Matthias Kilian wrote:
building the snmp PSEUDOFLAVOR, I get:
Error: 'make snmp' no longer exists.
Use './configure --with-snmp' instead.
Well, it doesn't really error out, but something's wrong here. Also,
is there any good reason to keep the PSEUDOFLAVR at all? If not,
please remove it and just build the -snmp subpackage unconditionally.
attached is a revised diff.
Index: sysutils/nut/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/nut/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- sysutils/nut/Makefile 18 May 2007 12:22:45 -0000 1.22
+++ sysutils/nut/Makefile 26 Aug 2007 14:41:22 -0000
@@ -4,15 +4,15 @@
COMMENT-cgi= "CGIs for monitoring Nut-based UPSs"
COMMENT-snmp= "driver for monitoring UPSs via SNMP"
-DISTNAME= nut-2.0.5
+DISTNAME= nut-2.2.0
PKGNAME-cgi= ${DISTNAME:S/-/-cgi-/}
-PKGNAME-snmp= ${DISTNAME:S/-/-snmp-}
+PKGNAME-snmp= ${DISTNAME:S/-/-snmp-/}
CATEGORIES= sysutils
HOMEPAGE= http://www.networkupstools.org/
MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
-MASTER_SITES= http://random.networkupstools.org/source/2.0/
+MASTER_SITES= ${HOMEPAGE}source/2.2/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -26,30 +26,34 @@
NUT_ID= 529
SUBST_VARS= WEB_ROOT NUT_USER NUT_ID
-CONFIGURE_STYLE= gnu old
+CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --sysconfdir=${SYSCONFDIR}/nut \
--datadir=${PREFIX}/share/ups \
--mandir=${PREFIX}/man \
--with-statepath=/var/db/nut \
--with-user=${NUT_USER} \
+ --with-group=${NUT_USER} \
--with-ssl \
--enable-strip
-
ALL_TARGET= all
INSTALL_TARGET= install
-PSEUDO_FLAVORS= no_cgi snmp
+PSEUDO_FLAVORS= snmp
FLAVOR?=
-MULTI_PACKAGES= -main
-.if !${FLAVOR:L:Mno_cgi}
-MULTI_PACKAGES+= -cgi
-.endif
+MULTI_PACKAGES= -main -cgi
.if ${FLAVOR:L:Msnmp}
MULTI_PACKAGES+= -snmp
.endif
+LIB_DEPENDS-main= usb::devel/libusb
+
PREFIX-cgi= ${WEB_ROOT}
-WANTLIB-cgi=
+LIB_DEPENDS-cgi= gd::graphics/gd \
+ iconv::converters/libiconv \
+ jpeg::graphics/jpeg
+
+WANTLIB-cgi= X11 Xau Xdmcp c crypto expat fontconfig freetype m
+WANTLIB-cgi+= ssl z png
LIB_DEPENDS-snmp= netsnmp::net/net-snmp
@@ -58,16 +62,9 @@
CONFIGURE_ARGS+= --with-cgi \
--with-cgipath="${WEB_ROOT}/cgi-bin/nut" \
- --with-gd-libs="-L${PREFIX}/lib -lgd -lpng -lz -ljpeg
-lm" \
+ --with-gd-libs="-L/usr/X11R6/lib -L${PREFIX}/lib \
+ -lgd -lpng -lz -ljpeg -lm -lfreetype -lX11" \
--with-gd-includes="-I${PREFIX}/include"
-
-ALL_TARGET+= cgi
-INSTALL_TARGET+= install-cgi
-.endif
-
-.if ${MULTI_PACKAGES:M-snmp}
-ALL_TARGET+= snmp
-INSTALL_TARGET+= install-snmp
.endif
NO_REGRESS= Yes
@@ -77,13 +74,15 @@
cp -R ${WRKSRC}/docs/* ${PREFIX}/share/doc/nut/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nut/
.for file in upsmon.conf upsd.conf upsd.users upssched.conf ups.conf
- ${INSTALL_DATA} ${WRKBUILD}/conf/${file} ${PREFIX}/share/examples/nut/
+ ${INSTALL_DATA} ${WRKBUILD}/conf/${file}.sample \
+ ${PREFIX}/share/examples/nut/${file}
.endfor
# Yes, we install the CGI config files even if we're not building CGI support,
# it will get properly handled by packaging.
${INSTALL_DATA_DIR} ${WRKINST}${WEB_ROOT}/conf/nut/
.for file in hosts.conf upsset.conf upsstats.html upsstats-single.html
- ${INSTALL_DATA} ${WRKBUILD}/conf/${file}
${WRKINST}${WEB_ROOT}/conf/nut/${file}.sample
+ ${INSTALL_DATA} ${WRKBUILD}/conf/${file}.sample \
+ ${WRKINST}${WEB_ROOT}/conf/nut/${file}.sample
.endfor
.include <bsd.port.mk>
Index: sysutils/nut/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/nut/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- sysutils/nut/distinfo 18 May 2007 12:22:45 -0000 1.9
+++ sysutils/nut/distinfo 26 Aug 2007 14:41:22 -0000
@@ -1,5 +1,5 @@
-MD5 (nut-2.0.5.tar.gz) = sI/ehhkRVLvP2oYPlaXcog==
-RMD160 (nut-2.0.5.tar.gz) = 5fkKc5MuA409/ujLMvrwl9mafgs=
-SHA1 (nut-2.0.5.tar.gz) = 0sB63qxSS4RjZ3x1apDy8iCE814=
-SHA256 (nut-2.0.5.tar.gz) = Xhv+z8pSgQTbcCUFDIEljuIGIN90l6tZiK1GHZUcggM=
-SIZE (nut-2.0.5.tar.gz) = 809006
+MD5 (nut-2.2.0.tar.gz) = o1cFFdgIBAUdTnYx6KPrEg==
+RMD160 (nut-2.2.0.tar.gz) = 1ODlAjm6KwIAYERYabbTZKVgkvQ=
+SHA1 (nut-2.2.0.tar.gz) = uAFzANQcCnqUYDTPC9uSrYtzZ6k=
+SHA256 (nut-2.2.0.tar.gz) = 5nD/e1GmUv1hRyql+loe1HMLVBFnEGi+RWVR6kYJQSA=
+SIZE (nut-2.2.0.tar.gz) = 1173801
Index: sysutils/nut/patches/patch-Makefile_in
===================================================================
RCS file: sysutils/nut/patches/patch-Makefile_in
diff -N sysutils/nut/patches/patch-Makefile_in
--- sysutils/nut/patches/patch-Makefile_in 27 Sep 2004 03:10:24 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2004/09/27 03:10:24 marcm Exp $
---- Makefile.in.orig Mon Mar 8 02:00:02 2004
-+++ Makefile.in Thu Sep 16 08:51:48 2004
-@@ -50,6 +50,7 @@ install-bin:
-
- install-man:
- @cd man; $(MAKE) install; cd ..;
-+ @cd man; $(MAKE) install-cgi-man; cd ..;
-
- install-conf:
- cd conf; $(MAKE) install; cd ..
Index: sysutils/nut/patches/patch-clients_Makefile_in
===================================================================
RCS file: sysutils/nut/patches/patch-clients_Makefile_in
diff -N sysutils/nut/patches/patch-clients_Makefile_in
--- sysutils/nut/patches/patch-clients_Makefile_in 3 May 2006 17:32:09
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-clients_Makefile_in,v 1.5 2006/05/03 17:32:09 henning Exp $
---- clients/Makefile.in.orig Wed May 4 11:36:36 2005
-+++ clients/Makefile.in Mon May 1 17:40:26 2006
-@@ -58,13 +58,13 @@ upslog: upslog.c $(UPSCLI_OBJ) $(LIBDEP)
- $(CC) $(NET_CFLAGS) -o upslog upslog.c $(UPSCLI_OBJ) $(LIBOBJ)
$(NET_LDFLAGS)
-
- upsstats.cgi: upsstats.c $(UPSCLI_OBJ) cgilib.o $(LIBDEP)
-- $(CC) $(NET_CFLAGS) -o upsstats.cgi upsstats.c $(UPSCLI_OBJ) cgilib.o
$(LIBOBJ) $(NET_LDFLAGS)
-+ $(CC) $(NET_CFLAGS) -o upsstats.cgi upsstats.c $(UPSCLI_OBJ) cgilib.o
$(LIBOBJ) $(NET_LDFLAGS) -static
-
- upsimage.cgi: upsimage.c $(UPSCLI_OBJ) cgilib.o $(LIBDEP)
-- $(CC) $(NET_CFLAGS) $(GD_INCLUDES) -o upsimage.cgi upsimage.c
$(UPSCLI_OBJ) cgilib.o $(GD_LIBS) $(LIBOBJ) $(NET_LDFLAGS)
-+ $(CC) $(NET_CFLAGS) $(GD_INCLUDES) -o upsimage.cgi upsimage.c
$(UPSCLI_OBJ) cgilib.o $(GD_LIBS) $(LIBOBJ) $(NET_LDFLAGS) -static
-
- upsset.cgi: upsset.c $(UPSCLI_OBJ) cgilib.o $(LIBDEP)
-- $(CC) $(NET_CFLAGS) -o upsset.cgi upsset.c $(UPSCLI_OBJ) cgilib.o
$(LIBOBJ) $(NET_LDFLAGS)
-+ $(CC) $(NET_CFLAGS) -o upsset.cgi upsset.c $(UPSCLI_OBJ) cgilib.o
$(LIBOBJ) $(NET_LDFLAGS) -static
-
- upsmon: upsmon.c $(UPSCLI_OBJ) $(LIBDEP)
- $(CC) $(NET_CFLAGS) -o upsmon upsmon.c $(UPSCLI_OBJ) $(LIBOBJ)
$(NET_LDFLAGS)
Index: sysutils/nut/patches/patch-clients_upsset_c
===================================================================
RCS file: /cvs/ports/sysutils/nut/patches/patch-clients_upsset_c,v
retrieving revision 1.5
diff -u -r1.5 patch-clients_upsset_c
--- sysutils/nut/patches/patch-clients_upsset_c 18 May 2007 12:22:46 -0000
1.5
+++ sysutils/nut/patches/patch-clients_upsset_c 26 Aug 2007 14:41:22 -0000
@@ -1,18 +1,18 @@
$OpenBSD: patch-clients_upsset_c,v 1.5 2007/05/18 12:22:46 henning Exp $
---- clients/upsset.c.orig Mon Jul 10 14:33:14 2006
-+++ clients/upsset.c Fri May 18 13:54:23 2007
-@@ -202,7 +202,7 @@ static void do_pickups(const char *currfunc)
+--- clients/upsset.c.orig Sat May 26 16:24:26 2007
++++ clients/upsset.c Wed Aug 1 12:59:05 2007
+@@ -192,7 +192,7 @@ static void do_pickups(const char *currfunc)
char hostfn[SMALLBUF];
- PCONF_CTX ctx;
+ PCONF_CTX_t ctx;
- snprintf(hostfn, sizeof(hostfn), "%s/hosts.conf", confpath());
+ snprintf(hostfn, sizeof(hostfn), "%s/hosts.conf", cgiconfpath());
printf("<FORM METHOD=\"POST\" ACTION=\"upsset.cgi\">\n");
-@@ -989,7 +989,7 @@ static void check_conf(void)
+@@ -979,7 +979,7 @@ static void check_conf(void)
char fn[SMALLBUF];
- PCONF_CTX ctx;
+ PCONF_CTX_t ctx;
- snprintf(fn, sizeof(fn), "%s/upsset.conf", confpath());
+ snprintf(fn, sizeof(fn), "%s/upsset.conf", cgiconfpath());
Index: sysutils/nut/patches/patch-clients_upsstats_c
===================================================================
RCS file: /cvs/ports/sysutils/nut/patches/patch-clients_upsstats_c,v
retrieving revision 1.4
diff -u -r1.4 patch-clients_upsstats_c
--- sysutils/nut/patches/patch-clients_upsstats_c 18 May 2007 12:22:46
-0000 1.4
+++ sysutils/nut/patches/patch-clients_upsstats_c 26 Aug 2007 14:41:22
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-clients_upsstats_c,v 1.4 2007/05/18 12:22:46 henning Exp $
---- clients/upsstats.c.orig Wed Nov 8 03:08:45 2006
-+++ clients/upsstats.c Fri May 18 13:54:23 2007
-@@ -830,7 +830,7 @@ static void display_template(const char *tfn)
+--- clients/upsstats.c.orig Sat May 26 16:24:26 2007
++++ clients/upsstats.c Wed Aug 1 12:59:05 2007
+@@ -824,7 +824,7 @@ static void display_template(const char *tfn)
{
char fn[SMALLBUF], buf[LARGEBUF];
@@ -10,9 +10,9 @@
tf = fopen(fn, "r");
-@@ -970,7 +970,7 @@ static void load_hosts_conf(void)
+@@ -956,7 +956,7 @@ static void load_hosts_conf(void)
char fn[SMALLBUF];
- PCONF_CTX ctx;
+ PCONF_CTX_t ctx;
- snprintf(fn, sizeof(fn), "%s/hosts.conf", CONFPATH);
+ snprintf(fn, sizeof(fn), "%s/hosts.conf", cgiconfpath());
Index: sysutils/nut/patches/patch-common_common_c
===================================================================
RCS file: /cvs/ports/sysutils/nut/patches/patch-common_common_c,v
retrieving revision 1.3
diff -u -r1.3 patch-common_common_c
--- sysutils/nut/patches/patch-common_common_c 18 May 2007 12:22:46 -0000
1.3
+++ sysutils/nut/patches/patch-common_common_c 26 Aug 2007 14:41:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-common_common_c,v 1.3 2007/05/18 12:22:46 henning Exp $
---- common/common.c.orig Thu Jan 4 21:19:27 2007
-+++ common/common.c Thu Jan 18 00:41:08 2007
-@@ -287,6 +287,17 @@ const char * confpath(void)
+--- common/common.c.orig Sun May 27 16:07:56 2007
++++ common/common.c Wed Aug 1 12:59:05 2007
+@@ -301,6 +301,17 @@ const char * confpath(void)
return path;
}
Index: sysutils/nut/patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/nut/patches/patch-configure,v
retrieving revision 1.8
diff -u -r1.8 patch-configure
--- sysutils/nut/patches/patch-configure 18 May 2007 12:22:46 -0000
1.8
+++ sysutils/nut/patches/patch-configure 26 Aug 2007 14:41:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2007/05/18 12:22:46 henning Exp $
---- configure.orig Wed Jan 3 15:17:48 2007
-+++ configure Thu Jan 18 00:41:08 2007
-@@ -8120,7 +8120,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig Thu Jul 5 15:21:20 2007
++++ configure Wed Aug 1 12:59:05 2007
+@@ -23608,7 +23608,7 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <openssl/ssl.h>
int
Index: sysutils/nut/patches/patch-drivers_bcmxcp_c
===================================================================
RCS file: sysutils/nut/patches/patch-drivers_bcmxcp_c
diff -N sysutils/nut/patches/patch-drivers_bcmxcp_c
--- sysutils/nut/patches/patch-drivers_bcmxcp_c 18 May 2007 12:22:46 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
---- drivers/bcmxcp.c.orig Fri May 18 13:57:40 2007
-+++ drivers/bcmxcp.c Fri May 18 13:57:26 2007
-@@ -732,18 +732,6 @@ void upsdrv_initinfo(void)
- /* Set driver version info */
- dstate_setinfo("driver.version.internal", "%s", DRV_VERSION);
-
-- /* Get information on Phases from UPS */
-- res = command_read_sequence(PW_UPS_TOP_DATA_REQ, answer);
-- if (res <= 0)
-- fatal_with_errno("Could not communicate with the ups");
--
-- nphases = (answer[0] & 0x0F) +1;
-- dstate_setinfo("input.phases", "%d", nphases);
--
--
-- /* Init BCM/XCP <-> NUT meter map */
-- init_meter_map();
--
- /* Init BCM/XCP alarm descriptions */
- init_alarm_map();
-
-@@ -786,8 +774,15 @@ void upsdrv_initinfo(void)
- }
- dstate_setinfo("ups.power.nominal", "%d", iRating);
-
-- /* Skip UPS' number of phases and phase angle, as NUT do not care */
-- iIndex += 2;
-+ /* Get information on Phases from UPS */
-+ nphases = (answer[iIndex++]);
-+ dstate_setinfo("output.phases", "%d", nphases);
-+
-+ /* Init BCM/XCP <-> NUT meter map */
-+ init_meter_map();
-+
-+ /* Skip UPS' phase angle, as NUT do not care */
-+ iIndex += 1;
-
- /* Get length of UPS description */
- len = answer[iIndex++];
Index: sysutils/nut/patches/patch-drivers_fentonups_c
===================================================================
RCS file: sysutils/nut/patches/patch-drivers_fentonups_c
diff -N sysutils/nut/patches/patch-drivers_fentonups_c
--- sysutils/nut/patches/patch-drivers_fentonups_c 18 May 2007 12:22:46
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,142 +0,0 @@
-$OpenBSD: patch-drivers_fentonups_c,v 1.3 2007/05/18 12:22:46 henning Exp $
---- drivers/fentonups.c.orig Tue Dec 19 04:18:58 2006
-+++ drivers/fentonups.c Fri May 18 13:54:23 2007
-@@ -34,14 +34,17 @@ static float lowvolt = 0, voltrange, chrglow = 0,
chrg
- static int lownorm, highnorm;
-
- /* handle devices which don't give a properly formatted I string */
--static int check_mtab2(const char *raw)
-+static int check_mtab2(const char *raw, int israw)
- {
- int i;
- char *cooked;
-
-- /* trim off the leading # and any trailing spaces */
-- cooked = xstrdup(&raw[1]);
-- rtrim(cooked, ' ');
-+ if (israw) {
-+ /* trim off the leading # and any trailing spaces */
-+ cooked = xstrdup(&raw[1]);
-+ rtrim(cooked, ' ');
-+ } else
-+ cooked = xstrdup(raw);
-
- for (i = 0; mtab2[i].id != NULL; i++) {
- if (!strcmp(cooked, mtab2[i].id)) {
-@@ -77,7 +80,7 @@ static void guessmodel(const char *raw)
- char mch, *mstr;
-
- /* first see if it's in the mtab2 */
-- if (check_mtab2(raw))
-+ if (check_mtab2(raw, 1))
- return;
-
- mch = raw[17];
-@@ -179,28 +182,36 @@ static char *get_id(void)
- void upsdrv_initinfo(void)
- {
- int modelnum, i, ret;
-- char temp[256], model[32], *raw;
-+ char temp[256], qmodel[32], *model, *raw = NULL;
-
-- raw = get_id();
-+ model = getval("model");
-
-- if (!raw)
-- fatalx("Unable to detect a Fenton or Megatec protocol UPS");
-+ if (!model) {
-+ raw = get_id();
-
-- snprintf(temp, sizeof(temp), "%s", raw);
-+ if (!raw)
-+ fatalx("Unable to detect a Fenton or Megatec protocol
UPS");
-
-- temp[11] = 0;
-- temp[27] = 0;
-+ snprintf(temp, sizeof(temp), "%s", raw);
-
-- /* manufacturer */
-- rtrim(&temp[1], ' ');
-- dstate_setinfo("ups.mfr", "%s", &temp[1]);
-+ temp[11] = 0;
-+ temp[27] = 0;
-
-- /* L660A = PowerPal (L) @ 660 VA, American (A) version (115V) */
-+ /* manufacturer */
-+ rtrim(&temp[1], ' ');
-+ dstate_setinfo("ups.mfr", "%s", &temp[1]);
-
-- /* grab full model string */
-- rtrim(&temp[17], ' ');
-- snprintf(model, sizeof(model), "%s", &temp[17]);
-+ /* L660A = PowerPal (L) @ 660 VA, American (A) version (115V) */
-
-+ /* grab full model string */
-+ rtrim(&temp[17], ' ');
-+ snprintf(qmodel, sizeof(qmodel), "%s", &temp[17]);
-+ model = qmodel;
-+ }
-+
-+ if (!model)
-+ fatalx("unable to determine model");
-+
- modelnum = -1;
-
- /* figure out official model name and voltage info from table */
-@@ -216,20 +227,27 @@ void upsdrv_initinfo(void)
- }
- }
-
-- /* table lookup fails -> guess */
-- if (modelnum == -1)
-- guessmodel(raw);
-- else {
-- dstate_setinfo("ups.model", "%s", modeltab[modelnum].desc);
-+ if (model && modelnum == -1)
-+ if (check_mtab2(model, 0) == 0)
-+ fatalx("no such model: %s", model);
-
-- dstate_setinfo("input.transfer.low", "%d",
-- modeltab[modelnum].lowxfer);
-+ if (raw) {
-+ /* table lookup fails -> guess */
-+ if (modelnum == -1)
-+ guessmodel(raw);
-+ else {
-+ dstate_setinfo("ups.model", "%s",
-+ modeltab[modelnum].desc);
-
-- dstate_setinfo("input.transfer.high", "%d",
-- modeltab[modelnum].highxfer);
-+ dstate_setinfo("input.transfer.low", "%d",
-+ modeltab[modelnum].lowxfer);
-
-- lownorm = modeltab[modelnum].lownorm;
-- highnorm = modeltab[modelnum].highnorm;
-+ dstate_setinfo("input.transfer.high", "%d",
-+ modeltab[modelnum].highxfer);
-+
-+ lownorm = modeltab[modelnum].lownorm;
-+ highnorm = modeltab[modelnum].highnorm;
-+ }
- }
-
- /* now add instant command support info */
-@@ -237,7 +255,8 @@ void upsdrv_initinfo(void)
- dstate_addcmd("test.battery.stop");
-
- printf("Detected %s on %s\n", dstate_getinfo("ups.model"), device_path);
-- free(raw);
-+ if (raw)
-+ free(raw);
-
- /* paranoia - cancel any shutdown that might already be running */
- ret = ser_send(upsfd, "C\r");
-@@ -426,6 +445,7 @@ void upsdrv_help(void)
- void upsdrv_makevartable(void)
- {
- addvar(VAR_VALUE, "lowbattvolt", "Set low battery level, in volts");
-+ addvar(VAR_VALUE, "model", "force model");
- }
-
- void upsdrv_banner(void)
Index: sysutils/nut/patches/patch-drivers_fentonups_h
===================================================================
RCS file: sysutils/nut/patches/patch-drivers_fentonups_h
diff -N sysutils/nut/patches/patch-drivers_fentonups_h
--- sysutils/nut/patches/patch-drivers_fentonups_h 18 May 2007 12:22:46
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-drivers_fentonups_h,v 1.3 2007/05/18 12:22:46 henning Exp $
---- drivers/fentonups.h.orig Wed Nov 8 03:08:45 2006
-+++ drivers/fentonups.h Thu Jan 18 00:41:08 2007
-@@ -109,5 +109,8 @@ struct {
- { "UNITEK Alph1000iS A0", "Unitek", "Alpha 1000is",
- 9.6, 2.4, 9.6, 2.4, 158, 172, 288, 290, 0 },
-
-+ { "XS3000R", "Online", "Xanto S3000R",
-+ 1.81, 0.44, 1.81, 0.44, 165, 200, 240, 275, 1 },
-+
- { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0 }
- };
Index: sysutils/nut/patches/patch-include_common_h
===================================================================
RCS file: /cvs/ports/sysutils/nut/patches/patch-include_common_h,v
retrieving revision 1.4
diff -u -r1.4 patch-include_common_h
--- sysutils/nut/patches/patch-include_common_h 18 May 2007 12:22:46 -0000
1.4
+++ sysutils/nut/patches/patch-include_common_h 26 Aug 2007 14:41:22 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-include_common_h,v 1.4 2007/05/18 12:22:46 henning Exp $
---- include/common.h.orig Thu Jan 4 21:19:27 2007
-+++ include/common.h Thu Jan 18 00:41:09 2007
-@@ -81,6 +81,9 @@ void syslogbit_set(void);
+--- include/common.h.orig Sun May 27 16:07:56 2007
++++ include/common.h Wed Aug 1 12:59:20 2007
+@@ -82,6 +82,9 @@ void syslogbit_set(void);
/* Return the default path for the directory containing configuration files */
const char * confpath(void);
Index: sysutils/nut/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/sysutils/nut/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- sysutils/nut/pkg/PLIST-main 18 May 2007 12:22:46 -0000 1.2
+++ sysutils/nut/pkg/PLIST-main 26 Aug 2007 14:41:22 -0000
@@ -8,29 +8,28 @@
bin/al175
bin/apcsmart
bin/bcmxcp
+bin/bcmxcp_usb
bin/belkin
bin/belkinunv
bin/bestfcom
bin/bestuferrups
bin/bestups
-bin/blazer
bin/cpsups
bin/cyberpower
-bin/esupssmart
+bin/dummy-ups
bin/etapro
bin/everups
-bin/fentonups
bin/gamatronic
bin/genericups
-bin/ippon
bin/isbmex
bin/liebert
bin/masterguard
bin/megatec
+bin/megatec_usb
bin/metasys
bin/mge-shut
bin/mge-utalk
-bin/mustek
+bin/newmge-shut
bin/nitram
bin/oneac
bin/optiups
@@ -38,9 +37,10 @@
bin/powerpanel
bin/rhino
bin/safenet
-bin/sms
+bin/skel
bin/solis
bin/tripplite
+bin/tripplite_usb
bin/tripplitesu
bin/upsc
bin/upscmd
@@ -48,6 +48,8 @@
bin/upsdrvctl
bin/upslog
bin/upsrw
+bin/upssched-cmd
+bin/usbhid-ups
bin/victronups
@comment html/
@comment html/bottom.html
@@ -65,6 +67,7 @@
@man man/man8/al175.8
@man man/man8/apcsmart.8
@man man/man8/bcmxcp.8
[EMAIL PROTECTED] man/man8/bcmxcp_usb.8
@man man/man8/belkin.8
@man man/man8/belkinunv.8
@man man/man8/bestfcom.8
@@ -75,27 +78,27 @@
@man man/man8/dummy-ups.8
@man man/man8/etapro.8
@man man/man8/everups.8
[EMAIL PROTECTED] man/man8/fentonups.8
[EMAIL PROTECTED] man/man8/gamatronic.8
@man man/man8/genericups.8
[EMAIL PROTECTED] man/man8/ippon.8
@man man/man8/isbmex.8
@man man/man8/liebert.8
@man man/man8/masterguard.8
@man man/man8/megatec.8
[EMAIL PROTECTED] man/man8/megatec_usb.8
@man man/man8/metasys.8
@man man/man8/mge-shut.8
@man man/man8/mge-utalk.8
[EMAIL PROTECTED] man/man8/mustek.8
@man man/man8/nitram.8
@man man/man8/nutupsdrv.8
@man man/man8/oneac.8
@man man/man8/optiups.8
@man man/man8/powercom.8
@man man/man8/powerpanel.8
[EMAIL PROTECTED] man/man8/rhino.8
@man man/man8/safenet.8
[EMAIL PROTECTED] man/man8/sms.8
@man man/man8/solis.8
@man man/man8/tripplite.8
[EMAIL PROTECTED] man/man8/tripplite_usb.8
@man man/man8/tripplitesu.8
@man man/man8/upsc.8
@man man/man8/upscmd.8
@@ -109,12 +112,16 @@
@man man/man8/upssched.8
@man man/man8/upsset.cgi.8
@man man/man8/upsstats.cgi.8
[EMAIL PROTECTED] man/man8/usbhid-ups.8
@man man/man8/victronups.8
sbin/upsd
sbin/upsmon
sbin/upssched
share/doc/nut/
share/doc/nut/FAQ
+share/doc/nut/Makefile
+share/doc/nut/Makefile.am
+share/doc/nut/Makefile.in
share/doc/nut/README
share/doc/nut/acpi.txt
share/doc/nut/al175-vars.txt
@@ -138,9 +145,11 @@
share/doc/nut/developers.txt
share/doc/nut/hid-subdrivers.txt
share/doc/nut/ideas.txt
+share/doc/nut/macros.txt
share/doc/nut/megatec.txt
share/doc/nut/new-drivers.txt
share/doc/nut/new-names.txt
+share/doc/nut/nut-hal.txt
share/doc/nut/osd-notify.txt
share/doc/nut/pager.txt
share/doc/nut/powersaving.txt
