[105950] trunk/dports/devel/cmake
larryv at macports.org
larryv at macports.org
Fri May 10 19:37:25 PDT 2013
Revision: 105950
https://trac.macports.org/changeset/105950
Author: larryv at macports.org
Date: 2013-05-10 19:37:24 -0700 (Fri, 10 May 2013)
Log Message:
-----------
cmake: Update to 2.8.10.2 (maintainer timeout, #38863).
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2013-05-11 02:28:29 UTC (rev 105949)
+++ trunk/dports/devel/cmake/Portfile 2013-05-11 02:37:24 UTC (rev 105950)
@@ -5,8 +5,7 @@
PortGroup muniversal 1.0
name cmake
-version 2.8.10
-revision 1
+version 2.8.10.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
license BSD
@@ -22,8 +21,8 @@
master_sites http://www.cmake.org/files/v${branch}/
platforms darwin freebsd
-checksums rmd160 9af9e3f26f0f3d827ef566f99050fe6a2721dd25 \
- sha256 a18b721c547c2ce2ea9378f2687caca4398fc348982ede799e96b26924cc9e04
+checksums rmd160 03274f790edd5dd94a8e1c94eade36864eaf5b2b \
+ sha256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1
depends_lib-append port:libidn port:openssl
@@ -52,9 +51,6 @@
patch-Modules-FindQt4.cmake.diff \
patch-Utilities-cmcurl-strequal.h.diff
-# Add upstream patch for Darwin.cmake
-patchfiles-append patch-Modules-Platform-Darwin.cmake.diff
-
post-patch {
# copy cmake init file, ready to be patched below
copy ${filespath}/macports.cmake ${worksrcpath}
Deleted: trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff 2013-05-11 02:28:29 UTC (rev 105949)
+++ trunk/dports/devel/cmake/files/patch-Modules-Platform-Darwin.cmake.diff 2013-05-11 02:37:24 UTC (rev 105950)
@@ -1,29 +0,0 @@
-From: Brad King <brad.king at kitware.com>
-Date: Mon, 5 Nov 2012 15:43:46 +0000 (-0500)
-Subject: OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=15f5764e
-
-OS X: Fix default CMAKE_OSX_SYSROOT with deployment target
-
-Since commit 43b74793 (OS X: Further improve default CMAKE_OSX_SYSROOT
-selection, 2012-09-21) we choose a default CMAKE_OSX_SYSROOT only when
-one is needed. However, the change forgot that we require a sysroot
-when a deployment target is requested. Teach Darwin.cmake to choose a
-default CMAKE_OSX_SYSROOT when CMAKE_OSX_DEPLOYMENT_TARGET is set.
-
-Reported-by: Matthew Brett <matthew.brett at gmail.com>
-Reported-by: Bradley Giesbrecht <pixilla at macports.org>
----
-
-diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index a401762..4e7e99c 100644
---- Modules/Platform/Darwin.cmake
-+++ Modules/Platform/Darwin.cmake
-@@ -107,6 +107,7 @@ elseif(NOT "x$ENV{SDKROOT}" STREQUAL "x" AND
- # Use the value of SDKROOT from the environment.
- set(_CMAKE_OSX_SYSROOT_DEFAULT "$ENV{SDKROOT}")
- elseif("${CMAKE_GENERATOR}" MATCHES Xcode
-+ OR CMAKE_OSX_DEPLOYMENT_TARGET
- OR CMAKE_OSX_ARCHITECTURES MATCHES "[^;]"
- OR NOT EXISTS "/usr/include/sys/types.h")
- # Find installed SDKs in either Xcode-4.3+ or pre-4.3 SDKs directory.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130510/9cfd4918/attachment.html>
More information about the macports-changes
mailing list