From b34fbea81658b683205fc30f8394f43bf21793c6 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Wed, 21 Apr 2004 08:06:14 +0000
Subject: Fix freetype2 configuration failure and build ImageMagick with the
 freetype2 support properly (unless WITHOUT_IMAGEMAGICK_TTF is not defined).

Patches have been sent to the developer forum.  Hopefully the next
version to 6.0.0 will include the fix.
---
 graphics/ImageMagick/files/patch-configure | 45 ++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

(limited to 'graphics/ImageMagick/files/patch-configure')

diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
index ab93c04e6ebf..530c9a8d220c 100644
--- a/graphics/ImageMagick/files/patch-configure
+++ b/graphics/ImageMagick/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Jun 23 12:18:35 2002
-+++ configure	Sun Jun 23 12:23:23 2002
-@@ -22001,6 +22001,7 @@
+--- configure.bak	Fri Feb  6 09:19:49 2004
++++ configure	Wed Apr 21 16:47:25 2004
+@@ -23161,6 +23161,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,42 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -37277,10 +37278,10 @@
+ done
+        if test -n "$freetype_config"
+        then
+-          freetype_prefix=`freetype-config --prefix`
+-          freetype_exec_prefix=`freetype-config --exec-prefix`
+-          LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
+-          CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
++          freetype_cflags=`$freetype_config --cflags`
++          freetype_libs=`$freetype_config --libs`
++          LDFLAGS="$LDFLAGS $freetype_libs"
++          CPPFLAGS="$freetype_cflags $CPPFLAGS"
+        fi
+     fi
+ 
+@@ -37621,10 +37622,10 @@
+ done
+        if test -n "$freetype_config"
+        then
+-          freetype_prefix=`freetype-config --prefix`
+-          freetype_exec_prefix=`freetype-config --exec-prefix`
+-          LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
+-          CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
++          freetype_cflags=`$freetype_config --cflags`
++          freetype_libs=`$freetype_config --libs`
++          LDFLAGS="$LDFLAGS $freetype_libs"
++          CPPFLAGS="$freetype_cflags $CPPFLAGS"
+        fi
+     fi
+ 
+@@ -37906,7 +37907,7 @@
+ fi
+ 
+ 
+-    if test "$have_freetype_h" = 'yes'
++    if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'
+     then
+       passed=`expr $passed + 1`
+     else
-- 
cgit v1.2.3