[110531] users/mojca/ports

1 Sep 2013

Revision: 110531
          https://trac.macports.org/changeset/110531
Author:   mojca@macports.org
Date:     2013-09-01 13:02:56 -0700 (Sun, 01 Sep 2013)
Log Message:
-----------
mojca/cmake: update to version 2.8.12-rc2

Modified Paths:
--------------
    users/mojca/ports/devel/cmake/Portfile
    users/mojca/ports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff

Added Paths:
-----------
    users/mojca/ports/devel/
    users/mojca/ports/devel/cmake/


Property changes on: users/mojca/ports/devel/cmake
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/devel/cmake:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/cal/ports/devel/cmake:96570-97031

Modified: users/mojca/ports/devel/cmake/Portfile
===================================================================

--- trunk/dports/devel/cmake/Portfile	2013-09-01 19:43:12 UTC (rev 110530)
+++ users/mojca/ports/devel/cmake/Portfile	2013-09-01 20:02:56 UTC (rev 110531)
@@ -5,7 +5,7 @@
 PortGroup           muniversal 1.0
 
 name                cmake
-version             2.8.11.2
+version             2.8.12-rc2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel
 license             BSD
@@ -20,8 +20,8 @@
 master_sites        http://www.cmake.org/files/v${branch}/
 platforms           darwin freebsd
 
-checksums           rmd160  4fe1fe6306cae0d11da53b30266203c846e484d8 \
-                    sha256  b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562
+checksums           rmd160  8a38ed86c1275105639e00ad7746999ed855c45d \
+                    sha256  d4ed7b766a23bf72951541fce9fdefdfba185e6a0f68b5cf8b2b0384bdfc8c28
 
 depends_lib-append  port:libidn port:openssl
 

Modified: users/mojca/ports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2013-09-01 19:43:12 UTC (rev 110530)
+++ users/mojca/ports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff	2013-09-01 20:02:56 UTC (rev 110531)
@@ -1,6 +1,6 @@
---- Modules/FindQt4.cmake.orig	2013-01-03 21:15:16.000000000 -0500
-+++ Modules/FindQt4.cmake	2013-01-03 21:24:55.000000000 -0500
-@@ -592,7 +592,8 @@
+--- Modules/FindQt4.cmake.orig
++++ Modules/FindQt4.cmake
+@@ -594,7 +594,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
      set(QT_MKSPECS_DIR NOTFOUND)
      find_path(QT_MKSPECS_DIR NAMES qconfig.pri
        HINTS ${qt_cross_paths} ${qt_mkspecs_dirs}
@@ -10,7 +10,7 @@
    endif()
  
    if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -692,6 +693,7 @@
+@@ -697,6 +698,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
          find_path(QT_QTCORE_INCLUDE_DIR QtCore
                    HINTS ${qt_headers} ${QT_LIBRARY_DIR}
                    PATH_SUFFIXES QtCore qt4/QtCore
@@ -18,7 +18,7 @@
            )
        endif()
  
-@@ -745,7 +747,8 @@
+@@ -750,7 +752,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
      endforeach()
      find_path(QT_PLUGINS_DIR NAMES accessible imageformats sqldrivers codecs designer
        HINTS ${qt_cross_paths} ${qt_plugins_dir}
@@ -28,7 +28,7 @@
    endif ()
  
    # ask qmake for the translations directory
-@@ -765,8 +768,7 @@
+@@ -770,8 +773,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
        find_path(QT_IMPORTS_DIR NAMES Qt
          HINTS ${qt_cross_paths} ${qt_imports_dir}
          DOC "The location of the Qt imports"

    

mojca＠macports.org

tags

participants (1)