ports/186160: graphics/ImageMagick does not detect freetype2 properly

[David Lundgren]

>Number:         186160
>Category:       ports
>Synopsis:       graphics/ImageMagick does not detect freetype2 properly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 27 06:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     David Lundgren
>Release:        9.1-RELEASE-p7 amd64
>Organization:
>Environment:
FreeBSD webdev101 9.1-RELEASE-p7 FreeBSD 9.1-RELEASE-p7 #0: Mon Sep 9 21:34:37 UTC 2013 root at amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
While diagnosing a problem with a client I found that ImageMagick did not have the freetype delegate.

After watching the configure output and referencing the freetype2 port's commit for December 12 2013 that the headers were reshuffled I found that the headers were wrong.

===
-------------------------------------------------------------
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
===
>How-To-Repeat:
use WITHOUT_X11=yes in make.conf (this could be skipped, but I am building on a headless system)

Build graphics/ImageMagick port with default options

Once done run "identify -list configure"

Note that the DELEGATES line does not contain freetype
>Fix:
I've attached a patch to change the following files to find freetype2/freetype.h:
coders/ttf.c
magick/annotate.c
configure

I'm not sure if this is the correct way to fix this, or if I did the patch correctly. I'm fairly certain I followed the chapter 10.2 in the Handbook properly.

If there are any problems or question please let me know.

Patch attached with submission follows:

diff -ruN ImageMagick.orig/files/patch-coders::ttf.c ImageMagick/files/patch-coders::ttf.c
--- ImageMagick.orig/files/patch-coders::ttf.c	1969-12-31 18:00:00.000000000 -0600
+++ ImageMagick/files/patch-coders::ttf.c	2014-01-26 23:51:02.000000000 -0600
@@ -0,0 +1,10 @@
+--- coders/ttf.c.orig 2012-08-30 06:41:56.000000000 -0500
++++ coders/ttf.c      2014-01-26 23:46:48.000000000 -0600
+@@ -64,7 +64,7 @@
+ #if defined(FT_FREETYPE_H)
+ #  include FT_FREETYPE_H
+ #else
+-#  include <freetype/freetype.h>
++#  include <freetype2/freetype.h>
+ #endif
+ #endif
diff -ruN ImageMagick.orig/files/patch-configure ImageMagick/files/patch-configure
--- ImageMagick.orig/files/patch-configure	2014-01-26 23:54:26.000000000 -0600
+++ ImageMagick/files/patch-configure	2014-01-26 23:57:24.000000000 -0600
@@ -1,6 +1,15 @@
---- configure.orig	2012-05-16 09:58:45.571776589 +0200
-+++ configure	2012-05-16 09:58:54.042776583 +0200
-@@ -32626,7 +32626,7 @@
+--- configure.orig	2014-01-26 23:54:54.000000000 -0600
++++ configure	2014-01-26 23:56:44.000000000 -0600
+@@ -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
diff -ruN ImageMagick.orig/files/patch-magick::annotate.c ImageMagick/files/patch-magick::annotate.c
--- ImageMagick.orig/files/patch-magick::annotate.c	1969-12-31 18:00:00.000000000 -0600
+++ ImageMagick/files/patch-magick::annotate.c	2014-01-26 23:51:38.000000000 -0600
@@ -0,0 +1,11 @@
+--- magick/annotate.c.orig  2012-08-26 11:40:55.000000000 -0500
++++ magick/annotate.c       2014-01-26 23:47:07.000000000 -0600
+@@ -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


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