6 files changed, 48 insertions, 36 deletions

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 02e8090e6c99..d4a61718ecd2 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://eu1.networkupstools.org/source/${PORTVERSION:R}/ \
 		http://us1.networkupstools.org/source/${PORTVERSION:R}/
@@ -25,6 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--localstatedir=${STATEDIR} \
 		--datadir=${PREFIX}/etc/nut \
+		--mandir=${PREFIX}/man \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=${STATEDIR} \
 		--with-altpidpath=${STATEDIR} \
@@ -44,14 +45,14 @@ PLIST_SUB+=	STATEDIR=${STATEDIR}
 
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
-MAN8=		apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 bestuferrups.8 \
-		bestups.8 bestfcom.8 cpsups.8 cyberpower.8 etapro.8 everups.8 \
-		fentonups.8 gamatronic.8 genericups.8 ippon.8 isbmex.8 \
-		liebert.8 masterguard.8 metasys.8 mge-shut.8 mge-utalk.8 \
-		mustek.8 nutupsdrv.8 oneac.8 powercom.8 powermust.8 safenet.8 \
-		sms.8 solis.8 tripplite.8 tripplitesu.8 upsc.8 upscmd.8 \
-		upscode2.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 \
-		upssched.8 victronups.8
+MAN8=		al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \
+		bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \
+		dummy-ups.8 etapro.8 everups.8 fentonups.8 genericups.8 \
+		ippon.8 isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \
+		mge-shut.8 mge-utalk.8 mustek.8 nitram.8 nutupsdrv.8 oneac.8 \
+		optiups.8 powercom.8 powerpanel.8 safenet.8 sms.8 solis.8 \
+		tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upscode2.8 upsd.8 \
+		upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install install-conf
@@ -126,7 +127,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
-.for file in CHANGES CREDITS INSTALL NEWS README UPGRADING
+.for file in ChangeLog CREDITS INSTALL NEWS README UPGRADING
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index bb2140dc0503..75fc04d0f31e 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1,6 +1,6 @@
-MD5 (nut-2.0.4.tar.gz) = 59b6f3038a5ef64c584913e72bd850a2
-SHA256 (nut-2.0.4.tar.gz) = 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2
-SIZE (nut-2.0.4.tar.gz) = 699424
-MD5 (nut-2.0.4.tar.gz.sig) = 3c340daa45678b83479367c30f5ba45d
-SHA256 (nut-2.0.4.tar.gz.sig) = 0066eaea801e01e248426fe355f950f6e61c6399bacfcf63945b4ad2b55b1a96
-SIZE (nut-2.0.4.tar.gz.sig) = 65
+MD5 (nut-2.0.5.tar.gz) = b08fde86191154bbcfda860f95a5dca2
+SHA256 (nut-2.0.5.tar.gz) = 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203
+SIZE (nut-2.0.5.tar.gz) = 809006
+MD5 (nut-2.0.5.tar.gz.sig) = 87e01f70e56e647af64c1a9324525f6c
+SHA256 (nut-2.0.5.tar.gz.sig) = e2307cde6369dd9d425758171cc5de36676b419d9d88b76012c9f0acc6ac657d
+SIZE (nut-2.0.5.tar.gz.sig) = 65
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index aae6239a71de..c050dba648fa 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -15,6 +15,7 @@ etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
+libexec/nut/al175
 libexec/nut/apcsmart
 libexec/nut/bcmxcp
 libexec/nut/belkin
@@ -40,9 +41,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
@@ -64,13 +67,15 @@ sbin/upssched
 %%CGIETC%%upsstats-single.html.sample
 %%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
 %%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%PORTDOCS%%%%DOCSDIR%%/acpi.txt
+%%PORTDOCS%%%%DOCSDIR%%/al175-vars.txt
 %%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
 %%PORTDOCS%%%%DOCSDIR%%/cables/apc-rs500-serial.txt
 %%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 02e8090e6c99..d4a61718ecd2 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://eu1.networkupstools.org/source/${PORTVERSION:R}/ \
 		http://us1.networkupstools.org/source/${PORTVERSION:R}/
@@ -25,6 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--localstatedir=${STATEDIR} \
 		--datadir=${PREFIX}/etc/nut \
+		--mandir=${PREFIX}/man \
 		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=${STATEDIR} \
 		--with-altpidpath=${STATEDIR} \
@@ -44,14 +45,14 @@ PLIST_SUB+=	STATEDIR=${STATEDIR}
 
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
-MAN8=		apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 bestuferrups.8 \
-		bestups.8 bestfcom.8 cpsups.8 cyberpower.8 etapro.8 everups.8 \
-		fentonups.8 gamatronic.8 genericups.8 ippon.8 isbmex.8 \
-		liebert.8 masterguard.8 metasys.8 mge-shut.8 mge-utalk.8 \
-		mustek.8 nutupsdrv.8 oneac.8 powercom.8 powermust.8 safenet.8 \
-		sms.8 solis.8 tripplite.8 tripplitesu.8 upsc.8 upscmd.8 \
-		upscode2.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 \
-		upssched.8 victronups.8
+MAN8=		al175.8 apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \
+		bestuferrups.8 bestups.8 bestfcom.8 cpsups.8 cyberpower.8 \
+		dummy-ups.8 etapro.8 everups.8 fentonups.8 genericups.8 \
+		ippon.8 isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \
+		mge-shut.8 mge-utalk.8 mustek.8 nitram.8 nutupsdrv.8 oneac.8 \
+		optiups.8 powercom.8 powerpanel.8 safenet.8 sms.8 solis.8 \
+		tripplite.8 tripplitesu.8 upsc.8 upscmd.8 upscode2.8 upsd.8 \
+		upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.8
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install install-conf
@@ -126,7 +127,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
-.for file in CHANGES CREDITS INSTALL NEWS README UPGRADING
+.for file in ChangeLog CREDITS INSTALL NEWS README UPGRADING
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index bb2140dc0503..75fc04d0f31e 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1,6 +1,6 @@
-MD5 (nut-2.0.4.tar.gz) = 59b6f3038a5ef64c584913e72bd850a2
-SHA256 (nut-2.0.4.tar.gz) = 6a8fb79fd5eb89baa36d321c8ffc1b6ec05265242c0ff3495aac49f008295db2
-SIZE (nut-2.0.4.tar.gz) = 699424
-MD5 (nut-2.0.4.tar.gz.sig) = 3c340daa45678b83479367c30f5ba45d
-SHA256 (nut-2.0.4.tar.gz.sig) = 0066eaea801e01e248426fe355f950f6e61c6399bacfcf63945b4ad2b55b1a96
-SIZE (nut-2.0.4.tar.gz.sig) = 65
+MD5 (nut-2.0.5.tar.gz) = b08fde86191154bbcfda860f95a5dca2
+SHA256 (nut-2.0.5.tar.gz) = 5e1bfecfca528104db7025050c81258ee20620df7497ab5988ad461d951c8203
+SIZE (nut-2.0.5.tar.gz) = 809006
+MD5 (nut-2.0.5.tar.gz.sig) = 87e01f70e56e647af64c1a9324525f6c
+SHA256 (nut-2.0.5.tar.gz.sig) = e2307cde6369dd9d425758171cc5de36676b419d9d88b76012c9f0acc6ac657d
+SIZE (nut-2.0.5.tar.gz.sig) = 65
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index aae6239a71de..c050dba648fa 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -15,6 +15,7 @@ etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
+libexec/nut/al175
 libexec/nut/apcsmart
 libexec/nut/bcmxcp
 libexec/nut/belkin
@@ -40,9 +41,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
@@ -64,13 +67,15 @@ sbin/upssched
 %%CGIETC%%upsstats-single.html.sample
 %%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%
 %%PORTDOCS%%@exec mkdir %D/%%DOCSDIR%%/cables
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%PORTDOCS%%%%DOCSDIR%%/acpi.txt
+%%PORTDOCS%%%%DOCSDIR%%/al175-vars.txt
 %%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
 %%PORTDOCS%%%%DOCSDIR%%/cables/apc-rs500-serial.txt
 %%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt