os ~/.slackbuilds

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@645 370017ae-e619-0410-ac65-c121f96126d4

22 files changed, 66 insertions, 110 deletions

diff --git a/patches/apache/apache.SlackBuild b/patches/apache/apache.SlackBuild
index 81eea967..dc20751f 100755
--- a/patches/apache/apache.SlackBuild
+++ b/patches/apache/apache.SlackBuild
@@ -9,14 +9,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 APACHE_VER=${APACHE_VER:=1.3.37}
 MM_VER=${MM_VER:=1.3.1}
 MODSSL_VER=${MODSSL_VER:=2.8.28-1.3.37}
diff --git a/patches/bin/bin.SlackBuild b/patches/bin/bin.SlackBuild
index 8961d06d..9ff96d66 100755
--- a/patches/bin/bin.SlackBuild
+++ b/patches/bin/bin.SlackBuild
@@ -8,14 +8,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="bin"
 VERSION=10.2
 ARCH=${ARCH:=i486}
diff --git a/patches/curl/curl.SlackBuild b/patches/curl/curl.SlackBuild
index 2901104a..2c422f06 100755
--- a/patches/curl/curl.SlackBuild
+++ b/patches/curl/curl.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="curl"
 VERSION=7.12.2
 ARCH=${ARCH:=i486}
diff --git a/patches/fetchmail/fetchmail.SlackBuild b/patches/fetchmail/fetchmail.SlackBuild
index 55f415ce..37d31d67 100755
--- a/patches/fetchmail/fetchmail.SlackBuild
+++ b/patches/fetchmail/fetchmail.SlackBuild
@@ -8,14 +8,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="fetchmail"
 VERSION=${VERSION:=6.3.4}
 ARCH=${ARCH:=i486}
diff --git a/patches/gnupg/gnupg.SlackBuild b/patches/gnupg/gnupg.SlackBuild
index 76685a2b..eec308d6 100755
--- a/patches/gnupg/gnupg.SlackBuild
+++ b/patches/gnupg/gnupg.SlackBuild
@@ -6,14 +6,12 @@
 # Set initial variables:
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="gnupg"
 VERSION=${VERSION:=1.4.5}
 ARCH=${ARCH:=i486}
diff --git a/patches/gzip/gzip.SlackBuild b/patches/gzip/gzip.SlackBuild
index 95cad835..cea51136 100755
--- a/patches/gzip/gzip.SlackBuild
+++ b/patches/gzip/gzip.SlackBuild
@@ -27,14 +27,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="gzip"
 PKGNAM="$PACKAGE"
 VERSION=${VERSION:=1.3.5}
diff --git a/patches/imagemagick/imagemagick.SlackBuild b/patches/imagemagick/imagemagick.SlackBuild
index 45aa9e03..b83f664e 100755
--- a/patches/imagemagick/imagemagick.SlackBuild
+++ b/patches/imagemagick/imagemagick.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="imagemagick"
 TMP=${TMP:=/tmp}
 ARCH=${ARCH:=i486}
diff --git a/patches/libtiff/libtiff.SlackBuild b/patches/libtiff/libtiff.SlackBuild
index 31dfbd18..b930d27a 100755
--- a/patches/libtiff/libtiff.SlackBuild
+++ b/patches/libtiff/libtiff.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 # default settings
 PACKAGE="libtiff"
 ARCH=${ARCH:=i486}
diff --git a/patches/mod_ssl/mod_ssl.SlackBuild b/patches/mod_ssl/mod_ssl.SlackBuild
index 235c487b..dcc67799 100755
--- a/patches/mod_ssl/mod_ssl.SlackBuild
+++ b/patches/mod_ssl/mod_ssl.SlackBuild
@@ -9,14 +9,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="mod_ssl"
 MODSSL_VER=${MODSSL_VER:=2.8.28}
 APACHE_VER=${APACHE_VER:=1.3.37}
diff --git a/patches/mozilla-firefox/mozilla-firefox.SlackBuild b/patches/mozilla-firefox/mozilla-firefox.SlackBuild
index df39e52c..aa1fcd59 100755
--- a/patches/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/patches/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 # default settings
 PACKAGE="firefox"
 VERSION=${VERSION:=1.5.0.7}
diff --git a/patches/mutt/mutt.SlackBuild b/patches/mutt/mutt.SlackBuild
index a7e22c50..ac4123e0 100755
--- a/patches/mutt/mutt.SlackBuild
+++ b/patches/mutt/mutt.SlackBuild
@@ -13,14 +13,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="mutt"
 #VERSION=${VERSION:=1.5.6i}
 VERSION=${VERSION:=1.5.12}
