update to 0.45.2 to be in sync with ups-nut. see ups-nut for more details

3 files changed, 17 insertions, 23 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index d60bab7967a..cf9c5db2fff 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2001/09/28 04:42:48 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2001/11/18 00:57:50 lukem Exp $
 
-DISTNAME=		nut-0.45.1
-PKGNAME=		ups-nut-cgi-0.45.1
+DISTNAME=		nut-0.45.2
+PKGNAME=		ups-nut-cgi-0.45.2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.exploits.org/nut/release/
 
-MAINTAINER=		collver@linuxfreemail.com
+MAINTAINER=		lukem@netbsd.org
 HOMEPAGE=		http://www.exploits.org/nut/
 COMMENT=		Network UPS Tools CGI scripts
 
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 5331ce89fef..bcd82b29692 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/09/28 04:42:48 lukem Exp $
+$NetBSD: distinfo,v 1.4 2001/11/18 00:57:50 lukem Exp $
 
-SHA1 (nut-0.45.1.tar.gz) = 2da78c22dd7162140c2b332bde69dde7a67d7b2c
-Size (nut-0.45.1.tar.gz) = 306332 bytes
+SHA1 (nut-0.45.2.tar.gz) = 9c225205127eee1e9bb55d9a28ff1290b47f75aa
+Size (nut-0.45.2.tar.gz) = 330851 bytes
 SHA1 (patch-aa) = f99436a2e83654e5a078b6ea899cc33ef8a48fa9
 SHA1 (patch-ab) = 47be57592a77ded239f20d8a2bd686c34dabfe6f
 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f
-SHA1 (patch-ad) = 43cf728e09bf58ee15cb296363867336a39c7b5f
+SHA1 (patch-ad) = f9f7fdc08c49aa1c1aa667ac6b7597679c9fea4e
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index c0068d7c055..9b991203038 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
+$NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
 
---- configure.in.orig	Tue Jun 12 07:47:56 2001
-+++ configure.in	Fri Sep 28 13:50:39 2001
+--- configure.in.orig	Mon Sep 10 07:52:14 2001
++++ configure.in
 @@ -16,6 +16,7 @@
  STATEPATH="/var/state/ups"
  MODELPATH="$prefix/bin"
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
  
  dnl Include in case GD was compiled with Xpm support
  AC_CHECK_LIB(X11, XBell,
-@@ -135,76 +172,43 @@
+@@ -135,70 +172,43 @@
  	       echo "Retrying with -L /usr/X11R6/lib"
                 unset ac_cv_lib_X11_XBell
  		AC_CHECK_LIB(X11, XBell,
@@ -103,9 +103,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
 -	AC_CHECK_LIB(gd, gdImagePng,
 -	[
 -		GFXLIBS="-lgd -lpng -lz -L/usr/local/lib -I/usr/local/include"
--	],
--	[
--	],
+-	],,
 -	[-lm -lpng -lz])
 +	AC_MSG_RESULT(
 +** You will not be able to build the CGI programs without gd.
@@ -123,9 +121,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
 -        AC_CHECK_LIB(gd, gdImagePng,
 -        [
 -                GFXLIBS="-lgd -lpng -lz $LIBTTF"
--        ],
--        [
--        ],
+-        ],,
 -        [-lm -lpng -lz $LIBTTF])
 -fi
 -
@@ -135,9 +131,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
 -        AC_CHECK_LIB(gd, gdImagePng,
 -        [
 -                GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM"
--        ],
--        [
--        ],
+-        ],,
 -        [-lm -lpng -lz $LIBTTF $LIBXPM])
 -fi
 -
@@ -153,7 +147,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
  
  AC_HEADER_TIME
  AC_CHECK_HEADERS(sys/time.h)
-@@ -217,7 +221,7 @@
+@@ -211,7 +221,7 @@
     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,
@@ -162,7 +156,7 @@ $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
  	 ],
  	 [],
  	 [-lm -R${lib}],)
-@@ -482,7 +486,8 @@
+@@ -481,7 +491,8 @@
  AC_SUBST(LIBOBJ)
  AC_SUBST(BUILDOBJ)
  AC_SUBST(NETLIBS)