4 files changed, 17 insertions, 41 deletions

diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index cb6939812b9c..5ea530d55e17 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	2.4.1
-#PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -22,6 +21,8 @@ USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	pkgconfig
 
+NO_LATEST_LINK=	yes
+
 NUT_USER?=	uucp
 NUT_GROUP?=	uucp
 STATEDIR?=	/var/db/nut
@@ -30,7 +31,6 @@ OPTIONS=	SERIAL		"SERIAL support"	on \
 		USB		"USB support"	on \
 		SNMP		"SNMP support"	on \
 		NEON		"NEON XML/HTTP support"	on \
-		PDU		"Powerman PDU support"	off \
 		HAL		"HAL support"	off \
 		IPV6		"IPV6 support"  on \
 		DEVEL		"Install header files"	off \
@@ -59,6 +59,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/nut \
 		--with-altpidpath=${STATEDIR} \
 		--with-pidpath=${STATEDIR} \
 		--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig \
+		--with-linux-hiddev=no \
 		--with-user=${NUT_USER} \
 		--with-group=${NUT_GROUP}
 
@@ -82,11 +83,11 @@ PLIST_SUB+=	NUT_CGI="@comment "
 
 .if !defined(WITHOUT_SERIAL)
 CONFIGURE_ARGS+=	--with-serial
-MAN8+=		apcsmart.8 bcmxcp.8 belkin.8 belkinunv.8 \
-		bestuferrups.8 bestups.8 bestfcom.8 blazer.8 cyberpower.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 gamatronic.8 genericups.8 \
 		isbmex.8 liebert.8 masterguard.8 megatec.8 metasys.8 \
-		mge-shut.8 mge-utalk.8 microdowell.8 oneac.8 optiups.8 \
+		mge-shut.8 mge-utalk.8 nitram.8 oneac.8 optiups.8 \
 		powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \
 		tripplitesu.8 upscode2.8 victronups.8
 PLIST_SUB+=	NUT_SERIAL=""
@@ -102,8 +103,7 @@ LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-m4_nut_check_libusb.m4
 . endif
 CONFIGURE_ARGS+=	--with-usb=auto
-MAN8+=		bcmxcp_usb.8 megatec_usb.8 richcomm_usb.8 tripplite_usb.8 \
-		usbhid-ups.8
+MAN8+=		bcmxcp_usb.8 megatec_usb.8 tripplite_usb.8 usbhid-ups.8
 PLIST_SUB+=	NUT_USB=""
 .else
 CONFIGURE_ARGS+=	--without-usb
@@ -134,16 +134,6 @@ CONFIGURE_ARGS+=	--without-neonxml
 PLIST_SUB+=	NUT_NEON="@comment "
 .endif
 
-.if defined(WITH_PDU)
-LIB_DEPENDS+=	powerman.0:${PORTSDIR}/sysutils/powerman
-CONFIGURE_ARGS+=	--with-powerman
-MAN8+=		powerman-pdu.8
-PLIST_SUB+=	NUT_PDU=""
-.else
-CONFIGURE_ARGS+=	--without-powerman
-PLIST_SUB+=	NUT_PDU="@comment "
-.endif
-
 .if defined(WITH_HAL)
 . if defined(WITHOUT_USB)
 BROKEN=		HAL is only usable with USB support enabled. Run 'make config' again!
