Attachment #138582 for bug #184587

Lines 28-33 Link Here

(-)audio/lmms/Makefile (+1 lines)
28		28
29	OPTIONS_DEFINE= JACK PULSEAUDIO SDL	29	OPTIONS_DEFINE= JACK PULSEAUDIO SDL
30		30
		31	MAKE_JOBS_UNSAFE=yes
31	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
32	NO_STAGE= yes	33	NO_STAGE= yes
33	USE_BZIP2= yes	34	USE_BZIP2= yes

Line 0 Link Here

(-)audio/musescore/files/patch-mscore_mscore_genft.cpp (+11 lines)
	1	--- mscore/mscore/genft.cpp.orig 2013-12-13 09:46:58.000000000 +0100
	2	+++ mscore/mscore/genft.cpp 2013-12-13 09:50:06.000000000 +0100
	3	@@ -27,7 +27,7 @@
	4
	5	#include <ft2build.h>
	6	#include FT_FREETYPE_H
	7	-#include <freetype/tttables.h>
	8	+#include FT_TRUETYPE_TABLES_H
	9	#include "al/xml.h"
	10
	11	QMap<int, int> codemap;

Lines 21-25 Link Here

(-)comms/gtkmmorse/Makefile (+4 lines)
21	PLIST_FILES= bin/gtkmmorse	21	PLIST_FILES= bin/gtkmmorse
22	MAN1= gtkmmorse.1	22	MAN1= gtkmmorse.1
23		23
		24	post-patch:
		25	@${REINPLACE_CMD} -e 's\|-ansi\|\|g' -e 's\|-pedantic\|\|g' \
		26	${WRKSRC}/src/Makefile.in
		27
24	NO_STAGE= yes	28	NO_STAGE= yes
25	.include <bsd.port.mk>	29	.include <bsd.port.mk>




In the 2.5.1 release of freetype most of the headers where moved from 
freetype2/freetype/* -> freetype2/*. So we need to update the detection
rules to take this into account.

http://public.kitware.com/Bug/view.php?id=14601

--- Modules/FindFreetype.cmake.orig	2013-12-13 11:15:05.000000000 +0100
+++ Modules/FindFreetype.cmake	2013-12-13 11:15:39.000000000 +0100
@@ -56,7 +56,7 @@
   PATH_SUFFIXES include/freetype2 include
 )
 
-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
   HINTS
     ENV FREETYPE_DIR
   PATHS
@@ -91,8 +91,8 @@
 endif()
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
 
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
+if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
+    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
 
     unset(FREETYPE_VERSION_STRING)

Lines 1-7 Link Here

(-)devel/cmake-modules/Makefile (-1 / +1 lines)
1	# Created by: gahr	1	# Created by: gahr
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5	PKGNAMESUFFIX= -modules	5	PKGNAMESUFFIX= -modules
6		6
7	COMMENT= Modules and Templates for CMake	7	COMMENT= Modules and Templates for CMake

Lines 4-10 Link Here

(-)devel/lasi/Makefile (-1 / +1 lines)
4		4
5	PORTNAME= lasi	5	PORTNAME= lasi
6	PORTVERSION= 1.1.1	6	PORTVERSION= 1.1.1
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= devel	8	CATEGORIES= devel
9	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source	9	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
10	DISTNAME= libLASi-${PORTVERSION}	10	DISTNAME= libLASi-${PORTVERSION}




--- include/LASi.h.orig	2013-12-13 10:12:32.000000000 +0100
+++ include/LASi.h	2013-12-13 10:14:20.000000000 +0100
@@ -11,7 +11,8 @@
 #include <sstream>
 #include <map>
 #include <pango/pango.h>
-#include <freetype/ftglyph.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
 
 class FreetypeGlyphMgr;
 class ContextMgr;




--- src/drawGlyph.cpp.orig	2013-12-13 10:13:26.000000000 +0100
+++ src/drawGlyph.cpp	2013-12-13 10:15:19.000000000 +0100
@@ -6,7 +6,8 @@
  */
 
 #include <ostream>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_OUTLINE_H
 #include <algorithm>
 #include <LASi.h>
 #include <config.h>




--- src/drawGlyph.h.orig	2013-12-13 10:13:05.000000000 +0100
+++ src/drawGlyph.h	2013-12-13 10:15:40.000000000 +0100
@@ -10,7 +10,8 @@
 
 #include <iostream>
 #include <pango/pango.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.




--- src/glyphMgr.cpp.orig	2013-12-13 10:13:39.000000000 +0100
+++ src/glyphMgr.cpp	2013-12-13 10:17:39.000000000 +0100
@@ -10,8 +10,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 #include <cassert>
 #include "util.h"




--- src/glyphMgr.h.orig	2013-12-13 10:13:45.000000000 +0100
+++ src/glyphMgr.h	2013-12-13 10:17:50.000000000 +0100
@@ -15,8 +15,7 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
-#include <freetype/ftglyph.h>
+#include FT_GLYPH_H
 
 /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
  */

Line 0 Link Here

(-)devel/lasi/files/patch-src_util.h (+11 lines)
	1	--- src/util.h.orig 2013-12-13 10:13:16.000000000 +0100
	2	+++ src/util.h 2013-12-13 10:17:01.000000000 +0100
	3	@@ -18,7 +18,7 @@
	4
	5	#include <ft2build.h>
	6	#include FT_FREETYPE_H
	7	-#include <freetype/ftglyph.h>
	8	+#include FT_GLYPH_H
	9
	10	std::ostream& operator<<(std::ostream&, const FT_Library);
	11	std::ostream& operator<<(std::ostream&, const FT_Face);




