This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

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

  • Loading branch information...
2 parents 37cca40 + c707784 commit 083794822df9a6ffe3353705c5f627d8cf920adf Dennis Luxen committed Sep 26, 2012
Showing with 457 additions and 342 deletions.
  1. +28 −11 Library/Contributions/cmds/brew-unpack.rb
  2. +4 −3 Library/ENV/4.3/cc
  3. +23 −30 Library/ENV/4.3/xcrun
  4. +4 −1 Library/ENV/libsuperenv.rb
  5. +22 −0 Library/Formula/abyss.rb
  6. +2 −2 Library/Formula/app-engine-java-sdk.rb
  7. +1 −1 Library/Formula/auto-scaling.rb
  8. +3 −3 Library/Formula/autoconf-archive.rb
  9. +2 −2 Library/Formula/cfitsio.rb
  10. +7 −5 Library/Formula/chuck.rb
  11. +20 −5 Library/Formula/dnscrypt-proxy.rb
  12. +1 −0 Library/Formula/doxygen.rb
  13. +4 −11 Library/Formula/e2fsprogs.rb
  14. +2 −1 Library/Formula/ext2fuse.rb
  15. +2 −2 Library/Formula/ffmpeg.rb
  16. +2 −2 Library/Formula/gearman.rb
  17. +8 −0 Library/Formula/git.rb
  18. +30 −21 Library/Formula/gnuplot.rb
  19. +3 −3 Library/Formula/go-app-engine-32.rb
  20. +3 −3 Library/Formula/go-app-engine-64.rb
  21. +3 −3 Library/Formula/go.rb
  22. +5 −3 Library/Formula/google-app-engine.rb
  23. +2 −2 Library/Formula/griffon.rb
  24. +2 −2 Library/Formula/groovy.rb
  25. +2 −0 Library/Formula/htop-osx.rb
  26. +8 −4 Library/Formula/iftop.rb
  27. +2 −0 Library/Formula/imageworsener.rb
  28. +41 −1 Library/Formula/libnids.rb
  29. +2 −2 Library/Formula/libvirt.rb
  30. +2 −0 Library/Formula/macvim.rb
  31. +8 −2 Library/Formula/mariadb.rb
  32. +13 −1 Library/Formula/mongodb.rb
  33. +2 −2 Library/Formula/nginx.rb
  34. +2 −2 Library/Formula/node.rb
  35. +2 −2 Library/Formula/opam.rb
  36. +2 −2 Library/Formula/optipng.rb
  37. +4 −19 Library/Formula/pass.rb
  38. +2 −2 Library/Formula/phantomjs.rb
  39. +2 −2 Library/Formula/postgresql.rb
  40. +1 −1 Library/Formula/pyqt.rb
  41. +1 −1 Library/Formula/qt.rb
  42. +2 −2 Library/Formula/redis.rb
  43. +17 −0 Library/Formula/sinan.rb
  44. +6 −0 Library/Formula/solr.rb
  45. +2 −2 Library/Formula/swftools.rb
  46. +2 −2 Library/Formula/swi-prolog.rb
  47. +2 −2 Library/Formula/taglib.rb
  48. +15 −7 Library/Formula/thrift.rb
  49. +6 −3 Library/Formula/urweb.rb
  50. +16 −44 Library/Formula/valgrind.rb
  51. +8 −13 Library/Formula/vice.rb
  52. +2 −2 Library/Formula/vimpager.rb
  53. +2 −2 Library/Formula/zookeeper.rb
  54. +0 −8 Library/Homebrew/blacklist.rb
  55. +8 −7 Library/Homebrew/build.rb
  56. +1 −0 Library/Homebrew/cmd/doctor.rb
  57. +4 −0 Library/Homebrew/cmd/sh.rb
  58. +14 −6 Library/Homebrew/download_strategy.rb
  59. +6 −47 Library/Homebrew/exceptions.rb
  60. +5 −1 Library/Homebrew/extend/ENV.rb
  61. +1 −1 Library/Homebrew/extend/fileutils.rb
  62. +33 −20 Library/Homebrew/formula.rb
  63. +7 −9 Library/Homebrew/formula_installer.rb
  64. +15 −3 Library/Homebrew/superenv.rb
  65. +4 −2 Library/Homebrew/utils.rb
