[81498] trunk/dports/devel/cmake

31 Jul 2011

Revision: 81498
          http://trac.macports.org/changeset/81498
Author:   css@macports.org
Date:     2011-07-31 16:39:14 -0700 (Sun, 31 Jul 2011)
Log Message:
-----------
cmake: update to 2.8.5. refs #30504

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-07-31 23:19:53 UTC (rev 81497)
+++ trunk/dports/devel/cmake/Portfile	2011-07-31 23:39:14 UTC (rev 81498)
@@ -5,7 +5,7 @@
 PortGroup	muniversal 1.0
 
 name		cmake
-version		2.8.4
+version		2.8.5
 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     209b7d1d04b2e00986538d74ba764fcf \
-                    sha1    6c42699bd63fdfcc7743d4906e3208d051d7f19b \
-                    rmd160  8b92eb11391b07433e7fe02bbb80c3ebcaaf1893
+checksums           md5     3c5d32cec0f4c2dc45f4c2e84f4a20c5 \
+                    sha1    8dd4c31cbccf1a297829a476a0ef79d1614ca368 \
+                    rmd160  e4767dc0ea3e53da3ab14cc6af5d42dd190eda76
 
 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-07-31 23:19:53 UTC (rev 81497)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2011-07-31 23:39:14 UTC (rev 81498)
@@ -11,21 +11,6 @@
    ENDIF()
  
    IF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -607,12 +608,12 @@
-     FIND_LIBRARY(QT_QTCORE_LIBRARY_RELEASE
-                  NAMES QtCore${QT_LIBINFIX} QtCore${QT_LIBINFIX}4
-                  HINTS ${QT_LIBRARY_DIR_TMP}
--                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
-+                 NO_DEFAULT_PATH
-         )
-     FIND_LIBRARY(QT_QTCORE_LIBRARY_DEBUG
-                  NAMES QtCore${QT_LIBINFIX}_debug QtCore${QT_LIBINFIX}d QtCore${QT_LIBINFIX}d4
-                  HINTS ${QT_LIBRARY_DIR_TMP}
--                 NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
-+                 NO_DEFAULT_PATH
-         )
- 
-     # try dropping a hint if trying to use Visual Studio with Qt built by mingw
 @@ -666,6 +667,7 @@
                  HINTS ${qt_headers}
                  ${QT_LIBRARY_DIR}/QtCore.framework/Headers

    

css＠macports.org

tags

participants (1)