diff options
author | Lars Koeller <lkoeller@FreeBSD.org> | 2003-11-18 20:18:17 +0000 |
---|---|---|
committer | Lars Koeller <lkoeller@FreeBSD.org> | 2003-11-18 20:18:17 +0000 |
commit | a9eb0f55e5c7d078d4fbbf37cf99ab9b1a372797 (patch) | |
tree | cde72baee97ff560fd328ee9b1ff8f4a4d5f84f0 /sysutils/apcupsd | |
parent | Add gdesklets-seti, a gdesklet client for the SETI project that is designed (diff) |
o) Update to version 3.10.6 (USB support)
Notes
Notes:
svn path=/head/; revision=94291
Diffstat (limited to 'sysutils/apcupsd')
-rw-r--r-- | sysutils/apcupsd/Makefile | 72 | ||||
-rw-r--r-- | sysutils/apcupsd/distinfo | 2 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-aa | 104 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-ab | 62 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-ac | 64 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-ad | 13 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-ba | 53 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-ca | 95 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-configure | 36 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-doc-apcupds.man | 196 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-platform-Makefile.in | 25 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-platform-etc-Makefile.in | 19 | ||||
-rw-r--r-- | sysutils/apcupsd/files/patch-usb-segfault | 127 | ||||
-rw-r--r-- | sysutils/apcupsd/pkg-plist | 95 |
14 files changed, 473 insertions, 490 deletions
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index efa30d736f81..4a2704605539 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -6,8 +6,8 @@ # PORTNAME= apcupsd -PORTVERSION= 3.8.6 -PORTREVISION= 1 +PORTVERSION= 3.10.6 +#PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,24 +17,27 @@ COMMENT= A daemon for controlling APC UPS LIB_DEPENDS= intl.5:${PORTSDIR}/devel/gettext +USE_REINPLACE= yes + STARTUP_SCRIPT= apcupsd.sh.sample PLIST_SUB= STARTUP_SCRIPT=${STARTUP_SCRIPT} HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --sbindir=${PREFIX}/sbin \ - --enable-nls --disable-install-distdir \ + --disable-install-distdir --enable-usb \ --sysconfdir=${PREFIX}/etc/apcupsd \ --with-serial-dev=/dev/usv \ - --enable-cgi --with-cgi-bin=${PREFIX}/etc/apcupsd/cgi -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - CFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + --enable-cgi --with-cgi-bin=${PREFIX}/etc/apcupsd/cgi \ + --enable-master-slave +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ + CFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib" .include <bsd.port.pre.mk> # Cause FreeBSD 3.X misses libmenu, libforms and libpanel (curses) .if ${OSVERSION} > 400000 -CONFIGURE_ARGS+=--enable-powerflute --with-libwrap +CONFIGURE_ARGS+=--enable-powerflute --with-libwrap=yes PLIST_SUB+= POWERFL="" .else PLIST_SUB+= POWERFL="@comment " @@ -42,31 +45,46 @@ PLIST_SUB+= POWERFL="@comment " MAN8= "apcupsd.8" -MYPORTDOCS= apcupsd.pdf apcaccess.html apcnisd.html apctest.html apcupsd-styles.css \ - apcupsd.apf 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 \ - new_features_3_8_6.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 +PORTDOCS= apcupsd.pdf manual.html \ + apcupsd.png back.png charging.png home.png main_configs.png \ + multimon.png next.png onbatt.png online.png status.png thanks.png \ + wininstall1.png wininstall2.png wininstall3.png wininstall4.png \ + wininstall5.png wininstall6.png wininstall7.png + +post-configure: + ${REINPLACE_CMD} -e "s|%PREFIX%|${PREFIX}|g" ${WRKSRC}/doc/apcupsd.man post-install: + # Check if the install presaves the configuration files + for na in apcupsd.conf hosts.conf multimon.conf; do \ + if [ -f ${PREFIX}/etc/apcupsd/$$na.new ]; then \ + ${ECHO_CMD} "etc/apcupsd/$$na.new" >> ${TMPPLIST}; \ + if cmp -s ${PREFIX}/etc/apcupsd/$$na.new ${PREFIX}/etc/apcupsd/$$na; then \ + ${ECHO_CMD} "etc/apcupsd/$$na" >> ${TMPPLIST}; \ + fi \ + else \ + ${ECHO_CMD} "etc/apcupsd/$$na" >> ${TMPPLIST}; \ + fi; \ + done + # If the files presaved are identical with the new one, include then in + # the package list. So the port could be removed without problems + for na in apccontrol commfailure mainsback mastertimeout \ + changeme commok masterconnect onbattery; do \ + if [ -f ${PREFIX}/etc/apcupsd/$$na.orig ]; then \ + if cmp -s ${PREFIX}/etc/apcupsd/$$na ${PREFIX}/etc/apcupsd/$$na.orig; then \ + ${ECHO_CMD} "etc/apcupsd/$$na.orig" >> ${TMPPLIST}; \ + fi \ + fi; \ + done + ${ECHO_CMD} "@dirrm etc/apcupsd" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec if [ -d %D/etc/apcupsd ]; then echo \"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_SCRIPT} ${FILESDIR}/${STARTUP_SCRIPT} \ ${PREFIX}/etc/rc.d/${STARTUP_SCRIPT} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for file in ${MYPORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} ${DOCSDIR} +.for filen in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/docbook/${filen} ${DOCSDIR} .endfor .endif diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo index 188b9f478d73..b6dfae378a0e 100644 --- a/sysutils/apcupsd/distinfo +++ b/sysutils/apcupsd/distinfo @@ -1 +1 @@ -MD5 (apcupsd-3.8.6.tar.gz) = 7ec48f1abc2107cf1a07dc03b3d88b40 +MD5 (apcupsd-3.10.6.tar.gz) = a015d65ebeae9ee08aacbc8e6e7ac217 diff --git a/sysutils/apcupsd/files/patch-aa b/sysutils/apcupsd/files/patch-aa deleted file mode 100644 index b59910759bc5..000000000000 --- a/sysutils/apcupsd/files/patch-aa +++ /dev/null @@ -1,104 +0,0 @@ -*** configure.orig Tue Nov 27 22:44:39 2001 ---- configure Mon Dec 3 22:12:31 2001 -*************** -*** 4134,4140 **** - # Check for TCP wrapper support - #-------------------------------------------------------------------- - -! with_libwrap=no - # Check whether --with-libwrap or --without-libwrap was given. - if test "${with_libwrap+set}" = set; then - withval="$with_libwrap" ---- 4134,4140 ---- - # Check for TCP wrapper support - #-------------------------------------------------------------------- - -! #with_libwrap=no - # Check whether --with-libwrap or --without-libwrap was given. - if test "${with_libwrap+set}" = set; then - withval="$with_libwrap" -*************** -*** 4179,4185 **** - fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! LIBS="$LIBS -lwrap -lnsl" - echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6 - echo "configure:4185: checking for TCP wrappers library -lwrap" >&5 - cat > conftest.$ac_ext <<EOF ---- 4179,4185 ---- - fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -! LIBS="$LIBS -lwrap" - echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6 - echo "configure:4185: checking for TCP wrappers library -lwrap" >&5 - cat > conftest.$ac_ext <<EOF -*************** -*** 4206,4212 **** - #define HAVE_LIBWRAP 1 - EOF - -! WRAPLIBS="-L$with_libwrap/lib -lwrap -lnsl" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 ---- 4206,4212 ---- - #define HAVE_LIBWRAP 1 - EOF - -! WRAPLIBS="-L$with_libwrap/lib -lwrap" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -*************** -*** 4327,4333 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lmenu $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4333 "configure" - #include "confdefs.h" ---- 4327,4333 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lmenu -lcurses $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4333 "configure" - #include "confdefs.h" -*************** -*** 4368,4374 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lform $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4374 "configure" - #include "confdefs.h" ---- 4368,4374 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lform -lcurses $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4374 "configure" - #include "confdefs.h" -*************** -*** 4409,4415 **** - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lpanel $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4415 "configure" - #include "confdefs.h" ---- 4409,4415 ---- - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" -! LIBS="-lpanel -lcurses $LIBS" - cat > conftest.$ac_ext <<EOF - #line 4415 "configure" - #include "confdefs.h" diff --git a/sysutils/apcupsd/files/patch-ab b/sysutils/apcupsd/files/patch-ab deleted file mode 100644 index a55ca19eba17..000000000000 --- a/sysutils/apcupsd/files/patch-ab +++ /dev/null @@ -1,62 +0,0 @@ -*** Makefile.in.orig Sat Nov 24 09:23:03 2001 ---- Makefile.in Sun Dec 2 11:47:56 2001 -*************** -*** 219,249 **** - @echo "Installing apcaccess binary..." - $(INSTALL_PROGRAM) $(srcdir)/apcaccess $(sbindir)/apcaccess - @echo "Installing apccontrol script..." -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol - @echo "Installing manual pages..." - $(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext) - @echo "Installing language catalogs..." - @POMAKE@ install - # don't overwrite any existing config file -! echo "Installing apcupsd.conf..."; \ - if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \ - srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \ - else \ - srcconf=etc/apcupsd.conf; \ - fi; \ -! if test -f $(sysconfdir)/apcupsd.conf; then \ -! dstconf=apcupsd.conf.new; \ -! echo " found old apcupsd.conf, installing new conf file as $$dstconf"; \ -! else \ -! dstconf=apcupsd.conf; \ -! fi; \ - echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \ -! $(INSTALL_PROGRAM) -m 644 $$srcconf $(sysconfdir)/$$dstconf -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/changeme $(sysconfdir) -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commfailure $(sysconfdir) -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commok $(sysconfdir) -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/onbattery $(sysconfdir) -! $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/mainsback $(sysconfdir) - - - install-apcupsdwin32: apcupsd ---- 219,244 ---- - @echo "Installing apcaccess binary..." - $(INSTALL_PROGRAM) $(srcdir)/apcaccess $(sbindir)/apcaccess - @echo "Installing apccontrol script..." -! $(INSTALL_DATA) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol - @echo "Installing manual pages..." - $(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext) - @echo "Installing language catalogs..." - @POMAKE@ install - # don't overwrite any existing config file -! echo "Installing sample apcupsd.conf..."; \ - if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \ - srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \ - else \ - srcconf=etc/apcupsd.conf; \ - fi; \ -! dstconf=apcupsd.conf.sample; \ - echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \ -! $(INSTALL_DATA) -m 644 $$srcconf $(sysconfdir)/$$dstconf -! $(INSTALL_DATA) -m 744 $(srcdir)/etc/changeme $(sysconfdir) -! $(INSTALL_DATA) -m 744 $(srcdir)/etc/commfailure $(sysconfdir) -! $(INSTALL_DATA) -m 744 $(srcdir)/etc/commok $(sysconfdir) -! $(INSTALL_DATA) -m 744 $(srcdir)/etc/onbattery $(sysconfdir) -! $(INSTALL_DATA) -m 744 $(srcdir)/etc/mainsback $(sysconfdir) - - - install-apcupsdwin32: apcupsd diff --git a/sysutils/apcupsd/files/patch-ac b/sysutils/apcupsd/files/patch-ac deleted file mode 100644 index 23e0cf5d7dee..000000000000 --- a/sysutils/apcupsd/files/patch-ac +++ /dev/null @@ -1,64 +0,0 @@ -*** apcnisd.c.orig Sat Apr 28 09:12:05 2001 ---- apcnisd.c Mon Dec 3 22:05:08 2001 -*************** -*** 68,79 **** ---- 68,84 ---- - #include <sys/socket.h> - #include <netinet/in.h> - #include <arpa/inet.h> -+ #ifdef HAVE_LIBWRAP -+ #include <tcpd.h> -+ #endif - - #define NETD_VERSION "1.0" - - char *pname; - - UPSINFO myUPS; -+ UPSINFO *core_ups = &myUPS;; -+ char argvalue[MAXSTRING]; - static char largebuf[4096]; - static int stat_recs; - static int logstats = 0; -*************** -*** 82,87 **** ---- 87,124 ---- - void handle_client_request(); - int do_daemon(int argc, char *argv[]); - int do_inetd(int argc, char *argv[]); -+ int check_wrappers(char *av, int newsock); -+ -+ #ifdef HAVE_LIBWRAP -+ int allow_severity = LOG_INFO; -+ int deny_severity = LOG_WARNING; -+ -+ int check_wrappers(char *av, int newsock) -+ { -+ struct request_info req; -+ char *av0; -+ -+ if (strchr(av, '/')) -+ av0 = strrchr(av, '/'); -+ else -+ av0 = av; -+ -+ request_init(&req, RQ_DAEMON, av0, RQ_FILE, newsock, NULL); -+ fromhost(&req); -+ if (!hosts_access(&req)) { -+ log_event(core_ups, LOG_WARNING, -+ _("Connection from %.500s refused by tcp_wrappers."), -+ eval_client(&req)); -+ return FAILURE; -+ } -+ #ifdef I_WANT_LOTS_OF_LOGGING -+ log_event(core_ups, LOG_NOTICE, "connect from %.500s", eval_client(&req)); -+ #endif -+ return SUCCESS; -+ } -+ -+ #endif /* HAVE_LIBWRAP */ -+ - - void error_cleanup(UPSINFO *ups) - { - diff --git a/sysutils/apcupsd/files/patch-ad b/sysutils/apcupsd/files/patch-ad deleted file mode 100644 index 8a6b7a7c3dc4..000000000000 --- a/sysutils/apcupsd/files/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ ---- powerflute.c.orig Fri Aug 23 14:58:34 2002 -+++ powerflute.c Fri Aug 23 14:58:09 2002 -@@ -576,9 +576,8 @@ - int do_horiz_menu(void) { - int pos = 0; - int oldpos = 0; -- int true = 1; - -- while (true) { -+ while (1) { - - display_h_menu(pos); - diff --git a/sysutils/apcupsd/files/patch-ba b/sysutils/apcupsd/files/patch-ba deleted file mode 100644 index 303f4604837f..000000000000 --- a/sysutils/apcupsd/files/patch-ba +++ /dev/null @@ -1,53 +0,0 @@ -*** cgi/Makefile.in.orig Thu Jun 21 10:16:41 2001 ---- cgi/Makefile.in Sun Dec 2 11:04:54 2001 -*************** -*** 84,89 **** ---- 84,92 ---- - rm -f Makefile config.h - - install: cgi -+ @if test ! -d $(cgibin) ; then \ -+ mkdir -p $(cgibin); \ -+ fi - @for p in $(CGIPROGS) ; do \ - echo $(INSTALL_PROGRAM) $$p $(cgibin); \ - $(INSTALL_PROGRAM) $$p $(cgibin); \ -*************** -*** 98,114 **** - echo "No CSS_DIR found, did not install multimon.css" ; \ - fi - # don't overwrite any existing config file -! @if test ! -f $(sysconfdir)/hosts.conf; then \ -! (echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf); \ -! else \ -! (echo "Installing hosts.conf in $(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf.new); \ -! fi - # don't overwrite any existing config file -! @if test ! -f $(sysconfdir)/multimon.conf; then \ -! (echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf); \ -! else \ -! (echo "Installing multimon.conf in $(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf.new); \ -! fi - - uninstall: - @echo "Uninstalling cgi program support..." ---- 101,119 ---- - echo "No CSS_DIR found, did not install multimon.css" ; \ - fi - # don't overwrite any existing config file -! # @if test ! -f $(sysconfdir)/hosts.conf; then \ -! # (echo "Installing hosts.conf..." && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf); \ -! # else \ -! # (echo "Installing hosts.conf in $(sysconfdir)/hosts.conf.new" && $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf.new); \ -! # fi -! $(INSTALL_DATA) ../etc/hosts.conf $(sysconfdir)/hosts.conf.sample - # don't overwrite any existing config file -! # @if test ! -f $(sysconfdir)/multimon.conf; then \ -! # (echo "Installing multimon.conf..." && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf); \ -! # else \ -! # (echo "Installing multimon.conf in $(sysconfdir)/multimon.conf.new" && $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf.new); \ -! # fi -! $(INSTALL_DATA) ../etc/multimon.conf $(sysconfdir)/multimon.conf.sample - - uninstall: - @echo "Uninstalling cgi program support..." diff --git a/sysutils/apcupsd/files/patch-ca b/sysutils/apcupsd/files/patch-ca deleted file mode 100644 index f13700d651b0..000000000000 --- a/sysutils/apcupsd/files/patch-ca +++ /dev/null @@ -1,95 +0,0 @@ -*** etc/changeme.in~ Mon Mar 12 16:22:57 2001 ---- etc/changeme.in Sun Dec 2 13:44:38 2001 -*************** -*** 6,12 **** - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME UPS battery needs changing NOW." ---- 6,12 ---- - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/usr/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME UPS battery needs changing NOW." -*** etc/commfailure.in~ Mon Mar 12 16:22:57 2001 ---- etc/commfailure.in Sun Dec 2 13:45:25 2001 -*************** -*** 6,12 **** - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Serial port communications with UPS lost" ---- 6,12 ---- - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/usr/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Serial port communications with UPS lost" -*** etc/commok.in~ Mon Mar 12 16:22:58 2001 ---- etc/commok.in Sun Dec 2 13:45:17 2001 -*************** -*** 6,12 **** - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Serial port communications with UPS restored" ---- 6,12 ---- - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/usr/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Serial port communications with UPS restored" -*** etc/mainsback.in~ Mon Mar 12 16:22:58 2001 ---- etc/mainsback.in Sun Dec 2 13:45:11 2001 -*************** -*** 6,12 **** - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Power has returned" ---- 6,12 ---- - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/usr/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Power has returned" -*** etc/onbattery.in~ Mon Mar 12 16:22:57 2001 ---- etc/onbattery.in Sun Dec 2 13:45:05 2001 -*************** -*** 6,12 **** - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Power Failure !!!" ---- 6,12 ---- - # We send an email message to root to notify him. - # - SYSADMIN=root -! MAIL="/usr/bin/mail" - - HOSTNAME=`hostname` - MSG="$HOSTNAME Power Failure !!!" diff --git a/sysutils/apcupsd/files/patch-configure b/sysutils/apcupsd/files/patch-configure new file mode 100644 index 000000000000..de9dfa191074 --- /dev/null +++ b/sysutils/apcupsd/files/patch-configure @@ -0,0 +1,36 @@ +*** configure.orig Fri Oct 3 21:22:27 2003 +--- configure Sat Nov 1 13:36:46 2003 +*************** +*** 8530,8536 **** + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + +! LIBS="${LIBS} -lwrap -lnsl" + + if test "${ac_cv_header_tcpd_h+set}" = set; then + echo "$as_me:$LINENO: checking for tcpd.h" >&5 +--- 8530,8536 ---- + LDFLAGS="${LDFLAGS} -L$withval/lib" + fi + +! LIBS="${LIBS} -lwrap" + + if test "${ac_cv_header_tcpd_h+set}" = set; then + echo "$as_me:$LINENO: checking for tcpd.h" >&5 +*************** +*** 9035,9041 **** + LDFLAGS=${_ldflags} + GDINCLUDE='-I$(topdir)/src/gd1.2' + LIBGD=gd1.2 +! LIBGDOBJ='$(topdir)/src/gd1.2/libgd.a' + cat >>confdefs.h <<\_ACEOF + #define IMGFMT_GIF 1 + _ACEOF +--- 9035,9041 ---- + LDFLAGS=${_ldflags} + GDINCLUDE='-I$(topdir)/src/gd1.2' + LIBGD=gd1.2 +! LIBGDOBJ='$(topdir)/src/gd1.2/libgd.a -lm' + cat >>confdefs.h <<\_ACEOF + #define IMGFMT_GIF 1 + _ACEOF diff --git a/sysutils/apcupsd/files/patch-doc-apcupds.man b/sysutils/apcupsd/files/patch-doc-apcupds.man new file mode 100644 index 000000000000..9c28feafad08 --- /dev/null +++ b/sysutils/apcupsd/files/patch-doc-apcupds.man @@ -0,0 +1,196 @@ +*** doc/apcupsd.man.orig Sun Nov 2 11:39:52 2003 +--- doc/apcupsd.man Sun Nov 2 11:45:58 2003 +*************** +*** 8,22 **** + .SH NAME + apcupsd \- daemon for most APC's UPS for Linux + .SH SYNOPSIS +! .B /sbin/apcupsd + .br +! .B /etc/apcupsd/apccontrol + .br +! .B /etc/apcupsd/apcupsd.conf + .br +! .B /sbin/apcaccess + .br +! .B /sbin/apcnetd + .br + .SH DESCRIPTION + .LP +--- 8,22 ---- + .SH NAME + apcupsd \- daemon for most APC's UPS for Linux + .SH SYNOPSIS +! .B %PREFIX%/sbin/apcupsd + .br +! .B %PREFIX%/etc/apcupsd/apccontrol + .br +! .B %PREFIX%/etc/apcupsd/apcupsd.conf + .br +! .B %PREFIX%/sbin/apcaccess + .br +! .B %PREFIX%/sbin/apcnetd + .br + .SH DESCRIPTION + .LP +*************** +*** 29,35 **** + above shutdown conditions is met, "apcupsd" will inform users about this + fact. + +! The shutdown is made by script calls to "/etc/apcupsd/apccontrol", which + is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary. + There is no communication between "apcupsd" and init(1) process. + Apcupsd modifies the halt script so that at the end of the shutdown +--- 29,35 ---- + above shutdown conditions is met, "apcupsd" will inform users about this + fact. + +! The shutdown is made by script calls to "%PREFIX%/etc/apcupsd/apccontrol", which + is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary. + There is no communication between "apcupsd" and init(1) process. + Apcupsd modifies the halt script so that at the end of the shutdown +*************** +*** 58,71 **** + .TP + .B \-c --configure + Attempts to configure the UPS EPROM to the values specified in the +! configuration file "/etc/apcupsd/apcupsd.conf". + .TP + .B \-d --debug <level> + Turns on debugging output for a NETSLAVE or a NETMASTER. + .TP + .B \-f --config-file <file> + Specifies the location of the configuration file. The default +! is: /etc/apcupsd/apcupsd.conf + .TP + .B \-k --killpower + Attempt to turn the UPS off. This option is normally only +--- 58,71 ---- + .TP + .B \-c --configure + Attempts to configure the UPS EPROM to the values specified in the +! configuration file "%PREFIX%/etc/apcupsd/apcupsd.conf". + .TP + .B \-d --debug <level> + Turns on debugging output for a NETSLAVE or a NETMASTER. + .TP + .B \-f --config-file <file> + Specifies the location of the configuration file. The default +! is: %PREFIX%/etc/apcupsd/apcupsd.conf + .TP + .B \-k --killpower + Attempt to turn the UPS off. This option is normally only +*************** +*** 74,80 **** + .TP + .B \-n --rename-ups + Attempts to change the UPS name stored in the UPS EPROM +! to that specified in your "/etc/apcupsd/apcupsd.conf" file. + .TP + .B \-u --update-battery-date + Attempts to update the battery date stored in the UPS EPROM. Normally +--- 74,80 ---- + .TP + .B \-n --rename-ups + Attempts to change the UPS name stored in the UPS EPROM +! to that specified in your "%PREFIX%/etc/apcupsd/apcupsd.conf" file. + .TP + .B \-u --update-battery-date + Attempts to update the battery date stored in the UPS EPROM. Normally +*************** +*** 88,99 **** + + .SH CONFIGURATION + It may be necessary to change the configuration information in the file +! "/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your + configuration. This file is a plain ASCII file and you can use your + favorite editor to change it. + .LP + Configuration commands in +! .B /etc/apcupsd/apcupsd.conf + are: + + .LP +--- 88,99 ---- + + .SH CONFIGURATION + It may be necessary to change the configuration information in the file +! "%PREFIX%/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your + configuration. This file is a plain ASCII file and you can use your + favorite editor to change it. + .LP + Configuration commands in +! .B %PREFIX%/etc/apcupsd/apcupsd.conf + are: + + .LP +*************** +*** 163,169 **** + If you want the apcupsd network information server to provide + the last 10 events via the network, you must specify a + file where apcupsd will save these events. The default is: +! /etc/apcupsd/apcupsd.events. Currently, apcupsd will save + at most the last 50 events. When more than 50 events are + recorded and a network request for the events arrives, + the network server will truncate the file to +--- 163,169 ---- + If you want the apcupsd network information server to provide + the last 10 events via the network, you must specify a + file where apcupsd will save these events. The default is: +! /var/log/apcupsd.events. Currently, apcupsd will save + at most the last 50 events. When more than 50 events are + recorded and a network request for the events arrives, + the network server will truncate the file to +*************** +*** 524,536 **** + are disabled or set to default values. Currently, there is not a known + way for early signals to be sent to BASIC Ports. MINUTES are set to 0. + .SH FILES +! .B /etc/apcupsd/apcupsd.conf + - configuration file. + .br +! .B /etc/apcupsd/apcupsd.status + - STATUS file + .br +! .B /etc/apcupsd/apcupsd.events + - where up to the last 50 events are stored + for the network information server. + .SH EVENTS +--- 524,536 ---- + are disabled or set to default values. Currently, there is not a known + way for early signals to be sent to BASIC Ports. MINUTES are set to 0. + .SH FILES +! .B %PREFIX%/etc/apcupsd/apcupsd.conf + - configuration file. + .br +! .B /var/log/apcupsd.status + - STATUS file + .br +! .B /var/log/apcupsd.events + - where up to the last 50 events are stored + for the network information server. + .SH EVENTS +*************** +*** 539,548 **** + ... + + These events are sent to the system log, optionally sent +! to the temporary events file (/etc/apcupsd/apcupsd.events), +! and they also generate a call to /etc/apcupsd/apccontrol + which in turn will call any scripts you have placed in the +! /etc/apcupsd directory. + + .SH DATA format + If the DATATIME configuration command is set nonzero, +--- 539,548 ---- + ... + + These events are sent to the system log, optionally sent +! to the temporary events file (/var/log/apcupsd.events), +! and they also generate a call to %PREFIX%/etc/apcupsd/apccontrol + which in turn will call any scripts you have placed in the +! %PREFIX%/etc/apcupsd directory. + + .SH DATA format + If the DATATIME configuration command is set nonzero, diff --git a/sysutils/apcupsd/files/patch-platform-Makefile.in b/sysutils/apcupsd/files/patch-platform-Makefile.in new file mode 100644 index 000000000000..d8ba7b564ff0 --- /dev/null +++ b/sysutils/apcupsd/files/patch-platform-Makefile.in @@ -0,0 +1,25 @@ +*** platforms/Makefile.in.orig Sat Nov 1 13:40:40 2003 +--- platforms/Makefile.in Sat Nov 1 13:41:12 2003 +*************** +*** 32,41 **** + echo " Found old apccontrol moving it to $(DESTDIR)$(sysconfdir)/apccontrol.orig"; \ + fi + @if test -f ./$(DISTNAME)/apccontrol; then \ +! $(INSTALL_PROGRAM) -m 744 ./$(DISTNAME)/apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ + else \ +! $(INSTALL_PROGRAM) -m 744 ./apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ + fi + (cd etc/; $(MAKE) DESTDIR=$(DESTDIR) install) +--- 32,41 ---- + echo " Found old apccontrol moving it to $(DESTDIR)$(sysconfdir)/apccontrol.orig"; \ + fi + @if test -f ./$(DISTNAME)/apccontrol; then \ +! $(INSTALL_SCRIPT) -m 744 ./$(DISTNAME)/apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ + else \ +! $(INSTALL_SCRIPT) -m 744 ./apccontrol \ + $(DESTDIR)$(sysconfdir)/apccontrol; \ + fi + (cd etc/; $(MAKE) DESTDIR=$(DESTDIR) install) diff --git a/sysutils/apcupsd/files/patch-platform-etc-Makefile.in b/sysutils/apcupsd/files/patch-platform-etc-Makefile.in new file mode 100644 index 000000000000..5c7eb98c1c2e --- /dev/null +++ b/sysutils/apcupsd/files/patch-platform-etc-Makefile.in @@ -0,0 +1,19 @@ +*** platforms/etc/Makefile.in.orig Sat Nov 1 13:46:41 2003 +--- platforms/etc/Makefile.in Sat Nov 1 13:47:05 2003 +*************** +*** 34,40 **** + $(RMF) $(DESTDIR)$(sysconfdir)/$$src.orig; \ + mv $(DESTDIR)$(sysconfdir)/$$src $(DESTDIR)$(sysconfdir)/$$src.orig; \ + fi; \ +! $(INSTALL_PROGRAM) $$src $(DESTDIR)$(sysconfdir)/$$src; \ + done + + uninstall: +--- 34,40 ---- + $(RMF) $(DESTDIR)$(sysconfdir)/$$src.orig; \ + mv $(DESTDIR)$(sysconfdir)/$$src $(DESTDIR)$(sysconfdir)/$$src.orig; \ + fi; \ +! $(INSTALL_SCRIPT) $$src $(DESTDIR)$(sysconfdir)/$$src; \ + done + + uninstall: diff --git a/sysutils/apcupsd/files/patch-usb-segfault b/sysutils/apcupsd/files/patch-usb-segfault new file mode 100644 index 000000000000..913d0d6716a9 --- /dev/null +++ b/sysutils/apcupsd/files/patch-usb-segfault @@ -0,0 +1,127 @@ + +This patch fixes a segfault during startup of apcupsd when +running with the USB driver. To apply it: + + cd <apcupsd-source> + patch -p0 <3.10.6-1-usb-segfault.patch + make + ... + + + +? find.syslog +? src/drivers/snmp/drv_powernet.c.new +? src/drivers/snmp/powernet-mib-mgr.c.new +? src/drivers/snmp/powernet-mib.h.new +? src/lib/stfSJuzf +Index: ChangeLog +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/ChangeLog,v +retrieving revision 1.36 +diff -u -b -r1.36 ChangeLog +--- ChangeLog 11 Oct 2003 09:45:20 -0000 1.36 ++++ ChangeLog 27 Oct 2003 19:49:44 -0000 +@@ -5,6 +5,10 @@ + /* http://sourceforge.net/projects/apcupsd */ + /***************************************************************************/ + ++28Oct03 ++- Bob Kuo found a bug that caused a seg fault, which was due ++ to my code that walked off the end of a table in linux-usb.c ++ + ----> Release apcupsd-3.10.6 (10 October 2003) + 11Oct03 + - Release 3.10.6 10Oct03 as offical stable version. +Index: doc/home-page/support.html +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/doc/home-page/support.html,v +retrieving revision 1.6 +diff -u -b -r1.6 support.html +--- doc/home-page/support.html 18 Oct 2003 11:32:49 -0000 1.6 ++++ doc/home-page/support.html 27 Oct 2003 19:49:47 -0000 +@@ -52,6 +52,11 @@ + you must replace the <b>at</b> with an @ symbol. + Please see <b>Information Needed</b> below for what to + include in your support request. ++p>I get a number of "off-list" emails sent ++directly to me. Please always copy the appropriate list, if you ++do not copy the list, I may not answer you, or I will answer by copying ++the list. If you <em>really</em> have something confidential, ++please clearly indicate it. + <p>The second way is to use the support tracking tool on SourceForge at + <a href="http://sourceforge.net/tracker/?group_id=54413&func=browse"> + http://sourceforge.net/tracker/?group_id=54413&func=browse</a>.<br>This +Index: doc/home-page/support.wml +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/doc/home-page/support.wml,v +retrieving revision 1.2 +diff -u -b -r1.2 support.wml +--- doc/home-page/support.wml 22 Jun 2003 15:57:37 -0000 1.2 ++++ doc/home-page/support.wml 27 Oct 2003 19:49:47 -0000 +@@ -15,6 +15,11 @@ + you must replace the <b>at</b> with an @ symbol. + Please see <b>Information Needed</b> below for what to + include in your support request. ++p>I get a number of "off-list" emails sent ++directly to me. Please always copy the appropriate list, if you ++do not copy the list, I may not answer you, or I will answer by copying ++the list. If you <em>really</em> have something confidential, ++please clearly indicate it. + + <p>The second way is to use the support tracking tool on SourceForge at + <a href="http://sourceforge.net/tracker/?group_id=54413&func=browse"> +Index: doc/techlogs/kes-3.10.6 +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/doc/techlogs/kes-3.10.6,v +retrieving revision 1.33 +diff -u -b -r1.33 kes-3.10.6 +--- doc/techlogs/kes-3.10.6 3 Oct 2003 19:22:29 -0000 1.33 ++++ doc/techlogs/kes-3.10.6 27 Oct 2003 19:49:48 -0000 +@@ -1,11 +1,14 @@ + Technical notes on version 3.10.6 +- 04 October 2003 ++ 28 October 2003 + Kern Sibbald + + General: + + Changes submitted this submission: +-03Oct03 ++28Oct03 ++- Bob Kuo found a bug that caused a seg fault, which was due ++ to my code that walked off the end of a table in linux-usb.c ++03Oct03 Released here + - Move the old manual to old_documents and commit the + new docbook manual to the CVS. Don't include the web + html directory. +Index: include/version.h +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/include/version.h,v +retrieving revision 1.49 +diff -u -b -r1.49 version.h +--- include/version.h 11 Oct 2003 09:45:20 -0000 1.49 ++++ include/version.h 27 Oct 2003 19:49:48 -0000 +@@ -2,5 +2,5 @@ + #define AVERSION 3 + #define VERSION "3.10.6" + #define VSTRING "3106" +-#define ADATE "10 October 2003" +-#define LSMDATE "10Oct03" ++#define ADATE "28 October 2003" ++#define LSMDATE "28Oct03" +Index: src/drivers/usb/linux-usb.c +=================================================================== +RCS file: /cvsroot/apcupsd/apcupsd/src/drivers/usb/linux-usb.c,v +retrieving revision 1.19 +diff -u -b -r1.19 linux-usb.c +--- src/drivers/usb/linux-usb.c 29 Sep 2003 13:37:40 -0000 1.19 ++++ src/drivers/usb/linux-usb.c 27 Oct 2003 19:49:50 -0000 +@@ -731,7 +731,7 @@ + * know_info table and see if we have a match. + * If so, allocate a new entry for it. + */ +- for (k=0; k <= (int)KNOWN_INFO_SZ; k++) { ++ for (k=0; k < (int)KNOWN_INFO_SZ; k++) { + USB_INFO *info; + int ci = known_info[k].ci; + diff --git a/sysutils/apcupsd/pkg-plist b/sysutils/apcupsd/pkg-plist index 03a4b023c54a..551b302f6d57 100644 --- a/sysutils/apcupsd/pkg-plist +++ b/sysutils/apcupsd/pkg-plist @@ -1,87 +1,40 @@ sbin/apcupsd sbin/apcaccess sbin/apcnisd -sbin/apctest %%POWERFL%%sbin/powerflute etc/apcupsd/apccontrol -@unexec if [ -f %D/etc/apcupsd/apcupsd.conf ]; then cmp -s %D/etc/apcupsd/apcupsd.conf.sample %D/etc/apcupsd/apcupsd.conf && rm -f %D/etc/apcupsd/apcupsd.conf || echo "If you are permanently removing this port, you should do a ``rm ${PKG_PREFIX}/etc/apcupsd/apcupsd.conf`` to remove config files left." | fmt ; fi -etc/apcupsd/apcupsd.conf.sample etc/apcupsd/changeme etc/apcupsd/commfailure etc/apcupsd/commok -etc/apcupsd/onbattery etc/apcupsd/mainsback -@unexec if [ -f %D/etc/apcupsd/hosts.conf ]; then cmp -s %D/etc/apcupsd/hosts.conf.sample %D/etc/apcupsd/hosts.conf && rm -f %D/etc/apcupsd/hosts.conf || echo "If you are permanently removing this port, you should do a ``rm ${PKG_PREFIX}/etc/apcupsd/hosts.conf`` to remove config files left." | fmt ; fi -etc/apcupsd/hosts.conf.sample -@unexec if [ -f %D/etc/apcupsd/multimon.conf ]; then cmp -s %D/etc/apcupsd/multimon.conf.sample %D/etc/apcupsd/multimon.conf && rm -f %D/etc/apcupsd/multimon.conf || echo "If you are permanently removing this port, you should do a ``rm ${PKG_PREFIX}/etc/apcupsd/multimon.conf`` to remove config files left." | fmt ; fi -etc/apcupsd/multimon.conf.sample +etc/apcupsd/masterconnect +etc/apcupsd/mastertimeout +etc/apcupsd/onbattery etc/apcupsd/cgi/multimon.cgi etc/apcupsd/cgi/multimoncss.cgi etc/apcupsd/cgi/upsfstats.cgi etc/apcupsd/cgi/upsimage.cgi etc/apcupsd/cgi/upsstats.cgi etc/rc.d/%%STARTUP_SCRIPT%% -share/locale/it/LC_MESSAGES/apcupsd.mo -%%PORTDOCS%%share/doc/apcupsd/apcupsd.pdf -%%PORTDOCS%%share/doc/apcupsd/apcaccess.html -%%PORTDOCS%%share/doc/apcupsd/apcnisd.html -%%PORTDOCS%%share/doc/apcupsd/apctest.html -%%PORTDOCS%%share/doc/apcupsd/apcupsd-styles.css -%%PORTDOCS%%share/doc/apcupsd/apcupsd.apf -%%PORTDOCS%%share/doc/apcupsd/apcupsd.book -%%PORTDOCS%%share/doc/apcupsd/apcupsd.gif -%%PORTDOCS%%share/doc/apcupsd/apcupsd.html -%%PORTDOCS%%share/doc/apcupsd/batteries.html -%%PORTDOCS%%share/doc/apcupsd/bugs.html -%%PORTDOCS%%share/doc/apcupsd/cables.html -%%PORTDOCS%%share/doc/apcupsd/cgiprogs.html -%%PORTDOCS%%share/doc/apcupsd/charging.gif -%%PORTDOCS%%share/doc/apcupsd/config-examples.html -%%PORTDOCS%%share/doc/apcupsd/configure.html -%%PORTDOCS%%share/doc/apcupsd/data.html -%%PORTDOCS%%share/doc/apcupsd/eprom.html -%%PORTDOCS%%share/doc/apcupsd/events.html -%%PORTDOCS%%share/doc/apcupsd/faq.html -%%PORTDOCS%%share/doc/apcupsd/index.html -%%PORTDOCS%%share/doc/apcupsd/install.html -%%PORTDOCS%%share/doc/apcupsd/invoking.html -%%PORTDOCS%%share/doc/apcupsd/kernel_config.html -%%PORTDOCS%%share/doc/apcupsd/license.html -%%PORTDOCS%%share/doc/apcupsd/logging.html -%%PORTDOCS%%share/doc/apcupsd/master-slave.html -%%PORTDOCS%%share/doc/apcupsd/multiUPS.html -%%PORTDOCS%%share/doc/apcupsd/multimon.gif -%%PORTDOCS%%share/doc/apcupsd/new_features_3_7_0.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_0.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_1.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_2.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_3.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_4.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_5.html -%%PORTDOCS%%share/doc/apcupsd/new_features_3_8_6.html -%%PORTDOCS%%share/doc/apcupsd/oldversions.html -%%PORTDOCS%%share/doc/apcupsd/onbatt.gif -%%PORTDOCS%%share/doc/apcupsd/online.gif -%%PORTDOCS%%share/doc/apcupsd/security.html -%%PORTDOCS%%share/doc/apcupsd/shutdown.html -%%PORTDOCS%%share/doc/apcupsd/status.gif -%%PORTDOCS%%share/doc/apcupsd/status.html -%%PORTDOCS%%share/doc/apcupsd/stopping.html -%%PORTDOCS%%share/doc/apcupsd/testing.html -%%PORTDOCS%%share/doc/apcupsd/thanks.gif -%%PORTDOCS%%share/doc/apcupsd/thanks.html -%%PORTDOCS%%share/doc/apcupsd/troubles.html -%%PORTDOCS%%share/doc/apcupsd/upgrading_to_3_7_0.html -%%PORTDOCS%%share/doc/apcupsd/upsbible.html -%%PORTDOCS%%share/doc/apcupsd/usb.html -%%PORTDOCS%%share/doc/apcupsd/win32.html -%%PORTDOCS%%share/doc/apcupsd/wininstall1.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall2.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall3.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall4.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall5.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall6.gif -%%PORTDOCS%%share/doc/apcupsd/wininstall7.gif +%%PORTDOCS%%%%DOCSDIR%%/apcupsd.pdf +%%PORTDOCS%%%%DOCSDIR%%/manual.html +%%PORTDOCS%%%%DOCSDIR%%/apcupsd.png +%%PORTDOCS%%%%DOCSDIR%%/back.png +%%PORTDOCS%%%%DOCSDIR%%/charging.png +%%PORTDOCS%%%%DOCSDIR%%/home.png +%%PORTDOCS%%%%DOCSDIR%%/main_configs.png +%%PORTDOCS%%%%DOCSDIR%%/multimon.png +%%PORTDOCS%%%%DOCSDIR%%/next.png +%%PORTDOCS%%%%DOCSDIR%%/onbatt.png +%%PORTDOCS%%%%DOCSDIR%%/online.png +%%PORTDOCS%%%%DOCSDIR%%/status.png +%%PORTDOCS%%%%DOCSDIR%%/thanks.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall1.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall2.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall3.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall4.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall5.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall6.png +%%PORTDOCS%%%%DOCSDIR%%/wininstall7.png +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/apcupsd/cgi -@dirrm etc/apcupsd -%%PORTDOCS%%@dirrm share/doc/apcupsd |