[85093] trunk/dports/devel/cmake

[css at macports.org]

Revision: 85093
          http://trac.macports.org/changeset/85093
Author:   css at macports.org
Date:     2011-10-09 11:20:46 -0700 (Sun, 09 Oct 2011)
Log Message:
-----------
cmake: bump version to 2.8.6, update checksums and fix the Qt patch

Modified Paths:
--------------
    trunk/dports/devel/cmake/Portfile
    trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff

Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile	2011-10-09 17:56:03 UTC (rev 85092)
+++ trunk/dports/devel/cmake/Portfile	2011-10-09 18:20:46 UTC (rev 85093)
@@ -5,7 +5,7 @@
 PortGroup	muniversal 1.0
 
 name		cmake
-version		2.8.5
+version		2.8.6
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	devel
 license		BSD
@@ -20,9 +20,9 @@
 master_sites	http://www.cmake.org/files/v${branch}/
 platforms	darwin freebsd
 
-checksums           md5     3c5d32cec0f4c2dc45f4c2e84f4a20c5 \
-                    sha1    8dd4c31cbccf1a297829a476a0ef79d1614ca368 \
-                    rmd160  e4767dc0ea3e53da3ab14cc6af5d42dd190eda76
+checksums           md5     2147da452fd9212bb9b4542a9eee9d5b \
+                    sha1    7c2cbd42d27e26580cd4923892197b84b2a90675 \
+                    rmd160  c3095a4776367496f895b8075fda373568f01878
 
 depends_lib-append port:libidn port:openssl
 

Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2011-10-09 17:56:03 UTC (rev 85092)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2011-10-09 18:20:46 UTC (rev 85093)
@@ -1,7 +1,6 @@
-diff -ur cmake-2.8.4-orig/Modules/FindQt4.cmake cmake-2.8.4/Modules/FindQt4.cmake
---- Modules/FindQt4.cmake	2011-02-27 17:51:38.000000000 +0100
-+++ Modules/FindQt4.cmake	2011-02-27 17:58:44.000000000 +0100
-@@ -583,7 +583,8 @@
+--- Modules/FindQt4.cmake.orig	2011-10-04 12:09:24.000000000 -0400
++++ Modules/FindQt4.cmake	2011-10-09 14:08:00.000000000 -0400
+@@ -526,7 +526,8 @@
      SET(QT_MKSPECS_DIR NOTFOUND)
      FIND_PATH(QT_MKSPECS_DIR NAMES qconfig.pri
        HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
@@ -11,15 +10,15 @@
    ENDIF()
  
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -666,6 +667,7 @@
-                 HINTS ${qt_headers}
-                 ${QT_LIBRARY_DIR}/QtCore.framework/Headers
-                 PATH_SUFFIXES QtCore
+@@ -619,6 +620,7 @@
+       FIND_PATH(QT_QTCORE_INCLUDE_DIR QtCore
+                 HINTS ${qt_headers} ${QT_LIBRARY_DIR}
+                 PATH_SUFFIXES QtCore qt4/QtCore
 +                NO_DEFAULT_PATH
          )
  
        # Set QT_HEADERS_DIR based on finding QtCore header
-@@ -714,7 +716,8 @@
+@@ -671,7 +673,8 @@
      endforeach(qt_cross_path)
      FIND_PATH(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
        HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -29,7 +28,7 @@
    ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR  OR  QT_QMAKE_CHANGED)
  
    # ask qmake for the translations directory
-@@ -734,8 +737,7 @@
+@@ -691,8 +694,7 @@
        FIND_PATH(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111009/d25c75d8/attachment.html>