@@ -23,14 +23,17 @@ def self.load(filename)
end
end
+# otherwise we may unpack bottles
+ENV['HOMEBREW_BUILD_FROM_SOURCE'] = '1'
+
# Need to tweak the Formula class slightly so that patching is option and `DATA`
# patches work correctly.
class Formula
# Create a reference to the original Formula.patch method and then override
# so that paching only happens if the user asks.
alias do_patch patch
def patch
- if ARGV.include? '--patch'
+ if ARGV.flag? '--patch'
# Yes Ruby, we are about to redefine a constant. Just breathe.
orig_v = $VERBOSE; $VERBOSE = nil
Formula.const_set 'DATA', ScriptDataReader.load(path)
@@ -48,19 +51,18 @@ def fails_with_llvm?; false; end
module Homebrew extend self
def unpack
unpack_usage = <<-EOS
-Usage: brew unpack [--patch] [--destdir=path/to/extract/in] <formulae ...>
+Usage: brew unpack [-pg] [--destdir=path/to/extract/in] <formulae ...>
Unpack formulae source code for inspection.
Formulae archives will be extracted to subfolders inside the current working
-directory or a directory specified by `--destdir`. If the `--patch` option is
-supplied, patches will also be downloaded and applied.
+directory or a directory specified by `--destdir`. If the `-p` option is
+supplied, patches will also be downloaded and applied. If the `-g` option is
+specified a git repository is created and all files added so that you can diff
+changes.
EOS
- if ARGV.empty?
- puts unpack_usage
- exit 0
- end
+ abort unpack_usage if ARGV.empty?
formulae = ARGV.formulae
raise FormulaUnspecifiedError if formulae.empty?
@@ -78,11 +80,26 @@ def unpack
formulae.each do |f|
# Create a nice name for the stage folder.
stage_dir = unpack_dir + [f.name, f.version].join('-')
- raise "Destination #{stage_dir} allready exists!" if stage_dir.exist?
+ if stage_dir.exist?
+ raise "Destination #{stage_dir} allready exists!" unless ARGV.force?
+ rm_rf stage_dir
+ end
+
+ oh1 "Unpacking #{f.name} to: #{stage_dir}"
+ ENV['VERBOSE'] = '1' # show messages about tar
f.brew do
- oh1 "Unpacking #{f.name} to: #{stage_dir}"
- cp_r Dir.getwd, stage_dir
+ cd Dir['*'][0] if Dir['*'].one?
+ mv getwd, stage_dir
+ end
+ ENV['VERBOSE'] = nil
+
+ if ARGV.switch? 'g'
+ ohai "Setting up git repository"
+ cd stage_dir
+ system "git init -q"
+ system "git add -A"
+ system 'git commit -qm"Vanilla"'
end
end
end
View
@@ -168,9 +168,10 @@ class Cmd
dels = @args - args
adds = args - @args
dups = dels & args
- puts "brew: Superenv removed: #{dels*' '}" unless dels.empty?
- puts "brew: Superenv deduped: #{dels}" unless dups.empty?
- puts "brew: Superenv added: #{adds*' '}" unless adds.empty?
+
+ STDERR.puts "brew: superenv removed: #{dels*' '}" unless dels.empty?
+ STDERR.puts "brew: superenv deduped: #{dels}" unless dups.empty?
+ STDERR.puts "brew: superenv added: #{adds*' '}" unless adds.empty?
end
end
View
@@ -1,38 +1,31 @@
-#!/bin/bash
+#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby -W0
+
# This wrapper because 4.3 xcrun doesn't work with CLT-only configurations
# But many build-systems expect it to work. This fixes that.
-# NOTE only works if they call xcrun without a full-path. Cross your fingers!
+# NOTE only works if the build-tool calls xcrun without a path prefixed!
-[ "$#" -eq 0 ] && exec /usr/bin/xcrun
+ENV['HOMEBREW_LOG'] = nil
-if [ $HOMEBREW_SDKROOT ]; then
- arg0="$1"
- shift
+require "#{File.dirname __FILE__}/../libsuperenv"
+SUPERBIN = __FILE__.dirname.cleanpath.freeze
- case $arg0 in
- -*)
- exec /usr/bin/xcrun "$arg0" "$@";;
- esac
+exec "/usr/bin/xcrun", *ARGV if ARGV.empty? or ARGV[0][0..0] == '-'
+exec "/usr/bin/#{ARGV.shift}", *ARGV unless ENV['HOMEBREW_SDKROOT'].directory?
- path="$(/usr/bin/xcrun -find $arg0)"
- [ -x "$path" ] && exec "$path" "$@"
+def try path
+ exec path, *ARGV if File.executable?(path) and path.cleanpath.dirname != SUPERBIN
+end
- # Nuts, Xcode is not setup properly or something.
- # Try to find the tools anyway!
- path="/Applications/Xcode.app/Contents/Developer/usr/bin/$arg0"
- [ -x "$path" ] && exec "$path" "$@"
- path="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/$arg0"
- [ -x "$path" ] && exec "$path" "$@"
- path="/usr/bin/$arg0"
- [ -x "$path" ] && exec "$path" "$@"
+arg0 = ARGV.shift
+try `/usr/bin/xcrun --find #{arg0}`
+# Nuts, Xcode is not setup properly or something. Try to find the tools anyway!
+try "/Applications/Xcode.app/Contents/Developer/usr/bin/#{arg0}"
+try "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/#{arg0}"
+try "/usr/bin/#{arg0}"
- echo "Your Xcode setup is not ready. You need to either:"
- echo " sudo xcode-select -switch /path/to/Xcode.app"
- echo "or:"
- echo " xcodebuild -license"
- exit 1
-else
- cmd="$1"
- shift
- exec "/usr/bin/$cmd" "$@"
-fi
+abort <<-EOS
+Your Xcode and or CLT are mis-configured. Try some or all of the following:
+ xcrun --kill-cache
+ xcodebuild -license
+ sudo xcode-select -switch /path/to/Xcode.app
+EOS
@@ -1,6 +1,9 @@
# Yes, a good deal of this could be imported from Homebrew-proper
# But Homebrew-proper is dog-slow currently, and I didn't want every cc
-# instantiation to be slower be a tangible amount.
+# instantiation to be slower by a tangible amount.
+
+# https://github.com/Homebrew/homebrew-versions/issues/47
+$:.unshift "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8"
class String
def directory?; File.directory? self end
View
@@ -16,6 +16,13 @@ class Abyss < Formula
# strip breaks the ability to read compressed files.
skip_clean 'bin'
+ # Fix a compiler error on OS X 10.8 Mountain Lion.
+ # This issue is fixed upstream:
+ # https://github.com/sjackman/abyss/issues/13
+ def patches
+ DATA
+ end
+
def install
system "./configure", "--disable-dependency-tracking",
"--prefix=#{prefix}"
@@ -26,3 +33,18 @@ def test
system "#{bin}/ABYSS", "--version"
end
end
+
+__END__
+diff --git a/Graph/ContigGraphAlgorithms.h b/Graph/ContigGraphAlgorithms.h
+index 023a898..0eac936 100644
+--- a/Graph/ContigGraphAlgorithms.h
++++ b/Graph/ContigGraphAlgorithms.h
+@@ -329,7 +329,7 @@ size_t addComplementaryEdges(ContigGraph<DG>& g)
+ if (!found) {
+ add_edge(vc, uc, g[e], static_cast<DG&>(g));
+ numAdded++;
+- } else if (g[e] != g[f]) {
++ } else if (!(g[e] == g[f])) {
+ // The edge properties do not agree. Select the better.
+ g[e] = g[f] = BetterDistanceEst()(g[e], g[f]);
+ }
@@ -2,8 +2,8 @@
class AppEngineJavaSdk < Formula
homepage 'http://code.google.com/appengine/docs/java/overview.html'
- url 'http://googleappengine.googlecode.com/files/appengine-java-sdk-1.7.1.zip'
- sha1 'c4edbf1424dba30648ff815442c5e2bf6f1637b5'
+ url 'http://googleappengine.googlecode.com/files/appengine-java-sdk-1.7.2.zip'
+ sha1 '5adcecb9c76937de5afeb3cf1fe17a6cce24f130'
def shim_script target
<<-EOS.undent
@@ -4,7 +4,7 @@ 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.1'
- sha1 '70fe87756f37dcfc412b6013d71e687dee6cb1c5'
+ sha1 '70138664fc4a76c965660b86e7be959a44281c40'
def install
standard_install
@@ -1,10 +1,10 @@
require 'formula'
class AutoconfArchive < Formula
- url 'http://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2012.04.07.tar.bz2'
- mirror 'http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2012.04.07.tar.bz2'
+ url 'http://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2012.09.08.tar.bz2'
+ mirror 'http://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-2012.09.08.tar.bz2'
homepage 'http://savannah.gnu.org/projects/autoconf-archive/'
- sha1 'ca15d09f63b26b146f8be12a740a148d8deb4066'
+ sha1 '2e6b427bc8fbcd69bd0d9a568678cdc7e2f36d03'
def install
system './configure', "--prefix=#{prefix}"
@@ -2,8 +2,8 @@
class CfitsioExamples < Formula
url 'http://heasarc.gsfc.nasa.gov/docs/software/fitsio/cexamples/cexamples.zip'
- version '2010.08.19'
- sha1 '35360dccc69dc5f12efb6fc9096ad951b59244d5'
+ version '2012.09.24'
+ sha1 '668ffa9a65a66c9f1d7f4241867e1e8adf653231'
end
class Cfitsio < Formula
View
@@ -1,13 +1,15 @@
require 'formula'
class Chuck < Formula
- url 'http://chuck.cs.princeton.edu/release/files/chuck-1.2.1.3.tgz'
homepage 'http://chuck.cs.princeton.edu/'
- sha1 '14de1c468294c6b324aee0023fee0116a8e5f5e0'
+ url 'http://chuck.cs.princeton.edu/release/files/chuck-1.3.1.2.tgz'
+ sha1 '9987c8e66c0910f2fab16845b763fc16ca743a80'
def install
- system "make", "-C", "src", "osx-#{Hardware.cpu_type}"
- bin.install "src/chuck"
- (share+'chuck').install "examples/"
+ cd "src" do
+ system "make osx"
+ bin.install "chuck"
+ end
+ (share/'chuck').install "examples/"
end
end
@@ -1,14 +1,29 @@
require 'formula'
class DnscryptProxy < Formula
- homepage 'http://www.opendns.com/technology/dnscrypt'
- url 'https://github.com/downloads/opendns/dnscrypt-proxy/dnscrypt-proxy-1.0.1.tar.gz'
- sha256 '9852a8dcae200c9965697b29fdaffb8ee1dc8602420afdb8763811a7996d6a7f'
+ homepage 'http://dnscrypt.org'
+ url 'https://github.com/downloads/opendns/dnscrypt-proxy/dnscrypt-proxy-1.1.0.tar.gz'
+ sha256 '73c1042f6ba68dedd89ab518c319f5e46b3536a3c49e697ef9ba504601b26c71'
- head 'https://github.com/opendns/dnscrypt-proxy.git', :branch => '1.0.x'
+ head 'https://github.com/opendns/dnscrypt-proxy.git', :branch => 'master'
+
+ option "plugins", "Support plugins and install example plugins."
+
+ if build.head?
+ depends_on :automake
+ depends_on :libtool
+ end
def install
- system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking"
+ system "autoreconf", "-if" if build.head?
+
+ args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
+ if build.include? "plugins"
+ args << "--enable-plugins"
+ args << "--enable-relaxed-plugins-permissions"
+ args << "--enable-plugins-root"
+ end
+ system "./configure", *args
system "make install"
end
end
@@ -3,6 +3,7 @@
class Doxygen < Formula
homepage 'http://www.doxygen.org/'
url 'http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.2.src.tar.gz'
+ mirror 'http://downloads.sourceforge.net/project/doxygen/rel-1.8.2/doxygen-1.8.2.src.tar.gz'
sha1 '7b88ade3989ce0f43f0fb2b2574436c4f1fa1c5a'
head 'https://doxygen.svn.sourceforge.net/svnroot/doxygen/trunk'
@@ -2,31 +2,24 @@
class E2fsprogs < Formula
homepage 'http://e2fsprogs.sourceforge.net/'
- url 'http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.42.5.tar.gz'
- sha1 '41bc6d247238eac65864193e6de941956da493cb'
+ url 'http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.42.6.tar.gz'
+ sha1 'cd05cd4205a00d01a6da821660cff386788e9be3'
head 'https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git'
keg_only "This brew installs several commands which override OS X-provided file system commands."
depends_on 'pkg-config' => :build
+ depends_on 'gettext'
def patches
# MacPorts patch to compile libs correctly.
- p = {:p0 => [
+ {:p0 => [
"https://trac.macports.org/export/92117/trunk/dports/sysutils/e2fsprogs/files/patch-lib__Makefile.darwin-lib"
]}
-
- # MacPorts patch to allow compilation on Leopard.
- if MacOS.version == :leopard
- p[:p0] << "https://trac.macports.org/export/92117/trunk/dports/sysutils/e2fsprogs/files/patch-lib-ext2fs-inline.c.diff"
- end
-
- p
end
def install
- ENV.append_to_cflags "--std=gnu89 -Wno-return-type" if ENV.compiler == :clang
system "./configure", "--prefix=#{prefix}"
system "make"
system "make install"
@@ -10,7 +10,8 @@ class Ext2fuse < Formula
def install
ENV.append 'LIBS', "-lfuse4x"
- ENV.append 'CPPFLAGS', "-DHAVE_TYPE_SSIZE_T=1"
+ ENV.append 'CFLAGS', '-D__FreeBSD__=10 -DENABLE_SWAPFS'
+ ENV.append 'CFLAGS', '--std=gnu89' if ENV.compiler == :clang
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}"
@@ -2,8 +2,8 @@
class Ffmpeg < Formula
homepage 'http://ffmpeg.org/'
- url 'http://ffmpeg.org/releases/ffmpeg-0.11.1.tar.bz2'
- sha1 'bf01742be60c2e6280371fc4189d5d28933f1a56'
+ url 'http://ffmpeg.org/releases/ffmpeg-0.11.2.tar.bz2'
+ sha1 '5d98729b8368df8145472ae6955ef8d6b9ed0efb'
head 'git://git.videolan.org/ffmpeg.git'
@@ -2,8 +2,8 @@
class Gearman < Formula
homepage 'http://gearman.org/'
- url 'https://launchpad.net/gearmand/1.0/0.37/+download/gearmand-0.37.tar.gz'
- sha1 'e2bdd3557cf65337ecd22b4fafff285e24c83a7d'
+ url 'https://launchpad.net/gearmand/1.0/0.39/+download/gearmand-0.39.tar.gz'
+ sha1 'a63af4d86809f39971b21b361740d472bf993345'
depends_on 'pkg-config' => :build
depends_on 'boost'
View
@@ -57,6 +57,14 @@ def install
system "make", "clean"
end
+ # Install git-subtree
+ cd 'contrib/subtree' do
+ system "make", "CC=#{ENV.cc}",
+ "CFLAGS=#{ENV.cflags}",
+ "LDFLAGS=#{ENV.ldflags}"
+ bin.install 'git-subtree'
+ end
+
# install the completion script first because it is inside 'contrib'
(prefix+'etc/bash_completion.d').install 'contrib/completion/git-completion.bash'
(prefix+'etc/bash_completion.d').install 'contrib/completion/git-prompt.sh'
Oops, something went wrong.

0 comments on commit 0837948

Please sign in to comment.