ports/111253: [PATCH] sysutils/apcupsd: update to 3.14.0

[Jui-Nan Lin]

>Number:         111253
>Category:       ports
>Synopsis:       [PATCH] sysutils/apcupsd: update to 3.14.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 05 06:20:04 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Jui-Nan Lin
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD Florence.tamama.org 6.2-RELEASE FreeBSD 6.2-RELEASE #2: Sun Jan 14 16:22:16 CST 2007
>Description:
- Update to 3.14.0

  **WARN** MASTER/SLAVE networking mode is removed

Changes:
  * PowerChute Network Shutdown driver
  * New configuration directives to set paths at runtime

  See: http://sourceforge.net/project/shownotes.php?group_id=54413&release_id=485633

  GAPCMON GUI monitoring tool was not ported in this patch.

Removed file(s):
- files/apcupsd.conf.net-master.sample
- files/apcupsd.conf.net-slave.sample

Port maintainer (itetcu at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- apcupsd-3.14.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/apcupsd/Makefile /home/jnlin/ports/apcupsd/Makefile
--- /usr/ports/sysutils/apcupsd/Makefile	Wed Feb 28 09:19:04 2007
+++ /home/jnlin/ports/apcupsd/Makefile	Thu Apr  5 13:44:20 2007
@@ -7,8 +7,7 @@
 # $Tecnik: ports/sysutils/apcupsd/Makefile,v 1.9 2006/04/30 11:36:52 itetcu Exp $
 
 PORTNAME=	apcupsd
-PORTVERSION=	3.12.4
-PORTREVISION=	1
+PORTVERSION=	3.14.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:src_sf/g} \
 		http://sce-tindy.tecnik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
@@ -31,7 +30,7 @@
 		--with-nologin=/var/run \
 		--disable-install-distdir \
 		--sysconfdir=${PREFIX}/etc/apcupsd \
-		--with-serial-dev=/dev/usv
+		--with-serial-dev=/dev/usv \
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"   \
@@ -92,8 +91,6 @@
 	done
 	@${ECHO_CMD} "@unexec if [ -d %D/etc/apcupsd ]; then ${ECHO_CMD} \"If you are permanently removing this port, you should do a ``rm -rf ${PREFIX}/etc/apcupsd`` to remove config files left.\" | ${FMT} ; fi" >> ${TMPPLIST}
 #	Install sample startup script
-	${INSTALL_DATA} ${FILESDIR}/apcupsd.conf.net-master.sample ${PREFIX}/etc/apcupsd/
-	${INSTALL_DATA} ${FILESDIR}/apcupsd.conf.net-slave.sample ${PREFIX}/etc/apcupsd/
 #	If there is already a config file it is installed as ...new
 	for na in apcupsd.conf apcupsd.css hosts.conf multimon.conf; do \
 		if [ -f ${PREFIX}/etc/apcupsd/$$na ]; then \
diff -ruN --exclude=CVS /usr/ports/sysutils/apcupsd/distinfo /home/jnlin/ports/apcupsd/distinfo
--- /usr/ports/sysutils/apcupsd/distinfo	Sun Sep 10 01:25:05 2006
+++ /home/jnlin/ports/apcupsd/distinfo	Thu Apr  5 12:59:47 2007
@@ -1,5 +1,5 @@
-MD5 (apcupsd-3.12.4.tar.gz) = 669c833ec02a2bc29fa98f845e5f5de5
-SHA256 (apcupsd-3.12.4.tar.gz) = e2c789089a71f8bafc2812a5e20b73f5420e4c234961afb53a30f6ff891640ba
-SIZE (apcupsd-3.12.4.tar.gz) = 4223158
+MD5 (apcupsd-3.14.0.tar.gz) = 334fe3413c08f14acec0226e71e98e0a
+SHA256 (apcupsd-3.14.0.tar.gz) = 3d30e5234115b466b97434d8c74f0cfc96c3735add7eb725066e5043ffbd66aa
+SIZE (apcupsd-3.14.0.tar.gz) = 4356614
 MD5 (apcupsd.pdf) = IGNORE
 SHA256 (apcupsd.pdf) = IGNORE
