ups-nut: Merge from sysutils/ups-nut

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: ups-nut: Merge from sysutils/ups-nut
From: Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 3 May 2026 16:44:32 +0000
Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun May 3 12:43:43 2026 -0400
Changeset:	9813020544e96209079e7c6fd9933af402ed4b99

Modified Files:
	ups-nut/COMMIT_MSG
	ups-nut/Makefile
	ups-nut/Makefile.common
	ups-nut/PLIST
	ups-nut/PLIST.SunOS
	ups-nut/distinfo
	ups-nut/options.mk
	ups-nut/patches/patch-configure

Log Message:
ups-nut: Merge from sysutils/ups-nut

This is basically clean of minor editing from merging, and RCS Ids; it
is not a significant change.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9813020544e96209079e7c6fd9933af402ed4b99

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

diffstat:
 ups-nut/COMMIT_MSG              | 69 +----------------------------------------
 ups-nut/Makefile                |  2 +-
 ups-nut/Makefile.common         |  6 ++--
 ups-nut/PLIST                   |  2 +-
 ups-nut/PLIST.SunOS             |  2 +-
 ups-nut/distinfo                |  2 +-
 ups-nut/options.mk              |  7 ++---
 ups-nut/patches/patch-configure |  2 +-
 8 files changed, 11 insertions(+), 81 deletions(-)

diffs:
diff --git a/ups-nut/COMMIT_MSG b/ups-nut/COMMIT_MSG
index adea185e37..d8d57dd256 100644
--- a/ups-nut/COMMIT_MSG
+++ b/ups-nut/COMMIT_MSG
@@ -1,68 +1 @@
-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]
+sysutils/ups-nut: Update to ?
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index 9cf56f6cf6..4aeccfd148 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $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"
 
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 7698e7e4ea..4094c4d3b8 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2025/08/10 21:51:59 gdt Exp $
+# $NetBSD: Makefile.common,v 1.23 2026/05/03 16:39:13 gdt Exp $
 # used by wip/ups-nut/Makefile
 # used by wip/ups-nut-cgi/Makefile
 # used by wip/ups-nut-snmp/Makefile
@@ -7,10 +7,8 @@
 
 DISTNAME=		nut-2.8.5
 CATEGORIES=		sysutils
-#MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 MASTER_SITES=		https://www.NetBSD.org/~gdt/
-# Isolate gdt-built distfiles from pkgsrc proper.
-DIST_SUBDIR=		ups-nut-wip
+DIST_SUBDIR=		ups-nut-wip	# Isolate gdt-built distfiles
 
 MAINTAINER?=		gdt%NetBSD.org@localhost
 HOMEPAGE=		http://www.networkupstools.org/
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index b14091bfba..44b4516bc6 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -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
diff --git a/ups-nut/PLIST.SunOS b/ups-nut/PLIST.SunOS
index 178a521a6d..e46f83deed 100644
--- a/ups-nut/PLIST.SunOS
+++ b/ups-nut/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2025/09/10 11:08:57 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
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index 3ebdd7cb7f..136d9d5510 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
+$NetBSD: distinfo,v 1.48 2026/05/03 16:39:13 gdt Exp $
 
 BLAKE2s (ups-nut-wip/nut-2.8.5.tar.gz) = 381c047237d5ab314304c80c94ce7309c2cc9db2b5c88b5bafb2192fb36f2eb9
 SHA512 (ups-nut-wip/nut-2.8.5.tar.gz) = e57c012fa73fad59d8c2669159fc899b8aa50b41af972e6ccdb0f880f5e7580b47c3b16af873b05d55a874a40917b8875ed200861ab234714a02088c02400576
diff --git a/ups-nut/options.mk b/ups-nut/options.mk
index ec483722ee..4b73043cc9 100644
--- a/ups-nut/options.mk
+++ b/ups-nut/options.mk
@@ -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
@@ -23,12 +23,11 @@ CONFIGURE_ARGS+=	--without-ssl
 ## PYTHON
 
 PLIST_VARS+=		python
-CONFIGURE_ARGS+=	--without-python2
 .if !empty(PKG_OPTIONS:Mpython)
-# Force only our chosen python3 (see Makefile comment for --without-python2)
 CONFIGURE_ARGS+=	--with-python3=${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
diff --git a/ups-nut/patches/patch-configure b/ups-nut/patches/patch-configure
index 16b381ed22..131e489bfc 100644
--- a/ups-nut/patches/patch-configure
+++ b/ups-nut/patches/patch-configure
@@ -1,4 +1,4 @@
-$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.
Prev by Date: crush: update to 0.65.2
Next by Date: gvfs: update to 1.60.0
Previous by Thread: crush: update to 0.65.2
Next by Thread: gvfs: update to 1.60.0
Indexes:
Home | Main Index | Thread Index | Old Index