DESTDIR support.

6 files changed, 94 insertions, 8 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 168f637eccc..c040aa42cb4 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2009/10/18 19:34:54 zafer Exp $
+# $NetBSD: Makefile,v 1.60 2010/03/15 17:31:57 schmonz Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=	9
@@ -14,6 +14,7 @@ LICENSE=		public-domain
 MANPAGES=		${DISTNAME}-man-20031023.tar.gz
 SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 # We change conf-home from the default "/usr/local" and don't
@@ -31,8 +32,9 @@ PLIST_SRC=		${PKGDIR}/PLIST
 INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns
 
 post-install:
-	cd ${WRKDIR}/*-man; for i in 1 5 8; do		 		\
-	for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \
+	cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do		 	\
+		for j in *.$$i; do ${INSTALL_MAN} $$j			\
+			${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done	\
 	done
 
 .include "../../mk/djbware.mk"
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index eadd2a84cc9..cea24681c0e 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/04/22 04:48:13 schmonz Exp $
+$NetBSD: distinfo,v 1.18 2010/03/15 17:31:57 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -24,3 +24,4 @@ Size (0002-dnscache-cache-soa-records.patch) = 2944 bytes
 SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa
 SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1
 SHA1 (patch-ac) = 1d5ab2c90a2c4221bc7ec08d116d3d23799bd5d6
+SHA1 (patch-ad) = 4f3543ff6c2778001c81197c797303929501f66c
diff --git a/net/djbdns/patches/patch-ad b/net/djbdns/patches/patch-ad
new file mode 100644
index 00000000000..b26c8a1b314
--- /dev/null
+++ b/net/djbdns/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.3 2010/03/15 17:31:57 schmonz Exp $
+
+--- Makefile.orig	2001-02-11 21:11:45.000000000 +0000
++++ Makefile
+@@ -29,6 +29,14 @@ auto-str.o: \
+ compile auto-str.c buffer.h exit.h
+ 	./compile auto-str.c
+ 
++auto_destdir.c: \
++auto-str conf-destdir
++	./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++	./compile auto_destdir.c
++
+ auto_home.c: \
+ auto-str conf-home
+ 	./auto-str auto_home `head -1 conf-home` > auto_home.c
+@@ -519,16 +527,16 @@ compile hier.c auto_home.h
+ 	./compile hier.c
+ 
+ install: \
+-load install.o hier.o auto_home.o buffer.a unix.a byte.a
+-	./load install hier.o auto_home.o buffer.a unix.a byte.a 
++load install.o hier.o auto_destdir.o buffer.a unix.a byte.a
++	./load install hier.o auto_destdir.o buffer.a unix.a byte.a 
+ 
+ install.o: \
+ compile install.c buffer.h strerr.h error.h open.h exit.h
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o buffer.a unix.a byte.a
+-	./load instcheck hier.o auto_home.o buffer.a unix.a byte.a 
++load instcheck.o hier.o auto_destdir.o buffer.a unix.a byte.a
++	./load instcheck hier.o auto_destdir.o buffer.a unix.a byte.a 
+ 
+ instcheck.o: \
+ compile instcheck.c strerr.h error.h exit.h
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 427315be356..e2e47c30877 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2009/05/19 09:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/03/15 17:32:17 schmonz Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		2
@@ -16,13 +16,15 @@ SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 
 DJB_RESTRICTED=		no
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1
 
 post-install:
-	cd ${WRKDIR}/*-man; for i in 1; do		 		\
-	for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \
+	cd ${WRKDIR}/${PKGNAME_NOREV}-man; for i in 1; do	 	\
+		for j in *.$$i; do ${INSTALL_MAN} $$j			\
+			${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done	\
 	done
 
 .include "../../mk/djbware.mk"
diff --git a/net/ucspi-tcp/distinfo b/net/ucspi-tcp/distinfo
index ba19edcd6ab..58e5d9598e3 100644
--- a/net/ucspi-tcp/distinfo
+++ b/net/ucspi-tcp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/02/02 13:00:36 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2010/03/15 17:32:17 schmonz Exp $
 
 SHA1 (rblsmtpd-nodefaultrbl.patch) = 5d6048b5928257c13ff5cbcddb40ed0eee9997c0
 RMD160 (rblsmtpd-nodefaultrbl.patch) = fa93dd4522ccc77c5b43d0a79f741ae2ab54f075
@@ -9,3 +9,4 @@ Size (ucspi-tcp-0.88-man-20020317.tar.gz) = 7562 bytes
 SHA1 (ucspi-tcp-0.88.tar.gz) = 793b4189795b563085602c030dd8aa0d206ddc0e
 RMD160 (ucspi-tcp-0.88.tar.gz) = eb20085ea6ffd5d137a805f7c8768e0312c1f56a
 Size (ucspi-tcp-0.88.tar.gz) = 53019 bytes
+SHA1 (patch-aa) = ce7aae99fcfa9d11a0050610153c802ac487cda2
diff --git a/net/ucspi-tcp/patches/patch-aa b/net/ucspi-tcp/patches/patch-aa
new file mode 100644
index 00000000000..93bf021d86c
--- /dev/null
+++ b/net/ucspi-tcp/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2010/03/15 17:32:17 schmonz Exp $
+
+--- Makefile.orig	2000-03-18 15:18:42.000000000 +0000
++++ Makefile
+@@ -36,6 +36,14 @@ auto-str.o: \
+ compile auto-str.c buffer.h readwrite.h exit.h
+ 	./compile auto-str.c
+ 
++auto_destdir.c: \
++auto-str conf-destdir
++	./auto-str auto_home `head -1 conf-destdir` > auto_destdir.c
++
++auto_destdir.o: \
++compile auto_destdir.c
++	./compile auto_destdir.c
++
+ auto_home.c: \
+ auto-str conf-home
+ 	./auto-str auto_home `head -1 conf-home` > auto_home.c
+@@ -347,16 +355,16 @@ warn-auto.sh http@.sh conf-home
+ 	chmod 755 http@
+ 
+ install: \
+-load install.o hier.o auto_home.o unix.a byte.a
+-	./load install hier.o auto_home.o unix.a byte.a 
++load install.o hier.o auto_destdir.o unix.a byte.a
++	./load install hier.o auto_destdir.o unix.a byte.a 
+ 
+ install.o: \
+ compile install.c buffer.h strerr.h error.h open.h readwrite.h exit.h
+ 	./compile install.c
+ 
+ instcheck: \
+-load instcheck.o hier.o auto_home.o unix.a byte.a
+-	./load instcheck hier.o auto_home.o unix.a byte.a 
++load instcheck.o hier.o auto_destdir.o unix.a byte.a
++	./load instcheck hier.o auto_destdir.o unix.a byte.a 
+ 
+ instcheck.o: \
+ compile instcheck.c strerr.h error.h readwrite.h exit.h