[140195] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Fri Sep 11 09:54:53 PDT 2015
Revision: 140195
https://trac.macports.org/changeset/140195
Author: michaelld at macports.org
Date: 2015-09-11 09:54:52 -0700 (Fri, 11 Sep 2015)
Log Message:
-----------
cmake-devel: update to 20150910 (ge6cc5), splitting noArchCheck patches for release and devel.
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
Added Paths:
-----------
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2015-09-11 16:38:23 UTC (rev 140194)
+++ trunk/dports/devel/cmake/Portfile 2015-09-11 16:54:52 UTC (rev 140195)
@@ -40,6 +40,8 @@
master_sites http://www.cmake.org/files/v${branch}/
+ patchfiles-append patch-Modules-noArchCheck.release.diff
+
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
livecheck.url [lindex $master_sites 0]
@@ -47,12 +49,12 @@
} else {
# devel
- version 20150831
+ version 20150910
set dist_branch 3.3
- set dist_date 20150831
- set dist_hash gb53ba
- checksums rmd160 015fc264e7ecb8a1d573d13e950d9491928bbf3b \
- sha256 7777b857d9468df9fe0a106a9f82bbc5064e297258da07070b3d2085a620b8f7
+ set dist_date 20150910
+ set dist_hash ge6cc5
+ checksums rmd160 e654dfeef16bfe34276d7bd52653d03b47bad128 \
+ sha256 ad4710b212dd851418f45f9783395e74ca31774e3235961db5ac8743fd3320e0
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -61,6 +63,8 @@
long_description ${base_long_description} \
The ${subport} port is updated roughly every week.
+ patchfiles-append patch-Modules-noArchCheck.devel.diff
+
livecheck.type regex
livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
livecheck.version ${distname}
@@ -78,12 +82,11 @@
# jsoncpp 1.0+ requires CMake for building. catch 22. So, have CMake
# use its internal jsoncpp until a better solution comes about.
-patchfiles patch-CMakeFindFrameworks.cmake.diff \
+patchfiles-append patch-CMakeFindFrameworks.cmake.diff \
patch-Modules-FindFreetype.cmake.diff \
patch-Modules-FindQt4.cmake.diff \
patch-Modules-Platform-Darwin.cmake.diff \
- patch-Modules-Platform-Darwin-Initialize.cmake.diff \
- patch-Modules-noArchCheck.diff
+ patch-Modules-Platform-Darwin-Initialize.cmake.diff
configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
Copied: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff (from rev 140194, trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2015-09-11 16:54:52 UTC (rev 140195)
@@ -0,0 +1,56 @@
+--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+@@ -17,15 +17,3 @@ else()
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+ endif()
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-ExactVersion.cmake.in
+@@ -32,16 +32,3 @@ endif()
+ if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+@@ -31,16 +31,3 @@ else()
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
Deleted: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff 2015-09-11 16:38:23 UTC (rev 140194)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff 2015-09-11 16:54:52 UTC (rev 140195)
@@ -1,56 +0,0 @@
---- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
-+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
-@@ -17,15 +17,3 @@
- set(PACKAGE_VERSION_EXACT TRUE)
- endif()
- endif()
--
--# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
-- return()
--endif()
--
--# 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")
-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
--endif()
---- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
-+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
-@@ -32,16 +32,3 @@
- if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
- set(PACKAGE_VERSION_EXACT TRUE)
- endif()
--
--
--# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
-- return()
--endif()
--
--# 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")
-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
--endif()
---- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
-+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
-@@ -31,16 +31,3 @@
- set(PACKAGE_VERSION_EXACT TRUE)
- endif()
- endif()
--
--
--# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
--if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
-- return()
--endif()
--
--# 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")
-- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-- set(PACKAGE_VERSION_UNSUITABLE TRUE)
--endif()
Copied: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff (from rev 140191, trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff 2015-09-11 16:54:52 UTC (rev 140195)
@@ -0,0 +1,56 @@
+--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
+@@ -17,15 +17,3 @@
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+ endif()
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-ExactVersion.cmake.in
+@@ -32,16 +32,3 @@
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+- set(PACKAGE_VERSION_UNSUITABLE TRUE)
+-endif()
+--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
++++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
+@@ -31,16 +31,3 @@
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+ endif()
+-
+-
+-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+-if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
+- return()
+-endif()
+-
+-# 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")
+- 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/20150911/b2197d07/attachment.html>
More information about the macports-changes
mailing list