[142473] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Sat Dec 12 05:54:26 PST 2015
Revision: 142473
https://trac.macports.org/changeset/142473
Author: michaelld at macports.org
Date: 2015-11-12 12:57:40 -0800 (Thu, 12 Nov 2015)
Log Message:
-----------
cmake:
+ update release to 3.4.0;
+ update devel to 20151111 (g5c42e);
+ update patches for changes.
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff
Added Paths:
-----------
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-Modules-FindBoost.cmake.diff
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2015-11-12 19:16:45 UTC (rev 142472)
+++ trunk/dports/devel/cmake/Portfile 2015-11-12 20:57:40 UTC (rev 142473)
@@ -23,16 +23,15 @@
subport cmake-devel {}
-set branch 3.3
+set branch 3.4
if {${subport} eq ${name}} {
# release
- version ${branch}.2
- revision 1
- checksums rmd160 c7d3b8895e2e143b7e1019477764370535917dca \
- sha256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22
+ version ${branch}.0
+ checksums rmd160 95d3d0cd86e17c249459975eb9b293a5075ae87a \
+ sha256 a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea
long_description ${base_long_description} \
The ${subport} release port is updated roughly every few months.
@@ -41,13 +40,6 @@
master_sites http://www.cmake.org/files/v${branch}/
- patchfiles-append patch-Modules-noArchCheck.release.diff
-
- # temporary patch to find Boost 1.59;
- # remove when updating to next release
-
- patchfiles-append patch-Modules-FindBoost.cmake.diff
-
livecheck.type regex
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
livecheck.url [lindex $master_sites 0]
@@ -55,12 +47,12 @@
} else {
# devel
- version 20151102
+ version 20151111
set dist_branch 3.4
- set dist_date 20151102
- set dist_hash g7b24b
- checksums rmd160 f0aa044cc36f29eb5f962e4fc36660c9d29e7011 \
- sha256 42a24505a5927d5d37bbc79fb05d2fc4355d261b0502282639761144a45cb197
+ set dist_date 20151111
+ set dist_hash g5c42e
+ checksums rmd160 03db6cfaeefc3f3274ffab6abcd6a7db92a747c3 \
+ sha256 479862dbf68a7bb85251727561f80e6fb1bd16cfe79e156d9959a9304771f645
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -69,8 +61,6 @@
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}
@@ -92,7 +82,8 @@
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-Platform-Darwin-Initialize.cmake.diff \
+ patch-Modules-noArchCheck.diff
configure.env-append \
CMAKE_PREFIX_PATH=${prefix} \
Deleted: trunk/dports/devel/cmake/files/patch-Modules-FindBoost.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindBoost.cmake.diff 2015-11-12 19:16:45 UTC (rev 142472)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindBoost.cmake.diff 2015-11-12 20:57:40 UTC (rev 142473)
@@ -1,11 +0,0 @@
---- Modules/FindBoost.cmake.orig 2015-10-04 16:06:25.000000000 +0200
-+++ Modules/FindBoost.cmake 2015-10-04 16:06:56.000000000 +0200
-@@ -512,7 +512,7 @@
- # The user has not requested an exact version. Among known
- # versions, find those that are acceptable to the user request.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-- "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
-+ "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
- "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
- "1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
- "1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
Modified: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff 2015-11-12 19:16:45 UTC (rev 142472)
+++ trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin-Initialize.cmake.diff 2015-11-12 20:57:40 UTC (rev 142473)
@@ -21,5 +21,5 @@
+ set(_CMAKE_OSX_SYSROOT_DEFAULT "")
+ endif()
endif()
- else()
- # Assume developer files are in root (such as Xcode 4.5 command-line tools).
+ if(NOT CMAKE_OSX_DEPLOYMENT_TARGET AND _CURRENT_OSX_VERSION VERSION_LESS _CMAKE_OSX_DEPLOYMENT_TARGET)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET ${_CURRENT_OSX_VERSION} CACHE STRING
Deleted: trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2015-11-12 19:16:45 UTC (rev 142472)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff 2015-11-12 20:57:40 UTC (rev 142473)
@@ -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.diff (from rev 142472, trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.devel.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.diff 2015-11-12 20:57:40 UTC (rev 142473)
@@ -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.release.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff 2015-11-12 19:16:45 UTC (rev 142472)
+++ trunk/dports/devel/cmake/files/patch-Modules-noArchCheck.release.diff 2015-11-12 20:57:40 UTC (rev 142473)
@@ -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()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/995f67ce/attachment.html>
More information about the macports-changes
mailing list