--- src/modules/font/freetype/Font.h.orig	2013-12-13 10:24:12.000000000 +0100
+++ src/modules/font/freetype/Font.h	2013-12-13 10:25:51.000000000 +0100
@@ -30,10 +30,10 @@
 #else
 #include <ft2build.h>
 #endif
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 namespace love
 {




--- src/modules/font/freetype/TrueTypeRasterizer.h.orig	2013-12-13 10:24:01.000000000 +0100
+++ src/modules/font/freetype/TrueTypeRasterizer.h	2013-12-13 10:26:35.000000000 +0100
@@ -27,10 +27,10 @@
 
 // TrueType2
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 namespace love
 {




--- src/modules/font/freetype/Font.h.orig	2013-12-13 10:24:12.000000000 +0100
+++ src/modules/font/freetype/Font.h	2013-12-13 10:25:51.000000000 +0100
@@ -30,10 +30,10 @@
 #else
 #include <ft2build.h>
 #endif
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 namespace love
 {




--- src/modules/font/freetype/TrueTypeRasterizer.h.orig	2013-12-13 10:24:01.000000000 +0100
+++ src/modules/font/freetype/TrueTypeRasterizer.h	2013-12-13 10:26:35.000000000 +0100
@@ -27,10 +27,10 @@
 
 // TrueType2
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 namespace love
 {




--- src/opengl/TrueTypeFont.h.orig	2013-12-13 10:36:51.000000000 +0100
+++ src/opengl/TrueTypeFont.h	2013-12-13 10:38:20.000000000 +0100
@@ -13,10 +13,10 @@
 
 // FreeType2
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 // STD
 #include <string>

Line 0 Link Here

(-)editors/ted/files/patch-appFrame_appFontConfig.c (+11 lines)
	1	--- appFrame/appFontConfig.c.orig 2013-12-13 10:45:38.000000000 +0100
	2	+++ appFrame/appFontConfig.c 2013-12-13 10:46:24.000000000 +0100
	3	@@ -889,7 +889,7 @@
	4
	5	static const n2s xftn2s[]=
	6	{
	7	-# include <freetype/fterrdef.h>
	8	+# include FT_ERROR_DEFINITIONS_H
	9	};
	10
	11	for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )




--- src/fontloader.h.orig	2013-12-13 10:49:49.000000000 +0100
+++ src/fontloader.h	2013-12-13 10:50:39.000000000 +0100
@@ -12,11 +12,9 @@
 //FreeType Headers
 #include <ft2build.h>
 #include FT_FREETYPE_H
-
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 // Other Headers we'll need.
 #include <vector>




--- src/sge_tt_text.cpp.orig	2004-03-03 21:17:48.000000000 +0100
+++ src/sge_tt_text.cpp	2013-12-13 11:24:58.000000000 +0100
@@ -26,7 +26,6 @@
 
 #include "SDL.h"

 #include <memory.h>
 #include <string.h>
 #include <stdarg.h>
@@ -37,9 +36,9 @@
 
 #ifndef _SGE_NOTTF
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_IDS_H
 
 /* The structure used to hold glyph information (cached) */
 struct glyph {

Lines 30-41 Link Here

(-)games/scorched3d/Makefile (-1 / +4 lines)
30	USE_SDL= mixer net sdl	30	USE_SDL= mixer net sdl
31	USE_WX= 2.4+	31	USE_WX= 2.4+
32	WX_CONF_ARGS= absolute	32	WX_CONF_ARGS= absolute
33	USES= iconv perl5 gmake pkgconfig	33	USES= dos2unix iconv perl5 gmake pkgconfig
34	USE_AUTOTOOLS= aclocal automake autoconf	34	USE_AUTOTOOLS= aclocal automake autoconf
35	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal	35	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
36	AUTOMAKE_ARGS= --add-missing --copy --force --foreign	36	AUTOMAKE_ARGS= --add-missing --copy --force --foreign
37	CONFIGURE_ARGS= --datadir=${DATADIR}	37	CONFIGURE_ARGS= --datadir=${DATADIR}
38		38
		39	DOS2UNIX_FILES= src/client/GLEXT/GLFont2dFreeType.h \
		40	src/launcher/wxdialogs/TrueTypeFont.h
		41
39	CPPFLAGS+= -I${LOCALBASE}/include	42	CPPFLAGS+= -I${LOCALBASE}/include
40	LDFLAGS+= -L${LOCALBASE}/lib	43	LDFLAGS+= -L${LOCALBASE}/lib
41		44




--- src/client/GLEXT/GLFont2dFreeType.h.orig	2013-12-17 09:58:11.000000000 +0100
+++ src/client/GLEXT/GLFont2dFreeType.h	2013-12-17 09:59:18.000000000 +0100
@@ -23,10 +23,10 @@
 
 #include <GLEXT/GLFont2dStorage.h>
 #include <ft2build.h>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 #include <string>
 
 class GLFont2dFreeType




--- src/launcher/wxdialogs/TrueTypeFont.h.orig	2013-12-17 10:01:02.000000000 +0100
+++ src/launcher/wxdialogs/TrueTypeFont.h	2013-12-17 10:01:16.000000000 +0100
@@ -25,10 +25,10 @@
 #include <wx/image.h>
 #include <ft2build.h>
 #include <string>
-#include <freetype/freetype.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttrigon.h>
+#include FT_FREETYPE_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 class TrueTypeFont
 {




--- 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
 

 MagickLibConfigPathDefine="${MagickLibConfigPath}/"
 if test "$native_win32_build" = 'yes'
 then
@@ -34108,7 +34108,7 @@
 #
 # Path to GraphicsMagick share files
 MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"

 MagickSharePathDefine="${MagickSharePath}/"
 if test "$native_win32_build" = 'yes'
 then
@@ -34128,7 +34128,7 @@
 #define MagickShareConfigSubDir "$MagickShareConfigSubDir"
 _ACEOF
 




--- 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

 
 cat >>confdefs.h <<_ACEOF
 #define MagickLibSubdir "$MagickLibSubdir"
@@ -25193,7 +25193,7 @@
 
 #
 # Path to GraphicsMagick share files




--- 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

 
 cat >>confdefs.h <<_ACEOF
 #define MagickLibSubdir "$MagickLibSubdir"
@@ -27039,7 +27039,7 @@
 
 #
 # Path to GraphicsMagick share files

Line 0 Link Here

(-)graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake (+11 lines)
	1	--- cmake/modules/FindFreetype.cmake.orig 2013-12-13 12:47:10.000000000 +0100
	2	+++ cmake/modules/FindFreetype.cmake 2013-12-13 12:47:42.000000000 +0100
	3	@@ -12,7 +12,7 @@
	4
	5	# Include dir
	6	find_path(Freetype_INCLUDE_DIR
	7	- NAMES freetype/freetype.h
	8	+ NAMES freetype.h
	9	PATHS ${Freetype_PKGCONF_INCLUDE_DIRS}
	10	PATH_SUFFIXES freetype2
	11	)




--- 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
 




--- 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"




--- 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

Line 0 Link Here

(-)graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake (+11 lines)
	1	--- CMake/Packages/FindFreetype.cmake.orig 2013-12-16 01:09:22.000000000 +0100
	2	+++ CMake/Packages/FindFreetype.cmake 2013-12-16 01:09:58.000000000 +0100
	3	@@ -43,7 +43,7 @@
	4	findpkg_framework(FREETYPE)
	5	message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
	6
	7	-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
	8	+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
	9	find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
	10
	11	find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)

Lines 17-23 Link Here

(-)graphics/podofo/Makefile (-1 / +2 lines)
17	libfreetype.so:${PORTSDIR}/print/freetype2 \	17	libfreetype.so:${PORTSDIR}/print/freetype2 \
18	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig	18	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
19		19
20	USES= cmake	20	USES= cmake dos2unix
21	CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \	21	CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \
22	-DPODOFO_BUILD_STATIC:BOOL=FALSE \	22	-DPODOFO_BUILD_STATIC:BOOL=FALSE \
23	-DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \	23	-DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \
Lines 24-29 Link Here
24	-DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}"	24	-DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}"
25	USE_OPENSSL= yes	25	USE_OPENSSL= yes
26	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
		27	DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake
27		28
28	OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF	29	OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF
29	OPTIONS_DEFAULT= JPEG PNG TIFF	30	OPTIONS_DEFAULT= JPEG PNG TIFF




--- 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

Line 0 Link Here

(-)graphics/py-imaging/files/patch-_imagingft.c (+11 lines)
	1	--- _imagingft.c.orig 2013-12-16 01:41:20.000000000 +0100
	2	+++ _imagingft.c 2013-12-16 01:42:34.000000000 +0100
	3	@@ -70,7 +70,7 @@
	4	const char* message;
	5	} ft_errors[] =
	6
	7	-#include <freetype/fterrors.h>
	8	+#include FT_ERRORS_H
	9
	10	/* -------------------------------------------------------------------- */
	11	/* font objects */

Line 0 Link Here

(-)graphics/py-pillow/files/patch-_imagingft.c (+11 lines)
	1	--- _imagingft.c.orig 2013-12-16 01:41:20.000000000 +0100
	2	+++ _imagingft.c 2013-12-16 01:42:34.000000000 +0100
	3	@@ -70,7 +70,7 @@
	4	const char* message;
	5	} ft_errors[] =
	6
	7	-#include <freetype/fterrors.h>
	8	+#include FT_ERRORS_H
	9
	10	/* -------------------------------------------------------------------- */
	11	/* font objects */

Line 0 Link Here

(-)graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c (+11 lines)
	1	--- src/imaging/libimagingft/_imagingft.c.orig 2009-11-01 01:44:12.000000000 +0100
	2	+++ src/imaging/libimagingft/_imagingft.c 2013-12-16 01:46:04.000000000 +0100
	3	@@ -70,7 +70,7 @@
	4	const char* message;
	5	} ft_errors[] =
	6
	7	-#include <freetype/fterrors.h>
	8	+#include FT_ERRORS_H
	9
	10	/* -------------------------------------------------------------------- */
	11	/* font objects */




--- 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

Lines 14-22 Link Here

(-)graphics/swfmill/Makefile (-1 / +2 lines)
14	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \	14	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
15	libfreetype.so:${PORTSDIR}/print/freetype2	15	libfreetype.so:${PORTSDIR}/print/freetype2
16		16
17	USES= iconv gmake pkgconfig	17	USES= dos2unix iconv gmake pkgconfig
18	USE_GNOME= libxml2 libxslt	18	USE_GNOME= libxml2 libxslt
19	USE_AUTOTOOLS= libtool	19	USE_AUTOTOOLS= libtool
		20	DOS2UNIX_FILES= src/swft/swft_import_ttf.cpp
20		21
21	PLIST_FILES= bin/swfmill	22	PLIST_FILES= bin/swfmill
22		23

Line 0 Link Here

(-)graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp (+11 lines)
	1	--- src/swft/swft_import_ttf.cpp.orig 2013-12-16 08:12:12.000000000 +0100
	2	+++ src/swft/swft_import_ttf.cpp 2013-12-16 08:11:52.000000000 +0100
	3	@@ -14,7 +14,7 @@
	4	#include FT_OUTLINE_H
	5	#include "SWFShapeMaker.h"
	6
	7	-#include <freetype/tttables.h>
	8	+#include FT_TRUETYPE_TABLES_H
	9
	10	using namespace SWF;
	11

Lines 39-44 Link Here

(-)graphics/xpaint/Makefile (+1 lines)
39		39
40	post-patch:	40	post-patch:
41	@${REINPLACE_CMD} -e 's/-ldl //' \	41	@${REINPLACE_CMD} -e 's/-ldl //' \
		42	-e 's\|freetype/\|\|g' \
42	${WRKSRC}/configure ${WRKSRC}/rw/configure	43	${WRKSRC}/configure ${WRKSRC}/rw/configure
43	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \	44	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
44	-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \	45	-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \

Line 0 Link Here

(-)japanese/xdvik/files/patch-texk_xdvik_vf2ft.c (+10 lines)
	1	--- xdvik-22.40w/texk/xdvik/vf2ft.c.orig 2013-12-16 09:29:17.000000000 +0100
	2	+++ xdvik-22.40w/texk/xdvik/vf2ft.c 2013-12-16 09:29:47.000000000 +0100
	3	@@ -1278,7 +1278,6 @@
	4
	5	static int fontsmax=0;
	6
	7	-#include <freetype/freetype.h>
	8	#include "vf2ft.h"
	9
	10	int VF_Init(char *vfcap)




