Update Network UPS Tools (pkgsrc/sysutils/ups-nut-*) to version 2.0.5.

This release is a backport of the development version.  Many changes
have already been backported previously.  Thus it is more a
synchronisation release, though it includes many bugfixes and support
for new models.

- support for new devices: APC Smart-UPS with 6TI firmware; Belkin
  Small Enterprise F6C1500-TW-RK; Compaq R3000 XR, R5500 XR; Cyber
  Power 550SL, 725SL, 685AVR, 800AVR, 1200AVR, AE550, BC1200 and
  many similar models; Eltek; Inform GUARD; Microsol Rhino; Opti-UPS
  PowerES 420E; PowerMan RealSmart, BackPro; Powerware PW9315 3-phase;
  SOLA 305; Tripp-Lite SMART550USB, SMART2200RMXL2U, OMNI1000LCD,
  OMNI900LCD, OMNI650LCD, 1500 LCD, AVR550U; Viewsonic PowerES 420E.

- bcmxcp: added 3-phase support

- megatec: better hardware support, more instant commands

- mge-hid: support more instant commands

- newhidups: fixed APC and Tripp Lite bugs, various memory bugs,
  improved report buffering, improved Solaris support, added
  '-x explore' option for easy diagnosis of new devices

- solis: shutdown programming, support new cables, Solaris support

- tripplite_usb: updated SMARTPRO support, fixed OL/OB reporting,
  better error handling, some memory bugs

- new dummy-ups driver simulator

- added HTML interface for access to CGI scripts

- powerpanel: new driver for CyberPower BC1200 and similar models

7 files changed, 37 insertions, 21 deletions

diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
index cd1968f4a23..8183ebf08a7 100644
--- a/sysutils/ups-nut-cgi/Makefile
+++ b/sysutils/ups-nut-cgi/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2006/08/17 19:20:11 ghen Exp $
+# $NetBSD: Makefile,v 1.47 2008/01/30 22:10:13 ghen Exp $
 
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=		${DISTNAME:S/nut/ups-nut-cgi/}
-PKGREVISION=		1
 COMMENT=		Network UPS Tools CGI scripts
 
 DEPENDS+=		ups-nut-2.*:../../sysutils/ups-nut
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
index 85247e1a132..7741109a7f9 100644
--- a/sysutils/ups-nut-cgi/PLIST
+++ b/sysutils/ups-nut-cgi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/02/15 13:15:43 lukem Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/01/30 22:10:13 ghen Exp $
 libexec/cgi-bin/upsimage.cgi
 libexec/cgi-bin/upsset.cgi
 libexec/cgi-bin/upsstats.cgi
@@ -12,3 +12,8 @@ share/examples/nut/hosts.conf.sample
 share/examples/nut/upsset.conf.sample
 share/examples/nut/upsstats-single.html.sample
 share/examples/nut/upsstats.html.sample
+share/nut/html/bottom.html
+share/nut/html/header.html
+share/nut/html/index.html
+share/nut/html/nut-banner.png
+@dirrm share/nut/html
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index 9b72039736f..287f2f053ad 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/07/04 20:55:01 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2008/01/30 22:10:12 ghen Exp $
 
 .include "Makefile.common"
 
