diff options
| author | bouyer <bouyer@pkgsrc.org> | 2002-12-01 22:32:25 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2002-12-01 22:32:25 +0000 |
| commit | 9d1c4a507ac33cbdb1ce32fff83b57cfa81a2135 (patch) | |
| tree | 4d57095402e9e099385c35b25504168d2956784b /sysutils/apcupsd | |
| parent | 215a13281c7310c8fd884357ab55e2fa002e88d0 (diff) | |
| download | pkgsrc-9d1c4a507ac33cbdb1ce32fff83b57cfa81a2135.tar.gz | |
Update to 3.8.5. Summary of changes since 3.6.2:
. New network interface to publish to clients the UPS status
. New master/server network code that is more fault tolerant
. Internationalization
. Use GNU getopt
. Logging on syslog
. Events logged in a file like APC's PowerChute
. Sync code removed: now only async processes are used
. Updated documentation (HTTP version)
. Bug fixes and enhancements: too many to tell them all
. no more powersc script, is has been remplaced with apccontrol
. In master/slave configurations, all masters and slaves
must be updated at the same time. Version 3.8.0 is not
compatible with versions prior to 3.8.0-pre4.
. Support for the Back-UPS Office series of UPSes
. Fixed dumb UPSes working with the Custom Simple cable.
. Correction of a buffer overflow on certain newer UPSes.
. More fault tolerant on startup in master/slave configuration.
. Additional STATUS variables (number of times on battery,
amount of time on batteries, time/date of last transfer to
batteries, apcupsd start time/date).
. apctest program for testing serial ports.
. Automatic notification of certain events by email.
. Detects Self Test and reports it as such rather than a
Power Failure.
. For SmartUPSes, apcupsd does a much better job of adapting
to the actual features of the UPS and is more efficient.
. Add Battery Runtime Calibration to apctest
. UPSNAME now sets upsname if given. Otherwise, apcupsd attempts to get name
from UPS, if not found, uses hostname, finally "default".
. Added Ambient Temperature and Humidity to multimon (Carl Erhorn)
A number of the configuration statements have changed since versions 3.6.2.
You should either take the new apcupsd.conf file and modify it, or update your
existing file. In general, we recommend starting with the new file.
If you have used a prior version of apcupsd, the CONTROL script file
(/sbin/powersc) has now been replaced by $SYSCONFDIR/apcupsd/apccontrol.
Consequently, the CONTROL configuration statement is obsolete. The following
configuration statements have been replaced by scripts called from
SYSCONDFIR/apcupsd/apccontrol, and thus are obsolete:
BATTCMD, LIMITCMN, LOADCMD, PWRCMD, REBOOTCMD, REMOTECMD, RETCMD, and TIMECMD.
If you use the master/slave networking code, please be aware that the
Diffstat (limited to 'sysutils/apcupsd')
| -rw-r--r-- | sysutils/apcupsd/MESSAGE | 5 | ||||
| -rw-r--r-- | sysutils/apcupsd/Makefile | 84 | ||||
| -rw-r--r-- | sysutils/apcupsd/PLIST | 80 | ||||
| -rw-r--r-- | sysutils/apcupsd/distinfo | 29 | ||||
| -rw-r--r-- | sysutils/apcupsd/files/apcupsd | 43 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-aa | 172 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ab | 77 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ac | 46 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ad | 165 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ae | 78 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-af | 131 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ag | 63 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ah | 18 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ai | 20 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-aj | 2700 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ak | 36 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-al | 13 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-am | 13 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-an | 13 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ao | 13 | ||||
| -rw-r--r-- | sysutils/apcupsd/patches/patch-ap | 13 |
21 files changed, 2973 insertions, 839 deletions
diff --git a/sysutils/apcupsd/MESSAGE b/sysutils/apcupsd/MESSAGE index 932917be4a2..8099dbdcb36 100644 --- a/sysutils/apcupsd/MESSAGE +++ b/sysutils/apcupsd/MESSAGE @@ -1,8 +1,11 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2001/10/31 22:52:51 zuntum Exp $ +$NetBSD: MESSAGE,v 1.2 2002/12/01 22:32:25 bouyer Exp $ NOTE: With most APC cables you must put a "local" flag in /etc/ttys for the port you connect your UPS to, and run "ttyflags -a" to turn it on the first time. +for complete documentation, see the html docs in +file://${PREFIX}/share/doc/html/apcupsd + =========================================================================== diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index c07648b8715..0718836ccc5 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2002/10/23 10:44:38 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2002/12/01 22:32:25 bouyer Exp $ -DISTNAME= apcupsd-3.6.2 +DISTNAME= apcupsd-3.8.5 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.oasi.gpa.it/pub/apcupsd/stable/tar/ @@ -15,6 +15,8 @@ USE_GMAKE= # defined GNU_CONFIGURE= # defined +PKG_SYSCONFSUBDIR= apcupsd + # Thread support is needed to for http support, and to compile powerflute, # which has a curses interface # @@ -25,38 +27,88 @@ GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-catgets # use catgets functions CONFIGURE_ARGS+= --enable-nls # i18n support +CONFIGURE_ARGS+= --with-lock-dir=/var/spool/lock +CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01 +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +# configure sets sbindir to '${prefix}/sbin' without expanding $prefix +# this breaks .in files that uses @sbindir@ +CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin + +EGDIR= ${PREFIX}/share/examples/apcupsd + +CONF_FILES_PERMS+= ${EGDIR}/apcupsd.master.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${ROOT_USER} ${ROOT_GROUP} 644 +CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${ROOT_USER} ${ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${ROOT_USER} ${ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${ROOT_USER} ${ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${ROOT_USER} ${ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/mainsback ${PKG_SYSCONFDIR}/mainsback ${ROOT_USER} ${ROOT_GROUP} 755 +SUPPORT_FILES_PERMS= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755 +RCD_SCRIPTS= apcupsd + # we should probably allow the tty to be set in /etc/mk.conf too # post-build: - ${SED} -e 's|@@PREFIX@@|${PREFIX}|' ${WRKSRC}/examples/apcupsd.conf > \ - ${WRKDIR}/apcupsd.conf - ${SED} -e 's|@@PREFIX@@|${PREFIX}|' ${FILESDIR}/apcupsd > \ - ${WRKDIR}/apcupsd - ${SED} -e 's|@@PREFIX@@|${PREFIX}|' ${WRKSRC}/doc/apcupsd.man > \ - ${WRKSRC}/doc/apcupsd.8 - -DOCS= README.BackUPS-Pro \ - README.NEW \ + ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \ + ${WRKSRC}/examples/apcupsd.master.conf > \ + ${WRKDIR}/apcupsd.master.conf + ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \ + ${WRKSRC}/examples/apcupsd.slave.conf > \ + ${WRKDIR}/apcupsd.slave.conf + ${SED} -e 's|@@PREFIX@@|${PREFIX}|'\ + -e 's|@@SYSCONFDIR@@|${PKG_SYSCONFDIR}|' \ + ${WRKSRC}/doc/apcupsd.man > ${WRKSRC}/doc/apcupsd.8 + +DOCS= README.BackUPS \ + README.BackUPS-Pro \ README.NewerBackUPS-Pro \ README.Share-UPS \ README.SmartUPS-VS \ README.apcaccess \ README.autoconfig \ README.cable \ - README.developers \ Statement.APCC \ - minicom.apcupsd \ + apcupsd-bug-1 \ + apcupsd-bug-2 \ + minicom.txt \ port.gif +HTMLDOCS= apcaccess.html apcnisd.html apctest.html apcupsd-styles.css \ + apcupsd.book apcupsd.gif apcupsd.html batteries.html bugs.html \ + cables.html cgiprogs.html charging.gif config-examples.html \ + configure.html data.html eprom.html events.html faq.html index.html \ + install.html invoking.html kernel_config.html license.html \ + logging.html master-slave.html multiUPS.html multimon.gif \ + new_features_3_7_0.html new_features_3_8_0.html \ + new_features_3_8_1.html new_features_3_8_2.html \ + new_features_3_8_3.html new_features_3_8_4.html \ + new_features_3_8_5.html oldversions.html onbatt.gif online.gif \ + security.html shutdown.html status.gif status.html stopping.html \ + testing.html thanks.gif thanks.html troubles.html \ + upgrading_to_3_7_0.html upsbible.html usb.html win32.html \ + wininstall1.gif wininstall2.gif wininstall3.gif wininstall4.gif \ + wininstall5.gif wininstall6.gif wininstall7.gif + + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples - ${INSTALL_DATA} ${WRKDIR}/apcupsd.conf ${PREFIX}/share/examples - ${INSTALL_SCRIPT} ${WRKDIR}/apcupsd ${PREFIX}/etc/rc.d + ${INSTALL_DATA} ${WRKDIR}/apcupsd.master.conf \ + ${PREFIX}/share/examples/apcupsd + ${INSTALL_DATA} ${WRKDIR}/apcupsd.slave.conf \ + ${PREFIX}/share/examples/apcupsd + ${INSTALL_SCRIPT} ${WRKSRC}/distributions/netbsd/apcupsd \ + ${PREFIX}/etc/rc.d ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apcupsd .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/apcupsd .endfor + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/apcupsd +.for file in ${HTMLDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \ + ${PREFIX}/share/doc/html/apcupsd +.endfor + .include "../../devel/gettext-lib/buildlink2.mk" + +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST index 4de932d6e0d..6fcc96a486f 100644 --- a/sysutils/apcupsd/PLIST +++ b/sysutils/apcupsd/PLIST @@ -1,21 +1,89 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:51 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/12/01 22:32:25 bouyer Exp $ sbin/apcaccess +sbin/apcnisd +sbin/apctest sbin/apcupsd -sbin/powersc etc/rc.d/apcupsd man/man8/apcupsd.8 +share/doc/apcupsd/README.BackUPS share/doc/apcupsd/README.BackUPS-Pro -share/doc/apcupsd/README.NEW share/doc/apcupsd/README.NewerBackUPS-Pro share/doc/apcupsd/README.Share-UPS share/doc/apcupsd/README.SmartUPS-VS share/doc/apcupsd/README.apcaccess share/doc/apcupsd/README.autoconfig share/doc/apcupsd/README.cable -share/doc/apcupsd/README.developers share/doc/apcupsd/Statement.APCC -share/doc/apcupsd/minicom.apcupsd +share/doc/apcupsd/apcupsd-bug-1 +share/doc/apcupsd/apcupsd-bug-2 +share/doc/apcupsd/minicom.txt share/doc/apcupsd/port.gif -share/examples/apcupsd.conf +share/doc/html/apcupsd/apcaccess.html +share/doc/html/apcupsd/apcnisd.html +share/doc/html/apcupsd/apctest.html +share/doc/html/apcupsd/apcupsd-styles.css +share/doc/html/apcupsd/apcupsd.book +share/doc/html/apcupsd/apcupsd.gif +share/doc/html/apcupsd/apcupsd.html +share/doc/html/apcupsd/batteries.html +share/doc/html/apcupsd/bugs.html +share/doc/html/apcupsd/cables.html +share/doc/html/apcupsd/cgiprogs.html +share/doc/html/apcupsd/charging.gif +share/doc/html/apcupsd/config-examples.html +share/doc/html/apcupsd/configure.html +share/doc/html/apcupsd/data.html +share/doc/html/apcupsd/eprom.html +share/doc/html/apcupsd/events.html +share/doc/html/apcupsd/faq.html +share/doc/html/apcupsd/index.html +share/doc/html/apcupsd/install.html +share/doc/html/apcupsd/invoking.html +share/doc/html/apcupsd/kernel_config.html +share/doc/html/apcupsd/license.html +share/doc/html/apcupsd/logging.html +share/doc/html/apcupsd/master-slave.html +share/doc/html/apcupsd/multiUPS.html +share/doc/html/apcupsd/multimon.gif +share/doc/html/apcupsd/new_features_3_7_0.html +share/doc/html/apcupsd/new_features_3_8_0.html +share/doc/html/apcupsd/new_features_3_8_1.html +share/doc/html/apcupsd/new_features_3_8_2.html +share/doc/html/apcupsd/new_features_3_8_3.html +share/doc/html/apcupsd/new_features_3_8_4.html +share/doc/html/apcupsd/new_features_3_8_5.html +share/doc/html/apcupsd/oldversions.html +share/doc/html/apcupsd/onbatt.gif +share/doc/html/apcupsd/online.gif +share/doc/html/apcupsd/security.html +share/doc/html/apcupsd/shutdown.html +share/doc/html/apcupsd/status.gif +share/doc/html/apcupsd/status.html +share/doc/html/apcupsd/stopping.html +share/doc/html/apcupsd/testing.html +share/doc/html/apcupsd/thanks.gif +share/doc/html/apcupsd/thanks.html +share/doc/html/apcupsd/troubles.html +share/doc/html/apcupsd/upgrading_to_3_7_0.html +share/doc/html/apcupsd/upsbible.html +share/doc/html/apcupsd/usb.html +share/doc/html/apcupsd/win32.html +share/doc/html/apcupsd/wininstall1.gif +share/doc/html/apcupsd/wininstall2.gif +share/doc/html/apcupsd/wininstall3.gif +share/doc/html/apcupsd/wininstall4.gif +share/doc/html/apcupsd/wininstall5.gif +share/doc/html/apcupsd/wininstall6.gif +share/doc/html/apcupsd/wininstall7.gif +share/examples/apcupsd/apcupsd.master.conf +share/examples/apcupsd/apcupsd.slave.conf +share/examples/apcupsd/apccontrol +share/examples/apcupsd/changeme +share/examples/apcupsd/commfailure +share/examples/apcupsd/commok +share/examples/apcupsd/onbattery +share/examples/apcupsd/mainsback share/locale/it/LC_MESSAGES/apcupsd.mo @dirrm share/doc/apcupsd +@dirrm share/doc/html/apcupsd +@dirrm share/examples/apcupsd diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo index 37fce9cd0fd..862da9f08a8 100644 --- a/sysutils/apcupsd/distinfo +++ b/sysutils/apcupsd/distinfo @@ -1,14 +1,17 @@ -$NetBSD: distinfo,v 1.4 2002/10/02 22:20:49 dillo Exp $ +$NetBSD: distinfo,v 1.5 2002/12/01 22:32:25 bouyer Exp $ -SHA1 (apcupsd-3.6.2.tar.gz) = bcf605bed09cdc55be30eed4f92e0a831767e62b -Size (apcupsd-3.6.2.tar.gz) = 282646 bytes -SHA1 (patch-aa) = 817e325217a68e866661b5617225aea7f1b0eac1 -SHA1 (patch-ab) = b098f80ef14e1be4aa4943a125eb79c5629bf352 -SHA1 (patch-ac) = c2de47eabb3add67b6578d26c5edb9c2301c3f44 -SHA1 (patch-ad) = 0b985a29e7cc629f1a6cf5983abc4e8e3f61c36f -SHA1 (patch-ae) = a22f3192a5c5e7b7cc7a8b4b2172d13efb0927ae -SHA1 (patch-af) = ef5f972889afe7677517c760cc4662e46d371bb5 -SHA1 (patch-ag) = 6027f9738223bc1f1429d678771940bd286fe85c -SHA1 (patch-ah) = 773ae6b982c9f1d49880c564784b5ae22c09bcfc -SHA1 (patch-ai) = 4cd39832027ea5fb22c9a650da09a7104c018fd7 -SHA1 (patch-aj) = 49c7ede1fc41c080991d82f52b45a01ccf3aaf4b +SHA1 (apcupsd-3.8.5.tar.gz) = 4cdbb38d51c0cc6639533cb922ad4cdc10f5bb92 +Size (apcupsd-3.8.5.tar.gz) = 1979485 bytes +SHA1 (patch-aa) = 1b8e48b25be9ef1787a4f27a5a228088807a4a26 +SHA1 (patch-ab) = cbca60f56412513a2141f24a711affbef06c1299 +SHA1 (patch-ac) = f153727711fde0b3ea71b30a258d8d5e7b2472bb +SHA1 (patch-ad) = 3411f109aa98799c686bd20cb5bce515a150dcbe +SHA1 (patch-ae) = 230f307753c643944e66c8ab68129a9ec2581bce +SHA1 (patch-af) = 82eebc194a45aeccd707370f52a0bebff4ea32b1 +SHA1 (patch-aj) = f6bb21d0ebc95501c3a5ea32f2bd7d9c500f68ef +SHA1 (patch-ak) = 754803ca43d7f7d6d7a044f898e60f4246a1e54d +SHA1 (patch-al) = 12b03c8426fd157946d2f41656f91b851d83d915 +SHA1 (patch-am) = acea61182b599f058bbdda439c221b1f84c7ca04 +SHA1 (patch-an) = 87b508441d8c1053cace47375a605c75e65aaa03 +SHA1 (patch-ao) = 81d92529336d9bbaf87e876cf1ee130ea90e71eb +SHA1 (patch-ap) = 288f8d4d358a33f12771a2e1dac041d690f7da25 diff --git a/sysutils/apcupsd/files/apcupsd b/sysutils/apcupsd/files/apcupsd deleted file mode 100644 index 8665a16d4f1..00000000000 --- a/sysutils/apcupsd/files/apcupsd +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# -# $NetBSD: apcupsd,v 1.2 2000/10/07 16:19:17 mason Exp $ -# -# PROVIDE: apcupsd -# REQUIRE: DAEMON - -name="apcupsd" -command="@@PREFIX@@/sbin/powersc" -pidfile="/var/run/${name}.pid" - -cmd=${1:-start} - -case ${cmd} in -start) - if [ -x ${command} ]; then - echo "Starting ${name}." - ${command} INIT - fi - ;; -stop) - if [ -f ${pidfile} ]; then - pid=`head 1 ${pidfile}` - echo "Stopping ${name}." - ${command} STOP - fi - ;; -restart) - if [ -x ${command} ]; then - echo "Restarting ${name}." - ${command} RESTARTME - fi - ;; -status) - if [ -f ${pidfile} ]; then - pid=`head -1 ${pidfile}` - echo "${name} is running as pid ${pid}." - else - echo "${name} is not running." - fi - ;; -esac -exit 0 diff --git a/sysutils/apcupsd/patches/patch-aa b/sysutils/apcupsd/patches/patch-aa index 49be3e0d3af..6d29b2e2302 100644 --- a/sysutils/apcupsd/patches/patch-aa +++ b/sysutils/apcupsd/patches/patch-aa @@ -1,52 +1,93 @@ -$NetBSD: patch-aa,v 1.2 2000/08/05 07:31:17 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/12/01 22:32:26 bouyer Exp $ ---- doc/apcupsd.man.orig Thu Jul 29 03:46:32 1999 -+++ doc/apcupsd.man Sat Aug 5 02:52:40 2000 -@@ -8,13 +8,13 @@ +--- doc/apcupsd.man.orig Fri Feb 2 23:46:33 2001 ++++ doc/apcupsd.man Sun Dec 1 13:13:59 2002 +@@ -4,19 +4,19 @@ + .\" LP paragraph + .\" IP indented paragraph + .\" TP hanging label +-.TH apcupsd 8 "APC UPS management under Linux -- November 1999" ++.TH apcupsd 8 "APC UPS management under Unix -- November 1999" .SH NAME - apcupsd \- daemon for Most APCC's UPS support under Linux +-apcupsd \- daemon for most APC's UPS for Linux ++apcupsd \- daemon for most APC's UPS for Unix .SH SYNOPSIS -.B /sbin/apcupsd +.B @@PREFIX@@/sbin/apcupsd .br --.B /sbin/powersc -+.B @@PREFIX@@/sbin/powersc +-.B /etc/apcupsd/apccontrol ++.B @@SYSCONFDIR@@/apccontrol .br - .B /etc/apcupsd.conf +-.B /etc/apcupsd/apcupsd.conf ++.B @@SYSCONFDIR@@/apcupsd.conf .br -.B /sbin/apcaccess -+.B @@PREFIX@@/bin/apcaccess ++.B @@PREFIX@@/sbin/apcaccess + .br +-.B /sbin/apcnetd ++.B @@PREFIX@@/sbin/apcnetd + .br .SH DESCRIPTION .LP - This daemon can be used for controlling the APC SmartUPS. During a power -@@ -23,7 +23,7 @@ - about this fact. If power is not restored, a system shutdown will follow - when the battery is exausted, a timeout (seconds) expires, or runtime - minutes based on internal values based on power consumption rates. The --whole shutdown is now made by script calls to the "/sbin/powersc" -+whole shutdown is now made by script calls to the "@@PREFIX@@/sbin/powersc" - file called by "apcupsd", so no changes in the inittab are necessary. - There is now no communication between "apcupsd" and init(1) process. - .LP -@@ -46,7 +46,7 @@ +@@ -29,7 +29,7 @@ + above shutdown conditions is met, "apcupsd" will inform users about this + fact. + +-The shutdown is made by script calls to "/etc/apcupsd/apccontrol", which ++The shutdown is made by script calls to "@@SYSCONFDIR@@/apccontrol", which + is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary. + There is no communication between "apcupsd" and init(1) process. + Apcupsd modifies the halt script so that at the end of the shutdown +@@ -50,22 +50,18 @@ + has a network connection with the slaves and sends them information + about the UPS status. + +-.LP +-RedHat and S.u.S.E. versions of Linux have direct install support. All +-other "FLAVORS" of Linux will need some fussing with to get the install +-correct. + .SH OPTIONS + .TP + .B \-c --configure + Attempts to configure the UPS EPROM to the values specified in the +-configuration file "/etc/apcupsd/apcupsd.conf". ++configuration file "@@SYSCONFDIR@@/apcupsd.conf". + .TP + .B \-d --debug <level> + Turns on debugging output for a NETSLAVE or a NETMASTER. + .TP + .B \-f --config-file <file> + Specifies the location of the configuration file. The default +-is: /etc/apcupsd/apcupsd.conf ++is: @@SYSCONFDIR@@/apcupsd.conf + .TP + .B \-k --killpower + Attempt to turn the UPS off. This option is normally only +@@ -74,7 +70,7 @@ + .TP + .B \-n --rename-ups + Attempts to change the UPS name stored in the UPS EPROM +-to that specified in your "/etc/apcupsd/apcupsd.conf" file. ++to that specified in your "@@SYSCONFDIR@@/apcupsd.conf" file. + .TP + .B \-u --update-battery-date + Attempts to update the battery date stored in the UPS EPROM. Normally +@@ -88,12 +84,12 @@ + .SH CONFIGURATION - It is necessary to write configuration info to the file "/etc/apcupsd.conf". - This file is a plain ASCII file and you can use your favorite editor for --configuration. For simple configuration, see enclosed sample file. -+configuration. For simple configuration, see sample file in @@PREFIX@@/etc + It may be necessary to change the configuration information in the file +-"/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your ++"@@SYSCONFDIR@@/apcupsd.conf" to meet your needs and to correspond to your + configuration. This file is a plain ASCII file and you can use your + favorite editor to change it. .LP Configuration commands in - .B /etc/apcupsd.conf -@@ -54,7 +54,7 @@ - .LP - .B CONTROL - -- <path|filename> --.B /sbin/powersc -+.B @@PREFIX@@/sbin/powersc - .br - Name of control script called by "apcupsd". +-.B /etc/apcupsd/apcupsd.conf ++.B @@SYSCONFDIR@@/apcupsd.conf + are: + .LP -@@ -121,7 +121,7 @@ +@@ -131,7 +127,7 @@ -- <name of serial port> .br Please specify which device is used for UPS communication. @@ -55,48 +96,31 @@ $NetBSD: patch-aa,v 1.2 2000/08/05 07:31:17 jlam Exp $ .LP .B LOCKFILE -- <path to lockfile> -@@ -163,7 +163,7 @@ - -- <time in seconds> - .br - Please specify time in seconds for "apcupsd" to update the psuedo --proc fs file "/etc/apcupsd.status". This rate is reset if there is -+proc fs file "/var/run/apcupsd.status". This rate is reset if there is - a power state change. - .LP - This will be replaced with "apcaccess 'status'" calls. This will prevent -@@ -173,7 +173,7 @@ - -- <time in seconds> - .br - Please specify time in seconds for "apcupsd" to update the log file --"/var/log/apcupsd.log". This rate is reset if there is a power state change. -+"/var/log/apcupsd". This rate is reset if there is a power state change. +@@ -615,13 +611,13 @@ .br - Future additions will allow one to select the location of the logfile. - .LP -@@ -487,14 +487,14 @@ - .B /etc/apcupsd.conf + 940-0023A Simple Signal UNIX, [BROKEN STILL]. + .SH FILES +-.B /etc/apcupsd/apcupsd.conf ++.B @@SYSCONFDIR@@/apcupsd.conf - configuration file. .br --.B /etc/apcupsd.status +-.B /etc/apcupsd/apcupsd.status +.B /var/run/apcupsd.status - - psuedo procfs-type file. - .br --.B /var/log/apcupsd.log -+.B /var/log/apcupsd - - the UPS status is logged. - .SH FILE FORMAT - .br --Both "apcupsd.log" and "apcupsd.status" are simple ascii files with -+Both "apcupsd" and "apcupsd.status" are simple ascii files with - several floating point numbers on one line. The format varies based - on the type of UPS that you are using. - .LP -@@ -570,7 +570,7 @@ - .br - BATTSTAT : BatteryStatus - .LP --.B /var/log/apcupsd.log -+.B /var/log/apcupsd - .br - .B SmartUPS and MatrixUPS Smart Signals + - STATUS file .br +-.B /etc/apcupsd/apcupsd.events ++.B /var/log/apcupsd.events + - where up to the last 50 events are stored + for the network information server. + .SH EVENTS +@@ -630,8 +626,8 @@ + ... + + These events are sent to the system log, optionally sent +-to the temporary events file (/etc/apcupsd/apcupsd.events), +-and they also generate a call to /etc/apcupsd/apccontrol ++to the temporary events file (/var/run/apcupsd.events), ++and they also generate a call to @@SYSCONFDIR@@/apccontrol + which in turn will call any scripts you have placed in the + /etc/apcupsd directory. + diff --git a/sysutils/apcupsd/patches/patch-ab b/sysutils/apcupsd/patches/patch-ab index fe1c5b97853..34f83275120 100644 --- a/sysutils/apcupsd/patches/patch-ab +++ b/sysutils/apcupsd/patches/patch-ab @@ -1,39 +1,64 @@ -$NetBSD: patch-ab,v 1.2 2000/08/05 07:31:18 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2002/12/01 22:32:27 bouyer Exp $ ---- examples/apcupsd.conf.orig Wed May 26 12:22:25 1999 -+++ examples/apcupsd.conf Sat Aug 5 02:52:40 2000 -@@ -3,7 +3,7 @@ - # "apcupsd" POSIX config file - # - # CONTROL <string> --CONTROL /sbin/powersc -+CONTROL @@PREFIX@@/sbin/powersc - # - # UPSCABLE [ simple | smart | - # 940-00(20B,23A,24B,24C,24G,95A,95C) | -@@ -26,10 +26,10 @@ - UPSMODE disable +--- examples/apcupsd.master.conf.orig Sun Dec 1 13:17:57 2002 ++++ examples/apcupsd.master.conf Sun Dec 1 13:20:07 2002 +@@ -33,11 +33,11 @@ # #DEVICE <string> /dev/<serial port> + # name of your serial port -DEVICE /dev/ttyS0 +DEVICE /dev/tty01 # #LOCKFILE <path to lockfile> + # path for serial port lock file -LOCKFILE /var/lock +LOCKFILE /var/spool/lock # - #ACCESS <string> [ true | false ] Enable Access Support - ACCESS true -@@ -44,10 +44,10 @@ - NOLOGON timeout # - # PROCFS <int> <120> <0> disables <update rate procfs-type of current status> --PROCFS 0 -+PROCFS 60 # - # LOGGING <int> <500> <0> disables <rate update log file of current status> --LOGGING 0 -+LOGGING 60 +@@ -80,7 +80,7 @@ + # information server. If netstatus is on, a network information + # server process will be started for serving the STATUS and + # EVENT data over the network (used by CGI programs). +-NETSERVER on ++NETSERVER off + # + # SERVERPORT <port> default is 7000 + # port to use for sending STATUS and EVENTS data over the network. +@@ -91,7 +91,7 @@ + # + # If you want the last few EVENTS to be available over the network + # by the network information server, you must define an EVENTSFILE. +-EVENTSFILE /etc/apcupsd/apcupsd.events ++EVENTSFILE /var/log/apcupsd.events + # + # + # +@@ -102,7 +102,7 @@ + STATTIME 0 + # + # STATFILE +-STATFILE /etc/apcupsd/apcupsd.status ++STATFILE /var/run/apcupsd.status + # + # + # LOGSTATS [ on | off ] on enables, off disables +@@ -134,15 +134,15 @@ + # + # UPSCLASS [ standalone | shareslave | sharemaster | netslave | netmaster ] + # normally standalone unless you share a UPS with multiple machines. +-UPSCLASS netmaster ++UPSCLASS standalone + # + # Unless you want to share the UPS (power multiple machines). + # this should be disable + # UPSMODE [ disable | share | net | sharenet ] +-UPSMODE net ++UPSMODE disable + # + #NETACCESS <string> [ true | false ] Enable Network Access Support +-NETACCESS true ++NETACCESS false # - # TIMEOUT <time is seconds to run on UPS, powerfails> - TIMEOUT 900 + # NETTIME <int> + NETTIME 10 diff --git a/sysutils/apcupsd/patches/patch-ac b/sysutils/apcupsd/patches/patch-ac index 91500504fce..6562d08c7df 100644 --- a/sysutils/apcupsd/patches/patch-ac +++ b/sysutils/apcupsd/patches/patch-ac @@ -1,35 +1,13 @@ -$NetBSD: patch-ac,v 1.2 2000/08/05 07:31:18 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2002/12/01 22:32:27 bouyer Exp $ ---- include/apc_defines.h.orig Thu Jul 29 04:47:46 1999 -+++ include/apc_defines.h Sat Aug 5 02:52:40 2000 -@@ -68,6 +68,12 @@ - #define PWRFAIL "/var/run/powerfail" - #endif /* __freebsd__ */ - -+#ifdef __NetBSD__ -+# define APCCONF "/etc/apcupsd.conf" -+# define UPS_STAT "/var/run/apcupsd.status" -+# define PWRFAIL "/var/run/powerfail" -+#endif /* __NetBSD__ */ -+ - #ifndef APCCONF - #define APCCONF "/etc/apcupsd.conf" - #endif -@@ -82,7 +88,7 @@ - - #define NOLOGIN "/etc/nologin" - #define APCPID "/var/run/apcupsd.pid" --#define LOG_FILE "/var/log/apcupsd.log" -+#define LOG_FILE "/var/log/apcupsd" - - #if USE_TMP_DIRECTORY - #define APC_RE_NET "/tmp/apcupsd.re-net" -@@ -91,7 +97,7 @@ - #endif /* USE_TMP_DIRECTORY */ - - #define APC_LOCK_PREFIX "/LCK.." --#define LOCK_DEFAULT "/var/lock" -+#define LOCK_DEFAULT "/var/spool/lock" - - #define APC_MAGIC "apcupsd-linux-4.0" - +--- include/apc_defines.h.orig Sun Dec 1 13:24:41 2002 ++++ include/apc_defines.h Sun Dec 1 13:24:45 2002 +@@ -86,7 +86,7 @@ + * -RF + */ + #define APC_LOCK_PREFIX "/LCK.." +-#define LOCK_DEFAULT "/var/lock" ++#define LOCK_DEFAULT "/var/spool/lock" + + /* + * JHNC: diff --git a/sysutils/apcupsd/patches/patch-ad b/sysutils/apcupsd/patches/patch-ad index e643bd4b59f..30799ff2035 100644 --- a/sysutils/apcupsd/patches/patch-ad +++ b/sysutils/apcupsd/patches/patch-ad @@ -1,101 +1,66 @@ -$NetBSD: patch-ad,v 1.2 2000/08/05 07:31:18 jlam Exp $ +$NetBSD: patch-ad,v 1.3 2002/12/01 22:32:27 bouyer Exp $ ---- installs/powersc.in.orig Thu Jul 29 03:46:32 1999 -+++ installs/powersc.in Sat Aug 5 02:52:40 2000 -@@ -26,66 +26,68 @@ - case "$1" in - POWEROUT) - printf "Warning! There are power problems." | $WALL -+ /usr/bin/logger -p user.info -t powersc "Warning there are Power problems." - ;; - ONBATTERY) - printf "Power Failure! Running on UPS." | $WALL -+ /usr/bin/logger -p user.info -t powersc "Power Failure! Running on UPS." - ;; - FAILING) -- printf "Battery Power Failed -- Normal Shutdown.\n" | $WALL -+ printf "Battery power failed -- Normal shutdown.\n" | $WALL -+ /usr/bin/logger -p user.info -t powersc "Battery power failed -- Normal shutdown." - ;; - TIMEOUT) - printf "On-line battery timeout -- Normal Shutdown.\n" | $WALL -+ /usr/bin/logger -p user.info -t powersc "On-line battery timeout -- Normal Shutdown." - ;; - LOADLIMIT) - printf "Battery load limits reached -- Normal Shutdown.\n" | $WALL -+ /usr/bin/logger -p user.info -t powersc "Battery load limits reached -- Normal Shutdown." - ;; - RUNLIMIT) - printf "Battery run time limits reached -- Normal Shutdown.\n" | $WALL -+ /usr/bin/logger -p user.info -t powersc "Battery run time limits reached -- Normal Shutdown." - ;; - DOSHUTDOWN) -- printf "Beginning Shutdown Sequence!" | $WALL -- ps x | gawk '{ if (($5 == "init") && ($1 == "1")) print $6 }' \ -- | cut -f2 -d[ | cut -f1 -d] \ -- > /tmp/run.level.power - if [ -f $POWERPID ] - then - exit 0 - else - echo $$ > $POWERPID -- $SHUTDOWN -h now -+ $SHUTDOWN -h now "$0: beginning normal UPS initiated shutdown..." - fi - ;; - MAINSBACK | WAITASEC) - printf "Power has returned." | $WALL -+ /usr/bin/logger -p user.info -t powersc "Power has returned." - if [ -f $POWERPID ]; then - printf "Attempting to cancel shutdown." | $WALL -+ /usr/bin/logger -p user.info -t powersc "Attempting to cancel shutdown." - kill $(cat $POWERPID) - rm -f $POWERPID -- init $(cat /tmp/run.level.power) - fi - ;; - ANNOYME) -- printf "Power Problems! Please Log Off Now!" | $WALL -+ printf "Power Problems! Please logout now!" | $WALL -+ /usr/bin/logger -p user.info -t powersc "Power Problems! Please logout now!" - ;; - EMERGENCY) -- printf "Possible battery failure -- Emergency Shutdown!" | $WALL -- $SHUTDOWN -h now -+ $SHUTDOWN -h now "$0: Emergency shutdown, UPS Batteries have failed" - ;; - CHANGEME) -- printf "Emergency -- Batteries Have Failed!\nChange Them NOW!" | $WALL -+ printf "Emergency -- Batteries have failed!\nChange them as soon as possible!" | $WALL -+ /usr/bin/logger -p user.info -t powersc "Emergency -- Batteries have failed! Change them as soon as possible!" - ;; - REMOTE) -- printf "Remote Calls -- Normal Shutdown.\nBeginning Shutdown Sequence!" | $WALL -- $SHUTDOWN -h now -+ $SHUTDOWN -h now "Remote UPS calls -- Normal shutdown. Beginning shutdown sequence!" - ;; - KILL) sleep 1 - $APCUPSD killpower - sleep 10 - ;; - INIT) rm -f $POWERPID -- rm -f /etc/powerfail -- rm -f /etc/powerstatus -- rm -f /etc/nologin -+ rm -f /var/run/powerfail -+ rm -f /var/run/apcupsd.status - [ "$2" = "" ] && echo -n "Starting APCUPSD Power Management: " - $APCUPSD - [ "$2" = "" ] && echo "apcupsd" -@@ -103,9 +105,8 @@ - kill $(cat $APCPID) - rm -f $APCPID - rm -f $POWERPID -- rm -f /etc/powerfail -- rm -f /etc/powerstatus -- rm -f /etc/nologin -+ rm -f /var/run/powerfail -+ rm -f /var/run/apcupsd.status - sleep 10 - $APCUPSD - [ "$2" = "" ] && echo "apcupsd" +--- distributions/netbsd/apccontrol.sh.in.orig Sun Dec 1 13:32:57 2002 ++++ distributions/netbsd/apccontrol.sh.in Sun Dec 1 13:31:47 2002 +@@ -50,28 +50,36 @@ + ;; + commfailure) + printf "Warning serial port communications with UPS lost." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Warning serial port communications with UPS lost." + ;; + commok) + printf "Serial communciations with UPS restored." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Serial communciations with UPS restored." + ;; + powerout) + printf "Warning power loss detected." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Warning power loss detected." + ;; + onbattery) + printf "Power failure. Running on UPS batteries." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Power failure. Running on UPS batteries." + ;; + failing) + printf "UPS battery power exhaused. Doing shutdown.\n" | wall ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery power exhaused. Doing shutdown.\n" + ;; + timeout) + printf "UPS battery runtime limit exceded. Doing shutdown.\n" | wall ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime limit exceded. Doing shutdown.\n" + ;; + loadlimit) + printf "UPS battery discharge limit reached. Doing shutdown.\n" | wall ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery discharge limit reached. Doing shutdown.\n" + ;; + runlimit) + printf "UPS battery runtime percent reached. Doing shutdown.\n" \ + | wall ++ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime percent reached. Doing shutdown.\n" + ;; + doreboot) + printf "Beginning Reboot Sequence" | wall +@@ -83,8 +91,10 @@ + ;; + mainsback) + printf "Power has returned..." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Power has returned..." + if [ -f @PWRFAILDIR@/powerfail ] ; then + printf "Continuing with shutdown. I hope you don't have a linux box as the UPS master ..." | wall ++ /usr/bin/logger -p user.info -t apccontrol "Continuing with shutdown. I hope you don't have a linux box as the UPS master ..." + fi + ;; + annoyme) +@@ -93,11 +103,13 @@ + emergency) + printf "Emergency Shutdown. Possible UPS battery failure." \ + | wall ++ /usr/bin/logger -p user.info -t apccontrol "Emergency Shutdown. Possible UPS battery failure." + ${SHUTDOWN} -h now "apcupsd emergency shutdown" + ;; + changeme) + printf "Emergency! UPS batteries have failed\nChange them NOW" \ + | wall ++ /usr/bin/logger -p user.info -t apccontrol "Emergency! UPS batteries have failed\nChange them NOW" + ;; + remotedown) + printf "Remote Shutdown.\nBeginning Shutdown Sequence." | wall diff --git a/sysutils/apcupsd/patches/patch-ae b/sysutils/apcupsd/patches/patch-ae index 1fff35506f7..ae2279939ab 100644 --- a/sysutils/apcupsd/patches/patch-ae +++ b/sysutils/apcupsd/patches/patch-ae @@ -1,61 +1,27 @@ -$NetBSD: patch-ae,v 1.2 2000/08/05 07:31:19 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2002/12/01 22:32:27 bouyer Exp $ ---- 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. +--- autoconf/configure.in.orig Fri Dec 14 16:09:12 2001 ++++ autoconf/configure.in Sun Dec 1 15:42:34 2002 +@@ -57,13 +57,6 @@ + if test x$sysconfdir = x'${prefix}/etc' ; then + sysconfdir='/etc/apcupsd' + fi +- -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. - - 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) +-dnl If the user has not set -sbindir, we set our default as /sbin +-dnl +- if test x$sbindir = x'${exec_prefix}/sbin' ; then +- sbindir='/sbin' +- fi + fi - 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"]) +@@ -155,7 +148,7 @@ + AC_SUBST(UTILPROGS) - 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. + dnl Now check for programs +-AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd, no) ++AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd, no, $PATH:/sbin:/usr/sbin) + if test "$SHUTDOWN" = "no" + then + if test "$ac_cv_cygwin" = no diff --git a/sysutils/apcupsd/patches/patch-af b/sysutils/apcupsd/patches/patch-af index 6e30f320b2f..0264d97d6b5 100644 --- a/sysutils/apcupsd/patches/patch-af +++ b/sysutils/apcupsd/patches/patch-af @@ -1,17 +1,28 @@ -$NetBSD: patch-af,v 1.3 2002/01/03 14:31:09 wiz Exp $ +$NetBSD: patch-af,v 1.4 2002/12/01 22:32:27 bouyer Exp $ ---- Makefile.in.orig Thu Jul 29 09:46:32 1999 -+++ Makefile.in -@@ -13,7 +13,7 @@ - - # Ultrix 2.2 make doesn't expand the value of VPATH. - srcdir = @srcdir@ --libdir = @libdir@/apcupsd -+#libdir = @libdir@/apcupsd - VPATH = @srcdir@ +--- Makefile.in.orig Fri Jan 4 10:08:33 2002 ++++ Makefile.in Sun Dec 1 15:54:19 2002 +@@ -29,18 +29,12 @@ + # + # this is a list of all subdirectories that contain or could contain Makefiles + # +-subdirs = . @INTLSUB@ @POSUB@ cgi doc lib contrib distributions \ +- distributions/debian distributions/engarde \ +- distributions/freebsd distributions/hpux distributions/openbsd \ +- distributions/redhat \ +- distributions/slackware distributions/sun distributions/suse \ +- distributions/unifix distributions/netbsd distributions/caldera win32 ++subdirs = . @INTLSUB@ @POSUB@ cgi doc lib contrib CC = @CC@ -@@ -67,6 +67,8 @@ + + # For some losing Unix makes. + SHELL = /bin/sh +-MAKE = make + + CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@ + LDFLAGS = @LDFLAGS@ @PTHREAD_LFLAGS@ +@@ -66,6 +60,8 @@ # Program to install `make'. INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -20,54 +31,62 @@ $NetBSD: patch-af,v 1.3 2002/01/03 14:31:09 wiz Exp $ # Program to install the man page. INSTALL_DATA = @INSTALL_DATA@ # Generic install program. -@@ -113,15 +115,15 @@ - ar rcs $(apclib) $(libobjs) - $(RANLIB) $(apclib) - --apcupsd: $(dobjs) $(apclib) @INTLLIBS@ -+apcupsd: $(dobjs) $(apclib) - $(CC) $(LDEFLAGS) $(LDFLAGS) $(dobjs) $(apclib) $(LOADLIBS) \ - -o apcupsd - --apcaccess: $(aobjs) $(apclib) @INTLLIBS@ -+apcaccess: $(aobjs) $(apclib) - $(CC) $(LDEFLAGS) $(LDFLAGS) $(aobjs) $(apclib) $(LOADLIBS) \ - -o apcaccess - --powerflute: $(fobjs) $(apclib) @INTLLIBS@ -+powerflute: $(fobjs) $(apclib) - $(CC) $(LDEFLAGS) $(LDFLAGS) $(fobjs) $(apclib) $(LOADLIBS) \ - -o powerflute - -@@ -134,11 +136,10 @@ - dummy: - - .c.o: -- $(CC) $(defines) -c $(CPFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/lib @INTLINCLUDE@ $(CEFLAGS) $(CFLAGS) $< -+ $(CC) $(defines) -c $(CPFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/lib @INTLINCLUDE@ $(CEFLAGS) $(CFLAGS) -o $@ $< - - # For some losing Unix makes. - SHELL = /bin/sh --MAKE = make - - tagsrcs = $(srcs) - TAGS: $(tagsrcs) -@@ -159,15 +160,15 @@ - - install-apcupsd: - @echo "Creating installation directories..." -- $(SHELL) ${srcdir}/mkinstalldirs $(sbindir) $(mandir) $(libdir) -+ $(SHELL) ${srcdir}/mkinstalldirs $(sbindir) $(mandir) +@@ -209,7 +205,7 @@ + $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sysconfdir); \ + chmod 755 $(sysconfdir); \ + fi; +- $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sbindir) $(mandir) ++ $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sbindir) $(mandir) $(prefix)/share/examples/apcupsd @echo "Installing apcupsd binary..." - $(INSTALL_PROGRAM) ./apcupsd $(sbindir)/apcupsd - @echo "Installing apcaccess binary..." - $(INSTALL_PROGRAM) ./apcaccess $(sbindir)/apcaccess - @echo "Installing powersc script..." -- $(INSTALL_PROGRAM) installs/powersc $(sbindir)/powersc -+ $(INSTALL_SCRIPT) installs/powersc $(sbindir)/powersc - @echo "Installing manual page..." + @strip $(srcdir)/apcupsd $(srcdir)/apcaccess + @strip $(srcdir)/apcnisd $(srcdir)/apctest +@@ -221,31 +217,16 @@ + @echo "Installing apctest binary..." + $(INSTALL_PROGRAM) $(srcdir)/apctest $(sbindir)/apctest + @echo "Installing apccontrol script..." +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol ++ $(INSTALL_SCRIPT) $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(prefix)/share/examples/apcupsd/apccontrol + @echo "Installing manual pages..." - $(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext) + $(INSTALL_DATA) $(srcdir)/doc/apcupsd.$(manext) $(mandir)/apcupsd.$(manext) @echo "Installing language catalogs..." @POMAKE@ install +-# don't overwrite any existing config file +- echo "Installing apcupsd.conf..."; \ +- if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \ +- srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \ +- else \ +- srcconf=etc/apcupsd.conf; \ +- fi; \ +- if test -f $(sysconfdir)/apcupsd.conf; then \ +- dstconf=apcupsd.conf.new; \ +- echo " found old apcupsd.conf, installing new conf file as $$dstconf"; \ +- else \ +- dstconf=apcupsd.conf; \ +- fi; \ +- echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \ +- $(INSTALL_PROGRAM) -m 644 $$srcconf $(sysconfdir)/$$dstconf +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/changeme $(sysconfdir) +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commfailure $(sysconfdir) +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commok $(sysconfdir) +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/onbattery $(sysconfdir) +- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/mainsback $(sysconfdir) ++ $(INSTALL_SCRIPT) $(srcdir)/etc/changeme $(prefix)/share/examples/apcupsd ++ $(INSTALL_SCRIPT) $(srcdir)/etc/commfailure $(prefix)/share/examples/apcupsd ++ $(INSTALL_SCRIPT) $(srcdir)/etc/commok $(prefix)/share/examples/apcupsd ++ $(INSTALL_SCRIPT) $(srcdir)/etc/onbattery $(prefix)/share/examples/apcupsd ++ $(INSTALL_SCRIPT) $(srcdir)/etc/mainsback $(prefix)/share/examples/apcupsd + + + install-apcupsdwin32: apcupsd +@@ -254,10 +235,6 @@ + + + install-distdir: +- @if test @WIN32@x != win32x; then \ +- (cd $(srcdir)/distributions/$(DISTNAME); \ +- $(MAKE) "DISTVER=$(DISTVER)" install); \ +- fi + install-cgi: + @CGIMAKE@ install diff --git a/sysutils/apcupsd/patches/patch-ag b/sysutils/apcupsd/patches/patch-ag deleted file mode 100644 index 864c004db27..00000000000 --- a/sysutils/apcupsd/patches/patch-ag +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2000/08/05 07:31:20 jlam Exp $ - ---- apcserial.c.orig Thu Jul 29 04:47:46 1999 -+++ apcserial.c Sat Aug 5 02:52:40 2000 -@@ -134,10 +134,10 @@ - newtio.c_oflag = 0; /* Raw output */ - newtio.c_lflag = 0; /* No local echo */ - --#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__ */ - - /* w.p. This makes a non.blocking read() with 5 sec. timeout */ - newtio.c_cc[VMIN] = 0; -@@ -206,7 +206,6 @@ - { - char response[32]; /* w.p. */ - char a; -- FILE *pwdf; - int errflag = 0; - response[0] = '\0'; - -@@ -242,19 +241,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)) { -@@ -271,7 +257,6 @@ - ups->argvalue); - sleep(15); - } -- fclose(pwdf); - - fprintf(stderr, - "%s: Attempting to kill the power!\n", -@@ -420,9 +405,7 @@ - } - } - /* w.p. */ -- sleep(10); - terminate(0); -- } - } else { - if (ups->mode.type <= SHAREBASIC) { - switch(ups->cable.type) { diff --git a/sysutils/apcupsd/patches/patch-ah b/sysutils/apcupsd/patches/patch-ah deleted file mode 100644 index f1f4de16366..00000000000 --- a/sysutils/apcupsd/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2000/08/05 07:31:20 jlam Exp $ - ---- apcupsd.c.orig Thu Jul 29 04:47:46 1999 -+++ apcupsd.c Sat Aug 5 02:52:40 2000 -@@ -292,13 +292,6 @@ - * it should close them. - *********************************************************************/ - void terminate (int sig) { -- /* -- * XXX - Is someone able to explain me why here we find a sleep for 10 -- * seconds ? -- * -- * -RF -- */ -- sleep(10); - #ifdef NEW_THREADS - restore_signals(); - #endif /* NEW_THREADS */ diff --git a/sysutils/apcupsd/patches/patch-ai b/sysutils/apcupsd/patches/patch-ai deleted file mode 100644 index 3d0412f3bc8..00000000000 --- a/sysutils/apcupsd/patches/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2000/08/05 07:31:21 jlam Exp $ - ---- apchttp.c.orig Mon Apr 26 14:16:43 1999 -+++ apchttp.c Sat Aug 5 02:52:41 2000 -@@ -70,7 +70,6 @@ - - #include <ctype.h> - #include <errno.h> --#include <netinet/in.h> - #include <signal.h> - #include <stdio.h> - #include <stdlib.h> -@@ -80,6 +79,7 @@ - #include <sys/types.h> - #include <time.h> - #include <unistd.h> -+#include <netinet/in.h> - - #include <apc_config.h> - #include <apc_i18n.h> diff --git a/sysutils/apcupsd/patches/patch-aj b/sysutils/apcupsd/patches/patch-aj index b2aea7bc5cd..3e9a09cce3a 100644 --- a/sysutils/apcupsd/patches/patch-aj +++ b/sysutils/apcupsd/patches/patch-aj @@ -1,202 +1,285 @@ -$NetBSD: patch-aj,v 1.3 2002/10/02 22:20:50 dillo Exp $ +$NetBSD: patch-aj,v 1.4 2002/12/01 22:32:28 bouyer Exp $ ---- configure.orig Thu Oct 3 00:16:21 2002 -+++ configure -@@ -804,8 +806,191 @@ else - CFLAGS= +--- configure.orig Sat Jan 5 16:13:02 2002 ++++ configure Sun Dec 1 15:42:56 2002 +@@ -704,17 +704,13 @@ + if test x$sysconfdir = x'${prefix}/etc' ; then + sysconfdir='/etc/apcupsd' fi +- +- if test x$sbindir = x'${exec_prefix}/sbin' ; then +- sbindir='/sbin' +- fi + fi + + + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:718: checking for $ac_word" >&5 ++echo "configure:714: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -744,7 +740,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:748: checking for $ac_word" >&5 ++echo "configure:744: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -795,7 +791,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:799: checking for $ac_word" >&5 ++echo "configure:795: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -827,7 +823,7 @@ fi -- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:809: checking how to run the C preprocessor" >&5 -+ ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+ -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:819: checking how to run the C preprocessor" >&5 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. -+ cat > conftest.$ac_ext <<EOF -+#line 834 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -E -traditional-cpp" -+ cat > conftest.$ac_ext <<EOF -+#line 851 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP="${CC-cc} -nologo -E" -+ cat > conftest.$ac_ext <<EOF -+#line 868 "configure" -+#include "confdefs.h" -+#include <assert.h> -+Syntax Error -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" -+else -+ ac_cv_prog_CPP="$CPP" -+fi -+echo "$ac_t""$CPP" 1>&6 -+ -+echo $ac_n "checking for AIX""... $ac_c" 1>&6 -+echo "configure:899: checking for AIX" >&5 -+cat > conftest.$ac_ext <<EOF -+#line 901 "configure" -+#include "confdefs.h" -+#ifdef _AIX -+ yes -+#endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* -+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF -+#define _ALL_SOURCE 1 -+EOF -+ -+else -+ rm -rf conftest* -+ echo "$ac_t""no" 1>&6 -+fi -+rm -f conftest* -+ -+ -+ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -+echo "configure:924: checking for minix/config.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext <<EOF -+#line 929 "configure" -+#include "confdefs.h" -+#include <minix/config.h> -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -+if test -z "$ac_err"; then -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ MINIX=yes -+else -+ echo "$ac_t""no" 1>&6 -+MINIX= -+fi -+ -+if test "$MINIX" = yes; then -+ cat >> confdefs.h <<\EOF -+#define _POSIX_SOURCE 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define _POSIX_1_SOURCE 2 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define _MINIX 1 -+EOF -+ -+fi -+ -+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -+echo "configure:972: checking for POSIXized ISC" >&5 -+if test -d /etc/conf/kconfig.d && -+ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 -+then -+ echo "$ac_t""yes" 1>&6 -+ ISC=yes # If later tests want to check for ISC. -+ cat >> confdefs.h <<\EOF -+#define _POSIX_SOURCE 1 -+EOF -+ -+ if test "$GCC" = yes; then -+ CC="$CC -posix" -+ else -+ CC="$CC -Xp" -+ fi -+else -+ echo "$ac_t""no" 1>&6 -+ ISC= -+fi -+ -+ -+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:994: checking how to run the C preprocessor" >&5 + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:831: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -838,12 +834,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 842 "configure" ++#line 838 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -869,12 +865,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:873: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:869: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:878: checking whether we are using GNU C" >&5 ++echo "configure:874: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -883,7 +879,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -902,7 +898,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:906: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:902: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -933,7 +929,7 @@ + fi + fi + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:937: checking how to run the C preprocessor" >&5 ++echo "configure:933: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -1062,7 +1247,7 @@ else +@@ -948,13 +944,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +-#line 952 "configure" ++#line 948 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -965,13 +961,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +-#line 969 "configure" ++#line 965 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -982,13 +978,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext <<EOF +-#line 986 "configure" ++#line 982 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -1013,10 +1009,10 @@ + echo "$ac_t""$CPP" 1>&6 + if test "x$CC" != xcc; then + echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 +-echo "configure:1017: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:1013: checking whether $CC and cc understand -c and -o together" >&5 + else + echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 +-echo "configure:1020: checking whether cc understands -c and -o together" >&5 ++echo "configure:1016: checking whether cc understands -c and -o together" >&5 + fi + set dummy $CC; ac_cc="`echo $2 | + sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" +@@ -1028,16 +1024,16 @@ + # We do the test twice because some compilers refuse to overwrite an + # existing .o file with -o, though they will create one. + ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' +-if { (eval echo configure:1032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + eval ac_cv_prog_cc_${ac_cc}_c_o=yes + if test "x$CC" != xcc; then + # Test first that cc exists at all. +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + ac_try='cc -c conftest.c -o conftest.o 1>&5' +- if { (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + then + # cc works too. + : +@@ -1064,13 +1060,13 @@ + fi + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 +-echo "configure:1068: checking whether ${CC-cc} needs -traditional" >&5 ++echo "configure:1064: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext <<EOF +-#line 1074 "configure" ++#line 1070 "configure" + #include "confdefs.h" + #include <sgtty.h> + Autoconf TIOCGETP +@@ -1088,7 +1084,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext <<EOF +-#line 1092 "configure" ++#line 1088 "configure" + #include "confdefs.h" + #include <termio.h> + Autoconf TCGETA +@@ -1120,7 +1116,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:1124: checking for a BSD compatible install" >&5 ++echo "configure:1120: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1171,12 +1167,12 @@ + test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +- for ac_prog in gawk mawk nawk awk ++ for ac_prog in mawk gawk nawk awk + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1180: checking for $ac_word" >&5 ++echo "configure:1176: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1261,7 +1257,7 @@ + with_pthreads=no + fi + echo $ac_n "checking for pthreads""... $ac_c" 1>&6 +-echo "configure:1265: checking for pthreads" >&5 ++echo "configure:1261: checking for pthreads" >&5 + # Check whether --enable-pthreads or --disable-pthreads was given. + if test "${enable_pthreads+set}" = set; then + enableval="$enable_pthreads" +@@ -1286,12 +1282,12 @@ + + + echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +-echo "configure:1290: checking for Cygwin environment" >&5 ++echo "configure:1286: checking for Cygwin environment" >&5 + if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1295 "configure" ++#line 1291 "configure" + #include "confdefs.h" + + int main() { +@@ -1302,7 +1298,7 @@ + return __CYGWIN__; + ; return 0; } + EOF +-if { (eval echo configure:1306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cygwin=yes + else +@@ -1338,7 +1334,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1342: checking for $ac_word" >&5 ++echo "configure:1338: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SHUTDOWN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1351,7 +1347,7 @@ ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" @@ -205,141 +288,2132 @@ $NetBSD: patch-aj,v 1.3 2002/10/02 22:20:50 dillo Exp $ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then -@@ -1083,9 +1268,9 @@ fi +@@ -1388,7 +1384,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1392: checking for $ac_word" >&5 ++echo "configure:1388: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WALL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1438,7 +1434,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1442: checking for $ac_word" >&5 ++echo "configure:1438: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SCRIPTSHELL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1485,7 +1481,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1489: checking for $ac_word" >&5 ++echo "configure:1485: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MAKEDEPEND'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1526,7 +1522,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1530: checking for $ac_word" >&5 ++echo "configure:1526: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1569,12 +1565,12 @@ + strncpy syslog tcgetattr vfprintf setpgrp + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:1573: checking for $ac_func" >&5 ++echo "configure:1569: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1578 "configure" ++#line 1574 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -1597,7 +1593,7 @@ - test -n "$SHUTDOWN" && break - done --test -n "$SHUTDOWN" || SHUTDOWN="echo 'ERROR: shutdown program not found !'" -+test -n "$SHUTDOWN" || SHUTDOWN="shutdown" + ; return 0; } + EOF +-if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -1625,12 +1621,12 @@ + + + echo $ac_n "checking for strftime""... $ac_c" 1>&6 +-echo "configure:1629: checking for strftime" >&5 ++echo "configure:1625: checking for strftime" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1634 "configure" ++#line 1630 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strftime(); below. */ +@@ -1653,7 +1649,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strftime=yes" + else +@@ -1675,7 +1671,7 @@ + echo "$ac_t""no" 1>&6 + # strftime is in -lintl on SCO UNIX. + echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 +-echo "configure:1679: checking for strftime in -lintl" >&5 ++echo "configure:1675: checking for strftime in -lintl" >&5 + ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1683,7 +1679,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1687 "configure" ++#line 1683 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1694,7 +1690,7 @@ + strftime() + ; return 0; } + EOF +-if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1720,7 +1716,7 @@ + + fi + echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 +-echo "configure:1724: checking whether setpgrp takes no argument" >&5 ++echo "configure:1720: checking whether setpgrp takes no argument" >&5 + if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1728,7 +1724,7 @@ + { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 1732 "configure" ++#line 1728 "configure" + #include "confdefs.h" + + #ifdef HAVE_UNISTD_H +@@ -1748,7 +1744,7 @@ + } + + EOF +-if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_setpgrp_void=no + else +@@ -1775,12 +1771,12 @@ + for ac_func in shmctl + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:1779: checking for $ac_func" >&5 ++echo "configure:1775: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1784 "configure" ++#line 1780 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -1803,7 +1799,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -1842,12 +1838,12 @@ + # - RF + # + echo $ac_n "checking for socket""... $ac_c" 1>&6 +-echo "configure:1846: checking for socket" >&5 ++echo "configure:1842: checking for socket" >&5 + if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1851 "configure" ++#line 1847 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char socket(); below. */ +@@ -1870,7 +1866,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_socket=yes" + else +@@ -1888,7 +1884,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for socket in -lxnet""... $ac_c" 1>&6 +-echo "configure:1892: checking for socket in -lxnet" >&5 ++echo "configure:1888: checking for socket in -lxnet" >&5 + ac_lib_var=`echo xnet'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1896,7 +1892,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lxnet $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1900 "configure" ++#line 1896 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1907,7 +1903,7 @@ + socket() + ; return 0; } + EOF +-if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1935,7 +1931,7 @@ + fi + + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +-echo "configure:1939: checking for socket in -lsocket" >&5 ++echo "configure:1935: checking for socket in -lsocket" >&5 + ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1943,7 +1939,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsocket $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1947 "configure" ++#line 1943 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -1954,7 +1950,7 @@ + socket() + ; return 0; } + EOF +-if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -1982,7 +1978,7 @@ + fi + + echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 +-echo "configure:1986: checking for socket in -linet" >&5 ++echo "configure:1982: checking for socket in -linet" >&5 + ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1990,7 +1986,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linet $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1994 "configure" ++#line 1990 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2001,7 +1997,7 @@ + socket() + ; return 0; } + EOF +-if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2033,12 +2029,12 @@ + + # If resolver functions are not in libc check for -lnsl or -lresolv. + echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 +-echo "configure:2037: checking for gethostbyname" >&5 ++echo "configure:2033: checking for gethostbyname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2042 "configure" ++#line 2038 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname(); below. */ +@@ -2061,7 +2057,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gethostbyname=yes" + else +@@ -2079,7 +2075,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 +-echo "configure:2083: checking for gethostbyname in -lnsl" >&5 ++echo "configure:2079: checking for gethostbyname in -lnsl" >&5 + ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2087,7 +2083,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2091 "configure" ++#line 2087 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2098,7 +2094,7 @@ + gethostbyname() + ; return 0; } + EOF +-if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2126,7 +2122,7 @@ + fi + + echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6 +-echo "configure:2130: checking for gethostbyname in -lresolv" >&5 ++echo "configure:2126: checking for gethostbyname in -lresolv" >&5 + ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2134,7 +2130,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lresolv $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2138 "configure" ++#line 2134 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2145,7 +2141,7 @@ + gethostbyname() + ; return 0; } + EOF +-if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2177,12 +2173,12 @@ + + # If gettext isn't in the C library, maybe there's a -lintl. + echo $ac_n "checking for gettext""... $ac_c" 1>&6 +-echo "configure:2181: checking for gettext" >&5 ++echo "configure:2177: checking for gettext" >&5 + if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2186 "configure" ++#line 2182 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gettext(); below. */ +@@ -2205,7 +2201,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_gettext=yes" + else +@@ -2223,7 +2219,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 +-echo "configure:2227: checking for gettext in -lintl" >&5 ++echo "configure:2223: checking for gettext in -lintl" >&5 + ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2231,7 +2227,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2235 "configure" ++#line 2231 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2242,7 +2238,7 @@ + gettext() + ; return 0; } + EOF +-if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2274,12 +2270,12 @@ + + # The condition in this test copes with the presence of inet_addr in libc6. + echo $ac_n "checking for inet_addr""... $ac_c" 1>&6 +-echo "configure:2278: checking for inet_addr" >&5 ++echo "configure:2274: checking for inet_addr" >&5 + if eval "test \"`echo '$''{'ac_cv_func_inet_addr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2283 "configure" ++#line 2279 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char inet_addr(); below. */ +@@ -2302,7 +2298,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_inet_addr=yes" + else +@@ -2320,7 +2316,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 +-echo "configure:2324: checking for inet_addr in -lnsl" >&5 ++echo "configure:2320: checking for inet_addr in -lnsl" >&5 + ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2328,7 +2324,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lnsl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2332 "configure" ++#line 2328 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2339,7 +2335,7 @@ + inet_addr() + ; return 0; } + EOF +-if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2371,12 +2367,12 @@ + + # The condition in this test copes with the presence of inet_addr in libc6. + echo $ac_n "checking for strchr""... $ac_c" 1>&6 +-echo "configure:2375: checking for strchr" >&5 ++echo "configure:2371: checking for strchr" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strchr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2380 "configure" ++#line 2376 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strchr(); below. */ +@@ -2399,7 +2395,7 @@ --for ac_prog in ranlib true -+for ac_prog in ranlib + ; return 0; } + EOF +-if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strchr=yes" + else +@@ -2417,7 +2413,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for strchr in -lcposix""... $ac_c" 1>&6 +-echo "configure:2421: checking for strchr in -lcposix" >&5 ++echo "configure:2417: checking for strchr in -lcposix" >&5 + ac_lib_var=`echo cposix'_'strchr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2425,7 +2421,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lcposix $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 2429 "configure" ++#line 2425 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -2436,7 +2432,7 @@ + strchr() + ; return 0; } + EOF +-if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -2461,12 +2457,12 @@ + + + echo $ac_n "checking for strstr""... $ac_c" 1>&6 +-echo "configure:2465: checking for strstr" >&5 ++echo "configure:2461: checking for strstr" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strstr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2470 "configure" ++#line 2466 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strstr(); below. */ +@@ -2489,7 +2485,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strstr=yes" + else +@@ -2515,12 +2511,12 @@ + + + echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 +-echo "configure:2519: checking for strcasecmp" >&5 ++echo "configure:2515: checking for strcasecmp" >&5 + if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2524 "configure" ++#line 2520 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char strcasecmp(); below. */ +@@ -2543,7 +2539,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_strcasecmp=yes" + else +@@ -2569,12 +2565,12 @@ + + + echo $ac_n "checking for memmove""... $ac_c" 1>&6 +-echo "configure:2573: checking for memmove" >&5 ++echo "configure:2569: checking for memmove" >&5 + if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2578 "configure" ++#line 2574 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char memmove(); below. */ +@@ -2597,7 +2593,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_memmove=yes" + else +@@ -2623,12 +2619,12 @@ + + + echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 +-echo "configure:2627: checking for getopt_long" >&5 ++echo "configure:2623: checking for getopt_long" >&5 + if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2632 "configure" ++#line 2628 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char getopt_long(); below. */ +@@ -2651,7 +2647,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getopt_long=yes" + else +@@ -2677,12 +2673,12 @@ + + + echo $ac_n "checking for setproctitle""... $ac_c" 1>&6 +-echo "configure:2681: checking for setproctitle" >&5 ++echo "configure:2677: checking for setproctitle" >&5 + if eval "test \"`echo '$''{'ac_cv_func_setproctitle'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2686 "configure" ++#line 2682 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char setproctitle(); below. */ +@@ -2705,7 +2701,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_setproctitle=yes" + else +@@ -2739,17 +2735,17 @@ do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2743: checking for $ac_hdr" >&5 ++echo "configure:2739: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2748 "configure" ++#line 2744 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2783,17 +2779,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2787: checking for $ac_hdr" >&5 ++echo "configure:2783: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2792 "configure" ++#line 2788 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2823,12 +2819,12 @@ + fi + + echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 +-echo "configure:2827: checking whether stat file-mode macros are broken" >&5 ++echo "configure:2823: checking whether stat file-mode macros are broken" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2832 "configure" ++#line 2828 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/stat.h> +@@ -2878,12 +2874,12 @@ + + fi + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:2882: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:2878: checking whether time.h and sys/time.h may both be included" >&5 + if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2887 "configure" ++#line 2883 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/time.h> +@@ -2892,7 +2888,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:2896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -2912,12 +2908,12 @@ + + fi + echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:2916: checking for sys/wait.h that is POSIX.1 compatible" >&5 ++echo "configure:2912: checking for sys/wait.h that is POSIX.1 compatible" >&5 + if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2921 "configure" ++#line 2917 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/wait.h> +@@ -2933,7 +2929,7 @@ + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; return 0; } + EOF +-if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_sys_wait_h=yes + else +@@ -2953,12 +2949,12 @@ + + fi + echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +-echo "configure:2957: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:2953: checking whether struct tm is in sys/time.h or time.h" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2962 "configure" ++#line 2958 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <time.h> +@@ -2966,7 +2962,7 @@ + struct tm *tp; tp->tm_sec; + ; return 0; } + EOF +-if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm=time.h + else +@@ -2986,12 +2982,12 @@ + + fi + echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 +-echo "configure:2990: checking for tm_zone in struct tm" >&5 ++echo "configure:2986: checking for tm_zone in struct tm" >&5 + if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 2995 "configure" ++#line 2991 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <$ac_cv_struct_tm> +@@ -2999,7 +2995,7 @@ + struct tm tm; tm.tm_zone; + ; return 0; } + EOF +-if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_struct_tm_zone=yes + else +@@ -3019,12 +3015,12 @@ + + else + echo $ac_n "checking for tzname""... $ac_c" 1>&6 +-echo "configure:3023: checking for tzname" >&5 ++echo "configure:3019: checking for tzname" >&5 + if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3028 "configure" ++#line 3024 "configure" + #include "confdefs.h" + #include <time.h> + #ifndef tzname /* For SGI. */ +@@ -3034,7 +3030,7 @@ + atoi(*tzname); + ; return 0; } + EOF +-if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_var_tzname=yes + else +@@ -3055,12 +3051,12 @@ + fi + fi + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:3059: checking for uid_t in sys/types.h" >&5 ++echo "configure:3055: checking for uid_t in sys/types.h" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3064 "configure" ++#line 3060 "configure" + #include "confdefs.h" + #include <sys/types.h> + EOF +@@ -3089,7 +3085,7 @@ + fi + + echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 +-echo "configure:3093: checking type of array argument to getgroups" >&5 ++echo "configure:3089: checking type of array argument to getgroups" >&5 + if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3097,7 +3093,7 @@ + ac_cv_type_getgroups=cross + else + cat > conftest.$ac_ext <<EOF +-#line 3101 "configure" ++#line 3097 "configure" + #include "confdefs.h" + + /* Thanks to Mike Rendell for this test. */ +@@ -3122,7 +3118,7 @@ + } + + EOF +-if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_type_getgroups=gid_t + else +@@ -3136,7 +3132,7 @@ + + if test $ac_cv_type_getgroups = cross; then + cat > conftest.$ac_ext <<EOF +-#line 3140 "configure" ++#line 3136 "configure" + #include "confdefs.h" + #include <unistd.h> + EOF +@@ -3160,12 +3156,12 @@ + + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:3164: checking for ANSI C header files" >&5 ++echo "configure:3160: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3169 "configure" ++#line 3165 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -3173,7 +3169,7 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:3177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -3190,7 +3186,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 3194 "configure" ++#line 3190 "configure" + #include "confdefs.h" + #include <string.h> + EOF +@@ -3208,7 +3204,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 3212 "configure" ++#line 3208 "configure" + #include "confdefs.h" + #include <stdlib.h> + EOF +@@ -3229,7 +3225,7 @@ + : + else + cat > conftest.$ac_ext <<EOF +-#line 3233 "configure" ++#line 3229 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -3240,7 +3236,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -3264,12 +3260,12 @@ + fi + + echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:3268: checking for mode_t" >&5 ++echo "configure:3264: checking for mode_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3273 "configure" ++#line 3269 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -3297,12 +3293,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:3301: checking for off_t" >&5 ++echo "configure:3297: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3306 "configure" ++#line 3302 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -3330,12 +3326,12 @@ + fi + + echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:3334: checking for pid_t" >&5 ++echo "configure:3330: checking for pid_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3339 "configure" ++#line 3335 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -3363,12 +3359,12 @@ + fi + + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:3367: checking return type of signal handlers" >&5 ++echo "configure:3363: checking return type of signal handlers" >&5 + if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3372 "configure" ++#line 3368 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <signal.h> +@@ -3385,7 +3381,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -3404,12 +3400,12 @@ + + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:3408: checking for size_t" >&5 ++echo "configure:3404: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3413 "configure" ++#line 3409 "configure" + #include "confdefs.h" + #include <sys/types.h> + #if STDC_HEADERS +@@ -3437,12 +3433,12 @@ + fi + + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:3441: checking for uid_t in sys/types.h" >&5 ++echo "configure:3437: checking for uid_t in sys/types.h" >&5 + if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3446 "configure" ++#line 3442 "configure" + #include "confdefs.h" + #include <sys/types.h> + EOF +@@ -3471,14 +3467,14 @@ + fi + + echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +-echo "configure:3475: checking whether byte ordering is bigendian" >&5 ++echo "configure:3471: checking whether byte ordering is bigendian" >&5 + if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_c_bigendian=unknown + # See if sys/param.h defines the BYTE_ORDER macro. + cat > conftest.$ac_ext <<EOF +-#line 3482 "configure" ++#line 3478 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/param.h> +@@ -3489,11 +3485,11 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:3493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + # It does; now see whether it defined to BIG_ENDIAN or not. + cat > conftest.$ac_ext <<EOF +-#line 3497 "configure" ++#line 3493 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/param.h> +@@ -3504,7 +3500,7 @@ + #endif + ; return 0; } + EOF +-if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_bigendian=yes + else +@@ -3524,7 +3520,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 3528 "configure" ++#line 3524 "configure" + #include "confdefs.h" + main () { + /* Are we little or big endian? From Harbison&Steele. */ +@@ -3537,7 +3533,7 @@ + exit (u.c[sizeof (long) - 1] == 1); + } + EOF +-if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_bigendian=no + else +@@ -3560,12 +3556,12 @@ + + fi + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:3564: checking for working const" >&5 ++echo "configure:3560: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3569 "configure" ++#line 3565 "configure" + #include "confdefs.h" + + int main() { +@@ -3614,7 +3610,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -3634,21 +3630,21 @@ + + fi + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:3638: checking for inline" >&5 ++echo "configure:3634: checking for inline" >&5 + if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_cv_c_inline=no + for ac_kw in inline __inline__ __inline; do + cat > conftest.$ac_ext <<EOF +-#line 3645 "configure" ++#line 3641 "configure" + #include "confdefs.h" + + int main() { + } $ac_kw foo() { + ; return 0; } + EOF +-if { (eval echo configure:3652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break + else +@@ -3673,14 +3669,14 @@ + ;; + esac + echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 +-echo "configure:3677: checking whether char is unsigned" >&5 ++echo "configure:3673: checking whether char is unsigned" >&5 + if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + if test "$GCC" = yes; then + # GCC predefines this symbol on systems where it applies. + cat > conftest.$ac_ext <<EOF +-#line 3684 "configure" ++#line 3680 "configure" + #include "confdefs.h" + #ifdef __CHAR_UNSIGNED__ + yes +@@ -3702,7 +3698,7 @@ + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + else + cat > conftest.$ac_ext <<EOF +-#line 3706 "configure" ++#line 3702 "configure" + #include "confdefs.h" + /* volatile prevents gcc2 from optimizing the test away on sparcs. */ + #if !defined(__STDC__) || __STDC__ != 1 +@@ -3712,7 +3708,7 @@ + volatile char c = 255; exit(c < 0); + } + EOF +-if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_char_unsigned=yes + else +@@ -3737,12 +3733,12 @@ + + + echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 +-echo "configure:3741: checking for preprocessor stringizing operator" >&5 ++echo "configure:3737: checking for preprocessor stringizing operator" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3746 "configure" ++#line 3742 "configure" + #include "confdefs.h" + + #define x(y) #y +@@ -3771,19 +3767,19 @@ + fi + echo "$ac_t""${ac_cv_c_stringize}" 1>&6 + echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +-echo "configure:3775: checking for mingw32 environment" >&5 ++echo "configure:3771: checking for mingw32 environment" >&5 + if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 3780 "configure" ++#line 3776 "configure" + #include "confdefs.h" + + int main() { + return __MINGW32__; + ; return 0; } + EOF +-if { (eval echo configure:3787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_mingw32=yes + else +@@ -3802,7 +3798,7 @@ + + + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +-echo "configure:3806: checking for executable suffix" >&5 ++echo "configure:3802: checking for executable suffix" >&5 + if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -3812,7 +3808,7 @@ + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= +- if { (eval echo configure:3816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++ if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in + *.c | *.o | *.obj) ;; +@@ -3834,7 +3830,7 @@ + # Pull the hash mark out of the macro call to avoid m4 problems. + ac_msg="whether #! works in shell scripts" + echo $ac_n "checking $ac_msg""... $ac_c" 1>&6 +-echo "configure:3838: checking $ac_msg" >&5 ++echo "configure:3834: checking $ac_msg" >&5 + if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4153,17 +4149,17 @@ + _libs=${LIBS} + ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6 +-echo "configure:4157: checking for tcpd.h" >&5 ++echo "configure:4153: checking for tcpd.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4162 "configure" ++#line 4158 "configure" + #include "confdefs.h" + #include <tcpd.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4181,9 +4177,9 @@ + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -lwrap -lnsl" + echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6 +-echo "configure:4185: checking for TCP wrappers library -lwrap" >&5 ++echo "configure:4181: checking for TCP wrappers library -lwrap" >&5 + cat > conftest.$ac_ext <<EOF +-#line 4187 "configure" ++#line 4183 "configure" + #include "confdefs.h" + #include <tcpd.h> + int allow_severity = 0; +@@ -4195,7 +4191,7 @@ + hosts_access (req) + ; return 0; } + EOF +-if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +@@ -4280,7 +4276,7 @@ + enableval="$enable_powerflute" + if test "$enableval" = "yes" ; then + echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 +-echo "configure:4284: checking for initscr in -lncurses" >&5 ++echo "configure:4280: checking for initscr in -lncurses" >&5 + ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4288,7 +4284,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lncurses $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4292 "configure" ++#line 4288 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4299,7 +4295,7 @@ + initscr() + ; return 0; } + EOF +-if { (eval echo configure:4303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4321,7 +4317,7 @@ + fi + + echo $ac_n "checking for new_menu in -lmenu""... $ac_c" 1>&6 +-echo "configure:4325: checking for new_menu in -lmenu" >&5 ++echo "configure:4321: checking for new_menu in -lmenu" >&5 + ac_lib_var=`echo menu'_'new_menu | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4329,7 +4325,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lmenu $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4333 "configure" ++#line 4329 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4340,7 +4336,7 @@ + new_menu() + ; return 0; } + EOF +-if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4362,7 +4358,7 @@ + fi + + echo $ac_n "checking for new_form in -lform""... $ac_c" 1>&6 +-echo "configure:4366: checking for new_form in -lform" >&5 ++echo "configure:4362: checking for new_form in -lform" >&5 + ac_lib_var=`echo form'_'new_form | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4370,7 +4366,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lform $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4374 "configure" ++#line 4370 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4381,7 +4377,7 @@ + new_form() + ; return 0; } + EOF +-if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4403,7 +4399,7 @@ + fi + + echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6 +-echo "configure:4407: checking for new_panel in -lpanel" >&5 ++echo "configure:4403: checking for new_panel in -lpanel" >&5 + ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4411,7 +4407,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lpanel $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 4415 "configure" ++#line 4411 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -4422,7 +4418,7 @@ + new_panel() + ; return 0; } + EOF +-if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -4509,7 +4505,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -1124,7 +1309,7 @@ fi + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4513: checking for $ac_word" >&5 ++echo "configure:4509: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4552,7 +4548,7 @@ + USE_INCLUDED_LIBINTL=no + else + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:4556: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:4552: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -4581,7 +4577,7 @@ + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:4585: checking for $ac_word" >&5 ++echo "configure:4581: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4609,7 +4605,7 @@ + fi - test -n "$RANLIB" && break - done --test -n "$RANLIB" || RANLIB="echo 'ERROR: ranlib program not found !'" -+test -n "$RANLIB" || RANLIB="true" + echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +-echo "configure:4613: checking for POSIXized ISC" >&5 ++echo "configure:4609: checking for POSIXized ISC" >&5 + if test -d /etc/conf/kconfig.d && + grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + then +@@ -4632,19 +4628,19 @@ + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works + # for constant arguments. Useless! + echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +-echo "configure:4636: checking for working alloca.h" >&5 ++echo "configure:4632: checking for working alloca.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4641 "configure" ++#line 4637 "configure" + #include "confdefs.h" + #include <alloca.h> + int main() { + char *p = alloca(2 * sizeof(int)); + ; return 0; } + EOF +-if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_header_alloca_h=yes + else +@@ -4665,12 +4661,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:4669: checking for alloca" >&5 ++echo "configure:4665: checking for alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4674 "configure" ++#line 4670 "configure" + #include "confdefs.h" + + #ifdef __GNUC__ +@@ -4698,7 +4694,7 @@ + char *p = (char *) alloca(1); + ; return 0; } + EOF +-if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_func_alloca_works=yes + else +@@ -4730,12 +4726,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:4734: checking whether alloca needs Cray hooks" >&5 ++echo "configure:4730: checking whether alloca needs Cray hooks" >&5 + if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4739 "configure" ++#line 4735 "configure" + #include "confdefs.h" + #if defined(CRAY) && ! defined(CRAY2) + webecray +@@ -4760,12 +4756,12 @@ + if test $ac_cv_os_cray = yes; then + for ac_func in _getb67 GETB67 getb67; do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4764: checking for $ac_func" >&5 ++echo "configure:4760: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4769 "configure" ++#line 4765 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -4788,7 +4784,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:4792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -4815,7 +4811,7 @@ + fi - for ac_prog in wall + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:4819: checking stack direction for C alloca" >&5 ++echo "configure:4815: checking stack direction for C alloca" >&5 + if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4823,7 +4819,7 @@ + ac_cv_c_stack_direction=0 + else + cat > conftest.$ac_ext <<EOF +-#line 4827 "configure" ++#line 4823 "configure" + #include "confdefs.h" + find_stack_direction () + { +@@ -4842,7 +4838,7 @@ + exit (find_stack_direction() < 0); + } + EOF +-if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:4842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_stack_direction=1 + else +@@ -4867,17 +4863,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4871: checking for $ac_hdr" >&5 ++echo "configure:4867: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4876 "configure" ++#line 4872 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:4881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:4877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -4906,12 +4902,12 @@ + for ac_func in getpagesize do -@@ -1165,7 +1350,7 @@ fi + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4910: checking for $ac_func" >&5 ++echo "configure:4906: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 4915 "configure" ++#line 4911 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -4934,7 +4930,7 @@ - test -n "$WALL" && break + ; return 0; } + EOF +-if { (eval echo configure:4938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -4959,7 +4955,7 @@ done --test -n "$WALL" || WALL="echo 'ERROR: wall program not found !'" -+test -n "$WALL" || WALL="cat" + echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +-echo "configure:4963: checking for working mmap" >&5 ++echo "configure:4959: checking for working mmap" >&5 + if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -4967,7 +4963,7 @@ + ac_cv_func_mmap_fixed_mapped=no + else + cat > conftest.$ac_ext <<EOF +-#line 4971 "configure" ++#line 4967 "configure" + #include "confdefs.h" - echo $ac_n "checking for strftime""... $ac_c" 1>&6 -@@ -2119,6 +2304,7 @@ EOF + /* Thanks to Mike Haertel and Jim Avera for this test. +@@ -5107,7 +5103,7 @@ + } + + EOF +-if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_mmap_fixed_mapped=yes else - echo "$ac_t""no" 1>&6 - EXTRASRC="$EXTRASRC \$(srcdir)/lib/getopt.c \$(srcdir)/lib/getopt1.c" -+ CPPFLAGS="-Ilib" - EXTRAOBJ="$EXTRAOBJ lib/getopt.o lib/getopt1.o" +@@ -5135,17 +5131,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:5139: checking for $ac_hdr" >&5 ++echo "configure:5135: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5144 "configure" ++#line 5140 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5175,12 +5171,12 @@ + strdup __argz_count __argz_stringify __argz_next + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:5179: checking for $ac_func" >&5 ++echo "configure:5175: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5184 "configure" ++#line 5180 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -5203,7 +5199,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -5232,12 +5228,12 @@ + for ac_func in stpcpy + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:5236: checking for $ac_func" >&5 ++echo "configure:5232: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5241 "configure" ++#line 5237 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -5260,7 +5256,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -5294,19 +5290,19 @@ + + if test $ac_cv_header_locale_h = yes; then + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +-echo "configure:5298: checking for LC_MESSAGES" >&5 ++echo "configure:5294: checking for LC_MESSAGES" >&5 + if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5303 "configure" ++#line 5299 "configure" + #include "confdefs.h" + #include <locale.h> + int main() { + return LC_MESSAGES + ; return 0; } + EOF +-if { (eval echo configure:5310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + am_cv_val_LC_MESSAGES=yes + else +@@ -5327,7 +5323,7 @@ + fi + fi + echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 +-echo "configure:5331: checking whether NLS is requested" >&5 ++echo "configure:5327: checking whether NLS is requested" >&5 + # Check whether --enable-nls or --disable-nls was given. + if test "${enable_nls+set}" = set; then + enableval="$enable_nls" +@@ -5347,7 +5343,7 @@ + EOF + + echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 +-echo "configure:5351: checking whether included gettext is requested" >&5 ++echo "configure:5347: checking whether included gettext is requested" >&5 + # Check whether --with-included-gettext or --without-included-gettext was given. + if test "${with_included_gettext+set}" = set; then + withval="$with_included_gettext" +@@ -5366,17 +5362,17 @@ + + ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 +-echo "configure:5370: checking for libintl.h" >&5 ++echo "configure:5366: checking for libintl.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5375 "configure" ++#line 5371 "configure" + #include "confdefs.h" + #include <libintl.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:5376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -5393,19 +5389,19 @@ + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 +-echo "configure:5397: checking for gettext in libc" >&5 ++echo "configure:5393: checking for gettext in libc" >&5 + if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5402 "configure" ++#line 5398 "configure" + #include "confdefs.h" + #include <libintl.h> + int main() { + return (int) gettext ("") + ; return 0; } + EOF +-if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + gt_cv_func_gettext_libc=yes + else +@@ -5421,7 +5417,7 @@ + + if test "$gt_cv_func_gettext_libc" != "yes"; then + echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 +-echo "configure:5425: checking for bindtextdomain in -lintl" >&5 ++echo "configure:5421: checking for bindtextdomain in -lintl" >&5 + ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5429,7 +5425,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5433 "configure" ++#line 5429 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -5440,7 +5436,7 @@ + bindtextdomain() + ; return 0; } + EOF +-if { (eval echo configure:5444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5456,12 +5452,12 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 +-echo "configure:5460: checking for gettext in libintl" >&5 ++echo "configure:5456: checking for gettext in libintl" >&5 + if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 +-echo "configure:5465: checking for gettext in -lintl" >&5 ++echo "configure:5461: checking for gettext in -lintl" >&5 + ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5469,7 +5465,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lintl $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5473 "configure" ++#line 5469 "configure" + #include "confdefs.h" + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -5480,7 +5476,7 @@ + gettext() + ; return 0; } + EOF +-if { (eval echo configure:5484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5519,7 +5515,7 @@ + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5523: checking for $ac_word" >&5 ++echo "configure:5519: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5553,12 +5549,12 @@ + for ac_func in dcgettext + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:5557: checking for $ac_func" >&5 ++echo "configure:5553: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5562 "configure" ++#line 5558 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -5581,7 +5577,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -5608,7 +5604,7 @@ + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5612: checking for $ac_word" >&5 ++echo "configure:5608: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5644,7 +5640,7 @@ + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5648: checking for $ac_word" >&5 ++echo "configure:5644: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5676,7 +5672,7 @@ fi -@@ -4249,98 +4435,7 @@ if test $ac_cv_sys_restartable_syscalls + cat > conftest.$ac_ext <<EOF +-#line 5680 "configure" ++#line 5676 "configure" + #include "confdefs.h" + + int main() { +@@ -5684,7 +5680,7 @@ + return _nl_msg_cat_cntr + ; return 0; } EOF +-if { (eval echo configure:5688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + CATOBJEXT=.gmo + DATADIRNAME=share +@@ -5707,7 +5703,7 @@ + + if test "$CATOBJEXT" = "NONE"; then + echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 +-echo "configure:5711: checking whether catgets can be used" >&5 ++echo "configure:5707: checking whether catgets can be used" >&5 + # Check whether --with-catgets or --without-catgets was given. + if test "${with_catgets+set}" = set; then + withval="$with_catgets" +@@ -5720,7 +5716,7 @@ + + if test "$nls_cv_use_catgets" = "yes"; then + echo $ac_n "checking for main in -li""... $ac_c" 1>&6 +-echo "configure:5724: checking for main in -li" >&5 ++echo "configure:5720: checking for main in -li" >&5 + ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -5728,14 +5724,14 @@ + ac_save_LIBS="$LIBS" + LIBS="-li $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 5732 "configure" ++#line 5728 "configure" + #include "confdefs.h" + int main() { + main() + ; return 0; } + EOF +-if { (eval echo configure:5739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -5763,12 +5759,12 @@ fi -- echo $ac_n "checking for AIX""... $ac_c" 1>&6 --echo "configure:4254: checking for AIX" >&5 --cat > conftest.$ac_ext <<EOF --#line 4256 "configure" --#include "confdefs.h" --#ifdef _AIX -- yes --#endif -- --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF --#define _ALL_SOURCE 1 --EOF -- --else -- rm -rf conftest* -- echo "$ac_t""no" 1>&6 --fi --rm -f conftest* -- -- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 --echo "configure:4277: checking for POSIXized ISC" >&5 --if test -d /etc/conf/kconfig.d && -- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 --then -- echo "$ac_t""yes" 1>&6 -- ISC=yes # If later tests want to check for ISC. -- cat >> confdefs.h <<\EOF --#define _POSIX_SOURCE 1 --EOF -- -- if test "$GCC" = yes; then -- CC="$CC -posix" -- else -- CC="$CC -Xp" -- fi --else -- echo "$ac_t""no" 1>&6 -- ISC= --fi -- ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 --echo "configure:4298: checking for minix/config.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext <<EOF --#line 4303 "configure" --#include "confdefs.h" --#include <minix/config.h> --EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- MINIX=yes --else -- echo "$ac_t""no" 1>&6 --MINIX= --fi -- --if test "$MINIX" = yes; then -- cat >> confdefs.h <<\EOF --#define _POSIX_SOURCE 1 --EOF -- -- cat >> confdefs.h <<\EOF --#define _POSIX_1_SOURCE 2 --EOF -- -- cat >> confdefs.h <<\EOF --#define _MINIX 1 --EOF -- --fi -- # Check whether --enable-powerflute or --disable-powerflute was given. -+ # Check whether --enable-powerflute or --disable-powerflute was given. - if test "${enable_powerflute+set}" = set; then - enableval="$enable_powerflute" - echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 + + echo $ac_n "checking for catgets""... $ac_c" 1>&6 +-echo "configure:5767: checking for catgets" >&5 ++echo "configure:5763: checking for catgets" >&5 + if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 5772 "configure" ++#line 5768 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char catgets(); below. */ +@@ -5791,7 +5787,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_catgets=yes" + else +@@ -5813,7 +5809,7 @@ + # Extract the first word of "gencat", so it can be a program name with args. + set dummy gencat; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5817: checking for $ac_word" >&5 ++echo "configure:5813: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5849,7 +5845,7 @@ + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5853: checking for $ac_word" >&5 ++echo "configure:5849: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5886,7 +5882,7 @@ + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5890: checking for $ac_word" >&5 ++echo "configure:5886: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5921,7 +5917,7 @@ + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5925: checking for $ac_word" >&5 ++echo "configure:5921: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -5980,7 +5976,7 @@ + # Extract the first word of "msgfmt", so it can be a program name with args. + set dummy msgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:5984: checking for $ac_word" >&5 ++echo "configure:5980: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6014,7 +6010,7 @@ + # Extract the first word of "gmsgfmt", so it can be a program name with args. + set dummy gmsgfmt; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6018: checking for $ac_word" >&5 ++echo "configure:6014: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6050,7 +6046,7 @@ + # Extract the first word of "xgettext", so it can be a program name with args. + set dummy xgettext; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6054: checking for $ac_word" >&5 ++echo "configure:6050: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6145,7 +6141,7 @@ + LINGUAS= + else + echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 +-echo "configure:6149: checking for catalogs to be installed" >&5 ++echo "configure:6145: checking for catalogs to be installed" >&5 + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in +@@ -6173,17 +6169,17 @@ + if test "$CATOBJEXT" = ".cat"; then + ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 +-echo "configure:6177: checking for linux/version.h" >&5 ++echo "configure:6173: checking for linux/version.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6182 "configure" ++#line 6178 "configure" + #include "confdefs.h" + #include <linux/version.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6259,12 +6255,12 @@ + for ac_func in wait waitpid wait3 + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6263: checking for $ac_func" >&5 ++echo "configure:6259: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6268 "configure" ++#line 6264 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -6287,7 +6283,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -6312,9 +6308,9 @@ + done + + echo $ac_n "checking for union wait""... $ac_c" 1>&6 +-echo "configure:6316: checking for union wait" >&5; ++echo "configure:6312: checking for union wait" >&5; + cat > conftest.$ac_ext <<EOF +-#line 6318 "configure" ++#line 6314 "configure" + #include "confdefs.h" + #include <sys/types.h> + #include <sys/wait.h> +@@ -6333,7 +6329,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + cat >> confdefs.h <<\EOF + #define HAVE_UNION_WAIT 1 +@@ -6375,12 +6371,12 @@ + for ac_func in snprintf + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6379: checking for $ac_func" >&5 ++echo "configure:6375: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6384 "configure" ++#line 6380 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -6403,7 +6399,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:6403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -6446,17 +6442,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6450: checking for $ac_hdr" >&5 ++echo "configure:6446: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6455 "configure" ++#line 6451 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -6489,17 +6485,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6493: checking for $ac_hdr" >&5 ++echo "configure:6489: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 6498 "configure" ++#line 6494 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:6499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* diff --git a/sysutils/apcupsd/patches/patch-ak b/sysutils/apcupsd/patches/patch-ak new file mode 100644 index 00000000000..765fa87b55c --- /dev/null +++ b/sysutils/apcupsd/patches/patch-ak @@ -0,0 +1,36 @@ +$NetBSD: patch-ak,v 1.1 2002/12/01 22:32:28 bouyer Exp $ + +--- examples/apcupsd.slave.conf.orig Sun Dec 1 13:18:09 2002 ++++ examples/apcupsd.slave.conf Sun Dec 1 13:21:27 2002 +@@ -33,11 +33,11 @@ + # + #DEVICE <string> /dev/<serial port> + # name of your serial port +-DEVICE /dev/ttyS0 ++DEVICE /dev/tty01 + # + #LOCKFILE <path to lockfile> + # path for serial port lock file +-LOCKFILE /var/lock ++LOCKFILE /var/spool/lock + # + # + # +@@ -91,7 +91,7 @@ + # + # If you want the last few EVENTS to be available over the network + # by the network information server, you must define an EVENTSFILE. +-EVENTSFILE /etc/apcupsd/apcupsd.events ++EVENTSFILE /var/log/apcupsd.events + # + # + # +@@ -102,7 +102,7 @@ + STATTIME 0 + # + # STATFILE +-STATFILE /etc/apcupsd/apcupsd.status ++STATFILE /var/run/apcupsd.status + # + # + # LOGSTATS [ on | off ] on enables, off disables diff --git a/sysutils/apcupsd/patches/patch-al b/sysutils/apcupsd/patches/patch-al new file mode 100644 index 00000000000..30395a284ba --- /dev/null +++ b/sysutils/apcupsd/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2002/12/01 22:32:28 bouyer Exp $ + +--- etc/changeme.in.orig Sun Dec 1 16:13:05 2002 ++++ etc/changeme.in Sun Dec 1 16:13:19 2002 +@@ -6,7 +6,7 @@ + # We send an email message to root to notify him. + # + SYSADMIN=root +-MAIL="/bin/mail" ++MAIL="mail" + + HOSTNAME=`hostname` + MSG="$HOSTNAME UPS battery needs changing NOW." diff --git a/sysutils/apcupsd/patches/patch-am b/sysutils/apcupsd/patches/patch-am new file mode 100644 index 00000000000..8d9df2e3ff6 --- /dev/null +++ b/sysutils/apcupsd/patches/patch-am @@ -0,0 +1,13 @@ +$NetBSD: patch-am,v 1.1 2002/12/01 22:32:29 bouyer Exp $ + +--- etc/commfailure.in.orig Sun Dec 1 16:13:19 2002 ++++ etc/commfailure.in Sun Dec 1 16:13:27 2002 +@@ -6,7 +6,7 @@ + # We send an email message to root to notify him. + # + SYSADMIN=root +-MAIL="/bin/mail" ++MAIL="mail" + + HOSTNAME=`hostname` + MSG="$HOSTNAME Serial port communications with UPS lost" diff --git a/sysutils/apcupsd/patches/patch-an b/sysutils/apcupsd/patches/patch-an new file mode 100644 index 00000000000..444c74d4216 --- /dev/null +++ b/sysutils/apcupsd/patches/patch-an @@ -0,0 +1,13 @@ +$NetBSD: patch-an,v 1.1 2002/12/01 22:32:29 bouyer Exp $ + +--- etc/commok.in.orig Sun Dec 1 16:13:27 2002 ++++ etc/commok.in Sun Dec 1 16:13:32 2002 +@@ -6,7 +6,7 @@ + # We send an email message to root to notify him. + # + SYSADMIN=root +-MAIL="/bin/mail" ++MAIL="mail" + + HOSTNAME=`hostname` + MSG="$HOSTNAME Serial port communications with UPS restored" diff --git a/sysutils/apcupsd/patches/patch-ao b/sysutils/apcupsd/patches/patch-ao new file mode 100644 index 00000000000..a4522949845 --- /dev/null +++ b/sysutils/apcupsd/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.1 2002/12/01 22:32:29 bouyer Exp $ + +--- etc/mainsback.in.orig Sun Dec 1 16:13:32 2002 ++++ etc/mainsback.in Sun Dec 1 16:13:37 2002 +@@ -6,7 +6,7 @@ + # We send an email message to root to notify him. + # + SYSADMIN=root +-MAIL="/bin/mail" ++MAIL="mail" + + HOSTNAME=`hostname` + MSG="$HOSTNAME Power has returned" diff --git a/sysutils/apcupsd/patches/patch-ap b/sysutils/apcupsd/patches/patch-ap new file mode 100644 index 00000000000..db720f680e5 --- /dev/null +++ b/sysutils/apcupsd/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.1 2002/12/01 22:32:29 bouyer Exp $ + +--- etc/onbattery.in.orig Sun Dec 1 16:13:37 2002 ++++ etc/onbattery.in Sun Dec 1 16:13:42 2002 +@@ -6,7 +6,7 @@ + # We send an email message to root to notify him. + # + SYSADMIN=root +-MAIL="/bin/mail" ++MAIL="mail" + + HOSTNAME=`hostname` + MSG="$HOSTNAME Power Failure !!!" |