[90330] trunk/dports/devel/cmake

[css at macports.org]

Revision: 90330
          http://trac.macports.org/changeset/90330
Author:   css at macports.org
Date:     2012-03-02 04:57:37 -0800 (Fri, 02 Mar 2012)
Log Message:
-----------
cmake: update to 2.8.7 and apply patches for XCode 4.3. refs #33388

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2012-03-02 10:30:54 UTC (rev 90329)
+++ trunk/dports/devel/cmake/Portfile	2012-03-02 12:57:37 UTC (rev 90330)
@@ -5,7 +5,7 @@
 PortGroup	muniversal 1.0
 
 name		cmake
-version		2.8.6
+version		2.8.7
 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     2147da452fd9212bb9b4542a9eee9d5b \
-                    sha1    7c2cbd42d27e26580cd4923892197b84b2a90675 \
-                    rmd160  c3095a4776367496f895b8075fda373568f01878
+checksums           md5     e1b237aeaed880f65dec9c20602452f6 \
+                    sha1    d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 \
+                    rmd160  13b188e75152feef4e5692807e3a9e7c34b26fe3
 
 depends_lib-append port:libidn port:openssl
 
@@ -38,7 +38,8 @@
 configure.post_args
 
 patchfiles	patch-CMakeFindFrameworks.cmake.diff \
-			patch-Modules-FindQt4.cmake.diff
+			patch-Modules-FindQt4.cmake.diff \
+			patch-Xcode_4.3.diff
 
 post-patch {
 	# copy cmake init file, ready to be patched below

Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2012-03-02 10:30:54 UTC (rev 90329)
+++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff	2012-03-02 12:57:37 UTC (rev 90330)
@@ -1,7 +1,7 @@
-diff -ur cmake-2.8.4-orig/CMakeLists.txt cmake-2.8.4/CMakeLists.txt
---- CMakeLists.txt	2011-02-27 20:41:54.000000000 +0100
-+++ CMakeLists.txt	2011-02-27 20:43:04.000000000 +0100
-@@ -547,7 +547,7 @@
+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 @@
  ENDIF(BUILD_CursesDialog)
  
  IF(BUILD_QtDialog)
@@ -10,7 +10,7 @@
      SET(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
      SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -560,7 +560,7 @@
+@@ -554,7 +554,7 @@
      ENDIF(NOT "${ENDCH}" STREQUAL "/")
      SET(CMAKE_INSTALL_PREFIX 
        "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
@@ -19,9 +19,10 @@
    
    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")
-diff -ur cmake-2.8.4-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.4/Source/QtDialog/CMakeLists.txt
---- Source/QtDialog/CMakeLists.txt	2011-02-27 20:41:55.000000000 +0100
-+++ Source/QtDialog/CMakeLists.txt	2011-02-27 20:43:22.000000000 +0100
+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
 @@ -59,23 +59,23 @@
    IF(Q_WS_WIN)
      SET(SRCS ${SRCS} CMakeSetup.rc)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120302/75e19ed1/attachment.html>