Upgrade to version 1.110, including the most recent patches.

3 files changed, 26 insertions, 42 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index d48a2f9f9966..425bc99ac617 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	1.100
-PORTREVISION=	10
+PORTVERSION=	1.110
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/updates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -25,19 +24,18 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 SCRIPTS_ENV+=	WRKDIR="${WRKDIR}"
 
-WEBMIN_MODULES=	apache-1.100-3.wbm.gz \
-		dhcpd-1.100-1.wbm.gz \
-		file-1.100-2.wbm.gz \
-		ldap-useradmin-1.100-1.wbm.gz \
-		lpadmin-1.100-2.wbm.gz \
-		mon-1.100-2.wbm.gz \
-		mount-1.100-8.wbm.gz \
-		mysql-1.100-1.wbm.gz \
-		nis-1.100-1.wbm.gz \
-		qmailadmin-1.100-1.wbm.gz \
-		samba-1.100-6.wbm.gz \
-		squid-1.100-5.wbm.gz \
-		updown-1.100-4.wbm.gz
+WEBMIN_MODULES=	dhcpd-1.110-9.wbm.gz \
+		file-1.110-1.wbm.gz \
+		fsdump-1.110-2.wbm.gz \
+		ldap-useradmin-1.110-3.wbm.gz \
+		lpadmin-1.110-1.wbm.gz \
+		mysql-1.110-1.wbm.gz \
+		postfix-1.110-1.wbm.gz \
+		sendmail-1.110-1.wbm.gz \
+		stunnel-1.110-1.wbm.gz \
+		updown-1.110-1.wbm.gz \
+		upload-1.110-1.wbm.gz \
+		webalizer-1.110-2.wbm.gz
 
 WEBMIN_THEMES=
 
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index fd33bdae9993..67956bce8214 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,14 +1,13 @@
-MD5 (webmin-1.100.tar.gz) = 9b426bc40b51f70182d0e5bf41f82078
-MD5 (apache-1.100-3.wbm.gz) = 4c67e708abed11f80deba716d9c86dcc
-MD5 (dhcpd-1.100-1.wbm.gz) = dabf0b526719d5bda56b8edf5017c0f5
-MD5 (file-1.100-2.wbm.gz) = 33b8f0f3c408b74ed7423f45f4ae5069
-MD5 (ldap-useradmin-1.100-1.wbm.gz) = 0186d93d848fafbf83b93a88247592a0
-MD5 (lpadmin-1.100-2.wbm.gz) = 93fa8f9947e72f8a3c1e535652f96e17
-MD5 (mon-1.100-2.wbm.gz) = 5a63810a22b9e8c14e54a6162ac26831
-MD5 (mount-1.100-8.wbm.gz) = 2dcda6a94337c8cb8af717970773ea27
-MD5 (mysql-1.100-1.wbm.gz) = 17b0004275c0981cf5505c6cf9377f50
-MD5 (nis-1.100-1.wbm.gz) = 3f1d13c4c069964fc4751f87aed7b310
-MD5 (qmailadmin-1.100-1.wbm.gz) = 74355acfba3b6eff196a10ab6a950525
-MD5 (samba-1.100-6.wbm.gz) = 9c0f7c59ab3121dad727b4765ad0105e
-MD5 (squid-1.100-5.wbm.gz) = 35844e8fb227e90a5e0670f9676d75a5
-MD5 (updown-1.100-4.wbm.gz) = 121cfd3ff271bab012e72f97309574cf
+MD5 (webmin-1.110.tar.gz) = ca7099ba36fa61c6562ed5a93073310e
+MD5 (dhcpd-1.110-9.wbm.gz) = 0c9be2478b2ae0f02b9fde843e7a1742
+MD5 (file-1.110-1.wbm.gz) = 4e769f8ad70d0642998d8066a8674a63
+MD5 (fsdump-1.110-2.wbm.gz) = 6d0e561d0900da2b0998f7fa177b1bcc
+MD5 (ldap-useradmin-1.110-3.wbm.gz) = 5893e0a8dfd342aad0b74bd5ae569c78
+MD5 (lpadmin-1.110-1.wbm.gz) = 96f9343208764006917dd715a7030056
+MD5 (mysql-1.110-1.wbm.gz) = 86d802b2d75075d937b610e582bab4a6
+MD5 (postfix-1.110-1.wbm.gz) = 70981658a881d77c15e8196b9324075a
+MD5 (sendmail-1.110-1.wbm.gz) = 76040e8391b2196bedfa3bcdad5ebfbf
+MD5 (stunnel-1.110-1.wbm.gz) = 5809334bbbb43d53316545fccd2cccb0
+MD5 (updown-1.110-1.wbm.gz) = 3bd5e1779a82aaad2f2c1f3371aa40f5
+MD5 (upload-1.110-1.wbm.gz) = d8382dbc6de796a483434acce564c4e9
+MD5 (webalizer-1.110-2.wbm.gz) = 399948043d1e7f63bd4706d88e19fd5a
diff --git a/sysutils/webmin/files/patch-os_list.txt b/sysutils/webmin/files/patch-os_list.txt
deleted file mode 100644
index c64d115cf2c3..000000000000
--- a/sysutils/webmin/files/patch-os_list.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- os_list.txt.orig	Fri Jul 25 22:19:51 2003
-+++ os_list.txt	Fri Jul 25 22:19:54 2003
-@@ -164,6 +164,7 @@
- FreeBSD				4.7	freebsd		4.7	$uname =~ /FreeBSD.*\s4\.7/i
- FreeBSD				4.8	freebsd		4.8	$uname =~ /FreeBSD.*\s4\.8/i
- FreeBSD				5.0	freebsd		5.0	$uname =~ /FreeBSD.*\s5\.0/i
-+FreeBSD				5.1	freebsd		5.1	$uname =~ /FreeBSD.*\s5\.1/i
- OpenBSD				2.5	openbsd		2.5	$uname =~ /OpenBSD.*\s2\.5/i
- OpenBSD				2.6	openbsd		2.6	$uname =~ /OpenBSD.*\s2\.6/i
- OpenBSD				2.7	openbsd		2.7	$uname =~ /OpenBSD.*\s2\.7/i