5 files changed, 34 insertions, 38 deletions
diff --git a/graphics/fontforge/README b/graphics/fontforge/README
index e02ba52ed2..933bc68ad6 100644
--- a/graphics/fontforge/README
+++ b/graphics/fontforge/README
@@ -3,21 +3,7 @@ truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap (bdf, FON,
 NFNT) fonts, or edit existing ones. It also lets you convert one format to 
 another. FontForge has support for many Macintosh font formats.
 
-From the README-unix file inside the source: 
-  If you want to edit CID-keyed fonts (for CJK fonts) you may want to pull
-  down the cidmap package from http://fontforge.sf.net/cidmaps.tgz
-We have included it with our tarball, but you might want to check for a 
-newer version just in case.  If you have it in the directory with the 
-SlackBuild script, it will automatically place the cidmaps inside the package.
-
-You will also want to have an extracted copy of the freetype source code
-available inside the extracted SlackBuild tarball directory - in other words:
-	/somedir/fontforge/
-		README
-		fontforge.SlackBuild
-		fontforge.info
-		slack-desc
-		freetype-2.3.7/
-Fontforge seems to build (and function) just fine without doing this (this is
-at least true for prior versions), but it does look for the freetype sources 
-while compiling, so it's probably best to make them available just in case :)
+You can specify an alternate version of freetype on the command line when 
+running the script with e.g.   FREETYPE=2.3.10 ./fontforge.SlackBuild
+but you will need to manually place that freetype tarball in the slackbuild 
+directory.
diff --git a/graphics/fontforge/cidmaps.tgz b/graphics/fontforge/cidmaps.tgz
deleted file mode 100644
index 67865939a6..0000000000
--- a/graphics/fontforge/cidmaps.tgz
+++ /dev/null
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}
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index f4aad9cd46..5c65ac2bb2 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,8 +1,14 @@
 PRGNAM="fontforge"
-VERSION="20090224"
+VERSION="20090622"
 HOMEPAGE="http://fontforge.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/fontforge/fontforge_full-20090224.tar.bz2"
-MD5SUM="5b564437e5e3db660b0202647b6f733b"
+DOWNLOAD="http://downloads.sourceforge.net/fontforge/fontforge_full-20090622.tar.bz2 \
+  http://fontforge.sf.net/cidmaps.tgz \
+  http://slackware.osuosl.org/slackware-13.0/source/l/freetype/freetype-2.3.9.tar.bz2"
+MD5SUM="3f4ff2d2dab200f47595bff38baa13ca \
+  063691163e592515b31514515bb3ce8c \
+  d76233108aca9c9606cdbd341562ad9a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="dsomero"
diff --git a/graphics/fontforge/slack-desc b/graphics/fontforge/slack-desc
index f7c833bbd1..f630b19056 100644
--- a/graphics/fontforge/slack-desc
+++ b/graphics/fontforge/slack-desc
@@ -7,13 +7,13 @@
 
          |-----handy-ruler------------------------------------------------------|
 fontforge: FontForge (an outline font editor)
-fontforge: 
+fontforge:
 fontforge: FontForge is an outline font editor that lets you create your own 
 fontforge: postscript, truetype, opentype, cid-keyed, multi-master, cff, svg 
 fontforge: and bitmap (bdf, FON, NFNT) fonts, or edit existing ones. It also  
 fontforge: lets you convert one format to another. FontForge has support for
 fontforge: many Macintosh font formats.
-fontforge: 
+fontforge:
 fontforge: Homepage: http://fontforge.sourceforge.net/
-fontforge: 
-fontforge: 
+fontforge:
+fontforge: