[152005] trunk/dports/devel/cmake

[michaelld at macports.org]

Revision: 152005
          https://trac.macports.org/changeset/152005
Author:   michaelld at macports.org
Date:     2016-08-26 08:37:40 -0700 (Fri, 26 Aug 2016)
Log Message:
-----------
cmake-devel:
+ update to 20160824 (g96199);
+ rename devel-only patch & fix for latest update;
+ tweak VIM post-destroot install for updated files.

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile

Added Paths:
-----------
    trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.devel.diff

Removed Paths:
-------------
    trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2016-08-26 13:37:32 UTC (rev 152004)
+++ trunk/dports/devel/cmake/Portfile	2016-08-26 15:37:40 UTC (rev 152005)
@@ -54,12 +54,12 @@
 
     # devel
 
-    version         20160817
+    version         20160824
     set dist_branch 3.6
-    set dist_date   20160817
-    set dist_hash   g1cca3
-    checksums       rmd160 6c73bdc673bf4d6c456a4c1ba8cb76005e5d84d5 \
-                    sha256 964f9804dcb24a1fe0e768669971ecb3139a2b88528d4fad46f3086a92255a87
+    set dist_date   20160824
+    set dist_hash   g96199
+    checksums       rmd160 da159d833c5cfcfb468135f8c2fc4ab1c521166b \
+                    sha256 c5287cf153c0d68b56375da89b4f5beb1850b92fd890ab4bdd48dcb3ba8792d9
 
     master_sites    http://www.cmake.org/files/dev/
     distname        ${name}-${dist_branch}.${dist_date}-${dist_hash}
@@ -74,7 +74,7 @@
         patch-Modules-FindFreetype.cmake.devel.diff \
         patch-Modules-noArchCheck.devel.diff \
         patch-CMakeFindFrameworks.cmake.devel.diff \
-        patch-Source_CMakeVersionCompute.cmake.diff
+        patch-Source_CMakeVersionCompute.cmake.devel.diff
 
     livecheck.type  regex
     livecheck.regex (${name}-\[0-9a-g.-\]+)${extract.suffix}
@@ -173,10 +173,18 @@
     xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp
     xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \
         ${destroot}${prefix}/share/emacs/site-lisp
-    foreach type {syntax indent} {
-        xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
-        xinstall -m 0644 -W ${worksrcpath}/Auxiliary cmake-${type}.vim \
-            ${destroot}${prefix}/share/vim/vimfiles/${type}
+    if {${subport} eq ${name}} {
+        foreach type {syntax indent} {
+            xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
+            xinstall -m 0644 -W ${worksrcpath}/Auxiliary cmake-${type}.vim \
+                ${destroot}${prefix}/share/vim/vimfiles/${type}
+        }
+    } else {
+        foreach type {syntax indent} {
+            xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
+            xinstall -m 0644 -W ${worksrcpath}/Auxiliary/vim/${type} cmake.vim \
+                ${destroot}${prefix}/share/vim/vimfiles/${type}
+        }
     }
     if ([variant_isset gui]) {
         set app CMake

Copied: trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.devel.diff (from rev 152004, trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.diff)
===================================================================
--- trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.devel.diff	                        (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.devel.diff	2016-08-26 15:37:40 UTC (rev 152005)
@@ -0,0 +1,12 @@
+--- Source/CMakeVersionCompute.cmake.orig
++++ Source/CMakeVersionCompute.cmake
+@@ -10,6 +10,9 @@
+   set(CMake_VERSION_IS_DIRTY 0) # may be set to 1 by CMakeVersionSource
+   set(CMake_VERSION_IS_RELEASE 0)
+   include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake)
++  if(NOT CMake_VERSION_IS_DIRTY)
++    set(CMake_VERSION_IS_DIRTY 0)
++  endif()
+ endif()
+ 
+ # Compute the full version string.

Deleted: trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.diff	2016-08-26 13:37:32 UTC (rev 152004)
+++ trunk/dports/devel/cmake/files/patch-Source_CMakeVersionCompute.cmake.diff	2016-08-26 15:37:40 UTC (rev 152005)
@@ -1,12 +0,0 @@
---- Source/CMakeVersionCompute.cmake.orig
-+++ Source/CMakeVersionCompute.cmake
-@@ -9,6 +9,9 @@
- else()
-   set(CMake_VERSION_IS_RELEASE 0)
-   include(${CMake_SOURCE_DIR}/Source/CMakeVersionSource.cmake)
-+  if(NOT CMake_VERSION_IS_DIRTY)
-+    set(CMake_VERSION_IS_DIRTY 0)
-+  endif()
- endif()
- 
- # Compute the full version string.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160826/dba6525a/attachment-0001.html>