3 files changed, 55 insertions, 1 deletions

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index e388164c19b6..4d5bacca82db 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nut
 PORTVERSION=	2.8.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 
@@ -142,6 +142,7 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${PATCHDIR}/nut.syslog ${STAGEDIR}${EXAMPLESDIR}/syslog.sample
 	${INSTALL_DATA} ${PATCHDIR}/nut.newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog.sample
+	${INSTALL_DATA} ${PATCHDIR}/nut_upslog.sample ${STAGEDIR}${EXAMPLESDIR}/nut_upslog.sample
 	${MKDIR} ${STAGEDIR}/var/log/nut
 	@${RM} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init/nut
 	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/nut/solaris-init
diff --git a/sysutils/nut/files/nut_upslog.sample b/sysutils/nut/files/nut_upslog.sample
new file mode 100644
index 000000000000..126a47a70d3a
--- /dev/null
+++ b/sysutils/nut/files/nut_upslog.sample
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Authored by vvd@unislabs.com.
+
+# PROVIDE: nut_upslog
+# REQUIRE: NETWORKING nut
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+. /etc/rc.subr
+
+case $0 in
+/etc/rc*)
+	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
+	# so get the name of the script from $_file
+	name=$_file
+	;;
+*)
+	name=$0
+	;;
+esac
+
+name=${name##*/}
+rcvar=${name}_enable
+
+load_rc_config "${name}"
+
+# Define these nut_upslog* variables in one of these files:
+#       /etc/rc.conf
+#       /etc/rc.conf.local
+#       /etc/rc.conf.d/nut_upslog
+#
+# If you want to log several different UPSes:
+# ln -s nut_upslog /usr/local/etc/rc.d/NAME
+# then set variables NAME_enable, NAME_ups, NAME_pidbase, NAME_logfile and etc.
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+eval "${rcvar}=\${${rcvar}:-'NO'}"
+eval "_prefix=\${${name}_prefix:-'/usr/local'}"
+eval "_logfile=\${${name}_logfile:-'/var/log/nut/ups.log'}"
+eval "_interval=\${${name}_interval:-'300'}"
+eval "_ups=\${${name}_ups:-'myups@localhost'}"
+eval "_pidbase=\${${name}_pidbase:-'upslog'}"
+eval "_format=\${${name}_format:+-f \${${name}_format}}"
+eval "${name}_flags=\${${name}_flags:-'-s ${_ups} -l ${_logfile} -i ${_interval} -p ${_pidbase} ${_format}'}"
+
+required_dirs="%%STATEDIR%%"
+pidfile="%%STATEDIR%%/${_pidbase}.pid"
+command="${_prefix}/bin/upslog"
+
+run_rc_command "$1"
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 51fabcb8782c..d8fbf6fc4567 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -18,6 +18,7 @@
 @sample %%ETCDIR%%/upsmon.conf.sample
 @sample %%ETCDIR%%/upssched.conf.sample
 @sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
+@sample %%EXAMPLESDIR%%/nut_upslog.sample
 @sample %%EXAMPLESDIR%%/syslog.sample etc/syslog.d/nut
 %%USB%%etc/devd/nut-usb.conf
 bin/nut-scanner