1 files changed, 17 insertions, 13 deletions
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 57ed2fb31f..de56c96d8b 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -23,12 +23,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fontforge
-VERSION=20090224
+VERSION=20090622
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-no}
+FREETYPE=${FREETYPE:-"2.3.9"}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -37,10 +38,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -48,19 +52,21 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
 tar xvf $CWD/${PRGNAM}_full-${VERSION}.tar.bz2
+tar xvf $CWD/freetype-$FREETYPE.tar.bz2
+chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
+chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
 cd $PRGNAM-$VERSION
-chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --with-x \
-  --with-freetype-src=$CWD/freetype-2.3.7 \
+  --with-freetype-src=$TMP/freetype-${FREETYPE} \
   --with-freetype-bytecode=$ENABLE_BCINT \
   --with-devicetables \
   --enable-libff \
@@ -75,13 +81,11 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-# Let's add the cidmaps if the user downloaded them
-if [ -e $CWD/cidmaps.tgz ]; then
-  mkdir -p $PKG/usr/share/fontforge
-  tar xvf $CWD/cidmaps.tgz -C $PKG/usr/share/fontforge || exit 1
-  chmod 0644 $PKG/usr/share/fontforge/*.cidmap
-  chown root:root $PKG/usr/share/fontforge/*.cidmap
-fi
+# Let's add the cidmaps
+mkdir -p $PKG/usr/share/fontforge
+tar xvf $CWD/cidmaps.tgz -C $PKG/usr/share/fontforge || exit 1
+chmod 0644 $PKG/usr/share/fontforge/*.cidmap
+chown root:root $PKG/usr/share/fontforge/*.cidmap
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
@@ -106,4 +110,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}