Ticket #34187: cmake-2.8.8-port-update.patch

File cmake-2.8.8-port-update.patch, 5.1 KB (added by maehne (Torsten Maehne), 13 years ago)

Patch to update cmake port from 2.8.7 to 2.8.8

  • Portfile 

    diff -ur cmake-orig/Portfile cmake/Portfile
    old new  
    55PortGroup       muniversal 1.0
    66
    77name            cmake
    8 version         2.8.7
     8version         2.8.8
    99set branch      [join [lrange [split ${version} .] 0 1] .]
    1010categories      devel
    1111license         BSD
    … …  
    2121master_sites    http://www.cmake.org/files/v${branch}/
    2222platforms       darwin freebsd
    2323
    24 checksums           md5     e1b237aeaed880f65dec9c20602452f6 \
    25                     sha1    d206182b454f4d1ddeb0f11d7d1be8a66e5c2464 \
    26                     rmd160  13b188e75152feef4e5692807e3a9e7c34b26fe3
     24checksums           md5     ba74b22c788a0c8547976b880cd02b17 \
     25                    sha1    a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1 \
     26                    rmd160  db60999fd4d1b3e2e28368d45035a058ed7e7639
    2727
    2828depends_lib-append port:libidn port:openssl
    2929
    … …  
    4949}
    5050
    5151patchfiles      patch-CMakeFindFrameworks.cmake.diff \
    52                         patch-Modules-FindQt4.cmake.diff \
    53                         patch-Xcode_4.3.diff
     52                        patch-Modules-FindQt4.cmake.diff
    5453
    5554post-patch {
    5655        # copy cmake init file, ready to be patched below

  • files/patch-CMakeFindFrameworks.cmake.diff 

    diff -ur cmake-orig/files/patch-CMakeFindFrameworks.cmake.diff cmake/files/patch-CMakeFindFrameworks.cmake.diff
    old new  
    1 --- Modules/CMakeFindFrameworks.cmake.orig      2010-06-28 10:15:57.000000000 -0500
    2 +++ Modules/CMakeFindFrameworks.cmake   2010-07-08 13:46:38.000000000 -0500
     1--- Modules/CMakeFindFrameworks.cmake   2012-05-11 11:39:53.000000000 +0200
     2+++ Modules/CMakeFindFrameworks.cmake   2012-05-11 11:47:07.000000000 +0200
    33@@ -20,6 +20,7 @@
    44     IF(APPLE)
    55       FOREACH(dir

  • files/patch-CMakeLists.txt.diff 

    diff -ur cmake-orig/files/patch-CMakeLists.txt.diff cmake/files/patch-CMakeLists.txt.diff
    old new  
    1 diff -ur cmake-2.8.7-orig/CMakeLists.txt cmake-2.8.7/CMakeLists.txt
    2 --- CMakeLists.txt      2012-02-27 16:55:54.000000000 +0100
    3 +++ CMakeLists.txt      2012-02-27 16:56:56.000000000 +0100
    4 @@ -541,7 +541,7 @@
     1--- CMakeLists.txt      2012-05-11 11:39:53.000000000 +0200
     2+++ CMakeLists.txt      2012-05-11 11:48:15.000000000 +0200
     3@@ -542,7 +542,7 @@
    54 ENDIF(BUILD_CursesDialog)
    65 
    76 IF(BUILD_QtDialog)
    … …  
    109     SET(CMAKE_BUNDLE_NAME
    1110       "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
    1211     SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
    13 @@ -554,7 +554,7 @@
     12@@ -555,7 +555,7 @@
    1413     ENDIF(NOT "${ENDCH}" STREQUAL "/")
    1514     SET(CMAKE_INSTALL_PREFIX
    1615       "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
    … …  
    1918   
    2019   SET(QT_NEED_RPATH FALSE)
    2120   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")
    22 Only in cmake-2.8.7: CMakeLists.txt.orig
    23 diff -ur cmake-2.8.7-orig/Source/QtDialog/CMakeLists.txt cmake-2.8.7/Source/QtDialog/CMakeLists.txt
    24 --- Source/QtDialog/CMakeLists.txt      2012-02-27 16:55:54.000000000 +0100
    25 +++ Source/QtDialog/CMakeLists.txt      2012-02-27 16:56:56.000000000 +0100
     21--- Source/QtDialog/CMakeLists.txt      2012-05-11 11:39:53.000000000 +0200
     22+++ Source/QtDialog/CMakeLists.txt      2012-05-11 11:48:15.000000000 +0200
    2623@@ -59,23 +59,23 @@
    2724   IF(Q_WS_WIN)
    2825     SET(SRCS ${SRCS} CMakeSetup.rc)

  • files/patch-Modules-FindQt4.cmake.diff 

    diff -ur cmake-orig/files/patch-Modules-FindQt4.cmake.diff cmake/files/patch-Modules-FindQt4.cmake.diff
    old new  
    1 --- Modules/FindQt4.cmake.orig  2011-10-04 12:09:24.000000000 -0400
    2 +++ Modules/FindQt4.cmake       2011-10-09 14:08:00.000000000 -0400
     1--- Modules/FindQt4.cmake       2012-05-11 11:39:53.000000000 +0200
     2+++ Modules/FindQt4.cmake       2012-05-11 11:49:04.000000000 +0200
    33@@ -526,7 +526,8 @@
    44     SET(QT_MKSPECS_DIR NOTFOUND)
    55     FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
    … …  
    1010   ENDIF()
    1111 
    1212   IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
    13 @@ -619,6 +620,7 @@
     13@@ -620,6 +621,7 @@
    1414       FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
    1515                 HINTS ${qt_headers} ${QT_LIBRARY_DIR}
    1616                 PATH_SUFFIXES QtCore qt4/QtCore
    … …  
    1818         )
    1919 
    2020       # Set QT_HEADERS_DIR based on finding QtCore header
    21 @@ -671,7 +673,8 @@
     21@@ -672,7 +674,8 @@
    2222     endforeach(qt_cross_path)
    2323     FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
    2424       HINTS ${qt_cross_paths} ${qt_plugins_dir}
    … …  
    2828   ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
    2929 
    3030   # ask qmake for the translations directory
    31 @@ -691,8 +694,7 @@
     31@@ -692,8 +695,7 @@
    3232       FIND_PATH(QT_IMPORTS_DIR NAMES Qt
    3333         HINTS ${qt_cross_paths} ${qt_imports_dir}
    3434         DOC "The location of the Qt imports"