PKG_DESTDIR_SUPPORT

4 files changed, 35 insertions, 37 deletions

diff --git a/net/connect/Makefile b/net/connect/Makefile
index c6f91128a16..0d9c447dd96 100644
--- a/net/connect/Makefile
+++ b/net/connect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/05/25 14:45:17 tron Exp $
+# $NetBSD: Makefile,v 1.11 2009/12/17 22:34:37 abs Exp $
 
 DISTNAME=	connect
 PKGNAME=	${DISTNAME}-1.95
@@ -16,7 +16,8 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 LIBS.Darwin+=	-lresolv
 LIBS.SunOS+=	-lresolv -lsocket -lnsl
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/connect
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 do-build:
 	${MKDIR} ${WRKSRC}
@@ -25,8 +26,7 @@ do-build:
 	${CUT} -c 4- >${WRKSRC}/README
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/connect ${PREFIX}/bin
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/connect
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/connect
+	${INSTALL_PROGRAM} ${WRKSRC}/connect ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/connect
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 44fe8f540e0..d97841293f6 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/10/03 18:31:19 bad Exp $
+# $NetBSD: Makefile,v 1.27 2009/12/17 22:36:00 abs Exp $
 
 DISTNAME=	ddclient-3.6.6
 PKGREVISION=	1
@@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		perl:run
 USE_LANGUAGES=		# empty
 
+BUILD_DEFS+=		VARBASE
 DOCDIR=			${PREFIX}/share/doc/ddclient
 EGDIR=			${PREFIX}/share/examples/ddclient
 RCD_SCRIPTS=		ddclient
@@ -22,7 +23,8 @@ CONF_FILES_PERMS=	${EGDIR}/sample-etc_ddclient.conf		\
 			${PKG_SYSCONFDIR}/ddclient.conf			\
 			${ROOT_USER} ${ROOT_GROUP} 0600
 
-INSTALLATION_DIRS=	sbin
+INSTALLATION_DIRS=	sbin share/doc/ddclient share/examples/ddclient
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 do-configure:
 	cd ${WRKSRC}; for f in ddclient; do				\
@@ -39,13 +41,11 @@ do-configure:
 do-build:	# empty
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.cisco ${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample-* ${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/ddclient ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.cisco ${DESTDIR}${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/sample-* ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 70b727091d3..98fd1530d5d 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/06/30 00:07:20 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2009/12/17 22:39:56 abs Exp $
 
 DISTNAME=	dgd-1.2p4
 PKGNAME=	dgd-1.2.0.4
@@ -25,20 +25,18 @@ SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	mud.dgd
 SUBST_SED.paths=	-e 's,/home/dworkin/,${PREFIX}/libdata/,g'
 
-INSTALLATION_DIRS=	libexec
+INSTALLATION_DIRS=	libexec share/doc/dgd share/examples/dgd libdata/dgd/tmp
+PKG_DESTDIR_SUPPORT=	destdir
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/a.out ${PREFIX}/libexec/dgd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dgd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dgd
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/dgd/tmp
+	${INSTALL_PROGRAM} ${WRKSRC}/src/a.out ${DESTDIR}${PREFIX}/libexec/dgd
 	cd ${WRKDIR}/dgd && \
-	${INSTALL_DATA} Copyright Credits README ${PREFIX}/share/doc/dgd
+	${INSTALL_DATA} Copyright Credits README ${DESTDIR}${PREFIX}/share/doc/dgd
 	${GTAR} cCf ${WRKDIR}/dgd/doc - . | ${GTAR} xCf \
-		${PREFIX}/share/doc/dgd -
-	${GTAR} cCf ${WRKDIR}/dgd - mud | ${GTAR} xCf ${PREFIX}/libdata/dgd -
-	${CHOWN} -R ${BINOWN}:${BINGRP}  ${PREFIX}/libdata/dgd \
-		${PREFIX}/share/doc/dgd
-	${INSTALL_DATA} ${WRKSRC}/mud.dgd ${PREFIX}/share/examples/dgd
+		${DESTDIR}${PREFIX}/share/doc/dgd -
+	${GTAR} cCf ${WRKDIR}/dgd - mud | ${GTAR} xCf ${DESTDIR}${PREFIX}/libdata/dgd -
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${DESTDIR}${PREFIX}/libdata/dgd \
+		${DESTDIR}${PREFIX}/share/doc/dgd
+	${INSTALL_DATA} ${WRKSRC}/mud.dgd ${DESTDIR}${PREFIX}/share/examples/dgd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 82d933149b5..993b754a841 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:30:17 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2009/12/17 22:38:50 abs Exp $
 #
 
 DISTNAME=	dhid-5.2
@@ -12,17 +12,17 @@ COMMENT=	Dynamic Host Information System client daemon
 
 RCD_SCRIPTS=	dhid
 
-INSTALLATION_DIRS=	sbin
+INSTALLATION_DIRS=	sbin share/doc/dhid
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/sbin/dhid-genkeys
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dhid
-	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/dhid
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/dhid
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dhid
-	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/dhid
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dhid
+	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${DESTDIR}${PREFIX}/sbin/dhid-genkeys
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/dhid
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/share/doc/dhid
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/dhid
+	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DESTDIR}${PREFIX}/share/doc/dhid
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dhid
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"