Update to version 0.45.0

8 files changed, 24 insertions, 54 deletions

diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 7132ad9b480b..955117041ce5 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.44.3
+PORTVERSION=	0.45.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
@@ -54,7 +54,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${NDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${NDOCDIR}
 .endif
 .if defined(CGI)
 	@if ! [ -d ${NCGIDIR} ]; then ${MKDIR} ${NCGIDIR}; fi
diff --git a/sysutils/nut/distinfo b/sysutils/nut/distinfo
index f17479811bb8..01556b8c6b0d 100644
--- a/sysutils/nut/distinfo
+++ b/sysutils/nut/distinfo
@@ -1 +1 @@
-MD5 (nut-0.44.3.tar.gz) = 0149034ae01d78241bc3a51d2ccfa45e
+MD5 (nut-0.45.0.tar.gz) = 0b818140b1d818269dc0b70b1097b111
diff --git a/sysutils/nut/files/patch-ab b/sysutils/nut/files/patch-ab
deleted file mode 100644
index d96f1ebe7097..000000000000
--- a/sysutils/nut/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./conf/Makefile.in.orig	Fri Feb 16 16:19:11 2001
-+++ ./conf/Makefile.in	Fri Mar 23 07:31:03 2001
-@@ -12,17 +12,9 @@
- 
- install:
- 	@for f in $(SECFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
- 	done
- 
- 	@for f in $(PUBFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
- 	done
diff --git a/sysutils/nut/pkg-plist b/sysutils/nut/pkg-plist
index 1e6e89d73f3a..7b94c793ec0e 100644
--- a/sysutils/nut/pkg-plist
+++ b/sysutils/nut/pkg-plist
@@ -6,8 +6,10 @@ bin/upslog
 etc/nut/hosts.conf.sample
 etc/nut/multimon.conf.sample
 etc/nut/upsd.conf.sample
+etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
-etc/nut/upsset.passwd.sample
+etc/nut/upssched.conf.sample
+etc/nut/upsset.conf.sample
 etc/rc.d/nut.sh.sample
 libexec/nut/apcsmart
 libexec/nut/belkin
@@ -20,10 +22,12 @@ libexec/nut/genericups
 libexec/nut/ipt-anzen
 libexec/nut/mge-ellipse
 libexec/nut/mgeups
+libexec/nut/multilink
 libexec/nut/mustekups
 libexec/nut/newapc
 libexec/nut/optiups
 libexec/nut/powercom
+libexec/nut/sec
 libexec/nut/toshiba1500
 libexec/nut/ups-trust425+625
 libexec/nut/upseyeux
@@ -33,11 +37,12 @@ sbin/upsmon
 sbin/upssched
 %%PORTDOCS%%share/doc/nut/Changes.trust
 %%PORTDOCS%%share/doc/nut/FAQ
-%%PORTDOCS%%share/doc/nut/QUICKSTART
+%%PORTDOCS%%share/doc/nut/INSTALL
 %%PORTDOCS%%share/doc/nut/README
 %%PORTDOCS%%share/doc/nut/access.txt
 %%PORTDOCS%%share/doc/nut/belkin.txt
 %%PORTDOCS%%share/doc/nut/big-servers.txt
+%%PORTDOCS%%share/doc/nut/chroot.txt
 %%PORTDOCS%%share/doc/nut/commands.txt
 %%PORTDOCS%%share/doc/nut/configure.txt
 %%PORTDOCS%%share/doc/nut/data-room.txt
@@ -46,6 +51,7 @@ sbin/upssched
 %%PORTDOCS%%share/doc/nut/generic-ups.txt
 %%PORTDOCS%%share/doc/nut/mge-ellipse.txt
 %%PORTDOCS%%share/doc/nut/model-arguments.txt
+%%PORTDOCS%%share/doc/nut/multilink.txt
 %%PORTDOCS%%share/doc/nut/new-modules.txt
 %%PORTDOCS%%share/doc/nut/pager.txt
 %%PORTDOCS%%share/doc/nut/powercom.txt
@@ -56,6 +62,7 @@ sbin/upssched
 %%PORTDOCS%%share/doc/nut/ups-trust425+625.txt
 %%PORTDOCS%%share/doc/nut/upssched.txt
 %%PORTDOCS%%share/doc/nut/cables/powerware.txt
+%%PORTDOCS%%share/doc/nut/cables/repotec.txt
 %%PORTDOCS%%share/doc/nut/cables/victron.txt
 %%CGIFILES%%share/nut/cgi/multimon.cgi
 %%CGIFILES%%share/nut/cgi/upsimage.cgi
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 7132ad9b480b..955117041ce5 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.44.3
+PORTVERSION=	0.45.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
@@ -54,7 +54,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/QUICKSTART ${NDOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/INSTALL ${NDOCDIR}
 .endif
 .if defined(CGI)
 	@if ! [ -d ${NCGIDIR} ]; then ${MKDIR} ${NCGIDIR}; fi
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index f17479811bb8..01556b8c6b0d 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1 +1 @@
-MD5 (nut-0.44.3.tar.gz) = 0149034ae01d78241bc3a51d2ccfa45e
+MD5 (nut-0.45.0.tar.gz) = 0b818140b1d818269dc0b70b1097b111
diff --git a/sysutils/nut22/files/patch-ab b/sysutils/nut22/files/patch-ab
deleted file mode 100644
index d96f1ebe7097..000000000000
--- a/sysutils/nut22/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./conf/Makefile.in.orig	Fri Feb 16 16:19:11 2001
-+++ ./conf/Makefile.in	Fri Mar 23 07:31:03 2001
-@@ -12,17 +12,9 @@
- 
- install:
- 	@for f in $(SECFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
- 	done
- 
- 	@for f in $(PUBFILES) ; do \
--		if (test -f $(CONFPATH)/$$f ); then \
--			echo "Preserving existing config file: $$f"; \
--		else \
--			$(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
--		fi; \
-+		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
- 	done
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index 1e6e89d73f3a..7b94c793ec0e 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -6,8 +6,10 @@ bin/upslog
 etc/nut/hosts.conf.sample
 etc/nut/multimon.conf.sample
 etc/nut/upsd.conf.sample
+etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
-etc/nut/upsset.passwd.sample
+etc/nut/upssched.conf.sample
+etc/nut/upsset.conf.sample
 etc/rc.d/nut.sh.sample
 libexec/nut/apcsmart
 libexec/nut/belkin
@@ -20,10 +22,12 @@ libexec/nut/genericups
 libexec/nut/ipt-anzen
 libexec/nut/mge-ellipse
 libexec/nut/mgeups
+libexec/nut/multilink
 libexec/nut/mustekups
 libexec/nut/newapc
 libexec/nut/optiups
 libexec/nut/powercom
+libexec/nut/sec
 libexec/nut/toshiba1500
 libexec/nut/ups-trust425+625
 libexec/nut/upseyeux
@@ -33,11 +37,12 @@ sbin/upsmon
 sbin/upssched
 %%PORTDOCS%%share/doc/nut/Changes.trust
 %%PORTDOCS%%share/doc/nut/FAQ
-%%PORTDOCS%%share/doc/nut/QUICKSTART
+%%PORTDOCS%%share/doc/nut/INSTALL
 %%PORTDOCS%%share/doc/nut/README
 %%PORTDOCS%%share/doc/nut/access.txt
 %%PORTDOCS%%share/doc/nut/belkin.txt
 %%PORTDOCS%%share/doc/nut/big-servers.txt
+%%PORTDOCS%%share/doc/nut/chroot.txt
 %%PORTDOCS%%share/doc/nut/commands.txt
 %%PORTDOCS%%share/doc/nut/configure.txt
 %%PORTDOCS%%share/doc/nut/data-room.txt
@@ -46,6 +51,7 @@ sbin/upssched
 %%PORTDOCS%%share/doc/nut/generic-ups.txt
 %%PORTDOCS%%share/doc/nut/mge-ellipse.txt
 %%PORTDOCS%%share/doc/nut/model-arguments.txt
+%%PORTDOCS%%share/doc/nut/multilink.txt
 %%PORTDOCS%%share/doc/nut/new-modules.txt
 %%PORTDOCS%%share/doc/nut/pager.txt
 %%PORTDOCS%%share/doc/nut/powercom.txt
@@ -56,6 +62,7 @@ sbin/upssched
 %%PORTDOCS%%share/doc/nut/ups-trust425+625.txt
 %%PORTDOCS%%share/doc/nut/upssched.txt
 %%PORTDOCS%%share/doc/nut/cables/powerware.txt
+%%PORTDOCS%%share/doc/nut/cables/repotec.txt
 %%PORTDOCS%%share/doc/nut/cables/victron.txt
 %%CGIFILES%%share/nut/cgi/multimon.cgi
 %%CGIFILES%%share/nut/cgi/upsimage.cgi