diff options
211 files changed, 633 insertions, 1055 deletions
diff --git a/amavisd-new/amavisd-new.SlackBuild b/amavisd-new/amavisd-new.SlackBuild index 206d5488..95c78341 100755 --- a/amavisd-new/amavisd-new.SlackBuild +++ b/amavisd-new/amavisd-new.SlackBuild @@ -30,14 +30,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 - # default settings PACKAGE="amavisd-new" ARCH="noarch" diff --git a/amule/aMule.SlackBuild b/amule/aMule.SlackBuild index a20839a9..61b9b642 100755 --- a/amule/aMule.SlackBuild +++ b/amule/aMule.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="aMule" ARCH=${ARCH:=i486} diff --git a/anacron/anacron.SlackBuild b/anacron/anacron.SlackBuild index 1fc8213b..d4043f5a 100644 --- a/anacron/anacron.SlackBuild +++ b/anacron/anacron.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 - # default settings PACKAGE="anacron" ARCH=${ARCH:=i486} diff --git a/antiword/antiword.SlackBuild b/antiword/antiword.SlackBuild index bdd3543f..ce6e35d2 100755 --- a/antiword/antiword.SlackBuild +++ b/antiword/antiword.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 - # default settings PACKAGE="antiword" ARCH=${ARCH:=i486} diff --git a/arc/arc.SlackBuild b/arc/arc.SlackBuild index 15764892..ff0f3ab8 100755 --- a/arc/arc.SlackBuild +++ b/arc/arc.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="arc" VERSION=${VERSION:=5.21o} diff --git a/ardour/ardour.SlackBuild b/ardour/ardour.SlackBuild index 42d912b0..4e4567cd 100755 --- a/ardour/ardour.SlackBuild +++ b/ardour/ardour.SlackBuild @@ -17,14 +17,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 - # default settings PACKAGE="ardour" VERSION=${VERSION:=0.99.3} diff --git a/audacity/audacity.SlackBuild b/audacity/audacity.SlackBuild index b0696c83..b03b6569 100755 --- a/audacity/audacity.SlackBuild +++ b/audacity/audacity.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 - # default settings PACKAGE="audacity" ARCH=${ARCH:=i486} diff --git a/avahi/avahi.SlackBuild b/avahi/avahi.SlackBuild index 56b6ee35..a448ddc7 100755 --- a/avahi/avahi.SlackBuild +++ b/avahi/avahi.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 - # default settings PACKAGE="avahi" ARCH=${ARCH:=i486} diff --git a/azureus/azureus.SlackBuild b/azureus/azureus.SlackBuild index 682a26e7..67ff7bcd 100755 --- a/azureus/azureus.SlackBuild +++ b/azureus/azureus.SlackBuild @@ -5,14 +5,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 PRGNAM="azureus" PACKAGE="$PRGNAM" diff --git a/backupninja/backupninja.SlackBuild b/backupninja/backupninja.SlackBuild index d6e1eb03..c890cc78 100755 --- a/backupninja/backupninja.SlackBuild +++ b/backupninja/backupninja.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="backupninja" ARCH="noarch" diff --git a/bitlbee/bitlbee.SlackBuild b/bitlbee/bitlbee.SlackBuild index eafeda60..6441d51d 100755 --- a/bitlbee/bitlbee.SlackBuild +++ b/bitlbee/bitlbee.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 - # default settings PACKAGE="bitlbee" ARCH=${ARCH:=i486} diff --git a/blop/blop.SlackBuild b/blop/blop.SlackBuild index 1c918ede..4e9fa6e3 100755 --- a/blop/blop.SlackBuild +++ b/blop/blop.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 - # default settings PACKAGE="blop" ARCH=${ARCH:=i486} diff --git a/bogofilter/bogofilter.SlackBuild b/bogofilter/bogofilter.SlackBuild index 8ba2905c..c9d71194 100755 --- a/bogofilter/bogofilter.SlackBuild +++ b/bogofilter/bogofilter.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 - # default settings PACKAGE="bogofilter" ARCH=${ARCH:=i486} diff --git a/bogosort/bogosort.SlackBuild b/bogosort/bogosort.SlackBuild index d6d3e461..0a83934c 100755 --- a/bogosort/bogosort.SlackBuild +++ b/bogosort/bogosort.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="bogosort" VERSION=${VERSION:=0.4.2} diff --git a/bootsplash/bootsplash.SlackBuild b/bootsplash/bootsplash.SlackBuild index bfcd5554..ad28f76e 100755 --- a/bootsplash/bootsplash.SlackBuild +++ b/bootsplash/bootsplash.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 - # default settings PACKAGE="bootsplash" ARCH=${ARCH:=i486} diff --git a/cairo/cairo.SlackBuild b/cairo/cairo.SlackBuild index 5fdc61e4..314ec9c0 100755 --- a/cairo/cairo.SlackBuild +++ b/cairo/cairo.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 - # default settings PACKAGE="cairo" ARCH=${ARCH:=i486} diff --git a/camp/camp.SlackBuild b/camp/camp.SlackBuild index 74a40301..948779a6 100755 --- a/camp/camp.SlackBuild +++ b/camp/camp.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 - # default settings PACKAGE="camp" ARCH=${ARCH:=i486} diff --git a/cinelerra/cinelerra.SlackBuild b/cinelerra/cinelerra.SlackBuild index cbec38a9..63707ca3 100755 --- a/cinelerra/cinelerra.SlackBuild +++ b/cinelerra/cinelerra.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 - # default settings PACKAGE="cinelerra" ARCH=${ARCH:=i586} diff --git a/clamav/clamav.SlackBuild b/clamav/clamav.SlackBuild index 5b0d3a91..77534aa1 100755 --- a/clamav/clamav.SlackBuild +++ b/clamav/clamav.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 - # default settings PACKAGE="clamav" VERSION=${VERSION:=0.88.6} diff --git a/cmt/cmt.SlackBuild b/cmt/cmt.SlackBuild index 95e2bad7..fddc1a69 100755 --- a/cmt/cmt.SlackBuild +++ b/cmt/cmt.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 - # default settings PACKAGE="cmt" ARCH=${ARCH:=i486} diff --git a/conky/conky.SlackBuild b/conky/conky.SlackBuild index 246eb3f0..1103ee99 100755 --- a/conky/conky.SlackBuild +++ b/conky/conky.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 - # default settings PACKAGE="conky" ARCH=${ARCH:=i486} diff --git a/courier-authlib/courier-authlib.SlackBuild b/courier-authlib/courier-authlib.SlackBuild index e61f518b..0033dfc6 100755 --- a/courier-authlib/courier-authlib.SlackBuild +++ b/courier-authlib/courier-authlib.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="courier-authlib" VERSION=${VERION:=0.58} diff --git a/courier-imap/courier-imap.SlackBuild b/courier-imap/courier-imap.SlackBuild index 5b9b7bdb..1e1679a8 100755 --- a/courier-imap/courier-imap.SlackBuild +++ b/courier-imap/courier-imap.SlackBuild @@ -20,14 +20,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 - # default settings PACKAGE="courier-imap" VERSION=${VERSION:=4.1.1} diff --git a/cryptsetup/cryptsetup-luks.SlackBuild b/cryptsetup/cryptsetup-luks.SlackBuild index 98919933..65da2e3b 100755 --- a/cryptsetup/cryptsetup-luks.SlackBuild +++ b/cryptsetup/cryptsetup-luks.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 - # default settings PACKAGE="cryptsetup-luks" ARCH=${ARCH:=i486} diff --git a/cryptsetup/cryptsetup.SlackBuild b/cryptsetup/cryptsetup.SlackBuild index 7976d890..70fec877 100755 --- a/cryptsetup/cryptsetup.SlackBuild +++ b/cryptsetup/cryptsetup.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 - # default settings PACKAGE="cryptsetup" ARCH=${ARCH:=i486} diff --git a/cyrus-sasl/cyrus-sasl.SlackBuild b/cyrus-sasl/cyrus-sasl.SlackBuild index 8ef5977b..9953f61f 100755 --- a/cyrus-sasl/cyrus-sasl.SlackBuild +++ b/cyrus-sasl/cyrus-sasl.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="cyrus-sasl" VERSION=${VERSION:=2.1.21} ARCH=${ARCH:=i486} diff --git a/darkice/darkice.SlackBuild b/darkice/darkice.SlackBuild index 5f09d82d..43d9dd19 100755 --- a/darkice/darkice.SlackBuild +++ b/darkice/darkice.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 - # default settings PACKAGE="darkice" ARCH=${ARCH:=i486} diff --git a/darksnow/darksnow.SlackBuild b/darksnow/darksnow.SlackBuild index 4e1ef7f1..bb46f8e2 100755 --- a/darksnow/darksnow.SlackBuild +++ b/darksnow/darksnow.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 - # default settings PACKAGE="darksnow" ARCH=${ARCH:=i486} diff --git a/denyhosts/denyhosts.SlackBuild b/denyhosts/denyhosts.SlackBuild index eddc96b0..42184a02 100755 --- a/denyhosts/denyhosts.SlackBuild +++ b/denyhosts/denyhosts.SlackBuild @@ -5,14 +5,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="denyhosts" VERSION=${VERSION:=2.5} diff --git a/dopewars/dopewars.SlackBuild b/dopewars/dopewars.SlackBuild index d46d65c2..4d8378f7 100755 --- a/dopewars/dopewars.SlackBuild +++ b/dopewars/dopewars.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="dopewars" ARCH=${ARCH:=i486} diff --git a/downtube/downtube.SlackBuild b/downtube/downtube.SlackBuild index 971706cf..bd9eb96f 100755 --- a/downtube/downtube.SlackBuild +++ b/downtube/downtube.SlackBuild @@ -5,14 +5,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="downtube" VERSION=${VERSION:=1.2} diff --git a/dssi/dssi.SlackBuild b/dssi/dssi.SlackBuild index e67599b5..4aa057dc 100755 --- a/dssi/dssi.SlackBuild +++ b/dssi/dssi.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 - # default settings PACKAGE="dssi" ARCH=${ARCH:=i486} diff --git a/duplicity/duplicity.SlackBuild b/duplicity/duplicity.SlackBuild index aca5bc3d..dcd17147 100755 --- a/duplicity/duplicity.SlackBuild +++ b/duplicity/duplicity.SlackBuild @@ -5,14 +5,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="duplicity" VERSION=${VERSION:=0.4.2} diff --git a/dvgrab/dvgrab.SlackBuild b/dvgrab/dvgrab.SlackBuild index 059f3630..e0ccd055 100755 --- a/dvgrab/dvgrab.SlackBuild +++ b/dvgrab/dvgrab.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 - # default settings PACKAGE="dvgrab" ARCH=${ARCH:=i486} diff --git a/e17/Eterm/Eterm.SlackBuild b/e17/Eterm/Eterm.SlackBuild index 03076d6b..6d2cfd1d 100755 --- a/e17/Eterm/Eterm.SlackBuild +++ b/e17/Eterm/Eterm.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 - # default settings PACKAGE="Eterm" ARCH=${ARCH:=i486} diff --git a/e17/e_modules/e_modules.SlackBuild b/e17/e_modules/e_modules.SlackBuild index c11a7ee6..d1a86c06 100755 --- a/e17/e_modules/e_modules.SlackBuild +++ b/e17/e_modules/e_modules.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 - # default settings PACKAGE="e_modules" ARCH=${ARCH:=i486} diff --git a/e17/e_utils/e_utils.SlackBuild b/e17/e_utils/e_utils.SlackBuild index a83e6715..7b2238eb 100755 --- a/e17/e_utils/e_utils.SlackBuild +++ b/e17/e_utils/e_utils.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 - # default settings PACKAGE="e_utils" ARCH=${ARCH:=i486} diff --git a/e17/eclair/eclair.SlackBuild b/e17/eclair/eclair.SlackBuild index 9cebf801..42871eac 100755 --- a/e17/eclair/eclair.SlackBuild +++ b/e17/eclair/eclair.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 - # default settings PACKAGE="eclair" ARCH=${ARCH:=i486} diff --git a/e17/engage/engage.SlackBuild b/e17/engage/engage.SlackBuild index 66b4a992..6f6ac698 100755 --- a/e17/engage/engage.SlackBuild +++ b/e17/engage/engage.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 - # default settings PACKAGE="engage" ARCH=${ARCH:=i486} diff --git a/e17/enlightenment/enlightenment.SlackBuild b/e17/enlightenment/enlightenment.SlackBuild index 93f55d2e..cd0e3bd2 100755 --- a/e17/enlightenment/enlightenment.SlackBuild +++ b/e17/enlightenment/enlightenment.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 - # default settings PACKAGE="enlightenment" ARCH=${ARCH:=i486} diff --git a/e17/entrance/entrance.SlackBuild b/e17/entrance/entrance.SlackBuild index 62485ae3..2fa48103 100755 --- a/e17/entrance/entrance.SlackBuild +++ b/e17/entrance/entrance.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 - # default settings PACKAGE="entrance" ARCH=${ARCH:=i486} diff --git a/e17/etk/etk.SlackBuild b/e17/etk/etk.SlackBuild index 3c96fa86..3b301b47 100755 --- a/e17/etk/etk.SlackBuild +++ b/e17/etk/etk.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 - # default settings PACKAGE="etk" ARCH=${ARCH:=i486} diff --git a/e17/examine/examine.SlackBuild b/e17/examine/examine.SlackBuild index 5768c8d4..dffbdf9e 100755 --- a/e17/examine/examine.SlackBuild +++ b/e17/examine/examine.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 - # default settings PACKAGE="examine" ARCH=${ARCH:=i486} diff --git a/e17/libast/libast.SlackBuild b/e17/libast/libast.SlackBuild index 7ad67062..cd0d61a2 100755 --- a/e17/libast/libast.SlackBuild +++ b/e17/libast/libast.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 - # default settings PACKAGE="libast" ARCH=${ARCH:=i486} diff --git a/efl/ecore/ecore.SlackBuild b/efl/ecore/ecore.SlackBuild index 530f0e9d..bc245fdd 100755 --- a/efl/ecore/ecore.SlackBuild +++ b/efl/ecore/ecore.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 - # default settings PACKAGE="ecore" ARCH=${ARCH:=i486} diff --git a/efl/edb/edb.SlackBuild b/efl/edb/edb.SlackBuild index f464c7c7..37868877 100755 --- a/efl/edb/edb.SlackBuild +++ b/efl/edb/edb.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 - # default settings PACKAGE="edb" ARCH=${ARCH:=i486} diff --git a/efl/edje/edje.SlackBuild b/efl/edje/edje.SlackBuild index e93f49b8..4dacaa1a 100755 --- a/efl/edje/edje.SlackBuild +++ b/efl/edje/edje.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 - # default settings PACKAGE="edje" ARCH=${ARCH:=i486} diff --git a/efl/eet/eet.SlackBuild b/efl/eet/eet.SlackBuild index b684941c..5703ee99 100755 --- a/efl/eet/eet.SlackBuild +++ b/efl/eet/eet.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 - # default settings PACKAGE="eet" ARCH=${ARCH:=i486} diff --git a/efl/embryo/embryo.SlackBuild b/efl/embryo/embryo.SlackBuild index d2ffb350..0a55e605 100755 --- a/efl/embryo/embryo.SlackBuild +++ b/efl/embryo/embryo.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 - # default settings PACKAGE="embryo" ARCH=${ARCH:=i486} diff --git a/efl/emotion/emotion.SlackBuild b/efl/emotion/emotion.SlackBuild index d3f3905e..640354c6 100755 --- a/efl/emotion/emotion.SlackBuild +++ b/efl/emotion/emotion.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 - # default settings PACKAGE="emotion" ARCH=${ARCH:=i486} diff --git a/efl/engrave/engrave.SlackBuild b/efl/engrave/engrave.SlackBuild index f62ca984..7142a83b 100755 --- a/efl/engrave/engrave.SlackBuild +++ b/efl/engrave/engrave.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 - # default settings PACKAGE="engrave" ARCH=${ARCH:=i486} diff --git a/efl/epeg/epeg.SlackBuild b/efl/epeg/epeg.SlackBuild index d01b5a38..c819efb5 100755 --- a/efl/epeg/epeg.SlackBuild +++ b/efl/epeg/epeg.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 - # default settings PACKAGE="epeg" ARCH=${ARCH:=i486} diff --git a/efl/epsilon/epsilon.SlackBuild b/efl/epsilon/epsilon.SlackBuild index d61ef317..c32deaef 100755 --- a/efl/epsilon/epsilon.SlackBuild +++ b/efl/epsilon/epsilon.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 - # default settings PACKAGE="epsilon" ARCH=${ARCH:=i486} diff --git a/efl/esmart/esmart.SlackBuild b/efl/esmart/esmart.SlackBuild index c0a4ed3d..5d191491 100755 --- a/efl/esmart/esmart.SlackBuild +++ b/efl/esmart/esmart.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 - # default settings PACKAGE="esmart" ARCH=${ARCH:=i486} diff --git a/efl/evas/evas.SlackBuild b/efl/evas/evas.SlackBuild index de3ce46a..692841b9 100755 --- a/efl/evas/evas.SlackBuild +++ b/efl/evas/evas.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 - # default settings PACKAGE="evas" ARCH=${ARCH:=i486} diff --git a/efl/ewl/ewl.SlackBuild b/efl/ewl/ewl.SlackBuild index a99ecac4..6a6f5da1 100755 --- a/efl/ewl/ewl.SlackBuild +++ b/efl/ewl/ewl.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 - # default settings PACKAGE="ewl" ARCH=${ARCH:=i486} diff --git a/efl/exml/exml.SlackBuild b/efl/exml/exml.SlackBuild index 23a38b4d..b173620f 100755 --- a/efl/exml/exml.SlackBuild +++ b/efl/exml/exml.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 - # default settings PACKAGE="exml" ARCH=${ARCH:=i486} diff --git a/efl/imlib2/imlib2.SlackBuild b/efl/imlib2/imlib2.SlackBuild index 7fbc26d6..6504a7c8 100755 --- a/efl/imlib2/imlib2.SlackBuild +++ b/efl/imlib2/imlib2.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 - # default settings PACKAGE="imlib2" ARCH=${ARCH:=i486} diff --git a/ekiga/ekiga.SlackBuild b/ekiga/ekiga.SlackBuild index 4b8f35b2..00cf05ca 100755 --- a/ekiga/ekiga.SlackBuild +++ b/ekiga/ekiga.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 - # default settings PACKAGE="ekiga" ARCH=${ARCH:=i486} diff --git a/envy24control/envy24control.SlackBuild b/envy24control/envy24control.SlackBuild index 02c241a2..1c668ce4 100755 --- a/envy24control/envy24control.SlackBuild +++ b/envy24control/envy24control.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 - # default settings PACKAGE="envy24control" ARCH=${ARCH:=i486} diff --git a/faac/faac.SlackBuild b/faac/faac.SlackBuild index 4b72b57a..c6edc97e 100755 --- a/faac/faac.SlackBuild +++ b/faac/faac.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 - # default settings PACKAGE="faac" ARCH=${ARCH:=i486} diff --git a/faad2/faad2.SlackBuild b/faad2/faad2.SlackBuild index 7fdb8369..3ede8370 100755 --- a/faad2/faad2.SlackBuild +++ b/faad2/faad2.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 - # default settings PACKAGE="faad2" ARCH=${ARCH:=i486} diff --git a/feast/feast.SlackBuild b/feast/feast.SlackBuild index d8a963dd..2e797f86 100755 --- a/feast/feast.SlackBuild +++ b/feast/feast.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 - # default settings PACKAGE="feast" ARCH=${ARCH:=i486} diff --git a/ffmpeg/ffmpeg.SlackBuild b/ffmpeg/ffmpeg.SlackBuild index c9be3da0..dfd560d6 100755 --- a/ffmpeg/ffmpeg.SlackBuild +++ b/ffmpeg/ffmpeg.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 - # default settings PACKAGE="ffmpeg" ARCH=${ARCH:=i486} diff --git a/ffmpeg2theora/ffmpeg2theora.SlackBuild b/ffmpeg2theora/ffmpeg2theora.SlackBuild index 67edaac5..ce205990 100755 --- a/ffmpeg2theora/ffmpeg2theora.SlackBuild +++ b/ffmpeg2theora/ffmpeg2theora.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 - # default settings PACKAGE="ffmpeg2theora" ARCH=${ARCH:=i486} diff --git a/fftw/fftw.SlackBuild b/fftw/fftw.SlackBuild index 01f92f1c..3b8953b3 100755 --- a/fftw/fftw.SlackBuild +++ b/fftw/fftw.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 - # default settings PACKAGE="fftw" ARCH=${ARCH:=i486} diff --git a/fluidsynth/fluidsynth.SlackBuild b/fluidsynth/fluidsynth.SlackBuild index 408ba83f..c3bc0a66 100755 --- a/fluidsynth/fluidsynth.SlackBuild +++ b/fluidsynth/fluidsynth.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 - # default settings PACKAGE="fluidsynth" ARCH=${ARCH:=i486} diff --git a/freetype/freetype.SlackBuild b/freetype/freetype.SlackBuild index f3cd9b74..0e704084 100755 --- a/freetype/freetype.SlackBuild +++ b/freetype/freetype.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 - PRGNAM=freetype VERSION=${VERSION:-2.2.1} ARCH=${ARCH:-i486} diff --git a/gd/gd.SlackBuild b/gd/gd.SlackBuild index 7b6c6568..f5bb66c7 100755 --- a/gd/gd.SlackBuild +++ b/gd/gd.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="gd" ARCH=${ARCH:=i486} diff --git a/gephex/gephex.SlackBuild b/gephex/gephex.SlackBuild index 83655d10..fb549be6 100755 --- a/gephex/gephex.SlackBuild +++ b/gephex/gephex.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 - # default settings PACKAGE="gephex" ARCH=${ARCH:=i486} diff --git a/glew/glew.SlackBuild b/glew/glew.SlackBuild index 07ae76bd..97aed04b 100755 --- a/glew/glew.SlackBuild +++ b/glew/glew.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 - # default settings PACKAGE="glew" ARCH=${ARCH:=i486} diff --git a/glitz/glitz.SlackBuild b/glitz/glitz.SlackBuild index 201739a9..6f8b3805 100755 --- a/glitz/glitz.SlackBuild +++ b/glitz/glitz.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 - # default settings PACKAGE="glitz" ARCH=${ARCH:=i486} diff --git a/gnash/gnash.SlackBuild b/gnash/gnash.SlackBuild index e80eafdd..8c2a1b36 100755 --- a/gnash/gnash.SlackBuild +++ b/gnash/gnash.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="gnash" ARCH=${ARCH:=i486} diff --git a/gnutls/gnutls.SlackBuild b/gnutls/gnutls.SlackBuild index d9c6cf67..6d72805b 100755 --- a/gnutls/gnutls.SlackBuild +++ b/gnutls/gnutls.SlackBuild @@ -23,14 +23,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 - # default settings PACKAGE="gnutls" ARCH=${ARCH:=i486} diff --git a/gphoto2/gphoto2.SlackBuild b/gphoto2/gphoto2.SlackBuild index 9446fd3a..fb87e4fd 100755 --- a/gphoto2/gphoto2.SlackBuild +++ b/gphoto2/gphoto2.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 - # default settings PACKAGE="gphoto2" ARCH=${ARCH:=i486} diff --git a/gqview/gqview.SlackBuild b/gqview/gqview.SlackBuild index 9a208863..916a43d5 100755 --- a/gqview/gqview.SlackBuild +++ b/gqview/gqview.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 - # default settings PACKAGE="gqview" ARCH=${ARCH:=i486} diff --git a/grip/grip.SlackBuild b/grip/grip.SlackBuild index 45e9dba1..92fa2ff2 100755 --- a/grip/grip.SlackBuild +++ b/grip/grip.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 - # default settings PACKAGE="grip" ARCH=${ARCH:=i486} diff --git a/grub/grub.SlackBuild b/grub/grub.SlackBuild index 84238366..d81fbfe0 100755 --- a/grub/grub.SlackBuild +++ b/grub/grub.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 - # default settings PACKAGE="grub" ARCH=${ARCH:=i486} diff --git a/gtkam/gtkam.SlackBuild b/gtkam/gtkam.SlackBuild index a3343e90..8503f947 100755 --- a/gtkam/gtkam.SlackBuild +++ b/gtkam/gtkam.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 - # default settings PACKAGE="gtkam" ARCH=${ARCH:=i486} diff --git a/hashalot/hashalot.SlackBuild b/hashalot/hashalot.SlackBuild index e9e7b64d..eb0c4cda 100755 --- a/hashalot/hashalot.SlackBuild +++ b/hashalot/hashalot.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="hashalot" ARCH=${ARCH:=i486} diff --git a/hydrogen/hydrogen.SlackBuild b/hydrogen/hydrogen.SlackBuild index 63284452..5ddbe3dc 100755 --- a/hydrogen/hydrogen.SlackBuild +++ b/hydrogen/hydrogen.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 - # default settings PACKAGE="hydrogen" ARCH=${ARCH:=i486} diff --git a/icecast/icecast.SlackBuild b/icecast/icecast.SlackBuild index 7ab9e4fa..2bee5cf1 100755 --- a/icecast/icecast.SlackBuild +++ b/icecast/icecast.SlackBuild @@ -59,14 +59,12 @@ fi # 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 - PRGNAM=icecast PACKAGE="$PRGNAM" VERSION=${VERSION:=2.3.1} diff --git a/icecast/ices.SlackBuild b/icecast/ices.SlackBuild index 18a6d1d8..a6d6bf7d 100755 --- a/icecast/ices.SlackBuild +++ b/icecast/ices.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="ices" ARCH=${ARCH:=i486} diff --git a/inkscape/inkscape.SlackBuild b/inkscape/inkscape.SlackBuild index 5fab16ce..882d3ac0 100755 --- a/inkscape/inkscape.SlackBuild +++ b/inkscape/inkscape.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="inkscape" ARCH=${ARCH:=i486} diff --git a/jack-rack/jack-rack.SlackBuild b/jack-rack/jack-rack.SlackBuild index 1adf701b..fee2baf9 100755 --- a/jack-rack/jack-rack.SlackBuild +++ b/jack-rack/jack-rack.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 - # default settings PACKAGE="jack-rack" ARCH=${ARCH:=i486} diff --git a/jack/jack.SlackBuild b/jack/jack.SlackBuild index 865f6c07..d8de2b11 100755 --- a/jack/jack.SlackBuild +++ b/jack/jack.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 - # default settings PACKAGE="jack" ARCH=${ARCH:=i486} diff --git a/kernel-aletta/kernel-aletta.SlackBuild b/kernel-aletta/kernel-aletta.SlackBuild index 08edd840..5872f904 100755 --- a/kernel-aletta/kernel-aletta.SlackBuild +++ b/kernel-aletta/kernel-aletta.SlackBuild @@ -5,14 +5,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="kernel-aletta" KERNEL_VERSION="2.6.18" EXTRAVERSION="2" diff --git a/kernel-ratten/kernel-ratten.SlackBuild b/kernel-ratten/kernel-ratten.SlackBuild index 2a651b04..75a57616 100755 --- a/kernel-ratten/kernel-ratten.SlackBuild +++ b/kernel-ratten/kernel-ratten.SlackBuild @@ -16,14 +16,12 @@ if [ -s "slack-required" ]; then fi fi -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 - CWD="`pwd`" PACKAGE="kernel-ratten" diff --git a/kernel-satan/kernel-satan.SlackBuild b/kernel-satan/kernel-satan.SlackBuild index 2a8193de..ed69211a 100755 --- a/kernel-satan/kernel-satan.SlackBuild +++ b/kernel-satan/kernel-satan.SlackBuild @@ -5,14 +5,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="kernel-satan" KERNEL_VERSION="2.6.16" EXTRAVERSION="25" diff --git a/kino/kino.SlackBuild b/kino/kino.SlackBuild index 4eb7e9f1..2ec8a173 100755 --- a/kino/kino.SlackBuild +++ b/kino/kino.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 - # default settings PACKAGE="kino" ARCH=${ARCH:=i486} diff --git a/ladspa/ladspa.SlackBuild b/ladspa/ladspa.SlackBuild index 12b4c657..388adae1 100755 --- a/ladspa/ladspa.SlackBuild +++ b/ladspa/ladspa.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 - # default settings PACKAGE="ladspa" ARCH=${ARCH:=i486} diff --git a/liba52/liba52.SlackBuild b/liba52/liba52.SlackBuild index def60d71..6a1d81af 100755 --- a/liba52/liba52.SlackBuild +++ b/liba52/liba52.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 - # default settings PACKAGE="liba52" ARCH=${ARCH:=i486} diff --git a/libavc1394/libavc1394.SlackBuild b/libavc1394/libavc1394.SlackBuild index fe3c9124..72fee6f4 100755 --- a/libavc1394/libavc1394.SlackBuild +++ b/libavc1394/libavc1394.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 - # default settings PACKAGE="libavc1394" ARCH=${ARCH:=i486} diff --git a/libdc1394/libdc1394.SlackBuild b/libdc1394/libdc1394.SlackBuild index 7f8effd3..0cf6a716 100755 --- a/libdc1394/libdc1394.SlackBuild +++ b/libdc1394/libdc1394.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 - # default settings PACKAGE="libdc1394" ARCH=${ARCH:=i486} diff --git a/libdv/libdv.SlackBuild b/libdv/libdv.SlackBuild index 7fe6030f..1d5c7206 100755 --- a/libdv/libdv.SlackBuild +++ b/libdv/libdv.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 - # default settings PACKAGE="libdv" ARCH=${ARCH:=i486} diff --git a/libevent/libevent.SlackBuild b/libevent/libevent.SlackBuild index 11b30841..75d7b4b8 100755 --- a/libevent/libevent.SlackBuild +++ b/libevent/libevent.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 - # default settings PACKAGE="libevent" ARCH=${ARCH:=i486} diff --git a/libexif-gtk/libexif-gtk.SlackBuild b/libexif-gtk/libexif-gtk.SlackBuild index 5fec01ae..fc25e9e4 100755 --- a/libexif-gtk/libexif-gtk.SlackBuild +++ b/libexif-gtk/libexif-gtk.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 - # default settings PACKAGE="libexif-gtk" ARCH=${ARCH:=i486} diff --git a/libgc/libgc.SlackBuild b/libgc/libgc.SlackBuild index e57707ac..b5a88939 100755 --- a/libgc/libgc.SlackBuild +++ b/libgc/libgc.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 - # default settings PACKAGE="gc" ARCH=${ARCH:=i486} diff --git a/libgcrypt/libgcrypt.SlackBuild b/libgcrypt/libgcrypt.SlackBuild index 1407f8bb..c64ed336 100755 --- a/libgcrypt/libgcrypt.SlackBuild +++ b/libgcrypt/libgcrypt.SlackBuild @@ -12,14 +12,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="libgcrypt" ARCH=${ARCH:=i486} diff --git a/libgpg-error/libgpg-error.SlackBuild b/libgpg-error/libgpg-error.SlackBuild index 6252ff66..dafd558b 100755 --- a/libgpg-error/libgpg-error.SlackBuild +++ b/libgpg-error/libgpg-error.SlackBuild @@ -11,14 +11,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="libgpg-error" ARCH=${ARCH:=i486} diff --git a/libgphoto2/libgphoto2.SlackBuild b/libgphoto2/libgphoto2.SlackBuild index 24b9f717..5c083801 100755 --- a/libgphoto2/libgphoto2.SlackBuild +++ b/libgphoto2/libgphoto2.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 - # default settings PACKAGE="libgphoto2" ARCH=${ARCH:=i486} diff --git a/libiconv/libiconv.SlackBuild b/libiconv/libiconv.SlackBuild index 7d3cab7c..81d2bd79 100755 --- a/libiconv/libiconv.SlackBuild +++ b/libiconv/libiconv.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="libiconv" ARCH=${ARCH:=i486} diff --git a/libiec61883/libiec61883.SlackBuild b/libiec61883/libiec61883.SlackBuild index 1ccf446f..9d4a997f 100755 --- a/libiec61883/libiec61883.SlackBuild +++ b/libiec61883/libiec61883.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 - # default settings PACKAGE="libiec61883" ARCH=${ARCH:=i486} diff --git a/liblo/liblo.SlackBuild b/liblo/liblo.SlackBuild index 168c21af..74b7ddda 100755 --- a/liblo/liblo.SlackBuild +++ b/liblo/liblo.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 - # default settings PACKAGE="liblo" ARCH=${ARCH:=i486} diff --git a/liblrdf/liblrdf.SlackBuild b/liblrdf/liblrdf.SlackBuild index 3fd421b3..b64ab786 100755 --- a/liblrdf/liblrdf.SlackBuild +++ b/liblrdf/liblrdf.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 - # default settings PACKAGE="liblrdf" ARCH=${ARCH:=i486} diff --git a/libquicktime/libquicktime.SlackBuild b/libquicktime/libquicktime.SlackBuild index 5a582c3d..7e5e2797 100755 --- a/libquicktime/libquicktime.SlackBuild +++ b/libquicktime/libquicktime.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 - # default settings PACKAGE="libquicktime" ARCH=${ARCH:=i486} diff --git a/libraw1394/libraw1394.SlackBuild b/libraw1394/libraw1394.SlackBuild index 22fceefa..a17751ff 100755 --- a/libraw1394/libraw1394.SlackBuild +++ b/libraw1394/libraw1394.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 - # default settings PACKAGE="libraw1394" ARCH=${ARCH:=i486} diff --git a/librsync/librsync.SlackBuild b/librsync/librsync.SlackBuild index 45440c4e..2e6955ed 100755 --- a/librsync/librsync.SlackBuild +++ b/librsync/librsync.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="librsync" ARCH=${ARCH:=i486} diff --git a/libsafe/libsafe.SlackBuild b/libsafe/libsafe.SlackBuild index 0a9539bf..2dd83b40 100755 --- a/libsafe/libsafe.SlackBuild +++ b/libsafe/libsafe.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="libsafe" ARCH=${ARCH:=i486} BUILD=${BUILD:=1rha} diff --git a/libsamplerate/libsamplerate.SlackBuild b/libsamplerate/libsamplerate.SlackBuild index f1df0585..4d233127 100755 --- a/libsamplerate/libsamplerate.SlackBuild +++ b/libsamplerate/libsamplerate.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 - # default settings PACKAGE="libsamplerate" ARCH=${ARCH:=i486} diff --git a/libshout/libshout.SlackBuild b/libshout/libshout.SlackBuild index b770171b..c4ebfd1e 100755 --- a/libshout/libshout.SlackBuild +++ b/libshout/libshout.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 - # default settings PACKAGE="libshout" ARCH=${ARCH:=i486} diff --git a/libsndfile/libsndfile.SlackBuild b/libsndfile/libsndfile.SlackBuild index 59dc8066..bbda4b2a 100755 --- a/libsndfile/libsndfile.SlackBuild +++ b/libsndfile/libsndfile.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 - # default settings PACKAGE="libsndfile" ARCH=${ARCH:=i486} diff --git a/libtheora/libtheora.SlackBuild b/libtheora/libtheora.SlackBuild index 0924c170..af1a33b6 100755 --- a/libtheora/libtheora.SlackBuild +++ b/libtheora/libtheora.SlackBuild @@ -11,14 +11,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="libtheora" VERSION=${VERSION:=1.0alpha7} ARCH=${ARCH:-i486} diff --git a/libx264/libx264.SlackBuild b/libx264/libx264.SlackBuild index e852edf1..03edfbfa 100755 --- a/libx264/libx264.SlackBuild +++ b/libx264/libx264.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 - # default settings PACKAGE="libx264" ARCH=${ARCH:=i486} diff --git a/lirc/lirc.SlackBuild b/lirc/lirc.SlackBuild index 8b2fa844..6938ecef 100755 --- a/lirc/lirc.SlackBuild +++ b/lirc/lirc.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 - # default settings PACKAGE="lirc" ARCH=${ARCH:=i486} diff --git a/lives/lives.SlackBuild b/lives/lives.SlackBuild index b0042204..ffb87ac8 100755 --- a/lives/lives.SlackBuild +++ b/lives/lives.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="lives" ARCH=${ARCH:=i486} diff --git a/lm_sensors/lm_sensors.SlackBuild b/lm_sensors/lm_sensors.SlackBuild index 19a44a02..57dbe34a 100755 --- a/lm_sensors/lm_sensors.SlackBuild +++ b/lm_sensors/lm_sensors.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 PRGNAM="lm_sensors" PACKAGE="$PRGNAM" diff --git a/lmms/lmms.SlackBuild b/lmms/lmms.SlackBuild index 29070697..ae242ea5 100755 --- a/lmms/lmms.SlackBuild +++ b/lmms/lmms.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 - # default settings PACKAGE="lmms" ARCH=${ARCH:=i486} diff --git a/lshw/lshw.SlackBuild b/lshw/lshw.SlackBuild index f1a75ee6..43ca7b67 100755 --- a/lshw/lshw.SlackBuild +++ b/lshw/lshw.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="lshw" ARCH=${ARCH:=i486} diff --git a/lzo/lzo.SlackBuild b/lzo/lzo.SlackBuild index f9c51419..1dd7b766 100755 --- a/lzo/lzo.SlackBuild +++ b/lzo/lzo.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="lzo" ARCH=${ARCH:=i486} diff --git a/mailgraph/mailgraph.SlackBuild b/mailgraph/mailgraph.SlackBuild index cfa91d40..afa4273d 100755 --- a/mailgraph/mailgraph.SlackBuild +++ b/mailgraph/mailgraph.SlackBuild @@ -5,14 +5,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="mailgraph" ARCH="noarch" diff --git a/mailman/mailman.SlackBuild b/mailman/mailman.SlackBuild index 8f2e8096..66ba28d6 100755 --- a/mailman/mailman.SlackBuild +++ b/mailman/mailman.SlackBuild @@ -5,14 +5,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="mailman" VERSION=${VERSION:=2.1.9} diff --git a/mairix/mairix.SlackBuild b/mairix/mairix.SlackBuild index ee70c4d1..84e7276b 100755 --- a/mairix/mairix.SlackBuild +++ b/mairix/mairix.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 - # default settings PACKAGE="mairix" ARCH=${ARCH:=i486} diff --git a/mhonarc/MHonArc.SlackBuild b/mhonarc/MHonArc.SlackBuild index f44c5b07..68d80104 100755 --- a/mhonarc/MHonArc.SlackBuild +++ b/mhonarc/MHonArc.SlackBuild @@ -5,14 +5,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="MHonArc" VERSION=${VERSION:=2.6.15} diff --git a/mixxx/mixxx.SlackBuild b/mixxx/mixxx.SlackBuild index ca067ce4..2559d3de 100755 --- a/mixxx/mixxx.SlackBuild +++ b/mixxx/mixxx.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 - # default settings PACKAGE="mixxx" VERSION=${VERSION:=1.4.2} diff --git a/mjpegtools/mjpegtools.SlackBuild b/mjpegtools/mjpegtools.SlackBuild index 6dca2dc1..756e3517 100755 --- a/mjpegtools/mjpegtools.SlackBuild +++ b/mjpegtools/mjpegtools.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 - # default settings PACKAGE="mjpegtools" ARCH=${ARCH:=i486} diff --git a/mlt++/mlt++.SlackBuild b/mlt++/mlt++.SlackBuild index fa116919..33eff083 100755 --- a/mlt++/mlt++.SlackBuild +++ b/mlt++/mlt++.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 - # default settings PACKAGE="mlt++" ARCH=${ARCH:=i486} diff --git a/mlt/mlt.SlackBuild b/mlt/mlt.SlackBuild index d815b80a..2c26e6fe 100755 --- a/mlt/mlt.SlackBuild +++ b/mlt/mlt.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 - # default settings PACKAGE="mlt" ARCH=${ARCH:=i486} diff --git a/mm/mm.SlackBuild b/mm/mm.SlackBuild index 67b7d036..f723cda3 100755 --- a/mm/mm.SlackBuild +++ b/mm/mm.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="mm" ARCH=${ARCH:=i486} diff --git a/mod_fastcgi/mod_fastcgi.SlackBuild b/mod_fastcgi/mod_fastcgi.SlackBuild index 7cf6d91f..315f0fe1 100755 --- a/mod_fastcgi/mod_fastcgi.SlackBuild +++ b/mod_fastcgi/mod_fastcgi.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="mod_fastcgi" VERSION=${VERSION:=2.4.2} diff --git a/mod_python/mod_python.SlackBuild b/mod_python/mod_python.SlackBuild index 22309c8c..ea99a2b6 100755 --- a/mod_python/mod_python.SlackBuild +++ b/mod_python/mod_python.SlackBuild @@ -5,14 +5,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="mod_python" VERSION=${VERSION:=2.7.11} diff --git a/moin/moin.SlackBuild b/moin/moin.SlackBuild index 90684915..3825c1d7 100755 --- a/moin/moin.SlackBuild +++ b/moin/moin.SlackBuild @@ -5,14 +5,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="moin" VERSION=${VERSION:=1.5.6} diff --git a/mp3blaster/mp3blaster.SlackBuild b/mp3blaster/mp3blaster.SlackBuild index 9225bc03..eb6d42b5 100755 --- a/mp3blaster/mp3blaster.SlackBuild +++ b/mp3blaster/mp3blaster.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 - # default settings PACKAGE="mp3blaster" ARCH=${ARCH:=i486} diff --git a/mpeg2dec/mpeg2dec.SlackBuild b/mpeg2dec/mpeg2dec.SlackBuild index 0812025d..36832d71 100755 --- a/mpeg2dec/mpeg2dec.SlackBuild +++ b/mpeg2dec/mpeg2dec.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 - # default settings PACKAGE="mpeg2dec" ARCH=${ARCH:=i486} diff --git a/mplayer/MPlayer.SlackBuild b/mplayer/MPlayer.SlackBuild index b3547d01..115416e5 100755 --- a/mplayer/MPlayer.SlackBuild +++ b/mplayer/MPlayer.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 - # default settings PACKAGE="MPlayer" ARCH=${ARCH:=i486} diff --git a/mrtg/mrtg.SlackBuild b/mrtg/mrtg.SlackBuild index b30ef8e7..9fe4ab93 100755 --- a/mrtg/mrtg.SlackBuild +++ b/mrtg/mrtg.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="mrtg" VERSION=${VERSION:=2.14.3} BUILD=${BUILD:=1rha} diff --git a/msmtp/msmtp.SlackBuild b/msmtp/msmtp.SlackBuild index 147f5d12..ccf001ca 100755 --- a/msmtp/msmtp.SlackBuild +++ b/msmtp/msmtp.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 - # default settings PACKAGE="msmtp" ARCH=${ARCH:=i486} diff --git a/munin/munin.SlackBuild b/munin/munin.SlackBuild index ceb1ad86..4b3d6686 100755 --- a/munin/munin.SlackBuild +++ b/munin/munin.SlackBuild @@ -5,14 +5,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="munin" VERSION=${VERSION:=1.2.4} diff --git a/muse/MusE.SlackBuild b/muse/MusE.SlackBuild index f4597326..24d0db8c 100755 --- a/muse/MusE.SlackBuild +++ b/muse/MusE.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 - # default settings PACKAGE="MusE" ARCH=${ARCH:=i486} diff --git a/nano/nano.SlackBuild b/nano/nano.SlackBuild index 208c15c3..0d164d87 100755 --- a/nano/nano.SlackBuild +++ b/nano/nano.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="nano" ARCH=${ARCH:=i486} diff --git a/nicotine/nicotine+.SlackBuild b/nicotine/nicotine+.SlackBuild index 9b69a951..0da0eac9 100755 --- a/nicotine/nicotine+.SlackBuild +++ b/nicotine/nicotine+.SlackBuild @@ -5,14 +5,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="nicotine+" VERSION=${VERSION:=1.2.4.1} diff --git a/nicotine/nicotine.SlackBuild b/nicotine/nicotine.SlackBuild index 53561e2c..dbbd7f32 100755 --- a/nicotine/nicotine.SlackBuild +++ b/nicotine/nicotine.SlackBuild @@ -17,14 +17,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 - # default settings PACKAGE="nicotine" VERSION=${VERSION:=1.0.8} diff --git a/nspluginwrapper/nspluginwrapper.SlackBuild b/nspluginwrapper/nspluginwrapper.SlackBuild index c437f225..0954db2b 100755 --- a/nspluginwrapper/nspluginwrapper.SlackBuild +++ b/nspluginwrapper/nspluginwrapper.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 - # default settings PACKAGE="nspluginwrapper" ARCH=${ARCH:=i486} diff --git a/oggfwd/oggfwd.SlackBuild b/oggfwd/oggfwd.SlackBuild index 35bde207..618228d2 100755 --- a/oggfwd/oggfwd.SlackBuild +++ b/oggfwd/oggfwd.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 - # default settings PACKAGE="oggfwd" ARCH=${ARCH:=i486} diff --git a/opal/opal.SlackBuild b/opal/opal.SlackBuild index f2eb18f9..0cfaeb44 100755 --- a/opal/opal.SlackBuild +++ b/opal/opal.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 - # default settings PACKAGE="opal" ARCH=${ARCH:=i486} diff --git a/openexr/openexr.SlackBuild b/openexr/openexr.SlackBuild index a93d9167..715e1491 100755 --- a/openexr/openexr.SlackBuild +++ b/openexr/openexr.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 - # default settings PACKAGE="openexr" ARCH=${ARCH:=i486} diff --git a/openldap/openldap-client.SlackBuild b/openldap/openldap-client.SlackBuild index 6eb2c783..b2e49184 100755 --- a/openldap/openldap-client.SlackBuild +++ b/openldap/openldap-client.SlackBuild @@ -5,14 +5,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="openldap-client" ARCH=${ARCH:=i486} diff --git a/openldap/openldap.SlackBuild b/openldap/openldap.SlackBuild index 581fe4aa..1cb6ee6c 100755 --- a/openldap/openldap.SlackBuild +++ b/openldap/openldap.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="openldap" ARCH=${ARCH:=i486} 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} diff --git a/postfix/postfix.SlackBuild b/postfix/postfix.SlackBuild index 06a3edf4..56a61586 100755 --- a/postfix/postfix.SlackBuild +++ b/postfix/postfix.SlackBuild @@ -33,14 +33,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 - # default settings PACKAGE=postfix ARCH=${ARCH:=i486} diff --git a/postgresql/postgresql.SlackBuild b/postgresql/postgresql.SlackBuild index 990aab48..793a250d 100755 --- a/postgresql/postgresql.SlackBuild +++ b/postgresql/postgresql.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 - # default settings PACKAGE="postgresql" ARCH=${ARCH:=i486} diff --git a/postgrey/postgrey.SlackBuild b/postgrey/postgrey.SlackBuild index 8bece798..5d8e46ec 100755 --- a/postgrey/postgrey.SlackBuild +++ b/postgrey/postgrey.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 - # default settings PACKAGE="postgrey" VERSION=${VERSION:=1.27} diff --git a/privoxy/privoxy.SlackBuild b/privoxy/privoxy.SlackBuild index b49bff66..70dc095e 100755 --- a/privoxy/privoxy.SlackBuild +++ b/privoxy/privoxy.SlackBuild @@ -5,14 +5,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="privoxy" VERSION=${VERSION:=3.0.3} diff --git a/pwlib/pwlib.SlackBuild b/pwlib/pwlib.SlackBuild index 0f551695..5102e955 100755 --- a/pwlib/pwlib.SlackBuild +++ b/pwlib/pwlib.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 - # default settings PACKAGE="pwlib" ARCH=${ARCH:=i486} diff --git a/pygtk/pygtk.SlackBuild b/pygtk/pygtk.SlackBuild index d2d4d2ee..a92b9b71 100755 --- a/pygtk/pygtk.SlackBuild +++ b/pygtk/pygtk.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 - # default settings PACKAGE="pygtk" ARCH=${ARCH:=i486} diff --git a/pyrex/Pyrex.SlackBuild b/pyrex/Pyrex.SlackBuild index 3da8174d..6da69b39 100755 --- a/pyrex/Pyrex.SlackBuild +++ b/pyrex/Pyrex.SlackBuild @@ -17,14 +17,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 - # default settings PACKAGE="Pyrex" VERSION=${VERSION:=0.9.4.1} diff --git a/qjackctl/qjackctl.SlackBuild b/qjackctl/qjackctl.SlackBuild index 209c4e15..f57aa8eb 100755 --- a/qjackctl/qjackctl.SlackBuild +++ b/qjackctl/qjackctl.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 - # default settings PACKAGE="qjackctl" ARCH=${ARCH:=i486} diff --git a/raptor/raptor.SlackBuild b/raptor/raptor.SlackBuild index 7e0cd9a6..66b1bc0c 100755 --- a/raptor/raptor.SlackBuild +++ b/raptor/raptor.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 - # default settings PACKAGE="raptor" ARCH=${ARCH:=i486} diff --git a/rdiff-backup/rdiff-backup.SlackBuild b/rdiff-backup/rdiff-backup.SlackBuild index b23c8ae4..a9c56774 100755 --- a/rdiff-backup/rdiff-backup.SlackBuild +++ b/rdiff-backup/rdiff-backup.SlackBuild @@ -5,14 +5,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="rdiff-backup" VERSION=${VERSION:=1.0.4} diff --git a/realtime-lsm/realtime-lsm.SlackBuild b/realtime-lsm/realtime-lsm.SlackBuild index 5a036d7a..08f6e222 100755 --- a/realtime-lsm/realtime-lsm.SlackBuild +++ b/realtime-lsm/realtime-lsm.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="realtime-lsm" ARCH=${ARCH:=i486} diff --git a/rrdtool/rrdtool.SlackBuild b/rrdtool/rrdtool.SlackBuild index 3f7b20ad..cfd66a6a 100755 --- a/rrdtool/rrdtool.SlackBuild +++ b/rrdtool/rrdtool.SlackBuild @@ -42,14 +42,12 @@ else sleep 3 fi -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="rrdtool" PRGNAM="$PACKAGE" ARCH=${ARCH:=i486} diff --git a/rssh/rssh-chroot.SlackBuild b/rssh/rssh-chroot.SlackBuild index 0c92d9dd..9853bdb4 100755 --- a/rssh/rssh-chroot.SlackBuild +++ b/rssh/rssh-chroot.SlackBuild @@ -21,14 +21,12 @@ else sleep 3 fi -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 PRGNAM="rssh-chroot" PACKAGE="$PRGNAM" diff --git a/rssh/rssh.SlackBuild b/rssh/rssh.SlackBuild index 9dd76960..af7c2324 100755 --- a/rssh/rssh.SlackBuild +++ b/rssh/rssh.SlackBuild @@ -5,14 +5,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 PRGNAM="rssh" PACKAGE="$PRGNAM" diff --git a/scons/scons.SlackBuild b/scons/scons.SlackBuild index 28d9d6fe..7c3384f7 100755 --- a/scons/scons.SlackBuild +++ b/scons/scons.SlackBuild @@ -17,14 +17,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 - # default settings PACKAGE="scons" VERSION=${VERSION:=0.96.1} diff --git a/shfs/shfs.SlackBuild b/shfs/shfs.SlackBuild index a042baad..daca20f3 100755 --- a/shfs/shfs.SlackBuild +++ b/shfs/shfs.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="shfs" ARCH=${ARCH:=i486} diff --git a/silc/silc-client.SlackBuild b/silc/silc-client.SlackBuild index 731ae4a2..7a2405af 100755 --- a/silc/silc-client.SlackBuild +++ b/silc/silc-client.SlackBuild @@ -17,14 +17,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 - # default settings PACKAGE="silc-client" VERSION=${VERSION:=1.0.3} diff --git a/silc/silc-server.SlackBuild b/silc/silc-server.SlackBuild index 5ef29b38..627a8632 100755 --- a/silc/silc-server.SlackBuild +++ b/silc/silc-server.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 - # default settings PACKAGE="silc-server" ARCH=${ARCH:=i486} diff --git a/silc/silc-toolkit.SlackBuild b/silc/silc-toolkit.SlackBuild index 4835c319..8dced009 100755 --- a/silc/silc-toolkit.SlackBuild +++ b/silc/silc-toolkit.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 - # default settings PACKAGE="silc-toolkit" ARCH=${ARCH:=i486} diff --git a/soundtouch/soundtouch.SlackBuild b/soundtouch/soundtouch.SlackBuild index 7c22fe31..591894c4 100755 --- a/soundtouch/soundtouch.SlackBuild +++ b/soundtouch/soundtouch.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 - # default settings PACKAGE="soundtouch" ARCH=${ARCH:=i486} diff --git a/soundtracker/soundtracker.SlackBuild b/soundtracker/soundtracker.SlackBuild index 0fcb26d9..e601fb7d 100755 --- a/soundtracker/soundtracker.SlackBuild +++ b/soundtracker/soundtracker.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 - # default settings PACKAGE="soundtracker" ARCH=${ARCH:=i486} diff --git a/speex/speex.SlackBuild b/speex/speex.SlackBuild index ea840e06..b88cacc3 100755 --- a/speex/speex.SlackBuild +++ b/speex/speex.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="speex" VERSION=${VERSION:=1.0.5} ARCH=${ARCH:=i486} diff --git a/ssmtp/ssmtp.SlackBuild b/ssmtp/ssmtp.SlackBuild index 07291e35..9f40d6a7 100755 --- a/ssmtp/ssmtp.SlackBuild +++ b/ssmtp/ssmtp.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="ssmtp" ARCH=${ARCH:=i486} diff --git a/stellarium/stellarium.SlackBuild b/stellarium/stellarium.SlackBuild index 763edf24..27891440 100755 --- a/stellarium/stellarium.SlackBuild +++ b/stellarium/stellarium.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 - # default settings PACKAGE="stellarium" ARCH=${ARCH:=i486} diff --git a/swh-plugins/swh-plugins.SlackBuild b/swh-plugins/swh-plugins.SlackBuild index cf8348e2..abd42235 100755 --- a/swh-plugins/swh-plugins.SlackBuild +++ b/swh-plugins/swh-plugins.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 - # default settings PACKAGE="swh-plugins" ARCH=${ARCH:=i486} diff --git a/sympa/sympa.SlackBuild b/sympa/sympa.SlackBuild index 36c5ec81..4f6214f6 100755 --- a/sympa/sympa.SlackBuild +++ b/sympa/sympa.SlackBuild @@ -31,14 +31,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 - # default settings PACKAGE="sympa" VERSION=${VERSION:=5.2.1} diff --git a/sysfsutils/sysfsutils.SlackBuild b/sysfsutils/sysfsutils.SlackBuild index 84f65254..6ead938e 100755 --- a/sysfsutils/sysfsutils.SlackBuild +++ b/sysfsutils/sysfsutils.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="sysfsutils" ARCH=${ARCH:=i486} diff --git a/tor/tor.SlackBuild b/tor/tor.SlackBuild index f201f910..7674468d 100755 --- a/tor/tor.SlackBuild +++ b/tor/tor.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 - # default settings PACKAGE="tor" ARCH=${ARCH:=i486} diff --git a/torsmo/torsmo.SlackBuild b/torsmo/torsmo.SlackBuild index 87cec4ef..8e82a1ce 100755 --- a/torsmo/torsmo.SlackBuild +++ b/torsmo/torsmo.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 - # default settings PACKAGE="torsmo" ARCH=${ARCH:=i486} diff --git a/twolame/twolame.SlackBuild b/twolame/twolame.SlackBuild index 11f16fd4..d87750c8 100755 --- a/twolame/twolame.SlackBuild +++ b/twolame/twolame.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 - # default settings PACKAGE="twolame" ARCH=${ARCH:=i486} diff --git a/unrar/unrar.SlackBuild b/unrar/unrar.SlackBuild index b3a33484..1f977d26 100755 --- a/unrar/unrar.SlackBuild +++ b/unrar/unrar.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="unrar" ARCH=${ARCH:=i486} diff --git a/unrtf/unrtf.SlackBuild b/unrtf/unrtf.SlackBuild index 26911ca8..8bb44767 100755 --- a/unrtf/unrtf.SlackBuild +++ b/unrtf/unrtf.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 - # default settings PACKAGE="unrtf" ARCH=${ARCH:=i486} diff --git a/util-vserver/beecrypt.SlackBuild b/util-vserver/beecrypt.SlackBuild index 8f6f010c..2733c090 100755 --- a/util-vserver/beecrypt.SlackBuild +++ b/util-vserver/beecrypt.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 - # default settings PACKAGE="beecrypt" ARCH=${ARCH:=i486} diff --git a/util-vserver/util-vserver.SlackBuild b/util-vserver/util-vserver.SlackBuild index 78fa1f5c..8aefcbe4 100755 --- a/util-vserver/util-vserver.SlackBuild +++ b/util-vserver/util-vserver.SlackBuild @@ -24,14 +24,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 - # default settings PACKAGE="util-vserver" ARCH=${ARCH:=i486} diff --git a/util-vserver/vlan.SlackBuild b/util-vserver/vlan.SlackBuild index 3c044001..06386b8c 100755 --- a/util-vserver/vlan.SlackBuild +++ b/util-vserver/vlan.SlackBuild @@ -5,14 +5,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="vlan" ARCH=${ARCH:=i486} diff --git a/vlc/vlc.SlackBuild b/vlc/vlc.SlackBuild index 131f19d4..ed17f5e3 100755 --- a/vlc/vlc.SlackBuild +++ b/vlc/vlc.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 - # default settings PACKAGE="vlc" ARCH=${ARCH:=i486} diff --git a/webalizer/webalizer.SlackBuild b/webalizer/webalizer.SlackBuild index ef230043..ec8d8bed 100755 --- a/webalizer/webalizer.SlackBuild +++ b/webalizer/webalizer.SlackBuild @@ -33,14 +33,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 - # change STATIC to anything other than "yes" to enable dynamic build. STATIC=${STATIC:-no} diff --git a/wipe/wipe.SlackBuild b/wipe/wipe.SlackBuild index 69f1e1d9..631fed79 100755 --- a/wipe/wipe.SlackBuild +++ b/wipe/wipe.SlackBuild @@ -5,14 +5,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="wipe" VERSION=${VERSION:=2.2.0} diff --git a/wxwidgets/wxWidgets.SlackBuild b/wxwidgets/wxWidgets.SlackBuild index 86e0322a..593b4664 100755 --- a/wxwidgets/wxWidgets.SlackBuild +++ b/wxwidgets/wxWidgets.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 - # default settings PACKAGE="wxWidgets" ARCH=${ARCH:=i486} diff --git a/xmms-jack/xmms-jack.SlackBuild b/xmms-jack/xmms-jack.SlackBuild index e7cabd83..337457ba 100755 --- a/xmms-jack/xmms-jack.SlackBuild +++ b/xmms-jack/xmms-jack.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 - # default settings PACKAGE="xmms-jack" ARCH=${ARCH:=i486} diff --git a/yasm/yasm.SlackBuild b/yasm/yasm.SlackBuild index f557f1b5..e0ea3767 100755 --- a/yasm/yasm.SlackBuild +++ b/yasm/yasm.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 - # default settings PACKAGE="yasm" ARCH=${ARCH:=i486} |