DESTDIR support.

6 files changed, 35 insertions, 27 deletions

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 68bb6fce0a0..5e5d71a6e0c 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/12/22 23:41:01 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2009/02/09 23:30:07 joerg Exp $
 
 DISTNAME=	arj-3.10.22
 CATEGORIES=	archivers
@@ -9,6 +9,7 @@ HOMEPAGE=	http://arj.sourceforge.net/
 COMMENT=	Open-source ARJ archiver
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		autoconf gmake
 GNU_CONFIGURE=		yes
@@ -33,12 +34,13 @@ pre-configure:
 	${RM} -f ${WRKSRC}/environ.c.1
 	cd ${WRKSRC}/gnu && autoconf
 
+INSTALLATION_DIRS+=	${ARJ_DOCSDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${ARJ_DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${WRKSRC}/doc/debug.txt 	\
-					${ARJ_DOCSDIR}
+					${DESTDIR}${ARJ_DOCSDIR}
 .for i in arjl.txt arjs.txt history.txt readme.txt unix.txt
-	${INSTALL_DATA} ${WRKSRC}/resource/en/${i:Q} ${ARJ_DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/resource/en/${i:Q} ${DESTDIR}${ARJ_DOCSDIR}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 6f8080a8920..6799ce2dc9c 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2008/01/25 23:44:14 joerg Exp $
+# $NetBSD: Makefile,v 1.51 2009/02/09 23:33:27 joerg Exp $
 
 DISTNAME=		rar	# overridden in Makefile.${EMUL_PLATFORM}
 PKGNAME=		rar-2.02 # also overridden
@@ -6,6 +6,8 @@ PKGREVISION=		1
 CATEGORIES=		archivers
 MASTER_SITES=		# empty
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.rarsoft.com/
 COMMENT=		RAR file archiver (binary)
diff --git a/archivers/rar/Makefile.linux-i386 b/archivers/rar/Makefile.linux-i386
index b0b8c2ac294..a0473c13adc 100644
--- a/archivers/rar/Makefile.linux-i386
+++ b/archivers/rar/Makefile.linux-i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.linux-i386,v 1.1 2007/08/22 16:43:34 jlam Exp $
+# $NetBSD: Makefile.linux-i386,v 1.2 2009/02/09 23:33:27 joerg Exp $
 
 DISTNAME=		rarlinux-3.6.0
 PKGNAME=		${DISTNAME:S/linux//}
@@ -18,7 +18,7 @@ DOCDIR=			${PREFIX}/share/doc/rar
 INSTALLATION_DIRS=	bin lib ${DATADIR} ${DOCDIR}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC:Q}/rar_static ${PREFIX:Q}/bin/rar
-	${INSTALL_DATA} ${WRKSRC:Q}/default.sfx ${DATADIR:Q}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCDIR:Q}
-	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${DOCDIR:Q}
+	${INSTALL_PROGRAM} ${WRKSRC}/rar_static ${DESTDIR}${PREFIX}/bin/rar
+	${INSTALL_DATA} ${WRKSRC}/default.sfx ${DESTDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${DESTDIR}${DOCDIR}
diff --git a/archivers/rar/Makefile.netbsd-i386 b/archivers/rar/Makefile.netbsd-i386
index f1e7a607050..8329a0e3306 100644
--- a/archivers/rar/Makefile.netbsd-i386
+++ b/archivers/rar/Makefile.netbsd-i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.netbsd-i386,v 1.2 2007/08/23 18:20:30 jlam Exp $
+# $NetBSD: Makefile.netbsd-i386,v 1.3 2009/02/09 23:33:27 joerg Exp $
 
 DISTNAME=		rarbsd
 PKGNAME=		rar-2.02
@@ -47,9 +47,9 @@ do-build:
 	done
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC:Q}/rar ${PREFIX:Q}/bin/rar
-	${INSTALL_DATA} ${WRKSRC:Q}/RarFiles.Lst ${DATADIR:Q}/rarfiles.lst
-	${INSTALL_DATA} ${WRKSRC:Q}/default.sfx ${DATADIR:Q}/default.sfx
-	${INSTALL_DATA} ${WRKSRC:Q}/Dos.SFX ${DATADIR:Q}/dos.sfx
-	cd ${WRKSRC:Q} && ${INSTALL_MAN} Rar.Txt Rar_FAQ.txt		\
-		TechNote.Txt License.Txt Internet.Txt ${DOCDIR:Q}
+	${INSTALL_SCRIPT} ${WRKSRC}/rar ${DESTDIR}${PREFIX}/bin/rar
+	${INSTALL_DATA} ${WRKSRC}/RarFiles.Lst ${DESTDIR}${DATADIR}/rarfiles.lst
+	${INSTALL_DATA} ${WRKSRC}/default.sfx ${DESTDIR}${DATADIR}/default.sfx
+	${INSTALL_DATA} ${WRKSRC}/Dos.SFX ${DESTDIR}${DATADIR}/dos.sfx
+	cd ${WRKSRC} && ${INSTALL_MAN} Rar.Txt Rar_FAQ.txt		\
+		TechNote.Txt License.Txt Internet.Txt ${DESTDIR}${DOCDIR}
diff --git a/archivers/rzip/Makefile b/archivers/rzip/Makefile
index 5ed28005506..971357351fc 100644
--- a/archivers/rzip/Makefile
+++ b/archivers/rzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/19 13:39:14 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2009/02/09 23:37:17 joerg Exp $
 
 DISTNAME=	rzip-2.1
 CATEGORIES=	archivers
@@ -8,13 +8,16 @@ MAINTAINER=	carton@Ivy.NET
 HOMEPAGE=	http://rzip.samba.org/
 COMMENT=	Create or extract .rz files, like gzip but smaller
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
-MAKE_FLAGS+=	INSTALL_MAN=${PREFIX}/${PKGMANDIR}
+INSTALL_MAKE_FLAGS+=	INSTALL_BIN=${DESTDIR}${PREFIX}/bin \
+			INSTALL_MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 post-install:
-	${LN} -f ${PREFIX}/bin/rzip ${PREFIX}/bin/runzip
-	${RM} -f ${PREFIX}/${PKGMANDIR}/man1/runzip.1
-	${LN} -s rzip.1 ${PREFIX}/${PKGMANDIR}/man1/runzip.1
+	${LN} -f ${DESTDIR}${PREFIX}/bin/rzip ${DESTDIR}${PREFIX}/bin/runzip
+	${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/runzip.1
+	${LN} -s rzip.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/runzip.1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/unace-bin/Makefile b/archivers/unace-bin/Makefile
index 3d1379241a5..6bcf653606b 100644
--- a/archivers/unace-bin/Makefile
+++ b/archivers/unace-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/05/25 13:16:10 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2009/02/09 23:38:34 joerg Exp $
 #
 
 DISTNAME=	linunace25
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.winace.com/
 COMMENT=	Extract, list and test files in ACE archives (Linux binary)
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 LICENSE=		unace-license
 RESTRICTED=		Only original file distribution.
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -22,11 +24,10 @@ EMUL_MODULES.linux=	base compat
 WRKSRC=			${WRKDIR}
 BUILD_DIRS=		# empty
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/unace-bin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin/unace-bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/unace-bin
-	${INSTALL_DATA} ${WRKSRC}/licence ${PREFIX}/share/doc/unace-bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unace ${DESTDIR}${PREFIX}/bin/unace-bin
+	${INSTALL_DATA} ${WRKSRC}/licence ${DESTDIR}${PREFIX}/share/doc/unace-bin
 
 .include "../../mk/bsd.pkg.mk"