Ticket #42654: cmake-3.0.0-rc1.diff

File cmake-3.0.0-rc1.diff, 7.9 KB (added by mojca (Mojca Miklavec), 10 years ago)

  • Portfile

     
    55PortGroup           muniversal 1.0
    66
    77name                cmake
    8 version             2.8.12.2
     8version             3.0.0-rc1
    99set branch          [join [lrange [split ${version} .] 0 1] .]
    1010categories          devel
    1111license             BSD
    … …  
    2020master_sites        http://www.cmake.org/files/v${branch}/
    2121platforms           darwin freebsd
    2222
    23 checksums           rmd160  ee92327c3870f3ae2ea997d0258b0ef141e90525 \
    24                     sha256  8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e
     23checksums           rmd160  df1fd58f0e95552d4797a6c7e6cea92627b403db \
     24                    sha256  f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6
    2525
    2626depends_lib-append  port:libidn port:openssl
    2727
    … …  
    7272
    7373post-destroot {
    7474    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 \
    7676        ${destroot}${prefix}/share/emacs/site-lisp
    7777    foreach type {syntax indent} {
    7878        xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
    79         xinstall -m 0644 -W ${worksrcpath}/Docs cmake-${type}.vim \
     79        xinstall -m 0644 -W ${worksrcpath}/Auxiliary cmake-${type}.vim \
    8080            ${destroot}${prefix}/share/vim/vimfiles/${type}
    8181    }
    8282    if ([variant_isset gui]) {

  • files/patch-CMakeFindFrameworks.cmake.diff

     
    11--- Modules/CMakeFindFrameworks.cmake   2012-11-02 10:05:18.000000000 -0700
    22+++ Modules/CMakeFindFrameworks.cmake   2012-11-02 10:12:23.000000000 -0700
    3 @@ -20,6 +20,7 @@
     3@@ -24,6 +24,7 @@
    44     if(APPLE)
    55       foreach(dir
    66           ~/Library/Frameworks/${fwk}.framework

  • files/patch-CMakeLists.txt.diff

     
    11--- CMakeLists.txt      2013-10-11 18:37:11.000000000 +0200
    22+++ CMakeLists.txt      2013-10-11 18:39:22.000000000 +0200
    3 @@ -528,7 +528,7 @@ if(BUILD_CursesDialog)
     3@@ -476,7 +476,7 @@ if(BUILD_CursesDialog)
    44 endif()
    55 
    66 if(BUILD_QtDialog)
    77-  if(APPLE)
    88+  if(FALSE)
    9      set(CMAKE_BUNDLE_NAME
    10        "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}")
    1111     set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
    1212--- Source/QtDialog/CMakeLists.txt      2013-10-11 18:37:12.000000000 +0200
    1313+++ Source/QtDialog/CMakeLists.txt      2013-10-11 18:43:24.000000000 +0200
    14 @@ -95,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS}
     14@@ -95,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
    1515 if(WIN32)
    1616   set(SRCS ${SRCS} CMakeSetup.rc)
    1717 endif()
    … …  
    2020   set(SRCS ${SRCS} CMakeSetup.icns)
    2121   set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    2222   set_source_files_properties(CMakeSetup.icns PROPERTIES
    23 @@ -104,13 +104,13 @@ endif()
     23@@ -111,13 +111,13 @@ endif()
    2424 
    2525 set(CMAKE_INCLUDE_CURRENT_DIR ON)
    2626 
    … …  
    3333 
    3434-if(APPLE)
    3535+if(FALSE)
    36    set_target_properties(cmake-gui PROPERTIES
    37      OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
    38  endif()
    39 @@ -127,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@@ -149,7 +149,7 @@ if(UNIX)
    4040   install(FILES cmakecache.xml DESTINATION share/mime/packages )
    4141 endif()
    4242 
    … …  
    4545   set(CMAKE_POSTFLIGHT_SCRIPT
    4646     "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
    4747   set(CMAKE_POSTUPGRADE_SCRIPT
    48 @@ -140,7 +140,7 @@ if(APPLE)
     48@@ -162,7 +162,7 @@ if(APPLE)
    4949                 WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
    5050 endif()
    5151 

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

     
    1 --- Modules/FindFreetype.cmake.orig     2013-10-07 10:31:00.000000000 -0500
    2 +++ Modules/FindFreetype.cmake  2013-11-30 05:30:36.000000000 -0600
    3 @@ -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
    44   HINTS
    55     ENV FREETYPE_DIR
    66   PATHS
    … …  
    1111     ENV GTKMM_BASEPATH
    1212     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    1313     [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
    1915   HINTS
    2016     ENV FREETYPE_DIR
    2117   PATHS
    … …  
    2622     ENV GTKMM_BASEPATH
    2723     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    2824     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
    29 @@ -76,10 +68,6 @@
     25@@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY
    3026     ENV FREETYPE_DIR
    3127   PATH_SUFFIXES lib
    3228   PATHS
    … …  
    3733     ENV GTKMM_BASEPATH
    3834     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    3935     [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_str
    46 +if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
    47 +    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
    48           REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
    49  
    50      unset(FREETYPE_VERSION_STRING)

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

     
    11--- Modules/FindQt4.cmake.orig
    22+++ 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)
    324       find_path(QT_IMPORTS_DIR NAMES Qt
    335         HINTS ${qt_cross_paths} ${qt_imports_dir}
    346         DOC "The location of the Qt imports"
     7-        NO_CMAKE_FIND_ROOT_PATH
    358-        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
    369-        NO_CMAKE_SYSTEM_PATH)
    3710+        NO_DEFAULT_PATH)