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 /libraries | |
| parent | 610e8461bb9b201adbd4bd9257a9bf48be71f62b (diff) | |
various: Fix SlackBuild formatting and comment nit picks.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'libraries')
208 files changed, 201 insertions, 469 deletions
diff --git a/libraries/BeautifulSoup/BeautifulSoup.SlackBuild b/libraries/BeautifulSoup/BeautifulSoup.SlackBuild index c9a847b0426d..8f631d30ebbf 100644 --- a/libraries/BeautifulSoup/BeautifulSoup.SlackBuild +++ b/libraries/BeautifulSoup/BeautifulSoup.SlackBuild @@ -46,7 +46,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/libraries/CEGUI/CEGUI.SlackBuild b/libraries/CEGUI/CEGUI.SlackBuild index e9454cab13f1..e3b174e97bca 100644 --- a/libraries/CEGUI/CEGUI.SlackBuild +++ b/libraries/CEGUI/CEGUI.SlackBuild @@ -62,7 +62,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/libraries/CGAL/CGAL.SlackBuild b/libraries/CGAL/CGAL.SlackBuild index 1c28eb243314..94c3c5abf378 100644 --- a/libraries/CGAL/CGAL.SlackBuild +++ b/libraries/CGAL/CGAL.SlackBuild @@ -76,7 +76,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/libraries/Crypt-SSLeay/Crypt-SSLeay.SlackBuild b/libraries/Crypt-SSLeay/Crypt-SSLeay.SlackBuild index 8d7e373b5549..1e75a7af22d7 100644 --- a/libraries/Crypt-SSLeay/Crypt-SSLeay.SlackBuild +++ b/libraries/Crypt-SSLeay/Crypt-SSLeay.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh - + # Slackware build script for Crypt-SSLeay # Modified by SlackBuilds.org --dsomero # @@ -28,12 +28,10 @@ VERSION=0.64 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/libraries/DevIL/DevIL.SlackBuild b/libraries/DevIL/DevIL.SlackBuild index bcd254b1ce16..42f8a8040c7b 100644 --- a/libraries/DevIL/DevIL.SlackBuild +++ b/libraries/DevIL/DevIL.SlackBuild @@ -10,12 +10,10 @@ PKG_VERSION=${VERSION}_rc2 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 @@ -41,9 +39,9 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$(echo $PKG_VERSION | tr _ -).tar.gz cd $PRGNAM-$VERSION @@ -63,7 +61,7 @@ patch -p1 < $CWD/patches/devil-1.6.8-libpng14.patch # Thanks to David Somero for the heads up on this. patch -p1 < $CWD/patches/ILvoid_fix_1.diff patch -p1 < $CWD/patches/ILvoid_fix_2.diff -# There is a space in the filename's path, so we have to cd into +# There is a space in the filename's path, so we have to cd into # the offending directory before patching. ( cd cpp\ wrapper patch < $CWD/patches/ILvoid_fix_3.diff diff --git a/libraries/GLee/GLee.SlackBuild b/libraries/GLee/GLee.SlackBuild index 8823736c3c0e..b7308870c633 100644 --- a/libraries/GLee/GLee.SlackBuild +++ b/libraries/GLee/GLee.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-5.4.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 +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/GeoIP-Python/GeoIP-Python.SlackBuild b/libraries/GeoIP-Python/GeoIP-Python.SlackBuild index e6b38ad18e33..c9dfe4b0e605 100644 --- a/libraries/GeoIP-Python/GeoIP-Python.SlackBuild +++ b/libraries/GeoIP-Python/GeoIP-Python.SlackBuild @@ -35,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/Geraldo/Geraldo.SlackBuild b/libraries/Geraldo/Geraldo.SlackBuild index abe4d5b95ea5..c09ba5378226 100644 --- a/libraries/Geraldo/Geraldo.SlackBuild +++ b/libraries/Geraldo/Geraldo.SlackBuild @@ -38,7 +38,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/Impacket/Impacket.SlackBuild b/libraries/Impacket/Impacket.SlackBuild index 8536d3fda364..240f71f347d9 100644 --- a/libraries/Impacket/Impacket.SlackBuild +++ b/libraries/Impacket/Impacket.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.9.6.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 @@ -48,7 +46,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION diff --git a/libraries/ORBit2/ORBit2.SlackBuild b/libraries/ORBit2/ORBit2.SlackBuild index af18df497b71..8c7ed3e29720 100644 --- a/libraries/ORBit2/ORBit2.SlackBuild +++ b/libraries/ORBit2/ORBit2.SlackBuild @@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # Ref: https://bugzilla.gnome.org/show_bug.cgi?id=696900 -sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile +sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile make make install-strip DESTDIR=$PKG diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 29297d8776ad..c83d99da126f 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-3.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/libraries/PDFlib-Lite/PDFlib-Lite.SlackBuild b/libraries/PDFlib-Lite/PDFlib-Lite.SlackBuild index 0c8e9f34a506..252ffcc0eb3e 100644 --- a/libraries/PDFlib-Lite/PDFlib-Lite.SlackBuild +++ b/libraries/PDFlib-Lite/PDFlib-Lite.SlackBuild @@ -1,11 +1,11 @@ #!/bin/sh # Slackware build script for PDFlib-Lite -# Written by Petar Petrov, <ppetrov@paju.oulu.fi> and +# Written by Petar Petrov, <ppetrov@paju.oulu.fi> and # hereby submitted to the public domain -# THIS SLACKBUILD IS DISTRIBUTETD IN THE HOPE OF BEING -# USEFUL BUT WITHOUT ANY WARRANTY. THE AUTHOR IS _NOT_ +# THIS SLACKBUILD IS DISTRIBUTETD IN THE HOPE OF BEING +# USEFUL BUT WITHOUT ANY WARRANTY. THE AUTHOR IS _NOT_ # RESPONSIBLE FOR ANY DAMAGE OR DATA LOSS CAUSED BY IT. PRGNAM=PDFlib-Lite diff --git a/libraries/PyQwt/PyQwt.SlackBuild b/libraries/PyQwt/PyQwt.SlackBuild index a2d94fb33dab..03fae1c1aa75 100644 --- a/libraries/PyQwt/PyQwt.SlackBuild +++ b/libraries/PyQwt/PyQwt.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-5.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/libraries/PyXML/PyXML.SlackBuild b/libraries/PyXML/PyXML.SlackBuild index 0911fafa20a5..c2aa7e3417dc 100644 --- a/libraries/PyXML/PyXML.SlackBuild +++ b/libraries/PyXML/PyXML.SlackBuild @@ -32,12 +32,10 @@ VERSION=0.8.4 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/libraries/PyYAML/PyYAML.SlackBuild b/libraries/PyYAML/PyYAML.SlackBuild index ff8146424df2..45d2dc2ea7d6 100644 --- a/libraries/PyYAML/PyYAML.SlackBuild +++ b/libraries/PyYAML/PyYAML.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/QuantLib-Python/QuantLib-Python.SlackBuild b/libraries/QuantLib-Python/QuantLib-Python.SlackBuild index f8b26a422595..285e3fb780bc 100644 --- a/libraries/QuantLib-Python/QuantLib-Python.SlackBuild +++ b/libraries/QuantLib-Python/QuantLib-Python.SlackBuild @@ -11,12 +11,10 @@ TAG=${TAG:-_SBo} SRCNAM=QuantLib-SWIG -# 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/libraries/QuantLib/QuantLib.SlackBuild b/libraries/QuantLib/QuantLib.SlackBuild index 79e3fbcef74b..0c6f355e685c 100644 --- a/libraries/QuantLib/QuantLib.SlackBuild +++ b/libraries/QuantLib/QuantLib.SlackBuild @@ -7,12 +7,10 @@ VERSION=${VERSION:-1.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/libraries/SDL_sound/SDL_sound.SlackBuild b/libraries/SDL_sound/SDL_sound.SlackBuild index 914e12d21c72..7db488343674 100644 --- a/libraries/SDL_sound/SDL_sound.SlackBuild +++ b/libraries/SDL_sound/SDL_sound.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.0.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/libraries/SimGear/SimGear.SlackBuild b/libraries/SimGear/SimGear.SlackBuild index 340dabf6d70f..ad20cfa9c937 100644 --- a/libraries/SimGear/SimGear.SlackBuild +++ b/libraries/SimGear/SimGear.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-2.12.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/libraries/agg/agg.SlackBuild b/libraries/agg/agg.SlackBuild index e79addc30582..83e6941204c4 100644 --- a/libraries/agg/agg.SlackBuild +++ b/libraries/agg/agg.SlackBuild @@ -40,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/alglib/alglib.SlackBuild b/libraries/alglib/alglib.SlackBuild index 8a6a8d419cf0..739e8fb11514 100644 --- a/libraries/alglib/alglib.SlackBuild +++ b/libraries/alglib/alglib.SlackBuild @@ -26,10 +26,10 @@ # http://aur.archlinux.org/packages/al/alglib/PKGBUILD # PKGBUILD contributor is Carlo Casta. Thank you! -PRGNAM=alglib +PRGNAM=alglib VERSION=${VERSION:-2.6.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/libraries/ant-contrib/ant-contrib.SlackBuild b/libraries/ant-contrib/ant-contrib.SlackBuild index 0dc6fb33183f..96561bc78782 100644 --- a/libraries/ant-contrib/ant-contrib.SlackBuild +++ b/libraries/ant-contrib/ant-contrib.SlackBuild @@ -10,12 +10,10 @@ TAG=${TAG:-_SBo} ANT_HOME=${ANT_HOME:-/usr/share/ant} -# 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/libraries/argtable/argtable.SlackBuild b/libraries/argtable/argtable.SlackBuild index 2d4e242ab81d..93827f30424d 100644 --- a/libraries/argtable/argtable.SlackBuild +++ b/libraries/argtable/argtable.SlackBuild @@ -28,12 +28,10 @@ SRCVER=2-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 @@ -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/libraries/atlas/atlas.SlackBuild b/libraries/atlas/atlas.SlackBuild index 21ff510379dc..d0126d7712fd 100644 --- a/libraries/atlas/atlas.SlackBuild +++ b/libraries/atlas/atlas.SlackBuild @@ -62,13 +62,13 @@ fi # MAX_MALLOC=${MAX_MALLOC:-268435456} -# If you don't want to use architectural defaults set the following to +# If you don't want to use architectural defaults set the following to # something like "no". USE_ARCH_DEFAULTS=${USE_ARCH_DEFAULTS:-yes} -# The path to a reference BLAS library. By default it is assumed that you -# have installed the netlib BLAS reference using the appropriate slackbuild -# from slackbuilds.org. If this is not the case, you have to run this script +# The path to a reference BLAS library. By default it is assumed that you +# have installed the netlib BLAS reference using the appropriate slackbuild +# from slackbuilds.org. If this is not the case, you have to run this script # with another value for REF_BLAS. REF_BLAS=${REF_BLAS:-/usr/lib${LIBDIRSUFFIX}/libblas.a} @@ -108,7 +108,7 @@ BLDdir=BuildDir # Get the CPU frequency for good timing. CPU_FREQ="$(cat /proc/cpuinfo |grep "cpu MHz"| head -n 1| cut -d ":" -s -f2| tr -d [:blank:])" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/audiere/audiere.SlackBuild b/libraries/audiere/audiere.SlackBuild index 7237ace1bd77..5b76cae81e16 100644 --- a/libraries/audiere/audiere.SlackBuild +++ b/libraries/audiere/audiere.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.9.4} 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 @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -53,8 +51,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/patches/audiere-1.9.4-gcc44.patch -patch -p1 < $CWD/patches/audiere-1.9.4-flac.patch +patch -p1 < $CWD/patches/audiere-1.9.4-gcc44.patch +patch -p1 < $CWD/patches/audiere-1.9.4-flac.patch patch -p1 < $CWD/patches/audiere-1.9.4-speex.patch sh bootstrap @@ -71,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -# Not build examples +# Not build examples sed -i s/"SUBDIRS = doc src examples test"/"SUBDIRS = doc src test"/ Makefile make make install DESTDIR=$PKG diff --git a/libraries/blas/blas.SlackBuild b/libraries/blas/blas.SlackBuild index d9fb4f8e2015..6c900e471b09 100644 --- a/libraries/blas/blas.SlackBuild +++ b/libraries/blas/blas.SlackBuild @@ -26,7 +26,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -44,7 +44,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild index 096c1ab509dc..05e134840f66 100644 --- a/libraries/cairomm/cairomm.SlackBuild +++ b/libraries/cairomm/cairomm.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.10.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/libraries/cbase/cbase.SlackBuild b/libraries/cbase/cbase.SlackBuild index 135f6cc872fe..3e8bf47c740e 100644 --- a/libraries/cbase/cbase.SlackBuild +++ b/libraries/cbase/cbase.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-1.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 @@ -43,7 +41,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/chromaprint/chromaprint.SlackBuild b/libraries/chromaprint/chromaprint.SlackBuild index 4243805fb948..48c1485ec1dc 100644 --- a/libraries/chromaprint/chromaprint.SlackBuild +++ b/libraries/chromaprint/chromaprint.SlackBuild @@ -64,7 +64,7 @@ fi DOCS="CHANGES.txt COPYING.txt NEWS.txt README.txt" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -90,7 +90,7 @@ cd build -DWITH_FFTW3="$fftw3" \ -DBUILD_TOOLS="$tools" \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/libraries/configobj/configobj.SlackBuild b/libraries/configobj/configobj.SlackBuild index 2ff397a03d6d..17c244d19d84 100644 --- a/libraries/configobj/configobj.SlackBuild +++ b/libraries/configobj/configobj.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-4.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 @@ -24,7 +22,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/libraries/cryptopp/cryptopp.SlackBuild b/libraries/cryptopp/cryptopp.SlackBuild index dbf713911711..b58c133e5aa6 100644 --- a/libraries/cryptopp/cryptopp.SlackBuild +++ b/libraries/cryptopp/cryptopp.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-5.6.1} 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/libraries/ctemplate/ctemplate.SlackBuild b/libraries/ctemplate/ctemplate.SlackBuild index 860ec93d5e52..15c3b167f467 100644 --- a/libraries/ctemplate/ctemplate.SlackBuild +++ b/libraries/ctemplate/ctemplate.SlackBuild @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -80,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --build=$ARCH-slackware-linux -make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG +make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/darcsver/darcsver.SlackBuild b/libraries/darcsver/darcsver.SlackBuild index f75a6ba34647..dff30736b062 100644 --- a/libraries/darcsver/darcsver.SlackBuild +++ b/libraries/darcsver/darcsver.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-1.7.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/libraries/equinox/equinox.SlackBuild b/libraries/equinox/equinox.SlackBuild index 04988490cba2..8d6292d434d6 100644 --- a/libraries/equinox/equinox.SlackBuild +++ b/libraries/equinox/equinox.SlackBuild @@ -53,7 +53,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Starting with glib 2.32 it is now mandatory to +# Starting with glib 2.32 it is now mandatory to # include glib.h instead of individual headers. patch -p1 -i $CWD/glib-single-include.patch diff --git a/libraries/exempi/exempi.SlackBuild b/libraries/exempi/exempi.SlackBuild index a623a8108006..0e63e2a737df 100644 --- a/libraries/exempi/exempi.SlackBuild +++ b/libraries/exempi/exempi.SlackBuild @@ -55,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/fltk/fltk.SlackBuild b/libraries/fltk/fltk.SlackBuild index a0e106305b03..b0958493ecb3 100644 --- a/libraries/fltk/fltk.SlackBuild +++ b/libraries/fltk/fltk.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.1.10 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 @@ -77,7 +75,7 @@ find -L . \ patch -p1 -i $CWD/fltk-1.1.10-pkgconfig_xft.patch patch -p1 -i $CWD/fltk-1.1.x-r5750-undefined.patch -# Fix linking when --libdir=/usr/lib64 +# Fix linking when --libdir=/usr/lib64 sed -i \ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ src/Makefile || exit @@ -97,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-threads \ --enable-xinerama \ --enable-xft \ - --enable-xdbe + --enable-xdbe make make install DESTDIR=$PKG diff --git a/libraries/fltk13/fltk13.SlackBuild b/libraries/fltk13/fltk13.SlackBuild index 13e042b6431e..3a262e339ac8 100644 --- a/libraries/fltk13/fltk13.SlackBuild +++ b/libraries/fltk13/fltk13.SlackBuild @@ -74,7 +74,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 {} \; -# Fix linking when --libdir=/usr/lib64 +# Fix linking when --libdir=/usr/lib64 sed -i \ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ src/Makefile || exit diff --git a/libraries/fmodapi/fmodapi.SlackBuild b/libraries/fmodapi/fmodapi.SlackBuild index d53f09884425..ef0d8e294528 100644 --- a/libraries/fmodapi/fmodapi.SlackBuild +++ b/libraries/fmodapi/fmodapi.SlackBuild @@ -10,12 +10,10 @@ SRCVER=$( echo $VERSION | sed 's/\.//g' ) 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 @@ -36,7 +34,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -57,7 +55,7 @@ mkdir -p $PKG/usr/include/fmodex ( cd api/lib cp -a libfmodex*.so* $PKG/usr/lib${LIBDIRSUFFIX} ) - + ( cd api/inc cp -a * $PKG/usr/include/fmodex ) diff --git a/libraries/fox-toolkit/fox-toolkit.SlackBuild b/libraries/fox-toolkit/fox-toolkit.SlackBuild index 0339f56ad07a..3f2838baccb7 100644 --- a/libraries/fox-toolkit/fox-toolkit.SlackBuild +++ b/libraries/fox-toolkit/fox-toolkit.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for fox-toolkit -# Copyright 2006-2013 Robby Workman, Northport, AL, USA +# Copyright 2006-2013 Robby Workman, Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.6.49} 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 @@ -58,7 +56,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf fox-$VERSION diff --git a/libraries/fpconst/fpconst.SlackBuild b/libraries/fpconst/fpconst.SlackBuild index 20c5c6d15f3e..e3801d15b0c3 100644 --- a/libraries/fpconst/fpconst.SlackBuild +++ b/libraries/fpconst/fpconst.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.7.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/libraries/freealut/freealut.SlackBuild b/libraries/freealut/freealut.SlackBuild index a84bd57b999a..b1a91e3322d5 100644 --- a/libraries/freealut/freealut.SlackBuild +++ b/libraries/freealut/freealut.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.1.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/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild index ae6e370803d1..6164a717791f 100644 --- a/libraries/frei0r/frei0r.SlackBuild +++ b/libraries/frei0r/frei0r.SlackBuild @@ -34,12 +34,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 @@ -63,7 +61,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -88,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux - + make make install DESTDIR=$PKG diff --git a/libraries/ftgl/ftgl.SlackBuild b/libraries/ftgl/ftgl.SlackBuild index ee47752ef385..0a528f5fd501 100644 --- a/libraries/ftgl/ftgl.SlackBuild +++ b/libraries/ftgl/ftgl.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.1.3_rc5} 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/libraries/gdk-pixbuf/gdk-pixbuf.SlackBuild b/libraries/gdk-pixbuf/gdk-pixbuf.SlackBuild index a4344f7f2eb1..b8e08f9c7c80 100644 --- a/libraries/gdk-pixbuf/gdk-pixbuf.SlackBuild +++ b/libraries/gdk-pixbuf/gdk-pixbuf.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.22.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/libraries/ggz-base-libs/ggz-base-libs.SlackBuild b/libraries/ggz-base-libs/ggz-base-libs.SlackBuild index f237f4933dfa..6678b3c725aa 100644 --- a/libraries/ggz-base-libs/ggz-base-libs.SlackBuild +++ b/libraries/ggz-base-libs/ggz-base-libs.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.99.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/libraries/glfw/glfw.SlackBuild b/libraries/glfw/glfw.SlackBuild index ed48d9fc8615..8324654b0e36 100644 --- a/libraries/glfw/glfw.SlackBuild +++ b/libraries/glfw/glfw.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/glibmm/glibmm.SlackBuild b/libraries/glibmm/glibmm.SlackBuild index f6a7b488a90a..2ccbb9e0e5ca 100644 --- a/libraries/glibmm/glibmm.SlackBuild +++ b/libraries/glibmm/glibmm.SlackBuild @@ -35,7 +35,7 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/gnet/gnet.SlackBuild b/libraries/gnet/gnet.SlackBuild index decc520af40a..610a2e345ae8 100644 --- a/libraries/gnet/gnet.SlackBuild +++ b/libraries/gnet/gnet.SlackBuild @@ -16,12 +16,10 @@ 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 @@ -45,7 +43,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/gnome-sharp/gnome-sharp.SlackBuild b/libraries/gnome-sharp/gnome-sharp.SlackBuild index ebfe6bf68c53..ae7a136aceb6 100644 --- a/libraries/gnome-sharp/gnome-sharp.SlackBuild +++ b/libraries/gnome-sharp/gnome-sharp.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Gnome# -# Written by André Barboza <bmg.andre@gmail.com> +# Written by André Barboza <bmg.andre@gmail.com> # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/gsm/gsm.SlackBuild b/libraries/gsm/gsm.SlackBuild index 01d252f07b55..f52846a6f642 100644 --- a/libraries/gsm/gsm.SlackBuild +++ b/libraries/gsm/gsm.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.0.13} 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 @@ -77,7 +75,7 @@ patch -p1 < $CWD/patches/gsm-1.0.13-shared.patch patch -p1 < $CWD/patches/gsm-1.0.12-memcpy.patch patch -p1 < $CWD/patches/gsm-1.0.12-64bit.patch -mkdir -p $PKG/usr/bin +mkdir -p $PKG/usr/bin mkdir -p $PKG/usr/lib$LIBDIRSUFFIX mkdir -p $PKG/usr/include/{gsm,libgsm} mkdir -p $PKG/usr/man/man{1,3} diff --git a/libraries/gsnmp/gsnmp.SlackBuild b/libraries/gsnmp/gsnmp.SlackBuild index 551fe9771c82..5842892ec256 100644 --- a/libraries/gsnmp/gsnmp.SlackBuild +++ b/libraries/gsnmp/gsnmp.SlackBuild @@ -10,12 +10,10 @@ VERSION=0.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 @@ -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/libraries/gst1-libav/gst1-libav.SlackBuild b/libraries/gst1-libav/gst1-libav.SlackBuild index 9916646abb31..546c1a5c0f0c 100644 --- a/libraries/gst1-libav/gst1-libav.SlackBuild +++ b/libraries/gst1-libav/gst1-libav.SlackBuild @@ -58,7 +58,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$SRCNAM-$VERSION cd $TMP diff --git a/libraries/gstreamermm/gstreamermm.SlackBuild b/libraries/gstreamermm/gstreamermm.SlackBuild index 41e9ff9a138d..44334d5b1b3e 100644 --- a/libraries/gstreamermm/gstreamermm.SlackBuild +++ b/libraries/gstreamermm/gstreamermm.SlackBuild @@ -56,7 +56,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP diff --git a/libraries/gtk-aurora-engine/gtk-aurora-engine.SlackBuild b/libraries/gtk-aurora-engine/gtk-aurora-engine.SlackBuild index 43858753bd7e..fe67135cdad8 100644 --- a/libraries/gtk-aurora-engine/gtk-aurora-engine.SlackBuild +++ b/libraries/gtk-aurora-engine/gtk-aurora-engine.SlackBuild @@ -81,7 +81,7 @@ else DO_ANIM="dis" fi -# Starting with glib 2.32 it is now mandatory to +# Starting with glib 2.32 it is now mandatory to # include glib.h instead of individual headers. patch -p1 -i $CWD/glib-single-include.patch @@ -96,14 +96,14 @@ CFLAGS="$SLKCFLAGS" \ --${DO_ANIM}able-animation \ --build=$ARCH-slackware-linux -make install-strip DESTDIR=$PKG +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/share/themes tar xjf $TMP/Aurora.tar.bz2 -C $PKG/usr/share/themes mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $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/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild b/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild index 5664e5852f09..42d03a9455b1 100644 --- a/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/libraries/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -30,12 +30,10 @@ VERSION=${VERSION:-1.1} 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 @@ -75,7 +73,7 @@ find . \ -exec chmod 644 {} \; # Patch the source so it won't break while building -patch -p4 < $CWD/include.patch +patch -p4 < $CWD/include.patch # Fix for glib>=2.31 sed -i "s|/glist||" src/qt_theme_draw.c @@ -86,7 +84,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} . - make + make make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/gtkglarea/gtkglarea.SlackBuild b/libraries/gtkglarea/gtkglarea.SlackBuild index 3736604be558..d9159351329f 100644 --- a/libraries/gtkglarea/gtkglarea.SlackBuild +++ b/libraries/gtkglarea/gtkglarea.SlackBuild @@ -8,12 +8,10 @@ VERSION="1.99.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/libraries/gtkimageview/gtkimageview.SlackBuild b/libraries/gtkimageview/gtkimageview.SlackBuild index 1a285c6b3768..aaab6857b5ff 100644 --- a/libraries/gtkimageview/gtkimageview.SlackBuild +++ b/libraries/gtkimageview/gtkimageview.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.6.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/libraries/gtkmm-utils/gtkmm-utils.SlackBuild b/libraries/gtkmm-utils/gtkmm-utils.SlackBuild index 97669cba30c1..d0af007f024a 100644 --- a/libraries/gtkmm-utils/gtkmm-utils.SlackBuild +++ b/libraries/gtkmm-utils/gtkmm-utils.SlackBuild @@ -27,17 +27,15 @@ VERSION=${VERSION:-0.4.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) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/gtkmm/gtkmm.SlackBuild b/libraries/gtkmm/gtkmm.SlackBuild index dbb1ee8b9f09..ca4ebfeacc89 100644 --- a/libraries/gtkmm/gtkmm.SlackBuild +++ b/libraries/gtkmm/gtkmm.SlackBuild @@ -29,17 +29,15 @@ VERSION=${VERSION:-2.24.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 -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/gtkmm3/gtkmm3.SlackBuild b/libraries/gtkmm3/gtkmm3.SlackBuild index 36173737dd9c..fe87e82d7ab8 100644 --- a/libraries/gtkmm3/gtkmm3.SlackBuild +++ b/libraries/gtkmm3/gtkmm3.SlackBuild @@ -31,17 +31,15 @@ VERSION=${VERSION:-3.8.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) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/guichan/guichan.SlackBuild b/libraries/guichan/guichan.SlackBuild index 6f9448d243dd..208b9c44f07e 100644 --- a/libraries/guichan/guichan.SlackBuild +++ b/libraries/guichan/guichan.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.8.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/libraries/id3lib/id3lib.SlackBuild b/libraries/id3lib/id3lib.SlackBuild index 811fbfe1e20c..f11dde28f0c7 100644 --- a/libraries/id3lib/id3lib.SlackBuild +++ b/libraries/id3lib/id3lib.SlackBuild @@ -21,7 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Heavily based on original slackbuild by AlienBOB. +# Heavily based on original slackbuild by AlienBOB. # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=id3lib @@ -29,12 +29,10 @@ VERSION=3.8.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 diff --git a/libraries/io_lib/io_lib.SlackBuild b/libraries/io_lib/io_lib.SlackBuild index d71da918cd94..4b3e9a8a6b44 100644 --- a/libraries/io_lib/io_lib.SlackBuild +++ b/libraries/io_lib/io_lib.SlackBuild @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=io_lib +PRGNAM=io_lib VERSION=${VERSION:-1.13.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/libraries/itcl/itcl.SlackBuild b/libraries/itcl/itcl.SlackBuild index acbcae9d396d..caf925cde82c 100644 --- a/libraries/itcl/itcl.SlackBuild +++ b/libraries/itcl/itcl.SlackBuild @@ -38,7 +38,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -47,7 +47,7 @@ rm -rf $PRGNAM-$VERSION /tmp/tcl$TCL tar xvf $CWD/$PRGNAM$VERSION.tar.gz mv $PRGNAM$VERSION $PRGNAM-$VERSION -# Since itcl expects tcl to be in /tmp (Slackware default in set by +# Since itcl expects tcl to be in /tmp (Slackware default in set by # /usr/lib${LIBDIRSUFFIX}/tclConfig.sh (TCL_SRC_DIR). tar -C /tmp -xvf $CWD/tcl$TCL-src.tar.xz @@ -79,12 +79,12 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # There's nothing in $PKG/usr/bin rmdir $PKG/usr/bin -# Add manpages that are part of the source tarball, but that upstream +# Add manpages that are part of the source tarball, but that upstream # doesn't include for some reason. mkdir -p $PKG/usr/man/man3 -for manpage in $TMP/$PRGNAM-$VERSION/doc/*.3 ; do +for manpage in $TMP/$PRGNAM-$VERSION/doc/*.3 ; do gzip -9 -c $manpage > $PKG/usr/man/man3/$( basename $manpage ).gz; done - + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ license.terms \ diff --git a/libraries/iulib/iulib.SlackBuild b/libraries/iulib/iulib.SlackBuild index 9de6f3b4be35..c52bc9277de8 100644 --- a/libraries/iulib/iulib.SlackBuild +++ b/libraries/iulib/iulib.SlackBuild @@ -58,7 +58,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 diff --git a/libraries/jbigkit/jbigkit.SlackBuild b/libraries/jbigkit/jbigkit.SlackBuild index 356781a5127e..e83ab279d080 100644 --- a/libraries/jbigkit/jbigkit.SlackBuild +++ b/libraries/jbigkit/jbigkit.SlackBuild @@ -8,12 +8,10 @@ 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 @@ -50,7 +48,7 @@ chmod -R u+w,go+r-w,a-s . # Build the shared library first cd libjbig - make libjbig.a CFLAGS="$SLKCFLAGS" + make libjbig.a CFLAGS="$SLKCFLAGS" gcc -shared -o libjbig.so.$VERSION -Wl,-soname=libjbig.so.$VERSION \ $(ar t libjbig.a) ln -snf libjbig.so.$VERSION libjbig.so diff --git a/libraries/lablgtk/lablgtk.SlackBuild b/libraries/lablgtk/lablgtk.SlackBuild index 25e5409bcb4d..f83a6c152563 100644 --- a/libraries/lablgtk/lablgtk.SlackBuild +++ b/libraries/lablgtk/lablgtk.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.14.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/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild index b4b32cdf1f6e..6003dc0f9ae2 100644 --- a/libraries/lame/lame.SlackBuild +++ b/libraries/lame/lame.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-3.99.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 @@ -57,11 +55,11 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors. +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/libraries/lapack-atlas/lapack-atlas.SlackBuild b/libraries/lapack-atlas/lapack-atlas.SlackBuild index 4659a7f7e6d3..67fcc9df0119 100644 --- a/libraries/lapack-atlas/lapack-atlas.SlackBuild +++ b/libraries/lapack-atlas/lapack-atlas.SlackBuild @@ -40,7 +40,7 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -set -e # Exit on most errors +set -e # This is the system destination directory. When installing the # package produced by this script, LAPACK's files will be written to @@ -84,13 +84,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Within Makefile it is asumed that lapack_testing.py is executable. +# Within Makefile it is asumed that lapack_testing.py is executable. # This is not the case, thus if TEST_LAPACK is enabled, make fails. chmod 755 ./lapack_testing.py -# If you say "no" here, the script will NOT try to link LAPACK against -# the multi-threaded ATLAS libraries. If you leave it to "yes" and the -# multi-threaded ATLAS libraries are not available, the script will default +# If you say "no" here, the script will NOT try to link LAPACK against +# the multi-threaded ATLAS libraries. If you leave it to "yes" and the +# multi-threaded ATLAS libraries are not available, the script will default # to linking against the single threaded ones and raise a warning. USE_ATLAS_PT_LIBS="${USE_ATLAS_PT_LIBS:-yes}" USE_ATLAS_PT_LIBS=$(echo "$USE_ATLAS_PT_LIBS"|cut -b 1|tr a-z A-Z) # Make Y or N out of yes, Yes, No, no, etc. @@ -100,7 +100,7 @@ TEST_LAPACK="${TEST_LAPACK:-no}" # Make Y or N out of yes, Yes, No, no, etc. TEST_LAPACK=$(echo "$TEST_LAPACK"|cut -b 1|tr a-z A-Z) -# Search for the latest installed atlas package +# Search for the latest installed atlas package # (not necessarily the one with the latest version). # For this to work the system clock should also work properly. # NOTE: The echo statement below is for getting around "set -e" this time. @@ -111,8 +111,8 @@ ATLAS_PKG="$(ls -1 -dc /var/log/packages/atlas* 2>/dev/null | \ [ ! "$ATLAS_PKG" ] && \ echo "ERROR: Couldn't find the ATLAS package." && exit 1 -# Pick up the SETTINGS file containing the appropriate flags, use again the -# echo trick against "set -e". You may also provide your own path to a file +# Pick up the SETTINGS file containing the appropriate flags, use again the +# echo trick against "set -e". You may also provide your own path to a file # containing apropriate settings, see the README for details ATLAS_SETTINGS_FILE=${ATLAS_SETTINGS_FILE:-"/$(grep SETTINGS "$ATLAS_PKG" || echo -n)"} @@ -137,7 +137,7 @@ echo "ERROR: No location available for the file with ATLAS settings." && exit 1 # Otherwise, please read LAPACK's make.inc for more informations. LAPACK_TIMER="${LAPACK_TIMER:-INT_ETIME}" -# Looking for the libraries provided by ATLAS. If one asks for threaded +# Looking for the libraries provided by ATLAS. If one asks for threaded # libraries and these are available we will try to link against them. if [ "$USE_ATLAS_PT_LIBS" = "Y" ]; then # Set proper library names for the threaded ATLAS libs. @@ -145,9 +145,9 @@ if [ "$USE_ATLAS_PT_LIBS" = "Y" ]; then ATLAS_CBLASLIB="libptcblas.a" # Find out the full paths to the ATLAS libraries ATLAS_BLASLIB_P="/$(grep "$ATLAS_BLASLIB" "$ATLAS_PKG" || echo -n)" - # We need this to finally link against the mixed LAPACK library, resulting + # We need this to finally link against the mixed LAPACK library, resulting # from the full LAPACK and the optimized LAPACK routines provided by ATLAS. - ATLAS_CBLASLIB_P="/$(grep "$ATLAS_CBLASLIB" "$ATLAS_PKG" || echo -n)" + ATLAS_CBLASLIB_P="/$(grep "$ATLAS_CBLASLIB" "$ATLAS_PKG" || echo -n)" if [ "${ATLAS_BLASLIB_P}1" = "/1" -o "${ATLAS_CBLASLIB_P}1" = "/1" ]; then # Oops! The threaded libraries are not available! echo "" @@ -178,7 +178,7 @@ ATLAS_LAPACK="/$(grep liblapack.a "$ATLAS_PKG" || echo -n)" { echo "ERROR: ATLAS libraries missing from the Slackware ATLAS package log." && exit 1; } # Check that the library files are there. -# NOTE: After the installation of this package, the incomplete LAPACK library +# NOTE: After the installation of this package, the incomplete LAPACK library # installed by ATLAS gets substituted by the complete one provided by us [ -f "$ATLAS_BLASLIB" -a -r "$ATLAS_BLASLIB" ] || \ { echo "ERROR: $ATLAS_BLASLIB is not a regular file or is not readable by us." && exit 1; } @@ -221,7 +221,7 @@ rm -rf merging_dir if [ "$TEST_LAPACK" = "Y" ]; then # We want to test LAPACK, thus we have to build tmglib and then run the tests make OPTS="$LAPACK_OPTS" NOOPT="$LAPACK_NOOPT" tmglib - + # Update make.inc taking into account that the LAPACK library has # been merged with the optimized LAPACK routines provided by ATLAS. ATLAS_LIBS="${ATLAS_BLASLIB} ${ATLAS_CBLASLIB} ${ATLAS_EXTRA_LIB}" @@ -243,7 +243,7 @@ if [ "$TEST_LAPACK" = "Y" ]; then TEST_OUTPUT="TEST.RESULTS.tgz" tar czf "$TEST_OUTPUT" TESTING/*.out fi - + #LAPACK only. ( mkdir "shared_$SRCNAM" cd "shared_$SRCNAM" diff --git a/libraries/lapack/lapack.SlackBuild b/libraries/lapack/lapack.SlackBuild index 1ee2e1cf700d..55ea30ccfe98 100644 --- a/libraries/lapack/lapack.SlackBuild +++ b/libraries/lapack/lapack.SlackBuild @@ -41,7 +41,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/lensfun/lensfun.SlackBuild b/libraries/lensfun/lensfun.SlackBuild index 398fc3530a28..dfeecc4e2530 100644 --- a/libraries/lensfun/lensfun.SlackBuild +++ b/libraries/lensfun/lensfun.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # -# Slackware build script of lensfun +# Slackware build script of lensfun # Copyright 2009 Ricardson Williams <ricardsonwilliams at yahoo.com.br> # All rights reserved. @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.2.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 @@ -71,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - || exit 1 + || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/libraries/leptonica/leptonica.SlackBuild b/libraries/leptonica/leptonica.SlackBuild index d0f889106cef..d356b3d48ce4 100644 --- a/libraries/leptonica/leptonica.SlackBuild +++ b/libraries/leptonica/leptonica.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.69} 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/libraries/lgi/lgi.SlackBuild b/libraries/lgi/lgi.SlackBuild index 0795b2d3df1c..b007d4ade747 100644 --- a/libraries/lgi/lgi.SlackBuild +++ b/libraries/lgi/lgi.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for lgi +# Slackware build script for lgi # Copyright 2013 Heiko Rosemann Germany # All rights reserved. @@ -29,12 +29,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 @@ -58,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libAfterImage/libAfterImage.SlackBuild b/libraries/libAfterImage/libAfterImage.SlackBuild index 47e67a04090a..f06986a2ac26 100644 --- a/libraries/libAfterImage/libAfterImage.SlackBuild +++ b/libraries/libAfterImage/libAfterImage.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libAfterImage -# Written by Larry Hajali +# Written by Larry Hajali # Now maintained by David Woodfall <dave@dawoodfall.net> PRGNAM=libAfterImage diff --git a/libraries/libalkimia/libalkimia.SlackBuild b/libraries/libalkimia/libalkimia.SlackBuild index 1bcd2ce18b3e..1b044637072b 100644 --- a/libraries/libalkimia/libalkimia.SlackBuild +++ b/libraries/libalkimia/libalkimia.SlackBuild @@ -80,8 +80,8 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make VERBOSE=1 - make install VERBOSE=1 DESTDIR=$PKG + make VERBOSE=1 + make install VERBOSE=1 DESTDIR=$PKG cd - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/libaosd/libaosd.SlackBuild b/libraries/libaosd/libaosd.SlackBuild index e9a92ac5f015..522e26ca7ab7 100644 --- a/libraries/libaosd/libaosd.SlackBuild +++ b/libraries/libaosd/libaosd.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.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/libraries/libcacard/libcacard.SlackBuild b/libraries/libcacard/libcacard.SlackBuild index a9819d79c54a..41d1d4f350dd 100644 --- a/libraries/libcacard/libcacard.SlackBuild +++ b/libraries/libcacard/libcacard.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="AUTHORS COPYING ChangeLog NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libcap-ng/libcap-ng.SlackBuild b/libraries/libcap-ng/libcap-ng.SlackBuild index f961a6600771..4ee42237bdb7 100644 --- a/libraries/libcap-ng/libcap-ng.SlackBuild +++ b/libraries/libcap-ng/libcap-ng.SlackBuild @@ -42,7 +42,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -76,7 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # This only works if our kernel-headers match the kernel, which is a horrible assumption -# make check +# make check make make install-strip DESTDIR=$PKG diff --git a/libraries/libchewing/libchewing.SlackBuild b/libraries/libchewing/libchewing.SlackBuild index adb75d2a1240..8e763d62163b 100644 --- a/libraries/libchewing/libchewing.SlackBuild +++ b/libraries/libchewing/libchewing.SlackBuild @@ -31,7 +31,6 @@ 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 @@ -55,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/libraries/libcli/libcli.SlackBuild b/libraries/libcli/libcli.SlackBuild index 5a11da77926a..d754fc9d7ac6 100644 --- a/libraries/libcli/libcli.SlackBuild +++ b/libraries/libcli/libcli.SlackBuild @@ -27,12 +27,10 @@ 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/libraries/libconfig/libconfig.SlackBuild b/libraries/libconfig/libconfig.SlackBuild index 18768d31d392..0f646d6ce77e 100644 --- a/libraries/libconfig/libconfig.SlackBuild +++ b/libraries/libconfig/libconfig.SlackBuild @@ -27,12 +27,10 @@ VERSION=${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/libraries/libcryptui/libcryptui.SlackBuild b/libraries/libcryptui/libcryptui.SlackBuild index e39279030211..427b26890901 100644 --- a/libraries/libcryptui/libcryptui.SlackBuild +++ b/libraries/libcryptui/libcryptui.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libcsv/libcsv.SlackBuild b/libraries/libcsv/libcsv.SlackBuild index e9b43a4d460d..2e6fdf07b71a 100644 --- a/libraries/libcsv/libcsv.SlackBuild +++ b/libraries/libcsv/libcsv.SlackBuild @@ -25,11 +25,9 @@ VERSION=${VERSION:-"3.0.0"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/libraries/libcue/libcue.SlackBuild b/libraries/libcue/libcue.SlackBuild index 112f55ff5cda..7f446bf3e7ee 100644 --- a/libraries/libcue/libcue.SlackBuild +++ b/libraries/libcue/libcue.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.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/libraries/libdbi-drivers/libdbi-drivers.SlackBuild b/libraries/libdbi-drivers/libdbi-drivers.SlackBuild index de596cefcfac..8188bdd132b7 100644 --- a/libraries/libdbi-drivers/libdbi-drivers.SlackBuild +++ b/libraries/libdbi-drivers/libdbi-drivers.SlackBuild @@ -11,12 +11,10 @@ TAG=${TAG:-_SBo} SRCVERSION=$(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 diff --git a/libraries/libdca/libdca.SlackBuild b/libraries/libdca/libdca.SlackBuild index fbf8767293f2..5be86e94d6f9 100644 --- a/libraries/libdca/libdca.SlackBuild +++ b/libraries/libdca/libdca.SlackBuild @@ -29,12 +29,10 @@ VERSION=0.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/libraries/libdmtx/libdmtx.SlackBuild b/libraries/libdmtx/libdmtx.SlackBuild index dc4a848ea6fe..6eba3c9192cd 100644 --- a/libraries/libdmtx/libdmtx.SlackBuild +++ b/libraries/libdmtx/libdmtx.SlackBuild @@ -10,12 +10,10 @@ VERSION=${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 @@ -39,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libdockapp/libdockapp.SlackBuild b/libraries/libdockapp/libdockapp.SlackBuild index a1a8e99cd0b8..e7a6ca05f4b9 100644 --- a/libraries/libdockapp/libdockapp.SlackBuild +++ b/libraries/libdockapp/libdockapp.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-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 @@ -55,7 +53,7 @@ find . \ -exec chmod 644 {} \; # Fixup the SHAREDIR in examples/Makefile.in -patch -p1 < $CWD/Fixup-examples-sharedir.patch +patch -p1 < $CWD/Fixup-examples-sharedir.patch CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -67,7 +65,7 @@ CFLAGS="$SLKCFLAGS" \ --disable-debug \ --build=$ARCH-slackware-linux -make XFONTDIR="\$(DESTDIR)/usr/share/fonts" +make XFONTDIR="\$(DESTDIR)/usr/share/fonts" make install DESTDIR=$PKG XFONTDIR="\$(DESTDIR)/usr/share/fonts" find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/libraries/libdvbpsi/libdvbpsi.SlackBuild b/libraries/libdvbpsi/libdvbpsi.SlackBuild index f284ebac21b2..c106800237e6 100644 --- a/libraries/libdvbpsi/libdvbpsi.SlackBuild +++ b/libraries/libdvbpsi/libdvbpsi.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/libraries/libdvdcss/libdvdcss.SlackBuild b/libraries/libdvdcss/libdvdcss.SlackBuild index ad0e80d4b64a..f4abe51af183 100644 --- a/libraries/libdvdcss/libdvdcss.SlackBuild +++ b/libraries/libdvdcss/libdvdcss.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.2.13 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/libraries/libdynamite/libdynamite.SlackBuild b/libraries/libdynamite/libdynamite.SlackBuild index f78bbe38dcf1..9dfd6e8c9136 100644 --- a/libraries/libdynamite/libdynamite.SlackBuild +++ b/libraries/libdynamite/libdynamite.SlackBuild @@ -7,12 +7,10 @@ VERSION=${VERSION:-0.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/libraries/libebml/libebml.SlackBuild b/libraries/libebml/libebml.SlackBuild index bf69b6405a8c..4fb59c546c59 100644 --- a/libraries/libebml/libebml.SlackBuild +++ b/libraries/libebml/libebml.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # Slackware build script for libebml diff --git a/libraries/libee/libee.SlackBuild b/libraries/libee/libee.SlackBuild index 1a936c100a39..3d10314bcb84 100644 --- a/libraries/libee/libee.SlackBuild +++ b/libraries/libee/libee.SlackBuild @@ -54,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/libraries/libesmtp/libesmtp.SlackBuild b/libraries/libesmtp/libesmtp.SlackBuild index 3195e9f40c2c..24c2641ac209 100644 --- a/libraries/libesmtp/libesmtp.SlackBuild +++ b/libraries/libesmtp/libesmtp.SlackBuild @@ -11,12 +11,10 @@ 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 diff --git a/libraries/libestr/libestr.SlackBuild b/libraries/libestr/libestr.SlackBuild index 5c4e73160b02..52899fc65527 100644 --- a/libraries/libestr/libestr.SlackBuild +++ b/libraries/libestr/libestr.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -79,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - --disable-static + --disable-static make make install DESTDIR=$PKG diff --git a/libraries/libev/libev.SlackBuild b/libraries/libev/libev.SlackBuild index bcbe0c28ecd3..dfbc286ae5b7 100644 --- a/libraries/libev/libev.SlackBuild +++ b/libraries/libev/libev.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-4.11} 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/libraries/libexif-gtk/libexif-gtk.SlackBuild b/libraries/libexif-gtk/libexif-gtk.SlackBuild index fbe65573cc0c..dc75891055c0 100644 --- a/libraries/libexif-gtk/libexif-gtk.SlackBuild +++ b/libraries/libexif-gtk/libexif-gtk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh - -# Slackware Build Script for libexif-gtk + +# Slackware Build Script for libexif-gtk # (C) 2007 Michael Wagner <lapinours@web.de> # All rights reserved. @@ -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=libexif-gtk VERSION=0.3.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 @@ -62,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 cd $PRGNAM-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -79,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --program-prefix="" \ || exit 1 - + make || exit 1 make install-strip DESTDIR=$PKG || exit 1 diff --git a/libraries/libflashsupport/libflashsupport.SlackBuild b/libraries/libflashsupport/libflashsupport.SlackBuild index c2ee9e89c707..16863d2f7ee7 100644 --- a/libraries/libflashsupport/libflashsupport.SlackBuild +++ b/libraries/libflashsupport/libflashsupport.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-20080328} 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/libraries/libfprint/libfprint.SlackBuild b/libraries/libfprint/libfprint.SlackBuild index 11990e9c02bc..4dc4847e6a45 100644 --- a/libraries/libfprint/libfprint.SlackBuild +++ b/libraries/libfprint/libfprint.SlackBuild @@ -11,12 +11,10 @@ VERSION=0.0.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/libraries/libg15/libg15.SlackBuild b/libraries/libg15/libg15.SlackBuild index c6813d9db5e6..575754fc65a2 100644 --- a/libraries/libg15/libg15.SlackBuild +++ b/libraries/libg15/libg15.SlackBuild @@ -31,12 +31,10 @@ TAG=${TAG:-_SBo} DOCS="README AUTHORS ChangeLog NEWS COPYING" -# 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/libraries/libg15render/libg15render.SlackBuild b/libraries/libg15render/libg15render.SlackBuild index 5b7c9ef23094..b816adf82e84 100644 --- a/libraries/libg15render/libg15render.SlackBuild +++ b/libraries/libg15render/libg15render.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-1.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/libraries/libgig/libgig.SlackBuild b/libraries/libgig/libgig.SlackBuild index cdf720818576..b94d57efd347 100644 --- a/libraries/libgig/libgig.SlackBuild +++ b/libraries/libgig/libgig.SlackBuild @@ -7,18 +7,16 @@ VERSION=${VERSION:-3.3.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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libgksu/libgksu.SlackBuild b/libraries/libgksu/libgksu.SlackBuild index cb1190b5f728..f6fe58725ab0 100644 --- a/libraries/libgksu/libgksu.SlackBuild +++ b/libraries/libgksu/libgksu.SlackBuild @@ -95,7 +95,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --disable-static \ --build=$ARCH-slackware-linux - + make make install DESTDIR=$PKG @@ -110,7 +110,7 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -( cd $PKG/usr/doc/$PRGNAM-$VERSION +( cd $PKG/usr/doc/$PRGNAM-$VERSION ln -s /usr/share/gtk-doc/html/libgksu html ) diff --git a/libraries/libglademm/libglademm.SlackBuild b/libraries/libglademm/libglademm.SlackBuild index aa39ce2312b4..747ec79ae5d4 100644 --- a/libraries/libglademm/libglademm.SlackBuild +++ b/libraries/libglademm/libglademm.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.6.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/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild index d8cc560c5f69..f59e7a8aeff2 100644 --- a/libraries/libglpng/libglpng.SlackBuild +++ b/libraries/libglpng/libglpng.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.45 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 @@ -74,7 +72,7 @@ make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr # The Makefile doesn't make this easy :/ if [ "$ARCH" = "x86_64" ]; then - mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} + mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} fi strip --strip-unneeded $PKG/usr/lib${LIBDIRSUFFIX}/* 2> /dev/null || true diff --git a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild index db44da0daefd..e9f2254aa361 100644 --- a/libraries/libgnomecanvas/libgnomecanvas.SlackBuild +++ b/libraries/libgnomecanvas/libgnomecanvas.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-2.30.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/libraries/libgnomecups/libgnomecups.SlackBuild b/libraries/libgnomecups/libgnomecups.SlackBuild index 6cf321fb74ce..582ef9ee7cc4 100644 --- a/libraries/libgnomecups/libgnomecups.SlackBuild +++ b/libraries/libgnomecups/libgnomecups.SlackBuild @@ -93,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=no \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux - + make make install DESTDIR=$PKG diff --git a/libraries/libgnomeprint/libgnomeprint.SlackBuild b/libraries/libgnomeprint/libgnomeprint.SlackBuild index ef30588c020a..6c4971439aa5 100644 --- a/libraries/libgnomeprint/libgnomeprint.SlackBuild +++ b/libraries/libgnomeprint/libgnomeprint.SlackBuild @@ -81,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-static=no \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG diff --git a/libraries/libgringotts/libgringotts.SlackBuild b/libraries/libgringotts/libgringotts.SlackBuild index a351dd664a1d..9d38f5801735 100644 --- a/libraries/libgringotts/libgringotts.SlackBuild +++ b/libraries/libgringotts/libgringotts.SlackBuild @@ -9,12 +9,10 @@ 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 diff --git a/libraries/libgtop/libgtop.SlackBuild b/libraries/libgtop/libgtop.SlackBuild index 2b1df48e350c..a0fa9e88cfac 100644 --- a/libraries/libgtop/libgtop.SlackBuild +++ b/libraries/libgtop/libgtop.SlackBuild @@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-x \ --disable-hacker-mode \ --build=$ARCH-slackware-linux - + make make install DESTDIR=$PKG @@ -100,7 +100,7 @@ cp -a \ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild ( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s /usr/share/gtk-doc/html/libgtop html + ln -s /usr/share/gtk-doc/html/libgtop html ) mkdir -p $PKG/install diff --git a/libraries/libhid/libhid.SlackBuild b/libraries/libhid/libhid.SlackBuild index 76051ad9d60c..077a203741a8 100644 --- a/libraries/libhid/libhid.SlackBuild +++ b/libraries/libhid/libhid.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.2.16} 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/libraries/libiec61883/libiec61883.SlackBuild b/libraries/libiec61883/libiec61883.SlackBuild index ff81009d471c..b0cabec69361 100644 --- a/libraries/libiec61883/libiec61883.SlackBuild +++ b/libraries/libiec61883/libiec61883.SlackBuild @@ -30,12 +30,10 @@ VERSION=1.2.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/libraries/libinstpatch/libinstpatch.SlackBuild b/libraries/libinstpatch/libinstpatch.SlackBuild index 7bd16d51dc86..344ae6298d1f 100644 --- a/libraries/libinstpatch/libinstpatch.SlackBuild +++ b/libraries/libinstpatch/libinstpatch.SlackBuild @@ -14,7 +14,7 @@ if [ -z "$ARCH" ]; then esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libiptcdata/libiptcdata.SlackBuild b/libraries/libiptcdata/libiptcdata.SlackBuild index 56b13ae49ccb..1c92eec61ae8 100644 --- a/libraries/libiptcdata/libiptcdata.SlackBuild +++ b/libraries/libiptcdata/libiptcdata.SlackBuild @@ -29,12 +29,10 @@ VERSION=1.0.4 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/libraries/libisoburn/libisoburn.SlackBuild b/libraries/libisoburn/libisoburn.SlackBuild index 34fa40250377..ff7c46b3f3fb 100644 --- a/libraries/libisoburn/libisoburn.SlackBuild +++ b/libraries/libisoburn/libisoburn.SlackBuild @@ -12,12 +12,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 diff --git a/libraries/libixp/libixp.SlackBuild b/libraries/libixp/libixp.SlackBuild index 03b929218672..cb77b1c53f4b 100644 --- a/libraries/libixp/libixp.SlackBuild +++ b/libraries/libixp/libixp.SlackBuild @@ -26,12 +26,10 @@ 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 diff --git a/libraries/libkate/libkate.SlackBuild b/libraries/libkate/libkate.SlackBuild index c7755f867b02..bbb10c25f0c5 100644 --- a/libraries/libkate/libkate.SlackBuild +++ b/libraries/libkate/libkate.SlackBuild @@ -57,7 +57,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/liblscp/liblscp.SlackBuild b/libraries/liblscp/liblscp.SlackBuild index 8251492d033a..2951ee0e9e9d 100644 --- a/libraries/liblscp/liblscp.SlackBuild +++ b/libraries/liblscp/liblscp.SlackBuild @@ -7,18 +7,16 @@ VERSION=${VERSION:-0.5.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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libmimedir/libmimedir.SlackBuild b/libraries/libmimedir/libmimedir.SlackBuild index 7c5168faae98..f49ca231428f 100644 --- a/libraries/libmimedir/libmimedir.SlackBuild +++ b/libraries/libmimedir/libmimedir.SlackBuild @@ -2,23 +2,21 @@ # Slackware build script for libmimedir # Written by redtricycle (redtricycle@gmail.com) -PRGNAM=libmimedir +PRGNAM=libmimedir VERSION=${VERSION:-0.5.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} @@ -36,7 +34,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libmimic/libmimic.SlackBuild b/libraries/libmimic/libmimic.SlackBuild index 6a6dc5faf254..53eb568ba8bb 100644 --- a/libraries/libmimic/libmimic.SlackBuild +++ b/libraries/libmimic/libmimic.SlackBuild @@ -28,12 +28,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 diff --git a/libraries/libmp4v2/libmp4v2.SlackBuild b/libraries/libmp4v2/libmp4v2.SlackBuild index 0d849396e2ae..643dbfed82f5 100644 --- a/libraries/libmp4v2/libmp4v2.SlackBuild +++ b/libraries/libmp4v2/libmp4v2.SlackBuild @@ -4,7 +4,7 @@ # Copyright (c) 2007 Alex Lysenka <me@alkos333.net> # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: @@ -39,12 +39,10 @@ VERSION=2.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 diff --git a/libraries/libmpd/libmpd.SlackBuild b/libraries/libmpd/libmpd.SlackBuild index 7eb6e49697a0..cd8597ad6b1c 100644 --- a/libraries/libmpd/libmpd.SlackBuild +++ b/libraries/libmpd/libmpd.SlackBuild @@ -10,12 +10,10 @@ VERSION=0.20.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/libraries/libmpdclient/libmpdclient.SlackBuild b/libraries/libmpdclient/libmpdclient.SlackBuild index d59d3aa2475e..b040ae689392 100644 --- a/libraries/libmpdclient/libmpdclient.SlackBuild +++ b/libraries/libmpdclient/libmpdclient.SlackBuild @@ -8,12 +8,10 @@ VERSION=2.7 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/libraries/libmspack/libmspack.SlackBuild b/libraries/libmspack/libmspack.SlackBuild index 752d3bce7ba4..16e2e0e70bff 100644 --- a/libraries/libmspack/libmspack.SlackBuild +++ b/libraries/libmspack/libmspack.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.4alpha 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 @@ -80,7 +78,7 @@ CFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING.LIB INSTALL NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION/html diff --git a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild index 029186d14f85..105a71e2f49b 100644 --- a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild +++ b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild @@ -7,18 +7,16 @@ VERSION=${VERSION:-2.1.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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libmygpo-qt/libmygpo-qt.SlackBuild b/libraries/libmygpo-qt/libmygpo-qt.SlackBuild index 3973488332b7..60f189e8fd06 100644 --- a/libraries/libmygpo-qt/libmygpo-qt.SlackBuild +++ b/libraries/libmygpo-qt/libmygpo-qt.SlackBuild @@ -76,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/libraries/libnids/libnids.SlackBuild b/libraries/libnids/libnids.SlackBuild index 26b9b4282f0c..ef1595c6f417 100644 --- a/libraries/libnids/libnids.SlackBuild +++ b/libraries/libnids/libnids.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.24} 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/libraries/libnxml/libnxml.SlackBuild b/libraries/libnxml/libnxml.SlackBuild index 41ed54d302f9..e4666c1401af 100644 --- a/libraries/libnxml/libnxml.SlackBuild +++ b/libraries/libnxml/libnxml.SlackBuild @@ -8,12 +8,10 @@ VERSION=0.18.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 @@ -37,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libofa/libofa.SlackBuild b/libraries/libofa/libofa.SlackBuild index 8a28d04d4aba..6f2ef0d969f7 100644 --- a/libraries/libofa/libofa.SlackBuild +++ b/libraries/libofa/libofa.SlackBuild @@ -7,18 +7,16 @@ VERSION=${VERSION:-0.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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/liboop/liboop.SlackBuild b/libraries/liboop/liboop.SlackBuild index 5d241bfeac5b..d0e05ba88254 100644 --- a/libraries/liboop/liboop.SlackBuild +++ b/libraries/liboop/liboop.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-1.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 @@ -43,7 +41,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libopenraw/libopenraw.SlackBuild b/libraries/libopenraw/libopenraw.SlackBuild index e05360cdf266..db3d6732e05c 100644 --- a/libraries/libopenraw/libopenraw.SlackBuild +++ b/libraries/libopenraw/libopenraw.SlackBuild @@ -68,7 +68,7 @@ find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/liborigin/liborigin.SlackBuild b/libraries/liborigin/liborigin.SlackBuild index 248a0dac9fbc..58315561685f 100644 --- a/libraries/liborigin/liborigin.SlackBuild +++ b/libraries/liborigin/liborigin.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -60,8 +60,8 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ - -DBoost_LIBRARY_DIRS=/usr/lib64 - make + -DBoost_LIBRARY_DIRS=/usr/lib64 + make make install DESTDIR=$PKG cd .. diff --git a/libraries/libowfat/libowfat.SlackBuild b/libraries/libowfat/libowfat.SlackBuild index 498bac8fbc34..2effdd02058f 100644 --- a/libraries/libowfat/libowfat.SlackBuild +++ b/libraries/libowfat/libowfat.SlackBuild @@ -26,7 +26,7 @@ # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # 2010 June 25 - initial release - + PRGNAM=libowfat VERSION=${VERSION:-0.28} BUILD=${BUILD:-1} diff --git a/libraries/libpaper/libpaper.SlackBuild b/libraries/libpaper/libpaper.SlackBuild index d0de134cf71b..b63418efc32c 100644 --- a/libraries/libpaper/libpaper.SlackBuild +++ b/libraries/libpaper/libpaper.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.1.24+nmu2} 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/libraries/libpar2/libpar2.SlackBuild b/libraries/libpar2/libpar2.SlackBuild index 49b6b7d29d84..a52565d2b3ef 100644 --- a/libraries/libpar2/libpar2.SlackBuild +++ b/libraries/libpar2/libpar2.SlackBuild @@ -24,12 +24,10 @@ 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 diff --git a/libraries/libpgf/libpgf.SlackBuild b/libraries/libpgf/libpgf.SlackBuild index 384223c6a456..41f0ae22bc9c 100644 --- a/libraries/libpgf/libpgf.SlackBuild +++ b/libraries/libpgf/libpgf.SlackBuild @@ -29,12 +29,10 @@ VERSION=6.12.24 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=i486 ;; arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi diff --git a/libraries/libpseudo/libpseudo.SlackBuild b/libraries/libpseudo/libpseudo.SlackBuild index 45bc4b289363..9d572ffe7476 100644 --- a/libraries/libpseudo/libpseudo.SlackBuild +++ b/libraries/libpseudo/libpseudo.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.1.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/libraries/libpst/libpst.SlackBuild b/libraries/libpst/libpst.SlackBuild index 4565db702c9a..e4fd9f9946bf 100644 --- a/libraries/libpst/libpst.SlackBuild +++ b/libraries/libpst/libpst.SlackBuild @@ -95,7 +95,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr 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 -# Package documentation has aready been copied +# Package documentation has aready been copied # into $PKG/usr/doc/$PRGNAM-$VERSION by "make install" cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libqinfinity/libqinfinity.SlackBuild b/libraries/libqinfinity/libqinfinity.SlackBuild index 5a4e61374c5c..734cc2613047 100644 --- a/libraries/libqinfinity/libqinfinity.SlackBuild +++ b/libraries/libqinfinity/libqinfinity.SlackBuild @@ -62,7 +62,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/libraries/libqxt/libqxt.SlackBuild b/libraries/libqxt/libqxt.SlackBuild index 26fd9693ffd0..b5dcb17c2cda 100644 --- a/libraries/libqxt/libqxt.SlackBuild +++ b/libraries/libqxt/libqxt.SlackBuild @@ -24,7 +24,7 @@ # Modified by the SlackBuilds.org project -PRGNAM=libqxt +PRGNAM=libqxt VERSION=${VERSION:-0.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/librapi2/librapi2.SlackBuild b/libraries/librapi2/librapi2.SlackBuild index c2c5b491f78c..70d452240970 100644 --- a/libraries/librapi2/librapi2.SlackBuild +++ b/libraries/librapi2/librapi2.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.13.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 @@ -37,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/librcd/librcd.SlackBuild b/libraries/librcd/librcd.SlackBuild index d4dde8861472..8d99e76c910c 100644 --- a/libraries/librcd/librcd.SlackBuild +++ b/libraries/librcd/librcd.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.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/libraries/librelp/librelp.SlackBuild b/libraries/librelp/librelp.SlackBuild index ef84944e567a..d78cca999a61 100644 --- a/libraries/librelp/librelp.SlackBuild +++ b/libraries/librelp/librelp.SlackBuild @@ -82,7 +82,7 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 0644 {} \; cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/librra/librra.SlackBuild b/libraries/librra/librra.SlackBuild index 181f77397ef9..5fab7c86f227 100644 --- a/libraries/librra/librra.SlackBuild +++ b/libraries/librra/librra.SlackBuild @@ -2,23 +2,21 @@ # Slackware build script for librra # Written by Lionel Young (redtricycle@gmail.com) -PRGNAM=librra +PRGNAM=librra VERSION=${VERSION:-0.13} 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} @@ -36,7 +34,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/librsync/librsync.SlackBuild b/libraries/librsync/librsync.SlackBuild index e7da10e0ac1b..58b3af79fc84 100644 --- a/libraries/librsync/librsync.SlackBuild +++ b/libraries/librsync/librsync.SlackBuild @@ -12,12 +12,10 @@ 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 @@ -45,7 +43,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION diff --git a/libraries/librtfcomp/librtfcomp.SlackBuild b/libraries/librtfcomp/librtfcomp.SlackBuild index aa76e96341dc..ac3e4311fbc4 100644 --- a/libraries/librtfcomp/librtfcomp.SlackBuild +++ b/libraries/librtfcomp/librtfcomp.SlackBuild @@ -16,7 +16,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/libraries/libshout/libshout.SlackBuild b/libraries/libshout/libshout.SlackBuild index 2a15e07024d0..a24d218dc87b 100644 --- a/libraries/libshout/libshout.SlackBuild +++ b/libraries/libshout/libshout.SlackBuild @@ -5,17 +5,15 @@ # Written by Rodney Cobb (rdc@ktabic.co.uk) # Modified by Robby Workman <rworkman@slackbuilds.org> -PRGNAM=libshout +PRGNAM=libshout 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 @@ -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/libraries/libsigc++/libsigc++.SlackBuild b/libraries/libsigc++/libsigc++.SlackBuild index c63890e3add0..6c52f4e91807 100644 --- a/libraries/libsigc++/libsigc++.SlackBuild +++ b/libraries/libsigc++/libsigc++.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for libsigc++ +# Slackware build script for libsigc++ # Copyright (C) 2006 paul wisehart wise@lupulin.net # All rights reserved. @@ -30,17 +30,15 @@ VERSION=2.2.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 -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libsmbios/libsmbios.SlackBuild b/libraries/libsmbios/libsmbios.SlackBuild index c501a105c3ea..198b1c496b8e 100644 --- a/libraries/libsmbios/libsmbios.SlackBuild +++ b/libraries/libsmbios/libsmbios.SlackBuild @@ -5,12 +5,10 @@ VERSION=2.2.28 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/libraries/libsmi/libsmi.SlackBuild b/libraries/libsmi/libsmi.SlackBuild index fecfbbf9a8ce..f5ff887b72a9 100644 --- a/libraries/libsmi/libsmi.SlackBuild +++ b/libraries/libsmi/libsmi.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.4.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 @@ -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/libraries/libsynce/libsynce.SlackBuild b/libraries/libsynce/libsynce.SlackBuild index d42fc221e074..c116fac11cb8 100644 --- a/libraries/libsynce/libsynce.SlackBuild +++ b/libraries/libsynce/libsynce.SlackBuild @@ -2,23 +2,21 @@ # Slackware build script for libsynce # Written by redtricycle (redtricycle@gmail.com) -PRGNAM=libsynce +PRGNAM=libsynce VERSION=${VERSION:-0.13} 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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -36,7 +34,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libtar/libtar.SlackBuild b/libraries/libtar/libtar.SlackBuild index 1028d9e29972..0927a9fe8ac8 100644 --- a/libraries/libtar/libtar.SlackBuild +++ b/libraries/libtar/libtar.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-1.2.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/libraries/libtirpc/libtirpc.SlackBuild b/libraries/libtirpc/libtirpc.SlackBuild index 5eb99dbbb73a..269587229308 100644 --- a/libraries/libtirpc/libtirpc.SlackBuild +++ b/libraries/libtirpc/libtirpc.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libtunepimp/libtunepimp.SlackBuild b/libraries/libtunepimp/libtunepimp.SlackBuild index 0e502af12f29..60c198d0789a 100644 --- a/libraries/libtunepimp/libtunepimp.SlackBuild +++ b/libraries/libtunepimp/libtunepimp.SlackBuild @@ -7,19 +7,17 @@ VERSION=${VERSION:-0.5.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 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/libraries/libunique/libunique.SlackBuild b/libraries/libunique/libunique.SlackBuild index 6b6fa94ea86f..2c868e011f14 100644 --- a/libraries/libunique/libunique.SlackBuild +++ b/libraries/libunique/libunique.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.1.6} BUILD=${BUILD:-4} 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/libraries/libunique3/libunique3.SlackBuild b/libraries/libunique3/libunique3.SlackBuild index 63b7ceefec40..c14977c4d7c6 100644 --- a/libraries/libunique3/libunique3.SlackBuild +++ b/libraries/libunique3/libunique3.SlackBuild @@ -30,12 +30,10 @@ VERSION=${VERSION:-3.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 diff --git a/libraries/libunwind/libunwind.SlackBuild b/libraries/libunwind/libunwind.SlackBuild index dbedbe8e9deb..353c4cd7f109 100644 --- a/libraries/libunwind/libunwind.SlackBuild +++ b/libraries/libunwind/libunwind.SlackBuild @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libunwind -VERSION=${VERSION:-1.1} +PRGNAM=libunwind +VERSION=${VERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libupnp/libupnp.SlackBuild b/libraries/libupnp/libupnp.SlackBuild index b370122acdbb..b2b3d5861121 100644 --- a/libraries/libupnp/libupnp.SlackBuild +++ b/libraries/libupnp/libupnp.SlackBuild @@ -57,7 +57,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/libvidcap/libvidcap.SlackBuild b/libraries/libvidcap/libvidcap.SlackBuild index bfe0dafdf081..b10b894dfc78 100644 --- a/libraries/libvidcap/libvidcap.SlackBuild +++ b/libraries/libvidcap/libvidcap.SlackBuild @@ -28,12 +28,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/libraries/libviper/libviper.SlackBuild b/libraries/libviper/libviper.SlackBuild index 0e92b97299fc..37eb44f81077 100644 --- a/libraries/libviper/libviper.SlackBuild +++ b/libraries/libviper/libviper.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.4.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/libraries/libvmime/libvmime.SlackBuild b/libraries/libvmime/libvmime.SlackBuild index 5d897a14ab1e..c5577831a56f 100644 --- a/libraries/libvmime/libvmime.SlackBuild +++ b/libraries/libvmime/libvmime.SlackBuild @@ -85,7 +85,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/libwhisker2/libwhisker2.SlackBuild b/libraries/libwhisker2/libwhisker2.SlackBuild index e321f7fcb1b6..5f756650220e 100644 --- a/libraries/libwhisker2/libwhisker2.SlackBuild +++ b/libraries/libwhisker2/libwhisker2.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh - + # Slackware build script for libwhisker2 # # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it> @@ -27,12 +27,10 @@ VERSION=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/libraries/lksctp-tools/lksctp-tools.SlackBuild b/libraries/lksctp-tools/lksctp-tools.SlackBuild index 34b080ad7168..8da57bc8ab9a 100644 --- a/libraries/lksctp-tools/lksctp-tools.SlackBuild +++ b/libraries/lksctp-tools/lksctp-tools.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-1.0.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 @@ -37,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/logilab-astng/logilab-astng.SlackBuild b/libraries/logilab-astng/logilab-astng.SlackBuild index 1277c5914c2e..4dc70a96d9e0 100644 --- a/libraries/logilab-astng/logilab-astng.SlackBuild +++ b/libraries/logilab-astng/logilab-astng.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.24.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/libraries/logilab-common/logilab-common.SlackBuild b/libraries/logilab-common/logilab-common.SlackBuild index 5e3c249b14a5..55d73def1827 100644 --- a/libraries/logilab-common/logilab-common.SlackBuild +++ b/libraries/logilab-common/logilab-common.SlackBuild @@ -13,7 +13,6 @@ 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/libraries/lua-filesystem/lua-filesystem.SlackBuild b/libraries/lua-filesystem/lua-filesystem.SlackBuild index f06a648767d8..6ca6154a9b05 100644 --- a/libraries/lua-filesystem/lua-filesystem.SlackBuild +++ b/libraries/lua-filesystem/lua-filesystem.SlackBuild @@ -54,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/libraries/mini18n/mini18n.SlackBuild b/libraries/mini18n/mini18n.SlackBuild index 147e2cdad6f4..8d127bd8fdef 100644 --- a/libraries/mini18n/mini18n.SlackBuild +++ b/libraries/mini18n/mini18n.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-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/libraries/motif/motif.SlackBuild b/libraries/motif/motif.SlackBuild index 9831628d3cee..845c7374733d 100644 --- a/libraries/motif/motif.SlackBuild +++ b/libraries/motif/motif.SlackBuild @@ -10,12 +10,10 @@ VERSION=2.3.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/libraries/mygpoclient/mygpoclient.SlackBuild b/libraries/mygpoclient/mygpoclient.SlackBuild index 9471cefa5b29..db67c6202cc7 100644 --- a/libraries/mygpoclient/mygpoclient.SlackBuild +++ b/libraries/mygpoclient/mygpoclient.SlackBuild @@ -9,12 +9,10 @@ VERSION=${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 @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/mysql++/mysql++.SlackBuild b/libraries/mysql++/mysql++.SlackBuild index 1766755422ca..ef7ae8524e0a 100644 --- a/libraries/mysql++/mysql++.SlackBuild +++ b/libraries/mysql++/mysql++.SlackBuild @@ -26,22 +26,20 @@ PRGNAM=mysql++ VERSION=3.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/libraries/opal/opal.SlackBuild b/libraries/opal/opal.SlackBuild index 757560a5f964..1c127a87ae65 100644 --- a/libraries/opal/opal.SlackBuild +++ b/libraries/opal/opal.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Opal -# Copyright 2008-2009 Mauro Giachero +# Copyright 2008-2009 Mauro Giachero # Copyright 2011 David Woodfall # All rights reserved. # diff --git a/libraries/openmotif/openmotif.SlackBuild b/libraries/openmotif/openmotif.SlackBuild index 233ada2b0aec..d7ce6644fd94 100644 --- a/libraries/openmotif/openmotif.SlackBuild +++ b/libraries/openmotif/openmotif.SlackBuild @@ -10,12 +10,10 @@ VERSION=2.3.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/libraries/p4api/p4api.SlackBuild b/libraries/p4api/p4api.SlackBuild index d98090d0cc40..2ec4f2240f3e 100644 --- a/libraries/p4api/p4api.SlackBuild +++ b/libraries/p4api/p4api.SlackBuild @@ -12,7 +12,6 @@ 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/libraries/pangomm/pangomm.SlackBuild b/libraries/pangomm/pangomm.SlackBuild index cad51d3317e8..4fe06830922a 100644 --- a/libraries/pangomm/pangomm.SlackBuild +++ b/libraries/pangomm/pangomm.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.34.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/libraries/pgtcl-ng/pgtcl-ng.SlackBuild b/libraries/pgtcl-ng/pgtcl-ng.SlackBuild index a3c2ca623a41..5eaf7f36e28d 100644 --- a/libraries/pgtcl-ng/pgtcl-ng.SlackBuild +++ b/libraries/pgtcl-ng/pgtcl-ng.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pgtcl-ng -# Copyright 2011 Richard Ellis, Arlington, Virginia, USA +# Copyright 2011 Richard Ellis, Arlington, Virginia, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # Version 1 - June 12, 2009 # Updated for Slackware 13.37 and pgtcl-ng 2.0.0 Dec 18, 2011 -PRGNAM=pgtcl-ng +PRGNAM=pgtcl-ng VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/pidgin-mra/pidgin-mra.SlackBuild b/libraries/pidgin-mra/pidgin-mra.SlackBuild index 3267020745cb..823a821dacb8 100644 --- a/libraries/pidgin-mra/pidgin-mra.SlackBuild +++ b/libraries/pidgin-mra/pidgin-mra.SlackBuild @@ -22,7 +22,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -51,7 +51,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/use_our_cflags.diff +patch -p1 < $CWD/use_our_cflags.diff make \ OPTS="$SLKCFLAGS" \ diff --git a/libraries/plib/plib.SlackBuild b/libraries/plib/plib.SlackBuild index baf21345bc24..68a8d65a7d7a 100644 --- a/libraries/plib/plib.SlackBuild +++ b/libraries/plib/plib.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.8.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/libraries/pthsem/pthsem.SlackBuild b/libraries/pthsem/pthsem.SlackBuild index 8cd12a83f522..6d66d51ecc76 100644 --- a/libraries/pthsem/pthsem.SlackBuild +++ b/libraries/pthsem/pthsem.SlackBuild @@ -9,12 +9,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/libraries/purple-plugin_pack/purple-plugin_pack.SlackBuild b/libraries/purple-plugin_pack/purple-plugin_pack.SlackBuild index 2d12bfd4a766..f423d9febe59 100644 --- a/libraries/purple-plugin_pack/purple-plugin_pack.SlackBuild +++ b/libraries/purple-plugin_pack/purple-plugin_pack.SlackBuild @@ -8,12 +8,10 @@ VERSION=2.5.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 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP diff --git a/libraries/qt-assistant-compat/qt-assistant-compat.SlackBuild b/libraries/qt-assistant-compat/qt-assistant-compat.SlackBuild index e384cf6da722..de76d952e4b0 100644 --- a/libraries/qt-assistant-compat/qt-assistant-compat.SlackBuild +++ b/libraries/qt-assistant-compat/qt-assistant-compat.SlackBuild @@ -29,7 +29,7 @@ PRGNAM=qt-assistant-compat VERSION=${VERSION:-4.6.3} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} SRCNAM=qt-assistant-qassistantclient-library-compat-src SRCDIR=qt-assistant-qassistantclient-library-compat-version diff --git a/libraries/qtermwidget/qtermwidget.SlackBuild b/libraries/qtermwidget/qtermwidget.SlackBuild index e3c20746481f..9d5b6e377d73 100644 --- a/libraries/qtermwidget/qtermwidget.SlackBuild +++ b/libraries/qtermwidget/qtermwidget.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="AUTHORS COPYING Changelog README TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -60,7 +60,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/libraries/quesoglc/quesoglc.SlackBuild b/libraries/quesoglc/quesoglc.SlackBuild index 31e785eb121c..27f3c7839691 100644 --- a/libraries/quesoglc/quesoglc.SlackBuild +++ b/libraries/quesoglc/quesoglc.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.7.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/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index 2dae61d879e7..3aad78b06b78 100644 --- a/libraries/qwt/qwt.SlackBuild +++ b/libraries/qwt/qwt.SlackBuild @@ -40,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/raptor/raptor.SlackBuild b/libraries/raptor/raptor.SlackBuild index c2cac2b249b5..d656777b1b1b 100644 --- a/libraries/raptor/raptor.SlackBuild +++ b/libraries/raptor/raptor.SlackBuild @@ -58,7 +58,7 @@ fi DOCS="AUTHORS COPYING* INSTALL* LICENSE* NEWS* NOTICE README* RELEASE.html" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/rhino/rhino.SlackBuild b/libraries/rhino/rhino.SlackBuild index b8bfe1d0a7ae..2f2f2439b6de 100644 --- a/libraries/rhino/rhino.SlackBuild +++ b/libraries/rhino/rhino.SlackBuild @@ -8,12 +8,10 @@ VERSION=1_7R2 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/libraries/slib/slib.SlackBuild b/libraries/slib/slib.SlackBuild index 5517314afb92..58030d7aab44 100644 --- a/libraries/slib/slib.SlackBuild +++ b/libraries/slib/slib.SlackBuild @@ -96,7 +96,7 @@ mkdir -p $PKG/usr/share/guile/1.8/ ln -s ../../slib $PKG/usr/share/guile/1.8/ # somewhat perculiar quirk that only seems to be an issue on slackware -ln -s mklibcat.scm $PKG/usr/share/slib/mklibcat +ln -s mklibcat.scm $PKG/usr/share/slib/mklibcat # This will be invoked during postinstall to generate the guile catalog file mkdir -p $PKG/usr/libexec/slib @@ -113,6 +113,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh - + cd $PKG /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/smartirc4net/smartirc4net.SlackBuild b/libraries/smartirc4net/smartirc4net.SlackBuild index 92c632e023fe..cfd512bf3bb9 100644 --- a/libraries/smartirc4net/smartirc4net.SlackBuild +++ b/libraries/smartirc4net/smartirc4net.SlackBuild @@ -13,7 +13,6 @@ 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/libraries/stk/stk.SlackBuild b/libraries/stk/stk.SlackBuild index 040da301dfea..ea63053471c9 100644 --- a/libraries/stk/stk.SlackBuild +++ b/libraries/stk/stk.SlackBuild @@ -85,7 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -# Compile only the library files (both static and dynamic) +# Compile only the library files (both static and dynamic) # Seems our flags are ignored sed -i "s|-O3|$SLKCFLAGS|" src/Makefile cd src diff --git a/libraries/tcllib/tcllib.SlackBuild b/libraries/tcllib/tcllib.SlackBuild index 842eaaccf4ec..612597621ec1 100644 --- a/libraries/tcllib/tcllib.SlackBuild +++ b/libraries/tcllib/tcllib.SlackBuild @@ -7,22 +7,20 @@ PRGNAM=tcllib VERSION=${VERSION:-1.14} 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/libraries/tkimg/tkimg.SlackBuild b/libraries/tkimg/tkimg.SlackBuild index 85a93698f5fd..8ae96e0fa1ea 100644 --- a/libraries/tkimg/tkimg.SlackBuild +++ b/libraries/tkimg/tkimg.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for tkimg -# Copyright 2011 Richard Ellis, Arlington, Virginia, USA +# Copyright 2011 Richard Ellis, Arlington, Virginia, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/libraries/tls/tls.SlackBuild b/libraries/tls/tls.SlackBuild index 9fd17e02e39a..396d0f6b1f52 100644 --- a/libraries/tls/tls.SlackBuild +++ b/libraries/tls/tls.SlackBuild @@ -9,12 +9,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/libraries/tolua++/tolua++.SlackBuild b/libraries/tolua++/tolua++.SlackBuild index 489548e56955..c4d9e1255055 100644 --- a/libraries/tolua++/tolua++.SlackBuild +++ b/libraries/tolua++/tolua++.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.0.93} 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/libraries/tre/tre.SlackBuild b/libraries/tre/tre.SlackBuild index a9b57702fb46..754451db4568 100644 --- a/libraries/tre/tre.SlackBuild +++ b/libraries/tre/tre.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.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 diff --git a/libraries/unixODBC/unixODBC.SlackBuild b/libraries/unixODBC/unixODBC.SlackBuild index 5f8ac712598c..c7b2940ba08b 100644 --- a/libraries/unixODBC/unixODBC.SlackBuild +++ b/libraries/unixODBC/unixODBC.SlackBuild @@ -32,12 +32,10 @@ VERSION=2.3.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/libraries/vigra/vigra.SlackBuild b/libraries/vigra/vigra.SlackBuild index 80dbbd5b5fb6..a3ef5be55f48 100644 --- a/libraries/vigra/vigra.SlackBuild +++ b/libraries/vigra/vigra.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for vigra # Home Page http://hci.iwr.uni-heidelberg.de/vigra/ -# Copyright (c) 2013, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2013, Nishant Limbachia, Hoffman Estates, IL, USA # (nishant _AT_ mnspace _DOT_ net) # All rights reserved. @@ -82,7 +82,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DDOCINSTALL=doc/$PRGNAM-$VERSION \ -DCMAKE_BUILD_TYPE=Release .. - make VERBOSE=1 + make VERBOSE=1 make install DESTDIR=$PKG cd .. diff --git a/libraries/webkitgtk3/webkitgtk3.SlackBuild b/libraries/webkitgtk3/webkitgtk3.SlackBuild index a3097b422785..c3f973e70afb 100644 --- a/libraries/webkitgtk3/webkitgtk3.SlackBuild +++ b/libraries/webkitgtk3/webkitgtk3.SlackBuild @@ -90,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-geolocation=$GEOCLUE \ --build=$ARCH-slackware-linux -make clean +make clean make -j1 Programs_DumpRenderTree_LDFLAGS="-no-fast-install -no-install -lfontconfig" make install-strip DESTDIR=$PKG diff --git a/libraries/wv/wv.SlackBuild b/libraries/wv/wv.SlackBuild index 80c151fa9cef..cd332fbdc391 100644 --- a/libraries/wv/wv.SlackBuild +++ b/libraries/wv/wv.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.2.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/libraries/wxX11/wxX11.SlackBuild b/libraries/wxX11/wxX11.SlackBuild index 51576853fc51..60d2ac04dfc9 100644 --- a/libraries/wxX11/wxX11.SlackBuild +++ b/libraries/wxX11/wxX11.SlackBuild @@ -7,12 +7,10 @@ VERSION=2.8.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 @@ -36,7 +34,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/xalan-c/xalan-c.SlackBuild b/libraries/xalan-c/xalan-c.SlackBuild index b959c96aa446..4401f6a80e85 100644 --- a/libraries/xalan-c/xalan-c.SlackBuild +++ b/libraries/xalan-c/xalan-c.SlackBuild @@ -24,8 +24,8 @@ # Currently maintained by Robert Allen <slacker@slaphappygeeks.com> -# Note: This SVN snapshot of xalan-c is selected to build with xerces-c-3.x -# series without patching, so the source archive filename is hard-coded into +# Note: This SVN snapshot of xalan-c is selected to build with xerces-c-3.x +# series without patching, so the source archive filename is hard-coded into # the script. If you want to build with a different snapshot then you will # need to create your own archive an update the filename in the script. # diff --git a/libraries/xalan/xalan.SlackBuild b/libraries/xalan/xalan.SlackBuild index 3c4640aadf81..34b9b64621d4 100644 --- a/libraries/xalan/xalan.SlackBuild +++ b/libraries/xalan/xalan.SlackBuild @@ -11,12 +11,10 @@ TAG=${TAG:-_SBo} DVER=j_$(echo $VERSION | tr . _) ANTHOME=/usr/share/ant -# 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/libraries/xerces/xerces.SlackBuild b/libraries/xerces/xerces.SlackBuild index eee1deefe4c2..4eb584c710ef 100644 --- a/libraries/xerces/xerces.SlackBuild +++ b/libraries/xerces/xerces.SlackBuild @@ -32,12 +32,10 @@ TAG=${TAG:-_SBo} DVER=$(echo $VERSION | tr . _) ANTHOME=/usr/share/ant -# 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/libraries/xforms/xforms.SlackBuild b/libraries/xforms/xforms.SlackBuild index 8102386b0a28..2ecbb3630565 100644 --- a/libraries/xforms/xforms.SlackBuild +++ b/libraries/xforms/xforms.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.0.93sp1} 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 @@ -61,7 +59,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/libraries/xlt/xlt.SlackBuild b/libraries/xlt/xlt.SlackBuild index 39ad065b5815..30a3aa1af329 100644 --- a/libraries/xlt/xlt.SlackBuild +++ b/libraries/xlt/xlt.SlackBuild @@ -14,12 +14,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/libraries/xmlgen/xmlgen.SlackBuild b/libraries/xmlgen/xmlgen.SlackBuild index 775a6decd478..a8151ac929a8 100644 --- a/libraries/xmlgen/xmlgen.SlackBuild +++ b/libraries/xmlgen/xmlgen.SlackBuild @@ -17,7 +17,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/libraries/xulrunner/xulrunner.SlackBuild b/libraries/xulrunner/xulrunner.SlackBuild index 36bbdd229e76..16aa827c8f47 100644 --- a/libraries/xulrunner/xulrunner.SlackBuild +++ b/libraries/xulrunner/xulrunner.SlackBuild @@ -107,7 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-updater \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux \ - --target=$ARCH-slackware-linux + --target=$ARCH-slackware-linux make make install DESTDIR=$PKG diff --git a/libraries/zbase32/zbase32.SlackBuild b/libraries/zbase32/zbase32.SlackBuild index 7126d6a5f951..88efa1681932 100644 --- a/libraries/zbase32/zbase32.SlackBuild +++ b/libraries/zbase32/zbase32.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-1.1.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/libraries/zita-resampler/zita-resampler.SlackBuild b/libraries/zita-resampler/zita-resampler.SlackBuild index cc2c4ad4ea4f..dc51059084b0 100644 --- a/libraries/zita-resampler/zita-resampler.SlackBuild +++ b/libraries/zita-resampler/zita-resampler.SlackBuild @@ -16,7 +16,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/libraries/zsi/zsi.SlackBuild b/libraries/zsi/zsi.SlackBuild index a0e497d8ce6e..d770a66ef47f 100644 --- a/libraries/zsi/zsi.SlackBuild +++ b/libraries/zsi/zsi.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.1a1} 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 |