Upgrade to version 1.480

Cleanup PREFIX handling.

6 files changed, 77 insertions, 97 deletions

diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 4c6b1e94ccf3..1d917df46ab2 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	usermin
-PORTVERSION=	1.470
+PORTVERSION=	1.480
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
@@ -38,11 +38,16 @@ post-extract:
 	fi
 
 post-patch:
-.for file in	mysql/config-freebsd postgresql/config-freebsd \
-		spam/config-freebsd
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
-.endfor
 	@${REINPLACE_CMD} -e "s=%%PREFIX%%=${PREFIX}=" ${WRKSRC}/setup.sh
+
+.for file in filter/config commands/config htaccess/config
+	@${PERL} -pi -e "s|=/etc/webmin|=${PREFIX}/etc/webmin|g" ${WRKSRC}/${file}
+.endfor
+
+	@${FIND} ${WRKSRC} -name config-freebsd\* \
+		-exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \
+		-exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \;
+
 	@${FIND} ${WRKSRC} -name "*.cgi" -print \
 		| ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@"
 	@${FIND} ${WRKSRC} -name "*.cgi" -print \
@@ -51,6 +56,7 @@ post-patch:
 		| ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@"
 	@${FIND} ${WRKSRC} -name "*.pl" -print \
 		| ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/bin/perl@#!${PERL}@"
+
 	@${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM}
 	@${FIND} ${WRKSRC} -name "*.bak" -print | ${XARGS} ${RM}
 
diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo
index 90ddd576ea5c..8b3b80419f1d 100644
--- a/sysutils/usermin/distinfo
+++ b/sysutils/usermin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usermin-1.470.tar.gz) = 50ea5da09520ca27fd7392b936311761f1f0b385f6c018fe4d4091b416dddfff
-SIZE (usermin-1.470.tar.gz) = 6143011
+SHA256 (usermin-1.480.tar.gz) = 2d69901250ddc820f6d2ca99e7e161afd43216a1e61dba62b452d6fbbf247633
+SIZE (usermin-1.480.tar.gz) = 6090557
diff --git a/sysutils/usermin/files/patch-mysql_config-freebsd b/sysutils/usermin/files/patch-mysql_config-freebsd
deleted file mode 100644
index b11b774c3517..000000000000
--- a/sysutils/usermin/files/patch-mysql_config-freebsd
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD$
-
---- mysql/config-freebsd.orig
-+++ mysql/config-freebsd
-@@ -1,12 +1,12 @@
--start_cmd=(/usr/local/bin/safe_mysqld || /usr/local/bin/mysqld_safe) &
-+start_cmd=(%%PREFIX%%/bin/safe_mysqld || %%PREFIX%%/bin/mysqld_safe) &
- perpage=25
--mysql=/usr/local/bin/mysql
--mysqldump=/usr/local/bin/mysqldump
--mysqlimport=/usr/local/bin/mysqlimport
--mysqlshow=/usr/local/bin/mysqlshow
-+mysql=%%PREFIX%%/bin/mysql
-+mysqldump=%%PREFIX%%/bin/mysqldump
-+mysqlimport=%%PREFIX%%/bin/mysqlimport
-+mysqlshow=%%PREFIX%%/bin/mysqlshow
- login=root
--mysql_libs=/usr/local/lib/mysql
--mysqladmin=/usr/local/bin/mysqladmin
-+mysql_libs=%%PREFIX%%/lib/mysql
-+mysqladmin=%%PREFIX%%/bin/mysqladmin
- style=0
- add_mode=1
- nodbi=0
diff --git a/sysutils/usermin/files/patch-postgresql_config-freebsd b/sysutils/usermin/files/patch-postgresql_config-freebsd
deleted file mode 100644
index 6d6a55cb744e..000000000000
--- a/sysutils/usermin/files/patch-postgresql_config-freebsd
+++ /dev/null
@@ -1,34 +0,0 @@
-
-$FreeBSD$
-
---- postgresql/config-freebsd.orig
-+++ postgresql/config-freebsd
-@@ -1,18 +1,18 @@
- basedb=template1
- pass=
--hba_conf=/usr/local/pgsql/data/pg_hba.conf
--alt_hba_conf=/usr/local/share/postgresql/pg_hba.conf.sample
--pid_file=/usr/local/pgsql/data/postmaster.pid
--stop_cmd=/usr/local/etc/rc.d/postgresql stop
--start_cmd=/usr/local/etc/rc.d/postgresql start
--setup_cmd=/usr/local/etc/rc.d/postgresql initdb
-+hba_conf=%%PREFIX%%/pgsql/data/pg_hba.conf
-+alt_hba_conf=%%PREFIX%%/share/postgresql/pg_hba.conf.sample
-+pid_file=%%PREFIX%%/pgsql/data/postmaster.pid
-+stop_cmd=%%PREFIX%%/etc/rc.d/postgresql stop
-+start_cmd=%%PREFIX%%/etc/rc.d/postgresql start
-+setup_cmd=%%PREFIX%%/etc/rc.d/postgresql initdb
- perpage=25
--psql=/usr/local/bin/psql
-+psql=%%PREFIX%%/bin/psql
- login=pgsql
--plib=/usr/local/lib
-+plib=%%PREFIX%%/lib
- nodbi=0
--dump_cmd=/usr/local/bin/pg_dump
--rstr_cmd=/usr/local/bin/pg_restore
-+dump_cmd=%%PREFIX%%/bin/pg_dump
-+rstr_cmd=%%PREFIX%%/bin/pg_restore
- sameunix=0
- access=*: *
- blob_mode=0
diff --git a/sysutils/usermin/files/patch-setup.sh b/sysutils/usermin/files/patch-setup.sh
index 4616de21cc68..056f64202ddc 100644
--- a/sysutils/usermin/files/patch-setup.sh
+++ b/sysutils/usermin/files/patch-setup.sh
@@ -1,24 +1,49 @@
 
 $FreeBSD$
 
