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 /graphics | |
parent | 610e8461bb9b201adbd4bd9257a9bf48be71f62b (diff) | |
download | slackbuilds-687c78d5604ce299d5164ffd69de88f2dd10fefc.tar.gz |
various: Fix SlackBuild formatting and comment nit picks.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'graphics')
58 files changed, 91 insertions, 147 deletions
diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild index 2cfa7a1a0b..786d067371 100644 --- a/graphics/FreeCAD/FreeCAD.SlackBuild +++ b/graphics/FreeCAD/FreeCAD.SlackBuild @@ -84,7 +84,7 @@ do done # these patch contain some code taken from upstream -# thanks to cbuehler +# thanks to cbuehler patch -p1 -i $CWD/freecad-0.13.diff mkdir build diff --git a/graphics/GPS/GPS.SlackBuild b/graphics/GPS/GPS.SlackBuild index f45c7671af..6dd9e48536 100644 --- a/graphics/GPS/GPS.SlackBuild +++ b/graphics/GPS/GPS.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for GIMP Paint Studio -# Written by klaatu +# Written by klaatu # klaatu at the domain of member.fsf.org PRGNAM=GPS diff --git a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild b/graphics/GraphicsMagick/GraphicsMagick.SlackBuild index 73df8491ac..ebc38be4d5 100644 --- a/graphics/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/graphics/GraphicsMagick/GraphicsMagick.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/graphics/HotShots/HotShots.SlackBuild b/graphics/HotShots/HotShots.SlackBuild index fa9fce2819..c79e9beded 100644 --- a/graphics/HotShots/HotShots.SlackBuild +++ b/graphics/HotShots/HotShots.SlackBuild @@ -84,7 +84,7 @@ sed -i "s!/usr/include/qxt/!/usr/include/!g" CMakeLists.txt -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release . - make + make make install DESTDIR=$PKG cd .. diff --git a/graphics/dcraw/dcraw.SlackBuild b/graphics/dcraw/dcraw.SlackBuild index 037853ed9c..7939322e57 100644 --- a/graphics/dcraw/dcraw.SlackBuild +++ b/graphics/dcraw/dcraw.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for dcraw # Home Page http://cybercom.net/~dcoffin/dcraw -# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA # (nishant _AT_ mnspace _DOT_ net) # All rights reserved. @@ -34,12 +34,10 @@ VERSION=${VERSION:-9.19} 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 @@ -81,7 +79,7 @@ fi # builds with support for jpeg, png, lcms and tiff and optionally, jasper DCRAW_BUILD_FLAGS="-lm -ljpeg -llcms -lpng -ltiff $JASPER_BUILD_FLAG" -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/dia/dia.SlackBuild b/graphics/dia/dia.SlackBuild index 24b8b00626..43eeaeadce 100644 --- a/graphics/dia/dia.SlackBuild +++ b/graphics/dia/dia.SlackBuild @@ -62,7 +62,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux - + make make install DESTDIR=$PKG diff --git a/graphics/discwrapper/discwrapper.SlackBuild b/graphics/discwrapper/discwrapper.SlackBuild index d763dd9ecb..2dba9ff9d9 100644 --- a/graphics/discwrapper/discwrapper.SlackBuild +++ b/graphics/discwrapper/discwrapper.SlackBuild @@ -9,12 +9,10 @@ VERSION=${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 @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/djview4/djview4.SlackBuild b/graphics/djview4/djview4.SlackBuild index 67538569d0..4d05b0ba64 100644 --- a/graphics/djview4/djview4.SlackBuild +++ b/graphics/djview4/djview4.SlackBuild @@ -72,7 +72,7 @@ find . \ if [ "$QTDIR" == "/opt/kde3/lib/qt3" ]; then QTDIR=$QT4DIR -fi +fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/entangle/entangle.SlackBuild b/graphics/entangle/entangle.SlackBuild index 349fbe4656..adf57a49be 100644 --- a/graphics/entangle/entangle.SlackBuild +++ b/graphics/entangle/entangle.SlackBuild @@ -54,11 +54,11 @@ else LIBDIRSUFFIX="" fi -set -e +set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $TMP/$PRGNAM-$VERSION tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION @@ -71,7 +71,7 @@ find . \ -exec chmod 644 {} \; DOCS="AUTHORS COPYING ChangeLog NEWS README" - + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/exiftags/exiftags.SlackBuild b/graphics/exiftags/exiftags.SlackBuild index 4d833ef7b4..2818b8e764 100644 --- a/graphics/exiftags/exiftags.SlackBuild +++ b/graphics/exiftags/exiftags.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.01} 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 @@ find . \ CFLAGS="$SLKCFLAGS" \ make -# Copying executables and manuals to the correct location +# Copying executables and manuals to the correct location mkdir -p $PKG/usr/bin cp -a exifcom exiftags exiftime $PKG/usr/bin mkdir -p $PKG/usr/man/man1 diff --git a/graphics/fig2sxd/fig2sxd.SlackBuild b/graphics/fig2sxd/fig2sxd.SlackBuild index 240726bce0..8b33e2b96d 100644 --- a/graphics/fig2sxd/fig2sxd.SlackBuild +++ b/graphics/fig2sxd/fig2sxd.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.21} 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/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index e50c462592..7cee34daa4 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -34,12 +34,10 @@ TARVERS=$(printf $VERSION | tr _ -) ENABLE_BCINT=${ENABLE_BCINT:-yes} FREETYPE=${FREETYPE:-"2.4.10"} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/graphics/fontmatrix/fontmatrix.SlackBuild b/graphics/fontmatrix/fontmatrix.SlackBuild index a0378087f5..b334a2a3d3 100644 --- a/graphics/fontmatrix/fontmatrix.SlackBuild +++ b/graphics/fontmatrix/fontmatrix.SlackBuild @@ -2,19 +2,17 @@ # Slackware build script for fontmatrix # Written by Larry Hajali -# Maintained by Klaatu <klaatu@member.fsf.org> +# Maintained by Klaatu <klaatu@member.fsf.org> PRGNAM=fontmatrix VERSION=${VERSION:-r1220} 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/graphics/fotoxx/fotoxx.SlackBuild b/graphics/fotoxx/fotoxx.SlackBuild index bced42c79f..c966803570 100644 --- a/graphics/fotoxx/fotoxx.SlackBuild +++ b/graphics/fotoxx/fotoxx.SlackBuild @@ -56,7 +56,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION diff --git a/graphics/frescobaldi/frescobaldi.SlackBuild b/graphics/frescobaldi/frescobaldi.SlackBuild index f37e17c935..817119b7a2 100644 --- a/graphics/frescobaldi/frescobaldi.SlackBuild +++ b/graphics/frescobaldi/frescobaldi.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/graphics/fyre/fyre.SlackBuild b/graphics/fyre/fyre.SlackBuild index 898b75ad65..a424e6399e 100644 --- a/graphics/fyre/fyre.SlackBuild +++ b/graphics/fyre/fyre.SlackBuild @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=fyre +PRGNAM=fyre VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/graphics/gimp-feca_hdr-plugin/gimp-feca_hdr-plugin.SlackBuild b/graphics/gimp-feca_hdr-plugin/gimp-feca_hdr-plugin.SlackBuild index 2008c4c008..43e85e1029 100644 --- a/graphics/gimp-feca_hdr-plugin/gimp-feca_hdr-plugin.SlackBuild +++ b/graphics/gimp-feca_hdr-plugin/gimp-feca_hdr-plugin.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/graphics/gimp-fourier-plugin/gimp-fourier-plugin.SlackBuild b/graphics/gimp-fourier-plugin/gimp-fourier-plugin.SlackBuild index 3ee9a53a7d..086d1f56c0 100644 --- a/graphics/gimp-fourier-plugin/gimp-fourier-plugin.SlackBuild +++ b/graphics/gimp-fourier-plugin/gimp-fourier-plugin.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for a Fourier plugin for the GIMP. - + # Copyright 2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # @@ -70,7 +70,7 @@ chmod -R u+w,go+r-w,a-s . make mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins -install -m 0755 fourier $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins +install -m 0755 fourier $PKG/usr/lib${LIBDIRSUFFIX}/gimp/2.0/plug-ins 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/graphics/gimp-registry-plugins/gimp-registry-plugins.SlackBuild b/graphics/gimp-registry-plugins/gimp-registry-plugins.SlackBuild index 15c974db12..dc00b08ef4 100644 --- a/graphics/gimp-registry-plugins/gimp-registry-plugins.SlackBuild +++ b/graphics/gimp-registry-plugins/gimp-registry-plugins.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # SlackBuild script for gimp-registry-plugin. - + # Takes a series of plugins (mostly from the Debian gimp-registry-plugin list) # plus a couple of extras and extracts them into the relevant gimp directories. @@ -77,7 +77,7 @@ unzip $CWD/GREYCstoration-2.9.zip cp $TMP/GREYCstoration-2.9/GREYCstoration_gimp_pc_linux${LIBDIRSUFFIX} . ) -# Add ellipsis to the Vignette script name for better consistency with other +# Add ellipsis to the Vignette script name for better consistency with other # filters in Filters > Light and Shadow. sed -i '178s|Vignette|Vignette...|' $PKG/usr/share/gimp/2.0/scripts/vignette_0.scm diff --git a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild index cf5fbb4208..d72ee05287 100644 --- a/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.SlackBuild +++ b/graphics/gimp-wideangle-plugin/gimp-wideangle-plugin.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/graphics/gliv/gliv.SlackBuild b/graphics/gliv/gliv.SlackBuild index 69356ce507..470b9ff93d 100644 --- a/graphics/gliv/gliv.SlackBuild +++ b/graphics/gliv/gliv.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-1.9.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -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/graphics/goocanvas/goocanvas.SlackBuild b/graphics/goocanvas/goocanvas.SlackBuild index 5e23edddea..c1a28c61dd 100644 --- a/graphics/goocanvas/goocanvas.SlackBuild +++ b/graphics/goocanvas/goocanvas.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -67,7 +67,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; - + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -78,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --disable-static \ --enable-shared \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG diff --git a/graphics/gource/gource.SlackBuild b/graphics/gource/gource.SlackBuild index 5f5773a020..2a1ab08158 100644 --- a/graphics/gource/gource.SlackBuild +++ b/graphics/gource/gource.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.40} 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 DOCS="COPYING ChangeLog INSTALL README THANKS" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/gpaint/gpaint.SlackBuild b/graphics/gpaint/gpaint.SlackBuild index 76c486b6c2..10329ed87f 100644 --- a/graphics/gpaint/gpaint.SlackBuild +++ b/graphics/gpaint/gpaint.SlackBuild @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gpaint +PRGNAM=gpaint VERSION=${VERSION:-0.3.3} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -97,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -install -D -m644 $CWD/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1 +install -D -m644 $CWD/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1 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/graphics/gtkam/gtkam.SlackBuild b/graphics/gtkam/gtkam.SlackBuild index 8c41c56cc9..31f4cb5d18 100644 --- a/graphics/gtkam/gtkam.SlackBuild +++ b/graphics/gtkam/gtkam.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware Build Script for gtkam +# Slackware Build Script for gtkam -# (C) 2009 Michael Wagner <slackware.wagnerm@arcor.de> +# (C) 2009 Michael Wagner <slackware.wagnerm@arcor.de> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -58,10 +58,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -88,7 +88,7 @@ make make install-strip DESTDIR=$PKG # Get rid of unnecessary stuff -rm -rf $PKG/usr/share/{gnome,omf} +rm -rf $PKG/usr/share/{gnome,omf} gzip -9 $PKG/usr/man/man?/$PRGNAM.? diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild index d21a0c4994..6a686562e6 100644 --- a/graphics/hugin/hugin.SlackBuild +++ b/graphics/hugin/hugin.SlackBuild @@ -4,7 +4,7 @@ # # Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA # All rights reserved. -# Modified 2011 for version 2011.0.0 by titopoquito +# Modified 2011 for version 2011.0.0 by titopoquito # Modified 2012 for version 2011.4.0 by titopoquito # Modified 2013 for version 2012.0.0 by titopoquito # (titopoquito@gmail.com) diff --git a/graphics/jUploadr/jUploadr.SlackBuild b/graphics/jUploadr/jUploadr.SlackBuild index 74b61e58dc..13d625c4c5 100644 --- a/graphics/jUploadr/jUploadr.SlackBuild +++ b/graphics/jUploadr/jUploadr.SlackBuild @@ -12,7 +12,7 @@ TAG=${TAG:-_SBo} ARCH=i386 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/graphics/jpeg2ps/jpeg2ps.SlackBuild b/graphics/jpeg2ps/jpeg2ps.SlackBuild index 39f198599d..9297022699 100644 --- a/graphics/jpeg2ps/jpeg2ps.SlackBuild +++ b/graphics/jpeg2ps/jpeg2ps.SlackBuild @@ -5,24 +5,22 @@ # Copyright 2009 Georgy Shepelev (gshep) <shepelev.georgy@googlemail.com> # This software is free. You are granted the right to use, copy, modify and # ditribute it without any restrictions. -# +# # The author accepts no responsibility for damages resulting from the use of # this software and makes no warranty, either express or implied, including but # not limited to, any implied warranty of merchantability or fitness for a # particular purpose. This software is provided as is, and you assume all risks -# when using it. +# when using it. PRGNAM=jpeg2ps VERSION=${VERSION:-1.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -32,14 +30,14 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index 27618395c4..519f2f69a4 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-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 @@ -41,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/graphics/luxblend25/luxblend25.SlackBuild b/graphics/luxblend25/luxblend25.SlackBuild index 63145050eb..f4eab84690 100644 --- a/graphics/luxblend25/luxblend25.SlackBuild +++ b/graphics/luxblend25/luxblend25.SlackBuild @@ -21,7 +21,7 @@ # 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=luxblend25 VERSION=${VERSION:-1.1} @@ -30,7 +30,7 @@ TAG=${TAG:-_SBo} SRCVERSION=luxblend25-3a928b723b29 blender_version() { - + BLENDER_HEADER=`/opt/blender/blender --version 2>&1 | head -n 1` BLENDER_IMPL=`echo ${BLENDER_HEADER} | cut -f1 -d' '` if [ "$BLENDER_IMPL" = "Blender" ] ; then @@ -42,12 +42,10 @@ blender_version BLENDER_PLUGIN_DIR=/opt/blender/$BLENDER_VERSION/scripts/addons -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; -# Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -71,7 +69,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/luxrender/luxrender.SlackBuild b/graphics/luxrender/luxrender.SlackBuild index e670f3ace2..ab6d84f228 100644 --- a/graphics/luxrender/luxrender.SlackBuild +++ b/graphics/luxrender/luxrender.SlackBuild @@ -29,12 +29,10 @@ TAG=${TAG:-_SBo} SRCVERSION=lux-4b4289cda943 LUXRAYSRCVERSION=luxrays-589aa5dac899 -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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 +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -101,7 +99,7 @@ cd - cmake ./ \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release # compile luxrays make luxrays @@ -149,10 +147,10 @@ cmake ./ # compile luxrender make luxrender -make install DESTDIR=$PKG +make install DESTDIR=$PKG # /usr/local? no, thanks -cp -r $PKG/usr/local/* $PKG/usr +cp -r $PKG/usr/local/* $PKG/usr rm -rf $PKG/usr/local # copy pylux.so diff --git a/graphics/makehuman/makehuman.SlackBuild b/graphics/makehuman/makehuman.SlackBuild index fd22ebc2b0..45f06c6839 100644 --- a/graphics/makehuman/makehuman.SlackBuild +++ b/graphics/makehuman/makehuman.SlackBuild @@ -21,18 +21,16 @@ # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + PRGNAM=makehuman VERSION=${VERSION:-1.0a7} 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/graphics/mcomix/mcomix.SlackBuild b/graphics/mcomix/mcomix.SlackBuild index e045a2a048..ab9141a2c1 100644 --- a/graphics/mcomix/mcomix.SlackBuild +++ b/graphics/mcomix/mcomix.SlackBuild @@ -20,7 +20,6 @@ VERSION=${VERSION:-0.99} 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 ;; @@ -48,7 +47,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/metapixel/metapixel.SlackBuild b/graphics/metapixel/metapixel.SlackBuild index 3af18d2b8e..4eaa077ac6 100644 --- a/graphics/metapixel/metapixel.SlackBuild +++ b/graphics/metapixel/metapixel.SlackBuild @@ -4,23 +4,21 @@ # Written by otzy_007 oz@oprod.net -PRGNAM=metapixel -VERSION=${VERSION:-1.0.2} +PRGNAM=metapixel +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/mypaint/mypaint.SlackBuild b/graphics/mypaint/mypaint.SlackBuild index 579d0ccb42..00dc442934 100644 --- a/graphics/mypaint/mypaint.SlackBuild +++ b/graphics/mypaint/mypaint.SlackBuild @@ -43,7 +43,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/graphics/nomacs/nomacs.SlackBuild b/graphics/nomacs/nomacs.SlackBuild index 2ac80845c1..c940871d04 100644 --- a/graphics/nomacs/nomacs.SlackBuild +++ b/graphics/nomacs/nomacs.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="Readme/COPYRIGHT Readme/LICENSE* Readme/README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -81,7 +81,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/graphics/ocropus/ocropus.SlackBuild b/graphics/ocropus/ocropus.SlackBuild index b3aa2b7e00..5dbab7a666 100644 --- a/graphics/ocropus/ocropus.SlackBuild +++ b/graphics/ocropus/ocropus.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for OCROpus. - + # Copyright 2010 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/graphics/openclipart/openclipart.SlackBuild b/graphics/openclipart/openclipart.SlackBuild index 479f11917f..deb573dc44 100644 --- a/graphics/openclipart/openclipart.SlackBuild +++ b/graphics/openclipart/openclipart.SlackBuild @@ -38,7 +38,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/graphics/photivo/photivo.SlackBuild b/graphics/photivo/photivo.SlackBuild index 7935fb9778..3b20f08de8 100644 --- a/graphics/photivo/photivo.SlackBuild +++ b/graphics/photivo/photivo.SlackBuild @@ -21,7 +21,7 @@ # 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=photivo VERSION=${VERSION:-20131103} BUILD=${BUILD:-1} diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild index ec3a715062..1f94723b15 100644 --- a/graphics/plotutils/plotutils.SlackBuild +++ b/graphics/plotutils/plotutils.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -67,7 +65,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=no \ --enable-shared=yes \ --enable-libplotter \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux make make install DESTDIR=$PKG diff --git a/graphics/qiv/qiv.SlackBuild b/graphics/qiv/qiv.SlackBuild index edb742d19e..92566e4d46 100644 --- a/graphics/qiv/qiv.SlackBuild +++ b/graphics/qiv/qiv.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-2.2.4} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild b/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild index 9eb2a184dc..3bd73aa1d4 100644 --- a/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild +++ b/graphics/raw-thumbnailer/raw-thumbnailer.SlackBuild @@ -68,7 +68,7 @@ find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/resynthesizer/resynthesizer.SlackBuild b/graphics/resynthesizer/resynthesizer.SlackBuild index 2ff0bdba91..9e9c7618b6 100644 --- a/graphics/resynthesizer/resynthesizer.SlackBuild +++ b/graphics/resynthesizer/resynthesizer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for the resynthesizer GIMP plug-in. -# +# # Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # @@ -27,12 +27,10 @@ VERSION=${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/graphics/screengrab/screengrab.SlackBuild b/graphics/screengrab/screengrab.SlackBuild index 2863016694..c52bacc33f 100644 --- a/graphics/screengrab/screengrab.SlackBuild +++ b/graphics/screengrab/screengrab.SlackBuild @@ -56,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/graphics/scrot/scrot.SlackBuild b/graphics/scrot/scrot.SlackBuild index c30c35cc9e..01b96f92f3 100644 --- a/graphics/scrot/scrot.SlackBuild +++ b/graphics/scrot/scrot.SlackBuild @@ -11,12 +11,10 @@ VERSION=0.8 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/graphics/svp/svp.SlackBuild b/graphics/svp/svp.SlackBuild index 911a62df1b..dcf08fb18e 100644 --- a/graphics/svp/svp.SlackBuild +++ b/graphics/svp/svp.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -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/graphics/tesseract/tesseract.SlackBuild b/graphics/tesseract/tesseract.SlackBuild index 5f1423c7ae..90ba6f3577 100644 --- a/graphics/tesseract/tesseract.SlackBuild +++ b/graphics/tesseract/tesseract.SlackBuild @@ -28,7 +28,7 @@ # Updated 28/05/2009 for Slackware64. # Updated 08/09/2010 Fixed language packs logic (Thanks to Ed Rozenberg) # Thanks to S+*n_Pe*rm*n for a bug report from OCRopus. -# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org> +# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org> PRGNAM=tesseract VERSION=${VERSION:-3.02.02} diff --git a/graphics/tgif-QPL/tgif-QPL.SlackBuild b/graphics/tgif-QPL/tgif-QPL.SlackBuild index 728f7d9738..e382f44ffc 100644 --- a/graphics/tgif-QPL/tgif-QPL.SlackBuild +++ b/graphics/tgif-QPL/tgif-QPL.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-4.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 @@ -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/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild b/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild index 2964ce96e4..13d82795e3 100644 --- a/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild +++ b/graphics/tuxpaint-stamps/tuxpaint-stamps.SlackBuild @@ -16,7 +16,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/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild index 9cdf160e3b..029fe36b0b 100644 --- a/graphics/tuxpaint/tuxpaint.SlackBuild +++ b/graphics/tuxpaint/tuxpaint.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.9.21} 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 @@ -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/graphics/vuescan/vuescan.SlackBuild b/graphics/vuescan/vuescan.SlackBuild index 7696ffc1bb..121f48cbb9 100644 --- a/graphics/vuescan/vuescan.SlackBuild +++ b/graphics/vuescan/vuescan.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for vuescan +# Slackware build script for vuescan # Copyright 2013 Heiko Rosemann, Germany # All rights reserved. @@ -27,11 +27,10 @@ VERSION=${VERSION:-9.2.24} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on # and choose source file accordingly if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) + i?86) ARCH=i486 SOURCEFILE=vuex3292.tgz ;; x86_64) @@ -47,7 +46,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/graphics/whyteboard/whyteboard.SlackBuild b/graphics/whyteboard/whyteboard.SlackBuild index 356e16a875..6546649f3c 100644 --- a/graphics/whyteboard/whyteboard.SlackBuild +++ b/graphics/whyteboard/whyteboard.SlackBuild @@ -2,7 +2,7 @@ # # Slackware build script for Whyteboard # -# Copyright 2009 Jose Maria Marin Carceles +# Copyright 2009 Jose Maria Marin Carceles # # # Redistribution and use of this script, with or without modification, is diff --git a/graphics/xdot/xdot.SlackBuild b/graphics/xdot/xdot.SlackBuild index 73cc5931ad..304a6390ec 100644 --- a/graphics/xdot/xdot.SlackBuild +++ b/graphics/xdot/xdot.SlackBuild @@ -27,12 +27,10 @@ VERSION=20090403 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 -xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION diff --git a/graphics/xpe/xpe.SlackBuild b/graphics/xpe/xpe.SlackBuild index deb3b5e0b3..573e866a22 100644 --- a/graphics/xpe/xpe.SlackBuild +++ b/graphics/xpe/xpe.SlackBuild @@ -11,18 +11,16 @@ VERSION=0.9.5b BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# The tarballs come with the name "xpe_project" to distinguish them from +# The tarballs come with the name "xpe_project" to distinguish them from # the "xpe_daily" svn snapshots SRCPRGNAM=xpe_project # The Source tarball has a different version numbering SRCVERSION="v$(echo $VERSION | tr . _)" -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/graphics/xzgv/xzgv.SlackBuild b/graphics/xzgv/xzgv.SlackBuild index 193509ccdc..6a9b45e665 100644 --- a/graphics/xzgv/xzgv.SlackBuild +++ b/graphics/xzgv/xzgv.SlackBuild @@ -25,18 +25,16 @@ # # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # 2010 June 1 - initial release - + PRGNAM=xzgv VERSION=${VERSION:-0.9.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 @@ -59,7 +57,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/graphics/yafaray/yafaray.SlackBuild b/graphics/yafaray/yafaray.SlackBuild index f30efa5035..d96c6c0f00 100644 --- a/graphics/yafaray/yafaray.SlackBuild +++ b/graphics/yafaray/yafaray.SlackBuild @@ -34,12 +34,10 @@ VERSION=${VERSION:-0.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; -# Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/graphics/zbar/zbar.SlackBuild b/graphics/zbar/zbar.SlackBuild index 781d84935b..571285bfca 100644 --- a/graphics/zbar/zbar.SlackBuild +++ b/graphics/zbar/zbar.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-0.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/graphics/zgv/zgv.SlackBuild b/graphics/zgv/zgv.SlackBuild index 90fe1f06f4..688fb96fdb 100644 --- a/graphics/zgv/zgv.SlackBuild +++ b/graphics/zgv/zgv.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh - -# Slackware build script for zgv + +# Slackware build script for zgv # Modified by Luis Henrique <lmello.009@gmail.com> # (C) 2007 Michael Wagner <lapinours@web.de> @@ -28,12 +28,10 @@ VERSION=5.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 @@ -76,7 +74,7 @@ find . \ # Apply patches for i in $CWD/patches/*; do - patch -p0 < $i + patch -p0 < $i done make SLKCFLAGS="$SLKCFLAGS" |