Update CMake to 2.8.3.

1 files changed, 10 insertions, 13 deletions

diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb
index 5e13f40eb..1e1ee27f9 100644
--- a/Library/Formula/cmake.rb
+++ b/Library/Formula/cmake.rb
@@ -1,24 +1,21 @@
 require 'formula'
 
 class Cmake <Formula
-  url 'http://www.cmake.org/files/v2.8/cmake-2.8.2.tar.gz'
-  md5 '8c967d5264657a798f22ee23976ff0d9'
+  url 'http://www.cmake.org/files/v2.8/cmake-2.8.3.tar.gz'
+  md5 'a76a44b93acf5e3badda9de111385921'
   homepage 'http://www.cmake.org/'
 
-  def patches
-    # CMAKE_OSX_ARCHITECTURES quoting bug. See: http://www.vtk.org/Bug/view.php?id=11244
-    # Not needed with CMake 2.8.3 and above.
-    [ "http://cmake.org/gitweb?p=cmake.git;a=patch;h=a8ded533",
-      "http://cmake.org/gitweb?p=cmake.git;a=patch;h=0790af3b" ]
-  end
-
   def install
-    # xmlrpc is a stupid little library, rather than waste our users' time
-    # just let cmake use its own copy. God knows why something like cmake
-    # needs an xmlrpc library anyway! It is amazing!
+    # If we specify to CMake to use the system libraries by passing
+    # --system-libs to bootstrap then it insists on finding them all
+    # or erroring out, as that's what other Linux/OSX distributions
+    # would want. I've requested that they either fix this or let us
+    # submit a patch to do so on their bug tracker:
+    # http://www.cmake.org/Bug/view.php?id=11431
     inreplace 'CMakeLists.txt',
               "# Mention to the user what system libraries are being used.",
-              "SET(CMAKE_USE_SYSTEM_XMLRPC 0)"
+              "SET(CMAKE_USE_SYSTEM_XMLRPC 0)
+               SET(CMAKE_USE_SYSTEM_LIBARCHIVE 0)"
 
     system "./bootstrap", "--prefix=#{prefix}",
                           "--system-libs",