diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index a2737c540111..adf7e1cae440 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2012/08/07 16:18:26 adam Exp $
+# $NetBSD: Makefile,v 1.64 2012/08/11 11:10:54 marino Exp $
 
-DISTNAME=	cmake-${CMAKE_API}.8
+DISTNAME=	cmake-${CMAKE_API}.9
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cmake.org/files/v${CMAKE_API}/
 
diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST
index 8b8d95ea21bc..4662f5ae30b4 100644
--- a/devel/cmake/PLIST
+++ b/devel/cmake/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2012/08/07 16:18:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2012/08/11 11:10:54 marino Exp $
 bin/ccmake
 bin/cmake
 bin/cpack
@@ -43,6 +43,7 @@ share/cmake-${CMAKE_API}/Modules/CMakeCXXCompiler.cmake.in
 share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerABI.cpp
 share/cmake-${CMAKE_API}/Modules/CMakeCXXCompilerId.cpp.in
 share/cmake-${CMAKE_API}/Modules/CMakeCXXInformation.cmake
+share/cmake-${CMAKE_API}/Modules/CMakeClDeps.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCommonLanguageInclude.cmake
 share/cmake-${CMAKE_API}/Modules/CMakeCompilerABI.h
 share/cmake-${CMAKE_API}/Modules/CMakeConfigurableFile.in
@@ -286,6 +287,7 @@ share/cmake-${CMAKE_API}/Modules/FindKDE4.cmake
 share/cmake-${CMAKE_API}/Modules/FindLAPACK.cmake
 share/cmake-${CMAKE_API}/Modules/FindLATEX.cmake
 share/cmake-${CMAKE_API}/Modules/FindLibArchive.cmake
+share/cmake-${CMAKE_API}/Modules/FindLibLZMA.cmake
 share/cmake-${CMAKE_API}/Modules/FindLibXml2.cmake
 share/cmake-${CMAKE_API}/Modules/FindLibXslt.cmake
 share/cmake-${CMAKE_API}/Modules/FindLua50.cmake
@@ -401,6 +403,7 @@ share/cmake-${CMAKE_API}/Modules/MacOSXFrameworkInfo.plist.in
 share/cmake-${CMAKE_API}/Modules/MacroAddFileDependencies.cmake
 share/cmake-${CMAKE_API}/Modules/NSIS.InstallOptions.ini.in
 share/cmake-${CMAKE_API}/Modules/NSIS.template.in
+share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-ASM.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-C.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-CXX.cmake
 share/cmake-${CMAKE_API}/Modules/Platform/AIX-GNU-Fortran.cmake
@@ -617,6 +620,13 @@ share/cmake-${CMAKE_API}/Templates/UtilityHeader.dsptemplate
 share/cmake-${CMAKE_API}/Templates/cygwin-package.sh.in
 share/cmake-${CMAKE_API}/Templates/staticLibFooter.dsptemplate
 share/cmake-${CMAKE_API}/Templates/staticLibHeader.dsptemplate
+share/cmake-${CMAKE_API}/completions/cmake
+share/cmake-${CMAKE_API}/completions/cpack
+share/cmake-${CMAKE_API}/completions/ctest
+share/cmake-${CMAKE_API}/editors/emacs/cmake-mode.el
+share/cmake-${CMAKE_API}/editors/vim/cmake-help.vim
+share/cmake-${CMAKE_API}/editors/vim/cmake-indent.vim
+share/cmake-${CMAKE_API}/editors/vim/cmake-syntax.vim
 share/cmake-${CMAKE_API}/include/cmCPluginAPI.h
 share/doc/cmake-${CMAKE_API}/Copyright.txt
 share/doc/cmake-${CMAKE_API}/ccmake.docbook
diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo
index 698ba56acaf8..226c232a9cf6 100644
--- a/devel/cmake/distinfo
+++ b/devel/cmake/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.38 2012/08/07 16:18:26 adam Exp $
+$NetBSD: distinfo,v 1.39 2012/08/11 11:10:54 marino Exp $
 
-SHA1 (cmake-2.8.8.tar.gz) = a74dfc3e0a0d7f857ac5dda03bb99ebf07676da1
-RMD160 (cmake-2.8.8.tar.gz) = db60999fd4d1b3e2e28368d45035a058ed7e7639
-Size (cmake-2.8.8.tar.gz) = 5691656 bytes
+SHA1 (cmake-2.8.9.tar.gz) = b96663c0757a5edfbddc410aabf7126a92131e2b
+RMD160 (cmake-2.8.9.tar.gz) = 66808a280eb8e4ae798df3283fab8bcc3f512777
+Size (cmake-2.8.9.tar.gz) = 5658837 bytes
 SHA1 (patch-Modules_FindX11.cmake) = c87f91643f3d9df7b1bbae298fc694dfcf26af75
