update to nut-2.2.2, which contains the old agiler driver from 2.2.0

(now called agiler-old) upses such as the below can now work again: {0x0665, 0x5161, &agiler_old_subdriver}, /* Belkin F6C1200-UNV */ {0x06da, 0x0003, &agiler_old_subdriver}, /* Mustek Powermust */ {0x0f03, 0x0001, &agiler_old_subdriver}, /* Unitek Alpha 1200Sx * ok sthen@
2008-09-08 19:38:30 +00:00 · 2008-09-08 19:38:30 +00:00 · f025b2164e
commit f025b2164e
parent f1914d77e7
9 changed files with 91 additions and 80 deletions
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.26 2008/02/03 18:06:41 kili Exp $
+# $OpenBSD: Makefile,v 1.27 2008/09/08 19:38:30 martynas Exp $

 COMMENT-main=		UPS monitoring program supporting many brands
 COMMENT-cgi=		CGIs for monitoring Nut-based UPSs
 COMMENT-snmp=		driver for monitoring UPSs via SNMP

-DISTNAME=		nut-2.2.1
-PKGNAME-main=		${DISTNAME}p0
-PKGNAME-cgi=		${DISTNAME:S/-/-cgi-/}p0
-PKGNAME-snmp=		${DISTNAME:S/-/-snmp-/}p0
+DISTNAME=		nut-2.2.2
+PKGNAME-main=		${DISTNAME}
+PKGNAME-cgi=		${DISTNAME:S/-/-cgi-/}
+PKGNAME-snmp=		${DISTNAME:S/-/-snmp-/}
 CATEGORIES=		sysutils
 HOMEPAGE=		http://www.networkupstools.org/

+SHARED_LIBS+=		upsclient 0.0
+
 MAINTAINER=		Marc Balmer <mbalmer@openbsd.org>

 MASTER_SITES=		${HOMEPAGE}source/2.2/
@ -61,6 +63,8 @@ CONFIGURE_ARGS+=	--with-cgi \
 			--with-gd-includes="-I${PREFIX}/include"
 .endif

+USE_LIBTOOL=		Yes
+
 NO_REGRESS=		Yes

 post-install:
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@ -1,5 +1,5 @@
-MD5 (nut-2.2.1.tar.gz) = x66HGWGn2+ErItUEJn3BMg==
-RMD160 (nut-2.2.1.tar.gz) = WtXkhrORvQ0aP2/lIQQ/Re6Ywuk=
-SHA1 (nut-2.2.1.tar.gz) = pRwKrmuU9s9VsnGbSkmdjDHmKGI=
-SHA256 (nut-2.2.1.tar.gz) = mq0V2M3YaUg5tUNCyLTCbdzlCPb7Kf9L7jq74VVXcfQ=
-SIZE (nut-2.2.1.tar.gz) = 1192538
+MD5 (nut-2.2.2.tar.gz) = Z3qEqD6b57yTYQQT7mljdQ==
+RMD160 (nut-2.2.2.tar.gz) = TcHStyn8DgLAR1AIxEvGLhkB9wU=
+SHA1 (nut-2.2.2.tar.gz) = 9UzJCbIpkx+5G0o2DwRHtTnU6ms=
+SHA256 (nut-2.2.2.tar.gz) = WZ0AJLzBFhN6PrZQMNPbxxMqZPMKdxf3aoJU2FQ0Ius=
+SIZE (nut-2.2.2.tar.gz) = 1184406
--- a/sysutils/nut/patches/patch-clients_Makefile_in
+++ b/sysutils/nut/patches/patch-clients_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-clients_Makefile_in,v 1.7 2008/02/03 18:06:41 kili Exp $
--- clients/Makefile.in.orig	Fri Dec 21 13:00:51 2007
-+++ clients/Makefile.in	Sun Feb  3 15:03:06 2008
-@@ -339,9 +339,12 @@ upssched_SOURCES = upssched.c upssched.h
+$OpenBSD: patch-clients_Makefile_in,v 1.8 2008/09/08 19:38:30 martynas Exp $
+--- clients/Makefile.in.orig	Wed May  7 12:29:26 2008
+++ clients/Makefile.in	Wed Aug 27 17:18:49 2008
+@@ -330,9 +330,12 @@ upssched_SOURCES = upssched.c upssched.h
 upssched_LDADD = ../common/libcommon.a $(NETLIBS) ../common/parseconf.o 
 upsimage_cgi_SOURCES = upsimage.c upsclient.h upsimagearg.h cgilib.c cgilib.h
 upsimage_cgi_LDADD = $(LDADD) $(LIBGD_LDFLAGS)
--- a/sysutils/nut/patches/patch-clients_upsset_c
+++ b/sysutils/nut/patches/patch-clients_upsset_c
@ -1,6 +1,6 @@
-$OpenBSD: patch-clients_upsset_c,v 1.6 2008/01/30 20:55:59 mbalmer Exp $
--- clients/upsset.c.orig	Sat May 26 16:24:26 2007
-+++ clients/upsset.c	Wed Aug  1 12:59:05 2007
+$OpenBSD: patch-clients_upsset_c,v 1.7 2008/09/08 19:38:30 martynas Exp $
+--- clients/upsset.c.orig	Fri Feb 22 21:21:11 2008
+++ clients/upsset.c	Wed Aug 27 17:18:49 2008
@@ -192,7 +192,7 @@ static void do_pickups(const char *currfunc)
 	char	hostfn[SMALLBUF];
 	PCONF_CTX_t	ctx;
@ -10,7 +10,7 @@ $OpenBSD: patch-clients_upsset_c,v 1.6 2008/01/30 20:55:59 mbalmer Exp $
 
 	printf("<FORM METHOD=\"POST\" ACTION=\"upsset.cgi\">\n");
 
-@@ -979,7 +979,7 @@ static void check_conf(void)
+@@ -990,7 +990,7 @@ static void check_conf(void)
 	char	fn[SMALLBUF];
 	PCONF_CTX_t	ctx;
 
--- a/sysutils/nut/patches/patch-clients_upsstats_c
+++ b/sysutils/nut/patches/patch-clients_upsstats_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-clients_upsstats_c,v 1.5 2008/01/30 20:55:59 mbalmer Exp $
--- 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)
+$OpenBSD: patch-clients_upsstats_c,v 1.6 2008/09/08 19:38:30 martynas Exp $
+--- clients/upsstats.c.orig	Fri Feb 22 21:21:11 2008
+++ clients/upsstats.c	Wed Aug 27 17:18:49 2008
+@@ -825,7 +825,7 @@ static void display_template(const char *tfn)
 {
 	char	fn[SMALLBUF], buf[LARGEBUF];	
 
@ -10,7 +10,7 @@ $OpenBSD: patch-clients_upsstats_c,v 1.5 2008/01/30 20:55:59 mbalmer Exp $
 
 	tf = fopen(fn, "r");
 
-@@ -956,7 +956,7 @@ static void load_hosts_conf(void)
+@@ -957,7 +957,7 @@ static void load_hosts_conf(void)
 	char	fn[SMALLBUF];
 	PCONF_CTX_t	ctx;
 
--- a/sysutils/nut/patches/patch-configure
+++ b/sysutils/nut/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.10 2008/02/03 18:06:41 kili Exp $
--- configure.orig	Fri Dec 21 13:00:49 2007
-+++ configure	Sun Feb  3 13:54:59 2008
-@@ -25318,7 +25318,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+$OpenBSD: patch-configure,v 1.11 2008/09/08 19:38:30 martynas Exp $
+--- configure.orig	Wed May  7 12:29:25 2008
+++ configure	Wed Aug 27 17:18:49 2008
+@@ -10326,7 +10326,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <openssl/ssl.h>
 int
--- a/sysutils/nut/pkg/PFRAG.shared-main
+++ b/sysutils/nut/pkg/PFRAG.shared-main
@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2008/09/08 19:38:30 martynas Exp $
+@lib lib/libupsclient.so.${LIBupsclient_VERSION}
--- a/sysutils/nut/pkg/PLIST-cgi
+++ b/sysutils/nut/pkg/PLIST-cgi
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST-cgi,v 1.5 2004/09/27 03:10:24 marcm Exp $
+@comment $OpenBSD: PLIST-cgi,v 1.6 2008/09/08 19:38:30 martynas Exp $
 cgi-bin/nut/
-cgi-bin/nut/upsimage.cgi
-cgi-bin/nut/upsset.cgi
-cgi-bin/nut/upsstats.cgi
+@bin cgi-bin/nut/upsimage.cgi
+@bin cgi-bin/nut/upsset.cgi
+@bin cgi-bin/nut/upsstats.cgi
 conf/nut/
 conf/nut/hosts.conf.sample
@sample ${WEB_ROOT}/conf/nut/hosts.conf
--- a/sysutils/nut/pkg/PLIST-main
+++ b/sysutils/nut/pkg/PLIST-main
@ -1,61 +1,65 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2008/01/30 20:55:59 mbalmer Exp $
+@comment $OpenBSD: PLIST-main,v 1.4 2008/09/08 19:38:30 martynas Exp $
@conflict upsd-*
@pkgpath sysutils/nut
@pkgpath sysutils/nut,no_cgi
@pkgpath sysutils/nut,snmp
@pkgpath sysutils/nut,no_cgi,snmp
@newuser ${NUT_USER}:${NUT_ID}:::UPS User:/var/empty:/sbin/nologin
-bin/al175
-bin/apcsmart
-bin/bcmxcp
-bin/bcmxcp_usb
-bin/belkin
-bin/belkinunv
-bin/bestfcom
-bin/bestuferrups
-bin/bestups
-bin/cpsups
-bin/cyberpower
-bin/dummy-ups
-bin/etapro
-bin/everups
-bin/gamatronic
-bin/genericups
-bin/isbmex
-bin/liebert
-bin/masterguard
-bin/megatec
-bin/megatec_usb
-bin/metasys
-bin/mge-shut
-bin/mge-utalk
-bin/newmge-shut
-bin/nitram
-bin/oneac
-bin/optiups
-bin/powercom
-bin/powerpanel
-bin/rhino
-bin/safenet
-bin/skel
-bin/solis
-bin/tripplite
-bin/tripplite_usb
-bin/tripplitesu
-bin/upsc
-bin/upscmd
-bin/upscode2
-bin/upsdrvctl
-bin/upslog
-bin/upsrw
+%%SHARED%%
+@bin bin/al175
+@bin bin/apcsmart
+@bin bin/bcmxcp
+@bin bin/bcmxcp_usb
+@bin bin/belkin
+@bin bin/belkinunv
+@bin bin/bestfcom
+@bin bin/bestuferrups
+@bin bin/bestups
+@bin bin/cpsups
+@bin bin/cyberpower
+@bin bin/dummy-ups
+@bin bin/etapro
+@bin bin/everups
+@bin bin/gamatronic
+@bin bin/genericups
+@bin bin/isbmex
+@bin bin/liebert
+@bin bin/masterguard
+@bin bin/megatec
+@bin bin/megatec_usb
+@bin bin/metasys
+@bin bin/mge-shut
+@bin bin/mge-utalk
+@bin bin/netxml-ups
+@bin bin/newmge-shut
+@bin bin/nitram
+@bin bin/oneac
+@bin bin/optiups
+@bin bin/powercom
+@bin bin/powerpanel
+@bin bin/rhino
+@bin bin/safenet
+@bin bin/skel
+@bin bin/solis
+@bin bin/tripplite
+@bin bin/tripplite_usb
+@bin bin/tripplitesu
+@bin bin/upsc
+@bin bin/upscmd
+@bin bin/upscode2
+@bin bin/upsdrvctl
+@bin bin/upslog
+@bin bin/upsrw
 bin/upssched-cmd
-bin/usbhid-ups
-bin/victronups
+@bin bin/usbhid-ups
+@bin bin/victronups
@comment html/
@comment html/bottom.html
@comment html/header.html
@comment html/index.html
 html/nut-banner.png
+lib/libupsclient.a
+lib/libupsclient.la
 lib/pkgconfig/
@man man/man5/hosts.conf.5
@man man/man5/ups.conf.5
@ -89,6 +93,7 @@ lib/pkgconfig/
@man man/man8/metasys.8
@man man/man8/mge-shut.8
@man man/man8/mge-utalk.8
+@man man/man8/netxml-ups.8
@man man/man8/nitram.8
@man man/man8/nutupsdrv.8
@man man/man8/oneac.8
@ -115,9 +120,9 @@ lib/pkgconfig/
@man man/man8/upsstats.cgi.8
@man man/man8/usbhid-ups.8
@man man/man8/victronups.8
-sbin/upsd
-sbin/upsmon
-sbin/upssched
+@bin sbin/upsd
+@bin sbin/upsmon
+@bin sbin/upssched
 share/doc/nut/
 share/doc/nut/FAQ
 share/doc/nut/Makefile