diff options
| author |   dsomero | 2013-11-22 08:34:22 +0100 |
|---|---|---|
| committer | dsomero | 2013-11-22 08:34:22 +0100 |
| commit | 687c78d5604ce299d5164ffd69de88f2dd10fefc (patch) | |
| tree | 2c3b4dd9491198917e0178dd5a0cf0fa3e6715c8 /misc | |
| 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 'misc')
46 files changed, 72 insertions, 116 deletions
diff --git a/misc/bchunk/bchunk.SlackBuild b/misc/bchunk/bchunk.SlackBuild index d4d5a72ba2..f0d8dd8bd2 100644 --- a/misc/bchunk/bchunk.SlackBuild +++ b/misc/bchunk/bchunk.SlackBuild @@ -27,12 +27,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 @@ -50,7 +48,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/misc/beep/beep.SlackBuild b/misc/beep/beep.SlackBuild index e00ca4136a..e603915297 100644 --- a/misc/beep/beep.SlackBuild +++ b/misc/beep/beep.SlackBuild @@ -34,7 +34,7 @@ elif [ "$ARCH" = "x86_64" ]; then fi # See the manpage for more information on why, but you will need to install -# beep with the suid bit set in order to have full functionality in all +# beep with the suid bit set in order to have full functionality in all # instances. The default is NO, but it *should* be safe to change it to YES SET_SUID=NO diff --git a/misc/biosdisk/biosdisk.SlackBuild b/misc/biosdisk/biosdisk.SlackBuild index 33fca83d60..a67b008b83 100644 --- a/misc/biosdisk/biosdisk.SlackBuild +++ b/misc/biosdisk/biosdisk.SlackBuild @@ -11,7 +11,7 @@ TAG=${TAG:-_SBo} SRC_VERSION=${VERSION}-2 CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/misc/bodr/bodr.SlackBuild b/misc/bodr/bodr.SlackBuild index db9c45ef0d..63cd3be5f9 100644 --- a/misc/bodr/bodr.SlackBuild +++ b/misc/bodr/bodr.SlackBuild @@ -22,17 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=bodr -VERSION=${VERSION:-9} +PRGNAM=bodr +VERSION=${VERSION:-9} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} ARCH=noarch CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -71,7 +71,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION - + make make DESTDIR=$PKG install diff --git a/misc/boncuk/boncuk.SlackBuild b/misc/boncuk/boncuk.SlackBuild index c54bc2c6c4..63e849dc65 100644 --- a/misc/boncuk/boncuk.SlackBuild +++ b/misc/boncuk/boncuk.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for Boncuk +# Slackware build script for Boncuk -# Copyright 2009 Ozan Türkyılmaz ozan.turkyilmaz@gmail.com +# Copyright 2009 Ozan Türkyılmaz ozan.turkyilmaz@gmail.com # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=boncuk +PRGNAM=boncuk VERSION=${VERSION:-1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +58,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -75,7 +75,7 @@ find . \ lrelease boncuk.pro qmake QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" -make +make strip --strip-unneeded bin/boncuk mkdir -p $PKG/usr/bin diff --git a/misc/bsdsfv/bsdsfv.SlackBuild b/misc/bsdsfv/bsdsfv.SlackBuild index b55d3614ff..2330f01f7d 100644 --- a/misc/bsdsfv/bsdsfv.SlackBuild +++ b/misc/bsdsfv/bsdsfv.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.18 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/misc/ccze/ccze.SlackBuild b/misc/ccze/ccze.SlackBuild index 061d9c5600..67b02ac6c8 100644 --- a/misc/ccze/ccze.SlackBuild +++ b/misc/ccze/ccze.SlackBuild @@ -9,12 +9,10 @@ VERSION=0.2.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/chemical-mime-data/chemical-mime-data.SlackBuild b/misc/chemical-mime-data/chemical-mime-data.SlackBuild index 1a39a66e50..3db57f91bf 100644 --- a/misc/chemical-mime-data/chemical-mime-data.SlackBuild +++ b/misc/chemical-mime-data/chemical-mime-data.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=chemical-mime-data -VERSION=${VERSION:-0.1.94} +PRGNAM=chemical-mime-data +VERSION=${VERSION:-0.1.94} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -38,7 +38,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -79,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux - + make make DESTDIR=$PKG install diff --git a/misc/chm2pdf/chm2pdf.SlackBuild b/misc/chm2pdf/chm2pdf.SlackBuild index a5911eb4f4..67ac50bdfc 100644 --- a/misc/chm2pdf/chm2pdf.SlackBuild +++ b/misc/chm2pdf/chm2pdf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for chm2pdf +# Slackware build script for chm2pdf # Written by João Felipe Santos (joao.eel@gmail.com) # Maintained by Ozan Türkyilmaz <ozan.turkyilmaz@gmail.com> @@ -26,7 +26,7 @@ # THE SOFTWARE. PRGNAM=chm2pdf -VERSION=${VERSION:-0.9.1} +VERSION=${VERSION:-0.9.1} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} diff --git a/misc/cksfv/cksfv.SlackBuild b/misc/cksfv/cksfv.SlackBuild index 0bbd51b8e2..3df7e1a972 100644 --- a/misc/cksfv/cksfv.SlackBuild +++ b/misc/cksfv/cksfv.SlackBuild @@ -34,12 +34,10 @@ VERSION=1.3.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/misc/dbview/dbview.SlackBuild b/misc/dbview/dbview.SlackBuild index 7009c7947c..12a0412d5a 100644 --- a/misc/dbview/dbview.SlackBuild +++ b/misc/dbview/dbview.SlackBuild @@ -8,12 +8,10 @@ VERSION=1.0.4 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/dcc/dcc.SlackBuild b/misc/dcc/dcc.SlackBuild index b4db377f6e..75b6d2131a 100644 --- a/misc/dcc/dcc.SlackBuild +++ b/misc/dcc/dcc.SlackBuild @@ -25,14 +25,12 @@ PRGNAM=dcc VERSION=${VERSION:-1.3.152} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/dmg2img/dmg2img.SlackBuild b/misc/dmg2img/dmg2img.SlackBuild index 54d0219742..ad2c2b5309 100644 --- a/misc/dmg2img/dmg2img.SlackBuild +++ b/misc/dmg2img/dmg2img.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/misc/flashrom/flashrom.SlackBuild b/misc/flashrom/flashrom.SlackBuild index 8b7a1d8116..7f5666a713 100644 --- a/misc/flashrom/flashrom.SlackBuild +++ b/misc/flashrom/flashrom.SlackBuild @@ -74,7 +74,7 @@ find . \ make \ PREFIX=/usr \ MANDIR=/usr/man \ - CFLAGS="$SLKCFLAGS -Wall -Wshadow" + CFLAGS="$SLKCFLAGS -Wall -Wshadow" make install \ PREFIX=/usr \ diff --git a/misc/fribid/fribid.SlackBuild b/misc/fribid/fribid.SlackBuild index ab8a6d1e5f..2eb855ffeb 100644 --- a/misc/fribid/fribid.SlackBuild +++ b/misc/fribid/fribid.SlackBuild @@ -30,12 +30,10 @@ TAG=${TAG:-_SBo} # Should we build PKCS#11 smartcard support YES RUNTIME or nothing. PKCS11=$(echo $PKCS11 | tr 'a-z' 'A-Z') -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/misc/funny-manpages/funny-manpages.SlackBuild b/misc/funny-manpages/funny-manpages.SlackBuild index 0554e89105..b46774aa3d 100644 --- a/misc/funny-manpages/funny-manpages.SlackBuild +++ b/misc/funny-manpages/funny-manpages.SlackBuild @@ -63,7 +63,7 @@ for manpage in $(echo *fun); do install -m 0644 $manpage $PKG/usr/man/man$section/$manpage done -# Move date.1fun over to mansection 6. It is kinda screwing with upstream, +# Move date.1fun over to mansection 6. It is kinda screwing with upstream, # but right now causes a conflict with the systems date(1) ( cd $PKG/usr/man/man1 ln -sf grope.1fun egrope.1fun diff --git a/misc/g15composer/g15composer.SlackBuild b/misc/g15composer/g15composer.SlackBuild index 3ed9d85492..e3211f311a 100644 --- a/misc/g15composer/g15composer.SlackBuild +++ b/misc/g15composer/g15composer.SlackBuild @@ -31,12 +31,10 @@ TAG=${TAG:-_SBo} DOCS="README AUTHORS ChangeLog NEWS COPYING" -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/gnome-mime-data/gnome-mime-data.SlackBuild b/misc/gnome-mime-data/gnome-mime-data.SlackBuild index bc3f81e63f..e5b8d7de30 100644 --- a/misc/gnome-mime-data/gnome-mime-data.SlackBuild +++ b/misc/gnome-mime-data/gnome-mime-data.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.18.0 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/ibus-pinyin/ibus-pinyin.SlackBuild b/misc/ibus-pinyin/ibus-pinyin.SlackBuild index 4a8301812a..3bba0bfa29 100644 --- a/misc/ibus-pinyin/ibus-pinyin.SlackBuild +++ b/misc/ibus-pinyin/ibus-pinyin.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.3.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/ibus-skk/ibus-skk.SlackBuild b/misc/ibus-skk/ibus-skk.SlackBuild index 4a5986be9f..44384aab6d 100644 --- a/misc/ibus-skk/ibus-skk.SlackBuild +++ b/misc/ibus-skk/ibus-skk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for ibus-skk +# Slackware build script for ibus-skk # Copyright (C) 2013, Jun SAITO <jsaito@xopowo.info> # All rights reserved. diff --git a/misc/kasumi/kasumi.SlackBuild b/misc/kasumi/kasumi.SlackBuild index 76466bebe6..39cdf87b6c 100644 --- a/misc/kasumi/kasumi.SlackBuild +++ b/misc/kasumi/kasumi.SlackBuild @@ -33,11 +33,11 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM-$VERSION cd $TMP diff --git a/misc/lbdb/lbdb.SlackBuild b/misc/lbdb/lbdb.SlackBuild index b7f09567a4..570eed4fe7 100644 --- a/misc/lbdb/lbdb.SlackBuild +++ b/misc/lbdb/lbdb.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.38} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/misc/ltunify/ltunify.SlackBuild b/misc/ltunify/ltunify.SlackBuild index bfbe59d816..8db09512ab 100644 --- a/misc/ltunify/ltunify.SlackBuild +++ b/misc/ltunify/ltunify.SlackBuild @@ -28,12 +28,10 @@ VERSION=0.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/mdic/mdic.SlackBuild b/misc/mdic/mdic.SlackBuild index 0a1ef56544..f8c45bf6fb 100644 --- a/misc/mdic/mdic.SlackBuild +++ b/misc/mdic/mdic.SlackBuild @@ -3,7 +3,7 @@ #written by Mehdi Esmaeelpour ariarat@gmail.com www.slack-world.com PRGNAM=mdic -VERSION=${VERSION:-0.8.1} +VERSION=${VERSION:-0.8.1} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -38,7 +38,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$PRGNAM cd $TMP @@ -65,7 +65,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mv $PKG/usr/share/man $PKG/usr rm -rf $PKG/usr/share/doc -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING changelog README AUTHORS TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/mdic.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/mdic.SlackBuild diff --git a/misc/megatunix/megatunix.SlackBuild b/misc/megatunix/megatunix.SlackBuild index 161ba696c8..1f53ae3faf 100644 --- a/misc/megatunix/megatunix.SlackBuild +++ b/misc/megatunix/megatunix.SlackBuild @@ -3,11 +3,11 @@ # Slackware build script for megatunix # Copyright (c) 2009 Allen Coleman (acoleman at tomjones.doesntexist.com) -# +# # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above # copyright notice and this permission notice appear in all copies. -# +# # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR @@ -59,7 +59,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -# 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/misc/nixnote/nixnote.SlackBuild b/misc/nixnote/nixnote.SlackBuild index 3184fed8a4..91610a8354 100644 --- a/misc/nixnote/nixnote.SlackBuild +++ b/misc/nixnote/nixnote.SlackBuild @@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i486" ]; then SOURCEARCH="i386" elif [ "$ARCH" = "i686" ]; then SOURCEARCH="i386" diff --git a/misc/par2cmdline/par2cmdline.SlackBuild b/misc/par2cmdline/par2cmdline.SlackBuild index e514d1b675..149d2fb1a0 100644 --- a/misc/par2cmdline/par2cmdline.SlackBuild +++ b/misc/par2cmdline/par2cmdline.SlackBuild @@ -10,12 +10,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 diff --git a/misc/pinfo/pinfo.SlackBuild b/misc/pinfo/pinfo.SlackBuild index 1e664c22e5..d7aa85ac07 100644 --- a/misc/pinfo/pinfo.SlackBuild +++ b/misc/pinfo/pinfo.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.6.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/misc/projectM/projectM.SlackBuild b/misc/projectM/projectM.SlackBuild index e3094a9833..da1530231c 100644 --- a/misc/projectM/projectM.SlackBuild +++ b/misc/projectM/projectM.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -61,7 +61,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/misc/protobuf/protobuf.SlackBuild b/misc/protobuf/protobuf.SlackBuild index bdc2dc15ba..a4ec137dc2 100644 --- a/misc/protobuf/protobuf.SlackBuild +++ b/misc/protobuf/protobuf.SlackBuild @@ -64,10 +64,10 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG -# Install the python bindings +# Install the python bindings if [ "${PYTHON:-yes}" = "yes" ]; then cd python ; python setup.py install --root=$PKG ; cd .. fi diff --git a/misc/readesm/readesm.SlackBuild b/misc/readesm/readesm.SlackBuild index 52b2c4c4db..bcb0f863b6 100644 --- a/misc/readesm/readesm.SlackBuild +++ b/misc/readesm/readesm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for readesm +# Slackware build script for readesm # Copyright 2013 Vitor Borrego Corroios, Portugal # All rights reserved. @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -83,7 +83,7 @@ sed -i \ gui/mainWindow.cpp make clean -make +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/misc/recode/recode.SlackBuild b/misc/recode/recode.SlackBuild index 57b31023e9..c767a112ae 100644 --- a/misc/recode/recode.SlackBuild +++ b/misc/recode/recode.SlackBuild @@ -16,12 +16,10 @@ VERSION=3.6 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/misc/rsibreak/rsibreak.SlackBuild b/misc/rsibreak/rsibreak.SlackBuild index 4bc4af99a6..22e3899cc0 100644 --- a/misc/rsibreak/rsibreak.SlackBuild +++ b/misc/rsibreak/rsibreak.SlackBuild @@ -9,12 +9,10 @@ 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/misc/rsnapshot/rsnapshot.SlackBuild b/misc/rsnapshot/rsnapshot.SlackBuild index c04388c059..bc40c86e5b 100644 --- a/misc/rsnapshot/rsnapshot.SlackBuild +++ b/misc/rsnapshot/rsnapshot.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.3.1 BUILD=${BUILD:-3} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION diff --git a/misc/siege/siege.SlackBuild b/misc/siege/siege.SlackBuild index 6666086133..0033ccc6d6 100644 --- a/misc/siege/siege.SlackBuild +++ b/misc/siege/siege.SlackBuild @@ -40,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/misc/ssss/ssss.SlackBuild b/misc/ssss/ssss.SlackBuild index 1460be2c29..6b4b4cddb9 100644 --- a/misc/ssss/ssss.SlackBuild +++ b/misc/ssss/ssss.SlackBuild @@ -56,7 +56,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/misc/tal/tal.SlackBuild b/misc/tal/tal.SlackBuild index 9c2f639df4..4c0d35f707 100644 --- a/misc/tal/tal.SlackBuild +++ b/misc/tal/tal.SlackBuild @@ -9,12 +9,10 @@ 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 @@ -36,9 +34,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/misc/tamsyn-font/tamsyn-font.SlackBuild b/misc/tamsyn-font/tamsyn-font.SlackBuild index 73c8141701..3cf7eb533f 100644 --- a/misc/tamsyn-font/tamsyn-font.SlackBuild +++ b/misc/tamsyn-font/tamsyn-font.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 -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/misc/temper/temper.SlackBuild b/misc/temper/temper.SlackBuild index 05f20c0554..9550863d8f 100644 --- a/misc/temper/temper.SlackBuild +++ b/misc/temper/temper.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for temper. -# +# # Copyright 2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/misc/texscythe/texscythe.SlackBuild b/misc/texscythe/texscythe.SlackBuild index c9ffce26d5..57eda57998 100644 --- a/misc/texscythe/texscythe.SlackBuild +++ b/misc/texscythe/texscythe.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/misc/txt2tags/txt2tags.SlackBuild b/misc/txt2tags/txt2tags.SlackBuild index 71b9457822..bd27fac45f 100644 --- a/misc/txt2tags/txt2tags.SlackBuild +++ b/misc/txt2tags/txt2tags.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware Build script for txt2tags +# Slackware Build script for txt2tags # Copyright (c) 2009, eviljames <storgeek [at] gmail [dot] com> # @@ -9,7 +9,7 @@ # copyright notice and this permission notice appear in all copies. # # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN @@ -23,12 +23,10 @@ VERSION=${VERSION:-r1172} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -91,7 +89,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog README extras samples test \ doc/English/txt2tags-quickref.pdf doc/English/userguide.pdf \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/misc/vdpauinfo/vdpauinfo.SlackBuild b/misc/vdpauinfo/vdpauinfo.SlackBuild index 36a29ccb48..04f7f3c193 100644 --- a/misc/vdpauinfo/vdpauinfo.SlackBuild +++ b/misc/vdpauinfo/vdpauinfo.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.0.6 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/misc/viking/viking.SlackBuild b/misc/viking/viking.SlackBuild index 86077e389f..46b6f3b90e 100644 --- a/misc/viking/viking.SlackBuild +++ b/misc/viking/viking.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for viking. - + # Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com> # All rights reserved. # diff --git a/misc/xapian-omega/xapian-omega.SlackBuild b/misc/xapian-omega/xapian-omega.SlackBuild index 55b2557855..481361174a 100644 --- a/misc/xapian-omega/xapian-omega.SlackBuild +++ b/misc/xapian-omega/xapian-omega.SlackBuild @@ -98,7 +98,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; # Install (but don't clobber) a config file (and use our own config file) -rm -f $PKG/etc/omega.conf +rm -f $PKG/etc/omega.conf cat $CWD/xapian-omega.conf > $PKG/etc/xapian-omega.conf.new # Create the otherwise missing directories listed in /etc/xapian-omega.conf diff --git a/misc/xclip/xclip.SlackBuild b/misc/xclip/xclip.SlackBuild index 741ac2668f..a7641cadf4 100644 --- a/misc/xclip/xclip.SlackBuild +++ b/misc/xclip/xclip.SlackBuild @@ -1,22 +1,22 @@ #!/bin/sh # Slackware build script for xclip -# Copyright 2009 Grigorios Bouzakis <grbzks@xsmail.com> -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for any purpose -# with or without fee is hereby granted, provided that the above copyright -# notice and this permission notice appear in all copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 -# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS 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 +# Copyright 2009 Grigorios Bouzakis <grbzks@xsmail.com> +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for any purpose +# with or without fee is hereby granted, provided that the above copyright +# notice and this permission notice appear in all copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 +# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS 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. PRGNAM=xclip @@ -24,12 +24,10 @@ VERSION=${VERSION:-0.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/misc/xdelta/xdelta.SlackBuild b/misc/xdelta/xdelta.SlackBuild index a23697837e..cb55d95ada 100644 --- a/misc/xdelta/xdelta.SlackBuild +++ b/misc/xdelta/xdelta.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -38,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT |