diff options
81 files changed, 982 insertions, 138 deletions
diff --git a/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt b/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt new file mode 100644 index 000000000000..b6f61c73d1a1 --- /dev/null +++ b/audio/lmms/files/patch-plugins_zynaddsubfx_fltk_CMakeLists.txt @@ -0,0 +1,11 @@ +--- plugins/zynaddsubfx/fltk/CMakeLists.txt.orig 2013-12-24 21:48:53.000000000 +0200 ++++ plugins/zynaddsubfx/fltk/CMakeLists.txt 2013-12-24 21:49:16.000000000 +0200 +@@ -165,7 +165,7 @@ + mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) + + # where to find freetype headers +-find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) ++find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2) + if(FREETYPE_PATH) + include_directories(${FREETYPE_PATH}) + endif(FREETYPE_PATH) diff --git a/audio/musescore/files/patch-mscore_mscore_genft.cpp b/audio/musescore/files/patch-mscore_mscore_genft.cpp new file mode 100644 index 000000000000..9c6f2b50e35b --- /dev/null +++ b/audio/musescore/files/patch-mscore_mscore_genft.cpp @@ -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; diff --git a/comms/gtkmmorse/Makefile b/comms/gtkmmorse/Makefile index a6f16abc4b98..7d4c1c94232a 100644 --- a/comms/gtkmmorse/Makefile +++ b/comms/gtkmmorse/Makefile @@ -21,5 +21,9 @@ USES= pkgconfig 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> diff --git a/devel/cmake-modules/Makefile b/devel/cmake-modules/Makefile index 45f8e120f2c5..d8483a64e742 100644 --- a/devel/cmake-modules/Makefile +++ b/devel/cmake-modules/Makefile @@ -1,7 +1,7 @@ # Created by: gahr # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -modules COMMENT= Modules and Templates for CMake diff --git a/devel/cmake/files/patch-Modules_FindFreetype.cmake b/devel/cmake/files/patch-Modules_FindFreetype.cmake new file mode 100644 index 000000000000..e053e80bea84 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindFreetype.cmake @@ -0,0 +1,28 @@ +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) diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile index 0b74f6fbd7ff..7f4f39febe67 100644 --- a/devel/lasi/Makefile +++ b/devel/lasi/Makefile @@ -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} diff --git a/devel/lasi/files/patch-include_LASi.h b/devel/lasi/files/patch-include_LASi.h new file mode 100644 index 000000000000..613b5c712c83 --- /dev/null +++ b/devel/lasi/files/patch-include_LASi.h @@ -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; diff --git a/devel/lasi/files/patch-src_drawGlyph.cpp b/devel/lasi/files/patch-src_drawGlyph.cpp new file mode 100644 index 000000000000..1ce9a4c23382 --- /dev/null +++ b/devel/lasi/files/patch-src_drawGlyph.cpp @@ -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> diff --git a/devel/lasi/files/patch-src_drawGlyph.h b/devel/lasi/files/patch-src_drawGlyph.h new file mode 100644 index 000000000000..cb174aae7889 --- /dev/null +++ b/devel/lasi/files/patch-src_drawGlyph.h @@ -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. diff --git a/devel/lasi/files/patch-src_glyphMgr.cpp b/devel/lasi/files/patch-src_glyphMgr.cpp new file mode 100644 index 000000000000..426821e6d803 --- /dev/null +++ b/devel/lasi/files/patch-src_glyphMgr.cpp @@ -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" diff --git a/devel/lasi/files/patch-src_glyphMgr.h b/devel/lasi/files/patch-src_glyphMgr.h new file mode 100644 index 000000000000..23afe4b1052f --- /dev/null +++ b/devel/lasi/files/patch-src_glyphMgr.h @@ -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. + */ diff --git a/devel/lasi/files/patch-src_util.h b/devel/lasi/files/patch-src_util.h new file mode 100644 index 000000000000..567da584216a --- /dev/null +++ b/devel/lasi/files/patch-src_util.h @@ -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); diff --git a/devel/love/files/patch-src_modules_font_freetype_Font.h b/devel/love/files/patch-src_modules_font_freetype_Font.h new file mode 100644 index 000000000000..361373507e0f --- /dev/null +++ b/devel/love/files/patch-src_modules_font_freetype_Font.h @@ -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 + { diff --git a/devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h b/devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h new file mode 100644 index 000000000000..29204d223e88 --- /dev/null +++ b/devel/love/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h @@ -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 + { diff --git a/devel/love07/files/patch-src_modules_font_freetype_Font.h b/devel/love07/files/patch-src_modules_font_freetype_Font.h new file mode 100644 index 000000000000..361373507e0f --- /dev/null +++ b/devel/love07/files/patch-src_modules_font_freetype_Font.h @@ -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 + { diff --git a/devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h b/devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h new file mode 100644 index 000000000000..29204d223e88 --- /dev/null +++ b/devel/love07/files/patch-src_modules_font_freetype_TrueTypeRasterizer.h @@ -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 + { diff --git a/devel/love5/files/patch-src_opengl_TrueTypeFont.h b/devel/love5/files/patch-src_opengl_TrueTypeFont.h new file mode 100644 index 000000000000..bb88d134a49b --- /dev/null +++ b/devel/love5/files/patch-src_opengl_TrueTypeFont.h @@ -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> diff --git a/editors/ted/files/patch-appFrame_appFontConfig.c b/editors/ted/files/patch-appFrame_appFontConfig.c new file mode 100644 index 000000000000..4e7979331e33 --- /dev/null +++ b/editors/ted/files/patch-appFrame_appFontConfig.c @@ -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++ ) diff --git a/games/brutalchess/files/patch-src_fontloader.h b/games/brutalchess/files/patch-src_fontloader.h new file mode 100644 index 000000000000..e1434464ce8d --- /dev/null +++ b/games/brutalchess/files/patch-src_fontloader.h @@ -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> diff --git a/games/openmortal/files/patch-src-sge__tt__text.cpp b/games/openmortal/files/patch-src-sge__tt__text.cpp index 0df428b3db45..4cef2d593c2c 100644 --- a/games/openmortal/files/patch-src-sge__tt__text.cpp +++ b/games/openmortal/files/patch-src-sge__tt__text.cpp @@ -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 { diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 7c52265fb8e7..1e8f83e79a5b 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -30,12 +30,15 @@ USE_OPENAL= al alut 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 diff --git a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h new file mode 100644 index 000000000000..5bcad3c1b8ff --- /dev/null +++ b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h @@ -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 diff --git a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h new file mode 100644 index 000000000000..d3f212392a55 --- /dev/null +++ b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h @@ -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 + { diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure index a54a2698da9e..18c490659397 100644 --- a/graphics/GraphicsMagick/files/patch-configure +++ b/graphics/GraphicsMagick/files/patch-configure @@ -1,6 +1,35 @@ ---- ./configure.orig 2008-04-10 11:16:29.000000000 -0400 -+++ ./configure 2008-09-02 08:05:29.000000000 -0400 -@@ -34040,7 +34040,7 @@ +--- configure.orig 2008-11-20 04:31:11.000000000 +0100 ++++ configure 2013-12-13 12:12:27.000000000 +0100 +@@ -32116,7 +32116,7 @@ + fi + + # Some Freetype installs appear to require that <ft2build.h> be +- # included prior to including <freetype/freetype.h>. Oops! ++ # included prior to including <freetype.h>. Oops! + if test "${ac_cv_header_ft2build_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ft2build.h" >&5 + echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; } +@@ -32249,8 +32249,8 @@ + fi + + +- { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5 +-echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; } ++ { echo "$as_me:$LINENO: checking for freetype.h" >&5 ++echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; } + if test "${ac_cv_header_freetype_freetype_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -32262,7 +32262,7 @@ + /* end confdefs.h. */ + $FT2BUILD_H + +-#include <freetype/freetype.h> ++#include <freetype.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -34050,7 +34050,7 @@ #define MagickLibConfigSubDir "$MagickLibConfigSubDir" _ACEOF @@ -9,7 +38,7 @@ MagickLibConfigPathDefine="${MagickLibConfigPath}/" if test "$native_win32_build" = 'yes' then -@@ -34098,7 +34098,7 @@ +@@ -34108,7 +34108,7 @@ # # Path to GraphicsMagick share files MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}" @@ -18,7 +47,7 @@ MagickSharePathDefine="${MagickSharePath}/" if test "$native_win32_build" = 'yes' then -@@ -34118,7 +34118,7 @@ +@@ -34128,7 +34128,7 @@ #define MagickShareConfigSubDir "$MagickShareConfigSubDir" _ACEOF diff --git a/graphics/GraphicsMagick12/files/patch-configure.in b/graphics/GraphicsMagick12/files/patch-configure.in index ed7a7535689b..e8e1402cef44 100644 --- a/graphics/GraphicsMagick12/files/patch-configure.in +++ b/graphics/GraphicsMagick12/files/patch-configure.in @@ -1,6 +1,15 @@ ---- configure.orig 2008-05-18 17:22:52.000000000 -0400 -+++ configure 2008-06-06 18:37:48.269146182 -0400 -@@ -37604,7 +37604,7 @@ +--- configure.orig 2010-01-05 20:20:45.000000000 +0100 ++++ configure 2013-12-13 12:20:04.000000000 +0100 +@@ -24299,7 +24299,7 @@ + fi + + +- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H ++ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H + " + if test "x$ac_cv_header_freetype_freetype_h" = x""yes; then : + have_freetype_h='yes' +@@ -25089,7 +25089,7 @@ # # Subdirectory under lib to place GraphicsMagick lib files @@ -9,7 +18,7 @@ cat >>confdefs.h <<_ACEOF #define MagickLibSubdir "$MagickLibSubdir" -@@ -37708,7 +37708,7 @@ +@@ -25193,7 +25193,7 @@ # # Path to GraphicsMagick share files diff --git a/graphics/GraphicsMagick13/files/patch-configure.in b/graphics/GraphicsMagick13/files/patch-configure.in index ed7a7535689b..175a24ef8c29 100644 --- a/graphics/GraphicsMagick13/files/patch-configure.in +++ b/graphics/GraphicsMagick13/files/patch-configure.in @@ -1,6 +1,15 @@ ---- configure.orig 2008-05-18 17:22:52.000000000 -0400 -+++ configure 2008-06-06 18:37:48.269146182 -0400 -@@ -37604,7 +37604,7 @@ +--- configure.orig 2013-03-10 00:21:59.000000000 +0100 ++++ configure 2013-12-13 12:24:09.000000000 +0100 +@@ -26059,7 +26059,7 @@ + fi + + +- ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H ++ ac_fn_c_check_header_compile "$LINENO" "freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H + " + if test "x$ac_cv_header_freetype_freetype_h" = xyes; then : + have_freetype_h='yes' +@@ -26935,7 +26935,7 @@ # # Subdirectory under lib to place GraphicsMagick lib files @@ -9,7 +18,7 @@ cat >>confdefs.h <<_ACEOF #define MagickLibSubdir "$MagickLibSubdir" -@@ -37708,7 +37708,7 @@ +@@ -27039,7 +27039,7 @@ # # Path to GraphicsMagick share files diff --git a/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake b/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake new file mode 100644 index 000000000000..5a85775d425e --- /dev/null +++ b/graphics/darktable/files/patch-cmake_modules_FindFreetype.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindFreetype.cmake.orig 2013-12-13 12:47:10.000000000 +0100 ++++ cmake/modules/FindFreetype.cmake 2013-12-13 12:47:42.000000000 +0100 +@@ -12,7 +12,7 @@ + + # Include dir + find_path(Freetype_INCLUDE_DIR +- NAMES freetype/freetype.h ++ NAMES freetype.h + PATHS ${Freetype_PKGCONF_INCLUDE_DIRS} + PATH_SUFFIXES freetype2 + ) diff --git a/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c b/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c new file mode 100644 index 000000000000..4250f058ebce --- /dev/null +++ b/graphics/dia/files/patch-plug-ins_postscript_diapsft2renderer.c @@ -0,0 +1,14 @@ +--- plug-ins/postscript/diapsft2renderer.c.orig 2013-12-14 12:29:51.000000000 +0100 ++++ plug-ins/postscript/diapsft2renderer.c 2013-12-14 12:31:31.000000000 +0100 +@@ -29,8 +29,9 @@ + #include <pango/pangoft2.h> + #include <pango/pango-engine.h> + /* I'd really rather avoid this */ +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> ++#include <ft2build.h> ++#include FT_GLYPH_H ++#include FT_OUTLINE_H + + #define DPI 300 + diff --git a/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c b/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c new file mode 100644 index 000000000000..08bf01ac4f6a --- /dev/null +++ b/graphics/evas-core/files/patch-src_lib_engines_common_evas-font-load.c @@ -0,0 +1,12 @@ +--- src/lib/engines/common/evas_font_load.c.orig 2013-12-14 12:42:42.000000000 +0100 ++++ src/lib/engines/common/evas_font_load.c 2013-12-14 12:44:14.000000000 +0100 +@@ -5,7 +5,8 @@ + + #include "evas_font_private.h" /* for Frame-Queuing support */ + #include "evas_font_ot.h" +-#include <freetype/tttables.h> /* Freetype2 OS/2 font table. */ ++#include <ft2build.h> ++#include FT_TRUETYPE_TABLES_H /* Freetype2 OS/2 font table. */ + + #ifdef EVAS_CSERVE2 + # include "../../cserve2/evas_cs2_private.h" diff --git a/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake b/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake new file mode 100644 index 000000000000..01ed79b2e849 --- /dev/null +++ b/graphics/libprojectm/files/patch-cmake_FindFreetype2.cmake @@ -0,0 +1,20 @@ +--- cmake/FindFreetype2.cmake.orig 2013-12-24 19:02:55.000000000 +0100 ++++ cmake/FindFreetype2.cmake 2013-12-24 19:03:21.000000000 +0100 +@@ -52,7 +52,7 @@ + # + + +-FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h ++FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h + ${ADDITIONAL_INCLUDE_PATH} + /usr/include + /usr/include/freetype2 +@@ -67,7 +67,7 @@ + NO_DEFAULT_PATH + ) + +-FIND_PATH(FREETYPE2_FT2BUILD ft2build.h ++FIND_PATH(FREETYPE2_FT2BUILD freetype2/ft2build.h + ${ADDITIONAL_INCLUDE_PATH} + /usr/include + /usr/X11/include diff --git a/graphics/mapserver/files/patch-cmake__FindFreetype.cmake b/graphics/mapserver/files/patch-cmake__FindFreetype.cmake new file mode 100644 index 000000000000..6a6c8a53cdd2 --- /dev/null +++ b/graphics/mapserver/files/patch-cmake__FindFreetype.cmake @@ -0,0 +1,20 @@ +--- cmake/FindFreetype.cmake.orig 2013-12-23 20:00:03.000000000 +0200 ++++ cmake/FindFreetype.cmake 2013-12-23 20:00:14.000000000 +0200 +@@ -41,7 +41,7 @@ + # wants explicit full paths and this trickery doesn't work too well. + # I'm going to attempt to cut out the middleman and hope + # everything still works. +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + HINTS + $ENV{FREETYPE_DIR} + PATH_SUFFIXES include +@@ -54,7 +54,7 @@ + /usr/freeware/include + ) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + HINTS + $ENV{FREETYPE_DIR}/include/freetype2 + PATHS diff --git a/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake b/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake new file mode 100644 index 000000000000..d40c42523311 --- /dev/null +++ b/graphics/ogre3d/files/patch-CMake_Packages_FindFreetype.cmake @@ -0,0 +1,13 @@ +--- CMake/Packages/FindFreetype.cmake.orig 2012-09-02 07:27:14.000000000 +0200 ++++ CMake/Packages/FindFreetype.cmake 2013-12-24 20:05:12.000000000 +0100 +@@ -43,8 +43,8 @@ + findpkg_framework(FREETYPE) + message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") + +-find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) +-find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) ++find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) ++find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES freetype2/ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) + + find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) + find_library(FREETYPE_LIBRARY_DBG NAMES ${FREETYPE_LIBRARY_NAMES_DBG} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) diff --git a/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake new file mode 100644 index 000000000000..135d24e12ff3 --- /dev/null +++ b/graphics/osg/files/patch-CMakeModules_FindFreeType.cmake @@ -0,0 +1,44 @@ +--- CMakeModules/FindFreeType.cmake.orig 2013-12-24 19:18:24.000000000 +0100 ++++ CMakeModules/FindFreeType.cmake 2013-12-24 19:19:27.000000000 +0100 +@@ -24,18 +24,18 @@ + # wants explicit full paths and this trickery doesn't work too well. + # I'm going to attempt to cut out the middleman and hope + # everything still works. +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS + $ENV{FREETYPE_DIR} + NO_DEFAULT_PATH + PATH_SUFFIXES include + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. + NO_DEFAULT_PATH + PATH_SUFFIXES include + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build freetype2/ft2build.h + PATHS + /usr/local + /usr +@@ -51,16 +51,16 @@ + PATH_SUFFIXES include + ) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + $ENV{FREETYPE_DIR}/include/freetype2 + NO_DEFAULT_PATH + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this. + NO_DEFAULT_PATH + PATH_SUFFIXES include/freetype2 + ) +-FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h + /usr/local/include/freetype2 + /usr/include/freetype2 + /usr/local/X11R6/include/freetype2 diff --git a/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp new file mode 100644 index 000000000000..eaae7ca841dc --- /dev/null +++ b/graphics/osg/files/patch-src-osgPlugins-freetype-FreeTypeFont.cpp @@ -0,0 +1,14 @@ +--- src/osgPlugins/freetype/FreeTypeFont.cpp.orig 2013-12-24 19:29:26.000000000 +0100 ++++ src/osgPlugins/freetype/FreeTypeFont.cpp 2013-12-24 19:30:24.000000000 +0100 +@@ -14,8 +14,9 @@ + #include "FreeTypeFont.h" + #include "FreeTypeLibrary.h" + +-#include <freetype/ftoutln.h> +-#include <freetype/ftbbox.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_BBOX_H + + #include <osg/Notify> + #include <osg/io_utils> diff --git a/graphics/php5-gd/files/patch-config.m4 b/graphics/php5-gd/files/patch-config.m4 index 03b69a1c248a..8212b1b4c8fb 100644 --- a/graphics/php5-gd/files/patch-config.m4 +++ b/graphics/php5-gd/files/patch-config.m4 @@ -1,8 +1,17 @@ ---- config.m4.orig Mon May 30 01:16:41 2005 -+++ config.m4 Wed Dec 7 11:01:13 2005 -@@ -220,7 +220,7 @@ +--- config.m4.orig 2013-12-10 20:32:43.000000000 +0100 ++++ config.m4 2013-12-24 21:02:03.000000000 +0100 +@@ -193,7 +193,7 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/include/freetype2/freetype.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -241,7 +241,7 @@ ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/$PHP_LIBDIR + -L$GD_T1_DIR/$PHP_LIBDIR -lm diff --git a/graphics/php52-gd/files/patch-config.m4 b/graphics/php52-gd/files/patch-config.m4 index a0cc4ad378d6..b1877eef1874 100644 --- a/graphics/php52-gd/files/patch-config.m4 +++ b/graphics/php52-gd/files/patch-config.m4 @@ -1,8 +1,17 @@ ---- ext/gd/config.m4.orig Mon May 30 01:16:41 2005 -+++ ext/gd/config.m4 Wed Dec 7 11:01:13 2005 -@@ -220,7 +220,7 @@ +--- config.m4.orig 2007-07-03 19:25:43.000000000 +0200 ++++ config.m4 2013-12-24 21:04:48.000000000 +0100 +@@ -204,7 +204,7 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/include/freetype2/freetype.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -251,7 +251,7 @@ ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/$PHP_LIBDIR + -L$GD_T1_DIR/$PHP_LIBDIR -lm diff --git a/graphics/php53-gd/files/patch-config.m4 b/graphics/php53-gd/files/patch-config.m4 index 03b69a1c248a..debdbc510a3f 100644 --- a/graphics/php53-gd/files/patch-config.m4 +++ b/graphics/php53-gd/files/patch-config.m4 @@ -1,8 +1,17 @@ ---- config.m4.orig Mon May 30 01:16:41 2005 -+++ config.m4 Wed Dec 7 11:01:13 2005 -@@ -220,7 +220,7 @@ +--- config.m4.orig 2013-12-10 20:04:57.000000000 +0100 ++++ config.m4 2013-12-24 21:07:17.000000000 +0100 +@@ -162,7 +162,7 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/include/freetype2/freetype.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -210,7 +210,7 @@ ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/$PHP_LIBDIR + -L$GD_T1_DIR/$PHP_LIBDIR -lm diff --git a/graphics/php55-gd/files/patch-config.m4 b/graphics/php55-gd/files/patch-config.m4 index 03b69a1c248a..1e9eae3ad4e6 100644 --- a/graphics/php55-gd/files/patch-config.m4 +++ b/graphics/php55-gd/files/patch-config.m4 @@ -1,8 +1,17 @@ ---- config.m4.orig Mon May 30 01:16:41 2005 -+++ config.m4 Wed Dec 7 11:01:13 2005 -@@ -220,7 +220,7 @@ +--- config.m4.orig 2013-12-11 00:31:06.000000000 +0100 ++++ config.m4 2013-12-24 21:11:19.000000000 +0100 +@@ -185,7 +185,7 @@ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for i in $PHP_FREETYPE_DIR /usr/local /usr; do +- if test -f "$i/include/freetype2/freetype/freetype.h"; then ++ if test -f "$i/include/freetype2/freetype.h"; then + FREETYPE2_DIR=$i + FREETYPE2_INC_DIR=$i/include/freetype2 + break +@@ -233,7 +233,7 @@ ],[ - AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ - -L$GD_T1_DIR/$PHP_LIBDIR + -L$GD_T1_DIR/$PHP_LIBDIR -lm diff --git a/graphics/podofo/Makefile b/graphics/podofo/Makefile index b4d6e9a8154e..4b824d5e8c31 100644 --- a/graphics/podofo/Makefile +++ b/graphics/podofo/Makefile @@ -17,13 +17,14 @@ LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig -USES= cmake +USES= cmake dos2unix CMAKE_ARGS= -DPODOFO_BUILD_SHARED:BOOL=TRUE \ -DPODOFO_BUILD_STATIC:BOOL=FALSE \ -DOPENSSL_INCLUDE_DIR:PATH="${OPENSSLINC}" \ -DOPENSSL_LIBRARIES:PATH="${OPENSSLDIR}" USE_OPENSSL= yes USE_LDCONFIG= yes +DOS2UNIX_FILES= cmake/modules/FindFREETYPE.cmake OPTIONS_DEFINE= IMPOSE JPEG PNG TIFF OPTIONS_DEFAULT= JPEG PNG TIFF diff --git a/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake new file mode 100644 index 000000000000..fab85541e57c --- /dev/null +++ b/graphics/podofo/files/patch-cmake_modules_FindFREETYPE.cmake @@ -0,0 +1,19 @@ +--- cmake/modules/FindFREETYPE.cmake.orig 2013-12-23 19:53:54.000000000 +0200 ++++ cmake/modules/FindFREETYPE.cmake 2013-12-23 19:54:05.000000000 +0200 +@@ -12,14 +12,14 @@ + + SET(FREETYPE_FIND_QUIETLY 1) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h + /usr/include/ + /usr/local/include/ + /usr/X11/include/ + NO_CMAKE_SYSTEM_PATH + ) + +-FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h ++FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER config/ftheader.h + /usr/include/freetype2 + /usr/local/include/freetype2 + /usr/X11/include/freetype2 diff --git a/graphics/py-imaging/files/patch-_imagingft.c b/graphics/py-imaging/files/patch-_imagingft.c new file mode 100644 index 000000000000..b6895dfc9221 --- /dev/null +++ b/graphics/py-imaging/files/patch-_imagingft.c @@ -0,0 +1,11 @@ +--- _imagingft.c.orig 2013-12-16 01:41:20.000000000 +0100 ++++ _imagingft.c 2013-12-16 01:42:34.000000000 +0100 +@@ -70,7 +70,7 @@ + const char* message; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include FT_ERRORS_H + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/graphics/py-pillow/files/patch-_imagingft.c b/graphics/py-pillow/files/patch-_imagingft.c new file mode 100644 index 000000000000..b6895dfc9221 --- /dev/null +++ b/graphics/py-pillow/files/patch-_imagingft.c @@ -0,0 +1,11 @@ +--- _imagingft.c.orig 2013-12-16 01:41:20.000000000 +0100 ++++ _imagingft.c 2013-12-16 01:42:34.000000000 +0100 +@@ -70,7 +70,7 @@ + const char* message; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include FT_ERRORS_H + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/graphics/py-soya3d/files/patch-include_freetype.h b/graphics/py-soya3d/files/patch-include_freetype.h new file mode 100644 index 000000000000..0d16fe2ae324 --- /dev/null +++ b/graphics/py-soya3d/files/patch-include_freetype.h @@ -0,0 +1,14 @@ +--- include_freetype.h.orig 2013-12-24 20:30:39.000000000 +0100 ++++ include_freetype.h 2013-12-24 20:31:30.000000000 +0100 +@@ -21,8 +21,7 @@ + + #include <ft2build.h> + #include FT_FREETYPE_H // this is not do-able in Pyrex +-#include <freetype/freetype.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ftimage.h> +-#include <freetype/ftglyph.h> ++#include FT_OUTLINE_H ++#include FT_IMAGE_H ++#include FT_GLYPH_H + diff --git a/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c b/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c new file mode 100644 index 000000000000..bc5ee9fd307c --- /dev/null +++ b/graphics/sk1libs/files/patch-src_imaging_libimagingft_imagingft.c @@ -0,0 +1,11 @@ +--- src/imaging/libimagingft/_imagingft.c.orig 2009-11-01 01:44:12.000000000 +0100 ++++ src/imaging/libimagingft/_imagingft.c 2013-12-16 01:46:04.000000000 +0100 +@@ -70,7 +70,7 @@ + const char* message; + } ft_errors[] = + +-#include <freetype/fterrors.h> ++#include FT_ERRORS_H + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c b/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c new file mode 100644 index 000000000000..627d18e2a2ab --- /dev/null +++ b/graphics/sodipodi/files/patch-src_libnrtype_nr-type-fc2.c @@ -0,0 +1,14 @@ +--- src/libnrtype/nr-type-ft2.c.orig 2013-12-16 01:48:18.000000000 +0100 ++++ src/libnrtype/nr-type-ft2.c 2013-12-16 01:49:11.000000000 +0100 +@@ -13,8 +13,9 @@ + #include <stdio.h> + #include <libnr/nr-macros.h> + #include <libnr/nr-matrix.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ftbbox.h> ++#include <ft2build.h> ++#include FT_OUTLINE_H ++#include FT_BBOX_H + #include "nr-type-ft2.h" + + #define noNRTFFT2_DEBUG diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile index 103afa036f6a..7ef5103dc64f 100644 --- a/graphics/swfmill/Makefile +++ b/graphics/swfmill/Makefile @@ -14,9 +14,10 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -USES= iconv gmake pkgconfig +USES= dos2unix iconv gmake pkgconfig USE_GNOME= libxml2 libxslt USE_AUTOTOOLS= libtool +DOS2UNIX_FILES= src/swft/swft_import_ttf.cpp PLIST_FILES= bin/swfmill diff --git a/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp b/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp new file mode 100644 index 000000000000..016392c7fb41 --- /dev/null +++ b/graphics/swfmill/files/patch-src_swft_swft-import-ttf.cpp @@ -0,0 +1,11 @@ +--- src/swft/swft_import_ttf.cpp.orig 2013-12-16 08:12:12.000000000 +0100 ++++ src/swft/swft_import_ttf.cpp 2013-12-16 08:11:52.000000000 +0100 +@@ -14,7 +14,7 @@ + #include FT_OUTLINE_H + #include "SWFShapeMaker.h" + +-#include <freetype/tttables.h> ++#include FT_TRUETYPE_TABLES_H + + using namespace SWF; + diff --git a/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt b/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt new file mode 100644 index 000000000000..e6b48cb465d8 --- /dev/null +++ b/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt @@ -0,0 +1,10 @@ +--- thirdparty/ftgl/CMakeLists.txt.orig 2013-12-24 22:28:17.000000000 +0200 ++++ thirdparty/ftgl/CMakeLists.txt 2013-12-24 22:28:03.000000000 +0200 +@@ -104,6 +104,7 @@ + + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS}) ++INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) + + ADD_LIBRARY(ftgl SHARED ${ftgl_SRCS} ${ftgl_headers_SRCS} ${ftglyph_SRCS} ${ftfont_SRCS} ${ftlayout_SRCS}) + TARGET_LINK_LIBRARIES(ftgl ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY}) diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index a46cf1eddd38..32f22b62dc5a 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -39,6 +39,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's/-ldl //' \ + -e 's|freetype/||g' \ ${WRKSRC}/configure ${WRKSRC}/rw/configure @${REINPLACE_CMD} -e '/^LIBTOOL/d' \ -e '/^install-exec-am:/s/install-libLTLIBRARIES//' \ diff --git a/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c b/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c new file mode 100644 index 000000000000..b06b806673eb --- /dev/null +++ b/japanese/xdvik/files/patch-texk_xdvik_vf2ft.c @@ -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) diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c new file mode 100644 index 000000000000..94e225bf65a5 --- /dev/null +++ b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-FreetypeGlyphVector.c @@ -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" diff --git a/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c new file mode 100644 index 000000000000..69fc69036461 --- /dev/null +++ b/java/classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkFontPeer.c @@ -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" diff --git a/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c b/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c new file mode 100644 index 000000000000..30e29a8dbed4 --- /dev/null +++ b/java/sablevm-classpath/files/patch-native_jni_gtk-peer_gnu-java-awt-peer-gtk-GdkTextLayout.c @@ -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" diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 6696d22f30a0..a33efdc27251 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -169,6 +169,7 @@ CONFIGURE_ARGS+=--disable-ipv6 post-patch: @${TOUCH} ${WRKSRC}/ext/php_config.h +# @${REINPLACE_CMD} -e 's|freetype/||g' ${WRKSRC}/config.m4 @${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|" \ diff --git a/lang/php52/Makefile b/lang/php52/Makefile index e6576f048e90..0bb50d0d4710 100644 --- a/lang/php52/Makefile +++ b/lang/php52/Makefile @@ -194,6 +194,7 @@ CONFIGURE_ARGS+=--disable-ipv6 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' \ diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 0dd20a33bc85..71223cf63818 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -154,6 +154,7 @@ CONFIGURE_ARGS+=--disable-ipv6 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|" \ diff --git a/lang/php55/Makefile b/lang/php55/Makefile index 447915272eb0..f28defd6b408 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -169,6 +169,7 @@ CONFIGURE_ARGS+=--disable-ipv6 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|" \ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 3db54e49f56b..ec2fca99ab21 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -349,6 +349,7 @@ post-patch: ${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 diff --git a/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c b/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c new file mode 100644 index 000000000000..7662dd9cc0d1 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavfilter_vf-drawtext.c @@ -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 diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index e99c980908d4..113e1b338c6d 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -413,6 +413,7 @@ post-patch: ${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' \ diff --git a/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c b/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c new file mode 100644 index 000000000000..86ac852ccc79 --- /dev/null +++ b/multimedia/ffmpeg0/files/patch-libavfilter_vf-drawtext.c @@ -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 + diff --git a/multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c b/multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c new file mode 100644 index 000000000000..d8009517d271 --- /dev/null +++ b/multimedia/mlt/files/patch-src_modules_gtk2_producer-pango.c @@ -0,0 +1,12 @@ +--- src/modules/gtk2/producer_pango.c.orig 2013-12-24 21:37:38.000000000 +0100 ++++ src/modules/gtk2/producer_pango.c 2013-12-24 21:37:11.000000000 +0100 +@@ -25,7 +25,8 @@ + #include <string.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + #include <pango/pangoft2.h> +-#include <freetype/freetype.h> ++#include <ft2build.h> ++#include FT_FREETYPE_H + #include <iconv.h> + #include <pthread.h> + #include <ctype.h> diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index c8e966b4f7ca..db602a411cda 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -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,21 +16,19 @@ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION} 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 -LIBTOOLFILES= builds/unix/configure +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} @@ -47,12 +45,11 @@ pre-patch: @${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> diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo index a86731fa1a74..c5cc19e10d89 100644 --- a/print/freetype2/distinfo +++ b/print/freetype2/distinfo @@ -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 diff --git a/print/freetype2/files/patch-builds::unix::freetype-config.in b/print/freetype2/files/patch-builds::unix::freetype-config.in deleted file mode 100644 index 4a935f869f9c..000000000000 --- a/print/freetype2/files/patch-builds::unix::freetype-config.in +++ /dev/null @@ -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 diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist index e858413c34f4..219af878b706 100644 --- a/print/freetype2/pkg-plist +++ b/print/freetype2/pkg-plist @@ -1,61 +1,60 @@ 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 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 diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile index 39f201132980..37751298146e 100644 --- a/print/ft2demos/Makefile +++ b/print/ft2demos/Makefile @@ -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 @@ MAINTAINER= 5u623l20@gmail.com 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 @@ PLIST_FILES= ${FT_PROGRAMS:S,^,bin/,} 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> diff --git a/print/ft2demos/distinfo b/print/ft2demos/distinfo index 694a4a1e9e55..05757a922c30 100644 --- a/print/ft2demos/distinfo +++ b/print/ft2demos/distinfo @@ -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 diff --git a/print/lilypond/files/patch-lily_freetype-error.cc b/print/lilypond/files/patch-lily_freetype-error.cc new file mode 100644 index 000000000000..d729c4536253 --- /dev/null +++ b/print/lilypond/files/patch-lily_freetype-error.cc @@ -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 + + ; + diff --git a/print/lilypond/files/patch-lily_open-type-font.cc b/print/lilypond/files/patch-lily_open-type-font.cc new file mode 100644 index 000000000000..78d55522b016 --- /dev/null +++ b/print/lilypond/files/patch-lily_open-type-font.cc @@ -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" diff --git a/print/lilypond/files/patch-lily_pango-font.cc b/print/lilypond/files/patch-lily_pango-font.cc new file mode 100644 index 000000000000..227a0444fd58 --- /dev/null +++ b/print/lilypond/files/patch-lily_pango-font.cc @@ -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> diff --git a/print/lilypond/files/patch-lily_ttf.cc b/print/lilypond/files/patch-lily_ttf.cc new file mode 100644 index 000000000000..0211987989dc --- /dev/null +++ b/print/lilypond/files/patch-lily_ttf.cc @@ -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" diff --git a/print/paps/files/patch-src_libpaps.c b/print/paps/files/patch-src_libpaps.c new file mode 100644 index 000000000000..790c3a8dda74 --- /dev/null +++ b/print/paps/files/patch-src_libpaps.c @@ -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> diff --git a/print/ttf2pt1/files/patch-ft.c b/print/ttf2pt1/files/patch-ft.c index 02c702492731..80140af7a608 100644 --- a/print/ttf2pt1/files/patch-ft.c +++ b/print/ttf2pt1/files/patch-ft.c @@ -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" + diff --git a/science/paraview/files/patch-VTK_CMake_FindFREETYPE.cmake b/science/paraview/files/patch-VTK_CMake_FindFREETYPE.cmake new file mode 100644 index 000000000000..572db7a78efc --- /dev/null +++ b/science/paraview/files/patch-VTK_CMake_FindFREETYPE.cmake @@ -0,0 +1,14 @@ +--- 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 + ) diff --git a/x11-fm/xfe/Makefile b/x11-fm/xfe/Makefile index c05a50de06ac..68312fa3d3db 100644 --- a/x11-fm/xfe/Makefile +++ b/x11-fm/xfe/Makefile @@ -27,6 +27,7 @@ post-patch: ${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> diff --git a/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake new file mode 100644 index 000000000000..fa75a8cd357f --- /dev/null +++ b/x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake @@ -0,0 +1,22 @@ +--- 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 diff --git a/x11-fonts/ttmkfdir/files/patch-ttf.cpp b/x11-fonts/ttmkfdir/files/patch-ttf.cpp index 7718aea50169..da260f32bd09 100644 --- a/x11-fonts/ttmkfdir/files/patch-ttf.cpp +++ b/x11-fonts/ttmkfdir/files/patch-ttf.cpp @@ -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", }; diff --git a/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt b/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt index 18ecf8aa437f..733734d4260e 100644 --- a/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt +++ b/x11-toolkits/fltk-devel/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2013-09-11 14:54:40.000000000 +0200 -+++ CMakeLists.txt 2013-10-23 16:43:54.000000000 +0200 +--- CMakeLists.txt.orig 2013-09-11 15:54:40.000000000 +0300 ++++ CMakeLists.txt 2013-12-23 19:35:33.000000000 +0200 @@ -54,6 +54,12 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") endif(APPLE) @@ -13,6 +13,15 @@ if(WIN32) if(MSVC) add_definitions(-DWIN32_LEAN_AND_MEAN) +@@ -129,7 +135,7 @@ + mark_as_advanced(HAVE_SYS_STDTYPES_H HAVE_XDBE_H) + + # where to find freetype headers +-find_path(FREETYPE_PATH freetype/config/ftheader.h PATH_SUFFIXES freetype2) ++find_path(FREETYPE_PATH config/ftheader.h PATH_SUFFIXES freetype2) + if(FREETYPE_PATH) + include_directories(${FREETYPE_PATH}) + endif(FREETYPE_PATH) @@ -681,7 +687,7 @@ install(FILES ${FLTK_SOURCE_DIR}/documentation/src/${FILE}.man diff --git a/x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h b/x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h new file mode 100644 index 000000000000..054cce89e83c --- /dev/null +++ b/x11-toolkits/libgdiplus/files/patch-src_gdiplus-private.h @@ -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> + diff --git a/x11-wm/matwm2/files/patch-configure b/x11-wm/matwm2/files/patch-configure new file mode 100644 index 000000000000..c117f4a52324 --- /dev/null +++ b/x11-wm/matwm2/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2013-12-24 20:50:01.000000000 +0100 ++++ configure 2013-12-24 20:50:14.000000000 +0100 +@@ -36,7 +36,7 @@ + x11) echo "X11/Xlib.h";; + xext) echo "X11/extensions/shape.h";; + xinerama) echo "X11/extensions/Xinerama.h";; +- xft) echo "X11/Xft/Xft.h freetype/config/ftheader.h";; ++ xft) echo "X11/Xft/Xft.h config/ftheader.h";; + xproto) echo "X11/Xproto.h";; + esac + } |