ports/186171: graphics/ImageMagick bug support TrueType font

[Alexander Panyushkin]

>Number:         186171
>Category:       ports
>Synopsis:       graphics/ImageMagick bug support TrueType font
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 27 15:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Panyushkin
>Release:        FreeBSD 10.0-STABLE #1 r260992
>Organization:
Home
>Environment:
FreeBSD magnetron.intra 10.0-STABLE FreeBSD 10.0-STABLE #1 r260992: Wed Jan 22 12:46:50 EET 2014     root at magnetron.intra:/usr/obj/usr/src/sys/Kernel  amd64
>Description:
There is a problem when building ImageMagick

buildlog
[...cut...]
-------------------------------------------------------------
checking for FreeType 2.0 ... 
checking for freetype-config... /usr/local/bin/freetype-config
checking for FT_Init_FreeType in -lfreetype... 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
[...cut...]

Port installed without errors.

But TTF font is not supported:
# identify -list format | grep TTF                               
      TTF* ---   TrueType font


>How-To-Repeat:
portmaster graphics/ImageMagick
>Fix:
Needed change in sources freetype/freetype.h  => freetype2/freetype.h
With patch 

#identify -list format | grep TTF
      TTF* r--   TrueType font (Freetype 2.5.2)
     ^^^^^^^^^^^

Patch attached with submission follows:

--- magick/annotate.c.orig	2012-08-26 19:40:55.000000000 +0300
+++ magick/annotate.c	2014-01-25 12:24:55.055265432 +0200
@@ -85,7 +85,7 @@
 #if defined(FT_FREETYPE_H)
 #  include FT_FREETYPE_H
 #else
-#  include <freetype/freetype.h>
+#  include <freetype2/freetype.h>
 #endif
 #if defined(FT_GLYPH_H)
 #  include FT_GLYPH_H
--- www/api/MagickCore/annotate_8c.html.orig	2014-01-25 12:31:29.616772912 +0200
+++ www/api/MagickCore/annotate_8c.html	2014-01-25 12:31:37.105259232 +0200
@@ -37,10 +37,10 @@
 <code>#include "<a class="el" href="utility_8h-source.html">magick/utility.h</a>"</code><br>
 <code>#include "<a class="el" href="xwindow-private_8h-source.html">magick/xwindow-private.h</a>"</code><br>
 <code>#include <ft2build.h></code><br>
-<code>#include <freetype/freetype.h></code><br>
-<code>#include <freetype/ftglyph.h></code><br>
-<code>#include <freetype/ftoutln.h></code><br>
-<code>#include <freetype/ftbbox.h></code><br>
+<code>#include <freetype2/freetype.h></code><br>
+<code>#include <freetype2/ftglyph.h></code><br>
+<code>#include <freetype2/ftoutln.h></code><br>
+<code>#include <freetype2/ftbbox.h></code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
--- coders/jp2.c.orig	Sat Oct 12 23:41:32 2002
+++ coders/jp2.c	Wed Jan 22 21:11:31 2003
@@ -639,5 +639,14 @@
 
 #if defined(HasJP2)
+
+#ifndef JAS_IMAGE_CM_GRAY
+#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY
+#endif
+
+#ifndef JAS_IMAGE_CM_RGB
+#define JAS_IMAGE_CM_RGB JAS_IMAGE_CS_RGB
+#endif
+
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
--- magick/config.h_vms.orig	2010-01-14 04:58:18.000000000 +0200
+++ magick/config.h_vms	2014-01-25 12:28:17.196778832 +0200
@@ -91,7 +91,7 @@
 /* Define if you have the <ft2build.h> header file.  */
 #define MAGICKCORE_HAVE_FT2BUILD_H 1
 
-/* Define if you have the <freetype/freetype.h> header file.  */
+/* Define if you have the <freetype2/freetype.h> header file.  */
 #define MAGICKCORE_HAVE_FREETYPE_FREETYPE_H 1
 
 /* Define if you have the <hdf.h> header file.  */
--- configure.orig	2012-11-26 14:21:20.000000000 +0200
+++ configure	2014-01-25 12:20:42.895271832 +0200
@@ -28616,7 +28616,7 @@
 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" "freetype2/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'
@@ -31756,7 +31756,7 @@
 
 #
 # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
 DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
 DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
 case "${build_os}" in
--- configure.ac.orig	2012-11-23 22:16:13.000000000 +0200
+++ configure.ac	2014-01-25 12:22:50.275268472 +0200
@@ -1941,7 +1941,7 @@
 
 dnl Now test for the headers
     AC_CHECK_HEADER([ft2build.h],[FT2BUILD_H='#include <ft2build.h>'],[ft2build=''],[])
-    AC_CHECK_HEADER(freetype/freetype.h,[have_freetype_h='yes'],[have_freetype_h='no'],[$FT2BUILD_H])
+    AC_CHECK_HEADER(freetype2/freetype.h,[have_freetype_h='yes'],[have_freetype_h='no'],[$FT2BUILD_H])
     if test "$have_freetype_h" = 'yes'; then
       passed=`expr $passed + 1`
     else
--- coders/ttf.c.orig	2012-08-30 14:41:56.000000000 +0300
+++ coders/ttf.c	2014-01-25 12:29:36.325523712 +0200
@@ -64,7 +64,7 @@
 #if defined(FT_FREETYPE_H)
 #  include FT_FREETYPE_H
 #else
-#  include <freetype/freetype.h>
+#  include <freetype2/freetype.h>
 #endif
 #endif
 


>Release-Note:
>Audit-Trail:
>Unformatted: