[73737] trunk/dports/devel/cmake
css at macports.org
css at macports.org
Mon Nov 22 20:02:29 PST 2010
Revision: 73737
http://trac.macports.org/changeset/73737
Author: css at macports.org
Date: 2010-11-22 20:02:24 -0800 (Mon, 22 Nov 2010)
Log Message:
-----------
Bump CMake 2.8.3 to revision 1 based on some changes to locating Qt libraries and and modifying ccmake's use of ncurses. refs #27383
Revision Links:
--------------
http://trac.macports.org/changeset/1
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/macports.cmake
Added Paths:
-----------
trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2010-11-23 02:17:56 UTC (rev 73736)
+++ trunk/dports/devel/cmake/Portfile 2010-11-23 04:02:24 UTC (rev 73737)
@@ -6,22 +6,23 @@
name cmake
version 2.8.3
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
-maintainers css
-description Cross-platform make
+maintainers css
+description Cross-platform make
long_description \
- An extensible, open-source system that manages the build \
+ An extensible, open-source system that manages the build \
process in an operating system and compiler independent manner. \
- Unlike many cross-platform systems, CMake is designed to be \
+ Unlike many cross-platform systems, CMake is designed to be \
used in conjunction with the native build environment.
homepage http://www.cmake.org/
master_sites http://www.cmake.org/files/v${branch}/
platforms darwin freebsd
-checksums md5 a76a44b93acf5e3badda9de111385921 \
- sha1 e9bfbec47b3939be6f83ffa8006884285c687dc2 \
- rmd160 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c
+checksums md5 a76a44b93acf5e3badda9de111385921 \
+ sha1 e9bfbec47b3939be6f83ffa8006884285c687dc2 \
+ rmd160 8bcba88ad884e22bbadf4c594a5f3b0bdbf2e12c
depends_lib-append port:libidn port:openssl
@@ -31,9 +32,19 @@
configure.args --mandir=/share/man --docdir=/share/doc/cmake \
--parallel=${build.jobs} \
- --init=${filespath}/macports.cmake
-patchfiles patch-CMakeFindFrameworks.cmake.diff
+ --init=${worksrcpath}/macports.cmake
+configure.universal_args
+configure.post_args
+
+patchfiles patch-CMakeFindFrameworks.cmake.diff \
+ patch-Modules-FindQt4.cmake.diff
+
post-patch {
+ # copy cmake init file, ready to be patched below
+ copy ${filespath}/macports.cmake ${worksrcpath}
+
+ # patch PREFIX
+ reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/macports.cmake
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Modules/CMakeFindFrameworks.cmake
}
@@ -47,9 +58,6 @@
} else {
set dirs ${worksrcpath}
}
- foreach dir ${dirs} {
- reinplace "s|/usr/lib/libcurses|${prefix}/lib/libncurses|g" ${dir}/CMakeCache.txt
- }
}
}
@@ -65,11 +73,11 @@
}
variant gui description {Qt4 based cmake-gui} {
- PortGroup qt4 1.0
+ PortGroup qt4 1.0
patchfiles-append patch-CMakeLists.txt.diff
configure.args-append --qt-gui --qt-qmake=${qt_qmake_cmd}
}
-livecheck.type regex
+livecheck.type regex
livecheck.regex {Latest Release \((\d(?:\.\d+)*)\)}
livecheck.url ${homepage}cmake/resources/software.html
Modified: trunk/dports/devel/cmake/files/macports.cmake
===================================================================
--- trunk/dports/devel/cmake/files/macports.cmake 2010-11-23 02:17:56 UTC (rev 73736)
+++ trunk/dports/devel/cmake/files/macports.cmake 2010-11-23 04:02:24 UTC (rev 73737)
@@ -1,4 +1,3 @@
-# Use ncurses to use the MacPorts ncurses
-set(CURSES_USE_NCURSES TRUE)
-set(CURSES_NEED_NCURSES TRUE)
-set(CURSES_CURSES_LIBRARY ${CURSES_NCURSES_LIBRARY})
+# Coerce CMake to use the MacPorts ncurses library
+# patch __PREFIX__ in the Portfile post-patch stage
+set(CURSES_CURSES_LIBRARY "__PREFIX__/lib/libncurses.dylib" CACHE FILEPATH "The Curses Library" FORCE)
Added: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff (rev 0)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.diff 2010-11-23 04:02:24 UTC (rev 73737)
@@ -0,0 +1,55 @@
+--- Modules/FindQt4.cmake.orig 2010-11-18 09:49:17.000000000 -0500
++++ Modules/FindQt4.cmake 2010-11-18 09:53:21.000000000 -0500
+@@ -580,7 +580,8 @@
+ 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")
+@@ -604,12 +605,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
+@@ -663,6 +664,7 @@
+ HINTS ${qt_headers}
+ ${QT_LIBRARY_DIR}/QtCore.framework/Headers
+ PATH_SUFFIXES QtCore
++ NO_DEFAULT_PATH
+ )
+
+ # Set QT_HEADERS_DIR based on finding QtCore header
+@@ -711,7 +713,8 @@
+ endforeach(qt_cross_path)
+ 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 (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED)
+
+ # ask qmake for the translations directory
+@@ -731,8 +734,7 @@
+ FIND_PATH(QT_IMPORTS_DIR NAMES Qt
+ HINTS ${qt_cross_paths} ${qt_imports_dir}
+ DOC "The location of the Qt imports"
+- NO_CMAKE_PATH NO_CMAKE_ENVIRONMENT_PATH NO_SYSTEM_ENVIRONMENT_PATH
+- NO_CMAKE_SYSTEM_PATH)
++ NO_DEFAULT_PATH)
+ mark_as_advanced(QT_IMPORTS_DIR)
+ endif(qt_imports_dir)
+ ENDIF (QT_LIBRARY_DIR AND NOT QT_IMPORTS_DIR OR QT_QMAKE_CHANGED)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101122/09b2696f/attachment-0001.html>
More information about the macports-changes
mailing list