7 files changed, 40 insertions, 79 deletions

diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile
index 6d84d42c1fa8..e51dcaa91299 100644
--- a/net/netsaint-plugins/Makefile
+++ b/net/netsaint-plugins/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	netsaint-plugins
-PORTVERSION=	1.2.9.3
-PORTREVISION=	2
+PORTVERSION=	1.2.9.4
 CATEGORIES=	net
 MASTER_SITES=	http://download.sourceforge.net/netsaintplug/
-DISTNAME=	${PORTNAME}-1.2.9-3
+DISTNAME=	${PORTNAME}-1.2.9-4
 
-MAINTAINER=	blaz@amis.net
+MAINTAINER=	blaz@si.FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sbindir=${PREFIX}/share/netsaint/sbin \
@@ -31,9 +30,6 @@ pre-fetch:
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
 
-pre-install:
-	${PERL} ${SCRIPTDIR}/createuser
-
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 	
diff --git a/net/netsaint-plugins/distinfo b/net/netsaint-plugins/distinfo
index 57e3a22ebee0..f83d420d0c14 100644
--- a/net/netsaint-plugins/distinfo
+++ b/net/netsaint-plugins/distinfo
@@ -1 +1 @@
-MD5 (netsaint-plugins-1.2.9-3.tar.gz) = 2e9928dcb1d522144ba0bb9a98619035
+MD5 (netsaint-plugins-1.2.9-4.tar.gz) = ef4adb2b9e77abebd3797e5ebe093014
diff --git a/net/netsaint-plugins/files/patch-ab b/net/netsaint-plugins/files/patch-ab
index 4d27df545d40..126c8b052a54 100644
--- a/net/netsaint-plugins/files/patch-ab
+++ b/net/netsaint-plugins/files/patch-ab
@@ -1,5 +1,5 @@
---- configure.in.orig	Tue Mar  6 06:40:44 2001
-+++ configure.in	Mon Apr 16 12:24:22 2001
+--- configure.in.orig	Thu Apr 26 16:00:26 2001
++++ configure.in	Tue May  1 18:28:01 2001
 @@ -7,7 +7,7 @@
  dnl AM_INIT_AUTOMAKE(netsaint-plugins,$VERSION)
  AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
@@ -9,7 +9,18 @@
  
  dnl Figure out how to invoke "install" and what install options to use.
  
-@@ -126,25 +126,37 @@
+@@ -99,8 +99,8 @@
+     AC_CHECK_HEADERS(postgresql/libpq-fe.h)
+     AC_CHECK_HEADERS(libpq-fe.h)
+     if test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
+-      PGLIBS="-lpq -lcrypt"
+-      PGINCLUDE="-I/usr/include/pgsql"
++      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
++      PGINCLUDE="-I$PGSQL/include/pgsql"
+     elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
+       PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+       PGINCLUDE="-I/usr/include/postgresql"
+@@ -128,25 +128,37 @@
  LIBS="$_SAVEDLIBS"
  CPPFLAGS="$_SAVEDCPPFLAGS"
  
@@ -53,7 +64,7 @@
    AC_SUBST(LDAPLIBS)
    AC_SUBST(LDAPINCLUDE)
    EXTRAS="$EXTRAS check_ldap"
-@@ -153,13 +165,14 @@
+@@ -155,13 +167,14 @@
    AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).])
  fi
  LIBS="$_SAVEDLIBS"
@@ -70,7 +81,7 @@
    AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz)
  elif test -f /usr/lib/libmysqlclient.so; then
    AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz)
-@@ -175,7 +188,8 @@
+@@ -177,7 +190,8 @@
    AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql)
  fi
  if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then
@@ -80,7 +91,7 @@
    if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then
      EXTRAS="$EXTRAS check_mysql"
      AC_SUBST(MYSQLLIBS)
-@@ -189,7 +203,7 @@
+@@ -191,7 +205,7 @@
    AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).])
  fi
  LIBS="$_SAVEDLIBS"
@@ -89,7 +100,7 @@
  
  dnl Check for OpenSSL location
  AC_PATH_PROG(OPENSSL,openssl)
-@@ -268,16 +282,16 @@
+@@ -270,16 +284,16 @@
  dnl AC_SUBST(libgetopt_a_DEPENDENCIES)
  dnl AC_SUBST(libsnprintf_a_SOURCES)
  
@@ -115,7 +126,7 @@
  
  AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a")
  
-@@ -328,72 +342,72 @@
+@@ -330,72 +344,72 @@
  	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'")
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
          echo "      ps syntax... $PATH_TO_PS -eo 's  comm vsz rss user ppid args'"
@@ -204,7 +215,7 @@
  	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
  	EXTRAS="$EXTRAS check_netsaint"
 -	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'")
-+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command command'")
++	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'")
  	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n")
 -	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'")
 +	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'")
@@ -217,7 +228,7 @@
  dnl BSD-like mode in RH 6.1
  elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null]
  then
-@@ -407,7 +421,7 @@
+@@ -409,7 +423,7 @@
  	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s")
  	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'")
  	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s")
@@ -226,7 +237,7 @@
  dnl IRIX 53
  elif [ps -el 2>/dev/null | egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null]
  then
-@@ -618,6 +632,8 @@
+@@ -620,6 +634,8 @@
  	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO")
  fi
  
@@ -235,7 +246,7 @@
  AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
  if test -f "$PATH_TO_SNMPGET"
  then
-@@ -626,6 +642,7 @@
+@@ -628,6 +644,7 @@
  else
  	echo "** Get snmpget from http://ucd-snmp.ucdavis.edu to make check_hpjd and check_snmp plugins"
  fi
@@ -243,7 +254,7 @@
  
  AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
  if test -f "$PATH_TO_SNMPGETNEXT"
-@@ -633,6 +650,8 @@
+@@ -635,6 +652,8 @@
  	AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT")
  fi
  
@@ -252,7 +263,7 @@
  AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
  AC_PATH_PROG(PATH_TO_QSTAT,qstat)
  if test -n "$PATH_TO_QUAKESTAT"
-@@ -646,7 +665,10 @@
+@@ -648,7 +667,10 @@
  else
  	echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"
  fi
@@ -263,7 +274,7 @@
  AC_PATH_PROG(PATH_TO_FPING,fping)
  if test -n "$PATH_TO_FPING"
  then
-@@ -654,6 +676,7 @@
+@@ -656,6 +678,7 @@
  	EXTRAS="$EXTRAS check_fping"
  else
  	echo "** Get fping from http://www.stanford.edu/~schemers/docs/fping/fping.html in order to make check_fping plugin"
diff --git a/net/netsaint-plugins/files/patch-ac b/net/netsaint-plugins/files/patch-ac
index 994cda94580f..796ee76bcc2a 100644
--- a/net/netsaint-plugins/files/patch-ac
+++ b/net/netsaint-plugins/files/patch-ac
@@ -1,11 +1,12 @@
---- plugins-scripts/check_ntp.pl.orig	Mon Aug 28 17:00:59 2000
-+++ plugins-scripts/check_ntp.pl	Mon Apr  9 19:37:32 2001
-@@ -153,7 +153,7 @@
+--- plugins-scripts/check_ntp.pl.orig	Mon Apr 23 19:43:00 2001
++++ plugins-scripts/check_ntp.pl	Sun Apr 29 18:38:26 2001
+@@ -154,7 +154,8 @@
  ###
  ###
  
--if (#open(NTPDC,"/usr/sbin/ntpdc -c $host 2>&1 |") ||
-+if (open(NTPDC,"/usr/sbin/ntpdc -c $host 2>&1 |") ||
-     open(NTPDC,"/usr/sbin/xntpdc -c $host 2>&1 |") ) {
+-if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ) {
++if (open(NTPDC,"/usr/sbin/xntpdc -c peers $host 2>&1 |") ||
++    open(NTPDC,"/usr/sbin/ntpdc -c peers $host 2>&1 |")) {
  	while (<NTPDC>) {
  		print if ($verbose);
+ 		if (/([^\s]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
diff --git a/net/netsaint-plugins/pkg-plist b/net/netsaint-plugins/pkg-plist
index dad66c5abf20..2fc85698322f 100644
--- a/net/netsaint-plugins/pkg-plist
+++ b/net/netsaint-plugins/pkg-plist
@@ -19,8 +19,10 @@ libexec/netsaint/check_log
 libexec/netsaint/check_mrtg
 libexec/netsaint/check_mrtgtraf
 %%SUB_MYSQL%%libexec/netsaint/check_mysql
+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
diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure
index efb83034f1d2..1a17d8fb4392 100644
--- a/net/netsaint-plugins/scripts/configure
+++ b/net/netsaint-plugins/scripts/configure
@@ -81,7 +81,7 @@ while [ "$1" ]; do
 			;;
 		\"PostgreSQL\")
 			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/databases/postgresql7"
-			echo "CONFIGURE_ARGS+=	--with-pgsql=\${LOCALBASE}/pgsql"
+			echo "CONFIGURE_ARGS+=	--with-pgsql=\${LOCALBASE}"
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
diff --git a/net/netsaint-plugins/scripts/createuser b/net/netsaint-plugins/scripts/createuser
deleted file mode 100644
index 0ebde3c5496d..000000000000
--- a/net/netsaint-plugins/scripts/createuser
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl
-#
-
-eval '(exit $?0)' && eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
-& eval 'exec /usr/bin/perl -S $0 $argv:q'
-if 0;
-
-if( $> ) {
-	print "\nYou must be root to run this step!\n\n";
-	exit 1;
-} 
-
-if( getpwnam( "netsaint" ) ) {
-	( $null, $null, $nsUID ) = getpwnam( "netsaint" );
-} else {
-	$nsUID = 70;
-	while( getpwuid( $nsUID ) ) {
-		$nsUID++;
-	}
-}
-
-if( getgrnam( "netsaint" ) ) {
-	( $null, $null, $nsGID ) = getgrnam( "netsaint" );
-} else {
-	$nsGID = 70;
-	while( getgrgid( $nsGID ) ) {
-		$nsGID++;
-	}
-	&append_file( "/etc/group", "netsaint:*:$nsGID:" );
-}
-
-print "netsaint user using uid $nsUID and gid $nsGID\n";
-
-system( "/usr/bin/chpass -a \"netsaint:*:$nsUID:$nsGID\:\:0:0:Netsaint pseudo-user:/var/netsaint:/sbin/nologin\"" );
-
-sub append_file {
-	local($file,@list) = @_;
-	local($LOCK_EX) = 2;
-	local($LOCK_NB) = 4;
-	local($LOCK_UN) = 8;
-
-	open(F, ">> $file") || die "$file: $!\n";
-	while( ! flock( F, $LOCK_EX | $LOCK_NB ) ) {
-		exit 1;
-	}
-	print F join( "\n", @list) . "\n";
-	close F;
-	flock( F, $LOCK_UN );
-}