update to nut 0.50.0. notable changes:

- change from tcp/ip port 3305 to the IANA assigned 3493
- all old-style drivers have been deprecated:
	aeg bestfort bestuferrups engetron ipt-anzen
	mgeups multilink mustekups optiups sms
	toshiba1500 ups-trust425+625 upseyeux
- newvictron renamed to victronups
- newpowercom renamed to powercom, replacing previous powercom
  and ups-trust425+625 as well

6 files changed, 45 insertions, 49 deletions

diff --git a/sysutils/ups-nut-cgi/DESCR b/sysutils/ups-nut-cgi/DESCR
index 5a76a0c57b7..167a3054f47 100644
--- a/sysutils/ups-nut-cgi/DESCR
+++ b/sysutils/ups-nut-cgi/DESCR
@@ -1 +1 @@
-ups-nut-cgi provides CGI scripts to monitor UPS status via WEB browser.
+ups-nut-cgi provides CGI scripts to monitor UPS status via a web browser.
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index beb249cda1a..76045f6aee5 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2002/05/13 15:15:23 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2002/07/03 11:57:14 lukem Exp $
 
-DISTNAME=		nut-0.45.5
-PKGNAME=		ups-nut-cgi-0.45.5
-PKGREVISION=		1
+DISTNAME=		nut-0.50.0
+PKGNAME=		ups-nut-cgi-0.50.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.exploits.org/nut/release/
 
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 0b136e964e5..4767e05580a 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2002/05/13 15:15:24 lukem Exp $
+$NetBSD: distinfo,v 1.9 2002/07/03 11:57:14 lukem Exp $
 
-SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3
-Size (nut-0.45.5.tar.gz) = 386936 bytes
-SHA1 (patch-aa) = 6057ca39afdfc4e49380c8f4d35f2371df9fe549
+SHA1 (nut-0.50.0.tar.gz) = b8826f2e7301e5c753ac946574a53d651faf69c3
+Size (nut-0.50.0.tar.gz) = 382755 bytes
+SHA1 (patch-aa) = cd7b96973d696c1a1f1051fc30c516e158c89ec5
 SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3
 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f
-SHA1 (patch-ad) = 7c705b7d1d70962f3f39f399753f585d439032fb
-SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975
+SHA1 (patch-ad) = 3620c734b396a2de657b6dceb7d5ba3cc821250b
+SHA1 (patch-ae) = 6cff43dc5ed449a8f3c9b1e4864a47336b69fb30
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index ff6b6033e2c..d2e8e5fa0fd 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $
+$NetBSD: patch-aa,v 1.5 2002/07/03 11:57:14 lukem Exp $
 
---- Makefile.in.orig	Fri Mar  8 23:21:11 2002
+--- Makefile.in.orig	Wed Apr 17 00:00:49 2002
 +++ Makefile.in
-@@ -9,9 +9,10 @@
+@@ -9,7 +9,7 @@ MODELPATH   = $(INSTALLROOT)@MODELPATH@
  INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
  STATEPATH   = $(INSTALLROOT)@STATEPATH@
  
@@ -10,11 +10,8 @@ $NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $
 +SUBDIRS	= common
  CFLAGS	= -I../include @CFLAGS@
  
-+
  # these are here so they can be overridden during a make install
- RUNUID=@RUN_AS_USER@
- RUNGID=@RUN_AS_GROUP@
-@@ -64,7 +65,7 @@
+@@ -65,7 +65,7 @@ install-dirs:
  install-man:
  	@cd man; $(MAKE) install; cd ..;
  
@@ -23,7 +20,7 @@ $NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $
  	@cd clients; $(MAKE) cgi; cd ..;
  
  install-cgi: install-dirs 
-@@ -72,7 +73,6 @@
+@@ -73,7 +73,6 @@ install-cgi: install-dirs 
  		./install-sh -d $(CGIPATH) || exit 1; \
  	fi \
  
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index 5d15ecc59e6..a23d45a27b8 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
+$NetBSD: patch-ad,v 1.6 2002/07/03 11:57:14 lukem Exp $
 
---- configure.in.orig	Tue Feb 26 05:46:25 2002
+--- configure.in.orig	Tue Apr 16 23:34:38 2002
 +++ configure.in
-@@ -16,6 +16,7 @@
+@@ -18,6 +18,7 @@ dnl | default values for things later on
  STATEPATH="/var/state/ups"
  MODELPATH="$prefix/bin"
  CGIPATH="$prefix/cgi-bin"
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
  RUN_AS_USER="nobody"
  RUN_AS_GROUP="nogroup"
  PIDPATH="/var/run"
-@@ -120,9 +121,43 @@
+@@ -118,9 +119,43 @@ if ( test x"$ac_cv_func_connect" = x"no"
  	], [], [])
  fi
  
