8 files changed, 40 insertions, 50 deletions

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index e970df1dcf3a..5a1e4aa44ae8 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	1.4.1
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://us1.networkupstools.org/source/${PORTVERSION:R}/ \
 		http://eu1.networkupstools.org/source/${PORTVERSION:R}/
@@ -17,6 +17,7 @@ COMMENT=	Network UPS Tools
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--localstatedir=/var/db/nut \
+		--datadir=${PREFIX}/etc/nut \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=/var/db/nut \
 		--with-altpidpath=/var/db/nut \
@@ -24,22 +25,21 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
-MAN8=		apcsmart.8 bcmxcp.8 belkin.8 \
-		bestfortress.8 bestuferrups.8 bestups.8 cyberpower.8 etapro.8 \
-		everups.8 fentonups.8 genericups.8 hp.8 isbmex.8 liebert.8 \
-		masterguard.8 mge-shut.8 mge-utalk.8 microdowell.8 newapc.8 \
-		nutupsdrv.8 oneac.8 powercom.8 powernet.8 sec.8 sms.8 \
-		snmp-ups.8 tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upsd.8 \
-		upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8 \
-		dummycons.8 energizerups.8 ferrups.8 safenet.8
+MAN8=		apcsmart.8 belkin.8 belkinunv.8 bestuferrups.8 bestups.8 \
+		cyberpower.8 cyberpower1100.8 etapro.8 everups.8 \
+		fentonups.8 genericups.8 ippon.8 isbmex.8 liebert.8 \
+		masterguard.8 mge-shut.8 mge-utalk.8 nutupsdrv.8 oneac.8 \
+		powercom.8 sms.8 snmp-ups.8 tripplite.8 tripplitesu.8 \
+		upsc.8 upscmd.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 \
+		upsrw.8 upssched.8 victronups.8 safenet.8
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install
+INSTALL_TARGET=	install install-conf
 
 .if defined(WITH_NUT_CGI)
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 ALL_TARGET+=	cgi
-INSTALL_TARGET+=install-cgi
+INSTALL_TARGET+=install-cgi install-cgi-conf
 MAN5+=		hosts.conf.5 upsset.conf.5 upsstats.html.5
 MAN8+=		upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
@@ -77,7 +77,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${DOCSDIR}
 .for file in CHANGES CREDITS INSTALL NEWS README UPGRADING
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index c5614f4d8809..c1ef2f64908e 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1,2 +1,2 @@
-MD5 (nut-1.4.1.tar.gz) = ae91ea3d643d7665bda0a95ce62957a0
-SIZE (nut-1.4.1.tar.gz) = 550238
+MD5 (nut-2.0.0.tar.gz) = 84649ad95809737b5ffc19efdd9e9952
+SIZE (nut-2.0.0.tar.gz) = 530492
diff --git a/sysutils/nut/files/patch-man_Makefile.in b/sysutils/nut/files/patch-man_Makefile.in
index 557ac7e5e9d0..a4387d2a5bbf 100644
--- a/sysutils/nut/files/patch-man_Makefile.in
+++ b/sysutils/nut/files/patch-man_Makefile.in
@@ -5,7 +5,7 @@
  		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
  	done
 -	@for f in $(MAN8_PAGES) ; do \
-+	@for f in $(MAN8_PAGES) $(SNMPPAGES) hp.8 ; do \
++	@for f in $(MAN8_PAGES) $(SNMPPAGES) ; do \
  		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
  		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
  	done
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 73c6b8c2f39b..6852272d2cd9 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -2,6 +2,8 @@ bin/upsc
 bin/upscmd
 bin/upslog
 bin/upsrw
+etc/nut/cmdvartab
+etc/nut/driver.list
 etc/nut/ups.conf.sample
 etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
@@ -9,31 +11,27 @@ etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
 etc/rc.d/nut.sh.sample
 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
@@ -42,7 +40,6 @@ libexec/nut/victronups
 sbin/upsd
 sbin/upsmon
 sbin/upssched
-share/cmdvartab
 %%CGIFILES%%upsimage.cgi
 %%CGIFILES%%upsset.cgi
 %%CGIFILES%%upsstats.cgi
@@ -73,7 +70,7 @@ share/cmdvartab
 %%PORTDOCS%%%%DOCSDIR%%/data-room.txt
 %%PORTDOCS%%%%DOCSDIR%%/design.txt
 %%PORTDOCS%%%%DOCSDIR%%/developers.txt
-%%PORTDOCS%%%%DOCSDIR%%/driver.list
+%%PORTDOCS%%%%DOCSDIR%%/ideas.txt
 %%PORTDOCS%%%%DOCSDIR%%/new-drivers.txt
 %%PORTDOCS%%%%DOCSDIR%%/new-names.txt
 %%PORTDOCS%%%%DOCSDIR%%/osd-notify.txt
@@ -84,7 +81,6 @@ share/cmdvartab
 %%PORTDOCS%%%%DOCSDIR%%/snmp.txt
 %%PORTDOCS%%%%DOCSDIR%%/sock-protocol.txt
 %%PORTDOCS%%%%DOCSDIR%%/ssl.txt
-%%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%PORTDOCS%%%%DOCSDIR%%/upssched.txt
 @dirrm %%DOCSDIR%%/cables
 @dirrm %%DOCSDIR%%/drivers
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index e970df1dcf3a..5a1e4aa44ae8 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	1.4.1
+PORTVERSION=	2.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://us1.networkupstools.org/source/${PORTVERSION:R}/ \
 		http://eu1.networkupstools.org/source/${PORTVERSION:R}/
@@ -17,6 +17,7 @@ COMMENT=	Network UPS Tools
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--localstatedir=/var/db/nut \
+		--datadir=${PREFIX}/etc/nut \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=/var/db/nut \
 		--with-altpidpath=/var/db/nut \
@@ -24,22 +25,21 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
-MAN8=		apcsmart.8 bcmxcp.8 belkin.8 \
-		bestfortress.8 bestuferrups.8 bestups.8 cyberpower.8 etapro.8 \
-		everups.8 fentonups.8 genericups.8 hp.8 isbmex.8 liebert.8 \
-		masterguard.8 mge-shut.8 mge-utalk.8 microdowell.8 newapc.8 \
-		nutupsdrv.8 oneac.8 powercom.8 powernet.8 sec.8 sms.8 \
-		snmp-ups.8 tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upsd.8 \
-		upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8 \
-		dummycons.8 energizerups.8 ferrups.8 safenet.8
+MAN8=		apcsmart.8 belkin.8 belkinunv.8 bestuferrups.8 bestups.8 \
+		cyberpower.8 cyberpower1100.8 etapro.8 everups.8 \
+		fentonups.8 genericups.8 ippon.8 isbmex.8 liebert.8 \
+		masterguard.8 mge-shut.8 mge-utalk.8 nutupsdrv.8 oneac.8 \
+		powercom.8 sms.8 snmp-ups.8 tripplite.8 tripplitesu.8 \
+		upsc.8 upscmd.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 \
+		upsrw.8 upssched.8 victronups.8 safenet.8
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install
+INSTALL_TARGET=	install install-conf
 
 .if defined(WITH_NUT_CGI)
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 ALL_TARGET+=	cgi
-INSTALL_TARGET+=install-cgi
+INSTALL_TARGET+=install-cgi install-cgi-conf
 MAN5+=		hosts.conf.5 upsset.conf.5 upsstats.html.5
 MAN8+=		upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8
 .if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
@@ -77,7 +77,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${DOCSDIR}
 .for file in CHANGES CREDITS INSTALL NEWS README UPGRADING
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index c5614f4d8809..c1ef2f64908e 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1,2 +1,2 @@
-MD5 (nut-1.4.1.tar.gz) = ae91ea3d643d7665bda0a95ce62957a0
-SIZE (nut-1.4.1.tar.gz) = 550238
+MD5 (nut-2.0.0.tar.gz) = 84649ad95809737b5ffc19efdd9e9952
+SIZE (nut-2.0.0.tar.gz) = 530492
diff --git a/sysutils/nut22/files/patch-man_Makefile.in b/sysutils/nut22/files/patch-man_Makefile.in
index 557ac7e5e9d0..a4387d2a5bbf 100644
--- a/sysutils/nut22/files/patch-man_Makefile.in
+++ b/sysutils/nut22/files/patch-man_Makefile.in
@@ -5,7 +5,7 @@
  		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
  	done
 -	@for f in $(MAN8_PAGES) ; do \
-+	@for f in $(MAN8_PAGES) $(SNMPPAGES) hp.8 ; do \
++	@for f in $(MAN8_PAGES) $(SNMPPAGES) ; do \
  		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
  		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
  	done
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index 73c6b8c2f39b..6852272d2cd9 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -2,6 +2,8 @@ bin/upsc
 bin/upscmd
 bin/upslog
 bin/upsrw
+etc/nut/cmdvartab
+etc/nut/driver.list
 etc/nut/ups.conf.sample
 etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
@@ -9,31 +11,27 @@ etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
 etc/rc.d/nut.sh.sample
 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
@@ -42,7 +40,6 @@ libexec/nut/victronups
 sbin/upsd
 sbin/upsmon
 sbin/upssched
-share/cmdvartab
 %%CGIFILES%%upsimage.cgi
 %%CGIFILES%%upsset.cgi
 %%CGIFILES%%upsstats.cgi
@@ -73,7 +70,7 @@ share/cmdvartab
 %%PORTDOCS%%%%DOCSDIR%%/data-room.txt
 %%PORTDOCS%%%%DOCSDIR%%/design.txt
 %%PORTDOCS%%%%DOCSDIR%%/developers.txt
-%%PORTDOCS%%%%DOCSDIR%%/driver.list
+%%PORTDOCS%%%%DOCSDIR%%/ideas.txt
 %%PORTDOCS%%%%DOCSDIR%%/new-drivers.txt
 %%PORTDOCS%%%%DOCSDIR%%/new-names.txt
 %%PORTDOCS%%%%DOCSDIR%%/osd-notify.txt
@@ -84,7 +81,6 @@ share/cmdvartab
 %%PORTDOCS%%%%DOCSDIR%%/snmp.txt
 %%PORTDOCS%%%%DOCSDIR%%/sock-protocol.txt
 %%PORTDOCS%%%%DOCSDIR%%/ssl.txt
-%%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%PORTDOCS%%%%DOCSDIR%%/upssched.txt
 @dirrm %%DOCSDIR%%/cables
 @dirrm %%DOCSDIR%%/drivers