head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.7.0.4 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.4.0.6 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.2 pkgviews-base:1.4 buildlink2:1.3.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.1; locks; strict; comment @# @; 1.8 date 2004.02.15.13.14.25; author lukem; state dead; branches; next 1.7; 1.7 date 2002.12.31.22.47.07; author lukem; state Exp; branches; next 1.6; 1.6 date 2002.12.13.04.23.20; author lukem; state dead; branches; next 1.5; 1.5 date 2002.08.25.21.51.06; author jlam; state Exp; branches; next 1.4; 1.4 date 2002.05.13.14.40.51; author lukem; state Exp; branches; next 1.3; 1.3 date 2001.11.21.03.22.05; author simonb; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2001.09.28.04.37.28; author lukem; state dead; branches; next 1.1; 1.1 date 2001.03.11.16.22.08; author martin; state Exp; branches; next ; 1.3.2.1 date 2002.06.23.19.01.13; author jlam; state Exp; branches; next ; desc @@ 1.8 log @Update to ups-nut 1.4.1. Many changes, including * various configuation file format changes * most UPS drivers enhanced * upsmon/upssched support a lockfile * chroot jails supported * various bugfixes (Refer to http://random.networkupstools.org/source/1.4/new-1.4.1.txt for more information) pkg update based on work sent in private email by Daniel Farrugia, with various fixes by me. @ text @$NetBSD: patch-ag,v 1.7 2002/12/31 22:47:07 lukem Exp $ --- drivers/newapc.h.orig Tue Aug 20 17:06:26 2002 +++ drivers/newapc.h @@@@ -119,7 +119,7 @@@@ struct apc_cmdtab_t { {INFO_MINUTIL, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'N'}, {INFO_OUTVOLT, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'O'}, {INFO_SLFTSTRES,0, 0, APC_POLL, NULL, NULL, 'X'}, - {INFO_BATT_RUNTIME,0, 0, APC_POLL|APC_F_MINUTES, NULL, NULL, 'j'}, + {INFO_RUNTIME, 0, 0, APC_POLL|APC_F_SECONDS, NULL, NULL, 'j'}, {INFO_MFRDATE, 0, 0, 0, NULL, NULL, 'm'}, {INFO_TEMPMAX, 0, 0, APC_F_CELCIUS, NULL, NULL, '['}, {INFO_TEMPMIN, 0, 0, APC_F_CELCIUS, NULL, NULL, ']'}, @ 1.7 log @Convert back to supporting INFO_RUNTIME instead of INFO_BATT_RUNTIME. I *really* dislike how newapc changed from supporting INFO_RUNTIME (runtime in minutes, which is what the UPS actually reports) to INFO_BATT_RUNTIME (runtime in seconds, which is UPS result * 60), because the latter is much less useful as a realistic guess (IMHO), and because this broke my upslog format and ups monitoring stuff that used '%VAR runtime'. (Unfortunately, newapc is written in a way which precludes supporting multiple results from the same 'UPS status code' (in this case `j'), so we can't support both results at this time. I decided that INFO_RUNTIME is more useful, because '81' (minutes) is easier to "use" than '4860' (seconds)) @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update from nut 0.50.0 to 1.2.1. Many changes, too many to list here. See: http://www.exploits.org/nut/release/1.2/new-1.2.1.txt and (after installation): /usr/pkg/share/doc/nut/UPGRADING @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.5 2002/08/25 21:51:06 jlam Exp $ d3 11 a13 19 --- models/Makefile.in.orig Tue Mar 26 10:30:31 2002 +++ models/Makefile.in @@@@ -2,6 +2,7 @@@@ # directories MODELPATH = $(INSTALLROOT)@@MODELPATH@@ +SBINPATH = $(INSTALLROOT)@@prefix@@/@@sbindir@@ # other definitions CC = @@CC@@ @@@@ -97,7 +98,7 @@@@ # Install handlers install: all install-@@DRIVER_INSTALL_TARGET@@ - $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(MODELPATH); + $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH); # Install every driver @ 1.5 log @Merge packages from the buildlink2 branch back into the main trunk that have been converted to USE_BUILDLINK2. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.3.2.1 2002/06/23 19:01:13 jlam Exp $ @ 1.4 log @Update ups-nut from 0.45.3 to 0.45.5. Notable changes: - upsd.users(5) has changed formats. NOTE: you need to update your file for upsd(8) to function - upsmon can reload its configuration on the fly (with '-c reload') - upsdrvctl can power off UPS's in an orderly fashion - new drivers: - tripplite - Tripp-Lite SmartUPS models - newvictron - IMV/Victron hardware - bestferrups801-807 - Best FerrUPS 8.01-8.07 firmware - genericups type 14 - for Online P-series units - upsdrvctl now waits up to "maxstartdelay" (default 45) seconds for a driver to start before it gives up and goes to the next entry (refer to CHANGES in the distribution, or http://www.exploits.org/nut/release/new-0.45.4.txt and http://www.exploits.org/nut/release/new-0.45.5.txt for a detailed list) @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Move the individual UPS drivers from ${PREFIX}/bin to ${PREFIX}/sbin/ups-drivers. @ text @d3 3 a5 4 --- models/Makefile.in.orig Wed Aug 29 21:40:53 2001 +++ models/Makefile.in Wed Nov 21 02:52:43 2001 @@@@ -1,7 +1,9 @@@@ # Network UPS Tools: models a7 1 +prefix = $(INSTALLROOT)@@prefix@@ d9 1 a9 1 +SBINPATH = $(prefix)/@@sbindir@@ d13 8 a20 2 @@@@ -85,6 +87,8 @@@@ distclean: clean a21 7 install: all - @@for f in $(PROGS) $(PROGS2) upsdrvctl ; do \ + $(INSTALLCMD) -m 0755 -d $(MODELPATH) + @@for f in $(PROGS) $(PROGS2) ; do \ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \ done + @@$(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH) @ 1.3.2.1 log @Merge from pkgsrc-current to buildlink2 branch. @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.4 2002/05/13 14:40:51 lukem Exp $ d3 4 a6 3 --- models/Makefile.in.orig Tue Mar 26 10:30:31 2002 +++ models/Makefile.in @@@@ -2,6 +2,7 @@@@ d9 1 d11 1 a11 1 +SBINPATH = $(INSTALLROOT)@@prefix@@/@@sbindir@@ d15 2 a16 8 @@@@ -97,7 +98,7 @@@@ # Install handlers install: all install-@@DRIVER_INSTALL_TARGET@@ - $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(MODELPATH); + $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(SBINPATH); # Install every driver d18 7 @ 1.2 log @update from 0.44.3-pre5 to 0.45.1 (with an extra vendor patch). changes include: - ups info moved to ups.conf instead of upsd.conf - unified driver control between ups drivers - upsmon doesn't run as root by default any more; most of the work is done by an unprivileged child, with a parent only accepting shutdown messages - more model support: - AEG Proect S. - aeg - SMS Ltda (Brazillian) - sms - SOLA 620 - bestups - Ever UPS - everups - various other improvements and bugfixes see http://www.exploits.org/nut/release/new-0.45.1.txt for more details) @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.1 2001/03/11 16:22:08 martin Exp $ d3 22 a24 11 --- models/mge-ellipse.c.orig Tue Feb 27 05:36:19 2001 +++ models/mge-ellipse.c Sun Mar 11 17:13:07 2001 @@@@ -695,7 +695,7 @@@@ start = buf; fprintf(stderr,"%s: (%d bytes)\n", msg, len); while (len > 0) { - snprintf(line, sizeof(line), "%08x: ", buf - start); + snprintf(line, sizeof(line), "%08lx: ", (unsigned long)(buf - start)); out = line + 10; for (i = 0, pc = buf, nlocal = len; i < 16; i++, pc++) { @ 1.1 log @Make this LP64 save. @ text @d1 1 a1 1 $NetBSD$ @