1 files changed, 11 insertions, 16 deletions
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 7cee34daa4..76e53e8811 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -25,12 +25,10 @@
 # Currently maintained by David Woodfall
 
 PRGNAM=fontforge
-VERSION=20120731_b
+VERSION=${VERSION:-20141014}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-TARVERS=$(printf $VERSION | tr _ -)
-
 ENABLE_BCINT=${ENABLE_BCINT:-yes}
 FREETYPE=${FREETYPE:-"2.4.10"}
 
@@ -67,12 +65,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION freetype-$FREETYPE
-tar xvf $CWD/${PRGNAM}_full-${TARVERS}.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 tar xvf $CWD/freetype-$FREETYPE.tar.xz
-chown -R root:root $PRGNAM-$TARVERS freetype-$FREETYPE
-chmod -R u+w,go+r-w,a-s $PRGNAM-$TARVERS freetype-$FREETYPE
-cd $PRGNAM-$TARVERS
+chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE
+chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE
+cd $PRGNAM-$VERSION
 
+./bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -80,12 +79,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --with-x \
-  --with-freetype-src=$TMP/freetype-${FREETYPE} \
-  --with-freetype-bytecode=$ENABLE_BCINT \
-  --enable-libff \
-  --enable-pyextension \
-  --enable-type3 \
-  --enable-tilepath \
+  --with-freetype-source=$TMP/freetype-${FREETYPE} \
+  --enable-python-extension \
+  --enable-tile-path \
   --enable-static=no \
   --enable-shared=yes \
   --build=$ARCH-slackware-linux
@@ -103,11 +99,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
   grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS INSTALL LICENSE README-Unix.html README-unix VERSION \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS INSTALL LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;