Mechanical changes to add full DESTDIR support to packages that install

their files via a custom do-install target.

10 files changed, 67 insertions, 49 deletions

diff --git a/comms/asterisk-sounds-de-x9media/Makefile b/comms/asterisk-sounds-de-x9media/Makefile
index 25faa98d4da..44ca3cb4efa 100644
--- a/comms/asterisk-sounds-de-x9media/Makefile
+++ b/comms/asterisk-sounds-de-x9media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/03/03 05:22:19 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/03 05:33:32 jlam Exp $
 #
 
 PKGNAME=		asterisk-sounds-de-x9media-20060714
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.x9media.com/
 COMMENT=		German voice prompt files for asterisk
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		tar
 
 FETCH_BEFORE_ARGS+=	-o ${DISTNAME}${EXTRACT_SUFX}
@@ -18,8 +20,8 @@ FETCH_BEFORE_ARGS+=	-o ${DISTNAME}${EXTRACT_SUFX}
 do-build:	# EMPTY
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/asterisk/sounds
-	( cd ${WRKSRC}; tar -cf - de digits ) | ( cd ${PREFIX}/libdata/asterisk/sounds; tar -xf - )
-	( cd ${WRKSRC}/x9media; tar -cf - . ) | ( cd ${PREFIX}/libdata/asterisk/sounds/de; tar -xf - )
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/libdata/asterisk/sounds
+	( cd ${WRKSRC}; tar -cf - de digits ) | ( cd ${DESTDIR}${PREFIX}/libdata/asterisk/sounds; tar -xf - )
+	( cd ${WRKSRC}/x9media; tar -cf - . ) | ( cd ${DESTDIR}${PREFIX}/libdata/asterisk/sounds/de; tar -xf - )
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/bthfp/Makefile b/comms/bthfp/Makefile
index 4abf4228a28..7881bff7045 100644
--- a/comms/bthfp/Makefile
+++ b/comms/bthfp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/07 20:29:10 plunky Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=		bthfp-0.1
 CATEGORIES=		comms
@@ -10,12 +10,12 @@ COMMENT=		Bluetooth Handsfree Profile
 
 ONLY_FOR_PLATFORM=	NetBSD-[4-9].*-*
 
-BUILD_DEFS+=		PKGMANDIR
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bthfp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/bthfp.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/bthfp ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/bthfp.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/dl-ezkit/Makefile b/comms/dl-ezkit/Makefile
index 6fbe89e4323..7a57d5ff1c7 100644
--- a/comms/dl-ezkit/Makefile
+++ b/comms/dl-ezkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2007/02/22 19:26:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=	dl-ezkit-0.8.1-bsd
 PKGNAME=	dl-ezkit-0.8.1
@@ -9,6 +9,8 @@ MAINTAINER=	gmcgarry@NetBSD.org
 HOMEPAGE=	http://www.ww.tu-freiberg.de/~pberg/download/
 COMMENT=	Coff file downloader for the EZ-KIT Lite using the RS232
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_FILE=	Makefile.bsd
 
 WRKSRC=		${WRKDIR}/dl-ezkit
@@ -16,6 +18,6 @@ WRKSRC=		${WRKDIR}/dl-ezkit
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dl ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/dl ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/estic/Makefile b/comms/estic/Makefile
index cf7a3666825..defc2d92414 100644
--- a/comms/estic/Makefile
+++ b/comms/estic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/01/06 18:39:38 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=	estic-1.61
 PKGREVISION=	1
@@ -21,6 +21,8 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 
 USE_LANGUAGES=	c c++
@@ -41,13 +43,13 @@ pre-build:
 	cd ${WRKDIR}/spunk && ${BUILD_MAKE_CMD} depend lib
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xestic ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/estic.res ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/estic
-	${INSTALL_DATA} ${WRKSRC}/estic.doc ${PREFIX}/share/doc/estic
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/estic
+	${INSTALL_PROGRAM} ${WRKSRC}/xestic ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/estic.res ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/estic
+	${INSTALL_DATA} ${WRKSRC}/estic.doc ${DESTDIR}${PREFIX}/share/doc/estic
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/estic
 	cd ${WRKSRC}/samples && \
