From ce22a7a41767db0d674bb502e865cef85ae186e4 Mon Sep 17 00:00:00 2001
From: Robby Workman <rw@rlworkman.net>
Date: Tue, 11 May 2010 22:23:14 +0200
Subject: graphics/fontforge: Updated for version 20080927

---
 graphics/fontforge/README               |  13 +++++++------
 graphics/fontforge/cidmaps.tgz          | Bin 313755 -> 314314 bytes
 graphics/fontforge/fontforge.SlackBuild |  15 ++++++++++-----
 graphics/fontforge/fontforge.info       |   8 ++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'graphics/fontforge')

diff --git a/graphics/fontforge/README b/graphics/fontforge/README
index 9ad488289b..b6cef4ebe8 100644
--- a/graphics/fontforge/README
+++ b/graphics/fontforge/README
@@ -6,10 +6,11 @@ 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
-If you download this file and place it in the directory with the SlackBuild
-script, the script will automatically place the cidmaps inside the package.
+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 might also want to have an extracted copy of the freetype source code
+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
@@ -17,6 +18,6 @@ available inside the extracted SlackBuild tarball directory - in other words:
 		fontforge.info
 		slack-desc
 		freetype-2.3.5/
-Fontforge seems to build (and function) just fine without doing this, but
-it does look for the freetype sources while compiling, so it's probably 
-best to make them available just in case :)
+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 :)
diff --git a/graphics/fontforge/cidmaps.tgz b/graphics/fontforge/cidmaps.tgz
index 293b2d7836..67865939a6 100644
Binary files a/graphics/fontforge/cidmaps.tgz and b/graphics/fontforge/cidmaps.tgz differ
diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 823172ca7d..4c617e7c58 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -26,7 +26,7 @@
 # file right without too much manual intervention :-)
 
 PRGNAM=fontforge
-VERSION=20080309
+VERSION=20080927
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -40,6 +40,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -59,13 +61,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --with-x \
   --with-freetype-src=$CWD/freetype-2.3.5 \
-  --with-multilayer \
+  --with-freetype-bytecode=no \
   --with-devicetables \
+  --enable-libff \
+  --enable-pyextension \
+  --enable-type3 \
+  --enable-tilepath \
   --disable-debug \
   --enable-static=no \
   --enable-shared=yes \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make prefix=$PKG/usr libdir=$PKG/usr/lib install
@@ -79,7 +84,7 @@ if [ -e $CWD/cidmaps.tgz ]; then
 fi
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 41896059c4..889a789c6a 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -1,8 +1,8 @@
 PRGNAM="fontforge"
-VERSION="20080309"
+VERSION="20080927"
 HOMEPAGE="http://fontforge.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/fontforge/fontforge_full-20080309.tar.bz2"
-MD5SUM="96916b6a6f926551f1a775fa5d456738"
+DOWNLOAD="http://downloads.sourceforge.net/fontforge/fontforge_full-20080927.tar.bz2"
+MD5SUM="8866595d4dac77c0c093ed1e104515d3"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="Michiel"
+APPROVED="dsomero"
-- 
cgit v1.2.3