Update ups-nut to 0.44.3 prerelease 5.

Changes are too much to list here, see "Changes" in the distribution
for a detailed list. Various bugfixes and enhancements.
Based on a package provided by collver@linuxfreemail.com.

9 files changed, 76 insertions, 23 deletions

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 224c780a2ef..2170cf010de 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:15 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/11 13:46:11 martin Exp $
 #
 
-DISTNAME=		nut-0.44.2
-PKGNAME=		ups-nut-0.44.2
+DISTNAME=		nut-0.44.3-pre5
+PKGNAME=		ups-nut-0.44.3pre5
 CATEGORIES=		sysutils
-MASTER_SITES=		http://www.exploits.org/nut/release/
+MASTER_SITES=		http://www.exploits.org/nut/testing/0.44.3-pre/
 
-MAINTAINER=		collver@softhome.net
+MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.exploits.org/nut/
 COMMENT=		Network UPS Tools
 
@@ -30,9 +30,10 @@ ADDGROUP=		groupadd
 USERDEL=		userdel
 GROUPDEL=		groupdel
 .endif
-WRKSRC=			${WRKDIR}/nut-0.44.2
+WRKSRC=			${WRKDIR}/nut-0.44.3
 DEINSTALL_FILE=         ${WRKDIR}/DEINSTALL
 INSTALL_FILE=           ${WRKDIR}/INSTALL
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
 
 GNU_CONFIGURE=		yes
 NUT_DOCDIR=		${LOCALBASE}/share/doc/nut
@@ -43,6 +44,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${LOCALBASE}/etc/nut \
 			--with-group=${NUT_GROUP} \
 			--with-statepath=/var/db/nut
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf --force
+
 pre-install:
 	${SED}  -e 's|@NUT_USER@|${NUT_USER}|g' \
 		-e 's|@NUT_GROUP@|${NUT_GROUP}|g' \
