Move the individual UPS drivers from ${PREFIX}/bin to

${PREFIX}/sbin/ups-drivers.

5 files changed, 60 insertions, 33 deletions

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index f0361516341..1363d597882 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/11/19 04:25:15 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2001/11/21 03:22:05 simonb Exp $
 #
 
 DISTNAME=		nut-0.45.2
@@ -35,7 +35,8 @@ NUT_GROUP=		nut
 CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc/nut \
 			--with-user=${NUT_USER} \
 			--with-group=${NUT_GROUP} \
-			--with-statepath=/var/db/nut
+			--with-statepath=/var/db/nut \
+			--with-modelpath=${LOCALBASE}/sbin/ups-drivers
 
 FILES_SUBST=		NUT_USER=${NUT_USER}
 FILES_SUBST+=		NUT_GROUP=${NUT_GROUP}
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index b5bd350d3af..2934d45d70f 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,35 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2001/11/19 04:40:00 lukem Exp $
-bin/aeg
-bin/apcsmart
-bin/belkin
-bin/bestfort
-bin/bestuferrups
-bin/bestups
-bin/engetron
-bin/everups
-bin/fentonups
-bin/genericups
-bin/ipt-anzen
-bin/masterguard
-bin/mge-ellipse
-bin/mgeups
-bin/multilink
-bin/mustekups
-bin/newapc
-bin/optiups
-bin/powercom
-bin/sec
-bin/sms
-bin/toshiba1500
-bin/ups-trust425+625
+@comment $NetBSD: PLIST,v 1.5 2001/11/21 03:22:05 simonb Exp $
 bin/upsc
 bin/upscmd
 bin/upsct
 bin/upsct2
-bin/upsdrvctl
-bin/upseyeux
 bin/upslog
-bin/victronups
 etc/nut/hosts.conf.sample
 etc/nut/multimon.conf.sample
 etc/nut/ups.conf.sample
@@ -55,7 +29,33 @@ man/man8/upsd.8
 man/man8/upslog.8
 man/man8/upsmon.8
 man/man8/upssched.8
+sbin/ups-drivers/aeg
+sbin/ups-drivers/apcsmart
+sbin/ups-drivers/belkin
+sbin/ups-drivers/bestfort
+sbin/ups-drivers/bestuferrups
+sbin/ups-drivers/bestups
+sbin/ups-drivers/engetron
+sbin/ups-drivers/everups
+sbin/ups-drivers/fentonups
+sbin/ups-drivers/genericups
+sbin/ups-drivers/ipt-anzen
+sbin/ups-drivers/masterguard
+sbin/ups-drivers/mge-ellipse
+sbin/ups-drivers/mgeups
+sbin/ups-drivers/multilink
+sbin/ups-drivers/mustekups
+sbin/ups-drivers/newapc
+sbin/ups-drivers/optiups
+sbin/ups-drivers/powercom
+sbin/ups-drivers/sec
+sbin/ups-drivers/sms
+sbin/ups-drivers/toshiba1500
+sbin/ups-drivers/ups-trust425+625
+sbin/ups-drivers/upseyeux
+sbin/ups-drivers/victronups
 sbin/upsd
+sbin/upsdrvctl
 sbin/upsmon
 sbin/upssched
 share/doc/nut/Changes.trust
@@ -90,5 +90,6 @@ 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
 @dirrm share/doc/nut/cables
 @dirrm share/doc/nut
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 72e2a3bd18b..907be20a892 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/11/20 14:53:03 lukem Exp $
+$NetBSD: distinfo,v 1.7 2001/11/21 03:22:05 simonb Exp $
 
 SHA1 (nut-0.45.2.tar.gz) = 9c225205127eee1e9bb55d9a28ff1290b47f75aa
 Size (nut-0.45.2.tar.gz) = 330851 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 88c1b244d10c6f3a4db62565477260949a9f01f1
 SHA1 (patch-ad) = 1132a678cc53882cc92764ed17bbd4cf4152c58d
 SHA1 (patch-ae) = 601c7a2eb702e9220aa6f2b8cb596385596d5a92
 SHA1 (patch-af) = 92f99eae16425baab09b1f5e6546caf322ca430c
+SHA1 (patch-ag) = d75f10af8a716effbdca17dd28323bd6edc75c87
diff --git a/sysutils/ups-nut/files/upsd b/sysutils/ups-nut/files/upsd
index c89fffeeadd..b51e1208497 100755
--- a/sysutils/ups-nut/files/upsd
+++ b/sysutils/ups-nut/files/upsd
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: upsd,v 1.2 2001/11/20 16:59:10 jlam Exp $
+# $NetBSD: upsd,v 1.3 2001/11/21 03:22:05 simonb Exp $
 #
 # PROVIDE: upsd
 # REQUIRE: NETWORK syslogd mountcritremote
@@ -16,7 +16,7 @@
 
 if [ -z "$1" -o "x$1" = xstart ]; then
 	if [ "x${upsd}" = xYES ]; then
-		%%PREFIX%%/bin/${upsd_driver} ${upsd_flags} ${upsd_dev}
+		%%PREFIX%%/sbin/ups-drivers/${upsd_driver} ${upsd_flags} ${upsd_dev}
 		%%PREFIX%%/sbin/upsd
 	fi
 
@@ -25,7 +25,7 @@ if [ -z "$1" -o "x$1" = xstart ]; then
 	fi
 elif [ "x$1" = xstop ]; then
 	echo "Stopping upsd - caveat, this may not work if multiple instances are running"
-	dpid=`ps ax | fgrep %%PREFIX%%/bin/${upsd_driver} | fgrep -v fgrep | awk '{print $1}'`
+	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}
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
new file mode 100644
index 00000000000..66c39bae4d9
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.3 2001/11/21 03:22:05 simonb Exp $
+
+--- models/Makefile.in.orig	Wed Aug 29 21:40:53 2001
++++ models/Makefile.in	Wed Nov 21 02:52:43 2001
+@@ -1,7 +1,9 @@
+ # Network UPS Tools: models
+ 
+ # directories
++prefix    = $(INSTALLROOT)@prefix@
+ MODELPATH = $(INSTALLROOT)@MODELPATH@
++SBINPATH  = $(prefix)/@sbindir@
+ 
+ # other definitions
+ CC	= @CC@
+@@ -85,6 +87,8 @@
+ distclean: clean
+ 
+ install: all
+-	@for f in $(PROGS) $(PROGS2) upsdrvctl ; do \
++	$(INSTALLCMD) -m 0755 -d $(MODELPATH)
++	@for f in $(PROGS) $(PROGS2) ; do \
+ 		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \
+ 	done
++	@$(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH)