diff options
| -rw-r--r-- | security/zebedee/Makefile | 4 | ||||
| -rw-r--r-- | security/zebedee/distinfo | 4 | ||||
| -rw-r--r-- | security/zebedee/patches/patch-aa | 4 | ||||
| -rw-r--r-- | sysutils/foremost/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/foremost/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/foremost/patches/patch-aa | 6 | ||||
| -rw-r--r-- | sysutils/foremost/patches/patch-ab | 18 |
7 files changed, 26 insertions, 23 deletions
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile index 41ba18dce95..01d0c165057 100644 --- a/security/zebedee/Makefile +++ b/security/zebedee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/01/17 12:02:45 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2010/06/28 10:13:01 joerg Exp $ DISTNAME= zebedee-2.5.3 PKGREVISION= 4 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.winton.org.uk/zebedee/ COMMENT= Simple tunneling program for TCP or UDP with encryption +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake perl tclsh:run MAKE_ENV+= PERL5=${PERL5:Q} diff --git a/security/zebedee/distinfo b/security/zebedee/distinfo index d5d9a237cb0..ca56251a226 100644 --- a/security/zebedee/distinfo +++ b/security/zebedee/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2006/03/08 23:06:40 minskim Exp $ +$NetBSD: distinfo,v 1.10 2010/06/28 10:13:01 joerg Exp $ SHA1 (zebedee-2.5.3.tar.gz) = 54717faade0275929163369942885cc448bc9986 RMD160 (zebedee-2.5.3.tar.gz) = 2b4bee4c5f66f59628308a6c300b4c9d0c854e30 Size (zebedee-2.5.3.tar.gz) = 176088 bytes -SHA1 (patch-aa) = 5ab4c410cc372c1eb1e56f90ff92386b92454b40 +SHA1 (patch-aa) = 925b9240514201c2b60c62b4e302c8332211380d SHA1 (patch-ab) = d7b800bab4b5e0f242b4e0a8545e3364abc3f95b diff --git a/security/zebedee/patches/patch-aa b/security/zebedee/patches/patch-aa index 94a3fba77bf..75d7390beeb 100644 --- a/security/zebedee/patches/patch-aa +++ b/security/zebedee/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2006/03/08 23:06:40 minskim Exp $ +$NetBSD: patch-aa,v 1.9 2010/06/28 10:13:01 joerg Exp $ --- Makefile.orig 2005-09-05 22:59:53.000000000 -0700 +++ Makefile @@ -52,7 +52,7 @@ $NetBSD: patch-aa,v 1.8 2006/03/08 23:06:40 minskim Exp $ # Installation directories for the Linux/Solaris/*NIX World -ROOTDIR = /usr -+ROOTDIR =$(LOCALBASE) ++ROOTDIR =$(DESTDIR)$(PREFIX) BINDIR = $(ROOTDIR)/bin -ZBDDIR = $(ROOTDIR)/lib/zebedee +ZBDDIR = $(ROOTDIR)/share/doc/zebedee diff --git a/sysutils/foremost/Makefile b/sysutils/foremost/Makefile index 4bd0b441dd7..03e7cc78791 100644 --- a/sysutils/foremost/Makefile +++ b/sysutils/foremost/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/02/22 23:19:16 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2010/06/28 10:18:58 joerg Exp $ DISTNAME= foremost-1.4 CATEGORIES= sysutils @@ -8,10 +8,11 @@ MAINTAINER= lkundrak@skosi.org HOMEPAGE= http://foremost.sourceforge.net/ COMMENT= Recover various formats of files using typical data structures +PKG_DESTDIR_SUPPORT= user-destdir + EGDIR= ${PREFIX}/share/examples/foremost CONF_FILES= ${EGDIR}/foremost.conf ${PKG_SYSCONFDIR}/foremost.conf -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/foremost/distinfo b/sysutils/foremost/distinfo index 7179d2b7aa4..ca11c089718 100644 --- a/sysutils/foremost/distinfo +++ b/sysutils/foremost/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/02/22 23:19:16 rillig Exp $ +$NetBSD: distinfo,v 1.3 2010/06/28 10:18:58 joerg Exp $ SHA1 (foremost-1.4.tar.gz) = c6f9f28ae80a57388a8e8a6b958bc8c76797fad4 RMD160 (foremost-1.4.tar.gz) = b2ea590ab78f96e74cb3842ad60dc4f1429244ef Size (foremost-1.4.tar.gz) = 49521 bytes -SHA1 (patch-aa) = 727975dedae9261a4088083931eb709771873062 -SHA1 (patch-ab) = c56e70d64e30c0867beb3fd3ad40336cb6364c31 +SHA1 (patch-aa) = 39f986d19d80efe431d92af7884ae0a395ff9576 +SHA1 (patch-ab) = a5f6eb555818b333faebfc611fbabf8cef49f441 SHA1 (patch-ac) = 7832701bafa1336fda2b4e08ef38bca8ddf29f8d diff --git a/sysutils/foremost/patches/patch-aa b/sysutils/foremost/patches/patch-aa index 3e71ecaea7a..e479db79a82 100644 --- a/sysutils/foremost/patches/patch-aa +++ b/sysutils/foremost/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ +$NetBSD: patch-aa,v 1.2 2010/06/28 10:18:58 joerg Exp $ --- Makefile.orig 2005-11-05 18:12:37.000000000 +0100 +++ Makefile @@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -BIN = /usr/local/bin -MAN = /usr/local/man/man1 -CONF= /usr/local/etc -+BIN = $(PREFIX)/bin -+MAN = $(PREFIX)/$(PKGMANDIR)/man1 ++BIN = ${DESTDIR}$(PREFIX)/bin ++MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1 +CONF= $(PKG_SYSCONFDIR) # Setup for compiling and cross-compiling for Windows # The CR_ prefix refers to cross compiling from OSX to Windows diff --git a/sysutils/foremost/patches/patch-ab b/sysutils/foremost/patches/patch-ab index 18f53005a45..f8de76e886a 100644 --- a/sysutils/foremost/patches/patch-ab +++ b/sysutils/foremost/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ +$NetBSD: patch-ab,v 1.2 2010/06/28 10:18:58 joerg Exp $ --- Makefile.orig 2007-01-26 15:10:20.000000000 +0100 +++ Makefile @@ -12,10 +12,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ # You shouldn't need to change anything below this line #--------------------------------------------------------------------- @@ -27,6 +27,11 @@ RAW_FLAGS += -DVERSION=\"$(VERSION)\" - BIN = $(PREFIX)/bin - MAN = $(PREFIX)/$(PKGMANDIR)/man1 + BIN = ${DESTDIR}$(PREFIX)/bin + MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1 CONF= $(PKG_SYSCONFDIR) -+SAMPLES = $(PREFIX)/share/examples/foremost ++SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost + +# Tell it to config.c +RAW_FLAGS += -DCONFDIR=\"$(CONF)\" @@ -32,10 +32,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -macinstall: MAN = /usr/share/man/man1/ -macinstall: CONF = /usr/local/etc/ + install -m 444 foremost.conf $(SAMPLES) -+macinstall: BIN = $(PREFIX)/bin/ -+macinstall: MAN = $(PREFIX)/$(PKGMANDIR)/man1/ ++macinstall: BIN = ${DESTDIR}$(PREFIX)/bin/ ++macinstall: MAN = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1/ +macinstall: CONF = $(PREFIX)/etc/ -+macinstall: SAMPLES = $(PREFIX)/share/examples/foremost ++macinstall: SAMPLES = ${DESTDIR}$(PREFIX)/share/examples/foremost macinstall: mac install @@ -45,8 +45,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2007/01/26 16:36:29 minskim Exp $ -macuninstall: BIN = /usr/bin -macuninstall: MAN = /usr/share/man/man1 -+macuninstall: BIN = $(PREFIX)/bin -+macuninstall: MAN = $(PREFIX)/$(PKGMANDIR)/man1 ++macuninstall: BIN =${DESTDIR} $(PREFIX)/bin ++macuninstall: MAN =${DESTDIR} $(PREFIX)/$(PKGMANDIR)/man1 macuninstall: uninstall #--------------------------------------------------------------------- |