[93135] trunk/dports/devel/cmake
css at macports.org
css at macports.org
Tue May 15 17:46:57 PDT 2012
Revision: 93135
https://trac.macports.org/changeset/93135
Author: css at macports.org
Date: 2012-05-15 17:46:56 -0700 (Tue, 15 May 2012)
Log Message:
-----------
cmake: update to 2.8.8. refs #34187
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff
trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
Removed Paths:
-------------
trunk/dports/devel/cmake/files/patch-Xcode_4.3.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2012-05-15 23:12:17 UTC (rev 93134)
+++ trunk/dports/devel/cmake/Portfile 2012-05-16 00:46:56 UTC (rev 93135)
@@ -5,7 +5,7 @@
PortGroup muniversal 1.0
name cmake
-version 2.8.7
+version 2.8.8
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
license BSD
@@ -21,9 +21,9 @@
master_sites http://www.cmake.org/files/v${branch}/
platforms darwin freebsd
-checksums md5 e1b237aeaed880f65dec9c20602452f6 \
- sha1 d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 \
- rmd160 13b188e75152feef4e5692807e3a9e7c34b26fe3
+checksums md5 ba74b22c788a0c8547976b880cd02b17 \
+ sha1 a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1 \
+ rmd160 db60999fd4d1b3e2e28368d45035a058ed7e7639
depends_lib-append port:libidn port:openssl
@@ -49,8 +49,7 @@
}
patchfiles patch-CMakeFindFrameworks.cmake.diff \
- patch-Modules-FindQt4.cmake.diff \
- patch-Xcode_4.3.diff
+ patch-Modules-FindQt4.cmake.diff
post-patch {
# copy cmake init file, ready to be patched below
Modified: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2012-05-15 23:12:17 UTC (rev 93134)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2012-05-16 00:46:56 UTC (rev 93135)
@@ -1,5 +1,5 @@
---- Modules/CMakeFindFrameworks.cmake.orig 2010-06-28 10:15:57.000000000 -0500
-+++ Modules/CMakeFindFrameworks.cmake 2010-07-08 13:46:38.000000000 -0500
+--- Modules/CMakeFindFrameworks.cmake 2012-05-11 11:39:53.000000000 +0200
++++ Modules/CMakeFindFrameworks.cmake 2012-05-11 11:47:07.000000000 +0200
@@ -20,6 +20,7 @@
IF(APPLE)
FOREACH(dir
Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2012-05-15 23:12:17 UTC (rev 93134)
+++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2012-05-16 00:46:56 UTC (rev 93135)
@@ -1,7 +1,6 @@
-diff -ur cmake-2.8.7-orig/CMakeLists.txt cmake-2.8.7/CMakeLists.txt
---- CMakeLists.txt 2012-02-27 16:55:54.000000000 +0100
-+++ CMakeLists.txt 2012-02-27 16:56:56.000000000 +0100
-@@ -541,7 +541,7 @@
+--- CMakeLists.txt 2012-05-11 11:39:53.000000000 +0200
++++ CMakeLists.txt 2012-05-11 11:48:15.000000000 +0200
+@@ -542,7 +542,7 @@
ENDIF(BUILD_CursesDialog)
IF(BUILD_QtDialog)
@@ -10,7 +9,7 @@
SET(CMAKE_BUNDLE_NAME
"CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -554,7 +554,7 @@
+@@ -555,7 +555,7 @@
ENDIF(NOT "${ENDCH}" STREQUAL "/")
SET(CMAKE_INSTALL_PREFIX
"${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
@@ -19,10 +18,8 @@
SET(QT_NEED_RPATH FALSE)
IF(NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/lib64" AND NOT "${QT_LIBRARY_DIR}" STREQUAL "/usr/lib64")
-Only in cmake-2.8.7: CMakeLists.txt.orig
-diff -ur cmake-2.8.7-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.7/Source/QtDialog/CMakeLists.txt
---- Source/QtDialog/CMakeLists.txt 2012-02-27 16:55:54.000000000 +0100
-+++ Source/QtDialog/CMakeLists.txt 2012-02-27 16:56:56.000000000 +0100
+--- Source/QtDialog/CMakeLists.txt 2012-05-11 11:39:53.000000000 +0200
++++ Source/QtDialog/CMakeLists.txt 2012-05-11 11:48:15.000000000 +0200
@@ -59,23 +59,23 @@
IF(Q_WS_WIN)
SET(SRCS ${SRCS} CMakeSetup.rc)
Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2012-05-15 23:12:17 UTC (rev 93134)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2012-05-16 00:46:56 UTC (rev 93135)
@@ -1,5 +1,5 @@
---- Modules/FindQt4.cmake.orig 2011-10-04 12:09:24.000000000 -0400
-+++ Modules/FindQt4.cmake 2011-10-09 14:08:00.000000000 -0400
+--- Modules/FindQt4.cmake 2012-05-11 11:39:53.000000000 +0200
++++ Modules/FindQt4.cmake 2012-05-11 11:49:04.000000000 +0200
@@ -526,7 +526,8 @@
SET(QT_MKSPECS_DIR NOTFOUND)
FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
@@ -10,7 +10,7 @@
ENDIF()
IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -619,6 +620,7 @@
+@@ -620,6 +621,7 @@
FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
HINTS ${qt_headers} ${QT_LIBRARY_DIR}
PATH_SUFFIXES QtCore qt4/QtCore
@@ -18,7 +18,7 @@
)
# Set QT_HEADERS_DIR based on finding QtCore header
-@@ -671,7 +673,8 @@
+@@ -672,7 +674,8 @@
endforeach(qt_cross_path)
FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -28,7 +28,7 @@
ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
# ask qmake for the translations directory
-@@ -691,8 +694,7 @@
+@@ -692,8 +695,7 @@
FIND_PATH(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC "The location of the Qt imports"
Deleted: trunk/dports/devel/cmake/files/patch-Xcode_4.3.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Xcode_4.3.diff 2012-05-15 23:12:17 UTC (rev 93134)
+++ trunk/dports/devel/cmake/files/patch-Xcode_4.3.diff 2012-05-16 00:46:56 UTC (rev 93135)
@@ -1,79 +0,0 @@
-diff -ur cmake-2.8.7-orig/Modules/Platform/Darwin.cmake cmake-2.8.7/Modules/Platform/Darwin.cmake
---- Modules/Platform/Darwin.cmake 2012-02-27 16:55:54.000000000 +0100
-+++ Modules/Platform/Darwin.cmake 2012-03-01 14:37:31.000000000 +0100
-@@ -58,20 +58,22 @@
-
- # Set the assumed (Pre 10.5 or Default) location of the developer tools
- SET(OSX_DEVELOPER_ROOT "/Developer")
-+# Use the xcode-select tool if it's available (Xcode >= 3.0 installations)
-+FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
-+IF(CMAKE_XCODE_SELECT)
-+ EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
-+ OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+ENDIF(CMAKE_XCODE_SELECT)
-
- # Find installed SDKs
--FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*")
--
--# If nothing is found there, then try locating the dev tools based on the xcode-select tool
--# (available in Xcode >= 3.0 installations)
-+# Start with pre-Xcode-4.3 default SDKs directory
-+SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/SDKs")
-+FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
-+# If not present, try 4.3+ SDKs directory
- IF(NOT _CMAKE_OSX_SDKS)
-- FIND_PROGRAM(CMAKE_XCODE_SELECT xcode-select)
-- IF(CMAKE_XCODE_SELECT)
-- EXECUTE_PROCESS(COMMAND ${CMAKE_XCODE_SELECT} "-print-path"
-- OUTPUT_VARIABLE OSX_DEVELOPER_ROOT
-- OUTPUT_STRIP_TRAILING_WHITESPACE)
-- FILE(GLOB _CMAKE_OSX_SDKS "${OSX_DEVELOPER_ROOT}/SDKs/*")
-- ENDIF(CMAKE_XCODE_SELECT)
-+ SET(_CMAKE_OSX_SDKS_DIR "${OSX_DEVELOPER_ROOT}/Platforms/MacOSX.platform/Developer/SDKs")
-+ FILE(GLOB _CMAKE_OSX_SDKS "${_CMAKE_OSX_SDKS_DIR}/*")
- ENDIF(NOT _CMAKE_OSX_SDKS)
-
- EXECUTE_PROCESS(COMMAND sw_vers -productVersion
-@@ -103,16 +105,16 @@
- # Set CMAKE_OSX_SYSROOT_DEFAULT based on _CURRENT_OSX_VERSION,
- # accounting for the known specially named SDKs.
- SET(CMAKE_OSX_SYSROOT_DEFAULT
-- "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX${_CURRENT_OSX_VERSION}.sdk")
-+ "${_CMAKE_OSX_SDKS_DIR}/MacOSX${_CURRENT_OSX_VERSION}.sdk")
-
- IF(_CURRENT_OSX_VERSION STREQUAL "10.4")
- SET(CMAKE_OSX_SYSROOT_DEFAULT
-- "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.4u.sdk")
-+ "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.4u.sdk")
- ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.4")
-
- IF(_CURRENT_OSX_VERSION STREQUAL "10.3")
- SET(CMAKE_OSX_SYSROOT_DEFAULT
-- "${OSX_DEVELOPER_ROOT}/SDKs/MacOSX10.3.9.sdk")
-+ "${_CMAKE_OSX_SDKS_DIR}/MacOSX10.3.9.sdk")
- ENDIF(_CURRENT_OSX_VERSION STREQUAL "10.3")
-
- # Use environment or default as initial cache value:
-diff -ur cmake-2.8.7-orig/Source/cmGlobalXCodeGenerator.cxx cmake-2.8.7/Source/cmGlobalXCodeGenerator.cxx
---- Source/cmGlobalXCodeGenerator.cxx 2012-02-27 16:55:54.000000000 +0100
-+++ Source/cmGlobalXCodeGenerator.cxx 2012-02-27 17:11:59.000000000 +0100
-@@ -135,8 +135,16 @@
- {
- #if defined(CMAKE_BUILD_WITH_CMAKE)
- cmXcodeVersionParser parser;
-- parser.ParseFile
-- ("/Developer/Applications/Xcode.app/Contents/version.plist");
-+ if (cmSystemTools::FileExists("/Applications/Xcode.app/Contents/version.plist"))
-+ {
-+ parser.ParseFile
-+ ("/Applications/Xcode.app/Contents/version.plist");
-+ }
-+ else
-+ {
-+ parser.ParseFile
-+ ("/Developer/Applications/Xcode.app/Contents/version.plist");
-+ }
- cmsys::auto_ptr<cmGlobalXCodeGenerator>
- gg(new cmGlobalXCodeGenerator(parser.Version));
- if (gg->XcodeVersion == 20)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120515/0c82c657/attachment.html>
More information about the macports-changes
mailing list