@@ -54,7 +54,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
  
  dnl Include in case GD was compiled with Xpm support
  AC_CHECK_LIB(X11, XBell,
-@@ -131,13 +166,16 @@
+@@ -129,13 +164,16 @@ AC_CHECK_LIB(X11, XBell,
  	       echo "Retrying with -L /usr/X11R6/lib"
                 unset ac_cv_lib_X11_XBell
  		AC_CHECK_LIB(X11, XBell,
@@ -73,7 +73,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
  dnl   Skip this chunk if there's no LIBX to use
  
  if test "$LIBX" != "" 
-@@ -145,69 +183,34 @@
+@@ -143,69 +181,35 @@ then
  
  	dnl Include in case GD was compiled with Xpm support
  	AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
@@ -120,7 +120,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
 -[-lm -lpng -lz],
 +[$GRAPHICS_LIBS -lm -lpng -lz],
  )
--
+ 
 -dnl  Don't run the ttf/xpm tests against gd unless
 -dnl  we actually have something to test!
 -dnl 
@@ -154,13 +154,13 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
 +GRAPHICS_LIBS="$LIBGD"
 +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
  
- AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h)
+ AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h)
 +CFLAGS=$CFLAGS_save
 +CPPFLAGS=$CPPFLAGS_save
  
  AC_HEADER_TIME
  AC_CHECK_HEADERS(sys/time.h)
-@@ -220,7 +223,7 @@
+@@ -218,7 +222,7 @@ if test -n "$LD_LIBRARY_PATH"; then
     for lib in `echo $LD_LIBRARY_PATH | $AWK -F: '{ for (i = NF; i > 0; --i) print $i }' | sort | uniq`; do
        if test -f ${lib}/libpng.so; then
           AC_CHECK_LIB(png, png_info_init,
@@ -169,7 +169,7 @@ $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
  	 ],
  	 [],
  	 [-lm -R${lib}],)
-@@ -524,7 +527,8 @@
+@@ -550,7 +554,8 @@ AC_SUBST(DRIVER_INSTALL_TARGET)
  AC_SUBST(LIBOBJ)
  AC_SUBST(BUILDOBJ)
  AC_SUBST(NETLIBS)
diff --git a/sysutils/ups-nut-cgi/patches/patch-ae b/sysutils/ups-nut-cgi/patches/patch-ae
index f50fae45b14..52f204c5515 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ae
+++ b/sysutils/ups-nut-cgi/patches/patch-ae
@@ -1,38 +1,38 @@
-$NetBSD: patch-ae,v 1.1 2001/11/19 03:47:42 lukem Exp $
+$NetBSD: patch-ae,v 1.2 2002/07/03 11:57:14 lukem Exp $
 
---- clients/upsstats.c.orig	Wed Aug 29 22:36:41 2001
+--- clients/upsstats.c.orig	Thu Mar 21 17:01:16 2002
 +++ clients/upsstats.c
-@@ -73,6 +73,7 @@
+@@ -74,6 +74,7 @@ int main() 
  	double	tempf;
  	char	model[64], status[64], battpct[64], utility[64], loadpct[64],
  	        upstemp[64], acfreq[64], *stat, *ptr;
 +	char	runtime[64];
  	int	i;
  
- 	strcpy (monhost, MONHOST);	/* default host */
-@@ -149,6 +150,7 @@
- 
- 	printf ("</TR>\n");
+ 	extractcgiargs();
+@@ -162,6 +163,7 @@ int main() 
+ 	printf("</TD>\n");
+ 	printf("</TR>\n");
  
 +#if 0
- 	printf ("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
+ 	printf("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
  
  	/* TODO: handle self tests */
-@@ -156,6 +158,7 @@
- /*	printf ("Last UPS Self Test: Not Available\n"); */
- /*	printf ("    Last Test Date: Not Available\n"); */
- 	printf ("</PRE></TD></TR>\n");
+@@ -169,6 +171,7 @@ int main() 
+ /*	printf("Last UPS Self Test: Not Available\n"); */
+ /*	printf("    Last Test Date: Not Available\n"); */
+ 	printf("</PRE></TD></TR>\n");
 +#endif
  
- 	printf ("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
+ 	printf("<TR><TD BGCOLOR=\"#FFFFFF\"><PRE>\n");
  
-@@ -173,6 +176,9 @@
+@@ -186,6 +189,9 @@ int main() 
  
- 	if (getupsvar (monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
- 		printf (" Output Freq: %s Hz\n", acfreq);
+ 	if (getupsvar(monhost, "acfreq", acfreq, sizeof(acfreq)) > 0)
+ 		printf(" Output Freq: %s Hz\n", acfreq);
 +
-+	if (getupsvar (monhost, "runtime", runtime, sizeof(runtime)) > 0)
-+		printf ("     Runtime: %s\n", runtime);
++	if (getupsvar(monhost, "runtime", runtime, sizeof(runtime)) > 0)
++		printf("     Runtime: %s\n", runtime);
  
- 	printf ("</PRE><P>\n");
- 	printf ("<CENTER>Network UPS Tools upsstats %s</CENTER>\n", UPS_VERSION);
+ 	printf("</PRE><P>\n");
+ 	printf("<CENTER>Network UPS Tools upsstats %s</CENTER>\n", UPS_VERSION);