From 687c78d5604ce299d5164ffd69de88f2dd10fefc Mon Sep 17 00:00:00 2001 From: dsomero Date: Fri, 22 Nov 2013 02:34:22 -0500 Subject: various: Fix SlackBuild formatting and comment nit picks. Signed-off-by: dsomero --- audio/MusicMixer/MusicMixer.SlackBuild | 2 +- audio/Pd-extended/Pd-extended.SlackBuild | 6 +++--- audio/SuperCollider/SuperCollider.SlackBuild | 2 +- audio/a52dec/a52dec.SlackBuild | 2 -- audio/abcde/abcde.SlackBuild | 10 ++++------ audio/aften/aften.SlackBuild | 4 +--- audio/amSynth/amSynth.SlackBuild | 2 +- audio/ario/ario.SlackBuild | 2 +- audio/audtty/audtty.SlackBuild | 2 -- audio/cd-discid/cd-discid.SlackBuild | 6 ++---- audio/celt051/celt051.SlackBuild | 2 -- audio/chuck/chuck.SlackBuild | 2 +- audio/cuberok/cuberok.SlackBuild | 2 -- audio/dcd/dcd.SlackBuild | 4 +--- audio/deadbeef/deadbeef.SlackBuild | 2 -- audio/discord/discord.SlackBuild | 4 +--- audio/dssi-vst/dssi-vst.SlackBuild | 2 +- audio/easymp3gain/easymp3gain.SlackBuild | 2 +- audio/eyeD3/eyeD3.SlackBuild | 2 -- audio/faac/faac.SlackBuild | 2 -- audio/faad2/faad2.SlackBuild | 2 -- audio/faust/faust.SlackBuild | 2 +- audio/flac123/flac123.SlackBuild | 6 ++---- audio/gimmix/gimmix.SlackBuild | 4 ++-- audio/gmusicbrowser/gmusicbrowser.SlackBuild | 2 +- audio/gnump3d/gnump3d.SlackBuild | 8 +++----- audio/grip2/grip2.SlackBuild | 4 ++-- audio/guitarix/guitarix.SlackBuild | 4 ++-- audio/gvolwheel/gvolwheel.SlackBuild | 16 ++++++++-------- audio/herrie/herrie.SlackBuild | 6 ++---- audio/icecast/icecast.SlackBuild | 4 +--- audio/ices-cc/ices-cc.SlackBuild | 2 +- audio/ices/ices.SlackBuild | 6 ++---- audio/id3/id3.SlackBuild | 4 +--- audio/id3v2/id3v2.SlackBuild | 14 ++++++-------- audio/iripdb/iripdb.SlackBuild | 4 +--- audio/jack_capture/jack_capture.SlackBuild | 2 +- audio/jamin/jamin.SlackBuild | 4 +--- audio/jokosher/jokosher.SlackBuild | 2 +- audio/jost_bin/jost_bin.SlackBuild | 2 +- audio/kanola/kanola.SlackBuild | 4 +--- audio/kid3/kid3.SlackBuild | 4 ++-- audio/listener/listener.SlackBuild | 8 ++++---- audio/llcon/llcon.SlackBuild | 2 -- audio/meterbridge/meterbridge.SlackBuild | 2 +- audio/miniAudicle/miniAudicle.SlackBuild | 2 +- audio/mp3blaster/mp3blaster.SlackBuild | 6 ++---- audio/mp3val/mp3val.SlackBuild | 4 +--- audio/mp3wrap/mp3wrap.SlackBuild | 2 +- audio/mppenc/mppenc.SlackBuild | 6 +++--- audio/mt-daapd/mt-daapd.SlackBuild | 4 +--- audio/multimidicast/multimidicast.SlackBuild | 2 +- audio/muse/muse.SlackBuild | 2 +- audio/musepack-tools/musepack-tools.SlackBuild | 2 +- audio/ncmpc/ncmpc.SlackBuild | 2 -- audio/ncmpcpp/ncmpcpp.SlackBuild | 2 -- audio/ogmtools/ogmtools.SlackBuild | 8 +++----- audio/opencore-amr/opencore-amr.SlackBuild | 2 -- audio/pd_mrpeach/pd_mrpeach.SlackBuild | 2 +- audio/phat/phat.SlackBuild | 2 -- audio/pmidi/pmidi.SlackBuild | 4 +--- audio/pulseaudio/pulseaudio.SlackBuild | 2 +- audio/pyalsaaudio/pyalsaaudio.SlackBuild | 2 +- audio/qastools/qastools.SlackBuild | 4 ++-- audio/qjackctl/qjackctl.SlackBuild | 2 -- audio/qsynth/qsynth.SlackBuild | 2 +- audio/rubyripper/rubyripper.SlackBuild | 2 -- audio/sfarkxtc/sfarkxtc.SlackBuild | 2 -- audio/shell-fm/shell-fm.SlackBuild | 2 -- audio/speex/speex.SlackBuild | 4 +--- audio/streamripper/streamripper.SlackBuild | 2 -- audio/streamtuner/streamtuner.SlackBuild | 2 -- audio/swami/swami.SlackBuild | 2 +- audio/swh-plugins/swh-plugins.SlackBuild | 2 -- audio/vimpc/vimpc.SlackBuild | 10 +++++----- audio/volti/volti.SlackBuild | 4 ++-- audio/xforge/xforge.SlackBuild | 2 -- audio/xmms-scrobbler/xmms-scrobbler.SlackBuild | 4 +--- audio/xmms-shn/xmms-shn.SlackBuild | 16 +++++++--------- audio/xmms2/xmms2.SlackBuild | 2 -- 80 files changed, 105 insertions(+), 195 deletions(-) (limited to 'audio') diff --git a/audio/MusicMixer/MusicMixer.SlackBuild b/audio/MusicMixer/MusicMixer.SlackBuild index 9a0fa9f5cd..f47681338d 100644 --- a/audio/MusicMixer/MusicMixer.SlackBuild +++ b/audio/MusicMixer/MusicMixer.SlackBuild @@ -12,7 +12,7 @@ TAG=${TAG:-_SBo} ARCH=i486 # hardcoded for 32bit CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/Pd-extended/Pd-extended.SlackBuild b/audio/Pd-extended/Pd-extended.SlackBuild index 7e5a80dfa4..4dcca81654 100644 --- a/audio/Pd-extended/Pd-extended.SlackBuild +++ b/audio/Pd-extended/Pd-extended.SlackBuild @@ -3,7 +3,7 @@ # Written by Felix Pfeifer, revision date 2010/07/31 # contact: pfeifer[dot]felix[at]googlemail[dot]com -# Modified by the SlackBuilds.org project. +# Modified by the SlackBuilds.org project. PRGNAM=Pd-extended VERSION=0.43.4 @@ -83,7 +83,7 @@ cd packages/linux_make libdir="/usr/lib$LIBDIRSUFFIX" \ mandir="/usr/man" \ DOC_TARGETS="media messageoddness pd_fileformat pd-msg pddp tutorials" \ - DESTDIR=$PKG + DESTDIR=$PKG cd ../.. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -102,7 +102,7 @@ if [ "$ARCH" = "x86_64" ]; then chmod 755 $PKG/usr/bin/pdextended64 fi -# Seems Pd developers can't make their mind up how they want to be called, +# Seems Pd developers can't make their mind up how they want to be called, # (Pd/pd or Pd/pd-extended), so we're hardcoding the files here. mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/share/mime/packages sed "s|^Exec.*|Exec=/usr/lib$LIBDIRSUFFIX/pd-extended/tcl/pd-gui.tcl %F|" \ diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild index ea5c0a7677..a08673de31 100644 --- a/audio/SuperCollider/SuperCollider.SlackBuild +++ b/audio/SuperCollider/SuperCollider.SlackBuild @@ -84,7 +84,7 @@ cd build -DSC_WII="$cwiid" \ -DSC_ED="2" \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install/strip DESTDIR=$PKG cd - diff --git a/audio/a52dec/a52dec.SlackBuild b/audio/a52dec/a52dec.SlackBuild index 46dbd08cc7..c16e68e923 100644 --- a/audio/a52dec/a52dec.SlackBuild +++ b/audio/a52dec/a52dec.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.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/audio/abcde/abcde.SlackBuild b/audio/abcde/abcde.SlackBuild index e287d81c6b..5f131d3f89 100644 --- a/audio/abcde/abcde.SlackBuild +++ b/audio/abcde/abcde.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for abcde # abcde has a dependency of cd-discid, see the README -# Copyright 2007 Jim Capozzoli +# Copyright 2007 Jim Capozzoli # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -31,12 +31,10 @@ VERSION=2.5.4 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -48,7 +46,7 @@ OUTPUT=${OUTPUT:-/tmp} set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP @@ -65,11 +63,11 @@ chmod -R u+w,go+r-w,a-s . # likes to test a script as normal user before running it as root, and the # ownership setting in the Makefile will break installs as a normal user. # --rworkman -patch -p1 < $CWD/Makefile.diff +patch -p1 < $CWD/Makefile.diff # fix to mailx call: the command was using the -a option which, in Slackware's # mailx, means something different than what was intended here (intent here is -# to set content type to UTF-8. In Slackware the -a is unnecessary. Thanks to +# to set content type to UTF-8. In Slackware the -a is unnecessary. Thanks to # Andreas Vogele for this patch. --gbecker patch -p1 < $CWD/cddb-tool.diff diff --git a/audio/aften/aften.SlackBuild b/audio/aften/aften.SlackBuild index 82c1caee4c..091ba6d6b0 100644 --- a/audio/aften/aften.SlackBuild +++ b/audio/aften/aften.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.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 @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/audio/amSynth/amSynth.SlackBuild b/audio/amSynth/amSynth.SlackBuild index eb3071a629..df216e06bb 100644 --- a/audio/amSynth/amSynth.SlackBuild +++ b/audio/amSynth/amSynth.SlackBuild @@ -37,7 +37,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/audio/ario/ario.SlackBuild b/audio/ario/ario.SlackBuild index 3226187033..5025f66594 100644 --- a/audio/ario/ario.SlackBuild +++ b/audio/ario/ario.SlackBuild @@ -72,7 +72,7 @@ find . \ # Check for Avahi if $(pkg-config --exists avahi-core); then AVAHI="enable" ; else AVAHI="disable" ; 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 diff --git a/audio/audtty/audtty.SlackBuild b/audio/audtty/audtty.SlackBuild index 019f098fee..7738e03887 100644 --- a/audio/audtty/audtty.SlackBuild +++ b/audio/audtty/audtty.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.1.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/audio/cd-discid/cd-discid.SlackBuild b/audio/cd-discid/cd-discid.SlackBuild index dabee6d2b3..9fe39062fa 100644 --- a/audio/cd-discid/cd-discid.SlackBuild +++ b/audio/cd-discid/cd-discid.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for cd-discid -# Copyright 2007 Jim Capozzoli +# Copyright 2007 Jim Capozzoli # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +29,10 @@ VERSION=1.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 @@ -69,7 +67,7 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . # Apply a patch to Makefile to fix mandir and prevent setting ownership during -# the install. The mandir could easily be done by passing the 'mandir' +# the install. The mandir could easily be done by passing the 'mandir' # variable to 'make install' but the ownership setting can't be omitted any # other way. This isn't a huge issue, but I'm probably not the only one who # likes to test scripts as a normal user before running them as root, and the diff --git a/audio/celt051/celt051.SlackBuild b/audio/celt051/celt051.SlackBuild index ffc26fee8f..196d6acadb 100644 --- a/audio/celt051/celt051.SlackBuild +++ b/audio/celt051/celt051.SlackBuild @@ -29,12 +29,10 @@ VERSION=0.5.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/audio/chuck/chuck.SlackBuild b/audio/chuck/chuck.SlackBuild index 815714a440..e5c9b9a101 100644 --- a/audio/chuck/chuck.SlackBuild +++ b/audio/chuck/chuck.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/cuberok/cuberok.SlackBuild b/audio/cuberok/cuberok.SlackBuild index cad3b9e99d..084aa1fc63 100644 --- a/audio/cuberok/cuberok.SlackBuild +++ b/audio/cuberok/cuberok.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.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/audio/dcd/dcd.SlackBuild b/audio/dcd/dcd.SlackBuild index f1fd1bbcae..ae3e97609b 100644 --- a/audio/dcd/dcd.SlackBuild +++ b/audio/dcd/dcd.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.99.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 @@ -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/audio/deadbeef/deadbeef.SlackBuild b/audio/deadbeef/deadbeef.SlackBuild index f914e032f3..78d6fac156 100644 --- a/audio/deadbeef/deadbeef.SlackBuild +++ b/audio/deadbeef/deadbeef.SlackBuild @@ -27,12 +27,10 @@ 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 diff --git a/audio/discord/discord.SlackBuild b/audio/discord/discord.SlackBuild index 55fb18444d..d3e5be1120 100644 --- a/audio/discord/discord.SlackBuild +++ b/audio/discord/discord.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-3.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 @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/audio/dssi-vst/dssi-vst.SlackBuild b/audio/dssi-vst/dssi-vst.SlackBuild index 3897dc0408..a84aca4667 100644 --- a/audio/dssi-vst/dssi-vst.SlackBuild +++ b/audio/dssi-vst/dssi-vst.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/audio/easymp3gain/easymp3gain.SlackBuild b/audio/easymp3gain/easymp3gain.SlackBuild index 65752dd7c1..b0307bf65c 100644 --- a/audio/easymp3gain/easymp3gain.SlackBuild +++ b/audio/easymp3gain/easymp3gain.SlackBuild @@ -27,7 +27,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/audio/eyeD3/eyeD3.SlackBuild b/audio/eyeD3/eyeD3.SlackBuild index 14df739400..f2e6b92025 100644 --- a/audio/eyeD3/eyeD3.SlackBuild +++ b/audio/eyeD3/eyeD3.SlackBuild @@ -30,12 +30,10 @@ VERSION=0.6.14 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/audio/faac/faac.SlackBuild b/audio/faac/faac.SlackBuild index 988f4d6415..f43c05c133 100644 --- a/audio/faac/faac.SlackBuild +++ b/audio/faac/faac.SlackBuild @@ -30,12 +30,10 @@ VERSION=${VERSION:-1.28} 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/audio/faad2/faad2.SlackBuild b/audio/faad2/faad2.SlackBuild index 2de4d62f78..e051b8f3bd 100644 --- a/audio/faad2/faad2.SlackBuild +++ b/audio/faad2/faad2.SlackBuild @@ -27,12 +27,10 @@ VERSION=${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/audio/faust/faust.SlackBuild b/audio/faust/faust.SlackBuild index f76a47f8e7..de19034519 100644 --- a/audio/faust/faust.SlackBuild +++ b/audio/faust/faust.SlackBuild @@ -32,7 +32,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/audio/flac123/flac123.SlackBuild b/audio/flac123/flac123.SlackBuild index fa1dbc0105..5e9d3cfceb 100644 --- a/audio/flac123/flac123.SlackBuild +++ b/audio/flac123/flac123.SlackBuild @@ -22,17 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=flac123 -VERSION=0.0.11 +PRGNAM=flac123 +VERSION=0.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/audio/gimmix/gimmix.SlackBuild b/audio/gimmix/gimmix.SlackBuild index 9926e2e1b7..13e09f2801 100644 --- a/audio/gimmix/gimmix.SlackBuild +++ b/audio/gimmix/gimmix.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=gimmix VERSION=0.5.7.1 BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -53,7 +53,7 @@ find . \ # Fix curl includes. patch -p1 -i $CWD/gimmix-0.5.7.1-curl-headers.patch -# Replace "enable" with "disable" -cover and -lyrics if you do not +# Replace "enable" with "disable" -cover and -lyrics if you do not # want to have built in plugins for cover and lyrics fetching. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/audio/gmusicbrowser/gmusicbrowser.SlackBuild b/audio/gmusicbrowser/gmusicbrowser.SlackBuild index d8c4a5e766..cd8259cb95 100644 --- a/audio/gmusicbrowser/gmusicbrowser.SlackBuild +++ b/audio/gmusicbrowser/gmusicbrowser.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh - + # Slackware build script for gmusicbrowser # (C) 2007 Michael Wagner diff --git a/audio/gnump3d/gnump3d.SlackBuild b/audio/gnump3d/gnump3d.SlackBuild index 01a3a4b3fe..0b8579e9a0 100644 --- a/audio/gnump3d/gnump3d.SlackBuild +++ b/audio/gnump3d/gnump3d.SlackBuild @@ -24,19 +24,17 @@ # 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=gnump3d VERSION=3.0 BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -59,7 +57,7 @@ else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -# gnump3d gets the library directory from a short perl script in the +# gnump3d gets the library directory from a short perl script in the # source directory, thus, there's no need to specify a suffix in this # script. @@ -74,7 +72,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -make +make make install \ PREFIX=$PKG \ MANDIR=/usr/man/man1 diff --git a/audio/grip2/grip2.SlackBuild b/audio/grip2/grip2.SlackBuild index 35d480289c..187ddf24d6 100644 --- a/audio/grip2/grip2.SlackBuild +++ b/audio/grip2/grip2.SlackBuild @@ -51,10 +51,10 @@ if [ -r /usr/include/cdda/cdda_interface.h ]; then fi # Patch to use system-installed cdparanoia libs: -patch -p1 --verbose < $CWD/patches/system_cdparanoia_libs.diff +patch -p1 --verbose < $CWD/patches/system_cdparanoia_libs.diff # Patch to fix a compile issue with threads (probably came from gentoo): -patch -p1 --verbose < $CWD/patches/grip2-nptl.diff +patch -p1 --verbose < $CWD/patches/grip2-nptl.diff # Patch to install binaries/manpages as grip2 and gcd2 (so as not to conflict # with the grip 3.x package). diff --git a/audio/guitarix/guitarix.SlackBuild b/audio/guitarix/guitarix.SlackBuild index 99e45da870..fc8d39893e 100644 --- a/audio/guitarix/guitarix.SlackBuild +++ b/audio/guitarix/guitarix.SlackBuild @@ -32,7 +32,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -85,7 +85,7 @@ fi --ladspadir="/usr/lib${LIBDIRSUFFIX}/ladspa/" \ $LV2OPT ./waf build -./waf install --destdir=$PKG +./waf install --destdir=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/audio/gvolwheel/gvolwheel.SlackBuild b/audio/gvolwheel/gvolwheel.SlackBuild index e39fe95dd9..3e40e398af 100644 --- a/audio/gvolwheel/gvolwheel.SlackBuild +++ b/audio/gvolwheel/gvolwheel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for GVolWheel +# Slackware build script for GVolWheel # Copyright 2012 Bojan Popovic, Belgrade, Serbia # All rights reserved. @@ -25,7 +25,7 @@ PRGNAM=gvolwheel VERSION=${VERSION:-1.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,9 +36,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" @@ -55,11 +55,11 @@ else fi # The package is compiled without OSS support by default to avoid -# auto-detection of ALSA OSS compatibility libs. 0.7 seemed to have -# problems with this, so it's better to be on the safe side. +# auto-detection of ALSA OSS compatibility libs. 0.7 seemed to have +# problems with this, so it's better to be on the safe side. OSS=${OSS:-no} -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -91,7 +91,7 @@ make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Configure will ignore passed --docdir option, so correct docdir manually. +# Configure will ignore passed --docdir option, so correct docdir manually. mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/herrie/herrie.SlackBuild b/audio/herrie/herrie.SlackBuild index 0b629625f9..f7ac4473ca 100644 --- a/audio/herrie/herrie.SlackBuild +++ b/audio/herrie/herrie.SlackBuild @@ -8,12 +8,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*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -27,10 +25,10 @@ OUTPUT=${OUTPUT:-/tmp} # Experimental Patches # # # I have found these to be stable on my systems, -# and they might be included in future upstream +# and they might be included in future upstream # sources, but for now you use these at your own risk. # -# Please read README.SBo for more information on the +# Please read README.SBo for more information on the # functionality that these patches add. AUTOQUIT=${AUTOQUIT:-NO} SIGNALS=${SIGNALS:-NO} diff --git a/audio/icecast/icecast.SlackBuild b/audio/icecast/icecast.SlackBuild index 1e96aecc42..267b7b597c 100644 --- a/audio/icecast/icecast.SlackBuild +++ b/audio/icecast/icecast.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-2.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 @@ -40,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/audio/ices-cc/ices-cc.SlackBuild b/audio/ices-cc/ices-cc.SlackBuild index 6c2207c70e..ecd6b6f964 100644 --- a/audio/ices-cc/ices-cc.SlackBuild +++ b/audio/ices-cc/ices-cc.SlackBuild @@ -74,7 +74,7 @@ with_flac="no" \ --disable-static \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ diff --git a/audio/ices/ices.SlackBuild b/audio/ices/ices.SlackBuild index 5846a92a5e..8a97b0e000 100644 --- a/audio/ices/ices.SlackBuild +++ b/audio/ices/ices.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -64,7 +62,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --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/audio/id3/id3.SlackBuild b/audio/id3/id3.SlackBuild index b3de0c065f..ba641f2458 100644 --- a/audio/id3/id3.SlackBuild +++ b/audio/id3/id3.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.78} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -60,7 +58,7 @@ patch -p1 < $CWD/id3-0.78-include_string_h.diff make CFLAGS="$SLKCFLAGS" -# Copying executable and manual to the correct location +# Copying executable and manual to the correct location mkdir -p $PKG/usr/bin cp -a id3 $PKG/usr/bin diff --git a/audio/id3v2/id3v2.SlackBuild b/audio/id3v2/id3v2.SlackBuild index 142da5410a..4db55a23be 100644 --- a/audio/id3v2/id3v2.SlackBuild +++ b/audio/id3v2/id3v2.SlackBuild @@ -7,22 +7,20 @@ PRGNAM=id3v2 VERSION=0.1.11 BUILD=${BUILD:-2} -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" @@ -56,9 +54,9 @@ find . \ patch -p1 < $CWD/id3v2-0.1.11-fixup_Makefile.patch patch -p1 < $CWD/id3v2-0.1.11-track_no-segfault.patch -# The Makefile doesnt use DESTDIR, but the program is just an -# executable and a man page (there's no apparent path-info compiled -# into the binary). So we can fake it be using PREFIX and manually +# The Makefile doesnt use DESTDIR, but the program is just an +# executable and a man page (there's no apparent path-info compiled +# into the binary). So we can fake it be using PREFIX and manually # creating the direcories needed in $PKG mkdir -p $PKG/usr/{bin,man/man1} make OPT="$SLKCFLAGS" diff --git a/audio/iripdb/iripdb.SlackBuild b/audio/iripdb/iripdb.SlackBuild index d3731cd2f3..e46a1cd1f3 100644 --- a/audio/iripdb/iripdb.SlackBuild +++ b/audio/iripdb/iripdb.SlackBuild @@ -9,12 +9,10 @@ VERSION=0.1.3b 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/audio/jack_capture/jack_capture.SlackBuild b/audio/jack_capture/jack_capture.SlackBuild index c163dfa582..11daed4b68 100644 --- a/audio/jack_capture/jack_capture.SlackBuild +++ b/audio/jack_capture/jack_capture.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/audio/jamin/jamin.SlackBuild b/audio/jamin/jamin.SlackBuild index f4b7b9e1a8..58fbd3abec 100644 --- a/audio/jamin/jamin.SlackBuild +++ b/audio/jamin/jamin.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.95.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 @@ -88,7 +86,7 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps mv $PKG/usr/share/icons/jamin.svg $PKG/usr/share/icons/hicolor/scalable/apps -# Make sure the desktop file is standard-compliant - we ship this gzipped +# Make sure the desktop file is standard-compliant - we ship this gzipped # to make sure our non-utf8-capable server doesn't corrupt it zcat $CWD/desktopfile.gz > $PKG/usr/share/applications/jamin.desktop diff --git a/audio/jokosher/jokosher.SlackBuild b/audio/jokosher/jokosher.SlackBuild index cf7192b2cc..1fcb51901e 100644 --- a/audio/jokosher/jokosher.SlackBuild +++ b/audio/jokosher/jokosher.SlackBuild @@ -56,7 +56,7 @@ find . \ -exec chmod 644 {} \; python setup.py build -python setup.py install --skip-build --root=$PKG +python setup.py install --skip-build --root=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/audio/jost_bin/jost_bin.SlackBuild b/audio/jost_bin/jost_bin.SlackBuild index d382e8393f..4ea0eddee9 100644 --- a/audio/jost_bin/jost_bin.SlackBuild +++ b/audio/jost_bin/jost_bin.SlackBuild @@ -11,7 +11,7 @@ ARCH=i486 # Hardcoded: we don't compile. SRCNAM=jost CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$SRCNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/kanola/kanola.SlackBuild b/audio/kanola/kanola.SlackBuild index 5d3cad4f1f..84d7c181c5 100644 --- a/audio/kanola/kanola.SlackBuild +++ b/audio/kanola/kanola.SlackBuild @@ -29,12 +29,10 @@ 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 @@ -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/audio/kid3/kid3.SlackBuild b/audio/kid3/kid3.SlackBuild index 175cfb189d..70a5aeee9b 100644 --- a/audio/kid3/kid3.SlackBuild +++ b/audio/kid3/kid3.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -84,7 +84,7 @@ cmake . \ -DWITH_CHROMAPRINT="$CHROMA" \ -DWITH_MP4V2="$MP4TAG" \ -DWITH_KDE="$KDE4" - + # breaks compilation #-DBUILD_SHARED_LIBS:BOOL=ON \ diff --git a/audio/listener/listener.SlackBuild b/audio/listener/listener.SlackBuild index 21a572ebec..c38c1859c9 100644 --- a/audio/listener/listener.SlackBuild +++ b/audio/listener/listener.SlackBuild @@ -1,13 +1,13 @@ #!/bin/bash # # Slackware build script for listener. -# +# # Distributed under the beerware licence: # # "THE BEER-WARE LICENSE" (Revision 42): -# pwcazenave gmail com wrote this file. As long as you retain this -# notice you can do whatever you want with this stuff. If we meet some day, -# and you think this stuff is worth it, you can buy me a beer in return +# pwcazenave gmail com wrote this file. As long as you retain this +# notice you can do whatever you want with this stuff. If we meet some day, +# and you think this stuff is worth it, you can buy me a beer in return # Pierre Cazenave # # Created 07/08/2008 diff --git a/audio/llcon/llcon.SlackBuild b/audio/llcon/llcon.SlackBuild index b63686f36f..1ead3d23f3 100644 --- a/audio/llcon/llcon.SlackBuild +++ b/audio/llcon/llcon.SlackBuild @@ -8,12 +8,10 @@ VERSION=${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 diff --git a/audio/meterbridge/meterbridge.SlackBuild b/audio/meterbridge/meterbridge.SlackBuild index b132651b44..816c3b7424 100644 --- a/audio/meterbridge/meterbridge.SlackBuild +++ b/audio/meterbridge/meterbridge.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/audio/miniAudicle/miniAudicle.SlackBuild b/audio/miniAudicle/miniAudicle.SlackBuild index b9b24ed6a0..4c787f585a 100644 --- a/audio/miniAudicle/miniAudicle.SlackBuild +++ b/audio/miniAudicle/miniAudicle.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/mp3blaster/mp3blaster.SlackBuild b/audio/mp3blaster/mp3blaster.SlackBuild index 219346a4f8..96dc4e0f11 100644 --- a/audio/mp3blaster/mp3blaster.SlackBuild +++ b/audio/mp3blaster/mp3blaster.SlackBuild @@ -29,12 +29,10 @@ VERSION=3.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 @@ -60,7 +58,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION @@ -83,7 +81,7 @@ make install-strip DESTDIR=$PKG ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/audio/mp3val/mp3val.SlackBuild b/audio/mp3val/mp3val.SlackBuild index 62e6591113..02a20b919a 100644 --- a/audio/mp3val/mp3val.SlackBuild +++ b/audio/mp3val/mp3val.SlackBuild @@ -6,12 +6,10 @@ VERSION=${VERSION:-0.1.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) 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 @@ -42,7 +40,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz # source file comes with -src appended -mv $PRGNAM-$VERSION-src $PRGNAM-$VERSION # .tar extracts to directory with -src appended +mv $PRGNAM-$VERSION-src $PRGNAM-$VERSION # .tar extracts to directory with -src appended cd $PRGNAM-$VERSION mv Makefile.linux Makefile diff --git a/audio/mp3wrap/mp3wrap.SlackBuild b/audio/mp3wrap/mp3wrap.SlackBuild index 46a48033cb..6bc908b8ec 100644 --- a/audio/mp3wrap/mp3wrap.SlackBuild +++ b/audio/mp3wrap/mp3wrap.SlackBuild @@ -64,7 +64,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-samples \ --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/audio/mppenc/mppenc.SlackBuild b/audio/mppenc/mppenc.SlackBuild index 5a1f848850..b5fe8f9441 100644 --- a/audio/mppenc/mppenc.SlackBuild +++ b/audio/mppenc/mppenc.SlackBuild @@ -34,7 +34,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKLDFLAGS="-L/usr/lib64" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -49,7 +49,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" \ @@ -66,7 +66,7 @@ cd - 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/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/mt-daapd/mt-daapd.SlackBuild b/audio/mt-daapd/mt-daapd.SlackBuild index 25d0789e06..2bf0349ab8 100644 --- a/audio/mt-daapd/mt-daapd.SlackBuild +++ b/audio/mt-daapd/mt-daapd.SlackBuild @@ -29,12 +29,10 @@ VERSION=0.2.4.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 @@ -86,7 +84,7 @@ install -D -m 0644 contrib/mt-daapd.conf $PKG/etc/mt-daapd.conf.new || exit 1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; diff --git a/audio/multimidicast/multimidicast.SlackBuild b/audio/multimidicast/multimidicast.SlackBuild index 7fdb2d0222..704457a82e 100644 --- a/audio/multimidicast/multimidicast.SlackBuild +++ b/audio/multimidicast/multimidicast.SlackBuild @@ -18,7 +18,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/audio/muse/muse.SlackBuild b/audio/muse/muse.SlackBuild index 64794c3b94..ef640f2192 100644 --- a/audio/muse/muse.SlackBuild +++ b/audio/muse/muse.SlackBuild @@ -60,7 +60,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_PYTHON:STRING="ON" \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/audio/musepack-tools/musepack-tools.SlackBuild b/audio/musepack-tools/musepack-tools.SlackBuild index 5d6acce494..db18af7c25 100644 --- a/audio/musepack-tools/musepack-tools.SlackBuild +++ b/audio/musepack-tools/musepack-tools.SlackBuild @@ -61,7 +61,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/audio/ncmpc/ncmpc.SlackBuild b/audio/ncmpc/ncmpc.SlackBuild index 19ab773d93..e59b689de9 100644 --- a/audio/ncmpc/ncmpc.SlackBuild +++ b/audio/ncmpc/ncmpc.SlackBuild @@ -29,12 +29,10 @@ VERSION=0.16 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/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild index b25e0193dc..1e65122f8f 100644 --- a/audio/ncmpcpp/ncmpcpp.SlackBuild +++ b/audio/ncmpcpp/ncmpcpp.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.5.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/audio/ogmtools/ogmtools.SlackBuild b/audio/ogmtools/ogmtools.SlackBuild index 2ffe599401..68f5a2c343 100644 --- a/audio/ogmtools/ogmtools.SlackBuild +++ b/audio/ogmtools/ogmtools.SlackBuild @@ -7,10 +7,10 @@ # Copyright (c) 2008, Nishant Limbachia (nishant@mnspace.net) # All rights reserved. -# Redistribution and use of this script, with or without modification, is +# Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: -# 1. Redistributions of script must retain the above copyright notice, +# 1. Redistributions of script must retain the above copyright notice, # this list of conditions and the following disclaimer. # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -24,7 +24,7 @@ # 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=ogmtools @@ -32,12 +32,10 @@ VERSION=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 diff --git a/audio/opencore-amr/opencore-amr.SlackBuild b/audio/opencore-amr/opencore-amr.SlackBuild index f4641b842d..6f22ea20ca 100644 --- a/audio/opencore-amr/opencore-amr.SlackBuild +++ b/audio/opencore-amr/opencore-amr.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-0.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/audio/pd_mrpeach/pd_mrpeach.SlackBuild b/audio/pd_mrpeach/pd_mrpeach.SlackBuild index acb039e9b2..f9b68f6e1c 100644 --- a/audio/pd_mrpeach/pd_mrpeach.SlackBuild +++ b/audio/pd_mrpeach/pd_mrpeach.SlackBuild @@ -17,7 +17,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/phat/phat.SlackBuild b/audio/phat/phat.SlackBuild index efd963b51d..4336530f5d 100644 --- a/audio/phat/phat.SlackBuild +++ b/audio/phat/phat.SlackBuild @@ -22,12 +22,10 @@ VERSION=${VERSION:-0.4.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/audio/pmidi/pmidi.SlackBuild b/audio/pmidi/pmidi.SlackBuild index 34b877ad14..380448bde5 100644 --- a/audio/pmidi/pmidi.SlackBuild +++ b/audio/pmidi/pmidi.SlackBuild @@ -29,17 +29,15 @@ VERSION=1.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 -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PKGNAME OUTPUT=${OUTPUT:-/tmp} diff --git a/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild index 7e3d8f9cde..aa45905f10 100644 --- a/audio/pulseaudio/pulseaudio.SlackBuild +++ b/audio/pulseaudio/pulseaudio.SlackBuild @@ -61,7 +61,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -if pkg-config --exists orc-0.4 ; then +if pkg-config --exists orc-0.4 ; then ORC=yes else ORC=no diff --git a/audio/pyalsaaudio/pyalsaaudio.SlackBuild b/audio/pyalsaaudio/pyalsaaudio.SlackBuild index 88f90977ac..e4911bbb19 100644 --- a/audio/pyalsaaudio/pyalsaaudio.SlackBuild +++ b/audio/pyalsaaudio/pyalsaaudio.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/audio/qastools/qastools.SlackBuild b/audio/qastools/qastools.SlackBuild index d05ee2a315..33881a47ff 100644 --- a/audio/qastools/qastools.SlackBuild +++ b/audio/qastools/qastools.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="CHANGELOG COPYING README TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -59,7 +59,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/audio/qjackctl/qjackctl.SlackBuild b/audio/qjackctl/qjackctl.SlackBuild index f78eb5b0d7..4d377e4154 100644 --- a/audio/qjackctl/qjackctl.SlackBuild +++ b/audio/qjackctl/qjackctl.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-0.3.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/audio/qsynth/qsynth.SlackBuild b/audio/qsynth/qsynth.SlackBuild index b9f4e7ba20..9761787814 100644 --- a/audio/qsynth/qsynth.SlackBuild +++ b/audio/qsynth/qsynth.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/audio/rubyripper/rubyripper.SlackBuild b/audio/rubyripper/rubyripper.SlackBuild index 7079023a3e..54c6fe4f68 100644 --- a/audio/rubyripper/rubyripper.SlackBuild +++ b/audio/rubyripper/rubyripper.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.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 diff --git a/audio/sfarkxtc/sfarkxtc.SlackBuild b/audio/sfarkxtc/sfarkxtc.SlackBuild index c6f15f285c..a5d77ef4d2 100644 --- a/audio/sfarkxtc/sfarkxtc.SlackBuild +++ b/audio/sfarkxtc/sfarkxtc.SlackBuild @@ -7,12 +7,10 @@ VERSION=20070326 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/audio/shell-fm/shell-fm.SlackBuild b/audio/shell-fm/shell-fm.SlackBuild index 5e31fa2bde..84cf10d971 100644 --- a/audio/shell-fm/shell-fm.SlackBuild +++ b/audio/shell-fm/shell-fm.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-git20130207} 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/audio/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild index 9a9c9f73c6..70995a9b17 100644 --- a/audio/speex/speex.SlackBuild +++ b/audio/speex/speex.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for speex -# Copyright (c) 2012 Vliegendehuiskat +# Copyright (c) 2012 Vliegendehuiskat # Copyright (c) 2007 Alex Lysenka # All rights reserved. # @@ -31,12 +31,10 @@ VERSION=1.2rc1 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/audio/streamripper/streamripper.SlackBuild b/audio/streamripper/streamripper.SlackBuild index 5cd2a5bbe2..2ffd34209e 100644 --- a/audio/streamripper/streamripper.SlackBuild +++ b/audio/streamripper/streamripper.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.64.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/audio/streamtuner/streamtuner.SlackBuild b/audio/streamtuner/streamtuner.SlackBuild index 542e0a4ce3..a7b1678fd3 100644 --- a/audio/streamtuner/streamtuner.SlackBuild +++ b/audio/streamtuner/streamtuner.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.99.99} 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/audio/swami/swami.SlackBuild b/audio/swami/swami.SlackBuild index ade1842e47..dc603075bb 100644 --- a/audio/swami/swami.SlackBuild +++ b/audio/swami/swami.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/audio/swh-plugins/swh-plugins.SlackBuild b/audio/swh-plugins/swh-plugins.SlackBuild index 7eaa4e58b7..99b0456b15 100644 --- a/audio/swh-plugins/swh-plugins.SlackBuild +++ b/audio/swh-plugins/swh-plugins.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.4.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 diff --git a/audio/vimpc/vimpc.SlackBuild b/audio/vimpc/vimpc.SlackBuild index c430858add..cb2bc74be8 100644 --- a/audio/vimpc/vimpc.SlackBuild +++ b/audio/vimpc/vimpc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for vimpc +# Slackware build script for vimpc # Written by Jostein Berntsen @@ -18,7 +18,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -61,8 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/audio/volti/volti.SlackBuild b/audio/volti/volti.SlackBuild index 4ec3ec3a8a..6340f84782 100644 --- a/audio/volti/volti.SlackBuild +++ b/audio/volti/volti.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -86,7 +86,7 @@ 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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/xforge/xforge.SlackBuild b/audio/xforge/xforge.SlackBuild index e0e2a7e7c8..c0038766aa 100644 --- a/audio/xforge/xforge.SlackBuild +++ b/audio/xforge/xforge.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-0.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/audio/xmms-scrobbler/xmms-scrobbler.SlackBuild b/audio/xmms-scrobbler/xmms-scrobbler.SlackBuild index 0e3aa45432..6b2eb913e9 100644 --- a/audio/xmms-scrobbler/xmms-scrobbler.SlackBuild +++ b/audio/xmms-scrobbler/xmms-scrobbler.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.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 @@ -35,7 +33,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/audio/xmms-shn/xmms-shn.SlackBuild b/audio/xmms-shn/xmms-shn.SlackBuild index 3ed9deef36..5d5e8c33e7 100644 --- a/audio/xmms-shn/xmms-shn.SlackBuild +++ b/audio/xmms-shn/xmms-shn.SlackBuild @@ -3,25 +3,23 @@ # Slackware build script for xmms-shn # Written by mightaswell -PRGNAM=xmms-shn -VERSION=${VERSION:-2.4.1} +PRGNAM=xmms-shn +VERSION=${VERSION:-2.4.1} 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" @@ -37,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -62,7 +60,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --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/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index c4bff33ab9..7e641fc2ce 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -11,12 +11,10 @@ VERSION="0.8DrO_o" 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 -- cgit v1.2.3