Ticket #36287: fix-cmake-2.8.9-port-gui-variant.patch

Portfile

@@ -6 +6 @@
 
 name            cmake
 version         2.8.9
-revision        1
+revision        2
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      devel
 license         BSD
@@ -70 +70 @@
                 xinstall -m 0644 -W ${worksrcpath}/Docs cmake-${type}.vim \
                         ${destroot}${prefix}/share/vim/vimfiles/${type}
         }
+        if ([variant_isset gui]) {
+                set app CMake
+                xinstall -d ${destroot}${applications_dir}/${app}.app/Contents/MacOS \
+                        ${destroot}${applications_dir}/${app}.app/Contents/Resources
+                xinstall -m 644 ${filespath}/Info.plist.in ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+                reinplace "s|@VERSION@|${version}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+                reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${applications_dir}/${app}.app/Contents/Info.plist
+                ln -s ${prefix}/bin/cmake-gui ${destroot}${applications_dir}/${app}.app/Contents/MacOS/cmake-gui
+                xinstall -m 644 ${worksrcpath}/Source/QtDialog/CMakeSetup.icns ${destroot}${applications_dir}/${app}.app/Contents/Resources/CMakeSetup.icns
+        }
 }
 
 variant gui description {Qt4 based cmake-gui} {
         PortGroup qt4 1.0
-#       patchfiles-append patch-CMakeLists.txt.diff
+        patchfiles-append patch-CMakeLists.txt.diff
         configure.args-append --qt-gui --qt-qmake=${qt_qmake_cmd}
 }
 

files/patch-CMakeFindFrameworks.cmake.diff

@@ -1 @@
---- Modules/CMakeFindFrameworks.cmake   2012-05-11 11:39:53.000000000 +0200
-+++ Modules/CMakeFindFrameworks.cmake   2012-05-11 11:47:07.000000000 +0200
+--- Modules/CMakeFindFrameworks.cmake   2012-10-07 15:26:05.000000000 +0200
++++ Modules/CMakeFindFrameworks.cmake   2012-10-07 15:50:10.000000000 +0200
 @@ -20,6 +20,7 @@
      IF(APPLE)
        FOREACH(dir

files/patch-CMakeLists.txt.diff

@@ -1 @@
---- CMakeLists.txt      2012-05-11 11:39:53.000000000 +0200
-+++ CMakeLists.txt      2012-05-11 11:48:15.000000000 +0200
-@@ -542,7 +542,7 @@
+--- CMakeLists.txt      2012-10-07 15:26:05.000000000 +0200
++++ CMakeLists.txt      2012-10-07 15:52:38.000000000 +0200
+@@ -528,7 +528,7 @@
  ENDIF(BUILD_CursesDialog)
  
  IF(BUILD_QtDialog)
@@ -9 +9 @@
      SET(CMAKE_BUNDLE_NAME
        "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
      SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-@@ -555,7 +555,7 @@
+@@ -541,7 +541,7 @@
      ENDIF(NOT "${ENDCH}" STREQUAL "/")
      SET(CMAKE_INSTALL_PREFIX 
        "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents")
@@ -18 +18 @@
    
    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")
---- Source/QtDialog/CMakeLists.txt      2012-05-11 11:39:53.000000000 +0200
-+++ Source/QtDialog/CMakeLists.txt      2012-05-11 11:48:15.000000000 +0200
+diff -u -r cmake-2.8.9-orig/Modules/CMakeFindFrameworks.cmake cmake-2.8.9/Modules/CMakeFindFrameworks.cmake
+--- Source/QtDialog/CMakeLists.txt      2012-10-07 15:26:05.000000000 +0200
++++ Source/QtDialog/CMakeLists.txt      2012-10-07 15:57:54.000000000 +0200
 @@ -59,23 +59,23 @@
    IF(Q_WS_WIN)
      SET(SRCS ${SRCS} CMakeSetup.rc)
@@ -46 +47 @@
         OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
 -    ENDIF(APPLE)
 +    ENDIF(FALSE)
-     SET(CMAKE_INSTALL_DESTINATION_ARGS 
+     SET(CMAKE_INSTALL_DESTINATION_ARGS
        BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}")
    ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
 @@ -90,7 +90,7 @@
@@ -70 +71 @@
      # install rules for including 3rd party libs such as Qt
      # if a system Qt is used (e.g. installed in /usr/lib/), it will not be included in the installation
      set(fixup_exe "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/cmake-gui${CMAKE_EXECUTABLE_SUFFIX}")
-@@ -114,7 +114,7 @@
-       include(\"${CMake_SOURCE_DIR}/Modules/BundleUtilities.cmake\")
+@@ -115,7 +115,7 @@
+       set(BU_CHMOD_BUNDLE_ITEMS ON)
        fixup_bundle(\"${fixup_exe}\" \"\" \"${QT_LIBRARY_DIR};${QT_BINARY_DIR}\")
      ")
 -  endif(APPLE OR WIN32)
 +  endif(WIN32)
  
    CONFIGURE_FILE("${QtDialog_SOURCE_DIR}/QtDialogCPack.cmake.in"
-     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)    
+     "${QtDialog_BINARY_DIR}/QtDialogCPack.cmake" @ONLY)

files/patch-Modules-FindQt4.cmake.diff

@@ -1 @@
---- 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 @@
+--- Modules/FindQt4.cmake       2012-10-07 15:26:05.000000000 +0200
++++ Modules/FindQt4.cmake       2012-10-07 15:46:05.000000000 +0200
+@@ -539,8 +539,9 @@
      SET(QT_MKSPECS_DIR NOTFOUND)
      FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
        HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
 -      DOC "The location of the Qt mkspecs containing qconfig.pri")
+-  ENDIF()
 +      DOC "The location of the Qt mkspecs containing qconfig.pri"
 +      NO_DEFAULT_PATH)
-   ENDIF()
++   ENDIF()
  
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -620,6 +621,7 @@
+     FILE(READ ${QT_MKSPECS_DIR}/qconfig.pri _qconfig_FILE_contents)
+@@ -633,6 +634,7 @@
        FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
                  HINTS ${qt_headers} ${QT_LIBRARY_DIR}
                  PATH_SUFFIXES QtCore qt4/QtCore
@@ -18 +20 @@
          )
  
        # Set QT_HEADERS_DIR based on finding QtCore header
-@@ -672,7 +674,8 @@
+@@ -685,7 +687,8 @@
      endforeach(qt_cross_path)
      FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
        HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -28 +30 @@
    ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
  
    # ask qmake for the translations directory
-@@ -692,8 +695,7 @@
+@@ -705,8 +708,7 @@
        FIND_PATH(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"