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/3ca61820475b
branches: trunk
changeset: 554600:3ca61820475b
user: joerg <joerg%pkgsrc.org@localhost>
date: Mon Feb 16 18:44:40 2009 +0000
description:
DESTDIR support
diffstat:
net/ncftp3/Makefile | 6 +++++-
security/sniff/Makefile | 6 ++++--
security/sniff/distinfo | 4 ++--
security/sniff/patches/patch-aa | 6 +++---
sysutils/daemontools/Makefile | 11 +++++------
sysutils/safetynet/Makefile | 13 +++++++------
sysutils/tdir/Makefile | 13 +++++++------
textproc/rfcutil/Makefile | 6 ++++--
8 files changed, 37 insertions(+), 28 deletions(-)
diffs (207 lines):
diff -r bfa6f7dc333a -r 3ca61820475b net/ncftp3/Makefile
--- a/net/ncftp3/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/net/ncftp3/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/07 15:14:44 recht Exp $
+# $NetBSD: Makefile,v 1.20 2009/02/16 18:44:40 joerg Exp $
DISTNAME= ncftp-3.1.9-src
PKGNAME= ncftp3-3.1.9
@@ -9,6 +9,10 @@
HOMEPAGE= http://www.ncftp.com/
COMMENT= FTP replacement with advanced user interface
+PKG_DESTDIR_SUPPORT= user-destdir
+
+INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
GNU_CONFIGURE= yes
diff -r bfa6f7dc333a -r 3ca61820475b security/sniff/Makefile
--- a/security/sniff/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/security/sniff/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/04/07 18:04:40 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2009/02/16 18:49:58 joerg Exp $
#
DISTNAME= sniff-2.0
@@ -8,7 +8,9 @@
MAINTAINER= zuntum%NetBSD.org@localhost
COMMENT= Program to sniff logins and passwords
-INSTALLATION_DIRS= sbin
+PKG_DESTDIR_SUPPORT= user-destdir
+
+INSTALLATION_DIRS= ${PKGMANDIR}/man1 sbin
.include "../../mk/bsd.prefs.mk"
diff -r bfa6f7dc333a -r 3ca61820475b security/sniff/distinfo
--- a/security/sniff/distinfo Mon Feb 16 18:39:36 2009 +0000
+++ b/security/sniff/distinfo Mon Feb 16 18:44:40 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:10:13 agc Exp $
+$NetBSD: distinfo,v 1.5 2009/02/16 18:49:58 joerg Exp $
SHA1 (sniff-2.0.tar.gz) = 9e9ef76eaccaa6cbb3c23054a29a08dd9faed328
RMD160 (sniff-2.0.tar.gz) = 8879f5ffcfc3f59fcde7cbc5c103d7c7f4947c4b
Size (sniff-2.0.tar.gz) = 10720 bytes
-SHA1 (patch-aa) = 8e5d7967940c60f3bb6c53ab053e7c95c7371605
+SHA1 (patch-aa) = 52fa7e4382fa4abe5357af3ad0cbded00939b1e0
diff -r bfa6f7dc333a -r 3ca61820475b security/sniff/patches/patch-aa
--- a/security/sniff/patches/patch-aa Mon Feb 16 18:39:36 2009 +0000
+++ b/security/sniff/patches/patch-aa Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2003/10/06 07:53:04 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2009/02/16 18:49:58 joerg Exp $
--- Makefile.orig Thu Feb 15 04:47:36 2001
+++ Makefile
@@ -25,8 +25,8 @@
install:
- $(CP) sniff2 $(INSTALL_DIR)
- $(CP) sniff2.1 $(INSTALL_MAN)/man1
-+ $(BSD_INSTALL_PROGRAM) sniff2 $(INSTALL_DIR)
-+ $(BSD_INSTALL_MAN) sniff2.1 $(INSTALL_MAN)/man1
++ $(BSD_INSTALL_PROGRAM) sniff2 ${DESTDIR}$(INSTALL_DIR)
++ $(BSD_INSTALL_MAN) sniff2.1 ${DESTDIR}$(INSTALL_MAN)/man1
clean:
$(RM) $(OBJS) sniff2
diff -r bfa6f7dc333a -r 3ca61820475b sysutils/daemontools/Makefile
--- a/sysutils/daemontools/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/sysutils/daemontools/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2008/02/19 21:12:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2009/02/16 18:46:42 joerg Exp $
DISTNAME= daemontools-0.76
PKGREVISION= 1
@@ -17,6 +17,7 @@
DJB_RESTRICTED= no
PKG_INSTALLATION_TYPES= overwrite pkgviews
+PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/admin/${DISTNAME}
DJB_SLASHPACKAGE= YES
@@ -30,15 +31,13 @@
do-install:
(while read cmd; do \
if ${FILE_CMD} ${CMDDIR}/$$cmd | ${EGREP} "(executable .* script|shell script|text)" >/dev/null 2>&1; then \
- ${INSTALL_SCRIPT} ${CMDDIR}/$$cmd ${PREFIX}/bin; \
+ ${INSTALL_SCRIPT} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \
else \
- ${INSTALL_PROGRAM} ${CMDDIR}/$$cmd ${PREFIX}/bin; \
+ ${INSTALL_PROGRAM} ${CMDDIR}/$$cmd ${DESTDIR}${PREFIX}/bin; \
fi \
done) < ${WRKSRC}/package/commands
-
-post-install:
cd ${WRKDIR}/*-man; for i in 8; do \
- for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \
+ for j in *.$$i; do ${INSTALL_MAN} $$j ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \
done
.include "../../mk/djbware.mk"
diff -r bfa6f7dc333a -r 3ca61820475b sysutils/safetynet/Makefile
--- a/sysutils/safetynet/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/sysutils/safetynet/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2009/02/16 18:51:16 joerg Exp $
#
DISTNAME= safetynet-1.15
@@ -9,11 +9,13 @@
HOMEPAGE= http://www.unixpimps.org/safetynet/
COMMENT= Safetynet is a perl script intended to monitor system services
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
NO_BUILD= YES
USE_TOOLS+= perl:run
-INSTALLATION_DIRS= bin etc
+INSTALLATION_DIRS= bin etc share/doc/safetynet
post-patch:
${SED} -e "s,/etc/safetynet.conf,${PREFIX}/etc/safetynet.conf,g" \
@@ -28,9 +30,8 @@
${MV} ${WRKSRC}/safetynet.conf.done ${WRKSRC}/safetynet.conf
do-install:
- ${INSTALL_SCRIPT} -m 700 ${WRKSRC}/safetynet ${PREFIX}/bin/safetynet
- ${INSTALL_DATA} -m 600 ${WRKSRC}/safetynet.conf ${PREFIX}/etc/safetynet.conf.sample
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/safetynet
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/safetynet/README
+ ${INSTALL_SCRIPT} -m 700 ${WRKSRC}/safetynet ${DESTDIR}${PREFIX}/bin/safetynet
+ ${INSTALL_DATA} -m 600 ${WRKSRC}/safetynet.conf ${DESTDIR}${PREFIX}/etc/safetynet.conf.sample
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/safetynet/README
.include "../../mk/bsd.pkg.mk"
diff -r bfa6f7dc333a -r 3ca61820475b sysutils/tdir/Makefile
--- a/sysutils/tdir/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/sysutils/tdir/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2009/02/09 22:56:26 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2009/02/16 18:47:43 joerg Exp $
#
DISTNAME= tdir-1.58
@@ -9,20 +9,21 @@
MAINTAINER= zuntum%NetBSD.org@localhost
COMMENT= Display directories with files ordered by ending "extension"
+PKG_DESTDIR_SUPPORT= user-destdir
+
LICENSE= tdir-license
NOT_FOR_BULK_PLATFORM= HPUX-*-*
USE_TOOLS+= gunzip
PYTHON_PATCH_SCRIPTS= tdir
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/tdir
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/tdir ${PREFIX}/bin/tdir
+ ${INSTALL_SCRIPT} ${WRKSRC}/tdir ${DESTDIR}${PREFIX}/bin/tdir
${GUNZIP_CMD} ${WRKSRC}/tdir.1.gz
- ${INSTALL_MAN} ${WRKSRC}/tdir.1 ${PREFIX}/${PKGMANDIR}/man1/tdir.1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdir
- ${INSTALL_DATA} ${WRKSRC}/tdir-license.txt ${PREFIX}/share/doc/tdir/
+ ${INSTALL_MAN} ${WRKSRC}/tdir.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/tdir.1
+ ${INSTALL_DATA} ${WRKSRC}/tdir-license.txt ${DESTDIR}${PREFIX}/share/doc/tdir/
.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff -r bfa6f7dc333a -r 3ca61820475b textproc/rfcutil/Makefile
--- a/textproc/rfcutil/Makefile Mon Feb 16 18:39:36 2009 +0000
+++ b/textproc/rfcutil/Makefile Mon Feb 16 18:44:40 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/01/04 15:37:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2009/02/16 18:48:54 joerg Exp $
#
DISTNAME= rfc-3.2
@@ -12,6 +12,8 @@
HOMEPAGE= http://www.dewn.com/rfc/
COMMENT= Search for RFCs and do ports, services & protocol lookups
+PKG_DESTDIR_SUPPORT= user-destdir
+
WRKSRC= ${WRKDIR}
EXTRACT_ONLY= #
@@ -31,6 +33,6 @@
<${DISTDIR}/${DISTNAME} >${WRKSRC}/rfc
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/rfc ${PREFIX}/bin/rfc
+ ${INSTALL_SCRIPT} ${WRKSRC}/rfc ${DESTDIR}${PREFIX}/bin/rfc
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index