Buildlinkify, respect ${CONFDIR}, and use general INSTALL/DEINSTALL scripts.

Also replace rc.d scripts with much better ones by Luke Mewburn
<lukem@wasabisystems.com> that were slightly editted by me to have some
minimal functionality on pre-rc.d systems.

12 files changed, 248 insertions, 200 deletions

diff --git a/sysutils/ups-nut/DEINSTALL b/sysutils/ups-nut/DEINSTALL
deleted file mode 100644
index 865d1a2a8e7..00000000000
--- a/sysutils/ups-nut/DEINSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.3 2001/11/19 04:40:00 lukem Exp $
-#
-
-PKGNAME=$1
-STAGE=$2
-
-USER="@NUT_USER@"
-GROUP="@NUT_GROUP@"
-
-CAT="@CAT@"
-
-case ${STAGE} in
-DEINSTALL)
-	;;
-
-POST-DEINSTALL)
-	${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-
-  * the \`${USER}' user
-  * the \`${GROUP}' group
-  * the \`${PKG_PREFIX}/etc/nut' directory
-
-===========================================================================
-EOF
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/sysutils/ups-nut/INSTALL b/sysutils/ups-nut/INSTALL
deleted file mode 100644
index ad4011fb974..00000000000
--- a/sysutils/ups-nut/INSTALL
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2001/11/19 04:25:15 lukem Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-USER=@NUT_USER@
-GROUP=@NUT_GROUP@
-
-ADDUSER="@ADDUSER@"
-ADDGROUP="@ADDGROUP@"
-CHGRP="@CHGRP@"
-ID="@ID@"
-RM="@RM@"
-TOUCH="@TOUCH@"
-
-case ${STAGE} in
-PRE-INSTALL)
-	# Group... the default's shipped with NetBSD
-	# We need to check that ${GROUP} exists before adding the user.
-	# Do it with chgrp to be able to use NIS.
-	#
-	${TOUCH} "/tmp/grouptest.$$"
-	${CHGRP} ${GROUP} "/tmp/grouptest.$$" >/dev/null 2>&1
-	if [ $? -eq 0 ]
-	then
-		echo "Group '${GROUP}' already exists...proceeding."
-	else
-		echo "Creating '${GROUP}' group..."
-		${ADDGROUP} ${GROUP}
-		echo "Done."
-	fi
-	${RM} -f "/tmp/grouptest.$$"
-
-	# Use `id' to be able to use NIS.
-	#
-	${ID} ${USER} 2>/dev/null >/dev/null
-	if [ $? -eq 0 ]
-	then
-		echo "User '${USER}' already exists...proceeding."
-	else
-		echo "Creating '${USER}' user..."
-		${ADDUSER} \
-			-c "Network UPS Tools" \
-			-g ${GROUP} -s /bin/sh -m ${USER}
-		echo "Done."
-	fi
-	;;
-
-POST-INSTALL)
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 1363d597882..0f3c0c01d67 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/11/21 03:22:05 simonb Exp $
+# $NetBSD: Makefile,v 1.14 2001/11/21 15:50:55 jlam Exp $
 #
 
 DISTNAME=		nut-0.45.2
@@ -10,63 +10,66 @@ MAINTAINER=		lukem@netbsd.org
 HOMEPAGE=		http://www.exploits.org/nut/
 COMMENT=		Network UPS Tools
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-.if exists(/usr/sbin/user)
-ADDUSER=		/usr/sbin/useradd
-ADDGROUP=		/usr/sbin/groupadd
-.else
-DEPENDS+=		user>=20000313:../../sysutils/user
-ADDUSER=		${LOCALBASE}/sbin/useradd
-ADDGROUP=		${LOCALBASE}/sbin/groupadd
-.endif
-.elif ${OPSYS} == "SunOS"
-ADDUSER=		useradd
-ADDGROUP=		groupadd
-.endif
-DEINSTALL_FILE=         ${WRKDIR}/DEINSTALL
-INSTALL_FILE=           ${WRKDIR}/INSTALL
 BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
 
+USE_BUILDLINK_ONLY=	yes
 GNU_CONFIGURE=		yes
-NUT_DOCDIR=		${LOCALBASE}/share/doc/nut
-NUT_USER=		nut
-NUT_GROUP=		nut
-CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc/nut \
-			--with-user=${NUT_USER} \
-			--with-group=${NUT_GROUP} \
-			--with-statepath=/var/db/nut \
+CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR}			\
+			--with-user=${PKG_USER}				\
+			--with-group=${PKG_GROUP}			\
+			--with-statepath=${NUT_STATEDIR}		\
 			--with-modelpath=${LOCALBASE}/sbin/ups-drivers
 
