From c8f076738ae5c6c7bc1f447a9005825d5c675a67 Mon Sep 17 00:00:00 2001
From: Matteo Bernardini <ponce@slackbuilds.org>
Date: Sat, 22 Aug 2015 16:07:07 +0200
Subject: graphics/fontforge: Fix for the newer libtool on -current.

Updated freetype following upstream

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/fontforge/fontforge.SlackBuild | 13 +++++++++++--
 graphics/fontforge/fontforge.info       |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'graphics')

diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild
index 23767033e11d6..3eafe3df3ed97 100644
--- a/graphics/fontforge/fontforge.SlackBuild
+++ b/graphics/fontforge/fontforge.SlackBuild
@@ -29,7 +29,7 @@ BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ENABLE_BCINT=${ENABLE_BCINT:-yes}
-FREETYPE=${FREETYPE:-"2.5.0.1"}
+FREETYPE=${FREETYPE:-"2.6"}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -70,13 +70,22 @@ 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
+# Fix for the newer libtool
+# http://osdir.com/ml/blfs-dev/2015-02/msg00002.html
+for i in m4/*.m4; do
+  if [[ ! -L $i ]]; then continue; fi
+  j=$(readlink "$i")
+  ln -sf "${j/aclocal\//aclocal\/lt}" "$i"
+done
+
+./bootstrap -f
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-x \
   --with-freetype-source=$TMP/freetype-${FREETYPE} \
   --enable-python-extension \
diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info
index 2f79bcb190ff0..a05c1707778a6 100644
--- a/graphics/fontforge/fontforge.info
+++ b/graphics/fontforge/fontforge.info
@@ -3,10 +3,10 @@ VERSION="20141126"
 HOMEPAGE="http://fontforge.sourceforge.net/"
 DOWNLOAD="http://unrealize.co.uk/source/fontforge-20141126.tar.gz \
           http://fontforge.sf.net/cidmaps.tgz \
-          http://slackware.osuosl.org/slackware-14.1/source/l/freetype/freetype-2.5.0.1.tar.xz"
+          http://ponce.cc/slackware/sources/repo/freetype-2.6.tar.xz"
 MD5SUM="eaf134632c6c3a1a9c2cf8c8026a0c4a \
         063691163e592515b31514515bb3ce8c \
-        7ca0e253eb589b30d3e33786dbf39dff"
+        7662700e5d5f471349ba6e557e04acb3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3