- Update to 3.14.8

- Among other things, the SNMP driver that does not require libsnmp.so
- Adjust pkg-message to point to the right manual [1]

Full list of changes:
http://apcupsd.cvs.sourceforge.net/viewvc/*checkout*/apcupsd/apcupsd/ReleaseNotes?pathrev=Release-3_14_8

Submitted by:	Scott Bennett <bennett@cs.niu.edu> [1]
Tested by:	Ulrich Drolshagen <u.drolshagen@t-online.de>, imp@inbox.ru,
		Warren Block <wblock@wonkity.com>, mack@

5 files changed, 18 insertions, 41 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 77fd87a3586e..5c3f1042075c 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -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 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		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 @@ OPTIONS=	APCSMART_DRV "Compile APC SmartUPS serial driver" on \
 		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+=	--enable-pcnet
 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 @@ pre-configure:
 	@${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 \
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index 958846443840..699a19f42bfe 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -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
diff --git a/sysutils/apcupsd/files/patch-src__powerflute.c b/sysutils/apcupsd/files/patch-src__powerflute.c
deleted file mode 100644
index 9f0a3f51ac15..000000000000
--- a/sysutils/apcupsd/files/patch-src__powerflute.c
+++ /dev/null
@@ -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
diff --git a/sysutils/apcupsd/files/pkg-message.in b/sysutils/apcupsd/files/pkg-message.in
index ad709025e578..36ee3eb2ff77 100644
--- a/sysutils/apcupsd/files/pkg-message.in
+++ b/sysutils/apcupsd/files/pkg-message.in
@@ -1,7 +1,7 @@
 **********************************************************************
 Read the manual
 
-  %%DOCSDIR%%/manual.pdf
+  %%DOCSDIR%%/apcupsd.pdf
 
 to do site specific configuration assigenments! Especially have a
 detailed look into the chapter describing the shutdown procedure.
diff --git a/sysutils/apcupsd/pkg-plist b/sysutils/apcupsd/pkg-plist
index a9635b4c88b1..19ef1b86b108 100644
--- a/sysutils/apcupsd/pkg-plist
+++ b/sysutils/apcupsd/pkg-plist
@@ -2,7 +2,6 @@ sbin/apcupsd
 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