DESTDIR support

9 files changed, 63 insertions, 56 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index a39389dadce..6ae466b34a3 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/08/17 11:09:10 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2010/01/27 17:40:30 joerg Exp $
 
 DISTNAME=	smokeping-2.4.2
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	http://oss.oetiker.ch/smokeping/index.en.html
 COMMENT=	Latency/packet loss monitoring/graphing tool
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	rrdtool>=1.0:../../databases/rrdtool
 DEPENDS+=	fping>=2.4b2:../../net/fping
 DEPENDS+=	p5-Digest-MD5>=2.20:../../security/p5-Digest-MD5
@@ -60,41 +62,36 @@ INSTALLATION_DIRS=	bin libexec/cgi-bin
 post-extract:
 	${CP} ${FILESDIR}/smokeping.conf ${WRKSRC}
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smokeping
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA_DIR} ${SPDIR}
-	${INSTALL_DATA_DIR} ${SPDIR}/cropper
-	${INSTALL_DATA_DIR} ${SPDIR}/resource
-	${INSTALL_DATA_DIR} ${SPDIR}/script
+INSTALLATION_DIRS+=	lib/smokeping share/doc/smokeping ${EGDIR} \
+	${SPDIR}/cropper ${SPDIR}/resource ${SPDIR}/script
 
+do-install:
 	for FILE in CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO; do \
 		${INSTALL_DATA} \
