Revision: 149764 https://trac.macports.org/changeset/149764 Author: michaelld@macports.org Date: 2016-06-29 13:40:59 -0700 (Wed, 29 Jun 2016) Log Message: ----------- cmake: + update devel to 20160628 (gc664b9); + fix some patches to be release or devel specific. Modified Paths: -------------- trunk/dports/devel/cmake/Portfile Added Paths: ----------- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff Removed Paths: ------------- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff Modified: trunk/dports/devel/cmake/Portfile =================================================================== --- trunk/dports/devel/cmake/Portfile 2016-06-29 20:40:15 UTC (rev 149763) +++ trunk/dports/devel/cmake/Portfile 2016-06-29 20:40:59 UTC (rev 149764) @@ -42,6 +42,11 @@ # keep this patch until the next version (major or minor) patchfiles-append patch-Modules-Platform-Darwin-Initialize.cmake.diff + # release-only patches + patchfiles-append \ + patch-Modules-FindQt4.cmake.release.diff \ + patch-Modules-FindFreetype.cmake.release.diff + livecheck.type regex livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix} livecheck.url [lindex $master_sites 0] @@ -50,12 +55,12 @@ # devel - version 20160621 + version 20160628 set dist_branch 3.6 - set dist_date 20160621 - set dist_hash gdbfd5 - checksums rmd160 8b536bbda1334cab7954724f8bdc485d1330e5ba \ - sha256 ff99a623f1a95313ac4b8a648ca185db8468ad0a5edaa888fcf4564e6c66d5e9 + set dist_date 20160628 + set dist_hash gc664b9 + checksums rmd160 ad455843f0e63a9e53f9b3956fb0f13b4bf1a3b7 \ + sha256 7c05845754a48d6e7cf584614c9e354185c219c516f6721029ad279e77f63c2d master_sites http://www.cmake.org/files/dev/ distname ${name}-${dist_branch}.${dist_date}-${dist_hash} @@ -64,6 +69,11 @@ long_description ${base_long_description} \ The ${subport} port is updated roughly every week. + # devel-only patches + patchfiles-append \ + patch-Modules-FindQt4.cmake.devel.diff \ + patch-Modules-FindFreetype.cmake.devel.diff + livecheck.type regex livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix} livecheck.version ${distname} @@ -83,8 +93,6 @@ # use its internal jsoncpp until a better solution comes about. patchfiles-append patch-CMakeFindFrameworks.cmake.diff \ - patch-Modules-FindFreetype.cmake.diff \ - patch-Modules-FindQt4.cmake.diff \ patch-Modules-Platform-Darwin.cmake.diff \ patch-Modules-noArchCheck.diff Copied: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff (from rev 149679, trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff) =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff (rev 0) +++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -0,0 +1,13 @@ +--- Modules/FindFreetype.cmake.orig ++++ Modules/FindFreetype.cmake +@@ -56,10 +56,6 @@ + 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] Deleted: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2016-06-29 20:40:15 UTC (rev 149763) +++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -1,13 +0,0 @@ ---- Modules/FindFreetype.cmake.orig -+++ Modules/FindFreetype.cmake -@@ -56,10 +56,6 @@ - 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] Copied: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff (from rev 149763, trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff) =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff (rev 0) +++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.release.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -0,0 +1,35 @@ +--- Modules/FindFreetype.cmake.orig ++++ Modules/FindFreetype.cmake +@@ -57,10 +57,6 @@ + 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] +@@ -78,10 +74,6 @@ + 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] +@@ -99,10 +91,6 @@ + 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] Copied: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff (from rev 149679, trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff) =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff (rev 0) +++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -0,0 +1,13 @@ +--- Modules/FindQt4.cmake.orig ++++ Modules/FindQt4.cmake +@@ -743,9 +743,7 @@ + find_path(QT_IMPORTS_DIR NAMES Qt + HINTS ${qt_cross_paths} ${qt_imports_dir} + DOC "The location of the Qt imports" +- NO_CMAKE_FIND_ROOT_PATH +- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH +- NO_CMAKE_SYSTEM_PATH) ++ NO_DEFAULT_PATH) + mark_as_advanced(QT_IMPORTS_DIR) + endif() + endif () Deleted: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2016-06-29 20:40:15 UTC (rev 149763) +++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -1,13 +0,0 @@ ---- Modules/FindQt4.cmake.orig -+++ Modules/FindQt4.cmake -@@ -741,9 +741,7 @@ - find_path(QT_IMPORTS_DIR NAMES Qt - HINTS ${qt_cross_paths} ${qt_imports_dir} - DOC "The location of the Qt imports" -- NO_CMAKE_FIND_ROOT_PATH -- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH -- NO_CMAKE_SYSTEM_PATH) -+ NO_DEFAULT_PATH) - mark_as_advanced(QT_IMPORTS_DIR) - endif() - endif () Copied: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff (from rev 149763, trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff) =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff (rev 0) +++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.release.diff 2016-06-29 20:40:59 UTC (rev 149764) @@ -0,0 +1,13 @@ +--- Modules/FindQt4.cmake.orig ++++ Modules/FindQt4.cmake +@@ -741,9 +741,7 @@ + find_path(QT_IMPORTS_DIR NAMES Qt + HINTS ${qt_cross_paths} ${qt_imports_dir} + DOC "The location of the Qt imports" +- NO_CMAKE_FIND_ROOT_PATH +- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH +- NO_CMAKE_SYSTEM_PATH) ++ NO_DEFAULT_PATH) + mark_as_advanced(QT_IMPORTS_DIR) + endif() + endif ()