Attachment 138581 Details for Bug 184587 – freetype-2.5.2_3.diff

[patch] freetype-2.5.2_3.diff

freetype-2.5.2_3.diff (text/x-diff; charset=us-ascii), 68.23 KB, created by Koop Mast on 2013-12-21 09:19:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2013-12-21 09:19:19 UTC

Size: 68.23 KB

patch

obsolete

>Index: audio/lmms/Makefile
>===================================================================
>--- audio/lmms/Makefile	(revision 337118)
>+++ audio/lmms/Makefile	(working copy)
>@@ -28,6 +28,7 @@
> 
> OPTIONS_DEFINE=	JACK PULSEAUDIO SDL
> 
>+MAKE_JOBS_UNSAFE=yes
> USE_LDCONFIG=	yes
> NO_STAGE=	yes
> USE_BZIP2=	yes
>Index: audio/musescore/files/patch-mscore_mscore_genft.cpp
>===================================================================
>--- audio/musescore/files/patch-mscore_mscore_genft.cpp	(revision 0)
>+++ audio/musescore/files/patch-mscore_mscore_genft.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- mscore/mscore/genft.cpp.orig	2013-12-13 09:46:58.000000000 +0100
>++++ mscore/mscore/genft.cpp	2013-12-13 09:50:06.000000000 +0100
>+@@ -27,7 +27,7 @@
>+ 
>+ #include <ft2build.h>
>+ #include FT_FREETYPE_H
>+-#include <freetype/tttables.h>
>++#include FT_TRUETYPE_TABLES_H
>+ #include "al/xml.h"
>+ 
>+ QMap<int, int> codemap;
>
>Property changes on: audio/musescore/files/patch-mscore_mscore_genft.cpp
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: comms/gtkmmorse/Makefile
>===================================================================
>--- comms/gtkmmorse/Makefile	(revision 337118)
>+++ comms/gtkmmorse/Makefile	(working copy)
>@@ -21,5 +21,9 @@
> PLIST_FILES=	bin/gtkmmorse
> MAN1=		gtkmmorse.1
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|-ansi||g' -e 's|-pedantic||g' \
>+		${WRKSRC}/src/Makefile.in
>+
> NO_STAGE=	yes
> .include <bsd.port.mk>
>Index: devel/cmake/files/patch-Modules_FindFreetype.cmake
>===================================================================
>--- devel/cmake/files/patch-Modules_FindFreetype.cmake	(revision 0)
>+++ devel/cmake/files/patch-Modules_FindFreetype.cmake	(working copy)
>@@ -0,0 +1,22 @@
>+--- 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)
>
>Property changes on: devel/cmake/files/patch-Modules_FindFreetype.cmake
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/cmake-modules/Makefile
>===================================================================
>--- devel/cmake-modules/Makefile	(revision 337118)
>+++ devel/cmake-modules/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # Created by: gahr
> # $FreeBSD$
> 
>-PORTREVISION=	0
>+PORTREVISION=	1
> PKGNAMESUFFIX=	-modules
> 
> COMMENT=	Modules and Templates for CMake
>Index: devel/lasi/Makefile
>===================================================================
>--- devel/lasi/Makefile	(revision 337118)
>+++ devel/lasi/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> 
> PORTNAME=	lasi
> PORTVERSION=	1.1.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
> DISTNAME=	libLASi-${PORTVERSION}
>Index: devel/lasi/files/patch-include_LASi.h
>===================================================================
>--- devel/lasi/files/patch-include_LASi.h	(revision 0)
>+++ devel/lasi/files/patch-include_LASi.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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;
>
>Property changes on: devel/lasi/files/patch-include_LASi.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/lasi/files/patch-src_drawGlyph.cpp
>===================================================================
>--- devel/lasi/files/patch-src_drawGlyph.cpp	(revision 0)
>+++ devel/lasi/files/patch-src_drawGlyph.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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>
>
>Property changes on: devel/lasi/files/patch-src_drawGlyph.cpp
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/lasi/files/patch-src_drawGlyph.h
>===================================================================
>--- devel/lasi/files/patch-src_drawGlyph.h	(revision 0)
>+++ devel/lasi/files/patch-src_drawGlyph.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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.
>
>Property changes on: devel/lasi/files/patch-src_drawGlyph.h
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/lasi/files/patch-src_glyphMgr.cpp
>===================================================================
>--- devel/lasi/files/patch-src_glyphMgr.cpp	(revision 0)
>+++ devel/lasi/files/patch-src_glyphMgr.cpp	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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"
>
>Property changes on: devel/lasi/files/patch-src_glyphMgr.cpp
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/lasi/files/patch-src_glyphMgr.h
>===================================================================
>--- devel/lasi/files/patch-src_glyphMgr.h	(revision 0)
>+++ devel/lasi/files/patch-src_glyphMgr.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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.
>+  */
>
>Property changes on: devel/lasi/files/patch-src_glyphMgr.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/lasi/files/patch-src_util.h
>===================================================================
>--- devel/lasi/files/patch-src_util.h	(revision 0)
>+++ devel/lasi/files/patch-src_util.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/util.h.orig	2013-12-13 10:13:16.000000000 +0100
>++++ src/util.h	2013-12-13 10:17:01.000000000 +0100
>+@@ -18,7 +18,7 @@
>+ 
>+ #include <ft2build.h>
>+ #include FT_FREETYPE_H
>+-#include <freetype/ftglyph.h>
>++#include FT_GLYPH_H
>+ 
>+ std::ostream& operator<<(std::ostream&, const FT_Library);
>+ std::ostream& operator<<(std::ostream&, const FT_Face);
>
>Property changes on: devel/lasi/files/patch-src_util.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/love/files/patch-src_modules_font_freetype_Font.h
>===================================================================
>--- devel/love/files/patch-src_modules_font_freetype_Font.h	(revision 0)
>+++ devel/love/files/patch-src_modules_font_freetype_Font.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>+ {
>
>Property changes on: devel/love/files/patch-src_modules_font_freetype_Font.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h
>===================================================================
>--- devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h	(revision 0)
>+++ devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>+ {
>
>Property changes on: devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/love07/files/patch-src_modules_font_freetype_Font.h
>===================================================================
>--- devel/love07/files/patch-src_modules_font_freetype_Font.h	(revision 0)
>+++ devel/love07/files/patch-src_modules_font_freetype_Font.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>+ {
>
>Property changes on: devel/love07/files/patch-src_modules_font_freetype_Font.h
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h
>===================================================================
>--- devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h	(revision 0)
>+++ devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>+ {
>
>Property changes on: devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/love5/files/patch-src_opengl_TrueTypeFont.h
>===================================================================
>--- devel/love5/files/patch-src_opengl_TrueTypeFont.h	(revision 0)
>+++ devel/love5/files/patch-src_opengl_TrueTypeFont.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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>
>
>Property changes on: devel/love5/files/patch-src_opengl_TrueTypeFont.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: editors/ted/files/patch-appFrame_appFontConfig.c
>===================================================================
>--- editors/ted/files/patch-appFrame_appFontConfig.c	(revision 0)
>+++ editors/ted/files/patch-appFrame_appFontConfig.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- appFrame/appFontConfig.c.orig	2013-12-13 10:45:38.000000000 +0100
>++++ appFrame/appFontConfig.c	2013-12-13 10:46:24.000000000 +0100
>+@@ -889,7 +889,7 @@
>+ 
>+     static const n2s xftn2s[]=
>+     {
>+-#   include <freetype/fterrdef.h>
>++#   include FT_ERROR_DEFINITIONS_H
>+     };
>+ 
>+     for ( i= 0; i < sizeof(xftn2s)/sizeof(n2s); i++ )
>
>Property changes on: editors/ted/files/patch-appFrame_appFontConfig.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: games/brutalchess/files/patch-src_fontloader.h
>===================================================================
>--- games/brutalchess/files/patch-src_fontloader.h	(revision 0)
>+++ games/brutalchess/files/patch-src_fontloader.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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>
>
>Property changes on: games/brutalchess/files/patch-src_fontloader.h
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: games/openmortal/files/patch-src-sge__tt__text.cpp
>===================================================================
>--- games/openmortal/files/patch-src-sge__tt__text.cpp	(revision 337118)
>+++ games/openmortal/files/patch-src-sge__tt__text.cpp	(working copy)
>@@ -1,5 +1,5 @@
>---- src/sge_tt_text.cpp.orig	Tue Sep 12 18:29:07 2006
>-+++ src/sge_tt_text.cpp	Tue Sep 12 18:29:12 2006
>+--- 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"
>@@ -8,3 +8,16 @@
>  #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 {
>Index: games/scorched3d/Makefile
>===================================================================
>--- games/scorched3d/Makefile	(revision 337118)
>+++ games/scorched3d/Makefile	(working copy)
>@@ -30,12 +30,15 @@
> USE_SDL=	mixer net sdl
> USE_WX=		2.4+
> WX_CONF_ARGS=	absolute
>-USES=		iconv perl5 gmake pkgconfig
>+USES=		dos2unix iconv perl5 gmake pkgconfig
> USE_AUTOTOOLS=	aclocal automake autoconf
> ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
> AUTOMAKE_ARGS=	--add-missing --copy --force --foreign
> CONFIGURE_ARGS=	--datadir=${DATADIR}
> 
>+DOS2UNIX_FILES=	src/client/GLEXT/GLFont2dFreeType.h \
>+		src/launcher/wxdialogs/TrueTypeFont.h
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>Index: games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
>===================================================================
>--- games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h	(revision 0)
>+++ games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>
>Property changes on: games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
>===================================================================
>--- games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h	(revision 0)
>+++ games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h	(working copy)
>@@ -0,0 +1,17 @@
>+--- 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
>+ {
>
>Property changes on: games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: graphics/GraphicsMagick/files/patch-configure
>===================================================================
>--- graphics/GraphicsMagick/files/patch-configure	(revision 337118)
>+++ graphics/GraphicsMagick/files/patch-configure	(working copy)
>@@ -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
>  
>Index: graphics/GraphicsMagick12/files/patch-configure.in
>===================================================================
>--- graphics/GraphicsMagick12/files/patch-configure.in	(revision 337118)
>+++ graphics/GraphicsMagick12/files/patch-configure.in	(working copy)
>@@ -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
>Index: graphics/GraphicsMagick13/files/patch-configure.in
>===================================================================
>--- graphics/GraphicsMagick13/files/patch-configure.in	(revision 337118)
>+++ graphics/GraphicsMagick13/files/patch-configure.in	(working copy)
>@@ -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
>Index: graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake
>===================================================================
>--- graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake	(revision 0)
>+++ graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake	(working copy)
>@@ -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
>+ )
>
>Property changes on: graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
>===================================================================
>--- graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c	(revision 0)
>+++ graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c	(working copy)
>@@ -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
>+ 
>
>Property changes on: graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c
>===================================================================
>--- graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c	(revision 0)
>+++ graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c	(working copy)
>@@ -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"
>
>Property changes on: graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake
>===================================================================
>--- graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake	(revision 0)
>+++ graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake	(working copy)
>@@ -0,0 +1,11 @@
>+--- CMake/Packages/FindFreetype.cmake.orig	2013-12-16 01:09:22.000000000 +0100
>++++ CMake/Packages/FindFreetype.cmake	2013-12-16 01:09:58.000000000 +0100
>+@@ -43,7 +43,7 @@
>+ 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_INCLUDE_DIR NAMES 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_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel)
>
>Property changes on: graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/py-imaging/files/patch-_imagingft.c
>===================================================================
>--- graphics/py-imaging/files/patch-_imagingft.c	(revision 0)
>+++ graphics/py-imaging/files/patch-_imagingft.c	(working copy)
>@@ -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 */
>
>Property changes on: graphics/py-imaging/files/patch-_imagingft.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/py-pillow/files/patch-_imagingft.c
>===================================================================
>--- graphics/py-pillow/files/patch-_imagingft.c	(revision 0)
>+++ graphics/py-pillow/files/patch-_imagingft.c	(working copy)
>@@ -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 */
>
>Property changes on: graphics/py-pillow/files/patch-_imagingft.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c
>===================================================================
>--- graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c	(revision 0)
>+++ graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c	(working copy)
>@@ -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 */
>
>Property changes on: graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c
>===================================================================
>--- graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c	(revision 0)
>+++ graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c	(working copy)
>@@ -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
>
>Property changes on: graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: graphics/swfmill/Makefile
>===================================================================
>--- graphics/swfmill/Makefile	(revision 337118)
>+++ graphics/swfmill/Makefile	(working copy)
>@@ -14,9 +14,10 @@
> 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
> 
>Index: graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp
>===================================================================
>--- graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp	(revision 0)
>+++ graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp	(working copy)
>@@ -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;
>+ 
>
>Property changes on: graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: graphics/xpaint/Makefile
>===================================================================
>--- graphics/xpaint/Makefile	(revision 337118)
>+++ graphics/xpaint/Makefile	(working copy)
>@@ -39,6 +39,7 @@
> 
> 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//' \
>Index: japanese/xdvik/files/patch-texk_xdvik_vf2ft.c
>===================================================================
>--- japanese/xdvik/files/patch-texk_xdvik_vf2ft.c	(revision 0)
>+++ japanese/xdvik/files/patch-texk_xdvik_vf2ft.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- xdvik-22.40w/texk/xdvik/vf2ft.c.orig	2013-12-16 09:29:17.000000000 +0100
>++++ xdvik-22.40w/texk/xdvik/vf2ft.c	2013-12-16 09:29:47.000000000 +0100
>+@@ -1278,7 +1278,6 @@
>+ 
>+ static int fontsmax=0;
>+ 
>+-#include <freetype/freetype.h>
>+ #include "vf2ft.h"
>+ 
>+ int VF_Init(char *vfcap)
>
>Property changes on: japanese/xdvik/files/patch-texk_xdvik_vf2ft.c
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
>===================================================================
>--- java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c	(revision 0)
>+++ java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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"
>
>Property changes on: java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
>===================================================================
>--- java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c	(revision 0)
>+++ java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c	(working copy)
>@@ -0,0 +1,18 @@
>+--- 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"
>
>Property changes on: java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c
>===================================================================
>--- java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c	(revision 0)
>+++ java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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"
>
>Property changes on: java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: lang/php5/Makefile
>===================================================================
>--- lang/php5/Makefile	(revision 337118)
>+++ lang/php5/Makefile	(working copy)
>@@ -169,6 +169,7 @@
> 
> post-patch:
> 	@${TOUCH} ${WRKSRC}/ext/php_config.h
>+	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} "s|^$extension_dir$|; \1|" ${WRKSRC}/php.ini-*
> .if ${PORT_OPTIONS:MFPM}
> 	@${REINPLACE_CMD} -e "s|^;$pid$|\1|;s|^;$pm\.[a-z_]*_servers$|\1|" \
>Index: lang/php52/Makefile
>===================================================================
>--- lang/php52/Makefile	(revision 337118)
>+++ lang/php52/Makefile	(working copy)
>@@ -194,6 +194,7 @@
> 
> post-patch:
> 	@${TOUCH} ${WRKSRC}/ext/php_config.h
>+	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} "s|^$extension_dir$|; \1|" ${WRKSRC}/php.ini-*
> .if ${PORT_OPTIONS:MFPM} && ${PORT_OPTIONS:MCGI}
> 	@${REINPLACE_CMD} -e 's,BUILD_CGI=\"\\$$$.*$\\$$(EXTRA_LIBS),BUILD_CGI=\"\\$$\1\\$$(EXTRA_LIBS) \\$$(SAPI_EXTRA_LIBS),g' \
>Index: lang/php53/Makefile
>===================================================================
>--- lang/php53/Makefile	(revision 337118)
>+++ lang/php53/Makefile	(working copy)
>@@ -154,6 +154,7 @@
> 
> post-patch:
> 	@${TOUCH} ${WRKSRC}/ext/php_config.h
>+	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} "s|^$extension_dir$|; \1|" ${WRKSRC}/php.ini-*
> .if ${PORT_OPTIONS:MFPM}
> 	@${REINPLACE_CMD} -e "s|^;$pid$|\1|;s|^;$pm\.[a-z_]*_servers$|\1|" \
>Index: lang/php55/Makefile
>===================================================================
>--- lang/php55/Makefile	(revision 337118)
>+++ lang/php55/Makefile	(working copy)
>@@ -169,6 +169,7 @@
> 
> post-patch:
> 	@${TOUCH} ${WRKSRC}/ext/php_config.h
>+	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
> 	@${REINPLACE_CMD} "s|^$extension_dir$|; \1|" ${WRKSRC}/php.ini-*
> .if ${PORT_OPTIONS:MFPM}
> 	@${REINPLACE_CMD} -e "s|^;$pid$|\1|;s|^;$pm\.[a-z_]*_servers$|\1|" \
>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 337118)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -349,6 +349,7 @@
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|-ldl||' \
> 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
>+		-e 's|freetype/freetype.h|freetype.h|g' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
> 		${WRKSRC}/doc/texi2pod.pl
>Index: multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
>===================================================================
>--- multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c	(revision 0)
>+++ multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- libavfilter/vf_drawtext.c.orig	2013-11-20 03:28:56.000000000 +0100
>++++ libavfilter/vf_drawtext.c	2013-12-06 18:26:57.000000000 +0100
>+@@ -48,7 +48,6 @@
>+ #include "video.h"
>+ 
>+ #include <ft2build.h>
>+-#include <freetype/config/ftheader.h>
>+ #include FT_FREETYPE_H
>+ #include FT_GLYPH_H
>+ #if CONFIG_FONTCONFIG
>
>Property changes on: multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: multimedia/ffmpeg0/Makefile
>===================================================================
>--- multimedia/ffmpeg0/Makefile	(revision 337118)
>+++ multimedia/ffmpeg0/Makefile	(working copy)
>@@ -413,6 +413,7 @@
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
> 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
>+		-e 's|freetype/freetype.h|freetype.h|g' \
> 		-e 's|check_ldflags -Wl,--as-needed||' \
> 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
> 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
>Index: multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c
>===================================================================
>--- multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c	(revision 0)
>+++ multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- libavfilter/vf_drawtext.c.orig	2013-12-06 18:18:29.000000000 +0100
>++++ libavfilter/vf_drawtext.c	2013-12-06 18:18:49.000000000 +0100
>+@@ -41,7 +41,6 @@
>+ #undef time
>+ 
>+ #include <ft2build.h>
>+-#include <freetype/config/ftheader.h>
>+ #include FT_FREETYPE_H
>+ #include FT_GLYPH_H
>+ 
>
>Property changes on: multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c
>===================================================================
>--- multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c	(revision 0)
>+++ multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c	(working copy)
>@@ -0,0 +1,5 @@
>+28c28,29
>+< #include <freetype/freetype.h>
>+---
>+> #include <ft2build.h>
>+> #include FT_FREETYPE_H
>
>Property changes on: multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: print/freetype2/Makefile
>===================================================================
>--- print/freetype2/Makefile	(revision 337118)
>+++ print/freetype2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> #   $MCom: ports/print/freetype2/Makefile,v 1.28 2011/10/25 18:31:21 kwm Exp $
> 
> PORTNAME=	freetype2
>-PORTVERSION=	2.5.0.1
>+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/ \
>@@ -16,7 +16,6 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Free and portable TrueType font rendering engine
> 
>-USE_AUTOTOOLS=	libtool
> USE_BZIP2=	yes
> USES=		gmake
> MAKE_ENV=	TOP=""
>@@ -23,7 +22,7 @@
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> USE_GNOME=	ltverhack:9
>-LIBTOOLFILES=	builds/unix/configure
>+ltverhack_PATCH_FILES=	builds/unix/ltmain.sh
> CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
> 
> OPTIONS_DEFINE=		LCD_FILTERING PNG
>@@ -30,7 +29,6 @@
> 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}
>@@ -47,12 +45,11 @@
> 	@${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>
>Index: print/freetype2/distinfo
>===================================================================
>--- print/freetype2/distinfo	(revision 337118)
>+++ print/freetype2/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (freetype-2.5.0.1.tar.bz2) = 57bce5b37989577aa8b4a588426839f6bf39bcc3869748cb18f6827df251f4e5
>-SIZE (freetype-2.5.0.1.tar.bz2) = 1607037
>+SHA256 (freetype-2.5.2.tar.bz2) = 4ff4bd393aa01071ec7b849d035508a505a78f88b2bcf25ff11e58e43c0b9def
>+SIZE (freetype-2.5.2.tar.bz2) = 1676373
>Index: print/freetype2/files/patch-builds::unix::freetype-config.in
>===================================================================
>--- print/freetype2/files/patch-builds::unix::freetype-config.in	(revision 337118)
>+++ print/freetype2/files/patch-builds::unix::freetype-config.in	(working copy)
>@@ -1,17 +0,0 @@
>---- 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
>Index: print/freetype2/pkg-plist
>===================================================================
>--- print/freetype2/pkg-plist	(revision 337118)
>+++ print/freetype2/pkg-plist	(working copy)
>@@ -1,55 +1,55 @@
> bin/freetype-config
>-include/freetype2/freetype/config/ftconfig.h
>-include/freetype2/freetype/config/ftheader.h
>-include/freetype2/freetype/config/ftmodule.h
>-include/freetype2/freetype/config/ftoption.h
>-include/freetype2/freetype/config/ftstdlib.h
>-include/freetype2/freetype/freetype.h
>-include/freetype2/freetype/ftadvanc.h
>-include/freetype2/freetype/ftautoh.h
>-include/freetype2/freetype/ftbbox.h
>-include/freetype2/freetype/ftbdf.h
>-include/freetype2/freetype/ftbitmap.h
>-include/freetype2/freetype/ftbzip2.h
>-include/freetype2/freetype/ftcache.h
>-include/freetype2/freetype/ftcffdrv.h
>-include/freetype2/freetype/ftchapters.h
>-include/freetype2/freetype/ftcid.h
>-include/freetype2/freetype/fterrdef.h
>-include/freetype2/freetype/fterrors.h
>-include/freetype2/freetype/ftgasp.h
>-include/freetype2/freetype/ftglyph.h
>-include/freetype2/freetype/ftgxval.h
>-include/freetype2/freetype/ftgzip.h
>-include/freetype2/freetype/ftimage.h
>-include/freetype2/freetype/ftincrem.h
>-include/freetype2/freetype/ftlcdfil.h
>-include/freetype2/freetype/ftlist.h
>-include/freetype2/freetype/ftlzw.h
>-include/freetype2/freetype/ftmac.h
>-include/freetype2/freetype/ftmm.h
>-include/freetype2/freetype/ftmodapi.h
>-include/freetype2/freetype/ftmoderr.h
>-include/freetype2/freetype/ftotval.h
>-include/freetype2/freetype/ftoutln.h
>-include/freetype2/freetype/ftpfr.h
>-include/freetype2/freetype/ftrender.h
>-include/freetype2/freetype/ftsizes.h
>-include/freetype2/freetype/ftsnames.h
>-include/freetype2/freetype/ftstroke.h
>-include/freetype2/freetype/ftsynth.h
>-include/freetype2/freetype/ftsystem.h
>-include/freetype2/freetype/ftttdrv.h
>-include/freetype2/freetype/fttrigon.h
>-include/freetype2/freetype/fttypes.h
>-include/freetype2/freetype/ftwinfnt.h
>-include/freetype2/freetype/ftxf86.h
>-include/freetype2/freetype/t1tables.h
>-include/freetype2/freetype/ttnameid.h
>-include/freetype2/freetype/tttables.h
>-include/freetype2/freetype/tttags.h
>-include/freetype2/freetype/ttunpat.h
>-include/ft2build.h
>+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
>@@ -56,6 +56,5 @@
> lib/libfreetype.so.9
> libdata/pkgconfig/freetype2.pc
> share/aclocal/freetype2.m4
>-@dirrm include/freetype2/freetype/config
>-@dirrm include/freetype2/freetype
>+@dirrm include/freetype2/config
> @dirrm include/freetype2
>Index: print/ft2demos/Makefile
>===================================================================
>--- print/ft2demos/Makefile	(revision 337118)
>+++ print/ft2demos/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ft2demos
>-PORTVERSION=	2.4.11
>+PORTVERSION=	2.5.2
> CATEGORIES=	print
> MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION} \
> 		RINGSERVER/graphics/freetype/freetype2
>@@ -11,11 +11,11 @@
> COMMENT=	Demo programs for FreeType2
> 
> BUILD_DEPENDS+=	${FREETYPE_WRKSRC}/config.mk:${PORTSDIR}/print/freetype2:build
>-LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
>+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
> 
> USE_BZIP2=	yes
> USE_XORG=	xext
>-USE_GMAKE=	yes
>+USES=		gmake
> USE_AUTOTOOLS=	libtool:env
> MAKE_ENV=	TOP_DIR="${FREETYPE_WRKSRC}"
> MAKE_ARGS=	EXES="${FT_PROGRAMS}" X11_PATH="${LOCALBASE}"
>@@ -25,12 +25,11 @@
> 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} ${PREFIX}/bin)
>+	@(cd ${WRKSRC}/bin/.libs/; ${INSTALL_PROGRAM} ${FT_PROGRAMS} ${STAGEDIR}${PREFIX}/bin)
> 
> .include <bsd.port.post.mk>
>Index: print/ft2demos/distinfo
>===================================================================
>--- print/ft2demos/distinfo	(revision 337118)
>+++ print/ft2demos/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (ft2demos-2.4.11.tar.bz2) = 49cc6c45542cc39cca0d9135b865fab428b1f9805b46c22fd848528f51c76075
>-SIZE (ft2demos-2.4.11.tar.bz2) = 164608
>+SHA256 (ft2demos-2.5.2.tar.bz2) = a3cdf60186caeb68cafc98b6b32c54ae9467a7a844865db161510a17a2d14471
>+SIZE (ft2demos-2.5.2.tar.bz2) = 185966
>Index: print/lilypond/files/patch-lily_freetype-error.cc
>===================================================================
>--- print/lilypond/files/patch-lily_freetype-error.cc	(revision 0)
>+++ print/lilypond/files/patch-lily_freetype-error.cc	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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
>+ 
>+   ;
>+ 
>
>Property changes on: print/lilypond/files/patch-lily_freetype-error.cc
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: print/lilypond/files/patch-lily_open-type-font.cc
>===================================================================
>--- print/lilypond/files/patch-lily_open-type-font.cc	(revision 0)
>+++ print/lilypond/files/patch-lily_open-type-font.cc	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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"
>
>Property changes on: print/lilypond/files/patch-lily_open-type-font.cc
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: print/lilypond/files/patch-lily_pango-font.cc
>===================================================================
>--- print/lilypond/files/patch-lily_pango-font.cc	(revision 0)
>+++ print/lilypond/files/patch-lily_pango-font.cc	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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>
>
>Property changes on: print/lilypond/files/patch-lily_pango-font.cc
>___________________________________________________________________
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: print/lilypond/files/patch-lily_ttf.cc
>===================================================================
>--- print/lilypond/files/patch-lily_ttf.cc	(revision 0)
>+++ print/lilypond/files/patch-lily_ttf.cc	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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"
>
>Property changes on: print/lilypond/files/patch-lily_ttf.cc
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: print/paps/files/patch-src_libpaps.c
>===================================================================
>--- print/paps/files/patch-src_libpaps.c	(revision 0)
>+++ print/paps/files/patch-src_libpaps.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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>
>
>Property changes on: print/paps/files/patch-src_libpaps.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: print/ttf2pt1/files/patch-ft.c
>===================================================================
>--- print/ttf2pt1/files/patch-ft.c	(revision 337118)
>+++ print/ttf2pt1/files/patch-ft.c	(working copy)
>@@ -1,12 +1,20 @@
>---- ft.c.orig	Sun Mar 21 18:24:06 2004
>-+++ ft.c	Sun Mar 21 18:24:31 2004
>-@@ -12,7 +12,8 @@
>+--- ft.c.orig	2003-12-31 22:30:50.000000000 +0100
>++++ ft.c	2013-12-16 16:50:37.000000000 +0100
>+@@ -12,11 +12,12 @@
>  #include <stdlib.h>
>  #include <ctype.h>
>  #include <sys/types.h>
> -#include <freetype/freetype.h>
>+-#include <freetype/ftglyph.h>
>+-#include <freetype/ftsnames.h>
>+-#include <freetype/ttnameid.h>
>+-#include <freetype/ftoutln.h>
> +#include <ft2build.h>
> +#include FT_FREETYPE_H
>- #include <freetype/ftglyph.h>
>- #include <freetype/ftsnames.h>
>- #include <freetype/ttnameid.h>
>++#include FT_GLYPH_H
>++#include FT_SFNT_NAMES_H
>++#include FT_TRUETYPE_IDS_H
>++#include FT_OUTLINE_H
>+ #include "pt1.h"
>+ #include "global.h"
>+ 
>Index: x11-fm/xfe/Makefile
>===================================================================
>--- x11-fm/xfe/Makefile	(revision 337118)
>+++ x11-fm/xfe/Makefile	(working copy)
>@@ -27,6 +27,7 @@
> 		${WRKSRC}/src/XFileExplorer.cpp \
> 		${WRKSRC}/src/help.h \
> 		${WRKSRC}/src/xfedefs.h
>+	@${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/configure
> 
> .include <bsd.port.options.mk>
> 
>Index: x11-fonts/fontmatrix/files/patch-cmake_modules_FREETYPEConfig.cmake
>===================================================================
>--- x11-fonts/fontmatrix/files/patch-cmake_modules_FREETYPEConfig.cmake	(revision 0)
>+++ x11-fonts/fontmatrix/files/patch-cmake_modules_FREETYPEConfig.cmake	(working copy)
>@@ -0,0 +1,11 @@
>+--- cmake/modules/FREETYPEConfig.cmake.orig	2013-12-17 00:02:50.000000000 +0100
>++++ cmake/modules/FREETYPEConfig.cmake	2013-12-17 00:03:12.000000000 +0100
>+@@ -8,7 +8,7 @@
>+     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
>
>Property changes on: x11-fonts/fontmatrix/files/patch-cmake_modules_FREETYPEConfig.cmake
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: x11-fonts/ttmkfdir/files/patch-ttf.cpp
>===================================================================
>--- x11-fonts/ttmkfdir/files/patch-ttf.cpp	(revision 337118)
>+++ x11-fonts/ttmkfdir/files/patch-ttf.cpp	(working copy)
>@@ -1,6 +1,16 @@
>---- ttf.cpp	2003-01-08 00:25:25.000000000 -0500
>-+++ ttf.cpp	2012-12-07 12:34:54.000000000 -0500
>-@@ -51,20 +51,27 @@
>+--- ttf.cpp.orig	2003-01-08 06:25:25.000000000 +0100
>++++ ttf.cpp	2013-12-17 00:08:13.000000000 +0100
>+@@ -3,7 +3,8 @@
>+ #include <cctype>
>+ #include <cstring>
>+ 
>+-#include "freetype/tttables.h"
>++#include <ft2build.h>
>++#include FT_TRUETYPE_TABLES_H
>+ #include "ttmkfdir.h"
>+ #include "ttf.h"
>+ #include "ttos2val.h"
>+@@ -51,20 +52,27 @@
>  bool
>  Face::MappingPresent (int cmapidx, NumericMapping *m, int enc_size, int start_code, bool enc_comp)
>  {
>@@ -35,7 +45,7 @@
>  }
>  
>  Face::Face (const std::string &filename)
>-@@ -239,7 +246,7 @@
>+@@ -239,7 +247,7 @@
>  	for (i = 0; i < n; i++) {
>  	    if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
>                      std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
>@@ -44,7 +54,7 @@
>              };
>              platform = NamePtr.platform_id;
>              encoding = NamePtr.encoding_id;
>-@@ -483,7 +490,7 @@
>+@@ -483,7 +491,7 @@
>  const char *
>  Face::PanoseWeight (void) const
>  {
>@@ -53,7 +63,7 @@
>  	"any",
>  	"no fit",
>  	"very light",
>-@@ -548,7 +555,7 @@
>+@@ -548,7 +556,7 @@
>  const char *
>  Face::PanoseWidth (void) const
>  {
>@@ -62,7 +72,7 @@
>  	"any",
>  	"no fit",
>  	"old style",
>-@@ -561,7 +568,7 @@
>+@@ -561,7 +569,7 @@
>  	"monospaced",
>      };
>      
>Index: x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h
>===================================================================
>--- x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h	(revision 0)
>+++ x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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>
>+ 
>
>Property changes on: x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: mcom:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 184587: 138579 | 138580 | 138581 | 138582