Upgrade to version 1.4.0, the latest stable version.

Re-enable the CGI programs, now that they build.

Kind assistance provided by: Guido Falsi <mad@madpilot.net>

4 files changed, 93 insertions, 51 deletions

diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 914958b..66b54ea 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	1.2.1
+PORTVERSION=	1.4.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.exploits.org/nut/release/${PORTVERSION:R}/
 
@@ -26,20 +26,41 @@ MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 MAN8=		apcsmart.8 bcmxcp.8 belkin.8 bestferrups801-807.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-ellipse.8 mge-utalk.8 microdowell.8 newapc.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 upsc.8 upscmd.8 upsd.8 upsdrvctl.8 \
-		upslog.8 upsmon.8 upsrw.8 upssched.8 victronups.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
 
 ALL_TARGET=	all
+INSTALL_TARGET=	install
 
-pre-fetch:
-.if defined(CGI) && !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	@${ECHO_MSG} 'CGI clients are currently disabled because they require'
-	@${ECHO_MSG} 'a later version of the gd2 library than we have.'
+.if defined(WITH_NUT_CGI)
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
+ALL_TARGET+=	cgi
+INSTALL_TARGET+=install-cgi
+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)
+CGIDIR?=	share/apache/cgi-bin
+.else
+CGIDIR?=	www/cgi-bin
+.endif
+CONFIGURE_ARGS+=	--with-cgi --with-cgipath=${PREFIX}/${CGIDIR}/nut \
+			--with-gd-includes=-I${PREFIX}/include \
+			--with-gd-libs="-L${PREFIX}/lib -lgd"
+PLIST_SUB+=	CGIFILES="${CGIDIR}/nut/"
+PLIST_SUB+=	CGIDIRRM="@dirrm ${CGIDIR}/nut"
+PLIST_SUB+=	CGIETC="etc/nut/"
+.else
+PLIST_SUB+=	CGIFILES="@comment "
+PLIST_SUB+=	CGIDIRRM="@comment "
+PLIST_SUB+=	CGIETC="@comment "
 .endif
 
 pre-install:
+.if !defined(WITH_NUT_CGI) && !defined(BATCH) && !defined(PACKAGE_BUILDING)
+	@${ECHO_MSG} "Type \"make -DWITH_NUT_CGI\" if you want to build CGI scripts."
+.endif
 	@${MKDIR} ${PREFIX}/libexec/nut
 	@${MKDIR} /var/db/nut
 	@${CHOWN} uucp /var/db/nut
@@ -52,8 +73,6 @@ post-install:
 	@${MKDIR} ${DOCSDIR}/cables
 	@${MKDIR} ${DOCSDIR}/drivers
 	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
