pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net DESTDIR support



details:   https://anonhg.NetBSD.org/pkgsrc/rev/77cc158ee723
branches:  trunk
changeset: 571413:77cc158ee723
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 11 22:24:33 2010 +0000

description:
DESTDIR support

diffstat:

 net/ntop/Makefile       |   4 +++-
 net/oinkmaster/Makefile |  31 ++++++++++++++++---------------
 net/openag/Makefile     |   9 ++++++---
 net/openh323/Makefile   |  22 +++++++++++-----------
 net/openntpd/Makefile   |  13 ++++++++-----
 net/overnet/Makefile    |  14 +++++++-------
 net/queryperf/Makefile  |  16 ++++++++--------
 7 files changed, 59 insertions(+), 50 deletions(-)

diffs (271 lines):

diff -r 16d9204a48f5 -r 77cc158ee723 net/ntop/Makefile
--- a/net/ntop/Makefile Thu Feb 11 22:14:30 2010 +0000
+++ b/net/ntop/Makefile Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2010/01/17 12:02:34 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2010/02/11 22:24:33 joerg Exp $
 
 DISTNAME=      ntop-3.3.10
 PKGREVISION=   2
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://www.ntop.org/ntop.html
 COMMENT=       Shows network usage (similar to "top" for processes)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=     ntop-[0-9]*
 
 USE_LIBTOOL=           yes
diff -r 16d9204a48f5 -r 77cc158ee723 net/oinkmaster/Makefile
--- a/net/oinkmaster/Makefile   Thu Feb 11 22:14:30 2010 +0000
+++ b/net/oinkmaster/Makefile   Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/07/17 18:00:20 adrianp Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/11 22:24:43 joerg Exp $
 
 DISTNAME=      oinkmaster-2.0
 CATEGORIES=    net
@@ -8,6 +8,8 @@
 HOMEPAGE=      http://oinkmaster.sourceforge.net/
 COMMENT=       Manage snort rule updates
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      snort{,-mysql,-pgsql}-[0-9]*:../../net/snort
 
 NO_BUILD=      yes
@@ -32,29 +34,28 @@
 SUBST_SED.pub+=                -e "s|/usr/local|${PREFIX}|g"
 SUBST_MESSAGE.pub=     Fixing harcoded paths.
 
-INSTALLATION_DIRS=     bin share/snort/rules
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 \
+                       share/doc/oinkmaster share/examples/oinkmaster \
+                       share/snort/rules
 
 do-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oinkmaster
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oinkmaster
-
 .      for f in ${DOCS}
-               ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
+               ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
 .      endfor
 
-       ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR}
-       ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster
+       ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${DESTDIR}${EGDIR}
+       ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${DESTDIR}${PREFIX}/bin/oinkmaster
        ${LN} -s ${PKG_SYSCONFDIR}/classification.config \
-               ${PREFIX}/share/snort/rules/classification.config
+           ${DESTDIR}${PREFIX}/share/snort/rules/classification.config
        ${LN} -s ${PKG_SYSCONFDIR}/reference.config \
-               ${PREFIX}/share/snort/rules/reference.config
+           ${DESTDIR}${PREFIX}/share/snort/rules/reference.config
        ${LN} -s ${PKG_SYSCONFDIR}/gen-msg.map \
-               ${PREFIX}/share/snort/rules/gen-msg.map
+           ${DESTDIR}${PREFIX}/share/snort/rules/gen-msg.map
        ${LN} -s ${PKG_SYSCONFDIR}/sid-msg.map \
-               ${PREFIX}/share/snort/rules/sid-msg.map
+           ${DESTDIR}${PREFIX}/share/snort/rules/sid-msg.map
        ${LN} -s ${PKG_SYSCONFDIR}/unicode.map \
-               ${PREFIX}/share/snort/rules/unicode.map
+           ${DESTDIR}${PREFIX}/share/snort/rules/unicode.map
 
 .include "../../mk/bsd.pkg.mk"
diff -r 16d9204a48f5 -r 77cc158ee723 net/openag/Makefile
--- a/net/openag/Makefile       Thu Feb 11 22:14:30 2010 +0000
+++ b/net/openag/Makefile       Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/11 22:28:40 joerg Exp $
 #
 
 DISTNAME=      OpenAG-1.1.1
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://sourceforge.net/projects/openags/
 COMMENT=       Open Audio Galaxy client
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      wget-[0-9]*:../../net/wget
 
 GNU_CONFIGURE= yes
@@ -18,10 +20,11 @@
 
 .include "../../devel/zlib/buildlink3.mk"
 
+INSTALLATION_DIRS+=    share/doc/OpenAG
+
 post-install:
-               ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/OpenAG
 .for i in AUTHORS ChangeLog INSTALL NEWS README
