26 files changed, 366 insertions, 31 deletions

diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index a54a2698da9e..18c490659397 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,6 +1,35 @@
---- ./configure.orig	2008-04-10 11:16:29.000000000 -0400
-+++ ./configure	2008-09-02 08:05:29.000000000 -0400
-@@ -34040,7 +34040,7 @@
+--- configure.orig	2008-11-20 04:31:11.000000000 +0100
++++ configure	2013-12-13 12:12:27.000000000 +0100
+@@ -32116,7 +32116,7 @@
+     fi
+ 
+     # Some Freetype installs appear to require that <ft2build.h> be
+-    # included prior to including <freetype/freetype.h>.  Oops!
++    # included prior to including <freetype.h>.  Oops!
+     if test "${ac_cv_header_ft2build_h+set}" = set; then
+   { echo "$as_me:$LINENO: checking for ft2build.h" >&5
+ echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
+@@ -32249,8 +32249,8 @@
+ fi
+ 
+ 
+-    { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5
+-echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for freetype.h" >&5
++echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_freetype_freetype_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -32262,7 +32262,7 @@
+ /* end confdefs.h.  */
+ $FT2BUILD_H
+ 
+-#include <freetype/freetype.h>
++#include <freetype.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -34050,7 +34050,7 @@
  #define MagickLibConfigSubDir "$MagickLibConfigSubDir"
  _ACEOF
  
@@ -9,7 +38,7 @@
  MagickLibConfigPathDefine="${MagickLibConfigPath}/"
  if test "$native_win32_build" = 'yes'
  then
-@@ -34098,7 +34098,7 @@
+@@ -34108,7 +34108,7 @@
  #
  # Path to GraphicsMagick share files
  MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
@@ -18,7 +47,7 @@
  MagickSharePathDefine="${MagickSharePath}/"
  if test "$native_win32_build" = 'yes'
  then
-@@ -34118,7 +34118,7 @@
+@@ -34128,7 +34128,7 @@
  #define MagickShareConfigSubDir "$MagickShareConfigSubDir"
  _ACEOF
  
diff --git a/graphics/GraphicsMagick12/files/patch-configure.in b/graphics/GraphicsMagick12/files/patch-configure.in
index ed7a7535689b..e8e1402cef44 100644
--- a/graphics/GraphicsMagick12/files/patch-configure.in
+++ b/graphics/GraphicsMagick12/files/patch-configure.in
@@ -1,6 +1,15 @@
---- configure.orig	2008-05-18 17:22:52.000000000 -0400
-+++ configure	2008-06-06 18:37:48.269146182 -0400
-@@ -37604,7 +37604,7 @@
+--- configure.orig	2010-01-05 20:20:45.000000000 +0100
++++ configure	2013-12-13 12:20:04.000000000 +0100
+@@ -24299,7 +24299,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" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
+ "
+ if test "x$ac_cv_header_freetype_freetype_h" = x""yes; then :
+   have_freetype_h='yes'
+@@ -25089,7 +25089,7 @@
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -9,7 +18,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
-@@ -37708,7 +37708,7 @@
+@@ -25193,7 +25193,7 @@
  
  #
  # Path to GraphicsMagick share files
diff --git a/graphics/GraphicsMagick13/files/patch-configure.in b/graphics/GraphicsMagick13/files/patch-configure.in
index ed7a7535689b..175a24ef8c29 100644
--- a/graphics/GraphicsMagick13/files/patch-configure.in
+++ b/graphics/GraphicsMagick13/files/patch-configure.in
@@ -1,6 +1,15 @@
---- configure.orig	2008-05-18 17:22:52.000000000 -0400
-+++ configure	2008-06-06 18:37:48.269146182 -0400
-@@ -37604,7 +37604,7 @@
+--- configure.orig	2013-03-10 00:21:59.000000000 +0100
++++ configure	2013-12-13 12:24:09.000000000 +0100
+@@ -26059,7 +26059,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" "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'
+@@ -26935,7 +26935,7 @@
  #
  
  # Subdirectory under lib to place GraphicsMagick lib files
@@ -9,7 +18,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define MagickLibSubdir "$MagickLibSubdir"
-@@ -37708,7 +37708,7 @@
+@@ -27039,7 +27039,7 @@
  
  #
  # Path to GraphicsMagick share files
diff --git a/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake b/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake
new file mode 100644
index 000000000000..5a85775d425e
--- /dev/null
+++ b/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindFreetype.cmake.orig	2013-12-13 12:47:10.000000000 +0100
++++ cmake/modules/FindFreetype.cmake	2013-12-13 12:47:42.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ # Include dir
+ find_path(Freetype_INCLUDE_DIR
+-  NAMES freetype/freetype.h
++  NAMES freetype.h
+   PATHS ${Freetype_PKGCONF_INCLUDE_DIRS}
+   PATH_SUFFIXES freetype2
+ )
diff --git a/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c b/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
new file mode 100644
index 000000000000..4250f058ebce
--- /dev/null
+++ b/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
@@ -0,0 +1,14 @@
+--- plug-ins/postscript/diapsft2renderer.c.orig	2013-12-14 12:29:51.000000000 +0100
++++ plug-ins/postscript/diapsft2renderer.c	2013-12-14 12:31:31.000000000 +0100
+@@ -29,8 +29,9 @@
+ #include <pango/pangoft2.h>
+ #include <pango/pango-engine.h>
+ /* I'd really rather avoid this */
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ 
+ #define DPI 300
+ 
diff --git a/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c b/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c
new file mode 100644
index 000000000000..08bf01ac4f6a
--- /dev/null
+++ b/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c
@@ -0,0 +1,12 @@
+--- src/lib/engines/common/evas_font_load.c.orig	2013-12-14 12:42:42.000000000 +0100
++++ src/lib/engines/common/evas_font_load.c	2013-12-14 12:44:14.000000000 +0100
+@@ -5,7 +5,8 @@
+ 
+ #include "evas_font_private.h" /* for Frame-Queuing support */
+ #include "evas_font_ot.h"
+-#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
++#include <ft2build.h>
++#include FT_TRUETYPE_TABLES_H /* Freetype2 OS/2 font table. */
+ 
+ #ifdef EVAS_CSERVE2
+ # include "../../cserve2/evas_cs2_private.h"
diff --git a/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake b/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
new file mode 100644
index 000000000000..01ed79b2e849
--- /dev/null
+++ b/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake
@@ -0,0 +1,20 @@
+--- cmake/FindFreetype2.cmake.orig	2013-12-24 19:02:55.000000000 +0100
++++ cmake/FindFreetype2.cmake	2013-12-24 19:03:21.000000000 +0100
+@@ -52,7 +52,7 @@
+ #
+ 
+ 
+-FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h
++FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h
+        ${ADDITIONAL_INCLUDE_PATH}
+       /usr/include
+       /usr/include/freetype2
+@@ -67,7 +67,7 @@
+       NO_DEFAULT_PATH
+ )
+ 
+-FIND_PATH(FREETYPE2_FT2BUILD ft2build.h
++FIND_PATH(FREETYPE2_FT2BUILD freetype2/ft2build.h
+        ${ADDITIONAL_INCLUDE_PATH}
+       /usr/include
+       /usr/X11/include
diff --git a/graphics/mapserver/files/patch-cmake__FindFreetype.cmake b/graphics/mapserver/files/patch-cmake__FindFreetype.cmake
new file mode 100644
index 000000000000..6a6c8a53cdd2
--- /dev/null
+++ b/graphics/mapserver/files/patch-cmake__FindFreetype.cmake
@@ -0,0 +1,20 @@
+--- cmake/FindFreetype.cmake.orig	2013-12-23 20:00:03.000000000 +0200
++++ cmake/FindFreetype.cmake	2013-12-23 20:00:14.000000000 +0200
+@@ -41,7 +41,7 @@
+ # wants explicit full paths and this trickery doesn't work too well.
+ # I'm going to attempt to cut out the middleman and hope 
+ # everything still works.
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
+   HINTS
+   $ENV{FREETYPE_DIR}
+   PATH_SUFFIXES include
+@@ -54,7 +54,7 @@
+   /usr/freeware/include
+ )
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+   HINTS
+   $ENV{FREETYPE_DIR}/include/freetype2
+   PATHS
diff --git a/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake b/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake
new file mode 100644
index 000000000000..d40c42523311
--- /dev/null
+++ b/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake
@@ -0,0 +1,13 @@
+--- CMake/Packages/FindFreetype.cmake.orig	2012-09-02 07:27:14.000000000 +0200
++++ CMake/Packages/FindFreetype.cmake	2013-12-24 20:05:12.000000000 +0100
+@@ -43,8 +43,8 @@
+ findpkg_framework(FREETYPE)
+ message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
+ 
+-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
+-find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
++find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
++find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES freetype2/ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
+ 
+ find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
+ find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug)
diff --git a/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake
new file mode 100644
index 000000000000..135d24e12ff3
--- /dev/null
+++ b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake
@@ -0,0 +1,44 @@
+--- CMakeModules/FindFreeType.cmake.orig	2013-12-24 19:18:24.000000000 +0100
++++ CMakeModules/FindFreeType.cmake	2013-12-24 19:19:27.000000000 +0100
+@@ -24,18 +24,18 @@
+ # wants explicit full paths and this trickery doesn't work too well.
+ # I'm going to attempt to cut out the middleman and hope 
+ # everything still works.
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
+   PATHS
+   $ENV{FREETYPE_DIR}
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES include    
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
+   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES include
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h 
+   PATHS
+   /usr/local
+   /usr
+@@ -51,16 +51,16 @@
+   PATH_SUFFIXES include
+ )
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+   $ENV{FREETYPE_DIR}/include/freetype2
+   NO_DEFAULT_PATH
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+   PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
+   NO_DEFAULT_PATH
+   PATH_SUFFIXES include/freetype2
+ )
+-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 
++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 
+   /usr/local/include/freetype2
+   /usr/include/freetype2
+   /usr/local/X11R6/include/freetype2
diff --git a/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
new file mode 100644
index 000000000000..eaae7ca841dc
--- /dev/null
+++ b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp
@@ -0,0 +1,14 @@
+--- src/osgPlugins/freetype/FreeTypeFont.cpp.orig	2013-12-24 19:29:26.000000000 +0100
++++ src/osgPlugins/freetype/FreeTypeFont.cpp	2013-12-24 19:30:24.000000000 +0100
+@@ -14,8 +14,9 @@
+ #include "FreeTypeFont.h"
+ #include "FreeTypeLibrary.h"
+ 
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_BBOX_H
+ 
+ #include <osg/Notify>
+ #include <osg/io_utils>
diff --git a/graphics/php5-gd/files/patch-config.m4 b/graphics/php5-gd/files/patch-config.m4
index 03b69a1c248a..8212b1b4c8fb 100644
--- a/graphics/php5-gd/files/patch-config.m4
+++ b/graphics/php5-gd/files/patch-config.m4
@@ -1,8 +1,17 @@
---- config.m4.orig	Mon May 30 01:16:41 2005
-+++ config.m4	Wed Dec  7 11:01:13 2005
-@@ -220,7 +220,7 @@
+--- config.m4.orig	2013-12-10 20:32:43.000000000 +0100
++++ config.m4	2013-12-24 21:02:03.000000000 +0100
+@@ -193,7 +193,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
+@@ -241,7 +241,7 @@
      ],[
-       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
+       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
      ],[
 -      -L$GD_T1_DIR/$PHP_LIBDIR
 +      -L$GD_T1_DIR/$PHP_LIBDIR -lm
diff --git a/graphics/php52-gd/files/patch-config.m4 b/graphics/php52-gd/files/patch-config.m4
index a0cc4ad378d6..b1877eef1874 100644
--- a/graphics/php52-gd/files/patch-config.m4
+++ b/graphics/php52-gd/files/patch-config.m4
@@ -1,8 +1,17 @@
---- ext/gd/config.m4.orig	Mon May 30 01:16:41 2005
-+++ ext/gd/config.m4	Wed Dec  7 11:01:13 2005
-@@ -220,7 +220,7 @@
+--- config.m4.orig	2007-07-03 19:25:43.000000000 +0200
++++ config.m4	2013-12-24 21:04:48.000000000 +0100
+@@ -204,7 +204,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
+@@ -251,7 +251,7 @@
      ],[
-       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
+       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
      ],[
 -      -L$GD_T1_DIR/$PHP_LIBDIR
 +      -L$GD_T1_DIR/$PHP_LIBDIR -lm
diff --git a/graphics/php53-gd/files/patch-config.m4 b/graphics/php53-gd/files/patch-config.m4
index 03b69a1c248a..debdbc510a3f 100644
--- a/graphics/php53-gd/files/patch-config.m4
+++ b/graphics/php53-gd/files/patch-config.m4
@@ -1,8 +1,17 @@
---- config.m4.orig	Mon May 30 01:16:41 2005
-+++ config.m4	Wed Dec  7 11:01:13 2005
-@@ -220,7 +220,7 @@
+--- config.m4.orig	2013-12-10 20:04:57.000000000 +0100
++++ config.m4	2013-12-24 21:07:17.000000000 +0100
+@@ -162,7 +162,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
+@@ -210,7 +210,7 @@
      ],[
-       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
+       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
      ],[
 -      -L$GD_T1_DIR/$PHP_LIBDIR
 +      -L$GD_T1_DIR/$PHP_LIBDIR -lm
diff --git a/graphics/php55-gd/files/patch-config.m4 b/graphics/php55-gd/files/patch-config.m4
index 03b69a1c248a..1e9eae3ad4e6 100644
--- a/graphics/php55-gd/files/patch-config.m4
+++ b/graphics/php55-gd/files/patch-config.m4
@@ -1,8 +1,17 @@
---- config.m4.orig	Mon May 30 01:16:41 2005
-+++ config.m4	Wed Dec  7 11:01:13 2005
-@@ -220,7 +220,7 @@
+--- config.m4.orig	2013-12-11 00:31:06.000000000 +0100
++++ config.m4	2013-12-24 21:11:19.000000000 +0100
+@@ -185,7 +185,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break
+@@ -233,7 +233,7 @@
      ],[
-       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) 
+       AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
      ],[
 -      -L$GD_T1_DIR/$PHP_LIBDIR
 +      -L$GD_T1_DIR/$PHP_LIBDIR -lm
diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile
index b4d6e9a8154e..4b824d5e8c31 100644
--- a/graphics/podofo/Makefile
+++ b/graphics/podofo/Makefile
@@ -17,13 +17,14 @@ LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-USES=		cmake
+USES=		cmake dos2unix
 CMAKE_ARGS=	-DPODOFO_BUILD_SHARED:BOOL=TRUE \
 		-DPODOFO_BUILD_STATIC:BOOL=FALSE \
 		-DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \
 		-DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}"
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
+DOS2UNIX_FILES=	cmake/modules/FindFREETYPE.cmake
 
 OPTIONS_DEFINE=		IMPOSE JPEG PNG TIFF
 OPTIONS_DEFAULT=	JPEG PNG TIFF
