update from 0.44.3-pre5 -> 0.45.1. changes as per ups-nut (see its commit log).

part of this includes local fixes to ensure that upsimage.cgi gets linked with
the appropriate -R option so that it can find its libraries.

3 files changed, 33 insertions, 21 deletions

diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index 46b234ad533..6884ffbf986 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/28 04:42:49 lukem Exp $
 
---- Makefile.in.orig	Fri Dec 22 19:40:24 2000
-+++ Makefile.in	Thu Dec 28 16:36:28 2000
+--- Makefile.in.orig	Fri Aug 10 02:52:31 2001
++++ Makefile.in	Fri Sep 28 12:50:05 2001
 @@ -5,10 +5,10 @@
  BASEPATH    = $(INSTALLROOT)@prefix@
  CONFPATH    = $(INSTALLROOT)@sysconfdir@
@@ -15,8 +15,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $
  CFLAGS	= -I../include @CFLAGS@
  
  # these are here so they can be overridden during a make install
-@@ -58,7 +58,7 @@
- 		$(INSTALLCMD) -d -o $(RUNUID) -g $(RUNGID) $(STATEPATH) || exit 1; \
+@@ -58,11 +58,10 @@
+ 		./install-sh -d -o $(RUNUID) -g $(RUNGID) $(STATEPATH) || exit 1; \
  	fi
  
 -cgi:
@@ -24,3 +24,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $
  	@cd clients; $(MAKE) cgi; cd ..;
  
  install-cgi: install-dirs 
+-	@cd conf; $(MAKE) install; cd ..;
+ 	@cd clients; $(MAKE) install-cgi; cd ..;
+ 
+ install-misc: install-dirs
diff --git a/sysutils/ups-nut-cgi/patches/patch-ab b/sysutils/ups-nut-cgi/patches/patch-ab
index ebca983818b..2d19f8020eb 100644
--- a/sysutils/ups-nut-cgi/patches/patch-ab
+++ b/sysutils/ups-nut-cgi/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $
+$NetBSD: patch-ab,v 1.2 2001/09/28 04:42:49 lukem Exp $
 
---- clients/Makefile.in.orig	Fri Dec 22 19:40:24 2000
-+++ clients/Makefile.in	Thu Dec 28 16:38:51 2000
-@@ -58,7 +58,7 @@
+--- clients/Makefile.in.orig	Wed Jul  4 14:31:29 2001
++++ clients/Makefile.in	Fri Sep 28 11:14:57 2001
+@@ -59,7 +59,7 @@
  	$(CC) $(CFLAGS) -o upsstats.cgi upsstats.c upsfetch.o cgilib.o $(LIBOBJ)
  
- upsimage.cgi: upsimage.c upsfetch.o cgilib.o $(LIBOBJ)
+ upsimage.cgi: upsimage.c upsfetch.o cgilib.o $(LIBDEP)
 -	$(CC) $(CFLAGS) -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @GFXLIBS@ -lm $(LIBOBJ)
 +	$(CC) $(CFLAGS) @GRAPHICS_INCLUDES@ -o upsimage.cgi upsimage.c upsfetch.o cgilib.o @GRAPHICS_LIBS@ -lm $(LIBOBJ)
  
diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad
index 73f2f8d27db..c0068d7c055 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.2 2001/03/11 13:50:50 martin Exp $
+$NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $
 
---- configure.in.orig	Sat Mar 10 16:43:14 2001
-+++ configure.in	Sat Mar 10 16:55:21 2001
+--- configure.in.orig	Tue Jun 12 07:47:56 2001
++++ configure.in	Fri Sep 28 13:50:39 2001
 @@ -16,6 +16,7 @@
  STATEPATH="/var/state/ups"
  MODELPATH="$prefix/bin"
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin Exp $
  RUN_AS_USER="nobody"
  RUN_AS_GROUP="nogroup"
  PIDPATH="/var/run"
-@@ -120,9 +121,45 @@
+@@ -124,9 +125,45 @@
  	], [], [])
  fi
  
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin Exp $
 +	esac],
 +	AC_MSG_RESULT(using default: $GRAPHLIB_PATH)
 +)
-+GRAPHICS_LIBS="-L$GRAPHLIB_PATH/lib"
++GRAPHICS_LIBS="-R$GRAPHLIB_PATH/lib -L$GRAPHLIB_PATH/lib"
 +GRAPHICS_INCLUDES="-I$GRAPHLIB_PATH/include"
 +CFLAGS_save=$CFLAGS
 +CPPFLAGS_save=$CPPFLAGS
@@ -56,7 +56,15 @@ $NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin Exp $
  
  dnl Include in case GD was compiled with Xpm support
  AC_CHECK_LIB(X11, XBell,
-@@ -137,70 +174,37 @@
+@@ -135,76 +172,43 @@
+ 	       echo "Retrying with -L /usr/X11R6/lib"
+                unset ac_cv_lib_X11_XBell
+ 		AC_CHECK_LIB(X11, XBell,
+-                        [ LIBX="-lX11 -L/usr/X11R6/lib" ],
++                        [ LIBX="-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11" ],
+                         [ LIBX="" ],
+-                        [ -lX11 -L/usr/X11R6/lib ],
++                        [ -L/usr/X11R6/lib -lX11 ],
                  )
          ],
  )
@@ -139,13 +147,13 @@ $NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin 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)
+ AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h)
 +CFLAGS=$CFLAGS_save
 +CPPFLAGS=$CPPFLAGS_save
  
- dnl  Would really like to *test* for the necessity of -R (and how to use
- dnl  it) but I have no clue how :-/  
-@@ -210,7 +214,7 @@
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS(sys/time.h)
+@@ -217,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,
@@ -154,7 +162,7 @@ $NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin Exp $
  	 ],
  	 [],
  	 [-lm -R${lib}],)
-@@ -431,7 +435,8 @@
+@@ -482,7 +486,8 @@
  AC_SUBST(LIBOBJ)
  AC_SUBST(BUILDOBJ)
  AC_SUBST(NETLIBS)