diff --git a/patches/mysql/mysql.SlackBuild b/patches/mysql/mysql.SlackBuild
index c370ce04..bccba06b 100755
--- a/patches/mysql/mysql.SlackBuild
+++ b/patches/mysql/mysql.SlackBuild
@@ -9,14 +9,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="mysql"
 VERSION=${VERSION:=4.1.21}
 ARCH=${ARCH:=i486}
diff --git a/patches/openssh/openssh.SlackBuild b/patches/openssh/openssh.SlackBuild
index dab2a5d7..fd4c7075 100755
--- a/patches/openssh/openssh.SlackBuild
+++ b/patches/openssh/openssh.SlackBuild
@@ -26,14 +26,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="openssh"
 VERSION=${VERSION:=4.4p1}
 ARCH=${ARCH:=i486}
diff --git a/patches/openssl/openssl.SlackBuild b/patches/openssl/openssl.SlackBuild
index bc5d7420..50e00f97 100755
--- a/patches/openssl/openssl.SlackBuild
+++ b/patches/openssl/openssl.SlackBuild
@@ -26,14 +26,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="openssl"
 VERSION=${VERSION:=0.9.7l}
 ARCH=${ARCH:=i486}
diff --git a/patches/php/php-pgsql.SlackBuild b/patches/php/php-pgsql.SlackBuild
index 04dfeb23..fdbaef10 100755
--- a/patches/php/php-pgsql.SlackBuild
+++ b/patches/php/php-pgsql.SlackBuild
@@ -22,14 +22,12 @@ fi
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="php"
 PACKAGE_NAME="php-pgsql" # this is beacuse we're build with pgsql support
 VERSION=${VERSION:=4.4.4}
diff --git a/patches/php/php.SlackBuild b/patches/php/php.SlackBuild
index 816f25d2..ed96c4ab 100755
--- a/patches/php/php.SlackBuild
+++ b/patches/php/php.SlackBuild
@@ -21,14 +21,12 @@ fi
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="php"
 VERSION=${VERSION:=4.4.4}
 PINE=${PINE:=4.64}
diff --git a/patches/php/php4-snapshot.SlackBuild b/patches/php/php4-snapshot.SlackBuild
index cfd1f06f..1f4f8de6 100755
--- a/patches/php/php4-snapshot.SlackBuild
+++ b/patches/php/php4-snapshot.SlackBuild
@@ -22,14 +22,12 @@ fi
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="php"
 VERSION=${VERSION:=4.4.4}
 SNAP_VERSION=${SNAP_VERSION:=200611041530}
diff --git a/patches/pine/pine.SlackBuild b/patches/pine/pine.SlackBuild
index cf31c424..d924d003 100755
--- a/patches/pine/pine.SlackBuild
+++ b/patches/pine/pine.SlackBuild
@@ -18,14 +18,12 @@ fi
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="pine"
 VERSION=${VERSION:=4.64}
 PINEPGP=${PINEPGP:=0.18.0}
diff --git a/patches/python/python.SlackBuild b/patches/python/python.SlackBuild
index 9eb1f62c..94aa49bf 100755
--- a/patches/python/python.SlackBuild
+++ b/patches/python/python.SlackBuild
@@ -19,14 +19,12 @@ fi
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="python"
 VERSION=${VERSION:=2.4.4}
 ARCH=${ARCH:=i486}
diff --git a/patches/sdl/sdl.SlackBuild b/patches/sdl/sdl.SlackBuild
index bf5cb1c1..cc280385 100755
--- a/patches/sdl/sdl.SlackBuild
+++ b/patches/sdl/sdl.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="sdl"
 VERSION=${VERSION:=1.2.11}
 ARCH=${ARCH:=i486}
diff --git a/patches/smartmontools/smartmontools.SlackBuild b/patches/smartmontools/smartmontools.SlackBuild
index 54f5f771..af7c62dc 100755
--- a/patches/smartmontools/smartmontools.SlackBuild
+++ b/patches/smartmontools/smartmontools.SlackBuild
@@ -6,14 +6,12 @@
 
 CWD="`pwd`"
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="smartmontools"
 VERSION=${VERSION:=5.36}
 ARCH=${ARCH:=i486}
diff --git a/patches/sudo/sudo.SlackBuild b/patches/sudo/sudo.SlackBuild
index 33979fc1..e3f58913 100755
--- a/patches/sudo/sudo.SlackBuild
+++ b/patches/sudo/sudo.SlackBuild
@@ -7,14 +7,12 @@
 # Set initial variables:
 CWD=`pwd`
 
-if [ -f "/etc/slackbuildrc" ]; then
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
   source /etc/slackbuildrc
 fi
 
-if [ -f "/root/.slackbuildrc" ]; then
-  source /root/.slackbuildrc
-fi
-
 PACKAGE="sudo"
 VERSION=${VERSION:=1.6.8p12}
 ARCH=${ARCH:=i486}