DESTDIR support

8 files changed, 80 insertions, 68 deletions

diff --git a/security/sbd/Makefile b/security/sbd/Makefile
index 7f6cbc14df5..fbeefa777cd 100644
--- a/security/sbd/Makefile
+++ b/security/sbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/05/10 18:18:16 agc Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/27 21:30:48 joerg Exp $
 #
 
 DISTNAME=	sbd-0.5
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/sbd/
 COMMENT=	HMAC & one-time pad-based remote login program
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/sbd
 
 USE_LANGUAGES+=	c c++
@@ -18,7 +20,11 @@ CONF_FILES=	${EGDIR}/deckey.bits ${PKG_SYSCONFDIR}/sbd/deckey.bits
 CONF_FILES+=	${EGDIR}/enckey.bits ${PKG_SYSCONFDIR}/sbd/enckey.bits
 CONF_FILES+=	${EGDIR}/athkey.bits ${PKG_SYSCONFDIR}/sbd/athkey.bits
 
-do-configure:
+NO_CONFIGURE=	yes
+
+INSTALLATION_DIRS+=	bin share/sbd
+
+OWN_DIRS+=	${PKG_SYSCONFDIR}/sbd
 
 do-build:
 	cd ${WRKSRC} && \
@@ -26,14 +32,12 @@ do-build:
 	${CXX} -DPKG_SYSCONFDIR=\""${PKG_SYSCONFDIR}/sbd\"" -Wall -O2 -o sbd csocket.cpp sha1.cpp utils.cpp sbd.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sbdd ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/sbd ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/sbd
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/sbd
-	${INSTALL_DATA} ${WRKSRC}/PROTOCOL ${PREFIX}/share/sbd/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/sbd/
-	${INSTALL_DATA} ${WRKSRC}/athkey.bits ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/deckey.bits ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/enckey.bits ${EGDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/sbdd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/sbd ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/PROTOCOL ${DESTDIR}${PREFIX}/share/sbd/
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/sbd/
+	${INSTALL_DATA} ${WRKSRC}/athkey.bits ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/deckey.bits ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/enckey.bits ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 8bdda57857c..c41b9d56ba5 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/27 21:28:11 joerg Exp $
 #
 
 DISTNAME=		secpanel-0.5.1
@@ -10,17 +10,19 @@ MAINTAINER=		dhowland@users.sourceforge.net
 HOMEPAGE=		http://www.pingx.net/secpanel/
 COMMENT=		GUI front-end for SSH
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		tk>=8.4:../../x11/tk
 
 NO_BUILD=		yes
 
+INSTALLATION_DIRS+=	bin lib/secpanel/images
+
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/secpanel
-	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/*.tcl ${PREFIX}/lib/secpanel/
-	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/default.* ${PREFIX}/lib/secpanel/
-	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/secpanel.* ${PREFIX}/lib/secpanel/
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/secpanel/images
-	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/images/*.gif ${PREFIX}/lib/secpanel/images/
-	${INSTALL_SCRIPT} ${WRKSRC}/src/bin/secpanel ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/*.tcl ${DESTDIR}${PREFIX}/lib/secpanel/
+	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/default.* ${DESTDIR}${PREFIX}/lib/secpanel/
+	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/secpanel.* ${DESTDIR}${PREFIX}/lib/secpanel/
+	${INSTALL_DATA} ${WRKSRC}/src/lib/secpanel/images/*.gif ${DESTDIR}${PREFIX}/lib/secpanel/images/
+	${INSTALL_SCRIPT} ${WRKSRC}/src/bin/secpanel ${DESTDIR}${PREFIX}/bin/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/srp_client/Makefile b/security/srp_client/Makefile
index 5c3cd3bdf45..525e128ef49 100644
--- a/security/srp_client/Makefile
+++ b/security/srp_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2009/05/19 08:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/01/27 21:26:59 joerg Exp $
 
 DISTNAME=		srp-1.4.4
 PKGNAME=		srp-client-1.4.4
@@ -11,6 +11,8 @@ HOMEPAGE=		http://srp.stanford.edu/
 COMMENT=		Client programs using Secure Remote Password protocol
 LICENSE=		srp_client-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=		Licensor makes vague patent claims.
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
@@ -35,8 +37,6 @@ SED_PATTERN+=	-e "s,-ldes,-ldes -lroken -lcom_err -lcrypt,"
 SED_PATTERN+=	-e "s,-ldes,-ldes -lcom_err,"
 .endif
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
-
 post-patch:
 	for FILE in ftp/ftp/Makefile.in ftp/ftpd/Makefile.in		\
 		telnet/configure.in telnet/configure;			\
@@ -47,13 +47,15 @@ post-patch:
 	done
 .endif
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/telnet/telnet/telnet \
-		${PREFIX}/bin/srptelnet
+	    ${DESTDIR}${PREFIX}/bin/srptelnet
 	${INSTALL_DATA} ${WRKSRC}/telnet/telnet/telnet.1 \
-		${PREFIX}/${PKGMANDIR}/man1/srptelnet.1
-	${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftp/ftp ${PREFIX}/bin/srpftp
-	${INSTALL_DATA} ${WRKSRC}/ftp/ftp/ftp.M ${PREFIX}/${PKGMANDIR}/man1/srpftp.1
+	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/srptelnet.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ftp/ftp/ftp ${DESTDIR}${PREFIX}/bin/srpftp
+	${INSTALL_DATA} ${WRKSRC}/ftp/ftp/ftp.M ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/srpftp.1
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/systrace-policies/Makefile b/security/systrace-policies/Makefile
index f5aabfbc796..498952909cd 100644
--- a/security/systrace-policies/Makefile
+++ b/security/systrace-policies/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:30:38 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/27 21:22:43 joerg Exp $
 
 DISTNAME=	hairyeyeball-1.1
 PKGREVISION=	1
@@ -10,16 +10,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://blafasel.org/~floh/he/
 COMMENT=	Systrace policy examples
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/1.1
 
 NO_BUILD=	YES
 
+INSTALLATION_DIRS+=	share/examples/systrace-policies
+
 do-install:
-	dir=${PREFIX}/share/examples/systrace-policies;			\
-	${INSTALL_DATA_DIR} $$dir;					\
-	cd ${WRKSRC} &&							\
-		for f in *; do						\
-			${INSTALL_DATA} $$f $$dir;			\
-		done
+	${INSTALL_DATA} ${WRKSRC}/* ${DESTDIR}${PREFIX}/share/examples/systrace-policies
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tacshell/Makefile b/security/tacshell/Makefile
index 9a17b6c1150..9af6cb553d4 100644
--- a/security/tacshell/Makefile
+++ b/security/tacshell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/20 23:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/27 21:21:03 joerg Exp $
 
 DISTNAME=		tacshell-0.91
 PKGREVISION=		1
@@ -9,13 +9,17 @@ MAINTAINER=		sekiya@NetBSD.org
 HOMEPAGE=		http://www.rezrov.net/software/tacshell.html
 COMMENT=		RSA ACE/Server sdshell workalike, using TACACS+
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		YES
 CONF_FILES+=		$(PREFIX)/share/examples/tacshell/tacshell.conf \
 			${PKG_SYSCONFDIR}/tacshell.conf
 
+INSTALLATION_DIRS+=	bin share/examples/tacshell
+INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tacshell
 	${INSTALL_DATA} ${WRKSRC}/tacshell.conf-example \
-		${PREFIX}/share/examples/tacshell/tacshell.conf
+	    ${DESTDIR}${PREFIX}/share/examples/tacshell/tacshell.conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tct/Makefile b/security/tct/Makefile
index 54555e028f2..b42e30a06a9 100644
--- a/security/tct/Makefile
+++ b/security/tct/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/01 22:48:05 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/01/27 21:18:13 joerg Exp $
 #
 
 DISTNAME=	tct-1.09
@@ -10,6 +10,8 @@ MAINTAINER=	frazee.23@osu.edu
 HOMEPAGE=	http://www.porcupine.org/forensics/tct.html
 COMMENT=	Programs to aid post-mortem after a break-in
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Date-Manip-[0-9]*:../../devel/p5-Date-Manip
 
 USE_TOOLS+=	perl:run
@@ -19,30 +21,27 @@ REPLACE_PERL+=	lazarus/lazarus
 
 MAKE_ENV+=	PERL5=${PERL5:Q}
 
+INSTALLATION_DIRS+=	tct/bin tct/conf tct/etc share/doc/tct ${PERL5_INSTALLVENDORLIB}
+
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/bin
 	cd ${WRKSRC}/bin &&						\
 	for f in grave-robber mactime; do				\
-		${INSTALL_SCRIPT} $$f ${PREFIX}/tct/bin;		\
+		${INSTALL_SCRIPT} $$f ${DESTDIR}${PREFIX}/tct/bin;		\
 	done;								\
 	for f in file icat ils lastcomm major_minor md5 pcat timeout unrm; do \
-		${INSTALL_PROGRAM} $$f ${PREFIX}/tct/bin;		\
+		${INSTALL_PROGRAM} $$f ${DESTDIR}${PREFIX}/tct/bin;		\
 	done
 	cd ${WRKSRC}/extras &&						\
 	for f in bdf ils2mac realpath; do				\
-		${INSTALL_SCRIPT} $$f ${PREFIX}/tct/bin;		\
+		${INSTALL_SCRIPT} $$f ${DESTDIR}${PREFIX}/tct/bin;		\
 	done
-	${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${PREFIX}/tct/bin
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/etc
-	cd ${WRKSRC}/etc && ${INSTALL_DATA} magic ${PREFIX}/tct/etc
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tct
+	${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${DESTDIR}${PREFIX}/tct/bin
+	cd ${WRKSRC}/etc && ${INSTALL_DATA} magic ${DESTDIR}${PREFIX}/tct/etc
 	cd ${WRKSRC}/docs &&						\
 	for f in README design-notes grave-robber.README lazarus.README mac.README; do \
-		${INSTALL_DATA} $$f ${PREFIX}/share/doc/tct;		\
+		${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/doc/tct;		\
 	done
-	${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB}
-	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.pl ${PERL5_INSTALLVENDORLIB}
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/tct/conf
-	cd ${WRKSRC}/conf && ${INSTALL_DATA} paths.pl *.cf ${PREFIX}/tct/conf
+	cd ${WRKSRC}/lib && ${INSTALL_DATA} *.pl ${DESTDIR}${PERL5_INSTALLVENDORLIB}
+	cd ${WRKSRC}/conf && ${INSTALL_DATA} paths.pl *.cf ${DESTDIR}${PREFIX}/tct/conf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tkpasman/Makefile b/security/tkpasman/Makefile
index c2bc74f2cb1..5682b88804b 100644
--- a/security/tkpasman/Makefile
+++ b/security/tkpasman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2008/01/18 05:09:42 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/27 21:15:45 joerg Exp $
 #
 
 DISTNAME=	TkPasMan-2.2a
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.xs4all.nl/~wbsoft/linux/tkpasman.html
 COMMENT=	Username and password manager that uses the Tk toolkit
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIG_SUBST=		PREFIX="${PREFIX}"
 CONFIG_SUBST+=		SHELL="${SH}"
 CONFIG_SUBST+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
@@ -21,7 +23,7 @@ CONFIG_SUBST_SED=	${CONFIG_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
 .include "options.mk"
 
 BUILD_TARGET=		tkpasman
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/tkpasman
 
 post-extract:
 	${MV} ${WRKSRC}/config ${WRKSRC}/config.in
@@ -30,9 +32,8 @@ do-configure:
 	${SED} ${CONFIG_SUBST_SED} ${WRKSRC}/config.in > ${WRKSRC}/config
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tkpasman ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tkpasman
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tkpasman
+	${INSTALL_SCRIPT} ${WRKSRC}/tkpasman ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/tkpasman
 
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 0db2a750065..ca3e46439f9 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2009/05/19 08:59:33 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/01/27 21:13:11 joerg Exp $
 
 DISTNAME=		vlp4510e
 PKGNAME=		uvscan-5.10
@@ -12,6 +12,8 @@ HOMEPAGE=		http://www.mcafee.com/us/enterprise/products/anti_virus/file_servers_
 COMMENT=		Evaluation version of a DOS/Windows file virus scanner
 LICENSE=		uvscan-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=		restrictive 30 day evaluation license
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
@@ -39,7 +41,8 @@ CONF_FILES+=		${EGDATDIR}/names.dat ${UVSCANDIR}/names.dat
 CONF_FILES+=		${EGDATDIR}/scan.dat ${UVSCANDIR}/scan.dat
 REQD_DIRS=		${UVSCANDIR}
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 sbin ${EGDATDIR} ${DOCDIR} \
+			${UVSCANDIR}
 
 USE_TOOLS+=		gtar:run
 
@@ -54,24 +57,22 @@ post-extract:
 	${CP} ${FILESDIR}/uvscan.sh ${WRKSRC}/uvscan.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/update_dat.sh ${PREFIX}/sbin/update_dat
-	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${UVSCANDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${PREFIX}/bin/uvscan
-	${INSTALL_DATA} ${WRKSRC}/liblnxfv.so.4 ${UVSCANDIR}
-	${LN} -s liblnxfv.so.4 ${UVSCANDIR}/liblnxfv.so
+	${INSTALL_SCRIPT} ${WRKSRC}/update_dat.sh ${DESTDIR}${PREFIX}/sbin/update_dat
+	${INSTALL_MAN} ${WRKSRC}/uvscan.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/uvscan ${DESTDIR}${UVSCANDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/uvscan.sh ${DESTDIR}${PREFIX}/bin/uvscan
+	${INSTALL_DATA} ${WRKSRC}/liblnxfv.so.4 ${DESTDIR}${UVSCANDIR}
+	${LN} -s liblnxfv.so.4 ${DESTDIR}${UVSCANDIR}/liblnxfv.so
 	for file in license.dat messages.dat; do			\
-		${INSTALL_DATA} ${WRKSRC}/$${file} ${UVSCANDIR};	\
+		${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${UVSCANDIR};	\
 	done
-	${INSTALL_DATA_DIR} ${EGDATDIR}
 	for file in ${DATFILES}; do					\
 		if [ -f ${WRKSRC}/$${file} ]; then			\
-			${INSTALL_DATA} ${WRKSRC}/$${file} ${EGDATDIR};	\
+			${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDATDIR};	\
 		fi;							\
 	done
-	${INSTALL_DATA_DIR} ${DOCDIR}
 	for file in contact.txt e5100upg.pdf license.txt ; do		\
-		${INSTALL_DATA} ${WRKSRC}/$${file} ${DOCDIR};		\
+		${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${DOCDIR};		\
 	done
 
 .include "../../mk/bsd.pkg.mk"