From 3222446d842fc6000d59dc223f801a8762d7510f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 2 Mar 2008 03:48:36 +0000
Subject: Mechanical changes to add full DESTDIR support to packages that
 install their files via a custom do-install target.

---
 archivers/9e/Makefile          |  5 +++--
 archivers/afio/Makefile        |  8 +++++---
 archivers/arc/Makefile         |  9 +++++----
 archivers/archangel/Makefile   |  8 +++++---
 archivers/bicom/Makefile       |  9 +++++----
 archivers/bunzip/Makefile      |  5 +++--
 archivers/gzrecover/Makefile   |  7 ++++---
 archivers/ha/Makefile          |  5 +++--
 archivers/lha/Makefile         |  8 +++++---
 archivers/lzma/Makefile        | 12 +++++++-----
 archivers/macutil/Makefile     |  9 ++++++---
 archivers/makeself/Makefile    |  6 ++++--
 archivers/mousetar/Makefile    |  8 +++++---
 archivers/mscompress/Makefile  | 13 ++++++++-----
 archivers/nomarch/Makefile     |  8 +++++---
 archivers/p7zip/Makefile       | 36 +++++++++++++++++++++++-------------
 archivers/pbzip2/Makefile      | 16 +++++++++++-----
 archivers/ppmd/Makefile        | 10 ++++++----
 archivers/ppunpack/Makefile    |  5 +++--
 archivers/rox-archive/Makefile |  6 ++++--
 archivers/sarab/Makefile       | 11 +++++++----
 archivers/squsq/Makefile       |  6 ++++--
 archivers/unace/Makefile       | 10 ++++++----
 archivers/unalz/Makefile       |  5 +++--
 archivers/unarj/Makefile       | 14 +++++++++-----
 archivers/undms/Makefile       |  5 +++--
 archivers/unlzx/Makefile       |  5 +++--
 archivers/unzoo/Makefile       |  5 +++--
 archivers/upx/Makefile         | 14 +++++++++-----
 archivers/xbin/Makefile        |  9 ++++++---
 archivers/xmill/Makefile       |  7 ++++---
 archivers/zip1/Makefile        | 15 ++++++++++-----
 32 files changed, 187 insertions(+), 112 deletions(-)

(limited to 'archivers')

diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile
index dd2785103a1..7dd33409379 100644
--- a/archivers/9e/Makefile
+++ b/archivers/9e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:28:51 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	9e
 PKGNAME=	9e-1.0
@@ -10,12 +10,13 @@ HOMEPAGE=	http://www.eecs.harvard.edu/~wkj/Software/9e/
 COMMENT=	Explode Plan9 archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/9e ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/9e ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/afio/Makefile b/archivers/afio/Makefile
index f3e5b485372..4a407f285db 100644
--- a/archivers/afio/Makefile
+++ b/archivers/afio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/23 13:57:28 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	afio-2.5
 PKGREVISION=	1
@@ -11,6 +11,7 @@ HOMEPAGE=	http://freshmeat.net/projects/afio/
 COMMENT=	cpio-format archive creator with data corruption handling
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=	afio
 
@@ -23,7 +24,8 @@ MAKE_FLAGS+=	e2=
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/afio ${PREFIX}/bin/afio
-	${INSTALL_MAN} ${WRKSRC}/afio.1 ${PREFIX}/${PKGMANDIR}/man1/afio.1
+	${INSTALL_PROGRAM} ${WRKSRC}/afio ${DESTDIR}${PREFIX}/bin/afio
+	${INSTALL_MAN} ${WRKSRC}/afio.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/afio.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 00446ecbb8a..8f904272f4c 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/10/04 20:45:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	arc-5.21o
 CATEGORIES=	archivers
@@ -10,12 +10,13 @@ HOMEPAGE=	http://sourceforge.net/projects/arc/
 COMMENT=	Create & extract files from DOS .ARC files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/arc ${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/marc ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/arc.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_PROGRAM} ${WRKSRC}/arc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/marc ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/arc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/archangel/Makefile b/archivers/archangel/Makefile
