DESTDIR support.

15 files changed, 120 insertions, 78 deletions

diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 0d7a3c4155c..512a0f515b9 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/11/03 07:53:55 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2006/11/03 19:14:25 joerg Exp $
 
 DISTNAME=	unzip552
 PKGNAME=	unzip-5.52
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.info-zip.org/pub/infozip/UnZip.html
 COMMENT=	List, test and extract compressed files in a ZIP archive
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 DIST_SUBDIR=	${PKGNAME_NOREV}	# Remove on next update.
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
@@ -32,16 +33,16 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc
 TEST_TARGET=	check
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${PREFIX}/bin
-	${LN} -sf unzip ${PREFIX}/bin/zipinfo
-	cd ${WRKSRC}/unix && ${INSTALL_SCRIPT} zipgrep ${PREFIX}/bin
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} unzip funzip unzipsfx ${DESTDIR}${PREFIX}/bin
+	${LN} -sf unzip ${DESTDIR}${PREFIX}/bin/zipinfo
+	cd ${WRKSRC}/unix && ${INSTALL_SCRIPT} zipgrep ${DESTDIR}${PREFIX}/bin
 	cd ${WRKSRC}/man && ${INSTALL_MAN} funzip.1 unzip.1 unzipsfx.1 \
-		zipgrep.1 zipinfo.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unzip
+		zipgrep.1 zipinfo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/unzip
 	cd ${WRKSRC} && ${INSTALL_DATA} BUGS LICENSE README WHERE \
-		${PREFIX}/share/doc/unzip
+		${DESTDIR}${PREFIX}/share/doc/unzip
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING.OLD \
-		${PREFIX}/share/doc/unzip/COPYING
+		${DESTDIR}${PREFIX}/share/doc/unzip/COPYING
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index c361cdccd56..c2b820e3abf 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/02/05 23:08:41 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2006/11/03 19:22:55 joerg Exp $
 #
 
 DISTNAME=	cvsync-0.24.19
@@ -11,9 +11,10 @@ HOMEPAGE=	http://www.cvsync.org/
 COMMENT=	Portable incremental cvs repository syncer
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/cvsync
 
 MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} BINMODE=${BINMODE:Q}
 MAKE_ENV+=	MANMODE=${MANMODE:Q}
@@ -55,11 +56,10 @@ MAKE_ENV+=	HASH_TYPE="openssl"
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-FreeBSD.conf ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-NetBSD.conf ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-OpenBSD.conf ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/cvsync.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-FreeBSD.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-NetBSD.conf ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/cvsyncd-OpenBSD.conf ${DESTDIR}${EGDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/cvsync/distinfo b/devel/cvsync/distinfo
index 0f22b06bd4f..67f6bbe6efb 100644
--- a/devel/cvsync/distinfo
+++ b/devel/cvsync/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.64 2005/10/20 17:37:04 wiz Exp $
+$NetBSD: distinfo,v 1.65 2006/11/03 19:22:55 joerg Exp $
 
 SHA1 (cvsync-0.24.19.tar.gz) = a3c0673bf0f3b81b1eb45ac828a527d2a4e6d2f6
 RMD160 (cvsync-0.24.19.tar.gz) = f98530cfa25d75647af7a4baed7e6184f01207ec
 Size (cvsync-0.24.19.tar.gz) = 139695 bytes
+SHA1 (patch-aa) = 6848abba52d055737f13a36fefa2edc67578049e
+SHA1 (patch-ab) = 290332d24c0abf4113d25058275e180a267700aa
diff --git a/devel/cvsync/patches/patch-aa b/devel/cvsync/patches/patch-aa
new file mode 100644
index 00000000000..8448549b916
--- /dev/null
+++ b/devel/cvsync/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2006/11/03 19:22:55 joerg Exp $
+
+--- mk/prog.mk.orig	2006-11-03 15:53:01.000000000 +0000
++++ mk/prog.mk
+@@ -65,8 +65,8 @@ distclean: clean
+ 	$(RM) .depend ../mk/defaults.mk *.core *.d *.stackdump
+ 
+ install: all
+-	${INSTALL} ${INSTALL_BIN_OPTS} ${PROG} ${BINDIR}/${PROG}
+-	${INSTALL} ${INSTALL_MAN_OPTS} ${MAN} ${MANDIR}/man1/${MAN}
++	${INSTALL} ${INSTALL_BIN_OPTS} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
++	${INSTALL} ${INSTALL_MAN_OPTS} ${MAN} ${DESTDIR}${MANDIR}/man1/${MAN}
+ 
+ uninstall:
+ 	$(RM) ${BINDIR}/${PROG} ${MANDIR}/man1/${MAN}
diff --git a/devel/cvsync/patches/patch-ab b/devel/cvsync/patches/patch-ab
new file mode 100644
index 00000000000..c2af71b1ac5
--- /dev/null
+++ b/devel/cvsync/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2006/11/03 19:22:55 joerg Exp $
+
+--- mk/base.mk.orig	2006-11-03 15:57:04.000000000 +0000
++++ mk/base.mk
+@@ -92,7 +92,7 @@ endif # SunOS
+ 
+ PREFIX ?= /usr/local
+ BINDIR ?= ${PREFIX}/bin
+-MANDIR ?= ${PREFIX}/man
++MANDIR ?= ${PREFIX}/${PKGMANDIR}
+ 
+ BINOWN ?= root
+ BINGRP ?= wheel
diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile
index 562aa759900..01c9edf492b 100644
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/04 20:23:46 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2006/11/03 19:22:55 joerg Exp $
 
 DISTNAME=	pcre-6.7
 CATEGORIES=	devel
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.pcre.org/
 COMMENT=	Perl Compatible Regular Expressions library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index 1ea7be7da38..5a94649e4e7 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:39 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/11/03 19:18:38 joerg Exp $
 
 DISTNAME=		ghostscript-fonts-8.11
 CATEGORIES=		fonts
@@ -10,6 +10,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gs-fonts.sourceforge.net/
 COMMENT=		Postscript fonts for Aladdin Ghostscript
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 #  Note: the following two are special files.  In the 5.50 directory
 #  on the FTP site, there are symlinks:
 #	ghostscript-fonts-other-5.50.tar.gz ->
@@ -30,19 +32,18 @@ NO_BUILD=		YES
 WRKSRC=			${WRKDIR}/fonts
 
 FONTS_DIR=		${PREFIX}/share/ghostscript/fonts
+INSTALLATION_DIRS=	share/ghostscript/fonts
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
-	${INSTALL_DATA_DIR} ${FONTS_DIR}
 	for ext in afm gsf pfa pfb pfm;				\
 	do							\
 		for f in ${WRKSRC}/*.$${ext};			\
 		do						\
-			${INSTALL_DATA} $${f} ${FONTS_DIR};	\
+			${INSTALL_DATA} $${f} ${DESTDIR}${FONTS_DIR};	\
 		done;						\
 	done
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${FONTS_DIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${DESTDIR}${FONTS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${DESTDIR}${FONTS_DIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${DESTDIR}${FONTS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 948a935bf24..0882f1ca51e 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/09 22:11:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/11/03 19:23:55 joerg Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -12,6 +12,8 @@ HOMEPAGE=	http://www.courier-mta.org/
 
 CONFLICTS=	courier-maildirmake-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES=		c c++
 
@@ -70,37 +72,37 @@ post-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/deliverquota		\
-		${PREFIX}/bin/deliverquota
+		${DESTDIR}${PREFIX}/bin/deliverquota
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildiracl			\
-		${PREFIX}/bin/courier-maildiracl
+		${DESTDIR}${PREFIX}/bin/courier-maildiracl
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirkw			\
-		${PREFIX}/bin/courier-maildirkw
+		${DESTDIR}${PREFIX}/bin/courier-maildirkw
 	${INSTALL_PROGRAM} ${WRKSRC}/maildir/maildirmake		\
-		${PREFIX}/bin/courier-maildirmake
+		${DESTDIR}${PREFIX}/bin/courier-maildirmake
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildiracl.1			\
-		${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildiracl.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirkw.1			\
-		${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirkw.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirmake.1			\
-		${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/courier-maildirmake.1
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildir.5			\
-		${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/courier-maildir.5
 	${INSTALL_MAN} ${WRKSRC}/maildir/maildirquota.7			\
-		${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/maildirquota.7
 	${INSTALL_MAN} ${WRKSRC}/maildir/deliverquota.8			\
-		${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/deliverquota.8
 	${INSTALL_DATA} ${WRKSRC}/maildir/quotawarnmsg			\
-		${EGDIR}/quotawarnmsg
+		${DESTDIR}${EGDIR}/quotawarnmsg
 	${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexinstall		\
-		${PREFIX}/sbin/sharedindexinstall
+		${DESTDIR}${PREFIX}/sbin/sharedindexinstall
 	${INSTALL_SCRIPT} ${WRKSRC}/maildir/sharedindexsplit		\
-		${PREFIX}/sbin/sharedindexsplit
+		${DESTDIR}${PREFIX}/sbin/sharedindexsplit
 	${INSTALL_SCRIPT} ${WRKDIR}/sharedindexupdate.sh		\
-		${EGDIR}/sharedindexupdate
+		${DESTDIR}${EGDIR}/sharedindexupdate
 	grep "^${DOCDIR:S/${PREFIX}\///}" ${PKGDIR}/PLIST |		\
 	while read file; do						\
 		src=${WRKSRC:Q}/maildir/`basename $$file`;		\
-		dst=${PREFIX:Q}"/$$file";				\
+		dst=${DESTDIR}${PREFIX:Q}"/$$file";			\
 		${INSTALL_DATA} "$$src" "$$dst";			\
 	done
 
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 1aa66c46413..7bdde5e7613 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/08/28 13:56:22 dsainty Exp $
+# $NetBSD: Makefile,v 1.9 2006/11/03 19:15:45 joerg Exp $
 
 DISTNAME=	cdrtools-2.01
 PKGREVISION=	4
@@ -13,6 +13,7 @@ COMMENT=	Software for creating ISO9660 images and writing CDs/CD-RWs
 CONFLICTS=	mkisofs-[0-9]* cdrtools-ossdvd-[0-9]* cdrecord-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -74,22 +75,22 @@ post-build:
 
 do-install:
 	cd ${WRKSRC}/cdda2wav;						\
-		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdda2wav.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/cdda2wav ${DESTDIR}${PREFIX}/bin;	\
+		${INSTALL_MAN} cdda2wav.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	cd ${WRKSRC}/cdrecord;						\
-		${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin;	\
-		${INSTALL_MAN} cdrecord.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/cdrecord ${DESTDIR}${PREFIX}/bin;	\
+		${INSTALL_MAN} cdrecord.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	cd ${WRKSRC}/mkisofs;						\
-		${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;		\
-		${INSTALL_MAN} mkisofs.8 ${PREFIX}/${PKGMANDIR}/man8
+		${INSTALL_PROGRAM} OBJ/*/mkisofs ${DESTDIR}${PREFIX}/bin;		\
+		${INSTALL_MAN} mkisofs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	cd ${WRKSRC}/mkisofs/diag;					\
 		for f in devdump isodump isoinfo isovfy; do		\
-			${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin;	\
-			${INSTALL_MAN} isoinfo.8 ${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
+			${INSTALL_PROGRAM} OBJ/*/$$f ${DESTDIR}${PREFIX}/bin;	\
+			${INSTALL_MAN} isoinfo.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
 		done
 	cd ${WRKSRC}/readcd;						\
-		${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;		\
-		${INSTALL_MAN} readcd.1 ${PREFIX}/${PKGMANDIR}/man1
+		${INSTALL_PROGRAM} OBJ/*/readcd ${DESTDIR}${PREFIX}/bin;		\
+		${INSTALL_MAN} readcd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index d4b3e9c9478..40a4e34e92e 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/09/20 07:19:59 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2006/11/03 19:15:45 joerg Exp $
 
 DISTNAME=	estd-r5
 PKGNAME=	estd-0.5
@@ -10,6 +10,10 @@ MAINTAINER=	dillo@NetBSD.org
 HOMEPAGE=	http://www.elektro-eel.org/
 COMMENT=	Dynamically sets the CPU-frequency on SpeedStep-enabled CPUs
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+INSTALLATION_DIRS=	share/examples/rc.d
+
 ONLY_FOR_PLATFORM=	NetBSD-2.99.*-i386 NetBSD-[3-9]*-i386 DragonFly-*-i386 \
 			NetBSD-[4-9]*-x86_64
 
diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo
index f7682795700..406718a7d36 100644
--- a/sysutils/estd/distinfo
+++ b/sysutils/estd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2006/09/20 07:19:59 rillig Exp $
+$NetBSD: distinfo,v 1.9 2006/11/03 19:15:45 joerg Exp $
 
 SHA1 (estd-r5.tar.gz) = c73037df5ccc038f96924f9cf5c0f2c6692b6307
 RMD160 (estd-r5.tar.gz) = 657fda2908a44edbc9ac0d8714ac13462ce7bc0c
 Size (estd-r5.tar.gz) = 7035 bytes
-SHA1 (patch-aa) = 144199974f5263d995865fd722db74102ce8073b
+SHA1 (patch-aa) = 4f3aead7002525188ea8de263ed967b969905df6
 SHA1 (patch-ab) = e552aafdcfe0d2eeefb77ec1bd9e7d702a1e6711
diff --git a/sysutils/estd/patches/patch-aa b/sysutils/estd/patches/patch-aa
index 45cdc6176d6..6618096fbfa 100644
--- a/sysutils/estd/patches/patch-aa
+++ b/sysutils/estd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2006/09/20 07:19:59 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2006/11/03 19:15:45 joerg Exp $
 
 --- Makefile.orig	2006-07-02 11:29:29.000000000 +0200
 +++ Makefile	2006-09-20 09:15:01.000000000 +0200
@@ -10,8 +10,8 @@ $NetBSD: patch-aa,v 1.5 2006/09/20 07:19:59 rillig Exp $
 -	install -s -o root -g wheel -m 0755 estd /usr/local/sbin/estd
 -	install -d -o root -g wheel -m 0755 /usr/local/man/man1
 -	install -o root -g wheel -m 0644 estd.1 /usr/local/man/man1/estd.1
-+	${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/sbin
-+	${BSD_INSTALL_PROGRAM} estd ${PREFIX}/sbin/estd
-+	${BSD_INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
-+	${BSD_INSTALL_MAN} estd.1 ${PREFIX}/${PKGMANDIR}/man1/estd.1
-+	${BSD_INSTALL_SCRIPT} estd.sh ${PREFIX}/share/examples/rc.d/estd
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin
++	${BSD_INSTALL_PROGRAM} estd ${DESTDIR}${PREFIX}/sbin/estd
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_MAN} estd.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/estd.1
++	${BSD_INSTALL_SCRIPT} estd.sh ${DESTDIR}${PREFIX}/share/examples/rc.d/estd
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index af19fb666b8..01f35b898ab 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/06 15:13:55 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/11/03 19:17:39 joerg Exp $
 #
 
 DISTNAME=	docbook-xml-4.4
@@ -14,6 +14,7 @@ HOMEPAGE=	http://www.oasis-open.org/docbook/
 COMMENT=	XML DTD designed for computer documentation
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
@@ -47,16 +48,16 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/xml\/docbook$$/ \
 
 pre-install:
 .for ver in ${VER}
-	@[ -d ${DTDDIR}/${ver} ] || ${INSTALL_DATA_DIR} ${DTDDIR}/${ver}
+	${INSTALL_DATA_DIR} ${DESTDIR}${DTDDIR}/${ver}
 .endfor
 
 do-install:
 .for ver in ${VER}
-	@(cd ${DTDDIR}/${ver}; ${UNZIP_CMD} ${DISTDIR}/docbook-xml-${ver}.zip)
-	@(cd ${DTDDIR}/${ver}; ${MV} catalog.xml catalog)
+	cd ${DESTDIR}${DTDDIR}/${ver} && ${UNZIP_CMD} ${DISTDIR}/docbook-xml-${ver}.zip
+	cd ${DESTDIR}${DTDDIR}/${ver} && ${MV} catalog.xml catalog
 .endfor
-	@${SED} -e 's|V4.2|V4.1.2|g' <${DTDDIR}/4.2/catalog \
-	    >${DTDDIR}/4.2/catalog-4.1.2
+	${SED} -e 's|V4.2|V4.1.2|g' <${DESTDIR}${DTDDIR}/4.2/catalog \
+	    >${DESTDIR}${DTDDIR}/4.2/catalog-4.1.2
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 3dc2d7005d0..b3985aeefc7 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/10/22 12:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/11/03 19:17:39 joerg Exp $
 #
 
 DISTNAME=	docbook-xsl-1.71.1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://docbook.sourceforge.net/
 COMMENT=	Docbook XSL modular stylesheet
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	docbook-xml>=4.2:../../textproc/docbook-xml
 
 USE_LANGUAGES=	# empty
@@ -25,19 +27,17 @@ XSLMODS=	common extensions fo highlighting html htmlhelp images javahelp \
 
 XML_CATALOGS=	${XSLDIR}/catalog.xml
 
+INSTALLATION_DIRS=	${EGDIR} ${XSLDIR}
+
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${EGDIR}
-	${INSTALL_DATA_DIR} ${XSLDIR}
-	${INSTALL_DATA} ${WRKSRC}/VERSION ${XSLDIR}
-	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${XSLDIR}/catalog.xml
+	cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/VERSION ${DESTDIR}${XSLDIR}
+	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DESTDIR}${XSLDIR}/catalog.xml
 	for d in ${XSLMODS}; do \
-	    ${ECHO} "${INSTALL_DATA_DIR} ${XSLDIR}/$$d"; \
-	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/"; \
-	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/; \
+	    ${ECHO} "${INSTALL_DATA_DIR} ${DESTDIR}${XSLDIR}/$$d"; \
+	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/"; \
+	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${DESTDIR}${XSLDIR}/; \
 	done
-	${RM} -f ${XSLDIR}/common/ko.xml.orig
-	${RM} -f ${XSLDIR}/common/pi.xsl.orig
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/neon/Makefile b/www/neon/Makefile
index f80e021ec8d..d532edbfdbf 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/02/05 23:11:26 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2006/11/03 19:16:41 joerg Exp $
 
 DISTNAME=		neon-0.25.5
 PKGREVISION=		2
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.webdav.org/neon/
 COMMENT=		HTTP and WebDAV client library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config