Ticket #42654: cmake-3.0.0-rc2.diff
File cmake-3.0.0-rc2.diff, 8.3 KB (added by mojca (Mojca Miklavec), 11 years ago) |
---|
-
Portfile
5 5 PortGroup muniversal 1.0 6 6 7 7 name cmake 8 version 2.8.12.28 version 3.0.0-rc2 9 9 set branch [join [lrange [split ${version} .] 0 1] .] 10 10 categories devel 11 11 license BSD … … 20 20 master_sites http://www.cmake.org/files/v${branch}/ 21 21 platforms darwin freebsd 22 22 23 checksums rmd160 ee92327c3870f3ae2ea997d0258b0ef141e90525\24 sha256 8 c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e23 checksums rmd160 268353f4943c9514adaae0a71d8ba99ea87dd450 \ 24 sha256 802ce1e0d80e6b93801372001d84697189e1aa69a54a2996ae1cc68721b92977 25 25 26 26 depends_lib-append port:libidn port:openssl 27 27 … … 72 72 73 73 post-destroot { 74 74 xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp 75 xinstall -m 0644 ${worksrcpath}/ Docs/cmake-mode.el \75 xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \ 76 76 ${destroot}${prefix}/share/emacs/site-lisp 77 77 foreach type {syntax indent} { 78 78 xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type} 79 xinstall -m 0644 -W ${worksrcpath}/ Docscmake-${type}.vim \79 xinstall -m 0644 -W ${worksrcpath}/Auxiliary cmake-${type}.vim \ 80 80 ${destroot}${prefix}/share/vim/vimfiles/${type} 81 81 } 82 82 if ([variant_isset gui]) { -
files/patch-CMakeFindFrameworks.cmake.diff
1 1 --- Modules/CMakeFindFrameworks.cmake 2012-11-02 10:05:18.000000000 -0700 2 2 +++ Modules/CMakeFindFrameworks.cmake 2012-11-02 10:12:23.000000000 -0700 3 @@ -2 0,6 +20,7 @@3 @@ -24,6 +24,7 @@ 4 4 if(APPLE) 5 5 foreach(dir 6 6 ~/Library/Frameworks/${fwk}.framework -
files/patch-CMakeLists.txt.diff
1 --- CMakeLists.txt 2013-10-11 18:37:11.000000000 +02002 +++ CMakeLists.txt 2013-10-11 18:39:22.000000000 +02003 @@ - 528,7 +528,7 @@ if(BUILD_CursesDialog)1 --- CMakeLists.txt 2 +++ CMakeLists.txt 3 @@ -476,7 +476,7 @@ if(BUILD_CursesDialog) 4 4 endif() 5 5 6 6 if(BUILD_QtDialog) 7 7 - if(APPLE) 8 8 + if(FALSE) 9 set(CMAKE_BUNDLE_ NAME10 " CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")9 set(CMAKE_BUNDLE_VERSION 10 "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}") 11 11 set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}") 12 --- Source/QtDialog/CMakeLists.txt 2013-10-11 18:37:12.000000000 +020013 +++ Source/QtDialog/CMakeLists.txt 2013-10-11 18:43:24.000000000 +020014 @@ -9 5,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS}12 --- Source/QtDialog/CMakeLists.txt 13 +++ Source/QtDialog/CMakeLists.txt 14 @@ -99,7 +99,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS}) 15 15 if(WIN32) 16 16 set(SRCS ${SRCS} CMakeSetup.rc) 17 17 endif() … … 20 20 set(SRCS ${SRCS} CMakeSetup.icns) 21 21 set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns) 22 22 set_source_files_properties(CMakeSetup.icns PROPERTIES 23 @@ -1 04,13 +104,13 @@ endif()23 @@ -115,13 +115,13 @@ endif() 24 24 25 25 set(CMAKE_INCLUDE_CURRENT_DIR ON) 26 26 27 27 -add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS}) 28 28 +add_executable(cmake-gui WIN32 ${SRCS}) 29 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${ QT_LIBRARIES})29 target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES}) 30 30 if(Qt_BIN_DIR) 31 31 set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR}) 32 32 endif() … … 33 33 34 34 -if(APPLE) 35 35 +if(FALSE) 36 set_target_properties(cmake-gui PROPERTIES37 OUTPUT_NAME ${CMAKE_BUNDLE_NAME})38 endif()39 @@ -1 27,7 +127,7 @@ if(UNIX)36 file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line 37 LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware") 38 39 @@ -153,7 +153,7 @@ if(UNIX) 40 40 install(FILES cmakecache.xml DESTINATION share/mime/packages ) 41 41 endif() 42 42 … … 45 45 set(CMAKE_POSTFLIGHT_SCRIPT 46 46 "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh") 47 47 set(CMAKE_POSTUPGRADE_SCRIPT 48 @@ -1 40,7 +140,7 @@ if(APPLE)48 @@ -166,7 +166,7 @@ if(APPLE) 49 49 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") 50 50 endif() 51 51 -
files/patch-Modules-FindFreetype.cmake.diff
1 --- Modules/FindFreetype.cmake.orig 2013-10-07 10:31:00.000000000 -05002 +++ Modules/FindFreetype.cmake 2013-11-30 05:30:36.000000000 -06003 @@ - 46,24 +46,16 @@1 --- Modules/FindFreetype.cmake.orig 2 +++ Modules/FindFreetype.cmake 3 @@ -55,10 +55,6 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h 4 4 HINTS 5 5 ENV FREETYPE_DIR 6 6 PATHS … … 11 11 ENV GTKMM_BASEPATH 12 12 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] 13 13 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] 14 PATH_SUFFIXES include/freetype2 include 15 ) 16 17 -find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h 18 +find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h 14 @@ -72,10 +68,6 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 19 15 HINTS 20 16 ENV FREETYPE_DIR 21 17 PATHS … … 26 22 ENV GTKMM_BASEPATH 27 23 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] 28 24 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] 29 @@ - 76,10 +68,6 @@25 @@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY 30 26 ENV FREETYPE_DIR 31 27 PATH_SUFFIXES lib 32 28 PATHS … … 37 33 ENV GTKMM_BASEPATH 38 34 [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path] 39 35 [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path] 40 @@ -91,8 +79,8 @@41 endif()42 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")43 44 -if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")45 - file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str46 +if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")47 + file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str48 REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")49 50 unset(FREETYPE_VERSION_STRING) -
files/patch-Modules-FindQt4.cmake.diff
1 1 --- Modules/FindQt4.cmake.orig 2 2 +++ Modules/FindQt4.cmake 3 @@ -594,7 +594,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) 4 set(QT_MKSPECS_DIR NOTFOUND) 5 find_path(QT_MKSPECS_DIR NAMES qconfig.pri 6 HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} 7 - DOC "The location of the Qt mkspecs containing qconfig.pri") 8 + DOC "The location of the Qt mkspecs containing qconfig.pri" 9 + NO_DEFAULT_PATH) 10 endif() 11 12 if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri") 13 @@ -697,6 +698,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) 14 find_path(QT_QTCORE_INCLUDE_DIR QtCore 15 HINTS ${qt_headers} ${QT_LIBRARY_DIR} 16 PATH_SUFFIXES QtCore qt4/QtCore 17 + NO_DEFAULT_PATH 18 ) 19 endif() 20 21 @@ -750,7 +752,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) 22 endforeach() 23 find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer 24 HINTS ${qt_cross_paths} ${qt_plugins_dir} 25 - DOC "The location of the Qt plugins") 26 + DOC "The location of the Qt plugins" 27 + NO_DEFAULT_PATH) 28 endif () 29 30 # ask qmake for the translations directory 31 @@ -770,8 +773,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) 3 @@ -728,9 +728,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) 32 4 find_path(QT_IMPORTS_DIR NAMES Qt 33 5 HINTS ${qt_cross_paths} ${qt_imports_dir} 34 6 DOC "The location of the Qt imports" 7 - NO_CMAKE_FIND_ROOT_PATH 35 8 - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH 36 9 - NO_CMAKE_SYSTEM_PATH) 37 10 + NO_DEFAULT_PATH)