aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2004-04-21 08:06:14 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2004-04-21 08:06:14 +0000
commitb34fbea81658b683205fc30f8394f43bf21793c6 (patch)
tree5882a6767228bb6a737e6ed9b30279e180f01b52
parente3c0159d5b88c8352a7f0be487cd103b447b6aef (diff)
downloadports-b34fbea81658b683205fc30f8394f43bf21793c6.tar.gz
ports-b34fbea81658b683205fc30f8394f43bf21793c6.zip
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.
Notes
Notes: svn path=/head/; revision=107772
-rw-r--r--graphics/ImageMagick/Makefile1
-rw-r--r--graphics/ImageMagick/files/patch-configure45
-rw-r--r--graphics/ImageMagick/files/patch-magick_config.h.in12
3 files changed, 55 insertions, 3 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 22e80911bbc9..2837b5648bfb 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ImageMagick
PORTVERSION= 5.5.7.16
+PORTREVISION= 1
CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
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
diff --git a/graphics/ImageMagick/files/patch-magick_config.h.in b/graphics/ImageMagick/files/patch-magick_config.h.in
new file mode 100644
index 000000000000..9301267db880
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-magick_config.h.in
@@ -0,0 +1,12 @@
+--- magick/magick_config.h.in.orig Thu Dec 18 09:12:27 2003
++++ magick/magick_config.h.in Wed Apr 21 16:53:23 2004
+@@ -79,6 +79,9 @@
+ /* define if the compiler supports the explicit keyword */
+ #undef HAVE_EXPLICIT
+
++/* Define to 1 if you have the <ft2build.h> header file. */
++#undef HAVE_FT2BUILD_H
++
+ /* Define to 1 if you have the <freetype/freetype.h> header file. */
+ #undef HAVE_FREETYPE_FREETYPE_H
+