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

Homebrew · Sep 21, 2012 · 108340d · 108340d
2 parents 9ff165d + bb9952a
commit 108340d
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 20 deletions.
diff --git a/Library/Formula/auto-scaling.rb b/Library/Formula/auto-scaling.rb
@@ -3,8 +3,8 @@
 class AutoScaling < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/2535'
   url 'http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip'
-  version  '1.0.61.0'
-  sha1 'bfee535e745d0e56289258151bd104263ebb8f64'
+  version  '1.0.61.1'
+  sha1 '70fe87756f37dcfc412b6013d71e687dee6cb1c5'
 
   def install
     standard_install

diff --git a/Library/Formula/aws-cfn-tools.rb b/Library/Formula/aws-cfn-tools.rb
@@ -3,8 +3,8 @@
 class AwsCfnTools < AmazonWebServicesFormula
   homepage 'http://aws.amazon.com/developertools/AWS-CloudFormation/2555753788650372'
   url 'https://s3.amazonaws.com/cloudformation-cli/AWSCloudFormation-cli.zip'
-  version '1.0.10'
-  sha1 '656a81c5f3078dc7550a0512aa97b67ebd0331f1'
+  version '1.0.11'
+  sha1 '45ab67be14e2dc895b73516063062e5406b8e270'
 
   depends_on 'ec2-api-tools'
 

diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb
@@ -1,8 +1,12 @@
 require 'formula'
 
+# Use a mirror because of:
+# http://lists.cairographics.org/archives/cairo/2012-September/023454.html
+
 class Cairo < Formula
   homepage 'http://cairographics.org/'
   url 'http://cairographics.org/releases/cairo-1.12.2.tar.xz'
+  mirror 'http://ftp-nyc.osuosl.org/pub/gentoo/distfiles/cairo-1.12.2.tar.xz'
   sha256 'b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96'
 
   keg_only :provided_pre_mountain_lion

diff --git a/Library/Formula/ccache.rb b/Library/Formula/ccache.rb
@@ -2,8 +2,8 @@
 
 class Ccache < Formula
   homepage 'http://ccache.samba.org/'
-  url 'http://samba.org/ftp/ccache/ccache-3.1.7.tar.bz2'
-  sha1 '910313f94b107c8d100f35d580deb95e7e1fd219'
+  url 'http://samba.org/ftp/ccache/ccache-3.1.8.tar.bz2'
+  sha1 '0c5ad63e700954117082383c064cf5326d82c872'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--mandir=#{man}"

diff --git a/Library/Formula/cloud-watch.rb b/Library/Formula/cloud-watch.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class CloudWatch < AmazonWebServicesFormula
-  version  '1.0.12.1'
   homepage 'http://aws.amazon.com/developertools/2534'
-  url      'http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip'
-  sha1 'e9e1b4c31531242fae26fabc18acc88351d6be1b'
+  url 'http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip'
+  version '1.0.13.4'
+  sha1 '24f4cbe8554790b7abcc3c037172ab2efecae1af'
 
   def install
     standard_install

diff --git a/Library/Formula/graphicsmagick.rb b/Library/Formula/graphicsmagick.rb
@@ -10,8 +10,8 @@ def ghostscript_fonts?
 
 class Graphicsmagick < Formula
   homepage 'http://www.graphicsmagick.org/'
-  url 'http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.15/GraphicsMagick-1.3.15.tar.bz2'
-  sha256 'fd79168feaca5a2d230ce294541bb3655fd0fb6f21aec7c29dd7f00db14109ed'
+  url 'http://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/1.3.16/GraphicsMagick-1.3.16.tar.bz2'
+  sha256 '2845bfcd53b0ea57755f21aac80df3becfa7d37ac50c6f67387f004d67d58d83'
 
   head 'hg://http://graphicsmagick.hg.sourceforge.net:8000/hgroot/graphicsmagick/graphicsmagick'
 

