Upgrade to version 1.380 (with bind8-1.380-2 and postfix-1.380-1).

3 files changed, 33 insertions, 18 deletions

diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 82615c863e70..8e995564e84f 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	1.370
-PORTREVISION=	2
+PORTVERSION=	1.380
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
@@ -28,7 +27,8 @@ USE_PERL5=	yes
 USE_RC_SUBR=    webmin.sh
 SUB_LIST=	PERL5=${PERL}
 
-WEBMIN_MODULES=	acl-1.370-1.wbm.gz
+WEBMIN_MODULES= bind8-1.380-2.wbm.gz \
+		postfix-1.380-1.wbm.gz
 
 post-extract:
 	@if [ "${WEBMIN_MODULES}" != "" ]; then \
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 265ca500e677..d3031885dc0c 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,6 +1,9 @@
-MD5 (webmin-1.370.tar.gz) = 4138359051ca5f1fa3967aaa1e346e69
-SHA256 (webmin-1.370.tar.gz) = db75b4dd0e65933e41bb95a73e70171d5c8bc19c280b2016fc0f0cabb0697be9
-SIZE (webmin-1.370.tar.gz) = 13132344
-MD5 (acl-1.370-1.wbm.gz) = 93dc93dab75d967a43326b3d65af97ce
-SHA256 (acl-1.370-1.wbm.gz) = 5639ced6584bf7b3797f72792464858facbdefe3104f35d47472f900c45b4c3f
-SIZE (acl-1.370-1.wbm.gz) = 295007
+MD5 (webmin-1.380.tar.gz) = df3fc997ce5244c40e329552bf834c04
+SHA256 (webmin-1.380.tar.gz) = 16531ef7654afd038cc88c6ee316f83496f2f9aa3c25f0faa16eaf8645fe7134
+SIZE (webmin-1.380.tar.gz) = 13296338
+MD5 (bind8-1.380-2.wbm.gz) = 5656cceba188f0100c3ce1f5976a6559
+SHA256 (bind8-1.380-2.wbm.gz) = 629892f66e399dc48871f2bf21d48dccc6b9864d1ab65fbcbf3799eff78d5cf5
+SIZE (bind8-1.380-2.wbm.gz) = 338084
+MD5 (postfix-1.380-1.wbm.gz) = 6d4a277021521648f9593e38375c66e0
+SHA256 (postfix-1.380-1.wbm.gz) = 165c2fc944a070bc44313a946e1ab8bb26c63db008cfd2b08c29fefead4668bb
+SIZE (postfix-1.380-1.wbm.gz) = 371282
diff --git a/sysutils/webmin/files/patch-aa b/sysutils/webmin/files/patch-aa
index eaf5c70836b2..0703b5ca8e91 100644
--- a/sysutils/webmin/files/patch-aa
+++ b/sysutils/webmin/files/patch-aa
@@ -3,7 +3,19 @@ $FreeBSD$
 
 --- setup.sh.orig
 +++ setup.sh
-@@ -95,19 +95,7 @@
+@@ -16,9 +16,9 @@
+ ver=`cat "$wadir/version"`
+ 
+ # Find temp directory
+-if [ "$tempdir" = "" ]; then
++# if [ "$tempdir" = "" ]; then
+ 	tempdir=/tmp/.webmin
+-fi
++# fi
+ 
+ if [ $? != "0" ]; then
+ 	echo "ERROR: Cannot find the Webmin install directory";
+@@ -99,19 +99,7 @@
  echo "Unless you want to run multiple versions of Webmin at the same time"
  echo "you can just accept the defaults."
  echo ""
@@ -20,11 +32,11 @@ $FreeBSD$
 -	echo ""
 -	exit 2
 -fi
-+config_dir=%%PREFIX%%/etc/webmin
++config_dir=/usr/local/etc/webmin
  if [ ! -d $config_dir ]; then
  	mkdir $config_dir;
  	if [ $? != 0 ]; then
-@@ -206,12 +194,12 @@
+@@ -210,12 +198,12 @@
  	fi
  
  	# Ask for log directory
@@ -39,7 +51,7 @@ $FreeBSD$
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -239,7 +227,9 @@
+@@ -243,7 +231,9 @@
  	echo "Webmin is written entirely in Perl. Please enter the full path to the"
  	echo "Perl 5 interpreter on your system."
  	echo ""
@@ -50,7 +62,7 @@ $FreeBSD$
  		perldef=/usr/bin/perl
  	elif [ -x /usr/local/bin/perl ]; then
  		perldef=/usr/local/bin/perl
-@@ -438,22 +428,6 @@
+@@ -442,22 +432,6 @@
  		fi
  	fi
  
@@ -73,7 +85,7 @@ $FreeBSD$
  	# Copy files to target directory
  	echo "***********************************************************************"
  	if [ "$wadir" != "$srcdir" ]; then
-@@ -564,6 +538,7 @@
+@@ -577,6 +551,7 @@
  	fi
  fi
  
@@ -81,7 +93,7 @@ $FreeBSD$
  if [ "$noperlpath" = "" ]; then
  	echo "Inserting path to perl into scripts.."
  	(find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl -
-@@ -574,7 +549,6 @@
+@@ -587,7 +562,6 @@
  echo "Creating start and stop scripts.."
  rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload
  echo "#!/bin/sh" >>$config_dir/start
@@ -89,7 +101,7 @@ $FreeBSD$
  echo "trap '' 1" >>$config_dir/start
  echo "LANG=" >>$config_dir/start
  echo "export LANG" >>$config_dir/start
-@@ -696,6 +670,7 @@
+@@ -714,6 +688,7 @@
  	echo passdelay=1 >> $config_dir/miniserv.conf
  fi
  
@@ -97,7 +109,7 @@ $FreeBSD$
  if [ "$nouninstall" = "" ]; then
  	echo "Creating uninstall script $config_dir/uninstall.sh .."
  	cat >$config_dir/uninstall.sh <<EOF
-@@ -765,6 +740,7 @@
+@@ -782,6 +757,7 @@
  	. "$srcdir/setup-post.sh"
  fi