<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121104] trunk/dports/devel/cmake</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121104">121104</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-17 09:43:30 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>cmake: upgrade to 3.0.0 (#42654, maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcmakePortfile">trunk/dports/devel/cmake/Portfile</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff">trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchCMakeListstxtdiff">trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff">trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff</a></li>
<li><a href="#trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff">trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcmakePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/Portfile (121103 => 121104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/Portfile 2014-06-17 15:13:35 UTC (rev 121103)
+++ trunk/dports/devel/cmake/Portfile 2014-06-17 16:43:30 UTC (rev 121104)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name cmake
</span><del>-version 2.8.12.2
</del><ins>+version 3.0.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel
</span><span class="cx"> license BSD
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> master_sites http://www.cmake.org/files/v${branch}/
</span><span class="cx"> platforms darwin freebsd
</span><span class="cx">
</span><del>-checksums rmd160 ee92327c3870f3ae2ea997d0258b0ef141e90525 \
- sha256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e
</del><ins>+checksums rmd160 a35492be2953d6dd432594e833b7586dc154f52d \
+ sha256 99a34b7f74000404feffd82fba9d9e0cd623428c74b6a4851a0dee1c272606c0
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:libidn port:openssl
</span><span class="cx">
</span><span class="lines">@@ -56,9 +56,7 @@
</span><span class="cx"> # TODO: Figure out why using libc++ fails.
</span><span class="cx"> # Since nothing links against cmake and cmake is just using
</span><span class="cx"> # the STL, we're safe to force libstdc++
</span><del>- if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libstdc++
- }
</del><ins>+ configure.cxx_stdlib libstdc++
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -72,11 +70,11 @@
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${prefix}/share/emacs/site-lisp
</span><del>- xinstall -m 0644 ${worksrcpath}/Docs/cmake-mode.el \
</del><ins>+ xinstall -m 0644 ${worksrcpath}/Auxiliary/cmake-mode.el \
</ins><span class="cx"> ${destroot}${prefix}/share/emacs/site-lisp
</span><span class="cx"> foreach type {syntax indent} {
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><del>- xinstall -m 0644 -W ${worksrcpath}/Docs cmake-${type}.vim \
</del><ins>+ xinstall -m 0644 -W ${worksrcpath}/Auxiliary cmake-${type}.vim \
</ins><span class="cx"> ${destroot}${prefix}/share/vim/vimfiles/${type}
</span><span class="cx"> }
</span><span class="cx"> if ([variant_isset gui]) {
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchCMakeFindFrameworkscmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff (121103 => 121104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2014-06-17 15:13:35 UTC (rev 121103)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.diff 2014-06-17 16:43:30 UTC (rev 121104)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- Modules/CMakeFindFrameworks.cmake 2012-11-02 10:05:18.000000000 -0700
</span><span class="cx"> +++ Modules/CMakeFindFrameworks.cmake 2012-11-02 10:12:23.000000000 -0700
</span><del>-@@ -20,6 +20,7 @@
</del><ins>+@@ -24,6 +24,7 @@
</ins><span class="cx"> if(APPLE)
</span><span class="cx"> foreach(dir
</span><span class="cx"> ~/Library/Frameworks/${fwk}.framework
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff (121103 => 121104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2014-06-17 15:13:35 UTC (rev 121103)
+++ trunk/dports/devel/cmake/files/patch-CMakeLists.txt.diff 2014-06-17 16:43:30 UTC (rev 121104)
</span><span class="lines">@@ -1,17 +1,17 @@
</span><del>---- CMakeLists.txt 2013-10-11 18:37:11.000000000 +0200
-+++ CMakeLists.txt 2013-10-11 18:39:22.000000000 +0200
-@@ -528,7 +528,7 @@ if(BUILD_CursesDialog)
</del><ins>+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -476,7 +476,7 @@ if(BUILD_CursesDialog)
</ins><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> if(BUILD_QtDialog)
</span><span class="cx"> - if(APPLE)
</span><span class="cx"> + if(FALSE)
</span><del>- set(CMAKE_BUNDLE_NAME
- "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}-${CMake_VERSION_PATCH}")
</del><ins>+ set(CMAKE_BUNDLE_VERSION
+ "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
</ins><span class="cx"> set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
</span><del>---- Source/QtDialog/CMakeLists.txt 2013-10-11 18:37:12.000000000 +0200
-+++ Source/QtDialog/CMakeLists.txt 2013-10-11 18:43:24.000000000 +0200
-@@ -95,7 +95,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS}
</del><ins>+--- Source/QtDialog/CMakeLists.txt
++++ Source/QtDialog/CMakeLists.txt
+@@ -99,7 +99,7 @@ set(SRCS ${SRCS} ${UI_SRCS} ${MOC_SRCS} ${RC_SRCS})
</ins><span class="cx"> if(WIN32)
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.rc)
</span><span class="cx"> endif()
</span><span class="lines">@@ -20,23 +20,23 @@
</span><span class="cx"> set(SRCS ${SRCS} CMakeSetup.icns)
</span><span class="cx"> set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
</span><span class="cx"> set_source_files_properties(CMakeSetup.icns PROPERTIES
</span><del>-@@ -104,13 +104,13 @@ endif()
</del><ins>+@@ -115,13 +115,13 @@ endif()
</ins><span class="cx">
</span><span class="cx"> set(CMAKE_INCLUDE_CURRENT_DIR ON)
</span><span class="cx">
</span><span class="cx"> -add_executable(cmake-gui WIN32 MACOSX_BUNDLE ${SRCS})
</span><span class="cx"> +add_executable(cmake-gui WIN32 ${SRCS})
</span><del>- target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES})
</del><ins>+ target_link_libraries(cmake-gui CMakeLib ${QT_QTMAIN_LIBRARY} ${CMake_QT_LIBRARIES})
</ins><span class="cx"> if(Qt_BIN_DIR)
</span><span class="cx"> set_property(TARGET cmake-gui PROPERTY Qt_BIN_DIR ${Qt_BIN_DIR})
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> -if(APPLE)
</span><span class="cx"> +if(FALSE)
</span><del>- set_target_properties(cmake-gui PROPERTIES
- OUTPUT_NAME ${CMAKE_BUNDLE_NAME})
- endif()
-@@ -127,7 +127,7 @@ if(UNIX)
</del><ins>+ file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
+ LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
+
+@@ -153,7 +153,7 @@ if(UNIX)
</ins><span class="cx"> install(FILES cmakecache.xml DESTINATION share/mime/packages )
</span><span class="cx"> endif()
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> set(CMAKE_POSTFLIGHT_SCRIPT
</span><span class="cx"> "${CMake_BINARY_DIR}/Source/QtDialog/postflight.sh")
</span><span class="cx"> set(CMAKE_POSTUPGRADE_SCRIPT
</span><del>-@@ -140,7 +140,7 @@ if(APPLE)
</del><ins>+@@ -166,7 +166,7 @@ if(APPLE)
</ins><span class="cx"> WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)")
</span><span class="cx"> endif()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindFreetypecmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff (121103 => 121104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2014-06-17 15:13:35 UTC (rev 121103)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.diff 2014-06-17 16:43:30 UTC (rev 121104)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- Modules/FindFreetype.cmake.orig 2013-10-07 10:31:00.000000000 -0500
-+++ Modules/FindFreetype.cmake 2013-11-30 05:30:36.000000000 -0600
-@@ -46,24 +46,16 @@
</del><ins>+--- Modules/FindFreetype.cmake.orig
++++ Modules/FindFreetype.cmake
+@@ -55,10 +55,6 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
</ins><span class="cx"> HINTS
</span><span class="cx"> ENV FREETYPE_DIR
</span><span class="cx"> PATHS
</span><span class="lines">@@ -11,11 +11,7 @@
</span><span class="cx"> ENV GTKMM_BASEPATH
</span><span class="cx"> [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
</span><span class="cx"> [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</span><del>- PATH_SUFFIXES include/freetype2 include
- )
-
--find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
</del><ins>+@@ -72,10 +68,6 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2
</ins><span class="cx"> HINTS
</span><span class="cx"> ENV FREETYPE_DIR
</span><span class="cx"> PATHS
</span><span class="lines">@@ -26,7 +22,7 @@
</span><span class="cx"> ENV GTKMM_BASEPATH
</span><span class="cx"> [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
</span><span class="cx"> [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</span><del>-@@ -76,10 +68,6 @@
</del><ins>+@@ -88,10 +80,6 @@ find_library(FREETYPE_LIBRARY
</ins><span class="cx"> ENV FREETYPE_DIR
</span><span class="cx"> PATH_SUFFIXES lib
</span><span class="cx"> PATHS
</span><span class="lines">@@ -37,14 +33,3 @@
</span><span class="cx"> ENV GTKMM_BASEPATH
</span><span class="cx"> [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
</span><span class="cx"> [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
</span><del>-@@ -91,8 +79,8 @@
- endif()
- set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
-
--if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
-- file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
-+if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
-+ file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h" freetype_version_str
- REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
-
- unset(FREETYPE_VERSION_STRING)
</del></span></pre></div>
<a id="trunkdportsdevelcmakefilespatchModulesFindQt4cmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff (121103 => 121104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2014-06-17 15:13:35 UTC (rev 121103)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2014-06-17 16:43:30 UTC (rev 121104)
</span><span class="lines">@@ -1,37 +1,10 @@
</span><span class="cx"> --- Modules/FindQt4.cmake.orig
</span><span class="cx"> +++ Modules/FindQt4.cmake
</span><del>-@@ -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}
-- DOC "The location of the Qt mkspecs containing qconfig.pri")
-+ DOC "The location of the Qt mkspecs containing qconfig.pri"
-+ NO_DEFAULT_PATH)
- endif()
-
- if(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
-@@ -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
-+ NO_DEFAULT_PATH
- )
- endif()
-
-@@ -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}
-- DOC "The location of the Qt plugins")
-+ DOC "The location of the Qt plugins"
-+ NO_DEFAULT_PATH)
- endif ()
-
- # ask qmake for the translations directory
-@@ -770,8 +773,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
</del><ins>+@@ -728,9 +728,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
</ins><span class="cx"> find_path(QT_IMPORTS_DIR NAMES Qt
</span><span class="cx"> HINTS ${qt_cross_paths} ${qt_imports_dir}
</span><span class="cx"> DOC "The location of the Qt imports"
</span><ins>+- NO_CMAKE_FIND_ROOT_PATH
</ins><span class="cx"> - NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
</span><span class="cx"> - NO_CMAKE_SYSTEM_PATH)
</span><span class="cx"> + NO_DEFAULT_PATH)
</span></span></pre>
</div>
</div>
</body>
</html>