[114177] trunk/dports/devel/cmake

[ryandesign at macports.org]

Revision: 114177
          https://trac.macports.org/changeset/114177
Author:   ryandesign at macports.org
Date:     2013-11-30 19:30:28 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
cmake: fix FindFreetype.cmake to be able to find freetype 2.5.1 (but not earlier versions; #41569; maintainer timeout); never look for freetype in system directories

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile

Added Paths:
-----------
    trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2013-12-01 03:09:21 UTC (rev 114176)
+++ trunk/dports/devel/cmake/Portfile	2013-12-01 03:30:28 UTC (rev 114177)
@@ -6,7 +6,7 @@
 
 name                cmake
 version             2.8.12
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD
@@ -27,6 +27,7 @@
 depends_lib-append  port:libidn port:openssl
 
 patchfiles          patch-CMakeFindFrameworks.cmake.diff \
+                    patch-Modules-FindFreetype.cmake.diff \
                     patch-Modules-FindQt4.cmake.diff
 
 configure.env-append \

Added: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff	                        (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff	2013-12-01 03:30:28 UTC (rev 114177)
@@ -0,0 +1,50 @@
+--- Modules/FindFreetype.cmake.orig	2013-10-07 10:31:00.000000000 -0500
++++ Modules/FindFreetype.cmake	2013-11-30 05:30:36.000000000 -0600
+@@ -46,24 +46,16 @@
+   HINTS
+     ENV FREETYPE_DIR
+   PATHS
+-    /usr/X11R6
+-    /usr/local/X11R6
+-    /usr/local/X11
+-    /usr/freeware
+     ENV GTKMM_BASEPATH
+     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+   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
+-    /usr/X11R6
+-    /usr/local/X11R6
+-    /usr/local/X11
+-    /usr/freeware
+     ENV GTKMM_BASEPATH
+     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+@@ -76,10 +68,6 @@
+     ENV FREETYPE_DIR
+   PATH_SUFFIXES lib
+   PATHS
+-    /usr/X11R6
+-    /usr/local/X11R6
+-    /usr/local/X11
+-    /usr/freeware
+     ENV GTKMM_BASEPATH
+     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+@@ -91,8 +79,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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131130/35dbd316/attachment.html>