diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-07-10 08:15:49 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-07-10 08:15:49 +0000 |
| commit | 68ac25f318dc11ab7f5dcd652b9744f4f9810e3c (patch) | |
| tree | 66d6be8ad2b13ca7ac6206d9fe23d982cd0c008d /devel/cmake | |
| parent | - Update to 4.15 (diff) | |
Update CMake to 2.8.11.2.
PR: ports/178737
Notes
Notes:
svn path=/head/; revision=322628
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 2 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 4 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindJava.cmake | 11 | ||||
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 26 |
4 files changed, 16 insertions, 27 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 97efcad5c17a..00c3c6d7de79 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 2.8.10.2 +PORTVERSION= 2.8.11.2 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 27d1761622c3..6c43aae6c347 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,2 +1,2 @@ -SHA256 (cmake-2.8.10.2.tar.gz) = ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 -SIZE (cmake-2.8.10.2.tar.gz) = 5768373 +SHA256 (cmake-2.8.11.2.tar.gz) = b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 +SIZE (cmake-2.8.11.2.tar.gz) = 5887016 diff --git a/devel/cmake/files/patch-Modules_FindJava.cmake b/devel/cmake/files/patch-Modules_FindJava.cmake deleted file mode 100644 index da784d4b8411..000000000000 --- a/devel/cmake/files/patch-Modules_FindJava.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100 -+++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100 -@@ -107,7 +107,7 @@ - # 2. OpenJDK 1.6 - # 3. GCJ 1.5 - # 4. Kaffe 1.4.2 -- if(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*") -+ if(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*") - # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer - string( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*" - "\\1" Java_VERSION_STRING "${var}" ) diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index b3bfe48c4f67..a58d27aebe8d 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,15 +1,15 @@ ---- Modules/FindQt4.cmake.orig 2012-11-06 21:41:36.000000000 +0200 -+++ Modules/FindQt4.cmake 2012-11-27 22:31:37.000000000 +0200 -@@ -497,7 +497,7 @@ - # check for qmake - # Debian uses qmake-qt4 - # macports' Qt uses qmake-mac --find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac -+find_program(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac - PATHS - ENV QTDIR - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" -@@ -690,13 +690,7 @@ +--- Modules/FindQt4.cmake.orig 2013-06-22 14:07:09.000000000 +0300 ++++ Modules/FindQt4.cmake 2013-06-22 14:07:22.000000000 +0300 +@@ -569,7 +569,7 @@ + + set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) + +-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) ++set(_QT4_QMAKE_NAMES qmake-qt4 qmake qmake4 qmake-mac) + _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) + + if (QT_QMAKE_EXECUTABLE AND QTVERSION) +@@ -739,13 +739,7 @@ # ask qmake for the plugins directory if (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_PLUGINS qt_plugins_dir) @@ -24,7 +24,7 @@ endif () # ask qmake for the translations directory -@@ -709,15 +703,7 @@ +@@ -758,15 +752,7 @@ if (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED) _qt4_query_qmake(QT_INSTALL_IMPORTS qt_imports_dir) if(qt_imports_dir) |