From ab5e21bfcd5649dd571dab033b58a44cc8baae1a Mon Sep 17 00:00:00 2001 From: lukem Date: Sun, 18 Nov 2001 00:57:50 +0000 Subject: update to 0.45.2 to be in sync with ups-nut. see ups-nut for more details --- sysutils/ups-nut-cgi/patches/patch-ad | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) (limited to 'sysutils/ups-nut-cgi/patches') 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) -- cgit v1.2.3