Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 083794822df9a6ffe3353705c5f627d8cf920adf 2 parents 37cca40 + c707784
Dennis Luxen authored
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
View
39 Library/Contributions/cmds/brew-unpack.rb
@@ -23,6 +23,9 @@ 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
@@ -30,7 +33,7 @@ class Formula
# 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
7 Library/ENV/4.3/cc
@@ -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
53 Library/ENV/4.3/xcrun
@@ -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
View
5 Library/ENV/libsuperenv.rb
@@ -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
22 Library/Formula/abyss.rb
@@ -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]);
+ }
View
4 Library/Formula/app-engine-java-sdk.rb
@@ -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
View
2  Library/Formula/auto-scaling.rb
@@ -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
View
6 Library/Formula/autoconf-archive.rb
@@ -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}"
View
4 Library/Formula/cfitsio.rb
@@ -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
12 Library/Formula/chuck.rb
@@ -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
View
25 Library/Formula/dnscrypt-proxy.rb
@@ -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
View
1  Library/Formula/doxygen.rb
@@ -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'
View
15 Library/Formula/e2fsprogs.rb
@@ -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"
View
3  Library/Formula/ext2fuse.rb
@@ -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}"
View
4 Library/Formula/ffmpeg.rb
@@ -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'
View
4 Library/Formula/gearman.rb
@@ -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
8 Library/Formula/git.rb
@@ -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'
View
51 Library/Formula/gnuplot.rb
@@ -7,7 +7,12 @@ class Gnuplot < Formula
head 'cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot', :using => :cvs
- if ARGV.build_head?
+ option 'pdf', 'Build with pdflib-lite support.'
+ option 'wx', 'Build with wxWidgets support.'
+ option 'nolua', 'Build without lua support.'
+ option 'nogd', 'Build without gd support.'
+
+ if build.head?
depends_on :automake
depends_on :libtool
end
@@ -16,18 +21,16 @@ class Gnuplot < Formula
depends_on 'readline'
depends_on 'pango'
depends_on :x11
- depends_on 'pdflib-lite' if ARGV.include? "--pdf"
- depends_on 'lua' unless ARGV.include? '--nolua'
- depends_on 'gd' unless ARGV.include? "--nogd"
- depends_on 'wxmac' if ARGV.include? "--wx"
-
- def options
- [
- ["--pdf", "Build with pdflib-lite support."],
- ["--wx", "Build with wxWidgets support."],
- ["--nolua", "Build without lua support."],
- ["--nogd", "Build without gd support."]
- ]
+ depends_on 'pdflib-lite' if build.include? 'pdf'
+ depends_on 'lua' unless build.include? 'nolua'
+ depends_on 'gd' unless build.include? 'nogd'
+ depends_on 'wxmac' if build.include? 'wx'
+
+ def patches
+ # MacPorts patch --without-aquaterm as a configuration option. Submitted
+ # upstream:
+ # http://sourceforge.net/tracker/?func=detail&aid=3476165&group_id=2055&atid=302055
+ {:p0 => 'https://trac.macports.org/export/96897/trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff'}
end
def install
@@ -36,21 +39,27 @@ def install
pdflib = Formula.factory 'pdflib-lite'
gd = Formula.factory 'gd'
- args = ["--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--with-readline=#{readline.prefix}"]
+ # Aquaterm disabled due to breakage. See:
+ # https://github.com/mxcl/homebrew/issues/14647
+ args = %W[
+ --disable-debug
+ --disable-dependency-tracking
+ --prefix=#{prefix}
+ --with-readline=#{readline.prefix}
+ --without-aquaterm
+ ]
- args << "--disable-wxwidgets" unless ARGV.include? "--wx"
- args << "--with-pdf=#{pdflib.prefix}" if ARGV.include? '--pdf'
- args << "--without-lua" if ARGV.include? "--nolua"
+ args << '--disable-wxwidgets' unless build.include? 'wx'
+ args << "--with-pdf=#{pdflib.prefix}" if build.include? 'pdf'
+ args << '--without-lua' if build.include? 'nolua'
- if ARGV.include? '--nogd'
+ if build.include? 'nogd'
args << '--without-gd'
else
args << "--with-gd=#{gd.prefix}"
end
- system "autoreconf" if ARGV.build_head?
+ system 'autoreconf' if build.head?
system "./configure", *args
system "make install"
View
6 Library/Formula/go-app-engine-32.rb
@@ -2,15 +2,15 @@
class GoAppEngine32 < Formula
homepage 'http://code.google.com/appengine/docs/go/overview.html'
- url 'http://googleappengine.googlecode.com/files/go_appengine_sdk_darwin_386-1.7.1.zip'
- sha1 'f55848605ba5892e968c65712449fabba5dbccbc'
+ url 'http://googleappengine.googlecode.com/files/go_appengine_sdk_darwin_386-1.7.2.zip'
+ sha1 'ebaf2da956270e0d9c294cd78843052b1a80fdd3'
def install
cd '..'
share.install 'google_appengine' => name
bin.mkpath
%w[
- appcfg.py bulkload_client.py bulkloader.py dev_appserver.py remote_api_shell.py
+ api_server.py appcfg.py bulkloader.py bulkload_client.py dev_appserver.py download_appstats.py
].each do |fn|
ln_s share+name+fn, bin
end
View
6 Library/Formula/go-app-engine-64.rb
@@ -2,15 +2,15 @@
class GoAppEngine64 < Formula
homepage 'http://code.google.com/appengine/docs/go/overview.html'
- url 'http://googleappengine.googlecode.com/files/go_appengine_sdk_darwin_amd64-1.7.1.zip'
- sha1 '0fe70c356520cd8eec277a869198716000215d6c'
+ url 'http://googleappengine.googlecode.com/files/go_appengine_sdk_darwin_amd64-1.7.2.zip'
+ sha1 '285b48e7f4dac3b9ed5bdb19a4f54fb750aad832'
def install
cd '..'
share.install 'google_appengine' => name
bin.mkpath
%w[
- appcfg.py bulkload_client.py bulkloader.py dev_appserver.py download_appstats.py
+ api_server.py appcfg.py bulkloader.py bulkload_client.py dev_appserver.py download_appstats.py
].each do |fn|
ln_s share+name+fn, bin
end
View
6 Library/Formula/go.rb
@@ -2,9 +2,9 @@
class Go < Formula
homepage 'http://golang.org'
- url 'http://go.googlecode.com/files/go1.0.2.src.tar.gz'
- version '1.0.2'
- sha1 '408bb361df8c34b1bba41383812154e932907526'
+ url 'http://go.googlecode.com/files/go1.0.3.src.tar.gz'
+ version '1.0.3'
+ sha1 '1a67293c10d6c06c633c078a7ca67e98c8b58471'
head 'http://go.googlecode.com/hg/'
View
8 Library/Formula/google-app-engine.rb
@@ -2,14 +2,16 @@
class GoogleAppEngine < Formula
homepage 'http://code.google.com/appengine/'
- url 'http://googleappengine.googlecode.com/files/google_appengine_1.7.1.zip'
- sha1 '1b41e08beb183affac7867bf78153b3389b9fd2a'
+ url 'http://googleappengine.googlecode.com/files/google_appengine_1.7.2.zip'
+ sha1 '519b914a41f1b323315c5f71ce9302f8ac6e044e'
def install
cd '..'
share.install 'google_appengine' => name
bin.mkpath
- %w[appcfg.py bulkload_client.py bulkloader.py dev_appserver.py remote_api_shell.py].each do |fn|
+ %w[
+ api_server.py appcfg.py bulkloader.py bulkload_client.py dev_appserver.py download_appstats.py remote_api_shell.py
+ ].each do |fn|
ln_s share+name+fn, bin
end
end
View
4 Library/Formula/griffon.rb
@@ -2,8 +2,8 @@
class Griffon < Formula
homepage 'http://griffon.codehaus.org/'
- url 'http://dist.codehaus.org/griffon/griffon/1.0.x/griffon-1.0.2-bin.zip'
- sha1 '1ae2b9bf9ff44c85aaff19d88c342ede139e70f6'
+ url 'http://dist.codehaus.org/griffon/griffon/1.1.x/griffon-1.1.0-bin.zip'
+ sha1 '3cb6ffa15a5bce3d3e7e2a56b210d9c40853b442'
def install
rm_f Dir["bin/*.bat"]
View
4 Library/Formula/groovy.rb
@@ -2,8 +2,8 @@
class Groovy < Formula
homepage 'http://groovy.codehaus.org/'
- url 'http://dist.groovy.codehaus.org/distributions/groovy-binary-2.0.2.zip'
- sha1 '024104492f110b4395d6efd40207f8726468c6b4'
+ url 'http://dist.groovy.codehaus.org/distributions/groovy-binary-2.0.4.zip'
+ sha1 '5e6fc699a91c508a33cbedf61b170ed64469fe79'
def install
# Don't need Windows files.
View
2  Library/Formula/htop-osx.rb
@@ -5,7 +5,9 @@ class HtopOsx < Formula
url 'https://github.com/max-horvath/htop-osx/tarball/0.8.2.1-2012-04-18'
sha1 '90975472c683e59a6476e215ae5cb768d86659a8'
+ depends_on :autoconf
depends_on :automake
+ depends_on :libtool
def install
# Otherwise htop will segfault when resizing the terminal
View
12 Library/Formula/iftop.rb
@@ -1,13 +1,17 @@
require 'formula'
+# Version is "pre-release", but is what Debian, MacPorts, etc.
+# package, and upstream has not had any movement in a long time.
class Iftop < Formula
- url 'http://www.ex-parrot.com/~pdw/iftop/download/iftop-0.17.tar.gz'
homepage 'http://www.ex-parrot.com/~pdw/iftop/'
- sha1 '75ce6afc8c0bf851278b0a15e66f523af90cfda9'
+ url 'http://www.ex-parrot.com/pdw/iftop/download/iftop-1.0pre2.tar.gz'
+ version '1.0pre2'
+ sha1 'd4dc473f8263192334da6289b69e102a4ae7df9e'
def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--prefix=#{prefix}", "--mandir=#{man}"
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}",
+ "--mandir=#{man}"
system "make install"
end
end
View
2  Library/Formula/imageworsener.rb
@@ -5,6 +5,8 @@ class Imageworsener < Formula
url 'http://entropymine.com/imageworsener/imageworsener-src-0.9.10.tar.gz'
sha1 'd908a08e3e402052a22390aa865cbb5a6e30d465'
+ depends_on :libpng => :recommended
+
def install
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
system "make install"
View
42 Library/Formula/libnids.rb
@@ -9,11 +9,20 @@ class Libnids < Formula
option "disable-libglib", "Don't use glib2 for multiprocessing support"
depends_on 'pkg-config' => :build
+ depends_on :automake => :build
+ depends_on :libtool => :build
depends_on 'libnet' => :recommended unless build.include? "disable-libnet"
depends_on 'glib' => :recommended unless build.include? "disable-libglib"
+ # Patch fixes -soname and .so shared library issues. Unreported.
+ def patches
+ DATA
+ end
+
def install
- args = ["--prefix=#{prefix}", "--mandir=#{man}"]
+ # autoreconf the old 2005 era code for sanity.
+ system 'autoreconf', '-ivf'
+ args = ["--prefix=#{prefix}", "--mandir=#{man}", "--enable-shared"]
args << "--disable-libnet" if build.include? "disable-libnet"
args << "--disable-libglib" if build.include? "disable-libglib"
@@ -21,3 +30,34 @@ def install
system "make install"
end
end
+
+__END__
+--- a/src/Makefile.in 2010-03-01 13:13:17.000000000 -0800
++++ b/src/Makefile.in 2012-09-19 09:48:23.000000000 -0700
+@@ -13,7 +13,7 @@
+ libdir = @libdir@
+ mandir = @mandir@
+ LIBSTATIC = libnids.a
+-LIBSHARED = libnids.so.1.24
++LIBSHARED = libnids.1.24.dylib
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@ -DLIBNET_VER=@LIBNET_VER@ -DHAVE_ICMPHDR=@ICMPHEADER@ -DHAVE_TCP_STATES=@TCPSTATES@ -DHAVE_BSD_UDPHDR=@HAVE_BSD_UDPHDR@
+@@ -65,7 +65,7 @@
+ ar -cr $@ $(OBJS)
+ $(RANLIB) $@
+ $(LIBSHARED): $(OBJS_SHARED)
+- $(CC) -shared -Wl,-soname,$(LIBSHARED) -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
++ $(CC) -Wl,-dylib -Wl,-install_name -Wl,$(LIBSHARED) -Wl,-headerpad_max_install_names -o $(LIBSHARED) $(OBJS_SHARED) $(LIBS) $(LNETLIB) $(PCAPLIB)
+
+ _install install: $(LIBSTATIC)
+ ../mkinstalldirs $(install_prefix)$(libdir)
+@@ -76,7 +76,7 @@
+ $(INSTALL) -c -m 644 libnids.3 $(install_prefix)$(mandir)/man3
+ _installshared installshared: install $(LIBSHARED)
+ $(INSTALL) -c -m 755 $(LIBSHARED) $(install_prefix)$(libdir)
+- ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.so
++ ln -s -f $(LIBSHARED) $(install_prefix)$(libdir)/libnids.dylib
+
+ clean:
+ rm -f *.o *~ $(LIBSTATIC) $(LIBSHARED)
View
4 Library/Formula/libvirt.rb
@@ -7,8 +7,8 @@ class Libvirt < Formula
# Latest (roughly) monthly release.
devel do
- url 'http://libvirt.org/sources/libvirt-0.10.1.tar.gz'
- sha256 '7b179219b92bff35986e2103b2767423d1e9c284052aa81228eae765f01a074d'
+ url 'http://libvirt.org/sources/libvirt-0.10.2.tar.gz'
+ sha256 '1fe69ae1268a097cc0cf83563883b51780d528c6493efe3e7d94c4160cc46977'
end
option 'without-libvirtd', 'Build only the virsh client and development libraries'
View
2  Library/Formula/macvim.rb
@@ -16,6 +16,8 @@ class Macvim < Formula
depends_on 'cscope' if build.include? 'with-cscope'
depends_on 'lua' if build.include? 'with-lua'
+ depends_on :xcode # For xcodebuild.
+
def install
# Set ARCHFLAGS so the Python app (with C extension) that is
# used to create the custom icons will not try to compile in
View
10 Library/Formula/mariadb.rb
@@ -46,7 +46,7 @@ def install
-DMYSQL_DATADIR=#{var}/mysql
-DINSTALL_MANDIR=#{man}
-DINSTALL_DOCDIR=#{doc}
- -DINSTALL_MYSQLSHAREDIR=#{share.basename}/#{name}
+ -DINSTALL_MYSQLSHAREDIR=#{share.basename}/mysql
-DWITH_SSL=yes
-DDEFAULT_CHARSET=utf8
-DDEFAULT_COLLATION=utf8_general_ci
@@ -94,13 +94,19 @@ def install
# pidof can be replaced with pgrep from proctools on Mountain Lion
s.gsub!(/pidof/, 'pgrep') if MacOS.version >= :mountain_lion
end
+
+ # Fix my.cnf to point to #{etc} instead of /etc
+ inreplace "#{etc}/my.cnf" do |s|
+ s.gsub!("!includedir /etc/my.cnf.d", "!includedir #{etc}/my.cnf.d")
+ end
+
ln_s "#{prefix}/support-files/mysql.server", bin
end
def caveats; <<-EOS.undent
Set up databases with:
unset TMPDIR
- mysql_install_db
+ mysql_install_db --user=\`whoami\` --basedir="$(brew --prefix mariadb)" --datadir=#{var}/mysql --tmpdir=/tmp
If this is your first install, automatically load on login with:
cp #{plist_path} ~/Library/LaunchAgents/
View
14 Library/Formula/mongodb.rb
@@ -7,10 +7,22 @@ class Mongodb < Formula
url 'http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-2.2.0.tgz'
md5 '5ad0d0b046919118e73976d670dce5e5'
version '2.2.0-x86_64'
+
+ devel do
+ url 'http://fastdl.mongodb.org/osx/mongodb-osx-x86_64-2.2.1-rc0.tgz'
+ md5 '5c1a448faa2e568dcc10e81c177249e8'
+ version '2.2.1-rc0-x86_64'
+ end
else
url 'http://fastdl.mongodb.org/osx/mongodb-osx-i386-2.2.0.tgz'
- md5 '59a59df34922f3caaa6219ab8ebf05dd'
+ md5 '576cc456081f8348a59448675fd1afde'
version '2.2.0-i386'
+
+ devel do
+ url 'http://fastdl.mongodb.org/osx/mongodb-osx-i386-2.2.1-rc0.tgz'
+ md5 'fab99dfe25114e616ba4ae47665fd1cc'
+ version '2.2.1-rc0-i386'
+ end
end
option '32-bit'
View
4 Library/Formula/nginx.rb
@@ -2,8 +2,8 @@
class Nginx < Formula
homepage 'http://nginx.org/'
- url 'http://nginx.org/download/nginx-1.2.3.tar.gz'
- sha1 '98059ae08ebbfaaead868128f7b66ebce16be9af'
+ url 'http://nginx.org/download/nginx-1.2.4.tar.gz'
+ sha1 'e3de0b2b82095f26e96bdb461ba36472d3e7cdda'
devel do
url 'http://nginx.org/download/nginx-1.3.6.tar.gz'
View
4 Library/Formula/node.rb
@@ -44,8 +44,8 @@ def fatal?
class Node < Formula
homepage 'http://nodejs.org/'
- url 'http://nodejs.org/dist/v0.8.9/node-v0.8.9.tar.gz'
- sha1 '2d3234adceedc2dc87284af88609ede6ecd71734'
+ url 'http://nodejs.org/dist/v0.8.10/node-v0.8.10.tar.gz'
+ sha1 'c596cce77726724441cf7fc98f42df3a5335ab8e'
head 'https://github.com/joyent/node.git'
View
4 Library/Formula/opam.rb
@@ -2,8 +2,8 @@
class Opam < Formula
homepage 'https://github.com/OCamlPro/opam'
- url 'https://github.com/OCamlPro/opam/tarball/0.6.0'
- sha1 '71aa753f37a60debe45a623bc2266a1262e9c305'
+ url 'https://github.com/OCamlPro/opam/tarball/0.7.1'
+ sha1 'f55e886f022c965e5f21c3ae49f41762ff9af1b4'
depends_on "objective-caml"
depends_on "wget"
View
4 Library/Formula/optipng.rb
@@ -2,8 +2,8 @@
class Optipng < Formula
homepage 'http://optipng.sourceforge.net/'
- url 'http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.1/optipng-0.7.1.tar.gz'
- sha1 'f71ae8c83ffb610c774f454c0f4e47cc7385a545'
+ url 'http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.3/optipng-0.7.3.tar.gz'
+ sha1 'c5dd2c688820f34fb6973d109ca880a77141cd31'
def install
system "./configure", "--with-system-zlib",
View
23 Library/Formula/pass.rb
@@ -2,9 +2,8 @@
class Pass < Formula
homepage 'http://zx2c4.com/projects/password-store'
- url 'http://git.zx2c4.com/password-store/snapshot/password-store-1.3.1.tar.xz'
- sha256 '351c0e2eb3315ca317026e73f7654a6351f2674000d9476b18c1525cbc5d732d'
-
+ url 'http://git.zx2c4.com/password-store/snapshot/password-store-1.4.tar.xz'
+ sha256 '2e94b0078abdf4673f3c22bde048776a3c12776b1bc98c22e8fb6e684b0b4a9e'
head 'http://git.zx2c4.com/password-store', :using => :git
depends_on 'xz' => :build
@@ -13,27 +12,13 @@ class Pass < Formula
depends_on 'gnu-getopt'
depends_on 'gnupg2'
- def patches
- # Use ramdisk for volatile storage in OSX.
- "contrib/osx-ramdisk.patch"
- end
-
def install
- inreplace "src/password-store.sh" do |s|
- s.gsub! "gpg ", "gpg2 "
- s.gsub! "xclip -o -selection clipboard", "pbpaste"
- s.gsub! "xclip -selection clipboard", "pbcopy"
- s.gsub! "qdbus", "#qdbus"
- s.gsub! "base64", "openssl base64"
- s.gsub! "getopt", Formula.factory('gnu-getopt').bin/"getopt"
- end
- inreplace "man/pass.1", "xclip", "pbcopy"
-
+ inreplace "contrib/pass.bash-completion", "gpg ", "gpg2 "
system "make DESTDIR=#{prefix} PREFIX=/ install"
end
def test
- system "#{bin}/pass --version"
+ system "#{bin}/pass", "--version"
end
end
View
4 Library/Formula/phantomjs.rb
@@ -12,8 +12,8 @@ def message
class Phantomjs < Formula
homepage 'http://www.phantomjs.org/'
- url 'http://phantomjs.googlecode.com/files/phantomjs-1.6.1-macosx-static.zip'
- sha1 '69a616fa035a815f05e1892e3ff795ef740f568b'
+ url 'http://phantomjs.googlecode.com/files/phantomjs-1.7.0-macosx.zip'
+ sha1 'de9ed8092d7fd5095447ada2cf96efb6c949b359'
depends_on SnowLeopardOrNewer.new
View
4 Library/Formula/postgresql.rb
@@ -2,8 +2,8 @@
class Postgresql < Formula
homepage 'http://www.postgresql.org/'
- url 'http://ftp.postgresql.org/pub/source/v9.2.0/postgresql-9.2.0.tar.bz2'
- sha1 '6ab154052dd62bb9b0cf2cd666384f7b25eefaf5'
+ url 'http://ftp.postgresql.org/pub/source/v9.2.1/postgresql-9.2.1.tar.bz2'
+ sha1 'cea9601b3acd1484fd98441b49a15ea1c42057ec'
depends_on 'readline'
depends_on 'libxml2' if MacOS.version == :leopard # Leopard libxml is too old
View
2  Library/Formula/pyqt.rb
@@ -5,7 +5,7 @@
class Pyqt < Formula
homepage 'http://www.riverbankcomputing.co.uk/software/pyqt'
- url 'http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-mac-gpl-4.9.4.tar.gz'
+ url 'http://downloads.sf.net/project/pyqt/PyQt4/PyQt-4.9.4/PyQt-mac-gpl-4.9.4.tar.gz'
sha1 '3fe827fed91ec710746fa980f433313dfec2d5fd'
depends_on 'sip'
View
2  Library/Formula/qt.rb
@@ -7,7 +7,7 @@ class Qt < Formula
bottle do
sha1 'ff488747325cd6771fbf0b79156fd3833ff3af63' => :mountainlion
- sha1 '048517758b2beb2dddabb97f711410ccbcb29c01' => :lion
+ sha1 '5b8d6d3c47f3992465de3a750a35407eef128c94' => :lion
sha1 'bb0b7e58d743e7b9147ae0d03cebc83134b8f68c' => :snowleopard
end
View
4 Library/Formula/redis.rb
@@ -8,8 +8,8 @@ class Redis < Formula
head 'https://github.com/antirez/redis.git', :branch => 'unstable'
devel do
- url 'http://redis.googlecode.com/files/redis-2.6.0-rc6.tar.gz'
- sha1 '64a3567d7a9ff1e33b121084a2c5a22c070c0a44'
+ url 'http://redis.googlecode.com/files/redis-2.6.0-rc7.tar.gz'
+ sha1 '03d849bc18a1f1849010064805e9f084857aaaab'
end
fails_with :llvm do
View
17 Library/Formula/sinan.rb
@@ -0,0 +1,17 @@
+require 'formula'
+
+class Sinan < Formula
+ homepage 'https://github.com/erlware/sinan/wiki'
+ url 'https://github.com/downloads/erlware/sinan/sinan-4.1.1.tar.gz'
+ sha1 '1249d202468b3703029f2f6cf3ec984d85e6729b'
+
+ depends_on 'erlang'
+
+ def install
+ bin.install 'sinan'
+ end
+
+ def test
+ system "#{bin}/sinan"
+ end
+end
View
6 Library/Formula/solr.rb
@@ -5,6 +5,12 @@ class Solr < Formula
url 'http://www.apache.org/dyn/closer.cgi?path=lucene/solr/3.6.1/apache-solr-3.6.1.tgz'
sha1 'd9f8a4086fb66e716e526d1a047578efdbdd0ede'
+ devel do
+ url 'http://www.apache.org/dyn/closer.cgi?path=lucene/solr/4.0.0-BETA/apache-solr-4.0.0-BETA.tgz'
+ sha1 'b41061400f3c5e0433ae8e01c4a62814be37b712'
+ version "4.0.0-BETA"
+ end
+
def script; <<-EOS.undent
#!/bin/sh
if [ -z "$1" ]; then
View
4 Library/Formula/swftools.rb
@@ -1,6 +1,6 @@
require 'formula'
-class Xpdf < Formula
+class XpdfTarball < Formula
url 'ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz', :using => :nounzip
sha1 '499423e8a795e0efd76ca798239eb4d0d52fe248'
end
@@ -31,7 +31,7 @@ def patches
end
def install
- Xpdf.new.brew { (buildpath+'lib/pdf').install Dir['*'] } if build.include? "with-xpdf"
+ XpdfTarball.new.brew { (buildpath+'lib/pdf').install Dir['*'] } if build.include? "with-xpdf"
system "./configure", "--prefix=#{prefix}"
system "make"
system "make install"
View
4 Library/Formula/swi-prolog.rb
@@ -2,8 +2,8 @@
class SwiProlog < Formula
homepage 'http://www.swi-prolog.org/'
- url 'http://www.swi-prolog.org/download/stable/src/pl-6.0.2.tar.gz'
- sha256 '9dbc4d3aef399204263f168583e54468078528bff75c48c7895ae3efe5499b75'
+ url 'http://www.swi-prolog.org/download/stable/src/pl-6.2.1.tar.gz'
+ sha256 'c5ceac0a23e6a2ab706a10987cb87a0cfe4e5c3d01600f6c5e178846310ea7e8'
head 'git://www.swi-prolog.org/home/pl/git/pl.git'
View
4 Library/Formula/taglib.rb
@@ -2,8 +2,8 @@
class Taglib < Formula
homepage 'http://taglib.github.com/'
- url 'https://github.com/downloads/taglib/taglib/taglib-1.7.2.tar.gz'
- sha1 'e657384ccf3284db2daba32dccece74534286012'
+ url 'https://github.com/downloads/taglib/taglib/taglib-1.8.tar.gz'
+ sha1 'bdbfd746fde42401d3a77cd930c7802d374a692d'
depends_on 'cmake' => :build
View
22 Library/Formula/thrift.rb
@@ -7,6 +7,12 @@ class Thrift < Formula
head 'http://svn.apache.org/repos/asf/thrift/trunk'
+ option "with-haskell", "Install Haskell binding"
+ option "with-erlang", "Install Erlang binding"
+ option "with-java", "Install Java binding"
+ option "with-perl", "Install Perl binding"
+ option "with-php", "Install Php binding"
+
depends_on 'boost'
def install
@@ -17,19 +23,21 @@ def install
system "./bootstrap.sh" if build.head?
+ exclusions = ["--without-python", "--without-ruby"]
+
+ exclusions << "--without-haskell" unless build.include? "with-haskell"
+ exclusions << "--without-java" unless build.include? "with-java"
+ exclusions << "--without-perl" unless build.include? "with-perl"
+ exclusions << "--without-php" unless build.include? "with-php"
+ exclusions << "--without-erlang" unless build.include? "with-erlang"
+
# Language bindings try to install outside of Homebrew's prefix, so
# omit them here. For ruby you can install the gem, and for Python
# you can use pip or easy_install.
system "./configure", "--disable-debug",
"--prefix=#{prefix}",
"--libdir=#{lib}",
- "--without-haskell",
- "--without-java",
- "--without-python",
- "--without-ruby",
- "--without-perl",
- "--without-php",
- "--without-erlang"
+ *exclusions
ENV.j1
system "make"
system "make install"
View
9 Library/Formula/urweb.rb
@@ -2,16 +2,19 @@
class Urweb < Formula
homepage 'http://impredicative.com/ur/'
- url 'http://impredicative.com/ur/urweb-20120807.tgz'
- sha1 '81c4a8095b2c6bb0f6779dd242270750f59627cf'
+ url 'http://impredicative.com/ur/urweb-20120925.tgz'
+ sha1 'd68c1746a00d6c1fa847edf4130e89d15522be8e'
head 'http://hg.impredicative.com/urweb', :using => :hg
depends_on :automake
depends_on :libtool
-
depends_on 'mlton'
def install
+ # The autoconf-generated shell scripts in the tarball
+ # are out of sync with our dependencies and force odd
+ # reconfigures and failures when running 'make.' It's better
+ # to just regenerate them and go for it.
system "aclocal"
system "autoreconf -i --force"
system "./configure", "--prefix=#{prefix}"
View
60 Library/Formula/valgrind.rb
@@ -5,8 +5,8 @@ class Valgrind < Formula
# Valgrind 3.7.0 drops support for OS X 10.5
if MacOS.version >= 10.6
- url 'http://valgrind.org/downloads/valgrind-3.8.0.tar.bz2'
- sha1 '074b09e99b09634f1efa6f7f0f87c7a541fb9b0d'
+ url 'http://valgrind.org/downloads/valgrind-3.8.1.tar.bz2'
+ sha1 'aa7a3b0b9903f59a11ae518874852e8ccb12751c'
else
url "http://valgrind.org/downloads/valgrind-3.6.1.tar.bz2"
md5 "2c3aa122498baecc9d69194057ca88f5"
@@ -23,16 +23,21 @@ class Valgrind < Formula
skip_clean 'lib'
def patches
- # For Xcode-only systems, we have to patch hard-coded paths, use xcrun and
- # add missing CFLAGS. See: https://bugs.kde.org/show_bug.cgi?id=295084
- DATA
- end unless MacOS::CLT.installed?
+ # 1: For Xcode-only systems, we have to patch hard-coded paths, use xcrun &
+ # add missing CFLAGS. See: https://bugs.kde.org/show_bug.cgi?id=295084
+ # 2: Fix for 10.7.4 w/XCode-4.5, duplicate symbols. Reported upstream in
+ # https://bugs.kde.org/show_bug.cgi?id=307415
+ p = []
+ p << 'https://gist.github.com/raw/3784836/f046191e72445a2fc8491cb6aeeabe84517687d9/patch1.diff' unless MacOS::CLT.installed?
+ p << 'https://gist.github.com/raw/3784930/dc8473c0ac5274f6b7d2eb23ce53d16bd0e2993a/patch2.diff' if MacOS.version == :lion
+ return p.empty? ? nil : p
+ end
def install
- # avoid undefined symbol __bzero
- ENV.remove_from_cflags "-mmacosx-version-min=#{MacOS.version}"
-
- args = ["--prefix=#{prefix}", "--mandir=#{man}"]
+ args = %W[
+ --disable-dependency-tracking
+ --prefix=#{prefix}
+ ]
if MacOS.prefer_64_bit?
args << "--enable-only64bit" << "--build=amd64-darwin"
else
@@ -41,7 +46,7 @@ def install
system "./autogen.sh" if build.head?
system "./configure", *args
- system "make", "AR=ar" # have to set AR or valgrind picks cc (WTF?)
+ system 'make'
system "make install"
end
@@ -49,36 +54,3 @@ def test
system "#{bin}/valgrind", "ls", "-l"
end
end
-
-__END__
-diff --git a/coregrind/Makefile.in b/coregrind/Makefile.in
-index d62cf92..477b069 100644
---- a/coregrind/Makefile.in
-+++ b/coregrind/Makefile.in
-@@ -82,10 +82,10 @@ bin_PROGRAMS = valgrind$(EXEEXT) vgdb$(EXEEXT)
- @VGCONF_OS_IS_DARWIN_TRUE@ m_mach/vm_map.h
-
- @VGCONF_OS_IS_DARWIN_TRUE@am__append_10 = \
--@VGCONF_OS_IS_DARWIN_TRUE@ /usr/include/mach/mach_vm.defs \
--@VGCONF_OS_IS_DARWIN_TRUE@ /usr/include/mach/task.defs \
--@VGCONF_OS_IS_DARWIN_TRUE@ /usr/include/mach/thread_act.defs \
--@VGCONF_OS_IS_DARWIN_TRUE@ /usr/include/mach/vm_map.defs
-+@VGCONF_OS_IS_DARWIN_TRUE@ $(HOMEBREW_SDKROOT)/usr/include/mach/mach_vm.defs \
-+@VGCONF_OS_IS_DARWIN_TRUE@ $(HOMEBREW_SDKROOT)/usr/include/mach/task.defs \
-+@VGCONF_OS_IS_DARWIN_TRUE@ $(HOMEBREW_SDKROOT)/usr/include/mach/thread_act.defs \
-+@VGCONF_OS_IS_DARWIN_TRUE@ $(HOMEBREW_SDKROOT)/usr/include/mach/vm_map.defs
-
- @VGCONF_HAVE_PLATFORM_SEC_TRUE@am__append_11 = libcoregrind-@VGCONF_ARCH_SEC@-@VGCONF_OS@.a
- @ENABLE_LINUX_TICKET_LOCK_PRIMARY_TRUE@am__append_12 = \
-diff --git a/coregrind/link_tool_exe_darwin.in b/coregrind/link_tool_exe_darwin.in
-index bf483a9..8474346 100644
---- a/coregrind/link_tool_exe_darwin.in
-+++ b/coregrind/link_tool_exe_darwin.in
-@@ -138,7 +138,7 @@ die "Can't find '-arch archstr' in command line"
-
-
- # build the command line
--my $cmd = "/usr/bin/ld";
-+my $cmd = "ld";
-
- $cmd = "$cmd -static";
View
21 Library/Formula/vice.rb
@@ -1,22 +1,15 @@
require 'formula'
class Vice < Formula
+ homepage 'http://vice-emu.sourceforge.net/'
url "http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.3.tar.gz"
sha1 '5e7e1a375a4ca8c4895dc1552162955fdffce296'
- homepage 'http://vice-emu.sourceforge.net/'
+ depends_on 'pkg-config' => :build
depends_on 'jpeg'
depends_on :libpng
-
- def remove_unused_icons
- Pathname.glob libexec+'*.app' do |d|
- appname = File.basename(d, '.app')
-
- Pathname.glob d+'Contents/Resources/x*.icns' do |g|
- File.unlink g if File.basename(g, '.icns') != appname
- end
- end
- end
+ depends_on 'giflib' => :optional
+ depends_on 'lame' => :optional
fails_with :llvm do
build 2335
@@ -24,14 +17,16 @@ def remove_unused_icons
def install
# Use Cocoa instead of X
+ # Use a static lame, otherwise Vice is hard-coded to look in
+ # /opt for the library.
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--with-cocoa",
- "--without-x"
+ "--without-x",
+ "--enable-static-lame"
system "make"
system "make bindist"
prefix.install Dir['vice-macosx-*/*']
- remove_unused_icons
end
def caveats
View
4 Library/Formula/vimpager.rb
@@ -2,8 +2,8 @@
class Vimpager < Formula
homepage 'https://github.com/rkitover/vimpager'
- url 'https://github.com/rkitover/vimpager/tarball/1.7.1'
- sha1 '4e44e3af13e4ca927a2d9fcda15b3ecb958dbd06'
+ url 'https://github.com/rkitover/vimpager/tarball/1.7.4'
+ sha1 '7a94beba5ed08b5156d98deba2523f0b7d51bb35'
head 'https://github.com/rkitover/vimpager.git'
def install
View
4 Library/Formula/zookeeper.rb
@@ -2,8 +2,8 @@
class Zookeeper < Formula
homepage 'http://zookeeper.apache.org/'
- url 'http://www.apache.org/dyn/closer.cgi?path=zookeeper/zookeeper-3.4.3/zookeeper-3.4.3.tar.gz'
- sha1 '8ac02ee34b94461fed19320d789f251e6a2a6796'
+ url 'http://www.apache.org/dyn/closer.cgi?path=zookeeper/zookeeper-3.4.4/zookeeper-3.4.4.tar.gz'
+ sha1 'c4f6dc623a265f54a93ee3b1192860324270b054'
head 'http://svn.apache.org/repos/asf/zookeeper/trunk'
View
8 Library/Homebrew/blacklist.rb
@@ -36,14 +36,6 @@ def blacklisted? name
when 'macruby' then <<-EOS.undent
MacRuby works better when you install their package:
http://www.macruby.org/
-
- Although if you prefer, there is a formula in homebrew-alt.
- EOS
- when 'npm' then <<-EOS.undent
- Homebrew does not provide npm because it is self-updating. To install it, first
- `brew install nodejs' and then:
-
- curl https://npmjs.org/install.sh | sh
EOS
when /(lib)?lzma/
"lzma is now part of the xz formula."
View
15 Library/Homebrew/build.rb
@@ -69,7 +69,8 @@ def pre_superenv_hacks f
end
def install f
- keg_only_deps = f.recursive_deps.uniq.select{|dep| dep.keg_only? }
+ deps = f.recursive_deps
+ keg_only_deps = deps.select{|dep| dep.keg_only? }
pre_superenv_hacks(f)
require 'superenv'
@@ -81,10 +82,10 @@ def install f
f.recursive_requirements.each { |rq| rq.modify_build_environment }
end
- keg_only_deps.each do |dep|
- opt = HOMEBREW_PREFIX/:opt/dep.name
+ deps.each do |dep|
+ opt = HOMEBREW_PREFIX/:opt/dep
fixopt(dep) unless opt.directory?
- if not superenv?
+ if not superenv? and dep.keg_only?
ENV.prepend_path 'PATH', "#{opt}/bin"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/lib/pkgconfig"
ENV.prepend_path 'PKG_CONFIG_PATH', "#{opt}/share/pkgconfig"
@@ -97,6 +98,7 @@ def install f
if superenv?
ENV.deps = keg_only_deps.map(&:to_s)
+ ENV.all_deps = f.recursive_deps.map(&:to_s)
ENV.x11 = f.recursive_requirements.detect{|rq| rq.class == X11Dependency }
ENV.setup_build_environment
f.recursive_requirements.each { |rq| rq.modify_build_environment }
@@ -126,7 +128,6 @@ def install f
end
interactive_shell f
- nil
else
f.prefix.mkpath
f.install
@@ -147,7 +148,7 @@ def install f
def fixopt f
path = if f.linked_keg.directory? and f.linked_keg.symlink?
- f.linked_keg.readlink
+ f.linked_keg.realpath
elsif f.prefix.directory?
f.prefix
elsif (kids = f.rack.children).size == 1 and kids.first.directory?
@@ -157,5 +158,5 @@ def fixopt f
end
Keg.new(path).optlink
rescue StandardError
- "#{f.opt_prefix} not present or broken\nPlease reinstall #{f}. Sorry :("
+ raise "#{f.opt_prefix} not present or broken\nPlease reinstall #{f}. Sorry :("
end
View
1  Library/Homebrew/cmd/doctor.rb
@@ -942,6 +942,7 @@ def check_os_version
end
def check_xcode_license_approved
+ return if MacOS::Xcode.bad_xcode_select_path?
# If the user installs Xcode-only, they have to approve the
# license or no "xc*" tool will work.
<<-EOS.undent if `/usr/bin/xcrun clang 2>&1` =~ /license/ and not $?.success?
View
4 Library/Homebrew/cmd/sh.rb
@@ -8,6 +8,10 @@ def sh
ENV.deps = Formula.installed.select{|f| f.keg_only? and f.opt_prefix.directory? }.map(&:name)
end
ENV.setup_build_environment
+ if superenv?
+ # superenv stopped adding brew's bin but generally user's will want it
+ ENV['PATH'] = ENV['PATH'].split(':').insert(1, "#{HOMEBREW_PREFIX}/bin").join(':')
+ end
ENV['PS1'] = 'brew \[\033[1;32m\]\w\[\033[0m\]$ '
ENV['VERBOSE'] = '1'
ENV['HOMEBREW_LOG'] = '1'
View
20 Library/Homebrew/download_strategy.rb
@@ -458,19 +458,27 @@ def initialize name, package
def cached_location; @clone; end
+ def hgpath
+ @path ||= if which "hg"
+ 'hg'
+ else
+ "#{HOMEBREW_PREFIX}/bin/hg"
+ end
+ end
+
def fetch
- raise "You must install Mercurial: brew install mercurial" unless which "hg"
+ raise "You must: brew install hg" unless File.file?(hgpath)
ohai "Cloning #{@url}"
unless @clone.exist?
url=@url.sub(%r[^hg://], '')
- safe_system 'hg', 'clone', url, @clone
+ safe_system hgpath, 'clone', url, @clone
else
puts "Updating #{@clone}"
Dir.chdir(@clone) do
- safe_system 'hg', 'pull'
- safe_system 'hg', 'update'
+ safe_system hgpath, 'pull'
+ safe_system hgpath, 'update'
end
end
end
@@ -480,9 +488,9 @@ def stage
Dir.chdir @clone do
if @spec and @ref
ohai "Checking out #{@spec} #{@ref}"
- safe_system 'hg', 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst
+ safe_system hgpath, 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst
else
- safe_system 'hg', 'archive', '--subrepos', '-y', '-t', 'files', dst
+ safe_system hgpath, 'archive', '--subrepos', '-y', '-t', 'files', dst
end
end
end
View
53 Library/Homebrew/exceptions.rb
@@ -95,54 +95,13 @@ def was_running_configure?
end
def dump
- e = self
-
- require 'cmd/--config'
- require 'cmd/--env'
-
- e.backtrace[1] =~ %r{Library/Formula/(.+)\.rb:(\d+)}
- formula_name = $1
- error_line = $2
-
- path = HOMEBREW_REPOSITORY/"Library/Formula/#{formula_name}.rb"
- if path.symlink? and path.realpath.to_s =~ %r{^#{HOMEBREW_REPOSITORY}/Library/Taps/(\w+)-(\w+)/}
- repo = "#$1/homebrew-#$2"
- repo_path = path.realpath.relative_path_from(HOMEBREW_REPOSITORY/"Library/Taps/#$1-#$2").parent.to_s
- issues_url = "https://github.com/#$1/homebrew-#$2/issues/new"
- else
- repo = "mxcl/master"
- repo_path = "Library/Formula"
- issues_url = ISSUES_URL
- end
-
- if ARGV.verbose?
- ohai "Exit Status: #{e.exit_status}"
- puts "https://github.com/#{repo}/blob/master/#{repo_path}/#{formula_name}.rb#L#{error_line}"
- end
- ohai "Build Environment"
- Homebrew.dump_build_config
- puts %["--use-clang" was specified] if ARGV.include? '--use-clang'
- puts %["--use-llvm" was specified] if ARGV.include? '--use-llvm'
- puts %["--use-gcc" was specified] if ARGV.include? '--use-gcc'
- Homebrew.dump_build_env e.env
- puts
- onoe "#{e.to_s.strip} (#{formula_name}.rb:#{error_line})"
- issues = GitHub.issues_for_formula formula_name
+ logs = "#{ENV['HOME']}/Library/Logs/Homebrew/#{formula}/"
puts
- if issues.empty?
- puts "This link will help resolve the above errors:"
- puts " #{Tty.em}#{issues_url}#{Tty.reset}"
- else
- puts "These existing issues may help you:", *issues.map{ |s| " #{Tty.em}#{s}#{Tty.reset}" }
- puts "Otherwise, this may help you fix or report the issue:"
- puts " #{Tty.em}#{issues_url}#{Tty.reset}"
- end
- if e.was_running_configure?
- puts "We saved the configure log:"
- puts " ~/Library/Logs/Homebrew/config.log"
- puts "When you report the issue please paste the build output above and the config.log here:"
- puts " #{Tty.em}http://gist.github.com/#{Tty.reset}"
- end
+ onoe "#{formula.name} did not build"
+ puts "Logs: #{logs}" unless Dir["#{logs}/*"].empty?
+ puts "Help: #{Tty.em}https://github.com/mxcl/homebrew/wiki/troubleshooting#{Tty.reset}"
+ issues = GitHub.issues_for_formula(formula.name)
+ puts *issues.map{ |s| " #{Tty.em}#{s}#{Tty.reset}" } unless issues.empty?
end
end
View
6 Library/Homebrew/extend/ENV.rb
@@ -446,6 +446,10 @@ def ncurses_define
def fortran
fc_flag_vars = %w{FCFLAGS FFLAGS}
+ # superenv removes these PATHs, but this option needs them
+ # TODO fix better, probably by making a super-fc
+ ENV['PATH'] += ":#{HOMEBREW_PREFIX}/bin:/usr/local/bin"
+
if self['FC']
ohai "Building with an alternative Fortran compiler. This is unsupported."
self['F77'] = self['FC'] unless self['F77']
@@ -470,7 +474,7 @@ def fortran
EOS
end
- elsif `/usr/bin/which gfortran`.chomp.size > 0
+ elsif `/usr/bin/which gfortran`.chuzzle
ohai <<-EOS.undent
Using Homebrew-provided fortran compiler.
This may be changed by setting the FC environment variable.
View
2  Library/Homebrew/extend/fileutils.rb
@@ -14,7 +14,7 @@ def mktemp
# /tmp volume to the other volume. So we let the user override the tmp
# prefix if they need to.
tmp = ENV['HOMEBREW_TEMP'].chuzzle || '/tmp'
- tempd = `/usr/bin/mktemp -d #{tmp}/brew-#{name}-#{version}-XXXX`.chuzzle
+ tempd = `/usr/bin/mktemp -d #{tmp}/#{name}-XXXX`.chuzzle
raise "Failed to create sandbox" if tempd.nil?
prevd = pwd
cd tempd
View
53 Library/Homebrew/formula.rb
@@ -223,25 +223,17 @@ def brew
# we allow formulas to do anything they want to the Ruby process
# so load any deps before this point! And exit asap afterwards
yield self
- rescue Interrupt, RuntimeError, SystemCallError => e
- puts if Interrupt === e # don't print next to the ^C
- unless ARGV.debug?
- %w(config.log CMakeCache.txt).select{|f| File.exist? f}.each do |f|
- HOMEBREW_LOGS.install f
- puts "#{f} was copied to #{HOMEBREW_LOGS}"
+ rescue RuntimeError, SystemCallError => e
+ if not ARGV.debug?
+ %w(config.log CMakeCache.txt).each do |fn|
+ (HOMEBREW_LOGS/name).install(fn) if File.file?(fn)
end
raise
end
- onoe e.inspect
- puts e.backtrace
+ onoe e.inspect
+ puts e.backtrace unless e.kind_of? BuildError
ohai "Rescuing build..."
- if (e.was_running_configure? rescue false) and File.exist? 'config.log'
- puts "It looks like an autotools configure failed."
- puts "Gist 'config.log' and any error output when reporting an issue."
- puts
- end
-
puts "When you exit this shell Homebrew will attempt to finalise the installation."
puts "If nothing is installed or the shell exits with a non-zero error code,"
puts "Homebrew will abort. The installation prefix is:"
@@ -529,23 +521,30 @@ def system cmd, *args
if ARGV.verbose?
safe_system cmd, *args
else
+ @exec_count ||= 0
+ @exec_count += 1
+ logd = HOMEBREW_LOGS/name
+ logfn = "#{logd}/%02d.%s" % [@exec_count, File.basename(cmd).split(' ').first]
+ mkdir_p(logd)
+
rd, wr = IO.pipe
pid = fork do
+ ENV['VERBOSE'] = '1' # helps with many tool's logging outputs
rd.close
$stdout.reopen wr
$stderr.reopen wr
args.collect!{|arg| arg.to_s}
exec(cmd, *args) rescue nil
+ puts "Failed to execute: #{cmd}"
exit! 1 # never gets here unless exec threw or failed
end
wr.close
- out = ''
- out << rd.read until rd.eof?
+
+ f = File.open(logfn, 'w')
+ f.write(rd.read) until rd.eof?
+
Process.wait
- unless $?.success?
- puts out
- raise
- end
+ raise unless $?.success?
end
removed_ENV_variables.each do |key, value|
@@ -553,7 +552,21 @@ def system cmd, *args
end if removed_ENV_variables
rescue
+ if f
+ f.flush
+ Kernel.system "/usr/bin/tail -n 5 #{logfn}"
+ require 'cmd/--config'
+ $f = f
+ def Homebrew.puts(*foo); $f.puts *foo end
+ f.puts
+ Homebrew.dump_build_config
+ class << Homebrew; undef :puts end
+ else
+ puts "No logs recorded :(" unless ARGV.verbose?
+ end
raise BuildError.new(self, cmd, args, $?)
+ ensure
+ f.close if f
end
public
View
16 Library/Homebrew/formula_installer.rb
@@ -200,6 +200,8 @@ def build_time
end
def build
+ FileUtils.rm Dir["#{HOMEBREW_LOGS}/#{f}/*"]
+
@start_time = Time.now
# 1. formulae can modify ENV, so we must ensure that each
@@ -236,7 +238,7 @@ def build
end
end
- ignore_interrupts do # the fork will receive the interrupt and marshall it back
+ ignore_interrupts(:quietly) do # the fork will receive the interrupt and marshall it back
write.close
Process.wait
data = read.read
@@ -245,18 +247,14 @@ def build
raise "Suspicious installation failure" unless $?.success?
end
- # This is the installation receipt. The reason this comment is necessary
- # is because some numpty decided to call the class Tab rather than
- # the far more appropriate InstallationReceipt :P
- Tab.for_install(f, args).write
+ raise "Empty installation" if Dir["#{f.prefix}/*"].empty?
+
+ Tab.for_install(f, args).write # INSTALL_RECEIPT.json
rescue Exception => e
ignore_interrupts do
# any exceptions must leave us with nothing installed
- if f.prefix.directory?
- puts "One sec, just cleaning up..." if e.kind_of? Interrupt
- f.prefix.rmtree
- end
+ f.prefix.rmtree if f.prefix.directory?
f.rack.rmdir_if_possible
end
raise
View
18 Library/Homebrew/superenv.rb
@@ -16,7 +16,6 @@ def superbin
end
def superenv?
- not MacOS::Xcode.bad_xcode_select_path? and # because xcrun won't work
not MacOS::Xcode.folder.nil? and # because xcrun won't work
superbin and superbin.directory? and
not ARGV.include? "--env=std"
@@ -24,6 +23,7 @@ def superenv?
class << ENV
attr :deps, true
+ attr :all_deps, true # above is just keg-only-deps
attr :x11, true
alias_method :x11?, :x11
@@ -43,6 +43,7 @@ def setup_build_environment
check
ENV['CC'] = 'cc'
ENV['CXX'] = 'c++'
+ ENV['DEVELOPER_DIR'] = determine_developer_dir # effects later settings
ENV['MAKEFLAGS'] ||= "-j#{determine_make_jobs}"
ENV['PATH'] = determine_path
ENV['PKG_CONFIG_PATH'] = determine_pkg_config_path
@@ -104,8 +105,7 @@ def determine_path
paths << "#{MacSystem.xcode43_developer_dir}/usr/bin"
paths << "#{MacSystem.xcode43_developer_dir}/Toolchains/XcodeDefault.xctoolchain/usr/bin"
end
- paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" }
- paths << HOMEBREW_PREFIX/:bin
+ paths += all_deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" }
paths << "#{MacSystem.x11_prefix}/bin" if x11?
paths += %w{/usr/bin /bin /usr/sbin /sbin}
paths.to_path_s
@@ -179,6 +179,17 @@ def determine_cccfg
s
end
+ def determine_developer_dir
+ # If Xcode path is fucked then this is basically a fix. In the case where
+ # nothing is valid, it still fixes most usage to supply a valid path that
+ # is not "/".
+ if MacOS::Xcode.bad_xcode_select_path?
+ (MacOS::Xcode.prefix || HOMEBREW_PREFIX).to_s
+ elsif ENV['DEVELOPER_DIR']
+ ENV['DEVELOPER_DIR']
+ end
+ end
+
public
### NO LONGER NECESSARY OR NO LONGER SUPPORTED
@@ -247,6 +258,7 @@ def + value
ENV.prepend 'PATH', "#{HOMEBREW_PREFIX}/bin", ':' unless ORIGINAL_PATHS.include? HOMEBREW_PREFIX/'bin'
else
ENV.deps = []
+ ENV.all_deps = []
end
View
6 Library/Homebrew/utils.rb
@@ -216,8 +216,10 @@ def inreplace path, before=nil, after=nil
end
end
-def ignore_interrupts
- std_trap = trap("INT") { puts "One sec, just cleaning up" }
+def ignore_interrupts(opt = nil)
+ std_trap = trap("INT") do
+ puts "One sec, just cleaning up" unless opt = :quietly
+ end
yield
ensure
trap("INT", std_trap)
Please sign in to comment.
Something went wrong with that request. Please try again.