diff -ruN --exclude=CVS /usr/ports/sysutils/apcupsd/files/apcupsd.conf.net-master.sample /home/jnlin/ports/apcupsd/files/apcupsd.conf.net-master.sample
--- /usr/ports/sysutils/apcupsd/files/apcupsd.conf.net-master.sample	Mon Jan  5 03:18:20 2004
+++ /home/jnlin/ports/apcupsd/files/apcupsd.conf.net-master.sample	Thu Jan  1 08:00:00 1970
@@ -1,35 +0,0 @@
-## apcupsd.conf v1.1 ##
-#
-# apcupsd 3.10.X master configuration
-#
-UPSCABLE 940-1524C
-UPSTYPE smartups
-DEVICE /dev/usv
-LOCKFILE /var/spool/lock
-BATTERYLEVEL 5
-MINUTES 3
-TIMEOUT 0
-ANNOY 300
-ANNOYDELAY 60
-NOLOGON disable
-KILLDELAY 0
-NETSERVER on
-#NISIP 0.0.0.0
-NISPORT 3551
-EVENTSFILE /var/log/apcupsd.events
-EVENTSFILEMAX 10
-UPSCLASS netmaster
-UPSMODE net
-STATTIME 0
-STATFILE /var/log/apcupsd.status
-LOGSTATS off
-DATATIME 0
-UPSNAME LK-SMART
-BATTDATE 11/20/01
-WAKEUP 60
-SLEEP 180
-LOTRANSFER  208
-HITRANSFER 253
-BEEPSTATE 0
-OUTPUTVOLTS 230
-SELFTEST 168
diff -ruN --exclude=CVS /usr/ports/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample /home/jnlin/ports/apcupsd/files/apcupsd.conf.net-slave.sample
--- /usr/ports/sysutils/apcupsd/files/apcupsd.conf.net-slave.sample	Mon Jan  5 03:18:20 2004
+++ /home/jnlin/ports/apcupsd/files/apcupsd.conf.net-slave.sample	Thu Jan  1 08:00:00 1970
@@ -1,18 +0,0 @@
-## apcupsd.conf v1.1 ##
-#
-#  apcupsd 3.10.X
-#
-# "apcupsd" netslave file
-#
-UPSCABLE ether
-UPSTYPE net
-DEVICE usv.koellers.net:3551
-LOCKFILE /var/spool/lock
-EVENTSFILE /var/log/apcupsd.events
-UPSCLASS standalone
-UPSMODE disable
-NISPORT		3551
-#
-# Use this to control the poll time.
-# the default is 60 or 1 minute
-NETTIME 30
diff -ruN --exclude=CVS /usr/ports/sysutils/apcupsd/pkg-plist /home/jnlin/ports/apcupsd/pkg-plist
--- /usr/ports/sysutils/apcupsd/pkg-plist	Mon May  1 22:35:47 2006
+++ /home/jnlin/ports/apcupsd/pkg-plist	Thu Apr  5 13:23:01 2007
@@ -3,16 +3,12 @@
 sbin/apctest
 sbin/smtp
 %%POWERFL%%sbin/powerflute
-etc/apcupsd/apcupsd.conf.net-master.sample
-etc/apcupsd/apcupsd.conf.net-slave.sample
 @unexec if cmp -s %D/etc/apcupsd/apcupsd.conf.sample %D/etc/apcupsd/apcupsd.conf; then rm -f %D/etc/apcupsd/apcupsd.conf; fi
 etc/apcupsd/apcupsd.conf.sample
 etc/apcupsd/apccontrol
 etc/apcupsd/changeme
 etc/apcupsd/commfailure
 etc/apcupsd/commok
-etc/apcupsd/masterconnect
-etc/apcupsd/mastertimeout
 etc/apcupsd/onbattery
 etc/apcupsd/offbattery
 %%CGI%%@unexec if cmp -s %D/etc/apcupsd/apcupsd.css.sample %D/etc/apcupsd/apcupsd.css; then rm -f %D/etc/apcupsd/apcupsd.css; fi
--- apcupsd-3.14.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: