Merge branch 'master' of https://github.com/mxcl/homebrew

Library/Formula/armadillo.rb

@@ -2,8 +2,8 @@
 
 class Armadillo < Formula
   homepage 'http://arma.sourceforge.net/'
-  url 'http://sourceforge.net/projects/arma/files/armadillo-3.2.2.tar.gz'
-  sha1 '3b251765af0edf4fd940cd153da0952152b09a70'
+  url 'http://sourceforge.net/projects/arma/files/armadillo-3.4.0.tar.gz'
+  sha1 'e7fdb6518172aabaa28c84412b52db7d86ef37a5'
 
   depends_on 'cmake' => :build
   depends_on 'boost'

Library/Formula/cppcheck.rb

@@ -2,8 +2,8 @@
 
 class Cppcheck < Formula
   homepage 'http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page'
-  url 'https://github.com/danmar/cppcheck/tarball/1.55'
-  sha1 '5a888427b9303420a1a583a2cb3919fb5ba3c5ce'
+  url 'https://github.com/danmar/cppcheck/tarball/1.56'
+  sha1 '195e8c819bff51bf2242133851052105a0619bf0'
 
   head 'https://github.com/danmar/cppcheck.git'
 
@@ -39,6 +39,10 @@ def install
     end
   end
 
+  def test
+    system "#{bin}/cppcheck", "--version"
+  end
+
   def caveats; <<-EOS.undent
     --with-gui installs cppcheck-gui.app in:
       #{bin}

Library/Formula/dmenu.rb

@@ -6,6 +6,8 @@ class Dmenu < Formula
   sha1 '70c1a13b950b7b0cb1bc35e30c6e861a78359953'
   head 'http://hg.suckless.org/dmenu/'
 
+  depends_on :x11
+
   def install
     system "make", "PREFIX=#{prefix}", "install"
   end

Library/Formula/doxygen.rb

@@ -2,8 +2,8 @@
 
 class Doxygen < Formula
   homepage 'http://www.doxygen.org/'
-  url 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.1.2.src.tar.gz'
-  sha1 'a11e65a597019510051290d2af0e6f379838b9c5'
+  url 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz'
+  sha1 '7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a'
 
   head 'https://doxygen.svn.sourceforge.net/svnroot/doxygen/trunk'
 

Library/Formula/drip.rb

@@ -2,8 +2,8 @@
 
 class Drip < Formula
   homepage 'https://github.com/flatland/drip'
-  url 'https://github.com/flatland/drip/tarball/0.1.4'
-  sha1 '564ebb5971d0366fe5e19da074b2bdf3494ac655'
+  url 'https://github.com/flatland/drip/tarball/0.1.7'
+  sha1 'c9d2a027759e425625ab170cf5012c75807e6093'
 
   def install
     system 'make'

Library/Formula/dwm.rb

@@ -6,6 +6,8 @@ class Dwm < Formula
   sha1 '35346f873a27f219ae266594b3690407f95d06ef'
   head 'http://hg.suckless.org/dwm'
 
+  depends_on :x11
+
   def install
     # The dwm default quit keybinding Mod1-Shift-q collides with
     # the Mac OS X Log Out shortcut in the Apple menu.

Library/Formula/erlang.rb

@@ -1,41 +1,39 @@
 require 'formula'
 
 class ErlangManuals < Formula
-  url 'http://erlang.org/download/otp_doc_man_R15B01.tar.gz'
-  sha1 'ec303c8e2957570b3b1ad56af8a5b29a6618d09a'
+  url 'http://erlang.org/download/otp_doc_man_R15B02.tar.gz'
+  sha1 'e50cc887b36b0b2f158a87fa5b21cb2b2c6679b0'
 end
 
 class ErlangHtmls < Formula
-  url 'http://erlang.org/download/otp_doc_html_R15B01.tar.gz'
-  sha1 'dfbad0ffd99be2ae219615f7a354ee9d1442e1a7'
+  url 'http://erlang.org/download/otp_doc_html_R15B02.tar.gz'
+  sha1 'b2ef425fe5aa9f4fff7afaa9b8204c45357eaa89'
 end
 
 class ErlangHeadManuals < Formula
-  url 'http://erlang.org/download/otp_doc_man_R15B01.tar.gz'
-  sha1 'e6f74fdab17d12026fe364d9658b906e58824076'
+  url 'http://erlang.org/download/otp_doc_man_R15B02.tar.gz'
+  sha1 'e50cc887b36b0b2f158a87fa5b21cb2b2c6679b0'
 end
 
 class ErlangHeadHtmls < Formula
-  url 'http://erlang.org/download/otp_doc_html_R15B01.tar.gz'
-  sha1 'e6f74fdab17d12026fe364d9658b906e58824076'
+  url 'http://erlang.org/download/otp_doc_html_R15B02.tar.gz'
+  sha1 'b2ef425fe5aa9f4fff7afaa9b8204c45357eaa89'
 end
 
 class Erlang < Formula
   homepage 'http://www.erlang.org'
   # Download tarball from GitHub; it is served faster than the official tarball.
-  url 'https://github.com/erlang/otp/tarball/OTP_R15B01'
-  sha1 'efc06b5058605e25bfde41d614a2040f282c2601'
+  url 'https://github.com/erlang/otp/tarball/OTP_R15B02'
+  sha1 '540d0d0a006082a8bc3e1fc239f2043fee015967'
+
+  head 'https://github.com/erlang/otp.git', :branch => 'dev'
 
   bottle do
-    sha1 'e6f74fdab17d12026fe364d9658b906e58824076' => :mountainlion
-    # Lion bottle built on OS X 10.7.2 using Xcode 4.1 using:
-    #   brew install erlang --build-bottle --use-gcc
-    sha1 '4dfc11ed455f8f866ab4627e8055488fa1954fa4' => :lion
-    sha1 '8a4adc813ca906c8e685ff571de03653f316146c' => :snowleopard
+    sha1 '94cbe622b817e8a5bd7797b615aad5e47c5d8660' => :mountainlion
+    sha1 'ec5b4749668c95ad55410c0316390046ee576895' => :lion
+    sha1 '10b0aa609354c07938ac936578c9d1f12a4249ba' => :snowleopard
   end
 
-  head 'https://github.com/erlang/otp.git', :branch => 'dev'
-
   # We can't strip the beam executables or any plugins, there isn't really
   # anything else worth stripping and it takes a really, long time to run
   # `file` over everything in lib because there is almost 4000 files (and
@@ -92,7 +90,6 @@ def install
 
     system "./configure", *args
     touch 'lib/wx/SKIP' if MacOS.version >= :snow_leopard
-    ENV.j1 # Parallel builds not working again as of at least R15B01
     system "make"
     system "make install"
 

Library/Formula/freetype.rb

@@ -9,6 +9,11 @@ class Freetype < Formula
 
   option :universal
 
+  bottle do
+    # Included with X11 so no bottle needed before Mountain Lion.
+    sha1 '02121cf64c189e61117dc9bef3de856f296761af' => :mountainlion
+  end
+
   def install
     ENV.universal_binary if build.universal?
     system "./configure", "--prefix=#{prefix}"

Library/Formula/git.rb

@@ -1,19 +1,19 @@
 require 'formula'
 
 class GitManuals < Formula
-  url 'http://git-core.googlecode.com/files/git-manpages-1.7.12.tar.gz'
-  sha1 'fb572729ca5c60161dc651564a50d4378507e20f'
+  url 'http://git-core.googlecode.com/files/git-manpages-1.7.12.1.tar.gz'
+  sha1 '2d9c267c5370cdceb2e67f67abf5b152b0c18db9'
 end
 
 class GitHtmldocs < Formula
