Date: Thu, 16 Jun 2011 20:04:25 +0400 (MSD) From: Lev Serebryakov <lev@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: itetcu@FreeBSD.org Subject: ports/157925: [PATCH] Update sysutils/nut to latest version 2.6.1 Message-ID: <20110616160425.E8DAF4AC31@onlyone.friendlyhosting.spb.ru> Resent-Message-ID: <201106161610.p5GGA7X0062472@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157925
>Category: ports
>Synopsis: [PATCH] Update sysutils/nut to latest version 2.6.1
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 16 16:10:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Lev Serebryakov
>Release: FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD vmware-8-32.home.serebryakov.spb.ru 8.2-STABLE FreeBSD 8.2-STABLE #5: Tue May 31 20:52:35 MSD 2011 lev@vmware-8-32.home.serebryakov.spb.ru:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Please note, that patch is prepared from ports' root, as it should update UPDATING file too.
Please, remove:
sysutils/nut/files/patch-clients-upssched.c
sysutils/nut/files/patch-m4-nut_check_ipv6.m4
>How-To-Repeat:
>Fix:
? sysutils/nut/after
? sysutils/nut/before
Index: UPDATING
===================================================================
RCS file: /home/pcvs/ports/UPDATING,v
retrieving revision 1.1078
diff -u -r1.1078 UPDATING
--- UPDATING 13 Jun 2011 19:22:24 -0000 1.1078
+++ UPDATING 16 Jun 2011 15:59:05 -0000
@@ -5,6 +5,16 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20110616:
+ AFFECTS: users of sysutils/nut
+ AUTHOR: lev@FreeBSD.org
+
+ New version of nut changes some drivers:
+ - users of the megatec and megatec_usb drivers must respectively switch
+ to blazer_ser and blazer_usb.
+ - users of the liebertgxt2 driver are advised that the driver name has
+ changed to liebert-esp2.
+
20110613:
AFFECTS: users of mail/mailman with postfix
AUTHOR: crees@FreeBSD.org
Index: sysutils/nut/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- sysutils/nut/Makefile 4 Dec 2010 07:33:40 -0000 1.60
+++ sysutils/nut/Makefile 16 Jun 2011 15:59:05 -0000
@@ -6,8 +6,8 @@
#
PORTNAME= nut
-PORTVERSION= 2.4.1
-PORTREVISION= 6
+PORTVERSION= 2.6.1
+PORTREVISION= 0
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
@@ -32,7 +32,6 @@
NEON "NEON XML/HTTP support" on \
PDU "Powerman PDU support" off \
HAL "HAL support" off \
- IPV6 "IPV6 support" on \
CGI "Web CGI interface" off
USE_RC_SUBR= nut.sh nut_upsmon.sh nut_upslog.sh
@@ -45,7 +44,7 @@
upscli_splitname.3 upscli_ssl.3 upscli_strerror.3 \
upscli_upserror.3 upsclient.3
-MAN5= ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \
+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 \
@@ -89,12 +88,12 @@
.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 \
- 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 \
- powercom.8 powerpanel.8 rhino.8 safenet.8 solis.8 tripplite.8 \
- tripplitesu.8 upscode2.8 victronups.8
+ bestuferrups.8 bestfortress.8 bestups.8 bestfcom.8 blazer.8 \
+ clone.8 dummy-ups.8 etapro.8 everups.8 gamatronic.8 \
+ genericups.8 isbmex.8 ivtscd.8 liebert.8 liebert-esp2.8 \
+ masterguard.8 metasys.8 mge-shut.8 mge-utalk.8 microdowell.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=""
.else
CONFIGURE_ARGS+= --without-serial
@@ -108,7 +107,7 @@
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 \
+MAN8+= bcmxcp_usb.8 richcomm_usb.8 tripplite_usb.8 \
usbhid-ups.8
PLIST_SUB+= NUT_USB=""
.else
@@ -151,7 +150,8 @@
BROKEN= HAL is only usable with USB support enabled. Run 'make config' again!
. endif
LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
-CONFIGURE_ARGS+= --with-hal
+CONFIGURE_ARGS+= --with-hal \
+ --with-hal-callouts-path=${PREFIX}/libexec
#MAN8+=
PLIST_SUB+= NUT_HAL=""
.else
@@ -159,12 +159,6 @@
PLIST_SUB+= NUT_HAL="@comment "
.endif
-.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --with-ipv6
-.else
-CONFIGURE_ARGS+= --without-ipv6
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|<hal/|<|' ${WRKSRC}/drivers/main-hal.c ${WRKSRC}/drivers/dstate-hal.c ${WRKSRC}/drivers/dstate-hal.h
@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share| ; s|$${datarootdir}|${PREFIX}/share|' ${WRKSRC}/m4/nut_check_libhal.m4
@@ -180,7 +174,6 @@
@${MKDIR} ${DOCSDIR}/cables
${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables
${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
.for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
Index: sysutils/nut/distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/distinfo,v
retrieving revision 1.27
diff -u -r1.27 distinfo
--- sysutils/nut/distinfo 19 Mar 2011 12:32:57 -0000 1.27
+++ sysutils/nut/distinfo 16 Jun 2011 15:59:05 -0000
@@ -1,4 +1,4 @@
-SHA256 (nut-2.4.1.tar.gz) = 9e2441e1a7046627715cfe78e22f82f7bb05bf380735f803731b64e06bd19f3c
-SIZE (nut-2.4.1.tar.gz) = 1121152
-SHA256 (nut-2.4.1.tar.gz.sig) = 9e3e116b8f51e452d9af9b77d310b097096e8078a22c73a1ee3a0cb934ab64a5
-SIZE (nut-2.4.1.tar.gz.sig) = 72
+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
Index: sysutils/nut/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/pkg-plist,v
retrieving revision 1.31
diff -u -r1.31 pkg-plist
--- sysutils/nut/pkg-plist 19 Dec 2009 19:48:00 -0000 1.31
+++ sysutils/nut/pkg-plist 16 Jun 2011 15:59:05 -0000
@@ -1,4 +1,4 @@
-@stopdaemon nut_upsmon
+@stopdaemon nut_upsmo+n
@stopdaemon nut_upslog
@stopdaemon nut
bin/upsc
@@ -16,11 +16,12 @@
etc/nut/upssched.conf.sample
include/parseconf.h
include/upsclient.h
+lib/libupsclient.a
lib/libupsclient.so.1
lib/libupsclient.so
lib/libupsclient.la
%%NUT_HAL%%libexec/hald-addon-bcmxcp_usb
-%%NUT_HAL%%libexec/hald-addon-megatec_usb
+%%NUT_HAL%%libexec/hald-addon-blazer_usb
%%NUT_HAL%%libexec/hald-addon-tripplite_usb
%%NUT_HAL%%libexec/hald-addon-usbhid-ups
%%NUT_SERIAL%%libexec/nut/apcsmart
@@ -30,20 +31,22 @@
%%NUT_SERIAL%%libexec/nut/belkinunv
%%NUT_SERIAL%%libexec/nut/bestfcom
%%NUT_SERIAL%%libexec/nut/bestuferrups
+%%NUT_SERIAL%%libexec/nut/bestfortress
%%NUT_SERIAL%%libexec/nut/bestups
%%NUT_SERIAL%%libexec/nut/blazer_ser
%%NUT_USB%%libexec/nut/blazer_usb
-%%NUT_SERIAL%%libexec/nut/cyberpower
+%%NUT_SERIAL%%libexec/nut/clone
+%%NUT_SERIAL%%libexec/nut/clone-outlet
%%NUT_SERIAL%%libexec/nut/dummy-ups
%%NUT_SERIAL%%libexec/nut/etapro
%%NUT_SERIAL%%libexec/nut/everups
%%NUT_SERIAL%%libexec/nut/gamatronic
%%NUT_SERIAL%%libexec/nut/genericups
%%NUT_SERIAL%%libexec/nut/isbmex
+%%NUT_SERIAL%%libexec/nut/ivtscd
%%NUT_SERIAL%%libexec/nut/liebert
+%%NUT_SERIAL%%libexec/nut/liebert-esp2
%%NUT_SERIAL%%libexec/nut/masterguard
-%%NUT_SERIAL%%libexec/nut/megatec
-%%NUT_USB%%libexec/nut/megatec_usb
%%NUT_SERIAL%%libexec/nut/metasys
%%NUT_SERIAL%%libexec/nut/mge-shut
%%NUT_SERIAL%%libexec/nut/mge-utalk
Index: sysutils/nut/files/extra-patch-m4_nut_check_libusb.m4
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/files/extra-patch-m4_nut_check_libusb.m4,v
retrieving revision 1.1
diff -u -r1.1 extra-patch-m4_nut_check_libusb.m4
--- sysutils/nut/files/extra-patch-m4_nut_check_libusb.m4 9 Mar 2009 17:15:42 -0000 1.1
+++ sysutils/nut/files/extra-patch-m4_nut_check_libusb.m4 16 Jun 2011 15:59:05 -0000
@@ -1,31 +1,41 @@
---- m4/nut_check_libusb.m4.orig 2009-03-07 23:56:24.000000000 +0300
-+++ m4/nut_check_libusb.m4 2009-03-07 23:57:04.000000000 +0300
-@@ -17,24 +17,12 @@
+--- m4/nut_check_libusb.m4.orig 2011-05-31 14:36:43.000000000 +0400
++++ m4/nut_check_libusb.m4 2011-06-16 00:56:31.000000000 +0400
+@@ -32,34 +32,12 @@
+ AC_MSG_RESULT(${LIBUSB_VERSION} found)
- dnl Check for libusb libs and flags
- AC_MSG_CHECKING(for libusb cflags)
-- CFLAGS=`libusb-config --cflags 2>/dev/null`
-- if (test "$?" != "0")
-- then
-- AC_MSG_RESULT(not found)
-- nut_have_libusb=no
-- else
-- AC_MSG_RESULT(${CFLAGS})
-- fi
-+ CFLAGS=""
-+ AC_MSG_RESULT(${CFLAGS})
+ AC_MSG_CHECKING(for libusb cflags)
+- AC_ARG_WITH(usb-includes,
+- AS_HELP_STRING([@<:@--with-usb-includes=CFLAGS@:>@], [include flags for the libusb library]),
+- [
+- case "${withval}" in
+- yes|no)
+- AC_MSG_ERROR(invalid option --with(out)-usb-includes - see docs/configure.txt)
+- ;;
+- *)
+- CFLAGS="${withval}"
+- ;;
+- esac
+- ], [])
+- AC_MSG_RESULT([${CFLAGS}])
++ CFLAGS=""
++ AC_MSG_RESULT(${CFLAGS})
- AC_MSG_CHECKING(for libusb libs)
-- LDFLAGS=`libusb-config --libs 2>/dev/null`
-- if (test "$?" != "0")
-- then
-- AC_MSG_RESULT(not found)
-- nut_have_libusb=no
-- else
-- AC_MSG_RESULT(${LDFLAGS})
-- fi
-+ LDFLAGS="-lusb"
-+ AC_MSG_RESULT(${LDFLAGS})
+ AC_MSG_CHECKING(for libusb ldflags)
+- AC_ARG_WITH(usb-libs,
+- AS_HELP_STRING([@<:@--with-usb-libs=LIBS@:>@], [linker flags for the libusb library]),
+- [
+- case "${withval}" in
+- yes|no)
+- AC_MSG_ERROR(invalid option --with(out)-usb-libs - see docs/configure.txt)
+- ;;
+- *)
+- LIBS="${withval}"
+- ;;
+- esac
+- ], [])
+- AC_MSG_RESULT([${LIBS}])
++ LDFLAGS="-lusb"
++ AC_MSG_RESULT(${LDFLAGS})
- if test "${nut_have_libusb}" = "yes"; then
- LIBUSB_CFLAGS="${CFLAGS}"
+ dnl check if libusb is usable
+ AC_CHECK_HEADERS(usb.h, [nut_have_libusb=yes], [nut_have_libusb=no], [AC_INCLUDES_DEFAULT])
Index: sysutils/nut/files/patch-clients-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/files/patch-clients-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-clients-Makefile.in
--- sysutils/nut/files/patch-clients-Makefile.in 12 Jun 2008 05:41:35 -0000 1.2
+++ sysutils/nut/files/patch-clients-Makefile.in 16 Jun 2011 15:59:05 -0000
@@ -1,11 +1,11 @@
---- clients/Makefile.in.orig 2007-07-05 15:21:22.000000000 +0200
-+++ clients/Makefile.in 2007-08-28 15:25:39.000000000 +0200
-@@ -440,7 +440,7 @@
- done
+--- clients/Makefile.in.orig 2011-06-01 16:00:01.000000000 +0400
++++ clients/Makefile.in 2011-06-15 19:58:10.000000000 +0400
+@@ -485,7 +485,7 @@
+ rm -f $$list
install-cgiexecPROGRAMS: $(cgiexec_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(cgiexecdir)" || $(MKDIR_P) "$(DESTDIR)$(cgiexecdir)"
+ test -z "$(cgiexec_PROGRAMS)" -o -z "$(cgiexecdir)" || $(MKDIR_P) "$(DESTDIR)$(cgiexecdir)"
- @list='$(cgiexec_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
+ @list='$(cgiexec_PROGRAMS)'; test -n "$(cgiexecdir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
Index: sysutils/nut/files/patch-data-html-Makefile.in
===================================================================
RCS file: /home/pcvs/ports/sysutils/nut/files/patch-data-html-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-data-html-Makefile.in
--- sysutils/nut/files/patch-data-html-Makefile.in 12 Jun 2008 05:41:35 -0000 1.2
+++ sysutils/nut/files/patch-data-html-Makefile.in 16 Jun 2011 15:59:05 -0000
@@ -1,20 +1,20 @@
---- data/html/Makefile.in.orig 2007-07-05 15:21:23.000000000 +0200
-+++ data/html/Makefile.in 2007-08-28 15:25:08.000000000 +0200
-@@ -285,7 +285,7 @@
- uninstall-info-am:
+--- data/html/Makefile.in.orig 2011-06-01 16:00:01.000000000 +0400
++++ data/html/Makefile.in 2011-06-15 20:00:57.000000000 +0400
+@@ -298,7 +298,7 @@
+ -rm -rf .libs _libs
install-dist_htmlDATA: $(dist_html_DATA)
@$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+ test -z "$(dist_html_DATA)" -o -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- @list='$(dist_html_DATA)'; for p in $$list; do \
+ @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-@@ -302,7 +302,7 @@
- done
+@@ -318,7 +318,7 @@
+ cd "$(DESTDIR)$(htmldir)" && rm -f $$files
install-nodist_htmlDATA: $(nodist_html_DATA)
@$(NORMAL_INSTALL)
- test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
+ test -z "$(nodist_html_DATA)" -o -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
- @list='$(nodist_html_DATA)'; for p in $$list; do \
+ @list='$(nodist_html_DATA)'; test -n "$(htmldir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110616160425.E8DAF4AC31>