user-destdir support

10 files changed, 57 insertions, 26 deletions

diff --git a/www/lhs/Makefile b/www/lhs/Makefile
index 12e68585058..509168ef315 100644
--- a/www/lhs/Makefile
+++ b/www/lhs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/01/18 05:09:50 tnn Exp $
+# $NetBSD: Makefile,v 1.13 2009/07/07 19:06:56 joerg Exp $
 #
 
 DISTNAME=	lhs-0.1
@@ -10,6 +10,8 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://dev.null.pl/
 COMMENT=	Lightweight HTTP Server, IPv6-aware and SSL-enabled
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/lhs
 GNU_CONFIGURE=	yes
 
@@ -21,7 +23,7 @@ MAKE_ENV+=	DEFAULT_ROOT_DIR=${PREFIX}/share/httpd/htdocs
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lhs ${PREFIX}/sbin/lhs
+	${INSTALL_PROGRAM} ${WRKSRC}/lhs ${DESTDIR}${PREFIX}/sbin/lhs
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 8bcbaf9b4b5..6f20ab48110 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2009/06/30 00:07:24 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/07/07 19:06:34 joerg Exp $
 #
 
 DISTNAME=	mMosaic-3.7.2
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://perso.enst.fr/~dauphin/mMosaic/
 COMMENT=	Modern derivative of NCSA XMosaic
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/mMosaic-src-3.7.2
@@ -17,7 +19,7 @@ WRKSRC=		${WRKDIR}/mMosaic-src-3.7.2
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${DESTDIR}${PREFIX}/bin/
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/www/make_album/Makefile b/www/make_album/Makefile
index 236c8c73018..e756165457d 100644
--- a/www/make_album/Makefile
+++ b/www/make_album/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/22 07:32:24 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2009/07/07 19:06:13 joerg Exp $
 #
 
 DISTNAME=	make_album_1_6
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.burren.cx/david/make_album.html
 COMMENT=	Generate HTML albums of images
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 MY_SCRIPTS=	index_albums ingest make_album newimagedir populate_master
@@ -22,16 +24,15 @@ REPLACE_PERL=	${MY_SCRIPTS}
 # in pre-configure stage
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin lib
+INSTALLATION_DIRS=	bin lib share/doc/make_album
 
 do-install:
 	for f in ${MY_SCRIPTS}; do \
-		${INSTALL_SCRIPT} ${WRKSRC}/$$f ${PREFIX}/bin; \
+		${INSTALL_SCRIPT} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/bin; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/cameras.txt ${PREFIX}/lib
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/make_album
+	${INSTALL_DATA} ${WRKSRC}/cameras.txt ${DESTDIR}${PREFIX}/lib
 	for f in CHANGES README TODO; do \
-		${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/make_album; \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/make_album; \
 	done
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index e35f4758cca..d3965ecdd10 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/03/23 21:38:02 reed Exp $
+# $NetBSD: Makefile,v 1.8 2009/07/07 19:06:08 joerg Exp $
 
 DISTNAME=	micro_httpd_12dec2005
 PKGNAME=	micro_httpd-20051212
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.acme.com/software/micro_httpd/
 COMMENT=	Really small HTTP server than runs from inetd(8)
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/micro_httpd
 NO_CONFIGURE=		yes
@@ -17,7 +18,7 @@ NO_CONFIGURE=		yes
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/micro_httpd ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_PROGRAM} ${WRKSRC}/micro_httpd ${DESTDIR}${PREFIX}/sbin/
+	${INSTALL_MAN} ${WRKSRC}/micro_httpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index 03690bdc6b6..3856a0a2ce4 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/01/18 05:09:52 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2009/07/07 19:05:23 joerg Exp $
 
 DISTNAME=	mini_httpd-1.19
 PKGREVISION=	5
