Date: Fri, 4 Jul 2014 00:30:46 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360497 - in head/sysutils/nut: . files Message-ID: <201407040030.s640UkL9085305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Jul 4 00:30:45 2014 New Revision: 360497 URL: http://svnweb.freebsd.org/changeset/ports/360497 QAT: https://qat.redports.org/buildarchive/r360497/ Log: Update 2.6.5 --> 2.7.2, stagify and modernize, assume maintainership. Approved by: itetcu (maintainer) Deleted: head/sysutils/nut/files/patch-clients__Makefile.in head/sysutils/nut/files/patch-data__html__Makefile.in Modified: head/sysutils/nut/Makefile head/sysutils/nut/distinfo head/sysutils/nut/pkg-plist Modified: head/sysutils/nut/Makefile ============================================================================== --- head/sysutils/nut/Makefile Fri Jul 4 00:26:43 2014 (r360496) +++ head/sysutils/nut/Makefile Fri Jul 4 00:30:45 2014 (r360497) @@ -2,14 +2,13 @@ # $FreeBSD$ PORTNAME= nut -PORTVERSION= 2.6.5 -PORTREVISION= 1 +PORTVERSION= 2.7.2 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= itetcu@FreeBSD.org +MAINTAINER= cy@FreeBSD.org COMMENT= Network UPS Tools USE_AUTOTOOLS= autoconf @@ -20,8 +19,10 @@ USES= gmake pkgconfig NUT_USER?= uucp NUT_GROUP?= uucp STATEDIR?= /var/db/nut +PLIST_SUB+= NUT_USER=${NUT_USER} +PLIST_SUB+= NUT_GROUP=${NUT_GROUP} -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU HAL CGI BASH +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU CGI BASH OPTIONS_DEFAULT=SERIAL USB SNMP NEON SERIAL_DESC= SERIAL support @@ -36,27 +37,8 @@ USE_RC_SUBR= nut nut_upsmon nut_upslog SUB_LIST+= STATEDIR=${STATEDIR} PLIST_SUB+= STATEDIR=${STATEDIR} -MAN3= nutscan.3 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_init.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 \ - upscli_connect.3 upscli_disconnect.3 upscli_fd.3 \ - upscli_get.3 upscli_list_next.3 upscli_list_start.3 \ - upscli_readline.3 upscli_sendline.3 upscli_splitaddr.3 \ - upscli_splitname.3 upscli_ssl.3 upscli_strerror.3 \ - upscli_upserror.3 upsclient.3 - -MAN5= nut.conf.5 ups.conf.5 upsd.conf.5 upsd.users.5 upsmon.conf.5 \ - upssched.conf.5 - -MAN8= nut-recorder.8 nut-scanner.8 nutupsdrv.8 upsc.8 \ - upscmd.8 upsd.8 upsdrvctl.8 upslog.8 upsmon.8 upsrw.8 upssched.8 - PORTDOCS= * -NO_STAGE= yes .include <bsd.port.options.mk> CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \ @@ -73,9 +55,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e --with-dev .if ${PORT_OPTIONS:MCGI} -LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd -MAN5+= hosts.conf.5 upsset.conf.5 upsstats.html.5 -MAN8+= upsset.cgi.8 upsstats.cgi.8 upsimage.cgi.8 +LIB_DEPENDS+= libgd.so:${PORTSDIR}/graphics/gd CGIDIR?= ${PREFIX}/www/cgi-bin/${PORTNAME} CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} CONFIGURE_ARGS+= --with-cgi --with-cgipath=${CGIDIR} \ @@ -92,13 +72,6 @@ PLIST_SUB+= NUT_CGI="@comment " .if ${PORT_OPTIONS:MSERIAL} CONFIGURE_ARGS+= --with-serial -MAN8+= apcsmart.8 apcsmart-old.8 bestfortress.8 bcmxcp.8 belkin.8 \ - belkinunv.8 bestuferrups.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 +81,6 @@ PLIST_SUB+= NUT_SERIAL="@comment " .if ${PORT_OPTIONS:MUSB} #EXTRA_PATCHES= ${FILESDIR}/extra-patch-m4_nut_check_libusb.m4 CONFIGURE_ARGS+= --with-usb=auto -MAN8+= bcmxcp_usb.8 richcomm_usb.8 tripplite_usb.8 usbhid-ups.8 PLIST_SUB+= NUT_USB="" .else CONFIGURE_ARGS+= --without-usb @@ -116,9 +88,8 @@ PLIST_SUB+= NUT_USB="@comment " .endif .if ${PORT_OPTIONS:MSNMP} -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+= --with-snmp -MAN8+= snmp-ups.8 PLIST_SUB+= NUT_SNMP="" .else CONFIGURE_ARGS+= --without-snmp @@ -126,9 +97,8 @@ PLIST_SUB+= NUT_SNMP="@comment " .endif .if ${PORT_OPTIONS:MNEON} -LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29 +LIB_DEPENDS+= libneon.so:${PORTSDIR}/www/neon29 CONFIGURE_ARGS+= --with-neonxml -MAN8+= netxml-ups.8 PLIST_SUB+= NUT_NEON="" .else CONFIGURE_ARGS+= --without-neonxml @@ -137,29 +107,14 @@ PLIST_SUB+= NUT_NEON="@comment " .endif .if ${PORT_OPTIONS:MPDU} -LIB_DEPENDS+= powerman.0:${PORTSDIR}/sysutils/powerman +LIB_DEPENDS+= libpowerman.so:${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 ${PORT_OPTIONS:MHAL} -. if empty(PORT_OPTIONS:MUSB) -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 \ - --with-hal-callouts-path=${PREFIX}/libexec -#MAN8+= -PLIST_SUB+= NUT_HAL="" -.else -CONFIGURE_ARGS+= --without-hal -PLIST_SUB+= NUT_HAL="@comment " -.endif - .if ${PORT_OPTIONS:MBASH} RUN_DEPENDS+= ${LOCALBASE}/share/bash-completion/bash_completion.sh:${PORTSDIR}/shells/bash-completion PLIST_SUB+= BASH="" @@ -167,28 +122,21 @@ PLIST_SUB+= BASH="" PLIST_SUB+= BASH="@comment " .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 - pre-install: - @${MKDIR} ${PREFIX}/libexec/nut - @${MKDIR} ${STATEDIR} - @${CHOWN} ${NUT_USER}:${NUT_GROUP} ${STATEDIR} - @${CHMOD} 0750 ${STATEDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nut .if ${PORT_OPTIONS:MDOCS} post-install: .if ${PORT_OPTIONS:MBASH} - @${MKDIR} ${PREFIX}/etc/bash_completion.d/ - ${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${PREFIX}/etc/bash_completion.d/ + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ + ${INSTALL_DATA} ${WRKSRC}/scripts/misc/nut.bash_completion ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ .endif - @${MKDIR} ${DOCSDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${DOCSDIR}/cables - ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/cables + ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${STAGEDIR}${DOCSDIR}/cables + ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/FAQ.txt ${STAGEDIR}${DOCSDIR} .for file in AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README UPGRADING - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/sysutils/nut/distinfo ============================================================================== --- head/sysutils/nut/distinfo Fri Jul 4 00:26:43 2014 (r360496) +++ head/sysutils/nut/distinfo Fri Jul 4 00:30:45 2014 (r360497) @@ -1,4 +1,4 @@ -SHA256 (nut-2.6.5.tar.gz) = 618df71cf1ca6e3700d1d3c282773a2dec85f9f20324c0d3234c824e97feb93f -SIZE (nut-2.6.5.tar.gz) = 2038832 -SHA256 (nut-2.6.5.tar.gz.sig) = 4aa66e909d730e2ca6953e3728f783c45bce5506af283b61737e988d22e6e02a -SIZE (nut-2.6.5.tar.gz.sig) = 72 +SHA256 (nut-2.7.2.tar.gz) = 4d5365359b059d96dfcb77458f361a114d26c84f1297ffcd0c6c166f7200376d +SIZE (nut-2.7.2.tar.gz) = 2223307 +SHA256 (nut-2.7.2.tar.gz.sig) = ef4dbed3ecad9f0fb27415c8790ae0a444d499d1284e389b166c279625f312aa +SIZE (nut-2.7.2.tar.gz.sig) = 72 Modified: head/sysutils/nut/pkg-plist ============================================================================== --- head/sysutils/nut/pkg-plist Fri Jul 4 00:26:43 2014 (r360496) +++ head/sysutils/nut/pkg-plist Fri Jul 4 00:30:45 2014 (r360497) @@ -1,10 +1,10 @@ %%NUT_CGI%%%%CGIDIR%%/upsimage.cgi %%NUT_CGI%%%%CGIDIR%%/upsset.cgi %%NUT_CGI%%%%CGIDIR%%/upsstats.cgi -%%NUT_CGI%%%%CGIETCDIR%%/hosts.conf.sample -%%NUT_CGI%%%%CGIETCDIR%%/upsset.conf.sample -%%NUT_CGI%%%%CGIETCDIR%%/upsstats.html.sample -%%NUT_CGI%%%%CGIETCDIR%%/upsstats-single.html.sample +%%NUT_CGI%%%%CGIETCDIR%%hosts.conf.sample +%%NUT_CGI%%%%CGIETCDIR%%upsset.conf.sample +%%NUT_CGI%%%%CGIETCDIR%%upsstats.html.sample +%%NUT_CGI%%%%CGIETCDIR%%upsstats-single.html.sample %%NUT_CGI%%%%WWWDIR%%/bottom.html %%NUT_CGI%%%%WWWDIR%%/header.html %%NUT_CGI%%%%WWWDIR%%/index.html @@ -27,21 +27,29 @@ bin/upsrw bin/upssched-cmd %%BASH%%etc/bash_completion.d/nut.bash_completion include/nut-scan.h +include/nutclient.h include/nutscan-device.h include/nutscan-init.h include/nutscan-ip.h include/parseconf.h include/upsclient.h +lib/libnutclient.a +lib/libnutclient.la +lib/libnutclient.so +lib/libnutclient.so.0 lib/libupsclient.a lib/libupsclient.la lib/libupsclient.so -lib/libupsclient.so.2 +lib/libupsclient.so.4 +libdata/pkgconfig/libnutclient.pc libdata/pkgconfig/libnutscan.pc libdata/pkgconfig/libupsclient.pc -%%NUT_HAL%%libexec/hald-addon-bcmxcp_usb -%%NUT_HAL%%libexec/hald-addon-blazer_usb -%%NUT_HAL%%libexec/hald-addon-tripplite_usb -%%NUT_HAL%%libexec/hald-addon-usbhid-ups +libexec/nut/al175 +libexec/nut/apcupsd-ups +libexec/nut/nutdrv_atcl_usb +libexec/nut/nutdrv_qx +libexec/nut/riello_ser +libexec/nut/riello_usb %%NUT_SERIAL%%libexec/nut/apcsmart %%NUT_SERIAL%%libexec/nut/apcsmart-old %%NUT_SERIAL%%libexec/nut/bcmxcp @@ -87,16 +95,160 @@ libdata/pkgconfig/libupsclient.pc %%NUT_USB%%libexec/nut/tripplite_usb %%NUT_SERIAL%%libexec/nut/tripplitesu %%NUT_SERIAL%%libexec/nut/upscode2 -libexec/nut/upsdrvctl %%NUT_USB%%libexec/nut/usbhid-ups %%NUT_SERIAL%%libexec/nut/victronups +man/man3/libnutclient.3.gz +man/man3/libnutclient_commands.3.gz +man/man3/libnutclient_devices.3.gz +man/man3/libnutclient_general.3.gz +man/man3/libnutclient_misc.3.gz +man/man3/libnutclient_tcp.3.gz +man/man3/libnutclient_variables.3.gz +man/man3/nutclient_authenticate.3.gz +man/man3/nutclient_destroy.3.gz +man/man3/nutclient_device_forced_shutdown.3.gz +man/man3/nutclient_device_login.3.gz +man/man3/nutclient_device_master.3.gz +man/man3/nutclient_execute_device_command.3.gz +man/man3/nutclient_get_device_command_description.3.gz +man/man3/nutclient_get_device_commands.3.gz +man/man3/nutclient_get_device_description.3.gz +man/man3/nutclient_get_device_num_logins.3.gz +man/man3/nutclient_get_device_rw_variables.3.gz +man/man3/nutclient_get_device_variable_description.3.gz +man/man3/nutclient_get_device_variable_values.3.gz +man/man3/nutclient_get_device_variables.3.gz +man/man3/nutclient_get_devices.3.gz +man/man3/nutclient_has_device.3.gz +man/man3/nutclient_has_device_command.3.gz +man/man3/nutclient_has_device_variable.3.gz +man/man3/nutclient_logout.3.gz +man/man3/nutclient_set_device_variable_value.3.gz +man/man3/nutclient_set_device_variable_values.3.gz +man/man3/nutclient_tcp_create_client.3.gz +man/man3/nutclient_tcp_disconnect.3.gz +man/man3/nutclient_tcp_get_timeout.3.gz +man/man3/nutclient_tcp_is_connected.3.gz +man/man3/nutclient_tcp_reconnect.3.gz +man/man3/nutclient_tcp_set_timeout.3.gz +man/man3/nutscan.3.gz +man/man3/nutscan_add_device_to_device.3.gz +man/man3/nutscan_add_option_to_device.3.gz +man/man3/nutscan_cidr_to_ip.3.gz +man/man3/nutscan_display_parsable.3.gz +man/man3/nutscan_display_ups_conf.3.gz +man/man3/nutscan_free_device.3.gz +man/man3/nutscan_get_serial_ports_list.3.gz +man/man3/nutscan_init.3.gz +man/man3/nutscan_new_device.3.gz +man/man3/nutscan_scan_avahi.3.gz +man/man3/nutscan_scan_eaton_serial.3.gz +man/man3/nutscan_scan_ipmi.3.gz +man/man3/nutscan_scan_nut.3.gz +man/man3/nutscan_scan_snmp.3.gz +man/man3/nutscan_scan_usb.3.gz +man/man3/nutscan_scan_xml_http.3.gz +man/man3/upscli_add_host_cert.3.gz +man/man3/upscli_cleanup.3.gz +man/man3/upscli_connect.3.gz +man/man3/upscli_disconnect.3.gz +man/man3/upscli_fd.3.gz +man/man3/upscli_get.3.gz +man/man3/upscli_init.3.gz +man/man3/upscli_list_next.3.gz +man/man3/upscli_list_start.3.gz +man/man3/upscli_readline.3.gz +man/man3/upscli_sendline.3.gz +man/man3/upscli_splitaddr.3.gz +man/man3/upscli_splitname.3.gz +man/man3/upscli_ssl.3.gz +man/man3/upscli_strerror.3.gz +man/man3/upscli_upserror.3.gz +man/man3/upsclient.3.gz +man/man5/nut.conf.5.gz +man/man5/ups.conf.5.gz +man/man5/upsd.conf.5.gz +man/man5/upsd.users.5.gz +man/man5/upsmon.conf.5.gz +man/man5/upssched.conf.5.gz +man/man8/al175.8.gz +man/man8/apcupsd-ups.8.gz +man/man8/blazer_ser.8.gz +man/man8/blazer_usb.8.gz +man/man8/nut-recorder.8.gz +man/man8/nut-scanner.8.gz +man/man8/nutdrv_atcl_usb.8.gz +man/man8/nutdrv_qx.8.gz +man/man8/nutupsdrv.8.gz +man/man8/riello_ser.8.gz +man/man8/riello_usb.8.gz +man/man8/upsc.8.gz +man/man8/upscmd.8.gz +man/man8/upsd.8.gz +man/man8/upsdrvctl.8.gz +man/man8/upslog.8.gz +man/man8/upsmon.8.gz +man/man8/upsrw.8.gz +man/man8/upssched.8.gz +%%NUT_CGI%%man/man5/hosts.conf.5.gz +%%NUT_CGI%%man/man5/upsset.conf.5.gz +%%NUT_CGI%%man/man5/upsstats.html.5.gz +%%NUT_CGI%%man/man8/upsset.cgi.8.gz +%%NUT_CGI%%man/man8/upsstats.cgi.8.gz +%%NUT_CGI%%man/man8/upsimage.cgi.8.gz +%%NUT_SERIAL%%man/man8/apcsmart.8.gz +%%NUT_SERIAL%%man/man8/apcsmart-old.8.gz +%%NUT_SERIAL%%man/man8/bestfortress.8.gz +%%NUT_SERIAL%%man/man8/bcmxcp.8.gz +%%NUT_SERIAL%%man/man8/belkin.8.gz +%%NUT_SERIAL%%man/man8/belkinunv.8.gz +%%NUT_SERIAL%%man/man8/bestuferrups.8.gz +%%NUT_SERIAL%%man/man8/bestups.8.gz +%%NUT_SERIAL%%man/man8/bestfcom.8.gz +%%NUT_SERIAL%%man/man8/clone.8.gz +%%NUT_SERIAL%%man/man8/dummy-ups.8.gz +%%NUT_SERIAL%%man/man8/etapro.8.gz +%%NUT_SERIAL%%man/man8/everups.8.gz +%%NUT_SERIAL%%man/man8/gamatronic.8.gz +%%NUT_SERIAL%%man/man8/genericups.8.gz +%%NUT_SERIAL%%man/man8/isbmex.8.gz +%%NUT_SERIAL%%man/man8/ivtscd.8.gz +%%NUT_SERIAL%%man/man8/liebert.8.gz +%%NUT_SERIAL%%man/man8/liebert-esp2.8.gz +%%NUT_SERIAL%%man/man8/masterguard.8.gz +%%NUT_SERIAL%%man/man8/metasys.8.gz +%%NUT_SERIAL%%man/man8/mge-shut.8.gz +%%NUT_SERIAL%%man/man8/mge-utalk.8.gz +%%NUT_SERIAL%%man/man8/microdowell.8.gz +%%NUT_SERIAL%%man/man8/oneac.8.gz +%%NUT_SERIAL%%man/man8/optiups.8.gz +%%NUT_SERIAL%%man/man8/powercom.8.gz +%%NUT_SERIAL%%man/man8/powerpanel.8.gz +%%NUT_SERIAL%%man/man8/rhino.8.gz +%%NUT_SERIAL%%man/man8/safenet.8.gz +%%NUT_SERIAL%%man/man8/solis.8.gz +%%NUT_SERIAL%%man/man8/tripplite.8.gz +%%NUT_SERIAL%%man/man8/tripplitesu.8.gz +%%NUT_SERIAL%%man/man8/upscode2.8.gz +%%NUT_SERIAL%%man/man8/victronups.8.gz +%%NUT_USB%%man/man8/bcmxcp_usb.8.gz +%%NUT_USB%%man/man8/richcomm_usb.8.gz +%%NUT_USB%%man/man8/tripplite_usb.8.gz +%%NUT_USB%%man/man8/usbhid-ups.8.gz +%%NUT_SNMP%%man/man8/snmp-ups.8.gz +%%NUT_NEON%%man/man8/netxml-ups.8.gz +%%NUT_PDU%%man/man8/powerman-pdu.8.gz sbin/upsd +sbin/upsdrvctl sbin/upsmon sbin/upssched -%%NUT_HAL%%share/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi -@dirrmtry share/hal/fdi/information/20thirdparty +@exec mkdir %%STATEDIR%% +@exec chown %%NUT_USER%%:%%NUT_GROUP%% %%STATEDIR%% +@exec chmod 750 %%STATEDIR%% +@unexec test -d %%STATEDIR%% && rmdir %%STATEDIR%% @dirrmtry %%CGIDIR%% @dirrmtry %%ETCDIR%% @dirrmtry %%WWWDIR%% @dirrmtry etc/bash_completion.d @dirrmtry libexec/nut +@dirrmtry www/cgi-bin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407040030.s640UkL9085305>