ups-nut: Update to 2.8.4.1239

[Greg Troxel (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Jan 26 19:20:50 2026 -0500
Changeset:	a889e921167c540b99e024b1f640d4f061302952

Modified Files:
	ups-nut/Makefile
	ups-nut/Makefile.common
	ups-nut/PLIST
	ups-nut/distinfo
	ups-nut/options.mk
	ups-nut/patches/patch-configure
Added Files:
	ups-nut/patches/patch-tests_nut-driver-enumerator-test.sh
Removed Files:
	ups-nut/patches/patch-conf_Makefile.in

Log Message:
ups-nut: Update to 2.8.4.1239

Straightforwardly adjust to upstream build system changes.

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

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

diffstat:
 ups-nut/Makefile                                        |  3 ---
 ups-nut/Makefile.common                                 |  4 +++-
 ups-nut/PLIST                                           |  4 +++-
 ups-nut/distinfo                                        | 10 +++++-----
 ups-nut/options.mk                                      |  7 ++++++-
 ups-nut/patches/patch-conf_Makefile.in                  | 16 ----------------
 ups-nut/patches/patch-configure                         |  6 +++---
 .../patches/patch-tests_nut-driver-enumerator-test.sh   | 17 +++++++++++++++++
 8 files changed, 37 insertions(+), 30 deletions(-)

diffs:
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index 04bc4db117..9cf56f6cf6 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -5,8 +5,6 @@
 PKGNAME=		ups-${DISTNAME}
 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
@@ -86,7 +84,6 @@ INSTALLATION_DIRS+=	${NUT_DOCDIR}/drivers
 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
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 07942debea..c22fa344f4 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -5,7 +5,7 @@
 # used by wip/ups-nut-usb/Makefile
 # used by wip/p5-UPS-Nut/Makefile
 
-DISTNAME=		nut-2.8.4.77
+DISTNAME=		nut-2.8.4.1239
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 MASTER_SITES=		https://www.NetBSD.org/~gdt/
@@ -27,7 +27,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}
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index 4072732f43..7f10518abf 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -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
@@ -198,6 +199,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 +210,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
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index a9a119d91a..6e6c89e788 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
 
-BLAKE2s (ups-nut-wip/nut-2.8.4.77.tar.gz) = 31ce49256783b05d6daa0c25caffd469ed4976ab4598979669282223a937463b
-SHA512 (ups-nut-wip/nut-2.8.4.77.tar.gz) = fa969d9e04cec1598a10d5ca0d1c829e7c66a3d4056d73180a8251aff75a49fec47314f0b6e29114a00348190f36543cb82ba6000d11b56a7e83836095d65723
-Size (ups-nut-wip/nut-2.8.4.77.tar.gz) = 5989016 bytes
+BLAKE2s (ups-nut-wip/nut-2.8.4.1239.tar.gz) = 469f3ae41aa3da4d9c5dcdf9512a3cf691850278df5803abcbba761c149b73a6
+SHA512 (ups-nut-wip/nut-2.8.4.1239.tar.gz) = 1822f4297fc9abb93927d7b18829c3ba250f1090b0e763bdaa2fe8e0ad0d76485312f21769ca8f8d1666a00621420ef427737600c1e7d6ead41a5a92340ff5fa
+Size (ups-nut-wip/nut-2.8.4.1239.tar.gz) = 6288369 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
-SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
-SHA1 (patch-configure) = fb27deb020020635d4345c2850099bbc7bc03af7
+SHA1 (patch-configure) = b1c2f7e57ecb4e4a94985f5b40afe5a00a9e9458
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
 SHA1 (patch-server_sockdebug.c) = 788efc0a519a6a0256b80156fff415d91a359098
+SHA1 (patch-tests_nut-driver-enumerator-test.sh) = c1fef9e080d4190606f90e2a5b4cff838bcc42c2
diff --git a/ups-nut/options.mk b/ups-nut/options.mk
index abdbfd57fa..ec483722ee 100644
--- a/ups-nut/options.mk
+++ b/ups-nut/options.mk
@@ -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,10 +20,13 @@ CONFIGURE_ARGS+=	--with-ssl=openssl --without-nss --with-openssl
 CONFIGURE_ARGS+=	--without-ssl
 .endif
 
+## 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}
-CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
 PLIST.python=		yes
 # \todo Move to split package.
 .else
diff --git a/ups-nut/patches/patch-conf_Makefile.in b/ups-nut/patches/patch-conf_Makefile.in
deleted file mode 100644
index eee68f0cbf..0000000000
--- a/ups-nut/patches/patch-conf_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-conf_Makefile.in,v 1.2 2025/05/17 23:56:37 gdt Exp $
-
-Place example configs in example directory, not etcdir.
-This is a pkgsrc norms adjustment and thus not reportable upstream.
-
---- conf/Makefile.in.orig	2025-03-31 12:16:18.000000000 +0000
-+++ conf/Makefile.in
-@@ -229,7 +229,7 @@ CONFIG_CPPFLAGS = @CONFIG_CPPFLAGS@
- CONFIG_CXXFLAGS = @CONFIG_CXXFLAGS@
- CONFIG_FLAGS = @CONFIG_FLAGS@
- CONFIG_LDFLAGS = @CONFIG_LDFLAGS@
--CONFPATH = @CONFPATH@
-+CONFPATH = $(DESTDIR)@prefix@/share/examples/nut
- CPP = @CPP@
- CPPCHECK = @CPPCHECK@
- CPPFLAGS = @CPPFLAGS@
diff --git a/ups-nut/patches/patch-configure b/ups-nut/patches/patch-configure
index 90b5931910..6303d3b555 100644
--- a/ups-nut/patches/patch-configure
+++ b/ups-nut/patches/patch-configure
@@ -2,13 +2,13 @@ $NetBSD: patch-configure,v 1.1 2025/09/10 11:08:57 jperkin Exp $
 
 Disable special manual page handling on SunOS.
 
---- configure.orig	2025-09-10 10:50:55.717222074 +0000
+--- configure.orig	2026-01-25 23:16:21.000000000 +0000
 +++ configure
-@@ -25118,8 +25118,6 @@ DEFAULT_MAN_DIR_AS_BASE="yes"
+@@ -27046,8 +27046,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
diff --git a/ups-nut/patches/patch-tests_nut-driver-enumerator-test.sh b/ups-nut/patches/patch-tests_nut-driver-enumerator-test.sh
new file mode 100644
index 0000000000..2c8d1e493a
--- /dev/null
+++ b/ups-nut/patches/patch-tests_nut-driver-enumerator-test.sh
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Remediate bash ==.
+
+Reported upstream by email 20260124 (or 25).
+
+--- tests/nut-driver-enumerator-test.sh.orig	2026-01-27 00:24:21.471437853 +0000
++++ tests/nut-driver-enumerator-test.sh
+@@ -614,7 +614,7 @@ testcase_semver_compare() {
+ 
+     run_testcase_generic callSEMVERCMP \
+         "SEMVER comparison helper: shell-style maths: (non-)equality with added trailing zero value e.g. 3 vs 30" 1 "" \
+-        test 01.02.03 == 1.002.00030
++        test 01.02.03 = 1.002.00030
+ 
+     run_testcase_generic callSEMVERCMP \
+         "SEMVER comparison helper: shell-style maths: non-equality with added trailing zeroed components (and different leading zero pads)" 1 "" \