If I install ImageMagick from the current amd64 package, I get this
$ convert -list configure|grep DELEGATES
DELEGATES bzlib djvu fftw fontconfig jbig jpeg jng jp2 lcms2 lzma png tiff
x11 xml zlib
but if I build my own copy on my laptop,
DELEGATES bzlib djvu fftw fontconfig freetype jbig jpeg jng jp2 lcms2 lzma
mpeg png tiff x11 xml wmf zlib
This is because following the header shuffling in freetype, ImageMagick's
configure script no longer picks it up. (Glad I failed to follow the
faq/current.html instructions about removing the old freetype files on
that machine, otherwise I'd have had a much harder time tracking it down).
-------------------------------------------------------------
checking for FreeType 2.0 ...
checking for freetype-config... /usr/X11R6/bin/freetype-config
checking for FT_Init_FreeType in -lfreetype... (cached) yes
checking ft2build.h usability... yes
checking ft2build.h presence... yes
checking for ft2build.h... yes
checking for freetype/freetype.h... no
checking if FreeType package is complete... no -- some components failed test
-------------------------------------------------------------
Diff below fixes it for me.
I think it's somewhat important as without it, ImageMagick's features
to add text to images don't work, this fixes a crash with Calibre's
cover page generation, I have no idea what else uses this feature but I
suspect there will be other things in ports and in people's own scripts.
OK to push it for release?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/Makefile,v
retrieving revision 1.131
diff -u -p -r1.131 Makefile
--- Makefile 5 Sep 2013 12:15:55 -0000 1.131
+++ Makefile 13 Feb 2014 00:42:20 -0000
@@ -6,7 +6,7 @@ COMMENT= image processing tools
VER= 6.7.7
DASHVER= 7
-REVISION= 5
+REVISION= 6
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
Index: patches/patch-coders_ttf_c
===================================================================
RCS file: patches/patch-coders_ttf_c
diff -N patches/patch-coders_ttf_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-coders_ttf_c 13 Feb 2014 00:42:20 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Diff is hand-edited to avoid ^L
+
+--- coders/ttf.c.orig Thu Feb 13 00:38:53 2014
++++ coders/ttf.c Thu Feb 13 00:39:22 2014
+@@ -63,6 +63,6 @@
+ #if defined(FT_FREETYPE_H)
+ # include FT_FREETYPE_H
+ #else
+-# include <freetype/freetype.h>
++# include <freetype.h>
+ #endif
+ #endif
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/graphics/ImageMagick/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 19 Jun 2012 12:46:12 -0000 1.7
+++ patches/patch-configure 13 Feb 2014 00:42:20 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.7 2012/06/19 12:46:12 sthen Exp $
--- configure.orig Sun Jun 10 17:13:41 2012
-+++ configure Tue Jun 19 09:17:08 2012
++++ configure Thu Feb 13 00:38:36 2014
@@ -9655,10 +9655,12 @@ else
PTHREAD_CC="$CC"
fi
@@ -14,6 +14,15 @@ $OpenBSD: patch-configure,v 1.7 2012/06/
# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
if test x"$ax_pthread_ok" = xyes; then
+@@ -29519,7 +29521,7 @@ else
+ fi
+
+
+- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h"
"ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
++ ac_fn_c_check_header_compile "$LINENO" "freetype.h"
"ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
+ "
+ if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :
+ have_freetype_h='yes'
@@ -32576,7 +32578,7 @@ _ACEOF
