git: f8048bff7d93 - main - sysutils/webmin: merge missing bits from PR 280163

The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f8048bff7d9389e27bdb2497986089d05b51479c

commit f8048bff7d9389e27bdb2497986089d05b51479c
Author:     Jimmy Olgeni <olgeni@FreeBSD.org>
AuthorDate: 2025-06-16 05:42:44 +0000
Commit:     Jimmy Olgeni <olgeni@FreeBSD.org>
CommitDate: 2025-06-16 06:37:22 +0000

    sysutils/webmin: merge missing bits from PR 280163
    
    - freebsd-mounts-7.c patch is no longer necessary
    - ajaxterm is no longer shipped, but acme_tiny.py needs compiled
    
    PR:             280163
---
 sysutils/webmin/Makefile                             | 5 +++--
 sysutils/webmin/files/patch-mount_freebsd-mounts-7.c | 8 --------
 sysutils/webmin/pkg-plist                            | 3 ++-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 34393a0e6aff..a9d6bd29f17c 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	webmin
 PORTVERSION=	2.401
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
@@ -50,8 +51,8 @@ post-patch:
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" -or -name "*.pyc" \) -delete
 
 do-build:
-	@${PYTHON_CMD} -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
-	@${PYTHON_CMD} -O -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/
+	@${PYTHON_CMD} -mcompileall ${WRKSRC}/webmin/acme_tiny.py
+	@${PYTHON_CMD} -O -mcompileall ${WRKSRC}/webmin/acme_tiny.py
 	@${CC} ${CFLAGS} -o ${WRKSRC}/mount/freebsd-mounts-7 ${WRKSRC}/mount/freebsd-mounts-7.c
 	@${STRIP_CMD} ${WRKSRC}/mount/freebsd-mounts-7
 
diff --git a/sysutils/webmin/files/patch-mount_freebsd-mounts-7.c b/sysutils/webmin/files/patch-mount_freebsd-mounts-7.c
deleted file mode 100644
index 589bf5032d7a..000000000000
--- a/sysutils/webmin/files/patch-mount_freebsd-mounts-7.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- mount/freebsd-mounts-7.c.orig	2015-03-13 23:51:39 UTC
-+++ mount/freebsd-mounts-7.c
-@@ -1,3 +1,5 @@
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include <errno.h>
- #include <sys/param.h>
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index 873b87514f56..b756623cc874 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -22089,6 +22089,8 @@ lib/webmin/webmin-pam
 lib/webmin/webmin-search-lib.pl
 lib/webmin/webmin-systemd
 lib/webmin/webmin/CHANGELOG
+lib/webmin/webmin/__pycache__/acme_tiny%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+lib/webmin/webmin/__pycache__/acme_tiny%%PYTHON_EXT_SUFFIX%%.pyc
 lib/webmin/webmin/acme_tiny.py
 lib/webmin/webmin/adminupgrade
 lib/webmin/webmin/backup_config.pl
@@ -23004,5 +23006,4 @@ lib/webmin/zones/zones-lib.pl
 @dir lib/webmin/mailboxes/xinha/plugins
 @dir lib/webmin/system-status/images
 @dir lib/webmin/webmincron/images
-@dir lib/webmin/xterm/images
 @postexec [ -d %D/etc/webmin ] && %D/lib/webmin/setup.sh || true