diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-20 02:59:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-20 02:59:36 +0000 |
| commit | 55f72a3ba0a4dd8b6845114bee51fa3d44d0fef3 (patch) | |
| tree | 675acb4f06ebe01690ce95eb840ffd39382f0860 /net | |
| parent | 478ce2ccd0481c20c16bb5cd35900d47e6de6e49 (diff) | |
| download | pkgsrc-55f72a3ba0a4dd8b6845114bee51fa3d44d0fef3.tar.gz | |
Modify the awk script that searches the PATH for tools to avoid looking
at any directories starting with ${WRKDIR}. This fixes the various
netsaint plugin scripts that had hardcoded ${WRKDIR} paths to tools.
Bump the PKGREVISION to 8.
Diffstat (limited to 'net')
| -rw-r--r-- | net/netsaint-plugins/Makefile | 9 | ||||
| -rw-r--r-- | net/netsaint-plugins/distinfo | 3 | ||||
| -rw-r--r-- | net/netsaint-plugins/patches/patch-ad | 16 |
3 files changed, 25 insertions, 3 deletions
diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile index 70080f7604f..2a3dfcfcb34 100644 --- a/net/netsaint-plugins/Makefile +++ b/net/netsaint-plugins/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:52 tv Exp $ +# $NetBSD: Makefile,v 1.22 2005/06/20 02:59:36 jlam Exp $ # DISTNAME= netsaint-plugins-1.2.9-4 PKGNAME= netsaint-plugins-1.2.9.4 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netsaintplug/} @@ -26,6 +26,11 @@ CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql CONFIGURE_ARGS+= --with-df-command="/bin/df -Pklt nokernfs,procfs,fdesc" .endif +SUBST_CLASSES+= wrkdir +SUBST_STAGE.wrkdir= pre-configure +SUBST_SED.wrkdir= -e "s|@WRKDIR@|${WRKDIR:Q}|" +SUBST_FILES.wrkdir= plugins-scripts/subst.in + .include "../../security/openssl/buildlink3.mk" .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo index c428df124f7..3c9067eff1c 100644 --- a/net/netsaint-plugins/distinfo +++ b/net/netsaint-plugins/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2005/02/24 12:13:54 agc Exp $ +$NetBSD: distinfo,v 1.10 2005/06/20 02:59:36 jlam Exp $ SHA1 (netsaint-plugins-1.2.9-4.tar.gz) = d4d6a52c0f5ca8470cd9b9ee52d427b2ecf940e6 RMD160 (netsaint-plugins-1.2.9-4.tar.gz) = c89e6a7e3ff81587d22ce124551a0385be916438 @@ -6,3 +6,4 @@ Size (netsaint-plugins-1.2.9-4.tar.gz) = 352023 bytes SHA1 (patch-aa) = 209680a6ffc320d1da82135027b9a5bd5d905690 SHA1 (patch-ab) = a2dba2793eb369cbcb77635165f72c719503b5ce SHA1 (patch-ac) = c86760de132f6e4995ee04feeaf392214b67f4bf +SHA1 (patch-ad) = 0f794b92bb4fa5b556987d08ede318e7e254840a diff --git a/net/netsaint-plugins/patches/patch-ad b/net/netsaint-plugins/patches/patch-ad new file mode 100644 index 00000000000..4417a22ede7 --- /dev/null +++ b/net/netsaint-plugins/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1 2005/06/20 02:59:36 jlam Exp $ + +--- plugins-scripts/subst.in.orig 2000-08-31 23:47:35.000000000 -0400 ++++ plugins-scripts/subst.in +@@ -21,6 +21,11 @@ function which(c,path) { + + BEGIN { + split(ENVIRON["PATH"] ":/sbin:/usr/sbin",path,/:/); ++ for (dir in path) { ++ if (path[dir] ~ "@WRKDIR@") { ++ delete path[dir]; ++ } ++ } + } + + # scripting language (first line) |