diff options
Diffstat (limited to 'sysutils/webmin/files/patch-aa')
| -rw-r--r-- | sysutils/webmin/files/patch-aa | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/sysutils/webmin/files/patch-aa b/sysutils/webmin/files/patch-aa index 0703b5ca8e91..e701419dce7e 100644 --- a/sysutils/webmin/files/patch-aa +++ b/sysutils/webmin/files/patch-aa @@ -3,19 +3,19 @@ $FreeBSD$ --- setup.sh.orig +++ setup.sh -@@ -16,9 +16,9 @@ +@@ -15,10 +15,7 @@ + srcdir=$wadir ver=`cat "$wadir/version"` - # Find temp directory +-# Find temp directory -if [ "$tempdir" = "" ]; then -+# if [ "$tempdir" = "" ]; then - tempdir=/tmp/.webmin +- tempdir=/tmp/.webmin -fi -+# fi ++tempdir=/tmp/.webmin if [ $? != "0" ]; then echo "ERROR: Cannot find the Webmin install directory"; -@@ -99,19 +99,7 @@ +@@ -95,19 +92,7 @@ echo "Unless you want to run multiple versions of Webmin at the same time" echo "you can just accept the defaults." echo "" @@ -36,7 +36,7 @@ $FreeBSD$ if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -210,12 +198,12 @@ +@@ -207,12 +192,12 @@ fi # Ask for log directory @@ -51,7 +51,7 @@ $FreeBSD$ fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -243,7 +231,9 @@ +@@ -240,7 +225,9 @@ echo "Webmin is written entirely in Perl. Please enter the full path to the" echo "Perl 5 interpreter on your system." echo "" @@ -62,7 +62,7 @@ $FreeBSD$ perldef=/usr/bin/perl elif [ -x /usr/local/bin/perl ]; then perldef=/usr/local/bin/perl -@@ -442,22 +432,6 @@ +@@ -439,21 +426,6 @@ fi fi @@ -80,12 +80,11 @@ $FreeBSD$ - echo "Webmin does not support being started at boot time on your system." - fi - fi -- makeboot=$atboot - # Copy files to target directory echo "***********************************************************************" if [ "$wadir" != "$srcdir" ]; then -@@ -577,6 +551,7 @@ +@@ -575,6 +547,7 @@ fi fi @@ -93,7 +92,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 - -@@ -587,7 +562,6 @@ +@@ -585,7 +558,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 @@ -101,7 +100,7 @@ $FreeBSD$ echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -714,6 +688,7 @@ +@@ -733,6 +705,7 @@ echo passdelay=1 >> $config_dir/miniserv.conf fi @@ -109,7 +108,7 @@ $FreeBSD$ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <<EOF -@@ -782,6 +757,7 @@ +@@ -822,6 +795,7 @@ . "$srcdir/setup-post.sh" fi |