1 files changed, 18 insertions, 11 deletions
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 2dffc015b5..5947647c68 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for fontforge
 
-# Copyright 2006-2009  Robby Workman  Northport, Alabama, USA
+# Copyright 2006,2007,2008,2009,2010  Robby Workman  Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,22 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fontforge
-VERSION=20090622
-ARCH=${ARCH:-i486}
+VERSION=20100501
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-no}
-FREETYPE=${FREETYPE:-"2.3.9"}
+FREETYPE=${FREETYPE:-"2.3.12"}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -54,7 +66,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
 tar xvf $CWD/${PRGNAM}_full-${VERSION}.tar.bz2
-tar xvf $CWD/freetype-$FREETYPE.tar.bz2
+tar xvf $CWD/freetype-$FREETYPE.tar.xz
 chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
 chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
 cd $PRGNAM-$VERSION
@@ -68,12 +80,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-x \
   --with-freetype-src=$TMP/freetype-${FREETYPE} \
   --with-freetype-bytecode=$ENABLE_BCINT \
-  --with-devicetables \
   --enable-libff \
   --enable-pyextension \
   --enable-type3 \
   --enable-tilepath \
-  --disable-debug \
   --enable-static=no \
   --enable-shared=yes \
   --build=$ARCH-slackware-linux
@@ -90,10 +100,7 @@ chown root:root $PKG/usr/share/fontforge/*.cidmap
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( 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
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \