Update from 0.45.3 to 0.45.5, to remain in sync with ups-nut.

Notable changes (separate to those from ups-nut):
- install nut .cgi related manual pages

5 files changed, 86 insertions, 63 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 38259b16c1b..beb249cda1a 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2002/03/13 17:37:44 fredb Exp $
+# $NetBSD: Makefile,v 1.16 2002/05/13 15:15:23 lukem Exp $
 
-DISTNAME=		nut-0.45.3
-PKGNAME=		ups-nut-cgi-0.45.3
+DISTNAME=		nut-0.45.5
+PKGNAME=		ups-nut-cgi-0.45.5
 PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.exploits.org/nut/release/
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 DEPENDS+=		ups-nut-0.*:../../sysutils/ups-nut
 
 ALL_TARGET=		cgi
-INSTALL_TARGET=		install-cgi
+INSTALL_TARGET=		install-cgi install-cgi-man
 
 PKG_SYSCONFSUBDIR?=	nut
 NUT_CONFDIR=		${PKG_SYSCONFDIR}
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
index 95dc4f2f8d0..65afed21c39 100644
--- a/sysutils/ups-nut-cgi/PLIST
+++ b/sysutils/ups-nut-cgi/PLIST
@@ -1,4 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:06 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/13 15:15:24 lukem Exp $
+man/man5/hosts.conf.5
+man/man5/multimon.conf.5
+man/man5/upsset.conf.5
+man/man8/multimon.cgi.8
+man/man8/upsimage.cgi.8
+man/man8/upsset.cgi.8
+man/man8/upsstats.cgi.8
 share/nut/cgi/multimon.cgi
 share/nut/cgi/upsimage.cgi
 share/nut/cgi/upsset.cgi
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index f29cb7f1f9f..0b136e964e5 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2002/01/03 14:48:59 lukem Exp $
+$NetBSD: distinfo,v 1.8 2002/05/13 15:15:24 lukem Exp $
 
-SHA1 (nut-0.45.3.tar.gz) = c6596eb9291a046e47a473db8cec81a082e28d2b
-Size (nut-0.45.3.tar.gz) = 339066 bytes
-SHA1 (patch-aa) = 27a523b5e09d0b28fbc55e567f130c77e81041fd
+SHA1 (nut-0.45.5.tar.gz) = 5cb08e27fb7e528a453d164d401410d341bf3bb3
+Size (nut-0.45.5.tar.gz) = 386936 bytes
+SHA1 (patch-aa) = 6057ca39afdfc4e49380c8f4d35f2371df9fe549
 SHA1 (patch-ab) = dfc1663368b670b84b1545c388bcd5f8703c08e3
 SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f
-SHA1 (patch-ad) = f9f7fdc08c49aa1c1aa667ac6b7597679c9fea4e
+SHA1 (patch-ad) = 7c705b7d1d70962f3f39f399753f585d439032fb
 SHA1 (patch-ae) = 39ea3f3a4234790837ccf6e5799c39b6ba390975
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index 947af3f98de..ff6b6033e2c 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,30 +1,33 @@
-$NetBSD: patch-aa,v 1.3 2002/01/03 14:49:00 lukem Exp $
+$NetBSD: patch-aa,v 1.4 2002/05/13 15:15:24 lukem Exp $
 
---- Makefile.in.orig	Fri Oct 26 17:16:27 2001
+--- Makefile.in.orig	Fri Mar  8 23:21:11 2002
 +++ Makefile.in
-@@ -8,7 +8,7 @@
+@@ -9,9 +9,10 @@
  INSTALLDIRS = $(CONFPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
  STATEPATH   = $(INSTALLROOT)@STATEPATH@
  
--SUBDIRS	= common models server clients man
+-SUBDIRS	= common models server clients
 +SUBDIRS	= common
  CFLAGS	= -I../include @CFLAGS@
  
++
  # these are here so they can be overridden during a make install
-@@ -60,7 +60,7 @@
- 		|| echo "Unable to set ownership of $(STATEPATH)"; \
- 	fi
+ RUNUID=@RUN_AS_USER@
+ RUNGID=@RUN_AS_GROUP@
+@@ -64,7 +65,7 @@
+ install-man:
+ 	@cd man; $(MAKE) install; cd ..;
  
 -cgi:
 +cgi: build
  	@cd clients; $(MAKE) cgi; cd ..;
  
  install-cgi: install-dirs 
-@@ -68,7 +68,6 @@
+@@ -72,7 +73,6 @@
  		./install-sh -d $(CGIPATH) || exit 1; \
  	fi \
  
 -	@cd conf; $(MAKE) install; cd ..;
  	@cd clients; $(MAKE) install-cgi; cd ..;
  
- install-misc: install-dirs
+ install-cgi-man:
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index 9b991203038..5d15ecc59e6 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ad
+++ b/sysutils/ups-nut-cgi/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
+$NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $
 
---- configure.in.orig	Mon Sep 10 07:52:14 2001
+--- configure.in.orig	Tue Feb 26 05:46:25 2002
 +++ configure.in
 @@ -16,6 +16,7 @@
  STATEPATH="/var/state/ups"
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
  RUN_AS_USER="nobody"
  RUN_AS_GROUP="nogroup"
  PIDPATH="/var/run"
-@@ -124,9 +125,45 @@
+@@ -120,9 +121,43 @@
  	], [], [])
  fi
  
