Upgrade to version 1.070, with changepass-1.070-2 and mailbox-1.070-1.

5 files changed, 19 insertions, 50 deletions

diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 092b7bdaa985..36f860700e7a 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	usermin
-PORTVERSION=	1.051
+PORTVERSION=	1.070
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -24,7 +24,8 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 SCRIPTS_ENV+=	WRKDIR="${WRKDIR}"
 
-USERMIN_MODULES=
+USERMIN_MODULES=changepass-1.070-2.wbm.gz \
+		mailbox-1.070-1.wbm.gz
 
 USERMIN_THEMES=
 
@@ -35,13 +36,11 @@ post-extract:
 			${TAR} --unlink -xzf ${DISTDIR}/$${usermin_module} -C ${WRKSRC}; \
 		done; \
 	fi
-	@${FIND} ${WRKSRC} -name "*.bak" | ${XARGS} ${RM}
+	@${FIND} ${WRKSRC} -name "*.orig" -or -name "*.bak" | ${XARGS} ${RM}
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/usermin
 	@${CP} -r ${WRKSRC}/* ${PREFIX}/lib/usermin
-	@cd ${PREFIX}/lib/usermin && ${FIND} . -name "*.orig" -print \
-		| ${XARGS} ${RM}
 # we may have 2 levels of empty directories which cause the plist generation
 # system to fail
 	@cd ${PREFIX}/lib/usermin && ${FIND} . -type d -empty -print \
diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo
index b43b31a51054..bb63f6d8f76b 100644
--- a/sysutils/usermin/distinfo
+++ b/sysutils/usermin/distinfo
@@ -1,2 +1,6 @@
-MD5 (usermin-1.051.tar.gz) = 7c2671dafbf3eb04e96502ac8df43797
-SIZE (usermin-1.051.tar.gz) = 2026822
+MD5 (usermin-1.070.tar.gz) = 8e557a9c62e721351d71eff3a32ad470
+SIZE (usermin-1.070.tar.gz) = 2009552
+MD5 (changepass-1.070-2.wbm.gz) = e4cd803f49632bc53026c161cce6f50d
+SIZE (changepass-1.070-2.wbm.gz) = 9297
+MD5 (mailbox-1.070-1.wbm.gz) = 8a4d8d327b06faa0a90103dd517332a0
+SIZE (mailbox-1.070-1.wbm.gz) = 84836
diff --git a/sysutils/usermin/files/patch-commands_config b/sysutils/usermin/files/patch-commands_config
deleted file mode 100644
index 606f7a35eb85..000000000000
--- a/sysutils/usermin/files/patch-commands_config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-$FreeBSD$
-
---- commands/config.orig	Mon Nov  4 00:55:32 2002
-+++ commands/config	Sun Nov 10 15:41:55 2002
-@@ -1 +1 @@
--webmin_config=/etc/webmin/custom
-+webmin_config=/usr/local/etc/webmin/custom
diff --git a/sysutils/usermin/files/patch-htaccess_config b/sysutils/usermin/files/patch-htaccess_config
deleted file mode 100644
index 3943aec56076..000000000000
--- a/sysutils/usermin/files/patch-htaccess_config
+++ /dev/null
@@ -1,9 +0,0 @@
-
-$FreeBSD$
-
---- htaccess/config.orig	Sun Nov 10 15:20:17 2002
-+++ htaccess/config	Sun Nov 10 15:20:29 2002
-@@ -1,2 +1,2 @@
- htaccess=.htaccess
--webmin_apache=/etc/webmin/apache
-+webmin_apache=/usr/local/etc/webmin/apache
diff --git a/sysutils/usermin/files/patch-setup.sh b/sysutils/usermin/files/patch-setup.sh
index 6db997da5697..c0f683ed6a10 100644
--- a/sysutils/usermin/files/patch-setup.sh
+++ b/sysutils/usermin/files/patch-setup.sh
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.sh.orig	Sat Apr  5 14:13:12 2003
-+++ setup.sh	Sat Apr  5 22:59:09 2003
-@@ -54,12 +54,12 @@
+--- setup.sh.orig	Sat Jan 31 10:52:05 2004
++++ setup.sh	Sat Jan 31 10:55:35 2004
+@@ -84,12 +84,12 @@
  echo "Unless you want to run multiple versions of Usermin at the same time"
  echo "you can just accept the defaults."
  echo ""
@@ -18,15 +18,7 @@ $FreeBSD$
  fi
  abspath=`echo $config_dir | grep "^/"`
  if [ "$abspath" = "" ]; then
-@@ -147,19 +147,19 @@
- else
- 	# Config directory exists .. make sure it is not in use
- 	ls $config_dir | grep -v rpmsave >/dev/null 2>&1
--	if [ "$?" = "0" -a "$config_dir" != "/etc/usermin" ]; then
-+	if [ "$?" = "0" -a "$config_dir" != "!!PREFIX!!/etc/usermin" ]; then
- 		echo "ERROR: Config directory $config_dir is not empty"
- 		echo ""
- 		exit 2
+@@ -194,12 +194,12 @@
  	fi
  
  	# Ask for log directory
@@ -41,23 +33,14 @@ $FreeBSD$
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -187,8 +187,8 @@
+@@ -227,7 +227,9 @@
  	echo "Usermin is written entirely in Perl. Please enter the full path to the"
  	echo "Perl 5 interpreter on your system."
  	echo ""
 -	if [ -x /usr/bin/perl ]; then
--		perldef=/usr/bin/perl
-+	if [ -x !!PERL5!! ]; then
-+		perldef=!!PERL5!!
++	if [ -x !!PERL!! ]; then
++		perldef=!!PERL!!
++	elif [ -x /usr/bin/perl ]; then
+ 		perldef=/usr/bin/perl
  	elif [ -x /usr/local/bin/perl ]; then
  		perldef=/usr/local/bin/perl
- 	else
-@@ -427,7 +427,7 @@
- else
- 	uname -a | grep -i FreeBSD >/dev/null
- 	if [ "$?" = "0" ]; then
--		echo "LD_PRELOAD=/usr/lib/libpam.so.1" >>$config_dir/start
-+		echo "LD_PRELOAD=/usr/lib/libpam.so" >>$config_dir/start
- 		echo "export LD_PRELOAD" >>$config_dir/start
- 	fi
- 	echo "exec "$wadir/miniserv.pl" $config_dir/miniserv.conf" >>$config_dir/start