Index: head/devel/cmake/Makefile =================================================================== --- head/devel/cmake/Makefile (revision 265025) +++ head/devel/cmake/Makefile (revision 265026) @@ -1,52 +1,53 @@ # New ports collection makefile for: cmake # Date created: March 18 2002 # Whom: Kyle Martin # # $FreeBSD$ # PORTNAME= cmake PORTVERSION= 2.8.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.${PORTNAME}.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ MAINTAINER= kde@FreeBSD.org COMMENT= A cross-platform Makefile generator HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir=${DATADIR:S|^${PREFIX}||} \ --docdir=${DOCSDIR:S|^${PREFIX}||} CONFIGURE_ENV= MAKE=make MAKE_JOBS_SAFE= yes .if !defined(WITH_DEBUG) INSTALL_TARGET=install/strip .endif MAN1= ccmake.1 \ cmake.1 \ cmakecommands.1 \ cmakecompat.1 \ cmakemodules.1 \ cmakepolicies.1 \ cmakeprops.1 \ cmakevars.1 \ cpack.1 \ ctest.1 post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g; \ s,/usr/X11R6,${LOCALBASE},g' @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${WRKSRC}/Source/cmLocalGenerator.cxx \ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \ ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's,/opt/kde4,${LOCALBASE}/kde4,g' \ ${WRKSRC}/Modules/FindKDE4.cmake @${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete .include Property changes on: head/devel/cmake/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.43 \ No newline at end of property +1.44 \ No newline at end of property Index: head/devel/cmake/files/patch-Modules_FindQt4.cmake =================================================================== --- head/devel/cmake/files/patch-Modules_FindQt4.cmake (revision 265025) +++ head/devel/cmake/files/patch-Modules_FindQt4.cmake (revision 265026) @@ -1,11 +1,26 @@ ---- ./Modules/FindQt4.cmake.orig 2010-03-16 23:29:30.000000000 +0300 -+++ ./Modules/FindQt4.cmake 2010-03-26 22:48:58.291402760 +0300 -@@ -392,7 +392,7 @@ +--- ./Modules/FindQt4.cmake.orig 2010-11-03 22:58:27.000000000 +0300 ++++ ./Modules/FindQt4.cmake 2010-11-23 18:09:33.486039056 +0300 +@@ -461,7 +461,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 PATHS +FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake qmake4 qmake-mac PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +@@ -705,13 +705,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) +- SET(QT_PLUGINS_DIR NOTFOUND) +- foreach(qt_cross_path ${CMAKE_FIND_ROOT_PATH}) +- set(qt_cross_paths ${qt_cross_paths} "${qt_cross_path}/plugins") +- 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") ++ SET(QT_PLUGINS_DIR ${qt_plugins_dir} CACHE PATH "The location of the Qt plugins" FORCE) + ENDIF (QT_LIBRARY_DIR AND NOT QT_PLUGINS_DIR OR QT_QMAKE_CHANGED) + + # ask qmake for the translations directory Property changes on: head/devel/cmake/files/patch-Modules_FindQt4.cmake ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.5 \ No newline at end of property +1.6 \ No newline at end of property