sysutils/nut: Update to 2.8.4

Copied nut-devel Makefile and pkg-plist for the same time period to
avoid having to test rebuild every option. Hopefully this is good
enough.

PR:		294189
This commit is contained in:
Cy Schubert
2026-04-01 12:04:32 -07:00
parent 073987603c
commit dc50ab13e8
5 changed files with 48 additions and 48 deletions
+10 -8
View File
@@ -1,6 +1,5 @@
PORTNAME= nut
PORTVERSION= 2.8.2
PORTREVISION= 1
PORTVERSION= 2.8.4
CATEGORIES= sysutils
MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/
@@ -66,6 +65,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
--program-transform-name="" \
--localstatedir=${STATEDIR} \
--datadir=${PREFIX}/etc/nut \
--mandir=${PREFIX}/share/man/nut \
--with-devd-dir=${PREFIX}/etc/devd \
--with-drvpath=${PREFIX}/libexec/nut \
--with-statepath=${STATEDIR} \
@@ -78,12 +78,13 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
--without-python2 \
--with-python3=${PYTHON_CMD} \
--without-nut_monitor \
--with-ltdl --with-nut-scanner
--with-ltdl --with-nut-scanner \
--without-augeas-lenses-dir \
--enable-extapi-enphase=no
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -pthread
CPPFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LIB_DEPENDS+= libltdl.so:devel/libltdl
MANPAGES_CONFIGURE_ON= --with-doc=man=auto
@@ -99,17 +100,18 @@ CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \
SERIAL_CONFIGURE_WITH= serial
USB_CONFIGURE_WITH= usb=auto
USB_LIB_DEPENDS= libgio-2.0.so:devel/glib20
SNMP_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp
SNMP_CONFIGURE_WITH= snmp
NEON_LIB_DEPENDS+= libneon.so:www/neon
NEON_LIB_DEPENDS= libneon.so:www/neon
NEON_CONFIGURE_WITH= neon
PDU_LIB_DEPENDS+= libpowerman.so:sysutils/powerman
PDU_LIB_DEPENDS= libpowerman.so:sysutils/powerman
PDU_CONFIGURE_WITH= powerman
MODBUS_LIB_DEPENDS+= libmodbus.so:comms/libmodbus
MODBUS_LIB_DEPENDS= libmodbus.so:comms/libmodbus
MODBUS_CONFIGURE_WITH= modbus
AVAHI_BUILD_DEPENDS= ${LOCALBASE}/include/avahi-ui/avahi-ui.h:net/avahi-header
@@ -155,7 +157,7 @@ post-install:
${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
.for file in AUTHORS COPYING INSTALL MAINTAINERS NEWS README
${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1712029991
SHA256 (nut-2.8.2.tar.gz) = e4b4b0cbe7dd39ba9097be7f7d787bb2fffbe35df64dff53b5fe393d659c597d
SIZE (nut-2.8.2.tar.gz) = 5599935
TIMESTAMP = 1775069525
SHA256 (nut-2.8.4.tar.gz) = 0130ba82ea79f04ba4f34c5249a85943977efd984ed7df6aec1a518d5a3594f8
SIZE (nut-2.8.4.tar.gz) = 6522704
@@ -1,21 +0,0 @@
--- m4/nut_check_libltdl.m4.orig 2023-08-01 07:33:24.593954000 -0700
+++ m4/nut_check_libltdl.m4 2023-08-01 07:35:18.506094000 -0700
@@ -10,10 +10,7 @@
dnl No NUT_CHECK_PKGCONFIG here: (lib)ltdl.pc was not seen on any OS
dnl save CFLAGS and LIBS
- CFLAGS_ORIG="${CFLAGS}"
- LIBS_ORIG="${LIBS}"
LIBS=""
- CFLAGS=""
dnl For fallback below:
myCFLAGS=""
@@ -71,7 +68,5 @@
unset myCFLAGS
dnl restore original CFLAGS and LIBS
- CFLAGS="${CFLAGS_ORIG}"
- LIBS="${LIBS_ORIG}"
fi
])
@@ -1,8 +0,0 @@
--- scripts/Makefile.am.orig 2020-02-09 10:44:01.000000000 -0800
+++ scripts/Makefile.am 2020-03-24 19:40:01.084978000 -0700
@@ -25,4 +25,4 @@
Windows/halt.c \
Windows/Makefile
-SUBDIRS = augeas devd hotplug python systemd udev Solaris upsdrvsvcctl
+SUBDIRS = augeas devd hotplug python udev upsdrvsvcctl
+35 -8
View File
@@ -14,7 +14,7 @@
@sample %%ETCDIR%%/nut.conf.sample
@sample %%ETCDIR%%/ups.conf.sample
@sample %%ETCDIR%%/upsd.conf.sample
@sample(%%NUT_USER%%,%%NUT_GROUP%%,0640) %%ETCDIR%%/upsd.users.sample
@sample %%ETCDIR%%/upsd.users.sample
@sample %%ETCDIR%%/upsmon.conf.sample
@sample %%ETCDIR%%/upssched.conf.sample
@sample %%EXAMPLESDIR%%/newsyslog.sample etc/newsyslog.conf.d/nut.conf
@@ -44,22 +44,23 @@ lib/libnutclient.so.2
lib/libnutclient.so.2.0.2
lib/libupsclient.a
lib/libupsclient.so
lib/libupsclient.so.6
lib/libupsclient.so.6.0.1
lib/libupsclient.so.7
lib/libupsclient.so.7.0.0
lib/libnutclientstub.a
lib/libnutclientstub.so
lib/libnutclientstub.so.1
lib/libnutclientstub.so.1.0.1
lib/libnutscan.a
lib/libnutscan.so
lib/libnutscan.so.2
lib/libnutscan.so.2.0.5
lib/libnutscan.so.4
lib/libnutscan.so.4.0.0
%%PYTHON_SITELIBDIR%%/PyNUT.py
%%PYTHON_SITELIBDIR%%/test_nutclient.py
%%DEV%%libdata/pkgconfig/libnutclient.pc
%%DEV%%libdata/pkgconfig/libnutscan.pc
%%DEV%%libdata/pkgconfig/libupsclient.pc
%%DEV%%libdata/pkgconfig/libnutclientstub.pc
%%DEV%%libexec/sockdebug
%%SERIAL%%libexec/nut/al175
%%SERIAL%%libexec/nut/apcupsd-ups
%%USB%%libexec/nut/nutdrv_atcl_usb
@@ -76,6 +77,7 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/bestfortress
%%SERIAL%%libexec/nut/bestuferrups
%%SERIAL%%libexec/nut/bestups
%%SERIAL%%libexec/nut/bicker_ser
%%SERIAL%%libexec/nut/blazer_ser
%%USB%%libexec/nut/blazer_usb
%%SERIAL%%libexec/nut/clone
@@ -83,12 +85,14 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/dummy-ups
%%SERIAL%%libexec/nut/etapro
%%SERIAL%%libexec/nut/everups
%%USB%%libexec/nut/failover
%%SERIAL%%libexec/nut/gamatronic
%%SERIAL%%libexec/nut/genericups
%%SERIAL%%libexec/nut/isbmex
%%SERIAL%%libexec/nut/ivtscd
%%SERIAL%%libexec/nut/liebert
%%SERIAL%%libexec/nut/liebert-esp2
%%SERIAL%%libexec/nut/liebert-gxe
%%SERIAL%%libexec/nut/masterguard
%%SERIAL%%libexec/nut/metasys
%%SERIAL%%libexec/nut/mge-utalk
@@ -99,10 +103,13 @@ lib/libnutscan.so.2.0.5
%%SERIAL%%libexec/nut/oneac
%%SERIAL%%libexec/nut/optiups
%%IPMIPSU%%libexec/nut/nut-ipmipsu
%%PDU%%libexec/nut/nutdrv_hashx
%%SERIAL%%libexec/nut/nutdrv_siemens-sitop
%%SERIAL%%libexec/nut/powercom
%%PDU%%libexec/nut/powerman-pdu
%%PDU%%libexec/nut/powervar_cx_ser
%%SERIAL%%libexec/nut/powerpanel
%%USB%%libexec/nut/powervar_cx_usb
%%SERIAL%%libexec/nut/rhino
%%USB%%libexec/nut/richcomm_usb
%%SERIAL%%libexec/nut/safenet
@@ -121,8 +128,8 @@ lib/libnutscan.so.2.0.5
%%MODBUS%%libexec/nut/huawei-ups2000
%%MODBUS%%libexec/nut/phoenixcontact_modbus
%%MODBUS%%libexec/nut/socomec_jbus
%%SERIAL%%libexec/nut/ve-direct
%%SERIAL%%libexec/nut/victronups
%%DEV%%libexec/sockdebug
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_commands.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_devices.3.gz
@@ -160,6 +167,7 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_ip_range.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_parsable.3.gz
@@ -168,8 +176,12 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_get_serial_ports_list.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_inc.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_init.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_new_device.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_avahi.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz
@@ -177,6 +189,7 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut_simulation.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_stringify_ip_ranges.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_add_host_cert.3.gz
@@ -185,17 +198,23 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%DEV%%share/man/man3/upscli_disconnect.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_fd.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_get.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_get_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_init.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_init_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_next.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_start.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_set_default_connect_timeout.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitaddr.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitname.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_add_unique_token.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_str_contains_token.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_strerror.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_tryconnect.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upscli_upserror.3.gz
%%MANPAGES%%%%DEV%%share/man/man3/upsclient.3.gz
%%MANPAGES%%share/man/man5/nut.conf.5.gz
@@ -204,12 +223,12 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%share/man/man5/upsd.users.5.gz
%%MANPAGES%%share/man/man5/upsmon.conf.5.gz
%%MANPAGES%%share/man/man5/upssched.conf.5.gz
%%MANPAGES%%share/man/man7/nut.7.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/al175.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/apcupsd-ups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/blazer_ser.8.gz
%%MANPAGES%%%%USB%%share/man/man8/blazer_usb.8.gz
%%MANPAGES%%%%NEON%%share/man/man8/netxml-ups.8.gz
%%MANPAGES%%share/man/man8/nut-driver-enumerator.8.gz
%%MANPAGES%%share/man/man8/nut-recorder.8.gz
%%MANPAGES%%share/man/man8/nut-scanner.8.gz
%%MANPAGES%%share/man/man8/nutconf.8.gz
@@ -217,6 +236,7 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%USB%%share/man/man8/nutdrv_qx.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz
%%MANPAGES%%share/man/man8/nutupsdrv.8.gz
%%MANPAGES%%%%USB%%share/man/man8/powervar_cx_usb.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz
%%MANPAGES%%%%USB%%share/man/man8/riello_usb.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz
@@ -230,7 +250,6 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%share/man/man8/upscmd.8.gz
%%MANPAGES%%share/man/man8/upsd.8.gz
%%MANPAGES%%share/man/man8/upsdrvctl.8.gz
%%MANPAGES%%share/man/man8/upsdrvsvcctl.8.gz
%%MANPAGES%%share/man/man8/upslog.8.gz
%%MANPAGES%%share/man/man8/upsmon.8.gz
%%MANPAGES%%share/man/man8/upsrw.8.gz
@@ -250,22 +269,27 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%SERIAL%%share/man/man8/bestuferrups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bestups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bestfcom.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/bicker_ser.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/clone.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/clone-outlet.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/dummy-ups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/etapro.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/everups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/failover.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/gamatronic.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/genericups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/isbmex.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/ivtscd.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/liebert.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-esp2.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-gxe.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/masterguard.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/metasys.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/mge-shut.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/mge-utalk.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/microdowell.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/microsol-apc.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_hashx.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/oneac.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/optiups.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/powercom.8.gz
@@ -285,6 +309,8 @@ lib/libnutscan.so.2.0.5
%%MANPAGES%%%%SNMP%%share/man/man8/snmp-ups.8.gz
%%MANPAGES%%%%IPMIPSU%%share/man/man8/nut-ipmipsu.8.gz
%%MANPAGES%%%%PDU%%share/man/man8/powerman-pdu.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/powervar_cx_ser.8.gz
%%MANPAGES%%%%SERIAL%%share/man/man8/ve-direct.8.gz
sbin/upsd
sbin/upsdrvctl
sbin/upsmon
@@ -293,3 +319,4 @@ sbin/upssched
@dir(%%NUT_USER%%,%%NUT_GROUP%%,750) %%STATEDIR%%
@dir libexec/nut
@dir(%%NUT_USER%%,%%NUT_GROUP%%,) /var/log/nut
%%PORTDOCS%%@dir %%DOCSDIR%%/html-man