DESTDIR support.

4 files changed, 25 insertions, 20 deletions

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