-			${WRKSRC}/$$FILE ${PREFIX}/share/doc/smokeping; \
+			${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/doc/*.txt; do \
-		${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/smokeping; \
+		${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/smokeping; \
 	done
 
 	for FILE in ${WRKSRC}/doc/examples/config.*; do \
-		${INSTALL_DATA} $$FILE ${EGDIR}; \
+		${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \
 	done
 
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${PREFIX}/bin/smokeping
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${PREFIX}/bin/tSmoke
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping.dist ${DESTDIR}${PREFIX}/bin/smokeping
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/tSmoke.dist ${DESTDIR}${PREFIX}/bin/tSmoke
 
 	${INSTALL_SCRIPT} ${WRKSRC}/htdocs/smokeping.cgi.dist \
-		${PREFIX}/libexec/cgi-bin/smokeping.cgi
+		${DESTDIR}${PREFIX}/libexec/cgi-bin/smokeping.cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/htdocs/tr.cgi.dist \
-		${PREFIX}/libexec/cgi-bin/tr.cgi
+		${DESTDIR}${PREFIX}/libexec/cgi-bin/tr.cgi
 
-	cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${SPDIR}/cropper
-	cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${SPDIR}/resource
-	cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${SPDIR}/script
-	cd ${WRKSRC}/lib && pax -rw -pm . ${PREFIX}/lib/smokeping
-	${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${SPDIR}
+	cd ${WRKSRC}/htdocs/cropper && pax -rw -pm . ${DESTDIR}${SPDIR}/cropper
+	cd ${WRKSRC}/htdocs/resource && pax -rw -pm . ${DESTDIR}${SPDIR}/resource
+	cd ${WRKSRC}/htdocs/script && pax -rw -pm . ${DESTDIR}${SPDIR}/script
+	cd ${WRKSRC}/lib && pax -rw -pm . ${DESTDIR}${PREFIX}/lib/smokeping
+	${INSTALL_DATA} ${WRKSRC}/htdocs/tr.html ${DESTDIR}${SPDIR}
 
 	for FILE in ${WRKSRC}/etc/config.dist \
 		${WRKSRC}/etc/basepage.html.dist \
@@ -102,10 +99,10 @@ do-install:
 		${WRKSRC}/etc/config.dist \
 		${WRKSRC}/smokeping.conf \
 		${WRKSRC}/etc/smokemail.dist; do \
-		${INSTALL_DATA} $$FILE ${EGDIR}; \
+		${INSTALL_DATA} $$FILE ${DESTDIR}${EGDIR}; \
 	done
 
-	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON/*.pm
-	${CHMOD} ${SHAREMODE} ${PREFIX}/lib/smokeping/JSON.pm
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON/*.pm
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/smokeping/JSON.pm
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort-rules/Makefile b/net/snort-rules/Makefile
index a3f09ceb110..07a936cef80 100644
--- a/net/snort-rules/Makefile
+++ b/net/snort-rules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/07/17 18:00:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/27 17:43:41 joerg Exp $
 
 DISTNAME=	Community-Rules-2.4
 PKGNAME=	snort-rules-2.4
@@ -9,18 +9,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.snort.org/
 COMMENT=	Network Intrusion Detection System (Community Rules)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	snort{,-mysql,-pgsql}>=2.4.0:../../net/snort
 
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/snort/rules
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snort/signatures
+INSTALLATION_DIRS+=	share/snort/rules share/doc/snort/signatures
 
-	${INSTALL_DATA} ${WRKDIR}/rules/*.rules ${PREFIX}/share/snort/rules
-	${INSTALL_DATA} ${WRKDIR}/rules/*.map ${PREFIX}/share/snort/rules
+do-install:
+	${INSTALL_DATA} ${WRKDIR}/rules/*.rules ${DESTDIR}${PREFIX}/share/snort/rules
+	${INSTALL_DATA} ${WRKDIR}/rules/*.map ${DESTDIR}${PREFIX}/share/snort/rules
 	${INSTALL_DATA} ${WRKDIR}/docs/*.txt \
-		${PREFIX}/share/doc/snort/signatures
+		${DESTDIR}${PREFIX}/share/doc/snort/signatures
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ssmping/Makefile b/net/ssmping/Makefile
index 0d19a4aafd1..69a1321bd49 100644
--- a/net/ssmping/Makefile
+++ b/net/ssmping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/04/07 18:07:05 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/27 17:41:43 joerg Exp $
 # FreeBSD Id: ports/net/ssmping/Makefile,v 1.1 2006/08/25 19:02:31 miwi Exp
 
 DISTNAME=	ssmping-0.9
@@ -9,6 +9,8 @@ MAINTAINER=	is@NetBSD.org
 HOMEPAGE=	http://www.venaas.no/multicast/ssmping/
 COMMENT=	Ping for Any- and Single-Source Multicast
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=	bin sbin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ssmping/distinfo b/net/ssmping/distinfo
index 18fd6886a56..4a05c08b20c 100644
--- a/net/ssmping/distinfo
+++ b/net/ssmping/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/10/11 19:35:26 is Exp $
+$NetBSD: distinfo,v 1.2 2010/01/27 17:41:43 joerg Exp $
 
 SHA1 (ssmping-0.9.tar.gz) = f3eee602d5c39e07e4d0382497b6b1cba88d59f3
 RMD160 (ssmping-0.9.tar.gz) = 008c34fa9d3401c9763f9f4566e297975216ad1a
 Size (ssmping-0.9.tar.gz) = 16464 bytes
-SHA1 (patch-aa) = b4b074cc646e16315c0f24b903808b0cacd7d433
+SHA1 (patch-aa) = 6c7dda2644d846e9ba529b921192c53c612c4dd7
 SHA1 (patch-ab) = e5edaef7a41c3b9a409ab653c148a344e836158e
diff --git a/net/ssmping/patches/patch-aa b/net/ssmping/patches/patch-aa
index ba49977ec0e..4054ba02148 100644
--- a/net/ssmping/patches/patch-aa
+++ b/net/ssmping/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/10/11 19:35:26 is Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/27 17:41:43 joerg Exp $
 
 --- Makefile.orig	2006-06-04 10:16:04.000000000 +0200
 +++ Makefile
@@ -32,13 +32,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/10/11 19:35:26 is Exp $
 -	install -D ssmping.1 $(DESTDIR)$(PREFIX)/man/man1/ssmping.1
 -	install -D asmping.1 $(DESTDIR)$(PREFIX)/man/man1/asmping.1
 -	install -D mcfirst.1 $(DESTDIR)$(PREFIX)/man/man1/mcfirst.1
-+	install -m 755 ssmping $(PREFIX)/bin/ssmping
-+	install -m 755 asmping $(PREFIX)/bin/asmping
-+	install -m 755 ssmpingd $(PREFIX)/sbin/ssmpingd
-+	install -m 755 mcfirst $(PREFIX)/bin/mcfirst
-+	install -m 644 ssmping.1 $(PREFIX)/man/man1/ssmping.1
-+	install -m 644 asmping.1 $(PREFIX)/man/man1/asmping.1
-+	install -m 644 mcfirst.1 $(PREFIX)/man/man1/mcfirst.1
++	${BSD_INSTALL_PROGRAM} ssmping ${DESTDIR}$(PREFIX)/bin/ssmping
++	${BSD_INSTALL_PROGRAM} asmping ${DESTDIR}$(PREFIX)/bin/asmping
++	${BSD_INSTALL_PROGRAM} ssmpingd ${DESTDIR}$(PREFIX)/sbin/ssmpingd
++	${BSD_INSTALL_PROGRAM} mcfirst ${DESTDIR}$(PREFIX)/bin/mcfirst
++	${BSD_INSTALL_DATA} ssmping.1 ${DESTDIR}$(PREFIX)/man/man1/ssmping.1
++	${BSD_INSTALL_DATA} asmping.1 ${DESTDIR}$(PREFIX)/man/man1/asmping.1
++	${BSD_INSTALL_DATA} mcfirst.1 ${DESTDIR}$(PREFIX)/man/man1/mcfirst.1
  
  clean:
 -	rm -f $(OBJ) joinch.o joingrp.o ssmping asmping ssmpingd mcfirst
diff --git a/net/ssync/Makefile b/net/ssync/Makefile
index 613a2a91034..9d717b0371f 100644
--- a/net/ssync/Makefile
+++ b/net/ssync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:30 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/27 17:42:32 joerg Exp $
 #
 
 DISTNAME=		ssync-1.6
@@ -8,6 +8,8 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Invoke rsync to distribute files to a set of hosts
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		netname-[0-9]*:../../net/netname
 DEPENDS+=		osname-[0-9]*:../../sysutils/osname
 DEPENDS+=		rsync>=2.3.1:../../net/rsync
@@ -19,7 +21,7 @@ SSYNC_PAWD?=		pwd
 
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all PREFIX=${PREFIX} PAWD=${SSYNC_PAWD}
-INSTALL_TARGET=		install PREFIX=${PREFIX}
+INSTALL_TARGET=		install PREFIX=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile
index 8bafb50d8c7..04e8396aee8 100644
--- a/net/tacacs/Makefile
+++ b/net/tacacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/08/30 20:20:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/27 17:38:46 joerg Exp $
 #
 
 DISTNAME=	tac_plus.F4.0.4.alpha
@@ -12,6 +12,8 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.shrubbery.net/tac_plus/
 COMMENT=	Cisco authentication, authorization, and accounting protocol daemon
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 BUILD_TARGET=	tac_plus
 
 .include "../../mk/bsd.prefs.mk"
@@ -19,12 +21,11 @@ BUILD_TARGET=	tac_plus
 MAKE_FLAGS+=	OS=-DSOLARIS OSLIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/tacacs
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/${PKGMANDIR}/man8/tac_plus.8
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tacacs
-	${INSTALL_DATA} ${WRKSRC}/users_guide ${PREFIX}/share/doc/tacacs
+	${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/tac_plus.8
+	${INSTALL_DATA} ${WRKSRC}/users_guide ${DESTDIR}${PREFIX}/share/doc/tacacs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcpdpriv/Makefile b/net/tcpdpriv/Makefile
index f7b4a972b7c..e47f8e9c454 100644
--- a/net/tcpdpriv/Makefile
+++ b/net/tcpdpriv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:06 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2010/01/27 17:44:37 joerg Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdpriv-0.8
@@ -8,12 +8,14 @@ MASTER_SITES=	ftp://tracer.csl.sony.co.jp/pub/mawi/tools/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Anonymize tcpdump traces
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/wide-tcpdpriv
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index b58f67c3125..c824056ca98 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/08/16 15:35:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/01/27 17:38:00 joerg Exp $
 #
 
 DISTNAME=	trickle-1.06
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://monkey.org/~marius/trickle/
 COMMENT=	Portable lightweight userspace bandwidth shaper
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
@@ -19,10 +21,10 @@ EGDIR=		${PREFIX}/share/examples/trickle
 CONF_FILES=	${EGDIR}/trickled.conf ${PKG_SYSCONFDIR}/trickled.conf
 
 RCD_SCRIPTS=	trickled
+INSTALLATION_DIRS+=	${EGDIR}
 
 pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${FILESDIR}/trickled.conf ${EGDIR}
+	${INSTALL_DATA} ${FILESDIR}/trickled.conf ${DESTDIR}${EGDIR}
 
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"