-FILES_SUBST=		NUT_USER=${NUT_USER}
-FILES_SUBST+=		NUT_GROUP=${NUT_GROUP}
+NUT_CONFDIR=		${CONFDIR}/nut
+NUT_DOCDIR=		${PREFIX}/share/doc/nut
+NUT_EGDIR=		${PREFIX}/share/examples/nut
+NUT_STATEDIR=		/var/db/nut
 
-FILES_SUBST+=		ADDGROUP=${ADDGROUP:Q}
-FILES_SUBST+=		ADDUSER=${ADDUSER:Q}
-FILES_SUBST+=		CAT=${CAT:Q}
-FILES_SUBST+=		CHGRP=${CHGRP:Q}
-FILES_SUBST+=		ID=${ID:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST+=		TOUCH=${TOUCH:Q}
+FILES_SUBST+=		NUT_CONFDIR=${NUT_CONFDIR}
+FILES_SUBST+=		NUT_STATEDIR=${NUT_STATEDIR}
 
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+PKG_USER=		nut
+PKG_USER_DESCR=		Network UPS Tools
+PKG_USER_SHELL=		${SH}
+PKG_GROUP=		nut
+
+CONF_FILES=	${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf
+CONF_FILES+=	${NUT_EGDIR}/multimon.conf.sample ${NUT_CONFDIR}/multimon.conf
+CONF_FILES+=	${NUT_EGDIR}/upsset.conf.sample ${NUT_CONFDIR}/upsset.conf
+CONF_FILES+=	${NUT_EGDIR}/upssched.conf.sample ${NUT_CONFDIR}/upssched.conf
+CONF_FILES+=	${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
+
+CONF_FILES_PERMS=	${NUT_EGDIR}/upsmon.conf.sample			\
+			${NUT_CONFDIR}/upsmon.conf			\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES_PERMS+=	${NUT_EGDIR}/upsd.conf.sample			\
+			${NUT_CONFDIR}/upsd.conf			\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES_PERMS+=	${NUT_EGDIR}/upsd.users.sample			\
+			${NUT_CONFDIR}/upsd.users			\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+RCD_SCRIPTS=		ups upsd upsdriver upslog upsmon
+
+OWN_DIRS=		${NUT_CONFDIR}
+OWN_DIRS_PERMS=		${NUT_STATEDIR} ${PKG_USER} ${PKG_GROUP} 0770
 
 pre-configure:
-	cd ${WRKSRC} && autoreconf --force
+	cd ${WRKSRC}; ${LOCALBASE}/bin/autoreconf --force
 
 pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	@${INSTALL_DATA_DIR} ${NUT_EGDIR}
+	@for script in ${RCD_SCRIPTS}; do				\
+		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
+			> ${WRKDIR}/$${script};				\
+	done
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
-	@${SED} -e "/%%PREFIX%%/s##${LOCALBASE}#g" \
-		${FILESDIR}/upsd \
-		>${LOCALBASE}/etc/rc.d/upsd
-	@${CHMOD} 0755 ${LOCALBASE}/etc/rc.d/upsd
-	@${INSTALL} -d -o ${NUT_USER} -g ${NUT_GROUP} -m 0770 /var/db/nut
-	@if ! [ -d ${NUT_DOCDIR} ]; then ${MKDIR} ${NUT_DOCDIR}; fi
-	@if ! [ -d ${NUT_DOCDIR}/cables ]; then ${MKDIR} ${NUT_DOCDIR}/cables; fi
+	for script in ${RCD_SCRIPTS}; do				\
+		${INSTALL_SCRIPT} ${WRKDIR}/$${script}			\
+			${PREFIX}/etc/rc.d/$${script};			\
+	done
+	${INSTALL_DATA_DIR} ${NUT_DOCDIR} ${NUT_DOCDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
@@ -74,4 +77,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index 2934d45d70f..5d3b68b33aa 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,18 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2001/11/21 03:22:05 simonb Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/11/21 15:50:55 jlam Exp $
 bin/upsc
 bin/upscmd
 bin/upsct
 bin/upsct2
 bin/upslog
-etc/nut/hosts.conf.sample
-etc/nut/multimon.conf.sample
-etc/nut/ups.conf.sample
-etc/nut/upsd.conf.sample
-etc/nut/upsd.users.sample
-etc/nut/upsmon.conf.sample
-etc/nut/upssched.conf.sample
-etc/nut/upsset.conf.sample
+etc/rc.d/ups
 etc/rc.d/upsd
+etc/rc.d/upsdriver
+etc/rc.d/upslog
+etc/rc.d/upsmon
 man/man5/ups.conf.5
 man/man5/upssched.conf.5
 man/man8/apcsmart.8
@@ -90,6 +86,15 @@ share/doc/nut/tips.txt
 share/doc/nut/todo.txt
 share/doc/nut/ups-trust425+625.txt
 share/doc/nut/upssched.txt
-@dirrm sbin/ups-drivers
+share/examples/nut/hosts.conf.sample
+share/examples/nut/multimon.conf.sample
+share/examples/nut/ups.conf.sample
+share/examples/nut/upsd.conf.sample
+share/examples/nut/upsd.users.sample
+share/examples/nut/upsmon.conf.sample
+share/examples/nut/upssched.conf.sample
+share/examples/nut/upsset.conf.sample
+@dirrm share/examples/nut
 @dirrm share/doc/nut/cables
 @dirrm share/doc/nut
+@dirrm sbin/ups-drivers
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 907be20a892..3bb611f45a8 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2001/11/21 03:22:05 simonb Exp $
+$NetBSD: distinfo,v 1.8 2001/11/21 15:50:55 jlam Exp $
 
 SHA1 (nut-0.45.2.tar.gz) = 9c225205127eee1e9bb55d9a28ff1290b47f75aa
 Size (nut-0.45.2.tar.gz) = 330851 bytes
 SHA1 (patch-aa) = 2919c36f928d7b3a22574f8ca0633cd11bb99c70
-SHA1 (patch-ab) = 88c1b244d10c6f3a4db62565477260949a9f01f1
+SHA1 (patch-ab) = fac1a47430a2c2d692ecede2ac6ed78c60a82566
 SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d
 SHA1 (patch-ae) = 601c7a2eb702e9220aa6f2b8cb596385596d5a92
 SHA1 (patch-af) = 92f99eae16425baab09b1f5e6546caf322ca430c
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
new file mode 100644
index 00000000000..d4ab04b16d4
--- /dev/null
+++ b/sysutils/ups-nut/files/ups.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# $NetBSD: ups.sh,v 1.1 2001/11/21 15:50:55 jlam Exp $
+#
+# PROVIDE: ups
+# KEYWORD: nostart
+
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+# NOTE: run_rc_command sets $_arg
+#
+ups_commands()
+{
+	for file in $UPS_COMMANDS; do
+		/etc/rc.d/$file $_arg
+	done
+}
+
+ups_reversecommands()
+{
+	UPS_REVCOMMANDS=
+	for file in $UPS_COMMANDS; do
+		UPS_REVCOMMANDS="$file $UPS_REVCOMMANDS"
+	done
+	for file in $UPS_REVCOMMANDS; do
+		/etc/rc.d/$file $_arg
+	done
+}
+
+UPS_COMMANDS="upsdriver upsd upsmon upslog"
+
+name="ups"
+start_cmd="ups_commands"
+stop_cmd="ups_reversecommands"
+status_cmd="ups_commands"
+extra_commands="status"
+run_rc_command "$1"
+
+if [ ! -d /etc/rc.d ]
+then
+        @ECHO@ -n " ${name}"
+	${start_cmd} "$1"
+else
+        run_rc_command "$1"
+fi
diff --git a/sysutils/ups-nut/files/upsd b/sysutils/ups-nut/files/upsd
deleted file mode 100755
index b51e1208497..00000000000
--- a/sysutils/ups-nut/files/upsd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: upsd,v 1.3 2001/11/21 03:22:05 simonb Exp $
-#
-# PROVIDE: upsd
-# REQUIRE: NETWORK syslogd mountcritremote
-
-# You need to set some parameters for this script in /etc/rc.conf,
-# examples are:
-#upsd=YES	upsd_flags=""	
-#		upsd_dev="/dev/tty01"
-#		upsd_driver="apcsmart"
-#upsmon=YES	upsmon_host="localhost"
-
-. /etc/rc.conf
-
-if [ -z "$1" -o "x$1" = xstart ]; then
-	if [ "x${upsd}" = xYES ]; then
-		%%PREFIX%%/sbin/ups-drivers/${upsd_driver} ${upsd_flags} ${upsd_dev}
-		%%PREFIX%%/sbin/upsd
-	fi
-
-	if [ "x${upsmon}" = xYES ]; then
-		%%PREFIX%%/sbin/upsmon ${upsmon_host}
-	fi
-elif [ "x$1" = xstop ]; then
-	echo "Stopping upsd - caveat, this may not work if multiple instances are running"
-	dpid=`ps ax | fgrep %%PREFIX%%/sbin/ups-drivers/${upsd_driver} | fgrep -v fgrep | awk '{print $1}'`
-	upid=`ps ax | fgrep %%PREFIX%%/sbin/upsd | fgrep -v fgrep | awk '{print $1}'`
-	if [ ! -z "${upid}" ]; then
-		kill ${upid}
-	fi
-	if [ ! -z "${dpid}" ]; then
-		kill ${dpid}
-	fi
-	if [ -r /var/run/upsmon.pid ]; then
-		mpid=`/bin/cat /var/run/upsmon.pid`
-		kill ${mpid}
-	fi
-fi
diff --git a/sysutils/ups-nut/files/upsd.sh b/sysutils/ups-nut/files/upsd.sh
new file mode 100644
index 00000000000..b063fb4310f
--- /dev/null
+++ b/sysutils/ups-nut/files/upsd.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+#
+# $NetBSD: upsd.sh,v 1.1 2001/11/21 15:50:56 jlam Exp $
+#
+# PROVIDE: upsd
+# REQUIRE: upsdriver
+
+if [ -d /etc/rc.d -a -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 [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n " ${name}"
+	${command} ${upsd_flags} ${command_args}
+else
+	load_rc_config $name
+	run_rc_command "$1"
+fi
diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh
new file mode 100644
index 00000000000..5ba7f67da5c
--- /dev/null
+++ b/sysutils/ups-nut/files/upsdriver.sh
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# $NetBSD: upsdriver.sh,v 1.1 2001/11/21 15:50:56 jlam Exp $
+#
+# PROVIDE: upsdriver
+# REQUIRE: NETWORK syslogd mountcritremote
+#
+# You will need to set some variables in /etc/rc.conf to start upslog
+# properly, e.g.
+#
+# upsdriver=YES
+#	upsdriver_type="newapc"
+#	upsdriver_flags="-a smartups"
+#
+# Please refer to nutupsdrv(8) for more information about the arguments to
+# pass to the UPS drivers.
+
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="upsdriver"
+rcvar=$name
+command="@PREFIX@/sbin/ups-drivers/${upsdriver_type}"
+#
+# XXX - We need a way to easily determine the pidfile, which is of the form
+# XXX - @NUT_STATEDIR@/${updriver_type}-${tty}.pid
+#
+#pidfile="@NUT_STATEDIR@/${upsdriver_type}-${tty}.pid"
+
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n " ${name}"
+	${command} ${upsdriver_flags} ${command_args}
+else
+	load_rc_config $name
+	run_rc_command "$1"
+fi
diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh
new file mode 100644
index 00000000000..2d1349177f3
--- /dev/null
+++ b/sysutils/ups-nut/files/upslog.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# $NetBSD: upslog.sh,v 1.1 2001/11/21 15:50:56 jlam Exp $
+#
+# PROVIDE: upslog
+# REQUIRE: upsd
+#
+# 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 [ -d /etc/rc.d -a -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="upslog"
+rcvar="${name}"
+command="@PREFIX@/bin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="@CONFDIR@/nut/${name}.conf"
+
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n " ${name}"
+	${command} ${upsmon_flags} ${command_args}
+else
+	load_rc_config $name
+	run_rc_command "$1"
+fi
diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh
new file mode 100644
index 00000000000..841f39ec234
--- /dev/null
+++ b/sysutils/ups-nut/files/upsmon.sh
@@ -0,0 +1,26 @@
+#! /bin/sh
+#
+# $NetBSD: upsmon.sh,v 1.1 2001/11/21 15:50:56 jlam Exp $
+#
+# PROVIDE: upsmon
+# REQUIRE: upsd
+
+if [ -d /etc/rc.d -a -f /etc/rc.subr ]
+then
+	. /etc/rc.subr
+fi
+
+name="upsmon"
+rcvar="${name}"
+command="@PREFIX@/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+required_files="@NUT_CONFDIR@/${name}.conf"
+
+if [ ! -d /etc/rc.d ]
+then
+	@ECHO@ -n " ${name}"
+	${command} ${upsmon_flags} ${command_args}
+else
+	load_rc_config $name
+	run_rc_command "$1"
+fi
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
index 738e2ad7a4e..9fb9ce303a9 100644
--- a/sysutils/ups-nut/patches/patch-ab
+++ b/sysutils/ups-nut/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2001/11/17 15:50:56 lukem Exp $
+$NetBSD: patch-ab,v 1.5 2001/11/21 15:50:56 jlam Exp $
 
---- conf/Makefile.in.orig	Tue Aug 14 03:12:18 2001
+--- conf/Makefile.in.orig	Mon Aug 13 13:12:18 2001
 +++ conf/Makefile.in
-@@ -4,7 +4,7 @@
- CONFPATH   = $(INSTALLROOT)@sysconfdir@
- INSTALLCMD = @INSTALL@
+@@ -1,7 +1,7 @@
+ # Network UPS Tools: conf
  
--SECFILES = upsmon.conf upsd.conf upsd.users
-+SECFILES = upsmon.conf ups.conf upsd.conf upsd.users
- PUBFILES = hosts.conf multimon.conf upsset.conf upssched.conf ups.conf
+ prefix     = @prefix@
+-CONFPATH   = $(INSTALLROOT)@sysconfdir@
++CONFPATH   = $(INSTALLROOT)@datadir@/examples/nut
+ INSTALLCMD = @INSTALL@
  
- all:
+ SECFILES = upsmon.conf upsd.conf upsd.users