-  url 'http://git-core.googlecode.com/files/git-htmldocs-1.7.12.tar.gz'
-  sha1 '50bbfeba77af9a411cc1a1e41220782cf3fd9b5e'
+  url 'http://git-core.googlecode.com/files/git-htmldocs-1.7.12.1.tar.gz'
+  sha1 'b42d5db34612825676d0a231cf9c566f8ad45e9f'
 end
 
 class Git < Formula
   homepage 'http://git-scm.com'
-  url 'http://git-core.googlecode.com/files/git-1.7.12.tar.gz'
-  sha1 '42ec1037f1ee5bfeb405710c83b73c0515ad26e6'
+  url 'http://git-core.googlecode.com/files/git-1.7.12.1.tar.gz'
+  sha1 'c5227b5202947bba3d63dca72662fad02d208800'
 
   head 'https://github.com/git/git.git'
 

Library/Formula/glew.rb

@@ -2,8 +2,8 @@
 
 class Glew < Formula
   homepage 'http://glew.sourceforge.net/'
-  url 'http://downloads.sourceforge.net/project/glew/glew/1.8.0/glew-1.8.0.tgz'
-  sha1 '641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4'
+  url 'http://downloads.sourceforge.net/project/glew/glew/1.9.0/glew-1.9.0.tgz'
+  sha1 '9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe'
 
   def install
     system "make", "GLEW_DEST=#{prefix}", "all"

Library/Formula/graphicsmagick.rb

@@ -1,23 +1,11 @@
 require 'formula'
 
-def ghostscript_fonts?
-  File.directory? "#{HOMEBREW_PREFIX}/share/ghostscript/fonts"
-end
-
 def ghostscript_srsly?
   build.include? 'with-ghostscript'
 end
 
-def use_wmf?
-  build.include? 'use-wmf'
-end
-
-def quantum_depth
-  if build.include? 'with-quantum-depth-32'
-    32
-  elsif build.include? 'with-quantum-depth-16'
-    16
-  end
+def ghostscript_fonts?
+  File.directory? "#{HOMEBREW_PREFIX}/share/ghostscript/fonts"
 end
 
 class Graphicsmagick < Formula
@@ -27,27 +15,36 @@ class Graphicsmagick < Formula
 
   head 'hg://http://graphicsmagick.hg.sourceforge.net:8000/hgroot/graphicsmagick/graphicsmagick'
 
-  depends_on :x11
-  depends_on 'jpeg'
-  depends_on 'libwmf' if use_wmf?
-  depends_on 'libtiff' => :optional
-  depends_on 'little-cms2' => :optional
-  depends_on 'jasper' => :optional
-  depends_on 'ghostscript' => :recommended if ghostscript_srsly?
-  depends_on 'xz' => :optional
+  option 'with-ghostscript', 'Compile against ghostscript (not recommended.)'
+  option 'use-tiff', 'Compile with libtiff support.'
+  option 'use-cms', 'Compile with little-cms support.'
+  option 'use-jpeg2000', 'Compile with jasper support.'
+  option 'use-wmf', 'Compile with libwmf support.'
+  option 'use-xz', 'Compile with xz support.'
+  option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'
+  option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'
+  option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'
+  option 'with-x', 'Compile with X11 support.'
+  option 'without-magick-plus-plus', "Don't build C++ library."
+
+  depends_on 'jpeg' => :recommended
+  depends_on :libpng
+  depends_on :x11 if build.include? 'with-x'
+
+  depends_on 'ghostscript' => :optional if ghostscript_srsly?
+
+  depends_on 'libtiff' => :optional if build.include? 'use-tiff'
+  depends_on 'little-cms2' => :optional if build.include? 'use-cms'
+  depends_on 'jasper' => :optional if build.include? 'use-jpeg2000'
+  depends_on 'libwmf' => :optional if build.include? 'use-wmf'
+  depends_on 'xz' => :optional if build.include? 'use-xz'
 
   fails_with :llvm do
     build 2335
   end
 
   skip_clean :la
 
