Permalink
Browse files

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

  • Loading branch information...
2 parents 70df8b2 + 496487f commit b8c8e4ef4338f1c033c876ffc3f84ebf4008afb9 Dennis Luxen committed Sep 15, 2012
Showing with 357 additions and 107 deletions.
  1. +1 −1 Library/Contributions/cmds/brew-linkapps.rb
  2. +7 −7 Library/ENV/4.3/cc
  3. +3 −1 Library/ENV/4.3/xcrun
  4. +2 −0 Library/Formula/auctex.rb
  5. +2 −2 Library/Formula/binwalk.rb
  6. +3 −6 Library/Formula/cassandra.rb
  7. +25 −10 Library/Formula/cherokee.rb
  8. +0 −2 Library/Formula/collectd.rb
  9. +1 −2 Library/Formula/coq.rb
  10. +2 −0 Library/Formula/fontforge.rb
  11. +1 −1 Library/Formula/gd.rb
  12. +2 −4 Library/Formula/ghc.rb
  13. +2 −0 Library/Formula/graphviz.rb
  14. +3 −0 Library/Formula/gromacs.rb
  15. +55 −0 Library/Formula/gst-python.rb
  16. +13 −0 Library/Formula/iat.rb
  17. +3 −0 Library/Formula/imagemagick.rb
  18. +20 −0 Library/Formula/intercal.rb
  19. +8 −0 Library/Formula/io.rb
  20. +2 −6 Library/Formula/ipmitool.rb
  21. +3 −5 Library/Formula/jetty.rb
  22. +2 −0 Library/Formula/jruby.rb
  23. +1 −1 Library/Formula/libagg.rb
  24. +2 −0 Library/Formula/lilypond.rb
  25. +2 −0 Library/Formula/nginx.rb
  26. +7 −0 Library/Formula/node.rb
  27. +32 −0 Library/Formula/opam.rb
  28. +14 −2 Library/Formula/pass.rb
  29. +2 −4 Library/Formula/pianobar.rb
  30. +4 −5 Library/Formula/python.rb
  31. +4 −5 Library/Formula/python3.rb
  32. +2 −0 Library/Formula/qt.rb
  33. +1 −1 Library/Formula/ruby-enterprise-edition.rb
  34. +7 −5 Library/Formula/ruby.rb
  35. +62 −0 Library/Formula/ssreflect.rb
  36. +1 −1 Library/Formula/stanford-parser.rb
  37. +2 −2 Library/Formula/whirr.rb
  38. +4 −2 Library/Formula/wine.rb
  39. +5 −28 Library/Homebrew/build.rb
  40. +15 −0 Library/Homebrew/build_environment.rb
  41. +2 −1 Library/Homebrew/cmd/--config.rb
  42. +2 −1 Library/Homebrew/cmd/doctor.rb
  43. +13 −0 Library/Homebrew/formula.rb
  44. +9 −0 Library/Homebrew/formula_installer.rb
  45. +4 −2 Library/Homebrew/macos.rb