@@ -59,7 +59,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${NUT_DOCDIR}
 	${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables
 	${INSTALL_DATA_DIR} ${NUT_DOCDIR}/drivers
-	for f in CHANGES COPYING CREDITS NEWS README INSTALL UPGRADING; do \
+	for f in COPYING CREDITS ChangeLog NEWS README INSTALL UPGRADING; do \
 		${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
diff --git a/sysutils/ups-nut/Makefile.common b/sysutils/ups-nut/Makefile.common
index 245a1533bd0..978e53c713d 100644
--- a/sysutils/ups-nut/Makefile.common
+++ b/sysutils/ups-nut/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1 2006/08/16 13:15:54 ghen Exp $
+# $NetBSD: Makefile.common,v 1.2 2008/01/30 22:10:12 ghen Exp $
 
-DISTNAME=		nut-2.0.4
+DISTNAME=		nut-2.0.5
 CATEGORIES=		sysutils
 MASTER_SITES=		http://random.networkupstools.org/source/2.0/
 
@@ -15,6 +15,9 @@ CONFIGURE_ARGS+=	--sysconfdir=${NUT_CONFDIR:Q}
 CONFIGURE_ARGS+=	--datadir=${NUT_DATADIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=	--with-statepath=${NUT_STATEDIR:Q}
+CONFIGURE_ARGS+=	--with-htmlpath=${PREFIX:Q}/share/nut/html
+
+CHECK_PORTABILITY_SKIP=	packaging/*
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index 1beaebe72d8..bf503e002f6 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.20 2006/08/15 12:26:07 ghen Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/01/30 22:10:12 ghen Exp $
 bin/upsc
 bin/upscmd
 bin/upslog
 bin/upsrw
+libexec/nut/al175
 libexec/nut/apcsmart
 libexec/nut/bcmxcp
 libexec/nut/belkin
@@ -28,9 +29,11 @@ libexec/nut/metasys
 libexec/nut/mge-shut
 libexec/nut/mge-utalk
 libexec/nut/mustek
+libexec/nut/nitram
 libexec/nut/oneac
+libexec/nut/optiups
 libexec/nut/powercom
-libexec/nut/powermust
+libexec/nut/powerpanel
 libexec/nut/rhino
 libexec/nut/safenet
 libexec/nut/sms
@@ -45,6 +48,7 @@ man/man5/upsd.conf.5
 man/man5/upsd.users.5
 man/man5/upsmon.conf.5
 man/man5/upssched.conf.5
+man/man8/al175.8
 man/man8/apcsmart.8
 man/man8/bcmxcp.8
 man/man8/belkin.8
@@ -54,23 +58,26 @@ man/man8/bestuferrups.8
 man/man8/bestups.8
 man/man8/cpsups.8
 man/man8/cyberpower.8
+man/man8/dummy-ups.8
 man/man8/etapro.8
 man/man8/everups.8
 man/man8/fentonups.8
-man/man8/gamatronic.8
 man/man8/genericups.8
 man/man8/ippon.8
 man/man8/isbmex.8
 man/man8/liebert.8
 man/man8/masterguard.8
+man/man8/megatec.8
 man/man8/metasys.8
 man/man8/mge-shut.8
 man/man8/mge-utalk.8
 man/man8/mustek.8
+man/man8/nitram.8
 man/man8/nutupsdrv.8
 man/man8/oneac.8
+man/man8/optiups.8
 man/man8/powercom.8
-man/man8/powermust.8
+man/man8/powerpanel.8
 man/man8/safenet.8
 man/man8/sms.8
 man/man8/solis.8
@@ -89,14 +96,16 @@ man/man8/victronups.8
 sbin/upsd
 sbin/upsmon
 sbin/upssched
-share/doc/nut/CHANGES
 share/doc/nut/COPYING
 share/doc/nut/CREDITS
+share/doc/nut/ChangeLog
 share/doc/nut/FAQ
 share/doc/nut/INSTALL
 share/doc/nut/NEWS
 share/doc/nut/README
 share/doc/nut/UPGRADING
+share/doc/nut/acpi.txt
+share/doc/nut/al175-vars.txt
 share/doc/nut/big-servers.txt
 share/doc/nut/cables/apc-rs500-serial.txt
 share/doc/nut/cables/apc.txt
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
index d99f24e7e60..8082d1179f3 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2006/08/15 12:26:07 ghen Exp $
+$NetBSD: distinfo,v 1.26 2008/01/30 22:10:13 ghen Exp $
 
-SHA1 (nut-2.0.4.tar.gz) = 31e2464a0f868c7d04d052ee558e52956220ccba
-RMD160 (nut-2.0.4.tar.gz) = 7368967572bd8b2361c6fdd642308ecbb661a994
-Size (nut-2.0.4.tar.gz) = 699424 bytes
+SHA1 (nut-2.0.5.tar.gz) = d2c07adeac524b8463677c756a90f2f22084f35e
+RMD160 (nut-2.0.5.tar.gz) = e5f90a73932e038d3dfee8cb32faf097d99a7e0b
+Size (nut-2.0.5.tar.gz) = 809006 bytes
 SHA1 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
-SHA1 (patch-ab) = 2a5ad1397736f8119532d756afe31dd523a23813
+SHA1 (patch-ab) = a5a1a74071d23043317114a3897ea35af3d7d11f
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
index 442e156d77d..2c31e89ce05 100644
--- a/sysutils/ups-nut/patches/patch-ab
+++ b/sysutils/ups-nut/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2006/08/02 12:11:00 ghen Exp $
+$NetBSD: patch-ab,v 1.10 2008/01/30 22:10:13 ghen Exp $
 
---- Makefile.in.orig	2006-08-02 13:55:06.000000000 +0200
+--- Makefile.in.orig	2006-11-08 03:08:45.000000000 +0100
 +++ Makefile.in
 @@ -41,7 +41,7 @@ distclean: clean
  		rm $$i/Makefile; \
@@ -18,8 +18,8 @@ $NetBSD: patch-ab,v 1.9 2006/08/02 12:11:00 ghen Exp $
 +	@cd common; $(MAKE); cd ..;
  	@cd clients; $(MAKE) cgi; cd ..;
  
--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: cgi install-cgi-dir install-dirs install-cgi-bin install-cgi-man install-cgi-html
++install-cgi: cgi install-cgi-dir install-dirs install-cgi-conf install-cgi-bin install-cgi-man install-cgi-html
  
  install-cgi-dir:
  	if (test ! -d $(CGIPATH)) then \