ups-nut: Update to 2.8.4.77

[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:		Tue Sep 16 09:21:25 2025 -0400
Changeset:	6c6923479e2594a41a34da6890457e74059e6569

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

Log Message:
ups-nut: Update to 2.8.4.77

  - Merge changes from sysutils/ups-nut
    + sunos changes
    + TOOL asciidoc
    + disable docs changelog
    + $NetBSD$ ids
  - Drop html docs from PLIST because upstream no longer installs them by default

  - advance along upstream, mostly
    + CI (irrelevant)
    + usbhid fixes (perhaps important for those with "new" UPS units :-)
    + docs stuff

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

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

diffstat:
 ups-nut/COMMIT_MSG              | 32 ++------------------------------
 ups-nut/Makefile                |  7 +++++--
 ups-nut/Makefile.common         |  6 ++++--
 ups-nut/PLIST                   |  3 +--
 ups-nut/PLIST.SunOS             |  4 +++-
 ups-nut/buildlink3.mk           |  2 +-
 ups-nut/distinfo                |  9 +++++----
 ups-nut/patches/patch-configure | 15 +++++++++++++++
 8 files changed, 36 insertions(+), 42 deletions(-)

diffs:
diff --git a/ups-nut/COMMIT_MSG b/ups-nut/COMMIT_MSG
index 7299dcfeba..169e97cbb7 100644
--- a/ups-nut/COMMIT_MSG
+++ b/ups-nut/COMMIT_MSG
@@ -1,31 +1,3 @@
-sysutils/ups-nut: Update to 2.8.4
+sysutils/ups-nut: Update to 2.8.5
 
-Release notes for NUT 2.8.4 - what's new since 2.8.3
--------------------------------------------------------------
-
-https://github.com/networkupstools/nut/milestone/9
-
- - New NUT drivers:
-   * Introduced a `ve-direct` driver for Victron Energy UPS/solar panels
-     monitoring. Most specific reported values are in an `experimental.*`
-     namespace, as a community we need to come up with standard naming for
-     those via `docs/nut-names.txt`. [#440]
-   * Introduced a `nutdrv_hashx` driver for numerous devices from Ablerex,
-     Atlantis Land, Epyc, Infosec, ION, PowerWalker, Right Power Technology,
-     Salicru, UPS Solutions and other vendors (originally shipped with a
-     "PowerMaster+", "PowerMaster" or "PowerGuide" software companion suite).
-     This seems to be a protocol developed by Cyber Energy for serial-port
-     devices, subsequently used by different vendors in their own products
-     or re-branded Cyber Energy creations. [#2940]
-   * Introduced a `failover` driver for monitoring multiple UPS driver sockets
-     and seamless switching out of UPS data in a failover situation, includes
-     support for end-to-end tracked instant commands and also variable updating.
-     [#2962]
-   * Introduced USB (`powervar_cx_usb`) and Serial (`powervar_cx_ser`) drivers
-     for Powervar CUSPP protocol, tested with GTS (USB) and UPM (USB, Serial)
-     models. [#2988]
-
- - NUT Monitor GUI:
-   * Ported Python 3 version to Qt6, now shipped alongside Qt5 for systems
-     with either or both, maximizing compatibility with old and new setups.
-     [#2946]
+\todo Fill in from upstream news when there are rumblings about 2.8.5.
diff --git a/ups-nut/Makefile b/ups-nut/Makefile
index 3e14531278..04bc4db117 100644
--- a/ups-nut/Makefile
+++ b/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2025/05/31 13:58:38 gdt Exp $
+# $NetBSD: Makefile,v 1.83 2025/09/16 12:23:20 gdt Exp $
 
 .include "Makefile.common"
 
@@ -17,13 +17,16 @@ SUBST_NOOP_OK.man-so=	yes
 # Don't regenerate any files in tools/.
 TOOLS_SCRIPT.perl=	exit 1
 
+# nut looks aggressively for asciidoc in a way that is hard to turn off,
+# and builds html docs.   asciidoc isn't that big, so just depend on it.
+TOOL_DEPENDS+=		asciidoc-[0-9]*:../../textproc/asciidoc
+
 CONFIGURE_ARGS+=	--with-drvpath=${NUT_DRVDIR:Q}
 CONFIGURE_ARGS+=	--with-pidpath=${NUT_RUNDIR:Q}
 CONFIGURE_ARGS+=	--with-altpidpath=${NUT_RUNDIR:Q}
 
 # nut, bizarrely, does not install headers by default
 CONFIGURE_ARGS+=	--with-dev
-CONFIGURE_ARGS+=	--without-asciidoc
 
 # Auto-enables if prereqs (not documented) are present.  Unclear
 # usefulness, so until rationale to enable (and patch), disable.
diff --git a/ups-nut/Makefile.common b/ups-nut/Makefile.common
index 2e03d63524..07942debea 100644
--- a/ups-nut/Makefile.common
+++ b/ups-nut/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.12 2022/04/26 23:28:25 gdt Exp $
+# $NetBSD: Makefile.common,v 1.21 2025/08/10 21:51:59 gdt Exp $
 # used by wip/ups-nut/Makefile
 # used by wip/ups-nut-cgi/Makefile
 # used by wip/ups-nut-snmp/Makefile
 # used by wip/ups-nut-usb/Makefile
 # used by wip/p5-UPS-Nut/Makefile
 
-DISTNAME=		nut-2.8.4
+DISTNAME=		nut-2.8.4.77
 CATEGORIES=		sysutils
 #MASTER_SITES=		http://www.networkupstools.org/source/${PKGVERSION_NOREV:R}/
 MASTER_SITES=		https://www.NetBSD.org/~gdt/
@@ -35,6 +35,8 @@ CONFIGURE_ARGS+=	--with-htmlpath=${PREFIX:Q}/share/nut/html
 CONFIGURE_ARGS+=	--with-user=${NUT_USER}
 CONFIGURE_ARGS+=	--with-group=${NUT_GROUP}
 
+CONFIGURE_ARGS+=	--disable-docs-changelog
+
 CHECK_PORTABILITY_SKIP=	packaging/*
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/ups-nut/PLIST b/ups-nut/PLIST
index 4561433994..4072732f43 100644
--- a/ups-nut/PLIST
+++ b/ups-nut/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.37 2025/09/16 12:23:20 gdt Exp $
 bin/nut-scanner
 bin/nutconf
 bin/upsc
@@ -298,6 +298,5 @@ share/examples/nut/upsmon.conf.sample
 share/examples/nut/upssched.conf.sample
 share/nut/cmdvartab
 share/nut/driver.list
-@pkgdir share/doc/nut/html-man
 @pkgdir share/doc/nut/drivers
 @pkgdir etc/nut
diff --git a/ups-nut/PLIST.SunOS b/ups-nut/PLIST.SunOS
index 07f30f606f..178a521a6d 100644
--- a/ups-nut/PLIST.SunOS
+++ b/ups-nut/PLIST.SunOS
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST.SunOS,v 1.3 2025/05/22 12:46:35 jperkin Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.4 2025/09/10 11:08:57 jperkin Exp $
 libexec/nut-driver-enumerator.sh
+man/man8/nut-driver-enumerator.8
+man/man8/upsdrvsvcctl.8
 sbin/upsdrvsvcctl
 share/nut/solaris-init/nut
 share/nut/solaris-init/reset-ups-usb-solaris.sh.sample
diff --git a/ups-nut/buildlink3.mk b/ups-nut/buildlink3.mk
index 8421b92af8..92481a0164 100644
--- a/ups-nut/buildlink3.mk
+++ b/ups-nut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2022/06/28 11:36:06 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/08/10 21:51:59 gdt Exp $
 
 BUILDLINK_TREE+=	ups-nut
 
diff --git a/ups-nut/distinfo b/ups-nut/distinfo
index f7a21c770b..a9a119d91a 100644
--- a/ups-nut/distinfo
+++ b/ups-nut/distinfo
@@ -1,10 +1,11 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
 
-BLAKE2s (ups-nut-wip/nut-2.8.4.tar.gz) = 39c286fa949a792843efb803ac7d6cffe809a89ac08ded2bf181c801ce5c22ea
-SHA512 (ups-nut-wip/nut-2.8.4.tar.gz) = 6ba46ff1f469e61d1b78b20fde41766f654b9af1f71406bb8b555d949ec42b19c0d0c45bfa5ddc05b298b21875663011241a7d1fe3e2e552050ea427f2685d45
-Size (ups-nut-wip/nut-2.8.4.tar.gz) = 6498633 bytes
+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
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
+SHA1 (patch-configure) = fb27deb020020635d4345c2850099bbc7bc03af7
 SHA1 (patch-drivers_libhid.c) = 8b4f773d9b32e4c43f7045a4a83854382b08cb5b
 SHA1 (patch-drivers_libusb0.c) = bdd6fcb145386598b4ac5474d4c866ded5f6d5fa
 SHA1 (patch-drivers_libusb1.c) = 58d8ffe9507399802ad885c2e2627641978e5438
diff --git a/ups-nut/patches/patch-configure b/ups-nut/patches/patch-configure
new file mode 100644
index 0000000000..90b5931910
--- /dev/null
+++ b/ups-nut/patches/patch-configure
@@ -0,0 +1,15 @@
+$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
+@@ -25118,8 +25118,6 @@ DEFAULT_MAN_DIR_AS_BASE="yes"
+ 
+ case "${target_os}" in
+     solaris*|sunos*|SunOS*|illumos*)
+-        DEFAULT_MAN_SECTION_CMD_SYS="1m"
+-        DEFAULT_MAN_DIR_AS_BASE="no"
+         ;;
+ esac
+