DESTDIR support

7 files changed, 39 insertions, 33 deletions

diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 92c2641948c..8409c868ad7 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2009/11/11 12:21:52 tonnerre Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 19:51:55 joerg Exp $
 
 DISTNAME=		puppet-0.24.8
 CATEGORIES=		sysutils
@@ -8,6 +8,8 @@ HOMEPAGE=		http://www.reductivelabs.com/projects/puppet/
 MASTER_SITES=		http://reductivelabs.com/downloads/gems/
 COMMENT=		Configuration management framework written in Ruby
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=		${RUBY_PKGPREFIX}-facter>=1.3.8:../../sysutils/ruby-facter
@@ -35,8 +37,10 @@ CONF_FILES=		${EGDIR}/puppet.conf ${PKG_SYSCONFDIR}/puppet.conf
 
 PLIST_VARS+=		sunos
 
+INSTALLATION_DIRS+=	${EGDIR}
+
 .if ${OPSYS} == "SunOS"
-INSTALLATION_DIRS=	lib/svc/method ${EGDIR}/svc
+INSTALLATION_DIRS+=	lib/svc/method ${EGDIR}/svc
 CONF_DIRS+=		${VARBASE}/svc/manifest
 CONF_FILES+=		${EGDIR}/svc/puppetd.xml ${VARBASE}/svc/manifest/puppetd.xml
 CONF_FILES+=		${EGDIR}/svc/puppetmasterd.xml ${VARBASE}/svc/manifest/puppetmasterd.xml
@@ -51,7 +55,6 @@ pre-build:
 		> examples/puppet.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/puppet.conf			\
 		${DESTDIR}${EGDIR}
 .if ${OPSYS} == "SunOS"
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index b6472e5c1fa..5140098bc36 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/08/25 11:56:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/27 19:52:22 joerg Exp $
 #
 
 DISTNAME=	rfstool-0.14-source
@@ -13,6 +13,7 @@ HOMEPAGE=	http://p-nand-q.com/download/rfstool/overview.html
 COMMENT=	Tools to access ReiserFS partitions
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/RFSTOOL
 MAKE_FILE=	makefile.gcc3x
@@ -21,6 +22,6 @@ USE_LANGUAGES=	c++
 INSTALLATION_DIRS=	sbin
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rfstool ${PREFIX}/sbin/rfstool
+	${INSTALL_PROGRAM} ${WRKSRC}/rfstool ${DESTDIR}${PREFIX}/sbin/rfstool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/roller/Makefile b/sysutils/roller/Makefile
index 7f3648e7809..5d92366c334 100644
--- a/sysutils/roller/Makefile
+++ b/sysutils/roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/12/25 13:27:02 kim Exp $
+# $NetBSD: Makefile,v 1.32 2010/01/27 19:53:23 joerg Exp $
 #
 
 DISTNAME=		roller-1.20
@@ -9,6 +9,8 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Roll log files
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=		cpogm-[0-9]*:../../sysutils/cpogm
 DEPENDS+=		logtime-[0-9]*:../../time/logtime
 DEPENDS+=		pflogsumm-[0-9]*:../../sysutils/pflogsumm
@@ -18,12 +20,9 @@ DEPENDS+=		pflogsumm-[0-9]*:../../sysutils/pflogsumm
 NO_CONFIGURE=		yes
 USE_TOOLS+=		perl:run
 
-MAKE_FLAGS+=		PREFIX=${PREFIX}
+MAKE_FLAGS+=		PREFIX=${DESTDIR}${PREFIX}
 MAKE_FLAGS+=		GAWK=${AWK}
 MAKE_FLAGS+=		PERL=${PERL5}
 MAKE_FLAGS+=		SH=${SH}
 
-BUILD_TARGET=		all
-INSTALL_TARGET=		install
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index 6632e371d0c..a59406fce4a 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/02 19:51:37 abs Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/27 19:54:41 joerg Exp $
 #
 
 DISTNAME=	rsnapshot-1.2.9
@@ -9,6 +9,8 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.rsnapshot.org/
 COMMENT=	Filesystem snapshot utility
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DEPENDS+=	rsync>=2.3.1:../../net/rsync
 DEPENDS+=	p5-Lchown>=0.07:../../sysutils/p5-Lchown
 
@@ -27,15 +29,13 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
 CONFIGURE_ARGS+=	--with-rsync=${LOCALBASE}/bin/rsync
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR} ${EGDIR}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/rsnapshot ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/rsnapshot.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/rsnapshot.conf.default ${EGDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/rsnapshot ${DESTDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/rsnapshot.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/rsnapshot.conf.default ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index eee2b94221d..06f0418669b 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2008/04/19 06:07:50 obache Exp $
+# $NetBSD: Makefile,v 1.27 2010/01/27 19:57:12 joerg Exp $
 
 DISTNAME=	rtty-3.2
 PKGREVISION=	1
@@ -9,6 +9,8 @@ MASTER_SITES=	http://gatekeeper.hpl.hp.com/archive/pub/misc/vixie/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multiuser "tip"/"cu" replacement with logging
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 WRKSRC=		${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
@@ -26,8 +28,10 @@ pre-configure:
 	cd ${WRKDIR} && \
 		${SED} -e '/^agelog=/s:/usr/etc/:${PREFIX}/rtty/bin/:' agelogs.sh >agelogs.sh.pdone && ${MV} agelogs.sh.pdone agelogs.sh
 
+INSTALLATION_DIRS=	share/doc/rtty
+INSTALL_MAKE_FLAGS+=	DESTROOT=${DESTDIR}
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtty
-	${INSTALL_DATA}  ${WRKDIR}/README ${PREFIX}/share/doc/rtty/
+	${INSTALL_DATA}  ${WRKDIR}/README ${DESTDIR}${PREFIX}/share/doc/rtty/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
index 8dbf549496d..5feb1586e15 100644
--- a/sysutils/sarah/Makefile
+++ b/sysutils/sarah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/05/01 14:52:02 zafer Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/27 19:59:16 joerg Exp $
 
 DISTNAME=	sarah-0.9.1b
 CATEGORIES=	sysutils
@@ -12,7 +12,8 @@ USE_TOOLS+=	perl:run
 REPLACE_PERL=	sarah
 NO_BUILD=	YES
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/sarah \
+			share/examples/sarah
 CONF_FILES+=	${PREFIX}/share/examples/sarah/sarah.conf.sample \
 			${PKG_SYSCONFDIR}/sarah.conf
 
@@ -27,11 +28,9 @@ post-patch:
 	${MV} ${WRKSRC}/sarah.1.done ${WRKSRC}/sarah.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/sarah ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sarah
-	${INSTALL_DATA} ${WRKSRC}/sarah.conf.sample ${PREFIX}/share/examples/sarah
-	${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sarah
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sarah
+	${INSTALL_SCRIPT} ${WRKSRC}/sarah ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/sarah.conf.sample ${DESTDIR}${PREFIX}/share/examples/sarah
+	${INSTALL_MAN} ${WRKSRC}/sarah.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/sarah
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile
index 1d5d2e93a80..d72d3e39b3d 100644
--- a/sysutils/scsiinfo/Makefile
+++ b/sysutils/scsiinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:12 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 19:59:43 joerg Exp $
 
 DISTNAME=	scsiinfo-4.7
 CATEGORIES=	sysutils
@@ -23,7 +23,7 @@ pre-build:
 	cd ${WRKSRC} && ./mkadapters esp isp fas glm ptisp pln > adapters
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/scsiinfo ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/scsiinfo ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"