cmake-devel: update to 1c3bbda2 (20180320).

devel/cmake/Portfile

@@ -64,11 +64,11 @@ if {${subport} eq ${name}} {
 
     # devel
 
-    version         20180316
-    set commit      b3e668ea25d35a04adc41e17cfb4c8ab7a97a7d9
-    checksums       rmd160 e40a4d69c1a055b8f03cc5b7c48bdec65a36afcf \
-                    sha256 adbbd56754644df1cdb037e1d99f6e694c541662cbf2c5340eb5d0bb84bab676 \
-                    size   6246932
+    version         20180320
+    set commit      1c3bbda2f2920f416304086ece139ba1b50015ea
+    checksums       rmd160 c42a1e559586c1b34cb404c5337678007afadf5e \
+                    sha256 f7bd447d144cb5b45b6cf52bf294580efb1b8787a681d16cbbc8a4c829a12129 \
+                    size   6253085
 
     use_bzip2       yes
     master_sites    https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&

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

@@ -1,13 +1,13 @@
 --- Modules/FindQt4.cmake.orig
 +++ Modules/FindQt4.cmake
-@@ -743,9 +743,7 @@
+@@ -736,9 +736,7 @@
        find_path(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"
 -        NO_CMAKE_FIND_ROOT_PATH
 -        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
 -        NO_CMAKE_SYSTEM_PATH)
 +        NO_DEFAULT_PATH)
-       # If the imports folder is empty, set QT_IMPORTS_DIR to ${qt_imports_dir}
-       if(NOT QT_IMPORTS_DIR AND qt_imports_dir)
-         set(QT_IMPORTS_DIR ${qt_imports_dir} CACHE PATH "The location of the Qt imports")
+       mark_as_advanced(QT_IMPORTS_DIR)
+     endif()
+   endif ()

devel/cmake/files/patch-qt4gui.devel.diff

@@ -126,7 +126,7 @@
    file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
      LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
 
-@@ -235,18 +150,18 @@
+@@ -235,7 +150,7 @@
      ${COMPONENT})
  endif()
 
@@ -135,11 +135,7 @@
    install(CODE "
      execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
          WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
-   " ${COMPONENT})
- endif()
-
--if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
-+if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
+@@ -246,7 +161,7 @@
    # 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}")

devel/cmake/files/patch-qt5gui.devel.diff

@@ -58,7 +58,7 @@
    file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
      LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
 
-@@ -235,18 +224,18 @@
+@@ -235,7 +224,7 @@
      ${COMPONENT})
  endif()
 
@@ -67,11 +67,7 @@
    install(CODE "
      execute_process(COMMAND ln -s \"../MacOS/CMake\" cmake-gui
          WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)
-   " ${COMPONENT})
- endif()
-
--if(CMake_INSTALL_DEPENDENCIES AND (APPLE OR WIN32))
-+if(CMake_INSTALL_DEPENDENCIES AND (APPLEBUNDLE OR WIN32))
+@@ -246,7 +235,7 @@
    # 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}")