-               ${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/OpenAG/${i}
+               ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff -r 16d9204a48f5 -r 77cc158ee723 net/openh323/Makefile
--- a/net/openh323/Makefile     Thu Feb 11 22:14:30 2010 +0000
+++ b/net/openh323/Makefile     Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2010/01/17 12:02:34 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2010/02/11 22:28:44 joerg Exp $
 
 DISTNAME=      openh323-v1_15_2-src
 PKGNAME=       openh323-1.15.2
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://www.openh323.org/
 COMMENT=       Open H.323 library
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 WRKSRC=                        ${WRKDIR}/openh323
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake tar
@@ -24,21 +26,19 @@
 
 MAKE_JOBS_SAFE=                no
 
+INSTALL_DIRS=          src plugins samples/simple
+INSTALLATION_DIRS+=    include/openh323 share/openh323
+
 post-patch:
        cd ${WRKSRC}/include; ${LN} -s . openh323
 
 # override the openh323 install - it uses cp -d, and isn't libtool-aware
 do-install:
-       cd ${WRKSRC}/src; ${MAKE_ENV} ${GMAKE} install
-       ${INSTALL_DATA_DIR} ${PREFIX}/include/openh323
-       cd ${WRKSRC}/include;                           \
-               for f in \*.h ; \
-                       do ${INSTALL_DATA} $$f ${PREFIX}/include/openh323; done
-       cd ${WRKSRC}; ${INSTALL_DATA} version.h ${PREFIX}/include/openh323
-       cd ${WRKSRC}/samples/simple; ${MAKE_ENV} ${GMAKE} install
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/openh323
-       cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323
-       cd ${WRKSRC}/plugins; ${GMAKE} install
+       for f in ${WRKSRC}/include/*.h ; do \
+               ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include/openh323; \
+       done
+       ${INSTALL_DATA} ${WRKSRC}/version.h ${DESTDIR}${PREFIX}/include/openh323
+       ${INSTALL_DATA} ${WRKSRC}/openh323u.mak ${DESTDIR}${PREFIX}/share/openh323
 
 .include "../../devel/pwlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 16d9204a48f5 -r 77cc158ee723 net/openntpd/Makefile
--- a/net/openntpd/Makefile     Thu Feb 11 22:14:30 2010 +0000
+++ b/net/openntpd/Makefile     Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/01/17 12:02:34 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/02/11 22:30:40 joerg Exp $
 
 DISTNAME=              openntpd-3.9p1
 PKGREVISION=           2
@@ -13,6 +13,7 @@
 HOMEPAGE=              http://www.openntpd.org/
 COMMENT=               Free implementation of the Network Time Protocol
 
+PKG_DESTDIR_SUPPORT=   user-destdir
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 CONFLICTS+=            ntp-[0-9]*
@@ -33,11 +34,13 @@
 OWN_DIRS=              ${VARBASE}/chroot/ntpd
 AUTO_MKDIRS=           yes
 
+INSTALLATION_DIRS+=    sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 ${EGDIR}
+
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${PREFIX}/sbin/ntpd
-       ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/${PKGMANDIR}/man8/ntpd.8
-       ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5
-       ${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${EGDIR}/ntpd.conf
+       ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${DESTDIR}${PREFIX}/sbin/ntpd
+       ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ntpd.8
+       ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5
+       ${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${DESTDIR}${EGDIR}/ntpd.conf
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 16d9204a48f5 -r 77cc158ee723 net/overnet/Makefile
--- a/net/overnet/Makefile      Thu Feb 11 22:14:30 2010 +0000
+++ b/net/overnet/Makefile      Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:47 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/11 22:31:25 joerg Exp $
 #
 
 DISTNAME=      overnetclc-1.0.1
@@ -12,6 +12,8 @@
 HOMEPAGE=      http://www.overnet.com/
 COMMENT=       Peer-to-peer file sharing client (binary pkg)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 EMUL_PLATFORMS=                linux-i386
 EMUL_MODULES.linux=    compat
 
@@ -23,17 +25,15 @@
 RPM2PKG_STRIP=         0
 RUN_LDCONFIG=          no
 
-INSTALLATION_DIRS=     bin
+INSTALLATION_DIRS=     bin share/doc/overnetclc share/overnetclc
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/overnetclc
+       ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${DESTDIR}${PREFIX}/bin
 .for f in ChangeLog LISEZMOI README
        ${INSTALL_DATA} ${WRKDIR}/usr/share/doc/overnetclc/${f}         \
-               ${PREFIX}/share/doc/overnetclc
+           ${DESTDIR}${PREFIX}/share/doc/overnetclc
 .endfor
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/overnetclc
        ${INSTALL_DATA} ${WRKSRC}/usr/share/overnetclc/contact.dat      \
-               ${PREFIX}/share/overnetclc
+           ${DESTDIR}${PREFIX}/share/overnetclc
 
 .include "../../mk/bsd.pkg.mk"
diff -r 16d9204a48f5 -r 77cc158ee723 net/queryperf/Makefile
--- a/net/queryperf/Makefile    Thu Feb 11 22:14:30 2010 +0000
+++ b/net/queryperf/Makefile    Thu Feb 11 22:24:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/03/19 16:40:28 tv Exp $
+# $NetBSD: Makefile,v 1.3 2010/02/11 22:34:24 joerg Exp $
 #
 
 DISTNAME=              queryperf-nominum-2.1
@@ -10,20 +10,20 @@
 HOMEPAGE=              ftp://ftp.nominum.com/pub/nominum/
 COMMENT=               DNS performance and load tester
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          queryperf
 USE_PKGINSTALL=                yes
 
 EGDIR=                 share/examples/queryperf
-INSTALLATION_DIRS+=    bin
-OWN_DIRS+=             share/doc/queryperf
-OWN_DIRS+=             ${EGDIR}
+INSTALLATION_DIRS+=    bin share/doc/queryperf ${EGDIR}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/queryperf ${PREFIX}/bin/
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/queryperf/
-       ${INSTALL_SCRIPT} ${WRKSRC}/utils/gen-data-queryperf.py ${PREFIX}/${EGDIR}/
-       ${INSTALL_DATA} ${WRKSRC}/input/sample.* ${PREFIX}/${EGDIR}/
+       ${INSTALL_PROGRAM} ${WRKSRC}/queryperf ${DESTDIR}${PREFIX}/bin/
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/queryperf/
+       ${INSTALL_SCRIPT} ${WRKSRC}/utils/gen-data-queryperf.py ${DESTDIR}${PREFIX}/${EGDIR}/
+       ${INSTALL_DATA} ${WRKSRC}/input/sample.* ${DESTDIR}${PREFIX}/${EGDIR}/
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index