--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig	2013-12-16 09:41:00.000000000 +0100
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c	2013-12-16 09:42:44.000000000 +0100
@@ -42,8 +42,9 @@
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
 #include "jcl.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"




--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c.orig	2013-12-16 09:40:51.000000000 +0100
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c	2013-12-16 09:44:06.000000000 +0100
@@ -39,10 +39,11 @@
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
-#include <freetype/fttypes.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TYPES_H
+#include FT_TRUETYPE_TABLES_H
 #include "gdkfont.h"
 #include "gtkpeer.h"
 #include "gnu_java_awt_peer_gtk_GdkFontPeer.h"




--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.orig	2013-12-16 10:19:17.000000000 +0100
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c	2013-12-16 10:19:47.000000000 +0100
@@ -42,8 +42,9 @@
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 #include <pango/pangofc-font.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
 #include "native_state.h"
 #include "gdkfont.h"
 #include "gnu_java_awt_peer_gtk_GdkTextLayout.h"

Lines 169-174 Link Here

(-)lang/php5/Makefile (+1 lines)
169		169
170	post-patch:	170	post-patch:
171	@${TOUCH} ${WRKSRC}/ext/php_config.h	171	@${TOUCH} ${WRKSRC}/ext/php_config.h
		172	@${REINPLACE_CMD} -e 's\|freetype/\|\|g' ${WRKSRC}/configure
172	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*	173	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*
173	.if ${PORT_OPTIONS:MFPM}	174	.if ${PORT_OPTIONS:MFPM}
174	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \	175	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \

Lines 194-199 Link Here

(-)lang/php52/Makefile (+1 lines)
194		194
195	post-patch:	195	post-patch:
196	@${TOUCH} ${WRKSRC}/ext/php_config.h	196	@${TOUCH} ${WRKSRC}/ext/php_config.h
		197	@${REINPLACE_CMD} -e 's\|freetype/\|\|g' ${WRKSRC}/configure
197	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*	198	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*
198	.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI}	199	.if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI}
199	@${REINPLACE_CMD} -e 's,BUILD_CGI=\"\\$$$.*$\\$$(EXTRA_LIBS),BUILD_CGI=\"\\$$\1\\$$(EXTRA_LIBS) \\$$(SAPI_EXTRA_LIBS),g' \	200	@${REINPLACE_CMD} -e 's,BUILD_CGI=\"\\$$$.*$\\$$(EXTRA_LIBS),BUILD_CGI=\"\\$$\1\\$$(EXTRA_LIBS) \\$$(SAPI_EXTRA_LIBS),g' \

Lines 154-159 Link Here

(-)lang/php53/Makefile (+1 lines)
154		154
155	post-patch:	155	post-patch:
156	@${TOUCH} ${WRKSRC}/ext/php_config.h	156	@${TOUCH} ${WRKSRC}/ext/php_config.h
		157	@${REINPLACE_CMD} -e 's\|freetype/\|\|g' ${WRKSRC}/configure
157	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*	158	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*
158	.if ${PORT_OPTIONS:MFPM}	159	.if ${PORT_OPTIONS:MFPM}
159	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \	160	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \

Lines 169-174 Link Here

(-)lang/php55/Makefile (+1 lines)
169		169
170	post-patch:	170	post-patch:
171	@${TOUCH} ${WRKSRC}/ext/php_config.h	171	@${TOUCH} ${WRKSRC}/ext/php_config.h
		172	@${REINPLACE_CMD} -e 's\|freetype/\|\|g' ${WRKSRC}/configure
172	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*	173	@${REINPLACE_CMD} "s\|^$extension_dir$\|; \1\|" ${WRKSRC}/php.ini-*
173	.if ${PORT_OPTIONS:MFPM}	174	.if ${PORT_OPTIONS:MFPM}
174	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \	175	@${REINPLACE_CMD} -e "s\|^;$pid$\|\1\|;s\|^;$pm\.[a-z_]*_servers$\|\1\|" \

Lines 349-354 Link Here

(-)multimedia/ffmpeg/Makefile (+1 lines)
349	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	349	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
350	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \	350	@${REINPLACE_CMD} -e 's\|-ldl\|\|' \
351	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \	351	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \
		352	-e 's\|freetype/freetype.h\|freetype.h\|g' \
352	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	353	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
353	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \	354	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \
354	${WRKSRC}/doc/texi2pod.pl	355	${WRKSRC}/doc/texi2pod.pl

Line 0 Link Here

(-)multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c (+10 lines)
	1	--- libavfilter/vf_drawtext.c.orig 2013-11-20 03:28:56.000000000 +0100
	2	+++ libavfilter/vf_drawtext.c 2013-12-06 18:26:57.000000000 +0100
	3	@@ -48,7 +48,6 @@
	4	#include "video.h"
	5
	6	#include <ft2build.h>
	7	-#include <freetype/config/ftheader.h>
	8	#include FT_FREETYPE_H
	9	#include FT_GLYPH_H
	10	#if CONFIG_FONTCONFIG

Lines 413-418 Link Here

(-)multimedia/ffmpeg0/Makefile (+1 lines)
413	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	413	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
414	@${REINPLACE_CMD} -e 's\|-ldl\|\|; s\|$$(LIBMAJOR)\|${SHLIB_VER}\|g;' \	414	@${REINPLACE_CMD} -e 's\|-ldl\|\|; s\|$$(LIBMAJOR)\|${SHLIB_VER}\|g;' \
415	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \	415	-e 's\|opencv opencv/cxcore.h\|opencv-core opencv2/core/core_c.h\|g' \
		416	-e 's\|freetype/freetype.h\|freetype.h\|g' \
416	-e 's\|check_ldflags -Wl,--as-needed\|\|' \	417	-e 's\|check_ldflags -Wl,--as-needed\|\|' \
417	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	418	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
418	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \	419	@${REINPLACE_CMD} -e 's\|/usr/bin/perl\|${PERL5}\|g' \

Line 0 Link Here

(-)multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c (+10 lines)
	1	--- libavfilter/vf_drawtext.c.orig 2013-12-06 18:18:29.000000000 +0100
	2	+++ libavfilter/vf_drawtext.c 2013-12-06 18:18:49.000000000 +0100
	3	@@ -41,7 +41,6 @@
	4	#undef time
	5
	6	#include <ft2build.h>
	7	-#include <freetype/config/ftheader.h>
	8	#include FT_FREETYPE_H
	9	#include FT_GLYPH_H
	10

Line 0 Link Here

(-)multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c (+5 lines)
	1	28c28,29
	2	< #include <freetype/freetype.h>
	3	---
	4	> #include <ft2build.h>
	5	> #include FT_FREETYPE_H




#   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $

PORTNAME=	freetype2
PORTVERSION=	2.5.2
CATEGORIES=	print
MASTER_SITES=	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Free and portable TrueType font rendering engine

USE_AUTOTOOLS=	libtool
USE_BZIP2=	yes
USES=		gmake
MAKE_ENV=	TOP=""

USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	ltverhack:9
ltverhack_PATCH_FILES=	builds/unix/ltmain.sh
CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix

OPTIONS_DEFINE=		LCD_FILTERING PNG

LCD_FILTERING_DESC?=	Sub-pixel rendering (patented)
PNG_DESC=		Png compressed OpenType embedded bitmaps support

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MLCD_FILTERING}

	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
		${WRKSRC}/builds/unix/install.mk

pre-configure:
	@${REINPLACE_CMD} -e '/^LIBTOOL/s|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool|LIBTOOL := ${WRKDIR}/gnome-libtool|' \
	    	${WRKSRC}/builds/unix/unix-cc.in

post-configure:
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.9

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)print/freetype2/distinfo (-2 / +2 lines)
1	SHA256 (freetype-2.5.0.1.tar.bz2) = 57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5	1	SHA256 (freetype-2.5.2.tar.bz2) = 4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def
2	SIZE (freetype-2.5.0.1.tar.bz2) = 1607037	2	SIZE (freetype-2.5.2.tar.bz2) = 1676373




--- builds/unix/freetype-config.in.orig	2009-12-21 18:23:42.000000000 -0500
+++ builds/unix/freetype-config.in	2010-02-21 15:51:17.000000000 -0500
@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the
 fi
 
 if test "$echo_cflags" = "yes" ; then
-  cflags="-I${SYSROOT}$includedir/freetype2"
-  if test "${SYSROOT}$includedir" != "/usr/include" ; then
-    echo $cflags -I${SYSROOT}$includedir
-  else
-    echo $cflags
-  fi
+   cflags="-I$includedir/freetype2 -I$includedir"
+   echo $cflags
 fi
 
 if test "$echo_libs" = "yes" ; then




