Ticket #46493: cmake-3.1.0.diff

File cmake-3.1.0.diff, 5.1 KB (added by mojca (Mojca Miklavec), 10 years ago)

Another patch for cmake upgrade to 3.1.0 that also fixes patches

  • Portfile

     
    55PortGroup           muniversal 1.0
    66
    77name                cmake
    8 version             3.0.2
    9 revision            1
     8version             3.1.0
    109set branch          [join [lrange [split ${version} .] 0 1] .]
    1110categories          devel
    1211license             BSD
     
    2120master_sites        http://www.cmake.org/files/v${branch}/
    2221platforms           darwin freebsd
    2322
    24 checksums           rmd160  b94ea2ed4dced373e289fa5f66674a227135f350 \
    25                     sha256  6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e
     23checksums           rmd160  00390c46b82fda47bb13fc740d4cd037bf66a8c1 \
     24                    sha256  8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9
    2625
    2726depends_lib-append  port:libidn \
    2827                    port:openssl \
     
    3534patchfiles          patch-CMakeFindFrameworks.cmake.diff \
    3635                    patch-Modules-FindFreetype.cmake.diff \
    3736                    patch-Modules-FindQt4.cmake.diff \
    38                     patch-Modules-Platform-Darwin.cmake.diff \
    3937                    patch-Modules-noArchCheck.diff
    4038
    4139configure.env-append \
  • files/patch-Modules-FindFreetype.cmake.diff

     
    11--- Modules/FindFreetype.cmake.orig
    22+++ Modules/FindFreetype.cmake
    3 @@ -55,10 +55,6 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
     3@@ -57,10 +57,6 @@ find_path(
    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 @@ -72,10 +68,6 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
     14@@ -78,10 +74,6 @@ find_path(
    1515   HINTS
    1616     ENV FREETYPE_DIR
    1717   PATHS
     
    2222     ENV GTKMM_BASEPATH
    2323     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
    2424     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
    25 @@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY
     25@@ -99,10 +91,6 @@ find_library(FREETYPE_LIBRARY
     26   HINTS
    2627     ENV FREETYPE_DIR
    27    PATH_SUFFIXES lib
    2828   PATHS
    2929-    /usr/X11R6
    3030-    /usr/local/X11R6
  • files/patch-Modules-FindQt4.cmake.diff

     
    11--- Modules/FindQt4.cmake.orig
    22+++ Modules/FindQt4.cmake
    3 @@ -728,9 +728,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
     3@@ -741,9 +741,7 @@ if (QT_QMAKE_EXECUTABLE AND
    44       find_path(QT_IMPORTS_DIR NAMES Qt
    55         HINTS ${qt_cross_paths} ${qt_imports_dir}
    66         DOC "The location of the Qt imports"
  • files/patch-Modules-noArchCheck.diff

     
    1 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
    2 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in    2013-10-08 00:31:00.000000000 +0900
    3 +++ ./Modules/BasicConfigVersion-AnyNewerVersion.cmake.in       2013-12-25 16:14:04.000000000 +0900
    4 @@ -17,15 +17,3 @@
     1--- Modules/BasicConfigVersion-AnyNewerVersion.cmake.in.orig
     2+++ Modules/BasicConfigVersion-AnyNewerVersion.cmake.in
     3@@ -17,15 +17,3 @@ else()
    54     set(PACKAGE_VERSION_EXACT TRUE)
    65   endif()
    76 endif()
     
    1716-   set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    1817-   set(PACKAGE_VERSION_UNSUITABLE TRUE)
    1918-endif()
    20 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in ./Modules/BasicConfigVersion-ExactVersion.cmake.in
    21 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-ExactVersion.cmake.in       2013-10-08 00:31:00.000000000 +0900
    22 +++ ./Modules/BasicConfigVersion-ExactVersion.cmake.in  2013-12-25 16:14:00.000000000 +0900
    23 @@ -32,16 +32,3 @@
     19--- Modules/BasicConfigVersion-ExactVersion.cmake.in.orig
     20+++ Modules/BasicConfigVersion-ExactVersion.cmake.in
     21@@ -32,16 +32,3 @@ endif()
    2422 if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
    2523   set(PACKAGE_VERSION_EXACT TRUE)
    2624 endif()
     
    3735-  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
    3836-  set(PACKAGE_VERSION_UNSUITABLE TRUE)
    3937-endif()
    40 diff -ur ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in
    41 --- ../cmake-2.8.12-orig/Modules/BasicConfigVersion-SameMajorVersion.cmake.in   2013-10-08 00:31:00.000000000 +0900
    42 +++ ./Modules/BasicConfigVersion-SameMajorVersion.cmake.in      2013-12-25 16:13:52.000000000 +0900
    43 @@ -31,16 +31,3 @@
     38--- Modules/BasicConfigVersion-SameMajorVersion.cmake.in.orig
     39+++ Modules/BasicConfigVersion-SameMajorVersion.cmake.in
     40@@ -31,16 +31,3 @@ else()
    4441       set(PACKAGE_VERSION_EXACT TRUE)
    4542   endif()
    4643 endif()