---- setup.sh.orig	Fri Jun  4 01:18:07 2004
-+++ setup.sh	Sat Jun 19 21:59:35 2004
-@@ -84,12 +84,12 @@
+--- setup.sh.orig
++++ setup.sh
+@@ -15,16 +15,8 @@
+ srcdir=$wadir
+ ver=`cat "$wadir/version"`
+ 
+-# Find temp directory
+-if [ "$tempdir" = "" ]; then
+-	tempdir=$tempdir
+-fi
+-
+-if [ $? != "0" ]; then
+-	echo "ERROR: Cannot find the Usermin install directory";
+-	echo "";
+-	exit 1;
+-fi
++tempdir=/tmp/.usermin
++mkdir -p $tempdir
+ 
+ echo "***********************************************************************"
+ echo "*            Welcome to the Usermin setup script, version $ver       *"
+@@ -84,19 +76,7 @@
  echo "Unless you want to run multiple versions of Usermin at the same time"
  echo "you can just accept the defaults."
  echo ""
 -printf "Config file directory [/etc/usermin]: "
-+printf "Config file directory [%%PREFIX%%/etc/usermin]: "
- if [ "$config_dir" = "" ]; then
- 	read config_dir
- fi
- if [ "$config_dir" = "" ]; then
+-if [ "$config_dir" = "" ]; then
+-	read config_dir
+-fi
+-if [ "$config_dir" = "" ]; then
 -	config_dir=/etc/usermin
-+	config_dir=%%PREFIX%%/etc/usermin
- fi
- abspath=`echo $config_dir | grep "^/"`
- if [ "$abspath" = "" ]; then
-@@ -194,12 +194,12 @@
+-fi
+-abspath=`echo $config_dir | grep "^/"`
+-if [ "$abspath" = "" ]; then
+-	echo "Config directory must be an absolute path"
+-	echo ""
+-	exit 2
+-fi
++config_dir=/usr/local/etc/usermin
+ if [ ! -d $config_dir ]; then
+ 	mkdir $config_dir;
+ 	if [ $? != 0 ]; then
+@@ -194,12 +174,12 @@
  	fi
  
  	# Ask for log directory
@@ -33,7 +58,7 @@ $FreeBSD$
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
-@@ -227,7 +227,9 @@
+@@ -227,7 +207,9 @@
  	echo "Usermin is written entirely in Perl. Please enter the full path to the"
  	echo "Perl 5 interpreter on your system."
  	echo ""
@@ -44,7 +69,15 @@ $FreeBSD$
  		perldef=/usr/bin/perl
  	elif [ -x /usr/local/bin/perl ]; then
  		perldef=/usr/local/bin/perl
-@@ -465,7 +467,6 @@
+@@ -477,6 +459,7 @@
+ 
+ fi
+ 
++noperlpath="yes"
+ 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 -
+@@ -487,7 +470,6 @@
  echo "Creating start and stop scripts.."
  rm -f $config_dir/stop $config_dir/start
  echo "#!/bin/sh" >>$config_dir/start
@@ -52,3 +85,19 @@ $FreeBSD$
  echo "trap '' 1" >>$config_dir/start
  echo "LANG=" >>$config_dir/start
  echo "export LANG" >>$config_dir/start
+@@ -600,6 +582,7 @@
+ 	echo passdelay=1 >> $config_dir/miniserv.conf
+ fi
+ 
++nouninstall="yes"
+ if [ "$nouninstall" = "" ]; then
+ 	echo "Creating uninstall script $config_dir/uninstall.sh .."
+ 	cat >$config_dir/uninstall.sh <<EOF
+@@ -644,6 +627,7 @@
+ 	rm -f $config_dir/install-dir
+ fi
+ 
++nostart="yes"
+ if [ "$nostart" = "" ]; then
+ 	if [ "$inetd" != "1" ]; then
+ 		echo "Attempting to start Usermin mini web server.."
diff --git a/sysutils/usermin/files/patch-spam_config-freebsd b/sysutils/usermin/files/patch-spam_config-freebsd
deleted file mode 100644
index ebb36f05b086..000000000000
--- a/sysutils/usermin/files/patch-spam_config-freebsd
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- spam/config-freebsd.orig
-+++ spam/config-freebsd
-@@ -1,8 +1,8 @@
- local_cf=.spamassassin/user_prefs
- spamassassin=spamassassin
- sa_learn=sa-learn
--global_procmailrc=/usr/local/etc/procmailrc
--global_cf=/usr/local/etc/mail/spamassassin
-+global_procmailrc=%%PREFIX%%/etc/procmailrc
-+global_cf=%%PREFIX%%/etc/mail/spamassassin
- show_global=0
- avail_icons=white,score,report,user,header,setup,mail
- warn_procmail=1