summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2009-09-15 09:44:31 +0000
committer Eric Hameleers <alien@slackware.com>2009-09-15 09:44:31 +0000
commit32982f12be4f292e285913b022b24e9350cb97ac (patch)
tree46d553b2be863e679de67b7c14b5ed3b6849456b
parent3920c419ae4703fce4b19ac5295b6940d3a28f9e (diff)
downloadasb-32982f12be4f292e285913b022b24e9350cb97ac.tar.gz
asb-32982f12be4f292e285913b022b24e9350cb97ac.tar.xz
Updated to 20090914
-rwxr-xr-xfontforge/build/fontforge.SlackBuild44
1 files changed, 20 insertions, 24 deletions
diff --git a/fontforge/build/fontforge.SlackBuild b/fontforge/build/fontforge.SlackBuild
index f863ccfe..73dd51d3 100755
--- a/fontforge/build/fontforge.SlackBuild
+++ b/fontforge/build/fontforge.SlackBuild
@@ -50,6 +50,8 @@
# * Update.
# 20090408-1: 28/may/2009 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 20090914-1: 15/sep/2009 by Eric Hameleers <alien@slackware.com>
+# * Update.
#
# Run 'sh fontforge.SlackBuild' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -58,7 +60,7 @@
# -----------------------------------------------------------------------------
PRGNAM=fontforge
-VERSION=${VERSION:-20090408}
+VERSION=${VERSION:-20090914}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-alien}
@@ -112,9 +114,6 @@ case "$ARCH" in
x86_64) SLKCFLAGS="-O2 -fPIC"
SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64"
;;
- athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
- SLKLDFLAGS=""; LIBDIRSUFFIX=""
- ;;
esac
# Create working directories:
@@ -179,11 +178,7 @@ 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
- tar -xjvf ${SOURCE[$i]}
- elif $(file ${SOURCE[$i]} | grep -q ": gzip"); then
- tar -xzvf ${SOURCE[$i]}
- fi
+ tar -xvf ${SOURCE[$i]}
done
# Read README-unix for the 'why' of the cidmaps:
@@ -198,21 +193,22 @@ echo Building ...
LDFLAGS="$SLKLDFLAGS" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --enable-type3 \
- --enable-pasteafter \
- --disable-static \
- --with-devicetables \
- ${FREETYPE_OPTS} \
- --program-prefix= \
- --program-suffix= \
- --build=$ARCH-slackware-linux \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
- # Using this, the man pages go into the root instead of $PKG
- # --mandir=/usr/man \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --localstatedir=/var \
+ --sysconfdir=/etc \
+ --enable-type3 \
+ --enable-pasteafter \
+ --disable-static \
+ --with-devicetables \
+ ${FREETYPE_OPTS} \
+ --program-prefix= \
+ --program-suffix= \
+ --build=$ARCH-slackware-linux \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+ # Using this, the man pages go into the root instead of $PKG
+ # --mandir=/usr/man \
make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
# Install all the needed stuff to the package dir