8 files changed, 95 insertions, 96 deletions

diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 321af3708e7b..7132ad9b480b 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.44.2
+PORTVERSION=	0.44.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/
 
 MAINTAINER=	jeh@freebsd.org
 
 .if defined(CGI)
-LIB_DEPENDS=	gd.1:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 .endif
 
 GNU_CONFIGURE=	yes
@@ -22,15 +22,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-modelpath=${PREFIX}/libexec/nut \
 		--with-statepath=/var/db
 
-ALL_TARGET=	all
+MAN8=		powercom.8 apcsmart.8
 
-PLIST=		${WRKDIR}/PLIST.DYN
+ALL_TARGET=	all
 
 NDOCDIR=	${PREFIX}/share/doc/nut
 
 .if defined(CGI)
 NCGIDIR=	${PREFIX}/share/nut/cgi
 ALL_TARGET+=	cgi
+PLIST_SUB+=	CGIFILES=""
+.else
+PLIST_SUB+=	CGIFILES="@comment "
 .endif
 
 pre-fetch:
@@ -38,15 +41,6 @@ pre-fetch:
 	@${ECHO_MSG} "Type \"make CGI=yes\" if you want to build CGI scripts."
 .endif
 
-pre-install:
-	@cp ${PKGDIR}/pkg-plist ${WRKDIR}/PLIST.DYN
-.if !defined(NOPORSDOCS)
-	@cat ${PKGDIR}/pkg-plist.doc >> ${WRKDIR}/PLIST.DYN
-.endif
-.if defined(CGI)
-	@cat ${PKGDIR}/pkg-plist.cgi >> ${WRKDIR}/PLIST.DYN
-.endif
-
 post-install:
 	@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \
 		${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \
@@ -67,6 +61,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/clients/*.cgi ${NCGIDIR}
 	@${ECHO_MSG} "Look in ${NCGIDIR} for cgi scripts."
 .endif
+.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "Look in ${NDOCDIR} for documentation."
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index c1f6bd84c5ba..f17479811bb8 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1 +1 @@
-MD5 (nut-0.44.2.tar.gz) = e426128d0a203b6d3dd5f641c2b17fd0
+MD5 (nut-0.44.3.tar.gz) = 0149034ae01d78241bc3a51d2ccfa45e
diff --git a/sysutils/nut22/files/patch-aa b/sysutils/nut22/files/patch-aa
index 89b982062e3b..f54d3025c03d 100644
--- a/sysutils/nut22/files/patch-aa
+++ b/sysutils/nut22/files/patch-aa
@@ -10,53 +10,3 @@ diff -ur ../442/Makefile.in ./Makefile.in
  STATEPATH   = $(INSTALLROOT)@STATEPATH@
  
  SUBDIRS	= common models server clients man
-Only in .: a
-diff -ur ../442/conf/Makefile.in ./conf/Makefile.in
---- ../442/conf/Makefile.in	Mon May  8 04:17:20 2000
-+++ ./conf/Makefile.in	Thu Jan  4 11:26:54 2001
-@@ -13,17 +13,9 @@
- 
- install:
- 	@for f in $(SECFILES) ; do \
--		if [ -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 [ -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 -ur ../442/scripts/FreeBSD/upsd.sh.sample ./scripts/FreeBSD/upsd.sh.sample
---- ../442/scripts/FreeBSD/upsd.sh.sample	Sun Jan 16 04:22:27 2000
-+++ ./scripts/FreeBSD/upsd.sh.sample	Thu Jan  4 11:51:18 2001
-@@ -2,7 +2,9 @@
- 
- PREFIX=%%PREFIX%%
- 
-+BIN=${PREFIX}/bin
- SBIN=${PREFIX}/sbin
-+MODELS=${PREFIX}/libexec/nut
- UPSTYPE="apcsmart"
- UPSFLAGS=""
- UPSDEV="/dev/cuaa3"
-@@ -10,10 +12,10 @@
- UPSLOGINTERVAL="300"
- 
- if [ x$1 = xstart ]; then
--	${SBIN}/$UPSTYPE $UPSFLAGS $UPSDEV
-+	${MODELS}/$UPSTYPE $UPSFLAGS $UPSDEV
- 	${SBIN}/upsd
- 	${SBIN}/upsmon localhost
--	${SBIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
-+	${BIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
- elif [ "x$1" = "xstop" ]; then
- 	/usr/bin/killall upslog upsmon upsd $UPSTYPE
- fi
diff --git a/sysutils/nut22/files/patch-ab b/sysutils/nut22/files/patch-ab
new file mode 100644
index 000000000000..d96f1ebe7097
--- /dev/null
+++ b/sysutils/nut22/files/patch-ab
@@ -0,0 +1,22 @@
+--- ./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/files/patch-ac b/sysutils/nut22/files/patch-ac
new file mode 100644
index 000000000000..0493b13ebdd7
--- /dev/null
+++ b/sysutils/nut22/files/patch-ac
@@ -0,0 +1,26 @@
+diff -ur ../442/scripts/FreeBSD/upsd.sh.sample ./scripts/FreeBSD/upsd.sh.sample
+--- ../442/scripts/FreeBSD/upsd.sh.sample	Sun Jan 16 04:22:27 2000
++++ ./scripts/FreeBSD/upsd.sh.sample	Thu Jan  4 11:51:18 2001
+@@ -2,7 +2,9 @@
+ 
+ PREFIX=%%PREFIX%%
+ 
++BIN=${PREFIX}/bin
+ SBIN=${PREFIX}/sbin
++MODELS=${PREFIX}/libexec/nut
+ UPSTYPE="apcsmart"
+ UPSFLAGS=""
+ UPSDEV="/dev/cuaa3"
+@@ -10,10 +12,10 @@
+ UPSLOGINTERVAL="300"
+ 
+ if [ x$1 = xstart ]; then
+-	${SBIN}/$UPSTYPE $UPSFLAGS $UPSDEV
++	${MODELS}/$UPSTYPE $UPSFLAGS $UPSDEV
+ 	${SBIN}/upsd
+ 	${SBIN}/upsmon localhost
+-	${SBIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
++	${BIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
+ elif [ "x$1" = "xstop" ]; then
+ 	/usr/bin/killall upslog upsmon upsd $UPSTYPE
+ fi
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index b495263cd015..1e6e89d73f3a 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -18,15 +18,52 @@ libexec/nut/engetron
 libexec/nut/fentonups
 libexec/nut/genericups
 libexec/nut/ipt-anzen
+libexec/nut/mge-ellipse
+libexec/nut/mgeups
 libexec/nut/mustekups
 libexec/nut/newapc
 libexec/nut/optiups
 libexec/nut/powercom
 libexec/nut/toshiba1500
 libexec/nut/ups-trust425+625
+libexec/nut/upseyeux
 libexec/nut/victronups
 sbin/upsd
 sbin/upsmon
 sbin/upssched
+%%PORTDOCS%%share/doc/nut/Changes.trust
+%%PORTDOCS%%share/doc/nut/FAQ
+%%PORTDOCS%%share/doc/nut/QUICKSTART
+%%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/commands.txt
+%%PORTDOCS%%share/doc/nut/configure.txt
+%%PORTDOCS%%share/doc/nut/data-room.txt
+%%PORTDOCS%%share/doc/nut/design.txt
+%%PORTDOCS%%share/doc/nut/dummyups.txt
+%%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/new-modules.txt
+%%PORTDOCS%%share/doc/nut/pager.txt
+%%PORTDOCS%%share/doc/nut/powercom.txt
+%%PORTDOCS%%share/doc/nut/protocol.txt
+%%PORTDOCS%%share/doc/nut/shutdown.txt
+%%PORTDOCS%%share/doc/nut/tips.txt
+%%PORTDOCS%%share/doc/nut/todo.txt
+%%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/victron.txt
+%%CGIFILES%%share/nut/cgi/multimon.cgi
+%%CGIFILES%%share/nut/cgi/upsimage.cgi
+%%CGIFILES%%share/nut/cgi/upsset.cgi
+%%CGIFILES%%share/nut/cgi/upsstats.cgi
+%%PORTDOCS%%@dirrm share/doc/nut/cables
+%%PORTDOCS%%@dirrm share/doc/nut
+@dirrm share/nut/cgi
+@dirrm share/nut
 @dirrm etc/nut
 @dirrm libexec/nut
diff --git a/sysutils/nut22/pkg-plist.cgi b/sysutils/nut22/pkg-plist.cgi
deleted file mode 100644
index 670b38eca27c..000000000000
--- a/sysutils/nut22/pkg-plist.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-share/nut/cgi/multimon.cgi
-share/nut/cgi/upsimage.cgi
-share/nut/cgi/upsset.cgi
-share/nut/cgi/upsstats.cgi
-@dirrm share/nut/cgi
-@dirrm share/nut
diff --git a/sysutils/nut22/pkg-plist.doc b/sysutils/nut22/pkg-plist.doc
deleted file mode 100644
index d1b1724ce29a..000000000000
--- a/sysutils/nut22/pkg-plist.doc
+++ /dev/null
@@ -1,26 +0,0 @@
-share/doc/nut/Changes.trust
-share/doc/nut/FAQ
-share/doc/nut/QUICKSTART
-share/doc/nut/README
-share/doc/nut/access.txt
-share/doc/nut/belkin.txt
-share/doc/nut/big-servers.txt
-share/doc/nut/commands.txt
-share/doc/nut/configure.txt
-share/doc/nut/data-room.txt
-share/doc/nut/dummyups.txt
-share/doc/nut/generic-ups.txt
-share/doc/nut/model-arguments.txt
-share/doc/nut/new-modules.txt
-share/doc/nut/pager.txt
-share/doc/nut/powercom.txt
-share/doc/nut/protocol.txt
-share/doc/nut/shutdown.txt
-share/doc/nut/tips.txt
-share/doc/nut/todo.txt
-share/doc/nut/ups-trust425+625.txt
-share/doc/nut/upssched.txt
-share/doc/nut/cables/powerware.txt
-share/doc/nut/cables/victron.txt
-@dirrm share/doc/nut/cables
-@dirrm share/doc/nut