Upgrade to version 1.160.

4 files changed, 22 insertions, 48 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index ee033e6eea91..c64c1229ecbd 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	1.150
-PORTREVISION=	5
+PORTVERSION=	1.160
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/updates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -26,9 +25,12 @@ USE_PERL5=	yes
 USE_RC_SUBR=    yes
 USE_REINPLACE=	yes
 
-WEBMIN_MODULES=	fsdump-1.150-1.wbm.gz \
-		quota-1.150-4.wbm.gz \
-		squid-1.150-2.wbm.gz
+WEBMIN_MODULES= bind8-1.160-4.wbm.gz \
+		cluster-webmin-1.160-1.wbm.gz \
+		cron-1.160-1.wbm.gz \
+		file-1.160-2.wbm.gz \
+		postgresql-1.160-1.wbm.gz \
+		usermin-1.160-2.wbm.gz
 
 WEBMIN_THEMES=
 
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 2ebf11f32929..a6a0841a9952 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,8 +1,14 @@
-MD5 (webmin-1.150.tar.gz) = 5566f3b761b5e9498b3da7c7587f9f75
-SIZE (webmin-1.150.tar.gz) = 7153367
-MD5 (fsdump-1.150-1.wbm.gz) = 4e9dcb86371f7b0132b5fd48623b733f
-SIZE (fsdump-1.150-1.wbm.gz) = 63975
-MD5 (quota-1.150-4.wbm.gz) = 61bca8478afef967a3ab69a700f77d61
-SIZE (quota-1.150-4.wbm.gz) = 106607
-MD5 (squid-1.150-2.wbm.gz) = 5e0fce2cbd5404903e8bd32c45174507
-SIZE (squid-1.150-2.wbm.gz) = 253921
+MD5 (webmin-1.160.tar.gz) = 9331501abdb0c0e582be97515aa252a8
+SIZE (webmin-1.160.tar.gz) = 7518886
+MD5 (bind8-1.160-4.wbm.gz) = 369cd83ff31faee1d57c07508239b3bd
+SIZE (bind8-1.160-4.wbm.gz) = 240778
+MD5 (cluster-webmin-1.160-1.wbm.gz) = cd11699c32f3d10136efbe368ad55107
+SIZE (cluster-webmin-1.160-1.wbm.gz) = 38725
+MD5 (cron-1.160-1.wbm.gz) = a75b8f2a40937df29d06031f0e5846a9
+SIZE (cron-1.160-1.wbm.gz) = 60110
+MD5 (file-1.160-2.wbm.gz) = 8dd15c858c80b06b8f8c79df5762a630
+SIZE (file-1.160-2.wbm.gz) = 260088
+MD5 (postgresql-1.160-1.wbm.gz) = b50854e3b83ad176981c5dc9b5fbb844
+SIZE (postgresql-1.160-1.wbm.gz) = 128311
+MD5 (usermin-1.160-2.wbm.gz) = 7eb14fbc767e3785ef3445927f2146ba
+SIZE (usermin-1.160-2.wbm.gz) = 110366
diff --git a/sysutils/webmin/files/patch-maketemp.pl b/sysutils/webmin/files/patch-maketemp.pl
deleted file mode 100644
index 286cb8942e5a..000000000000
--- a/sysutils/webmin/files/patch-maketemp.pl
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- maketemp.pl.orig	Wed Sep 15 00:00:08 2004
-+++ maketemp.pl	Wed Sep 15 00:00:19 2004
-@@ -3,17 +3,16 @@
- 
- $tmp_dir = $ENV{'tempdir'} || "/tmp/.webmin";
- 
--if (!-d $tmp_dir) {
--	mkdir($tmp_dir, 0755) || exit 1;
--	}
--chown($<, $(, $tmp_dir);
--chmod(0755, $tmp_dir);
--@st = lstat($tmp_dir);
--if (@st && $st[4] == $< && (-d _) &&
--    ($st[2] & 0777) == 0755) {
--	exit 0;
--	}
--else {
--	exit 1;
-+while($tries++ < 10) {
-+	local @st = lstat($tmp_dir);
-+	exit(0) if ($st[4] == $< && (-d _) && ($st[2] & 0777) == 0755);
-+	if (@st) {
-+		unlink($tmp_dir) || rmdir($tmp_dir) ||
-+			system("/bin/rm -rf ".quotemeta($tmp_dir));
-+		}
-+	mkdir($tmp_dir, 0755) || next;
-+	chown($<, $(, $tmp_dir);
-+	chmod(0755, $tmp_dir);
- 	}
-+exit(1);
- 
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index 5e23e3612634..a2be42f38dd6 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -2,4 +2,4 @@ etc/rc.d/webmin.sh
 @comment Insert PLIST.lib-webmin here
 @comment -=[ begin PLIST.lib-webmin ]=-
 @comment -=[ end PLIST.lib-webmin ]=-
-@dirrm lib/webmin
+@unexec rmdir %D/lib/webmin 2>/dev/null || true