pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net PKG_DESTDIR_SUPPORT



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3cbdad8ca636
branches:  trunk
changeset: 568769:3cbdad8ca636
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Dec 17 22:34:37 2009 +0000

description:
PKG_DESTDIR_SUPPORT

diffstat:

 net/connect/Makefile  |  10 +++++-----
 net/ddclient/Makefile |  20 ++++++++++----------
 net/dgd/Makefile      |  22 ++++++++++------------
 net/dhid/Makefile     |  20 ++++++++++----------
 4 files changed, 35 insertions(+), 37 deletions(-)

diffs (152 lines):

diff -r 01223093cbc7 -r 3cbdad8ca636 net/connect/Makefile
--- a/net/connect/Makefile      Thu Dec 17 22:33:35 2009 +0000
+++ b/net/connect/Makefile      Thu Dec 17 22:34:37 2009 +0000
@@ -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 @@
 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 @@
        ${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 -r 01223093cbc7 -r 3cbdad8ca636 net/ddclient/Makefile
--- a/net/ddclient/Makefile     Thu Dec 17 22:33:35 2009 +0000
+++ b/net/ddclient/Makefile     Thu Dec 17 22:34:37 2009 +0000
@@ -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 @@
 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 @@
                        ${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-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 -r 01223093cbc7 -r 3cbdad8ca636 net/dgd/Makefile
--- a/net/dgd/Makefile  Thu Dec 17 22:33:35 2009 +0000
+++ b/net/dgd/Makefile  Thu Dec 17 22:34:37 2009 +0000
@@ -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_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 -r 01223093cbc7 -r 3cbdad8ca636 net/dhid/Makefile
--- a/net/dhid/Makefile Thu Dec 17 22:33:35 2009 +0000
+++ b/net/dhid/Makefile Thu Dec 17 22:34:37 2009 +0000
@@ -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 @@
 
 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"



Home | Main Index | Thread Index | Old Index