-SHA1 (patch-Modules_Platform_SunOS.cmake) = a873f937568744208fec90f80ebb67ca3150b49a
-SHA1 (patch-Utilities_KWIML_ABI.h.in) = 3e71a1a38f156a0711e273628d95a938072566c5
+SHA1 (patch-Modules_Platform_SunOS.cmake) = bec194d087b2ee092cf0db11752fb30b0e86f384
+SHA1 (patch-Utilities_KWIML_ABI.h.in) = 98df469c09dcbb8f21a5ae71cdfe696bffdb7976
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c
 SHA1 (patch-aa) = 1af37a3f7bd8423785acff80d7b89c75018e5cab
 SHA1 (patch-ab) = 1e10b88b9929a49f6c0b6aec13e21d169a1f9480
-SHA1 (patch-ac) = a35634d41dc633707fd56ddb3ef587a41e04afbf
+SHA1 (patch-ac) = 01c9ce671ed54c20a01cf06af3674035049a20cc
diff --git a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake b/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
index 8c3e5a0a19d4..d8a997741afd 100644
--- a/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
+++ b/devel/cmake/patches/patch-Modules_Platform_SunOS.cmake
@@ -1,13 +1,13 @@
-$NetBSD: patch-Modules_Platform_SunOS.cmake,v 1.1 2012/02/16 18:32:25 hans Exp $
+$NetBSD: patch-Modules_Platform_SunOS.cmake,v 1.2 2012/08/11 11:10:54 marino Exp $
 
 Don't use gcc to link c++ libraries on SunOS,
 unless we are really using a gcc lacking libstdc++.
 
 See http://public.kitware.com/pipermail/cmake/2011-July/045300.html
 
---- Modules/Platform/SunOS.cmake.orig	2011-10-04 18:09:24.000000000 +0200
-+++ Modules/Platform/SunOS.cmake	2012-01-11 17:50:43.768105308 +0100
-@@ -5,12 +5,20 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
+--- Modules/Platform/SunOS.cmake.orig	2012-08-09 18:15:19.000000000 +0000
++++ Modules/Platform/SunOS.cmake
+@@ -7,12 +7,20 @@ IF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
     SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")  
  ENDIF(CMAKE_SYSTEM MATCHES "SunOS-4.*")
  
@@ -18,7 +18,7 @@ See http://public.kitware.com/pipermail/cmake/2011-July/045300.html
  IF(CMAKE_COMPILER_IS_GNUCXX)
    IF(CMAKE_COMPILER_IS_GNUCC)
 -    SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
--        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+-        "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_CXX_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS>  <SONAME_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
 -  ELSE(CMAKE_COMPILER_IS_GNUCC)
 -    # Take default rule from CMakeDefaultMakeRuleVariables.cmake.
 +    EXECUTE_PROCESS(
diff --git a/devel/cmake/patches/patch-Utilities_KWIML_ABI.h.in b/devel/cmake/patches/patch-Utilities_KWIML_ABI.h.in
index 190a11d626de..3b20bf523f14 100644
--- a/devel/cmake/patches/patch-Utilities_KWIML_ABI.h.in
+++ b/devel/cmake/patches/patch-Utilities_KWIML_ABI.h.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Utilities_KWIML_ABI.h.in,v 1.1 2012/05/28 18:06:48 abs Exp $
+$NetBSD: patch-Utilities_KWIML_ABI.h.in,v 1.2 2012/08/11 11:10:54 marino Exp $
 
 Add VAX to the list of supported architectures
 
---- Utilities/KWIML/ABI.h.in.orig	2011-12-30 16:49:58.000000000 +0000
+--- Utilities/KWIML/ABI.h.in.orig	2012-08-09 18:15:19.000000000 +0000
 +++ Utilities/KWIML/ABI.h.in
-@@ -402,6 +402,10 @@ suppression macro @KWIML@_ABI_NO_VERIFY 
+@@ -414,6 +414,10 @@ suppression macro @KWIML@_ABI_NO_VERIFY
  #elif defined(__SYSC_ZARCH__)
  # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG
  
diff --git a/devel/cmake/patches/patch-ac b/devel/cmake/patches/patch-ac
index dbc876425d6b..0aee58dbfdc0 100644
--- a/devel/cmake/patches/patch-ac
+++ b/devel/cmake/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.7 2012/08/07 16:18:26 adam Exp $
+$NetBSD: patch-ac,v 1.8 2012/08/11 11:10:54 marino Exp $
 
---- Modules/FindPythonLibs.cmake.orig	2012-04-18 18:10:54.000000000 +0000
+--- Modules/FindPythonLibs.cmake.orig	2012-08-09 18:15:19.000000000 +0000
 +++ Modules/FindPythonLibs.cmake
-@@ -56,11 +56,18 @@ ELSE(PythonLibs_FIND_VERSION)
+@@ -67,11 +67,18 @@ ELSE(PythonLibs_FIND_VERSION)
      SET(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} ${_PYTHON1_VERSIONS})
  ENDIF(PythonLibs_FIND_VERSION)