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 /development | |
parent | 610e8461bb9b201adbd4bd9257a9bf48be71f62b (diff) |
various: Fix SlackBuild formatting and comment nit picks.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'development')
107 files changed, 134 insertions, 231 deletions
diff --git a/development/CImg/CImg.SlackBuild b/development/CImg/CImg.SlackBuild index b45210ad9146..9e2d6985de1c 100644 --- a/development/CImg/CImg.SlackBuild +++ b/development/CImg/CImg.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for CImg. -# +# # Copyright 2009-2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/development/SQLAlchemy/SQLAlchemy.SlackBuild b/development/SQLAlchemy/SQLAlchemy.SlackBuild index 88b6eac58e29..dba85500116a 100644 --- a/development/SQLAlchemy/SQLAlchemy.SlackBuild +++ b/development/SQLAlchemy/SQLAlchemy.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.5.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/development/THE/THE.SlackBuild b/development/THE/THE.SlackBuild index 609da21d2fe9..3d0dbb77d408 100644 --- a/development/THE/THE.SlackBuild +++ b/development/THE/THE.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for The Hessling Editor +# Slackware build script for The Hessling Editor # Written by Richard Narron (richard@aaazen.com) @@ -64,9 +64,9 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --prefix=/usr \ - --sysconfdir=/etc + --sysconfdir=/etc -make +make make html make install DESTDIR=$PKG diff --git a/development/ahven/ahven.SlackBuild b/development/ahven/ahven.SlackBuild index a8906aaf1f79..2f7428f0713d 100644 --- a/development/ahven/ahven.SlackBuild +++ b/development/ahven/ahven.SlackBuild @@ -25,12 +25,10 @@ VERSION=${VERSION:-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*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac export ARCH diff --git a/development/amd-app-sdk/amd-app-sdk.SlackBuild b/development/amd-app-sdk/amd-app-sdk.SlackBuild index e02ab073ad27..3c0eaeeedc5e 100644 --- a/development/amd-app-sdk/amd-app-sdk.SlackBuild +++ b/development/amd-app-sdk/amd-app-sdk.SlackBuild @@ -37,7 +37,6 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SAMPLES=${SAMPLES:-no} -# Automatically determine the architecture we're building on or use supplied ARCH # (only x86 and x86_64 are supported) TESTARCH=${ARCH:-`uname -m`} case "$TESTARCH" in diff --git a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild index 0fedd5b35ad2..38adfcc384a0 100644 --- a/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild +++ b/development/avr8-burn-o-mat/avr8-burn-o-mat.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-2.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 @@ -46,7 +44,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/${SRCNAM}_$(echo $VERSION | tr '.' '_')_src.tar.bz2 -mv $(echo $SRCNAM | tr '_' '-' ) $PRGNAM-$VERSION +mv $(echo $SRCNAM | tr '_' '-' ) $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . find . \ diff --git a/development/avrdude/avrdude.SlackBuild b/development/avrdude/avrdude.SlackBuild index 93104e59019f..25e248c45616 100644 --- a/development/avrdude/avrdude.SlackBuild +++ b/development/avrdude/avrdude.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -62,7 +62,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/bakefile/bakefile.SlackBuild b/development/bakefile/bakefile.SlackBuild index 77ef986a7a88..1d47c518f654 100644 --- a/development/bakefile/bakefile.SlackBuild +++ b/development/bakefile/bakefile.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/bpython/bpython.SlackBuild b/development/bpython/bpython.SlackBuild index 66a098c81ca9..86e1ad7e698c 100644 --- a/development/bpython/bpython.SlackBuild +++ b/development/bpython/bpython.SlackBuild @@ -19,14 +19,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . diff --git a/development/bsdiff/bsdiff.SlackBuild b/development/bsdiff/bsdiff.SlackBuild index 02867bfe0a83..8f66ebae2c25 100644 --- a/development/bsdiff/bsdiff.SlackBuild +++ b/development/bsdiff/bsdiff.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/development/bvi/bvi.SlackBuild b/development/bvi/bvi.SlackBuild index 99f3e50bae62..cd58f5f98a90 100644 --- a/development/bvi/bvi.SlackBuild +++ b/development/bvi/bvi.SlackBuild @@ -27,12 +27,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/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild index 2b14d5bd4411..4d5e4b6186fa 100644 --- a/development/cgit/cgit.SlackBuild +++ b/development/cgit/cgit.SlackBuild @@ -59,7 +59,7 @@ GIT_VERSION=${GIT_VERSION:-1.8.4} DOCS="cgitrc.5.txt COPYING README $CWD/config/cgit-lighttpd.conf \ $CWD/config/cgit-httpd.conf $CWD/config/cgitrc.sample" -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/check/check.SlackBuild b/development/check/check.SlackBuild index b93bad67f06d..de96dea66037 100644 --- a/development/check/check.SlackBuild +++ b/development/check/check.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Check -# Copyright 2006 Jules Villard <theblatte@loulous.org> +# Copyright 2006 Jules Villard <theblatte@loulous.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/development/chicken/chicken.SlackBuild b/development/chicken/chicken.SlackBuild index af53a7f16fb6..92c53d875dbd 100644 --- a/development/chicken/chicken.SlackBuild +++ b/development/chicken/chicken.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-4.8.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 @@ -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/development/cim/cim.SlackBuild b/development/cim/cim.SlackBuild index fe9cd9fd53a8..b1256f1214a9 100644 --- a/development/cim/cim.SlackBuild +++ b/development/cim/cim.SlackBuild @@ -5,33 +5,31 @@ # Written by Andre Barboza <bmg.andre@gmail.com> # Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cim VERSION=${VERSION:-3.37} 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/development/couchdb/couchdb.SlackBuild b/development/couchdb/couchdb.SlackBuild index 580ed7b574f8..2f156267e69b 100644 --- a/development/couchdb/couchdb.SlackBuild +++ b/development/couchdb/couchdb.SlackBuild @@ -12,12 +12,10 @@ TAG=${TAG:-_SBo} PKGSRC=apache-couchdb -# 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/development/cpan2tgz/cpan2tgz.SlackBuild b/development/cpan2tgz/cpan2tgz.SlackBuild index 3fde9fbdaf16..dc5666d73519 100644 --- a/development/cpan2tgz/cpan2tgz.SlackBuild +++ b/development/cpan2tgz/cpan2tgz.SlackBuild @@ -61,7 +61,7 @@ make install DESTDIR=$PKG INSTALLSITEMAN1DIR=/usr/man/man1 # Remove unnecessary crap eval $(perl '-V:archlib'); eval $(perl '-V:sitelib') -rm -rf $PKG/$archlib/* $PKG/$sitelib/* +rm -rf $PKG/$archlib/* $PKG/$sitelib/* rmdir --parents $PKG/$sitelib $PKG/$archlib 2>/dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/development/cppcms/cppcms.SlackBuild b/development/cppcms/cppcms.SlackBuild index 5f4b60c1cb84..81cbc681ceec 100644 --- a/development/cppcms/cppcms.SlackBuild +++ b/development/cppcms/cppcms.SlackBuild @@ -60,7 +60,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/development/cppunit/cppunit.SlackBuild b/development/cppunit/cppunit.SlackBuild index 523a97cd7683..2e341e7a5f65 100644 --- a/development/cppunit/cppunit.SlackBuild +++ b/development/cppunit/cppunit.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.12.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 @@ -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/development/cryptoki/cryptoki.SlackBuild b/development/cryptoki/cryptoki.SlackBuild index 79f80729a18b..a01024950a55 100644 --- a/development/cryptoki/cryptoki.SlackBuild +++ b/development/cryptoki/cryptoki.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for the RSA Security Inc. PKCS #11 Cryptographic # Token Interface 2.20 headers, called Cryptoki. -# +# # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/development/cvsd/cvsd.SlackBuild b/development/cvsd/cvsd.SlackBuild index 953e4b798052..bb547e70cf89 100644 --- a/development/cvsd/cvsd.SlackBuild +++ b/development/cvsd/cvsd.SlackBuild @@ -28,7 +28,7 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -set -e # Exit on most errors +set -e # Bail out if user or group isn't valid on your system # For slackbuilds.org, assigned cvsd uid/gid are 233/233 diff --git a/development/devhelp/devhelp.SlackBuild b/development/devhelp/devhelp.SlackBuild index 44fd44de9862..a4d424ab20d3 100644 --- a/development/devhelp/devhelp.SlackBuild +++ b/development/devhelp/devhelp.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/docutils/docutils.SlackBuild b/development/docutils/docutils.SlackBuild index cd532f7a5b1b..bc398f1e094d 100644 --- a/development/docutils/docutils.SlackBuild +++ b/development/docutils/docutils.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.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/development/ecl/ecl.SlackBuild b/development/ecl/ecl.SlackBuild index 3828151a5c40..6b2738209851 100644 --- a/development/ecl/ecl.SlackBuild +++ b/development/ecl/ecl.SlackBuild @@ -26,12 +26,10 @@ TAG=${TAG:-_SBo} DOCS="ANNOUNCEMENT INSTALL README.1st Copyright LGPL" -# 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/development/eclipse/eclipse.SlackBuild b/development/eclipse/eclipse.SlackBuild index 27213f726c24..7da697232f73 100644 --- a/development/eclipse/eclipse.SlackBuild +++ b/development/eclipse/eclipse.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for eclipse +# Slackware build script for eclipse # Copyright (c) 2008-2010, Antonio Hernández Blas <hba.nihilismus@gmail.com> # All rights reserved. diff --git a/development/epydoc/epydoc.SlackBuild b/development/epydoc/epydoc.SlackBuild index 34bf1ac49e64..92d3c3f1c8a2 100644 --- a/development/epydoc/epydoc.SlackBuild +++ b/development/epydoc/epydoc.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=epydoc VERSION=3.0.1 BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,9 +35,9 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} DOCS="LICENSE.txt README.txt" diff --git a/development/erlang-otp/erlang-otp.SlackBuild b/development/erlang-otp/erlang-otp.SlackBuild index 0b316632f51c..e456c5146b72 100644 --- a/development/erlang-otp/erlang-otp.SlackBuild +++ b/development/erlang-otp/erlang-otp.SlackBuild @@ -10,7 +10,7 @@ # Modified by Robby Workman 20071027 # I won't change the "Written by" line, because I didn't # change who wrote the script. If there are questions as -# to whether my changes caused a problem, feel free to +# to whether my changes caused a problem, feel free to # send mail to me first. # Package adaptation in order to rename it from otp-R11B diff --git a/development/flawfinder/flawfinder.SlackBuild b/development/flawfinder/flawfinder.SlackBuild index c1157fa82f7d..8b2a9a681932 100644 --- a/development/flawfinder/flawfinder.SlackBuild +++ b/development/flawfinder/flawfinder.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.27} 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/development/ftjam/ftjam.SlackBuild b/development/ftjam/ftjam.SlackBuild index 867784050df0..208e1cbb0c6a 100644 --- a/development/ftjam/ftjam.SlackBuild +++ b/development/ftjam/ftjam.SlackBuild @@ -12,12 +12,10 @@ VERSION=2.5.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/development/gambit/gambit.SlackBuild b/development/gambit/gambit.SlackBuild index 218ff0ec51b2..d8c6e23c97bf 100644 --- a/development/gambit/gambit.SlackBuild +++ b/development/gambit/gambit.SlackBuild @@ -10,12 +10,10 @@ TAG=${TAG:-_SBo} SOURCE_BASE="gambc-v$(echo $VERSION | tr \. _)-devel" -# 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/development/glade/glade.SlackBuild b/development/glade/glade.SlackBuild index 4484b688e8fb..626be5ba832c 100644 --- a/development/glade/glade.SlackBuild +++ b/development/glade/glade.SlackBuild @@ -82,7 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux \ --disable-scrollkeeper -make +make make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/global/global.SlackBuild b/development/global/global.SlackBuild index ce0c6192b0e1..825d30ca93e3 100644 --- a/development/global/global.SlackBuild +++ b/development/global/global.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-6.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/development/gnome-inform7/gnome-inform7.SlackBuild b/development/gnome-inform7/gnome-inform7.SlackBuild index bbba73c858fe..03ccafdd32af 100644 --- a/development/gnome-inform7/gnome-inform7.SlackBuild +++ b/development/gnome-inform7/gnome-inform7.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 @@ -37,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -67,7 +66,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r rm -rf $PRGNAM-$VERSION tar xfv $CWD/I7_${VERSION}_GNOME_Source.tar.gz -cp $PKG/usr/share/inform7/Compilers/ni $PRGNAM-$VERSION/src/ni/ +cp $PKG/usr/share/inform7/Compilers/ni $PRGNAM-$VERSION/src/ni/ cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -94,7 +93,7 @@ make \ frotzdocdir=/usr/doc/$PRGNAM-$VERSION/frotz \ glulxedocdir=/usr/doc/$PRGNAM-$VERSION/glulxe \ gitdocdir=/usr/doc/$PRGNAM-$VERSION/git - + make install \ docdir=/usr/doc/$PRGNAM-$VERSION \ inform6docdir=/usr/doc/$PRGNAM-$VERSION/inform6 \ diff --git a/development/gnustep-base/gnustep-base.SlackBuild b/development/gnustep-base/gnustep-base.SlackBuild index fc97b289019f..aa42b6177c99 100644 --- a/development/gnustep-base/gnustep-base.SlackBuild +++ b/development/gnustep-base/gnustep-base.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.24.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/development/gnustep-make/gnustep-make.SlackBuild b/development/gnustep-make/gnustep-make.SlackBuild index 48ff3f0a0180..d4cd7db7d0b9 100644 --- a/development/gnustep-make/gnustep-make.SlackBuild +++ b/development/gnustep-make/gnustep-make.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.6.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/development/gplcver/gplcver.SlackBuild b/development/gplcver/gplcver.SlackBuild index 502132a61a1b..f38845caf566 100644 --- a/development/gplcver/gplcver.SlackBuild +++ b/development/gplcver/gplcver.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -75,8 +75,8 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr .. - make + -DCMAKE_INSTALL_PREFIX=/usr .. + make make install DESTDIR=$PKG cd .. diff --git a/development/gprolog/gprolog.SlackBuild b/development/gprolog/gprolog.SlackBuild index 41769a1b08b5..376b982d68bf 100644 --- a/development/gprolog/gprolog.SlackBuild +++ b/development/gprolog/gprolog.SlackBuild @@ -53,7 +53,7 @@ find -L . \ # gprolog seems to ignore the default SlackBuild configure options # and installs itself into $prefix/gprolog-$VERSION # So build it with only these two flags for now -cd src +cd src CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/gputils/gputils.SlackBuild b/development/gputils/gputils.SlackBuild index f01d2ddc3bc9..2febbb030665 100644 --- a/development/gputils/gputils.SlackBuild +++ b/development/gputils/gputils.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.13.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 @@ -33,7 +31,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/grails/grails.SlackBuild b/development/grails/grails.SlackBuild index 83b52734c243..70b0efe7b73c 100644 --- a/development/grails/grails.SlackBuild +++ b/development/grails/grails.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.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 @@ -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/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild index 05cceab60e9e..f79db5c7d154 100644 --- a/development/gtest/gtest.SlackBuild +++ b/development/gtest/gtest.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-1.5.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 @@ -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/development/guile1.8/guile1.8.SlackBuild b/development/guile1.8/guile1.8.SlackBuild index eea537054832..3eaabbfcb027 100644 --- a/development/guile1.8/guile1.8.SlackBuild +++ b/development/guile1.8/guile1.8.SlackBuild @@ -91,11 +91,11 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r # Compress info files if [ -d $PKG/usr/info ]; then ( cd $PKG/usr/info - rm -f dir + rm -f dir gzip -9 * # rename it so that it will not overwrite Slackware's guile 2.0 package for i in {1..7} - do + do mv guile.info-$i.gz guile1.8.info-$i.gz done mv guile.info.gz guile1.8.info.gz diff --git a/development/hexedit/hexedit.SlackBuild b/development/hexedit/hexedit.SlackBuild index 28a35880e66a..7443ed48f93b 100644 --- a/development/hexedit/hexedit.SlackBuild +++ b/development/hexedit/hexedit.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -32,7 +30,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/ht/ht.SlackBuild b/development/ht/ht.SlackBuild index 9fbc98a963d6..5745d1ddaa4b 100644 --- a/development/ht/ht.SlackBuild +++ b/development/ht/ht.SlackBuild @@ -30,7 +30,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/hte/hte.SlackBuild b/development/hte/hte.SlackBuild index f429623846dc..78014080f70a 100644 --- a/development/hte/hte.SlackBuild +++ b/development/hte/hte.SlackBuild @@ -55,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/development/hugs98/hugs98.SlackBuild b/development/hugs98/hugs98.SlackBuild index c301e8c99387..daa3421b0082 100644 --- a/development/hugs98/hugs98.SlackBuild +++ b/development/hugs98/hugs98.SlackBuild @@ -25,12 +25,10 @@ VERSION=Sep2006 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/development/icoutils/icoutils.SlackBuild b/development/icoutils/icoutils.SlackBuild index b94bdefb556a..16e2c8f0583c 100644 --- a/development/icoutils/icoutils.SlackBuild +++ b/development/icoutils/icoutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for icoutils +# Slackware build script for icoutils # Copyright (c) 2008, Mark Walling <mark@markwalling.com> # All rights reserved. @@ -29,12 +29,10 @@ VERSION=0.26.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/development/jam/jam.SlackBuild b/development/jam/jam.SlackBuild index 50a7a82f954d..cec53096b9ec 100644 --- a/development/jam/jam.SlackBuild +++ b/development/jam/jam.SlackBuild @@ -29,12 +29,10 @@ VERSION=2.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/development/jasspa/jasspa.SlackBuild b/development/jasspa/jasspa.SlackBuild index 8c6ea34a8cce..eeb0413d20ee 100644 --- a/development/jasspa/jasspa.SlackBuild +++ b/development/jasspa/jasspa.SlackBuild @@ -77,7 +77,7 @@ install -D -m 755 me $PKG/usr/bin/me mkdir -p $PKG/usr/share # extract macros under /usr/share -# NOTE $PRGNAM-metree-20091017.tar.gz is newer than VERSION. This is +# NOTE $PRGNAM-metree-20091017.tar.gz is newer than VERSION. This is # intentional, the macros collection contains some minor fixes, # but according to http://www.jasspa.com/downsrc.html: "The official # baseline for 2009 is 2009.10.11 ...", so VERSION is 091011 diff --git a/development/jdk/jdk.SlackBuild b/development/jdk/jdk.SlackBuild index 474b051cf096..0a0511ae6b62 100644 --- a/development/jdk/jdk.SlackBuild +++ b/development/jdk/jdk.SlackBuild @@ -80,7 +80,7 @@ chmod 755 $PKG/etc/profile.d/* ln -sf java ${PRGNAM}${DVER} ) -if [ ${EXPLOIT_ME:-"no"} = "YES" ] ;then +if [ ${EXPLOIT_ME:-"no"} = "YES" ] ;then mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins ln -sf /usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so @@ -90,7 +90,7 @@ else security vulnerabilities, 44 of which affected the use of Java as a plug-in for Web browers. - !! THE MOZILLA PLUGIN IS NO LONGER ACTIVATED BY DEFAULT !! + !! THE MOZILLA PLUGIN IS NO LONGER ACTIVATED BY DEFAULT !! " sleep 5 fi diff --git a/development/judy/judy.SlackBuild b/development/judy/judy.SlackBuild index d0a9467594f7..6415f66cf6f7 100644 --- a/development/judy/judy.SlackBuild +++ b/development/judy/judy.SlackBuild @@ -56,7 +56,7 @@ fi DOCS="AUTHORS COPYING ChangeLog README" -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/julius/julius.SlackBuild b/development/julius/julius.SlackBuild index b6f989be4110..d489f00c7448 100644 --- a/development/julius/julius.SlackBuild +++ b/development/julius/julius.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for julius # Copyright (c) 2010 Roberto Metere. All rights reserved. -# roberto<at>metere<dot>it +# roberto<at>metere<dot>it # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -76,7 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=$PKG/usr/man \ --build=$ARCH-slackware-linux -make +make make install find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/development/kdesvn/kdesvn.SlackBuild b/development/kdesvn/kdesvn.SlackBuild index 0d0ff1a67762..ad3b7c739791 100644 --- a/development/kdesvn/kdesvn.SlackBuild +++ b/development/kdesvn/kdesvn.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 @@ -70,7 +69,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -mkdir build +mkdir build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/development/kelbt/kelbt.SlackBuild b/development/kelbt/kelbt.SlackBuild index fd242cc7dd06..8640f5af5c56 100644 --- a/development/kelbt/kelbt.SlackBuild +++ b/development/kelbt/kelbt.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/kompozer/kompozer.SlackBuild b/development/kompozer/kompozer.SlackBuild index 415c686ee390..5dd861be0baa 100644 --- a/development/kompozer/kompozer.SlackBuild +++ b/development/kompozer/kompozer.SlackBuild @@ -25,7 +25,7 @@ OUTPUT=${OUTPUT:-/tmp} # http://sourceforge.net/projects/kompozer/files/ KOMPOZERLANG=${KOMPOZERLANG:-en-US} -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/latrace/latrace.SlackBuild b/development/latrace/latrace.SlackBuild index 49ec7609e0e7..b6254102b3d6 100644 --- a/development/latrace/latrace.SlackBuild +++ b/development/latrace/latrace.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-0.5.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 @@ -41,9 +39,9 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/ldns/ldns.SlackBuild b/development/ldns/ldns.SlackBuild index bcced58885cf..3bb9aaea1d3c 100644 --- a/development/ldns/ldns.SlackBuild +++ b/development/ldns/ldns.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- -# Slackware SlackBuild script +# Slackware SlackBuild script # =========================== # By: R. Andrew Bailey # For: ldns @@ -97,7 +97,7 @@ make install DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION -cd drill +cd drill CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -119,7 +119,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; find $PKG/usr/man -type f -exec chmod 0644 {} \; -for i in $(find $PKG/usr/man -type l -name "*.?") ; do +for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/development/libxdg-basedir/libxdg-basedir.SlackBuild b/development/libxdg-basedir/libxdg-basedir.SlackBuild index 4ec556f6b612..768f1b218985 100644 --- a/development/libxdg-basedir/libxdg-basedir.SlackBuild +++ b/development/libxdg-basedir/libxdg-basedir.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-1.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 @@ -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/development/logisim/logisim.SlackBuild b/development/logisim/logisim.SlackBuild index 4a3a4682ee27..54eb860e8ebd 100644 --- a/development/logisim/logisim.SlackBuild +++ b/development/logisim/logisim.SlackBuild @@ -33,7 +33,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/development/luarocks/luarocks.SlackBuild b/development/luarocks/luarocks.SlackBuild index 6ef15172b5d0..391469e484de 100644 --- a/development/luarocks/luarocks.SlackBuild +++ b/development/luarocks/luarocks.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for LuaRocks -# Copyright 2012 evandrofisico +# Copyright 2012 evandrofisico # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/development/mlton/mlton.SlackBuild b/development/mlton/mlton.SlackBuild index 7cf5bbb870ec..0a9076c3f516 100644 --- a/development/mlton/mlton.SlackBuild +++ b/development/mlton/mlton.SlackBuild @@ -40,7 +40,7 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} case "$ARCH" in - i?86) LIBDIRSUFFIX="" + i?86) LIBDIRSUFFIX="" TARARCH="x86" ;; x86_64) LIBDIRSUFFIX="64" TARARCH="amd64" ;; diff --git a/development/mm-common/mm-common.SlackBuild b/development/mm-common/mm-common.SlackBuild index e9f07f2ccb78..d884ac10140b 100644 --- a/development/mm-common/mm-common.SlackBuild +++ b/development/mm-common/mm-common.SlackBuild @@ -77,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -# Ugly hack for things that look for /usr/share/glibmm-2.4/doctool +# Ugly hack for things that look for /usr/share/glibmm-2.4/doctool mkdir -p $PKG/usr/share/glibmm-2.4 ( cd $PKG/usr/share/glibmm-2.4 && ln -s /usr/share/mm-common/doctool doctool ) diff --git a/development/mono-debugger/mono-debugger.SlackBuild b/development/mono-debugger/mono-debugger.SlackBuild index 48d6c3fbc193..bae11dcea4cb 100644 --- a/development/mono-debugger/mono-debugger.SlackBuild +++ b/development/mono-debugger/mono-debugger.SlackBuild @@ -68,7 +68,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/development/mtasc/mtasc.SlackBuild b/development/mtasc/mtasc.SlackBuild index b3ea4d17f5e7..fac3797a781d 100644 --- a/development/mtasc/mtasc.SlackBuild +++ b/development/mtasc/mtasc.SlackBuild @@ -10,7 +10,7 @@ PRGNAM=mtasc VERSION=${VERSION:-1.15} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -21,7 +21,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/development/mtd-utils/mtd-utils.SlackBuild b/development/mtd-utils/mtd-utils.SlackBuild index 466a395771c1..8ba3264000e8 100644 --- a/development/mtd-utils/mtd-utils.SlackBuild +++ b/development/mtd-utils/mtd-utils.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.4.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/development/newlisp/newlisp.SlackBuild b/development/newlisp/newlisp.SlackBuild index f6688626579b..359f4a5d461f 100644 --- a/development/newlisp/newlisp.SlackBuild +++ b/development/newlisp/newlisp.SlackBuild @@ -1,10 +1,10 @@ #!/bin/sh # # Written by Jockey S. Kyd (jockey dot kyd at gmail dot com) -# -# Latest version by Markus Hutmacher (markus dot hutmacher at gmail dot com) +# +# Latest version by Markus Hutmacher (markus dot hutmacher at gmail dot com) # May 2013 -# +# # Public domain # diff --git a/development/nexus/nexus.SlackBuild b/development/nexus/nexus.SlackBuild index 77d9eac0bac9..5155d1d07d59 100644 --- a/development/nexus/nexus.SlackBuild +++ b/development/nexus/nexus.SlackBuild @@ -56,7 +56,7 @@ else exit 1 fi -set -e +set -e # Check if the 'nexus' user & group exist: if [ "$(grep ^nexus /etc/passwd)" = "" -o "$(grep ^nexus /etc/group)" = "" ] ; then @@ -92,7 +92,7 @@ mv conf/* $PKG/etc/$PRGNAM mv bin/jsw/conf/* $PKG/etc/$PRGNAM mkdir -p $PKG/var/{lib,log,run,tmp}/$PRGNAM -ln -sf /etc/$PRGNAM $PKG/usr/share/$PRGNAM/conf +ln -sf /etc/$PRGNAM $PKG/usr/share/$PRGNAM/conf ln -sf /etc/$PRGNAM $PKG/usr/share/$PRGNAM/bin/jsw/conf ln -sf /var/tmp/$PRGNAM $PKG/usr/share/$PRGNAM/tmp ln -sf /var/log/$PRGNAM $PKG/usr/share/$PRGNAM/logs diff --git a/development/npm2tgz/npm2tgz.SlackBuild b/development/npm2tgz/npm2tgz.SlackBuild index 561c914fcc88..600e1c7d0366 100644 --- a/development/npm2tgz/npm2tgz.SlackBuild +++ b/development/npm2tgz/npm2tgz.SlackBuild @@ -18,7 +18,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/nqp/nqp.SlackBuild b/development/nqp/nqp.SlackBuild index 8e4078c23d0d..de3491887ab6 100644 --- a/development/nqp/nqp.SlackBuild +++ b/development/nqp/nqp.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -56,7 +56,7 @@ perl Configure.pl \ --with-parrot=/usr/bin/parrot make -j1 -make DESTDIR=$PKG install +make DESTDIR=$PKG install mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/development/nsis/nsis.SlackBuild b/development/nsis/nsis.SlackBuild index 12ea856ec622..886d2ad0601f 100644 --- a/development/nsis/nsis.SlackBuild +++ b/development/nsis/nsis.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.46 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 @@ -59,7 +57,7 @@ fi set -e rm -rf $TMP/$PRGNAM-$VERSION-src $PKG -mkdir -p $TMP $PKG $OUTPUT +mkdir -p $TMP $PKG $OUTPUT cd $TMP tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2 cd $PRGNAM-$VERSION-src diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild index 210446351375..72ddaeee7354 100644 --- a/development/nvi/nvi.SlackBuild +++ b/development/nvi/nvi.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.81.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/development/ola/ola.SlackBuild b/development/ola/ola.SlackBuild index ba63ecddc6fc..251cf664a0d8 100644 --- a/development/ola/ola.SlackBuild +++ b/development/ola/ola.SlackBuild @@ -39,7 +39,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -70,7 +70,7 @@ CXXFLAGS="-Wno-error=conversion $SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ - $BUILD_HTTP $BUILD_PYTHON + $BUILD_HTTP $BUILD_PYTHON make make install DESTDIR=$PKG diff --git a/development/osc/osc.SlackBuild b/development/osc/osc.SlackBuild index 564c0556e5d8..6fc51444a8ef 100644 --- a/development/osc/osc.SlackBuild +++ b/development/osc/osc.SlackBuild @@ -24,22 +24,20 @@ PRGNAM=osc VERSION=0.117 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} set -e diff --git a/development/p4/p4.SlackBuild b/development/p4/p4.SlackBuild index c5fa68a93493..6e309fafde64 100644 --- a/development/p4/p4.SlackBuild +++ b/development/p4/p4.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-r10.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/development/p4v/p4v.SlackBuild b/development/p4v/p4v.SlackBuild index f1258bd3607d..6bb5be6295b6 100644 --- a/development/p4v/p4v.SlackBuild +++ b/development/p4v/p4v.SlackBuild @@ -63,7 +63,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/parrot/parrot.SlackBuild b/development/parrot/parrot.SlackBuild index 6ba1cf195240..9e2c3b60f546 100644 --- a/development/parrot/parrot.SlackBuild +++ b/development/parrot/parrot.SlackBuild @@ -8,12 +8,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 @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -62,8 +60,8 @@ perl Configure.pl \ --parrot_is_shared # --icu-config=/usr/bin/icu-config -make -make DESTDIR=$PKG install +make +make DESTDIR=$PKG install 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 diff --git a/development/patchutils/patchutils.SlackBuild b/development/patchutils/patchutils.SlackBuild index f54e9c7de4f9..c3579510b338 100644 --- a/development/patchutils/patchutils.SlackBuild +++ b/development/patchutils/patchutils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for patchutils -# Copyright 2008-2012 Robby Workman, Northport, Alabama, USA +# Copyright 2008-2012 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.3.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 @@ -65,7 +63,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -82,7 +80,7 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/pd-psql/pd-psql.SlackBuild b/development/pd-psql/pd-psql.SlackBuild index 2f1611bb6955..d3fa38f26402 100644 --- a/development/pd-psql/pd-psql.SlackBuild +++ b/development/pd-psql/pd-psql.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for <pd-psql> # Written by Michales Michaloudes korgie@gmail.com -# Exit on most errors + set -e PRGNAM=pd-psql @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} SRCNAM=$(echo $PRGNAM | cut -f2 -d-) diff --git a/development/polyml/polyml.SlackBuild b/development/polyml/polyml.SlackBuild index 4ef18ccd525e..2c9aa7844f88 100644 --- a/development/polyml/polyml.SlackBuild +++ b/development/polyml/polyml.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -37,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -65,7 +63,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -# Strip binaries and libraries +# Strip binaries and libraries find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -82,7 +80,7 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy the slack-desc +# Copy the slack-desc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/development/portaudio/portaudio.SlackBuild b/development/portaudio/portaudio.SlackBuild index 4e606c93e939..4e5102d71b4d 100644 --- a/development/portaudio/portaudio.SlackBuild +++ b/development/portaudio/portaudio.SlackBuild @@ -31,12 +31,10 @@ TAG=${TAG:-_SBo} # eek! SRCNAME="pa_stable_v19_20111121.tgz" -# 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/development/power-architect/power-architect.SlackBuild b/development/power-architect/power-architect.SlackBuild index 2b035ca9d793..14286a414ef8 100644 --- a/development/power-architect/power-architect.SlackBuild +++ b/development/power-architect/power-architect.SlackBuild @@ -36,7 +36,7 @@ OUTPUT=${OUTPUT:-/tmp} DOCS="LICENSE README.generic" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/processing/processing.SlackBuild b/development/processing/processing.SlackBuild index 99ec99951abb..14e71a90d69b 100644 --- a/development/processing/processing.SlackBuild +++ b/development/processing/processing.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 @@ -22,9 +21,9 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $PKG/opt $OUTPUT tar xvf $CWD/$PRGNAM-$VERSION-linux.tgz -C $PKG/opt diff --git a/development/pyclewn/pyclewn.SlackBuild b/development/pyclewn/pyclewn.SlackBuild index 7520118be8d7..daee7dfb63cd 100644 --- a/development/pyclewn/pyclewn.SlackBuild +++ b/development/pyclewn/pyclewn.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.11.py2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # the "_SBo" is required -# 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/development/pyenchant/pyenchant.SlackBuild b/development/pyenchant/pyenchant.SlackBuild index ea34748103a1..d19a5abdb6c5 100644 --- a/development/pyenchant/pyenchant.SlackBuild +++ b/development/pyenchant/pyenchant.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.6.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/development/pylint/pylint.SlackBuild b/development/pylint/pylint.SlackBuild index 2b0f4224ef51..4a6660233196 100644 --- a/development/pylint/pylint.SlackBuild +++ b/development/pylint/pylint.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/development/ragel/ragel.SlackBuild b/development/ragel/ragel.SlackBuild index 25a472698672..86a5ff7e4c8d 100644 --- a/development/ragel/ragel.SlackBuild +++ b/development/ragel/ragel.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS COPYING README TODO $PRGNAM.vim contrib/unicode2ragel.rb" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/rakudo/rakudo.SlackBuild b/development/rakudo/rakudo.SlackBuild index 287890e6bfec..608fb052ad2f 100644 --- a/development/rakudo/rakudo.SlackBuild +++ b/development/rakudo/rakudo.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -74,8 +74,8 @@ perl Configure.pl \ --with-parrot=/usr/bin/parrot \ --with-nqp=/usr/bin/nqp -make -make DESTDIR=$PKG install +make +make DESTDIR=$PKG install 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 diff --git a/development/rapidsvn/rapidsvn.SlackBuild b/development/rapidsvn/rapidsvn.SlackBuild index 7e6a884ce04e..e3f77df1df3c 100644 --- a/development/rapidsvn/rapidsvn.SlackBuild +++ b/development/rapidsvn/rapidsvn.SlackBuild @@ -39,7 +39,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/rarian/rarian.SlackBuild b/development/rarian/rarian.SlackBuild index e61db8501887..fb67eaa01c57 100644 --- a/development/rarian/rarian.SlackBuild +++ b/development/rarian/rarian.SlackBuild @@ -4,7 +4,7 @@ # Copyright (c) 2009 Andrzej Telszewski <atelszewski@gmail.com> # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: @@ -36,12 +36,10 @@ VERSION=${VERSION:-0.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 diff --git a/development/regexxer/regexxer.SlackBuild b/development/regexxer/regexxer.SlackBuild index c4ee2460657a..3c4826fcde2a 100644 --- a/development/regexxer/regexxer.SlackBuild +++ b/development/regexxer/regexxer.SlackBuild @@ -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 {} \; -# 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/development/regina-rexx/regina-rexx.SlackBuild b/development/regina-rexx/regina-rexx.SlackBuild index 0842efc18159..bc9368218a63 100644 --- a/development/regina-rexx/regina-rexx.SlackBuild +++ b/development/regina-rexx/regina-rexx.SlackBuild @@ -4,7 +4,7 @@ # Written by Diogo Leal (diogo@diogoleal.com) PRGNAM=regina-rexx -VERSION=${VERSION:-3.7} +VERSION=${VERSION:-3.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/scala/scala.SlackBuild b/development/scala/scala.SlackBuild index c44662b0bfa2..75ba84128010 100644 --- a/development/scala/scala.SlackBuild +++ b/development/scala/scala.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-2.7.7.final} 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/development/shed/shed.SlackBuild b/development/shed/shed.SlackBuild index d515912c5a63..e9febb00c514 100644 --- a/development/shed/shed.SlackBuild +++ b/development/shed/shed.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.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 @@ -55,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/sloccount/sloccount.SlackBuild b/development/sloccount/sloccount.SlackBuild index 4b8b55311b49..5587b7e65384 100644 --- a/development/sloccount/sloccount.SlackBuild +++ b/development/sloccount/sloccount.SlackBuild @@ -10,12 +10,10 @@ VERSION=2.26 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/development/spice-protocol/spice-protocol.SlackBuild b/development/spice-protocol/spice-protocol.SlackBuild index 38bd5fbac7ac..c19ec86eca51 100644 --- a/development/spice-protocol/spice-protocol.SlackBuild +++ b/development/spice-protocol/spice-protocol.SlackBuild @@ -35,7 +35,7 @@ OUTPUT=${OUTPUT:-/tmp} DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/splint/splint.SlackBuild b/development/splint/splint.SlackBuild index 902cc2987223..80e5630c84d1 100644 --- a/development/splint/splint.SlackBuild +++ b/development/splint/splint.SlackBuild @@ -15,12 +15,10 @@ VERSION=3.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 @@ -48,7 +46,7 @@ fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.src.tgz cd $PRGNAM-$VERSION diff --git a/development/sqliteman/sqliteman.SlackBuild b/development/sqliteman/sqliteman.SlackBuild index cbe4b1e658a5..819b26439f11 100644 --- a/development/sqliteman/sqliteman.SlackBuild +++ b/development/sqliteman/sqliteman.SlackBuild @@ -26,12 +26,10 @@ VERSION=1.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/development/squeak-vm/squeak-vm.SlackBuild b/development/squeak-vm/squeak-vm.SlackBuild index 4d74200c101f..73e6ca841a68 100644 --- a/development/squeak-vm/squeak-vm.SlackBuild +++ b/development/squeak-vm/squeak-vm.SlackBuild @@ -55,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/development/stgit/stgit.SlackBuild b/development/stgit/stgit.SlackBuild index c4469d40f59c..203c509f699d 100644 --- a/development/stgit/stgit.SlackBuild +++ b/development/stgit/stgit.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.15} 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/development/sublime_text/sublime_text.SlackBuild b/development/sublime_text/sublime_text.SlackBuild index 4bdd59009539..8897642fcdbe 100644 --- a/development/sublime_text/sublime_text.SlackBuild +++ b/development/sublime_text/sublime_text.SlackBuild @@ -1,13 +1,13 @@ #!/bin/bash # Slackware build script for Sublime Text 2.0.1 -# Builds a Slackware package from the Sublime Text 2 binary tarballs. +# Builds a Slackware package from the Sublime Text 2 binary tarballs. # Anyone can freely modify and/or distribute this script without restrictions # # Written by Luke Williams ( xocel@iquidus.org ) PRGNAM=sublime_text -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -28,7 +28,7 @@ TARBALL_x86="Sublime Text 2.0.1.tar.bz2" # Name of 32bit tarball TARBALL_x86_64="Sublime Text 2.0.1 x64.tar.bz2" # Name of 64bit tarball TARBALL_ROOT="Sublime Text 2" # Name of tarballs root directory -# Set LIBDIRSUFFIX and TARBALL. +# Set LIBDIRSUFFIX and TARBALL. if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" TARBALL="$TARBALL_x86_64" diff --git a/development/swi-prolog/swi-prolog.SlackBuild b/development/swi-prolog/swi-prolog.SlackBuild index 09548b40968b..5c7c0171e7f2 100644 --- a/development/swi-prolog/swi-prolog.SlackBuild +++ b/development/swi-prolog/swi-prolog.SlackBuild @@ -97,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-PDT \ --with-utf8proc \ --with-archive \ - --without-jpl + --without-jpl make all make install DESTDIR=$PKG cd - diff --git a/development/tcc/tcc.SlackBuild b/development/tcc/tcc.SlackBuild index 9536faef4062..b40801e6b20a 100644 --- a/development/tcc/tcc.SlackBuild +++ b/development/tcc/tcc.SlackBuild @@ -56,7 +56,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild index 79444ce236a6..2c5d7e10370c 100644 --- a/development/tea/tea.SlackBuild +++ b/development/tea/tea.SlackBuild @@ -49,7 +49,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; - + qmake \ "PREFIX=/usr/bin" \ "QMAKE_CXXFLAGS+=$SLKCFLAGS" \ diff --git a/development/tklib/tklib.SlackBuild b/development/tklib/tklib.SlackBuild index 4f62a73470f0..a7fd5092b6d3 100644 --- a/development/tklib/tklib.SlackBuild +++ b/development/tklib/tklib.SlackBuild @@ -7,7 +7,7 @@ PRGNAM=tklib VERSION=0.5 BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -18,9 +18,9 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" diff --git a/development/valkyrie/valkyrie.SlackBuild b/development/valkyrie/valkyrie.SlackBuild index 6a488f119fde..597d3a69044d 100644 --- a/development/valkyrie/valkyrie.SlackBuild +++ b/development/valkyrie/valkyrie.SlackBuild @@ -48,10 +48,10 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else +else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/development/xemacs/xemacs.SlackBuild b/development/xemacs/xemacs.SlackBuild index caa33c456aa5..faddaf4a6669 100644 --- a/development/xemacs/xemacs.SlackBuild +++ b/development/xemacs/xemacs.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for XEmacs # Created by Sean MacLennan <xemacs@seanm.ca> -# Modified by Robby Workman <rworkman@slackbuilds.org> for +# Modified by Robby Workman <rworkman@slackbuilds.org> for # better consistency with existing SBo scripts... PRGNAM=xemacs diff --git a/development/xxdiff/xxdiff.SlackBuild b/development/xxdiff/xxdiff.SlackBuild index 1fa2301ff16c..6b14c8315d80 100644 --- a/development/xxdiff/xxdiff.SlackBuild +++ b/development/xxdiff/xxdiff.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-401} 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/development/zope.sqlalchemy/zope.sqlalchemy.SlackBuild b/development/zope.sqlalchemy/zope.sqlalchemy.SlackBuild index 68f63a9cb31a..dfa7395d0d19 100644 --- a/development/zope.sqlalchemy/zope.sqlalchemy.SlackBuild +++ b/development/zope.sqlalchemy/zope.sqlalchemy.SlackBuild @@ -13,12 +13,10 @@ VERSION=${VERSION:-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 @@ -42,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT |