Fix datadir location in perl lib, and allow subjects in mail sent from NetBSD

hosts. Bump to nocol-4.3.1nb2

4 files changed, 31 insertions, 3 deletions

diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index a631c2c5d4d..461d5a563bf 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/11/29 01:12:43 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2002/05/14 08:38:23 abs Exp $
 #
 
 DISTNAME=		nocol-4.3.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net
 MASTER_SITES= 		http://www.netplex-tech.com/software/nocol/downloads/
 
diff --git a/net/nocol/distinfo b/net/nocol/distinfo
index 71dfb655805..34aa72185d4 100644
--- a/net/nocol/distinfo
+++ b/net/nocol/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:25 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/05/14 08:38:24 abs Exp $
 
 SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325
 Size (nocol-4.3.1.tar.gz) = 1117438 bytes
@@ -10,3 +10,5 @@ SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f
 SHA1 (patch-af) = 1c863a4895b893c98ba5bd7ccf2bc8e33a84615f
 SHA1 (patch-ag) = d977f618285d7bb2f80a468fee0260db8d3b77e3
 SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158
+SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d
+SHA1 (patch-aj) = a2c7cb8a54a600194d465a3cf67472806837b0d8
diff --git a/net/nocol/patches/patch-ai b/net/nocol/patches/patch-ai
new file mode 100644
index 00000000000..b1841149429
--- /dev/null
+++ b/net/nocol/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/05/14 08:38:26 abs Exp $
+
+--- perlnocol/nocollib.pl.orig	Tue May  7 09:51:23 2002
++++ perlnocol/nocollib.pl
+@@ -52,7 +52,7 @@
+ $etcdir  = "$nocolroot/etc"  unless $etcdir;	# location of config file
+ $piddir  = "$nocolroot/run"  unless $piddir;	# SET_THIS
+ $bindir  = "$nocolroot/bin"  unless $bindir;
+-$datadir = "$nocolroot/data" unless $datadir;	# output data file
++$datadir = "/var/run/data"   unless $datadir;	# output data file
+ 
+ push(@INC, $bindir); push(@INC, $etcdir); # add to search paths for 'require'
+ $ENV{'PATH'} .= ":$bindir";             # add to path for snmpwalk, etc.
diff --git a/net/nocol/patches/patch-aj b/net/nocol/patches/patch-aj
new file mode 100644
index 00000000000..081aa47a35e
--- /dev/null
+++ b/net/nocol/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2002/05/14 08:38:26 abs Exp $
+
+--- utility/notifier.pl.orig	Tue May  7 09:57:22 2002
++++ utility/notifier.pl
+@@ -256,7 +256,7 @@
+ sub EmailNotify {		# Send email notification of fault
+   local ($id, $address, $message) = @_;
+ 
+-  if ($email_program =~ /ucb/) {
++  if ($^O eq 'netbsd' || $email_program =~ /ucb/) {
+     open(XPIPE, "|$email_program -s \"NOCOL notification: $sitename{i} $siteaddr{$i}\" $address") ||
+       die "Cannot open $email_program.\n";
+   }