<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2e531680644b593cdfce79329375e4b0316db050">https://github.com/macports/macports-ports/commit/2e531680644b593cdfce79329375e4b0316db050</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 2e53168  cmake; update release to 3.11.2 and devel to 2f8230b0 (20180524).
</span>2e53168 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2e531680644b593cdfce79329375e4b0316db050
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu May 24 14:28:38 2018 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cmake; update release to 3.11.2 and devel to 2f8230b0 (20180524).
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixup patches to be clean and work!
</span>---
 devel/cmake/Portfile                               | 23 +++++++++++-----------
 .../files/patch-Modules-FindQt4.cmake.devel.diff   | 13 ------------
 ...diff => patch-Source_CMakeLists.txt.devel.diff} |  2 +-
 ...ff => patch-Source_CMakeLists.txt.release.diff} |  0
 4 files changed, 12 insertions(+), 26 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f355ca7..5826ac0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,10 +37,10 @@ if {${subport} eq ${name}} {
</span> 
     # release
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         ${branch}.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160 8bf925456e778b489301d8e1d5cdb1e93d4ccc5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 57bebc6ca4d1d42c6385249d148d9216087e0fda57a47dc5c858790a70217d0c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size   7951125
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         ${branch}.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160 a05d8232a3553d75f892e9d98bbb099f4ac0ae7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 5ebc22bbcf2b4c7a20c4190d42c084cf38680a85b1a7980a2f1d5b4a52bf5248 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   7953913
</span> 
     master_sites    ${homepage}/files/v${branch}/
     conflicts       cmake-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ if {${subport} eq ${name}} {
</span>         patch-Modules-noArchCheck.release.diff \
         patch-CMakeFindFrameworks.cmake.release.diff \
         patch-Source_CMakeVersionCompute.cmake.release.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patch-Source_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patch-Source_CMakeLists.txt.release.diff
</span> 
     livecheck.type  regex
     livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,11 +64,11 @@ if {${subport} eq ${name}} {
</span> 
     # devel
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20180509
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set commit      d44441a365e4d4e4188ed2fa6b1f9ccda0568846
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160 886532b19289210f3f246778a45aa0bb2fffe293 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 db58e44c579bad4407dbee4f5351ca6a108d5bc2ec538c5065ba7bff9554f1bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size   6261821
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20180524
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set commit      2f8230b05251aa498b47a883d471b1ebfd357e64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160 4fb4f1df68d0e06c15ec1871a22acf82f9698466 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 36cad8fe559756063ac05c78db91efbe27f8e093225405e312f2ea7d1f8f16f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size   6262895
</span> 
     use_bzip2       yes
     master_sites    https://gitlab.kitware.com/cmake/cmake/repository/archive${extract.suffix}?ref=${commit}&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,11 +84,10 @@ if {${subport} eq ${name}} {
</span> 
     # devel-only patches
     patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patch-Modules-FindQt4.cmake.devel.diff \
</span>         patch-Modules-noArchCheck.devel.diff \
         patch-CMakeFindFrameworks.cmake.devel.diff \
         patch-Source_CMakeVersionCompute.cmake.devel.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        patch-Source_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patch-Source_CMakeLists.txt.devel.diff
</span> 
     livecheck.type  regex
     livecheck.regex /cmake/cmake/commit/(\[0-9a-g\]+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff b/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5862cd4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/FindQt4.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/FindQt4.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -736,9 +736,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       find_path(QT_IMPORTS_DIR NAMES Qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         HINTS ${qt_cross_paths} ${qt_imports_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         DOC "The location of the Qt imports"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        NO_CMAKE_FIND_ROOT_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--        NO_CMAKE_SYSTEM_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+        NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       mark_as_advanced(QT_IMPORTS_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   endif ()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span>similarity index 94%
copy from devel/cmake/files/patch-Source_CMakeLists.txt.diff
copy to devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>index 3f001d8..3df8a35 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-Source_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-Source_CMakeLists.txt.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Source/CMakeLists.txt.orig
 +++ Source/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -777,9 +777,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -784,9 +784,9 @@
</span>    endif()
  endif()
  
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-Source_CMakeLists.txt.diff b/devel/cmake/files/patch-Source_CMakeLists.txt.release.diff
</span>similarity index 100%
rename from devel/cmake/files/patch-Source_CMakeLists.txt.diff
rename to devel/cmake/files/patch-Source_CMakeLists.txt.release.diff
</pre><pre style='margin:0'>

</pre>