Update to version 0.44.1

Note: state files moved from /var/state/ups to /var/db.

10 files changed, 44 insertions, 60 deletions

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 3c947fb57ae2..794958397a0f 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.44.0
+PORTVERSION=	0.44.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
@@ -20,11 +20,11 @@ GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
 		--with-cgipath=${PREFIX}/share/nut/cgi \
 		--with-modelpath=${PREFIX}/sbin \
-		--with-uid=65534 --with-gid=68 
+		--with-statepath=/var/db
 
 ALL_TARGET=	all
 
-PLIST=	${WRKDIR}/PLIST.DYN
+PLIST=		${WRKDIR}/PLIST.DYN
 
 NDOCDIR=	${PREFIX}/share/doc/nut
 
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index a1dade6d7474..15a91fc9551a 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1 +1 @@
-MD5 (nut-0.44.0.tar.gz) = 98314d5eb66db0e0eb367623cff16e56
+MD5 (nut-0.44.1.tar.gz) = f34b5c9c4fd55b9763bd801bf88f4ed5
diff --git a/sysutils/nut/files/patch-aa b/sysutils/nut/files/patch-aa
index 107977974a1c..16ed4293bf15 100644
--- a/sysutils/nut/files/patch-aa
+++ b/sysutils/nut/files/patch-aa
@@ -1,6 +1,6 @@
-diff -ur ../440/Makefile.in ./Makefile.in
---- ../440/Makefile.in	Mon Jun 12 06:48:07 2000
-+++ ./Makefile.in	Tue Jul 18 11:51:25 2000
+diff -ur ../441/Makefile.in ./Makefile.in
+--- ../441/Makefile.in	Sun Jul 30 10:10:14 2000
++++ ./Makefile.in	Mon Oct 16 11:41:03 2000
 @@ -5,7 +5,7 @@
  BASEPATH = $(INSTALLROOT)@prefix@
  CONFPATH = $(INSTALLROOT)@sysconfdir@
@@ -10,9 +10,9 @@ diff -ur ../440/Makefile.in ./Makefile.in
  
  STATEPATH = $(INSTALLROOT)@STATEPATH@
  SUBDIRS = common models server clients
-diff -ur ../440/clients/Makefile.in ./clients/Makefile.in
---- ../440/clients/Makefile.in	Fri Jul 14 05:55:41 2000
-+++ ./clients/Makefile.in	Mon Jul 17 17:48:29 2000
+diff -ur ../441/clients/Makefile.in ./clients/Makefile.in
+--- ../441/clients/Makefile.in	Fri Jul 14 05:55:41 2000
++++ ./clients/Makefile.in	Mon Oct 16 11:42:15 2000
 @@ -57,7 +57,7 @@
  
  install: all
@@ -22,9 +22,9 @@ diff -ur ../440/clients/Makefile.in ./clients/Makefile.in
  	done
  
  install-cgi: cgi
-diff -ur ../440/conf/Makefile.in ./conf/Makefile.in
---- ../440/conf/Makefile.in	Mon May  8 04:17:20 2000
-+++ ./conf/Makefile.in	Mon Jul 17 17:49:43 2000
+diff -ur ../441/conf/Makefile.in ./conf/Makefile.in
+--- ../441/conf/Makefile.in	Mon May  8 04:17:20 2000
++++ ./conf/Makefile.in	Mon Oct 16 11:43:25 2000
 @@ -13,17 +13,9 @@
  
  install:
@@ -45,23 +45,9 @@ diff -ur ../440/conf/Makefile.in ./conf/Makefile.in
 -		fi; \
 +		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
  	done
