[pkgsrc/trunk]: pkgsrc/geography/epsg Add DESTDIR support and bail-out in eps...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/520c49892f9e
branches:  trunk
changeset: 532231:520c49892f9e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Aug 14 17:19:20 2007 +0000

description:
Add DESTDIR support and bail-out in epsg-load when errors happened,
e.g. because psql or mysql failed. Bump revision.
Patch from Brook Milligan in private mail.

diffstat:

 geography/epsg/Makefile        |  15 +++++++++------
 geography/epsg/files/epsg-load |   4 +++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (68 lines):

diff -r aad882f1701f -r 520c49892f9e geography/epsg/Makefile
--- a/geography/epsg/Makefile   Tue Aug 14 15:23:53 2007 +0000
+++ b/geography/epsg/Makefile   Tue Aug 14 17:19:20 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2007/07/28 11:06:36 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2007/08/14 17:19:20 joerg Exp $
 #
 
 DISTNAME=              epsg-v${VERS}sql-PostgreSQL
 PKGNAME=               epsg-6.13
+PKGREVISION=           1
 VERS=                  6_13
 CATEGORIES=            geography databases
 MASTER_SITES+=         http://www.epsg.org/databases/
@@ -14,6 +15,8 @@
 HOMEPAGE=              http://www.epsg.org/
 COMMENT=               EPSG geodetic parameters database
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # Don't make filenames lowercase.
 EXTRACT_OPTS_ZIP=      -aqo
 
@@ -27,6 +30,8 @@
 DOCDIR=                        ${PREFIX}/share/doc/epsg
 EPSGDIR=               ${PREFIX}/share/epsg
 
+INSTALLATION_DIRS=     ${BINDIR} ${DOCDIR} ${EPSGDIR}
+
 MESSAGE_SUBST+=                BINDIR=${BINDIR:Q}
 MESSAGE_SUBST+=                EPSGDIR=${EPSGDIR:Q}
 
@@ -50,13 +55,11 @@
        ${CP} ${FILESDIR}/epsg-load ${WRKSRC}
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA_DIR} ${EPSGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/epsg-v${VERS}_Readme.pdf ${DOCDIR:Q}
-       ${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${BINDIR}
+       ${INSTALL_DATA} ${WRKSRC}/epsg-v${VERS}_Readme.pdf ${DESTDIR}${DOCDIR:Q}
+       ${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${DESTDIR}${BINDIR}
 .for d in pgsql mysql
 .for f in ${DATAFILES.${d}}
-       ${INSTALL_DATA} ${WRKSRC}/${f} ${EPSGDIR:Q}/${f}
+       ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${EPSGDIR:Q}/${f}
 .endfor
 .endfor
 
diff -r aad882f1701f -r 520c49892f9e geography/epsg/files/epsg-load
--- a/geography/epsg/files/epsg-load    Tue Aug 14 15:23:53 2007 +0000
+++ b/geography/epsg/files/epsg-load    Tue Aug 14 17:19:20 2007 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: epsg-load,v 1.3 2007/07/28 11:06:36 gdt Exp $
+# $NetBSD: epsg-load,v 1.4 2007/08/14 17:19:20 joerg Exp $
 
 # epsg - import EPSG data into a relational database
 
@@ -32,6 +32,8 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+set -e # exit on error
+
 HOST=
 PORT=
 DB=epsg