Update apcupsd to 3.6.2. Package provided by Greg Woods <woods@weird.com>

in pkg/10552.  Changes from version 3.5.8:

	Network is fully functional under non-threaded compile.
	Possible fix for "pipe_master_status" calls on slaves.
	Added 940-1524C smart signal cable support.

	Added internationalization support. There is _only_ the support but
	no current code is written for the intl package. It can be compiled
	in, but intl strings have still to be translated (to be done in the
	future).

	Added new configuration options to reduce init time of daemon.
	powersc CONFIG
	powersc NAME
	powersc BATTERY

	Fixes a FIFO error

1 files changed, 57 insertions, 69 deletions

diff --git a/sysutils/apcupsd/patches/patch-ae b/sysutils/apcupsd/patches/patch-ae
index 0249bb795b5..1fff35506f7 100644
--- a/sysutils/apcupsd/patches/patch-ae
+++ b/sysutils/apcupsd/patches/patch-ae
@@ -1,73 +1,61 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/01/21 19:15:59 bouyer Exp $
+$NetBSD: patch-ae,v 1.2 2000/08/05 07:31:19 jlam Exp $
 
---- apcserial.c.orig	Wed Apr  7 18:06:41 1999
-+++ apcserial.c	Fri Jan  7 18:54:39 2000
-@@ -59,7 +59,9 @@
+--- configure.in.orig	Thu Jul 29 03:46:32 1999
++++ configure.in	Sat Aug  5 02:52:40 2000
+@@ -17,23 +17,28 @@
+ dnl Check for local host architecture.
+ dnl
+ AC_CANONICAL_HOST		dnl Check for host type.
+-dnl
++
++
++AC_PROG_CC			dnl Determine a C compiler to use.
++AC_LANG_C
++
++dnl Try to get a POSIX.1 environment
++AC_AIX
++AC_MINIX
++AC_ISC_POSIX
++
+ dnl
+ dnl	Check for programs.
+ dnl
+-AC_PROG_CC			dnl Determine a C compiler to use.
+ AC_PROG_CPP			dnl Determine a C pre-processor to use.
+ AC_PROG_CC_C_O			dnl Determine if C compiler support -c -o.
+ AC_PROG_GCC_TRADITIONAL		dnl Determine if ioctl() need -traditional.
+ AC_PROG_INSTALL			dnl Determine a BSD install program.
  
- #include <stdio.h>
- #include <unistd.h>
-+#ifndef __NetBSD__
- #include <getopt.h>
-+#endif /* __NetBSD__ */
- #include <stdlib.h>
- #include <stdarg.h>
- #include <fcntl.h>
-@@ -135,10 +137,10 @@
- 	newtio.c_oflag = 0;                  /* Raw output */
- 	newtio.c_lflag = 0;                  /* No local echo */
+ dnl Now check for programs
+-AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd,
+-				[echo 'ERROR: shutdown program not found !'])
+-AC_PATH_PROGS(RANLIB, ranlib true,
+-				[echo 'ERROR: ranlib program not found !'])
+-AC_PATH_PROGS(WALL, wall,
+-				[echo 'ERROR: wall program not found !'])
++AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd, shutdown, $PATH:/sbin:/usr/sbin)
++AC_PATH_PROGS(RANLIB, ranlib, true)
++AC_PATH_PROGS(WALL, wall, cat)
  
--#ifdef __freebsd__
-+#if defined(__freebsd__) || defined (__NetBSD__)
- 	newtio.c_ispeed = DEFAULT_SPEED;     /* Set input speed */
- 	newtio.c_ospeed = DEFAULT_SPEED;     /* Set output speed */
--#endif /* __freebsd__ */
-+#endif /* __freebsd__  || __NetBSD__ */
+ dnl	Check for libraries.
+ dnl
+@@ -112,6 +117,7 @@
+              
+ AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPTLONG),
+     [EXTRASRC="$EXTRASRC \$(srcdir)/lib/getopt.c \$(srcdir)/lib/getopt1.c"
++     CPPFLAGS="-Ilib"
+      EXTRAOBJ="$EXTRAOBJ lib/getopt.o lib/getopt1.o"])
  
- 	/* w.p. This makes a non.blocking read() with 5 sec. timeout */
- 	newtio.c_cc[VMIN] = 0;
-@@ -195,7 +197,6 @@
- {
- 	char response[32];                                         /* w.p. */
- 	char a;
--	FILE *pwdf;
- 	int errflag = 0;
- 	response[0] = '\0';
- 
-@@ -230,19 +231,6 @@
- 				}
- 			}
- 		}
--		if ((((pwdf = fopen(PWRFAIL, "r" )) == NULL) &&
--		    (ups->mode.type != BK)) ||
--		    (((pwdf = fopen(PWRFAIL, "r" )) == NULL) &&
--		    (ups->LineUp != 0) && (ups->mode.type == BK))) {
--			fprintf(stderr,
--			        "%s: Attempting to kill the power!\n" \
--			        "%s: Nice TRY but not TODAY!\n" \
--			        "%s: Shutdown not called first.\n" \
--			        "%s: Bug found by Tom Kunicki\n",
--			        ups->argvalue, ups->argvalue,
--			        ups->argvalue, ups->argvalue);
--			terminate(0);
--		} else {
- 			errflag=0;                             /* w.p. */
- 			if ((ups->class.type == SHAREMASTER) ||
- 			    (ups->class.type == SHARENETMASTER)) {
-@@ -259,7 +247,6 @@
- 					ups->argvalue);
- 				sleep(15);
- 			}
--			fclose(pwdf);
- 
- 			fprintf(stderr,
- 				"%s: Attempting to kill the power!\n",
-@@ -407,9 +394,7 @@
- 				}
- 			}
- 			/* w.p. */
--			sleep(10);
- 			terminate(0);
--		}
- 	} else {
- 		if (ups->mode.type <= SHAREBASIC) {
- 			switch(ups->cable.type) {
+ dnl
+@@ -172,11 +178,6 @@
+ AC_SYS_LONG_FILE_NAMES		dnl Check for long file names.
+ AC_SYS_RESTARTABLE_SYSCALLS	dnl Check interrupted syscalls will restart.
+ dnl
+-dnl
+-dnl UNIX variants
+-AC_AIX				dnl Check for aix.
+-AC_ISC_POSIX			dnl Check for isc.
+-AC_MINIX			dnl Check for minix.
+ dnl
+ dnl
+ dnl	Check for enable particular features.