diff --git a/sysutils/nut22/distinfo b/sysutils/nut22/distinfo
index 71778da37c71..430e505e1878 100644
--- a/sysutils/nut22/distinfo
+++ b/sysutils/nut22/distinfo
@@ -1,6 +1,6 @@
-MD5 (nut-2.4.1.tar.gz) = 609ebaf2123fc7171d25a6c742dd7d66
-SHA256 (nut-2.4.1.tar.gz) = 9e2441e1a7046627715cfe78e22f82f7bb05bf380735f803731b64e06bd19f3c
-SIZE (nut-2.4.1.tar.gz) = 1121152
-MD5 (nut-2.4.1.tar.gz.sig) = 3ac8a55987e25fbe07466a5673fdad68
-SHA256 (nut-2.4.1.tar.gz.sig) = 9e3e116b8f51e452d9af9b77d310b097096e8078a22c73a1ee3a0cb934ab64a5
-SIZE (nut-2.4.1.tar.gz.sig) = 72
+MD5 (nut-2.2.2.tar.gz) = 677a84a83e9be7bc93610413ee696375
+SHA256 (nut-2.2.2.tar.gz) = 599d0024bcc116137a3eb65030d3dbc7132a64f30a7717f76a8254d8543422eb
+SIZE (nut-2.2.2.tar.gz) = 1184406
+MD5 (nut-2.2.2.tar.gz.sig) = 2664e2b5bd2a7e7cd2939cb3f43d8e3d
+SHA256 (nut-2.2.2.tar.gz.sig) = 17f420125e63368f127b6802aa60c3be6a99737276bf82163fc694c2d186fe22
+SIZE (nut-2.2.2.tar.gz.sig) = 65
diff --git a/sysutils/nut22/files/patch-clients-upssched.c b/sysutils/nut22/files/patch-clients-upssched.c
deleted file mode 100644
index 1d2129b03d53..000000000000
--- a/sysutils/nut22/files/patch-clients-upssched.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- clients/upssched.c.orig	2009-02-19 20:01:40.000000000 +0100
-+++ clients/upssched.c	2009-02-19 20:02:00.000000000 +0100
-@@ -595,7 +595,7 @@
- 	int	pipefd, ret;
- 	struct	sockaddr_un saddr;
- 
--	memset(&sa, '\0', sizeof(saddr));
-+	memset(&saddr, '\0', sizeof(saddr));
- 	saddr.sun_family = AF_UNIX;
- 	snprintf(saddr.sun_path, sizeof(saddr.sun_path), "%s", pipefn);
- 
diff --git a/sysutils/nut22/pkg-plist b/sysutils/nut22/pkg-plist
index 894de723587f..f18971be7baf 100644
--- a/sysutils/nut22/pkg-plist
+++ b/sysutils/nut22/pkg-plist
@@ -8,7 +8,6 @@ bin/upsrw
 bin/upssched-cmd
 etc/nut/cmdvartab
 etc/nut/driver.list
-etc/nut/nut.conf.sample
 etc/nut/ups.conf.sample
 etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
@@ -23,6 +22,7 @@ lib/libupsclient.la
 %%NUT_HAL%%libexec/hald-addon-megatec_usb
 %%NUT_HAL%%libexec/hald-addon-tripplite_usb
 %%NUT_HAL%%libexec/hald-addon-usbhid-ups
+%%NUT_SERIAL%%libexec/nut/al175
 %%NUT_SERIAL%%libexec/nut/apcsmart
 %%NUT_SERIAL%%libexec/nut/bcmxcp
 %%NUT_USB%%libexec/nut/bcmxcp_usb
@@ -31,8 +31,7 @@ lib/libupsclient.la
 %%NUT_SERIAL%%libexec/nut/bestfcom
 %%NUT_SERIAL%%libexec/nut/bestuferrups
 %%NUT_SERIAL%%libexec/nut/bestups
-%%NUT_SERIAL%%libexec/nut/blazer_ser
-%%NUT_USB%%libexec/nut/blazer_usb
+%%NUT_SERIAL%%libexec/nut/cpsups
 %%NUT_SERIAL%%libexec/nut/cyberpower
 %%NUT_SERIAL%%libexec/nut/dummy-ups
 %%NUT_SERIAL%%libexec/nut/etapro
@@ -47,16 +46,14 @@ lib/libupsclient.la
 %%NUT_SERIAL%%libexec/nut/metasys
 %%NUT_SERIAL%%libexec/nut/mge-shut
 %%NUT_SERIAL%%libexec/nut/mge-utalk
-%%NUT_SERIAL%%libexec/nut/microdowell
 %%NUT_NEON%%libexec/nut/netxml-ups
 %%NUT_SERIAL%%libexec/nut/newmge-shut
+%%NUT_SERIAL%%libexec/nut/nitram
 %%NUT_SERIAL%%libexec/nut/oneac
 %%NUT_SERIAL%%libexec/nut/optiups
 %%NUT_SERIAL%%libexec/nut/powercom
-%%NUT_PDU%%libexec/nut/powerman-pdu
 %%NUT_SERIAL%%libexec/nut/powerpanel
 %%NUT_SERIAL%%libexec/nut/rhino
-%%NUT_USB%%libexec/nut/richcomm_usb
 %%NUT_SERIAL%%libexec/nut/safenet
 %%NUT_SNMP%%libexec/nut/snmp-ups
 %%NUT_SERIAL%%libexec/nut/skel