[pkgsrc/trunk]: pkgsrc/net DESTDIR support

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4f0b330e811
branches:  trunk
changeset: 576880:c4f0b330e811
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jun 25 21:56:46 2010 +0000

description:
DESTDIR support

diffstat:

 net/isc-dhclient4/Makefile    |   9 ++++++---
 net/isc-dhcp4/Makefile        |  14 ++++++++------
 net/isc-dhcp4/Makefile.common |   7 ++-----
 net/isc-dhcpd4/Makefile       |   9 ++++++---
 net/isc-dhcrelay4/Makefile    |   4 +++-
 5 files changed, 25 insertions(+), 18 deletions(-)

diffs (130 lines):

diff -r 5576d4a3fdd4 -r c4f0b330e811 net/isc-dhclient4/Makefile
--- a/net/isc-dhclient4/Makefile        Fri Jun 25 21:40:32 2010 +0000
+++ b/net/isc-dhclient4/Makefile        Fri Jun 25 21:56:46 2010 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2009/01/04 00:59:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/25 21:56:46 joerg Exp $
 #
 
 PKGNAME=       isc-dhclient-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Client
 SUBDIR=                client
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONF_FILES+=   ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
 
 RCD_SCRIPTS=   isc_dhclient
@@ -12,9 +14,10 @@
 
 .include "${.CURDIR}/../isc-dhcp4/options.mk"
 
+INSTALLATION_DIRS+=    ${EGDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/client/dhclient.conf ${DESTDIR}${EGDIR}
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../net/isc-dhcp4/buildlink3.mk"
diff -r 5576d4a3fdd4 -r c4f0b330e811 net/isc-dhcp4/Makefile
--- a/net/isc-dhcp4/Makefile    Fri Jun 25 21:40:32 2010 +0000
+++ b/net/isc-dhcp4/Makefile    Fri Jun 25 21:56:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/01/17 12:02:32 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/25 21:56:46 joerg Exp $
 #
 
 PKGNAME=       isc-dhcp-${DHVER}
@@ -6,17 +6,19 @@
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Base
 SUBDIR=                includes common minires dst
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "options.mk"
 
+INSTALLATION_DIRS+=    share/doc/${PKGBASE}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${PKGBASE}
-
        ${INSTALL_DATA} ${WRKSRC}/README \
-               ${PREFIX}/share/doc/${PKGBASE}
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/RELNOTES \
-               ${PREFIX}/share/doc/${PKGBASE}
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
        ${INSTALL_DATA} ${WRKSRC}/doc/References.txt \
-               ${PREFIX}/share/doc/${PKGBASE}
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff -r 5576d4a3fdd4 -r c4f0b330e811 net/isc-dhcp4/Makefile.common
--- a/net/isc-dhcp4/Makefile.common     Fri Jun 25 21:40:32 2010 +0000
+++ b/net/isc-dhcp4/Makefile.common     Fri Jun 25 21:56:46 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2010/03/20 21:32:41 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/06/25 21:56:46 joerg Exp $
 #
 # used by net/isc-dhcp4/Makefile
 # used by net/isc-dhcpd4/Makefile
@@ -42,9 +42,6 @@
 SUBST_SED.config+=      -e "s|@@PKG_SYSCONFDIR@@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.config=   Fixing configuration files.
 
-do-install:
-.      for d in ${SUBDIR}
-               cd ${WRKSRC}/${d} && ${SETENV} ${MAKE_ENV} ${MAKE} install
-.      endfor
+INSTALL_DIRS=  ${SUBDIR}
 
 .include "../../security/openssl/buildlink3.mk"
diff -r 5576d4a3fdd4 -r c4f0b330e811 net/isc-dhcpd4/Makefile
--- a/net/isc-dhcpd4/Makefile   Fri Jun 25 21:40:32 2010 +0000
+++ b/net/isc-dhcpd4/Makefile   Fri Jun 25 21:56:46 2010 +0000
@@ -1,19 +1,22 @@
-# $NetBSD: Makefile,v 1.3 2009/01/04 00:58:41 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/25 21:56:46 joerg Exp $
 #
 
 PKGNAME=       isc-dhcpd-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Server
 SUBDIR=                omapip dhcpctl server
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONF_FILES+=   ${EGDIR}/dhcpd.conf ${PKG_SYSCONFDIR}/dhcpd.conf
 RCD_SCRIPTS=   isc_dhcpd
 FILES_SUBST+=  DHCP_HOME=${DHCP_HOME}
 
 .include "${.CURDIR}/../isc-dhcp4/options.mk"
 
+INSTALLATION_DIRS+=    ${EGDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/server/dhcpd.conf ${DESTDIR}${EGDIR}
 
 .include "../../net/isc-dhcp4/Makefile.common"
 .include "../../net/isc-dhcp4/buildlink3.mk"
diff -r 5576d4a3fdd4 -r c4f0b330e811 net/isc-dhcrelay4/Makefile
--- a/net/isc-dhcrelay4/Makefile        Fri Jun 25 21:40:32 2010 +0000
+++ b/net/isc-dhcrelay4/Makefile        Fri Jun 25 21:56:46 2010 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2009/01/04 01:00:09 adrianp Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/25 21:56:46 joerg Exp $
 #
 
 PKGNAME=       isc-dhcrelay-${DHVER}
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Relay
 SUBDIR=                relay
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 RCD_SCRIPTS=   isc_dhcrelay
 FILES_SUBST+=  DHCP_HOME=${DHCP_HOME}