pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/netsaint-plugins Modify the awk script that search...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/41165cc9c61f
branches:  trunk
changeset: 495770:41165cc9c61f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jun 20 02:59:36 2005 +0000

description:
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:

 net/netsaint-plugins/Makefile         |   9 +++++++--
 net/netsaint-plugins/distinfo         |   3 ++-
 net/netsaint-plugins/patches/patch-ad |  16 ++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r c3dbf37b94f5 -r 41165cc9c61f net/netsaint-plugins/Makefile
--- a/net/netsaint-plugins/Makefile     Mon Jun 20 02:01:46 2005 +0000
+++ b/net/netsaint-plugins/Makefile     Mon Jun 20 02:59:36 2005 +0000
@@ -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 @@
 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 -r c3dbf37b94f5 -r 41165cc9c61f net/netsaint-plugins/distinfo
--- a/net/netsaint-plugins/distinfo     Mon Jun 20 02:01:46 2005 +0000
+++ b/net/netsaint-plugins/distinfo     Mon Jun 20 02:59:36 2005 +0000
@@ -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 @@
 SHA1 (patch-aa) = 209680a6ffc320d1da82135027b9a5bd5d905690
 SHA1 (patch-ab) = a2dba2793eb369cbcb77635165f72c719503b5ce
 SHA1 (patch-ac) = c86760de132f6e4995ee04feeaf392214b67f4bf
+SHA1 (patch-ad) = 0f794b92bb4fa5b556987d08ede318e7e254840a
diff -r c3dbf37b94f5 -r 41165cc9c61f net/netsaint-plugins/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/netsaint-plugins/patches/patch-ad     Mon Jun 20 02:59:36 2005 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index