head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.54 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.52 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.50 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.48 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.46 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.44 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.42 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.40 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.38 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.36 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.34 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.32 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.30 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.28 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.26 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.24 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.22 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.20 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.18 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.16 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.14 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.12 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.10 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.8 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.6 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.4 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.8.0.2 pkgsrc-2003Q4-base:1.8 netbsd-1-6:1.6.0.6 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.2 pkgviews-base:1.6 buildlink2:1.4.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2002.12.13.04.23.22; author lukem; state dead; branches; next 1.7; 1.7 date 2002.08.25.21.51.08; author jlam; state Exp; branches; next 1.6; 1.6 date 2002.07.03.11.57.14; author lukem; state Exp; branches; next 1.5; 1.5 date 2002.05.13.15.15.24; author lukem; state Exp; branches; next 1.4; 1.4 date 2001.11.18.00.57.50; author lukem; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2001.09.28.04.42.49; author lukem; state Exp; branches; next 1.2; 1.2 date 2001.03.11.13.50.50; author martin; state Exp; branches; next 1.1; 1.1 date 2000.12.28.16.07.51; author martin; state Exp; branches 1.1.1.1; next ; 1.4.2.1 date 2002.06.23.19.01.16; author jlam; state Exp; branches; next 1.4.2.2; 1.4.2.2 date 2002.08.25.21.21.36; author jlam; state Exp; branches; next ; 1.1.1.1 date 2000.12.28.16.07.51; author martin; state Exp; branches; next ; desc @@ 1.8 log @Update from nut 0.50.0 to 1.2.1. Many changes, too many to list here. See: http://www.exploits.org/nut/release/1.2/new-1.2.1.txt and (after installation): /usr/pkg/share/doc/nut/UPGRADING @ text @$NetBSD: patch-ad,v 1.7 2002/08/25 21:51:08 jlam Exp $ --- configure.in.orig Tue Apr 16 23:34:38 2002 +++ configure.in @@@@ -18,6 +18,7 @@@@ dnl | default values for things later on STATEPATH="/var/state/ups" MODELPATH="$prefix/bin" CGIPATH="$prefix/cgi-bin" +GRAPHLIB_PATH="/usr/local" RUN_AS_USER="nobody" RUN_AS_GROUP="nogroup" PIDPATH="/var/run" @@@@ -118,9 +119,43 @@@@ if ( test x"$ac_cv_func_connect" = x"no" ], [], []) fi +AC_MSG_CHECKING(graphics library file path) +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) +) +GRAPHICS_LIBS="-R$GRAPHLIB_PATH/lib -L$GRAPHLIB_PATH/lib" +GRAPHICS_INCLUDES="-I$GRAPHLIB_PATH/include" +CFLAGS_save=$CFLAGS +CPPFLAGS_save=$CPPFLAGS +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" +CPPFLAGS="$CPPFLAGS_save $GRAPHICS_INCLUDES" + +dnl Include in case GD was compiled with internationalization support +AC_CHECK_LIB(intl, gettext, +[ LIBINTL="-lintl"],[ LIBINTL=""] ) +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBINTL" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" + dnl Include in case GD was compiled with True Type support AC_CHECK_LIB(ttf, TT_New_Glyph, [ LIBTTF="-lttf"],[ LIBTTF=""] ) +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBTTF" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" + +dnl Include in case GD was compiled with jpeg support +AC_CHECK_LIB(jpeg, jpeg_abort, +[ LIBJPEG="-ljpeg"],[ LIBJPEG=""] ) dnl Include in case GD was compiled with Xpm support AC_CHECK_LIB(X11, XBell, @@@@ -129,13 +164,16 @@@@ AC_CHECK_LIB(X11, XBell, 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 ], ) ], ) +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" + dnl Skip this chunk if there's no LIBX to use if test "$LIBX" != "" @@@@ -143,69 +181,35 @@@@ then 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, [ - GFXLIBS="-lgd -lpng -lz" + LIBGD="$GRAPHICS_LIBS -lgd -lpng -lz" ], [ - echo "Trying again - using -L/usr/local/lib -I/usr/local/include..." - unset ac_cv_lib_gd_gdImagePng - CPPFLAGS="$CPPFLAGS -L/usr/local/lib -I/usr/local/include" - 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. +** +** To get it, visit http://www.boutell.com/gd/ + ) ], -[-lm -lpng -lz], +[$GRAPHICS_LIBS -lm -lpng -lz], ) -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" - ],, - [-lm -lpng -lz $LIBTTF $LIBXPM]) - fi -fi - -test "$GFXLIBS" = "" && echo "** You will not be able to build the CGI programs without gd." -test "$GFXLIBS" = "" && echo "** " -test "$GFXLIBS" = "" && echo "** To get it, visit http://www.boutell.com/gd/" +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) +CFLAGS=$CFLAGS_save +CPPFLAGS=$CPPFLAGS_save AC_HEADER_TIME AC_CHECK_HEADERS(sys/time.h) @@@@ -218,7 +222,7 @@@@ if test -n "$LD_LIBRARY_PATH"; then 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, - [ GFXLIBS="-R${lib} $GFXLIBS" + [ GRAPHICS_LIBS="-R${lib} $GRAPHICS_LIBS" ], [], [-lm -R${lib}],) @@@@ -550,7 +554,8 @@@@ AC_SUBST(DRIVER_INSTALL_TARGET) AC_SUBST(LIBOBJ) AC_SUBST(BUILDOBJ) AC_SUBST(NETLIBS) -AC_SUBST(GFXLIBS) +AC_SUBST(GRAPHICS_LIBS) +AC_SUBST(GRAPHICS_INCLUDES) AC_SUBST(SERLIBS) AC_SUBST(STATEPATH) AC_SUBST(MODELPATH) @ 1.7 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4.2.2 2002/08/25 21:21:36 jlam Exp $ @ 1.6 log @update to nut 0.50.0. notable changes: - change from tcp/ip port 3305 to the IANA assigned 3493 - all old-style drivers have been deprecated: aeg bestfort bestuferrups engetron ipt-anzen mgeups multilink mustekups optiups sms toshiba1500 ups-trust425+625 upseyeux - newvictron renamed to victronups - newpowercom renamed to powercom, replacing previous powercom and ups-trust425+625 as well @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @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 @ text @d3 1 a3 1 --- configure.in.orig Tue Feb 26 05:46:25 2002 d5 1 a5 1 @@@@ -16,6 +16,7 @@@@ d13 1 a13 1 @@@@ -120,9 +121,43 @@@@ d57 1 a57 1 @@@@ -131,13 +166,16 @@@@ d76 1 a76 1 @@@@ -145,69 +183,34 @@@@ d123 1 a123 1 - d157 1 a157 1 AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h err.h) d163 1 a163 1 @@@@ -220,7 +223,7 @@@@ d172 1 a172 1 @@@@ -524,7 +527,8 @@@@ @ 1.4 log @update to 0.45.2 to be in sync with ups-nut. see ups-nut for more details @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2001/09/28 04:42:49 lukem Exp $ d3 1 a3 1 --- configure.in.orig Mon Sep 10 07:52:14 2001 d13 1 a13 1 @@@@ -124,9 +125,45 @@@@ a53 2 +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG" +CFLAGS="$CFLAGS_save $GRAPHICS_LIBS" d57 1 a57 1 @@@@ -135,70 +172,43 @@@@ d69 2 a70 1 +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBX" d72 5 d78 21 a98 19 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" d124 15 a138 9 -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 d140 7 a146 7 -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" - ],, d148 1 d163 1 a163 1 @@@@ -211,7 +221,7 @@@@ d172 1 a172 1 @@@@ -481,7 +491,8 @@@@ @ 1.4.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2002/05/13 15:15:24 lukem Exp $ d3 1 a3 1 --- configure.in.orig Tue Feb 26 05:46:25 2002 d13 1 a13 1 @@@@ -120,9 +121,43 @@@@ d54 2 d59 1 a59 1 @@@@ -131,13 +166,16 @@@@ d71 2 d74 18 a91 1 +GRAPHICS_LIBS="$GRAPHICS_LIBS $LIBJPEG" a92 27 + 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 d118 9 a126 15 -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 d128 7 a134 7 - 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" - ],, a135 1 - fi d150 1 a150 1 @@@@ -220,7 +223,7 @@@@ d159 1 a159 1 @@@@ -524,7 +527,8 @@@@ @ 1.4.2.2 log @Merge changes in the main trunk into the buildlink2 branch for those packages that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.4.2.1 2002/06/23 19:01:16 jlam Exp $ d3 1 a3 1 --- configure.in.orig Tue Apr 16 23:34:38 2002 d5 1 a5 1 @@@@ -18,6 +18,7 @@@@ dnl | default values for things later on d13 1 a13 1 @@@@ -118,9 +119,43 @@@@ if ( test x"$ac_cv_func_connect" = x"no" d57 1 a57 1 @@@@ -129,13 +164,16 @@@@ AC_CHECK_LIB(X11, XBell, d76 1 a76 1 @@@@ -143,69 +181,35 @@@@ then d123 1 a123 1 d157 1 a157 1 AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h) d163 1 a163 1 @@@@ -218,7 +222,7 @@@@ if test -n "$LD_LIBRARY_PATH"; then d172 1 a172 1 @@@@ -550,7 +554,8 @@@@ AC_SUBST(DRIVER_INSTALL_TARGET) @ 1.3 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- configure.in.orig Tue Jun 12 07:47:56 2001 +++ configure.in Fri Sep 28 13:50:39 2001 d59 1 a59 1 @@@@ -135,76 +172,43 @@@@ d106 1 a106 3 - ], - [ - ], d124 1 a124 3 - ], - [ - ], d134 1 a134 3 - ], - [ - ], d150 1 a150 1 @@@@ -217,7 +221,7 @@@@ d159 1 a159 1 @@@@ -482,7 +486,8 @@@@ @ 1.2 log @Update ups-nut-cgi to 0.44.3 prerelease 5. Changes are too much to list here, see "Changes" in the distribution for a detailed list. Various bugfixes and enhancements. Package provided by collver@@linuxfreemail.com. @ text @d3 2 a4 2 --- configure.in.orig Sat Mar 10 16:43:14 2001 +++ configure.in Sat Mar 10 16:55:21 2001 d13 1 a13 1 @@@@ -120,9 +121,45 @@@@ d32 1 a32 1 +GRAPHICS_LIBS="-L$GRAPHLIB_PATH/lib" d59 9 a67 1 @@@@ -137,70 +174,37 @@@@ d150 1 a150 1 AC_CHECK_HEADERS(gd.h gd/gd.h sys/modem.h stdarg.h varargs.h sys/shm.h) d154 3 a156 3 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 @@@@ d165 1 a165 1 @@@@ -431,7 +435,8 @@@@ @ 1.1 log @Initial revision @ text @d3 3 a5 3 --- configure.in.orig Sat Dec 2 17:18:03 2000 +++ configure.in Thu Dec 14 16:26:56 2000 @@@@ -11,6 +11,7 @@@@ d12 2 a13 2 ### @@@@ -61,9 +62,45 @@@@ d21 10 a30 10 + 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) d39 1 a39 1 +dnl Include in case GD was compiled with True Type support d59 6 a64 1 @@@@ -81,67 +118,33 @@@@ a84 1 + d148 1 a148 1 @@@@ -151,7 +154,7 @@@@ d157 1 a157 2 @@@@ -310,7 +313,8 @@@@ d159 1 @ 1.1.1.1 log @Initial import of ups-nut-cgi package from collver@@softhome.net; additional tools for monitoring UPSes using ups-nut and cgi scripts. Closes PR 11746. @ text @@