ports/163306: [patch] upgrade sysutils/nut to 2.6.2 and fix misc port problems

[Garrett Cooper]

>Number:         163306
>Category:       ports
>Synopsis:       [patch] upgrade sysutils/nut to 2.6.2 and fix misc port problems
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 15 04:00:19 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        9.0-RC2
>Organization:
iXsystems, Inc.
>Environment:
FreeBSD bayonetta.local 9.0-RC2 FreeBSD 9.0-RC2 #0: Sun Nov 13 21:17:31 PST 2011     gcooper at bayonetta.local:/usr/obj/store/freebsd/stable/9/sys/BAYONETTA  amd64

>Description:
The attached patch:
1. Updates sysutils/nut from 2.6.1 to 2.6.2.
2. Sorts out one item in the pkg-plist.
3. Fixes the fact that the bash completions weren't being installed with the 2.6.1 port when NOPORTDOCS was defined.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -Naur sysutils/nut/Makefile sysutils/nut/Makefile
--- sysutils/nut/Makefile	2011-12-14 18:46:42.500726389 -0800
+++ sysutils/nut/Makefile	2011-12-14 19:11:45.507705209 -0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION=	2.6.1
+PORTVERSION=	2.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.networkupstools.org/source/${PORTVERSION:R}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -44,10 +44,25 @@
 		upscli_splitname.3 upscli_ssl.3 upscli_strerror.3 \
 		upscli_upserror.3 upsclient.3
 
+MAN3=		\
+		nutscan_add_device_to_device.3 \
+		nutscan_add_option_to_device.3 \
+		nutscan_cidr_to_ip.3 \
+		nutscan_display_parsable.3 \
+		nutscan_display_ups_conf.3 \
+		nutscan_free_device.3 \
+		nutscan_new_device.3 \
+		nutscan_scan_avahi.3 \
+		nutscan_scan_ipmi.3 \
+		nutscan_scan_nut.3 \
+		nutscan_scan_snmp.3 \
+		nutscan_scan_usb.3 \
+		nutscan_scan_xml_http.3 \
+
 MAN5=		nut.conf.5 ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
 		upssched.conf.5
 
-MAN8=		nutupsdrv.8 upsc.8 upscmd.8 upsd.8 upsdrvctl.8 \
+MAN8=		nut-scanner.8 nutupsdrv.8 upsc.8 upscmd.8 upsd.8 upsdrvctl.8 \
 		upslog.8 upsmon.8 upsrw.8 upssched.8
 
 PORTDOCS=	*
diff -Naur sysutils/nut/distinfo sysutils/nut/distinfo
--- sysutils/nut/distinfo	2011-12-14 18:46:42.487744571 -0800
+++ sysutils/nut/distinfo	2011-12-14 19:05:14.149691131 -0800
@@ -1,4 +1,4 @@
-SHA256 (nut-2.6.1.tar.gz) = f5c46b856c0cf5b7f0e4b22d82b670af64cc98717a90eaac8723dd402a181c00
-SIZE (nut-2.6.1.tar.gz) = 1776645
-SHA256 (nut-2.6.1.tar.gz.sig) = 780be2a54fcd4df1124f8dcec4e49df3c1c7a985e030856dbe63fd77d0e76ea8
-SIZE (nut-2.6.1.tar.gz.sig) = 72
+SHA256 (nut-2.6.2.tar.gz) = 343554add0713348f8b09bca8d83eee2eb2ae8bad9cdad9a39e0f0e2d0f5d375
+SIZE (nut-2.6.2.tar.gz) = 1897691
+SHA256 (nut-2.6.2.tar.gz.sig) = 606fa60c12dc4dfbaf9195aee86d56690dd2f38a81076c0e7353b9cd70228f29
+SIZE (nut-2.6.2.tar.gz.sig) = 72
diff -Naur sysutils/nut/pkg-plist sysutils/nut/pkg-plist
--- sysutils/nut/pkg-plist	2011-12-14 18:46:42.487744571 -0800
+++ sysutils/nut/pkg-plist	2011-12-14 19:15:57.023692087 -0800
@@ -1,6 +1,7 @@
 @stopdaemon nut_upsmon
 @stopdaemon nut_upslog
 @stopdaemon nut
+bin/nut-scanner
 bin/upsc
 bin/upscmd
 bin/upslog
@@ -26,6 +27,7 @@
 %%NUT_HAL%%libexec/hald-addon-tripplite_usb
 %%NUT_HAL%%libexec/hald-addon-usbhid-ups
 %%NUT_SERIAL%%libexec/nut/apcsmart
+%%NUT_SERIAL%%libexec/nut/apcsmart-old
 %%NUT_SERIAL%%libexec/nut/bestfortress
 %%NUT_SERIAL%%libexec/nut/bcmxcp
 %%NUT_USB%%libexec/nut/bcmxcp_usb
@@ -62,8 +64,8 @@
 %%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
+%%NUT_SNMP%%libexec/nut/snmp-ups
 %%NUT_SERIAL%%libexec/nut/solis
 %%NUT_SERIAL%%libexec/nut/tripplite
 %%NUT_USB%%libexec/nut/tripplite_usb


>Release-Note:
>Audit-Trail:
>Unformatted: