summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorMarcel Saegebarth <marc@mos6581.de>2015-01-30 15:02:51 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2015-01-31 06:55:52 +0700
commitbd3184d48f4cd8db26f6f2ece6b8924db73c1274 (patch)
tree814daa8627f2e81f2da968e477cc84e0a6cf5f16 /system
parent00b62ab083e9b876d9ba8660aa0ad1840f48d1aa (diff)
downloadslackbuilds-bd3184d48f4cd8db26f6f2ece6b8924db73c1274.tar.gz
system/cbmfs: Fixed VERSION, eMail. + copyright year + cleanup
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/cbmfs/cbmfs.SlackBuild32
-rw-r--r--system/cbmfs/cbmfs.info2
2 files changed, 21 insertions, 13 deletions
diff --git a/system/cbmfs/cbmfs.SlackBuild b/system/cbmfs/cbmfs.SlackBuild
index 00de4789c1..ce02add1e1 100644
--- a/system/cbmfs/cbmfs.SlackBuild
+++ b/system/cbmfs/cbmfs.SlackBuild
@@ -1,7 +1,8 @@
#!/bin/sh
-# SlackBuild script for "cbmfs".
-# Copyright 2010 Marcel Saegebarth <tsa@gmx.li>
+# Slackware build script for "cbmfs".
+
+# Copyright 2010-2015 Marcel Saegebarth <marc@mos6581.de>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cbmfs
-VERSION=1.0
+VERSION=${VERSION:-1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -42,11 +43,17 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -59,10 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
sed -i 's/^CXXLAGS=/CXXFLAGS+=/' Makefile
CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
@@ -71,11 +78,12 @@ mkdir -p $PKG/usr/bin
install -s -D -m 0755 $TMP/$PRGNAM-$VERSION/cbmfsmount $PKG/usr/bin
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README TODO \
+cp -a \
+ README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mkdir $PKG/install
+mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
diff --git a/system/cbmfs/cbmfs.info b/system/cbmfs/cbmfs.info
index d1b33ef2c6..55fbf2266b 100644
--- a/system/cbmfs/cbmfs.info
+++ b/system/cbmfs/cbmfs.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="Marcel Saegebarth"
-EMAIL="tsa@gmx.li"
+EMAIL="marc@mos6581.de"