CVS commit: pkgsrc/sysutils

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun May  3 16:39:14 UTC 2026

Modified Files:
        pkgsrc/sysutils/p5-UPS-Nut: Makefile
        pkgsrc/sysutils/ups-nut: Makefile Makefile.common PLIST PLIST.SunOS
            distinfo options.mk
        pkgsrc/sysutils/ups-nut-cgi: Makefile
        pkgsrc/sysutils/ups-nut/patches: patch-configure
Removed Files:
        pkgsrc/sysutils/ups-nut/patches: patch-clients_upsclient.c
            patch-conf_Makefile.in

Log Message:
sysutils/ups-nut: Update to 2.8.5

Release notes for NUT 2.8.5 - what's new since 2.8.4
----------------------------------------------------

 - common code:
   * Introduced `NUT_DEBUG_PROCNAME` environment variable support to optionally
     log also the process name (or however the program chose to identify itself).
     This may be useful when multiple NUT daemons log into the same file or
     console, without syslog to prefix the name into each line (e.g. in tests,
     single init script systems like Home Assistant, etc.) [PR 3368]

 - `asem`, `bestfortress`, `bestuferrups`, `bicker_ser`, `everups`, `metasys`,
   `masterguard`, `mge-utalk`, `oneac`, `phoenixcontact_modbus`, `pijuice`,
   `powercom`, `powervar_cx_ser`, `usbhid-ups`, `victronups` driver updates:
   * Moved code to align with NUT driver architecture, so `upsdrv_initups()`
     would focus on preparing communications, and `upsdrv_initinfo()` would
     actually talk to the device and set initial critical data values. [#1962]

 - Introduced a new NUT driver named `meanwell_ntu` which provides support for
   the Mean Well NTU series hybrid inverter and UPS units. [PR #3206]

 - Introduced a new NUT driver named `must_ep2000pro` which provides support
   for the MUST EP2000Pro compatible, line-interactive UPS models which talk
   serial-protocol modbus protocol. [PR #3228]

 - Introduced a new NUT driver named `nut-upower` which provides support
   for monitoring UPS and battery devices managed by the UPower daemon
   via D-Bus. This also introduces a new category of drivers that talk to
   operating system services to obtain power state information. [PR #3279]

 - `upsmon` client updates:
   * Make sure an `FSD` notification is issued for each UPS when this primary
     `upsmon` instance sets it (and does not return to usual data processing
     loop to see and report it like secondaries do). This allows a `NOTIFYCMD`
     such as `upssched` on the primary to handle the pending power outage
     (e.g. begin stopping heavy services) even while `upsmon` waits for the
     secondaries to complete their shutdowns and log out of the `upsd` data
     server. [issue #3003, PR #3110]

 - `configure` script updates:
   * For ages, most recipes for building NUT had customized the `sysconfdir` to
     be `/etc/nut`, which is not exactly the *system* configuration directory.
     This is finally deprecated, with new `--with-confdir` configuration option
     taking over the role of a full path to configuration files (by default
     `${sysconfdir}${confdir_suffix}`), and new `--with-confdir-suffix` allowing
     to specify just `/nut` or `/ups` that would be tacked onto the default
     `${sysconfdir}` to resolve the `${confdir}`. Default behavior should be
     same as with previous builds: if `sysconfdir` is customized (or `prefix`
     is kept at built-in default), the `confdir_suffix` will default to empty;
     otherwise it assumes the value of `/${PACKAGE_NAME}` to become `/nut` in
     most cases. A `--with-confdir-examples` option was also introduced, to
     help distributions that place `*.conf.sample` files into docs or other
     locations. [#3131]
   * The `configure` script would now probe (if it can) the operating systems
     for more user and group account names, such as `upsmon`, `nutmon`, `ups`,
     `nut` (last hit wins, separately for user and groups accounts) settling
     on one of those if detected instead of `nobody` (and optionally `nogroup`).
     It would also warn if `nobody` or `nogroup` end up being used for a build.
     [#3173]
   * Default `PIDPATH` is now more strictly `/var/run`, unless building on a
     system conforming to FHS-3.0 standard where that location is absent or
     is a symlink, while `/run` exists and is a true directory. [#3099]
   * Introduced `--with-python{,2,3}-modules-dir` to specify PyNUT(Client)
     module installation location (for module-named dir to be created under
     it), if not bundling with NUT-Monitor UI app. By default the respective
     interpreter's 'site-packages' or 'dist-packages' location will be used,
     so you may have to adjust search paths for any other values. [#3062]


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/p5-UPS-Nut/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/ups-nut/Makefile.common
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/ups-nut/PLIST.SunOS
cvs rdiff -u -r1.47 -r1.48 pkgsrc/sysutils/ups-nut/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/ups-nut/options.mk
cvs rdiff -u -r1.83 -r1.84 pkgsrc/sysutils/ups-nut-cgi/Makefile
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/sysutils/ups-nut/patches/patch-clients_upsclient.c
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/ups-nut/patches/patch-conf_Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/ups-nut/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/p5-UPS-Nut/Makefile
diff -u pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.22 pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.23
--- pkgsrc/sysutils/p5-UPS-Nut/Makefile:1.22    Fri Jul  4 08:48:11 2025
+++ pkgsrc/sysutils/p5-UPS-Nut/Makefile Sun May  3 16:39:14 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.22 2025/07/04 08:48:11 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/05/03 16:39:14 gdt Exp $
 
-PKGREVISION= 1
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/p5-UPS-Nut/}

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.83 pkgsrc/sysutils/ups-nut/Makefile:1.84
--- pkgsrc/sysutils/ups-nut/Makefile:1.83       Tue Sep 16 12:23:20 2025
+++ pkgsrc/sysutils/ups-nut/Makefile    Sun May  3 16:39:13 2026
@@ -1,13 +1,10 @@
-# $NetBSD: Makefile,v 1.83 2025/09/16 12:23:20 gdt Exp $
+# $NetBSD: Makefile,v 1.84 2026/05/03 16:39:13 gdt Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
-PKGREVISION=           1
 COMMENT=               Network UPS Tools
 
-PLIST_VARS+=           python
-
 SUBST_CLASSES+=                man-so
 SUBST_MESSAGE.man-so=  Fixing manpage .so references.
 SUBST_STAGE.man-so=    pre-build
@@ -87,7 +84,6 @@ INSTALLATION_DIRS+=   ${NUT_DOCDIR}/driver
 CHECK_INTERPRETER_SKIP+=       share/nut/solaris-init/nut
 
 post-install:
-       ${MV} ${DESTDIR}${NUT_CONFDIR}/*.sample ${DESTDIR}${NUT_EGDIR}
        for f in AUTHORS COPYING ChangeLog NEWS.adoc README.adoc UPGRADING.adoc; do \
                ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${NUT_DOCDIR}; \
        done

Index: pkgsrc/sysutils/ups-nut/Makefile.common
diff -u pkgsrc/sysutils/ups-nut/Makefile.common:1.22 pkgsrc/sysutils/ups-nut/Makefile.common:1.23
--- pkgsrc/sysutils/ups-nut/Makefile.common:1.22        Thu Sep 18 16:27:28 2025
+++ pkgsrc/sysutils/ups-nut/Makefile.common     Sun May  3 16:39:13 2026
@@ -1,18 +1,13 @@
-# $NetBSD: Makefile.common,v 1.22 2025/09/18 16:27:28 gdt Exp $
+# $NetBSD: Makefile.common,v 1.23 2026/05/03 16:39:13 gdt Exp $
 # used by sysutils/ups-nut/Makefile
 # used by sysutils/ups-nut-cgi/Makefile
 # used by sysutils/ups-nut-snmp/Makefile
 # used by sysutils/ups-nut-usb/Makefile
 # used by sysutils/p5-UPS-Nut/Makefile
 
-DISTNAME=              nut-2.8.4
+DISTNAME=              nut-2.8.5
 CATEGORIES=            sysutils
 MASTER_SITES=          https://networkupstools.org/source/${PKGVERSION_NOREV:R}/
-# Upstream placed an rc1 distfile at nut-2.8.4.tar.gz, and later
-# replaced it with a distfile corresponding to rc4 (which was the
-# actual release).
-# This is temporary until the next update.
-DIST_SUBDIR=           ups-nut-2.8.4bis
 
 MAINTAINER?=           gdt%NetBSD.org@localhost
 HOMEPAGE=              http://www.networkupstools.org/
@@ -29,7 +24,9 @@ USE_TOOLS=            pkg-config
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-cgipath=${NUT_CGIDIR:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${NUT_CONFDIR:Q}
+CONFIGURE_ARGS+=       --with-confdir-examples=${NUT_EGDIR:Q}
 CONFIGURE_ARGS+=       --datadir=${NUT_DATADIR:Q}
 CONFIGURE_ARGS+=       --localstatedir=${NUT_STATEDIR:Q}
 CONFIGURE_ARGS+=       --with-statepath=${NUT_STATEDIR:Q}

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.37 pkgsrc/sysutils/ups-nut/PLIST:1.38
--- pkgsrc/sysutils/ups-nut/PLIST:1.37  Tue Sep 16 12:23:20 2025
+++ pkgsrc/sysutils/ups-nut/PLIST       Sun May  3 16:39:13 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2025/09/16 12:23:20 gdt Exp $
+@comment $NetBSD: PLIST,v 1.38 2026/05/03 16:39:13 gdt Exp $
 bin/nut-scanner
 bin/nutconf
 bin/upsc
@@ -52,6 +52,7 @@ libexec/nut/liebert
 libexec/nut/liebert-esp2
 libexec/nut/liebert-gxe
 libexec/nut/masterguard
+libexec/nut/meanwell_ntu
 libexec/nut/metasys
 libexec/nut/mge-shut
 libexec/nut/mge-utalk
@@ -106,10 +107,40 @@ man/man3/nutclient_logout.3
 man/man3/nutclient_set_device_variable_value.3
 man/man3/nutclient_set_device_variable_values.3
 man/man3/nutclient_tcp_create_client.3
+man/man3/nutclient_tcp_create_client_ssl_NSSL.3
+man/man3/nutclient_tcp_create_client_ssl_OpenSSL.3
 man/man3/nutclient_tcp_disconnect.3
+man/man3/nutclient_tcp_get_ssl_cafile.3
+man/man3/nutclient_tcp_get_ssl_capath.3
+man/man3/nutclient_tcp_get_ssl_caps.3
+man/man3/nutclient_tcp_get_ssl_certfile.3
+man/man3/nutclient_tcp_get_ssl_certhost_name.3
+man/man3/nutclient_tcp_get_ssl_certident_name.3
+man/man3/nutclient_tcp_get_ssl_certstore_path.3
+man/man3/nutclient_tcp_get_ssl_certstore_prefix.3
+man/man3/nutclient_tcp_get_ssl_certverify.3
+man/man3/nutclient_tcp_get_ssl_force.3
+man/man3/nutclient_tcp_get_ssl_keyfile.3
+man/man3/nutclient_tcp_get_ssl_keypass.3
+man/man3/nutclient_tcp_get_ssl_try.3
 man/man3/nutclient_tcp_get_timeout.3
 man/man3/nutclient_tcp_is_connected.3
+man/man3/nutclient_tcp_is_ssl.3
 man/man3/nutclient_tcp_reconnect.3
+man/man3/nutclient_tcp_set_ssl_cafile.3
+man/man3/nutclient_tcp_set_ssl_capath.3
+man/man3/nutclient_tcp_set_ssl_certfile.3
+man/man3/nutclient_tcp_set_ssl_certhost_name.3
+man/man3/nutclient_tcp_set_ssl_certident_name.3
+man/man3/nutclient_tcp_set_ssl_certstore_path.3
+man/man3/nutclient_tcp_set_ssl_certstore_prefix.3
+man/man3/nutclient_tcp_set_ssl_certverify.3
+man/man3/nutclient_tcp_set_ssl_config_NSS.3
+man/man3/nutclient_tcp_set_ssl_config_OpenSSL.3
+man/man3/nutclient_tcp_set_ssl_force.3
+man/man3/nutclient_tcp_set_ssl_keyfile.3
+man/man3/nutclient_tcp_set_ssl_keypass.3
+man/man3/nutclient_tcp_set_ssl_try.3
 man/man3/nutclient_tcp_set_timeout.3
 man/man3/nutscan.3
 man/man3/nutscan_add_commented_option_to_device.3
@@ -139,6 +170,13 @@ man/man3/nutscan_scan_snmp.3
 man/man3/nutscan_scan_usb.3
 man/man3/nutscan_scan_xml_http_range.3
 man/man3/nutscan_stringify_ip_ranges.3
+man/man3/nutscan_upslog_cookie.3
+man/man3/nutscan_upslog_get_debug_level.3
+man/man3/nutscan_upslog_getproctag.3
+man/man3/nutscan_upslog_set_debug_level.3
+man/man3/nutscan_upslog_setprocname.3
+man/man3/nutscan_upslog_setproctag.3
+man/man3/nutscan_upslog_start_sync.3
 man/man3/upscli_add_host_cert.3
 man/man3/upscli_cleanup.3
 man/man3/upscli_connect.3
@@ -152,17 +190,29 @@ man/man3/upscli_list_next.3
 man/man3/upscli_list_start.3
 man/man3/upscli_readline.3
 man/man3/upscli_readline_timeout.3
+man/man3/upscli_readline_timeout_may_disconnect.3
+man/man3/upscli_report_build_details.3
 man/man3/upscli_sendline.3
 man/man3/upscli_sendline_timeout.3
+man/man3/upscli_sendline_timeout_may_disconnect.3
 man/man3/upscli_set_default_connect_timeout.3
 man/man3/upscli_splitaddr.3
 man/man3/upscli_splitname.3
 man/man3/upscli_ssl.3
+man/man3/upscli_ssl_caps.3
+man/man3/upscli_ssl_caps_descr.3
 man/man3/upscli_str_add_unique_token.3
 man/man3/upscli_str_contains_token.3
 man/man3/upscli_strerror.3
 man/man3/upscli_tryconnect.3
 man/man3/upscli_upserror.3
+man/man3/upscli_upslog_cookie.3
+man/man3/upscli_upslog_get_debug_level.3
+man/man3/upscli_upslog_getproctag.3
+man/man3/upscli_upslog_set_debug_level.3
+man/man3/upscli_upslog_setprocname.3
+man/man3/upscli_upslog_setproctag.3
+man/man3/upscli_upslog_start_sync.3
 man/man3/upsclient.3
 man/man5/nut.conf.5
 man/man5/ups.conf.5
@@ -198,6 +248,7 @@ man/man8/liebert-esp2.8
 man/man8/liebert-gxe.8
 man/man8/liebert.8
 man/man8/masterguard.8
+man/man8/meanwell_ntu.8
 man/man8/metasys.8
 man/man8/mge-shut.8
 man/man8/mge-utalk.8
@@ -208,7 +259,7 @@ man/man8/nut-scanner.8
 man/man8/nutconf.8
 man/man8/nutdrv_hashx.8
 man/man8/nutdrv_qx.8
-man/man8/nutdrv_siemens_sitop.8
+man/man8/nutdrv_siemens-sitop.8
 man/man8/nutupsdrv.8
 man/man8/oneac.8
 man/man8/optiups.8
@@ -345,22 +396,25 @@ share/doc/nut/html-man/liebert-gxe.html
 share/doc/nut/html-man/liebert.html
 share/doc/nut/html-man/macosx-ups.html
 share/doc/nut/html-man/masterguard.html
+share/doc/nut/html-man/meanwell_ntu.html
 share/doc/nut/html-man/metasys.html
 share/doc/nut/html-man/mge-shut.html
 share/doc/nut/html-man/mge-utalk.html
 share/doc/nut/html-man/microdowell.html
 share/doc/nut/html-man/microsol-apc.html
+share/doc/nut/html-man/must_ep2000pro.html
 share/doc/nut/html-man/netxml-ups.html
 share/doc/nut/html-man/nut-ipmipsu.html
 share/doc/nut/html-man/nut-recorder.html
 share/doc/nut/html-man/nut-scanner.html
+share/doc/nut/html-man/nut-upower.html
 share/doc/nut/html-man/nut.conf.html
 share/doc/nut/html-man/nut.html
 share/doc/nut/html-man/nutconf.html
 share/doc/nut/html-man/nutdrv_atcl_usb.html
 share/doc/nut/html-man/nutdrv_hashx.html
 share/doc/nut/html-man/nutdrv_qx.html
-share/doc/nut/html-man/nutdrv_siemens_sitop.html
+share/doc/nut/html-man/nutdrv_siemens-sitop.html
 share/doc/nut/html-man/nutscan.html
 share/doc/nut/html-man/nutscan_add_device_to_device.html
 share/doc/nut/html-man/nutscan_add_ip_range.html
@@ -388,6 +442,7 @@ share/doc/nut/html-man/nutscan_scan_snmp
 share/doc/nut/html-man/nutscan_scan_usb.html
 share/doc/nut/html-man/nutscan_scan_xml_http_range.html
 share/doc/nut/html-man/nutscan_stringify_ip_ranges.html
+share/doc/nut/html-man/nutscan_upslog_set_debug_level.html
 share/doc/nut/html-man/nutupsdrv.html
 share/doc/nut/html-man/oneac.html
 share/doc/nut/html-man/optiups.html
@@ -426,15 +481,18 @@ share/doc/nut/html-man/upscli_init_defau
 share/doc/nut/html-man/upscli_list_next.html
 share/doc/nut/html-man/upscli_list_start.html
 share/doc/nut/html-man/upscli_readline.html
+share/doc/nut/html-man/upscli_report_build_details.html
 share/doc/nut/html-man/upscli_sendline.html
 share/doc/nut/html-man/upscli_set_default_connect_timeout.html
 share/doc/nut/html-man/upscli_splitaddr.html
 share/doc/nut/html-man/upscli_splitname.html
 share/doc/nut/html-man/upscli_ssl.html
+share/doc/nut/html-man/upscli_ssl_caps.html
 share/doc/nut/html-man/upscli_str_add_unique_token.html
 share/doc/nut/html-man/upscli_str_contains_token.html
 share/doc/nut/html-man/upscli_strerror.html
 share/doc/nut/html-man/upscli_upserror.html
+share/doc/nut/html-man/upscli_upslog_set_debug_level.html
 share/doc/nut/html-man/upsclient.html
 share/doc/nut/html-man/upscmd.html
 share/doc/nut/html-man/upscode2.html

Index: pkgsrc/sysutils/ups-nut/PLIST.SunOS
diff -u pkgsrc/sysutils/ups-nut/PLIST.SunOS:1.5 pkgsrc/sysutils/ups-nut/PLIST.SunOS:1.6
--- pkgsrc/sysutils/ups-nut/PLIST.SunOS:1.5     Fri Sep 26 14:12:42 2025
+++ pkgsrc/sysutils/ups-nut/PLIST.SunOS Sun May  3 16:39:13 2026
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST.SunOS,v 1.5 2025/09/26 14:12:42 jperkin Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.6 2026/05/03 16:39:13 gdt Exp $
 libexec/nut-driver-enumerator.sh
 man/man8/nut-driver-enumerator.8
 man/man8/upsdrvsvcctl.8
 sbin/upsdrvsvcctl
-share/doc/nut/html-man/nut-driver-enumerator.html
-share/doc/nut/html-man/upsdrvsvcctl.html
 share/nut/solaris-init/nut
 share/nut/solaris-init/reset-ups-usb-solaris.sh.sample
 share/nut/solaris-smf/manifest/nut-driver-enumerator.xml

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.47 pkgsrc/sysutils/ups-nut/distinfo:1.48
--- pkgsrc/sysutils/ups-nut/distinfo:1.47       Thu Sep 18 16:27:28 2025
+++ pkgsrc/sysutils/ups-nut/distinfo    Sun May  3 16:39:13 2026
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.47 2025/09/18 16:27:28 gdt Exp $
+$NetBSD: distinfo,v 1.48 2026/05/03 16:39:13 gdt Exp $
 
-BLAKE2s (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = 2225617ef46a46cc0b6e08b93877ad0391b44a349efa2c8ea82fb3ef5ca8f7d2
-SHA512 (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = ddaca1d0cba17817fd27d036442395d11d64541b0782cd3c33d7b93712a15587dbad54fd7ed8a3ff14b89d75211560f76c30f5b9559e963adb4df7b05b66ec26
-Size (ups-nut-2.8.4bis/nut-2.8.4.tar.gz) = 6522704 bytes
-SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
-SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
-SHA1 (patch-configure) = fb27deb020020635d4345c2850099bbc7bc03af7
+BLAKE2s (nut-2.8.5.tar.gz) = e5080e0479e538fff2639c8f08bde95dd1d8acdfa6a814e7bddeb2d83e1a9a6c
+SHA512 (nut-2.8.5.tar.gz) = 9b1da12b88f86ab4413abf47317d553e22319f82b2719c2cd13b057591a4d21af1fc09296da40881713c91be333cf9f64bb9ae218af1270a3a92a001ad6e8066
+Size (nut-2.8.5.tar.gz) = 7362259 bytes
+SHA1 (patch-configure) = 30b1fa8026549e23b9648b6ea82c3642ae80ebbd
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438

Index: pkgsrc/sysutils/ups-nut/options.mk
diff -u pkgsrc/sysutils/ups-nut/options.mk:1.4 pkgsrc/sysutils/ups-nut/options.mk:1.5
--- pkgsrc/sysutils/ups-nut/options.mk:1.4      Fri May 16 16:55:21 2025
+++ pkgsrc/sysutils/ups-nut/options.mk  Sun May  3 16:39:13 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2025/05/16 16:55:21 martin Exp $
+# $NetBSD: options.mk,v 1.5 2026/05/03 16:39:13 gdt Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.ups-nut
 PKG_SUPPORTED_OPTIONS=         python
@@ -8,6 +8,8 @@ PKG_SUGGESTED_OPTIONS=          python openssl
 
 .include "../../mk/bsd.options.mk"
 
+## NSS
+
 .if !empty(PKG_OPTIONS:Mnss)
 CONFIGURE_ARGS+=       --with-ssl=nss --with-nss --without-openssl
 .  include "../../devel/nss/buildlink3.mk"
@@ -18,12 +20,14 @@ CONFIGURE_ARGS+=    --with-ssl=openssl --wi
 CONFIGURE_ARGS+=       --without-ssl
 .endif
 
+## PYTHON
+
+PLIST_VARS+=           python
 .if !empty(PKG_OPTIONS:Mpython)
-# Force only our chosen python3 (see Makefile comment for --without-python2)
 CONFIGURE_ARGS+=       --with-python3=${PYTHONBIN}
-CONFIGURE_ARGS+=       --with-python=${PYTHONBIN}
 PLIST.python=          yes
-# \todo Move to split package.
+# While this could be moved to a split package, so far nobody has said
+# they would like that.
 .else
 CONFIGURE_ARGS+=       --without-python3
 .endif

Index: pkgsrc/sysutils/ups-nut-cgi/Makefile
diff -u pkgsrc/sysutils/ups-nut-cgi/Makefile:1.83 pkgsrc/sysutils/ups-nut-cgi/Makefile:1.84
--- pkgsrc/sysutils/ups-nut-cgi/Makefile:1.83   Thu Oct 23 20:39:28 2025
+++ pkgsrc/sysutils/ups-nut-cgi/Makefile        Sun May  3 16:39:13 2026
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.83 2025/10/23 20:39:28 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2026/05/03 16:39:13 gdt Exp $
 
-PKGREVISION= 2
 .include "../../sysutils/ups-nut/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/nut/ups-nut-cgi/}

Index: pkgsrc/sysutils/ups-nut/patches/patch-configure
diff -u pkgsrc/sysutils/ups-nut/patches/patch-configure:1.1 pkgsrc/sysutils/ups-nut/patches/patch-configure:1.2
--- pkgsrc/sysutils/ups-nut/patches/patch-configure:1.1 Wed Sep 10 11:08:57 2025
+++ pkgsrc/sysutils/ups-nut/patches/patch-configure     Sun May  3 16:39:13 2026
@@ -1,14 +1,14 @@
-$NetBSD: patch-configure,v 1.1 2025/09/10 11:08:57 jperkin Exp $
+$NetBSD: patch-configure,v 1.2 2026/05/03 16:39:13 gdt Exp $
 
 Disable special manual page handling on SunOS.
 
---- configure.orig     2025-09-10 10:50:55.717222074 +0000
+--- configure.orig     2026-04-26 11:40:29.191919966 +0000
 +++ configure
-@@ -25118,8 +25118,6 @@ DEFAULT_MAN_DIR_AS_BASE="yes"
+@@ -27390,8 +27390,6 @@ DEFAULT_MAN_DIR_AS_BASE='yes'
  
  case "${target_os}" in
      solaris*|sunos*|SunOS*|illumos*)
--        DEFAULT_MAN_SECTION_CMD_SYS="1m"
+-                                                                        DEFAULT_MAN_SECTION_CMD_SYS="1m"
 -        DEFAULT_MAN_DIR_AS_BASE="no"
          ;;
  esac