diff options
author | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 11:59:56 +0000 |
---|---|---|
committer | Dima Panov <fluffy@FreeBSD.org> | 2010-05-11 11:59:56 +0000 |
commit | f639cf8c917c96f905ba43d2961f056fbde7ae50 (patch) | |
tree | 81f5dc7803ab34c6360e1576e9b7b418a796d514 /devel/cmake | |
parent | - The FreeBSD KDE team is pleased to announce SIP-4.10.2, PyQt-4.7.3 (diff) |
- Update CMake to 2.8.1 release
With hat on: kde@
Notes
Notes:
svn path=/head/; revision=254129
Diffstat (limited to 'devel/cmake')
-rw-r--r-- | devel/cmake/Makefile | 3 | ||||
-rw-r--r-- | devel/cmake/distinfo | 6 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindJava.cmake | 11 | ||||
-rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 14 | ||||
-rw-r--r-- | devel/cmake/files/patch-Source-kwsys_SharedForward.h.in | 11 | ||||
-rw-r--r-- | devel/cmake/pkg-plist | 49 |
6 files changed, 63 insertions, 31 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 439e35f9377b..f704c8edb563 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cmake -PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTVERSION= 2.8.1 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${PORTVERSION:C/\.[[:digit:]]+$//}/ diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 9ad728c59cc9..4b4d5ac58662 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -MD5 (cmake-2.8.0.tar.gz) = 3b3679b8a6afaedc38a8c15dd7ff4fcf -SHA256 (cmake-2.8.0.tar.gz) = 847d615ecadb97f2cd05964cad6b019b68a952cad0db1e8c05222dfc599f476d -SIZE (cmake-2.8.0.tar.gz) = 3553247 +MD5 (cmake-2.8.1.tar.gz) = feadc2e5ebbfed0efc90178583503725 +SHA256 (cmake-2.8.1.tar.gz) = 7eae74ab7673974a68e395c211854d318f0af2d320590a670339ee8ee9422242 +SIZE (cmake-2.8.1.tar.gz) = 3605586 diff --git a/devel/cmake/files/patch-Modules_FindJava.cmake b/devel/cmake/files/patch-Modules_FindJava.cmake new file mode 100644 index 000000000000..b55dac924eaa --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindJava.cmake @@ -0,0 +1,11 @@ +--- ./Modules/FindJava.cmake.orig 2010-04-16 16:49:52.000000000 +1100 ++++ ./Modules/FindJava.cmake 2010-04-16 16:51:27.398957616 +1100 +@@ -90,7 +90,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_]+[oem-]*\".*") ++ IF(var MATCHES "[java|openjdk] version \"[0-9]+\\.[0-9]+\\.[0-9_]+[oem-]*\".*") + # 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 3cb84ea59ec2..3c97ce18db88 100644 --- a/devel/cmake/files/patch-Modules_FindQt4.cmake +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -1,11 +1,11 @@ ---- Modules/FindQt4.cmake.orig 2009-05-10 21:46:40.000000000 +0200 -+++ Modules/FindQt4.cmake 2009-05-10 21:47:58.000000000 +0200 -@@ -336,7 +336,7 @@ - - GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) +--- ./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 @@ # check for qmake --FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS -+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS + # 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" diff --git a/devel/cmake/files/patch-Source-kwsys_SharedForward.h.in b/devel/cmake/files/patch-Source-kwsys_SharedForward.h.in deleted file mode 100644 index e4152e04c447..000000000000 --- a/devel/cmake/files/patch-Source-kwsys_SharedForward.h.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/kwsys/SharedForward.h.in.orig 2010-01-01 15:30:58.000000000 +0100 -+++ Source/kwsys/SharedForward.h.in 2010-01-01 15:31:11.000000000 +0100 -@@ -218,7 +218,7 @@ - #endif - - /* SUN */ --#if defined(__sparc) && !defined(__linux) -+#if defined(__sparc) && !defined(__linux) && !defined(__FreeBSD__) - # define KWSYS_SHARED_FORWARD_LDD "ldd" - # define KWSYS_SHARED_FORWARD_LDD_N 1 - # include <sys/isa_defs.h> diff --git a/devel/cmake/pkg-plist b/devel/cmake/pkg-plist index 01427849dbe4..161f66e9a681 100644 --- a/devel/cmake/pkg-plist +++ b/devel/cmake/pkg-plist @@ -54,6 +54,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeFortranInformation.cmake %%DATADIR%%/Modules/CMakeGenericSystem.cmake %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake +%%DATADIR%%/Modules/CMakeJOMFindMake.cmake %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in %%DATADIR%%/Modules/CMakeJavaInformation.cmake %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake @@ -71,6 +72,7 @@ bin/ctest %%DATADIR%%/Modules/CMakeTestASM_MASMCompiler.cmake %%DATADIR%%/Modules/CMakeTestCCompiler.cmake %%DATADIR%%/Modules/CMakeTestCXXCompiler.cmake +%%DATADIR%%/Modules/CMakeTestCompilerCommon.cmake %%DATADIR%%/Modules/CMakeTestForFreeVC.cxx %%DATADIR%%/Modules/CMakeTestFortranCompiler.cmake %%DATADIR%%/Modules/CMakeTestGNU.c @@ -126,14 +128,16 @@ bin/ctest %%DATADIR%%/Modules/CheckSizeOf.cmake %%DATADIR%%/Modules/CheckStructHasMember.cmake %%DATADIR%%/Modules/CheckSymbolExists.cmake +%%DATADIR%%/Modules/CheckTypeSize.c.in %%DATADIR%%/Modules/CheckTypeSize.cmake -%%DATADIR%%/Modules/CheckTypeSizeC.c.in +%%DATADIR%%/Modules/CheckTypeSizeMap.cmake.in %%DATADIR%%/Modules/CheckVariableExists.c %%DATADIR%%/Modules/CheckVariableExists.cmake %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake %%DATADIR%%/Modules/Compiler/GNU-C.cmake %%DATADIR%%/Modules/Compiler/GNU-CXX.cmake %%DATADIR%%/Modules/Compiler/GNU-Fortran.cmake +%%DATADIR%%/Modules/Compiler/GNU.cmake %%DATADIR%%/Modules/Compiler/HP-C.cmake %%DATADIR%%/Modules/Compiler/HP-CXX.cmake %%DATADIR%%/Modules/Compiler/HP-Fortran.cmake @@ -146,6 +150,11 @@ bin/ctest %%DATADIR%%/Modules/Compiler/PGI-C.cmake %%DATADIR%%/Modules/Compiler/PGI-CXX.cmake %%DATADIR%%/Modules/Compiler/PGI-Fortran.cmake +%%DATADIR%%/Modules/Compiler/PGI.cmake +%%DATADIR%%/Modules/Compiler/PathScale-C.cmake +%%DATADIR%%/Modules/Compiler/PathScale-CXX.cmake +%%DATADIR%%/Modules/Compiler/PathScale-Fortran.cmake +%%DATADIR%%/Modules/Compiler/PathScale.cmake %%DATADIR%%/Modules/Compiler/SunPro-C.cmake %%DATADIR%%/Modules/Compiler/SunPro-CXX.cmake %%DATADIR%%/Modules/Compiler/SunPro-Fortran.cmake @@ -322,6 +331,10 @@ bin/ctest %%DATADIR%%/Modules/MacroAddFileDependencies.cmake %%DATADIR%%/Modules/NSIS.InstallOptions.ini.in %%DATADIR%%/Modules/NSIS.template.in +%%DATADIR%%/Modules/Platform/AIX-GNU-C.cmake +%%DATADIR%%/Modules/Platform/AIX-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/AIX-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/AIX-GNU.cmake %%DATADIR%%/Modules/Platform/AIX-VisualAge-C.cmake %%DATADIR%%/Modules/Platform/AIX-VisualAge-CXX.cmake %%DATADIR%%/Modules/Platform/AIX-XL-C.cmake @@ -331,11 +344,15 @@ bin/ctest %%DATADIR%%/Modules/Platform/BSDOS.cmake %%DATADIR%%/Modules/Platform/BeOS.cmake %%DATADIR%%/Modules/Platform/BlueGeneL.cmake -%%DATADIR%%/Modules/Platform/CYGWIN-g77.cmake +%%DATADIR%%/Modules/Platform/CYGWIN-GNU-C.cmake +%%DATADIR%%/Modules/Platform/CYGWIN-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/CYGWIN-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/CYGWIN-GNU.cmake %%DATADIR%%/Modules/Platform/CYGWIN.cmake %%DATADIR%%/Modules/Platform/Catamount.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU-C.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/Darwin-GNU-Fortran.cmake %%DATADIR%%/Modules/Platform/Darwin-GNU.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-C.cmake %%DATADIR%%/Modules/Platform/Darwin-VisualAge-CXX.cmake @@ -353,11 +370,18 @@ bin/ctest %%DATADIR%%/Modules/Platform/Generic-ADSP-Common.cmake %%DATADIR%%/Modules/Platform/Generic-SDCC-C.cmake %%DATADIR%%/Modules/Platform/Generic.cmake +%%DATADIR%%/Modules/Platform/HP-UX-GNU-C.cmake +%%DATADIR%%/Modules/Platform/HP-UX-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/HP-UX-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/HP-UX-GNU.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-C.cmake +%%DATADIR%%/Modules/Platform/Linux-GNU-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-GNU.cmake %%DATADIR%%/Modules/Platform/Linux-Intel-C.cmake %%DATADIR%%/Modules/Platform/Linux-Intel-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-Intel-Fortran.cmake @@ -365,9 +389,12 @@ bin/ctest %%DATADIR%%/Modules/Platform/Linux-PGI-C.cmake %%DATADIR%%/Modules/Platform/Linux-PGI-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-PGI-Fortran.cmake -%%DATADIR%%/Modules/Platform/Linux-SunPro-C.cmake +%%DATADIR%%/Modules/Platform/Linux-PGI.cmake +%%DATADIR%%/Modules/Platform/Linux-PathScale-C.cmake +%%DATADIR%%/Modules/Platform/Linux-PathScale-CXX.cmake +%%DATADIR%%/Modules/Platform/Linux-PathScale-Fortran.cmake +%%DATADIR%%/Modules/Platform/Linux-PathScale.cmake %%DATADIR%%/Modules/Platform/Linux-SunPro-CXX.cmake -%%DATADIR%%/Modules/Platform/Linux-SunPro-Fortran.cmake %%DATADIR%%/Modules/Platform/Linux-VisualAge-C.cmake %%DATADIR%%/Modules/Platform/Linux-VisualAge-CXX.cmake %%DATADIR%%/Modules/Platform/Linux-VisualAge-Fortran.cmake @@ -385,6 +412,10 @@ bin/ctest %%DATADIR%%/Modules/Platform/RISCos.cmake %%DATADIR%%/Modules/Platform/SCO_SV.cmake %%DATADIR%%/Modules/Platform/SINIX.cmake +%%DATADIR%%/Modules/Platform/SunOS-GNU-C.cmake +%%DATADIR%%/Modules/Platform/SunOS-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/SunOS-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/SunOS-GNU.cmake %%DATADIR%%/Modules/Platform/SunOS.cmake %%DATADIR%%/Modules/Platform/Tru64.cmake %%DATADIR%%/Modules/Platform/ULTRIX.cmake @@ -394,14 +425,16 @@ bin/ctest %%DATADIR%%/Modules/Platform/Windows-Borland-C.cmake %%DATADIR%%/Modules/Platform/Windows-Borland-CXX.cmake %%DATADIR%%/Modules/Platform/Windows-Borland.cmake +%%DATADIR%%/Modules/Platform/Windows-GNU-C.cmake +%%DATADIR%%/Modules/Platform/Windows-GNU-CXX.cmake +%%DATADIR%%/Modules/Platform/Windows-GNU-Fortran.cmake +%%DATADIR%%/Modules/Platform/Windows-GNU.cmake %%DATADIR%%/Modules/Platform/Windows-Intel.cmake %%DATADIR%%/Modules/Platform/Windows-NMcl.cmake %%DATADIR%%/Modules/Platform/Windows-cl.cmake %%DATADIR%%/Modules/Platform/Windows-cl.cmake.in %%DATADIR%%/Modules/Platform/Windows-df.cmake %%DATADIR%%/Modules/Platform/Windows-g++.cmake -%%DATADIR%%/Modules/Platform/Windows-g77.cmake -%%DATADIR%%/Modules/Platform/Windows-gcc.cmake %%DATADIR%%/Modules/Platform/Windows-icl.cmake %%DATADIR%%/Modules/Platform/Windows-ifort.cmake %%DATADIR%%/Modules/Platform/Windows-wcl386.cmake @@ -410,11 +443,11 @@ bin/ctest %%DATADIR%%/Modules/Platform/Xenix.cmake %%DATADIR%%/Modules/Platform/cl.cmake %%DATADIR%%/Modules/Platform/eCos.cmake -%%DATADIR%%/Modules/Platform/g77.cmake %%DATADIR%%/Modules/Platform/gas.cmake -%%DATADIR%%/Modules/Platform/gcc.cmake %%DATADIR%%/Modules/Platform/kFreeBSD.cmake %%DATADIR%%/Modules/Platform/syllable.cmake +%%DATADIR%%/Modules/Qt4ConfigDependentSettings.cmake +%%DATADIR%%/Modules/Qt4Macros.cmake %%DATADIR%%/Modules/RepositoryInfo.txt.in %%DATADIR%%/Modules/SelectLibraryConfigurations.cmake %%DATADIR%%/Modules/SquishRunTestCase.bat |