[pkgsrc/trunk]: pkgsrc/sysutils/apcupsd Update to 3.12.4.

[bouyer <bouyer%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23d5abdb3e88
branches:  trunk
changeset: 521643:23d5abdb3e88
user:      bouyer <bouyer%pkgsrc.org@localhost>
date:      Wed Nov 15 21:46:24 2006 +0000

description:
Update to 3.12.4.
Summary of changes since 3.8.6:
* Support for USB UPSe (not enabled in pkgsrc)
* new networking driver (net) that uses the NIS interface rather than the
  older master/slave networking
* The apctest program has been enhanced to do EEPROM programming in a much
  more interactive way than the prior versions.
* Added a ONBATTERYDELAY config, time to switch to onbattery state after
  a power failure. New event "offbattery", which is the same as mainsback but
  only sent if we got to state onbattery
* new snmp driver, with trap support.
* Battery disconnect and reconnect events

diffstat:

 sysutils/apcupsd/Makefile         |     63 +-
 sysutils/apcupsd/PLIST            |     90 +-
 sysutils/apcupsd/distinfo         |     30 +-
 sysutils/apcupsd/patches/patch-aa |    112 +-
 sysutils/apcupsd/patches/patch-ab |      6 +-
 sysutils/apcupsd/patches/patch-ac |     12 +-
 sysutils/apcupsd/patches/patch-ad |    216 +-
 sysutils/apcupsd/patches/patch-ae |     34 +-
 sysutils/apcupsd/patches/patch-af |    102 +-
 sysutils/apcupsd/patches/patch-ag |     14 +
 sysutils/apcupsd/patches/patch-aj |  21133 ++++++++++++++++++++++++++++++++---
 sysutils/apcupsd/patches/patch-ak |      6 +-
 sysutils/apcupsd/patches/patch-al |     13 -
 sysutils/apcupsd/patches/patch-am |     13 -
 sysutils/apcupsd/patches/patch-an |     13 -
 sysutils/apcupsd/patches/patch-ao |     13 -
 sysutils/apcupsd/patches/patch-ap |     13 -
 17 files changed, 19125 insertions(+), 2758 deletions(-)

diffs (truncated from 22192 to 300 lines):

diff -r b1674a966d7d -r 23d5abdb3e88 sysutils/apcupsd/Makefile
--- a/sysutils/apcupsd/Makefile Wed Nov 15 19:27:16 2006 +0000
+++ b/sysutils/apcupsd/Makefile Wed Nov 15 21:46:24 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2006/08/04 08:05:54 ghen Exp $
+# $NetBSD: Makefile,v 1.45 2006/11/15 21:46:24 bouyer Exp $
 
-DISTNAME=              apcupsd-3.8.6
-PKGREVISION=           5
+DISTNAME=              apcupsd-3.12.4
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
 
@@ -10,6 +9,7 @@
 COMMENT=               UPS power management for APCC Products
 
 USE_TOOLS+=            gmake msgfmt sh
+USE_LANGUAGES+=                c++
 
 GNU_CONFIGURE=         yes
 
@@ -23,6 +23,8 @@
 #CONFIGURE_ARGS+=      --enable-threads        # compile threading code
 #CONFIGURE_ARGS+=      --enable-powerflute     # compile powerflute program
 
+CONFIGURE_ARGS+=       --enable-net            # enable NIS network driver
+#CONFIGURE_ARGS+=      --enable-snmp           # enable SNMP driver
 CONFIGURE_ARGS+=       --with-catgets          # use catgets functions
 CONFIGURE_ARGS+=       --enable-nls            # i18n support
 CONFIGURE_ARGS+=       --with-lock-dir=${VARBASE}/spool/lock
@@ -40,12 +42,18 @@
 CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${ROOT_USER} ${ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/masterconnect ${PKG_SYSCONFDIR}/masterconnect ${ROOT_USER} ${ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/mastertimeout ${PKG_SYSCONFDIR}/mastertimeout ${ROOT_USER} ${ROOT_GROUP} 755
+CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${ROOT_USER} ${ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/mainsback ${PKG_SYSCONFDIR}/mainsback ${ROOT_USER} ${ROOT_GROUP} 755
 CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755
 RCD_SCRIPTS=   apcupsd
 RCD_SCRIPT_SRC.apcupsd=        ${WRKSRC}/distributions/netbsd/apcupsd
 
+EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
+    etc/masterconnect etc/mastertimeout etc/offbattery etc/onbattery
+MANFILES= apcupsd apctest
+
 # we should probably allow the tty to be set in /etc/mk.conf too
 #
 post-build:
@@ -55,52 +63,31 @@
        ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
                ${WRKSRC}/examples/apcupsd.slave.conf > \
                ${WRKDIR}/apcupsd.slave.conf
+.for file in ${MANFILES}
        ${SED} -e 's|@@PREFIX@@|${PREFIX}|'\
             -e 's|@@SYSCONFDIR@@|${PKG_SYSCONFDIR}|' \
-            ${WRKSRC}/doc/apcupsd.man > ${WRKSRC}/doc/apcupsd.8
-
-DOCS=  README.BackUPS          \
-       README.BackUPS-Pro      \
-       README.NewerBackUPS-Pro \
-       README.Share-UPS        \
-       README.SmartUPS-VS      \
-       README.apcaccess        \
-       README.autoconfig       \
-       README.cable            \
-       Statement.APCC          \
-       apcupsd-bug-1           \
-       apcupsd-bug-2           \
-       minicom.txt             \
-       port.gif
+            ${WRKSRC}/doc/${file}.man > ${WRKSRC}/doc/${file}.8
+.endfor
 
-HTMLDOCS= apcaccess.html apcnisd.html apctest.html apcupsd-styles.css \
-        apcupsd.book apcupsd.gif apcupsd.html batteries.html bugs.html \
-        cables.html cgiprogs.html charging.gif config-examples.html \
-        configure.html data.html eprom.html events.html faq.html index.html \
-        install.html invoking.html kernel_config.html license.html \
-        logging.html master-slave.html multiUPS.html multimon.gif \
-        new_features_3_7_0.html new_features_3_8_0.html \
-        new_features_3_8_1.html new_features_3_8_2.html \
-        new_features_3_8_3.html new_features_3_8_4.html \
-        new_features_3_8_5.html oldversions.html onbatt.gif online.gif \
-        security.html shutdown.html status.gif status.html stopping.html \
-        testing.html thanks.gif thanks.html troubles.html \
-        upgrading_to_3_7_0.html upsbible.html usb.html win32.html \
-        wininstall1.gif wininstall2.gif wininstall3.gif wininstall4.gif \
-        wininstall5.gif wininstall6.gif wininstall7.gif
+HTMLDOCS= apcupsd.gif bclogo.gif bugs.html bugs.wml index.html index.wml \
+    license.html license.wml lists.html lists.wml mail16d.png menu.inc \
+    publishsite support.html support.wml systems.html systems.wml template.inc
 
 post-install:
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/apcupsd
        ${INSTALL_DATA} ${WRKDIR}/apcupsd.master.conf \
                ${PREFIX}/share/examples/apcupsd
        ${INSTALL_DATA} ${WRKDIR}/apcupsd.slave.conf \
                ${PREFIX}/share/examples/apcupsd
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apcupsd
-.for file in ${DOCS}
-       ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/apcupsd
+.for file in ${EGFILES}
+       ${INSTALL_SCRIPT} ${WRKSRC}/platforms/${file} \
+               ${PREFIX}/share/examples/apcupsd
 .endfor
+       ${INSTALL_SCRIPT} ${WRKSRC}/platforms/netbsd/apcupsd \
+           ${PREFIX}/share/examples/rc.d
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/apcupsd
 .for file in ${HTMLDOCS}
-       ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \
+       ${INSTALL_DATA} ${WRKSRC}/doc/home-page/${file} \
                ${PREFIX}/share/doc/html/apcupsd
 .endfor
 
diff -r b1674a966d7d -r 23d5abdb3e88 sysutils/apcupsd/PLIST
--- a/sysutils/apcupsd/PLIST    Wed Nov 15 19:27:16 2006 +0000
+++ b/sysutils/apcupsd/PLIST    Wed Nov 15 21:46:24 2006 +0000
@@ -1,89 +1,37 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/11/15 21:46:25 bouyer Exp $
 sbin/apcaccess
-sbin/apcnisd
 sbin/apctest
 sbin/apcupsd
 man/man8/apcupsd.8
-share/doc/apcupsd/README.BackUPS
-share/doc/apcupsd/README.BackUPS-Pro
-share/doc/apcupsd/README.NewerBackUPS-Pro
-share/doc/apcupsd/README.Share-UPS
-share/doc/apcupsd/README.SmartUPS-VS
-share/doc/apcupsd/README.apcaccess
-share/doc/apcupsd/README.autoconfig
-share/doc/apcupsd/README.cable
-share/doc/apcupsd/Statement.APCC
-share/doc/apcupsd/apcupsd-bug-1
-share/doc/apcupsd/apcupsd-bug-2
-share/doc/apcupsd/minicom.txt
-share/doc/apcupsd/port.gif
-share/doc/html/apcupsd/apcaccess.html
-share/doc/html/apcupsd/apcnisd.html
-share/doc/html/apcupsd/apctest.html
-share/doc/html/apcupsd/apcupsd-styles.css
-share/doc/html/apcupsd/apcupsd.book
+man/man8/apctest.8
 share/doc/html/apcupsd/apcupsd.gif
-share/doc/html/apcupsd/apcupsd.html
-share/doc/html/apcupsd/batteries.html
+share/doc/html/apcupsd/bclogo.gif
 share/doc/html/apcupsd/bugs.html
-share/doc/html/apcupsd/cables.html
-share/doc/html/apcupsd/cgiprogs.html
-share/doc/html/apcupsd/charging.gif
-share/doc/html/apcupsd/config-examples.html
-share/doc/html/apcupsd/configure.html
-share/doc/html/apcupsd/data.html
-share/doc/html/apcupsd/eprom.html
-share/doc/html/apcupsd/events.html
-share/doc/html/apcupsd/faq.html
+share/doc/html/apcupsd/bugs.wml
 share/doc/html/apcupsd/index.html
-share/doc/html/apcupsd/install.html
-share/doc/html/apcupsd/invoking.html
-share/doc/html/apcupsd/kernel_config.html
+share/doc/html/apcupsd/index.wml
 share/doc/html/apcupsd/license.html
-share/doc/html/apcupsd/logging.html
-share/doc/html/apcupsd/master-slave.html
-share/doc/html/apcupsd/multiUPS.html
-share/doc/html/apcupsd/multimon.gif
-share/doc/html/apcupsd/new_features_3_7_0.html
-share/doc/html/apcupsd/new_features_3_8_0.html
-share/doc/html/apcupsd/new_features_3_8_1.html
-share/doc/html/apcupsd/new_features_3_8_2.html
-share/doc/html/apcupsd/new_features_3_8_3.html
-share/doc/html/apcupsd/new_features_3_8_4.html
-share/doc/html/apcupsd/new_features_3_8_5.html
-share/doc/html/apcupsd/oldversions.html
-share/doc/html/apcupsd/onbatt.gif
-share/doc/html/apcupsd/online.gif
-share/doc/html/apcupsd/security.html
-share/doc/html/apcupsd/shutdown.html
-share/doc/html/apcupsd/status.gif
-share/doc/html/apcupsd/status.html
-share/doc/html/apcupsd/stopping.html
-share/doc/html/apcupsd/testing.html
-share/doc/html/apcupsd/thanks.gif
-share/doc/html/apcupsd/thanks.html
-share/doc/html/apcupsd/troubles.html
-share/doc/html/apcupsd/upgrading_to_3_7_0.html
-share/doc/html/apcupsd/upsbible.html
-share/doc/html/apcupsd/usb.html
-share/doc/html/apcupsd/win32.html
-share/doc/html/apcupsd/wininstall1.gif
-share/doc/html/apcupsd/wininstall2.gif
-share/doc/html/apcupsd/wininstall3.gif
-share/doc/html/apcupsd/wininstall4.gif
-share/doc/html/apcupsd/wininstall5.gif
-share/doc/html/apcupsd/wininstall6.gif
-share/doc/html/apcupsd/wininstall7.gif
+share/doc/html/apcupsd/license.wml
+share/doc/html/apcupsd/lists.html
+share/doc/html/apcupsd/lists.wml
+share/doc/html/apcupsd/mail16d.png
+share/doc/html/apcupsd/menu.inc
+share/doc/html/apcupsd/publishsite
+share/doc/html/apcupsd/support.html
+share/doc/html/apcupsd/support.wml
+share/doc/html/apcupsd/systems.html
+share/doc/html/apcupsd/systems.wml
+share/doc/html/apcupsd/template.inc
 share/examples/apcupsd/apcupsd.master.conf
 share/examples/apcupsd/apcupsd.slave.conf
 share/examples/apcupsd/apccontrol
 share/examples/apcupsd/changeme
 share/examples/apcupsd/commfailure
 share/examples/apcupsd/commok
+share/examples/apcupsd/masterconnect
+share/examples/apcupsd/mastertimeout
 share/examples/apcupsd/onbattery
-share/examples/apcupsd/mainsback
+share/examples/apcupsd/offbattery
 share/examples/rc.d/apcupsd
-share/locale/it/LC_MESSAGES/apcupsd.mo
-@dirrm share/doc/apcupsd
 @dirrm share/doc/html/apcupsd
 @dirrm share/examples/apcupsd
diff -r b1674a966d7d -r 23d5abdb3e88 sysutils/apcupsd/distinfo
--- a/sysutils/apcupsd/distinfo Wed Nov 15 19:27:16 2006 +0000
+++ b/sysutils/apcupsd/distinfo Wed Nov 15 21:46:24 2006 +0000
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 13:40:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/11/15 21:46:25 bouyer Exp $
 
-SHA1 (apcupsd-3.8.6.tar.gz) = 443a9625d29312c46edcc24b69802a083ed22b69
-RMD160 (apcupsd-3.8.6.tar.gz) = 072c4e410456a91a6df4c5f1128a597c0e36cf20
-Size (apcupsd-3.8.6.tar.gz) = 2013820 bytes
-SHA1 (patch-aa) = 1b8e48b25be9ef1787a4f27a5a228088807a4a26
-SHA1 (patch-ab) = cbca60f56412513a2141f24a711affbef06c1299
-SHA1 (patch-ac) = f153727711fde0b3ea71b30a258d8d5e7b2472bb
-SHA1 (patch-ad) = 3411f109aa98799c686bd20cb5bce515a150dcbe
-SHA1 (patch-ae) = 230f307753c643944e66c8ab68129a9ec2581bce
-SHA1 (patch-af) = 82eebc194a45aeccd707370f52a0bebff4ea32b1
-SHA1 (patch-aj) = f6bb21d0ebc95501c3a5ea32f2bd7d9c500f68ef
-SHA1 (patch-ak) = 754803ca43d7f7d6d7a044f898e60f4246a1e54d
-SHA1 (patch-al) = 12b03c8426fd157946d2f41656f91b851d83d915
-SHA1 (patch-am) = acea61182b599f058bbdda439c221b1f84c7ca04
-SHA1 (patch-an) = 87b508441d8c1053cace47375a605c75e65aaa03
-SHA1 (patch-ao) = 81d92529336d9bbaf87e876cf1ee130ea90e71eb
-SHA1 (patch-ap) = 288f8d4d358a33f12771a2e1dac041d690f7da25
+SHA1 (apcupsd-3.12.4.tar.gz) = a36212d9634d36beda2318d85b882209763f2473
+RMD160 (apcupsd-3.12.4.tar.gz) = a54c2f6d71c902d7963a1c65a3850f657aabaa88
+Size (apcupsd-3.12.4.tar.gz) = 4223158 bytes
+SHA1 (patch-aa) = 112c8db7a67456821a2e449d6a8ff600a7998dc0
+SHA1 (patch-ab) = 38ca41df0d96130f5c2202cb85d61f3202ec17ad
+SHA1 (patch-ac) = 98e8853dd030e09d5a487e57a277ff1269baa517
+SHA1 (patch-ad) = 48818f95966f5c9f742e333614b0ab5387886e62
+SHA1 (patch-ae) = 96f3fc1645577b9f5558c112133d4bff06c37cd5
+SHA1 (patch-af) = c4a52226d83ac50adcd9296afd786b42867a7a6d
+SHA1 (patch-ag) = 2b77e969d6cbe8ed06797cd753eb443bd6a3881b
+SHA1 (patch-aj) = 5dd8f244698d44ccb77a97ca305e3f2961b858b8
+SHA1 (patch-ak) = c3069d2b8d9059b383874989cde2edaecd35d49b
diff -r b1674a966d7d -r 23d5abdb3e88 sysutils/apcupsd/patches/patch-aa
--- a/sysutils/apcupsd/patches/patch-aa Wed Nov 15 19:27:16 2006 +0000
+++ b/sysutils/apcupsd/patches/patch-aa Wed Nov 15 21:46:24 2006 +0000
@@ -1,25 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2002/12/01 22:32:26 bouyer Exp $
+$NetBSD: patch-aa,v 1.4 2006/11/15 21:46:25 bouyer Exp $
 
---- doc/apcupsd.man.orig       Fri Feb  2 23:46:33 2001
-+++ doc/apcupsd.man    Sun Dec  1 13:13:59 2002
-@@ -4,19 +4,19 @@
- .\" LP paragraph
- .\" IP indented paragraph
- .\" TP hanging label
--.TH apcupsd 8 "APC UPS management under Linux -- November 1999"
-+.TH apcupsd 8 "APC UPS management under Unix -- November 1999"
+--- doc/apcupsd.man.orig       2005-09-13 14:34:36.000000000 +0200
++++ doc/apcupsd.man    2006-11-15 17:30:21.000000000 +0100
+@@ -8,15 +8,15 @@
  .SH NAME
--apcupsd \- daemon for most APC's UPS for Linux
-+apcupsd \- daemon for most APC's UPS for Unix
+ apcupsd \- daemon for most APC's UPS for Linux
  .SH SYNOPSIS
--.B /sbin/apcupsd 
-+.B @@PREFIX@@/sbin/apcupsd 
+-.B /sbin/apcupsd
++.B @@PREFIX@@/sbin/apcupsd
  .br
 -.B /etc/apcupsd/apccontrol
-+.B @@SYSCONFDIR@@/apccontrol
++.B @@SYSCONFDIR@@/apcupsd/apccontrol
  .br
 -.B /etc/apcupsd/apcupsd.conf
-+.B @@SYSCONFDIR@@/apcupsd.conf
++.B @@SYSCONFDIR@@/apcupsd/apcupsd.conf
  .br
 -.B /sbin/apcaccess