diff options
| -rw-r--r-- | sysutils/ups-nut-cgi/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/ups-nut-cgi/files/md5 | 4 | ||||
| -rw-r--r-- | sysutils/ups-nut-cgi/files/patch-sum | 10 | ||||
| -rw-r--r-- | sysutils/ups-nut-cgi/patches/patch-ac | 10 | ||||
| -rw-r--r-- | sysutils/ups-nut-cgi/patches/patch-ad | 48 |
5 files changed, 44 insertions, 40 deletions
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 38eb1953e6b..ffe556fd377 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:42:20 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/11 13:50:50 martin Exp $ # -DISTNAME= nut-0.44.2 -PKGNAME= ups-nut-cgi-0.44.2 +DISTNAME= nut-0.44.3-pre5 +PKGNAME= ups-nut-cgi-0.44.3pre5 CATEGORIES= sysutils -MASTER_SITES= http://www.exploits.org/nut/release/ +MASTER_SITES= http://www.exploits.org/nut/testing/0.44.3-pre/ -MAINTAINER= collver@softhome.net +MAINTAINER= collver@linuxfreemail.com HOMEPAGE= http://www.exploits.org/nut/ COMMENT= Network UPS Tools CGI scripts @@ -14,7 +14,7 @@ DEPENDS+= gd-*:../../graphics/gd DEPENDS+= ups-nut-0*:../ups-nut BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf -WRKSRC= ${WRKDIR}/nut-0.44.2 +WRKSRC= ${WRKDIR}/nut-0.44.3 ALL_TARGET= cgi INSTALL_TARGET= install-cgi diff --git a/sysutils/ups-nut-cgi/files/md5 b/sysutils/ups-nut-cgi/files/md5 index 7743bd6792c..04a95d3939c 100644 --- a/sysutils/ups-nut-cgi/files/md5 +++ b/sysutils/ups-nut-cgi/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +$NetBSD: md5,v 1.2 2001/03/11 13:50:50 martin Exp $ -MD5 (nut-0.44.2.tar.gz) = e426128d0a203b6d3dd5f641c2b17fd0 +SHA1 (nut-0.44.3-pre5.tar.gz) = 066d62ec6ebd522aa9b7d0f046856cfb1a34f61a diff --git a/sysutils/ups-nut-cgi/files/patch-sum b/sysutils/ups-nut-cgi/files/patch-sum index cdbe593e673..a15f9903165 100644 --- a/sysutils/ups-nut-cgi/files/patch-sum +++ b/sysutils/ups-nut-cgi/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +$NetBSD: patch-sum,v 1.2 2001/03/11 13:50:50 martin Exp $ -MD5 (patch-aa) = eee72928d87163bad1bb2c6b155e9e1b -MD5 (patch-ab) = c37f5a7191a233196603e7fe3812326b -MD5 (patch-ac) = 51d45ff3376634bd996dce8a436026d0 -MD5 (patch-ad) = a18046f00c6d95800731555e569eb4be +SHA1 (patch-aa) = 6d38b8c24eb67383cdb1c63ee7255187c8b630f0 +SHA1 (patch-ab) = 4cb49a2313e19ccda00bf0e34e9be54aef12f966 +SHA1 (patch-ac) = ded33bbc4c78b2b7c53230c0d4ab3c663104582f +SHA1 (patch-ad) = 0ea8e16ec546c6edf8f328017bc7dc98541ea172 diff --git a/sysutils/ups-nut-cgi/patches/patch-ac b/sysutils/ups-nut-cgi/patches/patch-ac index 88988e12a35..c9b5c7f02f9 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ac +++ b/sysutils/ups-nut-cgi/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +$NetBSD: patch-ac,v 1.2 2001/03/11 13:50:50 martin Exp $ ---- acconfig.h.orig Thu Dec 14 13:48:12 2000 -+++ acconfig.h Thu Dec 14 13:48:42 2000 +--- acconfig.h.orig Sat Mar 10 17:00:13 2001 ++++ acconfig.h Sat Mar 10 17:00:39 2001 @@ -15,6 +15,9 @@ /* default path for model-specific drivers */ #define MODELPATH "/usr/local/ups/bin" @@ -9,6 +9,6 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +/* default path for graphics library files */ +#define GRAPHLIB_PATH "/usr/local" + - /* port number used for network communications */ - #define UDPPORT 3305 + /* path where your pid files should go. */ + #define PIDPATH "/var/run" diff --git a/sysutils/ups-nut-cgi/patches/patch-ad b/sysutils/ups-nut-cgi/patches/patch-ad index 80d4b4ce74d..73f2f8d27db 100644 --- a/sysutils/ups-nut-cgi/patches/patch-ad +++ b/sysutils/ups-nut-cgi/patches/patch-ad @@ -1,16 +1,16 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +$NetBSD: patch-ad,v 1.2 2001/03/11 13:50:50 martin Exp $ ---- configure.in.orig Sat Dec 2 17:18:03 2000 -+++ configure.in Thu Dec 14 16:26:56 2000 -@@ -11,6 +11,7 @@ +--- configure.in.orig Sat Mar 10 16:43:14 2001 ++++ configure.in Sat Mar 10 16:55:21 2001 +@@ -16,6 +16,7 @@ STATEPATH="/var/state/ups" MODELPATH="$prefix/bin" CGIPATH="$prefix/cgi-bin" +GRAPHLIB_PATH="/usr/local" RUN_AS_USER="nobody" RUN_AS_GROUP="nogroup" - ### -@@ -61,9 +62,45 @@ + PIDPATH="/var/run" +@@ -120,9 +121,45 @@ ], [], []) fi @@ -18,16 +18,16 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +AC_ARG_WITH(graphics, +[ --with-graphics=PATH Path for graphics library files], +[ case "$withval" in -+ yes|no) -+ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) -+ ;; -+ *) -+ AC_MSG_RESULT($withval) -+ AC_DEFINE_UNQUOTED(GRAPHLIB_PATH, "$withval") -+ GRAPHLIB_PATH=$withval -+ ;; -+ esac], -+ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) ++ yes|no) ++ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) ++ ;; ++ *) ++ AC_MSG_RESULT($withval) ++ AC_DEFINE_UNQUOTED(GRAPHLIB_PATH, "$withval") ++ GRAPHLIB_PATH=$withval ++ ;; ++ esac], ++ AC_MSG_RESULT(using default: $GRAPHLIB_PATH) +) +GRAPHICS_LIBS="-L$GRAPHLIB_PATH/lib" +GRAPHICS_INCLUDES="-I$GRAPHLIB_PATH/include" @@ -36,7 +36,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" +CPPFLAGS="$CPPFLAGS_save $GRAPHICS_INCLUDES" + -+dnl Include in case GD was compiled with True Type support ++dnl Include in case GD was compiled with internationalization support +AC_CHECK_LIB(intl, gettext, +[ LIBINTL="-lintl"],[ LIBINTL=""] ) +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBINTL" @@ -56,7 +56,12 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(X11, XBell, -@@ -81,67 +118,33 @@ +@@ -137,70 +174,37 @@ + ) + ], + ) ++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, @@ -77,7 +82,6 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ ) +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBXPM" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" -+ AC_CHECK_LIB(gd, gdImagePng, [ @@ -141,7 +145,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ dnl Would really like to *test* for the necessity of -R (and how to use dnl it) but I have no clue how :-/ -@@ -151,7 +154,7 @@ +@@ -210,7 +214,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, @@ -150,9 +154,9 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/28 16:07:51 martin Exp $ ], [], [-lm -R${lib}],) -@@ -310,7 +313,8 @@ - +@@ -431,7 +435,8 @@ AC_SUBST(LIBOBJ) + AC_SUBST(BUILDOBJ) AC_SUBST(NETLIBS) -AC_SUBST(GFXLIBS) +AC_SUBST(GRAPHICS_LIBS) |