[151275] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Thu Aug 11 12:48:10 PDT 2016
Revision: 151275
https://trac.macports.org/changeset/151275
Author: michaelld at macports.org
Date: 2016-08-11 12:48:10 -0700 (Thu, 11 Aug 2016)
Log Message:
-----------
cmake:
+ update devel to 20160809 (g1b020);
+ split CMakeFindFrameworks patch between release and devel versions;
+ update noArchCheck devel patch.
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
Added Paths:
-----------
trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/Portfile 2016-08-11 19:48:10 UTC (rev 151275)
@@ -43,9 +43,9 @@
patchfiles-append \
patch-Modules-FindQt4.cmake.release.diff \
patch-Modules-FindFreetype.cmake.release.diff \
- patch-Modules-noArchCheck.release.diff
+ patch-Modules-noArchCheck.release.diff \
+ patch-CMakeFindFrameworks.cmake.release.diff
-
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
livecheck.url [lindex $master_sites 0]
@@ -54,12 +54,12 @@
# devel
- version 20160801
+ version 20160809
set dist_branch 3.6
- set dist_date 20160801
- set dist_hash g62452
- checksums rmd160 f56ce4926d0082255b52615c238c2db3dd8e13fe \
- sha256 caad99c3864bd019ffc2d9a7e8cf76aae99588f71dd4e65b56f046c023e4c61f
+ set dist_date 20160809
+ set dist_hash g1b020
+ checksums rmd160 34ccf32593e0b13c25650019c265a5cb0f575541 \
+ sha256 869ccfb3bfb2b2f16c7bc36238c3bfd2f2678c942f3efa15da32e68884e15c42
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -72,7 +72,8 @@
patchfiles-append \
patch-Modules-FindQt4.cmake.devel.diff \
patch-Modules-FindFreetype.cmake.devel.diff \
- patch-Modules-noArchCheck.devel.diff
+ patch-Modules-noArchCheck.devel.diff \
+ patch-CMakeFindFrameworks.cmake.devel.diff
livecheck.type regex
livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
@@ -92,8 +93,7 @@
# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
# use its internal jsoncpp until a better solution comes about.
-patchfiles-append patch-CMakeFindFrameworks.cmake.diff \
- patch-Modules-Platform-Darwin.cmake.diff
+patchfiles-append patch-Modules-Platform-Darwin.cmake.diff
configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
Copied: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff (from rev 151214, trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff 2016-08-11 19:48:10 UTC (rev 151275)
@@ -0,0 +1,10 @@
+--- Modules/CMakeFindFrameworks.cmake.orig
++++ Modules/CMakeFindFrameworks.cmake
+@@ -28,6 +28,7 @@
+ if(APPLE)
+ foreach(dir
+ ~/Library/Frameworks/${fwk}.framework
++ __PREFIX__/Library/Frameworks/${fwk}.framework
+ /usr/local/Frameworks/${fwk}.framework
+ /Library/Frameworks/${fwk}.framework
+ /System/Library/Frameworks/${fwk}.framework
Deleted: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2016-08-11 19:48:10 UTC (rev 151275)
@@ -1,10 +0,0 @@
---- Modules/CMakeFindFrameworks.cmake.orig
-+++ Modules/CMakeFindFrameworks.cmake
-@@ -24,6 +24,7 @@
- if(APPLE)
- foreach(dir
- ~/Library/Frameworks/${fwk}.framework
-+ __PREFIX__/Library/Frameworks/${fwk}.framework
- /Library/Frameworks/${fwk}.framework
- /System/Library/Frameworks/${fwk}.framework
- /Network/Library/Frameworks/${fwk}.framework)
Copied: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff (from rev 151274, trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.release.diff 2016-08-11 19:48:10 UTC (rev 151275)
@@ -0,0 +1,10 @@
+--- Modules/CMakeFindFrameworks.cmake.orig
++++ Modules/CMakeFindFrameworks.cmake
+@@ -24,6 +24,7 @@
+ if(APPLE)
+ foreach(dir
+ ~/Library/Frameworks/${fwk}.framework
++ __PREFIX__/Library/Frameworks/${fwk}.framework
+ /Library/Frameworks/${fwk}.framework
+ /System/Library/Frameworks/${fwk}.framework
+ /Network/Library/Frameworks/${fwk}.framework)
Modified: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2016-08-11 13:58:03 UTC (rev 151274)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2016-08-11 19:48:10 UTC (rev 151275)
@@ -13,7 +13,7 @@
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
@@ -32,7 +32,7 @@
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
@@ -51,6 +51,6 @@
-# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@")
- math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-- string(APPEND PACKAGE_VERSION " (${installedBits}bit)")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
- set(PACKAGE_VERSION_UNSUITABLE TRUE)
-endif()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160811/6998b7a2/attachment.html>
More information about the macports-changes
mailing list