3 files changed, 58 insertions, 85 deletions

diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 22d580cc6487..0f2a447c3535 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,47 +6,36 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	0.45.3
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.exploits.org/nut/release/
+MASTER_SITES=	http://www.exploits.org/nut/release/${PORTVERSION:R}/
 
 MAINTAINER=	DougB@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--localstatedir=/var/db/nut \
-		--with-modelpath=${PREFIX}/libexec/nut \
+		--with-drvpath=${PREFIX}/libexec/nut \
 		--with-statepath=/var/db/nut \
 		--with-altpidpath=/var/db/nut \
 		--with-pidpath=/var/db/nut
 
 MAN5=		ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
-MAN8=		apcsmart.8 belkin.8 bestups.8 fentonups.8 nutupsdrv.8 \
-		powercom.8 upsc.8 upscmd.8 upsct.8 upsct2.8 upsd.8 \
-		upsdrvctl.8 upslog.8 upsmon.8 upssched.8
+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 \
+		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
 
 ALL_TARGET=	all
 
-.if defined(CGI)
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
-.if !exists(${PREFIX}/www) && exists(${PREFIX}/share/apache)
-CGIDIR?=	share/apache/cgi-bin
-.else
-CGIDIR?=	www/cgi-bin
-.endif
-CONFIGURE_ARGS+=--with-cgipath=${PREFIX}/${CGIDIR}/nut
-ALL_TARGET+=	cgi
-PLIST_SUB+=	CGIFILES="${CGIDIR}/nut/"
-PLIST_SUB+=	CGIDIRRM="@dirrm ${CGIDIR}/nut"
-.else
-PLIST_SUB+=	CGIFILES="@comment "
-PLIST_SUB+=	CGIDIRRM="@comment "
-.endif
-
 pre-fetch:
-.if !defined(CGI)
-	@${ECHO_MSG} "Type \"make CGI=yes\" if you want to build CGI scripts."
+.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.'
 .endif
 
 pre-install:
@@ -54,29 +43,22 @@ pre-install:
 	@${MKDIR} /var/db/nut
 	@${CHOWN} uucp /var/db/nut
 
-NDOCDIR=	${PREFIX}/share/doc/nut
-
 post-install:
-	@${SED} -e "/%%PREFIX%%/s##${PREFIX}#g" \
-		${WRKSRC}/scripts/FreeBSD/upsd.sh.sample \
-		>${PREFIX}/etc/rc.d/nut.sh.sample
+	@${SED} -e "s#%%PREFIX%%#${PREFIX}#g" \
+		${FILESDIR}/nut.sh.sample > ${PREFIX}/etc/rc.d/nut.sh.sample
 	@${CHMOD} 0755 ${PREFIX}/etc/rc.d/nut.sh.sample
-	${INSTALL_DATA} ${WRKSRC}/conf/ups.conf \
-		${PREFIX}/etc/nut/ups.conf.sample
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${NDOCDIR}/cables
-	${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NDOCDIR}/cables
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/CREDITS ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${NDOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${NDOCDIR}
-.endif
-.if defined(CGI)
-	@${MKDIR} ${PREFIX}/${CGIDIR}/nut
-	${INSTALL_DATA} ${WRKSRC}/clients/*.cgi ${PREFIX}/${CGIDIR}/nut
+	@${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}
+.for file in CHANGES CREDITS INSTALL NEWS README UPGRADING
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index a4c1331504d1..b11c9f6317c2 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1 +1 @@
-MD5 (nut-0.45.3.tar.gz) = 904cbb02c90671dbeaf924ed6ba94b20
+MD5 (nut-1.2.1.tar.gz) = bf1147dbc04a6d5bb982d03720d2331e
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index d3138f4cc1dd..61de974b1aac 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -1,44 +1,39 @@
 bin/upsc
 bin/upscmd
-bin/upsct
-bin/upsct2
 bin/upslog
-etc/nut/hosts.conf.sample
-etc/nut/multimon.conf.sample
+bin/upsrw
 etc/nut/ups.conf.sample
 etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
-etc/nut/upsset.conf.sample
 etc/rc.d/nut.sh.sample
-libexec/nut/aeg
 libexec/nut/apcsmart
+libexec/nut/bcmxcp
 libexec/nut/belkin
-libexec/nut/bestfort
+libexec/nut/bestferrups801-807
+libexec/nut/bestfortress
 libexec/nut/bestuferrups
 libexec/nut/bestups
 libexec/nut/cyberpower
-libexec/nut/engetron
+libexec/nut/etapro
 libexec/nut/everups
 libexec/nut/fentonups
 libexec/nut/genericups
-libexec/nut/ipt-anzen
+libexec/nut/hp
+libexec/nut/isbmex
+libexec/nut/liebert
 libexec/nut/masterguard
 libexec/nut/mge-ellipse
-libexec/nut/mgeups
-libexec/nut/multilink
-libexec/nut/mustekups
+libexec/nut/mge-utalk
+libexec/nut/microdowell
 libexec/nut/newapc
-libexec/nut/newpowercom
-libexec/nut/optiups
+libexec/nut/oneac
 libexec/nut/powercom
 libexec/nut/sec
 libexec/nut/sms
-libexec/nut/toshiba1500
-libexec/nut/ups-trust425+625
+libexec/nut/tripplite
 libexec/nut/upsdrvctl
-libexec/nut/upseyeux
 libexec/nut/victronups
 sbin/upsd
 sbin/upsmon
@@ -47,43 +42,39 @@ sbin/upssched
 %%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/Changes.trust
-%%PORTDOCS%%share/doc/nut/access.txt
-%%PORTDOCS%%share/doc/nut/belkin.txt
+%%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/driver-control.txt
-%%PORTDOCS%%share/doc/nut/dummycons.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/multilink.txt
-%%PORTDOCS%%share/doc/nut/new-modules.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/powercom.txt
 %%PORTDOCS%%share/doc/nut/protocol.txt
 %%PORTDOCS%%share/doc/nut/shutdown.txt
-%%PORTDOCS%%share/doc/nut/tips.txt
+%%PORTDOCS%%share/doc/nut/ssl.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/repotec.txt
-%%PORTDOCS%%share/doc/nut/cables/sms.txt
-%%PORTDOCS%%share/doc/nut/cables/victron.txt
-%%CGIFILES%%multimon.cgi
-%%CGIFILES%%upsimage.cgi
-%%CGIFILES%%upsset.cgi
-%%CGIFILES%%upsstats.cgi
 %%PORTDOCS%%@dirrm share/doc/nut/cables
+%%PORTDOCS%%@dirrm share/doc/nut/drivers
 %%PORTDOCS%%@dirrm share/doc/nut
-%%CGIDIRRM%%
 @dirrm etc/nut
 @dirrm libexec/nut