-	${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${DOCSDIR}/drivers
-	${INSTALL_DATA} ${WRKSRC}/docs/drivers/README ${DOCSDIR}/drivers
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${DOCSDIR}
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index b11c9f6..4e2f767 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1 +1 @@
-MD5 (nut-1.2.1.tar.gz) = bf1147dbc04a6d5bb982d03720d2331e
+MD5 (nut-1.4.0.tar.gz) = 1ddf547866db0f1eeb9c535ba0339906
diff --git a/sysutils/nut22/files/patch-drivers::mge-shut.h b/sysutils/nut22/files/patch-drivers::mge-shut.h
new file mode 100644
index 0000000..5430501
--- /dev/null
+++ b/sysutils/nut22/files/patch-drivers::mge-shut.h
@@ -0,0 +1,11 @@
+--- drivers/mge-shut.h.orig	Mon Sep  8 16:05:30 2003
++++ drivers/mge-shut.h	Mon Sep  8 16:06:24 2003
+@@ -166,7 +166,7 @@
+   char	item_path[MAX_STRING];		/* HID object (fully qualified string path) */
+   char	fmt[6];						/* printf format string for INFO entry   */
+   char	*dfl;						/* default value */
+-  ulong	shut_flags;					/* specific SHUT flags */
++  unsigned long	shut_flags;					/* specific SHUT flags */
+ } mge_info_item;
+ 
+ /* Array containing information to translate between UTalk and NUT info
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index 61de974..629af5a 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -16,6 +16,7 @@ libexec/nut/bestfortress
 libexec/nut/bestuferrups
 libexec/nut/bestups
 libexec/nut/cyberpower
+libexec/nut/esupssmart
 libexec/nut/etapro
 libexec/nut/everups
 libexec/nut/fentonups
@@ -24,7 +25,7 @@ libexec/nut/hp
 libexec/nut/isbmex
 libexec/nut/liebert
 libexec/nut/masterguard
-libexec/nut/mge-ellipse
+libexec/nut/mge-shut
 libexec/nut/mge-utalk
 libexec/nut/microdowell
 libexec/nut/newapc
@@ -33,48 +34,59 @@ libexec/nut/powercom
 libexec/nut/sec
 libexec/nut/sms
 libexec/nut/tripplite
+libexec/nut/tripplitesu
 libexec/nut/upsdrvctl
 libexec/nut/victronups
 sbin/upsd
 sbin/upsmon
 sbin/upssched
-%%PORTDOCS%%share/doc/nut/CHANGES
-%%PORTDOCS%%share/doc/nut/CREDITS
-%%PORTDOCS%%share/doc/nut/FAQ
-%%PORTDOCS%%share/doc/nut/INSTALL
-%%PORTDOCS%%share/doc/nut/NEWS
-%%PORTDOCS%%share/doc/nut/README
-%%PORTDOCS%%share/doc/nut/UPGRADING
-%%PORTDOCS%%share/doc/nut/big-servers.txt
-%%PORTDOCS%%share/doc/nut/cables/apc.txt
-%%PORTDOCS%%share/doc/nut/cables/ge-imv-victron.txt
-%%PORTDOCS%%share/doc/nut/cables/imv.txt
-%%PORTDOCS%%share/doc/nut/cables/mgeups.txt
-%%PORTDOCS%%share/doc/nut/cables/powerware.txt
-%%PORTDOCS%%share/doc/nut/cables/repotec.txt
-%%PORTDOCS%%share/doc/nut/cables/sms.txt
-%%PORTDOCS%%share/doc/nut/chroot.txt
-%%PORTDOCS%%share/doc/nut/commands.txt
-%%PORTDOCS%%share/doc/nut/config-files.txt
-%%PORTDOCS%%share/doc/nut/configure.txt
-%%PORTDOCS%%share/doc/nut/data-room.txt
-%%PORTDOCS%%share/doc/nut/design.txt
-%%PORTDOCS%%share/doc/nut/developers.txt
-%%PORTDOCS%%share/doc/nut/driver.list
-%%PORTDOCS%%share/doc/nut/drivers/README
-%%PORTDOCS%%share/doc/nut/drivers/generic-ups.txt
-%%PORTDOCS%%share/doc/nut/drivers/mge-ellipse.txt
-%%PORTDOCS%%share/doc/nut/drivers/mge-utalk.txt
-%%PORTDOCS%%share/doc/nut/drivers/snmp-ups.txt
-%%PORTDOCS%%share/doc/nut/new-drivers.txt
-%%PORTDOCS%%share/doc/nut/pager.txt
-%%PORTDOCS%%share/doc/nut/protocol.txt
-%%PORTDOCS%%share/doc/nut/shutdown.txt
-%%PORTDOCS%%share/doc/nut/ssl.txt
-%%PORTDOCS%%share/doc/nut/todo.txt
-%%PORTDOCS%%share/doc/nut/upssched.txt
-%%PORTDOCS%%@dirrm share/doc/nut/cables
-%%PORTDOCS%%@dirrm share/doc/nut/drivers
-%%PORTDOCS%%@dirrm share/doc/nut
-@dirrm etc/nut
+share/cmdvartab
+%%CGIFILES%%upsimage.cgi
+%%CGIFILES%%upsset.cgi
+%%CGIFILES%%upsstats.cgi
+%%CGIETC%%hosts.conf.sample
+%%CGIETC%%upsset.conf.sample
+%%CGIETC%%upsstats.html.sample
+%%CGIETC%%upsstats-single.html.sample
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
+%%PORTDOCS%%%%DOCSDIR%%/big-servers.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/apc.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/ge-imv-victron.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/imv.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/mgeups.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/powerware.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/repotec.txt
+%%PORTDOCS%%%%DOCSDIR%%/cables/sms.txt
+%%PORTDOCS%%%%DOCSDIR%%/chroot.txt
+%%PORTDOCS%%%%DOCSDIR%%/commands.txt
+%%PORTDOCS%%%%DOCSDIR%%/config-files.txt
+%%PORTDOCS%%%%DOCSDIR%%/configure.txt
+%%PORTDOCS%%%%DOCSDIR%%/contact-closure.txt
+%%PORTDOCS%%%%DOCSDIR%%/data-room.txt
+%%PORTDOCS%%%%DOCSDIR%%/design.txt
+%%PORTDOCS%%%%DOCSDIR%%/developers.txt
+%%PORTDOCS%%%%DOCSDIR%%/driver.list
+%%PORTDOCS%%%%DOCSDIR%%/new-drivers.txt
+%%PORTDOCS%%%%DOCSDIR%%/new-names.txt
+%%PORTDOCS%%%%DOCSDIR%%/osd-notify.txt
+%%PORTDOCS%%%%DOCSDIR%%/pager.txt
+%%PORTDOCS%%%%DOCSDIR%%/powersaving.txt
+%%PORTDOCS%%%%DOCSDIR%%/protocol.txt
+%%PORTDOCS%%%%DOCSDIR%%/shutdown.txt
+%%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
+@dirrm %%DOCSDIR%%
 @dirrm libexec/nut
+%%CGIDIRRM%%
+@unexec rmdir %D/etc/nut 2>/dev/null || true