View
2 Library/Contributions/cmds/brew-linkapps.rb
@@ -32,7 +32,7 @@ def create_finder_alias(from, to)
appname = File.basename(p, ".app")
target = HOME_APPS+"/"+appname
if File.exist? target
- if File.symlink? target or finder_alias? target
+ if File.symlink?(target) || finder_alias?(target)
system "rm", target
else
onoe "#{target} already exists, skipping."
View
14 Library/ENV/4.3/cc
@@ -64,24 +64,24 @@ class Cmd
refurbished_args
end
if tool != 'ld'
- args.unshift("--sysroot=#$sdkroot")
+ args << "--sysroot=#$sdkroot"
else
- args.unshift($sdkroot).unshift("-syslibroot")
+ args << "-syslibroot" << $sdkroot
end if nclt?
case mode
when :cpp
- %w{-E} + cppflags + args
+ %w{-E} + args + cppflags
when :ld
ldflags + args
when :cc
- cflags + cppflags + args
+ cflags + args + cppflags
when :ccld
- cflags + cppflags + ldflags + args
+ cflags + args + cppflags + ldflags
end.compact
end
def refurbished_args
- lset = Set.new(syslibpath)
- iset = Set.new(syscpath)
+ lset = Set.new(libpath + syslibpath)
+ iset = Set.new(cpath.flatten)
args = []
whittler = @args.each
View
4 Library/ENV/4.3/xcrun
@@ -14,7 +14,7 @@ if [ $HOMEBREW_SDKROOT ]; then
exec /usr/bin/xcrun "$arg0" "$@";;
esac
- path=$(/usr/bin/xcrun -find $arg0)
+ path="$(/usr/bin/xcrun -find $arg0)"
[ -x "$path" ] && exec "$path" "$@"
# Nuts, Xcode is not setup properly or something.
@@ -23,6 +23,8 @@ if [ $HOMEBREW_SDKROOT ]; then
[ -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" "$@"
echo "Your Xcode setup is not ready. You need to either:"
echo " sudo xcode-select -switch /path/to/Xcode.app"
View
2 Library/Formula/auctex.rb
@@ -21,6 +21,8 @@ class Auctex < Formula
mirror 'http://ftp.gnu.org/gnu/auctex/auctex-11.86.tar.gz'
sha1 'af3dd156f8b2db7764c86d9f7de8abd5811d888a'
+ env :userpaths
+
depends_on TexInstalled.new
def options
View
4 Library/Formula/binwalk.rb
@@ -2,8 +2,8 @@
class Binwalk < Formula
homepage 'http://code.google.com/p/binwalk/'
- url 'http://binwalk.googlecode.com/files/binwalk-0.4.2.tar.gz'
- sha1 '160ad2f4dd7f37628a4fade5d16c0c9996174ab2'
+ url 'http://binwalk.googlecode.com/files/binwalk-0.4.5.tar.gz'
+ sha1 'cdc7918cada78b8d84c61a38d9c50a21704adfba'
depends_on 'libmagic'
View
9 Library/Formula/cassandra.rb
@@ -2,8 +2,8 @@
class Cassandra < Formula
homepage 'http://cassandra.apache.org'
- url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.1.3/apache-cassandra-1.1.3-bin.tar.gz'
- sha1 '3872d6ef4309d3fa1131bef0a08bbf132f854a60'
+ url 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.1.5/apache-cassandra-1.1.5-bin.tar.gz'
+ sha1 '5094bd3cd537bef8a0def86098d12e238b412403'
def install
(var+"lib/cassandra").mkpath
@@ -12,10 +12,7 @@ def install
inreplace "conf/cassandra.yaml", "/var/lib/cassandra", "#{var}/lib/cassandra"
inreplace "conf/log4j-server.properties", "/var/log/cassandra", "#{var}/log/cassandra"
-
- inreplace "conf/cassandra-env.sh" do |s|
- s.gsub! "/lib/", "/"
- end
+ inreplace "conf/cassandra-env.sh", "/lib/", "/"
inreplace "bin/cassandra.in.sh" do |s|
s.gsub! "CASSANDRA_HOME=`dirname $0`/..", "CASSANDRA_HOME=#{prefix}"
View
35 Library/Formula/cherokee.rb
@@ -5,19 +5,34 @@ class Cherokee < Formula
url 'http://www.cherokee-project.com/download/1.2/1.2.101/cherokee-1.2.101.tar.gz'
sha1 'b27f149c7d7111207ac8c3cd8a4856c05490d136'
+ head 'https://github.com/cherokee/webserver.git'
+
depends_on 'gettext'
+ if build.head?
+ depends_on :autoconf
+ depends_on :automake
+ depends_on :libtool
+ end
def install
- system "./configure", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--sysconfdir=#{etc}",
- "--localstatedir=#{var}/cherokee",
- "--with-wwwuser=#{ENV['USER']}",
- "--with-wwwgroup=www",
- "--enable-internal-pcre",
- # Don't install to /Library
- "--with-wwwroot=#{etc}/cherokee/htdocs",
- "--with-cgiroot=#{etc}/cherokee/cgi-bin"
+ if build.head?
+ ENV['LIBTOOL'] = 'glibtool'
+ ENV['LIBTOOLIZE'] = 'glibtoolize'
+ cmd = './autogen.sh'
+ else
+ cmd = './configure'
+ end
+
+ system cmd, "--disable-dependency-tracking",
+ "--prefix=#{prefix}",
+ "--sysconfdir=#{etc}",
+ "--localstatedir=#{var}/cherokee",
+ "--with-wwwuser=#{ENV['USER']}",
+ "--with-wwwgroup=www",
+ "--enable-internal-pcre",
+ # Don't install to /Library
+ "--with-wwwroot=#{etc}/cherokee/htdocs",
+ "--with-cgiroot=#{etc}/cherokee/cgi-bin"
system "make install"
prefix.install "org.cherokee.webserver.plist"
View
2 Library/Formula/collectd.rb
@@ -7,8 +7,6 @@ class Collectd < Formula
depends_on 'pkg-config' => :build
- skip_clean :all
-
fails_with :clang do
build 318
cause <<-EOS.undent
View
3 Library/Formula/coq.rb
@@ -21,9 +21,8 @@ class Coq < Formula
homepage 'http://coq.inria.fr/'
url 'http://coq.inria.fr/distrib/V8.4/files/coq-8.4.tar.gz'
sha1 '2987aa418dd96a0df7284afe296293cb28814ef5'
- head 'svn://scm.gforge.inria.fr/svn/coq/trunk'
- skip_clean :all
+ head 'svn://scm.gforge.inria.fr/svn/coq/trunk'
depends_on TransitionalMode.new
depends_on 'objective-caml'
View
2 Library/Formula/fontforge.rb
@@ -7,6 +7,8 @@ class Fontforge < Formula
head 'https://github.com/fontforge/fontforge.git'
+ env :std
+
option 'without-python', 'Build without Python'
option 'with-x', 'Build with X'
option 'with-cairo', 'Build with Cairo'
View
2 Library/Formula/gd.rb
@@ -14,7 +14,7 @@ class Gd < Formula
depends_on :libpng unless build.include? "without-libpng"
depends_on 'jpeg' => :recommended unless build.include? "without-jpeg"
- depends_on :freetype => :optional if build.include? "with-freetype"
+ depends_on :freetype if build.include? "with-freetype"
fails_with :llvm do
build 2326
View
6 Library/Formula/ghc.rb
@@ -24,14 +24,12 @@ class Ghc < Formula
sha1 '60f749893332d7c22bb4905004a67510992d8ef6'
end
+ env :std
+
depends_on NeedsSnowLeopard.new
option '32-bit'
- # Avoid stripping the Haskell binaries & libraries.
- # See: http://hackage.haskell.org/trac/ghc/ticket/2458
- skip_clean ['bin', 'lib']
-
fails_with :clang do
build 421
cause <<-EOS.undent
View
2 Library/Formula/graphviz.rb
@@ -5,6 +5,8 @@ class Graphviz < Formula
url 'http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.28.0.tar.gz'
sha1 '4725d88a13e071ee22e632de551d4a55ca08ee7d'
+ env :std
+
option :universal
option 'with-bindings', 'Build Perl/Python/Ruby/etc. bindings'
option 'with-pangocairo', 'Build with Pango/Cairo for alternate PDF output'
View
3 Library/Formula/gromacs.rb
@@ -7,13 +7,16 @@ class Gromacs < Formula
option 'enable-mpi', "Enables MPI support"
option 'enable-double',"Enables double precision"
+ option 'without-x', "Disable the X11 visualizer"
+ depends_on :x11 unless build.include? 'without-x'
depends_on 'fftw'
def install
args = ["--prefix=#{prefix}"]
args << "--enable-mpi" if build.include? 'enable-mpi'
args << "--enable-double" if build.include? 'enable-double'
+ args << "--without-x" if build.include? 'without-x'
system "./configure", *args
system "make"
View
55 Library/Formula/gst-python.rb
@@ -0,0 +1,55 @@
+require 'formula'
+
+class GstPython < Formula
+ homepage 'http://gstreamer.freedesktop.org/'
+ url 'http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.22.tar.bz2'
+ sha1 '7012445d921ae1b325c162500750c9b0e777201f'
+
+ depends_on 'pkg-config' => :build
+ depends_on 'gst-plugins-base'
+ depends_on 'pygtk'
+
+ def install
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
+ system "make install"
+ end
+
+ def caveats; <<-EOS.undent
+ For non-Homebrew Python, you need to amend your PYTHONPATH like so:
+ export PYTHONPATH=#{HOMEBREW_PREFIX}/lib/#{which_python}/site-packages:$PYTHONPATH
+ EOS
+ end
+
+ def which_python
+ "python" + `python -c 'import sys;print(sys.version[:3])'`.strip
+ end
+
+ def test
+ mktemp do
+ (Pathname.pwd+'test.py').write <<-EOS.undent
+ #!/usr/bin/env python
+
+ import time
+
+ import pygst
+ pygst.require('0.10')
+ import gst
+
+ import gobject
+ gobject.threads_init()
+
+ def main():
+ pipeline = gst.parse_launch(
+ 'audiotestsrc ! audioresample ! fakesink')
+ pipeline.set_state(gst.STATE_PLAYING)
+ time.sleep(3)
+
+ if __name__ == "__main__":
+ main()
+ EOS
+ system "chmod +x test.py"
+ system "./test.py"
+ end
+ end
+end
View
13 Library/Formula/iat.rb
@@ -0,0 +1,13 @@
+require 'formula'
+
+class Iat < Formula
+ homepage 'http://iat.berlios.de/'
+ url 'http://sourceforge.net/projects/iat.berlios/files/iat-0.1.7.tar.bz2'
+ sha1 '006ad57c18c399530ea07847aa0f1c34b650d439'
+
+ def install
+ system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}",
+ "--includedir=#{include}/iat"
+ system 'make install'
+ end
+end
View
3 Library/Formula/imagemagick.rb
@@ -35,12 +35,14 @@ class Imagemagick < Formula
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'
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 'ghostscript' => :optional if ghostscript_srsly?
@@ -97,6 +99,7 @@ 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'
# versioned stuff in main tree is pointless for us
inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
View
20 Library/Formula/intercal.rb
@@ -0,0 +1,20 @@
+require 'formula'
+
+class Intercal < Formula
+ homepage 'http://catb.org/esr/intercal/'
+ url 'http://overload.intercal.org.uk/c/intercal-0.29.pax.gz'
+ sha1 'a1109c97ab0a3ccc5ad181cb6d4b7aa470a69e1d'
+
+ depends_on :autoconf
+
+ def install
+ system "./configure", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
+ system "make install"
+ end
+
+ def test
+ system "#{bin}/convickt"
+ system "#{bin}/ick"
+ end
+end
View
8 Library/Formula/io.rb
@@ -17,6 +17,14 @@ class Io < Formula
depends_on 'libffi'
depends_on 'pcre'
+ fails_with :clang do
+ build 421
+ cause <<-EOS.undent
+ make never completes. see:
+ https://github.com/stevedekorte/io/issues/223
+ EOS
+ end
+
# Fix recursive inline. See discussion in:
# https://github.com/stevedekorte/io/issues/135
def patches
View
8 Library/Formula/ipmitool.rb
@@ -2,12 +2,8 @@
class Ipmitool < Formula
homepage 'http://ipmitool.sourceforge.net/'
- url 'http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.11/ipmitool-1.8.11.tar.bz2'
- sha1 '9f6667c3d47ca56f8c0803ea7849ed375133cb72'
-
- fails_with :clang do
- cause 'error: non-void functions should return a value'
- end
+ url 'http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.12/ipmitool-1.8.12.tar.bz2'
+ sha1 'b895564db1196e891b60d2ab4f6d0bf5499c3453'
def install
system "./configure", "--disable-debug",
View
8 Library/Formula/jetty.rb
@@ -2,11 +2,9 @@
class Jetty < Formula
homepage 'http://www.eclipse.org/jetty/'
- url 'http://download.eclipse.org/jetty/8.1.4.v20120524/dist/jetty-distribution-8.1.4.v20120524.tar.gz'
- version '8.1.4'
- sha1 '7943e7d7fa0b460f034fde6d32487c9b33b9f829'
-
- skip_clean :all
+ url 'http://download.eclipse.org/jetty/8.1.7.v20120910/dist/jetty-distribution-8.1.7.v20120910.tar.gz'
+ version '8.1.7'
+ sha1 'f0ff5a85d494fea6bfac2aba956ddf0f2fafb129'
def install
rm_rf Dir['bin/*.{cmd,bat]}']
View
2 Library/Formula/jruby.rb
@@ -5,6 +5,8 @@ class Jruby < Formula
url 'http://jruby.org.s3.amazonaws.com/downloads/1.6.7.2/jruby-bin-1.6.7.2.tar.gz'
sha1 '717db67a08bf22a838a7debcca7eed9a010ff840'
+ env :std
+
def install
# Remove Windows files
rm Dir['bin/*.{bat,dll,exe}']
View
2 Library/Formula/libagg.rb
@@ -10,7 +10,7 @@ class Libagg < Formula
depends_on :automake
depends_on 'pkg-config' => :build
depends_on 'sdl'
- depends_on :freetype => :optional if build.include? "with-freetype"
+ depends_on :freetype if build.include? "with-freetype"
depends_on :libtool unless MacOS.version >= :mountain_lion
fails_with :clang do
View
2 Library/Formula/lilypond.rb
@@ -24,6 +24,8 @@ class Lilypond < Formula
url 'http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.0.tar.gz'
sha1 'b5edfdd1332a5cee94bd31c7b1e8b08909c0a068'
+ env :userpaths
+
depends_on TexInstalled.new
depends_on 'pkg-config' => :build
depends_on 'gettext'
View
2 Library/Formula/nginx.rb
@@ -10,6 +10,8 @@ class Nginx < Formula
sha1 '8f1f1bd9a98a2d72a5b6fce24d67e9d5f48b5224'
end
+ env :userpaths
+
depends_on 'pcre'
option 'with-passenger', 'Compile with support for Phusion Passenger module'
View
7 Library/Formula/node.rb
@@ -62,6 +62,13 @@ class Node < Formula
end
def install
+ # Lie to `xcode-select` for now to work around a GYP bug that affects
+ # CLT-only systems:
+ #
+ # http://code.google.com/p/gyp/issues/detail?id=292
+ # joyent/node#3681
+ ENV['DEVELOPER_DIR'] = MacOS.dev_tools_path unless MacOS::Xcode.installed?
+
args = %W{--prefix=#{prefix}}
args << "--debug" if build.include? 'enable-debug'
args << "--without-npm" if build.include? 'without-npm'
View
32 Library/Formula/opam.rb
@@ -0,0 +1,32 @@
+require 'formula'
+
+class Opam < Formula
+ homepage 'https://github.com/OCamlPro/opam'
+ url 'https://github.com/OCamlPro/opam/tarball/0.6.0'
+ sha1 '71aa753f37a60debe45a623bc2266a1262e9c305'
+
+ depends_on "objective-caml"
+ depends_on "wget"
+
+ def install
+ system "./configure", "--prefix=#{prefix}"
+ system "make"
+ system "make install"
+ end
+
+ def test
+ system "#{bin}/opam --help"
+ end
+
+ def caveats; <<-EOS.undent
+ opam uses ~/.opam by default to install packages, you need to init package
+ database first by running:
+
+ opam init
+
+ and add the following line to ~/.profile to initialize opam environment:
+
+ eval `opam config -env`
+ EOS
+ end
+end
View
16 Library/Formula/pass.rb
@@ -2,26 +2,38 @@
class Pass < Formula
homepage 'http://zx2c4.com/projects/password-store'
- url 'http://git.zx2c4.com/password-store/snapshot/password-store-1.2.1.tar.xz'
- sha256 'e75c49db92288cb41913905f9cdfbae6cfb8db09f9d5537242ca436c811042fa'
+ url 'http://git.zx2c4.com/password-store/snapshot/password-store-1.3.1.tar.xz'
+ sha256 '351c0e2eb3315ca317026e73f7654a6351f2674000d9476b18c1525cbc5d732d'
+
head 'http://git.zx2c4.com/password-store', :using => :git
depends_on 'xz' => :build
depends_on 'pwgen'
depends_on 'tree'
+ 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", "#{HOMEBREW_PREFIX}/opt/gnu-getopt/bin/getopt"
end
inreplace "man/pass.1", "xclip", "pbcopy"
system "make DESTDIR=#{prefix} PREFIX=/ install"
end
+ def test
+ system "#{bin}/pass --version"
+ end
+
end
View
6 Library/Formula/pianobar.rb
@@ -2,8 +2,8 @@
class Pianobar < Formula
homepage 'https://github.com/PromyLOPh/pianobar/'
- url 'https://github.com/PromyLOPh/pianobar/tarball/2012.06.24'
- sha1 '510dfbbc411e516a71f56d71dfb06086faabd4dd'
+ url 'https://github.com/PromyLOPh/pianobar/tarball/2012.09.07'
+ sha1 'c4e399dafaffb3c4c4c07682f5cfac82605600da'
head 'https://github.com/PromyLOPh/pianobar.git'
@@ -23,8 +23,6 @@ class Pianobar < Formula
def install
# Discard Homebrew's CFLAGS as Pianobar reportedly doesn't like them
ENV['CFLAGS'] = "-O2 -DNDEBUG " +
- # fixes a segfault: https://github.com/PromyLOPh/pianobar/issues/138
- "-D_DARWIN_C_SOURCE " +
# Or it doesn't build at all
"-std=c99 " +
# build if we aren't /usr/local'
View
9 Library/Formula/python.rb
@@ -30,6 +30,8 @@ class Python < Formula
url 'http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tar.bz2'
sha1 '842c4e2aff3f016feea3c6e992c7fa96e49c9aa0'
+ env :std
+
depends_on TkCheck.new
depends_on 'pkg-config' => :build
depends_on 'readline' => :recommended
@@ -45,9 +47,6 @@ class Python < Formula
# A note is added upstream about the CLT requirement.
option 'with-dtrace', 'Install with DTrace support' if MacOS::CLT.installed?
- # Skip binaries so modules will load; skip lib because it is mostly Python files
- skip_clean ['bin', 'lib']
-
def site_packages_cellar
prefix/"Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages"
end
@@ -150,8 +149,8 @@ def install
EOF
# Install distribute and pip
- Distribute.new.brew { system "#{bin}/python", "setup.py", "--no-user-cfg", "install", "--force" }
- Pip.new.brew { system "#{bin}/python", "setup.py", "--no-user-cfg", "install", "--force" }
+ Distribute.new.brew { system "#{bin}/python", "setup.py", "--no-user-cfg", "install", "--force", "--verbose" }
+ Pip.new.brew { system "#{bin}/python", "setup.py", "--no-user-cfg", "install", "--force", "--verbose" }
end
def caveats
View
9 Library/Formula/python3.rb
@@ -22,6 +22,8 @@ class Python3 < Formula
url 'http://python.org/ftp/python/3.2.3/Python-3.2.3.tar.bz2'
sha1 '4c2d562a0681ba27bc920500050e2f08de224311'
+ env :std
+
depends_on TkCheck.new
depends_on 'pkg-config' => :build
depends_on 'readline' => :recommended
@@ -31,9 +33,6 @@ class Python3 < Formula
option 'quicktest', 'Run `make quicktest` after the build'
- # Skip binaries so modules will load; skip lib because it is mostly Python files
- skip_clean ['bin', 'lib']
-
def site_packages_cellar
prefix/"Frameworks/Python.framework/Versions/3.2/lib/python3.2/site-packages"
end
@@ -129,14 +128,14 @@ def install
# Install distribute for python3
Distribute.new.brew do
- system "#{bin}/python3.2", "setup.py", "install", "--force"
+ system "#{bin}/python3.2", "setup.py", "install", "--force", "--verbose"
# Symlink to easy_install3 to match python3 command.
unless (scripts_folder/'easy_install3').exist?
ln_s scripts_folder/"easy_install", scripts_folder/"easy_install3"
end
end
# Install pip-3.2 for python3
- Pip.new.brew { system "#{bin}/python3.2", "setup.py", "install", "--force" }
+ Pip.new.brew { system "#{bin}/python3.2", "setup.py", "install", "--force", "--verbose" }
end
def caveats
View
2 Library/Formula/qt.rb
@@ -14,6 +14,8 @@ class Qt < Formula
head 'git://gitorious.org/qt/qt.git', :branch => 'master'
+ env :std # Otherwise fails on SSE intrinsics
+
option :universal
option 'with-qtdbus', 'Enable QtDBus module'
option 'with-qt3support', 'Enable deprecated Qt3Support module'
View
2 Library/Formula/ruby-enterprise-edition.rb
@@ -5,7 +5,7 @@ class RubyEnterpriseEdition < Formula
url 'http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz'
sha1 '662f37afbe04f3a55ac3b119227a2cd4e53745bf'
- skip_clean 'bin/ruby'
+ env :std
option 'enable-shared', "Compile shared, but see caveats"
View
12 Library/Formula/ruby.rb
@@ -7,18 +7,20 @@ class Ruby < Formula
head 'http://svn.ruby-lang.org/repos/ruby/trunk/'
+ env :std
+
+ option :universal
+ option 'with-suffix', 'Suffix commands with "19"'
+ option 'with-doc', 'Install documentation'
+ option 'with-tcltk' 'Install with Tcl/Tk support'
+
depends_on :autoconf if build.head?
depends_on 'pkg-config' => :build
depends_on 'readline'
depends_on 'gdbm'
depends_on 'libyaml'
depends_on :x11 if build.include? 'with-tcltk'
- option :universal
- option 'with-suffix', 'Suffix commands with "19"'
- option 'with-doc', 'Install documentation'
- option 'with-tcltk' 'Install with Tcl/Tk support'
-
fails_with :llvm do
build 2326
end
View
62 Library/Formula/ssreflect.rb
@@ -0,0 +1,62 @@
+require 'formula'
+
+class Ssreflect < Formula
+ homepage 'http://www.msr-inria.inria.fr/Projects/math-components'
+ url 'http://www.msr-inria.inria.fr/Projects/math-components/ssreflect-1.4-coq8.4.tar.gz'
+ version '1.4'
+ sha1 'c9e678a362973b202a5d90d2abf6436fa1ab4dcf'
+
+ depends_on 'objective-caml'
+ depends_on 'coq'
+
+ option 'with-doc', 'Install HTML documents'
+ option 'with-static', 'Build with static linking'
+
+ def patches
+ # Fix an ill-formatted ocamldoc comment.
+ DATA
+ end
+
+ def install
+ ENV.j1
+
+ # Enable static linking.
+ if build.include? 'with-static'
+ inreplace 'Make' do |s|
+ s.gsub! /#\-custom/, '-custom'
+ s.gsub! /#SSRCOQ/, 'SSRCOQ'
+ end
+ end
+
+ args = ["COQBIN=#{HOMEBREW_PREFIX}/bin/",
+ "COQLIBINSTALL=lib/coq/user-contrib",
+ "COQDOCINSTALL=share/doc",
+ "DSTROOT=#{prefix}/"]
+ system "make", *args
+ system "make", "install", *args
+ if build.include? 'with-doc'
+ system "make", "-f", "Makefile.coq", "html", *args
+ system "make", "-f", "Makefile.coq", "mlihtml", *args
+ system "make", "-f", "Makefile.coq", "install-doc", *args
+ end
+ bin.install 'bin/ssrcoq.byte', 'bin/ssrcoq' if build.include? 'with-static'
+ (share/'ssreflect').install "pg-ssr.el"
+ end
+
+end
+
+
+__END__
+diff --git a/src/ssrmatching.mli b/src/ssrmatching.mli
+index fd2e835..1d9d15b 100644
+--- a/src/ssrmatching.mli
++++ b/src/ssrmatching.mli
+@@ -77,7 +77,7 @@ val interp_cpattern :
+ pattern
+
+ (** The set of occurrences to be matched. The boolean is set to true
+- * to signal the complement of this set (i.e. {-1 3}) *)
++ * to signal the complement of this set (i.e. \{-1 3\}) *)
+ type occ = (bool * int list) option
+
+ (** Substitution function. The [int] argument is the number of binders
View
2 Library/Formula/stanford-parser.rb
@@ -3,7 +3,7 @@
class StanfordParser < Formula
homepage 'http://nlp.stanford.edu/software/lex-parser.shtml'
url 'http://nlp.stanford.edu/software/stanford-parser-2012-07-09.tgz'
- sha1 'd5c0ea5f974d0e2776321b1aaab85647c908dd51'
+ sha1 '1d67ec99f473b59600e5698083ce518ada4dd1b2'
version '2.0.3'
def shim_script target_script
View
4 Library/Formula/whirr.rb
@@ -2,8 +2,8 @@
class Whirr < Formula
homepage 'http://whirr.apache.org/'
- url 'http://www.apache.org/dyn/closer.cgi?path=whirr/whirr-0.7.1/whirr-0.7.1.tar.gz'
- sha1 '15772fd7bf35cbc1c50023f4a22bcbb1cd1f80c9'
+ url 'http://www.apache.org/dyn/closer.cgi?path=whirr/whirr-0.8.0/whirr-0.8.0.tar.gz'
+ sha1 '44056fee1fd0e83a7257772d1a20faeae8f5cd1d'
def shim_script target
<<-EOS.undent
View
6 Library/Formula/wine.rb
@@ -17,10 +17,12 @@ class Wine < Formula
head 'git://source.winehq.org/git/wine.git'
devel do
- url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.5.12.tar.bz2'
- sha256 'ba987a0e3b1d5c0ba2d42fecdcff1c4e910d7c9949d9baca796b8b5c1318662c'
+ url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.5.13.tar.bz2'
+ sha256 'c05dd12ecc5256219d09cc1daad6f2153368d69ef15c68400a2a404b79b079d1'
end
+ env :std
+
depends_on :x11
depends_on 'jpeg'
depends_on 'libicns'
View
33 Library/Homebrew/build.rb
@@ -53,32 +53,17 @@ def main
end
def post_superenv_hacks f
- # TODO replace with Formula DSL
- # Python etc. build but then pip can't build stuff.
- # Scons resets ENV and then can't find superenv's build-tools.
- # In some cases we should only apply in the case of an option I suggest the
- # following:
- #
- # option 'with-passenger' do
- # env :userpaths # for superenv
- # end
- # option 'without-foo' do
- # env :std, :x11
- # end
- #
- # NOTE I think all ENV stuff should be specified with a DSL like this now.
- case f.name.to_sym
- when :lilypond, :nginx, :auctex
+ # Only allow Homebrew-approved directories into the PATH, unless
+ # a formula opts-in to allowing the user's path.
+ if f.env.userpaths?
paths = ORIGINAL_PATHS.map{|pn| pn.realpath.to_s rescue nil } - %w{/usr/X11/bin /opt/X11/bin}
ENV['PATH'] = "#{ENV['PATH']}:#{paths.join(':')}"
end
end
def pre_superenv_hacks f
- # fontforge needs 10.7 SDK, wine 32 bit, graphviz has mysteriously missing symbols
- # and ruby/python etc. create gem/pip that then won't work
- stdenvs = %w{fontforge python python3 ruby ruby-enterprise-edition jruby wine graphviz}
- ARGV.unshift '--env=std' if (stdenvs.include?(f.name) or
+ # Allow a formula to opt-in to the std environment.
+ ARGV.unshift '--env=std' if (f.env.std? or
f.recursive_deps.detect{|d| d.name == 'scons' }) and
not ARGV.include? '--env=super'
end
@@ -146,14 +131,6 @@ def install f
f.prefix.mkpath
f.install
- # Install a plist if one is defined
- unless f.startup_plist.nil?
- unless f.plist_path.exist?
- f.plist_path.write f.startup_plist
- f.plist_path.chmod 0644
- end
- end
-
# Find and link metafiles
FORMULA_META_FILES.each do |filename|
next if File.directory? filename
View
15 Library/Homebrew/build_environment.rb
@@ -0,0 +1,15 @@
+require 'set'
+
+class BuildEnvironment
+ def initialize settings
+ @settings = Set.new(settings)
+ end
+
+ def std?
+ @settings.include? :std
+ end
+
+ def userpaths?
+ @settings.include? :userpaths
+ end
+end
View
3 Library/Homebrew/cmd/--config.rb
@@ -64,7 +64,7 @@ def describe_path path
def describe_x11
return "N/A" unless MacOS::XQuartz.installed?
- return "#{MacOS::XQuartz.version} in " + describe_path(MacOS::XQuartz.prefix)
+ return "#{MacOS::XQuartz.version} => " + describe_path(MacOS::XQuartz.prefix)
end
def describe_perl
@@ -127,6 +127,7 @@ def dump_verbose_config
puts "Clang: #{clang ? "#{clang} build #{clang_build}" : "N/A"}"
ponk = macports_or_fink_installed?
puts "MacPorts or Fink? #{ponk}" if ponk
+ puts "X11: #{describe_x11}"
puts "System Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}"
puts "Perl: #{describe_perl}"
puts "Python: #{describe_python}"
View
3 Library/Homebrew/cmd/doctor.rb
@@ -259,7 +259,8 @@ def check_cc
def check_standard_compilers
return if check_for_latest_xcode # only check if Xcode is up to date
- if !MacOS.compilers_standard? then <<-EOS.undent
+ compiler_status = MacOS.compilers_standard?
+ if not compiler_status and not compiler_status.nil? then <<-EOS.undent
Your compilers are different from the standard versions for your Xcode.
If you have Xcode 4.3 or newer, you should install the Command Line Tools for
Xcode from within Xcode's Download preferences.
View
13 Library/Homebrew/formula.rb
@@ -6,6 +6,7 @@
require 'extend/fileutils'
require 'patches'
require 'compilers'
+require 'build_environment'
class Formula
@@ -436,6 +437,10 @@ def self.path name
def deps; self.class.dependencies.deps; end
def requirements; self.class.dependencies.requirements; end
+ def env
+ @env ||= BuildEnvironment.new(self.class.environments)
+ end
+
def conflicts
requirements.select { |r| r.is_a? ConflictRequirement }
end
@@ -646,6 +651,14 @@ def mirror val
@stable.mirror(val)
end
+ def environments
+ @environments ||= []
+ end
+
+ def env *settings
+ environments.concat [settings].flatten
+ end
+
def dependencies
@dependencies ||= DependencyCollector.new
end
View
9 Library/Homebrew/formula_installer.rb
@@ -186,6 +186,7 @@ def finish
check_PATH unless f.keg_only?
end
+ install_plist
fix_install_names
ohai "Summary" if ARGV.verbose? or show_summary_heading
@@ -283,6 +284,14 @@ def link
end
end
+ def install_plist
+ # Install a plist if one is defined
+ if f.startup_plist and not f.plist_path.exist?
+ f.plist_path.write f.startup_plist
+ f.plist_path.chmod 0644
+ end
+ end
+
def fix_install_names
Keg.new(f.prefix).fix_install_names
rescue Exception => e
View
6 Library/Homebrew/macos.rb
@@ -189,7 +189,8 @@ def prefer_64_bit?
"4.3.2" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318},
"4.3.3" => {:llvm_build_version=>2336, :clang_version=>"3.1", :clang_build_version=>318},
"4.4" => {:llvm_build_version=>2336, :clang_version=>"4.0", :clang_build_version=>421},
- "4.4.1" => {:llvm_build_version=>2336, :clang_version=>"4.0", :clang_build_version=>421}
+ "4.4.1" => {:llvm_build_version=>2336, :clang_version=>"4.0", :clang_build_version=>421},
+ "4.5" => {:llvm_build_version=>2336, :clang_version=>"4.1", :clang_build_version=>421}
}
def compilers_standard?
@@ -203,9 +204,10 @@ def compilers_standard?
Thanks!
EOS
+ return
end
- StandardCompilers[xcode].all? { |method, build| MacOS.send(method) == build } rescue false
+ StandardCompilers[xcode].all? { |method, build| MacOS.send(method) == build }
end
def app_with_bundle_id id

0 comments on commit b8c8e4e

Please sign in to comment.