 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.67.2.1 2023/01/07 16:07:58 gdt Exp $
+# $NetBSD: Makefile,v 1.67.2.2 2023/01/07 16:09:38 gdt Exp $
-PKGREVISION= 3
+PKGREVISION= 2
 .include "Makefile.common"
 PKGNAME=		ups-${DISTNAME}
 COMMENT=		Network UPS Tools
 SUBST_CLASSES+=		man-so
 SUBST_MESSAGE.man-so=	Fixing manpage .so references.
 SUBST_STAGE.man-so=	pre-build
 SUBST_FILES.man-so=	docs/man/*.[0-9]
 SUBST_SED.man-so=	-e 's,^\.so \([^/]*\)\.\([0-9]\)$$,.so man\2/\1.\2,'
 SUBST_NOOP_OK.man-so=	yes
 # Don't regenerate any files in tools/.

 @@ -1,51 +1,55 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: ups.sh,v 1.10.158.1 2023/01/07 16:07:59 gdt Exp $
+# $NetBSD: ups.sh,v 1.10.158.2 2023/01/07 16:09:38 gdt Exp $
+#
 # KEYWORD: nostart
-# NB: This file is not intended to be run automaticlally at boot.  It
+if [ -f /etc/rc.subr ]
-# is a convenience script for humans to start or stop all 4 nut-ups
+then
 # daemons as a group.
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 rcd_dir=`@DIRNAME@ $0`
 # NOTE: run_rc_command sets $rc_arg
+#
 forward_commands()
+{
 	# Backward compat with NetBSD <1.6:
 	[ -z "$rc_arg" ] && rc_arg=$_arg
 	for file in $COMMAND_LIST; do
 		$rcd_dir/$file $rc_arg
 	done
+}
 reverse_commands()
+{
 	# Backward compat with NetBSD <1.6:
 	[ -z "$rc_arg" ] && rc_arg=$_arg
 	REVCOMMAND_LIST=
 	for file in $COMMAND_LIST; do
 		REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
 	done
 	for file in $REVCOMMAND_LIST; do
 		$rcd_dir/$file $rc_arg
 	done
+}
 COMMAND_LIST="upsdriver upsd upsmon upslog"
 name="ups"
 start_cmd="forward_commands"
 stop_cmd="reverse_commands"
 status_cmd="forward_commands"
 extra_commands="status"
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
         run_rc_command "$1"
 else
         @ECHO@ -n " ${name}"
-	rc_arg="$1"
+	_arg="$1"
 	${start_cmd}
 fi

 @@ -1,26 +1,28 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: upsd.sh,v 1.7.134.1 2023/01/07 16:07:59 gdt Exp $
+# $NetBSD: upsd.sh,v 1.7.134.2 2023/01/07 16:09:38 gdt Exp $
+#
 # PROVIDE: upsd
 # REQUIRE: upsdriver
 # BEFORE: upsmon
 # KEYWORD: shutdown
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 name="upsd"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@NUT_CONFDIR@/${name}.conf"
 pidfile="@NUT_STATEDIR@/${name}.pid"
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
 	${command} ${upsd_flags} ${command_args}
 fi

 @@ -1,25 +1,26 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: upsmon.sh,v 1.7.134.1 2023/01/07 16:07:59 gdt Exp $
+# $NetBSD: upsmon.sh,v 1.7.134.2 2023/01/07 16:09:38 gdt Exp $
+#
 # PROVIDE: upsmon
 # BEFORE: SERVERS
 # KEYWORD: shutdown
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 name="upsmon"
 rcvar="${name}"
 command="@PREFIX@/sbin/${name}"
 pidfile="@NUT_STATEDIR@/${name}.pid"
 required_files="@NUT_CONFDIR@/${name}.conf"
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
 	${command} ${upsmon_flags} ${command_args}
 fi

 @@ -1,55 +1,58 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: upsdriver.sh,v 1.9.34.1 2023/01/07 16:07:59 gdt Exp $
+# $NetBSD: upsdriver.sh,v 1.9.34.2 2023/01/07 16:09:38 gdt Exp $
+#
 # PROVIDE: upsdriver
 # REQUIRE: NETWORK syslogd mountcritremote
+#
-# The standard approach is to leave "upsdriver_type" unset, so that
+# You will need to set some variables in /etc/rc.conf to start the UPS
-# upsdrvctl is used to start and stop the driver(s).  (Note that a
+# driver(s) properly, e.g.
 # system might have more than one UPS, and upsdrvctl should support
 # this.)  See nutupsdrv(8), but upsdrvctl will invoke the driver
 # properly.
 # An alternative is to set the driver type and flags.  This only works
 # for a single driver.  This approach is deprecated and may be removed.
+#
 # upsdriver=YES
 #	upsdriver_type="newapc"
 #	upsdriver_flags="-a smartups"
+#
 # If "upsdriver_type" is unset, then use "upsdrvctl" to control the UPS
 # drivers.  Please refer to nutupsdrv(8) for more information about the
 # arguments to pass to the UPS drivers.
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 name="upsdriver"
 rcvar=$name
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 fi
-if [ "${upsdriver_type:-upsdrvctl}" = "upsdrvctl" ]; then
+if [ "${upsdriver_type:-upsdrvctl}" = "upsdrvctl" ]
 then
 	ctl_command="@PREFIX@/sbin/upsdrvctl"
 	required_files="@NUT_CONFDIR@/ups.conf"
 	start_cmd="${ctl_command} start"
 	stop_cmd="${ctl_command} stop"
 	# XXX implement status after upsdrvctl does
 else
 	command="@PREFIX@/libexec/nut/${upsdriver_type}"
 	# XXX Restructure upsname into variable, but really just
-	# delete this option.
+	# XXX - We need a way to easily determine the pidfile, which is of
-	#upsname=`echo $upsdriver_flags | sed -e 's/^-a //'
+	# XXX - the form @NUT_STATEDIR@/${updriver_type}-${tty}.pid
 	#pidfile="@NUT_STATEDIR@/${upsdriver_type}-${upsname}.pid"
 	#pidfile="@NUT_STATEDIR@/${upsdriver_type}-${tty}.pid"
 fi
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
-	if [ -n "${start_cmd}" ]; then
+	if [ -n "${start_cmd}" ]
 	then
 		${start_cmd}
 	else
 		${command} ${upsdriver_flags} ${command_args}
 	fi
 fi

 @@ -1,33 +1,34 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: upslog.sh,v 1.6.154.1 2023/01/07 16:07:59 gdt Exp $
+# $NetBSD: upslog.sh,v 1.6.154.2 2023/01/07 16:09:38 gdt Exp $
+#
 # PROVIDE: upslog
-# REQUIRE: upsd DAEMON
+# REQUIRE: upsd
 # BEFORE: LOGIN
+#
 # You will need to set some variables in /etc/rc.conf to start upslog
 # properly, e.g.
+#
 # upslog=YES
 # upslog_flags="smartups@localhost /var/log/ups 60"
+#
 # Please refer to upslog(8) for more information about the arguments to pass
 # to upslog.
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	. /etc/rc.subr
 fi
 name="upslog"
 rcvar="${name}"
 command="@PREFIX@/bin/${name}"
 pidfile="@NUT_STATEDIR@/${name}.pid"
-if [ -f /etc/rc.subr ]; then
+if [ -f /etc/rc.subr ]
 then
 	load_rc_config $name
 	run_rc_command "$1"
 else
 	@ECHO@ -n " ${name}"
 	${command} ${upslog_flags} ${command_args}
 fi