Update netsaint-plugins to 1.2.9.4. Provided in PR pkg/15992 by Murray

Armfield <murray@river-styx.org>.  This is part of the netsaint update
to 0.0.7. Please see the previous commit message on netsaint-0.0.7 for
a summary of changes.

6 files changed, 45 insertions, 101 deletions

diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index ef09e2edcaa..e5ed4402494 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -1,24 +1,31 @@
-# $NetBSD: Makefile,v 1.6 2002/03/22 11:00:34 rh Exp $
+# $NetBSD: Makefile,v 1.7 2002/03/25 12:58:46 rh Exp $
 #
 
-DISTNAME=	netsaint-plugins-1.2.8-4
-PKGNAME=	netsaint-plugins-1.2.8.4
-PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netsaintplug/}
+DISTNAME=		netsaint-plugins-1.2.9-4
+PKGNAME=		netsaint-plugins-1.2.9.4
+CATEGORIES=		net
+MASTER_SITES=		http://prdownloads.sourceforge.net/netsaintplug/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://netsaintplug.sourceforge.net/
-COMMENT=	basic monitoring plugins for netsaint
+MAINTAINER=		murray@river-styx.org
+HOMEPAGE=		http://netsaintplug.sourceforge.net/
+COMMENT=		NetSaint plugins
 
-DEPENDS+=	netsaint-base-[0-9]*:../../net/netsaint-base
+DEPENDS+=		autoconf>=2.13:../../devel/autoconf
+DEPENDS+=		automake>=1.4.5:../../devel/automake
+DEPENDS+=		netsaint-base-[0-9]*:../../net/netsaint-base
 .if !exists(/usr/bin/ssh)