diff --git a/Library/Formula/metasploit.rb b/Library/Formula/metasploit.rb
@@ -2,8 +2,8 @@
 
 class Metasploit < Formula
   homepage 'http://www.metasploit.com/framework/'
-  url 'http://downloads.metasploit.com/data/releases/archive/framework-4.3.0.tar.bz2'
-  sha1 '45eea26b27ffe5bcd2dc25888bad897fcdd35bfb'
+  url 'http://downloads.metasploit.com/data/releases/framework-4.4.0.tar.bz2'
+  sha1 '4188c1727364fff857ff1a58cb3f95a5f376cfb1'
 
   head "https://www.metasploit.com/svn/framework3/trunk/", :using => :svn
 

diff --git a/Library/Formula/pxz.rb b/Library/Formula/pxz.rb
@@ -0,0 +1,34 @@
+require 'formula'
+
+class Pxz < Formula
+  homepage 'http://jnovy.fedorapeople.org/pxz/'
+  url 'http://jnovy.fedorapeople.org/pxz/pxz-4.999.9beta.20091201git.tar.xz'
+  version '4.999.9'
+  sha1 'fe352d3e076183be95609497b1102a5a49a65b4f'
+
+  depends_on 'xz'
+
+  def patches
+    DATA # Fixes usage of MAP_POPULATE for mmap (linux only)
+  end
+
+  def install
+    system "make", "CC=#{ENV.cc}"
+    bin.install 'pxz'
+  end
+end
+
+__END__
+diff --git a/pxz.c b/pxz.c
+index b54f3fc..3e7e86a 100644
+--- a/pxz.c
++++ b/pxz.c
+@@ -259,7 +259,7 @@ int main( int argc, char **argv ) {
+ 			exit(EXIT_FAILURE);
+ 		}
+
+-		m = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED|MAP_POPULATE, fileno(f), 0);
++		m = mmap(NULL, s.st_size, PROT_READ, MAP_SHARED, fileno(f), 0);
+ 		if (m == MAP_FAILED) {
+ 			perror("mmap failed");
+ 			exit(EXIT_FAILURE);
diff --git a/Library/Formula/rename.rb b/Library/Formula/rename.rb
@@ -1,10 +1,10 @@
 require 'formula'
 
 class Rename < Formula
-  url 'http://plasmasturm.org/code/rename/rename', :using => :nounzip
-  version '0.1.3'
   homepage 'http://plasmasturm.org/code/rename'
-  sha1 'a2235a402d18495513edf690445e0030f31c9ab3'
+  url 'http://plasmasturm.org/code/rename/rename', :using => :nounzip
+  version '1.100'
+  sha1 '2077cdb11878ffeaefa32063e29af87d8ad7a596'
 
   def install
     system 'pod2man', 'rename', 'rename.1'

diff --git a/Library/Formula/zsh-completions.rb b/Library/Formula/zsh-completions.rb
@@ -2,11 +2,13 @@
 
 class ZshCompletions < Formula
   homepage 'https://github.com/zsh-users/zsh-completions'
-  url 'https://github.com/zsh-users/zsh-completions/tarball/0.5.2'
-  sha1 'aee4dde26e6b54c2c580380241c4c384b6d4962d'
+  url 'https://github.com/zsh-users/zsh-completions/tarball/0.7.0'
+  sha1 '604f4678b29ee1c1a0a0da11a20feef283b64822'
+
+  head 'https://github.com/zsh-users/zsh-completions.git'
 
   def install
-    (share/'zsh-completions').install Dir['_*']
+    (share/'zsh-completions').install Dir['src/_*']
   end
 
   def caveats

diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
@@ -86,7 +86,7 @@ def can_cleanup?
         select{ |ff| ff.deps.map(&:to_s).include? name }.
         map{ |ff| ff.rack.children rescue [] }.
         flatten.
-        map{ |keg_path| Tab.for_keg(keg_path).sha }.
+        map{ |keg_path| Tab.for_keg(keg_path).send("HEAD") }.
         include? nil
     end
   end