-diff -ur ../440/models/Makefile.in ./models/Makefile.in
---- ../440/models/Makefile.in	Fri Jul 14 05:27:27 2000
-+++ ./models/Makefile.in	Tue Jul 18 10:59:01 2000
-@@ -20,9 +20,7 @@
- # in the future ala the Linux "make config" process...
- 
- $(PROGS): upscommon.o ../include/shared.h ../common/common.o
--
--.c:
--	$(CC) $(CFLAGS) -o $* $*.c upscommon.o ../common/common.o
-+	$(CC) $(CFLAGS) -o $* $*.c upscommon.o @SERLIBS@ ../common/common.o
- 
- #
- # Housekeeping stuff
-diff -ur ../440/server/Makefile.in ./server/Makefile.in
---- ../440/server/Makefile.in	Fri Jul 14 05:30:40 2000
-+++ ./server/Makefile.in	Mon Jul 17 17:51:19 2000
+diff -ur ../441/server/Makefile.in ./server/Makefile.in
+--- ../441/server/Makefile.in	Fri Jul 14 05:30:40 2000
++++ ./server/Makefile.in	Mon Oct 16 11:44:41 2000
 @@ -24,5 +24,5 @@
  
  install: all
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 1b710856e2a9..81e0ef91c233 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -1,11 +1,14 @@
 sbin/apcsmart
+sbin/belkin
 sbin/bestfort
 sbin/bestups
+sbin/engetron
 sbin/fentonups
 sbin/genericups
 sbin/ipt-anzen
 sbin/mustekups                       
 sbin/optiups
+sbin/powercom
 sbin/ups-trust425+625
 sbin/victronups
 sbin/upsc
diff --git a/sysutils/nut/pkg-plist.doc b/sysutils/nut/pkg-plist.doc
index 18a1a05c9690..703131ed35fe 100644
--- a/sysutils/nut/pkg-plist.doc
+++ b/sysutils/nut/pkg-plist.doc
@@ -1,10 +1,12 @@
 share/doc/nut/Changes.trust
 share/doc/nut/FAQ
 share/doc/nut/access.txt
+share/doc/nut/belkin.txt
 share/doc/nut/big-servers.txt
 share/doc/nut/commands.txt
 share/doc/nut/configure.txt
 share/doc/nut/data-room.txt
+share/doc/nut/dummyups.txt
 share/doc/nut/generic-ups.txt
 share/doc/nut/new-modules.txt
 share/doc/nut/pager.txt
@@ -16,6 +18,7 @@ share/doc/nut/todo.txt
 share/doc/nut/ups-trust425+625.txt
 share/doc/nut/README
 share/doc/nut/QUICKSTART
+share/doc/nut/cables/powerware.txt
 share/doc/nut/cables/victron.txt
 @dirrm share/doc/nut/cables
 @dirrm share/doc/nut
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 3c947fb57ae2..794958397a0f 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.44.0
+PORTVERSION=	0.44.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
@@ -20,11 +20,11 @@ GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
 		--with-cgipath=${PREFIX}/share/nut/cgi \
 		--with-modelpath=${PREFIX}/sbin \
-		--with-uid=65534 --with-gid=68 
+		--with-statepath=/var/db
 
 ALL_TARGET=	all
 
-PLIST=	${WRKDIR}/PLIST.DYN
+PLIST=		${WRKDIR}/PLIST.DYN
 
 NDOCDIR=	${PREFIX}/share/doc/nut
 
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index a1dade6d7474..15a91fc9551a 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1 +1 @@
-MD5 (nut-0.44.0.tar.gz) = 98314d5eb66db0e0eb367623cff16e56
+MD5 (nut-0.44.1.tar.gz) = f34b5c9c4fd55b9763bd801bf88f4ed5
diff --git a/sysutils/nut22/files/patch-aa b/sysutils/nut22/files/patch-aa
index 107977974a1c..16ed4293bf15 100644
--- a/sysutils/nut22/files/patch-aa
+++ b/sysutils/nut22/files/patch-aa
@@ -1,6 +1,6 @@
-diff -ur ../440/Makefile.in ./Makefile.in
---- ../440/Makefile.in	Mon Jun 12 06:48:07 2000
-+++ ./Makefile.in	Tue Jul 18 11:51:25 2000
+diff -ur ../441/Makefile.in ./Makefile.in
+--- ../441/Makefile.in	Sun Jul 30 10:10:14 2000
++++ ./Makefile.in	Mon Oct 16 11:41:03 2000
 @@ -5,7 +5,7 @@
  BASEPATH = $(INSTALLROOT)@prefix@
  CONFPATH = $(INSTALLROOT)@sysconfdir@
@@ -10,9 +10,9 @@ diff -ur ../440/Makefile.in ./Makefile.in
  
  STATEPATH = $(INSTALLROOT)@STATEPATH@
  SUBDIRS = common models server clients