diff --git a/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake
new file mode 100644
index 000000000000..fab85541e57c
--- /dev/null
+++ b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake
@@ -0,0 +1,19 @@
+--- cmake/modules/FindFREETYPE.cmake.orig	2013-12-23 19:53:54.000000000 +0200
++++ cmake/modules/FindFREETYPE.cmake	2013-12-23 19:54:05.000000000 +0200
+@@ -12,14 +12,14 @@
+ 
+ SET(FREETYPE_FIND_QUIETLY 1)
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h
+   /usr/include/
+   /usr/local/include/
+   /usr/X11/include/
+   NO_CMAKE_SYSTEM_PATH
+ )
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
+   /usr/include/freetype2
+   /usr/local/include/freetype2
+   /usr/X11/include/freetype2
diff --git a/graphics/py-imaging/files/patch-_imagingft.c b/graphics/py-imaging/files/patch-_imagingft.c
new file mode 100644
index 000000000000..b6895dfc9221
--- /dev/null
+++ b/graphics/py-imaging/files/patch-_imagingft.c
@@ -0,0 +1,11 @@
+--- _imagingft.c.orig	2013-12-16 01:41:20.000000000 +0100
++++ _imagingft.c	2013-12-16 01:42:34.000000000 +0100
+@@ -70,7 +70,7 @@
+     const char* message;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/graphics/py-pillow/files/patch-_imagingft.c b/graphics/py-pillow/files/patch-_imagingft.c
new file mode 100644
index 000000000000..b6895dfc9221
--- /dev/null
+++ b/graphics/py-pillow/files/patch-_imagingft.c
@@ -0,0 +1,11 @@
+--- _imagingft.c.orig	2013-12-16 01:41:20.000000000 +0100
++++ _imagingft.c	2013-12-16 01:42:34.000000000 +0100
+@@ -70,7 +70,7 @@
+     const char* message;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/graphics/py-soya3d/files/patch-include_freetype.h b/graphics/py-soya3d/files/patch-include_freetype.h
new file mode 100644
index 000000000000..0d16fe2ae324
--- /dev/null
+++ b/graphics/py-soya3d/files/patch-include_freetype.h
@@ -0,0 +1,14 @@
+--- include_freetype.h.orig	2013-12-24 20:30:39.000000000 +0100
++++ include_freetype.h	2013-12-24 20:31:30.000000000 +0100
+@@ -21,8 +21,7 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H // this is not do-able in Pyrex
+-#include <freetype/freetype.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftimage.h>
+-#include <freetype/ftglyph.h>
++#include FT_OUTLINE_H
++#include FT_IMAGE_H
++#include FT_GLYPH_H
+ 
diff --git a/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c b/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c
new file mode 100644
index 000000000000..bc5ee9fd307c
--- /dev/null
+++ b/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c
@@ -0,0 +1,11 @@
+--- src/imaging/libimagingft/_imagingft.c.orig	2009-11-01 01:44:12.000000000 +0100
++++ src/imaging/libimagingft/_imagingft.c	2013-12-16 01:46:04.000000000 +0100
+@@ -70,7 +70,7 @@
+     const char* message;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c b/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c
new file mode 100644
index 000000000000..627d18e2a2ab
--- /dev/null
+++ b/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c
@@ -0,0 +1,14 @@
+--- src/libnrtype/nr-type-ft2.c.orig	2013-12-16 01:48:18.000000000 +0100
++++ src/libnrtype/nr-type-ft2.c	2013-12-16 01:49:11.000000000 +0100
+@@ -13,8 +13,9 @@
+ #include <stdio.h>
+ #include <libnr/nr-macros.h>
+ #include <libnr/nr-matrix.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_BBOX_H
+ #include "nr-type-ft2.h"
+ 
+ #define noNRTFFT2_DEBUG
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index 103afa036f6a..7ef5103dc64f 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -14,9 +14,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		iconv gmake pkgconfig
+USES=		dos2unix iconv gmake pkgconfig
 USE_GNOME=	libxml2 libxslt
 USE_AUTOTOOLS=	libtool
