diff options
author | dsomero <xgizzmo@slackbuilds.org> | 2013-11-22 02:34:22 -0500 |
---|---|---|
committer | dsomero <xgizzmo@slackbuilds.org> | 2013-11-22 02:34:22 -0500 |
commit | 687c78d5604ce299d5164ffd69de88f2dd10fefc (patch) | |
tree | 2c3b4dd9491198917e0178dd5a0cf0fa3e6715c8 /network | |
parent | 610e8461bb9b201adbd4bd9257a9bf48be71f62b (diff) |
various: Fix SlackBuild formatting and comment nit picks.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network')
176 files changed, 239 insertions, 449 deletions
diff --git a/network/APC/APC.SlackBuild b/network/APC/APC.SlackBuild index fce8e313656bf..66a08cdb927df 100644 --- a/network/APC/APC.SlackBuild +++ b/network/APC/APC.SlackBuild @@ -82,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -INSTALL_ROOT=$PKG make install +INSTALL_ROOT=$PKG make install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/DenyHosts/DenyHosts.SlackBuild b/network/DenyHosts/DenyHosts.SlackBuild index 2e09a38dcf420..a291ba4e37f47 100644 --- a/network/DenyHosts/DenyHosts.SlackBuild +++ b/network/DenyHosts/DenyHosts.SlackBuild @@ -5,10 +5,10 @@ # http://slackbuilds.org/python-template.SlackBuild -PRGNAM=DenyHosts -VERSION=${VERSION:-2.6} +PRGNAM=DenyHosts +VERSION=${VERSION:-2.6} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -19,9 +19,9 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -37,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/GhostInTheMail/GhostInTheMail.SlackBuild b/network/GhostInTheMail/GhostInTheMail.SlackBuild index 788af2382ec9e..4cc139039f352 100644 --- a/network/GhostInTheMail/GhostInTheMail.SlackBuild +++ b/network/GhostInTheMail/GhostInTheMail.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.5} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/QuiteRSS/QuiteRSS.SlackBuild b/network/QuiteRSS/QuiteRSS.SlackBuild index 99fd85aac858f..87d019a399638 100644 --- a/network/QuiteRSS/QuiteRSS.SlackBuild +++ b/network/QuiteRSS/QuiteRSS.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/SocksiPy/SocksiPy.SlackBuild b/network/SocksiPy/SocksiPy.SlackBuild index c082f575323c5..1d2c359050bae 100644 --- a/network/SocksiPy/SocksiPy.SlackBuild +++ b/network/SocksiPy/SocksiPy.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.0.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -46,7 +44,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION mkdir $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM.tar.gz -C $PRGNAM-$VERSION diff --git a/network/airpwn/airpwn.SlackBuild b/network/airpwn/airpwn.SlackBuild index a2ed6189cd634..0d02450ffd5c8 100644 --- a/network/airpwn/airpwn.SlackBuild +++ b/network/airpwn/airpwn.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -100,7 +98,7 @@ CPPFLAGS="-I${PKG}/usr/include" \ --build=$ARCH-slackware-linux # fix what libs we link to -sed -i 's/-lnet/-lnet -lssl -lexpat -lcrypto/' Makefile +sed -i 's/-lnet/-lnet -lssl -lexpat -lcrypto/' Makefile # build airpwn make diff --git a/network/ajaxplorer-sync/ajaxplorer-sync.SlackBuild b/network/ajaxplorer-sync/ajaxplorer-sync.SlackBuild index dc2360c8a8b0d..d5d9f0978b4e7 100644 --- a/network/ajaxplorer-sync/ajaxplorer-sync.SlackBuild +++ b/network/ajaxplorer-sync/ajaxplorer-sync.SlackBuild @@ -31,11 +31,9 @@ TAG=${TAG:-_SBo} SRCNAM=ajaxplorer_sync -# Automatically determine the architecture we're building on: case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac diff --git a/network/amap/amap.SlackBuild b/network/amap/amap.SlackBuild index 9cba1adcb2371..f7873afbba83b 100644 --- a/network/amap/amap.SlackBuild +++ b/network/amap/amap.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/aria2/aria2.SlackBuild b/network/aria2/aria2.SlackBuild index cb5a3983bc7c9..21fa8aaf6e7da 100644 --- a/network/aria2/aria2.SlackBuild +++ b/network/aria2/aria2.SlackBuild @@ -38,7 +38,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/network/arp-scan/arp-scan.SlackBuild b/network/arp-scan/arp-scan.SlackBuild index b318e3bcd4d41..851ba194890ef 100644 --- a/network/arp-scan/arp-scan.SlackBuild +++ b/network/arp-scan/arp-scan.SlackBuild @@ -27,17 +27,15 @@ VERSION=${VERSION:-1.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/network/arpwatch/arpwatch.SlackBuild b/network/arpwatch/arpwatch.SlackBuild index e7d9a66ab7649..840cba42ae1da 100644 --- a/network/arpwatch/arpwatch.SlackBuild +++ b/network/arpwatch/arpwatch.SlackBuild @@ -8,12 +8,10 @@ VERSION=2.1a15 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/cadaver/cadaver.SlackBuild b/network/cadaver/cadaver.SlackBuild index 900d6215b37c1..44f4ff21bdbb2 100644 --- a/network/cadaver/cadaver.SlackBuild +++ b/network/cadaver/cadaver.SlackBuild @@ -8,12 +8,10 @@ VERSION=0.23.3 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/cgterm/cgterm.SlackBuild b/network/cgterm/cgterm.SlackBuild index 8b10b03d34efb..6bfb48517870e 100644 --- a/network/cgterm/cgterm.SlackBuild +++ b/network/cgterm/cgterm.SlackBuild @@ -28,12 +28,10 @@ VERSION=1.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/ckermit/ckermit.SlackBuild b/network/ckermit/ckermit.SlackBuild index 92e062ec1aa72..cfb5d43d7dbd7 100644 --- a/network/ckermit/ckermit.SlackBuild +++ b/network/ckermit/ckermit.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-9.0.302} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild index 4e151c156c071..2c1f1a706d40a 100644 --- a/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild +++ b/network/clamav-unofficial-sigs/clamav-unofficial-sigs.SlackBuild @@ -39,7 +39,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e ### user and group for config file CONFIG_USER="root" diff --git a/network/clive/clive.SlackBuild b/network/clive/clive.SlackBuild index 0e9414a48491b..5e895cb6d561d 100644 --- a/network/clive/clive.SlackBuild +++ b/network/clive/clive.SlackBuild @@ -28,12 +28,10 @@ VERSION=1.0.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/cmdiag/cmdiag.SlackBuild b/network/cmdiag/cmdiag.SlackBuild index f13ab2f5c523f..f817f69671003 100644 --- a/network/cmdiag/cmdiag.SlackBuild +++ b/network/cmdiag/cmdiag.SlackBuild @@ -36,7 +36,7 @@ else fi set -ue - + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP diff --git a/network/corkscrew/corkscrew.SlackBuild b/network/corkscrew/corkscrew.SlackBuild index de733992ae378..ac702807cb7ee 100644 --- a/network/corkscrew/corkscrew.SlackBuild +++ b/network/corkscrew/corkscrew.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/cowpatty/cowpatty.SlackBuild b/network/cowpatty/cowpatty.SlackBuild index a7ab733e9f273..b60afd70ccb67 100644 --- a/network/cowpatty/cowpatty.SlackBuild +++ b/network/cowpatty/cowpatty.SlackBuild @@ -49,7 +49,7 @@ find . \ # force the Makefile to use our SLKCFLAGS: sed -i 14s/"-g3 -ggdb"/"-g3 -ggdb ${SLKCFLAGS}"/ Makefile -make +make make strip make install BINDIR=/usr/bin DESTDIR=$PKG diff --git a/network/cryptcat-unix/cryptcat-unix.SlackBuild b/network/cryptcat-unix/cryptcat-unix.SlackBuild index 1cdf0ce38e405..23113f2bd1b0f 100644 --- a/network/cryptcat-unix/cryptcat-unix.SlackBuild +++ b/network/cryptcat-unix/cryptcat-unix.SlackBuild @@ -13,12 +13,10 @@ PRGNAM=cryptcat-unix BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/csync/csync.SlackBuild b/network/csync/csync.SlackBuild index d65948b3870a1..7f8dd18ee1fd5 100644 --- a/network/csync/csync.SlackBuild +++ b/network/csync/csync.SlackBuild @@ -78,7 +78,7 @@ cd build -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DLIB_SUFFIX=64 \ -DSYSCONF_INSTALL_DIR=/etc \ - -DMAN_INSTALL_DIR=/usr/man + -DMAN_INSTALL_DIR=/usr/man make make install DESTDIR=$PKG cd .. diff --git a/network/deluge/deluge.SlackBuild b/network/deluge/deluge.SlackBuild index 335887d5edae9..837189a79a60a 100644 --- a/network/deluge/deluge.SlackBuild +++ b/network/deluge/deluge.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.3.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/dnstracer/dnstracer.SlackBuild b/network/dnstracer/dnstracer.SlackBuild index 2965d1d0ec9ca..ed5e7ed8af234 100644 --- a/network/dnstracer/dnstracer.SlackBuild +++ b/network/dnstracer/dnstracer.SlackBuild @@ -56,7 +56,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -make CC="$(which gcc) $SLKCFLAGS" +make CC="$(which gcc) $SLKCFLAGS" mkdir -p $PKG/usr/{bin,man,doc} mkdir -p $PKG/usr/man/man8 diff --git a/network/docsis/docsis.SlackBuild b/network/docsis/docsis.SlackBuild index fd6040c809109..3ee0b6d490ca4 100644 --- a/network/docsis/docsis.SlackBuild +++ b/network/docsis/docsis.SlackBuild @@ -36,7 +36,7 @@ else fi set -ue - + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild index bdc3f85d29c61..cdf9db6919c42 100644 --- a/network/dropbear/dropbear.SlackBuild +++ b/network/dropbear/dropbear.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2008, Piter Punk, São Paulo, Brazil +# Copyright 2007-2008, Piter Punk, São Paulo, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,12 +25,10 @@ VERSION=0.52 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/dsniff/dsniff.SlackBuild b/network/dsniff/dsniff.SlackBuild index 761e3b7370ac3..7800b0030e2dc 100644 --- a/network/dsniff/dsniff.SlackBuild +++ b/network/dsniff/dsniff.SlackBuild @@ -29,12 +29,10 @@ SRCVER=${SRCVER:-2.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/elinks/elinks.SlackBuild b/network/elinks/elinks.SlackBuild index 9d45ccff78ae9..1dc2cb36a23ad 100644 --- a/network/elinks/elinks.SlackBuild +++ b/network/elinks/elinks.SlackBuild @@ -12,12 +12,10 @@ VERSION=0.11.5 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -47,7 +45,7 @@ cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 cd $PRGNAM-$VERSION || exit 1 -chown -R root:root . +chown -R root:root . chmod -R u+w,go+r-w,a-s . CFLAGS="$SLKCFLAGS" \ @@ -91,7 +89,7 @@ mv $PKG/usr/share/man $PKG/usr ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +) cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/emacs-w3m/emacs-w3m.SlackBuild b/network/emacs-w3m/emacs-w3m.SlackBuild index 99ccfccebd4ce..d3277679549d8 100644 --- a/network/emacs-w3m/emacs-w3m.SlackBuild +++ b/network/emacs-w3m/emacs-w3m.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-cvs_1.4.400_0.20100725} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/emesene/emesene.SlackBuild b/network/emesene/emesene.SlackBuild index 3dfac70ed462c..0c39a9dd0d4ce 100644 --- a/network/emesene/emesene.SlackBuild +++ b/network/emesene/emesene.SlackBuild @@ -17,7 +17,7 @@ OUTPUT=${OUTPUT:-/tmp} # No flags/configure needed because it is writen in python programing language. ARCH=noarch -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/enet/enet.SlackBuild b/network/enet/enet.SlackBuild index a7ecd3f203f2e..1547e631de804 100644 --- a/network/enet/enet.SlackBuild +++ b/network/enet/enet.SlackBuild @@ -9,18 +9,16 @@ VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/etherpad-lite/etherpad-lite.SlackBuild b/network/etherpad-lite/etherpad-lite.SlackBuild index 338cff1127c89..9b7331cdbbedd 100644 --- a/network/etherpad-lite/etherpad-lite.SlackBuild +++ b/network/etherpad-lite/etherpad-lite.SlackBuild @@ -40,7 +40,7 @@ if ! grep -q "^$ETHERPAD_USER:" /etc/passwd; then elif ! grep -q "^$ETHERPAD_GROUP:" /etc/group; then bailout fi - + set -eu rm -rf $PKG diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild index 5b01e0ada8d44..df103dc5f0d8f 100644 --- a/network/ettercap/ettercap.SlackBuild +++ b/network/ettercap/ettercap.SlackBuild @@ -82,7 +82,7 @@ cd build -DENABLE_IPV6=$IPV6 \ -DENABLE_LUA=$LUA \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/network/flvstreamer/flvstreamer.SlackBuild b/network/flvstreamer/flvstreamer.SlackBuild index 65cd7bc40c3c2..1b25a09fd92a2 100644 --- a/network/flvstreamer/flvstreamer.SlackBuild +++ b/network/flvstreamer/flvstreamer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for flvstreamer. -# +# # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.1a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/fping/fping.SlackBuild b/network/fping/fping.SlackBuild index 229663f585b48..ea2e3a47c366c 100644 --- a/network/fping/fping.SlackBuild +++ b/network/fping/fping.SlackBuild @@ -29,12 +29,10 @@ VERSION=2.4b2_to BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/fping6/fping6.SlackBuild b/network/fping6/fping6.SlackBuild index c4f98ee692f5f..28cf3cac9be33 100644 --- a/network/fping6/fping6.SlackBuild +++ b/network/fping6/fping6.SlackBuild @@ -31,12 +31,10 @@ VERSION=2.4b2_to_ipv6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/gmapcatcher/gmapcatcher.SlackBuild b/network/gmapcatcher/gmapcatcher.SlackBuild index 93ea35db7e32f..df5ea2baf5604 100644 --- a/network/gmapcatcher/gmapcatcher.SlackBuild +++ b/network/gmapcatcher/gmapcatcher.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/gns3/gns3.SlackBuild b/network/gns3/gns3.SlackBuild index 09a148550e760..1274b980c0ec6 100644 --- a/network/gns3/gns3.SlackBuild +++ b/network/gns3/gns3.SlackBuild @@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/googlecl/googlecl.SlackBuild b/network/googlecl/googlecl.SlackBuild index e77b3877a92df..461f948cf282e 100644 --- a/network/googlecl/googlecl.SlackBuild +++ b/network/googlecl/googlecl.SlackBuild @@ -22,7 +22,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/gq/gq.SlackBuild b/network/gq/gq.SlackBuild index 6cec583b2748e..b06494a922a12 100644 --- a/network/gq/gq.SlackBuild +++ b/network/gq/gq.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010 Chris Abela <chris.abela@maltats> +# Copyright 2010 Chris Abela <chris.abela@maltats> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/network/haproxy/haproxy.SlackBuild b/network/haproxy/haproxy.SlackBuild index 517af87d56a00..470661d5d2746 100644 --- a/network/haproxy/haproxy.SlackBuild +++ b/network/haproxy/haproxy.SlackBuild @@ -32,12 +32,10 @@ VERSION=1.3.15.7 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/havp/havp.SlackBuild b/network/havp/havp.SlackBuild index b9df40ae60a29..a53d527b8a97d 100644 --- a/network/havp/havp.SlackBuild +++ b/network/havp/havp.SlackBuild @@ -51,7 +51,7 @@ elif ! getent passwd havp 2>&1 > /dev/null; then bailout ; fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -72,7 +72,7 @@ patch -p1 < $CWD/patches/use_clamav_group_by_default.diff patch -p1 < $CWD/patches/put_templates_in_usrshare.diff patch -p1 < $CWD/patches/use_vartmphavp_for_tempdir.diff -CFLAGS="$SLKCFLAGS" +CFLAGS="$SLKCFLAGS" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/network/hipchat/hipchat.SlackBuild b/network/hipchat/hipchat.SlackBuild index fdbb8c26c4a69..d6f949ca1f649 100644 --- a/network/hipchat/hipchat.SlackBuild +++ b/network/hipchat/hipchat.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.95.444} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi @@ -25,7 +23,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/hostapd/hostapd.SlackBuild b/network/hostapd/hostapd.SlackBuild index 9f0b30c661edb..76696cf3e4915 100644 --- a/network/hostapd/hostapd.SlackBuild +++ b/network/hostapd/hostapd.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-0.6.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild index a80574dfec2f5..73dd6887d3b75 100644 --- a/network/hping3/hping3.SlackBuild +++ b/network/hping3/hping3.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-20051105} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/hylafax+/hylafax+.SlackBuild b/network/hylafax+/hylafax+.SlackBuild index 33269df293e2e..76eee961a872b 100644 --- a/network/hylafax+/hylafax+.SlackBuild +++ b/network/hylafax+/hylafax+.SlackBuild @@ -59,7 +59,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $SRCNAM-$VERSION tar -xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION @@ -70,7 +70,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Copy our source for the correct configuration +# Copy our source for the correct configuration sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \ < $CWD/config.local.in \ > $TMP/$SRCNAM-$VERSION/config.local diff --git a/network/hylafax/hylafax.SlackBuild b/network/hylafax/hylafax.SlackBuild index 637fe2c262b30..545c4f91ba3d7 100644 --- a/network/hylafax/hylafax.SlackBuild +++ b/network/hylafax/hylafax.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-6.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -64,7 +62,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION @@ -75,7 +73,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Copy our source for the correct configuration +# Copy our source for the correct configuration sed "s|@LIBDIRSUFFIX@|${LIBDIRSUFFIX}|g" \ < $CWD/config.local.in \ > $TMP/$PRGNAM-$VERSION/config.local diff --git a/network/ifstatus/ifstatus.SlackBuild b/network/ifstatus/ifstatus.SlackBuild index b98895c50469a..135ee6b9e86f2 100644 --- a/network/ifstatus/ifstatus.SlackBuild +++ b/network/ifstatus/ifstatus.SlackBuild @@ -23,24 +23,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ifstatus -VERSION=${VERSION:-1.1.0} +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" diff --git a/network/imapfilter/imapfilter.SlackBuild b/network/imapfilter/imapfilter.SlackBuild index a02900eb93dc2..1cca53b9a35d9 100644 --- a/network/imapfilter/imapfilter.SlackBuild +++ b/network/imapfilter/imapfilter.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/iperf/iperf.SlackBuild b/network/iperf/iperf.SlackBuild index 1438a3e80f886..36b64391c9009 100644 --- a/network/iperf/iperf.SlackBuild +++ b/network/iperf/iperf.SlackBuild @@ -5,19 +5,17 @@ # Some parts learned or copied from: # http://slackbuilds.org/template.SlackBuild # and -# http://www.slackwiki.org/Writing_A_SlackBuild_Script +# http://www.slackwiki.org/Writing_A_SlackBuild_Script PRGNAM=iperf VERSION=${VERSION:-2.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/ipv6calc/ipv6calc.SlackBuild b/network/ipv6calc/ipv6calc.SlackBuild index eb5abc6656db0..c9ee6511e976c 100644 --- a/network/ipv6calc/ipv6calc.SlackBuild +++ b/network/ipv6calc/ipv6calc.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/ipvsadm/ipvsadm.SlackBuild b/network/ipvsadm/ipvsadm.SlackBuild index f81e7eb25d34b..6c50d87f2a73a 100644 --- a/network/ipvsadm/ipvsadm.SlackBuild +++ b/network/ipvsadm/ipvsadm.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.25} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/isync/isync.SlackBuild b/network/isync/isync.SlackBuild index 153a1944d8958..30e00e9ab1cfa 100644 --- a/network/isync/isync.SlackBuild +++ b/network/isync/isync.SlackBuild @@ -13,19 +13,19 @@ # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# * Neither the name of Tom Canich nor the names of other contributors -# may be used to endorse or promote products derived from this +# * Neither the name of Tom Canich nor the names of other contributors +# may be used to endorse or promote products derived from this # software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL Tom Canich BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL Tom Canich BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -34,12 +34,10 @@ VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -63,7 +61,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/jabberd2/jabberd2.SlackBuild b/network/jabberd2/jabberd2.SlackBuild index 937d4127a3d37..d5102d033823a 100644 --- a/network/jabberd2/jabberd2.SlackBuild +++ b/network/jabberd2/jabberd2.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=jabberd2 VERSION=${VERSION:-2.2.17} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/network/jboss-as/jboss-as.SlackBuild b/network/jboss-as/jboss-as.SlackBuild index c2b7e78c10003..fa1d5b66a570e 100644 --- a/network/jboss-as/jboss-as.SlackBuild +++ b/network/jboss-as/jboss-as.SlackBuild @@ -44,7 +44,7 @@ if [ "$(grep ^jboss /etc/passwd)" = "" -o "$(grep ^jboss /etc/group)" = "" ] ; t fi rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +mkdir -p $TMP $PKG $OUTPUT cd $TMP tar xvzf $CWD/$PRGNAM-$VERSION.tar.gz @@ -58,7 +58,7 @@ chown -R root:root . mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv docs/* $PKG/usr/doc/$PRGNAM-$VERSION mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION -rm -rf docs +rm -rf docs cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # directory server: jboss/standalone/* -> /var/lib/jboss/standalone/* @@ -66,38 +66,38 @@ cd $PKG mkdir -p $PKG/var/lib/$PRGNAM mv $PKG/usr/share/$PRGNAM/standalone $PKG/var/lib/$PRGNAM cd $PKG/usr/share/$PRGNAM -ln -sf ../../../var/lib/$PRGNAM/standalone +ln -sf ../../../var/lib/$PRGNAM/standalone mv $PKG/usr/share/$PRGNAM/domain $PKG/var/lib/$PRGNAM cd $PKG/usr/share/$PRGNAM -ln -sf ../../../var/lib/$PRGNAM/domain +ln -sf ../../../var/lib/$PRGNAM/domain mkdir -p $PKG/etc/$PRGNAM/{standalone,domain} mv $PKG/var/lib/$PRGNAM/standalone/configuration $PKG/etc/$PRGNAM/standalone/ mv $PKG/var/lib/$PRGNAM/domain/configuration $PKG/etc/$PRGNAM/domain/ cd $PKG/var/lib/$PRGNAM/standalone -ln -sf ../../../../etc/$PRGNAM/standalone/configuration configuration +ln -sf ../../../../etc/$PRGNAM/standalone/configuration configuration cd $PKG/var/lib/$PRGNAM/domain -ln -sf ../../../../etc/$PRGNAM/domain/configuration configuration +ln -sf ../../../../etc/$PRGNAM/domain/configuration configuration mkdir -p $PKG/var/{log,tmp}/$PRGNAM/standalone cd $PKG/var/lib/$PRGNAM/standalone -ln -sf ../../../log/$PRGNAM/standalone log -ln -sf ../../../tmp/$PRGNAM/standalone tmp +ln -sf ../../../log/$PRGNAM/standalone log +ln -sf ../../../tmp/$PRGNAM/standalone tmp mv $PKG/usr/share/$PRGNAM/bin/standalone.conf $PKG/etc/$PRGNAM/standalone/ mv $PKG/usr/share/$PRGNAM/bin/domain.conf $PKG/etc/$PRGNAM/domain/ cd $PKG/usr/share/$PRGNAM/bin -ln -sf ../../../../etc/$PRGNAM/standalone/standalone.conf -ln -sf ../../../../etc/$PRGNAM/domain/domain.conf +ln -sf ../../../../etc/$PRGNAM/standalone/standalone.conf +ln -sf ../../../../etc/$PRGNAM/domain/domain.conf # the xml history need some special treatment mkdir -p $PKG/var/lib/$PRGNAM/standalone/standalone_xml_history mkdir -p $PKG/var/lib/$PRGNAM/domain/domain_xml_history mkdir -p $PKG/var/lib/$PRGNAM/domain/host_xml_history cd $PKG/etc/$PRGNAM/standalone/configuration -ln -sf ../../../../var/lib/$PRGNAM/standalone/standalone_xml_history +ln -sf ../../../../var/lib/$PRGNAM/standalone/standalone_xml_history cd $PKG/etc/$PRGNAM/domain/configuration -ln -sf ../../../../var/lib/$PRGNAM/domain/domain_xml_history -ln -sf ../../../../var/lib/$PRGNAM/domain/host_xml_history - +ln -sf ../../../../var/lib/$PRGNAM/domain/domain_xml_history +ln -sf ../../../../var/lib/$PRGNAM/domain/host_xml_history + # Add /etc/rc.d/rc.jboss.new mkdir -p $PKG/etc/rc.d cat $CWD/rc.$PRGNAM > $PKG/etc/rc.d/rc.$PRGNAM.new @@ -120,11 +120,11 @@ chmod 0755 $PKG/usr/share/$PRGNAM/bin/*.sh mkdir -p $PKG/usr/bin cd $PKG/usr/bin -ln -sf ../share/$PRGNAM/bin/domain.sh -ln -sf ../share/$PRGNAM/bin/standalone.sh -ln -sf ../share/$PRGNAM/bin/jboss-admin.sh -ln -sf ../share/$PRGNAM/bin/wsprovide.sh -ln -sf ../share/$PRGNAM/bin/wsconsume.sh +ln -sf ../share/$PRGNAM/bin/domain.sh +ln -sf ../share/$PRGNAM/bin/standalone.sh +ln -sf ../share/$PRGNAM/bin/jboss-admin.sh +ln -sf ../share/$PRGNAM/bin/wsprovide.sh +ln -sf ../share/$PRGNAM/bin/wsconsume.sh mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/jigdo/jigdo.SlackBuild b/network/jigdo/jigdo.SlackBuild index 2edf75b2bfe53..3d79eb78828f0 100644 --- a/network/jigdo/jigdo.SlackBuild +++ b/network/jigdo/jigdo.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="README THANKS changelog doc/TechDetails.txt doc/Hacking.txt" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/kadu/kadu.SlackBuild b/network/kadu/kadu.SlackBuild index 0518f62b7ec68..83402980ec33b 100644 --- a/network/kadu/kadu.SlackBuild +++ b/network/kadu/kadu.SlackBuild @@ -39,7 +39,7 @@ fi set -e rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 diff --git a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild index f7656df3512e8..dcce21ec804a4 100644 --- a/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild +++ b/network/kde-networkmanagement-openconnect/kde-networkmanagement-openconnect.SlackBuild @@ -97,7 +97,7 @@ mkdir -p $PKG/usr/share/kde4/services/ cp -a vpnplugins/openconnect/networkmanagement_openconnectui.desktop \ $PKG/usr/share/kde4/services/ -# These seem to have been built for networkmanagement_openconnectui.so to +# These seem to have been built for networkmanagement_openconnectui.so to # link, but they're identical to what the stock networkmanagement package # contains, so we don't need to include them here. # mv build/lib/* $PKG/usr/lib${LIBDIRSUFFIX} diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild index 6bd0bca3d2958..4c200bd26d7d2 100644 --- a/network/kmess/kmess.SlackBuild +++ b/network/kmess/kmess.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -78,7 +76,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/network/knock/knock.SlackBuild b/network/knock/knock.SlackBuild index 56458597985e3..c26ea265ff116 100644 --- a/network/knock/knock.SlackBuild +++ b/network/knock/knock.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/kobby/kobby.SlackBuild b/network/kobby/kobby.SlackBuild index 0322b489dd705..61da499d21f92 100644 --- a/network/kobby/kobby.SlackBuild +++ b/network/kobby/kobby.SlackBuild @@ -61,7 +61,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/network/konversation/konversation.SlackBuild b/network/konversation/konversation.SlackBuild index 224b61faafe0d..971b73d252f70 100644 --- a/network/konversation/konversation.SlackBuild +++ b/network/konversation/konversation.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -60,7 +58,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild index ebd0b96b55115..78b705362fd2b 100644 --- a/network/krb5/krb5.SlackBuild +++ b/network/krb5/krb5.SlackBuild @@ -6,13 +6,13 @@ # All rights reserved. # # Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions +# modification, are permitted provided that the following conditions # are met: # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials # provided with the distribution. # * Neither the name of Tom Canich nor the names of other contributors # may be used to endorse or promote products derived from this @@ -20,14 +20,14 @@ # # THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=krb5 @@ -35,12 +35,10 @@ VERSION=${VERSION:-1.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/ldapvi/ldapvi.SlackBuild b/network/ldapvi/ldapvi.SlackBuild index b03df1abe228b..4c30fee73d486 100644 --- a/network/ldapvi/ldapvi.SlackBuild +++ b/network/ldapvi/ldapvi.SlackBuild @@ -11,23 +11,23 @@ # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided # with the distribution. -# * Neither the name of Tom Canich nor the names of other -# contributors may be used to endorse or promote products derived +# * Neither the name of Tom Canich nor the names of other +# contributors may be used to endorse or promote products derived # from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ldapvi diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild index 722fa127ac611..1fab964259924 100644 --- a/network/leafnode/leafnode.SlackBuild +++ b/network/leafnode/leafnode.SlackBuild @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=leafnode +PRGNAM=leafnode VERSION=2.0.0.alpha20110807a BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,8 +81,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-spooldir=/var/spool/news \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make +make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/libdnet/libdnet.SlackBuild b/network/libdnet/libdnet.SlackBuild index 58ddcfea6ff4f..be495d75e1a0a 100644 --- a/network/libdnet/libdnet.SlackBuild +++ b/network/libdnet/libdnet.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 7ebcec09838dd..72145fb4b6156 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -73,7 +73,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild index 358a7881abb9a..a198a25472465 100644 --- a/network/lighttpd2/lighttpd2.SlackBuild +++ b/network/lighttpd2/lighttpd2.SlackBuild @@ -75,7 +75,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/limnoria/limnoria.SlackBuild b/network/limnoria/limnoria.SlackBuild index ca7923b54e17f..f4ac2f7f8f363 100644 --- a/network/limnoria/limnoria.SlackBuild +++ b/network/limnoria/limnoria.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/macchanger/macchanger.SlackBuild b/network/macchanger/macchanger.SlackBuild index c5741d94b7f62..32f030c417611 100644 --- a/network/macchanger/macchanger.SlackBuild +++ b/network/macchanger/macchanger.SlackBuild @@ -8,17 +8,15 @@ ################################################################### -PRGNAM=macchanger +PRGNAM=macchanger VERSION=1.5.0 BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/maildrop/maildrop.SlackBuild b/network/maildrop/maildrop.SlackBuild index cc9844bdbe89b..ea3310f02363d 100644 --- a/network/maildrop/maildrop.SlackBuild +++ b/network/maildrop/maildrop.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-2.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mailman/mailman.SlackBuild b/network/mailman/mailman.SlackBuild index 51a7243c14ea0..812739160a8f7 100644 --- a/network/mailman/mailman.SlackBuild +++ b/network/mailman/mailman.SlackBuild @@ -19,12 +19,10 @@ CGI_GID=${CGI_GID:-apache} MAILMAN_UID=${MAILMAN_UID:-204} MAILMAN_GID=${MAILMAN_GID:-204} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -57,7 +55,7 @@ else fi # By default mailman will be installed to /opt, but -# the lists archives and databases directory can be +# the lists archives and databases directory can be # changed to /var/mailman: PREFIX=/opt/mailman VAR_PREFIX=${VAR_PREFIX:-/opt/mailman/var/mailman} @@ -68,7 +66,7 @@ mkdir -p $PKG install -d $PKG/$PREFIX -g mailman -o root -m 2775 install -d $PKG/$VAR_PREFIX -g mailman -o root -m 2775 -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/mbpurple/mbpurple.SlackBuild b/network/mbpurple/mbpurple.SlackBuild index 6c20c44880ea7..fad717476a7f1 100644 --- a/network/mbpurple/mbpurple.SlackBuild +++ b/network/mbpurple/mbpurple.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/metasploit/metasploit.SlackBuild b/network/metasploit/metasploit.SlackBuild index 3a7d6458fd678..5146da7cd94b5 100644 --- a/network/metasploit/metasploit.SlackBuild +++ b/network/metasploit/metasploit.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-4.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -120,8 +118,8 @@ chown root:root $PKG/etc/rc.d/rc.$INITSCRIPT.new chmod 755 $PKG/etc/rc.d/rc.$INITSCRIPT.new # Default installation makes pro stuff, starting METASPLOIT_SCRIPT, PROSVC_SCRIPT and WORKER_SCRIPT. Disable this... # We want only to start framework's PostgreSQL -chmod -x $PKG/$INSTDIR/apps/pro/ui/scripts/ctl.sh -chmod -x $PKG/$INSTDIR/apps/pro/engine/scripts/ctl.sh +chmod -x $PKG/$INSTDIR/apps/pro/ui/scripts/ctl.sh +chmod -x $PKG/$INSTDIR/apps/pro/engine/scripts/ctl.sh chmod -x $PKG/$INSTDIR/apps/pro/ui/scripts/worker_ctl.sh # Install /usr/bin links diff --git a/network/mitter/mitter.SlackBuild b/network/mitter/mitter.SlackBuild index c3928951f5607..30f2338b11c84 100644 --- a/network/mitter/mitter.SlackBuild +++ b/network/mitter/mitter.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.4.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mldonkey/mldonkey.SlackBuild b/network/mldonkey/mldonkey.SlackBuild index 203a32ef97359..a830bda672360 100644 --- a/network/mldonkey/mldonkey.SlackBuild +++ b/network/mldonkey/mldonkey.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for mldonkey +# Slackware build script for mldonkey -# This script is originally written by Antonio Hernández Blas and is +# This script is originally written by Antonio Hernández Blas and is # currently maintained by Grissiom. # Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com> diff --git a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild index 075285c0f0921..ea119ab509354 100644 --- a/network/mod_auth_kerb/mod_auth_kerb.SlackBuild +++ b/network/mod_auth_kerb/mod_auth_kerb.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/mod_chroot/mod_chroot.SlackBuild b/network/mod_chroot/mod_chroot.SlackBuild index 8dcb70914eb8f..b67e612f6687c 100644 --- a/network/mod_chroot/mod_chroot.SlackBuild +++ b/network/mod_chroot/mod_chroot.SlackBuild @@ -62,7 +62,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ apxs -ca mod_chroot.c -# Copy into place, and strip +# Copy into place, and strip install --mode=755 --strip .libs/mod_chroot.so $PKG/usr/lib${LIBDIRSUFFIX}/httpd/modules # Create initial environment diff --git a/network/mod_evasive/mod_evasive.SlackBuild b/network/mod_evasive/mod_evasive.SlackBuild index d00f39360e689..61e05caa1d279 100644 --- a/network/mod_evasive/mod_evasive.SlackBuild +++ b/network/mod_evasive/mod_evasive.SlackBuild @@ -13,12 +13,10 @@ VERSION=1.10.1 BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mod_fcgid/mod_fcgid.SlackBuild b/network/mod_fcgid/mod_fcgid.SlackBuild index 6bb649c71e9f4..e4ac55dd67503 100644 --- a/network/mod_fcgid/mod_fcgid.SlackBuild +++ b/network/mod_fcgid/mod_fcgid.SlackBuild @@ -29,12 +29,10 @@ VERSION=2.3.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mod_geoip2/mod_geoip2.SlackBuild b/network/mod_geoip2/mod_geoip2.SlackBuild index 038b1d4cab077..7d72831e9e46c 100644 --- a/network/mod_geoip2/mod_geoip2.SlackBuild +++ b/network/mod_geoip2/mod_geoip2.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mod_ruid2/mod_ruid2.SlackBuild b/network/mod_ruid2/mod_ruid2.SlackBuild index 7f2c1a7619535..070b8408fb14b 100644 --- a/network/mod_ruid2/mod_ruid2.SlackBuild +++ b/network/mod_ruid2/mod_ruid2.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.9.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mod_wsgi/mod_wsgi.SlackBuild b/network/mod_wsgi/mod_wsgi.SlackBuild index 5dd52484b19a0..4d4c4f8e6583e 100644 --- a/network/mod_wsgi/mod_wsgi.SlackBuild +++ b/network/mod_wsgi/mod_wsgi.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh ## Slackware build script for mod_wsgi -## +## ## Copyright 2008 Adis Nezirovic <adis _at_ linux.org.ba> ## Licensed under GNU GPL v2 @@ -25,7 +25,7 @@ OUTPUT=${OUTPUT:-/tmp} # CFLAGS are automatically picked from Python if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" + LIBDIRSUFFIX="64" else LIBDIRSUFFIX="" fi @@ -34,7 +34,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION diff --git a/network/movgrab/movgrab.SlackBuild b/network/movgrab/movgrab.SlackBuild index d906b0471b577..6464951262e09 100644 --- a/network/movgrab/movgrab.SlackBuild +++ b/network/movgrab/movgrab.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/network/msn-proxy/msn-proxy.SlackBuild b/network/msn-proxy/msn-proxy.SlackBuild index f22e3a6d14642..73e5f29d55aec 100644 --- a/network/msn-proxy/msn-proxy.SlackBuild +++ b/network/msn-proxy/msn-proxy.SlackBuild @@ -12,12 +12,10 @@ TAG=${TAG:-_SBo} DOCROOT=${DOCROOT:-var/www/htdocs} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/museek+/museek+.SlackBuild b/network/museek+/museek+.SlackBuild index a3e0afa595d6d..558c65fe4f5b6 100644 --- a/network/museek+/museek+.SlackBuild +++ b/network/museek+/museek+.SlackBuild @@ -9,12 +9,10 @@ VERSION=0.2 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/mysecureshell/mysecureshell.SlackBuild b/network/mysecureshell/mysecureshell.SlackBuild index 85d80a63685d0..30a74ec75911e 100644 --- a/network/mysecureshell/mysecureshell.SlackBuild +++ b/network/mysecureshell/mysecureshell.SlackBuild @@ -12,12 +12,10 @@ TAG=${TAG:-_SBo} ## The source has an underscore SRCNAME=$PRGNAM\_$VERSION -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/naim/naim.SlackBuild b/network/naim/naim.SlackBuild index 394a14b2270eb..15a9f637508b9 100644 --- a/network/naim/naim.SlackBuild +++ b/network/naim/naim.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.11.8.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -69,7 +67,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/network/nbtscan/nbtscan.SlackBuild b/network/nbtscan/nbtscan.SlackBuild index 58673fab5ad61..a339ecbc502b4 100644 --- a/network/nbtscan/nbtscan.SlackBuild +++ b/network/nbtscan/nbtscan.SlackBuild @@ -21,18 +21,16 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + PRGNAM=nbtscan VERSION=${VERSION:-1.0.35} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/netstat-nat/netstat-nat.SlackBuild b/network/netstat-nat/netstat-nat.SlackBuild index ef4d42d9994ce..e175171864916 100644 --- a/network/netstat-nat/netstat-nat.SlackBuild +++ b/network/netstat-nat/netstat-nat.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for netstat-nat +# Slackware build script for netstat-nat # Copyright 2006 Ricardson Williams <ricardsonwilliams at yahoo.com.br> # All rights reserved. @@ -27,12 +27,10 @@ VERSION=1.4.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild index 363f8cdba5c70..44c0744ebc4da 100644 --- a/network/netsurf/netsurf.SlackBuild +++ b/network/netsurf/netsurf.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/ngircd/ngircd.SlackBuild b/network/ngircd/ngircd.SlackBuild index 032c4f1e4fa6a..530e04a09e798 100644 --- a/network/ngircd/ngircd.SlackBuild +++ b/network/ngircd/ngircd.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/ngrep/ngrep.SlackBuild b/network/ngrep/ngrep.SlackBuild index fb7bac73debdf..23a1684ebed02 100644 --- a/network/ngrep/ngrep.SlackBuild +++ b/network/ngrep/ngrep.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.45} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/nikto/nikto.SlackBuild b/network/nikto/nikto.SlackBuild index 6e66cb1cc1fc2..dbafff9c9ac0d 100644 --- a/network/nikto/nikto.SlackBuild +++ b/network/nikto/nikto.SlackBuild @@ -54,7 +54,7 @@ else fi # Most of the packaging techniques for this strange program comes from Debian -# rules file; next time you'll be at the pub with your friendly debianist, +# rules file; next time you'll be at the pub with your friendly debianist, # buy him a beer ;-) set -e diff --git a/network/nload/nload.SlackBuild b/network/nload/nload.SlackBuild index 0781190b0d3de..83aea00e5d3ee 100644 --- a/network/nload/nload.SlackBuild +++ b/network/nload/nload.SlackBuild @@ -10,18 +10,16 @@ VERSION=0.7.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -39,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/noip2/noip2.SlackBuild b/network/noip2/noip2.SlackBuild index 6088add98575e..6762421047c23 100644 --- a/network/noip2/noip2.SlackBuild +++ b/network/noip2/noip2.SlackBuild @@ -30,12 +30,10 @@ VERSION=2.1.9 BUILD=${BUILD:-1} TAG=${TAG=_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/nrpe/nrpe.SlackBuild b/network/nrpe/nrpe.SlackBuild index 3ee5640c006fd..182a3df0232c9 100644 --- a/network/nrpe/nrpe.SlackBuild +++ b/network/nrpe/nrpe.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/nss-mdns/nss-mdns.SlackBuild b/network/nss-mdns/nss-mdns.SlackBuild index f87775b83fde7..b3da80172e79c 100644 --- a/network/nss-mdns/nss-mdns.SlackBuild +++ b/network/nss-mdns/nss-mdns.SlackBuild @@ -9,12 +9,10 @@ VERSION=0.10 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -70,7 +68,7 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/etc +mkdir -p $PKG/etc cat $CWD/mdns.allow > $PKG/etc/mdns.allow.new cat $CWD/nsswitch.conf-mdns > $PKG/etc/nsswitch.conf-mdns.new diff --git a/network/ntpclient/ntpclient.SlackBuild b/network/ntpclient/ntpclient.SlackBuild index 8291d9d8a0c74..8b900451a939b 100644 --- a/network/ntpclient/ntpclient.SlackBuild +++ b/network/ntpclient/ntpclient.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2007_365} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/offlineimap/offlineimap.SlackBuild b/network/offlineimap/offlineimap.SlackBuild index 98c7a3eb17a98..81f55cb24b7fa 100644 --- a/network/offlineimap/offlineimap.SlackBuild +++ b/network/offlineimap/offlineimap.SlackBuild @@ -43,7 +43,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e # In case the source was fetched with wget or some other downloader: [ -e v${VERSION} ] && mv v${VERSION} $SRCNAM.tar.gz diff --git a/network/opendchub/opendchub.SlackBuild b/network/opendchub/opendchub.SlackBuild index 8895cb009af76..5a36f0d5fda22 100644 --- a/network/opendchub/opendchub.SlackBuild +++ b/network/opendchub/opendchub.SlackBuild @@ -24,12 +24,10 @@ VERSION=0.7.15 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -90,7 +88,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL README NEWS Documentation/* \ $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/packit/packit.SlackBuild b/network/packit/packit.SlackBuild index a3fabc66d9048..047da7ca1e1c1 100644 --- a/network/packit/packit.SlackBuild +++ b/network/packit/packit.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.0} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/pdnsd/pdnsd.SlackBuild b/network/pdnsd/pdnsd.SlackBuild index 9e6259ac18e4c..daaa3d9aba618 100644 --- a/network/pdnsd/pdnsd.SlackBuild +++ b/network/pdnsd/pdnsd.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.2.7} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pebrot/pebrot.SlackBuild b/network/pebrot/pebrot.SlackBuild index bd1666540972e..b1379ad78e16e 100644 --- a/network/pebrot/pebrot.SlackBuild +++ b/network/pebrot/pebrot.SlackBuild @@ -29,12 +29,10 @@ VERSION=0.8.8 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/periscope/periscope.SlackBuild b/network/periscope/periscope.SlackBuild index 8e23304e3710c..ad82a5de81e03 100644 --- a/network/periscope/periscope.SlackBuild +++ b/network/periscope/periscope.SlackBuild @@ -47,7 +47,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION # Source tarball *WITHOUT* main directory O_O mkdir $PRGNAM-$VERSION diff --git a/network/pflogsumm/pflogsumm.SlackBuild b/network/pflogsumm/pflogsumm.SlackBuild index 3217ffbd6b7b4..811304d098161 100644 --- a/network/pflogsumm/pflogsumm.SlackBuild +++ b/network/pflogsumm/pflogsumm.SlackBuild @@ -7,10 +7,10 @@ # (nishant _AT_ mnspace _DOT_ net) # All rights reserved. -# Redistribution and use of this script, with or without modification, is +# Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: -# 1. Redistributions of script must retain the above copyright notice, +# 1. Redistributions of script must retain the above copyright notice, # this list of conditions and the following disclaimer. # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS diff --git a/network/pgl/pgl.SlackBuild b/network/pgl/pgl.SlackBuild index 2fa6b194c6dda..c4f9a633d7460 100644 --- a/network/pgl/pgl.SlackBuild +++ b/network/pgl/pgl.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-2.2.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/pidgin-gfire/pidgin-gfire.SlackBuild b/network/pidgin-gfire/pidgin-gfire.SlackBuild index e27a550d6577b..6bc40c3e277ae 100644 --- a/network/pidgin-gfire/pidgin-gfire.SlackBuild +++ b/network/pidgin-gfire/pidgin-gfire.SlackBuild @@ -56,7 +56,7 @@ fi DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pidgin-knotify/pidgin-knotify.SlackBuild b/network/pidgin-knotify/pidgin-knotify.SlackBuild index c1377fa78633d..8c709b5c06ca1 100644 --- a/network/pidgin-knotify/pidgin-knotify.SlackBuild +++ b/network/pidgin-knotify/pidgin-knotify.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild index e97d0651b740d..d4ad53d355df3 100644 --- a/network/pidgin-musictracker/pidgin-musictracker.SlackBuild +++ b/network/pidgin-musictracker/pidgin-musictracker.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-0.4.22} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -57,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pidgin-sound/pidgin-sound.SlackBuild b/network/pidgin-sound/pidgin-sound.SlackBuild index b6dae4e88e483..5658d6d5a9f13 100644 --- a/network/pidgin-sound/pidgin-sound.SlackBuild +++ b/network/pidgin-sound/pidgin-sound.SlackBuild @@ -38,7 +38,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pidgin-visnotes/pidgin-visnotes.SlackBuild b/network/pidgin-visnotes/pidgin-visnotes.SlackBuild index 1aff51e8b1682..df462b97b0814 100644 --- a/network/pidgin-visnotes/pidgin-visnotes.SlackBuild +++ b/network/pidgin-visnotes/pidgin-visnotes.SlackBuild @@ -5,24 +5,22 @@ # Written by otzy_007 (oz@oprod.net) PRGNAM=pidgin-visnotes -VERSION=${VERSION:-0.2} +VERSION=${VERSION:-0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/pidginTeX/pidginTeX.SlackBuild b/network/pidginTeX/pidginTeX.SlackBuild index ba638615a4a2a..fd2bbbc409135 100644 --- a/network/pidginTeX/pidginTeX.SlackBuild +++ b/network/pidginTeX/pidginTeX.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/plowshare/plowshare.SlackBuild b/network/plowshare/plowshare.SlackBuild index b2e41c3763fd0..f9e7886ef2e96 100644 --- a/network/plowshare/plowshare.SlackBuild +++ b/network/plowshare/plowshare.SlackBuild @@ -15,7 +15,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/policyd/policyd.SlackBuild b/network/policyd/policyd.SlackBuild index 286bb10206281..3ab1f7e689794 100644 --- a/network/policyd/policyd.SlackBuild +++ b/network/policyd/policyd.SlackBuild @@ -5,10 +5,10 @@ # Copyright (c) 2008-2009, Nishant Limbachia (nishant@mnspace.net) # All rights reserved. # -# Redistribution and use of this script, with or without modification, is +# Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # -# 1. Redistributions of script must retain the above copyright notice, +# 1. Redistributions of script must retain the above copyright notice, # this list of conditions and the following disclaimer. # # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -30,12 +30,10 @@ VERSION=1.82 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild index 7e27650bb60c8..6329357336132 100644 --- a/network/postfix/postfix.SlackBuild +++ b/network/postfix/postfix.SlackBuild @@ -57,7 +57,7 @@ fi # Build with dovecot sasl by default, cyrus/dovecot are supported SASL=${SASL:-dovecot} case "$SASL" in - dovecot) SASLARGS='-DDEF_SERVER_SASL_TYPE=\"dovecot\"' + dovecot) SASLARGS='-DDEF_SERVER_SASL_TYPE=\"dovecot\"' SASLLIBS="" ;; cyrus) SASLARGS='-DUSE_CYRUS_SASL -I/usr/include/sasl' SASLLIBS="-L/usr/lib${LIBDIRSUFFIX}/sasl2 -lsasl2" ;; @@ -195,9 +195,9 @@ cd $PKG/etc/postfix # Since we gzip the manpages, let's fix the postfix-files to reflect that # so it won't throw errors during post-install ( cd $PKG/usr/libexec/postfix -grep manpage postfix-files | while read line; -do MANPAGE="$(echo "$line" | cut -d: -f1)" - sed -i s#"$MANPAGE"#"$MANPAGE.gz"# postfix-files ; +grep manpage postfix-files | while read line; +do MANPAGE="$(echo "$line" | cut -d: -f1)" + sed -i s#"$MANPAGE"#"$MANPAGE.gz"# postfix-files ; done ) diff --git a/network/postgrey/postgrey.SlackBuild b/network/postgrey/postgrey.SlackBuild index 046c60b70e4db..e7ef1e8f75fc8 100644 --- a/network/postgrey/postgrey.SlackBuild +++ b/network/postgrey/postgrey.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.34} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -64,7 +62,7 @@ else fi do_exit() { - echo ; echo "You must have the ${POSTGREYUSR} user and ${POSTGREYGRP} group + echo ; echo "You must have the ${POSTGREYUSR} user and ${POSTGREYGRP} group in" echo "order to build postgrey. Sample lines to do so are below:" echo "# groupadd -g ${POSTGREYGID} ${POSTGREYGRP}" diff --git a/network/pound/pound.SlackBuild b/network/pound/pound.SlackBuild index fd7cd0669dce2..175e9954a308d 100644 --- a/network/pound/pound.SlackBuild +++ b/network/pound/pound.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for Pound +# Slackware build script for Pound # Copyright 2008 Thales A. Tsailas (ttsailas@enforcingit.com) # All rights reserved. @@ -27,12 +27,10 @@ VERSION=2.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -101,7 +99,7 @@ find $PKG/usr/sbin -type f -exec chmod 0755 {} \; for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done ) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README GPL.txt FAQ CHANGELOG $CWD/README.SLACKWARE \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -110,7 +108,7 @@ chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/* mkdir -p $PKG/var/log/pound touch $PKG/var/log/pound/{access,error}.log chown -R $POUNDUSER:$POUNDGROUP $PKG/var/log/pound - + mkdir -p $PKG/etc/{logrotate.d,pound,rc.d} cat $CWD/pound.logrotate > $PKG/etc/logrotate.d/pound.new cat $CWD/pound.cfg.new > $PKG/etc/pound/pound.cfg.new diff --git a/network/pptp/pptp.SlackBuild b/network/pptp/pptp.SlackBuild index 907e57d5b4e03..6062eac613354 100644 --- a/network/pptp/pptp.SlackBuild +++ b/network/pptp/pptp.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -73,7 +71,7 @@ find . \ -exec chmod 644 {} \; make IP=/sbin/ip OPTIMIZE="$SLKCFLAGS" -make install MANDIR=$PKG/usr/man/man8 DESTDIR=$PKG +make install MANDIR=$PKG/usr/man/man8 DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild index fc582a24361f8..ea386825f1c22 100644 --- a/network/pptpd/pptpd.SlackBuild +++ b/network/pptpd/pptpd.SlackBuild @@ -93,7 +93,7 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG +make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/privoxy/privoxy.SlackBuild b/network/privoxy/privoxy.SlackBuild index 48b42c4279cf6..ea4fb2208d657 100644 --- a/network/privoxy/privoxy.SlackBuild +++ b/network/privoxy/privoxy.SlackBuild @@ -128,7 +128,7 @@ sed -i \ -e "s,%CONF_DEST%,/etc/$PRGNAM," \ -e "s/%USER%/$PRIVOXY_USER/" \ -e "s/%GROUP%/$PRIVOXY_GROUP/" \ - $PKG/etc/rc.d/rc.$PRGNAM.new + $PKG/etc/rc.d/rc.$PRGNAM.new # Make .new files so we don't clobber the existing configuration. for i in config match-all.action trust user.action user.filter; do @@ -140,7 +140,7 @@ done # Don't clobber the logfile either. mv $PKG/var/log/privoxy/logfile $PKG/var/log/privoxy/logfile.new - + # Remove empty directories that are part of Slackware base. rmdir $PKG/usr/share rmdir $PKG/var/run diff --git a/network/proxychains/proxychains.SlackBuild b/network/proxychains/proxychains.SlackBuild index e3feb825a6490..61e3aa69cd18c 100644 --- a/network/proxychains/proxychains.SlackBuild +++ b/network/proxychains/proxychains.SlackBuild @@ -7,22 +7,20 @@ PRGNAM=proxychains VERSION=${VERSION:-4.2.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} DOCS="AUTHORS ChangeLog COPYING README TODO" @@ -41,7 +39,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -64,7 +62,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux + --host=$ARCH-slackware-linux make make install DESTDIR=$PKG diff --git a/network/proxymini/proxymini.SlackBuild b/network/proxymini/proxymini.SlackBuild index 56de36ea1d2a6..a520b709abef8 100644 --- a/network/proxymini/proxymini.SlackBuild +++ b/network/proxymini/proxymini.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/proxytunnel/proxytunnel.SlackBuild b/network/proxytunnel/proxytunnel.SlackBuild index d796ae32c1634..29e1d823ac53e 100644 --- a/network/proxytunnel/proxytunnel.SlackBuild +++ b/network/proxytunnel/proxytunnel.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/putty/putty.SlackBuild b/network/putty/putty.SlackBuild index 3babb340409d8..744e814a2e5cb 100644 --- a/network/putty/putty.SlackBuild +++ b/network/putty/putty.SlackBuild @@ -4,7 +4,7 @@ # Written by <youngmug@animeneko.net> -# Modified by Michael Wagner <lapinours@web.de> +# Modified by Michael Wagner <lapinours@web.de> # as putty now uses autoconf. # Maintained by Binh Nguyen <binhvng@gmail.com> diff --git a/network/pyzor/pyzor.SlackBuild b/network/pyzor/pyzor.SlackBuild index a962a9ec6f60b..bb7a57b3dda1c 100644 --- a/network/pyzor/pyzor.SlackBuild +++ b/network/pyzor/pyzor.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.5.0} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/r2e/r2e.SlackBuild b/network/r2e/r2e.SlackBuild index 5722d2d0ecdb5..009871b90f1bf 100644 --- a/network/r2e/r2e.SlackBuild +++ b/network/r2e/r2e.SlackBuild @@ -12,24 +12,24 @@ # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials # provided with the distribution. -# * Neither the name of Tom Canich nor the names of other -# contributors may be used to endorse or promote products -# derived from this software without specific prior written +# * Neither the name of Tom Canich nor the names of other +# contributors may be used to endorse or promote products +# derived from this software without specific prior written # permission. # # THIS SOFTWARE IS PROVIDED BY Tom Canich ''AS IS'' AND ANY # EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Tom Canich BE LIABLE FOR # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman@slackbuilds.org> @@ -39,12 +39,10 @@ VERSION=2.66 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/radvd/radvd.SlackBuild b/network/radvd/radvd.SlackBuild index ed67033450205..09865bc00315b 100644 --- a/network/radvd/radvd.SlackBuild +++ b/network/radvd/radvd.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.9.3 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -54,11 +52,11 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION @@ -91,11 +89,11 @@ mv $PKG/usr/share/man $PKG/usr/man find . -type f -exec gzip -9 {} \; ) -mkdir -p $PKG/etc/rc.d +mkdir -p $PKG/etc/rc.d install -D -m 0644 $CWD/rc.radvd.new $PKG/etc/rc.d/rc.radvd.new mv $TMP/$PRGNAM-$VERSION/radvd.conf.example $PKG/etc/radvd.conf.new -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CHANGES COPYRIGHT INTRO.html README TODO VERSION \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild index 70cd57daad3e3..a7910b098e2c5 100644 --- a/network/rekonq/rekonq.SlackBuild +++ b/network/rekonq/rekonq.SlackBuild @@ -59,7 +59,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release - make + make make install DESTDIR=$PKG cd .. diff --git a/network/rhapsody/rhapsody.SlackBuild b/network/rhapsody/rhapsody.SlackBuild index f219ecf689499..dcf346f39d221 100644 --- a/network/rhapsody/rhapsody.SlackBuild +++ b/network/rhapsody/rhapsody.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-0.28b} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/rssh/rssh.SlackBuild b/network/rssh/rssh.SlackBuild index caea632977ee3..465cb93e0b8c1 100644 --- a/network/rssh/rssh.SlackBuild +++ b/network/rssh/rssh.SlackBuild @@ -36,7 +36,7 @@ else fi set -e - + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP diff --git a/network/scapy/scapy.SlackBuild b/network/scapy/scapy.SlackBuild index 7b7f2b0d79408..1c04fcbf8c893 100644 --- a/network/scapy/scapy.SlackBuild +++ b/network/scapy/scapy.SlackBuild @@ -22,17 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=${PRGNAM:-scapy} -VERSION=${VERSION:-2.0.1} +PRGNAM=${PRGNAM:-scapy} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -42,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} OUTPUT=${OUTPUT:-/tmp} PKG=$TMP/package-$PRGNAM -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/shorewall/shorewall.SlackBuild b/network/shorewall/shorewall.SlackBuild index 73ec186f89aed..b968cfabbc6ec 100644 --- a/network/shorewall/shorewall.SlackBuild +++ b/network/shorewall/shorewall.SlackBuild @@ -36,7 +36,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/shorewall6/shorewall6.SlackBuild b/network/shorewall6/shorewall6.SlackBuild index 633b04d64b140..829e23acddd50 100644 --- a/network/shorewall6/shorewall6.SlackBuild +++ b/network/shorewall6/shorewall6.SlackBuild @@ -36,7 +36,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/sic/sic.SlackBuild b/network/sic/sic.SlackBuild index 1e15a7d2d556d..39081f38a2221 100644 --- a/network/sic/sic.SlackBuild +++ b/network/sic/sic.SlackBuild @@ -19,7 +19,7 @@ # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sic VERSION=${VERSION:-1.1} diff --git a/network/sparkleshare/sparkleshare.SlackBuild b/network/sparkleshare/sparkleshare.SlackBuild index 877f0978298bb..bf813681624fb 100644 --- a/network/sparkleshare/sparkleshare.SlackBuild +++ b/network/sparkleshare/sparkleshare.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Slackware build script for SparkleShare. - + # Copyright 2012 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild index b2537ea6d35eb..dc9ef7a838148 100644 --- a/network/spice-gtk/spice-gtk.SlackBuild +++ b/network/spice-gtk/spice-gtk.SlackBuild @@ -59,7 +59,7 @@ if [ "$GTK" = "2" ]; then gtkver="2"; else gtkver="3"; fi DOCS="AUTHORS COPYING NEWS README THANKS TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild index 92eb832c994ca..c3d26a8836133 100644 --- a/network/spice/spice.SlackBuild +++ b/network/spice/spice.SlackBuild @@ -62,7 +62,7 @@ else with_cacard="--disable-smartcard" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/sqlninja/sqlninja.SlackBuild b/network/sqlninja/sqlninja.SlackBuild index 8127ff70d8f68..16deb1007b342 100644 --- a/network/sqlninja/sqlninja.SlackBuild +++ b/network/sqlninja/sqlninja.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.2.5 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild index a85e8b66807a1..ab060796da0af 100644 --- a/network/squid/squid.SlackBuild +++ b/network/squid/squid.SlackBuild @@ -102,7 +102,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog INSTALL \ QUICKSTART README RELEASENOTES.html SPONSORS $CWD/README.SBo \ @@ -110,7 +110,7 @@ cp -a \ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown root:root $PKG/usr/doc/$PRGNAM-$VERSION/* -mkdir -p $PKG/etc/{logrotate.d,rc.d} +mkdir -p $PKG/etc/{logrotate.d,rc.d} cat $CWD/rc.squid > $PKG/etc/rc.d/rc.squid.new sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \ @@ -118,7 +118,7 @@ sed -e "s,@USER@,$SQUIDUSER," -e "s,@GROUP@,$SQUIDGROUP," $CWD/squid.logrotate \ mv $PKG/etc/squid/mime.conf $PKG/etc/squid/mime.conf.new mv $PKG/etc/squid/cachemgr.conf $PKG/etc/squid/cachemgr.conf.new -rm $PKG/etc/squid/squid.conf +rm $PKG/etc/squid/squid.conf cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new cat $CWD/squid.conf.documented > $PKG/etc/squid/squid.conf.documented diff --git a/network/sshblock/sshblock.SlackBuild b/network/sshblock/sshblock.SlackBuild index 8f62e06d5f21c..a45b7e6816dd1 100644 --- a/network/sshblock/sshblock.SlackBuild +++ b/network/sshblock/sshblock.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/sslscan/sslscan.SlackBuild b/network/sslscan/sslscan.SlackBuild index f8428746f421e..a8d3a1a110cfd 100644 --- a/network/sslscan/sslscan.SlackBuild +++ b/network/sslscan/sslscan.SlackBuild @@ -25,18 +25,16 @@ # # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # 2010 June 16 - initial release - + PRGNAM=sslscan VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -59,7 +57,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/network/sslstrip/sslstrip.SlackBuild b/network/sslstrip/sslstrip.SlackBuild index 315b8f7b2208a..81035847880a7 100644 --- a/network/sslstrip/sslstrip.SlackBuild +++ b/network/sslstrip/sslstrip.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/strongswan/strongswan.SlackBuild b/network/strongswan/strongswan.SlackBuild index 546e0ec68999c..8744ab3ce9fe1 100644 --- a/network/strongswan/strongswan.SlackBuild +++ b/network/strongswan/strongswan.SlackBuild @@ -27,12 +27,10 @@ VERSION=4.3.5 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -70,7 +68,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; - + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/sylpheed/sylpheed.SlackBuild b/network/sylpheed/sylpheed.SlackBuild index 407fde03acc58..b31ddc4923734 100644 --- a/network/sylpheed/sylpheed.SlackBuild +++ b/network/sylpheed/sylpheed.SlackBuild @@ -26,16 +26,14 @@ # Modified by the SlackBuilds.org project PRGNAM=sylpheed -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -45,7 +43,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="ABOUT-NLS AUTHORS COPYING COPYING.LIB +DOCS="ABOUT-NLS AUTHORS COPYING COPYING.LIB INSTALL LICENSE README TODO" set -e @@ -88,10 +86,10 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux -make -make install-strip DESTDIR=$PKG +make +make install-strip DESTDIR=$PKG -# Install desktop file and icon (we'll use the largest icon available by +# Install desktop file and icon (we'll use the largest icon available by # default - that way, it will scale down just fine for users who need a # smaller one, but smaller ones don't always scale larger so well) mkdir -p $PKG/usr/share/{applications,pixmaps} diff --git a/network/t50/t50.SlackBuild b/network/t50/t50.SlackBuild index 834c6138fab46..ca1824aed4bf8 100644 --- a/network/t50/t50.SlackBuild +++ b/network/t50/t50.SlackBuild @@ -29,12 +29,10 @@ TAG=${TAG:-_SBo} SRCVERS=$(echo $VERSION | tr _ -) -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -59,7 +57,7 @@ else fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP diff --git a/network/tcptunnel/tcptunnel.SlackBuild b/network/tcptunnel/tcptunnel.SlackBuild index 99364b3cacc50..67aac038596c9 100644 --- a/network/tcptunnel/tcptunnel.SlackBuild +++ b/network/tcptunnel/tcptunnel.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/teamviewer/teamviewer.SlackBuild b/network/teamviewer/teamviewer.SlackBuild index d59844714da4d..c30d68e539559 100644 --- a/network/teamviewer/teamviewer.SlackBuild +++ b/network/teamviewer/teamviewer.SlackBuild @@ -23,7 +23,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Willy Sudiarto Raharjo +# Modified by Willy Sudiarto Raharjo # Changelog # January 9, Upgraded to 8.0.16675, added rc.teamviewerd to provide teamviewer daemon # January 12, Rebuilt to create symlink in /usr/bin, thanks to Ponce diff --git a/network/thrift/thrift.SlackBuild b/network/thrift/thrift.SlackBuild index acd3657a8d8bc..4cc7367ccdde8 100644 --- a/network/thrift/thrift.SlackBuild +++ b/network/thrift/thrift.SlackBuild @@ -3,11 +3,11 @@ # Slackware build script for Apache Thrift # Copyright (c) 2010-2011, Fred Emmott <mail@fredemmott.co.uk> -# +# # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. -# +# # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -48,7 +48,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/thttpd/thttpd.SlackBuild b/network/thttpd/thttpd.SlackBuild index 784b7b141a85c..54cbf98b1c7c7 100644 --- a/network/thttpd/thttpd.SlackBuild +++ b/network/thttpd/thttpd.SlackBuild @@ -121,7 +121,7 @@ sed -i '/WEBGROUP =/ s/www/'$PRGNAM'/' Makefile* extras/Makefile* cgi-src/Makefi ## Use this line ONLY if you are going to build thttpd as a normal user. ##sed -i '/WEBGROUP =/ s/www/'$(/bin/id -ng)'/' Makefile* extras/Makefile* cgi-src/Makefile* -# Disable the use of bin as owner user and group. +# Disable the use of bin as owner user and group. sed -i 's/-o bin -g bin//' Makefile* extras/Makefile* cgi-src/Makefile* # Create required directories diff --git a/network/tinyproxy/tinyproxy.SlackBuild b/network/tinyproxy/tinyproxy.SlackBuild index b71d8159e5166..3744ab5533691 100644 --- a/network/tinyproxy/tinyproxy.SlackBuild +++ b/network/tinyproxy/tinyproxy.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.8.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/tor/tor.SlackBuild b/network/tor/tor.SlackBuild index 9fd2b73e3fa8a..7967be938e027 100644 --- a/network/tor/tor.SlackBuild +++ b/network/tor/tor.SlackBuild @@ -33,12 +33,10 @@ TOR_UID=${TOR_UID:-220} TOR_GROUP=${TOR_GROUP:-tor} TOR_GID=${TOR_GID:-220} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/tramp/tramp.SlackBuild b/network/tramp/tramp.SlackBuild index 98268ad69a3ad..d88224d281932 100644 --- a/network/tramp/tramp.SlackBuild +++ b/network/tramp/tramp.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.2.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild index 7aaa297e199e9..d5cbbdaf34a56 100644 --- a/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild +++ b/network/transmission-remote-gtk/transmission-remote-gtk.SlackBuild @@ -1,10 +1,10 @@ #!/bin/sh -# Slackware build script for transmission-remote-gtk +# Slackware build script for transmission-remote-gtk # Copyright 2012-2013 Chris Walker Copperas Cove, TX # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: diff --git a/network/ttcp/ttcp.SlackBuild b/network/ttcp/ttcp.SlackBuild index 77f7a22605d22..a9f58e75e72c5 100644 --- a/network/ttcp/ttcp.SlackBuild +++ b/network/ttcp/ttcp.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/ttdnsd/ttdnsd.SlackBuild b/network/ttdnsd/ttdnsd.SlackBuild index 7acd376f4967b..9e29da2326f71 100644 --- a/network/ttdnsd/ttdnsd.SlackBuild +++ b/network/ttdnsd/ttdnsd.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/tunctl/tunctl.SlackBuild b/network/tunctl/tunctl.SlackBuild index 4d830244cb406..840cd4f79d78e 100644 --- a/network/tunctl/tunctl.SlackBuild +++ b/network/tunctl/tunctl.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.5} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -53,7 +51,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make CFLAGS="$SLKCFLAGS" +make CFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/network/twitter-cmdline/twitter-cmdline.SlackBuild b/network/twitter-cmdline/twitter-cmdline.SlackBuild index 5445d86e0a202..bdd8ca9d84c66 100644 --- a/network/twitter-cmdline/twitter-cmdline.SlackBuild +++ b/network/twitter-cmdline/twitter-cmdline.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh - + # Slackware build script for twitter-cmdline. # # Copyright 2009-2010 Marco Bonetti <sid77@slackware.it> @@ -28,12 +28,10 @@ VERSION=1.03 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/ucspi-ssl/ucspi-ssl.SlackBuild b/network/ucspi-ssl/ucspi-ssl.SlackBuild index ed51be7c37a54..0956a938e6bcc 100644 --- a/network/ucspi-ssl/ucspi-ssl.SlackBuild +++ b/network/ucspi-ssl/ucspi-ssl.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.70} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/ucspi-tcp/ucspi-tcp.SlackBuild b/network/ucspi-tcp/ucspi-tcp.SlackBuild index 21312cee13289..e7645baa045da 100644 --- a/network/ucspi-tcp/ucspi-tcp.SlackBuild +++ b/network/ucspi-tcp/ucspi-tcp.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.88} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -49,7 +47,7 @@ find . \ -exec chmod 644 {} \; echo gcc $SLKCFLAGS > conf-cc -echo $PKG/usr > conf-home +echo $PKG/usr > conf-home patch -p1 < $CWD/patches/ucspi-tcp-0.88.errno.patch patch -p1 < $CWD/patches/ucspi-tcp-0.88.nobase.patch diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild index a3f30459a4baa..1f25cad7f03ca 100644 --- a/network/urlgrabber/urlgrabber.SlackBuild +++ b/network/urlgrabber/urlgrabber.SlackBuild @@ -29,12 +29,10 @@ VERSION=3.10 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -78,7 +76,7 @@ cp -a ChangeLog LICENSE README TODO \ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # there are doc files on /usr/share (duplicated on /usr/doc) -rm -r $PKG/usr/share/doc +rm -r $PKG/usr/share/doc rmdir $PKG/usr/share || true # if there is anything else on /usr/share, leave it alone mkdir -p $PKG/install diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild index 9610c6738e82f..f0bf00cfa721d 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/verlihub/verlihub.SlackBuild b/network/verlihub/verlihub.SlackBuild index 7bc3f6acbf78c..5bac3fbca7ca0 100644 --- a/network/verlihub/verlihub.SlackBuild +++ b/network/verlihub/verlihub.SlackBuild @@ -30,12 +30,10 @@ TAG=${TAG:-_SBo} # Temporary package version, for source to unpack successfuly TMPVER=${TMPVER:-0.9.8e-r2} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/vnstat/vnstat.SlackBuild b/network/vnstat/vnstat.SlackBuild index f6ee928fa6cca..c1711658f2c33 100644 --- a/network/vnstat/vnstat.SlackBuild +++ b/network/vnstat/vnstat.SlackBuild @@ -55,7 +55,7 @@ find . \ set -e -# vnstat doesn't have a proper configure. So we set the locations in the +# vnstat doesn't have a proper configure. So we set the locations in the # Makefiles properly by the way of sed-fu sed -i 's#MAN = $(DESTDIR)/usr/share/man#MAN = $(DESTDIR)/usr/man#' \ $TMP/$PRGNAM-$VERSION/Makefile diff --git a/network/vpnc/vpnc.SlackBuild b/network/vpnc/vpnc.SlackBuild index f99eca7df5eb3..b44c9bc1025f6 100644 --- a/network/vpnc/vpnc.SlackBuild +++ b/network/vpnc/vpnc.SlackBuild @@ -38,12 +38,10 @@ VERSION=0.5.3 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/wol/wol.SlackBuild b/network/wol/wol.SlackBuild index 5c323901c55eb..7b502f2761d59 100644 --- a/network/wol/wol.SlackBuild +++ b/network/wol/wol.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.7.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/wput/wput.SlackBuild b/network/wput/wput.SlackBuild index 71fe8a0f018b0..a3998b87125ea 100644 --- a/network/wput/wput.SlackBuild +++ b/network/wput/wput.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -39,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG/usr/{bin,man/man1} $OUTPUT @@ -63,7 +61,7 @@ CXXFLAGS="$SLKCFLAGS" \ --host=$ARCH-slackware-linux # Maximum compression for the man file: -sed -i 's/gzip/gzip -9/' doc/Makefile +sed -i 's/gzip/gzip -9/' doc/Makefile # Unable to set --datadir for configure script: sed -i 's/^datadir *= $(prefix)\/share/datadir = $(prefix)/' Makefile diff --git a/network/wvdial/wvdial.SlackBuild b/network/wvdial/wvdial.SlackBuild index 23d90563663c9..a3d4d9611dbbe 100644 --- a/network/wvdial/wvdial.SlackBuild +++ b/network/wvdial/wvdial.SlackBuild @@ -37,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -53,7 +53,7 @@ find . \ -exec chmod 644 {} \; ./configure -make -j1 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" +make -j1 CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make prefix=$PKG/usr PPPDIR=$PKG/etc/ppp/peers MANDIR=$PKG/usr/man install cat $CWD/wvdial.conf > $PKG/etc/wvdial.conf.new diff --git a/network/xinetd/xinetd.SlackBuild b/network/xinetd/xinetd.SlackBuild index 7abc64fce73ab..e2fa004e976bf 100644 --- a/network/xinetd/xinetd.SlackBuild +++ b/network/xinetd/xinetd.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -91,7 +91,7 @@ make install DESTDIR=$PKG # Install config files mkdir -p $PKG/etc/xinetd.d/ cat contrib/xinetd.conf > $PKG/etc/xinetd.conf.new -for file in contrib/xinetd.d/* ; do +for file in contrib/xinetd.d/* ; do cat $file > $PKG/etc/xinetd.d/$(basename $file).new ; done diff --git a/network/xl2tpd/xl2tpd.SlackBuild b/network/xl2tpd/xl2tpd.SlackBuild index c3f84672c93ea..ea6583de6fdc5 100644 --- a/network/xl2tpd/xl2tpd.SlackBuild +++ b/network/xl2tpd/xl2tpd.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -64,7 +62,7 @@ sed -i \ # build the program make -make install DESTDIR=$PKG +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/xnetload/xnetload.SlackBuild b/network/xnetload/xnetload.SlackBuild index c7ac98c379ff4..5059f928db5eb 100644 --- a/network/xnetload/xnetload.SlackBuild +++ b/network/xnetload/xnetload.SlackBuild @@ -56,7 +56,7 @@ find . \ make mkdir -p $PKG/usr/bin $PKG/usr/man/man1 -make install BINDIR=$PKG/usr/bin MANDIR=$PKG/usr/man/man1 +make install BINDIR=$PKG/usr/bin MANDIR=$PKG/usr/man/man1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/xombrero/xombrero.SlackBuild b/network/xombrero/xombrero.SlackBuild index d06cfd7279dcb..40f57575ba5cb 100644 --- a/network/xombrero/xombrero.SlackBuild +++ b/network/xombrero/xombrero.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/youtube-dl/youtube-dl.SlackBuild b/network/youtube-dl/youtube-dl.SlackBuild index 817efb2d33134..4cc26b7e2c3e9 100644 --- a/network/youtube-dl/youtube-dl.SlackBuild +++ b/network/youtube-dl/youtube-dl.SlackBuild @@ -35,7 +35,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/network/zabbix_agentd/zabbix_agentd.SlackBuild b/network/zabbix_agentd/zabbix_agentd.SlackBuild index 1a579d9fd53bb..8ec9ed79fd503 100644 --- a/network/zabbix_agentd/zabbix_agentd.SlackBuild +++ b/network/zabbix_agentd/zabbix_agentd.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/zabbix_proxy/zabbix_proxy.SlackBuild b/network/zabbix_proxy/zabbix_proxy.SlackBuild index 17b5c0de0ae32..0c8fea1df6327 100644 --- a/network/zabbix_proxy/zabbix_proxy.SlackBuild +++ b/network/zabbix_proxy/zabbix_proxy.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/zabbix_server/zabbix_server.SlackBuild b/network/zabbix_server/zabbix_server.SlackBuild index 60d0bcd4a427d..c477511a45cda 100644 --- a/network/zabbix_server/zabbix_server.SlackBuild +++ b/network/zabbix_server/zabbix_server.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.0.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/network/znc/znc.SlackBuild b/network/znc/znc.SlackBuild index c2992f4fbe705..46ee836bcfcb0 100644 --- a/network/znc/znc.SlackBuild +++ b/network/znc/znc.SlackBuild @@ -72,7 +72,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION @@ -150,7 +150,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/etc/znc chown -R $ZNC_USER $PKG/etc/znc -# Install an init script +# Install an init script mkdir -p $PKG/etc/rc.d sed -e "s/@ZNC_USER@/$ZNC_USER/g" -e "s/@VERSION@/$VERSION/g" $CWD/rc.znc \ > $PKG/etc/rc.d/rc.znc.new |