On Sun, 7 Mar 2010 11:34:51 +0300 Max Brazhnikov <m...@issp.ac.ru> wrote:
> On Sat, 6 Mar 2010 20:38:26 +0200, Ion-Mihai Tetcu wrote: > > Attached diff updates apcupsd to the latest stable version. > > The change logs are here: > > http://apcupsd.cvs.sourceforge.net/viewvc/*checkout*/apcupsd/apcupsd/Rele > > as eNotes?pathrev=Release-3_14_8 > > > > AFAIK this should fix all reported problems. > > > > I'd be grateful if you could test it and report back successes or > > failures (I'm badly missing non-production UPSes to test on). > > ===> Applying FreeBSD patches for apcupsd-3.14.8 > No file to patch. Skipping... > 1 out of 1 hunks ignored--saving rejects to ./src/powerflute.c.rej > => Patch patch-src__powerflute.c failed to apply cleanly. > => Patch(es) patch-configure patch-src__apcaccess.c applied cleanly. > *** Error code 1 > > Assuming the patch was staled I've removed it and compiled port. No > regression for me. Yes, powerflute has been disabled for some time, and now completely removed. I forgot to pass -N to cvs diff. Updated patch attached. Thanks for your report. -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" FreeBSD committer -> ite...@freebsd.org, PGP Key ID 057E9F8B493A297B
? apcupsd_3.14.5_to_3.14.8.diff
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/apcupsd/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- Makefile 22 Aug 2009 00:35:10 -0000 1.64
+++ Makefile 7 Mar 2010 08:43:11 -0000
@@ -6,8 +6,8 @@
#
PORTNAME= apcupsd
-PORTVERSION= 3.14.5
-PORTREVISION= 1
+PORTVERSION= 3.14.8
+PORTREVISION= 0
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}:src_sf \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
@@ -37,7 +37,8 @@
CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib"
-MAN8= apcupsd.8
+MAN5= apcupsd.conf.5
+MAN8= apcaccess.8 apccontrol.8 apctest.8 apcupsd.8
OPTIONS= APCSMART_DRV "Compile APC SmartUPS serial driver" on \
APCDUMB_DRV "Compile dumb UPS driver" on \
@@ -46,10 +47,10 @@
PCNET_DRV "Compile PowerChute Network Shutdown driver" on \
USB "Compile with USB Support driver" on \
SNMP_DRV "Compile with SNMP driver" on \
+ SNMP_DRV_OLD "Compile with old SNMP driver" off \
TCP_WRAPPERS "Compile with TCP_WRAPPERS support" on\
TEST_DRV "Compile TEST driver" off \
GAPCMON "Build GTK GUI front-end" off
-# POWERFLUTE "Compile powerflute program" off
PORTDOCS= ${PORTNAME}.pdf
@@ -96,26 +97,23 @@
CONFIGURE_ARGS+= --disable-pcnet
.endif
-# disabled upstream
-.ifdef(WITH_POWERFLUTE)
-CONFIGURE_ARGS+= --enable-powerflute
-CONFIGURE_ENV+= LIBS+="-lcurses -lmenu"
-PLIST_SUB+= POWERFL=""
-.else
-PLIST_SUB+= POWERFL="@comment "
-.endif
-
.ifdef(WITH_USB)
CONFIGURE_ARGS+= --enable-usb
.endif
.ifdef(WITH_SNMP_DRV)
-LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
CONFIGURE_ARGS+= --enable-snmp
.else
CONFIGURE_ARGS+= --disable-snmp
.endif
+.ifdef(WITH_SNMP_DRV_OLD)
+LIB_DEPENDS+= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp
+CONFIGURE_ARGS+= --enable-net-snmp
+.else
+CONFIGURE_ARGS+= --disable-net-snmp
+.endif
+
.ifdef(WITH_TCP_WRAPPERS)
CONFIGURE_ARGS+= --with-libwrap=yes
.endif
@@ -145,12 +143,9 @@
@${FALSE}
.endif
-post-configure:
- @${REINPLACE_CMD} -e "s|%PREFIX%|${PREFIX}|g" ${WRKSRC}/doc/apcupsd.man
-
post-install:
-# If the files presaved are identical with the new one, include then in
-# the package list. So the port could be removed without problems
+# If the files presaved are identical with the new one, include them in
+# the package list, so the port can be removed without problems
for na in apccontrol commfailure mainsback mastertimeout \
changeme commok masterconnect onbattery; do \
if [ -f ${ETCDIR}/$$na.orig ]; then \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/apcupsd/distinfo,v
retrieving revision 1.26
diff -u -r1.26 distinfo
--- distinfo 16 Feb 2009 22:56:48 -0000 1.26
+++ distinfo 7 Mar 2010 08:43:11 -0000
@@ -1,5 +1,5 @@
-MD5 (apcupsd-3.14.5.tar.gz) = 4ac73ec91d8ab56f3fac894e172567c4
-SHA256 (apcupsd-3.14.5.tar.gz) = f48a75139d5701d13444128da6f9f6feea04da8524e8ba3bce2c21bdbedba49e
-SIZE (apcupsd-3.14.5.tar.gz) = 4172931
+MD5 (apcupsd-3.14.8.tar.gz) = cd17f0a903dc2220e55ed54e242359d2
+SHA256 (apcupsd-3.14.8.tar.gz) = 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7
+SIZE (apcupsd-3.14.8.tar.gz) = 1317601
MD5 (apcupsd.pdf) = IGNORE
SHA256 (apcupsd.pdf) = IGNORE
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/apcupsd/pkg-plist,v
retrieving revision 1.22
diff -u -r1.22 pkg-plist
--- pkg-plist 10 Jul 2008 20:03:47 -0000 1.22
+++ pkg-plist 7 Mar 2010 08:43:11 -0000
@@ -2,7 +2,6 @@
sbin/apcaccess
sbin/apctest
sbin/smtp
-%%POWERFL%%sbin/powerflute
@unexec if cmp -s %D/%%ETCDIR%%/apcupsd.conf.sample %D/%%ETCDIR%%/apcupsd.conf; then rm -f %D/%%ETCDIR%%/apcupsd.conf; fi
%%ETCDIR%%/apcupsd.conf.sample
%%ETCDIR%%/apccontrol
Index: files/patch-src__powerflute.c
===================================================================
RCS file: files/patch-src__powerflute.c
diff -N files/patch-src__powerflute.c
--- files/patch-src__powerflute.c 10 Jul 2008 20:03:47 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- ./src/powerflute.c.orig 2008-01-27 18:22:57.000000000 +0200
-+++ ./src/powerflute.c 2008-06-29 14:16:28.000000000 +0300
-@@ -28,12 +28,12 @@
- #ifdef HAVE_POWERFLUTE
-
- #ifdef HAVE_NCURSES_MENU_H
--# include <ncurses/curses.h>
-+# include <ncurses/ncurses.h>
- # include <ncurses/panel.h>
- # include <ncurses/menu.h>
- #else
- # ifdef HAVE_MENU_H
--# include <curses.h>
-+# include <ncurses.h>
- # include <panel.h>
- # include <menu.h>
- # else
signature.asc
Description: PGP signature
