Update to nut-2.0.4. Also set NUT_USER's homedirectory to NUT_STATEDIR.

Changes since nut-2.0.3:

 - The newhidups critical bug (segmentation fault) has been fixed. It has
   also received some more care, like buxfixes and new models support and
   enhancement for Solaris.
 - A bug has been fixed in NUT core to support resuming from suspend-to-disk.
   This should also fix other similar issues, like time synchronisation
   through the NTP - Network Time Protocol.
 - The mge-shut driver now better detects the Low Battery status, support
   new models and fixes some wrong status and data. It also fixes some
   issue where the UPS wasn't restarting (refer to mge-shut manpage).
 - The genericups custom configuration through ups.conf is working again.
 - The genericups driver type 22 also support CyberPower 725SL
   (and maybe others SL models).
 - The new megatec driver, which will replace a bunch of drivers by nut 2.2
   (refer to docs/megatec.txt and UPGRADING) has been backported from the
   trunk (Development tree). The powermust driver has also received some
   attention.
 - The new rhino driver was added to support Microsol Rhino UPS hardware
   The solis has also been improved for solaris compatibility, and
   internal / external shutdown programming. solis can now save external
   shutdown programming to ups, and support new cables for solis 3.
 - Several fixes and improvements have been made to upsrw, upsset,
   cpsups, tripplite_usb and the FAQ.

From UPGRADING:
 - users of the following drivers (powermust, blazer, fentonups, mustek,
   esupssmart, ippon, sms, masterguard) are encouraged to switch to megatec,
   which should replace all these drivers by nut 2.2. For more information,
   please refer to doc/megatec.txt

3 files changed, 12 insertions, 10 deletions

diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index f7b01083988..ebbaf6303f2 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2006/08/15 12:07:15 ghen Exp $
+# $NetBSD: Makefile,v 1.46 2006/08/15 12:26:07 ghen Exp $
 #
 
-DISTNAME=		nut-2.0.3
-PKGNAME=		ups-nut-2.0.3
-PKGREVISION=		2
+DISTNAME=		nut-2.0.4
+PKGNAME=		ups-${DISTNAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		http://random.networkupstools.org/source/2.0/
 
@@ -45,6 +44,7 @@ MESSAGE_SUBST+=		NUT_DOCDIR=${NUT_DOCDIR}
 PKG_GROUPS=		${NUT_GROUP}
 PKG_USERS=		${NUT_USER}:${NUT_GROUP}
 PKG_GECOS.${NUT_USER}=	Network UPS Tools
+PKG_HOME.${NUT_USER}=	${NUT_STATEDIR}
 PKG_SHELL.${NUT_USER}=	${SH}
 
 CONF_FILES=		${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
index bee3d202363..1beaebe72d8 100644
--- a/sysutils/ups-nut/PLIST
+++ b/sysutils/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2006/03/09 18:32:33 abs Exp $
+@comment $NetBSD: PLIST,v 1.20 2006/08/15 12:26:07 ghen Exp $
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -23,6 +23,7 @@ libexec/nut/ippon
 libexec/nut/isbmex
 libexec/nut/liebert
 libexec/nut/masterguard
+libexec/nut/megatec
 libexec/nut/metasys
 libexec/nut/mge-shut
 libexec/nut/mge-utalk
@@ -30,6 +31,7 @@ libexec/nut/mustek
 libexec/nut/oneac
 libexec/nut/powercom
 libexec/nut/powermust
+libexec/nut/rhino
 libexec/nut/safenet
 libexec/nut/sms
 libexec/nut/solis
@@ -115,6 +117,7 @@ share/doc/nut/developers.txt
 share/doc/nut/driver.list
 share/doc/nut/hid-subdrivers.txt
 share/doc/nut/ideas.txt
+share/doc/nut/megatec.txt
 share/doc/nut/new-drivers.txt
 share/doc/nut/new-names.txt
 share/doc/nut/osd-notify.txt
@@ -139,7 +142,6 @@ share/examples/rc.d/upsmon
 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 315bd848c37..d99f24e7e60 100644
--- a/sysutils/ups-nut/distinfo
+++ b/sysutils/ups-nut/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.24 2006/08/02 12:11:00 ghen Exp $
+$NetBSD: distinfo,v 1.25 2006/08/15 12:26:07 ghen Exp $
 
-SHA1 (nut-2.0.3.tar.gz) = 3ea064668846529d95663eadbf07b41ca8c25b1d
-RMD160 (nut-2.0.3.tar.gz) = 890c52b1ab538101c30e5be33e785817a773cdb9
-Size (nut-2.0.3.tar.gz) = 656376 bytes
+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 (patch-aa) = e4649220e30ab6b582cf9115de9f7faad0f7cf8b
 SHA1 (patch-ab) = 2a5ad1397736f8119532d756afe31dd523a23813