DESTDIR support

6 files changed, 33 insertions, 26 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"