Revision: 76552 http://trac.macports.org/changeset/76552 Author: css@macports.org Date: 2011-02-27 19:17:54 -0800 (Sun, 27 Feb 2011) Log Message: ----------- Fix patches to allow building cmake 2.8.4 +gui. refs #28520 Modified Paths: -------------- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff =================================================================== --- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2011-02-27 23:36:00 UTC (rev 76551) +++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2011-02-28 03:17:54 UTC (rev 76552) @@ -1,10 +1,7 @@ -http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-2... - -Description: Don't build the GUI's app-bundle. -Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> ---- CMakeLists.txt.orig 2010-02-10 19:38:03 +0100 -+++ CMakeLists.txt 2010-02-10 19:38:49 +0100 -@@ -381,7 +381,7 @@ IF(BUILD_CursesDialog) +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 @@ ENDIF(BUILD_CursesDialog) IF(BUILD_QtDialog) @@ -13,7 +10,7 @@ SET(CMAKE_BUNDLE_NAME "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}") SET(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") -@@ -394,7 +394,7 @@ IF(BUILD_QtDialog) +@@ -560,7 +560,7 @@ ENDIF(NOT "${ENDCH}" STREQUAL "/") SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}${CMAKE_BUNDLE_NAME}.app/Contents") @@ -22,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") ---- Source/QtDialog/CMakeLists.txt.orig 2010-02-10 19:39:59 +0100 -+++ Source/QtDialog/CMakeLists.txt 2010-02-10 19:42:12 +0100 -@@ -66,12 +66,12 @@ ELSE(NOT QT4_FOUND) +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 +@@ -59,23 +59,23 @@ IF(Q_WS_WIN) SET(SRCS ${SRCS} CMakeSetup.rc) ENDIF(Q_WS_WIN) @@ -39,9 +37,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -@@ -79,13 +79,13 @@ ELSE(NOT QT4_FOUND) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - ADD_EXECUTABLE(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) + ADD_EXECUTABLE(cmake-gui WIN32 ${SRCS}) @@ -56,7 +51,7 @@ SET(CMAKE_INSTALL_DESTINATION_ARGS BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}") ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4) -@@ -101,7 +101,7 @@ ELSE(NOT QT4_FOUND) +@@ -90,7 +90,7 @@ INSTALL(FILES cmakecache.xml DESTINATION share/mime/packages ) ENDIF(UNIX) @@ -65,12 +60,24 @@ SET(CMAKE_POSTFLIGHT_SCRIPT "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") SET(CMAKE_POSTUPGRADE_SCRIPT -@@ -115,7 +115,7 @@ ELSE(NOT QT4_FOUND) - INSTALL(CODE "set(input_file - \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/MacOS/${CMAKE_BUNDLE_NAME}\")") - INSTALL(SCRIPT "${CMake_SOURCE_DIR}/Source/QtDialog/CMakeIngestOSXBundleLibraries.cmake") +@@ -101,9 +101,9 @@ + "${CMake_BINARY_DIR}/Source/QtDialog/postupgrade.sh") + INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" cmake-gui + WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") - ENDIF(APPLE) + ENDIF(FALSE) + +- if(APPLE OR WIN32) ++ if(WIN32) + # 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\") + 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) - ENDIF(NOT QT4_FOUND) Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff =================================================================== --- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2011-02-27 23:36:00 UTC (rev 76551) +++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2011-02-28 03:17:54 UTC (rev 76552) @@ -1,6 +1,7 @@ ---- Modules/FindQt4.cmake.orig 2010-11-18 09:49:17.000000000 -0500 -+++ Modules/FindQt4.cmake 2010-11-18 09:53:21.000000000 -0500 -@@ -580,7 +580,8 @@ +diff -ur cmake-2.8.4-orig/Modules/FindQt4.cmake cmake-2.8.4/Modules/FindQt4.cmake +--- Modules/FindQt4.cmake 2011-02-27 17:51:38.000000000 +0100 ++++ Modules/FindQt4.cmake 2011-02-27 17:58:44.000000000 +0100 +@@ -583,7 +583,8 @@ SET(QT_MKSPECS_DIR NOTFOUND) FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} @@ -10,7 +11,7 @@ ENDIF() IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") -@@ -604,12 +605,12 @@ +@@ -607,12 +608,12 @@ FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4 HINTS ${QT_LIBRARY_DIR_TMP} @@ -25,15 +26,15 @@ ) # try dropping a hint if trying to use Visual Studio with Qt built by mingw -@@ -663,6 +664,7 @@ +@@ -666,6 +667,7 @@ HINTS ${qt_headers} ${QT_LIBRARY_DIR}/QtCore.framework/Headers PATH_SUFFIXES QtCore -+ NO_DEFAULT_PATH ++ NO_DEFAULT_PATH ) # Set QT_HEADERS_DIR based on finding QtCore header -@@ -711,7 +713,8 @@ +@@ -714,7 +716,8 @@ endforeach(qt_cross_path) FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer HINTS ${qt_cross_paths} ${qt_plugins_dir} @@ -43,7 +44,7 @@ ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) # ask qmake for the translations directory -@@ -731,8 +734,7 @@ +@@ -734,8 +737,7 @@ FIND_PATH(QT_IMPORTS_DIR NAMES Qt HINTS ${qt_cross_paths} ${qt_imports_dir} DOC "The location of the Qt imports"