Mechanical changes to add DESTDIR support to packages that install

their files via a custom do-install target.

10 files changed, 44 insertions, 24 deletions

diff --git a/geography/epsg-docs/Makefile b/geography/epsg-docs/Makefile
index 3262402b9e9..e94017a204c 100644
--- a/geography/epsg-docs/Makefile
+++ b/geography/epsg-docs/Makefile
@@ -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 @@ COMMENT=		EPSG geodetic parameters database documentation
 
 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 @@ NO_BUILD=		yes
 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 --git a/geography/gpsutils/Makefile b/geography/gpsutils/Makefile
index 24cf9b69c18..fef97973f18 100644
--- a/geography/gpsutils/Makefile
+++ b/geography/gpsutils/Makefile
@@ -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 @@ MAINTAINER=		hdp@cs.nmsu.edu
 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 --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 74b67726179..0a5bfbe1981 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -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 @@ MAINTAINER=		hdp@cs.msu.edu
 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 @@ CONFIGURE_ARGS+=	--with-gd=${PREFIX:Q}				\
 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 --git a/geography/xrmap-anthems/Makefile b/geography/xrmap-anthems/Makefile
index bcb7d0e3d53..63889eda1e4 100644
--- a/geography/xrmap-anthems/Makefile
+++ b/geography/xrmap-anthems/Makefile
@@ -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 @@ COMMENT=		National anthems (text) for xrmap
 
 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 --git a/geography/xrmap-data/Makefile b/geography/xrmap-data/Makefile
index 5a3c9261ac2..0876b002a10 100644
--- a/geography/xrmap-data/Makefile
+++ b/geography/xrmap-data/Makefile
@@ -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 @@ COMMENT=		Vector data for xrmap
 
 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 --git a/geography/xrmap-factbook_html/Makefile b/geography/xrmap-factbook_html/Makefile
index 81b64bbfca5..c250e8005e0 100644
--- a/geography/xrmap-factbook_html/Makefile
+++ b/geography/xrmap-factbook_html/Makefile
@@ -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 @@ COMMENT=		CIA factbook for xrmap (HTML)
 
 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 --git a/geography/xrmap-factbook_text/Makefile b/geography/xrmap-factbook_text/Makefile
index 6cb07abf274..b41ea2f72a8 100644
--- a/geography/xrmap-factbook_text/Makefile
+++ b/geography/xrmap-factbook_text/Makefile
@@ -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 @@ COMMENT=		CIA factbook for xrmap
 
 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 --git a/geography/xrmap-flags/Makefile b/geography/xrmap-flags/Makefile
index f3b0f51d158..aaf90e7ba00 100644
--- a/geography/xrmap-flags/Makefile
+++ b/geography/xrmap-flags/Makefile
@@ -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 @@ COMMENT=		National flags for xrmap
 
 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 --git a/geography/xrmap-hymns/Makefile b/geography/xrmap-hymns/Makefile
index ec958862101..24518cac1bb 100644
--- a/geography/xrmap-hymns/Makefile
+++ b/geography/xrmap-hymns/Makefile
@@ -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 @@ COMMENT=		National anthems (MIDI) for xrmap
 
 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 --git a/geography/xrmap-pdfmaps/Makefile b/geography/xrmap-pdfmaps/Makefile
index 2cd2478079e..86bb2646547 100644
--- a/geography/xrmap-pdfmaps/Makefile
+++ b/geography/xrmap-pdfmaps/Makefile
@@ -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 @@ COMMENT=		PDF maps for xrmap
 
 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"