DESTDIR support

21 files changed, 128 insertions, 91 deletions

diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index ffd961a4fb2..b1d2bcbedac 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/10/09 04:14:28 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 17:30:14 joerg Exp $
 #
 
 DISTNAME=		tnftpd-20081009
@@ -8,6 +8,8 @@ MASTER_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
 MAINTAINER=		lukem@NetBSD.org
 COMMENT=		The NetBSD FTP Daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		wu-ftpd-[0-9]*
 CONFLICTS+=		kth-krb4-[0-9]*
 CONFLICTS+=		lukemftpd-[0-9]*
@@ -27,15 +29,15 @@ OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	CPPFLAGS=""
 
 EXAMPLEDIR=		${PREFIX}/share/examples/tnftpd
-INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
+			${EXAMPLEDIR}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
-	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
-	${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
-	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${DESTDIR}${PREFIX}/libexec
+	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
+	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
+	${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
+	${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${DESTDIR}${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${DESTDIR}${EXAMPLEDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile
index e6a36bf4cde..9b6e084dbe5 100644
--- a/net/torrentutils/Makefile
+++ b/net/torrentutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/22 17:46:19 tron Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/27 17:31:58 joerg Exp $
 
 DISTNAME=		torrentutils-0.3.0
 PKGREVISION=		4
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 # HOMEPAGE=		http://oskarsapps.mine.nu/torrentutils.html
 COMMENT=		Manage BitTorrent files and interact with trackers
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
 DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 
@@ -17,4 +19,6 @@ REPLACE_BASH+=		defrag.in
 REPLACE_PERL=		torrenttool.in
 MAKE_FLAGS+=		MANDIR=${PREFIX}/${PKGMANDIR}
 
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/torrentutils/distinfo b/net/torrentutils/distinfo
index 814a77e5b79..b317638f441 100644
--- a/net/torrentutils/distinfo
+++ b/net/torrentutils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/12/01 20:30:17 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/01/27 17:31:58 joerg Exp $
 
 SHA1 (torrentutils-0.3.0.tar.gz) = d9487551e5de128c31abe7fc404ec3a51d6a83a0
 RMD160 (torrentutils-0.3.0.tar.gz) = bc6dde481113a0a37a1a60fd520c6c28debea34e
 Size (torrentutils-0.3.0.tar.gz) = 21697 bytes
-SHA1 (patch-aa) = 634e8f4e3a14f239731924a5aa5078f8cd78b8a6
+SHA1 (patch-aa) = 830df7e0879310b5aaf419ed65fb951e4ce3dff4
 SHA1 (patch-ab) = 543d424cb131cdcbe17fb5091c3b7e826294de3c
diff --git a/net/torrentutils/patches/patch-aa b/net/torrentutils/patches/patch-aa
index 28ba6f2bab5..8169ee95a2f 100644
--- a/net/torrentutils/patches/patch-aa
+++ b/net/torrentutils/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/08/29 19:46:45 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/27 17:31:58 joerg Exp $
 
 --- Makefile.orig	2003-10-12 14:13:16.000000000 +0200
 +++ Makefile
@@ -35,10 +35,10 @@ $NetBSD: patch-aa,v 1.2 2004/08/29 19:46:45 wiz Exp $
 -	else \
 -	  echo "$(MCEXTFSDIR) does not exist. Not installing MC extfs support."; \
 -	fi
-+	${BSD_INSTALL_SCRIPT} torrenttool $(BINDIR)/torrenttool
-+	${BSD_INSTALL_SCRIPT} defrag $(BINDIR)
-+	${BSD_INSTALL_MAN} torrenttool.1 $(MANDIR)/man1
-+	${BSD_INSTALL_MAN} defrag.1 $(MANDIR)/man1
++	${BSD_INSTALL_SCRIPT} torrenttool ${DESTDIR}$(BINDIR)/torrenttool
++	${BSD_INSTALL_SCRIPT} defrag ${DESTDIR}$(BINDIR)
++	${BSD_INSTALL_MAN} torrenttool.1 ${DESTDIR}$(MANDIR)/man1
++	${BSD_INSTALL_MAN} defrag.1 ${DESTDIR}$(MANDIR)/man1
  
  clean:
  	rm -f torrenttool torrentmcfs defrag torrentutils.spec
diff --git a/net/totd/Makefile b/net/totd/Makefile
index 9e94b0a4570..038dac7ba6a 100644
--- a/net/totd/Makefile
+++ b/net/totd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2010/01/27 17:32:12 joerg Exp $
 #
 
 DISTNAME=	totd-1.5.1
@@ -16,14 +16,15 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.totd
 PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
 PKG_OPTIONS_GROUP.inet6=	inet6
 
-AUTO_MKDIRS=			yes
 BUILDLINK_TRANSFORM+=		rm:-Werror
 
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8 share/examples/totd
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/totd ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/totd.8 ${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_PROGRAM} ${WRKSRC}/totd ${DESTDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/totd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 	${INSTALL_DATA} ${FILESDIR}/totd.conf.sample \
-		${PREFIX}/share/examples/totd/totd.conf.sample
+		${DESTDIR}${PREFIX}/share/examples/totd/totd.conf.sample
 
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 020aab458c4..b3305708849 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/10/18 09:32:43 obache Exp $
+# $NetBSD: Makefile,v 1.31 2010/01/27 17:32:54 joerg Exp $
 
 DISTNAME=	trafshow-5.2.3
 CATEGORIES=	net
@@ -26,10 +26,10 @@ CFLAGS.Darwin+=	-DBIND_8_COMPAT
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/trafshow
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/.trafshow \
-		${PREFIX}/share/examples/trafshow/trafshow
+	    ${DESTDIR}${PREFIX}/share/examples/trafshow/trafshow
 
 BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.1
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 6146c04c425..38e735581b7 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/06/30 00:07:22 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/01/27 17:29:01 joerg Exp $
 
 DISTNAME=		mgv-3.1.5
 PKGREVISION=		4
@@ -9,6 +9,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://web.archive.org/web/20020201231345/http://www.trends.net/~mu/mgv.html
 COMMENT=		Motif/LessTif user interface for Ghostscript
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		yes
@@ -18,10 +20,11 @@ USE_TOOLS+=		gs:run
 CONFIGURE_ARGS+=	--with-motif-includes=${MOTIFBASE}/include
 CONFIGURE_ARGS+=	--with-motif-libs=${MOTIFBASE}/lib
 
+INSTALLATION_DIRS+=	share/doc/html
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/mgv/3.1.5/help
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
-	${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
+	${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help
+	${LN} -fs ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help ${DESTDIR}${PREFIX}/share/doc/html/mgv
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile
index 5c0d2a20d9b..30a1dd42fbe 100644
--- a/security/flawfinder/Makefile
+++ b/security/flawfinder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 17:21:29 joerg Exp $
 
 DISTNAME=	flawfinder-1.27
 PKGREVISION=		1
@@ -9,13 +9,15 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.dwheeler.com/flawfinder/
 COMMENT=	Python program to find flaws in C/C++ programs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	flawfinder
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index b4782f615ca..ad63e7aaa64 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/16 15:35:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 17:24:23 joerg Exp $
 
 DISTNAME=	fragroute-1.2
 PKGREVISION=	11
@@ -9,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.monkey.org/~dugsong/fragroute/
 COMMENT=	Tool for intercepting, modifying and rewriting egress traffic
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libdnet=${BUILDLINK_PREFIX.libdnet}
@@ -19,10 +20,11 @@ SCRIPTS=	README.snort base-1 frag-1 frag-2 frag-3 frag-4 frag-5 \
 	frag-6 frag-7-unix frag-7-win32 ins-2 ins-3 tcbc-2 tcp-3 tcp-5 \
 	tcp-7 tcp-9
 
+INSTALLATION_DIRS+=	share/fragroute
+
 pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/fragroute
 .for FILE in ${SCRIPTS}
-	${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${PREFIX}/share/fragroute
+	${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${DESTDIR}${PREFIX}/share/fragroute
 .endfor
 
 .include "../../net/libpcap/buildlink3.mk"
diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index c7f74fd7e5e..09d07218735 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/12/02 12:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 17:17:27 joerg Exp $
 
 DISTNAME=		hackbot-2.15
 CATEGORIES=		security net
@@ -9,21 +9,23 @@ MAINTAINER=		nk@atki.net
 HOMEPAGE=		http://ws.obit.nl/hackbot/
 COMMENT=		Vulnerability scanner written in Perl
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=			${WRKDIR}/hackbot
 MANCOMPRESSED=		YES
 USE_TOOLS+=		perl:run
 REPLACE_PERL=		hackbot.pl
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/hackbot
 
 do-build:
 	${SED} "s,/usr/local/etc,${PREFIX}/share/hackbot,g" ${WRKSRC}/hackbot.pl > ${WRKSRC}/hackbot.pl.done
 	${MV} ${WRKSRC}/hackbot.pl.done ${WRKSRC}/hackbot.pl
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/hackbot
-	${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/cgi.db ${WRKSRC}/fingerprint.db ${PREFIX}/share/hackbot
-	${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/cgi.db ${WRKSRC}/fingerprint.db \
+	    ${DESTDIR}${PREFIX}/share/hackbot
+	${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/hashcash/Makefile b/security/hashcash/Makefile
index c6c18111447..54e162eda1a 100644
--- a/security/hashcash/Makefile
+++ b/security/hashcash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/03/19 16:40:28 tv Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/27 17:13:24 joerg Exp $
 #
 
 DISTNAME=		hashcash-1.22
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.hashcash.org/
 COMMENT=		Hash collision based postage stamp
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -17,7 +18,7 @@ CFLAGS+=		-Dunix
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hashcash ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/hashcash.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/hashcash ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/hashcash.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 334bbd2ba67..b6547c63632 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/27 17:28:34 joerg Exp $
 #
 
 DISTNAME=	KeePassX-0.2.2
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://keepassx.sourceforge.net/
 COMMENT=	Password manager or safe
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
@@ -18,6 +20,7 @@ USE_LIBTOOL=	YES
 QMAKE=			${QTDIR}/bin/qmake
 CONFIGURE_ARGS+=	QMAKE=${QMAKE:Q} PREFIX=${PREFIX:Q}
 MAKE_ENV+=		QTDIR=${QTDIR} PREFIX=${PREFIX}
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 BUILDLINK_DEPMETHOD.qt3-tools=	build
 
@@ -29,7 +32,7 @@ pre-install:
 	${CP} ${WRKSRC}/bin/keepass ${WRKSRC}/src
 
 post-install:
-	${CHMOD} ${SHAREMODE} ${PREFIX}/share/keepass/icons/*.png
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/share/keepass/icons/*.png
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
diff --git a/security/libidea/Makefile b/security/libidea/Makefile
index a706dd6289f..b939de86ed5 100644
--- a/security/libidea/Makefile
+++ b/security/libidea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/05/19 08:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/01/27 17:12:39 joerg Exp $
 #
 
 DISTNAME=	libidea-0.8.2b
@@ -10,6 +10,8 @@ HOMEPAGE=	http://www.media-crypt.com/pages/fidea.html
 COMMENT=	IDEA block cipher library
 LICENSE=	idea-license
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=	IDEA is a patented algorithm that requires proper licensing
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
@@ -24,9 +26,9 @@ CRYPTO=		YES
 INSTALLATION_DIRS=	bin include lib
 
 do-install:
-	cd ${WRKSRC} &&							\
-	${INSTALL_DATA} libidea.a ${PREFIX}/lib &&			\
-	${INSTALL_DATA} idea.h ${PREFIX}/include &&			\
-	${INSTALL_PROGRAM} ideatest idea_spd ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libidea.a ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/idea.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_PROGRAM} ${WRKSRC}/ideatest ${WRKSRC}/idea_spd \
+	    ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libtcpa/Makefile b/security/libtcpa/Makefile
index 60910425637..0f297d518e6 100644
--- a/security/libtcpa/Makefile
+++ b/security/libtcpa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/27 17:11:31 joerg Exp $
 #
 
 DISTNAME=		tpm-1.1b
@@ -13,6 +13,7 @@ HOMEPAGE=		http://www.research.ibm.com/gsal/tcpa/
 COMMENT=		TCPA libraries and test programs from IBM
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/TPM
 
@@ -22,16 +23,16 @@ BUILD_DIRS=		libtcpa examples
 INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man3 share/doc/${PKGBASE}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/libtcpa/libtcpa.a ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/libtcpa/libtcpa.a ${DESTDIR}${PREFIX}/lib
 	for f in tcpa_demo takeown createkey loadkey evictkey signfile	\
 		verifyfile sealfile unsealfile; do			\
-		${INSTALL_PROGRAM} ${WRKSRC}/examples/$${f} ${PREFIX}/bin; \
+		${INSTALL_PROGRAM} ${WRKSRC}/examples/$${f} ${DESTDIR}${PREFIX}/bin; \
 	done
 	for f in ${WRKDIR}/tcpa_man/*.3; do			\
-		${INSTALL_MAN} $${f} ${PREFIX}/${PKGMANDIR}/man3;	\
+		${INSTALL_MAN} $${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3;	\
 	done
-	${INSTALL_DATA} ${WRKSRC}/libtcpa/License ${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/libtcpa/License ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 261d68896e6..f6ddaabc367 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/07/17 18:00:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/27 16:59:03 joerg Exp $
 
 DISTNAME=	nikto-1.36
 CATEGORIES=	security www
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.cirt.net/code/nikto.shtml
 COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 DEPENDS+=	nmap>=2.00:../../net/nmap
 
@@ -27,23 +29,19 @@ SUBST_MESSAGE.conf=	Fixing PREFIX in files.
 CONF_FILES=	${PREFIX}/share/examples/nikto/config.txt \
 			 ${PREFIX}/share/nikto/config.txt
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin libdata/nikto/docs libdata/nikto/plugins \
+			share/doc/nikto share/examples/nikto share/nikto
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA_DIR} ${PREFIX}/share/nikto
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/nikto/docs
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nikto
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${PREFIX}/libdata/nikto/docs
-	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${PREFIX}/share/doc/nikto
-	${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/share/examples/nikto
-	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${PREFIX}/bin/nikto
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/nikto
+	${INSTALL_DATA} ${WRKSRC}/docs/CHANGES.txt ${DESTDIR}${PREFIX}/libdata/nikto/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DESTDIR}${PREFIX}/share/doc/nikto
+	${INSTALL_DATA} ${WRKSRC}/config.txt ${DESTDIR}${PREFIX}/share/examples/nikto
+	${INSTALL_SCRIPT} ${WRKSRC}/nikto.pl ${DESTDIR}${PREFIX}/bin/nikto
 	${INSTALL_DATA} ${WRKSRC}/plugins/*.plugin \
-		${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${PREFIX}/libdata/nikto/plugins
-	${INSTALL_DATA} ${WRKSRC}/plugins/*.txt ${PREFIX}/libdata/nikto/plugins
+	    ${DESTDIR}${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/LW.pm ${DESTDIR}${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.db ${DESTDIR}${PREFIX}/libdata/nikto/plugins
+	${INSTALL_DATA} ${WRKSRC}/plugins/*.txt ${DESTDIR}${PREFIX}/libdata/nikto/plugins
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/priv/Makefile b/security/priv/Makefile
index ca889610ae2..a1de53554c6 100644
--- a/security/priv/Makefile
+++ b/security/priv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/20 17:04:13 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2010/01/27 17:02:16 joerg Exp $
 #
 
 DISTNAME=	priv-1.0-beta2
@@ -11,6 +11,7 @@ MAINTAINER=	simonb@NetBSD.org
 COMMENT=	Execute commands as a different user
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	YES
 
@@ -20,7 +21,8 @@ SUBST_STAGE.sysconfdir=	post-configure
 SUBST_FILES.sysconfdir=	priv.1
 SUBST_SED.sysconfdir=	-e "s|/usr/local/etc/|${PKG_SYSCONFDIR}/|g"
 
-INSTALL_MAKE_FLAGS=	mandir=${PREFIX}/${PKGMANDIR}/man1
+INSTALL_MAKE_FLAGS=	bindir=${DESTDIR}${PREFIX}/bin \
+			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 OWN_DIRS=	${PKG_SYSCONFDIR}/priv
 
diff --git a/security/qca/Makefile b/security/qca/Makefile
index f062fb789a6..c3f51cad80c 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 17:07:18 joerg Exp $
 
 DISTNAME=	qca-1.0
 PKGREVISION=	5
@@ -10,12 +10,15 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://delta.affinix.com/qca/
 COMMENT=	Cross-platform crypto API for QT
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+= gmake
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c++
 
 INSTALLATION_DIRS=	include lib
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt3-tools+=	qt3-tools>=3.3.5nb6
diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
index e4f5a8997bb..e5a1026a6ab 100644
--- a/security/qca2-ossl/Makefile
+++ b/security/qca2-ossl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 17:10:30 joerg Exp $
 
 DISTNAME=	qca-ossl-2.0.0-beta3
 PKGNAME=	qca2-ossl-${DISTNAME:S/-beta/beta/:C/.*-//}
@@ -11,6 +11,8 @@ MAINTAINER=	jdolecek@NetBSD.org
 HOMEPAGE=	http://delta.affinix.com/qca/
 COMMENT=	Cross-platform crypto API for QT - OpenSSL plugin
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
@@ -21,6 +23,8 @@ CONFIGURE_ARGS+=	--with-qca=${QTDIR}
 CONFIGURE_ARGS+=	--with-openssl-inc=${SSLBASE}/include
 CONFIGURE_ARGS+=	--with-openssl-lib=${SSLBASE}/lib
 
+INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
+
 .include "../../security/qca2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sign/Makefile b/security/sign/Makefile
index 4f82704831a..dc2f8a85bbf 100644
--- a/security/sign/Makefile
+++ b/security/sign/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/17 12:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/27 16:55:53 joerg Exp $
 #
 
 DISTNAME=	sign-1.0.4
@@ -10,14 +10,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swapped.cc/sign/
 COMMENT=	File signing and signature verification utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/sign ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/sign.1 ${PREFIX}/${PKGMANDIR}/man1
-	${LN} -sf ${PREFIX}/bin/sign ${PREFIX}/bin/unsign
+	${INSTALL_PROGRAM} ${WRKSRC}/src/sign ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/sign.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${LN} -sf sign ${DESTDIR}${PREFIX}/bin/unsign
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 716f63b9c52..2ac8b7580fe 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/07/17 18:00:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 16:52:13 joerg Exp $
 #
 
 DISTNAME=	SnortSnarf-050314.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.silicondefense.com/software/snortsnarf/
 COMMENT=	Generate HTML report summaries from snort incident alerts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	p5-Time-modules>=101.062101:../../time/p5-Time-modules
 
 NO_BUILD=	YES
@@ -24,14 +26,12 @@ SUBST_FILES.paths=	snortsnarf.pl
 SUBST_SED.paths=	-e "s|./include|${PREFIX}/share/snortsnarf|g"
 SUBST_MESSAGE.paths=	Fixing paths.
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/snortsnarf share/doc/snortsnarf
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/snortsnarf.pl ${PREFIX}/bin/snortsnarf.pl
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snortsnarf
-	cd ${WRKSRC}/include && pax -rw -pm * ${PREFIX}/share/snortsnarf
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snortsnarf
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/snortsnarf
-	${INSTALL_DATA} ${WRKSRC}/Usage ${PREFIX}/share/doc/snortsnarf
+	${INSTALL_SCRIPT} ${WRKSRC}/snortsnarf.pl ${DESTDIR}${PREFIX}/bin/snortsnarf.pl
+	cd ${WRKSRC}/include && pax -rw -pm * ${DESTDIR}${PREFIX}/share/snortsnarf
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/snortsnarf
+	${INSTALL_DATA} ${WRKSRC}/Usage ${DESTDIR}${PREFIX}/share/doc/snortsnarf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ssldump/Makefile b/security/ssldump/Makefile
index 4bf9fc6909c..e12362b80d8 100644
--- a/security/ssldump/Makefile
+++ b/security/ssldump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/01/17 12:02:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/01/27 16:55:04 joerg Exp $
 #
 
 DISTNAME=	ssldump-0.9b3
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.rtfm.com/ssldump/
 COMMENT=	SSLv3/TLS network protocol analyzer
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 
@@ -18,6 +20,9 @@ CONFIGURE_ARGS+=--with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \
 		--with-openssl-inc=${BUILDLINK_PREFIX.openssl}/include \
 		--with-openssl-lib=${BUILDLINK_PREFIX.openssl}/lib
 
+INSTALL_MAKE_FLAGS+=	BINDIR=${DESTDIR}${PREFIX}/sbin \
+			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"