-  option 'with-ghostscript', 'Compile against ghostscript (not recommended.)'
-  option 'without-magick-plus-plus', "Don't build C++ library."
-  option 'use-wmf', 'Compile with libwmf support.'
-  option 'with-quantum-depth-16', 'Use an 16 bit pixel quantum depth (default is 8)'
-  option 'with-quantum-depth-32', 'Use a 32 bit pixel quantum depth (default is 8)'
-
   def install
     # versioned stuff in main tree is pointless for us
     inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
@@ -60,9 +57,24 @@ def install
     args << "--with-gslib" if ghostscript_srsly?
     args << "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts" \
               unless ghostscript_fonts?
+
+    if build.include? 'with-quantum-depth-32'
+      quantum_depth = 32
+    elsif build.include? 'with-quantum-depth-16'
+      quantum_depth = 16
+    elsif build.include? 'with-quantum-depth-8'
+      quantum_depth = 8
+    end
+
     args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
+    args << "--without-x" unless build.include? 'with-x'
 
     system "./configure", *args
     system "make install"
   end
+
+  def test
+    system "#{bin}/gm", "identify", \
+      "/System/Library/Frameworks/SecurityInterface.framework/Versions/A/Resources/Key_Large.png"
+  end
 end

Library/Formula/grass.rb

@@ -39,7 +39,7 @@ class Grass < Formula
   def patches; DATA; end
 
   fails_with :clang do
-    build 318
+    build 421
 
     cause <<-EOS.undent
       Multiple build failures while compiling GRASS tools.

Library/Formula/imagemagick.rb

@@ -34,15 +34,15 @@ class Imagemagick < Formula
   option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'
   option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'
   option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'
-  option 'without-x', 'Compile without x11'
-  option 'without-freetype', 'Compile without freetype'
+  option 'with-x', 'Compile with X11 support.'
+  option 'without-freetype', 'Compile without freetype support.'
 
   depends_on 'pkg-config' => :build
 
   depends_on 'jpeg' => :recommended
   depends_on :libpng
-  depends_on :x11 unless build.include? 'without-x'
-  depends_on :freetype unless build.include? 'without-freetype'
+  depends_on :x11 if build.include? 'with-x'
+  depends_on :freetype => :recommended unless build.include? 'without-freetype'
 
   depends_on 'ghostscript' => :optional if ghostscript_srsly?
 
@@ -55,10 +55,10 @@ class Imagemagick < Formula
   depends_on 'openexr' => :optional if build.include? 'use-exr'
 
   bottle do
-    version 1
-    sha1 'fde8ed2686740ed83efd0626dd20170d9d3096b7' => :mountainlion
-    sha1 'e2c4d5b9e5f37e5f20dec36f3f3cbfc65821e164' => :lion
-    sha1 '019400feda06e4f277187702a4baeacdfdbf4851' => :snowleopard
+    version 3
+    sha1 '0d7ca4e54a1d3090e8b5a85663f0efa857ea52b7' => :mountainlion
+    sha1 '64fca6d7c75407dd1942a271a4df837ab02bbeb0' => :lion
+    sha1 'b8d1a9b2de7b1961da311df77922d326c2b6723f' => :snowleopard
   end
 
   skip_clean :la
@@ -78,6 +78,7 @@ def install
              "--enable-shared",
              "--disable-static",
              "--without-pango",
+             "--with-included-ltdl",
              "--with-modules"]
 
     args << "--disable-openmp" unless build.include? 'enable-openmp'
@@ -98,8 +99,8 @@ def install
 
     args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
     args << "--with-rsvg" if build.include? 'use-rsvg'
-    args << "--without-x" if build.include? 'without-x'
-    args << "--with-freetype=yes" unless build.include? 'without-freetype'
+    args << "--without-x" unless build.include? 'with-x'
+    args << "--with-freetype=yes" if build.include? 'with-freetype'
 
     # versioned stuff in main tree is pointless for us
     inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'