@@ -67,8 +71,8 @@ post-install:
 		>${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
-	${INSTALL_DATA_DIR} ${NUT_DOCDIR}
-	${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables
+	@if ! [ -d ${NUT_DOCDIR} ]; then ${MKDIR} ${NUT_DOCDIR}; fi
+	@if ! [ -d ${NUT_DOCDIR}/cables ]; then ${MKDIR} ${NUT_DOCDIR}/cables; fi
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
diff --git a/sysutils/ups-nut/files/md5 b/sysutils/ups-nut/files/md5
index 7bc131b3bdf..8bb828a196c 100644
--- a/sysutils/ups-nut/files/md5
+++ b/sysutils/ups-nut/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+$NetBSD: md5,v 1.2 2001/03/11 13:46:12 martin Exp $
 
-MD5 (nut-0.44.2.tar.gz) = e426128d0a203b6d3dd5f641c2b17fd0
+SHA1 (nut-0.44.3-pre5.tar.gz) = 066d62ec6ebd522aa9b7d0f046856cfb1a34f61a
diff --git a/sysutils/ups-nut/files/patch-sum b/sysutils/ups-nut/files/patch-sum
index 777de4a9839..4d2d379e8cf 100644
--- a/sysutils/ups-nut/files/patch-sum
+++ b/sysutils/ups-nut/files/patch-sum
@@ -1,5 +1,7 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/11 13:46:12 martin Exp $
 
-MD5 (patch-aa) = 335ec6d3e7292bb55e430cf29851ee70
-MD5 (patch-ab) = 23d71e721078f59fd160f58fa71df2fa
-MD5 (patch-ac) = ac889575a472b4284d008637ec746af9
+SHA1 (patch-aa) = 2919c36f928d7b3a22574f8ca0633cd11bb99c70
+SHA1 (patch-ab) = da464964fd63f2c3cb34d06f2d6de9e5c1aa356a
+SHA1 (patch-ac) = 3713ae0f24c70789a85b8636db2864148b09a2b7
+SHA1 (patch-ad) = 2e325eb1a8bd85ef81d265df76e866d8a31a6b57
+SHA1 (patch-ae) = a895fb6f94730db349375b46e4649257cebdcc58
diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa
index b589717dd71..3fa5bbf8ef7 100644
--- a/sysutils/ups-nut/patches/patch-aa
+++ b/sysutils/ups-nut/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/11 13:46:12 martin Exp $
 
 --- Makefile.in.orig	Sat Dec  2 17:18:03 2000
 +++ Makefile.in	Thu Dec 14 13:01:11 2000
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
index 566a22d5d67..dbf2f57da9d 100644
--- a/sysutils/ups-nut/patches/patch-ab
+++ b/sysutils/ups-nut/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/11 13:46:12 martin Exp $
 
---- conf/Makefile.in.orig	Thu Dec 14 13:04:42 2000
-+++ conf/Makefile.in	Thu Dec 14 13:05:27 2000
-@@ -13,17 +13,9 @@
+--- conf/Makefile.in.orig	Sat Mar 10 15:53:30 2001
++++ conf/Makefile.in	Sat Mar 10 15:54:03 2001
+@@ -12,17 +12,9 @@
  
  install:
  	@for f in $(SECFILES) ; do \
--		if [ -f $(CONFPATH)/$$f ]; then \
+-		if (test -f $(CONFPATH)/$$f ); then \
 -			echo "Preserving existing config file: $$f"; \
 -		else \
 -			$(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
@@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
  	done
  
  	@for f in $(PUBFILES) ; do \
--		if [ -f $(CONFPATH)/$$f ]; then \
+-		if (test -f $(CONFPATH)/$$f ); then \
 -			echo "Preserving existing config file: $$f"; \
 -		else \
 -			$(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
diff --git a/sysutils/ups-nut/patches/patch-ac b/sysutils/ups-nut/patches/patch-ac
index 5d0f8f36588..f8f1aca384e 100644
--- a/sysutils/ups-nut/patches/patch-ac
+++ b/sysutils/ups-nut/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+$NetBSD: patch-ac,v 1.2 2001/03/11 13:46:12 martin Exp $
 
 diff -Pur scripts-orig/NetBSD/upsd.sh scripts/NetBSD/upsd.sh
 --- scripts-orig/NetBSD/upsd	Wed Dec 31 16:00:00 1969
diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad
new file mode 100644
index 00000000000..c9d9ddf0b6b
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-ad
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.1 2001/03/11 13:46:12 martin Exp $
+
+--- configure.in.orig	Sat Mar 10 15:32:25 2001
++++ configure.in	Sat Mar 10 15:32:27 2001
+@@ -350,12 +350,16 @@
+ dnl | let's test it for sanity before proceeding.  It's better to      |
+ dnl | catch them here rather than in the program itself at runtime.    |
+ 
+-temp_group=`grep ^$RUN_AS_GROUP: /etc/group`
+-if ( test x"$temp_group" = "x" )
+-then
+-   AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
+-   AC_MSG_ERROR(Restart configure using --with-group and another group name.)
+-fi  
++dnl | NetBSD's pkgsrc setup creates the user and group AFTER the build
++dnl | and BEFORE install.  This gives the configure and build a chance
++dnl | to fail before modifying the group and passwd files.
++dnl
++dnl temp_group=`grep ^$RUN_AS_GROUP: /etc/group`
++dnl if ( test x"$temp_group" = "x" )
++dnl then
++dnl    AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
++dnl    AC_MSG_ERROR(Restart configure using --with-group and another group name.)
++dnl fi  
+ 
+ dnl | All done with group tests.                                       |
+ dnl +------------------------------------------------------------------+
diff --git a/sysutils/ups-nut/patches/patch-ae b/sysutils/ups-nut/patches/patch-ae
new file mode 100644
index 00000000000..d4821a06a1c
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2001/03/11 13:46:12 martin Exp $
+
+--- models/upscommon.c.orig	Tue Feb 27 07:01:46 2001
++++ models/upscommon.c	Sun Mar 11 14:08:48 2001
+@@ -555,11 +555,11 @@
+ #ifdef HAVE_SHMAT
+         test_writeinfo();
+ 
+-/* some systems (NetBSD) don't define SHM_R and SHM_W - they default to it */
++/* some systems (NetBSD) don't define SHM_R and SHM_W */
+ #ifdef SHM_R
+ #define IPC_MODE IPC_CREAT|SHM_R|SHM_W|S_IRGRP|S_IWGRP
+ #else
+-#define IPC_MODE IPC_CREAT
++#define IPC_MODE IPC_CREAT|0700
+ #endif
+         
+ 	if (shmok == 1) {
diff --git a/sysutils/ups-nut/pkg/PLIST b/sysutils/ups-nut/pkg/PLIST
index 680bead6943..f341db18c6f 100644
--- a/sysutils/ups-nut/pkg/PLIST
+++ b/sysutils/ups-nut/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/28 16:06:13 martin Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/11 13:46:12 martin Exp $
 etc/rc.d/upsd
 etc/nut/hosts.conf.sample
 etc/nut/multimon.conf.sample
@@ -37,8 +37,10 @@ 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/design.txt
 share/doc/nut/dummyups.txt
 share/doc/nut/generic-ups.txt
+share/doc/nut/mge-ellipse.txt
 share/doc/nut/new-modules.txt
 share/doc/nut/pager.txt
 share/doc/nut/powercom.txt