12 files changed, 302 insertions, 21 deletions
diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
index f936b5fea18a..33907677d5e1 100644
--- a/sysutils/iocage/Makefile
+++ b/sysutils/iocage/Makefile
@@ -1,11 +1,14 @@
 PORTNAME=	iocage
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 # Pull in PR #61 to unbreak default route detection on CURRENT
+# Pull in PR #90 to unbreak on python 3.12
 PATCH_SITES=    https://github.com/freebsd/iocage/commit/
-PATCHFILES=	2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch:-p1
+PATCHFILES=	2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch:-p1 \
+		c2cf9d218a643b6231d1bce0361846352f58c50f.patch:-p1
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	FreeBSD jail manager written in Python3
diff --git a/sysutils/iocage/distinfo b/sysutils/iocage/distinfo
index bdc9a0b24743..9d532c156395 100644
--- a/sysutils/iocage/distinfo
+++ b/sysutils/iocage/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1749992584
+TIMESTAMP = 1757166176
 SHA256 (freebsd-iocage-1.11_GH0.tar.gz) = 7f8eea47a71389eca9e147a7ec94ae7ecc260e6b17422837ac33492403af9028
 SIZE (freebsd-iocage-1.11_GH0.tar.gz) = 816215
 SHA256 (2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch) = 212d63a093d9831c29398e18e567ea63050b116f737be82f2fe2384c670b5981
 SIZE (2120a86d1d4fd3d383a3f0bddfc1e92eb5a7d2e7.patch) = 891
-SHA256 (c55e05aebb305b4013554ec80298113c50d1c74c.patch) = 90e723fb459513e82a617b5d57fa5b9cde881fd94e7f4158b4082ddd7dcd274c
-SIZE (c55e05aebb305b4013554ec80298113c50d1c74c.patch) = 956
+SHA256 (c2cf9d218a643b6231d1bce0361846352f58c50f.patch) = c550e0fcd6292e86b5405cf267fab88572484bb474a3435b57cdd0e4ecd89f90
+SIZE (c2cf9d218a643b6231d1bce0361846352f58c50f.patch) = 1990
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
index e79c304832ae..a676f4bb7ad2 100644
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	slurm
 DISTVERSION=	23.11.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	sysutils
 MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm
@@ -124,6 +124,12 @@ LLD2FIX=	api plugins/openapi sacctmgr sackd scontrol scrontab scrun	\
 
 .include <bsd.port.options.mk>
 
+post-extract:
+	@${MKDIR} ${WRKSRC}/src/plugins/task/pgid
+# Use an existing plugin's Makefile.in as a template
+	@${CP}	${WRKSRC}/src/plugins/task/cray_aries/Makefile.in \
+		${WRKSRC}/src/plugins/task/pgid/Makefile.in
+
 # Hack around nonfunctional --disable-gtktest flag
 pre-configure-GUI-off:
 	${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
diff --git a/sysutils/slurm-wlm/files/patch-configure b/sysutils/slurm-wlm/files/patch-configure
index 51cf89bd4981..f95b552a6dab 100644
--- a/sysutils/slurm-wlm/files/patch-configure
+++ b/sysutils/slurm-wlm/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2023-11-21 22:33:29 UTC
+--- configure.orig	2024-05-21 17:19:51 UTC
 +++ configure
 @@ -5513,7 +5513,7 @@ _ACEOF
  /* end confdefs.h.  */
@@ -240,3 +240,12 @@
  
      else
  printf "%s\n" "#define H5_USE_18_API 1" >>confdefs.h
+@@ -28035,7 +28030,7 @@ printf "%s\n" "${x_ac_deprecated=no}" >&6; }
+ 
+ 
+ 
+-ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/openlava/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/pmi/Makefile contribs/pmi2/Makefile contribs/seff/Makefile contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/torque/Makefile doc/Makefile doc/html/Makefile doc/html/configurator.easy.html doc/html/configurator.html doc/man/Makefile doc/man/man1/Makefile doc/man/man5/Makefile doc/man/man8/Makefile etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/interfaces/Makefile src/lua/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/gpu/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/sysfs/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/auth/slurm/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/lua/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cgroup/v2/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/cred/Makefile src/plugins/cred/common/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/data_parser/Makefile src/plugins/data_parser/v0.0.39/Makefile src/plugins/data_parser/v0.0.40/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/gpu/Makefile src/plugins/gpu/common/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nrt/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/oneapi/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/mps/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/shard/Makefile src/plugins/hash/Makefile src/plugins/hash/k12/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/common/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/kafka/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/script/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/user/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/node_features/Makefile src/plugins/node_features/helpers/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/preempt/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/example/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/hpe_slingshot/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/block/Makefile src/plugins/topology/common/Makefile src/plugins/topology/default/Makefile src/plugins/topology/tree/Makefile src/sacct/Makefile src/sackd/Makefile src/sacctmgr/Makefile src/salloc/Makefile src/sattach/Makefile src/scrun/Makefile src/sbatch/Makefile src/sbcast/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/plugins/openapi/dbv0.0.38/Makefile src/slurmrestd/plugins/openapi/dbv0.0.39/Makefile src/slurmrestd/plugins/openapi/slurmctld/Makefile src/slurmrestd/plugins/openapi/slurmdbd/Makefile src/slurmrestd/plugins/openapi/v0.0.38/Makefile src/slurmrestd/plugins/openapi/v0.0.39/Makefile src/sprio/Makefile src/squeue/Makefile src/sreport/Makefile src/srun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile testsuite/Makefile testsuite/testsuite.conf.sample testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile"
++ac_config_files="$ac_config_files Makefile auxdir/Makefile contribs/Makefile contribs/cray/Makefile contribs/cray/csm/Makefile contribs/cray/slurmsmwd/Makefile contribs/lua/Makefile contribs/nss_slurm/Makefile contribs/openlava/Makefile contribs/pam/Makefile contribs/pam_slurm_adopt/Makefile contribs/perlapi/Makefile contribs/perlapi/libslurm/Makefile contribs/perlapi/libslurm/perl/Makefile.PL contribs/perlapi/libslurmdb/Makefile contribs/perlapi/libslurmdb/perl/Makefile.PL contribs/pmi/Makefile contribs/pmi2/Makefile contribs/seff/Makefile contribs/sgather/Makefile contribs/sjobexit/Makefile contribs/torque/Makefile doc/Makefile doc/html/Makefile doc/html/configurator.easy.html doc/html/configurator.html doc/man/Makefile doc/man/man1/Makefile doc/man/man5/Makefile doc/man/man8/Makefile etc/Makefile src/Makefile src/api/Makefile src/bcast/Makefile src/common/Makefile src/database/Makefile src/interfaces/Makefile src/lua/Makefile src/plugins/Makefile src/plugins/accounting_storage/Makefile src/plugins/accounting_storage/common/Makefile src/plugins/accounting_storage/mysql/Makefile src/plugins/accounting_storage/slurmdbd/Makefile src/plugins/acct_gather_energy/Makefile src/plugins/acct_gather_energy/gpu/Makefile src/plugins/acct_gather_energy/ibmaem/Makefile src/plugins/acct_gather_energy/ipmi/Makefile src/plugins/acct_gather_energy/pm_counters/Makefile src/plugins/acct_gather_energy/rapl/Makefile src/plugins/acct_gather_energy/xcc/Makefile src/plugins/acct_gather_filesystem/Makefile src/plugins/acct_gather_filesystem/lustre/Makefile src/plugins/acct_gather_interconnect/Makefile src/plugins/acct_gather_interconnect/ofed/Makefile src/plugins/acct_gather_interconnect/sysfs/Makefile src/plugins/acct_gather_profile/Makefile src/plugins/acct_gather_profile/hdf5/Makefile src/plugins/acct_gather_profile/hdf5/sh5util/Makefile src/plugins/acct_gather_profile/influxdb/Makefile src/plugins/auth/Makefile src/plugins/auth/jwt/Makefile src/plugins/auth/munge/Makefile src/plugins/auth/none/Makefile src/plugins/auth/slurm/Makefile src/plugins/burst_buffer/Makefile src/plugins/burst_buffer/common/Makefile src/plugins/burst_buffer/datawarp/Makefile src/plugins/burst_buffer/lua/Makefile src/plugins/cgroup/Makefile src/plugins/cgroup/common/Makefile src/plugins/cgroup/v1/Makefile src/plugins/cgroup/v2/Makefile src/plugins/cli_filter/Makefile src/plugins/cli_filter/common/Makefile src/plugins/cli_filter/lua/Makefile src/plugins/cli_filter/syslog/Makefile src/plugins/cli_filter/user_defaults/Makefile src/plugins/core_spec/Makefile src/plugins/core_spec/cray_aries/Makefile src/plugins/cred/Makefile src/plugins/cred/common/Makefile src/plugins/cred/munge/Makefile src/plugins/cred/none/Makefile src/plugins/data_parser/Makefile src/plugins/data_parser/v0.0.39/Makefile src/plugins/data_parser/v0.0.40/Makefile src/plugins/ext_sensors/Makefile src/plugins/ext_sensors/rrd/Makefile src/plugins/gpu/Makefile src/plugins/gpu/common/Makefile src/plugins/gpu/generic/Makefile src/plugins/gpu/nrt/Makefile src/plugins/gpu/nvml/Makefile src/plugins/gpu/oneapi/Makefile src/plugins/gpu/rsmi/Makefile src/plugins/gres/Makefile src/plugins/gres/common/Makefile src/plugins/gres/gpu/Makefile src/plugins/gres/mps/Makefile src/plugins/gres/nic/Makefile src/plugins/gres/shard/Makefile src/plugins/hash/Makefile src/plugins/hash/k12/Makefile src/plugins/job_container/Makefile src/plugins/job_container/cncu/Makefile src/plugins/job_container/tmpfs/Makefile src/plugins/job_submit/Makefile src/plugins/job_submit/all_partitions/Makefile src/plugins/job_submit/cray_aries/Makefile src/plugins/job_submit/defaults/Makefile src/plugins/job_submit/logging/Makefile src/plugins/job_submit/lua/Makefile src/plugins/job_submit/partition/Makefile src/plugins/job_submit/pbs/Makefile src/plugins/job_submit/require_timelimit/Makefile src/plugins/job_submit/throttle/Makefile src/plugins/jobacct_gather/Makefile src/plugins/jobacct_gather/cgroup/Makefile src/plugins/jobacct_gather/common/Makefile src/plugins/jobacct_gather/linux/Makefile src/plugins/jobcomp/Makefile src/plugins/jobcomp/common/Makefile src/plugins/jobcomp/elasticsearch/Makefile src/plugins/jobcomp/filetxt/Makefile src/plugins/jobcomp/kafka/Makefile src/plugins/jobcomp/lua/Makefile src/plugins/jobcomp/mysql/Makefile src/plugins/jobcomp/script/Makefile src/plugins/mcs/Makefile src/plugins/mcs/account/Makefile src/plugins/mcs/group/Makefile src/plugins/mcs/user/Makefile src/plugins/mpi/Makefile src/plugins/mpi/cray_shasta/Makefile src/plugins/mpi/pmi2/Makefile src/plugins/mpi/pmix/Makefile src/plugins/node_features/Makefile src/plugins/node_features/helpers/Makefile src/plugins/node_features/knl_cray/Makefile src/plugins/node_features/knl_generic/Makefile src/plugins/power/Makefile src/plugins/power/common/Makefile src/plugins/power/cray_aries/Makefile src/plugins/preempt/Makefile src/plugins/preempt/partition_prio/Makefile src/plugins/preempt/qos/Makefile src/plugins/prep/Makefile src/plugins/prep/script/Makefile src/plugins/priority/Makefile src/plugins/priority/basic/Makefile src/plugins/priority/multifactor/Makefile src/plugins/proctrack/Makefile src/plugins/proctrack/cgroup/Makefile src/plugins/proctrack/cray_aries/Makefile src/plugins/proctrack/linuxproc/Makefile src/plugins/proctrack/pgid/Makefile src/plugins/sched/Makefile src/plugins/sched/backfill/Makefile src/plugins/sched/builtin/Makefile src/plugins/select/Makefile src/plugins/select/cons_tres/Makefile src/plugins/select/cray_aries/Makefile src/plugins/select/linear/Makefile src/plugins/select/other/Makefile src/plugins/serializer/Makefile src/plugins/serializer/json/Makefile src/plugins/serializer/url-encoded/Makefile src/plugins/serializer/yaml/Makefile src/plugins/site_factor/Makefile src/plugins/site_factor/example/Makefile src/plugins/switch/Makefile src/plugins/switch/cray_aries/Makefile src/plugins/switch/hpe_slingshot/Makefile src/plugins/task/Makefile src/plugins/task/affinity/Makefile src/plugins/task/cgroup/Makefile src/plugins/task/cray_aries/Makefile src/plugins/task/pgid/Makefile src/plugins/topology/Makefile src/plugins/topology/3d_torus/Makefile src/plugins/topology/block/Makefile src/plugins/topology/common/Makefile src/plugins/topology/default/Makefile src/plugins/topology/tree/Makefile src/sacct/Makefile src/sackd/Makefile src/sacctmgr/Makefile src/salloc/Makefile src/sattach/Makefile src/scrun/Makefile src/sbatch/Makefile src/sbcast/Makefile src/scancel/Makefile src/scontrol/Makefile src/scrontab/Makefile src/sdiag/Makefile src/sinfo/Makefile src/slurmctld/Makefile src/slurmd/Makefile src/slurmd/common/Makefile src/slurmd/slurmd/Makefile src/slurmd/slurmstepd/Makefile src/slurmdbd/Makefile src/slurmrestd/Makefile src/slurmrestd/plugins/Makefile src/slurmrestd/plugins/auth/Makefile src/slurmrestd/plugins/auth/jwt/Makefile src/slurmrestd/plugins/auth/local/Makefile src/slurmrestd/plugins/openapi/Makefile src/slurmrestd/plugins/openapi/dbv0.0.38/Makefile src/slurmrestd/plugins/openapi/dbv0.0.39/Makefile src/slurmrestd/plugins/openapi/slurmctld/Makefile src/slurmrestd/plugins/openapi/slurmdbd/Makefile src/slurmrestd/plugins/openapi/v0.0.38/Makefile src/slurmrestd/plugins/openapi/v0.0.39/Makefile src/sprio/Makefile src/squeue/Makefile src/sreport/Makefile src/srun/Makefile src/sshare/Makefile src/sstat/Makefile src/strigger/Makefile src/sview/Makefile testsuite/Makefile testsuite/testsuite.conf.sample testsuite/expect/Makefile testsuite/slurm_unit/Makefile testsuite/slurm_unit/common/Makefile testsuite/slurm_unit/common/bitstring/Makefile testsuite/slurm_unit/common/hostlist/Makefile testsuite/slurm_unit/common/slurm_protocol_defs/Makefile testsuite/slurm_unit/common/slurm_protocol_pack/Makefile testsuite/slurm_unit/common/slurmdb_defs/Makefile testsuite/slurm_unit/common/slurmdb_pack/Makefile"
+ 
+ 
+ cat >confcache <<\_ACEOF
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_Makefile.in b/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_Makefile.in
new file mode 100644
index 000000000000..39c103c910ac
--- /dev/null
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_Makefile.in
@@ -0,0 +1,97 @@
+--- src/plugins/task/pgid/Makefile.in.orig	2025-09-03 23:57:14 UTC
++++ src/plugins/task/pgid/Makefile.in
+@@ -181,16 +181,16 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+   }
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+-task_cray_aries_la_LIBADD =
+-am_task_cray_aries_la_OBJECTS = task_cray_aries.lo
+-task_cray_aries_la_OBJECTS = $(am_task_cray_aries_la_OBJECTS)
++task_pgid_la_LIBADD =
++am_task_pgid_la_OBJECTS = task_pgid.lo
++task_pgid_la_OBJECTS = $(am_task_pgid_la_OBJECTS)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+-task_cray_aries_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
++task_pgid_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+-	$(AM_CFLAGS) $(CFLAGS) $(task_cray_aries_la_LDFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS) $(task_pgid_la_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -207,7 +207,7 @@ am__maybe_remake_depfiles = depfiles
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/slurm
+ depcomp = $(SHELL) $(top_srcdir)/auxdir/depcomp
+ am__maybe_remake_depfiles = depfiles
+-am__depfiles_remade = ./$(DEPDIR)/task_cray_aries.Plo
++am__depfiles_remade = ./$(DEPDIR)/task_pgid.Plo
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -227,7 +227,7 @@ am__v_CCLD_1 = 
+ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+ am__v_CCLD_0 = @echo "  CCLD    " $@;
+ am__v_CCLD_1 = 
+-SOURCES = $(task_cray_aries_la_SOURCES)
++SOURCES = $(task_pgid_la_SOURCES)
+ am__can_run_installinfo = \
+   case $$AM_UPDATE_INFO_DIR in \
+     n|no|NO) false;; \
+@@ -514,12 +514,12 @@ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+ PLUGIN_FLAGS = -module -avoid-version --export-dynamic
+-AM_CPPFLAGS = -DSLURM_PLUGIN_DEBUG -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_TASK_CPPFLAGS)
+-pkglib_LTLIBRARIES = task_cray_aries.la
++AM_CPPFLAGS = -DSLURM_PLUGIN_DEBUG -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_TASK_CPPFLAGS) -I$(top_srcdir)/src/interfaces -I$(top_srcdir)/src/plugins/task -I$(top_srcdir)/src/slurmd -I$(top_srcdir)/src/slurmd/slurmstepd
++pkglib_LTLIBRARIES = task_pgid.la
+ 
+ # Null task plugin.
+-task_cray_aries_la_SOURCES = task_cray_aries.c
+-task_cray_aries_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
++task_pgid_la_SOURCES = task_pgid.c
++task_pgid_la_LDFLAGS = $(PLUGIN_FLAGS) $(CRAY_TASK_LDFLAGS) \
+ 	$(NUMA_LIBS)
+ 
+ all: all-am
+@@ -591,8 +591,8 @@ clean-pkglibLTLIBRARIES:
+ 	  rm -f $${locs}; \
+ 	}
+ 
+-task_cray_aries.la: $(task_cray_aries_la_OBJECTS) $(task_cray_aries_la_DEPENDENCIES) $(EXTRA_task_cray_aries_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(task_cray_aries_la_LINK) -rpath $(pkglibdir) $(task_cray_aries_la_OBJECTS) $(task_cray_aries_la_LIBADD) $(LIBS)
++task_pgid.la: $(task_pgid_la_OBJECTS) $(task_pgid_la_DEPENDENCIES) $(EXTRA_task_pgid_la_DEPENDENCIES)
++	$(AM_V_CCLD)$(task_pgid_la_LINK) -rpath $(pkglibdir) $(task_pgid_la_OBJECTS) $(task_pgid_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -600,7 +600,7 @@ distclean-compile:
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cray_aries.Plo@am__quote@ # am--include-marker
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_pgid.Plo@am__quote@ # am--include-marker
+ 
+ $(am__depfiles_remade):
+ 	@$(MKDIR_P) $(@D)
+@@ -729,7 +729,7 @@ distclean: distclean-am
+ 	mostlyclean-am
+ 
+ distclean: distclean-am
+-		-rm -f ./$(DEPDIR)/task_cray_aries.Plo
++		-rm -f ./$(DEPDIR)/task_pgid.Plo
+ 	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-tags
+@@ -775,7 +775,7 @@ maintainer-clean: maintainer-clean-am
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+-		-rm -f ./$(DEPDIR)/task_cray_aries.Plo
++		-rm -f ./$(DEPDIR)/task_pgid.Plo
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
diff --git a/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_task__pgid.c b/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_task__pgid.c
new file mode 100644
index 000000000000..0433aeaab02f
--- /dev/null
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_task_pgid_task__pgid.c
@@ -0,0 +1,155 @@
+--- src/plugins/task/pgid/task_pgid.c.orig     2025-09-03 23:58:57 UTC
++++ src/plugins/task/pgid/task_pgid.c
+@@ -0,0 +1,152 @@
++#include "slurm_xlator.h"
++#include "log.h"
++#include "xmalloc.h"
++#include "task.h"   /* interface declarations */
++
++/* these two pull in batch_job_launch_msg_t, launch_tasks_request_msg_t,
++   stepd_step_task_info_t, etc. */
++#include "src/common/slurm_protocol_api.h"
++#include "src/slurmd/slurmstepd/slurmstepd_job.h"
++
++#include <sys/types.h>
++#include <signal.h>
++#include <unistd.h>
++#include <errno.h>
++#include <string.h>
++
++/* Required plugin identifiers (exported) */
++__attribute__((visibility("default"))) const char     plugin_name[]    = "PGID task plugin for FreeBSD";
++__attribute__((visibility("default"))) const char     plugin_type[]    = "task/pgid";
++__attribute__((visibility("default"))) const uint32_t plugin_version   = SLURM_VERSION_NUMBER;
++
++/* Required generic plugin entry points */
++int init(void)  { slurm_info("task/pgid: init");  return SLURM_SUCCESS; }
++int fini(void)  { slurm_info("task/pgid: fini");  return SLURM_SUCCESS; }
++
++static pid_t job_pgid = -1;
++
++/* ==== Required task_* API (must all be present) ==== */
++
++/* Called when slurmd receives a batch launch request */
++int task_p_slurmd_batch_request(batch_job_launch_msg_t *req)
++{
++    (void)req;
++    return SLURM_SUCCESS;
++}
++
++/* Called when slurmd receives a general launch request */
++int task_p_slurmd_launch_request(launch_tasks_request_msg_t *req,
++                                 uint32_t node_id, char **err_msg)
++{
++    (void)req; (void)node_id; (void)err_msg;
++    return SLURM_SUCCESS;
++}
++
++int task_p_slurmd_suspend_job(uint32_t job_id)
++{
++    (void)job_id;
++    return SLURM_SUCCESS;
++}
++
++int task_p_slurmd_resume_job(uint32_t job_id)
++{
++    (void)job_id;
++    return SLURM_SUCCESS;
++}
++
++/* Before setuid to the job user */
++int task_p_pre_setuid(stepd_step_rec_t *step)
++{
++    (void)step;
++    return SLURM_SUCCESS;
++}
++
++/* Called in privileged context before launch */
++int task_p_pre_launch_priv(stepd_step_rec_t *step,
++                           uint32_t node_tid, uint32_t global_tid)
++{
++    (void)step; (void)node_tid; (void)global_tid;
++    return SLURM_SUCCESS;
++}
++
++int task_p_pre_launch(stepd_step_rec_t *step)
++{
++    pid_t cur = getpid();
++
++    /* Case A: no PGID recorded yet for this step -> become the group leader */
++    if (step->pgid <= 0) {
++        if (setpgid(0, 0) < 0) {
++            /* If a sibling beat us to it, join that PGID instead */
++            if (errno == EACCES || errno == EPERM || errno == EEXIST) {
++                /* Someone created a group already; query our pgid and store it */
++                pid_t pg = getpgid(0);
++                if (pg < 0) {
++                    slurm_error("task/pgid: getpgid failed after race: %s", strerror(errno));
++                    return SLURM_ERROR;
++                }
++                step->pgid = pg;
++                slurm_debug("task/pgid: joined existing PGID %d (race)", step->pgid);
++                return SLURM_SUCCESS;
++            }
++            slurm_error("task/pgid: setpgid(0,0) failed for leader pid=%d: %s", (int)cur, strerror(errno));
++            return SLURM_ERROR;
++        }
++        step->pgid = getpgid(0);
++        if (step->pgid < 0) {
++            slurm_error("task/pgid: getpgid failed after creating group: %s", strerror(errno));
++            return SLURM_ERROR;
++        }
++        slurm_debug("task/pgid: created step PGID %d (leader pid=%d)", step->pgid, (int)cur);
++        return SLURM_SUCCESS;
++    }
++
++    /* Case B: PGID exists -> join it */
++    if (setpgid(0, step->pgid) < 0) {
++        /* ESRCH: parent/leader not visible yet; tiny retry helps on fast forks */
++        if (errno == ESRCH) {
++            usleep(1000); /* 1 ms backoff */
++            if (setpgid(0, step->pgid) == 0) {
++                slurm_debug("task/pgid: joined PGID %d after retry", step->pgid);
++                return SLURM_SUCCESS;
++            }
++        }
++        slurm_error("task/pgid: setpgid(0,%d) failed: %s", step->pgid, strerror(errno));
++        return SLURM_ERROR;
++    }
++    slurm_debug("task/pgid: joined existing PGID %d", step->pgid);
++    return SLURM_SUCCESS;
++}
++
++/* After a task terminates */
++int task_p_post_term(stepd_step_rec_t *step, stepd_step_task_info_t *task)
++{
++    (void)step; (void)task;
++    return SLURM_SUCCESS;
++}
++
++/* After the whole step finishes */
++int task_p_post_step(stepd_step_rec_t *step)
++{
++    (void)step;
++    return SLURM_SUCCESS;
++}
++
++/* Allow plugin to track additional PIDs if needed */
++int task_p_add_pid(pid_t pid)
++{
++    (void)pid;
++    return SLURM_SUCCESS;
++}
++
++int task_p_signal(stepd_step_rec_t *step, int sig)
++{
++    if (step && step->pgid > 1) {
++        slurm_debug("task/pgid: sending signal %d to PGID %d", sig, step->pgid);
++        if (killpg((pid_t)step->pgid, sig) < 0) {
++            slurm_error("task/pgid: killpg(%d) failed: %s", step->pgid, strerror(errno));
++            return SLURM_ERROR;
++        }
++    }
++    return SLURM_SUCCESS;
++}
++int task_p_fini(stepd_step_rec_t *step) { (void)step; return SLURM_SUCCESS; }
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index e4c2395741aa..5c18a12d1069 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	usermin
-PORTVERSION=	2.302
+PORTVERSION=	2.400
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo
index 1799cc515aa9..de088b15ed3e 100644
--- a/sysutils/usermin/distinfo
+++ b/sysutils/usermin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750756861
-SHA256 (usermin-2.302.tar.gz) = 55ce97852f6de533605284d0dd8e43e90e5851f4b4bc0264b2bf86cc65d7f658
-SIZE (usermin-2.302.tar.gz) = 16244927
+TIMESTAMP = 1757088078
+SHA256 (usermin-2.400.tar.gz) = 38d31498ceef372f21aa987cde2b5fb07a4e9eb027d4eb805c486b8f79b7696a
+SIZE (usermin-2.400.tar.gz) = 16255073
diff --git a/sysutils/usermin/pkg-plist b/sysutils/usermin/pkg-plist
index 696f5cac11ce..e739f8c3be0f 100644
--- a/sysutils/usermin/pkg-plist
+++ b/sysutils/usermin/pkg-plist
@@ -190,6 +190,7 @@ lib/usermin/authentic-theme/extensions/csf/csf-lib.pl
 lib/usermin/authentic-theme/extensions/csf/csf.min.css
 lib/usermin/authentic-theme/extensions/csf/csf.min.css.gz
 lib/usermin/authentic-theme/extensions/csf/csf.min.js
+lib/usermin/authentic-theme/extensions/csf/csf.min.js.LEGAL.txt
 lib/usermin/authentic-theme/extensions/csf/csf.min.js.gz
 lib/usermin/authentic-theme/extensions/file-manager/acls.cgi
 lib/usermin/authentic-theme/extensions/file-manager/bookmark.cgi
@@ -209,8 +210,10 @@ lib/usermin/authentic-theme/extensions/file-manager/extract.cgi
 lib/usermin/authentic-theme/extensions/file-manager/fetcher.cgi
 lib/usermin/authentic-theme/extensions/file-manager/file-manager-lib.pl
 lib/usermin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js
+lib/usermin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.LEGAL.txt
 lib/usermin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.gz
 lib/usermin/authentic-theme/extensions/file-manager/file-manager.min.js
+lib/usermin/authentic-theme/extensions/file-manager/file-manager.min.js.LEGAL.txt
 lib/usermin/authentic-theme/extensions/file-manager/file-manager.min.js.gz
 lib/usermin/authentic-theme/extensions/file-manager/gpg.cgi
 lib/usermin/authentic-theme/extensions/file-manager/http_download.cgi
@@ -226,12 +229,14 @@ lib/usermin/authentic-theme/extensions/mail/mail-lib.pl
 lib/usermin/authentic-theme/extensions/mail/mail.min.css
 lib/usermin/authentic-theme/extensions/mail/mail.min.css.gz
 lib/usermin/authentic-theme/extensions/mail/mail.min.js
+lib/usermin/authentic-theme/extensions/mail/mail.min.js.LEGAL.txt
 lib/usermin/authentic-theme/extensions/mail/mail.min.js.gz
 lib/usermin/authentic-theme/extensions/mail/mail.src.js
 lib/usermin/authentic-theme/extensions/mail/message.cgi
 lib/usermin/authentic-theme/extensions/mail/messages.cgi
 lib/usermin/authentic-theme/extensions/mail/search.cgi
 lib/usermin/authentic-theme/extensions/sql.min.js
+lib/usermin/authentic-theme/extensions/sql.min.js.LEGAL.txt
 lib/usermin/authentic-theme/extensions/sql.min.js.gz
 lib/usermin/authentic-theme/extensions/stats/stats.min.css
 lib/usermin/authentic-theme/extensions/stats/stats.min.js
@@ -459,6 +464,7 @@ lib/usermin/authentic-theme/images/modules/bind8/slaves.gif
 lib/usermin/authentic-theme/images/modules/bind8/soa.gif
 lib/usermin/authentic-theme/images/modules/bind8/stub.gif
 lib/usermin/authentic-theme/images/modules/bind8/text.gif
+lib/usermin/authentic-theme/images/modules/bind8/tls.gif
 lib/usermin/authentic-theme/images/modules/bind8/view.gif
 lib/usermin/authentic-theme/images/modules/bind8/whois.gif
 lib/usermin/authentic-theme/images/modules/bind8/zonedef.gif
@@ -6545,7 +6551,8 @@ lib/usermin/mysql/config-aix
 lib/usermin/mysql/config-cobalt-linux
 lib/usermin/mysql/config-coherent-linux
 lib/usermin/mysql/config-debian-linux
-lib/usermin/mysql/config-debian-linux-10.0-ALL
+lib/usermin/mysql/config-debian-linux-10.0-12.0
+lib/usermin/mysql/config-debian-linux-13.0-ALL
 lib/usermin/mysql/config-debian-linux-2.2-9.0
 lib/usermin/mysql/config-freebsd
 lib/usermin/mysql/config-freebsd-8-ALL
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 8380f882fac6..28451907ada8 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	webmin
-PORTVERSION=	2.402
-PORTREVISION=	1
+PORTVERSION=	2.500
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index c45abd5bcd81..1594e331c501 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1750225206
-SHA256 (webmin-2.402.tar.gz) = ced99a948411e255549f4ce8b730820387a50379d755e802ff90ef6ae5deaca5
-SIZE (webmin-2.402.tar.gz) = 38515900
+TIMESTAMP = 1757117581
+SHA256 (webmin-2.500.tar.gz) = aa6b898be7b21847e9cf9bdddb1f13d93b2ccc7dca604b2478f4683641669759
+SIZE (webmin-2.500.tar.gz) = 38527403
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index 1a8fd74b32ba..f41930766f5f 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -950,6 +950,7 @@ lib/webmin/authentic-theme/extensions/csf/csf-lib.pl
 lib/webmin/authentic-theme/extensions/csf/csf.min.css
 lib/webmin/authentic-theme/extensions/csf/csf.min.css.gz
 lib/webmin/authentic-theme/extensions/csf/csf.min.js
+lib/webmin/authentic-theme/extensions/csf/csf.min.js.LEGAL.txt
 lib/webmin/authentic-theme/extensions/csf/csf.min.js.gz
 lib/webmin/authentic-theme/extensions/file-manager/acls.cgi
 lib/webmin/authentic-theme/extensions/file-manager/bookmark.cgi
@@ -969,8 +970,10 @@ lib/webmin/authentic-theme/extensions/file-manager/extract.cgi
 lib/webmin/authentic-theme/extensions/file-manager/fetcher.cgi
 lib/webmin/authentic-theme/extensions/file-manager/file-manager-lib.pl
 lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js
+lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.LEGAL.txt
 lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.gz
 lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js
+lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js.LEGAL.txt
 lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js.gz
 lib/webmin/authentic-theme/extensions/file-manager/gpg.cgi
 lib/webmin/authentic-theme/extensions/file-manager/http_download.cgi
@@ -986,12 +989,14 @@ lib/webmin/authentic-theme/extensions/mail/mail-lib.pl
 lib/webmin/authentic-theme/extensions/mail/mail.min.css
 lib/webmin/authentic-theme/extensions/mail/mail.min.css.gz
 lib/webmin/authentic-theme/extensions/mail/mail.min.js
+lib/webmin/authentic-theme/extensions/mail/mail.min.js.LEGAL.txt
 lib/webmin/authentic-theme/extensions/mail/mail.min.js.gz
 lib/webmin/authentic-theme/extensions/mail/mail.src.js
 lib/webmin/authentic-theme/extensions/mail/message.cgi
 lib/webmin/authentic-theme/extensions/mail/messages.cgi
 lib/webmin/authentic-theme/extensions/mail/search.cgi
 lib/webmin/authentic-theme/extensions/sql.min.js
+lib/webmin/authentic-theme/extensions/sql.min.js.LEGAL.txt
 lib/webmin/authentic-theme/extensions/sql.min.js.gz
 lib/webmin/authentic-theme/extensions/stats/stats.min.css
 lib/webmin/authentic-theme/extensions/stats/stats.min.js
@@ -1158,6 +1163,7 @@ lib/webmin/authentic-theme/images/modules/bind8/slaves.gif
 lib/webmin/authentic-theme/images/modules/bind8/soa.gif
 lib/webmin/authentic-theme/images/modules/bind8/stub.gif
 lib/webmin/authentic-theme/images/modules/bind8/text.gif
+lib/webmin/authentic-theme/images/modules/bind8/tls.gif
 lib/webmin/authentic-theme/images/modules/bind8/view.gif
 lib/webmin/authentic-theme/images/modules/bind8/whois.gif
 lib/webmin/authentic-theme/images/modules/bind8/zonedef.gif
@@ -8261,6 +8267,7 @@ lib/webmin/firewalld/config.info.de
 lib/webmin/firewalld/config.info.fr
 lib/webmin/firewalld/config.info.no
 lib/webmin/firewalld/config.info.pl
+lib/webmin/firewalld/config_info.pl
 lib/webmin/firewalld/create_zone.cgi
 lib/webmin/firewalld/default_zone.cgi
 lib/webmin/firewalld/delete_rules.cgi
@@ -13474,7 +13481,8 @@ lib/webmin/mysql/config-aix
 lib/webmin/mysql/config-cobalt-linux
 lib/webmin/mysql/config-coherent-linux
 lib/webmin/mysql/config-debian-linux
-lib/webmin/mysql/config-debian-linux-10.0-ALL
+lib/webmin/mysql/config-debian-linux-10.0-12.0
+lib/webmin/mysql/config-debian-linux-13.0-ALL
 lib/webmin/mysql/config-debian-linux-2.2-9.0
 lib/webmin/mysql/config-freebsd
 lib/webmin/mysql/config-freebsd-8-ALL
@@ -19854,7 +19862,6 @@ lib/webmin/status/alive-monitor.pl
 lib/webmin/status/apache-monitor.pl
 lib/webmin/status/backup_config.pl
 lib/webmin/status/bind8-monitor.pl
-lib/webmin/status/cfengine-monitor.pl
 lib/webmin/status/cgi_args.pl
 lib/webmin/status/change-monitor.pl
 lib/webmin/status/config
@@ -19893,7 +19900,6 @@ lib/webmin/status/delete_mons.cgi
 lib/webmin/status/delete_tmpls.cgi
 lib/webmin/status/dhcpd-monitor.pl
 lib/webmin/status/dns-monitor.pl
-lib/webmin/status/dnsadmin-monitor.pl
 lib/webmin/status/dovecot-monitor.pl
 lib/webmin/status/du-monitor.pl
 lib/webmin/status/edit_mon.cgi
@@ -19920,7 +19926,6 @@ lib/webmin/status/imap-monitor.pl
 lib/webmin/status/index.cgi
 lib/webmin/status/inetd-monitor.pl
 lib/webmin/status/init-monitor.pl
-lib/webmin/status/jabber-monitor.pl
 lib/webmin/status/lang/ar.auto
 lib/webmin/status/lang/bg.auto
 lib/webmin/status/lang/ca
@@ -20043,8 +20048,8 @@ lib/webmin/status/mon-monitor.pl
 lib/webmin/status/monitor.pl
 lib/webmin/status/mysql-monitor.pl
 lib/webmin/status/nfs-monitor.pl
-lib/webmin/status/nut-monitor.pl
 lib/webmin/status/oldfile-monitor.pl
+lib/webmin/status/phpini-monitor.pl
 lib/webmin/status/ping-monitor.pl
 lib/webmin/status/portsentry-monitor.pl
 lib/webmin/status/postfix-monitor.pl