[150938] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Tue Aug 2 11:24:20 PDT 2016
Revision: 150938
https://trac.macports.org/changeset/150938
Author: michaelld at macports.org
Date: 2016-08-02 11:24:20 -0700 (Tue, 02 Aug 2016)
Log Message:
-----------
cmake:
+ update devel to 20160801 (g62452);
+ split patch-Modules-noArchCheck between 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 2016-08-02 16:43:53 UTC (rev 150937)
+++ trunk/dports/devel/cmake/Portfile 2016-08-02 18:24:20 UTC (rev 150938)
@@ -42,8 +42,10 @@
# release-only patches
patchfiles-append \
patch-Modules-FindQt4.cmake.release.diff \
- patch-Modules-FindFreetype.cmake.release.diff
+ patch-Modules-FindFreetype.cmake.release.diff \
+ patch-Modules-noArchCheck.release.diff
+
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
livecheck.url [lindex $master_sites 0]
@@ -52,12 +54,12 @@
# devel
- version 20160726
+ version 20160801
set dist_branch 3.6
- set dist_date 20160722
- set dist_hash g858f9
- checksums rmd160 b68dcd81bb03d4c52daff0cd80b5a7852e89e3a4 \
- sha256 efa676d836269851acc8d3b9591091914d176882984d0b7bb40b47be13d1de52
+ set dist_date 20160801
+ set dist_hash g62452
+ checksums rmd160 f56ce4926d0082255b52615c238c2db3dd8e13fe \
+ sha256 caad99c3864bd019ffc2d9a7e8cf76aae99588f71dd4e65b56f046c023e4c61f
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -69,7 +71,8 @@
# devel-only patches
patchfiles-append \
patch-Modules-FindQt4.cmake.devel.diff \
- patch-Modules-FindFreetype.cmake.devel.diff
+ patch-Modules-FindFreetype.cmake.devel.diff \
+ patch-Modules-noArchCheck.devel.diff
livecheck.type regex
livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
@@ -90,8 +93,7 @@
# use its internal jsoncpp until a better solution comes about.
patchfiles-append patch-CMakeFindFrameworks.cmake.diff \
- patch-Modules-Platform-Darwin.cmake.diff \
- patch-Modules-noArchCheck.diff
+ patch-Modules-Platform-Darwin.cmake.diff
configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
Added: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2016-08-02 18:24:20 UTC (rev 150938)
@@ -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")
+- string(APPEND 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")
+- string(APPEND 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")
+- string(APPEND 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 2016-08-02 16:43:53 UTC (rev 150937)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff 2016-08-02 18:24:20 UTC (rev 150938)
@@ -1,56 +0,0 @@
---- 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()
Copied: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff (from rev 150937, 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 2016-08-02 18:24:20 UTC (rev 150938)
@@ -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()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160802/3914b454/attachment-0001.html>
More information about the macports-changes
mailing list