@@ -9,6 +9,8 @@ MAINTAINER=	reed@reedmedia.net
 HOMEPAGE=	http://www.acme.com/software/mini_httpd/
 COMMENT=	Small, forking webserver with IPv6 and SSL support
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_FEATURES=	snprintf
diff --git a/www/mini_httpd/distinfo b/www/mini_httpd/distinfo
index 4aa77d35504..087e965224c 100644
--- a/www/mini_httpd/distinfo
+++ b/www/mini_httpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2007/09/09 02:12:49 jlam Exp $
+$NetBSD: distinfo,v 1.7 2009/07/07 19:05:23 joerg Exp $
 
 SHA1 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = b156a5e0b9b6e2169ed772a5890fc63d8ed60514
 RMD160 (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 4e8ec41bd9238d49481354bcf9404fb11519a667
 Size (mini_httpd-1.19/mini_httpd-1.19.tar.gz) = 42063 bytes
-SHA1 (patch-aa) = f5a32ecaaa64360349853e726bc4787b29a8ceab
+SHA1 (patch-aa) = 1bf0a30eae6303e7692f768227daf1751c73c389
 SHA1 (patch-ab) = bf74dd6f6a921024e0dde08eeff39fdf64706414
 SHA1 (patch-ac) = ccbd255aa5b3580426276e8f2fe211deea3feae5
diff --git a/www/mini_httpd/patches/patch-aa b/www/mini_httpd/patches/patch-aa
index b8d1683e7f0..a961510baff 100644
--- a/www/mini_httpd/patches/patch-aa
+++ b/www/mini_httpd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2007/09/09 02:12:49 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2009/07/07 19:05:23 joerg Exp $
 
 --- Makefile.orig	Fri Nov  1 23:02:57 2002
 +++ Makefile
@@ -47,13 +47,13 @@ $NetBSD: patch-aa,v 1.2 2007/09/09 02:12:49 jlam Exp $
 -	cp mini_httpd.8 ${MANDIR}/man8
 -	-mkdir -p ${MANDIR}/man1
 -	cp htpasswd.1 ${MANDIR}/man1
-+	${BSD_INSTALL_PROGRAM_DIR} ${BINDIR}
-+	${BSD_INSTALL_PROGRAM} mini_httpd ${BINDIR}/mini_httpd
-+	${BSD_INSTALL_PROGRAM} htpasswd ${BINDIR}/mhtpasswd
-+	${BSD_INSTALL_MAN_DIR} ${MANDIR}/man8
-+	${BSD_INSTALL_MAN} mini_httpd.8 ${MANDIR}/man8/mini_httpd.8
-+	${BSD_INSTALL_MAN_DIR} ${MANDIR}/man1
-+	${BSD_INSTALL_MAN} htpasswd.1 ${MANDIR}/man1/mhtpasswd.1
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${BINDIR}
++	${BSD_INSTALL_PROGRAM} mini_httpd ${DESTDIR}${BINDIR}/mini_httpd
++	${BSD_INSTALL_PROGRAM} htpasswd ${DESTDIR}${BINDIR}/mhtpasswd
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man8
++	${BSD_INSTALL_MAN} mini_httpd.8 ${DESTDIR}${MANDIR}/man8/mini_httpd.8
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANDIR}/man1
++	${BSD_INSTALL_MAN} htpasswd.1 ${DESTDIR}${MANDIR}/man1/mhtpasswd.1
  
  clean:
  	rm -f mini_httpd mime_encodings.h mime_types.h htpasswd mini_httpd.rnd *.o core core.* *.core
diff --git a/www/pound/Makefile b/www/pound/Makefile
index 0159274ea1e..a0238c83c18 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/01/18 05:09:53 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2009/07/07 19:05:20 joerg Exp $
 
 DISTNAME=	Pound-2.3.2
 PKGNAME=	${DISTNAME:S/Pound/pound/}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.apsis.ch/pound/
 COMMENT=	Reverse proxy, load balancer and HTTPS front-end
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 USE_FEATURES.openssl=	threads
diff --git a/www/pound/distinfo b/www/pound/distinfo
index eacf7f6af0c..401ba81263b 100644
--- a/www/pound/distinfo
+++ b/www/pound/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/09/07 19:08:09 jlam Exp $
+$NetBSD: distinfo,v 1.2 2009/07/07 19:05:20 joerg Exp $
 
 SHA1 (Pound-2.3.2.tgz) = 93f248e7c5448c8b26905420e2f5d5fdafd33a51
 RMD160 (Pound-2.3.2.tgz) = b04401f7ec9857defae5f1198ab9247bf26db0b7
 Size (Pound-2.3.2.tgz) = 154678 bytes
+SHA1 (patch-aa) = 2a9bb11a4fe4808393f197c8803895853ab582f1
diff --git a/www/pound/patches/patch-aa b/www/pound/patches/patch-aa
new file mode 100644
index 00000000000..7d1ff54ab1a
--- /dev/null
+++ b/www/pound/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.1 2009/07/07 19:05:20 joerg Exp $
+
+--- Makefile.in.orig	2009-07-07 21:01:57.000000000 +0200
++++ Makefile.in
+@@ -57,11 +57,11 @@ $(OBJS):	pound.h
+ 
+ install:	all
+ 		@INSTALL@ -d ${DESTDIR}@sbindir@
+-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 pound ${DESTDIR}@sbindir@/pound
+-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 poundctl ${DESTDIR}@sbindir@/poundctl
++		${BSD_INSTALL_PROGRAM} pound ${DESTDIR}@sbindir@/pound
++		${BSD_INSTALL_PROGRAM} poundctl ${DESTDIR}@sbindir@/poundctl
+ 		@INSTALL@ -d ${DESTDIR}@mandir@/man8
+-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8
+-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
++		${BSD_INSTALL_DATA} pound.8 ${DESTDIR}@mandir@/man8/pound.8
++		${BSD_INSTALL_DATA} poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
+ 
+ clean:
+ 		rm -f pound $(OBJS) poundctl poundctl.o