bin/freetype-config
include/freetype2/config/ftconfig.h
include/freetype2/config/ftheader.h
include/freetype2/config/ftmodule.h
include/freetype2/config/ftoption.h
include/freetype2/config/ftstdlib.h
include/freetype2/freetype.h
include/freetype2/ft2build.h
include/freetype2/ftadvanc.h
include/freetype2/ftautoh.h
include/freetype2/ftbbox.h
include/freetype2/ftbdf.h
include/freetype2/ftbitmap.h
include/freetype2/ftbzip2.h
include/freetype2/ftcache.h
include/freetype2/ftcffdrv.h
include/freetype2/ftchapters.h
include/freetype2/ftcid.h
include/freetype2/fterrdef.h
include/freetype2/fterrors.h
include/freetype2/ftgasp.h
include/freetype2/ftglyph.h
include/freetype2/ftgxval.h
include/freetype2/ftgzip.h
include/freetype2/ftimage.h
include/freetype2/ftincrem.h
include/freetype2/ftlcdfil.h
include/freetype2/ftlist.h
include/freetype2/ftlzw.h
include/freetype2/ftmac.h
include/freetype2/ftmm.h
include/freetype2/ftmodapi.h
include/freetype2/ftmoderr.h
include/freetype2/ftotval.h
include/freetype2/ftoutln.h
include/freetype2/ftpfr.h
include/freetype2/ftrender.h
include/freetype2/ftsizes.h
include/freetype2/ftsnames.h
include/freetype2/ftstroke.h
include/freetype2/ftsynth.h
include/freetype2/ftsystem.h
include/freetype2/ftttdrv.h
include/freetype2/fttrigon.h
include/freetype2/fttypes.h
include/freetype2/ftwinfnt.h
include/freetype2/ftxf86.h
include/freetype2/t1tables.h
include/freetype2/ttnameid.h
include/freetype2/tttables.h
include/freetype2/tttags.h
include/freetype2/ttunpat.h
lib/libfreetype.a
lib/libfreetype.la
lib/libfreetype.so

lib/libfreetype.so.9
libdata/pkgconfig/freetype2.pc
share/aclocal/freetype2.m4
@dirrm include/freetype2/config
@dirrm include/freetype2/freetype
@dirrm include/freetype2




# $FreeBSD$

PORTNAME=	ft2demos
PORTVERSION=	2.5.2
CATEGORIES=	print
MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION} \
		RINGSERVER/graphics/freetype/freetype2

COMMENT=	Demo programs for FreeType2

BUILD_DEPENDS+=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2

USE_BZIP2=	yes
USE_XORG=	xext
USES=		gmake
USE_AUTOTOOLS=	libtool:env
MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
MAKE_ARGS=	EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"

FT_PROGRAMS=	ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \
		ftmulti ftpatchk ftstring fttimer ftvalid ftview

NO_STAGE=	yes
.include <bsd.port.pre.mk>

FREETYPE_WRKSRC!=	cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC

do-install:
	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin)

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)print/ft2demos/distinfo (-2 / +2 lines)
1	SHA256 (ft2demos-2.4.11.tar.bz2) = 49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075	1	SHA256 (ft2demos-2.5.2.tar.bz2) = a3cdf60186caeb68cafc98b6b32c54ae9467a7a844865db161510a17a2d14471
2	SIZE (ft2demos-2.4.11.tar.bz2) = 164608	2	SIZE (ft2demos-2.5.2.tar.bz2) = 185966




--- lily/freetype-error.cc.orig	2013-12-16 15:18:38.000000000 +0100
+++ lily/freetype-error.cc	2013-12-16 15:19:06.000000000 +0100
@@ -31,7 +31,8 @@
   const char *err_msg;
 } ft_errors[] =
 
-#include <freetype/fterrors.h>
+#include <ft2build.h>
+#include FT_ERRORS_H
 
   ;
 




--- lily/open-type-font.cc.orig	2013-12-16 15:54:16.000000000 +0100
+++ lily/open-type-font.cc	2013-12-16 15:54:45.000000000 +0100
@@ -23,7 +23,8 @@
 
 using namespace std;
 
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
 
 #include "dimensions.hh"
 #include "international.hh"




--- lily/pango-font.cc.orig	2013-12-16 15:49:55.000000000 +0100
+++ lily/pango-font.cc	2013-12-16 15:50:46.000000000 +0100
@@ -22,7 +22,8 @@
 #define PANGO_ENABLE_BACKEND
 
 #include <pango/pangoft2.h>
-#include <freetype/ftxf86.h>
+#include <ft2build.h>
+#include FT_XFREE86_H
 
 #include <map>
 #include <cstdio>




--- lily/ttf.cc.orig	2013-12-16 15:48:08.000000000 +0100
+++ lily/ttf.cc	2013-12-16 15:48:37.000000000 +0100
@@ -20,7 +20,8 @@
 #include <cstdio>
 #include "freetype.hh"
 
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
 
 #include "international.hh"
 #include "memory-stream.hh"




--- src/libpaps.c.orig	2013-12-16 16:10:33.000000000 +0100
+++ src/libpaps.c	2013-12-16 16:11:06.000000000 +0100
@@ -25,8 +25,9 @@
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
-#include <freetype/ftglyph.h>
-#include <freetype/ftoutln.h>
+#include <ft2build.h>
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>

Lines 1-12 Link Here

(-)print/ttf2pt1/files/patch-ft.c (-6 / +14 lines)
1	--- ft.c.orig Sun Mar 21 18:24:06 2004	1	--- ft.c.orig 2003-12-31 22:30:50.000000000 +0100
2	+++ ft.c Sun Mar 21 18:24:31 2004	2	+++ ft.c 2013-12-16 16:50:37.000000000 +0100
3	@@ -12,7 +12,8 @@	3	@@ -12,11 +12,12 @@
4	#include <stdlib.h>	4	#include <stdlib.h>
5	#include <ctype.h>	5	#include <ctype.h>
6	#include <sys/types.h>	6	#include <sys/types.h>
7	-#include <freetype/freetype.h>	7	-#include <freetype/freetype.h>
		8	-#include <freetype/ftglyph.h>
		9	-#include <freetype/ftsnames.h>
		10	-#include <freetype/ttnameid.h>
		11	-#include <freetype/ftoutln.h>
8	+#include <ft2build.h>	12	+#include <ft2build.h>
9	+#include FT_FREETYPE_H	13	+#include FT_FREETYPE_H
10	#include <freetype/ftglyph.h>	14	+#include FT_GLYPH_H
11	#include <freetype/ftsnames.h>	15	+#include FT_SFNT_NAMES_H
12	#include <freetype/ttnameid.h>	16	+#include FT_TRUETYPE_IDS_H
		17	+#include FT_OUTLINE_H
		18	#include "pt1.h"
		19	#include "global.h"
		20




--- VTK/CMake/FindFREETYPE.cmake.orig	2011-04-13 19:17:14.000000000 +0300
+++ VTK/CMake/FindFREETYPE.cmake	2013-12-23 19:50:03.000000000 +0200
@@ -10,9 +10,9 @@
 # also defined, but not for general use are
 # FREETYPE_LIBRARY, where to find the FREETYPE library.
 
-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
+FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h)
 
-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
 )

Lines 27-32 Link Here

(-)x11-fm/xfe/Makefile (+1 lines)
27	${WRKSRC}/src/XFileExplorer.cpp \	27	${WRKSRC}/src/XFileExplorer.cpp \
28	${WRKSRC}/src/help.h \	28	${WRKSRC}/src/help.h \
29	${WRKSRC}/src/xfedefs.h	29	${WRKSRC}/src/xfedefs.h
		30	@${REINPLACE_CMD} -e 's\|freetype/\|\|g' ${WRKSRC}/configure
30		31
31	.include <bsd.port.options.mk>	32	.include <bsd.port.options.mk>
32		33




--- cmake/modules/FREETYPEConfig.cmake.orig	2008-04-07 23:45:10.000000000 +0300
+++ cmake/modules/FREETYPEConfig.cmake	2013-12-23 19:53:13.000000000 +0200
@@ -1,14 +1,14 @@
 #
 # Find the native FREETYPE includes and library
 # (from Scribus)
-  FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
-    /usr/include/
-    /usr/local/include/
-    /usr/X11R6/include/
+  FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h
+    /usr/include
+    /usr/local/include
+    /usr/X11R6/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/X11R6/include/freetype2

Lines 1-6 Link Here

(-)x11-fonts/ttmkfdir/files/patch-ttf.cpp (-7 / +17 lines)
1	--- ttf.cpp 2003-01-08 00:25:25.000000000 -0500	1	--- ttf.cpp.orig 2003-01-08 06:25:25.000000000 +0100
2	+++ ttf.cpp 2012-12-07 12:34:54.000000000 -0500	2	+++ ttf.cpp 2013-12-17 00:08:13.000000000 +0100
3	@@ -51,20 +51,27 @@	3	@@ -3,7 +3,8 @@
		4	#include <cctype>
		5	#include <cstring>
		6
		7	-#include "freetype/tttables.h"
		8	+#include <ft2build.h>
		9	+#include FT_TRUETYPE_TABLES_H
		10	#include "ttmkfdir.h"
		11	#include "ttf.h"
		12	#include "ttos2val.h"
		13	@@ -51,20 +52,27 @@
