Update to ups-nut 1.4.1.

Many changes, including
    *	various configuation file format changes
    *	most UPS drivers enhanced
    *	upsmon/upssched support a lockfile
    *	chroot jails supported
    *	various bugfixes
(Refer to http://random.networkupstools.org/source/1.4/new-1.4.1.txt
for more information)

pkg update based on work sent in private email by Daniel Farrugia,
with various fixes by me.

6 files changed, 13 insertions, 101 deletions

diff --git a/sysutils/ups-nut/patches/patch-aa b/sysutils/ups-nut/patches/patch-aa
new file mode 100644
index 00000000000..af24a1f1874
--- /dev/null
+++ b/sysutils/ups-nut/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.9 2004/02/15 13:14:25 lukem Exp $
+
+--- conf/Makefile.in.orig	Tue Sep  3 09:23:02 2002
++++ conf/Makefile.in	Sat Feb 14 22:02:46 2004
+@@ -4,7 +4,7 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ 
+-CONFPATH	= $(DESTDIR)@sysconfdir@
++CONFPATH	= $(DESTDIR)@prefix@/share/examples/nut
+ 
+ INSTALLCMD  = @INSTALL@
+ 
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
deleted file mode 100644
index fae3f6877c5..00000000000
--- a/sysutils/ups-nut/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/12/13 04:23:19 lukem Exp $
-
---- conf/Makefile.in.orig	Tue Sep  3 17:23:02 2002
-+++ conf/Makefile.in
-@@ -4,7 +4,7 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- 
--CONFPATH	= $(DESTDIR)@sysconfdir@
-+CONFPATH	= $(DESTDIR)@datadir@/examples/nut
- 
- INSTALLCMD  = @INSTALL@
- 
diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad
deleted file mode 100644
index 36eb479226c..00000000000
--- a/sysutils/ups-nut/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/12/13 04:23:19 lukem Exp $
-
---- configure.in.orig	Mon Dec  2 23:08:46 2002
-+++ configure.in
-@@ -526,13 +526,17 @@
- 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.    |
- 
--grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
--if (test "$?" = "1")
--then
--	# not found, fatal error
--	AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
--	AC_MSG_WARN(You might want to rerun 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 grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
-+dnl if (test "$?" = "1")
-+dnl then
-+dnl 	# not found, fatal error
-+dnl 	AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
-+dnl 	AC_MSG_WARN(You might want to rerun 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-af b/sysutils/ups-nut/patches/patch-af
deleted file mode 100644
index 9936162ecec..00000000000
--- a/sysutils/ups-nut/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/12/31 22:47:06 lukem Exp $
-
---- drivers/newapc.c.orig	Mon Oct  7 14:35:35 2002
-+++ drivers/newapc.c
-@@ -182,11 +182,16 @@ char * convert_ups2info (struct apc_cmdt
- 	case APC_F_CELCIUS:
- 	case APC_F_HEX:
- 	case APC_F_DEC:
--	case APC_F_SECONDS:
--	case APC_F_HOURS:
- 	case APC_F_LEAVE:
- 				/* All of these just pass through at present */
- 		ptr = upsval;
-+		break;
-+	case APC_F_SECONDS:
-+	case APC_F_HOURS:
-+				/* Parse number */
-+		tval = strtol(upsval, NULL, 10);
-+		sprintf(tmp, "%d", tval);
-+		ptr = tmp;
- 		break;
- 	case APC_F_MINUTES:
- 		/* Convert to seconds - NUT standard time measurement */
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
deleted file mode 100644
index d769060b17e..00000000000
--- a/sysutils/ups-nut/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2002/12/31 22:47:07 lukem Exp $
-
---- drivers/newapc.h.orig	Tue Aug 20 17:06:26 2002
-+++ drivers/newapc.h
-@@ -119,7 +119,7 @@ struct apc_cmdtab_t {
- 	{INFO_MINUTIL,	0, 0,		APC_POLL|APC_F_VOLT,	NULL, NULL,	'N'},
- 	{INFO_OUTVOLT,	0, 0,		APC_POLL|APC_F_VOLT,	NULL, NULL,	'O'},
- 	{INFO_SLFTSTRES,0, 0,		APC_POLL,     		NULL, NULL,	'X'},
--	{INFO_BATT_RUNTIME,0, 0,	APC_POLL|APC_F_MINUTES,	NULL, NULL,	'j'},
-+	{INFO_RUNTIME,	0, 0,		APC_POLL|APC_F_SECONDS,	NULL, NULL,	'j'},
- 	{INFO_MFRDATE,	0, 0,		0,			NULL, NULL,	'm'},
- 	{INFO_TEMPMAX,	0, 0,		APC_F_CELCIUS,		NULL, NULL,	'['},
- 	{INFO_TEMPMIN,	0, 0,		APC_F_CELCIUS,		NULL, NULL,	']'},
diff --git a/sysutils/ups-nut/patches/patch-ah b/sysutils/ups-nut/patches/patch-ah
deleted file mode 100644
index 7702461f310..00000000000
--- a/sysutils/ups-nut/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/12/13 04:23:20 lukem Exp $
-
---- configure.orig	Mon Dec  2 23:08:51 2002
-+++ configure
-@@ -4741,18 +4741,6 @@
- 
- fi;
- 
--
--grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
--if (test "$?" = "1")
--then
--	# not found, fatal error
--	{ echo "$as_me:$LINENO: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&5
--echo "$as_me: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&2;}
--	{ echo "$as_me:$LINENO: WARNING: You might want to rerun configure using --with-group and another group name." >&5
--echo "$as_me: WARNING: You might want to rerun configure using --with-group and another group name." >&2;}
--fi
--
--
- echo "$as_me:$LINENO: checking facility for syslog" >&5
- echo $ECHO_N "checking facility for syslog... $ECHO_C" >&6
-