diff options
author | Max Brazhnikov <makc@FreeBSD.org> | 2009-03-24 19:11:23 +0000 |
---|---|---|
committer | Max Brazhnikov <makc@FreeBSD.org> | 2009-03-24 19:11:23 +0000 |
commit | 4d55666226a1a32a778ec41abf7265abf57b8c4a (patch) | |
tree | 3539d1e0a86996e97b7aaa1846b59e945cb8bc09 /devel/cmake | |
parent | - Update to 2.7.13 (diff) |
Update devel/cmake to 2.6.3.
- Set INSTALL_TARGET for cmake based ports to install/strip. This solves
problem of installing non-stripped binaries (noticed by delphij for KDE4 ports)
- Fix linking to -lpthread for cmake based ports (KDE4 ports are affected mostly)
Notes
Notes:
svn path=/head/; revision=230896
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/Makefile | 12 | ||||
-rw-r--r-- | devel/cmake/distinfo | 6 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindLua50.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindLua51.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindPythonInterp.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 20 | ||||
-rw-r--r-- | devel/cmake/pkg-plist | 18 |
7 files changed, 44 insertions, 45 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index e505ddef879f..e5d9625dc9fb 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,11 +6,9 @@ # PORTNAME= cmake -PORTVERSION= 2.6.2 +PORTVERSION= 2.6.3 CATEGORIES= devel -MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR=lofi +MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ MAINTAINER= kde@FreeBSD.org COMMENT= A cross-platform make @@ -21,6 +19,12 @@ CONFIGURE_ARGS= --prefix=${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 \ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 61421e73b8a5..58c3f1dbacde 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -MD5 (cmake-2.6.2.tar.gz) = 9e82aa3beb991aa8e5797cf330618d42 -SHA256 (cmake-2.6.2.tar.gz) = b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9 -SIZE (cmake-2.6.2.tar.gz) = 3543548 +MD5 (cmake-2.6.3.tar.gz) = 5ba47a94ce276f326abca1fd72a7e7c6 +SHA256 (cmake-2.6.3.tar.gz) = 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450 +SIZE (cmake-2.6.3.tar.gz) = 3594959 diff --git a/devel/cmake/files/patch-Modules_FindLua50.cmake b/devel/cmake/files/patch-Modules_FindLua50.cmake deleted file mode 100644 index 557a1694123f..000000000000 --- a/devel/cmake/files/patch-Modules_FindLua50.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindLua50.cmake.orig 2008-08-01 18:34:50.000000000 +0300 -+++ Modules/FindLua50.cmake 2009-01-22 09:26:29.000000000 +0200 -@@ -28,7 +28,7 @@ - ) - - FIND_LIBRARY(LUA_LIBRARY_lua -- NAMES lua50 lua5.0 lua5 lua -+ NAMES lua50 lua5.0 lua-5.0 lua5 lua - HINTS - $ENV{LUA_DIR} - PATH_SUFFIXES lib64 lib diff --git a/devel/cmake/files/patch-Modules_FindLua51.cmake b/devel/cmake/files/patch-Modules_FindLua51.cmake deleted file mode 100644 index 5b44295e4b4c..000000000000 --- a/devel/cmake/files/patch-Modules_FindLua51.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- Modules/FindLua51.cmake.orig 2008-08-01 18:34:50.000000000 +0300 -+++ Modules/FindLua51.cmake 2009-01-22 09:26:29.000000000 +0200 -@@ -28,7 +28,7 @@ - ) - - FIND_LIBRARY(LUA_LIBRARY -- NAMES lua51 lua5.1 lua -+ NAMES lua51 lua5.1 lua-5.1 lua - HINTS - $ENV{LUA_DIR} - PATH_SUFFIXES lib64 lib diff --git a/devel/cmake/files/patch-Modules_FindPythonInterp.cmake b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake new file mode 100644 index 000000000000..c67cffbdfe78 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindPythonInterp.cmake @@ -0,0 +1,11 @@ +--- ./Modules/FindPythonInterp.cmake.orig 2009-02-21 23:36:50.000000000 +0300 ++++ ./Modules/FindPythonInterp.cmake 2009-03-20 13:20:18.000000000 +0300 +@@ -7,7 +7,7 @@ + # + + FIND_PROGRAM(PYTHON_EXECUTABLE +- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python ++ NAMES ${DEFAULT_PYTHON_EXECUTABLE} python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python + PATHS + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake index 27a5aaeff783..13f6a82f03ca 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,6 +1,6 @@ ---- ./Modules/FindQt4.cmake.orig 2008-05-05 22:25:53.000000000 +0400 -+++ ./Modules/FindQt4.cmake 2008-07-21 02:37:16.000000000 +0400 -@@ -293,7 +293,7 @@ +--- ./Modules/FindQt4.cmake.orig 2009-02-21 23:36:50.000000000 +0300 ++++ ./Modules/FindQt4.cmake 2009-03-20 13:20:18.000000000 +0300 +@@ -319,7 +319,7 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) # check for qmake @@ -9,19 +9,7 @@ "[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" -@@ -915,9 +915,9 @@ - "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) - - SET(QT_MOC_EXECUTABLE -- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable") -+ ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE) - SET(QT_UIC_EXECUTABLE -- ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable") -+ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) - - FIND_PROGRAM(QT_UIC3_EXECUTABLE - NAMES uic3 -@@ -944,13 +944,13 @@ +@@ -855,13 +855,13 @@ ) FIND_PROGRAM(QT_LUPDATE_EXECUTABLE diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 6428a4bf369d..5933385e9366 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -8,6 +8,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeASM-ATTInformation.cmake %%DATADIR%%/Modules/CMakeASMCompiler.cmake.in %%DATADIR%%/Modules/CMakeASMInformation.cmake +%%DATADIR%%/Modules/CMakeASM_MASMInformation.cmake %%DATADIR%%/Modules/CMakeBackwardCompatibilityC.cmake %%DATADIR%%/Modules/CMakeBackwardCompatibilityCXX.cmake %%DATADIR%%/Modules/CMakeBorlandFindMake.cmake @@ -26,6 +27,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeDependentOption.cmake %%DATADIR%%/Modules/CMakeDetermineASM-ATTCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineASMCompiler.cmake +%%DATADIR%%/Modules/CMakeDetermineASM_MASMCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCXXCompiler.cmake %%DATADIR%%/Modules/CMakeDetermineCompilerABI.cmake @@ -58,6 +60,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeSystemSpecificInformation.cmake %%DATADIR%%/Modules/CMakeTestASM-ATTCompiler.cmake %%DATADIR%%/Modules/CMakeTestASMCompiler.cmake +%%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestCCompiler.cmake %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx @@ -128,11 +131,14 @@ bin/ctest %%DATADIR%%/Modules/FindCABLE.cmake %%DATADIR%%/Modules/FindCURL.cmake %%DATADIR%%/Modules/FindCVS.cmake +%%DATADIR%%/Modules/FindCoin3D.cmake %%DATADIR%%/Modules/FindCups.cmake %%DATADIR%%/Modules/FindCurses.cmake +%%DATADIR%%/Modules/FindCxxTest.cmake %%DATADIR%%/Modules/FindCygwin.cmake %%DATADIR%%/Modules/FindDCMTK.cmake %%DATADIR%%/Modules/FindDart.cmake +%%DATADIR%%/Modules/FindDevIL.cmake %%DATADIR%%/Modules/FindDoxygen.cmake %%DATADIR%%/Modules/FindEXPAT.cmake %%DATADIR%%/Modules/FindFLTK.cmake @@ -170,7 +176,9 @@ bin/ctest %%DATADIR%%/Modules/FindMotif.cmake %%DATADIR%%/Modules/FindOpenAL.cmake %%DATADIR%%/Modules/FindOpenGL.cmake +%%DATADIR%%/Modules/FindOpenMP.cmake %%DATADIR%%/Modules/FindOpenSSL.cmake +%%DATADIR%%/Modules/FindOpenSceneGraph.cmake %%DATADIR%%/Modules/FindOpenThreads.cmake %%DATADIR%%/Modules/FindPHP4.cmake %%DATADIR%%/Modules/FindPNG.cmake @@ -188,6 +196,7 @@ bin/ctest %%DATADIR%%/Modules/FindQt3.cmake %%DATADIR%%/Modules/FindQt4.cmake %%DATADIR%%/Modules/FindQuickTime.cmake +%%DATADIR%%/Modules/FindRTI.cmake %%DATADIR%%/Modules/FindRuby.cmake %%DATADIR%%/Modules/FindSDL.cmake %%DATADIR%%/Modules/FindSDL_image.cmake @@ -197,6 +206,7 @@ bin/ctest %%DATADIR%%/Modules/FindSDL_ttf.cmake %%DATADIR%%/Modules/FindSWIG.cmake %%DATADIR%%/Modules/FindSelfPackers.cmake +%%DATADIR%%/Modules/FindSquish.cmake %%DATADIR%%/Modules/FindSubversion.cmake %%DATADIR%%/Modules/FindTCL.cmake %%DATADIR%%/Modules/FindTIFF.cmake @@ -211,6 +221,7 @@ bin/ctest %%DATADIR%%/Modules/FindXMLRPC.cmake %%DATADIR%%/Modules/FindZLIB.cmake %%DATADIR%%/Modules/Findosg.cmake +%%DATADIR%%/Modules/FindosgAnimation.cmake %%DATADIR%%/Modules/FindosgDB.cmake %%DATADIR%%/Modules/FindosgFX.cmake %%DATADIR%%/Modules/FindosgGA.cmake @@ -224,8 +235,13 @@ bin/ctest %%DATADIR%%/Modules/FindosgText.cmake %%DATADIR%%/Modules/FindosgUtil.cmake %%DATADIR%%/Modules/FindosgViewer.cmake +%%DATADIR%%/Modules/FindosgVolume.cmake +%%DATADIR%%/Modules/FindosgWidget.cmake +%%DATADIR%%/Modules/Findosg_functions.cmake %%DATADIR%%/Modules/FindwxWidgets.cmake %%DATADIR%%/Modules/FindwxWindows.cmake +%%DATADIR%%/Modules/FortranCInterface.cmake +%%DATADIR%%/Modules/FortranCInterface.h.in %%DATADIR%%/Modules/GetPrerequisites.cmake %%DATADIR%%/Modules/ITKCompatibility.cmake %%DATADIR%%/Modules/InstallRequiredSystemLibraries.cmake @@ -257,6 +273,7 @@ bin/ctest %%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake %%DATADIR%%/Modules/Platform/Generic.cmake %%DATADIR%%/Modules/Platform/HP-UX.cmake +%%DATADIR%%/Modules/Platform/Haiku.cmake %%DATADIR%%/Modules/Platform/IRIX.cmake %%DATADIR%%/Modules/Platform/IRIX64.cmake %%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake @@ -311,6 +328,7 @@ bin/ctest %%DATADIR%%/Modules/Platform/kFreeBSD.cmake %%DATADIR%%/Modules/Platform/syllable.cmake %%DATADIR%%/Modules/Platform/xlf.cmake +%%DATADIR%%/Modules/SquishTestScript.cmake %%DATADIR%%/Modules/SystemInformation.cmake %%DATADIR%%/Modules/SystemInformation.in %%DATADIR%%/Modules/TestBigEndian.cmake |