Update ups-nut and ups-nut-cgi to version 2.0.

6 files changed, 38 insertions, 44 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index 27debd6b8db..3e5fe58616b 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.27 2004/02/15 13:15:43 lukem Exp $
+# $NetBSD: Makefile,v 1.28 2004/04/05 22:38:09 martin Exp $
 
-DISTNAME=		nut-1.4.1
-PKGNAME=		ups-nut-cgi-1.4.1
+DISTNAME=		nut-2.0.0
+PKGNAME=		ups-nut-cgi-2.0.0
 CATEGORIES=		sysutils
-MASTER_SITES=		http://random.networkupstools.org/source/1.4/
+MASTER_SITES=		http://random.networkupstools.org/source/2.0/
 
 MAINTAINER=		lukem@NetBSD.org
 HOMEPAGE=		http://www.networkupstools.org/
 COMMENT=		Network UPS Tools CGI scripts
 
-DEPENDS+=		ups-nut-1.*:../../sysutils/ups-nut
+DEPENDS+=		ups-nut-2.*:../../sysutils/ups-nut
 
 ALL_TARGET=		cgi
 INSTALL_TARGET=		install-cgi
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
index 4c2358ebef6..520dd481ceb 100644
--- a/sysutils/ups-nut-cgi/distinfo
+++ b/sysutils/ups-nut-cgi/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2004/02/15 13:15:43 lukem Exp $
+$NetBSD: distinfo,v 1.14 2004/04/05 22:38:09 martin Exp $
 
-SHA1 (nut-1.4.1.tar.gz) = b23920207d3bd6563172194546f26dbe7cfb7ec6
-Size (nut-1.4.1.tar.gz) = 550238 bytes
-SHA1 (patch-aa) = 62f0a514e6dde1f5438be676c269711d1bc5d42c
+SHA1 (nut-2.0.0.tar.gz) = 5a89efac3047b6e8183224171be53251733d9927
+Size (nut-2.0.0.tar.gz) = 530492 bytes
+SHA1 (patch-aa) = c127e81de7377dce56fccc842eb7207c972805d2
 SHA1 (patch-ac) = b8f2f582168834b3957b1a877f3cd55cdeb2a92e
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
index b38c9e23f23..ac9939fed4a 100644
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ b/sysutils/ups-nut-cgi/patches/patch-aa
@@ -1,12 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2002/12/13 04:23:21 lukem Exp $
+$NetBSD: patch-aa,v 1.8 2004/04/05 22:38:09 martin Exp $
 
---- Makefile.in.orig	Sun Dec  8 12:04:24 2002
-+++ Makefile.in
-@@ -81,6 +81,7 @@
+--- Makefile.in.orig	2004-03-08 11:00:02.000000000 +0100
++++ Makefile.in	2004-04-05 03:30:50.000000000 +0200
+@@ -72,9 +72,10 @@
  	@echo "Run 'configure --with-cgi' before doing 'make cgi'."
  
  build-cgi:
 +	@cd common; $(MAKE); cd ..;
  	@cd clients; $(MAKE) cgi; cd ..;
  
- install-cgi: cgi install-cgi-dir install-dirs install-cgi-bin \
+-install-cgi: cgi install-cgi-dir install-dirs install-cgi-bin install-cgi-man
++install-cgi: cgi install-cgi-dir install-dirs install-cgi-conf install-cgi-bin install-cgi-man
+ 
+ install-cgi-dir:
+ 	if (test ! -d $(CGIPATH)) then \
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 353621a2d01..564ddf9fc12 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2004/02/15 13:14:25 lukem Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/05 22:38:09 martin Exp $
 #
 
-DISTNAME=		nut-1.4.1
-PKGNAME=		ups-nut-1.4.1
+DISTNAME=		nut-2.0.0
+PKGNAME=		ups-nut-2.0.0
 CATEGORIES=		sysutils
-MASTER_SITES=		http://random.networkupstools.org/source/1.4/
+MASTER_SITES=		http://random.networkupstools.org/source/2.0/
 
 MAINTAINER=		lukem@NetBSD.org
 HOMEPAGE=		http://www.networkupstools.org/
@@ -75,7 +75,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/data/driver.list ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
 
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index ae69a9ef632..6cb34b5ccb4 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/02/15 13:14:25 lukem Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/04/05 22:38:09 martin Exp $
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -9,31 +9,27 @@ etc/rc.d/upsdriver
 etc/rc.d/upslog
 etc/rc.d/upsmon
 libexec/nut/apcsmart
