Use cmake 2.6.0 release

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4c2b48547c7110a63d212c1cc6d46ed09715f358..1e278c06afdca5c58304ffc0b7d0fe2bb20f7f94 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -262,14 +262,14 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 # ***************************************************************************
 # CMake
 # ***************************************************************************
-# cmake-$(CMAKE_VERSION).tar.gz:
-#      $(WGET) $(CMAKE_URL)
-#      
-# cmake: cmake-$(CMAKE_VERSION).tar.gz
-#      $(EXTRACT_GZ)
+cmake-$(CMAKE_VERSION).tar.gz:
+       $(WGET) $(CMAKE_URL)
+
+cmake: cmake-$(CMAKE_VERSION).tar.gz
+       $(EXTRACT_GZ)
        
-cmake: 
-       cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
+#cmake:
+#      cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
 
 .cmake: cmake
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 242ec1cb3b66b1d85f2c43475c6c37ec8f36abda..f54f5e88f7d2768e31b897e183687844ecb7fffd 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -38,8 +38,8 @@ LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.61
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
-CMAKE_VERSION=2.4.8
-CMAKE_URL=http://www.cmake.org/files/v2.4/cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_VERSION=2.6.0
+CMAKE_URL=http://www.cmake.org/files/v2.6/cmake-$(CMAKE_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.24
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.9.6