[114159] trunk/dports/science/gr-fosphor

[michaelld at macports.org]

Revision: 114159
          https://trac.macports.org/changeset/114159
Author:   michaelld at macports.org
Date:     2013-11-30 08:14:46 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
gr-fosphor: really fix #41612.

Modified Paths:
--------------
    trunk/dports/science/gr-fosphor/Portfile

Added Paths:
-----------
    trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff

Removed Paths:
-------------
    trunk/dports/science/gr-fosphor/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/science/gr-fosphor/Portfile
===================================================================
--- trunk/dports/science/gr-fosphor/Portfile	2013-11-30 15:59:00 UTC (rev 114158)
+++ trunk/dports/science/gr-fosphor/Portfile	2013-11-30 16:14:46 UTC (rev 114159)
@@ -40,7 +40,7 @@
     port:pkgconfig \
     port:doxygen
 
-patchfiles          patch-freetype-2.5.1.diff
+patchfiles          patch-cmake_Modules_FindFreetype2.cmake.diff
 
 # do VPATH build
 

Copied: trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff (from rev 114156, trunk/dports/science/gr-fosphor/files/patch-freetype-2.5.1.diff)
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff	                        (rev 0)
+++ trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff	2013-11-30 16:14:46 UTC (rev 114159)
@@ -0,0 +1,26 @@
+--- cmake/Modules/FindFreetype2.cmake.orig	2013-11-30 11:10:16.000000000 -0500
++++ cmake/Modules/FindFreetype2.cmake	2013-11-30 11:11:40.000000000 -0500
+@@ -1,18 +1,20 @@
+ if(NOT FREETYPE2_FOUND)
+   INCLUDE(FindPkgConfig)
+   pkg_check_modules (FREETYPE2_PKG freetype2)
+-  find_path(FREETYPE2_INCLUDE_DIRS NAMES freetype/freetype.h
++  find_path(FREETYPE2_INCLUDE_DIRS NAMES freetype.h
++    HINTS ${FREETYPE2_PKG_INCLUDE_DIRS}
+     PATHS
+-    ${FREETYPE2_PKG_INCLUDE_DIRS}
+     /usr/include/freetype2
+     /usr/local/include/freetype2
++    /opt/local/include/freetype2
+   )
+ 
+   find_library(FREETYPE2_LIBRARIES NAMES freetype
++    HINTS ${FREETYPE2_PKG_LIBRARY_DIRS}
+     PATHS
+-    ${FREETYPE2_PKG_LIBRARY_DIRS}
+     /usr/lib
+     /usr/local/lib
++    /opt/local/lib
+   )
+ 
+   if(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)

Deleted: trunk/dports/science/gr-fosphor/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-freetype-2.5.1.diff	2013-11-30 15:59:00 UTC (rev 114158)
+++ trunk/dports/science/gr-fosphor/files/patch-freetype-2.5.1.diff	2013-11-30 16:14:46 UTC (rev 114159)
@@ -1,23 +0,0 @@
-Fix build with freetype 2.5.1.
---- cmake/Modules/FindFreetype2.cmake.orig	2013-11-30 03:20:03.000000000 -0600
-+++ cmake/Modules/FindFreetype2.cmake	2013-11-30 03:54:51.000000000 -0600
-@@ -1,18 +1,14 @@
- if(NOT FREETYPE2_FOUND)
-   INCLUDE(FindPkgConfig)
-   pkg_check_modules (FREETYPE2_PKG freetype2)
--  find_path(FREETYPE2_INCLUDE_DIRS NAMES freetype/freetype.h
-+  find_path(FREETYPE2_INCLUDE_DIRS NAMES ft2build.h
-     PATHS
-     ${FREETYPE2_PKG_INCLUDE_DIRS}
--    /usr/include/freetype2
--    /usr/local/include/freetype2
-   )
- 
-   find_library(FREETYPE2_LIBRARIES NAMES freetype
-     PATHS
-     ${FREETYPE2_PKG_LIBRARY_DIRS}
--    /usr/lib
--    /usr/local/lib
-   )
- 
-   if(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131130/67fe6fb9/attachment.html>