summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2008-09-24 08:51:45 +0000
committer Eric Hameleers <alien@slackware.com>2008-09-24 08:51:45 +0000
commita090c521ffd5de2f94fd8d289f70c5a190158fdf (patch)
tree9d1066ce06cf2e79c6beccff657a63358c8a583b
parent65e036b90316b90f49f9de0fcba6963af7c15d8e (diff)
downloadasb-a090c521ffd5de2f94fd8d289f70c5a190158fdf.tar.gz
asb-a090c521ffd5de2f94fd8d289f70c5a190158fdf.tar.xz
Update to 20080828
-rwxr-xr-xfontforge/build/fontforge.SlackBuild26
1 files changed, 13 insertions, 13 deletions
diff --git a/fontforge/build/fontforge.SlackBuild b/fontforge/build/fontforge.SlackBuild
index 34182875..0ba02fbb 100755
--- a/fontforge/build/fontforge.SlackBuild
+++ b/fontforge/build/fontforge.SlackBuild
@@ -40,6 +40,8 @@
# * Update.
# 20080429-1: 06/may/2008 by Eric Hameleers <alien@slackware.com>
# * Update, also build for Slackware 12.1.
+# 20080828-1: 24/sep/2008 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh fontforge.SlackBuild --cleanup' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -50,7 +52,7 @@
# Set initial variables:
PRGNAM=fontforge
-VERSION=${VERSION:-20080429}
+VERSION=${VERSION:-20080828}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -93,16 +95,13 @@ set -u
P1=${1:-1}
# Slackware 11 and up need other option (gcc > 3.3.x)
-if [ `gcc -dumpversion | tr -d '.' |cut -c 1-2` -gt 33 ]; then
+if [ $(gcc -dumpversion | tr -d '.' |cut -c 1-2) -gt 33 ]; then
MOPT=tune
else
MOPT=cpu
fi
case "$ARCH" in
- i386) SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
- SLKLDFLAGS=""; LIBDIRSUFFIX=""
- ;;
i486) SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
SLKLDFLAGS=""; LIBDIRSUFFIX=""
;;
@@ -132,17 +131,17 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
if ! [ -f ${SOURCE[$i]} ]; then
if ! [ "x${SRCURL[$i]}" == "x" ]; then
# Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
- [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/`basename ${SOURCE[$i]}`"
- echo "Source '`basename ${SOURCE[$i]}`' not available yet..."
- echo "Will download file to `dirname $SOURCE[$i]`"
+ [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+ echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
+ echo "Will download file to $(dirname $SOURCE[$i])"
wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
- echo "Downloading '`basename ${SOURCE[$i]}`' failed.. aborting the build."
+ echo "Downloading '$(basename ${SOURCE[$i]})' failed.. aborting the build."
mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
exit 1
fi
else
- echo "File '`basename ${SOURCE[$i]}`' not available.. aborting the build."
+ echo "File '$(basename ${SOURCE[$i]})' not available.. aborting the build."
exit 1
fi
fi
@@ -169,9 +168,9 @@ fi
cd $TMP/tmp-$PRGNAM
echo "Extracting the source archive(s) for $PRGNAM..."
for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
- if `file ${SOURCE[$i]} | grep -q ": bzip2"`; then
+ if $(file ${SOURCE[$i]} | grep -q ": bzip2"); then
tar -xjvf ${SOURCE[$i]}
- elif `file ${SOURCE[$i]} | grep -q ": gzip"`; then
+ elif $(file ${SOURCE[$i]} | grep -q ": gzip"); then
tar -xzvf ${SOURCE[$i]}
fi
done
@@ -232,12 +231,13 @@ fi
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
find $PKG/usr/doc -type f -exec chmod 644 {} \;
# Compress the man page(s):
if [ -d $PKG/usr/man ]; then
find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
- for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
fi
# Strip binaries: