diff options
Diffstat (limited to 'sysutils/apcupsd')
-rw-r--r-- | sysutils/apcupsd/Makefile | 22 | ||||
-rw-r--r-- | sysutils/apcupsd/PLIST | 33 | ||||
-rw-r--r-- | sysutils/apcupsd/distinfo | 18 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-af | 28 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-aj | 30 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-al | 18 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-am | 18 | ||||
-rw-r--r-- | sysutils/apcupsd/patches/patch-an | 17 |
8 files changed, 63 insertions, 121 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 1d0f6df2a14..0b228546903 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.79 2015/11/18 14:19:54 ryoon Exp $ +# $NetBSD: Makefile,v 1.80 2016/01/28 15:51:34 prlw1 Exp $ -DISTNAME= apcupsd-3.14.9 -PKGREVISION= 12 +DISTNAME= apcupsd-3.14.13r2365 CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} +MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://www.apcupsd.org/ COMMENT= UPS power management for APCC Products +LICENSE= gnu-gpl-v2 USE_TOOLS+= gmake msgfmt sh makedepend USE_LANGUAGES= c c++ @@ -15,6 +16,7 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes PKG_SYSCONFSUBDIR= apcupsd +WRKSRC= ${WRKDIR}/apcupsd .include "options.mk" @@ -34,8 +36,6 @@ PKG_SYSCONFSUBDIR= apcupsd CONFIGURE_ARGS+= --enable-net # enable NIS network driver CONFIGURE_ARGS+= --enable-usb # enable USB network driver -CONFIGURE_ARGS+= --with-catgets # use catgets functions -CONFIGURE_ARGS+= --enable-nls # i18n support CONFIGURE_ARGS+= --enable-snmp # enable SNMP driver CONFIGURE_ARGS+= --with-lock-dir=${VARBASE}/spool/lock # XXX is this supposed to be the full filename? @@ -91,9 +91,7 @@ SUBST_MESSAGE.strip= Fixing conflicting STRIP variable name # XXX we should probably allow the tty to be set in /etc/mk.conf too # -HTMLDOCS= apcupsd.gif bclogo.gif bugs.html index.html license.html \ - lists.html mail16d.png support.html systems.html -HTMLMANUALS= manual.html apcupsd.png charging.png commlost.png \ +HTMLDOCS= manual.html apcupsd.png charging.png commlost.png \ main_configs.png multimon.png onbatt.png online.png status.png \ thanks.png wininstall6.png @@ -107,12 +105,8 @@ post-install: ${DESTDIR}${PREFIX}/share/examples/apcupsd .endfor .for file in ${HTMLDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/home-page/${file} \ - ${DESTDIR}${PREFIX}/share/doc/html/apcupsd -.endfor -.for file in ${HTMLMANUALS} ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \ - ${DESTDIR}${PREFIX}/share/doc/html/apcupsd/manual + ${DESTDIR}${PREFIX}/share/doc/html/apcupsd .endfor .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST index 926b4680fc8..ec91032386f 100644 --- a/sysutils/apcupsd/PLIST +++ b/sysutils/apcupsd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2014/03/11 14:05:14 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.17 2016/01/28 15:51:34 prlw1 Exp $ ${PLIST.cgi}libexec/cgi-bin/upsstats.cgi ${PLIST.cgi}libexec/cgi-bin/upsfstats.cgi ${PLIST.cgi}libexec/cgi-bin/apcupsimage.cgi @@ -11,26 +11,17 @@ man/man8/apcupsd.8 sbin/apcaccess sbin/apctest sbin/apcupsd -share/doc/html/apcupsd/apcupsd.gif -share/doc/html/apcupsd/bclogo.gif -share/doc/html/apcupsd/bugs.html -share/doc/html/apcupsd/index.html -share/doc/html/apcupsd/license.html -share/doc/html/apcupsd/lists.html -share/doc/html/apcupsd/mail16d.png -share/doc/html/apcupsd/manual/apcupsd.png -share/doc/html/apcupsd/manual/charging.png -share/doc/html/apcupsd/manual/commlost.png -share/doc/html/apcupsd/manual/main_configs.png -share/doc/html/apcupsd/manual/manual.html -share/doc/html/apcupsd/manual/multimon.png -share/doc/html/apcupsd/manual/onbatt.png -share/doc/html/apcupsd/manual/online.png -share/doc/html/apcupsd/manual/status.png -share/doc/html/apcupsd/manual/thanks.png -share/doc/html/apcupsd/manual/wininstall6.png -share/doc/html/apcupsd/support.html -share/doc/html/apcupsd/systems.html +share/doc/html/apcupsd/apcupsd.png +share/doc/html/apcupsd/charging.png +share/doc/html/apcupsd/commlost.png +share/doc/html/apcupsd/main_configs.png +share/doc/html/apcupsd/manual.html +share/doc/html/apcupsd/multimon.png +share/doc/html/apcupsd/onbatt.png +share/doc/html/apcupsd/online.png +share/doc/html/apcupsd/status.png +share/doc/html/apcupsd/thanks.png +share/doc/html/apcupsd/wininstall6.png share/examples/apcupsd/apccontrol share/examples/apcupsd/apcupsd.conf share/examples/apcupsd/apcupsd.css diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo index e3a40cb3a65..83103cf702f 100644 --- a/sysutils/apcupsd/distinfo +++ b/sysutils/apcupsd/distinfo @@ -1,20 +1,18 @@ -$NetBSD: distinfo,v 1.20 2015/11/04 01:32:06 agc Exp $ +$NetBSD: distinfo,v 1.21 2016/01/28 15:51:34 prlw1 Exp $ -SHA1 (apcupsd-3.14.9.tar.gz) = 1e9e8a054f17c554c047ec1d7b363d35553058bc -RMD160 (apcupsd-3.14.9.tar.gz) = be1a33b85c790fc3bc62bab370a62d014dbf0a57 -SHA512 (apcupsd-3.14.9.tar.gz) = 2fc50a3628eaf0f224b39a575ffa90682ee2e80fae4f6903faed31a6dd40303297d36b55f0f54d617f9e42de274d602c8259ed5755dada870e091309f1447a96 -Size (apcupsd-3.14.9.tar.gz) = 1334762 bytes +SHA1 (apcupsd-3.14.13r2365.tar.gz) = aa4093de66a4228e4b40820dc39afd597a8f3464 +RMD160 (apcupsd-3.14.13r2365.tar.gz) = da006ac337dbf46d2f3ecba6408e459842b96994 +SHA512 (apcupsd-3.14.13r2365.tar.gz) = 35a4bb5e30b4e7315322f541d399b81f35abd1c6887614ebd94fa7371f2b42b07167ed618ad763b7053b74fb1c24fd78ce6c4811ebddada41874ca1004e0730f +Size (apcupsd-3.14.13r2365.tar.gz) = 1816935 bytes SHA1 (patch-ab) = 3db85accf1b05c8723dd7625278dfac02909dc34 SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517 SHA1 (patch-ad) = 2877fd13513c96f4489953b539012b03c16b0223 SHA1 (patch-ae) = 9deb5f88617ea4fa81308567f4e65851c05e3f86 -SHA1 (patch-af) = 0e230b543aa72c6d5799b2223e52f2d932255e4f +SHA1 (patch-af) = 1d9e76ff90699aa15f2311e0eae922071e83fca8 SHA1 (patch-ag) = c160cf80182edd0e42323dd24eddff7ae91c0e13 SHA1 (patch-ah) = 738b93b481310aa92ee16d0fbf91b5723b8cabb8 SHA1 (patch-ai) = 0295d1bd90b5bb7890e93ef04f12c76cfdc6c94a -SHA1 (patch-aj) = d6e3b244c184b090e3b3f56ab6780283e85b2593 -SHA1 (patch-al) = bf84f2db316e944a7231ff4c75a5c903f61121dc -SHA1 (patch-am) = a2c060519748cf95f0f9aaa284f783f086c1d7d4 -SHA1 (patch-an) = 4464effaf8c67e202bb6c71bad1e6c3fb87c5444 +SHA1 (patch-aj) = b46da7d9a81dca87b3e1dc89f4cfe2c8bfa9623c +SHA1 (patch-an) = 64aef62894075ccd9cca1308bf57b8ef897b4763 SHA1 (patch-ao) = 1f755c11e30759f023c3a1a6f23949300d1ff7f7 SHA1 (patch-ap) = 32cf69dcc70ade970532e4e738fe8927ec1ec304 diff --git a/sysutils/apcupsd/patches/patch-af b/sysutils/apcupsd/patches/patch-af index da70e7d4729..41987a3feae 100644 --- a/sysutils/apcupsd/patches/patch-af +++ b/sysutils/apcupsd/patches/patch-af @@ -1,21 +1,21 @@ -$NetBSD: patch-af,v 1.7 2011/08/01 14:54:51 bouyer Exp $ +$NetBSD: patch-af,v 1.8 2016/01/28 15:51:34 prlw1 Exp $ ---- src/Makefile.orig 2009-09-30 01:20:45.000000000 +0200 -+++ src/Makefile 2011-08-01 16:07:24.000000000 +0200 -@@ -23,7 +23,7 @@ +--- src/Makefile.orig 2014-11-04 19:17:43.000000000 +0000 ++++ src/Makefile +@@ -27,7 +27,7 @@ smtp_obj := $(call SRC2OBJ,$(smtp SRCS = $(common_srcs) $(apcupsd_srcs) $(apcaccess_srcs) \ $(apctest_srcs) $(smtp_srcs) --all-targets: apcupsd apcaccess apctest smtp -+all-targets: apcupsd apcaccess apctest +-all-targets: apcupsd$(EXE) apcaccess$(EXE) apctest$(EXE) smtp$(EXE) ++all-targets: apcupsd$(EXE) apcaccess$(EXE) apctest$(EXE) - apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) - $(LINK) $(DRVLIBS) -@@ -45,7 +45,6 @@ - $(call INSTPROG,700,apcupsd,$(sbindir)/apcupsd) - $(call INSTPROG,700,apctest,$(sbindir)/apctest) - $(call INSTPROG,755,apcaccess,$(sbindir)/apcaccess) -- $(call INSTPROG,755,smtp,$(sbindir)/smtp) + apcupsd$(EXE): $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) + $(LINK) $(DRVLIBS) $(BG) +@@ -49,7 +49,6 @@ install-base: + $(call INSTPROG,700,apcupsd,$(sbindir)/apcupsd$(EXE)) + $(call INSTPROG,700,apctest,$(sbindir)/apctest$(EXE)) + $(call INSTPROG,755,apcaccess,$(sbindir)/apcaccess$(EXE)) +- $(call INSTPROG,755,smtp,$(sbindir)/smtp$(EXE)) uninstall-base: - $(call UNINST,$(sbindir)/apcupsd) + $(call UNINST,$(sbindir)/apcupsd$(EXE)) diff --git a/sysutils/apcupsd/patches/patch-aj b/sysutils/apcupsd/patches/patch-aj index 3d0dae9a02b..4d79f32961a 100644 --- a/sysutils/apcupsd/patches/patch-aj +++ b/sysutils/apcupsd/patches/patch-aj @@ -1,18 +1,19 @@ -$NetBSD: patch-aj,v 1.8 2011/08/01 14:54:51 bouyer Exp $ +$NetBSD: patch-aj,v 1.9 2016/01/28 15:51:34 prlw1 Exp $ ---- configure.orig 2010-09-02 16:23:39.000000000 +0200 -+++ configure 2011-08-01 15:50:48.000000000 +0200 -@@ -1542,9 +1542,6 @@ +--- configure.orig 2015-01-04 20:35:43.000000000 +0000 ++++ configure +@@ -2266,10 +2266,6 @@ else + if test x$sysconfdir = x'${prefix}/etc' ; then sysconfdir='/etc/apcupsd' fi - +- - if test x$sbindir = x'${exec_prefix}/sbin' ; then - sbindir='/sbin' - fi fi - # Make sure we can run config.sub. -@@ -3416,7 +3413,7 @@ + +@@ -4062,7 +4058,7 @@ _ACEOF APCACCESS=apcaccess @@ -21,16 +22,7 @@ $NetBSD: patch-aj,v 1.8 2011/08/01 14:54:51 bouyer Exp $ APCTEST=apctest -@@ -10575,7 +10572,7 @@ - echo "$as_me:$LINENO: result: Using Linux USB driver." >&5 - echo "${ECHO_T}Using Linux USB driver." >&6 - ;; -- *-*-freebsd* | *-*-openbsd* | *-*-netbsd*) -+ *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-dragonfly*) - LIBUSBHIDINC="-I\$(topdir)/src/libusbhid" - LIBUSBHID=libusbhid - APCDRVLIBS="$APCDRVLIBS \$(topdir)/src/libusbhid/libusbhid.a" -@@ -12200,7 +12197,7 @@ +@@ -13112,7 +13108,7 @@ then elif test $HAVE_UNAME=yes -a x`uname -s` = xFreeBSD then DISTNAME=freebsd @@ -39,7 +31,7 @@ $NetBSD: patch-aj,v 1.8 2011/08/01 14:54:51 bouyer Exp $ then DISTNAME=netbsd elif test $HAVE_UNAME=yes -a x`uname -s` = xOpenBSD -@@ -12331,7 +12328,7 @@ +@@ -13243,7 +13239,7 @@ debian) platforms/debian/apcupsd \ platforms/debian/ups-monitor" ;; @@ -48,7 +40,7 @@ $NetBSD: patch-aj,v 1.8 2011/08/01 14:54:51 bouyer Exp $ DISTVER=`uname -a |awk '{print $3}'` SERIALDEV=/dev/cuaa0 nologdir=/var/run -@@ -12365,7 +12362,8 @@ +@@ -13277,7 +13273,8 @@ netbsd) PTHREAD_LFLAGS="" LDFLAGS="$LDFLAGS -pthread" DFILES="\ diff --git a/sysutils/apcupsd/patches/patch-al b/sysutils/apcupsd/patches/patch-al deleted file mode 100644 index 21f229a2dbe..00000000000 --- a/sysutils/apcupsd/patches/patch-al +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-al,v 1.5 2011/08/01 14:54:51 bouyer Exp $ - ---- src/drivers/usb/bsd/bsd-usb.c.orig 2010-09-09 15:12:49.000000000 +0200 -+++ src/drivers/usb/bsd/bsd-usb.c 2011-08-01 15:35:27.000000000 +0200 -@@ -27,8 +27,13 @@ - #include "apc.h" - #include "hidutils.h" - #include "../usb_common.h" -+#ifdef __DragonFly__ -+#include <bus/usb/usb.h> -+#include <bus/usb/usbhid.h> -+#else - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> -+#endif - - /* Compatibility cruft for FreeBSD <= 4.7 */ - #ifndef USB_MAX_DEVNAMES diff --git a/sysutils/apcupsd/patches/patch-am b/sysutils/apcupsd/patches/patch-am deleted file mode 100644 index 031835a1aeb..00000000000 --- a/sysutils/apcupsd/patches/patch-am +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-am,v 1.3 2007/03/07 20:48:04 joerg Exp $ - ---- src/drivers/usb/bsd/hidutils.c.orig 2007-03-07 19:31:41.000000000 +0000 -+++ src/drivers/usb/bsd/hidutils.c -@@ -26,8 +26,13 @@ - #include "apc.h" - - #include "hidutils.h" -+#ifdef __DragonFly__ -+#include <bus/usb/usb.h> -+#include <bus/usb/usbhid.h> -+#else - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> -+#endif - - #define MAX_SANE_DESCRIPTOR_LEN 4096 - diff --git a/sysutils/apcupsd/patches/patch-an b/sysutils/apcupsd/patches/patch-an index 713740fdd52..30d5ab4f424 100644 --- a/sysutils/apcupsd/patches/patch-an +++ b/sysutils/apcupsd/patches/patch-an @@ -1,26 +1,29 @@ -$NetBSD: patch-an,v 1.7 2011/08/14 21:42:14 shattered Exp $ +$NetBSD: patch-an,v 1.8 2016/01/28 15:51:34 prlw1 Exp $ ---- src/cgi/Makefile.orig 2009-09-20 19:41:26.000000000 +0000 +--- src/cgi/Makefile.orig 2014-11-04 19:17:43.000000000 +0000 +++ src/cgi/Makefile -@@ -16,7 +16,7 @@ upsimage_obj := $(call SRC2OBJ,$(upsim - SRCS = $(common_srcs) $(multimon_srcs) $(upsstats_srcs) \ +@@ -17,9 +17,9 @@ SRCS = $(common_srcs) $(multimon_srcs) $ $(upsfstats_srcs) $(upsimage_srcs) + # libgd needs -DNONDLL on Windows, otherwise it defaults to DLL +-upsimage.cgi: CPPFLAGS += -DNONDLL ++apcupsimage.cgi: CPPFLAGS += -DNONDLL + -all-targets: multimon.cgi upsstats.cgi upsfstats.cgi upsimage.cgi +all-targets: multimon.cgi upsstats.cgi upsfstats.cgi apcupsimage.cgi multimon.cgi: $(common_obj) $(multimon_obj) $(APCLIBS) $(LINK) -@@ -27,7 +27,7 @@ upsstats.cgi: $(common_obj) $(upsstats_o +@@ -30,7 +30,7 @@ upsstats.cgi: $(common_obj) $(upsstats_o upsfstats.cgi: $(common_obj) $(upsfstats_obj) $(APCLIBS) $(LINK) -upsimage.cgi: $(common_obj) $(upsimage_obj) $(APCLIBS) +apcupsimage.cgi: $(common_obj) $(upsimage_obj) $(APCLIBS) - $(LINK) $(X_LIBS) $(LIBGD) + $(LINK) $(LIBGD) all-install: install-cgi -@@ -38,23 +38,13 @@ install-cgi: +@@ -41,23 +41,13 @@ install-cgi: $(call INSTPROG,755,multimon.cgi,$(cgibin)) $(call INSTPROG,755,upsstats.cgi,$(cgibin)) $(call INSTPROG,755,upsfstats.cgi,$(cgibin)) |