CVS commit: pkgsrc/sysutils/ups-nut

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Sep 16 12:23:20 UTC 2025

Modified Files:
        pkgsrc/sysutils/ups-nut: Makefile PLIST distinfo

Log Message:
sysutils/ups-nut: Recover from wip distfile confusion and fix asciidoc woes

I have been creating distfiles from upstream git for testing via
wip/ups-but, and I believe I got them crossed with real distfiles
before setting a DIST_SUBDIR for wip.  There's also a chance upstream
changed it, but so far I don't have believable evidence for that --
but I've raised the issue.  I did diff what I had and upstream's, and
the only difference is believable CI stuff that does appear in the
v2.8.4 git tag.  This commit adjusts distinfo so it works with the
distfile from upstream.

Upstream's logic for dealing with docs is too complicated.  Man pages
are pregenerated in distfiles, but not html.  It's too hard and too
confusing to turn off upstream's detection of asciidoc and building of
html, so this commit adds TOOL_DEPENDS on asciidoc to get consistent
doc output.  asciidoc isn't that big and it's only TOOL, so that seems
better than fighting upstream.

Probably this resolves various reports I've gotten that didn't make
sense to me, but at least we're on firmer ground.  Please email me
with any problems.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/sysutils/ups-nut/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/ups-nut/PLIST
cvs rdiff -u -r1.45 -r1.46 pkgsrc/sysutils/ups-nut/distinfo

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

Modified files:

Index: pkgsrc/sysutils/ups-nut/Makefile
diff -u pkgsrc/sysutils/ups-nut/Makefile:1.82 pkgsrc/sysutils/ups-nut/Makefile:1.83
--- pkgsrc/sysutils/ups-nut/Makefile:1.82       Sun Aug 10 21:51:59 2025
+++ pkgsrc/sysutils/ups-nut/Makefile    Tue Sep 16 12:23:20 2025
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.82 2025/08/10 21:51:59 gdt Exp $
+# $NetBSD: Makefile,v 1.83 2025/09/16 12:23:20 gdt Exp $
 
 .include "Makefile.common"
 
 PKGNAME=               ups-${DISTNAME}
+PKGREVISION=           1
 COMMENT=               Network UPS Tools
 
 PLIST_VARS+=           python
@@ -17,13 +18,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.

Index: pkgsrc/sysutils/ups-nut/PLIST
diff -u pkgsrc/sysutils/ups-nut/PLIST:1.36 pkgsrc/sysutils/ups-nut/PLIST:1.37
--- pkgsrc/sysutils/ups-nut/PLIST:1.36  Sun Aug 10 21:51:59 2025
+++ pkgsrc/sysutils/ups-nut/PLIST       Tue Sep 16 12:23:20 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2025/08/10 21:51:59 gdt Exp $
+@comment $NetBSD: PLIST,v 1.37 2025/09/16 12:23:20 gdt Exp $
 bin/nut-scanner
 bin/nutconf
 bin/upsc
@@ -290,6 +290,172 @@ share/doc/nut/detailed/sock-protocol.txt
 share/doc/nut/detailed/solaris-usb.txt
 share/doc/nut/detailed/support.txt
 share/doc/nut/detailed/user-manual.txt
+share/doc/nut/html-doc/FAQ.html
+share/doc/nut/html-doc/cables.html
+share/doc/nut/html-doc/developer-guide.html
+share/doc/nut/html-doc/packager-guide.html
+share/doc/nut/html-doc/qa-guide.html
+share/doc/nut/html-doc/release-notes.html
+share/doc/nut/html-doc/solaris-usb.html
+share/doc/nut/html-doc/user-manual.html
+share/doc/nut/html-man/adelsystem_cbi.html
+share/doc/nut/html-man/al175.html
+share/doc/nut/html-man/apc_modbus.html
+share/doc/nut/html-man/apcsmart-old.html
+share/doc/nut/html-man/apcsmart.html
+share/doc/nut/html-man/apcupsd-ups.html
+share/doc/nut/html-man/asem.html
+share/doc/nut/html-man/bcmxcp.html
+share/doc/nut/html-man/bcmxcp_usb.html
+share/doc/nut/html-man/belkin.html
+share/doc/nut/html-man/belkinunv.html
+share/doc/nut/html-man/bestfcom.html
+share/doc/nut/html-man/bestfortress.html
+share/doc/nut/html-man/bestuferrups.html
+share/doc/nut/html-man/bestups.html
+share/doc/nut/html-man/bicker_ser.html
+share/doc/nut/html-man/blazer_ser.html
+share/doc/nut/html-man/blazer_usb.html
+share/doc/nut/html-man/clone-outlet.html
+share/doc/nut/html-man/clone.html
+share/doc/nut/html-man/dummy-ups.html
+share/doc/nut/html-man/etapro.html
+share/doc/nut/html-man/everups.html
+share/doc/nut/html-man/failover.html
+share/doc/nut/html-man/gamatronic.html
+share/doc/nut/html-man/generic_gpio.html
+share/doc/nut/html-man/generic_modbus.html
+share/doc/nut/html-man/genericups.html
+share/doc/nut/html-man/hosts.conf.html
+share/doc/nut/html-man/huawei-ups2000.html
+share/doc/nut/html-man/hwmon_ina219.html
+share/doc/nut/html-man/index.html
+share/doc/nut/html-man/isbmex.html
+share/doc/nut/html-man/ivtscd.html
+share/doc/nut/html-man/libnutclient.html
+share/doc/nut/html-man/libnutclient_commands.html
+share/doc/nut/html-man/libnutclient_devices.html
+share/doc/nut/html-man/libnutclient_general.html
+share/doc/nut/html-man/libnutclient_misc.html
+share/doc/nut/html-man/libnutclient_tcp.html
+share/doc/nut/html-man/libnutclient_variables.html
+share/doc/nut/html-man/libupsclient-config.html
+share/doc/nut/html-man/liebert-esp2.html
+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/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/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.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/nutscan.html
+share/doc/nut/html-man/nutscan_add_device_to_device.html
+share/doc/nut/html-man/nutscan_add_ip_range.html
+share/doc/nut/html-man/nutscan_add_option_to_device.html
+share/doc/nut/html-man/nutscan_cidr_to_ip.html
+share/doc/nut/html-man/nutscan_display_parsable.html
+share/doc/nut/html-man/nutscan_display_sanity_check.html
+share/doc/nut/html-man/nutscan_display_sanity_check_serial.html
+share/doc/nut/html-man/nutscan_display_ups_conf.html
+share/doc/nut/html-man/nutscan_display_ups_conf_with_sanity_check.html
+share/doc/nut/html-man/nutscan_free_device.html
+share/doc/nut/html-man/nutscan_free_ip_ranges.html
+share/doc/nut/html-man/nutscan_get_serial_ports_list.html
+share/doc/nut/html-man/nutscan_init.html
+share/doc/nut/html-man/nutscan_init_ip_ranges.html
+share/doc/nut/html-man/nutscan_ip_ranges_iter_inc.html
+share/doc/nut/html-man/nutscan_ip_ranges_iter_init.html
+share/doc/nut/html-man/nutscan_new_device.html
+share/doc/nut/html-man/nutscan_scan_avahi.html
+share/doc/nut/html-man/nutscan_scan_eaton_serial.html
+share/doc/nut/html-man/nutscan_scan_ipmi.html
+share/doc/nut/html-man/nutscan_scan_nut.html
+share/doc/nut/html-man/nutscan_scan_nut_simulation.html
+share/doc/nut/html-man/nutscan_scan_snmp.html
+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/nutupsdrv.html
+share/doc/nut/html-man/oneac.html
+share/doc/nut/html-man/optiups.html
+share/doc/nut/html-man/phoenixcontact_modbus.html
+share/doc/nut/html-man/pijuice.html
+share/doc/nut/html-man/powercom.html
+share/doc/nut/html-man/powerman-pdu.html
+share/doc/nut/html-man/powerpanel.html
+share/doc/nut/html-man/powervar_cx_ser.html
+share/doc/nut/html-man/powervar_cx_usb.html
+share/doc/nut/html-man/rhino.html
+share/doc/nut/html-man/richcomm_usb.html
+share/doc/nut/html-man/riello_ser.html
+share/doc/nut/html-man/riello_usb.html
+share/doc/nut/html-man/safenet.html
+share/doc/nut/html-man/skel.html
+share/doc/nut/html-man/sms_ser.html
+share/doc/nut/html-man/snmp-ups.html
+share/doc/nut/html-man/sockdebug.html
+share/doc/nut/html-man/socomec_jbus.html
+share/doc/nut/html-man/solis.html
+share/doc/nut/html-man/tripplite.html
+share/doc/nut/html-man/tripplite_usb.html
+share/doc/nut/html-man/tripplitesu.html
+share/doc/nut/html-man/ups.conf.html
+share/doc/nut/html-man/upsc.html
+share/doc/nut/html-man/upscli_add_host_cert.html
+share/doc/nut/html-man/upscli_cleanup.html
+share/doc/nut/html-man/upscli_connect.html
+share/doc/nut/html-man/upscli_disconnect.html
+share/doc/nut/html-man/upscli_fd.html
+share/doc/nut/html-man/upscli_get.html
+share/doc/nut/html-man/upscli_get_default_connect_timeout.html
+share/doc/nut/html-man/upscli_init.html
+share/doc/nut/html-man/upscli_init_default_connect_timeout.html
+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_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_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/upsclient.html
+share/doc/nut/html-man/upscmd.html
+share/doc/nut/html-man/upscode2.html
+share/doc/nut/html-man/upsd.conf.html
+share/doc/nut/html-man/upsd.html
+share/doc/nut/html-man/upsd.users.html
+share/doc/nut/html-man/upsdrvctl.html
+share/doc/nut/html-man/upsimage.cgi.html
+share/doc/nut/html-man/upslog.html
+share/doc/nut/html-man/upsmon.conf.html
+share/doc/nut/html-man/upsmon.html
+share/doc/nut/html-man/upsrw.html
+share/doc/nut/html-man/upssched.conf.html
+share/doc/nut/html-man/upssched.html
+share/doc/nut/html-man/upsset.cgi.html
+share/doc/nut/html-man/upsset.conf.html
+share/doc/nut/html-man/upsstats.cgi.html
+share/doc/nut/html-man/upsstats.html.html
+share/doc/nut/html-man/usbhid-ups.html
+share/doc/nut/html-man/ve-direct.html
+share/doc/nut/html-man/victronups.html
 share/examples/nut/nut.conf.sample
 share/examples/nut/ups.conf.sample
 share/examples/nut/upsd.conf.sample
@@ -298,6 +464,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

Index: pkgsrc/sysutils/ups-nut/distinfo
diff -u pkgsrc/sysutils/ups-nut/distinfo:1.45 pkgsrc/sysutils/ups-nut/distinfo:1.46
--- pkgsrc/sysutils/ups-nut/distinfo:1.45       Wed Sep 10 11:08:57 2025
+++ pkgsrc/sysutils/ups-nut/distinfo    Tue Sep 16 12:23:20 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2025/09/10 11:08:57 jperkin Exp $
+$NetBSD: distinfo,v 1.46 2025/09/16 12:23:20 gdt Exp $
 
-BLAKE2s (nut-2.8.4.tar.gz) = ece7b19f55771472f113a712d047ff324199d28ea0f2f5cfa13a781ff8947e78
-SHA512 (nut-2.8.4.tar.gz) = 0d87c0006608f92ae54f8a500f93d9a81eac1d9abf57f32e7718dd72f265b8293a0b6cdba04c802b81eaf8907b52669c36b47b6875a4377f9752845ac6c5e8fa
-Size (nut-2.8.4.tar.gz) = 6522262 bytes
+BLAKE2s (nut-2.8.4.tar.gz) = 2225617ef46a46cc0b6e08b93877ad0391b44a349efa2c8ea82fb3ef5ca8f7d2
+SHA512 (nut-2.8.4.tar.gz) = ddaca1d0cba17817fd27d036442395d11d64541b0782cd3c33d7b93712a15587dbad54fd7ed8a3ff14b89d75211560f76c30f5b9559e963adb4df7b05b66ec26
+Size (nut-2.8.4.tar.gz) = 6522704 bytes
 SHA1 (patch-clients_upsclient.c) = 45eee24ed3cc06bbf5ec81344d0db62a3da3a827
 SHA1 (patch-conf_Makefile.in) = 8d02a0b05659cb210a77e863a28a3b9caa596dfc
 SHA1 (patch-configure) = fb27deb020020635d4345c2850099bbc7bc03af7