@@ -51,12 +51,10 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
 +dnl Include in case GD was compiled with jpeg support
 +AC_CHECK_LIB(jpeg, jpeg_abort,
 +[ LIBJPEG="-ljpeg"],[ LIBJPEG=""] )
-+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG"
-+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
  
  dnl Include in case GD was compiled with Xpm support
  AC_CHECK_LIB(X11, XBell,
-@@ -135,70 +172,43 @@
+@@ -131,13 +166,16 @@
  	       echo "Retrying with -L /usr/X11R6/lib"
                 unset ac_cv_lib_X11_XBell
  		AC_CHECK_LIB(X11, XBell,
@@ -68,28 +66,36 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
                  )
          ],
  )
-+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBX"
-+CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
  
- dnl Include in case GD was compiled with Xpm support
- AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
--	[ LIBXPM="-lXpm"],
--	[ 
--		echo "Retrying with $LIBX"
--		unset ac_cv_lib_Xpm_XpmReadFileToXpmImage
--		AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
--			[ LIBXPM="-lXpm $LIBX" ],
--			[ LIBXPM="" ],
--			[ -lXpm $LIBX ],
--		)
--	],
--	[ -lXpm ],
-+	[ LIBXPM="-lXpm $LIBX"],
-+	[ LIBXPM="" ],
-+	[ -lXpm $LIBX ],
- )
-+GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBXPM"
++GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG"
 +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
++
+ dnl   Skip this chunk if there's no LIBX to use
+ 
+ if test "$LIBX" != "" 
+@@ -145,69 +183,34 @@
+ 
+ 	dnl Include in case GD was compiled with Xpm support
+ 	AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
+-		[ LIBXPM="-lXpm"],
+-		[ 
+-			echo "Retrying with $LIBX"
+-			unset ac_cv_lib_Xpm_XpmReadFileToXpmImage
+-			AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
+-				[ LIBXPM="-lXpm $LIBX" ],
+-				[ LIBXPM="" ],
+-				[ -lXpm $LIBX ],
+-			)
+-		],
+-		[ -lXpm ],
++		[ LIBXPM="-lXpm $LIBX"],
++		[ LIBXPM="" ],
++		[ -lXpm $LIBX ],
+ 	)
++
++	GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBXPM"
++	CFLAGS="$CFLAGS_save $GRAPHICS_LIBS"
+ fi
  
  AC_CHECK_LIB(gd, gdImagePng,
  [
@@ -115,24 +121,31 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
 +[$GRAPHICS_LIBS -lm -lpng -lz],
  )
 -
--if test "$GFXLIBS" = "" ; then
--        echo "Trying again - using $LIBTTF"
--        unset ac_cv_lib_gd_gdImagePng
--        AC_CHECK_LIB(gd, gdImagePng,
--        [
--                GFXLIBS="-lgd -lpng -lz $LIBTTF"
--        ],,
--        [-lm -lpng -lz $LIBTTF])
--fi
+-dnl  Don't run the ttf/xpm tests against gd unless
+-dnl  we actually have something to test!
+-dnl 
+-if test "$LIBTTF" != "" 
+-then
+-
+-	if test "$GFXLIBS" = "" ; then
+-	        echo "Trying again - using $LIBTTF"
+-	        unset ac_cv_lib_gd_gdImagePng
+-	        AC_CHECK_LIB(gd, gdImagePng,
+-	        [
+-	                GFXLIBS="-lgd -lpng -lz $LIBTTF"
+-	        ],,
+-	        [-lm -lpng -lz $LIBTTF])
+-	fi
 -
--if test "$GFXLIBS" = "" ; then
--        echo "Trying again - using $LIBTTF $LIBXPM"
--        unset ac_cv_lib_gd_gdImagePng
--        AC_CHECK_LIB(gd, gdImagePng,
--        [
--                GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM"
--        ],,
+-	if test "$GFXLIBS" = "" ; then
+-	        echo "Trying again - using $LIBTTF $LIBXPM"
+-	        unset ac_cv_lib_gd_gdImagePng
+-	        AC_CHECK_LIB(gd, gdImagePng,
+-	        [
+-			GFXLIBS="-lgd -lpng -lz $LIBTTF $LIBXPM"
+-	        ],,
 -        [-lm -lpng -lz $LIBTTF $LIBXPM])
+-	fi
 -fi
 -
 -test "$GFXLIBS" = ""  && echo "** You will not be able to build the CGI programs without gd."
@@ -147,7 +160,7 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
  
  AC_HEADER_TIME
  AC_CHECK_HEADERS(sys/time.h)
-@@ -211,7 +221,7 @@
+@@ -220,7 +223,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,
@@ -156,7 +169,7 @@ $NetBSD: patch-ad,v 1.4 2001/11/18 00:57:50 lukem Exp $
  	 ],
  	 [],
  	 [-lm -R${lib}],)
-@@ -481,7 +491,8 @@
+@@ -524,7 +527,8 @@
  AC_SUBST(LIBOBJ)
  AC_SUBST(BUILDOBJ)
  AC_SUBST(NETLIBS)