+DOS2UNIX_FILES=	src/swft/swft_import_ttf.cpp
 
 PLIST_FILES=	bin/swfmill
 
diff --git a/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp b/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp
new file mode 100644
index 000000000000..016392c7fb41
--- /dev/null
+++ b/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp
@@ -0,0 +1,11 @@
+--- src/swft/swft_import_ttf.cpp.orig	2013-12-16 08:12:12.000000000 +0100
++++ src/swft/swft_import_ttf.cpp	2013-12-16 08:11:52.000000000 +0100
+@@ -14,7 +14,7 @@
+ #include FT_OUTLINE_H
+ #include "SWFShapeMaker.h"
+ 
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ using namespace SWF;
+ 
diff --git a/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt b/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt
new file mode 100644
index 000000000000..e6b48cb465d8
--- /dev/null
+++ b/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- thirdparty/ftgl/CMakeLists.txt.orig	2013-12-24 22:28:17.000000000 +0200
++++ thirdparty/ftgl/CMakeLists.txt	2013-12-24 22:28:03.000000000 +0200
+@@ -104,6 +104,7 @@
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
++INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+ 
+ ADD_LIBRARY(ftgl SHARED ${ftgl_SRCS} ${ftgl_headers_SRCS} ${ftglyph_SRCS} ${ftfont_SRCS} ${ftlayout_SRCS})
+ TARGET_LINK_LIBRARIES(ftgl ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY})
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index a46cf1eddd38..32f22b62dc5a 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -39,6 +39,7 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-ldl //' \
+		-e 's|freetype/||g' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
 	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \