[38092] trunk/dports/devel/cmake

[css at macports.org]

Revision: 38092
          http://trac.macosforge.org/projects/macports/changeset/38092
Author:   css at macports.org
Date:     2008-07-06 04:31:16 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
Patch CMake to correct CMake bug 7011. (refs #15733)

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

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

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2008-07-06 09:44:38 UTC (rev 38091)
+++ trunk/dports/devel/cmake/Portfile	2008-07-06 11:31:16 UTC (rev 38092)
@@ -4,6 +4,7 @@
 
 name		cmake
 version		2.6.0
+revision	1
 categories	devel
 maintainers	css at macports.org
 description	Cross-platform make
@@ -19,6 +20,8 @@
 		sha1 e99ee84f413bd1c728fe6def1eb5e27d0471bd27 \
 		rmd160 491aa0f7eedd3c43364bcfe675ba5526e5140361
 configure.args	--mandir=/share/man --docdir=/share/doc/cmake
+# Apply bugfix http://www.cmake.org/Bug/view.php?id=7011
+patchfiles	patch-cmake_bug_7011_fix.diff
 
 post-destroot {
 	xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp

Added: trunk/dports/devel/cmake/files/patch-cmake_bug_7011_fix.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-cmake_bug_7011_fix.diff	                        (rev 0)
+++ trunk/dports/devel/cmake/files/patch-cmake_bug_7011_fix.diff	2008-07-06 11:31:16 UTC (rev 38092)
@@ -0,0 +1,41 @@
+Index: Source/cmFindBase.cxx
+===================================================================
+RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
+retrieving revision 1.35.2.1
+retrieving revision 1.37
+diff -u -r1.35.2.1 -r1.37
+--- Source/cmFindBase.cxx	8 Apr 2008 16:22:49 -0000	1.35.2.1
++++ Source/cmFindBase.cxx	23 May 2008 19:25:04 -0000	1.37
+@@ -3,8 +3,8 @@
+   Program:   CMake - Cross-Platform Makefile Generator
+   Module:    $RCSfile: cmFindBase.cxx,v $
+   Language:  C++
+-  Date:      $Date: 2008-04-08 16:22:49 $
+-  Version:   $Revision: 1.35.2.1 $
++  Date:      $Date: 2008-05-23 19:25:04 $
++  Version:   $Revision: 1.37 $
+ 
+   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+@@ -378,12 +378,19 @@
+       {
+       dir += "/";
+       }
+-    dest.push_back(dir + subdir);
++    if(subdir != "/")
++      {
++      std::string add = dir + subdir;
++      if(add != "/")
++        {
++        dest.push_back(add);
++        }
++      }
+     if (subdir == "bin")
+       {
+       dest.push_back(dir + "sbin");
+       }
+-    if(!subdir.empty())
++    if(!subdir.empty() && *it != "/")
+       {
+       dest.push_back(*it);
+       }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080706/271470c7/attachment.html