4	bool	14	bool
5	Face::MappingPresent (int cmapidx, NumericMapping *m, int enc_size, int start_code, bool enc_comp)	15	Face::MappingPresent (int cmapidx, NumericMapping *m, int enc_size, int start_code, bool enc_comp)
6	{	16	{
Lines 35-41 Link Here
35	}	45	}
36		46
37	Face::Face (const std::string &filename)	47	Face::Face (const std::string &filename)
38	@@ -239,7 +246,7 @@	48	@@ -239,7 +247,7 @@
39	for (i = 0; i < n; i++) {	49	for (i = 0; i < n; i++) {
40	if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {	50	if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
41	std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;	51	std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
Lines 44-50 Link Here
44	};	54	};
45	platform = NamePtr.platform_id;	55	platform = NamePtr.platform_id;
46	encoding = NamePtr.encoding_id;	56	encoding = NamePtr.encoding_id;
47	@@ -483,7 +490,7 @@	57	@@ -483,7 +491,7 @@
48	const char *	58	const char *
49	Face::PanoseWeight (void) const	59	Face::PanoseWeight (void) const
50	{	60	{
Lines 53-59 Link Here
53	"any",	63	"any",
54	"no fit",	64	"no fit",
55	"very light",	65	"very light",
56	@@ -548,7 +555,7 @@	66	@@ -548,7 +556,7 @@
57	const char *	67	const char *
58	Face::PanoseWidth (void) const	68	Face::PanoseWidth (void) const
59	{	69	{
Lines 62-68 Link Here
62	"any",	72	"any",
63	"no fit",	73	"no fit",
64	"old style",	74	"old style",
65	@@ -561,7 +568,7 @@	75	@@ -561,7 +569,7 @@
66	"monospaced",	76	"monospaced",
67	};	77	};
68		78

Lines 1-5 Link Here

(-)x11-toolkits/fltk-devel/files/patch-CMakeLists.txt (-2 / +11 lines)
1	--- CMakeLists.txt.orig 2013-09-11 14:54:40.000000000 +0200	1	--- CMakeLists.txt.orig 2013-09-11 15:54:40.000000000 +0300
2	+++ CMakeLists.txt 2013-10-23 16:43:54.000000000 +0200	2	+++ CMakeLists.txt 2013-12-23 19:35:33.000000000 +0200
3	@@ -54,6 +54,12 @@	3	@@ -54,6 +54,12 @@
4	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")	4	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
5	endif(APPLE)	5	endif(APPLE)
Lines 13-18 Link Here
13	if(WIN32)	13	if(WIN32)
14	if(MSVC)	14	if(MSVC)
15	add_definitions(-DWIN32_LEAN_AND_MEAN)	15	add_definitions(-DWIN32_LEAN_AND_MEAN)
		16	@@ -129,7 +135,7 @@
		17	mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H)
		18
		19	# where to find freetype headers
		20	-find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2)
		21	+find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2)
		22	if(FREETYPE_PATH)
		23	include_directories(${FREETYPE_PATH})
		24	endif(FREETYPE_PATH)
