Update from 3.10.13 -> 3.10.15

  - Fix for lost config files during "portupgrade apcupsd"
    (PR ports/67251)
  - Mandrake 10 USB users, please note, you must either use devfs
    to access the USB or reconfigure your kernel and turn
    CONFIG_USB_DYNAMIC_MINORS off.
  - The NIS slave server code (net driver) should be much more
    efficient and robust than previous versions.
  - The code as a whole is much more resistant to buffer overflows
    since most all string copies are now protected.

PR:		67251
Submitted by:	Rob <robbyrnes@fastmail.com.au>

4 files changed, 19 insertions, 22 deletions

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 37500d9de659..e8cbd0fcddd7 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	apcupsd
-PORTVERSION=	3.10.13
-#PORTREVISION=	1
+PORTVERSION=	3.10.15
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,14 +33,10 @@ OPTIONS+=       CGI "Compile with CGI programms to show status" off
 
 .include <bsd.port.pre.mk>
 
-# We need this below
-CONF_FILES=apcupsd.conf
-
 .if defined(WITH_CGI)
 CONFIGURE_ARGS+=--enable-cgi --with-cgi-bin=${PREFIX}/etc/apcupsd/cgi
 LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 PLIST_SUB+=	CGI=""
-CONF_FILES+=	multimon.conf hosts.conf
 .else
 PLIST_SUB+=	CGI="@comment "
 .endif
@@ -89,17 +85,6 @@ 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 ${CONF_FILES}; 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 \
@@ -110,7 +95,6 @@ post-install:
 			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}
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
index cb185e5c645c..ceebd7504d0a 100644
--- a/sysutils/apcupsd/distinfo
+++ b/sysutils/apcupsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (apcupsd-3.10.13.tar.gz) = b201f70b0c066ff1bee86106e9ee5b6a
-SIZE (apcupsd-3.10.13.tar.gz) = 3809317
+MD5 (apcupsd-3.10.15.tar.gz) = 21b2b744ebcaa0010367a403a9c5e66c
+SIZE (apcupsd-3.10.15.tar.gz) = 3858266
diff --git a/sysutils/apcupsd/pkg-message b/sysutils/apcupsd/pkg-message
index 20de38c96c12..c914317b9ca3 100644
--- a/sysutils/apcupsd/pkg-message
+++ b/sysutils/apcupsd/pkg-message
@@ -7,8 +7,17 @@ the serial line the USV is connected to, e.g.
   cd /dev
   ln -s cuaa1 usv
 
-Read the MANUAL to do site specific configuration
+Read the manual to do site specific configuration
 assigenments! Especially have a detailed look into
 the chapter describing the shutdown procedure.
 
+Sample files are installed in ${PREFIX}/etc/apcupsd:
+
+  apcupsd.conf.sample, apcupsd.conf.net-master.sample
+  apcupsd.conf.net-slave.sample, hosts.conf.sample
+  multimon.conf.sample and cgi/apcupsd.css.sample
+
+These files must be copied and/or configured for a
+proper working apcupsd. Look into the manual!
+
 **************************************************
diff --git a/sysutils/apcupsd/pkg-plist b/sysutils/apcupsd/pkg-plist
index 6bbde2246ea9..9f6a5957aae5 100644
--- a/sysutils/apcupsd/pkg-plist
+++ b/sysutils/apcupsd/pkg-plist
@@ -13,10 +13,14 @@ etc/apcupsd/mainsback
 etc/apcupsd/masterconnect
 etc/apcupsd/mastertimeout
 etc/apcupsd/onbattery
-%%CGI%%etc/apcupsd/cgi/apcupsd.css
+etc/apcupsd/apcupsd.conf.sample
+%%CGI%%etc/apcupsd/cgi/apcupsd.css.sample
 %%CGI%%etc/apcupsd/cgi/multimon.cgi
 %%CGI%%etc/apcupsd/cgi/upsfstats.cgi
 %%CGI%%etc/apcupsd/cgi/upsimage.cgi
 %%CGI%%etc/apcupsd/cgi/upsstats.cgi
+%%CGI%%etc/apcupsd/hosts.conf.sample
+%%CGI%%etc/apcupsd/multimon.conf.sample
 etc/rc.d/%%STARTUP_SCRIPT%%
 %%CGI%%@dirrm etc/apcupsd/cgi
+@unexec rmdir %D/etc/apcupsd 2>/dev/null || /usr/bin/true