From 9dafbfb8c0b8c113e242341e41d74254ec158ab7 Mon Sep 17 00:00:00 2001 From: Cy Schubert <cy@FreeBSD.org> Date: Tue, 25 Feb 2025 07:58:23 -0800 Subject: [PATCH] sysutils/nut-devel: Fix plist Upstream doesn't appear to distribute man pages, in the traditional sense, anymore. Looking at their git logs, this appears to be intentional. They say this is to make it easier for distributions, i.e. us, to package man pages. IMO this is not the case for FreeBSD. In cbdbd520abc6 I simply copied the man pages to $LOCALBASE/share/doc. This of course will need to change. In the mean time the MAN option has been removed and man pages will remain in share/doc until I can develop a script (in Makefile) to read the man page volume number in the first line of each .txt file in order to install the man pages into their correct places in $LOCALBASE. This commit temporarily works around the failing build. --- sysutils/nut-devel/Makefile | 7 +- sysutils/nut-devel/pkg-plist | 140 +---------------------------------- 2 files changed, 4 insertions(+), 143 deletions(-) diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile index f3fd3d4d3209..b854233aa761 100644 --- a/sysutils/nut-devel/Makefile +++ b/sysutils/nut-devel/Makefile @@ -38,7 +38,7 @@ CGIDIR_REL?= ${CGIDIR:S,^${PREFIX}/,,} PLIST_SUB+= CGIDIR="${CGIDIR_REL}" PLIST_SUB+= CGIETCDIR="etc/nut/" -OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS MANPAGES OPENSSL +OPTIONS_DEFAULT= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI DOCS OPENSSL OPTIONS_DEFAULT_amd64= FREEIPMI OPTIONS_DEFAULT_i386= FREEIPMI OPTIONS_DEFAULT_powerpc= FREEIPMI @@ -46,7 +46,7 @@ OPTIONS_DEFAULT_powerpc64= FREEIPMI OPTIONS_DEFAULT_powerpc64le= FREEIPMI OPTIONS_DEFAULT_riscv64= FREEIPMI OPTIONS_DEFAULT_riscv64sf= FREEIPMI -OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS MANPAGES DEV +OPTIONS_DEFINE= SERIAL USB SNMP NEON PDU MODBUS CGI BASH AVAHI IPMIPSU FREEIPMI DOCS DEV OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= SSL_OFF OPENSSL NSS OPTIONS_SUB= yes @@ -99,9 +99,6 @@ LIB_DEPENDS+= libltdl.so:devel/libltdl # XXX asciidoc. BUILD_DEPENDS= asciidoc:textproc/asciidoc -MANPAGES_CONFIGURE_ON= --with-doc=man=auto -MANPAGES_CONFIGURE_OFF= --with-doc=no - CGI_LIB_DEPENDS= libgd.so:graphics/gd CGI_CONFIGURE_WITH= cgi CGI_CONFIGURE_ON= --with-cgipath=${CGIDIR} \ diff --git a/sysutils/nut-devel/pkg-plist b/sysutils/nut-devel/pkg-plist index f4f48ceb7b8a..0f26aaeb80ed 100644 --- a/sysutils/nut-devel/pkg-plist +++ b/sysutils/nut-devel/pkg-plist @@ -76,6 +76,7 @@ lib/libnutscan.so.2.0.6 %%SERIAL%%libexec/nut/bestfortress %%SERIAL%%libexec/nut/bestuferrups %%SERIAL%%libexec/nut/bestups +%%SERIAL%%libexec/nut/bicker_ser %%SERIAL%%libexec/nut/blazer_ser %%USB%%libexec/nut/blazer_usb %%SERIAL%%libexec/nut/clone @@ -89,6 +90,7 @@ lib/libnutscan.so.2.0.6 %%SERIAL%%libexec/nut/ivtscd %%SERIAL%%libexec/nut/liebert %%SERIAL%%libexec/nut/liebert-esp2 +%%SERIAL%%libexec/nut/liebert-gxe %%SERIAL%%libexec/nut/masterguard %%SERIAL%%libexec/nut/metasys %%SERIAL%%libexec/nut/mge-utalk @@ -123,144 +125,6 @@ lib/libnutscan.so.2.0.6 %%MODBUS%%libexec/nut/socomec_jbus %%SERIAL%%libexec/nut/victronups %%DEV%%libexec/sockdebug -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_commands.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_devices.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_general.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_misc.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_tcp.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/libnutclient_variables.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_authenticate.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_destroy.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_forced_shutdown.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_login.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_device_master.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_execute_device_command.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_command_description.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_commands.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_description.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_num_logins.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_rw_variables.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variable_description.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variable_values.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_device_variables.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_get_devices.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device_command.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_has_device_variable.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_logout.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_set_device_variable_value.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_set_device_variable_values.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_create_client.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_disconnect.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_get_timeout.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_is_connected.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_reconnect.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutclient_tcp_set_timeout.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_commented_option_to_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_device_to_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_ip_range.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_add_option_to_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_cidr_to_ip.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_parsable.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_sanity_check_serial.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf_with_sanity_check.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_display_ups_conf.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_free_ip_ranges.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_get_serial_ports_list.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_init_ip_ranges.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_inc.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_ip_ranges_iter_init.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_new_device.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_avahi.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_eaton_serial.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_ipmi.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_nut_simulation.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_snmp.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_stringify_ip_ranges.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_usb.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/nutscan_scan_xml_http_range.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_add_host_cert.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_cleanup.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_connect.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_disconnect.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_fd.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_get.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_init.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_next.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_list_start.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_readline_timeout.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_sendline_timeout.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitaddr.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_splitname.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_ssl.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_strerror.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upscli_upserror.3.gz -%%MANPAGES%%%%DEV%%share/man/man3/upsclient.3.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/al175.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/apcupsd-ups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/blazer_ser.8.gz -%%MANPAGES%%%%NEON%%share/man/man8/netxml-ups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/nutdrv_siemens_sitop.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/riello_ser.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/sms_ser.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/apc_modbus.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/adelsystem_cbi.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/generic_modbus.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/huawei-ups2000.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/phoenixcontact_modbus.8.gz -%%MANPAGES%%%%MODBUS%%share/man/man8/socomec_jbus.8.gz -%%MANPAGES%%%%CGI%%share/man/man5/hosts.conf.5.gz -%%MANPAGES%%%%CGI%%share/man/man5/upsset.conf.5.gz -%%MANPAGES%%%%CGI%%share/man/man5/upsstats.html.5.gz -%%MANPAGES%%%%CGI%%share/man/man8/upsset.cgi.8.gz -%%MANPAGES%%%%CGI%%share/man/man8/upsstats.cgi.8.gz -%%MANPAGES%%%%CGI%%share/man/man8/upsimage.cgi.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/apcsmart-old.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/bestfortress.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/bcmxcp.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/belkin.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/belkinunv.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/bestuferrups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/bestups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/bestfcom.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/clone.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/dummy-ups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/etapro.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/everups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/gamatronic.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/genericups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/isbmex.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/ivtscd.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/liebert.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/liebert-esp2.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/masterguard.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/metasys.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/mge-shut.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/mge-utalk.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/microdowell.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/microsol-apc.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/oneac.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/optiups.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/powercom.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/powerpanel.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/rhino.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/safenet.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/solis.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/tripplitesu.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/upscode2.8.gz -%%MANPAGES%%%%SERIAL%%share/man/man8/victronups.8.gz -%%MANPAGES%%%%DEV%%share/man/man8/sockdebug.8.gz -%%MANPAGES%%%%IPMIPSU%%share/man/man8/nut-ipmipsu.8.gz -%%MANPAGES%%%%PDU%%share/man/man8/powerman-pdu.8.gz sbin/upsd sbin/upsdrvctl sbin/upsmon -- GitLab