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-toolkits/fltk-devel | |
| parent | - Properly look for X11 using CMake and include the appropriate directories (diff) | |
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-toolkits/fltk-devel')
| -rw-r--r-- | x11-toolkits/fltk-devel/files/patch-CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
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 |