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 --- system/BasiliskII/BasiliskII.SlackBuild | 4 +-- system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild | 4 +-- system/ack/ack.SlackBuild | 2 +- system/acpi/acpi.SlackBuild | 2 -- system/acpitool/acpitool.SlackBuild | 4 +-- system/aespipe/aespipe.SlackBuild | 6 ++-- system/afuse/afuse.SlackBuild | 2 -- system/aide/aide.SlackBuild | 1 - system/amanda/amanda.SlackBuild | 4 +-- system/anacron/anacron.SlackBuild | 6 ++-- system/andromeda/andromeda.SlackBuild | 2 +- .../apache-cassandra/apache-cassandra.SlackBuild | 2 +- system/apcupsd/apcupsd.SlackBuild | 2 +- system/aterm/aterm.SlackBuild | 4 +-- system/atool/atool.SlackBuild | 4 +-- system/bochs/bochs.SlackBuild | 8 ++--- system/bogofilter/bogofilter.SlackBuild | 2 -- system/bonnie++/bonnie++.SlackBuild | 2 -- system/bootchart/bootchart.SlackBuild | 10 +++--- system/brasero/brasero.SlackBuild | 4 +-- system/cbmfs/cbmfs.SlackBuild | 2 -- system/ccd2iso/ccd2iso.SlackBuild | 2 -- system/ccrypt/ccrypt.SlackBuild | 2 +- system/chkrootkit/chkrootkit.SlackBuild | 4 +-- system/clamav/clamav.SlackBuild | 2 +- system/clamsmtp/clamsmtp.SlackBuild | 2 -- system/clusterglue/clusterglue.SlackBuild | 6 ++-- .../clusterresourceagents.SlackBuild | 4 +-- system/coolkey/coolkey.SlackBuild | 4 +-- system/corosync/corosync.SlackBuild | 6 ++-- system/crashplan/crashplan.SlackBuild | 4 +-- system/crikey/crikey.SlackBuild | 2 -- system/cups-bjnp/cups-bjnp.SlackBuild | 2 -- system/cutecom/cutecom.SlackBuild | 2 +- system/daa2iso/daa2iso.SlackBuild | 2 -- system/detox/detox.SlackBuild | 2 +- system/dosbox/dosbox.SlackBuild | 4 +-- system/dosemu/dosemu.SlackBuild | 4 +-- system/drbd-tools/drbd-tools.SlackBuild | 4 +-- system/driconf/driconf.SlackBuild | 2 +- system/ecofont-ttf/ecofont-ttf.SlackBuild | 2 +- system/eibd/eibd.SlackBuild | 2 -- system/extundelete/extundelete.SlackBuild | 4 +-- system/fakeroot/fakeroot.SlackBuild | 6 ++-- system/fio/fio.SlackBuild | 2 +- system/fish/fish.SlackBuild | 4 +-- system/flSynclient/flSynclient.SlackBuild | 2 -- system/freefont/freefont.SlackBuild | 2 +- system/fsarchiver/fsarchiver.SlackBuild | 4 +-- system/fuseiso/fuseiso.SlackBuild | 2 -- system/fxload/fxload.SlackBuild | 6 ++-- system/gconf-editor/gconf-editor.SlackBuild | 2 -- system/gdm/gdm.SlackBuild | 2 +- system/geoclue/geoclue.SlackBuild | 2 +- system/gkrellm-volume/gkrellm-volume.SlackBuild | 4 +-- system/gksu-polkit/gksu-polkit.SlackBuild | 2 +- system/glyptodon/glyptodon.SlackBuild | 2 +- system/gnomint/gnomint.SlackBuild | 2 +- system/gpsbabel/gpsbabel.SlackBuild | 2 -- system/graveman/graveman.SlackBuild | 2 -- system/gsmartcontrol/gsmartcontrol.SlackBuild | 2 -- system/gtk-vnc/gtk-vnc.SlackBuild | 2 -- system/gtklp/gtklp.SlackBuild | 2 +- system/gxemul/gxemul.SlackBuild | 2 -- system/hdapsd/hdapsd.SlackBuild | 2 +- system/hddtemp/hddtemp.SlackBuild | 4 +-- system/hebe/hebe.SlackBuild | 2 +- .../heirloom-doctools/heirloom-doctools.SlackBuild | 4 +-- system/heirloom-pax/heirloom-pax.SlackBuild | 8 ++--- system/hercules/hercules.SlackBuild | 2 -- system/hntool/hntool.SlackBuild | 2 +- system/imwheel/imwheel.SlackBuild | 4 +-- system/ipmitool/ipmitool.SlackBuild | 2 -- system/jenkins/jenkins.SlackBuild | 2 +- system/john/john.SlackBuild | 2 +- system/ksplice/ksplice.SlackBuild | 2 -- system/ktsuss/ktsuss.SlackBuild | 4 +-- system/kyotocabinet/kyotocabinet.SlackBuild | 2 +- system/lbzip2/lbzip2.SlackBuild | 2 -- system/lilyterm/lilyterm.SlackBuild | 4 +-- system/lirc/lirc.SlackBuild | 4 +-- system/logpp/logpp.SlackBuild | 6 ++-- system/lshw/lshw.SlackBuild | 2 +- system/luckybackup/luckybackup.SlackBuild | 2 -- system/lxdm/lxdm.SlackBuild | 4 +-- system/lxsplit/lxsplit.SlackBuild | 4 +-- system/mcrypt/mcrypt.SlackBuild | 2 -- system/memuse/memuse.SlackBuild | 4 +-- system/microcode_ctl/microcode_ctl.SlackBuild | 4 +-- .../midisport-firmware.SlackBuild | 2 +- system/mtftar/mtftar.SlackBuild | 2 -- system/mucommander/mucommander.SlackBuild | 2 +- system/nagios-plugins/nagios-plugins.SlackBuild | 2 +- system/numlockx/numlockx.SlackBuild | 2 +- system/nut/nut.SlackBuild | 1 - system/nvidia-driver/nvidia-driver.SlackBuild | 8 ++--- system/nvidia-kernel/nvidia-kernel.SlackBuild | 2 +- .../nvidia-legacy304-driver.SlackBuild | 6 ++-- .../nvidia-legacy304-kernel.SlackBuild | 4 +-- .../nvidia-legacy96-kernel.SlackBuild | 2 +- system/pacemaker/pacemaker.SlackBuild | 2 -- system/pax/pax.SlackBuild | 6 ++-- system/pev/pev.SlackBuild | 2 +- system/picocom/picocom.SlackBuild | 4 +-- system/pigz/pigz.SlackBuild | 2 +- system/pipemeter/pipemeter.SlackBuild | 2 -- system/plan9port/plan9port.SlackBuild | 2 +- system/postgresql/postgresql.SlackBuild | 8 ++--- system/powernowd/powernowd.SlackBuild | 2 -- system/prelink/prelink.SlackBuild | 4 +-- system/preload/preload.SlackBuild | 2 +- system/pv/pv.SlackBuild | 4 +-- system/pwgen/pwgen.SlackBuild | 8 ++--- system/pwsafe/pwsafe.SlackBuild | 2 -- system/qingy/qingy.SlackBuild | 2 +- .../qingy_0.3_themepack.SlackBuild | 2 +- system/qps/qps.SlackBuild | 2 +- system/qterminal/qterminal.SlackBuild | 2 +- system/qtfm/qtfm.SlackBuild | 10 +++--- system/qtgzmanager/qtgzmanager.SlackBuild | 10 +++--- system/qxkb/qxkb.SlackBuild | 2 +- system/rdiff-backup/rdiff-backup.SlackBuild | 4 +-- system/recorder/recorder.SlackBuild | 2 -- system/regionset/regionset.SlackBuild | 6 ++-- system/rkhunter/rkhunter.SlackBuild | 2 +- system/runit/runit.SlackBuild | 2 -- system/safecopy/safecopy.SlackBuild | 4 +-- system/sakura/sakura.SlackBuild | 4 +-- system/scalpel/scalpel.SlackBuild | 2 +- system/schedtool/schedtool.SlackBuild | 2 -- system/seahorse/seahorse.SlackBuild | 2 -- system/ser2net/ser2net.SlackBuild | 2 -- system/set_rlimits/set_rlimits.SlackBuild | 8 ++--- system/slackyd/slackyd.SlackBuild | 2 +- system/slim/slim.SlackBuild | 2 +- system/splix/splix.SlackBuild | 2 -- system/sqlite2/sqlite2.SlackBuild | 2 -- system/srm/srm.SlackBuild | 2 -- system/statifier/statifier.SlackBuild | 2 -- system/stress/stress.SlackBuild | 2 +- system/sudosh2/sudosh2.SlackBuild | 2 +- system/swatch/swatch.SlackBuild | 2 +- system/swun/swun.SlackBuild | 4 +-- system/tarsnap/tarsnap.SlackBuild | 14 ++++----- system/tokyocabinet/tokyocabinet.SlackBuild | 2 -- system/tokyotyrant/tokyotyrant.SlackBuild | 2 -- system/twin/twin.SlackBuild | 10 +++--- system/udevil/udevil.SlackBuild | 2 +- system/ufiformat/ufiformat.SlackBuild | 2 -- system/uif2iso/uif2iso.SlackBuild | 4 +-- system/unetbootin/unetbootin.SlackBuild | 2 +- system/unison/unison.SlackBuild | 4 +-- system/unp/unp.SlackBuild | 2 +- system/unrtf/unrtf.SlackBuild | 4 +-- system/usbmon/usbmon.SlackBuild | 2 -- system/vice/vice.SlackBuild | 4 +-- system/virt-manager/virt-manager.SlackBuild | 4 +-- system/wacomtablet/wacomtablet.SlackBuild | 1 - system/wdfs/wdfs.SlackBuild | 2 +- system/webmin/webmin.SlackBuild | 10 +++--- .../wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild | 2 -- system/winetricks/winetricks.SlackBuild | 2 +- system/xar/xar.SlackBuild | 2 -- system/xarchiver/xarchiver.SlackBuild | 2 -- system/xcdroast/xcdroast.SlackBuild | 8 ++--- system/xchm/xchm.SlackBuild | 4 +-- system/xfburn/xfburn.SlackBuild | 2 -- system/xfe/xfe.SlackBuild | 2 -- system/xosd/xosd.SlackBuild | 4 +-- system/yeahconsole/yeahconsole.SlackBuild | 36 ++++++++++------------ 170 files changed, 207 insertions(+), 384 deletions(-) (limited to 'system') diff --git a/system/BasiliskII/BasiliskII.SlackBuild b/system/BasiliskII/BasiliskII.SlackBuild index cb2b03d0b3..44894d4741 100644 --- a/system/BasiliskII/BasiliskII.SlackBuild +++ b/system/BasiliskII/BasiliskII.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="COPYING ChangeLog README TECH TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -61,7 +61,7 @@ fi sed -i "s|net/if_tun\.h|linux/if_tun.h|" src/Unix/{ether_unix.cpp,configure.ac} cd src/Unix -NO_CONFIGURE=1 ./autogen.sh +NO_CONFIGURE=1 ./autogen.sh CPPFLAGS="-I/usr/include/readline" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild b/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild index bd171a6ce7..49137bd196 100644 --- a/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild +++ b/system/MySQL-Sandbox/MySQL-Sandbox.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-3.0.08} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -57,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/ack/ack.SlackBuild b/system/ack/ack.SlackBuild index 7f6c62d562..b1f96b2254 100644 --- a/system/ack/ack.SlackBuild +++ b/system/ack/ack.SlackBuild @@ -39,7 +39,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -e +set -e rm -rf $PKG mkdir -p $PKG $OUTPUT diff --git a/system/acpi/acpi.SlackBuild b/system/acpi/acpi.SlackBuild index f70d74be73..7baaca31a5 100644 --- a/system/acpi/acpi.SlackBuild +++ b/system/acpi/acpi.SlackBuild @@ -24,12 +24,10 @@ VERSION=${VERSION:-1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/acpitool/acpitool.SlackBuild b/system/acpitool/acpitool.SlackBuild index 3149e838b2..f8cd8ad4a8 100644 --- a/system/acpitool/acpitool.SlackBuild +++ b/system/acpitool/acpitool.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.5.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -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/system/aespipe/aespipe.SlackBuild b/system/aespipe/aespipe.SlackBuild index ed047862b4..48cbe5b867 100644 --- a/system/aespipe/aespipe.SlackBuild +++ b/system/aespipe/aespipe.SlackBuild @@ -25,18 +25,16 @@ # # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # 2010 May 25 - initial release - + PRGNAM=aespipe VERSION=${VERSION:-v2.4c} 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 @@ -62,7 +60,7 @@ else SLKCFLAGS="-O2" LIBDIRSUFFIX="" OPT="" -fi +fi set -e diff --git a/system/afuse/afuse.SlackBuild b/system/afuse/afuse.SlackBuild index d8ec1370ca..8eba573eaa 100644 --- a/system/afuse/afuse.SlackBuild +++ b/system/afuse/afuse.SlackBuild @@ -9,12 +9,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/system/aide/aide.SlackBuild b/system/aide/aide.SlackBuild index 327c6d71ff..66a033ceb8 100644 --- a/system/aide/aide.SlackBuild +++ b/system/aide/aide.SlackBuild @@ -13,7 +13,6 @@ if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/amanda/amanda.SlackBuild b/system/amanda/amanda.SlackBuild index 6b511cf502..083bdb4dd3 100644 --- a/system/amanda/amanda.SlackBuild +++ b/system/amanda/amanda.SlackBuild @@ -2,9 +2,9 @@ # Slackware build script for amanda -# Copyright (c) 2009 Chris Walker +# Copyright (c) 2009 Chris Walker # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: diff --git a/system/anacron/anacron.SlackBuild b/system/anacron/anacron.SlackBuild index 7409cd765b..9388bc7338 100644 --- a/system/anacron/anacron.SlackBuild +++ b/system/anacron/anacron.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh - + # Slackware build script for anacron -# (C) 2007 Michael Wagner +# (C) 2007 Michael Wagner # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,12 +27,10 @@ VERSION=2.3 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/andromeda/andromeda.SlackBuild b/system/andromeda/andromeda.SlackBuild index 7947b6be43..4de82ce073 100644 --- a/system/andromeda/andromeda.SlackBuild +++ b/system/andromeda/andromeda.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="README.txt TODO.txt" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/apache-cassandra/apache-cassandra.SlackBuild b/system/apache-cassandra/apache-cassandra.SlackBuild index 7bd62079c5..a84b41834e 100644 --- a/system/apache-cassandra/apache-cassandra.SlackBuild +++ b/system/apache-cassandra/apache-cassandra.SlackBuild @@ -55,7 +55,7 @@ mkdir -p $PKG/opt/$PRGNAM mkdir -p $PKG/etc/$PRGNAM mkdir -p $PKG/var/log/cassandra mkdir -p $PKG/var/lib/cassandra -rm -f bin/*.bat +rm -f bin/*.bat ##### cp -rf conf/* interface $PKG/etc/$PRGNAM diff --git a/system/apcupsd/apcupsd.SlackBuild b/system/apcupsd/apcupsd.SlackBuild index 7d9975cbb4..01fddbfabc 100644 --- a/system/apcupsd/apcupsd.SlackBuild +++ b/system/apcupsd/apcupsd.SlackBuild @@ -59,7 +59,7 @@ fi set -e -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION diff --git a/system/aterm/aterm.SlackBuild b/system/aterm/aterm.SlackBuild index 41a721a826..feb8ab8d9c 100644 --- a/system/aterm/aterm.SlackBuild +++ b/system/aterm/aterm.SlackBuild @@ -29,12 +29,10 @@ VERSION=1.0.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -90,7 +88,7 @@ fi mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ChangeLog INSTALL doc/* $PKG/usr/doc/$PRGNAM-$VERSION for i in Makefile Makefile.in aterm.1 ; - do rm $PKG/usr/doc/$PRGNAM-$VERSION/$i ; + do rm $PKG/usr/doc/$PRGNAM-$VERSION/$i ; done cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/atool/atool.SlackBuild b/system/atool/atool.SlackBuild index 9bde18acef..1049b0d34a 100644 --- a/system/atool/atool.SlackBuild +++ b/system/atool/atool.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.37.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/bochs/bochs.SlackBuild b/system/bochs/bochs.SlackBuild index 5efab62524..149a257acf 100644 --- a/system/bochs/bochs.SlackBuild +++ b/system/bochs/bochs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for Bochs +# Slackware build script for Bochs # Copyright 2012, Bojan Popovic, Belgrade, Serbia # All rights reserved. # @@ -23,10 +23,10 @@ # Modified by the slackbuilds.org project -PRGNAM=bochs -VERSION=${VERSION:-2.6} +PRGNAM=bochs +VERSION=${VERSION:-2.6} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/bogofilter/bogofilter.SlackBuild b/system/bogofilter/bogofilter.SlackBuild index 7a2618c61c..17b4a13d91 100644 --- a/system/bogofilter/bogofilter.SlackBuild +++ b/system/bogofilter/bogofilter.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.2.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/system/bonnie++/bonnie++.SlackBuild b/system/bonnie++/bonnie++.SlackBuild index cd1fcbfc31..bb6f67ddfe 100644 --- a/system/bonnie++/bonnie++.SlackBuild +++ b/system/bonnie++/bonnie++.SlackBuild @@ -9,12 +9,10 @@ VERSION=1.03e 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/system/bootchart/bootchart.SlackBuild b/system/bootchart/bootchart.SlackBuild index 5a83e5b62c..aef03ededd 100644 --- a/system/bootchart/bootchart.SlackBuild +++ b/system/bootchart/bootchart.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for bootchart +# Slackware build script for bootchart # Written by Marco Cecchetti (mrc.ildp@gmail.com) @@ -8,8 +8,8 @@ # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmail.com -PRGNAM=bootchart -VERSION=${VERSION:-0.9} +PRGNAM=bootchart +VERSION=${VERSION:-0.9} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} @@ -22,7 +22,7 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -32,7 +32,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild index 10cbdfd3dd..1338ada9e9 100644 --- a/system/brasero/brasero.SlackBuild +++ b/system/brasero/brasero.SlackBuild @@ -42,7 +42,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -73,7 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-scrollkeeper \ --disable-schemas-install \ --enable-nautilus=no \ - --enable-libburnia=$LIBBURNIA + --enable-libburnia=$LIBBURNIA make make install DESTDIR=$PKG diff --git a/system/cbmfs/cbmfs.SlackBuild b/system/cbmfs/cbmfs.SlackBuild index da09f8318b..241597396b 100644 --- a/system/cbmfs/cbmfs.SlackBuild +++ b/system/cbmfs/cbmfs.SlackBuild @@ -28,12 +28,10 @@ VERSION=1.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/ccd2iso/ccd2iso.SlackBuild b/system/ccd2iso/ccd2iso.SlackBuild index f80e7a8dea..49e3e5a274 100644 --- a/system/ccd2iso/ccd2iso.SlackBuild +++ b/system/ccd2iso/ccd2iso.SlackBuild @@ -8,12 +8,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 diff --git a/system/ccrypt/ccrypt.SlackBuild b/system/ccrypt/ccrypt.SlackBuild index 8c0e27c8fe..72309835e9 100644 --- a/system/ccrypt/ccrypt.SlackBuild +++ b/system/ccrypt/ccrypt.SlackBuild @@ -57,7 +57,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/chkrootkit/chkrootkit.SlackBuild b/system/chkrootkit/chkrootkit.SlackBuild index d58e6fd7f2..77a41f1904 100644 --- a/system/chkrootkit/chkrootkit.SlackBuild +++ b/system/chkrootkit/chkrootkit.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.49} 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 @@ -42,7 +40,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/system/clamav/clamav.SlackBuild b/system/clamav/clamav.SlackBuild index 48f52d0363..dabaa8ac42 100644 --- a/system/clamav/clamav.SlackBuild +++ b/system/clamav/clamav.SlackBuild @@ -149,7 +149,7 @@ install -D -m 0755 $CWD/rc.clamav $PKG/etc/rc.d/rc.clamav.new install -D -m 0644 $CWD/logrotate.clamav $PKG/etc/logrotate.d/clamav.new # Create pid, socket, db, and log directories -# init script must still ensure that /var/run/clamav exists +# init script must still ensure that /var/run/clamav exists # and has proper ownership and permissions though mkdir -p $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav chmod 771 $PKG/var/lib/clamav $PKG/var/log/clamav $PKG/var/run/clamav diff --git a/system/clamsmtp/clamsmtp.SlackBuild b/system/clamsmtp/clamsmtp.SlackBuild index 63f5c1efeb..977c3fe671 100644 --- a/system/clamsmtp/clamsmtp.SlackBuild +++ b/system/clamsmtp/clamsmtp.SlackBuild @@ -29,12 +29,10 @@ VERSION=1.10 BUILD=${BUILD:-4} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/clusterglue/clusterglue.SlackBuild b/system/clusterglue/clusterglue.SlackBuild index aff936f76f..6f8d960c30 100644 --- a/system/clusterglue/clusterglue.SlackBuild +++ b/system/clusterglue/clusterglue.SlackBuild @@ -8,7 +8,7 @@ # Based on http://slackbuilds.org/template.SlackBuild # Modified by the SlackBuilds.org project - + PRGNAM=clusterglue VERSION=${VERSION:-5e06b2ddd24b} BUILD=${BUILD:-2} @@ -69,7 +69,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Starting with glib 2.32 it is now mandatory to +# Starting with glib 2.32 it is now mandatory to # include glib.h instead of individual headers. patch -p1 -i $CWD/glib-single-include.patch @@ -92,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-bundled-ltdl \ --enable-libnet -make +make make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/clusterresourceagents/clusterresourceagents.SlackBuild b/system/clusterresourceagents/clusterresourceagents.SlackBuild index 71d7a55812..71cc6974c9 100644 --- a/system/clusterresourceagents/clusterresourceagents.SlackBuild +++ b/system/clusterresourceagents/clusterresourceagents.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-20120918_a796f39} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -43,7 +41,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/coolkey/coolkey.SlackBuild b/system/coolkey/coolkey.SlackBuild index 0ddbe2d2db..ad3ebc5154 100644 --- a/system/coolkey/coolkey.SlackBuild +++ b/system/coolkey/coolkey.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.1.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 @@ -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/system/corosync/corosync.SlackBuild b/system/corosync/corosync.SlackBuild index e0d70c8329..3b9b21e911 100644 --- a/system/corosync/corosync.SlackBuild +++ b/system/corosync/corosync.SlackBuild @@ -9,17 +9,15 @@ # Based on http://slackbuilds.org/template.SlackBuild # Modified by the SlackBuilds.org project -PRGNAM=corosync +PRGNAM=corosync VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -43,7 +41,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/crashplan/crashplan.SlackBuild b/system/crashplan/crashplan.SlackBuild index 914e079739..749198de73 100644 --- a/system/crashplan/crashplan.SlackBuild +++ b/system/crashplan/crashplan.SlackBuild @@ -5,12 +5,12 @@ # Written by Lionel Young # Based on http://slackbuilds.org/template.SlackBuild -PRGNAM=crashplan +PRGNAM=crashplan VERSION=${VERSION:-3.5.3} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -SRCNAM=CrashPlan +SRCNAM=CrashPlan TARGETDIR=/opt/crashplan MANIFESTDIR=/var/crashplan # Directory to store backups to diff --git a/system/crikey/crikey.SlackBuild b/system/crikey/crikey.SlackBuild index a0c4720812..be23326c23 100644 --- a/system/crikey/crikey.SlackBuild +++ b/system/crikey/crikey.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.8.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/system/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild index d31e3cad09..2d10a06724 100644 --- a/system/cups-bjnp/cups-bjnp.SlackBuild +++ b/system/cups-bjnp/cups-bjnp.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/cutecom/cutecom.SlackBuild b/system/cutecom/cutecom.SlackBuild index a2d304e26a..bb6f417cdb 100644 --- a/system/cutecom/cutecom.SlackBuild +++ b/system/cutecom/cutecom.SlackBuild @@ -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/system/daa2iso/daa2iso.SlackBuild b/system/daa2iso/daa2iso.SlackBuild index bbf3359c2b..049300d336 100644 --- a/system/daa2iso/daa2iso.SlackBuild +++ b/system/daa2iso/daa2iso.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.1.7e} 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/system/detox/detox.SlackBuild b/system/detox/detox.SlackBuild index 6386c2cd8f..63d7831e71 100644 --- a/system/detox/detox.SlackBuild +++ b/system/detox/detox.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for detox. - + # Copyright 2011 Pierre Cazenave # All rights reserved. # diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild index 976a0218a5..1b5ae9bb5c 100644 --- a/system/dosbox/dosbox.SlackBuild +++ b/system/dosbox/dosbox.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-0.74} 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 @@ -64,7 +62,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/system/dosemu/dosemu.SlackBuild b/system/dosemu/dosemu.SlackBuild index e93b921c0b..de2d660d74 100644 --- a/system/dosemu/dosemu.SlackBuild +++ b/system/dosemu/dosemu.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-20130804_35054ba} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -42,7 +40,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# This script builds dosemu without X support by default. +# This script builds dosemu without X support by default. # To enable X, run the build script as: WITH_X=yes ./dosemu.SlackBuild WITH_X=${WITH_X:-no} diff --git a/system/drbd-tools/drbd-tools.SlackBuild b/system/drbd-tools/drbd-tools.SlackBuild index fe8b0aaeec..d05559bb85 100644 --- a/system/drbd-tools/drbd-tools.SlackBuild +++ b/system/drbd-tools/drbd-tools.SlackBuild @@ -13,12 +13,10 @@ TAG=${TAG:-_SBo} SRCNAM=drbd -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -42,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/driconf/driconf.SlackBuild b/system/driconf/driconf.SlackBuild index 91daaf3393..2aed8545db 100644 --- a/system/driconf/driconf.SlackBuild +++ b/system/driconf/driconf.SlackBuild @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/ecofont-ttf/ecofont-ttf.SlackBuild b/system/ecofont-ttf/ecofont-ttf.SlackBuild index bef0e17942..862497cbef 100644 --- a/system/ecofont-ttf/ecofont-ttf.SlackBuild +++ b/system/ecofont-ttf/ecofont-ttf.SlackBuild @@ -35,7 +35,7 @@ OUTPUT=${OUTPUT:-/tmp} SRC_PRGNAM=spranq_eco_sans_regular -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/eibd/eibd.SlackBuild b/system/eibd/eibd.SlackBuild index 6954627071..369cad8aa4 100644 --- a/system/eibd/eibd.SlackBuild +++ b/system/eibd/eibd.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-0.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/system/extundelete/extundelete.SlackBuild b/system/extundelete/extundelete.SlackBuild index 0c787896d2..2f6874564b 100644 --- a/system/extundelete/extundelete.SlackBuild +++ b/system/extundelete/extundelete.SlackBuild @@ -25,7 +25,7 @@ # # markus reichelt, slackbuilds@mareichelt.de, 0xCCEEF115 # 2010 Oct 22 - initial release - + PRGNAM=extundelete VERSION=${VERSION:-0.2.0} BUILD=${BUILD:-2} @@ -56,7 +56,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/system/fakeroot/fakeroot.SlackBuild b/system/fakeroot/fakeroot.SlackBuild index 53750ca2e4..b5a81bcdd6 100644 --- a/system/fakeroot/fakeroot.SlackBuild +++ b/system/fakeroot/fakeroot.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.12.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 @@ -82,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make make DESTDIR=$PKG install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -96,7 +94,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS BUGS COPYING DEBUG INSTALL README doc/README.* debian/changelog \ - $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/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild index 026f8695ec..7c409c893f 100644 --- a/system/fio/fio.SlackBuild +++ b/system/fio/fio.SlackBuild @@ -69,7 +69,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make install DESTDIR=$PKG prefix="/usr" +make install DESTDIR=$PKG prefix="/usr" 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/system/fish/fish.SlackBuild b/system/fish/fish.SlackBuild index 6fffe813f9..a3405e00c1 100644 --- a/system/fish/fish.SlackBuild +++ b/system/fish/fish.SlackBuild @@ -30,12 +30,10 @@ VERSION=1.23.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 @@ -81,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG # Let's not clobber the config diff --git a/system/flSynclient/flSynclient.SlackBuild b/system/flSynclient/flSynclient.SlackBuild index f3bfd6bbd1..134b8ff27f 100644 --- a/system/flSynclient/flSynclient.SlackBuild +++ b/system/flSynclient/flSynclient.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/freefont/freefont.SlackBuild b/system/freefont/freefont.SlackBuild index b2aa1e1bbf..f48c4072bd 100644 --- a/system/freefont/freefont.SlackBuild +++ b/system/freefont/freefont.SlackBuild @@ -38,7 +38,7 @@ OUTPUT=${OUTPUT:-/tmp} DOCS="AUTHORS COPYING CREDITS ChangeLog INSTALL README" -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/fsarchiver/fsarchiver.SlackBuild b/system/fsarchiver/fsarchiver.SlackBuild index 1728844a66..e0b8555ba0 100644 --- a/system/fsarchiver/fsarchiver.SlackBuild +++ b/system/fsarchiver/fsarchiver.SlackBuild @@ -3,7 +3,7 @@ # Slackware Package Build Script for fsarchiver # Home Page: http://www.fsarchiver.org/Main_Page -# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA +# Copyright (c) 2009-2013, Nishant Limbachia, Hoffman Estates, IL, USA # (nishant _AT_ mnspace _DOT_ net) # All rights reserved. # @@ -57,7 +57,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/fuseiso/fuseiso.SlackBuild b/system/fuseiso/fuseiso.SlackBuild index 8b29a62af2..3107eca196 100644 --- a/system/fuseiso/fuseiso.SlackBuild +++ b/system/fuseiso/fuseiso.SlackBuild @@ -27,12 +27,10 @@ VERSION=20070708 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/system/fxload/fxload.SlackBuild b/system/fxload/fxload.SlackBuild index 8da72dea6d..17bdac9671 100644 --- a/system/fxload/fxload.SlackBuild +++ b/system/fxload/fxload.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2008_10_13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -56,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -72,7 +70,7 @@ find . \ -exec chmod 644 {} \; RPM_OPT_FLAGS="$SLKCFLAGS" make -make install prefix=$PKG +make install prefix=$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/system/gconf-editor/gconf-editor.SlackBuild b/system/gconf-editor/gconf-editor.SlackBuild index f41690bbe4..e1c4f602f3 100644 --- a/system/gconf-editor/gconf-editor.SlackBuild +++ b/system/gconf-editor/gconf-editor.SlackBuild @@ -27,12 +27,10 @@ VERSION=2.24.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/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild index 7699068bd7..639ae0daad 100644 --- a/system/gdm/gdm.SlackBuild +++ b/system/gdm/gdm.SlackBuild @@ -60,7 +60,7 @@ find . \ # Don't automatically start ssh-agent -- this is the user's job patch -p1 < $CWD/patches/do_not_start_ssh-agent.diff -# Fix crypt() usage with glibc-2.17 and later +# Fix crypt() usage with glibc-2.17 and later patch -p1 < $CWD/patches/gdm-2.20.11-crypt.diff CFLAGS="$SLKCFLAGS" \ diff --git a/system/geoclue/geoclue.SlackBuild b/system/geoclue/geoclue.SlackBuild index 91fcf5a188..91c740425c 100644 --- a/system/geoclue/geoclue.SlackBuild +++ b/system/geoclue/geoclue.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="AUTHORS ChangeLog COPYING NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/gkrellm-volume/gkrellm-volume.SlackBuild b/system/gkrellm-volume/gkrellm-volume.SlackBuild index 9bd61c5eaa..eb6c748c38 100644 --- a/system/gkrellm-volume/gkrellm-volume.SlackBuild +++ b/system/gkrellm-volume/gkrellm-volume.SlackBuild @@ -22,17 +22,15 @@ VERSION=2.1.13 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/system/gksu-polkit/gksu-polkit.SlackBuild b/system/gksu-polkit/gksu-polkit.SlackBuild index 5389290405..9075e8b06e 100644 --- a/system/gksu-polkit/gksu-polkit.SlackBuild +++ b/system/gksu-polkit/gksu-polkit.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="AUTHORS COPYING ChangeLog README THANKS TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/glyptodon/glyptodon.SlackBuild b/system/glyptodon/glyptodon.SlackBuild index e3fa18d117..ffd21163d7 100644 --- a/system/glyptodon/glyptodon.SlackBuild +++ b/system/glyptodon/glyptodon.SlackBuild @@ -19,7 +19,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/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild index 5d1679156c..50c1436369 100644 --- a/system/gnomint/gnomint.SlackBuild +++ b/system/gnomint/gnomint.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/gpsbabel/gpsbabel.SlackBuild b/system/gpsbabel/gpsbabel.SlackBuild index d31eca002c..5f84b7dadc 100644 --- a/system/gpsbabel/gpsbabel.SlackBuild +++ b/system/gpsbabel/gpsbabel.SlackBuild @@ -8,12 +8,10 @@ VERSION=1.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 diff --git a/system/graveman/graveman.SlackBuild b/system/graveman/graveman.SlackBuild index 910092e5fc..b802ebfdd4 100644 --- a/system/graveman/graveman.SlackBuild +++ b/system/graveman/graveman.SlackBuild @@ -34,12 +34,10 @@ SRCVER=0.3.12-5 # this is the developer's source version DOCS="AUTHORS COPYING ChangeLog NEWS README* THANKS TRANSLATE-HOWTO.fr" -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/system/gsmartcontrol/gsmartcontrol.SlackBuild b/system/gsmartcontrol/gsmartcontrol.SlackBuild index eb26c43f5a..7ad16ae292 100644 --- a/system/gsmartcontrol/gsmartcontrol.SlackBuild +++ b/system/gsmartcontrol/gsmartcontrol.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.8.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/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild index 45b70425ab..1df599c6df 100644 --- a/system/gtk-vnc/gtk-vnc.SlackBuild +++ b/system/gtk-vnc/gtk-vnc.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.5.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/gtklp/gtklp.SlackBuild b/system/gtklp/gtklp.SlackBuild index 91c9018583..d3abffd0aa 100644 --- a/system/gtklp/gtklp.SlackBuild +++ b/system/gtklp/gtklp.SlackBuild @@ -30,7 +30,7 @@ elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/gxemul/gxemul.SlackBuild b/system/gxemul/gxemul.SlackBuild index 56c94a9f46..28c29541dd 100644 --- a/system/gxemul/gxemul.SlackBuild +++ b/system/gxemul/gxemul.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.6.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/system/hdapsd/hdapsd.SlackBuild b/system/hdapsd/hdapsd.SlackBuild index 34e5e6602e..2015df183e 100644 --- a/system/hdapsd/hdapsd.SlackBuild +++ b/system/hdapsd/hdapsd.SlackBuild @@ -59,7 +59,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/hddtemp/hddtemp.SlackBuild b/system/hddtemp/hddtemp.SlackBuild index e53cfdb788..06ba51de71 100644 --- a/system/hddtemp/hddtemp.SlackBuild +++ b/system/hddtemp/hddtemp.SlackBuild @@ -12,12 +12,10 @@ VERSION=$(echo $SRCVERSION | tr -d "-") 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/system/hebe/hebe.SlackBuild b/system/hebe/hebe.SlackBuild index d2f3704532..9b68bd4bfd 100644 --- a/system/hebe/hebe.SlackBuild +++ b/system/hebe/hebe.SlackBuild @@ -62,7 +62,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DHTML_INSTALL_DIR=/usr/doc/$PRGNAM-$VERSION/html \ -DCMAKE_BUILD_TYPE=Release .. - make + make make install DESTDIR=$PKG cd .. diff --git a/system/heirloom-doctools/heirloom-doctools.SlackBuild b/system/heirloom-doctools/heirloom-doctools.SlackBuild index fa887877e7..b394bc4758 100644 --- a/system/heirloom-doctools/heirloom-doctools.SlackBuild +++ b/system/heirloom-doctools/heirloom-doctools.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=heirloom-doctools -VERSION=${VERSION:-080407} +VERSION=${VERSION:-080407} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/heirloom-pax/heirloom-pax.SlackBuild b/system/heirloom-pax/heirloom-pax.SlackBuild index c04ecac43a..7f8dd3fc55 100644 --- a/system/heirloom-pax/heirloom-pax.SlackBuild +++ b/system/heirloom-pax/heirloom-pax.SlackBuild @@ -52,8 +52,8 @@ find . \ -exec chmod 644 {} \; # Patch the paths in the man page to use /usr/lib/heirloom/bin, rather -# than /usr/5bin (where the upstream maintainer suggests). This is -# done to avoid littering the top level of /usr. +# than /usr/5bin (where the upstream maintainer suggests). This is +# done to avoid littering the top level of /usr. sed -i.original \ -e "s|/usr/5bin|/usr/lib$LIBDIRSUFFIX/heirloom/bin|" \ -e "s|/usr/posix2001/bin|/usr/lib$LIBDIRSUFFIX/heirloom/bin/posix2001|" cpio/pax.1 @@ -71,10 +71,10 @@ make -C libcommon make -C libuxre make -C cpio pax pax_su3 -# The install will be manual as it is easier than patching the +# The install will be manual as it is easier than patching the # "make install" target. ;) # -# Note: pax cannot go directly into /usr/bin because Heirloom Toolchest +# Note: pax cannot go directly into /usr/bin because Heirloom Toolchest # provides two pax versions and the user may have another pax # already installed. install -Dm755 cpio/pax $PKG/usr/lib$LIBDIRSUFFIX/heirloom/bin/pax diff --git a/system/hercules/hercules.SlackBuild b/system/hercules/hercules.SlackBuild index d0c17bea24..d164c83803 100644 --- a/system/hercules/hercules.SlackBuild +++ b/system/hercules/hercules.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-3.07} 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/system/hntool/hntool.SlackBuild b/system/hntool/hntool.SlackBuild index 22972b0170..257fc43417 100644 --- a/system/hntool/hntool.SlackBuild +++ b/system/hntool/hntool.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/imwheel/imwheel.SlackBuild b/system/imwheel/imwheel.SlackBuild index ba502bb42d..f52f94d4ef 100644 --- a/system/imwheel/imwheel.SlackBuild +++ b/system/imwheel/imwheel.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.0.0pre12} 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 @@ -88,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make +make make install DESTDIR=$PKG ETCDIR=$PKG/etc/X11/imwheel find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/ipmitool/ipmitool.SlackBuild b/system/ipmitool/ipmitool.SlackBuild index c947f1495f..f6820cff7a 100644 --- a/system/ipmitool/ipmitool.SlackBuild +++ b/system/ipmitool/ipmitool.SlackBuild @@ -15,12 +15,10 @@ VERSION=${VERSION:-1.8.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/jenkins/jenkins.SlackBuild b/system/jenkins/jenkins.SlackBuild index d3a9e1fabb..f074d53df7 100644 --- a/system/jenkins/jenkins.SlackBuild +++ b/system/jenkins/jenkins.SlackBuild @@ -48,7 +48,7 @@ elif ! getent passwd jenkins 2>/dev/null 1>/dev/null ; then fi set -e - + rm -rf $PKG mkdir -p $PKG $OUTPUT cd $PKG diff --git a/system/john/john.SlackBuild b/system/john/john.SlackBuild index acbdc7df84..84e621f6fb 100644 --- a/system/john/john.SlackBuild +++ b/system/john/john.SlackBuild @@ -51,7 +51,7 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -# Soft-link in tarball causes x bit to be set below; nuke it +# Soft-link in tarball causes x bit to be set below; nuke it rm -f $PRGNAM-$VERSION/README cd $PRGNAM-$VERSION diff --git a/system/ksplice/ksplice.SlackBuild b/system/ksplice/ksplice.SlackBuild index bf251c3a44..d23ffc9d95 100644 --- a/system/ksplice/ksplice.SlackBuild +++ b/system/ksplice/ksplice.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.9.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/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild index 47b516fc0c..aecb10b46a 100644 --- a/system/ktsuss/ktsuss.SlackBuild +++ b/system/ktsuss/ktsuss.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=ktsuss +PRGNAM=ktsuss VERSION=${VERSION:-2} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild index 91d7834bd9..1ef524c76c 100644 --- a/system/kyotocabinet/kyotocabinet.SlackBuild +++ b/system/kyotocabinet/kyotocabinet.SlackBuild @@ -54,7 +54,7 @@ fi DOCS="COPYING ChangeLog *EXCEPTION README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/lbzip2/lbzip2.SlackBuild b/system/lbzip2/lbzip2.SlackBuild index cb518cf3d0..93e89fe881 100644 --- a/system/lbzip2/lbzip2.SlackBuild +++ b/system/lbzip2/lbzip2.SlackBuild @@ -27,12 +27,10 @@ VERSION=0.23 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/system/lilyterm/lilyterm.SlackBuild b/system/lilyterm/lilyterm.SlackBuild index d7ee9f3c8c..eb114227a0 100644 --- a/system/lilyterm/lilyterm.SlackBuild +++ b/system/lilyterm/lilyterm.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.9.9.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 @@ -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/system/lirc/lirc.SlackBuild b/system/lirc/lirc.SlackBuild index 07350db303..fe649f6cb4 100644 --- a/system/lirc/lirc.SlackBuild +++ b/system/lirc/lirc.SlackBuild @@ -30,12 +30,10 @@ TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} PKG_VERS=${VERSION}_$(echo $KERNEL| 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 @@ -99,7 +97,7 @@ make make install DESTDIR=$PKG mkdir -p $PKG/usr/share/$PRGNAM -cp -a remotes $PKG/usr/share/$PRGNAM +cp -a remotes $PKG/usr/share/$PRGNAM mkdir -p $PKG/lib/udev/rules.d cat contrib/lirc.rules > $PKG/lib/udev/rules.d/96-lirc.rules diff --git a/system/logpp/logpp.SlackBuild b/system/logpp/logpp.SlackBuild index 2a1bbf9fbc..b46f34dfce 100644 --- a/system/logpp/logpp.SlackBuild +++ b/system/logpp/logpp.SlackBuild @@ -17,9 +17,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" @@ -35,7 +35,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/lshw/lshw.SlackBuild b/system/lshw/lshw.SlackBuild index eedba1c343..40ae307b0c 100644 --- a/system/lshw/lshw.SlackBuild +++ b/system/lshw/lshw.SlackBuild @@ -52,7 +52,7 @@ sed -i "s%MANDIR=\$(PREFIX)/share/man%MANDIR=\$(PREFIX)/man%" src/Makefile RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make RPM_OPT_FLAGS="$SLKCFLAGS" MANDIR="/usr/man" make gui make install DESTDIR=$PKG -make install-gui DESTDIR=$PKG +make install-gui DESTDIR=$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/system/luckybackup/luckybackup.SlackBuild b/system/luckybackup/luckybackup.SlackBuild index 7ef749b697..22138cb47a 100644 --- a/system/luckybackup/luckybackup.SlackBuild +++ b/system/luckybackup/luckybackup.SlackBuild @@ -26,12 +26,10 @@ VERSION=${VERSION:-0.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index 3e25e024c3..5cf8121dbc 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -76,7 +76,7 @@ sed -i "s/@FULL_LIBEXECDIR@/\/usr\/libexec/" data/lxdm.conf.in # Patch the Xsession file to source /etc/profile and xprofile on session start patch -p1 < $CWD/patches/source_profile_in_Xsession.diff -# Remove the SuSe section from Xsession file, since it causes Slackware +# Remove the SuSe section from Xsession file, since it causes Slackware # to always launch whatever WM/DE that /etc/X11/xinit/xinitrc symlink is # pointing to, regardless of what the user wants... patch -p1 < $CWD/patches/remove_suse_from_Xsession.diff @@ -93,7 +93,7 @@ patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff # both KDM and GDM set DESKTOP_SESSION regardless of whether PAM is used, # this seems the path of least resistance. This patch *should* be easy # to maintain ; let's hope I don't eat those words. --rworkman -patch -p1 < $CWD/patches/lxdm-set_DESKTOP_SESSION_in_env.diff +patch -p1 < $CWD/patches/lxdm-set_DESKTOP_SESSION_in_env.diff sh autogen.sh || true diff --git a/system/lxsplit/lxsplit.SlackBuild b/system/lxsplit/lxsplit.SlackBuild index 48132a5b86..170ecc3f3e 100644 --- a/system/lxsplit/lxsplit.SlackBuild +++ b/system/lxsplit/lxsplit.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-0.2.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 @@ -35,7 +33,7 @@ elif [ "$ARCH" = "x86_64" ]; then else SLKCFLAGS="-O2" LIBDIRSUFFIX="" -fi +fi set -e diff --git a/system/mcrypt/mcrypt.SlackBuild b/system/mcrypt/mcrypt.SlackBuild index 399bbcafd8..9fd45cd63e 100644 --- a/system/mcrypt/mcrypt.SlackBuild +++ b/system/mcrypt/mcrypt.SlackBuild @@ -29,12 +29,10 @@ VERSION=2.6.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/system/memuse/memuse.SlackBuild b/system/memuse/memuse.SlackBuild index 14d741a0c1..a8ee93df56 100644 --- a/system/memuse/memuse.SlackBuild +++ b/system/memuse/memuse.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-0.20} 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/system/microcode_ctl/microcode_ctl.SlackBuild b/system/microcode_ctl/microcode_ctl.SlackBuild index 6dc3217530..54ba03cbd3 100644 --- a/system/microcode_ctl/microcode_ctl.SlackBuild +++ b/system/microcode_ctl/microcode_ctl.SlackBuild @@ -8,12 +8,10 @@ VERSION=1.17 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 @@ -23,7 +21,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/system/midisport-firmware/midisport-firmware.SlackBuild b/system/midisport-firmware/midisport-firmware.SlackBuild index bfbd7044e4..2f9b8e92f1 100644 --- a/system/midisport-firmware/midisport-firmware.SlackBuild +++ b/system/midisport-firmware/midisport-firmware.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/system/mtftar/mtftar.SlackBuild b/system/mtftar/mtftar.SlackBuild index 312a21e3d7..a39b26fa40 100644 --- a/system/mtftar/mtftar.SlackBuild +++ b/system/mtftar/mtftar.SlackBuild @@ -12,12 +12,10 @@ VERSION=${VERSION:-20070205} 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/system/mucommander/mucommander.SlackBuild b/system/mucommander/mucommander.SlackBuild index 283d4825b5..0d22964e4f 100644 --- a/system/mucommander/mucommander.SlackBuild +++ b/system/mucommander/mucommander.SlackBuild @@ -17,7 +17,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/system/nagios-plugins/nagios-plugins.SlackBuild b/system/nagios-plugins/nagios-plugins.SlackBuild index 18a094823a..43d4148942 100644 --- a/system/nagios-plugins/nagios-plugins.SlackBuild +++ b/system/nagios-plugins/nagios-plugins.SlackBuild @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e # Bail out if user or group isn't valid on your system # For slackbuilds.org, assigned nagios uid/gid are 213/213 diff --git a/system/numlockx/numlockx.SlackBuild b/system/numlockx/numlockx.SlackBuild index 2287ffa748..c5f9d2d058 100644 --- a/system/numlockx/numlockx.SlackBuild +++ b/system/numlockx/numlockx.SlackBuild @@ -43,7 +43,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/nut/nut.SlackBuild b/system/nut/nut.SlackBuild index 5e9bc93248..61045b39c6 100644 --- a/system/nut/nut.SlackBuild +++ b/system/nut/nut.SlackBuild @@ -47,7 +47,6 @@ if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index edc471e98c..aeda51be44 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -29,7 +29,7 @@ # 1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692 # 1.2 27-MAY-2011 new version, allow multilib option, minor edits # 1.2.1 20-JUNE-2011 minor edits, thanks to Robby and Roberto -# 1.5 01-JULY-2011 new version, single driver download, add switch to select +# 1.5 01-JULY-2011 new version, single driver download, add switch to select # pure x86_64 or x86_64 with 32-bit compatibility. # 1.6 27-AUG-2011 version bump, minor edits # 1.7 21-OCT-2011 version bump @@ -269,8 +269,8 @@ if [ "${OPTAPPS}" = "yes" ]; then fi # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files -# so we don't stomp on the overlapping xorg files. -# Note: switching "on the fly" is no longer supported. +# so we don't stomp on the overlapping xorg files. +# Note: switching "on the fly" is no longer supported. install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch @@ -289,7 +289,7 @@ sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" \ $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" \ $PKG/usr/share/applications/nvidia-settings.desktop - + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cd $TMP/$SRCNAM diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index 489402db4c..608e69bc04 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -95,7 +95,7 @@ make SYSSRC=$KERNELPATH module || exit 1 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ -# Make sure the X is specified to automagically load the +# Make sure the X is specified to automagically load the # correct driver, since I always forget. You can remove # this file if you have an equivilent entry in /etc/X11/xorg.d diff --git a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild index 1c54c67605..34605cdf18 100644 --- a/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild +++ b/system/nvidia-legacy304-driver/nvidia-legacy304-driver.SlackBuild @@ -31,7 +31,7 @@ # 1.1 10-APR-2011 updated to new version, testing 13.37rc4.6692 # 1.2 27-MAY-2011 new version, allow multilib option, minor edits # 1.2.1 20-JUNE-2011 minor edits, thanks to Robby and Roberto -# 1.5 01-JULY-2011 new version, single driver download, add switch to select +# 1.5 01-JULY-2011 new version, single driver download, add switch to select # pure x86_64 or x86_64 with 32-bit compatibility. # 1.6 27-AUG-2011 version bump, minor edits # 1.7 21-OCT-2011 version bump @@ -198,8 +198,8 @@ cd $TMP/nvidia-xconfig-$VERSION cd - # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files -# so we don't stomp on the overlapping xorg files. -# Note: switching "on the fly" no longer supported. +# so we don't stomp on the overlapping xorg files. +# Note: switching "on the fly" no longer supported. install -m 0755 $CWD/nvidia-switch $PKG/usr/sbin/ sed -i s/PKGVERSION/$VERSION/g $PKG/usr/sbin/nvidia-switch sed -i s/LIBDIRSUFFIX/$LIBDIRSUFFIX/g $PKG/usr/sbin/nvidia-switch diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild index a0d63bc428..d0d86af1fa 100644 --- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild +++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild @@ -97,8 +97,8 @@ make SYSSRC=$KERNELPATH module || exit 1 mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ -# Make sure the X is specified to automagically load the -# correct driver, since I always forget. +# Make sure the X is specified to automagically load the +# correct driver, since I always forget. mkdir -p $PKG/usr/share/X11/xorg.conf.d/ cat $CWD/10-nvidia.conf > $PKG/usr/share/X11/xorg.conf.d/10-nvidia.conf diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild index bf80710c74..2fcb26a5e8 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild @@ -77,7 +77,7 @@ chmod -R u+w,go+r-w,a-s . cd usr/src/nv/ || exit 1 -# backported patches courtesy of https://aur.archlinux.org/packages/nvidia-96xx/ +# backported patches courtesy of https://aur.archlinux.org/packages/nvidia-96xx/ patch -p1 -i $CWD/patches/173.14.36-37.patch || exit 1 patch -p1 -i $CWD/patches/173.14.37-38.patch || exit 1 diff --git a/system/pacemaker/pacemaker.SlackBuild b/system/pacemaker/pacemaker.SlackBuild index 2dae52ccf9..2bb6fc6821 100644 --- a/system/pacemaker/pacemaker.SlackBuild +++ b/system/pacemaker/pacemaker.SlackBuild @@ -14,12 +14,10 @@ VERSION=${VERSION:-b9b672590e79} 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/system/pax/pax.SlackBuild b/system/pax/pax.SlackBuild index 8a6285ffe9..fafe9b1edb 100644 --- a/system/pax/pax.SlackBuild +++ b/system/pax/pax.SlackBuild @@ -5,7 +5,7 @@ # Distributed under the terms of the GNU General Public License, Version 2 # ----------------------------------------------------------------------------- # -# Slackware SlackBuild script +# Slackware SlackBuild script # =========================== # By: Eric Hameleers # For: pax @@ -20,7 +20,7 @@ # * modified to more resemble SlackBuilds.org conventions # 3.4-1: 20/Dec/2005 by Eric Hameleers # * Initial build. -# +# # ----------------------------------------------------------------------------- PRGNAM=pax @@ -28,12 +28,10 @@ VERSION=${VERSION:-3.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/system/pev/pev.SlackBuild b/system/pev/pev.SlackBuild index b0ba71e9fa..01f57c4ee4 100644 --- a/system/pev/pev.SlackBuild +++ b/system/pev/pev.SlackBuild @@ -59,7 +59,7 @@ strip --strip-unneeded $PKG/usr/bin/pev mkdir -p $PKG/usr/man/man1 gzip -9c pev.1 > $PKG/usr/man/man1/pev.1.gz -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a README CHANGELOG VERSION AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/picocom/picocom.SlackBuild b/system/picocom/picocom.SlackBuild index 71e3d900cb..3a07de8f6c 100644 --- a/system/picocom/picocom.SlackBuild +++ b/system/picocom/picocom.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -39,7 +37,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/pigz/pigz.SlackBuild b/system/pigz/pigz.SlackBuild index fe5defe403..f7e352af5c 100644 --- a/system/pigz/pigz.SlackBuild +++ b/system/pigz/pigz.SlackBuild @@ -40,7 +40,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/pipemeter/pipemeter.SlackBuild b/system/pipemeter/pipemeter.SlackBuild index d9e339fe12..f9634c2060 100644 --- a/system/pipemeter/pipemeter.SlackBuild +++ b/system/pipemeter/pipemeter.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-1.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/plan9port/plan9port.SlackBuild b/system/plan9port/plan9port.SlackBuild index c9ee6389f5..3ec47a9f54 100644 --- a/system/plan9port/plan9port.SlackBuild +++ b/system/plan9port/plan9port.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for plan9port +# Slackware build script for plan9port # Copyright (c) 2012,2013 Ruben Schuller # diff --git a/system/postgresql/postgresql.SlackBuild b/system/postgresql/postgresql.SlackBuild index bd32ff4e2b..8345f37b84 100644 --- a/system/postgresql/postgresql.SlackBuild +++ b/system/postgresql/postgresql.SlackBuild @@ -103,7 +103,7 @@ make install-docs DESTDIR=$PKG # create symlinks to shared library for other programs to link against ( cd $PKG/usr/lib${LIBDIRSUFFIX} - for i in $(ls $PRGNAM/$PG_VERSION/lib/libpq.so*) ; do ln -sf $i ; done + for i in $(ls $PRGNAM/$PG_VERSION/lib/libpq.so*) ; do ln -sf $i ; done ) # Some interesting additional modules: @@ -114,7 +114,7 @@ make install-docs DESTDIR=$PKG # hstore, ltree, xml2 - useful extensions for developers # pg_archivecleanup, pg_standby - high availability helpers # pg_upgrade, pg_upgrade_support - online upgrade between postgresql versions -# postgres_fdw - foreign-data wrapper for access to external PostgreSQL servers +# postgres_fdw - foreign-data wrapper for access to external PostgreSQL servers # file_fdw - foreign-data wrapper for access to data files on filesystem PG_EXTENSIONS=${PG_EXTENSIONS:-"adminpack pgcrypto hstore ltree xml2 pg_archivecleanup pg_standby pg_upgrade pg_upgrade_support postgres_fdw file_fdw"} @@ -154,7 +154,7 @@ mkdir -p $PKG/etc/rc.d sed -e "s%@PG_VERSION@%$PG_VERSION%" \ -e "s%@PG_PORT@%$PG_PORT%" \ -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%" \ - $CWD/rc.$PRGNAM.new > $PKG/etc/rc.d/rc.$PRGNAM.new + $CWD/rc.$PRGNAM.new > $PKG/etc/rc.d/rc.$PRGNAM.new chmod 0755 $PKG/etc/rc.d/rc.$PRGNAM.new # Install logrotate script @@ -173,7 +173,7 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc sed -e "s%@PG_VERSION@%$PG_VERSION%" \ -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%" \ - $CWD/doinst.sh > $PKG/install/doinst.sh + $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/system/powernowd/powernowd.SlackBuild b/system/powernowd/powernowd.SlackBuild index c49aee2be8..8d3ca87a78 100644 --- a/system/powernowd/powernowd.SlackBuild +++ b/system/powernowd/powernowd.SlackBuild @@ -9,12 +9,10 @@ VERSION=${VERSION:-1.00} 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/system/prelink/prelink.SlackBuild b/system/prelink/prelink.SlackBuild index 3a2b0f2369..aed5ccd7bd 100644 --- a/system/prelink/prelink.SlackBuild +++ b/system/prelink/prelink.SlackBuild @@ -49,7 +49,7 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else +else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -82,7 +82,7 @@ CXXFLAGS="$SLKFLAGS" \ --build=$ARCH-slackware-linux make -make -C doc +make -C doc make install-strip DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/system/preload/preload.SlackBuild b/system/preload/preload.SlackBuild index f6e5016f6a..7913add62f 100644 --- a/system/preload/preload.SlackBuild +++ b/system/preload/preload.SlackBuild @@ -108,7 +108,7 @@ rm -rf $PKG/etc/sysconfig $PKG/etc/rc.d/init.d cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION/$DOC + $PKG/usr/doc/$PRGNAM-$VERSION/$DOC cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/pv/pv.SlackBuild b/system/pv/pv.SlackBuild index e9b393df78..0d69e502e5 100644 --- a/system/pv/pv.SlackBuild +++ b/system/pv/pv.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.1.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 @@ -52,7 +50,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/system/pwgen/pwgen.SlackBuild b/system/pwgen/pwgen.SlackBuild index db144550c9..a2e600dd9a 100644 --- a/system/pwgen/pwgen.SlackBuild +++ b/system/pwgen/pwgen.SlackBuild @@ -4,16 +4,16 @@ # Copyright (c) 2007, Timothy Pollard # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -34,12 +34,10 @@ VERSION=2.06 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/system/pwsafe/pwsafe.SlackBuild b/system/pwsafe/pwsafe.SlackBuild index f52cbffd57..6f6511e9ea 100644 --- a/system/pwsafe/pwsafe.SlackBuild +++ b/system/pwsafe/pwsafe.SlackBuild @@ -9,12 +9,10 @@ VERSION=0.2.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/qingy/qingy.SlackBuild b/system/qingy/qingy.SlackBuild index cd0dc662ee..e86076464a 100644 --- a/system/qingy/qingy.SlackBuild +++ b/system/qingy/qingy.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild b/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild index 66d18523d1..0fae8c12af 100644 --- a/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild +++ b/system/qingy_0.3_themepack/qingy_0.3_themepack.SlackBuild @@ -40,7 +40,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/system/qps/qps.SlackBuild b/system/qps/qps.SlackBuild index caf5062ca4..9eef741540 100644 --- a/system/qps/qps.SlackBuild +++ b/system/qps/qps.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="CHANGES COPYING README_INSTALL" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/qterminal/qterminal.SlackBuild b/system/qterminal/qterminal.SlackBuild index cab898f8fa..2c45078efa 100644 --- a/system/qterminal/qterminal.SlackBuild +++ b/system/qterminal/qterminal.SlackBuild @@ -37,7 +37,7 @@ fi DOCS="AUTHORS COPYING NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild index 4101886d0c..04e401577f 100644 --- a/system/qtfm/qtfm.SlackBuild +++ b/system/qtfm/qtfm.SlackBuild @@ -23,9 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qtfm -VERSION=${VERSION:-5.5} +VERSION=${VERSION:-5.5} 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" @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/qtgzmanager/qtgzmanager.SlackBuild b/system/qtgzmanager/qtgzmanager.SlackBuild index e984c9af9f..719aa626ad 100644 --- a/system/qtgzmanager/qtgzmanager.SlackBuild +++ b/system/qtgzmanager/qtgzmanager.SlackBuild @@ -4,10 +4,10 @@ # Written by Alexandre Albuquerque Arnt # Based on http://slackbuilds.org/template.SlackBuild -PRGNAM=qtgzmanager +PRGNAM=qtgzmanager VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -18,9 +18,9 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/qxkb/qxkb.SlackBuild b/system/qxkb/qxkb.SlackBuild index 53cf5838df..97fd1b79a0 100644 --- a/system/qxkb/qxkb.SlackBuild +++ b/system/qxkb/qxkb.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="COPYING README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/rdiff-backup/rdiff-backup.SlackBuild b/system/rdiff-backup/rdiff-backup.SlackBuild index 2151f73c17..ccdebd964a 100644 --- a/system/rdiff-backup/rdiff-backup.SlackBuild +++ b/system/rdiff-backup/rdiff-backup.SlackBuild @@ -28,12 +28,10 @@ VERSION=1.2.8 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -45,7 +43,7 @@ OUTPUT=${OUTPUT:-/tmp} rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 cd $PRGNAM-$VERSION || exit 1 diff --git a/system/recorder/recorder.SlackBuild b/system/recorder/recorder.SlackBuild index 17b2a686ec..77304048da 100644 --- a/system/recorder/recorder.SlackBuild +++ b/system/recorder/recorder.SlackBuild @@ -27,12 +27,10 @@ VERSION=1.4.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/system/regionset/regionset.SlackBuild b/system/regionset/regionset.SlackBuild index 3eca92a38d..14885d6d7f 100644 --- a/system/regionset/regionset.SlackBuild +++ b/system/regionset/regionset.SlackBuild @@ -20,19 +20,17 @@ # 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. +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=regionset VERSION=${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 @@ -53,7 +51,7 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/rkhunter/rkhunter.SlackBuild b/system/rkhunter/rkhunter.SlackBuild index cf1de2d0d1..c9bc274ce8 100644 --- a/system/rkhunter/rkhunter.SlackBuild +++ b/system/rkhunter/rkhunter.SlackBuild @@ -37,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/system/runit/runit.SlackBuild b/system/runit/runit.SlackBuild index d6838e5c9e..f9b83ed6fd 100644 --- a/system/runit/runit.SlackBuild +++ b/system/runit/runit.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-2.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/system/safecopy/safecopy.SlackBuild b/system/safecopy/safecopy.SlackBuild index ee152ebd6f..da12405f95 100644 --- a/system/safecopy/safecopy.SlackBuild +++ b/system/safecopy/safecopy.SlackBuild @@ -30,12 +30,10 @@ VERSION=${VERSION:-1.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 @@ -59,7 +57,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -fr $TMP/$PRGNAM-$VERSION $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/sakura/sakura.SlackBuild b/system/sakura/sakura.SlackBuild index c0c188d3e3..e877054d70 100644 --- a/system/sakura/sakura.SlackBuild +++ b/system/sakura/sakura.SlackBuild @@ -38,7 +38,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 @@ -55,7 +55,7 @@ cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DNDEBUG" \ -DCMAKE_BUILD_TYPE=Release make -make install DESTDIR=$PKG +make install DESTDIR=$PKG strip --strip-unneeded $PKG/usr/bin/sakura mv $PKG/usr/share/{man,doc} $PKG/usr diff --git a/system/scalpel/scalpel.SlackBuild b/system/scalpel/scalpel.SlackBuild index 4ec0dc7a23..72b7333768 100644 --- a/system/scalpel/scalpel.SlackBuild +++ b/system/scalpel/scalpel.SlackBuild @@ -80,4 +80,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} \ No newline at end of file +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/schedtool/schedtool.SlackBuild b/system/schedtool/schedtool.SlackBuild index da240e5b06..96e1eff540 100644 --- a/system/schedtool/schedtool.SlackBuild +++ b/system/schedtool/schedtool.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-1.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild index ef355ee627..52e4cc6e9a 100644 --- a/system/seahorse/seahorse.SlackBuild +++ b/system/seahorse/seahorse.SlackBuild @@ -10,12 +10,10 @@ VERSION=${VERSION:-3.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/ser2net/ser2net.SlackBuild b/system/ser2net/ser2net.SlackBuild index c847322191..1d09aa0563 100644 --- a/system/ser2net/ser2net.SlackBuild +++ b/system/ser2net/ser2net.SlackBuild @@ -9,12 +9,10 @@ VERSION=2.7 BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/set_rlimits/set_rlimits.SlackBuild b/system/set_rlimits/set_rlimits.SlackBuild index 8eed873681..a63d64cd9a 100644 --- a/system/set_rlimits/set_rlimits.SlackBuild +++ b/system/set_rlimits/set_rlimits.SlackBuild @@ -10,17 +10,15 @@ VERSION=1.3.0 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PKGNAME OUTPUT=${OUTPUT:-/tmp} @@ -43,7 +41,7 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PKGNAME-$VERSION tar xvf $CWD/$PKGNAME-$VERSION.tgz cd $PKGNAME-$VERSION @@ -57,7 +55,7 @@ make clean # oops :-) make EXTRA_CFLAGS="$SLKCFLAGS" PREFIX=/usr make install PREFIX=/usr DESTDIR=$PKG -mv $PKG/etc/set_rlimits.conf $PKG/etc/set_rlimits.conf.new +mv $PKG/etc/set_rlimits.conf $PKG/etc/set_rlimits.conf.new 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/system/slackyd/slackyd.SlackBuild b/system/slackyd/slackyd.SlackBuild index 92761bad77..914d84f973 100644 --- a/system/slackyd/slackyd.SlackBuild +++ b/system/slackyd/slackyd.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS BUGS CHANGELOG INSTALL THANKS" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/slim/slim.SlackBuild b/system/slim/slim.SlackBuild index c637d8e963..f1d8ffc000 100644 --- a/system/slim/slim.SlackBuild +++ b/system/slim/slim.SlackBuild @@ -86,7 +86,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/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild index 02263cf4d2..3fff4e4147 100644 --- a/system/splix/splix.SlackBuild +++ b/system/splix/splix.SlackBuild @@ -9,12 +9,10 @@ VERSION=2.0.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/system/sqlite2/sqlite2.SlackBuild b/system/sqlite2/sqlite2.SlackBuild index 7b53f21ca0..5634d53523 100644 --- a/system/sqlite2/sqlite2.SlackBuild +++ b/system/sqlite2/sqlite2.SlackBuild @@ -16,12 +16,10 @@ SRCNAM=sqlite SRCVERSION=$(printf "$VERSION" | cut -d _ -f 1) PATCHLEVEL=$(printf "$VERSION" | cut -d _ -f 2) -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in 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/system/srm/srm.SlackBuild b/system/srm/srm.SlackBuild index a393010966..4105cd0e79 100644 --- a/system/srm/srm.SlackBuild +++ b/system/srm/srm.SlackBuild @@ -28,12 +28,10 @@ VERSION=${VERSION:-1.2.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/system/statifier/statifier.SlackBuild b/system/statifier/statifier.SlackBuild index 36225ed780..a9f24db966 100644 --- a/system/statifier/statifier.SlackBuild +++ b/system/statifier/statifier.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-1.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/stress/stress.SlackBuild b/system/stress/stress.SlackBuild index 627f70bd18..b01c24cbc2 100644 --- a/system/stress/stress.SlackBuild +++ b/system/stress/stress.SlackBuild @@ -83,7 +83,7 @@ make || exit 1 make install DESTDIR=$PKG || exit 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 + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/system/sudosh2/sudosh2.SlackBuild b/system/sudosh2/sudosh2.SlackBuild index e37cf4f41f..afc5eb0ecd 100644 --- a/system/sudosh2/sudosh2.SlackBuild +++ b/system/sudosh2/sudosh2.SlackBuild @@ -88,7 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \ $do_record make -# make install will install sudosh.conf in the build system, use +# make install will install sudosh.conf in the build system, use # make install-am to avoid this and manualy install the conf file. make install-am DESTDIR=$PKG install -m 0644 -D $TMP/$PRGNAM-$VERSION/src/sudosh.conf $PKG/etc/sudosh.conf.new diff --git a/system/swatch/swatch.SlackBuild b/system/swatch/swatch.SlackBuild index 88a2b41a66..3b52c2f46e 100644 --- a/system/swatch/swatch.SlackBuild +++ b/system/swatch/swatch.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/swun/swun.SlackBuild b/system/swun/swun.SlackBuild index 87a82e8189..b0736ed1b6 100644 --- a/system/swun/swun.SlackBuild +++ b/system/swun/swun.SlackBuild @@ -55,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -77,7 +77,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/system/tarsnap/tarsnap.SlackBuild b/system/tarsnap/tarsnap.SlackBuild index 912c58875d..6c30132cd1 100644 --- a/system/tarsnap/tarsnap.SlackBuild +++ b/system/tarsnap/tarsnap.SlackBuild @@ -2,9 +2,9 @@ # Slackware build script for tarsnap -# Written by Justin H Haynes -# as a series of careful modifications to the excellent -# http://slackbuilds.org/template.SlackBuild +# Written by Justin H Haynes +# as a series of careful modifications to the excellent +# http://slackbuilds.org/template.SlackBuild # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -24,12 +24,10 @@ VERSION=${VERSION:-1.0.26} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -39,11 +37,11 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Normally we'd have this if block here for setting ARCH and +# Normally we'd have this if block here for setting ARCH and # feeding same to the configure script, but the tarsnap configure script -# figures out the architecture itself. +# figures out the architecture itself. -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/tokyocabinet/tokyocabinet.SlackBuild b/system/tokyocabinet/tokyocabinet.SlackBuild index f2524ff7fb..4448db0b45 100644 --- a/system/tokyocabinet/tokyocabinet.SlackBuild +++ b/system/tokyocabinet/tokyocabinet.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-1.4.43} 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/system/tokyotyrant/tokyotyrant.SlackBuild b/system/tokyotyrant/tokyotyrant.SlackBuild index 5371a02bb4..cba2290d2d 100644 --- a/system/tokyotyrant/tokyotyrant.SlackBuild +++ b/system/tokyotyrant/tokyotyrant.SlackBuild @@ -8,12 +8,10 @@ VERSION=${VERSION:-1.1.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 diff --git a/system/twin/twin.SlackBuild b/system/twin/twin.SlackBuild index d054fcb1a1..46d4707fe1 100644 --- a/system/twin/twin.SlackBuild +++ b/system/twin/twin.SlackBuild @@ -29,12 +29,10 @@ VERSION=${VERSION:-0.6.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 @@ -59,10 +57,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.gz -cd $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . @@ -86,7 +84,7 @@ mv $PKG/usr/share/man $PKG/usr/ ( cd $PKG/usr/man || exit 1 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 ( cd $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/udevil/udevil.SlackBuild b/system/udevil/udevil.SlackBuild index ebf96e87ee..6ab0f6040b 100644 --- a/system/udevil/udevil.SlackBuild +++ b/system/udevil/udevil.SlackBuild @@ -55,7 +55,7 @@ fi DOCS="AUTHORS COPYING ChangeLog NEWS README" -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT diff --git a/system/ufiformat/ufiformat.SlackBuild b/system/ufiformat/ufiformat.SlackBuild index d542279d6b..b420246509 100644 --- a/system/ufiformat/ufiformat.SlackBuild +++ b/system/ufiformat/ufiformat.SlackBuild @@ -8,12 +8,10 @@ VERSION=0.9.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/system/uif2iso/uif2iso.SlackBuild b/system/uif2iso/uif2iso.SlackBuild index 0c4b3132cd..f1ba67b655 100644 --- a/system/uif2iso/uif2iso.SlackBuild +++ b/system/uif2iso/uif2iso.SlackBuild @@ -31,12 +31,10 @@ VERSION=${VERSION:-0.1.7c} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -46,7 +44,7 @@ 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/system/unetbootin/unetbootin.SlackBuild b/system/unetbootin/unetbootin.SlackBuild index 1fad4b939d..17139f2092 100644 --- a/system/unetbootin/unetbootin.SlackBuild +++ b/system/unetbootin/unetbootin.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for unetbootin # Written by Jens Weber # v565: (jw) initial version 01/06/2012 -# v575: (jw) updated version +# v575: (jw) updated version # v581: (jw) update to version 581 11 Dec 2012 # v583: (jw) version bump to v583 22 Feb 2013 diff --git a/system/unison/unison.SlackBuild b/system/unison/unison.SlackBuild index b4cdac7a89..758232da6e 100644 --- a/system/unison/unison.SlackBuild +++ b/system/unison/unison.SlackBuild @@ -54,7 +54,7 @@ chmod -R u+w,go+r-w,a-s . # no need to set CFLAGS # FLAVOR lets the user enable their choice of interfaces. Defaults to gtk2 -# If you want to enable specifically for gtk2 or text simply pass this +# If you want to enable specifically for gtk2 or text simply pass this # variable to the script: $ FLAVOR=text ./unison.SlackBuild FLAVOR=${FLAVOR:-gtk2} @@ -64,7 +64,7 @@ if [ "$FLAVOR" = "gtk2" -o "$FLAVOR" = "GTK2" -o "$FLAVOR" = "GTK" -o "$FLAVOR" elif [ "$FLAVOR" = "text" -o "$FLAVOR" = "TEXT" -o "$FLAVOR" = "TXT" -o "$FLAVOR" = "txt" ]; then FLAVOR=text fi - + make UISTYLE=$FLAVOR DEBUGGING=false THREADS=true NATIVE=true mkdir -p $PKG/usr/bin install -m 0755 $PRGNAM $PKG/usr/bin diff --git a/system/unp/unp.SlackBuild b/system/unp/unp.SlackBuild index 5dbea10e90..cf4f7ba9af 100644 --- a/system/unp/unp.SlackBuild +++ b/system/unp/unp.SlackBuild @@ -12,7 +12,7 @@ TAG=${TAG:-_SBo} ARCH=noarch CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/system/unrtf/unrtf.SlackBuild b/system/unrtf/unrtf.SlackBuild index 08efddbf49..36f4cca0b7 100644 --- a/system/unrtf/unrtf.SlackBuild +++ b/system/unrtf/unrtf.SlackBuild @@ -55,7 +55,7 @@ else LIBDIRSUFFIX="" fi -set -e # Exit on most errors +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -70,7 +70,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# some source files have hard coded links to /usr/local - without this the +# some source files have hard coded links to /usr/local - without this the # compiled unrtf binary complains about missing /usr/local/lib/unrtf/html.conf sed -i "s,/usr/local/lib,/usr/lib$LIBDIRSUFFIX," src/* diff --git a/system/usbmon/usbmon.SlackBuild b/system/usbmon/usbmon.SlackBuild index 754fc9b6a8..a355aa604b 100644 --- a/system/usbmon/usbmon.SlackBuild +++ b/system/usbmon/usbmon.SlackBuild @@ -11,12 +11,10 @@ VERSION=${VERSION:-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/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index b2f41c5274..268197928f 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-2.3.22} 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/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild index 06af0d9f80..d91a362dfc 100644 --- a/system/virt-manager/virt-manager.SlackBuild +++ b/system/virt-manager/virt-manager.SlackBuild @@ -6,10 +6,10 @@ # Modified by Zoran Stojakovic # Lots of mods by rworkman for 0.10.x -PRGNAM=virt-manager +PRGNAM=virt-manager VERSION=${VERSION:-0.10.0} BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/system/wacomtablet/wacomtablet.SlackBuild b/system/wacomtablet/wacomtablet.SlackBuild index a7443afa1b..c9668c1ffd 100644 --- a/system/wacomtablet/wacomtablet.SlackBuild +++ b/system/wacomtablet/wacomtablet.SlackBuild @@ -29,7 +29,6 @@ TAG=${TAG:-_SBo} SRCVERSION=$(printf $VERSION | tr _ -) -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; diff --git a/system/wdfs/wdfs.SlackBuild b/system/wdfs/wdfs.SlackBuild index 053af5d275..e17a0724be 100644 --- a/system/wdfs/wdfs.SlackBuild +++ b/system/wdfs/wdfs.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/system/webmin/webmin.SlackBuild b/system/webmin/webmin.SlackBuild index 076112ee03..83c894e5a9 100644 --- a/system/webmin/webmin.SlackBuild +++ b/system/webmin/webmin.SlackBuild @@ -60,7 +60,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -rm -f mount/{freebsd,openbsd,macos}-mounts* +rm -f mount/{freebsd,openbsd,macos}-mounts* ( find . -name '*.cgi' ; find . -name '*.pl' ) | perl perlpath.pl /usr/bin/perl - @@ -90,10 +90,10 @@ noperlpath=1 nopostinstall=1 export config_dir var_dir perl autoos port login crypt host ssl atboot \ - nostart nochown autothird nouninstall noperlpath nopostinstall + nostart nochown autothird nouninstall noperlpath nopostinstall cd $PKG/usr/libexec/webmin - ./setup.sh 2>&1 + ./setup.sh 2>&1 cd - # Fixup the package files to use their real locations @@ -109,7 +109,7 @@ cp -a LICENCE* README ${CWD}/webmin.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* -mkdir -p $PKG/install +mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh @@ -127,7 +127,7 @@ get_config_files() { } # Finish the doinst.sh by adding the .new file handler. -if [ -e $PKG/etc ]; then +if [ -e $PKG/etc ]; then get_config_files $PKG/etc fi diff --git a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild b/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild index 4cbb8a6258..b9136c64e1 100644 --- a/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild +++ b/system/wiimms-wbfs-tool/wiimms-wbfs-tool.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.25a} 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/system/winetricks/winetricks.SlackBuild b/system/winetricks/winetricks.SlackBuild index 6a3ef11b6d..6473196515 100644 --- a/system/winetricks/winetricks.SlackBuild +++ b/system/winetricks/winetricks.SlackBuild @@ -34,7 +34,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 $PKG $OUTPUT diff --git a/system/xar/xar.SlackBuild b/system/xar/xar.SlackBuild index 6bb35db676..8c28708d24 100644 --- a/system/xar/xar.SlackBuild +++ b/system/xar/xar.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.5.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/xarchiver/xarchiver.SlackBuild b/system/xarchiver/xarchiver.SlackBuild index a4d655a464..bc31069cdf 100644 --- a/system/xarchiver/xarchiver.SlackBuild +++ b/system/xarchiver/xarchiver.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.5.2} 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/system/xcdroast/xcdroast.SlackBuild b/system/xcdroast/xcdroast.SlackBuild index ef95924b09..679787c602 100644 --- a/system/xcdroast/xcdroast.SlackBuild +++ b/system/xcdroast/xcdroast.SlackBuild @@ -5,17 +5,15 @@ # Written by Georgios Efstathiou gefst@yahoo.com # Heavily based on original slackware script. -PRGNAM=xcdroast +PRGNAM=xcdroast VERSION=0.98alpha16 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 +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -71,7 +69,7 @@ make XCDRLIB_PREFIX=/usr/lib${LIBDIRSUFFIX}/$PRGNAM install DESTDIR=$PKG mkdir -p $PKG/usr/share/{applications,pixmaps} cat $CWD/xcdroast.desktop > $PKG/usr/share/applications/xcdroast.desktop ( cd $PKG/usr/share/pixmaps - ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png + ln -s ../../lib${LIBDIRSUFFIX}/xcdroast/icons/xcdricon.png xcdroast.png ) find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild index 14f0943b9e..a803f8f295 100644 --- a/system/xchm/xchm.SlackBuild +++ b/system/xchm/xchm.SlackBuild @@ -58,8 +58,8 @@ CXXFLAGS=$SLKCFLAGS \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make +make install DESTDIR=$PKG strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2> /dev/null mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/xfburn/xfburn.SlackBuild b/system/xfburn/xfburn.SlackBuild index 6c7fced657..baa72cdbeb 100644 --- a/system/xfburn/xfburn.SlackBuild +++ b/system/xfburn/xfburn.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-0.4.3} BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi diff --git a/system/xfe/xfe.SlackBuild b/system/xfe/xfe.SlackBuild index 926352a806..2f1cdf32ed 100644 --- a/system/xfe/xfe.SlackBuild +++ b/system/xfe/xfe.SlackBuild @@ -27,12 +27,10 @@ VERSION=${VERSION:-1.35} 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/system/xosd/xosd.SlackBuild b/system/xosd/xosd.SlackBuild index decd7ad63d..dcb3e8da2c 100644 --- a/system/xosd/xosd.SlackBuild +++ b/system/xosd/xosd.SlackBuild @@ -10,17 +10,15 @@ VERSION=${VERSION:-r634} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/system/yeahconsole/yeahconsole.SlackBuild b/system/yeahconsole/yeahconsole.SlackBuild index eda4434a3f..6c1eecf0c8 100644 --- a/system/yeahconsole/yeahconsole.SlackBuild +++ b/system/yeahconsole/yeahconsole.SlackBuild @@ -3,23 +3,23 @@ # Slackware build script for yeahconsole # Copyright 2009 Pablo Santamaria (pablosantamaria at gmail.com) -# All rights reserved. -# +# All rights reserved. +# # Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# 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=yeahconsole @@ -27,20 +27,18 @@ VERSION=${VERSION:-0.3.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi 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,7 +54,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -- cgit v1.2.3