-diff -ur ../440/clients/Makefile.in ./clients/Makefile.in
---- ../440/clients/Makefile.in	Fri Jul 14 05:55:41 2000
-+++ ./clients/Makefile.in	Mon Jul 17 17:48:29 2000
+diff -ur ../441/clients/Makefile.in ./clients/Makefile.in
+--- ../441/clients/Makefile.in	Fri Jul 14 05:55:41 2000
++++ ./clients/Makefile.in	Mon Oct 16 11:42:15 2000
 @@ -57,7 +57,7 @@
  
  install: all
@@ -22,9 +22,9 @@ diff -ur ../440/clients/Makefile.in ./clients/Makefile.in
  	done
  
  install-cgi: cgi
-diff -ur ../440/conf/Makefile.in ./conf/Makefile.in
---- ../440/conf/Makefile.in	Mon May  8 04:17:20 2000
-+++ ./conf/Makefile.in	Mon Jul 17 17:49:43 2000
+diff -ur ../441/conf/Makefile.in ./conf/Makefile.in
+--- ../441/conf/Makefile.in	Mon May  8 04:17:20 2000
++++ ./conf/Makefile.in	Mon Oct 16 11:43:25 2000
 @@ -13,17 +13,9 @@
  
  install:
@@ -45,23 +45,9 @@ diff -ur ../440/conf/Makefile.in ./conf/Makefile.in
 -		fi; \
 +		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
  	done
-diff -ur ../440/models/Makefile.in ./models/Makefile.in
---- ../440/models/Makefile.in	Fri Jul 14 05:27:27 2000
-+++ ./models/Makefile.in	Tue Jul 18 10:59:01 2000
-@@ -20,9 +20,7 @@
- # in the future ala the Linux "make config" process...
- 
- $(PROGS): upscommon.o ../include/shared.h ../common/common.o
--
--.c:
--	$(CC) $(CFLAGS) -o $* $*.c upscommon.o ../common/common.o
-+	$(CC) $(CFLAGS) -o $* $*.c upscommon.o @SERLIBS@ ../common/common.o
- 
- #
- # Housekeeping stuff
-diff -ur ../440/server/Makefile.in ./server/Makefile.in
---- ../440/server/Makefile.in	Fri Jul 14 05:30:40 2000
-+++ ./server/Makefile.in	Mon Jul 17 17:51:19 2000
+diff -ur ../441/server/Makefile.in ./server/Makefile.in
+--- ../441/server/Makefile.in	Fri Jul 14 05:30:40 2000
++++ ./server/Makefile.in	Mon Oct 16 11:44:41 2000
 @@ -24,5 +24,5 @@
  
  install: all
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index 1b710856e2a9..81e0ef91c233 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -1,11 +1,14 @@
 sbin/apcsmart
+sbin/belkin
 sbin/bestfort
 sbin/bestups
+sbin/engetron
 sbin/fentonups
 sbin/genericups
 sbin/ipt-anzen
 sbin/mustekups                       
 sbin/optiups
+sbin/powercom
 sbin/ups-trust425+625
 sbin/victronups
 sbin/upsc
diff --git a/sysutils/nut22/pkg-plist.doc b/sysutils/nut22/pkg-plist.doc
index 18a1a05c9690..703131ed35fe 100644
--- a/sysutils/nut22/pkg-plist.doc
+++ b/sysutils/nut22/pkg-plist.doc
@@ -1,10 +1,12 @@
 share/doc/nut/Changes.trust
 share/doc/nut/FAQ
 share/doc/nut/access.txt
+share/doc/nut/belkin.txt
 share/doc/nut/big-servers.txt
 share/doc/nut/commands.txt
 share/doc/nut/configure.txt
 share/doc/nut/data-room.txt
+share/doc/nut/dummyups.txt
 share/doc/nut/generic-ups.txt
 share/doc/nut/new-modules.txt
 share/doc/nut/pager.txt
@@ -16,6 +18,7 @@ share/doc/nut/todo.txt
 share/doc/nut/ups-trust425+625.txt
 share/doc/nut/README
 share/doc/nut/QUICKSTART
+share/doc/nut/cables/powerware.txt
 share/doc/nut/cables/victron.txt
 @dirrm share/doc/nut/cables
 @dirrm share/doc/nut