[114301] trunk/dports/science/gr-fosphor
michaelld at macports.org
michaelld at macports.org
Wed Dec 4 07:48:35 PST 2013
Revision: 114301
https://trac.macports.org/changeset/114301
Author: michaelld at macports.org
Date: 2013-12-04 07:48:35 -0800 (Wed, 04 Dec 2013)
Log Message:
-----------
gr-fosphor: better patch for FindFreetype2; augment some other Find routines too.
Modified Paths:
--------------
trunk/dports/science/gr-fosphor/Portfile
Added Paths:
-----------
trunk/dports/science/gr-fosphor/files/patch-cmake_Modules.diff
Removed Paths:
-------------
trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff
Modified: trunk/dports/science/gr-fosphor/Portfile
===================================================================
--- trunk/dports/science/gr-fosphor/Portfile 2013-12-04 15:45:17 UTC (rev 114300)
+++ trunk/dports/science/gr-fosphor/Portfile 2013-12-04 15:48:35 UTC (rev 114301)
@@ -40,7 +40,7 @@
port:pkgconfig \
port:doxygen
-patchfiles patch-cmake_Modules_FindFreetype2.cmake.diff
+patchfiles patch-cmake_Modules.diff
# do VPATH build
Added: trunk/dports/science/gr-fosphor/files/patch-cmake_Modules.diff
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-cmake_Modules.diff (rev 0)
+++ trunk/dports/science/gr-fosphor/files/patch-cmake_Modules.diff 2013-12-04 15:48:35 UTC (rev 114301)
@@ -0,0 +1,175 @@
+--- cmake/Modules/FindCppUnit.cmake.orig
++++ cmake/Modules/FindCppUnit.cmake
+@@ -18,6 +18,7 @@ FIND_PATH(CPPUNIT_INCLUDE_DIRS
+ PATHS
+ /usr/local/include
+ /usr/include
++ /opt/local/include
+ )
+
+ FIND_LIBRARY(CPPUNIT_LIBRARIES
+@@ -27,6 +28,7 @@ FIND_LIBRARY(CPPUNIT_LIBRARIES
+ ${CPPUNIT_INCLUDE_DIRS}/../lib
+ /usr/local/lib
+ /usr/lib
++ /opt/local/lib
+ )
+
+ LIST(APPEND CPPUNIT_LIBRARIES ${CMAKE_DL_LIBS})
+--- cmake/Modules/FindFreetype2.cmake.orig
++++ cmake/Modules/FindFreetype2.cmake
+@@ -1,27 +1,103 @@
+ if(NOT FREETYPE2_FOUND)
+ INCLUDE(FindPkgConfig)
+ pkg_check_modules (FREETYPE2_PKG freetype2)
+- find_path(FREETYPE2_INCLUDE_DIRS NAMES freetype/freetype.h
+- PATHS
+- ${FREETYPE2_PKG_INCLUDE_DIRS}
+- /usr/include/freetype2
+- /usr/local/include/freetype2
+- )
+
+- find_library(FREETYPE2_LIBRARIES NAMES freetype
++ # find ft2build.h, which was added in 2.1.6; this could be in the
++ # top level include directory (for API release 16 or earlier) or in
++ # freetype2 (for API release 17 or later).
++
++ find_path(FREETYPE2_INCLUDE_DIR_ft2build
++ NAMES
++ ft2build.h
++ HINTS
++ ${FREETYPE2_PKG_INCLUDE_DIRS}
++ ENV FREETYPE2_DIR
+ PATHS
+- ${FREETYPE2_PKG_LIBRARY_DIRS}
+- /usr/lib
+- /usr/local/lib
++ /usr
++ /usr/local
++ /opt/local
++ PATH_SUFFIXES
++ include/freetype2
++ include
+ )
+
+- if(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)
+- set(FREETYPE2_FOUND TRUE CACHE INTERNAL "freetype2 found")
+- message(STATUS "Found freetype2: ${FREETYPE2_INCLUDE_DIR}, ${FREETYPE2_LIBRARIES}")
+- else(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)
+- set(FREETYPE2_FOUND FALSE CACHE INTERNAL "freetype2 found")
+- message(STATUS "freetype2 not found.")
+- endif(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)
++ if(FREETYPE2_INCLUDE_DIR_ft2build)
++
++ # Freetype changed header locations between API release 16 and 17;
++ # look for config/ftheader.h depending on the API release number.
++
++ if(NOT FREETYPE2_PKG_VERSION)
++
++ # PKGCONFIG failed to find a package, but ft2build.h was
++ # located. Guess API release version based on trailing
++ # directory of ft2build.h location.
++
++ STRING(REGEX MATCH "[^/]*$" FREETYPE2_ft2build_DIR ${FREETYPE2_INCLUDE_DIR_ft2build})
++ message("FREETYPE2_ft2build_DIR is '${FREETYPE2_ft2build_DIR}'")
++ STRING(COMPARE NOTEQUAL ${FREETYPE2_ft2build_DIR} "freetype2" FREETYPE_IS_2_4_OR_EARLIER)
++
++ else(NOT FREETYPE2_PKG_VERSION)
++
++ # PKGCONFIG provides version information; use that
++
++ STRING(REGEX MATCH "[^.]*" FREETYPE2_RELEASE ${FREETYPE2_PKG_VERSION})
++ STRING(COMPARE LESS ${FREETYPE2_RELEASE} 17 FREETYPE_IS_2_4_OR_EARLIER)
++
++ endif(NOT FREETYPE2_PKG_VERSION)
++
++ if(FREETYPE_IS_2_4_OR_EARLIER)
++ # freetype 2.4 or earlier
++ set(FTHEADER_NAME freetype/config/ftheader.h)
++ else(FREETYPE_IS_2_4_OR_EARLIER)
++ # freetype 2.5 or later
++ set(FTHEADER_NAME config/ftheader.h)
++ endif(FREETYPE_IS_2_4_OR_EARLIER)
++
++ find_path(FREETYPE2_INCLUDE_DIR_ftheader
++ NAMES
++ ${FTHEADER_NAME}
++ HINTS
++ ${FREETYPE2_PKG_INCLUDE_DIRS}
++ ${FREETYPE2_INCLUDE_DIR_ft2build}
++ ENV FREETYPE2_DIR
++ PATH_SUFFIXES
++ freetype2
++ include/freetype2
++ include
++ NO_DEFAULT_PATH
++ )
++
++ if(FREETYPE2_INCLUDE_DIR_ftheader)
++ string(COMPARE EQUAL ${FREETYPE2_INCLUDE_DIR_ft2build} ${FREETYPE2_INCLUDE_DIR_ftheader} FREETYPE2_DIRS_SAME)
++ if(FREETYPE2_DIRS_SAME)
++ set(FREETYPE2_INCLUDE_DIRS ${FREETYPE2_INCLUDE_DIR_ft2build})
++ else()
++ set(FREETYPE2_INCLUDE_DIRS ${FREETYPE2_INCLUDE_DIR_ft2build};${FREETYPE2_INCLUDE_DIR_ftheader})
++ endif()
++
++ find_library(FREETYPE2_LIBRARIES
++ NAMES
++ freetype
++ HINTS
++ ${FREETYPE2_PKG_LIBRARY_DIRS}
++ ENV FREETYPE_DIR
++ PATHS
++ /usr
++ /usr/local
++ /opt/local
++ PATH_SUFFIXES
++ lib
++ )
++
++ if(FREETYPE2_LIBRARIES)
++ set(FREETYPE2_FOUND TRUE CACHE INTERNAL "freetype2 found")
++ message(STATUS "Found freetype2: ${FREETYPE2_INCLUDE_DIRS}, ${FREETYPE2_LIBRARIES}")
++ else(FREETYPE2_INCLUDE_DIRS AND FREETYPE2_LIBRARIES)
++ set(FREETYPE2_FOUND FALSE CACHE INTERNAL "freetype2 found")
++ message(STATUS "freetype2 not found.")
++ endif(FREETYPE2_LIBRARIES)
++ endif(FREETYPE2_INCLUDE_DIR_ftheader)
++ endif(FREETYPE2_INCLUDE_DIR_ft2build)
+
+ mark_as_advanced(FREETYPE2_INCLUDE_DIRS FREETYPE2_LIBRARIES)
+
+--- cmake/Modules/FindGLFW3.cmake.orig
++++ cmake/Modules/FindGLFW3.cmake
+@@ -2,22 +2,28 @@ if(NOT GLFW3_FOUND)
+ INCLUDE(FindPkgConfig)
+ pkg_check_modules (GLFW3_PKG glfw3)
+ find_path(GLFW3_INCLUDE_DIRS NAMES GLFW/glfw3.h
+- PATHS
++ HINTS
+ ${GLFW3_PKG_INCLUDE_DIRS}
++ ENV GLFW3_DIR
++ PATHS
+ /usr/include
+ /usr/local/include
++ /opt/local/include
+ )
+
+ find_library(GLFW3_LIBRARIES NAMES glfw3 glfw
+- PATHS
++ HINTS
+ ${GLFW3_PKG_LIBRARY_DIRS}
++ ENV GLFW3_DIR
++ PATHS
+ /usr/lib
+ /usr/local/lib
++ /opt/local/lib
+ )
+
+ if(GLFW3_INCLUDE_DIRS AND GLFW3_LIBRARIES)
+ set(GLFW3_FOUND TRUE CACHE INTERNAL "GLFW3 found")
+- message(STATUS "Found GLFW3: ${GLFW3_INCLUDE_DIR}, ${GLFW3_LIBRARIES}")
++ message(STATUS "Found GLFW3: ${GLFW3_INCLUDE_DIRS}, ${GLFW3_LIBRARIES}")
+ else(GLFW3_INCLUDE_DIRS AND GLFW3_LIBRARIES)
+ set(GLFW3_FOUND FALSE CACHE INTERNAL "GLFW3 found")
+ message(STATUS "GLFW3 not found.")
Deleted: trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff 2013-12-04 15:45:17 UTC (rev 114300)
+++ trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindFreetype2.cmake.diff 2013-12-04 15:48:35 UTC (rev 114301)
@@ -1,26 +0,0 @@
---- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131204/4daf9cff/attachment-0001.html>
More information about the macports-changes
mailing list