16	@@ -681,7 +687,7 @@	25	@@ -681,7 +687,7 @@
17	install(FILES	26	install(FILES
18	${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man	27	${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man




--- src/gdiplus-private.h.orig	2013-12-17 00:22:34.000000000 +0100
+++ src/gdiplus-private.h	2013-12-17 00:23:00.000000000 +0100
@@ -30,7 +30,8 @@
 #include <stdio.h>
 #include <math.h>
 #include <glib.h>
-#include <freetype/tttables.h>
+#include <ft2build.h>
+#include FT_TRUETYPE_TABLES_H
 #include <pthread.h>
 #include <unistd.h>
 

Return to bug 184587

Line 0 Link Here

(-)devel/cmake/files/patch-Modules_FindFreetype.cmake (+28 lines)
	1	In the 2.5.1 release of freetype most of the headers where moved from
	2	freetype2/freetype/* -> freetype2/*. So we need to update the detection
	3	rules to take this into account.
	4
	5	http://public.kitware.com/Bug/view.php?id=14601
	6
	7	--- Modules/FindFreetype.cmake.orig 2013-12-13 11:15:05.000000000 +0100
	8	+++ Modules/FindFreetype.cmake 2013-12-13 11:15:39.000000000 +0100
	9	@@ -56,7 +56,7 @@
	10	PATH_SUFFIXES include/freetype2 include
	11	)
	12
	13	-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
	14	+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
	15	HINTS
	16	ENV FREETYPE_DIR
	17	PATHS
	18	@@ -91,8 +91,8 @@
	19	endif()
	20	set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
	21
	22	-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
	23	- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
	24	+if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
	25	+ file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
	26	REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR\|MINOR\|PATCH)[\t ]+[0-9]+$")
	27
	28	unset(FREETYPE_VERSION_STRING)

Line 0 Link Here

(-)devel/lasi/files/patch-include_LASi.h (+12 lines)
	1	--- include/LASi.h.orig 2013-12-13 10:12:32.000000000 +0100
	2	+++ include/LASi.h 2013-12-13 10:14:20.000000000 +0100
	3	@@ -11,7 +11,8 @@
	4	#include <sstream>
	5	#include <map>
	6	#include <pango/pango.h>
	7	-#include <freetype/ftglyph.h>
	8	+#include <ft2build.h>
	9	+#include FT_GLYPH_H
	10
	11	class FreetypeGlyphMgr;
	12	class ContextMgr;

Line 0 Link Here

(-)devel/lasi/files/patch-src_drawGlyph.cpp (+12 lines)
	1	--- src/drawGlyph.cpp.orig 2013-12-13 10:13:26.000000000 +0100
	2	+++ src/drawGlyph.cpp 2013-12-13 10:15:19.000000000 +0100
	3	@@ -6,7 +6,8 @@
	4	*/
	5
	6	#include <ostream>
	7	-#include <freetype/ftoutln.h>
	8	+#include <ft2build.h>
	9	+#include FT_OUTLINE_H
	10	#include <algorithm>
	11	#include <LASi.h>
	12	#include <config.h>

Line 0 Link Here

(-)devel/lasi/files/patch-src_drawGlyph.h (+12 lines)
	1	--- src/drawGlyph.h.orig 2013-12-13 10:13:05.000000000 +0100
	2	+++ src/drawGlyph.h 2013-12-13 10:15:40.000000000 +0100
	3	@@ -10,7 +10,8 @@
	4
	5	#include <iostream>
	6	#include <pango/pango.h>
	7	-#include <freetype/freetype.h>
	8	+#include <ft2build.h>
	9	+#include FT_FREETYPE_H
	10
	11	/** Generate the Postscript commands to draw the glyph
	12	* using the font in pPangoCtx.

Line 0 Link Here

(-)devel/lasi/files/patch-src_glyphMgr.cpp (+12 lines)
	1	--- src/glyphMgr.cpp.orig 2013-12-13 10:13:39.000000000 +0100
	2	+++ src/glyphMgr.cpp 2013-12-13 10:17:39.000000000 +0100
	3	@@ -10,8 +10,7 @@
	4
	5	#include <ft2build.h>
	6	#include FT_FREETYPE_H
	7	-
	8	-#include <freetype/ftglyph.h>
	9	+#include FT_GLYPH_H
	10
	11	#include <cassert>
	12	#include "util.h"

Line 0 Link Here

(-)devel/lasi/files/patch-src_glyphMgr.h (+12 lines)
	1	--- src/glyphMgr.h.orig 2013-12-13 10:13:45.000000000 +0100
	2	+++ src/glyphMgr.h 2013-12-13 10:17:50.000000000 +0100
	3	@@ -15,8 +15,7 @@
	4
	5	#include <ft2build.h>
	6	#include FT_FREETYPE_H
	7	-
	8	-#include <freetype/ftglyph.h>
	9	+#include FT_GLYPH_H
	10
	11	/** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
	12	*/

Line 0 Link Here

(-)devel/love/files/patch-src_modules_font_freetype_Font.h (+17 lines)
	1	--- src/modules/font/freetype/Font.h.orig 2013-12-13 10:24:12.000000000 +0100
	2	+++ src/modules/font/freetype/Font.h 2013-12-13 10:25:51.000000000 +0100
	3	@@ -30,10 +30,10 @@
	4	#else
	5	#include <ft2build.h>
	6	#endif
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	namespace love
	17	{

Line 0 Link Here

(-)devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h (+17 lines)
	1	--- src/modules/font/freetype/TrueTypeRasterizer.h.orig 2013-12-13 10:24:01.000000000 +0100
	2	+++ src/modules/font/freetype/TrueTypeRasterizer.h 2013-12-13 10:26:35.000000000 +0100
	3	@@ -27,10 +27,10 @@
	4
	5	// TrueType2
	6	#include <ft2build.h>
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	namespace love
	17	{

Line 0 Link Here

(-)devel/love07/files/patch-src_modules_font_freetype_Font.h (+17 lines)
	1	--- src/modules/font/freetype/Font.h.orig 2013-12-13 10:24:12.000000000 +0100
	2	+++ src/modules/font/freetype/Font.h 2013-12-13 10:25:51.000000000 +0100
	3	@@ -30,10 +30,10 @@
	4	#else
	5	#include <ft2build.h>
	6	#endif
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	namespace love
	17	{

Line 0 Link Here

(-)devel/love5/files/patch-src_opengl_TrueTypeFont.h (+17 lines)
	1	--- src/opengl/TrueTypeFont.h.orig 2013-12-13 10:36:51.000000000 +0100
	2	+++ src/opengl/TrueTypeFont.h 2013-12-13 10:38:20.000000000 +0100
	3	@@ -13,10 +13,10 @@
	4
	5	// FreeType2
	6	#include <ft2build.h>
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	// STD
	17	#include <string>

Line 0 Link Here

(-)games/brutalchess/files/patch-src_fontloader.h (+17 lines)
	1	--- src/fontloader.h.orig 2013-12-13 10:49:49.000000000 +0100
	2	+++ src/fontloader.h 2013-12-13 10:50:39.000000000 +0100
	3	@@ -12,11 +12,9 @@
	4	//FreeType Headers
	5	#include <ft2build.h>
	6	#include FT_FREETYPE_H
	7	-
	8	-#include <freetype/freetype.h>
	9	-#include <freetype/ftglyph.h>
	10	-#include <freetype/ftoutln.h>
	11	-#include <freetype/fttrigon.h>
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	// Other Headers we'll need.
	17	#include <vector>

Lines 1-5 Link Here

(-)games/openmortal/files/patch-src-sge__tt__text.cpp (-2 / +15 lines)
1	--- src/sge_tt_text.cpp.orig Tue Sep 12 18:29:07 2006	1	--- src/sge_tt_text.cpp.orig 2004-03-03 21:17:48.000000000 +0100
2	+++ src/sge_tt_text.cpp Tue Sep 12 18:29:12 2006	2	+++ src/sge_tt_text.cpp 2013-12-13 11:24:58.000000000 +0100
3	@@ -26,7 +26,6 @@	3	@@ -26,7 +26,6 @@
4		4
5	#include "SDL.h"	5	#include "SDL.h"
Lines 8-10 Link Here
8	#include <memory.h>	8	#include <memory.h>
9	#include <string.h>	9	#include <string.h>
10	#include <stdarg.h>	10	#include <stdarg.h>
		11	@@ -37,9 +36,9 @@
		12
		13	#ifndef _SGE_NOTTF
		14	#include <ft2build.h>
		15	-#include <freetype/freetype.h>
		16	-#include <freetype/ftoutln.h>
		17	-#include <freetype/ttnameid.h>
		18	+#include FT_FREETYPE_H
		19	+#include FT_OUTLINE_H
		20	+#include FT_TRUETYPE_IDS_H
		21
		22	/* The structure used to hold glyph information (cached) */
		23	struct glyph {

Line 0 Link Here

(-)games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h (+17 lines)
	1	--- src/client/GLEXT/GLFont2dFreeType.h.orig 2013-12-17 09:58:11.000000000 +0100
	2	+++ src/client/GLEXT/GLFont2dFreeType.h 2013-12-17 09:59:18.000000000 +0100
	3	@@ -23,10 +23,10 @@
	4
	5	#include <GLEXT/GLFont2dStorage.h>
	6	#include <ft2build.h>
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15	#include <string>
	16
	17	class GLFont2dFreeType

Line 0 Link Here

(-)games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h (+17 lines)
	1	--- src/launcher/wxdialogs/TrueTypeFont.h.orig 2013-12-17 10:01:02.000000000 +0100
	2	+++ src/launcher/wxdialogs/TrueTypeFont.h 2013-12-17 10:01:16.000000000 +0100
	3	@@ -25,10 +25,10 @@
	4	#include <wx/image.h>
	5	#include <ft2build.h>
	6	#include <string>
	7	-#include <freetype/freetype.h>
	8	-#include <freetype/ftglyph.h>
	9	-#include <freetype/ftoutln.h>
	10	-#include <freetype/fttrigon.h>
	11	+#include FT_FREETYPE_H
	12	+#include FT_GLYPH_H
	13	+#include FT_OUTLINE_H
	14	+#include FT_TRIGONOMETRY_H
	15
	16	class TrueTypeFont
	17	{

Lines 1-6 Link Here

(-)graphics/GraphicsMagick/files/patch-configure (-5 / +34 lines)
1	--- ./configure.orig 2008-04-10 11:16:29.000000000 -0400	1	--- configure.orig 2008-11-20 04:31:11.000000000 +0100
2	+++ ./configure 2008-09-02 08:05:29.000000000 -0400	2	+++ configure 2013-12-13 12:12:27.000000000 +0100
3	@@ -34040,7 +34040,7 @@	3	@@ -32116,7 +32116,7 @@
		4	fi
		5
		6	# Some Freetype installs appear to require that <ft2build.h> be
		7	- # included prior to including <freetype/freetype.h>. Oops!
		8	+ # included prior to including <freetype.h>. Oops!
		9	if test "${ac_cv_header_ft2build_h+set}" = set; then
		10	{ echo "$as_me:$LINENO: checking for ft2build.h" >&5
		11	echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
		12	@@ -32249,8 +32249,8 @@
		13	fi
		14
		15
		16	- { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5
		17	-echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; }
		18	+ { echo "$as_me:$LINENO: checking for freetype.h" >&5
		19	+echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; }
		20	if test "${ac_cv_header_freetype_freetype_h+set}" = set; then
		21	echo $ECHO_N "(cached) $ECHO_C" >&6
		22	else
		23	@@ -32262,7 +32262,7 @@
		24	/* end confdefs.h. */
		25	$FT2BUILD_H
		26
		27	-#include <freetype/freetype.h>
		28	+#include <freetype.h>
		29	_ACEOF
		30	rm -f conftest.$ac_objext
		31	if { (ac_try="$ac_compile"
		32	@@ -34050,7 +34050,7 @@
4	#define MagickLibConfigSubDir "$MagickLibConfigSubDir"	33	#define MagickLibConfigSubDir "$MagickLibConfigSubDir"
5	_ACEOF	34	_ACEOF
6		35
Lines 9-15 Link Here
9	MagickLibConfigPathDefine="${MagickLibConfigPath}/"	38	MagickLibConfigPathDefine="${MagickLibConfigPath}/"
10	if test "$native_win32_build" = 'yes'	39	if test "$native_win32_build" = 'yes'
11	then	40	then
12	@@ -34098,7 +34098,7 @@	41	@@ -34108,7 +34108,7 @@
13	#	42	#
14	# Path to GraphicsMagick share files	43	# Path to GraphicsMagick share files
15	MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"	44	MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
Lines 18-24 Link Here
18	MagickSharePathDefine="${MagickSharePath}/"	47	MagickSharePathDefine="${MagickSharePath}/"
19	if test "$native_win32_build" = 'yes'	48	if test "$native_win32_build" = 'yes'
20	then	49	then
21	@@ -34118,7 +34118,7 @@	50	@@ -34128,7 +34128,7 @@
22	#define MagickShareConfigSubDir "$MagickShareConfigSubDir"	51	#define MagickShareConfigSubDir "$MagickShareConfigSubDir"
23	_ACEOF	52	_ACEOF
24		53

Lines 1-6 Link Here

(-)graphics/GraphicsMagick12/files/patch-configure.in (-4 / +13 lines)
1	--- configure.orig 2008-05-18 17:22:52.000000000 -0400	1	--- configure.orig 2010-01-05 20:20:45.000000000 +0100
2	+++ configure 2008-06-06 18:37:48.269146182 -0400	2	+++ configure 2013-12-13 12:20:04.000000000 +0100
3	@@ -37604,7 +37604,7 @@	3	@@ -24299,7 +24299,7 @@
		4	fi
		5
		6
		7	- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
		8	+ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
		9	"
		10	if test "x$ac_cv_header_freetype_freetype_h" = x""yes; then :
		11	have_freetype_h='yes'
		12	@@ -25089,7 +25089,7 @@
4	#	13	#
5		14
6	# Subdirectory under lib to place GraphicsMagick lib files	15	# Subdirectory under lib to place GraphicsMagick lib files
Lines 9-15 Link Here
9		18
10	cat >>confdefs.h <<_ACEOF	19	cat >>confdefs.h <<_ACEOF
11	#define MagickLibSubdir "$MagickLibSubdir"	20	#define MagickLibSubdir "$MagickLibSubdir"
12	@@ -37708,7 +37708,7 @@	21	@@ -25193,7 +25193,7 @@
13		22
14	#	23	#
15	# Path to GraphicsMagick share files	24	# Path to GraphicsMagick share files

Lines 1-6 Link Here

(-)graphics/GraphicsMagick13/files/patch-configure.in (-4 / +13 lines)
1	--- configure.orig 2008-05-18 17:22:52.000000000 -0400	1	--- configure.orig 2013-03-10 00:21:59.000000000 +0100
2	+++ configure 2008-06-06 18:37:48.269146182 -0400	2	+++ configure 2013-12-13 12:24:09.000000000 +0100
3	@@ -37604,7 +37604,7 @@	3	@@ -26059,7 +26059,7 @@
		4	fi
		5
		6
		7	- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
		8	+ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H
		9	"
		10	if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :
		11	have_freetype_h='yes'
		12	@@ -26935,7 +26935,7 @@
4	#	13	#
5		14
6	# Subdirectory under lib to place GraphicsMagick lib files	15	# Subdirectory under lib to place GraphicsMagick lib files
Lines 9-15 Link Here
9		18
10	cat >>confdefs.h <<_ACEOF	19	cat >>confdefs.h <<_ACEOF
11	#define MagickLibSubdir "$MagickLibSubdir"	20	#define MagickLibSubdir "$MagickLibSubdir"
12	@@ -37708,7 +37708,7 @@	21	@@ -27039,7 +27039,7 @@
13		22
14	#	23	#
15	# Path to GraphicsMagick share files	24	# Path to GraphicsMagick share files

Line 0 Link Here

(-)graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c (+14 lines)
	1	--- plug-ins/postscript/diapsft2renderer.c.orig 2013-12-14 12:29:51.000000000 +0100
	2	+++ plug-ins/postscript/diapsft2renderer.c 2013-12-14 12:31:31.000000000 +0100
	3	@@ -29,8 +29,9 @@
	4	#include <pango/pangoft2.h>
	5	#include <pango/pango-engine.h>
	6	/* I'd really rather avoid this */
	7	-#include <freetype/ftglyph.h>
	8	-#include <freetype/ftoutln.h>
	9	+#include <ft2build.h>
	10	+#include FT_GLYPH_H
	11	+#include FT_OUTLINE_H
	12
	13	#define DPI 300
	14

Line 0 Link Here

(-)graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c (+12 lines)
	1	--- src/lib/engines/common/evas_font_load.c.orig 2013-12-14 12:42:42.000000000 +0100
	2	+++ src/lib/engines/common/evas_font_load.c 2013-12-14 12:44:14.000000000 +0100
	3	@@ -5,7 +5,8 @@
	4
	5	#include "evas_font_private.h" /* for Frame-Queuing support */
	6	#include "evas_font_ot.h"
	7	-#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */
	8	+#include <ft2build.h>
	9	+#include FT_TRUETYPE_TABLES_H /* Freetype2 OS/2 font table. */
	10
	11	#ifdef EVAS_CSERVE2
	12	# include "../../cserve2/evas_cs2_private.h"

Line 0 Link Here

(-)graphics/mapserver/files/patch-cmake__FindFreetype.cmake (+20 lines)
	1	--- cmake/FindFreetype.cmake.orig 2013-12-23 20:00:03.000000000 +0200
	2	+++ cmake/FindFreetype.cmake 2013-12-23 20:00:14.000000000 +0200
	3	@@ -41,7 +41,7 @@
	4	# wants explicit full paths and this trickery doesn't work too well.
	5	# I'm going to attempt to cut out the middleman and hope
	6	# everything still works.
	7	-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
	8	+FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h
	9	HINTS
	10	$ENV{FREETYPE_DIR}
	11	PATH_SUFFIXES include
	12	@@ -54,7 +54,7 @@
	13	/usr/freeware/include
	14	)
	15
	16	-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
	17	+FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
	18	HINTS
	19	$ENV{FREETYPE_DIR}/include/freetype2
	20	PATHS

Line 0 Link Here

(-)graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake (+19 lines)
	1	--- cmake/modules/FindFREETYPE.cmake.orig 2013-12-23 19:53:54.000000000 +0200
	2	+++ cmake/modules/FindFREETYPE.cmake 2013-12-23 19:54:05.000000000 +0200
	3	@@ -12,14 +12,14 @@
	4
	5	SET(FREETYPE_FIND_QUIETLY 1)
	6
	7	-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
	8	+FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h
	9	/usr/include/
	10	/usr/local/include/
	11	/usr/X11/include/
	12	NO_CMAKE_SYSTEM_PATH
	13	)
	14
	15	-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
	16	+FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h
	17	/usr/include/freetype2
	18	/usr/local/include/freetype2
	19	/usr/X11/include/freetype2

Line 0 Link Here

(-)graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c (+14 lines)
	1	--- src/libnrtype/nr-type-ft2.c.orig 2013-12-16 01:48:18.000000000 +0100
	2	+++ src/libnrtype/nr-type-ft2.c 2013-12-16 01:49:11.000000000 +0100
	3	@@ -13,8 +13,9 @@
	4	#include <stdio.h>
	5	#include <libnr/nr-macros.h>
	6	#include <libnr/nr-matrix.h>
	7	-#include <freetype/ftoutln.h>
	8	-#include <freetype/ftbbox.h>
	9	+#include <ft2build.h>
	10	+#include FT_OUTLINE_H
	11	+#include FT_BBOX_H
	12	#include "nr-type-ft2.h"
	13
	14	#define noNRTFFT2_DEBUG

Line 0 Link Here

(-)java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c (+14 lines)
	1	--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c.orig 2013-12-16 09:41:00.000000000 +0100
	2	+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2013-12-16 09:42:44.000000000 +0100
	3	@@ -42,8 +42,9 @@
	4	#include <pango/pango.h>
	5	#include <pango/pangoft2.h>
	6	#include <pango/pangofc-font.h>
	7	-#include <freetype/ftglyph.h>
	8	-#include <freetype/ftoutln.h>
	9	+#include <ft2build.h>
	10	+#include FT_GLYPH_H
	11	+#include FT_OUTLINE_H
	12	#include "jcl.h"
	13	#include "gdkfont.h"
	14	#include "gnu_java_awt_peer_gtk_FreetypeGlyphVector.h"

Line 0 Link Here

(-)java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c (+14 lines)
	1	--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c.orig 2013-12-16 10:19:17.000000000 +0100
	2	+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c 2013-12-16 10:19:47.000000000 +0100
	3	@@ -42,8 +42,9 @@
	4	#include <pango/pango.h>
	5	#include <pango/pangoft2.h>
	6	#include <pango/pangofc-font.h>
	7	-#include <freetype/ftglyph.h>
	8	-#include <freetype/ftoutln.h>
	9	+#include <ft2build.h>
	10	+#include FT_GLYPH_H
	11	+#include FT_OUTLINE_H
	12	#include "native_state.h"
	13	#include "gdkfont.h"
	14	#include "gnu_java_awt_peer_gtk_GdkTextLayout.h"

Lines 3-9 Link Here

(-)print/freetype2/Makefile (-8 / +5 lines)
3	# $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $	3	# $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
4		4
5	PORTNAME= freetype2	5	PORTNAME= freetype2
6	PORTVERSION= 2.5.0.1	6	PORTVERSION= 2.5.2
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \	8	MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \
9	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \	9	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
Lines 16-22 Link Here
16	MAINTAINER= gnome@FreeBSD.org	16	MAINTAINER= gnome@FreeBSD.org
17	COMMENT= Free and portable TrueType font rendering engine	17	COMMENT= Free and portable TrueType font rendering engine
18		18
19	USE_AUTOTOOLS= libtool
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USES= gmake	20	USES= gmake
22	MAKE_ENV= TOP=""	21	MAKE_ENV= TOP=""
Lines 23-29 Link Here
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	USE_GNOME= ltverhack:9	24	USE_GNOME= ltverhack:9
26	LIBTOOLFILES= builds/unix/configure	25	ltverhack_PATCH_FILES= builds/unix/ltmain.sh
27	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix	26	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix
28		27
29	OPTIONS_DEFINE= LCD_FILTERING PNG	28	OPTIONS_DEFINE= LCD_FILTERING PNG
Lines 30-36 Link Here
30	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)	29	LCD_FILTERING_DESC?= Sub-pixel rendering (patented)
31	PNG_DESC= Png compressed OpenType embedded bitmaps support	30	PNG_DESC= Png compressed OpenType embedded bitmaps support
32		31
33	NO_STAGE= yes
34	.include <bsd.port.options.mk>	32	.include <bsd.port.options.mk>
35		33
36	.if ${PORT_OPTIONS:MLCD_FILTERING}	34	.if ${PORT_OPTIONS:MLCD_FILTERING}
Lines 47-58 Link Here
47	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \	45	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \
48	${WRKSRC}/builds/unix/install.mk	46	${WRKSRC}/builds/unix/install.mk
49		47
50	pre-configure:
51	@${REINPLACE_CMD} -e '/^LIBTOOL/s\|LIBTOOL := $$(FT_LIBTOOL_DIR)/libtool\|LIBTOOL := ${WRKDIR}/gnome-libtool\|' \
52	${WRKSRC}/builds/unix/unix-cc.in
53
54	post-configure:	48	post-configure:
55	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \	49	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
56	${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)	50	${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
57		51
		52	post-install:
		53	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.9
		54
58	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-17 Link Here

(-)print/freetype2/files/patch-builds::unix::freetype-config.in (-17 lines)
1	--- builds/unix/freetype-config.in.orig 2009-12-21 18:23:42.000000000 -0500
2	+++ builds/unix/freetype-config.in 2010-02-21 15:51:17.000000000 -0500
3	@@ -131,12 +131,8 @@ if test "$echo_ft_version" = "yes" ; the
4	fi
5
6	if test "$echo_cflags" = "yes" ; then
7	- cflags="-I${SYSROOT}$includedir/freetype2"
8	- if test "${SYSROOT}$includedir" != "/usr/include" ; then
9	- echo $cflags -I${SYSROOT}$includedir
10	- else
11	- echo $cflags
12	- fi
13	+ cflags="-I$includedir/freetype2 -I$includedir"
14	+ echo $cflags
15	fi
16
17	if test "$echo_libs" = "yes" ; then

Lines 1-55 Link Here

(-)print/freetype2/pkg-plist (-53 / +52 lines)
1	bin/freetype-config	1	bin/freetype-config
2	include/freetype2/freetype/config/ftconfig.h	2	include/freetype2/config/ftconfig.h
3	include/freetype2/freetype/config/ftheader.h	3	include/freetype2/config/ftheader.h
4	include/freetype2/freetype/config/ftmodule.h	4	include/freetype2/config/ftmodule.h
5	include/freetype2/freetype/config/ftoption.h	5	include/freetype2/config/ftoption.h
6	include/freetype2/freetype/config/ftstdlib.h	6	include/freetype2/config/ftstdlib.h
7	include/freetype2/freetype/freetype.h	7	include/freetype2/freetype.h
8	include/freetype2/freetype/ftadvanc.h	8	include/freetype2/ft2build.h
9	include/freetype2/freetype/ftautoh.h	9	include/freetype2/ftadvanc.h
10	include/freetype2/freetype/ftbbox.h	10	include/freetype2/ftautoh.h
11	include/freetype2/freetype/ftbdf.h	11	include/freetype2/ftbbox.h
12	include/freetype2/freetype/ftbitmap.h	12	include/freetype2/ftbdf.h
13	include/freetype2/freetype/ftbzip2.h	13	include/freetype2/ftbitmap.h
14	include/freetype2/freetype/ftcache.h	14	include/freetype2/ftbzip2.h
15	include/freetype2/freetype/ftcffdrv.h	15	include/freetype2/ftcache.h
16	include/freetype2/freetype/ftchapters.h	16	include/freetype2/ftcffdrv.h
17	include/freetype2/freetype/ftcid.h	17	include/freetype2/ftchapters.h
18	include/freetype2/freetype/fterrdef.h	18	include/freetype2/ftcid.h
19	include/freetype2/freetype/fterrors.h	19	include/freetype2/fterrdef.h
20	include/freetype2/freetype/ftgasp.h	20	include/freetype2/fterrors.h
21	include/freetype2/freetype/ftglyph.h	21	include/freetype2/ftgasp.h
22	include/freetype2/freetype/ftgxval.h	22	include/freetype2/ftglyph.h
23	include/freetype2/freetype/ftgzip.h	23	include/freetype2/ftgxval.h
24	include/freetype2/freetype/ftimage.h	24	include/freetype2/ftgzip.h
25	include/freetype2/freetype/ftincrem.h	25	include/freetype2/ftimage.h
26	include/freetype2/freetype/ftlcdfil.h	26	include/freetype2/ftincrem.h
27	include/freetype2/freetype/ftlist.h	27	include/freetype2/ftlcdfil.h
28	include/freetype2/freetype/ftlzw.h	28	include/freetype2/ftlist.h
29	include/freetype2/freetype/ftmac.h	29	include/freetype2/ftlzw.h
30	include/freetype2/freetype/ftmm.h	30	include/freetype2/ftmac.h
31	include/freetype2/freetype/ftmodapi.h	31	include/freetype2/ftmm.h
32	include/freetype2/freetype/ftmoderr.h	32	include/freetype2/ftmodapi.h
33	include/freetype2/freetype/ftotval.h	33	include/freetype2/ftmoderr.h
34	include/freetype2/freetype/ftoutln.h	34	include/freetype2/ftotval.h
35	include/freetype2/freetype/ftpfr.h	35	include/freetype2/ftoutln.h
36	include/freetype2/freetype/ftrender.h	36	include/freetype2/ftpfr.h
37	include/freetype2/freetype/ftsizes.h	37	include/freetype2/ftrender.h
38	include/freetype2/freetype/ftsnames.h	38	include/freetype2/ftsizes.h
39	include/freetype2/freetype/ftstroke.h	39	include/freetype2/ftsnames.h
40	include/freetype2/freetype/ftsynth.h	40	include/freetype2/ftstroke.h
41	include/freetype2/freetype/ftsystem.h	41	include/freetype2/ftsynth.h
42	include/freetype2/freetype/ftttdrv.h	42	include/freetype2/ftsystem.h
43	include/freetype2/freetype/fttrigon.h	43	include/freetype2/ftttdrv.h
44	include/freetype2/freetype/fttypes.h	44	include/freetype2/fttrigon.h
45	include/freetype2/freetype/ftwinfnt.h	45	include/freetype2/fttypes.h
46	include/freetype2/freetype/ftxf86.h	46	include/freetype2/ftwinfnt.h
47	include/freetype2/freetype/t1tables.h	47	include/freetype2/ftxf86.h
48	include/freetype2/freetype/ttnameid.h	48	include/freetype2/t1tables.h
49	include/freetype2/freetype/tttables.h	49	include/freetype2/ttnameid.h
50	include/freetype2/freetype/tttags.h	50	include/freetype2/tttables.h
51	include/freetype2/freetype/ttunpat.h	51	include/freetype2/tttags.h
52	include/ft2build.h	52	include/freetype2/ttunpat.h
53	lib/libfreetype.a	53	lib/libfreetype.a
54	lib/libfreetype.la	54	lib/libfreetype.la
55	lib/libfreetype.so	55	lib/libfreetype.so
Lines 56-61 Link Here
56	lib/libfreetype.so.9	56	lib/libfreetype.so.9
57	libdata/pkgconfig/freetype2.pc	57	libdata/pkgconfig/freetype2.pc
58	share/aclocal/freetype2.m4	58	share/aclocal/freetype2.m4
59	@dirrm include/freetype2/freetype/config	59	@dirrm include/freetype2/config
60	@dirrm include/freetype2/freetype
61	@dirrm include/freetype2	60	@dirrm include/freetype2

Lines 2-8 Link Here

(-)print/ft2demos/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ft2demos	4	PORTNAME= ft2demos
5	PORTVERSION= 2.4.11	5	PORTVERSION= 2.5.2
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= SF/freetype/freetype-demos/${PORTVERSION} \	7	MASTER_SITES= SF/freetype/freetype-demos/${PORTVERSION} \
8	RINGSERVER/graphics/freetype/freetype2	8	RINGSERVER/graphics/freetype/freetype2
Lines 11-21 Link Here
11	COMMENT= Demo programs for FreeType2	11	COMMENT= Demo programs for FreeType2
12		12
13	BUILD_DEPENDS+= ${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build	13	BUILD_DEPENDS+= ${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
14	LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2	14	LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
15		15
16	USE_BZIP2= yes	16	USE_BZIP2= yes
17	USE_XORG= xext	17	USE_XORG= xext
18	USE_GMAKE= yes	18	USES= gmake
19	USE_AUTOTOOLS= libtool:env	19	USE_AUTOTOOLS= libtool:env
20	MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}"	20	MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}"
21	MAKE_ARGS= EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"	21	MAKE_ARGS= EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"
Lines 25-36 Link Here
25	FT_PROGRAMS= ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \	25	FT_PROGRAMS= ftbench ftchkwd ftdiff ftdump ftgamma ftgrid ftlint ftmemchk \
26	ftmulti ftpatchk ftstring fttimer ftvalid ftview	26	ftmulti ftpatchk ftstring fttimer ftvalid ftview
27		27
28	NO_STAGE= yes
29	.include <bsd.port.pre.mk>	28	.include <bsd.port.pre.mk>
30		29
31	FREETYPE_WRKSRC!= cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC	30	FREETYPE_WRKSRC!= cd ${PORTSDIR}/print/freetype2; ${MAKE} -V WRKSRC
32		31
33	do-install:	32	do-install:
34	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${PREFIX}/bin)	33	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin)
35		34
36	.include <bsd.port.post.mk>	35	.include <bsd.port.post.mk>

Line 0 Link Here

(-)print/lilypond/files/patch-lily_freetype-error.cc (+12 lines)
	1	--- lily/freetype-error.cc.orig 2013-12-16 15:18:38.000000000 +0100
	2	+++ lily/freetype-error.cc 2013-12-16 15:19:06.000000000 +0100
	3	@@ -31,7 +31,8 @@
	4	const char *err_msg;
	5	} ft_errors[] =
	6
	7	-#include <freetype/fterrors.h>
	8	+#include <ft2build.h>
	9	+#include FT_ERRORS_H
	10
	11	;
	12

Line 0 Link Here

(-)print/lilypond/files/patch-lily_open-type-font.cc (+12 lines)
	1	--- lily/open-type-font.cc.orig 2013-12-16 15:54:16.000000000 +0100
	2	+++ lily/open-type-font.cc 2013-12-16 15:54:45.000000000 +0100
	3	@@ -23,7 +23,8 @@
	4
	5	using namespace std;
	6
	7	-#include <freetype/tttables.h>
	8	+#include <ft2build.h>
	9	+#include FT_TRUETYPE_TABLES_H
	10
	11	#include "dimensions.hh"
	12	#include "international.hh"