Date: Thu, 09 Apr 2026 17:18:45 +0000 From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a32e4ab6c67b - main - sysutils/nut: Replace ./configure.ac patch with ./configure Message-ID: <69d7df75.3056e.3f23aa53@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a32e4ab6c67b168af8bc55774802ab0006085de6 commit a32e4ab6c67b168af8bc55774802ab0006085de6 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2026-04-09 17:14:05 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2026-04-09 17:18:15 +0000 sysutils/nut: Replace ./configure.ac patch with ./configure Replace ./configure.ac patch with a ./configure patch. We do not use autoconf.sh with the non-devel port. Therefore backport configure.ac to ./configure. This addresses missing nut group configuration on FreeBSD 13.5. PR: 294350 Fixes: 64fec1e56b44 --- sysutils/nut/Makefile | 1 + sysutils/nut/files/patch-configure | 41 +++++++++++++++++++++++++++++++++++ sysutils/nut/files/patch-configure.ac | 34 ----------------------------- 3 files changed, 42 insertions(+), 34 deletions(-) diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile index 8bef55ae040a..835699598ccf 100644 --- a/sysutils/nut/Makefile +++ b/sysutils/nut/Makefile @@ -1,5 +1,6 @@ PORTNAME= nut PORTVERSION= 2.8.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ diff --git a/sysutils/nut/files/patch-configure b/sysutils/nut/files/patch-configure new file mode 100644 index 000000000000..8d490e0823f5 --- /dev/null +++ b/sysutils/nut/files/patch-configure @@ -0,0 +1,41 @@ +--- configure.orig 2026-04-09 09:46:14.395464000 -0700 ++++ configure 2026-04-09 10:04:59.108399000 -0700 +@@ -9339,20 +9339,8 @@ + if test -n "`${PROBE_OS_GROUP} nogroup`" && test -z "`${PROBE_OS_GROUP} \"${RUN_AS_GROUP}\"`" + then : + RUN_AS_GROUP="nogroup" +- +-fi + +-for TOKEN in upsmon nutmon ups nut; do +- if test -n "`${PROBE_OS_USER} ${TOKEN}`" +-then : +- RUN_AS_USER="${TOKEN}" +-fi +- if test -n "`${PROBE_OS_GROUP} ${TOKEN}`" +-then : +- RUN_AS_GROUP="${TOKEN}" + fi +-done +-unset TOKEN + + case ${target_os} in #( + *mingw*) : +@@ -41472,7 +41460,7 @@ + then : + withval=$with_nut_monitor; nut_with_nut_monitor="${withval}" + else $as_nop +- nut_with_nut_monitor="auto" ++ nut_with_nut_monitor="no" + + fi + +@@ -47583,7 +47571,7 @@ + fi + if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}${nut_with_nut_monitor_py3qt6}" ; then + case "${nut_with_nut_monitor}" in +- "auto") nut_with_nut_monitor="yes" ;; ++ "auto") nut_with_nut_monitor="no" ;; + esac + else + case "${nut_with_nut_monitor}" in diff --git a/sysutils/nut/files/patch-configure.ac b/sysutils/nut/files/patch-configure.ac deleted file mode 100644 index f4ba07af7082..000000000000 --- a/sysutils/nut/files/patch-configure.ac +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.ac.orig 2025-11-17 08:11:32.054205000 -0800 -+++ configure.ac 2025-11-17 08:19:12.634169000 -0800 -@@ -509,13 +509,6 @@ - [RUN_AS_GROUP="nogroup"] - ) - --dnl Last hit wins, user and groups accounts separately --for TOKEN in upsmon nutmon ups nut; do -- AS_IF([test -n "`${PROBE_OS_USER} ${TOKEN}`"], [RUN_AS_USER="${TOKEN}"]) -- AS_IF([test -n "`${PROBE_OS_GROUP} ${TOKEN}`"], [RUN_AS_GROUP="${TOKEN}"]) --done --unset TOKEN -- - dnl NOTE: NUT legacy default, keep as is for least surprise - dnl Distributions are however welcome to specify the option to use tmpfs - AS_CASE([${target_os}], -@@ -2844,7 +2837,7 @@ - - dnl A Python GUI client application for the sysadmin desktop - dnl (not necessarily on the NUT server itself): --NUT_ARG_WITH([nut_monitor], [install the NUT-Monitor GUI files], [auto]) -+NUT_ARG_WITH([nut_monitor], [install the NUT-Monitor GUI files], [no]) - NUT_ARG_WITH([pynut], [install the PyNUT module files (yes, no, app, auto)], [auto]) - dnl Note: we did NUT_CHECK_PYTHON2 NUT_CHECK_PYTHON3 etc above, - dnl and if at all possible, we generate the files from .in templates -@@ -3534,7 +3527,7 @@ - dnl Can we satisfy any NUT-Monitor installation request? - if test -n "${nut_with_nut_monitor_py2gtk2}${nut_with_nut_monitor_py3qt5}${nut_with_nut_monitor_py3qt6}" ; then - case "${nut_with_nut_monitor}" in -- "auto") nut_with_nut_monitor="yes" ;; -+ "auto") nut_with_nut_monitor="no" ;; - esac - else - case "${nut_with_nut_monitor}" inhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d7df75.3056e.3f23aa53>