DESTDIR support

11 files changed, 55 insertions, 44 deletions

diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index 3b89f7eb4b3..6b6a01919c2 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:28 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/02/11 22:35:09 joerg Exp $
 
 DISTNAME=	rtspd-src-1.0.0.0
 PKGNAME=	ra-rtsp-proxy-1.0.0.0
@@ -11,6 +11,8 @@ HOMEPAGE=	http://service.real.com/firewall/fdev.html
 COMMENT=	Proxy server for the RealAudio RTSP protocol
 LICENSE=	no-commercial-use
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 RESTRICTED=		${LICENSE}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -27,14 +29,13 @@ WRKSRC=		${WRKDIR}/rtspd-1.0.0.0a
 MAKE_ENV+=	LOCAL_LIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	etc/rc.d ${PKGMANDIR}/man8 sbin
+INSTALLATION_DIRS=	etc/rc.d ${PKGMANDIR}/man8 sbin share/doc/ra-rtsp-proxy
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ra-rtsp-proxy
-	${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/ra-rtsp-proxy
+	${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${PREFIX}/share/doc/ra-rtsp-proxy
 	@${SED} -e 's#/usr/local#${PREFIX}#g' <${WRKSRC}/README \
-	  >${PREFIX}/share/doc/ra-rtsp-proxy/README
+	  >${DESTDIR}${PREFIX}/share/doc/ra-rtsp-proxy/README
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index a3bf93395bf..7651d03d3ce 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/12/22 12:39:57 obache Exp $
+# $NetBSD: Makefile,v 1.26 2010/02/11 22:37:49 joerg Exp $
 
 DISTNAME=	radiusd-cistron-1.6.8
 CATEGORIES=	net
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.radius.cistron.nl/
 COMMENT=	RADIUS-compliant remote authentication and accounting server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS+=	freeradius-[0-9]*
 
 USE_TOOLS+=	perl:run
@@ -23,7 +25,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
 
 RCD_SCRIPTS=	radiusd
 
-OWN_DIRS_PERMS=	/var/log/radacct ${ROOT_USER} ${ROOT_GROUP} 700
+OWN_DIRS_PERMS=	/var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
 
 PKG_SYSCONFSUBDIR=	raddb
 EGDIR=		${PREFIX}/share/examples/raddb
@@ -38,20 +40,20 @@ CONF_FILES+=	${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
 .endfor
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron/
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
 .for i in	ChangeLog README README.CVX README.Y2K README.cisco	\
 		README.pam README.proxy README.radrelay README.simul	\
 		README.tunnel README.usersfile
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/
+	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/
 .endfor
 .for i in	radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 .endfor
 .for i in	clients.5rad naslist.5rad
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
 .endfor
 .for i in	radiusd.8 radrelay.8 radwatch.8
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo
index 448625a2d36..ce0a3ad5438 100644
--- a/net/radiusd-cistron/distinfo
+++ b/net/radiusd-cistron/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2007/12/22 12:39:57 obache Exp $
+$NetBSD: distinfo,v 1.9 2010/02/11 22:37:49 joerg Exp $
 
 SHA1 (radiusd-cistron-1.6.8.tar.gz) = 7938d5acbb994174baf662a4b4641367c4e1fd95
 RMD160 (radiusd-cistron-1.6.8.tar.gz) = 06de37ca5e8a8354aaa7387255929388b49edb61
 Size (radiusd-cistron-1.6.8.tar.gz) = 199459 bytes
-SHA1 (patch-aa) = 53f331bde823f23a869c779df92a6e400a204746
-SHA1 (patch-ab) = a877e273f3d12228d4d0d6064115c5f55c044ad3
+SHA1 (patch-aa) = 7661709e49bf6797cfbbc86e45daf7be0f723d9a
+SHA1 (patch-ab) = e04249a8953a473577c4467788726c2db1de89d3
 SHA1 (patch-ac) = 95053cdb7cc8a1672d32a953147074ea948e535b
 SHA1 (patch-ad) = 1220fdb3141391f6c15b7bfba014baf1a372f3b6
 SHA1 (patch-ae) = 2049cfa99b6392ed178e11e283b2749df819a35c
diff --git a/net/radiusd-cistron/patches/patch-aa b/net/radiusd-cistron/patches/patch-aa
index caf4d62b3c6..9c583c1ddcb 100644
--- a/net/radiusd-cistron/patches/patch-aa
+++ b/net/radiusd-cistron/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $
+$NetBSD: patch-aa,v 1.5 2010/02/11 22:37:49 joerg Exp $
 
 --- src/Makefile.BSD.orig	Thu Apr 10 13:38:23 2003
 +++ src/Makefile.BSD	Tue Dec 16 20:15:35 2003
@@ -27,9 +27,9 @@ $NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $
 -SBINDIR = /usr/local/sbin
 -MANDIR  = /usr/local/man
 -SHAREDIR = /usr/local/share/radius
-+BINDIR  = $(PREFIX)/bin
-+SBINDIR = $(PREFIX)/sbin
-+MANDIR  = $(PREFIX)/man
-+SHAREDIR = $(PREFIX)/share/examples/raddb
++BINDIR  = ${DESTDIR}$(PREFIX)/bin
++SBINDIR = ${DESTDIR}$(PREFIX)/sbin
++MANDIR  = ${DESTDIR}$(PREFIX)/man
++SHAREDIR = ${DESTDIR}$(PREFIX)/share/examples/raddb
  
  .include "Make.inc"
diff --git a/net/radiusd-cistron/patches/patch-ab b/net/radiusd-cistron/patches/patch-ab
index 84b53cfcae7..6b4e512088a 100644
--- a/net/radiusd-cistron/patches/patch-ab
+++ b/net/radiusd-cistron/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $
+$NetBSD: patch-ab,v 1.5 2010/02/11 22:37:49 joerg Exp $
 
 --- src/Make.inc.orig	Thu Apr 10 13:51:47 2003
 +++ src/Make.inc	Tue Dec 16 20:10:28 2003
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $
  #
  
 -RADIUS_DIR    = /etc/raddb
-+RADIUS_DIR    = ${PREFIX}/share/examples/raddb
++RADIUS_DIR    = ${DESTDIR}${PREFIX}/share/examples/raddb
  
  SERVER_OBJS   = radiusd.o files.o acct.o pam.o version.o proxy.o \
  			exec.o auth.o timestr.o cache.o readusers.o
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 522046707fa..c9bea9c852c 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/01/08 21:12:31 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/11 22:38:12 joerg Exp $
 #
 
 DISTNAME=		rinetd
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.boutell.com/rinetd/
 COMMENT=		Internet redirection server
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=		yes
 BUILD_TARGET=		rinetd
 
@@ -31,7 +33,7 @@ do-build:
 	cd ${WRKSRC} && env ${MAKE_ENV} cc ${CPPFLAGS} ${CFLAGS} -o rinetd *.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rinetd ${PREFIX}/sbin/.
-	${INSTALL_MAN} ${WRKSRC}/rinetd.8 ${PREFIX}/${PKGMANDIR}/man8/.
+	${INSTALL_PROGRAM} ${WRKSRC}/rinetd ${DESTDIR}${PREFIX}/sbin/.
+	${INSTALL_MAN} ${WRKSRC}/rinetd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/.
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rootprobe/Makefile b/net/rootprobe/Makefile
index a3661e55e2e..4ea066494e3 100644
--- a/net/rootprobe/Makefile
+++ b/net/rootprobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2010/02/11 22:39:23 joerg Exp $
 #
 
 DISTNAME=	rootprobe-20030115
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mawi.wide.ad.jp/mawi/dnsprobe/
 COMMENT=	Root DNS server performance analysis
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NOT_FOR_PLATFORM=	Interix-*-* # no <net/if.h> support
 
 WRKSRC=		${WRKDIR}/rootprobe
@@ -17,7 +19,7 @@ WRKSRC=		${WRKDIR}/rootprobe
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rootprobe ${PREFIX}/bin
-	(cd ${PREFIX}/bin; ${LN} rootprobe cctldprobe)
+	${INSTALL_PROGRAM} ${WRKSRC}/rootprobe ${DESTDIR}${PREFIX}/bin
+	(cd ${DESTDIR}${PREFIX}/bin; ${LN} rootprobe cctldprobe)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/scamper/Makefile b/net/scamper/Makefile
index e2f79d265ed..bcfeea6f05b 100644
--- a/net/scamper/Makefile
+++ b/net/scamper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/07/08 12:35:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/02/11 22:41:44 joerg Exp $
 #
 
 DISTNAME=	scamper-cvs-20060331
@@ -10,12 +10,14 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.wand.net.nz/scamper/
 COMMENT=	Dual-stack traceroute software
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 INSTALLATION_DIRS=bin
 
 MAKE_FLAGS+=	WITH_DEBUG=yes	# recommended by the the software developer
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/scamper ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/scamper ${DESTDIR}${PREFIX}/bin
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.scamper
 PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
diff --git a/net/sdig/Makefile b/net/sdig/Makefile
index 3dd6a1669fd..73363746cc9 100644
--- a/net/sdig/Makefile
+++ b/net/sdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2008/06/23 03:53:57 dholland Exp $
+# $NetBSD: Makefile,v 1.16 2010/02/11 22:43:35 joerg Exp $
 
 DISTNAME=	sdig-0.30
 PKGREVISION=	1
@@ -10,20 +10,22 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.exploits.org/sdig/
 COMMENT=	Switch Digger finds port assignment for hosts on a switched Ethernet
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 SUBST_CLASSES+=		sdig
 SUBST_STAGE.sdig=	post-build
 SUBST_MESSAGE.sdig=	Inserting the correct prefix directory.
 SUBST_FILES.sdig=	sdig.conf
 SUBST_SED.sdig=		-e 's,\$${PREFIX},${PREFIX},g'
 
-INSTALLATION_DIRS+=	${PKGMANDIR}/man8 ${PKGMANDIR}/man5 share/doc \
+INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man8 ${PKGMANDIR}/man5 share/doc \
 			share/examples share/misc
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/sdig.conf ${PREFIX}/share/examples/
-	${INSTALL_DATA} ${WRKDIR}/mactable ${PREFIX}/share/misc/
-	${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/${PKGMANDIR}/man5/
+	${INSTALL_DATA} ${WRKSRC}/sdig.conf ${DESTDIR}${PREFIX}/share/examples/
+	${INSTALL_DATA} ${WRKDIR}/mactable ${DESTDIR}${PREFIX}/share/misc/
+	${INSTALL_DATA} ${WRKSRC}/sdig.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/
 
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sdig/distinfo b/net/sdig/distinfo
index 8030a361c92..cd6ec2c9a6f 100644
--- a/net/sdig/distinfo
+++ b/net/sdig/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:14:03 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/02/11 22:43:35 joerg Exp $
 
 SHA1 (sdig-0.30.tar.gz) = 5af0f6adbadee33b91a45cffcfd13587ad5fa3a0
 RMD160 (sdig-0.30.tar.gz) = ec8c433352170aefaf8b74152df7da850349943a
@@ -6,6 +6,6 @@ Size (sdig-0.30.tar.gz) = 25301 bytes
 SHA1 (mactable.gz) = afe9c24c45c5472c9e78d2a8d72fcdc18d43563d
 RMD160 (mactable.gz) = 1222c7b06a441c5ab4755c4525a55ca0a84442e3
 Size (mactable.gz) = 36490 bytes
-SHA1 (patch-aa) = 88e2c8be232c2666eed66400b31bef59ff4eb8b2
+SHA1 (patch-aa) = f70967610ce3aadc5e67d82cbf8d0d5325cf9c8c
 SHA1 (patch-ab) = 3b2d671d7d0ca66f8afe5c55bf075c6b62a9c95a
 SHA1 (patch-ac) = 0e5304f2d774ae8932ba5694b511410d52314f85
diff --git a/net/sdig/patches/patch-aa b/net/sdig/patches/patch-aa
index ab8af608807..6a6ab76031d 100644
--- a/net/sdig/patches/patch-aa
+++ b/net/sdig/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/04/07 15:01:22 bouyer Exp $
+$NetBSD: patch-aa,v 1.3 2010/02/11 22:43:35 joerg Exp $
 
 --- Makefile.orig	Tue Jul 23 04:56:11 2002
 +++ Makefile	Wed Apr  2 18:58:25 2003
@@ -43,6 +43,6 @@ $NetBSD: patch-aa,v 1.2 2003/04/07 15:01:22 bouyer Exp $
 -	else \
 -		cp sdig.conf /etc; \
 -	fi
-+	${BSD_INSTALL_PROGRAM} sdig ${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} nbname ${PREFIX}/bin
-+	${BSD_INSTALL_DATA} README ${PREFIX}/share/doc/sdig.README
++	${BSD_INSTALL_PROGRAM} sdig ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} nbname ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_DATA} README ${DESTDIR}${PREFIX}/share/doc/sdig.README