-DEPENDS+=	{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh
+DEPENDS+=		{ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/ssh
 .endif
 
-USE_SSL=	YES
-USE_PERL5=	YES
+USE_SSL=		YES
 
 .include "../../net/netsaint-base/Makefile.common"
 
+pre-configure:
+	cd ${WRKSRC};	\
+	${LOCALBASE}/bin/aclocal;	\
+	${LOCALBASE}/bin/autoheader;	\
+	${LOCALBASE}/bin/automake -a --foreign -i;	\
+	${LOCALBASE}/bin/autoconf
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netsaint-plugins/PLIST b/net/netsaint-plugins/PLIST
index 6deeabc8dbd..e9659613d78 100644
--- a/net/netsaint-plugins/PLIST
+++ b/net/netsaint-plugins/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:53 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/25 12:58:46 rh Exp $
 libexec/netsaint/check_breeze
 libexec/netsaint/check_by_ssh
+libexec/netsaint/check_dig
 libexec/netsaint/check_disk
 libexec/netsaint/check_disk_smb
 libexec/netsaint/check_dns
@@ -14,8 +15,10 @@ libexec/netsaint/check_load
 libexec/netsaint/check_log
 libexec/netsaint/check_mrtg
 libexec/netsaint/check_mrtgtraf
+libexec/netsaint/check_netdns
 libexec/netsaint/check_netsaint
 libexec/netsaint/check_nntp
+libexec/netsaint/check_nt
 libexec/netsaint/check_ntp
 libexec/netsaint/check_nwstat
 libexec/netsaint/check_oracle
@@ -24,7 +27,6 @@ libexec/netsaint/check_ping
 libexec/netsaint/check_pop
 libexec/netsaint/check_procs
 libexec/netsaint/check_real
-libexec/netsaint/check_reply
 libexec/netsaint/check_rpc
 libexec/netsaint/check_sensors
 libexec/netsaint/check_smtp
@@ -37,3 +39,5 @@ libexec/netsaint/check_users
 libexec/netsaint/check_vsz
 libexec/netsaint/check_wave
 libexec/netsaint/urlize
+libexec/netsaint/utils.pm
+libexec/netsaint/utils.sh
diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo
index 8d5e3f132b0..de3fb52a504 100644
--- a/net/netsaint-plugins/distinfo
+++ b/net/netsaint-plugins/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:25 wiz Exp $
 
-SHA1 (netsaint-plugins-1.2.8-4.tar.gz) = b6800aed3d58a98ff3d6772d17ccbec81c8fe8ba
-Size (netsaint-plugins-1.2.8-4.tar.gz) = 753261 bytes
-SHA1 (patch-aa) = 70ef1598c95efd145a17b757033bcf7a1fa4a362
-SHA1 (patch-ab) = e95df758c3a3204497745bb487d90bae6821c7c5
-SHA1 (patch-ac) = 7789522fe4ce90cf527bd8e45cf7545f8e910c9d
+SHA1 (netsaint-plugins-1.2.9-4.tar.gz) = d4d6a52c0f5ca8470cd9b9ee52d427b2ecf940e6
+Size (netsaint-plugins-1.2.9-4.tar.gz) = 352023 bytes
+SHA1 (patch-aa) = aae3fd6668a75dbc19e5c2545c5030116f19ab01
diff --git a/net/netsaint-plugins/patches/patch-aa b/net/netsaint-plugins/patches/patch-aa
index 2fbb92682a2..5e8c0ce23f9 100644
--- a/net/netsaint-plugins/patches/patch-aa
+++ b/net/netsaint-plugins/patches/patch-aa
@@ -1,58 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/16 15:43:29 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/03/25 12:58:47 rh Exp $
 
---- configure.orig	Tue Jan 16 13:33:07 2001
-+++ configure
-@@ -1830,7 +1830,7 @@
- LIBS="$ac_save_LIBS"
- 
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+if false; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_lib=HAVE_LIB`echo pq | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-@@ -2038,7 +2038,7 @@
- LIBS="$ac_save_LIBS"
- 
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+if false; then
-   echo "$ac_t""yes" 1>&6
-     ac_tr_lib=HAVE_LIB`echo ldap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-@@ -2052,7 +2052,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
+--- configure.in.orig	Fri Apr 27 00:00:26 2001
++++ configure.in
+@@ -144,7 +144,7 @@
+ dnl Check for LDAP libraries
+ _SAVEDLIBS="$LIBS"
+ AC_CHECK_LIB(ldap,main,,,-llber)
 -if test "$ac_cv_lib_ldap_main" = "yes"; then
 +if false; then
    LDAPLIBS="-lldap -llber"\
    LDAPINCLUDE="-I/usr/include/ldap"
-   
-@@ -2068,7 +2068,7 @@
- echo $ac_n "checking for mysql_init in -lmysqlclient""... $ac_c" 1>&6
- echo "configure:2070: checking for mysql_init in -lmysqlclient" >&5
- ac_lib_var=`echo mysqlclient'_'mysql_init | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+if false; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
-@@ -3779,7 +3779,7 @@
-   ;;
- esac
+   AC_SUBST(LDAPLIBS)
+@@ -621,7 +621,7 @@
  fi
--PATH_TO_SNMPGET="$ac_cv_path_PATH_TO_SNMPGET"
-+PATH_TO_SNMPGET=""
- if test -n "$PATH_TO_SNMPGET"; then
-   echo "$ac_t""$PATH_TO_SNMPGET" 1>&6
- else
-@@ -3871,7 +3871,7 @@
-   ;;
- esac
- fi
--PATH_TO_FPING="$ac_cv_path_PATH_TO_FPING"
-+PATH_TO_FPING=""
- if test -n "$PATH_TO_FPING"; then
-   echo "$ac_t""$PATH_TO_FPING" 1>&6
- else
+ 
+ AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
+-if test -f "$PATH_TO_SNMPGET"
++if false;
+ then
+ 	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET")
+ 	EXTRAS="$EXTRAS check_hpjd check_snmp"
diff --git a/net/netsaint-plugins/patches/patch-ab b/net/netsaint-plugins/patches/patch-ab
deleted file mode 100644
index 159d65af14d..00000000000
--- a/net/netsaint-plugins/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/01/16 16:25:05 rh Exp $
-
---- plugins/Makefile.in.orig	Tue Jan 16 17:12:27 2001
-+++ plugins/Makefile.in
-@@ -58,8 +58,7 @@
- 	rm -f *~ t/*~
- 
- install:
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(INSTALL_DIR)
--	for file in $(PLUGINS) $(EXTRAS); do if test -x $$file; then $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(INSTALL_DIR); fi; done
-+	for file in $(PLUGINS) $(EXTRAS); do if test -x $$file; then ${BSD_INSTALL_PROGRAM} $$file $(DESTDIR)$(INSTALL_DIR); fi; done
- 
- install-base:
- 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(INSTALL_DIR)
diff --git a/net/netsaint-plugins/patches/patch-ac b/net/netsaint-plugins/patches/patch-ac
deleted file mode 100644
index a8cc2e78905..00000000000
--- a/net/netsaint-plugins/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/01/16 16:25:05 rh Exp $
-
---- plugins-scripts/Makefile.in.orig	Wed Jun 14 22:44:21 2000
-+++ plugins-scripts/Makefile.in
-@@ -17,8 +17,7 @@
- all: $(SCRIPT)
- 
- install: 
--	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(INSTALL_DIR)
--	for file in $(SCRIPT); do $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(INSTALL_DIR); done
-+	for file in $(SCRIPT); do ${BSD_INSTALL_SCRIPT} $$file $(DESTDIR)$(INSTALL_DIR); done
- 
- test:
- 	$(PERL) ../test.pl t/*.t