3 files changed, 30 insertions, 16 deletions
diff --git a/sysutils/nut-devel/files/patch-configure.ac b/sysutils/nut-devel/files/patch-configure.ac
index 86db2cd40761..f4ba07af7082 100644
--- a/sysutils/nut-devel/files/patch-configure.ac
+++ b/sysutils/nut-devel/files/patch-configure.ac
@@ -1,6 +1,20 @@
---- configure.ac.orig	2022-08-25 15:32:21.256937000 -0700
-+++ configure.ac	2022-08-25 15:37:36.166445000 -0700
-@@ -802,7 +802,7 @@
+--- 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):
@@ -9,9 +23,9 @@
  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
-@@ -1301,7 +1301,7 @@
+@@ -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}" ; then
+     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" ;;
diff --git a/sysutils/nut-devel/files/patch-scripts_Makefile b/sysutils/nut-devel/files/patch-scripts_Makefile
deleted file mode 100644
index 2bb9e47afe06..000000000000
--- a/sysutils/nut-devel/files/patch-scripts_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.am.orig	2025-09-23 07:29:43.000000000 -0700
-+++ scripts/Makefile.am	2025-09-24 11:18:33.361330000 -0700
-@@ -30,7 +30,7 @@
-     valgrind/valgrind.sh.in \
-     Windows/halt.c
- 
--SUBDIRS = augeas devd hotplug installer python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
-+SUBDIRS = augeas devd hotplug installer python udev ufw Solaris upsdrvsvcctl external_apis
- 
- SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc
- 
diff --git a/sysutils/nut-devel/files/patch-scripts_Makefile.am b/sysutils/nut-devel/files/patch-scripts_Makefile.am
new file mode 100644
index 000000000000..067768646757
--- /dev/null
+++ b/sysutils/nut-devel/files/patch-scripts_Makefile.am
@@ -0,0 +1,11 @@
+--- scripts/Makefile.am.orig	2025-11-17 05:13:21.000000000 -0800
++++ scripts/Makefile.am	2025-11-17 07:46:55.934951000 -0800
+@@ -30,7 +30,7 @@
+     valgrind/valgrind.sh.in \
+     Windows/halt.c
+ 
+-SUBDIRS = augeas devd hotplug installer obs python systemd udev ufw Solaris Windows upsdrvsvcctl external_apis
++SUBDIRS = augeas devd hotplug installer obs python udev ufw Solaris Windows upsdrvsvcctl external_apis
+ 
+ SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc valgrind/README.adoc obs/README.adoc
+