pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc DESTDIR support
details: https://anonhg.NetBSD.org/pkgsrc/rev/d157e284c91e
branches: trunk
changeset: 570261:d157e284c91e
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Jan 27 16:52:13 2010 +0000
description:
DESTDIR support
diffstat:
net/tnftpd/Makefile | 20 +++++++++++---------
net/torrentutils/Makefile | 6 +++++-
net/torrentutils/distinfo | 4 ++--
net/torrentutils/patches/patch-aa | 10 +++++-----
net/totd/Makefile | 11 ++++++-----
net/trafshow/Makefile | 8 ++++----
print/mgv/Makefile | 11 +++++++----
security/flawfinder/Makefile | 8 +++++---
security/fragroute/Makefile | 8 +++++---
security/hackbot/Makefile | 14 ++++++++------
security/hashcash/Makefile | 7 ++++---
security/keepassx/Makefile | 7 +++++--
security/libidea/Makefile | 12 +++++++-----
security/libtcpa/Makefile | 13 +++++++------
security/nikto/Makefile | 30 ++++++++++++++----------------
security/priv/Makefile | 6 ++++--
security/qca/Makefile | 5 ++++-
security/qca2-ossl/Makefile | 6 +++++-
security/sign/Makefile | 10 ++++++----
security/snortsnarf/Makefile | 16 ++++++++--------
security/ssldump/Makefile | 7 ++++++-
21 files changed, 128 insertions(+), 91 deletions(-)
diffs (truncated from 645 to 300 lines):
diff -r 5bc0d36b2fc8 -r d157e284c91e net/tnftpd/Makefile
--- a/net/tnftpd/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/net/tnftpd/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/10/09 04:14:28 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 17:30:14 joerg Exp $
#
DISTNAME= tnftpd-20081009
@@ -8,6 +8,8 @@
MAINTAINER= lukem%NetBSD.org@localhost
COMMENT= The NetBSD FTP Daemon
+PKG_DESTDIR_SUPPORT= user-destdir
+
CONFLICTS= wu-ftpd-[0-9]*
CONFLICTS+= kth-krb4-[0-9]*
CONFLICTS+= lukemftpd-[0-9]*
@@ -27,15 +29,15 @@
MAKE_ENV.SunOS+= CPPFLAGS=""
EXAMPLEDIR= ${PREFIX}/share/examples/tnftpd
-INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
+ ${EXAMPLEDIR}
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec
- ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
- ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
- ${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
- ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR}
- ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${DESTDIR}${PREFIX}/libexec
+ ${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpd.conf.5
+ ${INSTALL_MAN} ${WRKSRC}/src/ftpusers.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ftpusers.5
+ ${INSTALL_MAN} ${WRKSRC}/src/tnftpd.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/tnftpd.8
+ ${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${DESTDIR}${EXAMPLEDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${DESTDIR}${EXAMPLEDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e net/torrentutils/Makefile
--- a/net/torrentutils/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/net/torrentutils/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/06/22 17:46:19 tron Exp $
+# $NetBSD: Makefile,v 1.15 2010/01/27 17:31:58 joerg Exp $
DISTNAME= torrentutils-0.3.0
PKGREVISION= 4
@@ -9,6 +9,8 @@
# HOMEPAGE= http://oskarsapps.mine.nu/torrentutils.html
COMMENT= Manage BitTorrent files and interact with trackers
+PKG_DESTDIR_SUPPORT= user-destdir
+
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
@@ -17,4 +19,6 @@
REPLACE_PERL= torrenttool.in
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
+
.include "../../mk/bsd.pkg.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e net/torrentutils/distinfo
--- a/net/torrentutils/distinfo Wed Jan 27 16:41:59 2010 +0000
+++ b/net/torrentutils/distinfo Wed Jan 27 16:52:13 2010 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/12/01 20:30:17 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/01/27 17:31:58 joerg Exp $
SHA1 (torrentutils-0.3.0.tar.gz) = d9487551e5de128c31abe7fc404ec3a51d6a83a0
RMD160 (torrentutils-0.3.0.tar.gz) = bc6dde481113a0a37a1a60fd520c6c28debea34e
Size (torrentutils-0.3.0.tar.gz) = 21697 bytes
-SHA1 (patch-aa) = 634e8f4e3a14f239731924a5aa5078f8cd78b8a6
+SHA1 (patch-aa) = 830df7e0879310b5aaf419ed65fb951e4ce3dff4
SHA1 (patch-ab) = 543d424cb131cdcbe17fb5091c3b7e826294de3c
diff -r 5bc0d36b2fc8 -r d157e284c91e net/torrentutils/patches/patch-aa
--- a/net/torrentutils/patches/patch-aa Wed Jan 27 16:41:59 2010 +0000
+++ b/net/torrentutils/patches/patch-aa Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2004/08/29 19:46:45 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/27 17:31:58 joerg Exp $
--- Makefile.orig 2003-10-12 14:13:16.000000000 +0200
+++ Makefile
@@ -35,10 +35,10 @@
- else \
- echo "$(MCEXTFSDIR) does not exist. Not installing MC extfs support."; \
- fi
-+ ${BSD_INSTALL_SCRIPT} torrenttool $(BINDIR)/torrenttool
-+ ${BSD_INSTALL_SCRIPT} defrag $(BINDIR)
-+ ${BSD_INSTALL_MAN} torrenttool.1 $(MANDIR)/man1
-+ ${BSD_INSTALL_MAN} defrag.1 $(MANDIR)/man1
++ ${BSD_INSTALL_SCRIPT} torrenttool ${DESTDIR}$(BINDIR)/torrenttool
++ ${BSD_INSTALL_SCRIPT} defrag ${DESTDIR}$(BINDIR)
++ ${BSD_INSTALL_MAN} torrenttool.1 ${DESTDIR}$(MANDIR)/man1
++ ${BSD_INSTALL_MAN} defrag.1 ${DESTDIR}$(MANDIR)/man1
clean:
rm -f torrenttool torrentmcfs defrag torrentutils.spec
diff -r 5bc0d36b2fc8 -r d157e284c91e net/totd/Makefile
--- a/net/totd/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/net/totd/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/02/28 11:58:48 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2010/01/27 17:32:12 joerg Exp $
#
DISTNAME= totd-1.5.1
@@ -16,14 +16,15 @@
PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability
PKG_OPTIONS_GROUP.inet6= inet6
-AUTO_MKDIRS= yes
BUILDLINK_TRANSFORM+= rm:-Werror
+INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 share/examples/totd
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/totd ${PREFIX}/sbin/
- ${INSTALL_MAN} ${WRKSRC}/totd.8 ${PREFIX}/${PKGMANDIR}/man8/
+ ${INSTALL_PROGRAM} ${WRKSRC}/totd ${DESTDIR}${PREFIX}/sbin/
+ ${INSTALL_MAN} ${WRKSRC}/totd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/
${INSTALL_DATA} ${FILESDIR}/totd.conf.sample \
- ${PREFIX}/share/examples/totd/totd.conf.sample
+ ${DESTDIR}${PREFIX}/share/examples/totd/totd.conf.sample
.include "../../mk/bsd.options.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e net/trafshow/Makefile
--- a/net/trafshow/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/net/trafshow/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/10/18 09:32:43 obache Exp $
+# $NetBSD: Makefile,v 1.31 2010/01/27 17:32:54 joerg Exp $
DISTNAME= trafshow-5.2.3
CATEGORIES= net
@@ -26,10 +26,10 @@
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/examples/trafshow
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
${INSTALL_DATA} ${WRKSRC}/.trafshow \
- ${PREFIX}/share/examples/trafshow/trafshow
+ ${DESTDIR}${PREFIX}/share/examples/trafshow/trafshow
BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.8.1
.include "../../net/libpcap/buildlink3.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e print/mgv/Makefile
--- a/print/mgv/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/print/mgv/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/06/30 00:07:22 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/01/27 17:29:01 joerg Exp $
DISTNAME= mgv-3.1.5
PKGREVISION= 4
@@ -9,6 +9,8 @@
HOMEPAGE= http://web.archive.org/web/20020201231345/http://www.trends.net/~mu/mgv.html
COMMENT= Motif/LessTif user interface for Ghostscript
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
@@ -18,10 +20,11 @@
CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include
CONFIGURE_ARGS+= --with-motif-libs=${MOTIFBASE}/lib
+INSTALLATION_DIRS+= share/doc/html
+
post-install:
- ${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${PREFIX}/share/mgv/3.1.5/help
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
- ${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.gif ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help
+ ${LN} -fs ${DESTDIR}${PREFIX}/share/mgv/3.1.5/help ${DESTDIR}${PREFIX}/share/doc/html/mgv
.include "../../x11/libXpm/buildlink3.mk"
.include "../../mk/motif.buildlink3.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e security/flawfinder/Makefile
--- a/security/flawfinder/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/security/flawfinder/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2010/01/27 17:21:29 joerg Exp $
DISTNAME= flawfinder-1.27
PKGREVISION= 1
@@ -9,13 +9,15 @@
HOMEPAGE= http://www.dwheeler.com/flawfinder/
COMMENT= Python program to find flaws in C/C++ programs
+PKG_DESTDIR_SUPPORT= user-destdir
+
NO_BUILD= yes
PYTHON_PATCH_SCRIPTS= flawfinder
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/flawfinder ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/flawfinder.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e security/fragroute/Makefile
--- a/security/fragroute/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/security/fragroute/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/08/16 15:35:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/01/27 17:24:23 joerg Exp $
DISTNAME= fragroute-1.2
PKGREVISION= 11
@@ -9,6 +9,7 @@
HOMEPAGE= http://www.monkey.org/~dugsong/fragroute/
COMMENT= Tool for intercepting, modifying and rewriting egress traffic
+PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-libdnet=${BUILDLINK_PREFIX.libdnet}
@@ -19,10 +20,11 @@
frag-6 frag-7-unix frag-7-win32 ins-2 ins-3 tcbc-2 tcp-3 tcp-5 \
tcp-7 tcp-9
+INSTALLATION_DIRS+= share/fragroute
+
pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/fragroute
.for FILE in ${SCRIPTS}
- ${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${PREFIX}/share/fragroute
+ ${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${DESTDIR}${PREFIX}/share/fragroute
.endfor
.include "../../net/libpcap/buildlink3.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e security/hackbot/Makefile
--- a/security/hackbot/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/security/hackbot/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/12/02 12:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/27 17:17:27 joerg Exp $
DISTNAME= hackbot-2.15
CATEGORIES= security net
@@ -9,21 +9,23 @@
HOMEPAGE= http://ws.obit.nl/hackbot/
COMMENT= Vulnerability scanner written in Perl
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}/hackbot
MANCOMPRESSED= YES
USE_TOOLS+= perl:run
REPLACE_PERL= hackbot.pl
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/hackbot
do-build:
${SED} "s,/usr/local/etc,${PREFIX}/share/hackbot,g" ${WRKSRC}/hackbot.pl > ${WRKSRC}/hackbot.pl.done
${MV} ${WRKSRC}/hackbot.pl.done ${WRKSRC}/hackbot.pl
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/hackbot
- ${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/cgi.db ${WRKSRC}/fingerprint.db ${PREFIX}/share/hackbot
- ${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/hackbot.pl ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/cgi.db ${WRKSRC}/fingerprint.db \
+ ${DESTDIR}${PREFIX}/share/hackbot
+ ${INSTALL_MAN} ${WRKSRC}/hackbot.1.gz ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"
diff -r 5bc0d36b2fc8 -r d157e284c91e security/hashcash/Makefile
--- a/security/hashcash/Makefile Wed Jan 27 16:41:59 2010 +0000
+++ b/security/hashcash/Makefile Wed Jan 27 16:52:13 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/03/19 16:40:28 tv Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/27 17:13:24 joerg Exp $
#
DISTNAME= hashcash-1.22
@@ -10,6 +10,7 @@
HOMEPAGE= http://www.hashcash.org/
COMMENT= Hash collision based postage stamp
+PKG_DESTDIR_SUPPORT= user-destdir
Home |
Main Index |
Thread Index |
Old Index