-libexec/nut/bcmxcp
 libexec/nut/belkin
-libexec/nut/bestfortress
+libexec/nut/belkinunv
 libexec/nut/bestuferrups
 libexec/nut/bestups
 libexec/nut/blazer
 libexec/nut/cyberpower
+libexec/nut/cyberpower1100
 libexec/nut/esupssmart
 libexec/nut/etapro
 libexec/nut/everups
 libexec/nut/fentonups
-libexec/nut/ferrups
 libexec/nut/genericups
-libexec/nut/hp
+libexec/nut/ippon
 libexec/nut/isbmex
 libexec/nut/liebert
 libexec/nut/masterguard
 libexec/nut/mge-shut
 libexec/nut/mge-utalk
-libexec/nut/microdowell
-libexec/nut/newapc
 libexec/nut/oneac
 libexec/nut/powercom
 libexec/nut/safenet
-libexec/nut/sec
 libexec/nut/sms
 libexec/nut/tripplite
 libexec/nut/tripplitesu
@@ -45,32 +41,28 @@ man/man5/upsd.users.5
 man/man5/upsmon.conf.5
 man/man5/upssched.conf.5
 man/man8/apcsmart.8
-man/man8/bcmxcp.8
 man/man8/belkin.8
-man/man8/bestfortress.8
+man/man8/belkinunv.8
 man/man8/bestuferrups.8
 man/man8/bestups.8
 man/man8/cyberpower.8
-man/man8/dummycons.8
-man/man8/energizerups.8
+man/man8/cyberpower1100.8
 man/man8/etapro.8
 man/man8/everups.8
 man/man8/fentonups.8
-man/man8/ferrups.8
 man/man8/genericups.8
+man/man8/ippon.8
 man/man8/isbmex.8
 man/man8/liebert.8
 man/man8/masterguard.8
 man/man8/mge-shut.8
 man/man8/mge-utalk.8
-man/man8/microdowell.8
-man/man8/newapc.8
 man/man8/nutupsdrv.8
 man/man8/oneac.8
 man/man8/powercom.8
 man/man8/safenet.8
-man/man8/sec.8
 man/man8/sms.8
+man/man8/snmp-ups.8
 man/man8/tripplite.8
 man/man8/tripplitesu.8
 man/man8/upsc.8
@@ -110,6 +102,7 @@ share/doc/nut/data-room.txt
 share/doc/nut/design.txt
 share/doc/nut/developers.txt
 share/doc/nut/driver.list
+share/doc/nut/ideas.txt
 share/doc/nut/new-drivers.txt
 share/doc/nut/new-names.txt
 share/doc/nut/osd-notify.txt
@@ -120,15 +113,11 @@ share/doc/nut/shutdown.txt
 share/doc/nut/snmp.txt
 share/doc/nut/sock-protocol.txt
 share/doc/nut/ssl.txt
-share/doc/nut/todo.txt
 share/doc/nut/upssched.txt
-share/examples/nut/ups.conf.sample
-share/examples/nut/upsd.conf.sample
-share/examples/nut/upsd.users.sample
-share/examples/nut/upsmon.conf.sample
-share/examples/nut/upssched.conf.sample
 share/nut/cmdvartab
+share/nut/driver.list
 @dirrm share/nut
+@exec ${MKDIR} %D/share/examples/nut
 @dirrm share/examples/nut
 @exec ${MKDIR} %D/share/doc/nut/drivers
 @dirrm share/doc/nut/drivers
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index 7ec1b288502..dae3212fe45 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2004/02/15 13:14:25 lukem Exp $
+$NetBSD: distinfo,v 1.19 2004/04/05 22:38:09 martin Exp $
 
-SHA1 (nut-1.4.1.tar.gz) = b23920207d3bd6563172194546f26dbe7cfb7ec6
-Size (nut-1.4.1.tar.gz) = 550238 bytes
+SHA1 (nut-2.0.0.tar.gz) = 5a89efac3047b6e8183224171be53251733d9927
+Size (nut-2.0.0.tar.gz) = 530492 bytes
 SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
+SHA1 (patch-ab) = c7ffec283e3e8a92e942035b5cc16167d58725a3