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.

5 files changed, 53 insertions, 8 deletions

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) {