-	${INSTALL_DATA} * ${PREFIX}/share/examples/estic
+	${INSTALL_DATA} * ${DESTDIR}${PREFIX}/share/examples/estic
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 55ac079c78f..86acb849ca8 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/12/12 20:42:31 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/03/03 05:33:32 jlam Exp $
 #
 
 DISTNAME=	gku100
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.columbia.edu/kermit/gkermit.html
 COMMENT=	Minimal implementation of the ``kermit'' protocol (GPL'd)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	posix
@@ -25,9 +26,10 @@ CFLAGS+=	-DERRNO_H
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin/gkermit; \
-	${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/${PKGMANDIR}/man1/gkermit.1; \
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gkermit
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gkermit
+	${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${DESTDIR}${PREFIX}/bin/gkermit
+	${INSTALL_MAN} ${WRKSRC}/gkermit.nr \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/gkermit.1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gkermit
+	${INSTALL_DATA} ${DESTDIR}${WRKSRC}/README ${PREFIX}/share/doc/gkermit
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 05bbadb61b4..66d557ee4ef 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2008/03/01 05:17:32 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=	cku211
 PKGNAME=	kermit-8.0.211
@@ -12,6 +12,8 @@ COMMENT=	Network and serial communication, file transfer, and scripting utility
 
 LICENSE=	kermit-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=		${WRKDIR}
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 5040183743c..f6ac2dd2fbd 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:49 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2008/03/03 05:33:32 jlam Exp $
 #
 
 DISTNAME=	linuxsms-0.65
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://linuxsms.sourceforge.net/
 COMMENT=	Perl script to send short messages to GSM phones
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	perl:run
 NO_BUILD=	yes
 
@@ -17,11 +19,11 @@ REPLACE_PERL=	linuxsms
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/linuxsms ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/linuxsms
+	${INSTALL_SCRIPT} ${WRKSRC}/linuxsms ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/linuxsms
 .for f in BUGS CHANGES README README.ES TODO
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/linuxsms
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/linuxsms
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 11f68bdff69..c672ba0b4bc 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/26 01:50:54 markd Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/03 05:33:32 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S/-/_/}.src
@@ -12,6 +12,8 @@ COMMENT=	Utility to synchronize Palm Pilots to the AvantGo.com service
 
 CONFLICTS+=	libmal-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/malsync
 USE_TOOLS+=		gmake
 MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
@@ -19,10 +21,10 @@ CPPFLAGS+=		-D__unix__=1
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/malsync ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/malsync
+	${INSTALL_PROGRAM} ${WRKSRC}/malsync ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/malsync
 .for doc in README_avantgo README_malsync
-	${INSTALL_DATA} ${FILESDIR}/${doc} ${PREFIX}/share/doc/malsync
+	${INSTALL_DATA} ${FILESDIR}/${doc} ${DESTDIR}${PREFIX}/share/doc/malsync
 .endfor
 
 .include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index fdeba8e0342..a2536f26e86 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/03/17 20:43:24 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=	pilotmgr-1.109
 CATEGORIES=	comms
@@ -13,6 +13,8 @@ DEPENDS+=	p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 DEPENDS+=	p5-pilot-link-[0-9]*:../../comms/p5-pilot-link
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=		YES
 NO_BUILD=		YES
 USE_TOOLS+=		perl:run
@@ -35,24 +37,24 @@ pre-install:
 	${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_DATA_DIR} ${PM_PERL_DIR}
-	${INSTALL_DATA_DIR} ${PM_DOC_DIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/PilotManager ${PM_PERL_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PM_PERL_DIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PM_DOC_DIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/PilotManager ${DESTDIR}${PM_PERL_DIR}
 	for FILE in ${WRKSRC}/*.pm; do \
-		${INSTALL_DATA} $$FILE ${PM_PERL_DIR}; \
+		${INSTALL_DATA} $$FILE ${DESTDIR}${PM_PERL_DIR}; \
 	done
-	${LN} -fs ${PM_PERL_DIR}/PilotManager ${PREFIX}/bin/PilotManager
+	${LN} -fs ${PM_PERL_DIR}/PilotManager ${DESTDIR}${PREFIX}/bin/PilotManager
 	cd ${WRKSRC} && \
 		for DIR in lib/*; do \
-			${INSTALL_DATA_DIR} ${PM_PERL_DIR}/$$DIR; \
+			${INSTALL_DATA_DIR} ${DESTDIR}${PM_PERL_DIR}/$$DIR; \
 			for FILE in $$DIR/*; do \
-				${INSTALL_DATA} $$FILE ${PM_PERL_DIR}/$$DIR; \
+				${INSTALL_DATA} $$FILE ${DESTDIR}${PM_PERL_DIR}/$$DIR; \
 			done; \
 		done
 	for FILE in ${WRKSRC}/docs/*; do \
-		${INSTALL_DATA} $$FILE ${PM_DOC_DIR}; \
+		${INSTALL_DATA} $$FILE ${DESTDIR}${PM_DOC_DIR}; \
 	done
-	${LN} -fs ${PM_DOC_DIR} ${PM_PERL_DIR}/docs
+	${LN} -fs ${PM_DOC_DIR} ${DESTDIR}${PM_PERL_DIR}/docs
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index f8528758d3f..3d7b509a9ef 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/04 20:51:40 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2008/03/03 05:33:32 jlam Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://web.archive.org/web/20031214215022/http://www.proudman51.freeserve.co.uk/psion/
 COMMENT=	Tools to talk to the PSION organiser
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
@@ -17,10 +19,10 @@ USE_LIBTOOL=	yes
 INSTALLATION_DIRS=	bin lib
 
 do-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/utils/libplputils.la ${PREFIX}/lib
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/ncp/ncp ${PREFIX}/bin
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/rfsv/rfsv ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/plp
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/plp
+	${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/utils/libplputils.la ${DESTDIR}${PREFIX}/lib
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/ncp/ncp ${DESTDIR}${PREFIX}/bin
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/rfsv/rfsv ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/plp
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/plp
 
 .include "../../mk/bsd.pkg.mk"