[pkgsrc/trunk]: pkgsrc/geography Mechanical changes to add DESTDIR support to...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/geography Mechanical changes to add DESTDIR support to...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:51:39 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a056430093d0
branches:  trunk
changeset: 539384:a056430093d0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 04 14:44:05 2008 +0000

description:
Mechanical changes to add DESTDIR support to packages that install
their files via a custom do-install target.

diffstat:

 geography/epsg-docs/Makefile           |  10 ++++++----
 geography/gpsutils/Makefile            |   6 ++++--
 geography/mapserver/Makefile           |  10 ++++++----
 geography/xrmap-anthems/Makefile       |   6 ++++--
 geography/xrmap-data/Makefile          |   6 ++++--
 geography/xrmap-factbook_html/Makefile |   6 ++++--
 geography/xrmap-factbook_text/Makefile |   6 ++++--
 geography/xrmap-flags/Makefile         |   6 ++++--
 geography/xrmap-hymns/Makefile         |   6 ++++--
 geography/xrmap-pdfmaps/Makefile       |   6 ++++--
 10 files changed, 44 insertions(+), 24 deletions(-)

diffs (256 lines):

diff -r 10b5f4bad611 -r a056430093d0 geography/epsg-docs/Makefile
--- a/geography/epsg-docs/Makefile      Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/epsg-docs/Makefile      Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/07/28 11:09:48 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              G7-1
@@ -15,6 +15,8 @@
 
 LICENSE=               epsg-license
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 # Docs were included in geography/epsg up to 6.11.2, but are released
 # separately and hence now packaged separately.
 CONFLICTS+=            epsg<6.13
@@ -24,8 +26,8 @@
 DOCDIR=                 ${PREFIX}/share/doc/epsg
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/G7-1.pdf ${DOCDIR:Q}
-       ${INSTALL_DATA} ${WRKSRC}/G7-2.pdf ${DOCDIR:Q}
+       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/G7-1.pdf ${DESTDIR}${DOCDIR:Q}
+       ${INSTALL_DATA} ${WRKSRC}/G7-2.pdf ${DESTDIR}${DOCDIR:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/gpsutils/Makefile
--- a/geography/gpsutils/Makefile       Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/gpsutils/Makefile       Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/02/22 19:01:19 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              gpsutils-0.4.0
@@ -9,12 +9,14 @@
 HOMEPAGE=              http://wombat.ie/gps/
 COMMENT=               Capture and convert data from a Garmin GPS receiver
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/gpsutils-0.4.0/src
 INSTALLATION_DIRS=     bin
 
 do-install:
 .for f in capture switchmode gbindiff
-       ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/bin
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/mapserver/Makefile
--- a/geography/mapserver/Makefile      Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/mapserver/Makefile      Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:57 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              mapserver-4.0
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://mapserver.gis.umn.edu/
 COMMENT=               Environment for building spatially enabled Internet apps
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
@@ -21,11 +23,11 @@
 INSTALLATION_DIRS=     bin include lib
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/libmap.a ${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/map.h ${PREFIX}/include
+       ${INSTALL_DATA} ${WRKSRC}/libmap.a ${DESTDIR}${PREFIX}/lib
+       ${INSTALL_DATA} ${WRKSRC}/map.h ${DESTDIR}${PREFIX}/include
 .for f in shp2img shp2pdf mapserv legend shptree shptreevis            \
        shptreetst scalebar sortshp
-       ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/bin
 .endfor
 
 .include "../../converters/libiconv/buildlink3.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-anthems/Makefile
--- a/geography/xrmap-anthems/Makefile  Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-anthems/Makefile  Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/09/06 10:00:25 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              anthems-1.1
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && pax -rw -pp anthems ${PREFIX}/share/rmap
+       cd ${WRKSRC} && pax -rw -pp anthems ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-data/Makefile
--- a/geography/xrmap-data/Makefile     Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-data/Makefile     Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              CIA_WDB2.jpd
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       ${INSTALL_DATA} ${WRKSRC}/CIA_WDB2.jpd ${PREFIX}/share/rmap
+       ${INSTALL_DATA} ${WRKSRC}/CIA_WDB2.jpd ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-factbook_html/Makefile
--- a/geography/xrmap-factbook_html/Makefile    Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-factbook_html/Makefile    Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              factbook_html_2002
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw -pe factbook ${PREFIX}/share/rmap
+       cd ${WRKSRC} && ${PAX} -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-factbook_text/Makefile
--- a/geography/xrmap-factbook_text/Makefile    Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-factbook_text/Makefile    Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              factbook_text_2002
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw -pe factbook ${PREFIX}/share/rmap
+       cd ${WRKSRC} && ${PAX} -rw -pe factbook ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-flags/Makefile
--- a/geography/xrmap-flags/Makefile    Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-flags/Makefile    Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              flags-1.1
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw -pe flags ${PREFIX}/share/rmap
+       cd ${WRKSRC} && ${PAX} -rw -pe flags ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-hymns/Makefile
--- a/geography/xrmap-hymns/Makefile    Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-hymns/Makefile    Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              hymns-1.2
@@ -14,11 +14,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw -pe hymns ${PREFIX}/share/rmap
+       cd ${WRKSRC} && ${PAX} -rw -pe hymns ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
diff -r 10b5f4bad611 -r a056430093d0 geography/xrmap-pdfmaps/Makefile
--- a/geography/xrmap-pdfmaps/Makefile  Tue Mar 04 14:41:09 2008 +0000
+++ b/geography/xrmap-pdfmaps/Makefile  Tue Mar 04 14:44:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2008/03/04 14:44:05 jlam Exp $
 #
 
 DISTNAME=              pdfmaps-1.1
@@ -13,11 +13,13 @@
 
 DEPENDS+=              xrmap-base>=2.29:../../geography/xrmap-base
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
 INSTALLATION_DIRS=     share/rmap
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw -pe pdfmaps ${PREFIX}/share/rmap
+       cd ${WRKSRC} && ${PAX} -rw -pe pdfmaps ${DESTDIR}${PREFIX}/share/rmap
 
 .include "../../mk/bsd.pkg.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/desktop-file-utils to 0.15
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/php5 Accidentally missed from last commit
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/desktop-file-utils to 0.15
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/php5 Accidentally missed from last commit
Indexes:
Home | Main Index | Thread Index | Old Index