index 8520b1b64b3..4d9a711c012 100644
--- a/archivers/archangel/Makefile
+++ b/archivers/archangel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/07/23 14:11:06 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	archangel-20050730
 PKGREVISION=	1
@@ -11,14 +11,16 @@ COMMENT=	Compressing archiver which can sign and encrypt entries
 
 DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/archangel
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/aatar ${PREFIX}/bin/.
-	${INSTALL_MAN} ${WRKSRC}/aatar.1 ${PREFIX}/${PKGMANDIR}/man1/.
+	${INSTALL_PROGRAM} ${WRKSRC}/aatar ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/aatar.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/archivers/bicom/Makefile b/archivers/bicom/Makefile
index 0ef1da9cccd..beb78dc7ebd 100644
--- a/archivers/bicom/Makefile
+++ b/archivers/bicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=		bicom101
@@ -20,6 +20,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}
 USE_LANGUAGES=		c++
@@ -40,9 +41,9 @@ do-build:
 			-o bicom *.o ../bialib/*.o
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bicom
+	${INSTALL_PROGRAM} ${WRKSRC}/bicom/bicom ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bicom
 	${INSTALL_DATA} ${WRKSRC}/README.TXT \
-		${PREFIX}/share/doc/bicom/readme.txt
+		${DESTDIR}${PREFIX}/share/doc/bicom/readme.txt
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/bunzip/Makefile b/archivers/bunzip/Makefile
index f76a70c7bb5..de90274f61c 100644
--- a/archivers/bunzip/Makefile
+++ b/archivers/bunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:28:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	bunzip021.c
 PKGNAME=	bunzip-0.21
@@ -11,6 +11,7 @@ HOMEPAGE=	http://www.muraroa.demon.co.uk/
 COMMENT=	Decompressor for bzip .bz files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
@@ -20,6 +21,6 @@ do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o bunzip ${DISTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${PREFIX}/bin/bunzip
+	${INSTALL_PROGRAM} ${WRKSRC}/bunzip ${DESTDIR}${PREFIX}/bin/bunzip
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gzrecover/Makefile b/archivers/gzrecover/Makefile
index 1e4722415ad..7b61043f73e 100644
--- a/archivers/gzrecover/Makefile
+++ b/archivers/gzrecover/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.5 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=		gzrt-0.2
 PKGNAME=		gzrecover-0.2
-PKGREVISION=	1
+PKGREVISION=		1
 CATEGORIES=		archivers
 MASTER_SITES=		http://www.urbanophile.com/arenn/hacking/gzrt/
 
@@ -12,13 +12,14 @@ HOMEPAGE=		http://www.urbanophile.com/arenn/hacking/gzrt/
 COMMENT=		GZip Recovery Toolkit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=		gzrecover
 
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gzrecover ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/gzrecover ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 774238f863f..5cbf1514930 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.28 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	ha0999
 PKGNAME=	ha-0.999b
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	The HA archiver using the HSC compression method
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
@@ -21,6 +22,6 @@ USE_TOOLS+=	gmake
 INSTALLATION_DIRS=	bin
 
 do-install:
-	cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 3ff945770a4..713f40305d5 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2007/05/28 21:21:09 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	lha-114i
 PKGNAME=	lha-114.9
@@ -18,6 +18,7 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -32,7 +33,8 @@ MAKE_FLAGS+=	MACHINE=${LHA_CPPFLAGS:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/man/lha.n ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/lha.1
+	${INSTALL_PROGRAM} ${WRKSRC}/src/lha ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/lha.n \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/lha.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile
index 06dc864fe62..4e57b458aca 100644
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/02/17 12:07:28 obache Exp $
+# $NetBSD: Makefile,v 1.2 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=		lzma443
@@ -11,15 +11,17 @@ MAINTAINER=		jakllsch@kollasch.net
 HOMEPAGE=		http://www.7-zip.org/sdk.html
 COMMENT=		LZMA compression utility from 7zip
 
-USE_LANGUAGES=		c c++
-
-WRKSRC=		${WRKDIR}/C/7zip/Compress/LZMA_Alone
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 
+WRKSRC=			${WRKDIR}/C/7zip/Compress/LZMA_Alone
 MAKE_FILE=		makefile.gcc
 
+INSTALLATION_DIRS=	bin
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/lzma ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/lzma ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
index b3259f2319f..6d3cf3ebf4e 100644
--- a/archivers/macutil/Makefile
+++ b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
@@ -10,6 +10,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Create & extract Mac archive files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_FILE=		makefile
 MAKE_ENV+=		CF=${CFLAGS:M*:Q}
@@ -25,7 +26,8 @@ do-install:
 			   ${WRKSRC}/mixed/macstream \
 			   ${WRKSRC}/binhex/binhex \
 			   ${WRKSRC}/comm/tomac \
-			   ${WRKSRC}/comm/frommac ${PREFIX}/bin
+			   ${WRKSRC}/comm/frommac \
+		${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/macunpack.1 \
 		       ${WRKSRC}/man/hexbin.1 \
 		       ${WRKSRC}/man/macsave.1 \
@@ -33,6 +35,7 @@ do-install:
 		       ${WRKSRC}/man/binhex.1 \
 		       ${WRKSRC}/man/tomac.1 \
 		       ${WRKSRC}/man/frommac.1 \
-		       ${WRKSRC}/man/macutil.1 ${PREFIX}/${PKGMANDIR}/man1
+		       ${WRKSRC}/man/macutil.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index 53d2402c4c7..9260caffb13 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/17 06:12:27 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	makeself-2.1.4
 CATEGORIES=	archivers
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.megastep.org/makeself/
 COMMENT=	Neat script to make self-extracting archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NO_BUILD=	yes
 
@@ -21,6 +22,7 @@ pre-patch:
 	cd ${WRKDIR} && ${SETENV} DISPLAY="" ${SH} ${DISTFILES}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh ${PREFIX}/bin/makeself
+	${INSTALL_SCRIPT} ${WRKSRC}/makeself.sh \
+		${DESTDIR}${PREFIX}/bin/makeself
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/mousetar/Makefile b/archivers/mousetar/Makefile
index c4d4bbc9182..0f8d9aa6d66 100644
--- a/archivers/mousetar/Makefile
+++ b/archivers/mousetar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/06/05 05:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=	mousetar-20021217
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	der Mouse's version of tar program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 NOT_FOR_PLATFORM+=	Interix-*-* # no sys/mtio.h tape support
 
@@ -37,7 +38,8 @@ do-build:
 	cd ${WRKSRC}; ${CC} ${CPPFLAGS} ${CFLAGS} tar.c -o mousetar
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mousetar ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tar.man ${PREFIX}/${PKGMANDIR}/man1/mousetar.1
+	${INSTALL_PROGRAM} ${WRKSRC}/mousetar ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/tar.man \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mousetar.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index aaacba9a189..14693bbaabf 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=		mscompress-0.3
@@ -11,15 +11,18 @@ HOMEPAGE=		ftp://ftp.penguin.cz/pub/users/mhi/mscompress/
 COMMENT=		Microsoft "compress.exe/expand.exe" compatible (de)compressor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mscompress.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/msexpand.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/mscompress.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/msexpand.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
index 9a069438952..027ea99d9ee 100644
--- a/archivers/nomarch/Makefile
+++ b/archivers/nomarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/07/23 14:40:53 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=	nomarch-1.3
@@ -10,6 +10,7 @@ HOMEPAGE=	http://rus.members.beeb.net/nomarch.html
 COMMENT=	Free replacement for the arc program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
 MAKE_FLAGS+=	CC=${CC:Q}
@@ -18,7 +19,8 @@ MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nomarch ${PREFIX}/bin/nomarch
-	${INSTALL_DATA} ${WRKSRC}/nomarch.1 ${PREFIX}/${PKGMANDIR}/man1/nomarch.1
+	${INSTALL_PROGRAM} ${WRKSRC}/nomarch ${DESTDIR}${PREFIX}/bin/nomarch
+	${INSTALL_DATA} ${WRKSRC}/nomarch.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/nomarch.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 329f682a444..afbfc95a929 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/12/16 09:25:22 adam Exp $
+# $NetBSD: Makefile,v 1.38 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	p7zip_4.57_src_all
 PKGNAME=	p7zip-4.57
@@ -11,6 +11,7 @@ HOMEPAGE=	http://p7zip.sourceforge.net/
 COMMENT=	File archiver with high compression
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
 MAKE_FILE=		makefile
@@ -50,22 +51,31 @@ CFLAGS+=		-DLITTLE_ENDIAN
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/7za ${DESTDIR}${PREFIX}/bin
 .if !empty(DYNAMIC_7Z:MYES)
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${PREFIX}/lib/7z
-	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* ${PREFIX}/lib/7z/Codecs
-	${INSTALL_LIB} ${WRKSRC}/bin/Formats/* ${PREFIX}/lib/7z/Formats
-	ln -s ${PREFIX}/lib/7z/7z ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/7z ${DESTDIR}${PREFIX}/lib/7z
+	ln -s ${PREFIX}/lib/7z/7z ${DESTDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/bin/Codecs/* \
+		${DESTDIR}${PREFIX}/lib/7z/Codecs
+	${INSTALL_LIB} ${WRKSRC}/bin/Formats/* \
+		${DESTDIR}${PREFIX}/lib/7z/Formats
 .else
 	ln -s 7za ${PREFIX}/bin/7z
 .endif
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* ${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* ${PREFIX}/share/doc/p7zip/commands
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* ${PREFIX}/share/doc/p7zip/switches
-	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man1/7za.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_MAN} ${WRKSRC}/man1/7zr.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/p7zip
+	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \
+		${DESTDIR}${PREFIX}/share/doc/p7zip
+	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \
+		${DESTDIR}${PREFIX}/share/doc/p7zip/commands
+	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \
+		${DESTDIR}${PREFIX}/share/doc/p7zip/switches
+	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/7za.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man1/7zr.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/pbzip2/Makefile b/archivers/pbzip2/Makefile
index 14ad1e8a8d2..d1775513113 100644
--- a/archivers/pbzip2/Makefile
+++ b/archivers/pbzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/07/29 01:52:19 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=		pbzip2-1.0.2
@@ -10,6 +10,8 @@ MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://compression.ca/pbzip2/
 COMMENT=		Parallel implementation of the bzip2 block-sorting file compressor
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 PTHREAD_AUTO_VARS=	yes
 PTHREAD_OPTS+=		require
 
@@ -26,10 +28,14 @@ do-build:
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o pbzip2 pbzip2.cpp ${LIBS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/pbzip2 ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/pbzip2.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/pbzip2
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pbzip2
+	${INSTALL_PROGRAM} ${WRKSRC}/pbzip2 \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/pbzip2.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/COPYING \
+		${DESTDIR}${PREFIX}/share/doc/pbzip2
+	${INSTALL_DATA} ${WRKSRC}/README \
+		${DESTDIR}${PREFIX}/share/doc/pbzip2
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile
index 26e8dcc7530..81db1b06866 100644
--- a/archivers/ppmd/Makefile
+++ b/archivers/ppmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=	ppmdi1
@@ -12,6 +12,7 @@ HOMEPAGE=	http://compression.ru/ds/
 COMMENT=	PPM file compressor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_FILE=	makefile.gmk
 BUILD_TARGET=	ppmd
@@ -28,8 +29,9 @@ SUBST_FILES.d2u=	*
 SUBST_FILTER_CMD.d2u=	${TR} -d '\015'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/ppmd ${PREFIX:Q}/bin
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/ppmd
-	${INSTALL_DATA} ${WRKSRC:Q}/read_me.txt ${PREFIX:Q}/share/doc/ppmd/
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/ppmd ${DESTDIR}${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/doc/ppmd
+	${INSTALL_DATA} ${WRKSRC:Q}/read_me.txt \
+		${DESTDIR}${PREFIX:Q}/share/doc/ppmd/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 4feaeff769f..3c5e01a9049 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/06/08 18:30:31 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -12,6 +12,7 @@ COMMENT=	Decompresses Amiga PowerPacker files
 LICENSE=	ppunpack-license
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/PPUnpack
 
@@ -24,6 +25,6 @@ BUILD_TARGET=	ppunpack
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ppunpack ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ppunpack ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 50821b62a4b..d80d997b5b3 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:08:04 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/02 03:48:36 jlam Exp $
 #
 
 DISTNAME=	archive-2.0
@@ -15,6 +15,8 @@ COMMENT=	Simple archiver
 # no real libraries there
 DEPENDS+=	rox-lib>=2.0.2nb2:../../devel/rox-lib
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/Archive
 DIST_SUBDIR=	rox
 
@@ -31,7 +33,7 @@ SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/share/rox/Archive
+	cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/rox/Archive
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/sarab/Makefile b/archivers/sarab/Makefile
index 1f54396e286..d6eb3ae062a 100644
--- a/archivers/sarab/Makefile
+++ b/archivers/sarab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/11/27 14:24:01 dsainty Exp $
+# $NetBSD: Makefile,v 1.3 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	sarab-0.2.2
 PKGREVISION=	1
@@ -13,6 +13,8 @@ COMMENT=	Schedule And Rotate Automatic Backups
 DEPENDS+=	dar-[0-9]*:../../archivers/dar
 WRKSRC=		${WRKDIR}/sarab
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=		bash:run
 PKG_SYSCONFSUBDIR=	sarab
 
@@ -53,18 +55,19 @@ SUBST_MESSAGE.prune=	Prune /kern instead of /sys
 SUBST_FILES.prune=	etc/sarab.dcf
 SUBST_SED.prune=	-e "s|--prune sys|--prune kern|"
 
+INSTALLATION_DIRS=	bin ${EGDIR}
+
 do-build: # do nothing
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
 	for example in \
 			${WRKSRC}/etc/rotation.schedule.README \
 			${WRKSRC}/etc/rotation.schedule \
 			${WRKSRC}/etc/sarab.conf \
 			${WRKSRC}/etc/sarab.dcf \
 			${WRKSRC}/etc/examples/*; do \
-		${INSTALL_DATA} $${example} ${EGDIR}/; \
+		${INSTALL_DATA} $${example} ${DESTDIR}${EGDIR}; \
 	done
-	${INSTALL_SCRIPT} ${WRKSRC}/sarab.sh ${PREFIX}/bin/sarab
+	${INSTALL_SCRIPT} ${WRKSRC}/sarab.sh ${DESTDIR}${PREFIX}/bin/sarab
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile
index ea8a49c1043..1b722e8a44c 100644
--- a/archivers/squsq/Makefile
+++ b/archivers/squsq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/02 03:48:36 jlam Exp $
 
 DISTNAME=	t20-squsq-3.3
 PKGNAME=	squsq-3.3
@@ -9,6 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Compressor/decompressor for CP/M Squeeze compressed files
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_FILE=	${FILESDIR}/Makefile
 
@@ -17,6 +18,7 @@ WRKSRC=		${WRKDIR}/t20-squsq
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq \
+		${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index 9db14921bd1..2e9f1bd49c9 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/11/03 14:10:32 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/02 03:48:37 jlam Exp $
 #
 
 DISTNAME=	unace-1.2b
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 LICENSE=		unace-source-license
 RESTRICTED=		Only original file distribution.
@@ -25,8 +26,9 @@ BUILD_TARGET=	clean unace
 INSTALLATION_DIRS=	bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unace
-	${INSTALL_MAN} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/unace
+	${INSTALL_PROGRAM} ${WRKSRC}/unace ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/unace
+	${INSTALL_MAN} ${WRKSRC}/readme.txt \
+		${DESTDIR}${PREFIX}/share/doc/unace
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile
index 44fdfe5a629..d95ebed2a2e 100644
--- a/archivers/unalz/Makefile
+++ b/archivers/unalz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/10/14 17:50:04 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2008/03/02 03:48:37 jlam Exp $
 #
 
 DISTNAME=		unalz-0.61
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.kipple.pe.kr/win/unalz/
 COMMENT=		Alzip archive (.alz) extractor
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_TARGET=		posix-utf8
 USE_LANGUAGES=		c c++
@@ -29,6 +30,6 @@ USE_TOOLS+=		tr
 .include "../../converters/libiconv/buildlink3.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unalz ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unalz ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 58438af83e6..aa1510a44b5 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/06/18 07:04:16 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/02 03:48:37 jlam Exp $
 
 DISTNAME=	unarj-2.65
 PKGREVISION=	1
@@ -15,6 +15,8 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 NO_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin
@@ -23,9 +25,11 @@ post-extract:
 	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unarj
-	${INSTALL_PROGRAM} ${WRKSRC}/unarj ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/unarj.txt ${PREFIX}/share/doc/unarj
-	${INSTALL_MAN} ${WRKSRC}/technote.txt ${PREFIX}/share/doc/unarj
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/unarj
+	${INSTALL_PROGRAM} ${WRKSRC}/unarj ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/unarj.txt \
+		${DESTDIR}${PREFIX}/share/doc/unarj
+	${INSTALL_MAN} ${WRKSRC}/technote.txt \
+		${DESTDIR}${PREFIX}/share/doc/unarj
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index d4b5efd2662..8f945717375 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2007/11/06 20:12:38 reed Exp $
+# $NetBSD: Makefile,v 1.20 2008/03/02 03:48:37 jlam Exp $
 
 DISTNAME=	undms-1.3.c
 PKGNAME=	undms-1.3
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
@@ -20,6 +21,6 @@ do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/undms ${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/undms ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 5f61c938138..89c8f8682be 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2007/11/06 20:13:33 reed Exp $
+# $NetBSD: Makefile,v 1.21 2008/03/02 03:48:37 jlam Exp $
 
 DISTNAME=	unlzx.c
 PKGNAME=	unlzx-1.1
@@ -11,6 +11,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Extracts .lzx archives from Amiga systems
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
@@ -20,6 +21,6 @@ do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} -o unlzx unlzx.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unlzx ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unlzx ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/unzoo/Makefile b/archivers/unzoo/Makefile
index 5091ea66ab7..59b7e1acaaf 100644
--- a/archivers/unzoo/Makefile
+++ b/archivers/unzoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/18 07:04:16 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2008/03/02 03:48:37 jlam Exp $
 #
 
 DISTNAME=	unzoo.c
@@ -11,6 +11,7 @@ MAINTAINER=	cjep@NetBSD.org
 COMMENT=	Extract zoo archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	YES
@@ -24,6 +25,6 @@ do-build:
 	cd ${WRKSRC} &&	${CC} ${CFLAGS} -DSYS_IS_UNIX -DSYS_HAS_MKDIR -o unzoo unzoo.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unzoo ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unzoo ${DESTDIR}${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index 9aab771ba00..e2285749200 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/09/29 10:23:08 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/03/02 03:48:37 jlam Exp $
 
 DISTNAME=	upx-1.25-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -10,6 +10,8 @@ MAINTAINER=	fab@gnux.info
 HOMEPAGE=	http://upx.sourceforge.net/
 COMMENT=	Ultimate packer for executables
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_TOOLS+=	gmake perl
@@ -26,10 +28,12 @@ do-build:
 	cd ${WRKSRC:Q}/doc && ${MAKE_PROGRAM}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/src/upx ${PREFIX:Q}/bin
-	${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/upx/
-	${INSTALL_DATA} ${WRKSRC:Q}/doc/upx.doc ${PREFIX:Q}/share/doc/upx
-	${INSTALL_DATA} ${WRKSRC:Q}/doc/upx.html ${PREFIX:Q}/share/doc/upx
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/src/upx ${DESTDIR}${PREFIX:Q}/bin
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/doc/upx/
+	${INSTALL_DATA} ${WRKSRC:Q}/doc/upx.doc \
+		${DESTDIR}${PREFIX:Q}/share/doc/upx
+	${INSTALL_DATA} ${WRKSRC:Q}/doc/upx.html \
+		${DESTDIR}${PREFIX:Q}/share/doc/upx
 
 .include "../../devel/ucl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/xbin/Makefile b/archivers/xbin/Makefile
index eed9482e263..9ef0ea81c47 100644
--- a/archivers/xbin/Makefile
+++ b/archivers/xbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/10/31 21:50:49 gdt Exp $
+# $NetBSD: Makefile,v 1.25 2008/03/02 03:48:37 jlam Exp $
 #
 
 DISTNAME=	${PRGNAME}unix
@@ -16,6 +16,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 
@@ -43,7 +44,9 @@ do-build:
 	${CC} ${CFLAGS} -o ${PRGNAME:Q} ${DISTNAME:Q}.c ${LDFLAGS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/${PRGNAME:Q} ${PREFIX:Q}/bin
-	${INSTALL_MAN} ${WRKSRC:Q}/${PRGNAME:Q}.man ${PREFIX:Q}/${PKGMANDIR}/cat1/${PRGNAME:Q}.0
+	${INSTALL_PROGRAM} ${WRKSRC:Q}/${PRGNAME:Q} \
+		${DESTDIR}${PREFIX:Q}/bin
+	${INSTALL_MAN} ${WRKSRC:Q}/${PRGNAME:Q}.man \
+		${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/cat1/${PRGNAME:Q}.0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index f58c9d36194..3078b317877 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/12/15 14:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/03/02 03:48:37 jlam Exp $
 
 DISTNAME=		xmill-0.9.1
 PKGREVISION=		3
@@ -10,6 +10,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Specialized compressor for XML
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 MAKE_FILE=		makefile
@@ -35,13 +36,13 @@ do-install:
 		${WRKSRC}/documentation/README.txt \
 		${WRKSRC}/documentation/xmill.ps.gz \
 		${WRKSRC}/documentation/xmill-09-doc.txt \
-		${PREFIX}/share/doc/xmill
+		${DESTDIR}${PREFIX}/share/doc/xmill
 	${INSTALL_PROGRAM} ${WRKSRC}/unix/xcmill \
 		${WRKSRC}/unix/xdemill \
 		${WRKSRC}/unix/xmillexample \
 		${WRKSRC}/unix/xmillinspect \
 		${WRKSRC}/unix/xmilltest \
-		${PREFIX}/bin
+		${DESTDIR}${PREFIX}/bin
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
index edf2b44071e..ec30387f5b2 100644
--- a/archivers/zip1/Makefile
+++ b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/01/11 19:08:50 gdt Exp $
+# $NetBSD: Makefile,v 1.43 2008/03/02 03:48:37 jlam Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -18,6 +18,7 @@ NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}
 MAKE_FILE=	makefile
@@ -36,9 +37,13 @@ MAKE_FLAGS+=	LFLAGS2=-lcompat
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} zip ${PREFIX}/bin/zip1
-	cd ${WRKSRC} && ${INSTALL_MAN} zip.1 ${PREFIX}/${PKGMANDIR}/man1/zip1.1
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} zipcloak ${PREFIX}/bin/zipcloak1
-	${LN} -fs zip1.1 ${PREFIX}/${PKGMANDIR}/man1/zipcloak1.1
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} zip \
+		${DESTDIR}${PREFIX}/bin/zip1
+	cd ${WRKSRC} && ${INSTALL_MAN} zip.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zip1.1
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} zipcloak \
+		${DESTDIR}${PREFIX}/bin/zipcloak1
+	${LN} -fs zip1.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/zipcloak1.1
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3