diff options
author | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2013-12-24 21:22:21 +0000 |
commit | b1bf1620a6571c5eb84bed4e3f06cf52094d0a48 (patch) | |
tree | 93506aaee5230ee46b75930c4b3a6b8e0f243d74 /x11-fonts/fontmatrix | |
parent | 123411e1ee17366ee88efd54b8482949b8e76eb5 (diff) | |
download | ports-b1bf1620a6571c5eb84bed4e3f06cf52094d0a48.tar.gz ports-b1bf1620a6571c5eb84bed4e3f06cf52094d0a48.zip |
Update freetype to 2.5.2.
Remove patch to add -I/usr/local/include in freetype-config --cflags. If
ports need extra headers they should look for them, and not get them via
a side-effect.
Freetype had a header resuffle in 2.5.1, patch ports to use the new header
style.
Thanks go to bdrewery for the two exp-runs and rakuco for helping me with
some troublesome cmake ports.
PR: ports/184587
Notes
Notes:
svn path=/head/; revision=337385
Diffstat (limited to 'x11-fonts/fontmatrix')
-rw-r--r-- | x11-fonts/fontmatrix/files/patch-cmake__modules__FREETYPEConfig.cmake | 22 |
1 files changed, 22 insertions, 0 deletions
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 |