From d366b28923ed31aafe914a3f27873b2b7605e903 Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Mon, 7 Sep 2009 01:06:08 +0100
Subject: Dependency resolution

Specify dependencies in your formula's deps function. You can return an Array,
String or Hash, eg:

    def deps
      { :optional => 'libogg', :required => %w[flac sdl], :recommended => 'cmake' }
    end

Note currently the Hash is flattened and qualifications are ignored. If you
only return an Array or String, the qualification is assumed to be :required.

Other packaging systems have problems when it comes to packages requiring a
specific version of a package, or some patches that may not work well with
other software. With Homebrew we have some options:

1.  If the formula is vanilla but an older version we can cherry-pick the old
    version and install it in the Cellar in parallel, but just not symlink it
    into /usr/local while forcing the formula that depends on it to link to
    that one and not any other versions of it.
2.  If the dependency requires patches then we shouldn't install this for use
    by any other tools, (I guess this needs to be decided on a per-situation
    basis). It can be installed into the parent formula's prefix, and not
    symlinked into /usr/local. In this case the dependency's Formula
    derivation should be saved in the parent formula's file (check git or
    flac for an example of this).

Both the above can be done currently with hacks, so I'll flesh out a proper
way sometime this week.
---
 Library/Formula/fish.rb              |  2 +-
 Library/Formula/ghostscript.rb       | 32 +++++++++++++++++++
 Library/Formula/imagemagick.rb       | 61 +-----------------------------------
 Library/Formula/liblastfm.rb         |  4 +--
 Library/Formula/libmusicbrainz.rb    |  3 +-
 Library/Formula/libtiff.rb           | 12 +++++++
 Library/Formula/libvorbis.rb         |  2 +-
 Library/Formula/libwmf.rb            | 16 ++++++++++
 Library/Formula/little-cms.rb        | 12 +++++++
 Library/Formula/memcached.rb         |  2 +-
 Library/Formula/mysql-connector-c.rb |  2 +-
 Library/Formula/mysql.rb             |  3 +-
 Library/Formula/nginx.rb             |  2 +-
 Library/Formula/playdar.rb           |  4 +--
 Library/Formula/python.rb            |  2 +-
 Library/Formula/scummvm.rb           |  6 +---
 Library/Formula/sshfs.rb             |  4 +--
 Library/Formula/taglib.rb            |  4 +--
 Library/Formula/unp.rb               |  2 +-
 Library/Formula/vorbis-tools.rb      |  4 +--
 Library/Formula/yajl.rb              |  4 +--
 Library/Homebrew/brew.h.rb           | 27 ++++++++++++++++
 Library/Homebrew/formula.rb          |  2 +-
 Library/Homebrew/unittest.rb         | 23 +++++++++-----
 24 files changed, 134 insertions(+), 101 deletions(-)
 create mode 100644 Library/Formula/ghostscript.rb
 create mode 100644 Library/Formula/libtiff.rb
 create mode 100644 Library/Formula/libwmf.rb
 create mode 100644 Library/Formula/little-cms.rb

(limited to 'Library')

diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index c84bb8111..09246747e 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -6,7 +6,7 @@ class Fish <Formula
   @md5='4b2436843e63bebba467cc4add11428a'
 
   def deps
-    LibraryDep.new 'readline'
+    'readline'
   end
 
   def install
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
new file mode 100644
index 000000000..9f7ef7785
--- /dev/null
+++ b/Library/Formula/ghostscript.rb
@@ -0,0 +1,32 @@
+require 'brewkit'
+
+class GhostscriptFonts <Formula
+  @url='http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz'
+  @homepage='http://sourceforge.net/projects/gs-fonts/'
+  @md5='6865682b095f8c4500c54b285ff05ef6'
+end
+
+class Ghostscript <Formula
+  @url='http://downloads.sourceforge.net/project/ghostscript/GPL%20Ghostscript/8.70/ghostscript-8.70.tar.bz2'
+  @homepage='http://www.ghostscript.com/'
+  @md5='526366f8cb4fda0d3d293597cc5b984b'
+  
+  def install
+    # ghostscript configure ignores LDFLAGs apparently
+    ENV['LIBS']="-L/usr/X11/lib"
+    system "./configure", "--prefix=#{prefix}", "--disable-debug", 
+                          # the cups component adamantly installs to /usr so fuck it
+                          "--disable-cups"
+    # versioned stuff in main tree is pointless for us
+    inreplace 'Makefile', '/$(GS_DOT_VERSION)', ''
+    system "make install"
+    (prefix+'share'+'ghostscript'+'doc').rmtree
+
+    GhostscriptFonts.new.brew do
+      Dir.chdir '..'
+      (prefix+'share'+'ghostscript').install 'fonts'
+    end
+    
+    (man+'de').rmtree
+  end
+end
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index 5db518006..ee06a50ac 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -2,43 +2,13 @@ require 'brewkit'
 
 # some credit to http://github.com/maddox/magick-installer
 
-class LibTIFF <Formula
-  @url='ftp://ftp.remotesensing.org/libtiff/tiff-3.8.2.tar.gz'
-  @homepage='http://www.libtiff.org/'
-  @md5='fbb6f446ea4ed18955e2714934e5b698'
-end
-
-class Libwmf <Formula
-  @url='http://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz'
-  @homepage='http://wvware.sourceforge.net/libwmf.html'
-  @md5='d1177739bf1ceb07f57421f0cee191e0'
-end
-
-class LittleCMS <Formula
-  @url='http://www.littlecms.com/lcms-1.17.tar.gz'
-  @homepage='http://www.littlecms.com/'
-  @md5='07bdbb4cfb05d21caa58fe3d1c84ddc1'
-end
-
-class Ghostscript <Formula
-  @url='http://downloads.sourceforge.net/project/ghostscript/GPL%20Ghostscript/8.70/ghostscript-8.70.tar.bz2'
-  @homepage='http://www.ghostscript.com/'
-  @md5='526366f8cb4fda0d3d293597cc5b984b'
-end
-
-class GhostscriptFonts <Formula
-  @url='http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ghostscript-fonts-std-8.11.tar.gz'
-  @homepage='http://sourceforge.net/projects/gs-fonts/'
-  @md5='6865682b095f8c4500c54b285ff05ef6'
-end
-
 class Imagemagick <Formula
   @url='ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.5.5-4.tar.bz2'
   @md5='8cb7471a50428e4892ee46aa404e54c2'
   @homepage='http://www.imagemagick.org'
 
   def deps
-    LibraryDep.new 'jpeg'
+    { :required => 'jpeg', :optional => %w[libwmf libtiff little-cms ghostscript] }
   end
 
   def install
@@ -47,33 +17,6 @@ class Imagemagick <Formula
 
     # TODO eventually these will be external optional dependencies
     # but for now I am lazy
-    LibTIFF.new.brew do
-      system "./configure", "--prefix=#{prefix}", "--disable-debug"
-      system "make install"
-    end
-    Libwmf.new.brew do
-      system "./configure", "--prefix=#{prefix}", "--disable-debug"
-      system "make install"
-    end
-    LittleCMS.new.brew do
-      system "./configure", "--prefix=#{prefix}", "--disable-debug"
-      system "make install"
-    end
-    Ghostscript.new.brew do
-      # ghostscript configure ignores LDFLAGs apparently
-      ENV['LIBS']="-L/usr/X11/lib"
-      system "./configure", "--prefix=#{prefix}", "--disable-debug", 
-                            # the cups component adamantly installs to /usr so fuck it
-                            "--disable-cups"
-      # versioned stuff in main tree is pointless for us
-      inreplace 'Makefile', '/$(GS_DOT_VERSION)', ''
-      system "make install"
-      (prefix+'share'+'ghostscript'+'doc').rmtree
-    end
-    GhostscriptFonts.new.brew do
-      Dir.chdir '..'
-      (prefix+'share'+'ghostscript').install 'fonts'
-    end
 
     # versioned stuff in main tree is pointless for us
     inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'
@@ -91,8 +34,6 @@ class Imagemagick <Formula
     (d+'NEWS.txt').unlink
     (d+'LICENSE').unlink
     (d+'ChangeLog').unlink
-    
-    (man+'de').rmtree
   end
 
   def caveats
diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
index 52444bdfa..ea6a61706 100644
--- a/Library/Formula/liblastfm.rb
+++ b/Library/Formula/liblastfm.rb
@@ -6,9 +6,7 @@ class Liblastfm <Formula
   @md5='3f73222ebc31635941832b01e7a494b6'
 
   def deps
-    BinaryDep.new 'qmake', 'qt'
-    LibraryDep.new 'fftw3f', 'fftw'
-    LibraryDep.new 'samplerate'
+    %w[qt fftw samplerate]
   end
 
   def install
diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb
index d562ab12a..b9d5c1c45 100644
--- a/Library/Formula/libmusicbrainz.rb
+++ b/Library/Formula/libmusicbrainz.rb
@@ -6,8 +6,7 @@ class Libmusicbrainz <Formula
   @md5='648ecd43f7b80852419aaf73702bc23f'
 
   def deps
-    LibraryDep.new 'neon'
-    OptionalLibraryDep.new 'libdiscid'
+    { :required => 'neon', :optional => 'libdiscid' }
   end
 
   def install
diff --git a/Library/Formula/libtiff.rb b/Library/Formula/libtiff.rb
new file mode 100644
index 000000000..831491321
--- /dev/null
+++ b/Library/Formula/libtiff.rb
@@ -0,0 +1,12 @@
+require 'brewkit'
+
+class Libtiff <Formula
+  @url='ftp://ftp.remotesensing.org/libtiff/tiff-3.8.2.tar.gz'
+  @homepage='http://www.libtiff.org/'
+  @md5='fbb6f446ea4ed18955e2714934e5b698'
+
+  def install
+    system "./configure", "--prefix=#{prefix}", "--disable-debug"
+    system "make install"
+  end
+end
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index d597b1feb..cdd795437 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -6,7 +6,7 @@ class Libvorbis <Formula
   @homepage='http://vorbis.com'
 
   def deps
-    LibraryDep.new 'libogg'
+    'libogg'
   end
 
   def install
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
new file mode 100644
index 000000000..f1a3ba1a1
--- /dev/null
+++ b/Library/Formula/libwmf.rb
@@ -0,0 +1,16 @@
+require 'brewkit'
+
+class Libwmf <Formula
+  @url='http://downloads.sourceforge.net/project/wvware/libwmf/0.2.8.4/libwmf-0.2.8.4.tar.gz'
+  @homepage='http://wvware.sourceforge.net/libwmf.html'
+  @md5='d1177739bf1ceb07f57421f0cee191e0'
+
+  def install
+    ENV.libpng
+    system "./configure", "--prefix=#{prefix}", "--disable-debug"
+    system "make"
+
+    ENV.j1 # yet another rubbish Makefile
+    system "make install"
+  end
+end
diff --git a/Library/Formula/little-cms.rb b/Library/Formula/little-cms.rb
new file mode 100644
index 000000000..a3efd783b
--- /dev/null
+++ b/Library/Formula/little-cms.rb
@@ -0,0 +1,12 @@
+require 'brewkit'
+
+class LittleCms <Formula
+  @url='http://www.littlecms.com/lcms-1.17.tar.gz'
+  @homepage='http://www.littlecms.com/'
+  @md5='07bdbb4cfb05d21caa58fe3d1c84ddc1'
+
+  def install
+    system "./configure", "--prefix=#{prefix}", "--disable-debug"
+    system "make install"
+  end
+end
diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb
index fda521f1d..0ad5681c3 100644
--- a/Library/Formula/memcached.rb
+++ b/Library/Formula/memcached.rb
@@ -6,7 +6,7 @@ class Memcached <Formula
   @md5='d7651ecb8bf345144cb17900d9a46c85'
 
   def deps
-    LibraryDep.new 'libevent'
+    'libevent'
   end
 
   def install
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index f97945135..f135f7dc8 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -6,7 +6,7 @@ class MysqlConnectorC <Formula
   @md5='348a869fa72957062ea4e7ad3865623c'
 
   def deps
-    BinaryDep.new 'cmake'
+    'cmake'
   end
 
   def install
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 662d8320d..5cfb8be41 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -6,8 +6,7 @@ class Mysql <Formula
   @md5='7564d7759a8077b3a0e6190955422287'
 
   def deps
-    # --without-readline means use system's readline
-    LibraryDep.new 'readline'
+    'readline'
   end
 
   def options
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index b2fe3e2fa..4863381e6 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -6,7 +6,7 @@ class Nginx <Formula
   @md5='6ebf89b9b00a3b82734e93c32da7df07'
 
   def deps
-    LibraryDep.new 'pcre'
+    'pcre'
   end
     
   def install
diff --git a/Library/Formula/playdar.rb b/Library/Formula/playdar.rb
index 0d2669ea8..44b1f815d 100644
--- a/Library/Formula/playdar.rb
+++ b/Library/Formula/playdar.rb
@@ -5,9 +5,7 @@ class Playdar <Formula
   @head='git://github.com/mxcl/playdar.git'
 
   def deps
-    LibraryDep.new 'taglib'
-    LibraryDep.new 'boost'
-    BinaryDep.new 'cmake'
+    %w[taglib boost cmake]
   end
 
   def skip_clean? path
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index d1d058644..0624146bc 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -7,7 +7,7 @@ class Python <Formula
 
   def deps
     # You can build Python without readline, but you really don't want to.
-    LibraryDep.new 'readline'
+    'readline'
   end
   
   def skip_clean? path
diff --git a/Library/Formula/scummvm.rb b/Library/Formula/scummvm.rb
index de0bd7bf1..adb1f1a48 100644
--- a/Library/Formula/scummvm.rb
+++ b/Library/Formula/scummvm.rb
@@ -14,11 +14,7 @@ prefer to use theirs. If so type `brew home scummvm' to visit their site.
   end
 
   def deps
-    LibraryDep.new 'sdl'
-    # Optional, but you want them anyway.
-    OptionalLibraryDep.new 'flac'
-    OptionalLibraryDep.new 'libogg'
-    OptionalLibraryDep.new 'libvorbis'
+    { :required => 'sdl', :recommended => %w[flac libogg libvorbis] }
   end
 
   def install
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index 67d94fae4..0ae3f40d9 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -14,9 +14,7 @@ class Sshfs <Formula
   end
 
   def deps
-    BinaryDep.new 'pkg-config'
-    LibraryDep.new 'glib'
-    LibraryDep.new 'macfuse'
+    %w[pkg-config glib macfuse]
   end
 
   def install
diff --git a/Library/Formula/taglib.rb b/Library/Formula/taglib.rb
index 59129a16a..ea92fa6df 100644
--- a/Library/Formula/taglib.rb
+++ b/Library/Formula/taglib.rb
@@ -11,13 +11,13 @@ class Taglib <Formula
   @homepage='http://developer.kde.org/~wheeler/taglib.html'
 
   def deps
-    BinaryDep.new 'cmake'
+    'cmake'
   end
 
   def install
     system "./configure --disable-debug --prefix='#{prefix}'"
     system "make install"
-    
+
     TaglibExtras.new.brew do
       system "cmake . #{std_cmake_parameters}"
       system "make install"
diff --git a/Library/Formula/unp.rb b/Library/Formula/unp.rb
index 50ab9ea8c..83cd639c2 100644
--- a/Library/Formula/unp.rb
+++ b/Library/Formula/unp.rb
@@ -6,7 +6,7 @@ class Unp <Formula
   @md5='ecea662bd7e7efe7f7e2213bf21d9646'
 
  def deps
-   BinaryDep.new 'p7zip'
+   'p7zip'
  end
 
   def install
diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb
index 4cd6613ac..b057cbe18 100644
--- a/Library/Formula/vorbis-tools.rb
+++ b/Library/Formula/vorbis-tools.rb
@@ -6,9 +6,7 @@ class VorbisTools <Formula
   @homepage='http://vorbis.com'
 
   def deps
-    LibraryDep.new 'ogg'
-    LibraryDep.new 'vorbis'
-    OptionalLibraryDep.new 'ao', 'ogg123'
+    { :required => %w[ogg vorbis], :optional => %w[ao ogg123] }
   end
 
   def install
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index 288e2fd39..19f47f2ff 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -6,7 +6,7 @@ class Yajl <Formula
   @md5='f4a3cbc764c43231ed1aedc54438b69b'
 
   def deps
-    BinaryDep.new 'cmake'
+    'cmake'
   end
 
   def install
@@ -18,4 +18,4 @@ class Yajl <Formula
     system "./configure --prefix '#{prefix}'"
     system "make install"
   end
-end
\ No newline at end of file
+end
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 8b3939968..496e7afc0 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -144,6 +144,33 @@ def clean f
 end
 
 
+# NOTE this is ugly code, and inefficient too, and can have infinite cycles
+# I have no time currently to improve it, feel free to submit a more elegant
+# solution. Thanks! --mxcl
+def expand_deps fae
+  deps = []
+  fae.each do |f|
+    case f.deps
+    when String, Array
+      f.deps.each do |name|
+        f = Formula.factory name
+        deps << expand_deps(f) if f.deps # hideous inefficient
+        deps << f
+      end
+    when Hash
+      # TODO implement optional and recommended
+      names = []
+      f.deps.each_value {|v| names << v}
+      ff=names.flatten.collect {|name| Formula.factory name}
+      deps << expand_deps(ff)
+    end
+    deps << f
+  end
+  # TODO much more efficient to use a set and not recurse stuff already done
+  return deps.flatten.uniq
+end
+
+
 def install f
   f.brew do
     if ARGV.flag? '--interactive'
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 7faabbae6..9c5123545 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -123,7 +123,7 @@ class Formula
   def brew
     validate_variable :name
     validate_variable :version
-    
+
     stage do
       begin
         patch
diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb
index ae8b0c1bc..2738755e4 100755
--- a/Library/Homebrew/unittest.rb
+++ b/Library/Homebrew/unittest.rb
@@ -41,7 +41,8 @@ class MostlyAbstractFormula <Formula
 end
 
 class TestBall <Formula
-  def initialize
+  # name parameter required for some Formula::factory
+  def initialize name=nil
     @url="file:///#{Pathname.new(ABS__FILE__).parent.realpath}/testball-0.1.tbz"
     super "testball"
   end
@@ -98,9 +99,13 @@ def nostdout
 end
 
 module ExtendArgvPlusYeast
-  def stick_an_arg_in_thar
+  def reset
     @named=nil
-    unshift 'foo'
+    @formulae=nil
+    @kegs=nil
+    while ARGV.count > 0
+      ARGV.shift
+    end
   end
 end
 ARGV.extend ExtendArgvPlusYeast
@@ -347,8 +352,9 @@ class BeerTasting <Test::Unit::TestCase
   end
 
   def test_no_ARGV_dupes
-    ARGV.unshift'foo'
-    ARGV.unshift'foo'
+    ARGV.reset
+    ARGV.unshift 'foo'
+    ARGV.unshift 'foo'
     n=0
     ARGV.named.each{|arg| n+=1 if arg == 'foo'}
     assert_equal 1, n
@@ -360,9 +366,10 @@ class BeerTasting <Test::Unit::TestCase
     assert_raises(UsageError) { ARGV.kegs }
     assert ARGV.named_empty?
     
-    (HOMEBREW_CELLAR+'foo'+'0.1').mkpath
+    (HOMEBREW_CELLAR+'mxcl'+'10.0').mkpath
     
-    ARGV.stick_an_arg_in_thar
+    ARGV.reset
+    ARGV.unshift 'mxcl'
     assert_equal 1, ARGV.named.length
     assert_equal 1, ARGV.kegs.length
     assert_raises(FormulaUnavailableError) { ARGV.formulae }
@@ -395,7 +402,7 @@ class BeerTasting <Test::Unit::TestCase
     nostdout do
       assert_nothing_raised do
         f=TestBall.new
-        make 'http://example.com/testball-0.1.tbz'
+        make f.url
         info f.name
         clean f
         prune
-- 
cgit v1.2.3


From fcd62ce1eb8ac4ed775515f7e877946a62508d65 Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Thu, 10 Sep 2009 14:11:04 +0100
Subject: Don't install dependencies that are already installed

---
 Library/Homebrew/brew.h.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 496e7afc0..de5048cc3 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -155,7 +155,7 @@ def expand_deps fae
       f.deps.each do |name|
         f = Formula.factory name
         deps << expand_deps(f) if f.deps # hideous inefficient
-        deps << f
+        deps << f unless f.installed?
       end
     when Hash
       # TODO implement optional and recommended
@@ -166,6 +166,7 @@ def expand_deps fae
     end
     deps << f
   end
+
   # TODO much more efficient to use a set and not recurse stuff already done
   return deps.flatten.uniq
 end
-- 
cgit v1.2.3


From 535086de273f6a6aa62c072890344ab02e98315e Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Thu, 10 Sep 2009 14:29:41 +0100
Subject: Only allow --interactive with one formula argument

See comments in commit for details.
---
 Library/Homebrew/ARGV+yeast.rb | 3 +++
 Library/Homebrew/brew.h.rb     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/ARGV+yeast.rb b/Library/Homebrew/ARGV+yeast.rb
index e602d7901..007de9f4c 100644
--- a/Library/Homebrew/ARGV+yeast.rb
+++ b/Library/Homebrew/ARGV+yeast.rb
@@ -66,6 +66,9 @@ module HomebrewArgvExtension
   def quieter?
     flag? '--quieter'
   end
+  def interactive?
+    flag? '--interactive'
+  end
 
   def flag? flag
     options.each do |arg|
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index de5048cc3..875f61be0 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -174,7 +174,7 @@ end
 
 def install f
   f.brew do
-    if ARGV.flag? '--interactive'
+    if ARGV.interactive?
       ohai "Entering interactive mode"
       puts "Type `exit' to return and finalize the installation"
       puts "Install to this prefix: #{f.prefix}"
-- 
cgit v1.2.3


From 0d1ec9641403ea2de9588ffdb22b68a23e6c2547 Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Thu, 17 Sep 2009 21:56:49 +0100
Subject: Python depends on a custom Readline

The idea here is that this readline is installed, but not symlinked in.
---
 Library/Formula/python.rb | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 0624146bc..6d92d147c 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -1,5 +1,26 @@
 require 'brewkit'
 
+class Readline <Formula
+  @url='ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz'
+  @homepage='http://tiswww.case.edu/php/chet/readline/rltop.html'
+  @md5='e39331f32ad14009b9ff49cc10c5e751'
+ 
+  def patches
+    (1..14).collect {|n| "ftp://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-%03d"%n}
+  end
+
+  def keg_only?
+    true
+  end
+
+  def install
+    system "./configure", "--prefix=#{prefix}",
+                          "--mandir=#{man}",
+                          "--infodir=#{info}"
+    system "make install"
+  end
+end
+
 class Python <Formula
   @url='http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2'
   @homepage='http://www.python.org/'
@@ -7,9 +28,9 @@ class Python <Formula
 
   def deps
     # You can build Python without readline, but you really don't want to.
-    'readline'
+    Readline.new
   end
-  
+
   def skip_clean? path
     path == bin+'python' or path == bin+'python2.6' or # if you strip these, it can't load modules
     path == lib+'python2.6' # save a lot of time
-- 
cgit v1.2.3


From 68108e109839a901313b9933cbb1e3202aed90cf Mon Sep 17 00:00:00 2001
From: Max Howell
Date: Fri, 18 Sep 2009 19:16:39 +0100
Subject: Dependency resolution with fancy syntax

Is it a DSL? No. But people call it that apparently.

To add a dependency:

class Doe <Formula
  depends_on 'ray'
  depends_on 'mee' => :optional
  depends_on 'far' => :recommended
  depends_on Sew.new
end

Sew would be a formula you have defined in this Formula file. This is useful,
eg. see Python's formula. Formula specified in this fashion cannot be linked
into the HOMEBREW_PREFIX, they are considered private libraries. This allows
you to create custom installations that are very specific to your formula.

More features to come, like specifying versions
---
 Library/Formula/erlang.rb            |  3 +++
 Library/Formula/fish.rb              |  4 +---
 Library/Formula/glib.rb              |  6 ++----
 Library/Formula/imagemagick.rb       | 19 ++++++++++---------
 Library/Formula/liblastfm.rb         |  6 +++---
 Library/Formula/libmusicbrainz.rb    |  5 ++---
 Library/Formula/libvorbis.rb         |  4 +---
 Library/Formula/memcached.rb         |  4 +---
 Library/Formula/mysql-connector-c.rb |  4 +---
 Library/Formula/mysql.rb             |  4 +---
 Library/Formula/nginx.rb             |  4 +---
 Library/Formula/playdar.rb           |  6 +++---
 Library/Formula/python.rb            |  6 ++----
 Library/Formula/scummvm.rb           |  7 ++++---
 Library/Formula/sshfs.rb             |  6 +++---
 Library/Formula/subversion.rb        | 13 ++-----------
 Library/Formula/unp.rb               |  4 +---
 Library/Formula/vorbis-tools.rb      |  7 ++++---
 Library/Formula/yajl.rb              |  4 +---
 Library/Homebrew/brew.h.rb           | 27 ++++-----------------------
 Library/Homebrew/formula.rb          | 33 +++++++++++++++++++++++++++++----
 21 files changed, 79 insertions(+), 97 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index eaa002ba0..41feea372 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -13,6 +13,9 @@ class Erlang <Formula
   @url='http://erlang.org/download/otp_src_R13B01.tar.gz'
   @md5='b3db581de6c13e1ec93d74e54a7b4231'
 
+  depends_on 'icu4c'
+  depends_on 'openssl'
+
   def install
     ENV.deparallelize
     system "./configure", "--disable-debug",
diff --git a/Library/Formula/fish.rb b/Library/Formula/fish.rb
index 09246747e..0324f0259 100644
--- a/Library/Formula/fish.rb
+++ b/Library/Formula/fish.rb
@@ -5,9 +5,7 @@ class Fish <Formula
   @homepage='http:://fishshell.org/'
   @md5='4b2436843e63bebba467cc4add11428a'
 
-  def deps
-    'readline'
-  end
+  depends_on 'readline'
 
   def install
     system "./configure", "--prefix=#{prefix}", "--without-xsel"
diff --git a/Library/Formula/glib.rb b/Library/Formula/glib.rb
index 9befe40c1..24c55be41 100644
--- a/Library/Formula/glib.rb
+++ b/Library/Formula/glib.rb
@@ -5,10 +5,8 @@ class Glib <Formula
   @md5='4c178b91d82ef80a2da3c26b772569c0'
   @homepage='http://www.gtk.org'
 
-  def deps
-    BinaryDep.new 'pkg-config'
-    LibraryDep.new 'gettext'
-  end
+  depends_on 'pkg-config'
+  depends_on 'gettext'
 
   def install
     # indeed, amazingly, -w causes gcc to emit spurious errors for this package!
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb
index ee06a50ac..0a7469b8a 100644
--- a/Library/Formula/imagemagick.rb
+++ b/Library/Formula/imagemagick.rb
@@ -7,9 +7,11 @@ class Imagemagick <Formula
   @md5='8cb7471a50428e4892ee46aa404e54c2'
   @homepage='http://www.imagemagick.org'
 
-  def deps
-    { :required => 'jpeg', :optional => %w[libwmf libtiff little-cms ghostscript] }
-  end
+  depends_on 'jpeg'
+  depends_on 'libwmf' => :optional
+  depends_on 'libtiff' => :optional
+  depends_on 'little-cms' => :optional
+  depends_on 'ghostscript' => :recommended
 
   def install
     ENV.libpng
@@ -25,15 +27,14 @@ class Imagemagick <Formula
                           "--without-maximum-compile-warnings",
                           "--prefix=#{prefix}",
                           "--disable-osx-universal-binary",
-                          "--with-gs-font-dir=#{prefix}/share/ghostscript/fonts",
+                          "--with-gs-font-dir=#{HOMEBREW_PREFIX}/share/ghostscript/fonts",
                           "--without-perl" # I couldn't make this compile
     system "make install"
 
-    # We already copy these in
-    d=prefix+'share'
-    (d+'NEWS.txt').unlink
-    (d+'LICENSE').unlink
-    (d+'ChangeLog').unlink
+    # We already copy these into the keg root
+    (share+'NEWS.txt').unlink
+    (share+'LICENSE').unlink
+    (share+'ChangeLog').unlink
   end
 
   def caveats
diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
index ea6a61706..fabdf637b 100644
--- a/Library/Formula/liblastfm.rb
+++ b/Library/Formula/liblastfm.rb
@@ -5,9 +5,9 @@ class Liblastfm <Formula
   @url='http://static.last.fm/src/liblastfm-0.3.0.tar.bz2'
   @md5='3f73222ebc31635941832b01e7a494b6'
 
-  def deps
-    %w[qt fftw samplerate]
-  end
+  depends_on 'qt'
+  depends_on 'fftw'
+  depends_on 'samplerate'
 
   def install
     system "./configure --release --prefix '#{prefix}'"
diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb
index b9d5c1c45..b7869abca 100644
--- a/Library/Formula/libmusicbrainz.rb
+++ b/Library/Formula/libmusicbrainz.rb
@@ -5,9 +5,8 @@ class Libmusicbrainz <Formula
   @homepage='http://musicbrainz.org'
   @md5='648ecd43f7b80852419aaf73702bc23f'
 
-  def deps
-    { :required => 'neon', :optional => 'libdiscid' }
-  end
+  depends_on 'neon'
+  depends_on 'libdiscid' => :optional
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index cdd795437..d4ca863e8 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -5,9 +5,7 @@ class Libvorbis <Formula
   @md5='6a7086ee666b8c62e122d29d107f7bec'
   @homepage='http://vorbis.com'
 
-  def deps
-    'libogg'
-  end
+  depends_on 'libogg'
 
   def install
     system "./configure --enable-docs --disable-debug --disable-dependency-tracking --prefix='#{prefix}'"
diff --git a/Library/Formula/memcached.rb b/Library/Formula/memcached.rb
index 0ad5681c3..3b942615f 100644
--- a/Library/Formula/memcached.rb
+++ b/Library/Formula/memcached.rb
@@ -5,9 +5,7 @@ class Memcached <Formula
   @homepage='http://www.danga.com/memcached/'
   @md5='d7651ecb8bf345144cb17900d9a46c85'
 
-  def deps
-    'libevent'
-  end
+  depends_on 'libevent'
 
   def install
     system "./configure --prefix='#{prefix}'"
diff --git a/Library/Formula/mysql-connector-c.rb b/Library/Formula/mysql-connector-c.rb
index f135f7dc8..580b6f5a6 100644
--- a/Library/Formula/mysql-connector-c.rb
+++ b/Library/Formula/mysql-connector-c.rb
@@ -5,9 +5,7 @@ class MysqlConnectorC <Formula
   @url='http://mysql.llarian.net/Downloads/Connector-C/mysql-connector-c-6.0.1.tar.gz'
   @md5='348a869fa72957062ea4e7ad3865623c'
 
-  def deps
-    'cmake'
-  end
+  depends_on 'cmake'
 
   def install
     system "cmake . #{std_cmake_parameters}"
diff --git a/Library/Formula/mysql.rb b/Library/Formula/mysql.rb
index 5cfb8be41..76fd2a7c4 100644
--- a/Library/Formula/mysql.rb
+++ b/Library/Formula/mysql.rb
@@ -5,9 +5,7 @@ class Mysql <Formula
   @homepage='http://dev.mysql.com/doc/refman/5.1/en/'
   @md5='7564d7759a8077b3a0e6190955422287'
 
-  def deps
-    'readline'
-  end
+  depends_on 'readline'
 
   def options
     [
diff --git a/Library/Formula/nginx.rb b/Library/Formula/nginx.rb
index 4863381e6..d0f03666b 100644
--- a/Library/Formula/nginx.rb
+++ b/Library/Formula/nginx.rb
@@ -5,9 +5,7 @@ class Nginx <Formula
   @homepage='http://nginx.net/'
   @md5='6ebf89b9b00a3b82734e93c32da7df07'
 
-  def deps
-    'pcre'
-  end
+  depends_on 'pcre'
     
   def install
     system "./configure", "--prefix=#{prefix}", "--with-http_ssl_module"
diff --git a/Library/Formula/playdar.rb b/Library/Formula/playdar.rb
index 44b1f815d..5ec5c0639 100644
--- a/Library/Formula/playdar.rb
+++ b/Library/Formula/playdar.rb
@@ -4,9 +4,9 @@ class Playdar <Formula
   @homepage='http://www.playdar.org'
   @head='git://github.com/mxcl/playdar.git'
 
-  def deps
-    %w[taglib boost cmake]
-  end
+  depends_on 'taglib'
+  depends_on 'boost'
+  depends_on 'cmake'
 
   def skip_clean? path
     # for some reason stripping breaks it
diff --git a/Library/Formula/python.rb b/Library/Formula/python.rb
index 6d92d147c..c1d15a887 100644
--- a/Library/Formula/python.rb
+++ b/Library/Formula/python.rb
@@ -26,10 +26,8 @@ class Python <Formula
   @homepage='http://www.python.org/'
   @md5='245db9f1e0f09ab7e0faaa0cf7301011'
 
-  def deps
-    # You can build Python without readline, but you really don't want to.
-    Readline.new
-  end
+  # You can build Python without readline, but you really don't want to.
+  depends_on Readline.new
 
   def skip_clean? path
     path == bin+'python' or path == bin+'python2.6' or # if you strip these, it can't load modules
diff --git a/Library/Formula/scummvm.rb b/Library/Formula/scummvm.rb
index adb1f1a48..912c4207e 100644
--- a/Library/Formula/scummvm.rb
+++ b/Library/Formula/scummvm.rb
@@ -13,9 +13,10 @@ prefer to use theirs. If so type `brew home scummvm' to visit their site.
     EOS
   end
 
-  def deps
-    { :required => 'sdl', :recommended => %w[flac libogg libvorbis] }
-  end
+  depends_on 'sdl'
+  depends_on 'flac' => :recommended
+  depends_on 'libvorbis' => :recommended
+  depends_on 'libogg' => :recommended
 
   def install
     system "./configure --prefix='#{prefix}' --disable-debug"
diff --git a/Library/Formula/sshfs.rb b/Library/Formula/sshfs.rb
index 0ae3f40d9..59c184663 100644
--- a/Library/Formula/sshfs.rb
+++ b/Library/Formula/sshfs.rb
@@ -13,9 +13,9 @@ class Sshfs <Formula
     }
   end
 
-  def deps
-    %w[pkg-config glib macfuse]
-  end
+  depends_on 'pkg-config'
+  depends_on 'glib'
+  depends_on 'macfuse'
 
   def install
     # Steal compile flags from macfuse_buildtool.sh
diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 63254e746..e4584062e 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -1,22 +1,13 @@
 require 'brewkit'
 
-class SubversionDeps <Formula
-  @url='http://subversion.tigris.org/downloads/subversion-deps-1.6.5.tar.bz2'
-  @md5='8272316e1670d4d2bea451411e438bde'
-end
-
 class Subversion <Formula
   @url='http://subversion.tigris.org/downloads/subversion-1.6.5.tar.bz2'
   @homepage='http://subversion.tigris.org/'
   @md5='1a53a0e72bee0bf814f4da83a9b6a636'
 
-  def install
-    # Slot dependencies into place
-    d=Pathname.getwd
-    SubversionDeps.new.brew do
-      d.install Dir['*']
-    end
+  depends_on 'neon'
 
+  def install
     # Use existing system zlib, dep-provided other libraries
     # Don't mess with Apache modules (since we're not sudo)
     system "./configure", "--disable-debug",
diff --git a/Library/Formula/unp.rb b/Library/Formula/unp.rb
index 83cd639c2..d01b7a36e 100644
--- a/Library/Formula/unp.rb
+++ b/Library/Formula/unp.rb
@@ -5,9 +5,7 @@ class Unp <Formula
   @homepage='http://packages.debian.org/de/etch/unp'
   @md5='ecea662bd7e7efe7f7e2213bf21d9646'
 
- def deps
-   'p7zip'
- end
+  depends_on 'p7zip'
 
   def install
     bin.install %w[unp ucat]
diff --git a/Library/Formula/vorbis-tools.rb b/Library/Formula/vorbis-tools.rb
index b057cbe18..deaa2d403 100644
--- a/Library/Formula/vorbis-tools.rb
+++ b/Library/Formula/vorbis-tools.rb
@@ -5,9 +5,10 @@ class VorbisTools <Formula
   @md5='df976d24e51ef3d87cd462edf747bf9a'
   @homepage='http://vorbis.com'
 
-  def deps
-    { :required => %w[ogg vorbis], :optional => %w[ao ogg123] }
-  end
+  depends_on 'ogg'
+  depends_on 'vorbis'
+  depends_on 'ao' => :optional
+  depends_on 'ogg123' => :optional
 
   def install
     system "./configure --disable-debug --disable-nls --disable-dependency-tracking --prefix='#{prefix}'"
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index 19f47f2ff..f47a454e4 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -5,9 +5,7 @@ class Yajl <Formula
   @url='http://github.com/lloyd/yajl/tarball/1.0.5'
   @md5='f4a3cbc764c43231ed1aedc54438b69b'
 
-  def deps
-    'cmake'
-  end
+  depends_on 'cmake'
 
   def install
     ENV.deparallelize
diff --git a/Library/Homebrew/brew.h.rb b/Library/Homebrew/brew.h.rb
index 875f61be0..0d977ae95 100644
--- a/Library/Homebrew/brew.h.rb
+++ b/Library/Homebrew/brew.h.rb
@@ -144,31 +144,12 @@ def clean f
 end
 
 
-# NOTE this is ugly code, and inefficient too, and can have infinite cycles
-# I have no time currently to improve it, feel free to submit a more elegant
-# solution. Thanks! --mxcl
-def expand_deps fae
+def expand_deps ff
   deps = []
-  fae.each do |f|
-    case f.deps
-    when String, Array
-      f.deps.each do |name|
-        f = Formula.factory name
-        deps << expand_deps(f) if f.deps # hideous inefficient
-        deps << f unless f.installed?
-      end
-    when Hash
-      # TODO implement optional and recommended
-      names = []
-      f.deps.each_value {|v| names << v}
-      ff=names.flatten.collect {|name| Formula.factory name}
-      deps << expand_deps(ff)
-    end
-    deps << f
+  ff.deps.collect do |f|
+    deps += expand_deps(Formula.factory(f))
   end
-
-  # TODO much more efficient to use a set and not recurse stuff already done
-  return deps.flatten.uniq
+  deps << ff
 end
 
 
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 9c5123545..a4bebdd2b 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -114,8 +114,6 @@ class Formula
   #     :p2 => ['http://moo.com/patch5', 'http://moo.com/patch6']
   #   }
   def patches; [] end
-  # reimplement and specify dependencies
-  def deps; end
   # sometimes the clean process breaks things, return true to skip anything
   def skip_clean? path; false end
 
@@ -157,6 +155,7 @@ class Formula
   end
 
   def self.factory name
+    return name if name.kind_of? Formula
     require self.path(name)
     return eval(self.class(name)).new(name)
   rescue LoadError
@@ -167,6 +166,10 @@ class Formula
     HOMEBREW_PREFIX+'Library'+'Formula'+"#{name.downcase}.rb"
   end
 
+  def deps
+    self.class.deps or []
+  end
+
 protected
   # Pretty titles the command and buffers stdout/stderr
   # Throws if there's an error
@@ -280,9 +283,31 @@ private
   end
 
   class <<self
-    attr_reader :url, :version, :homepage, :head
+    attr_reader :url, :version, :homepage, :head, :deps
     attr_reader *CHECKSUM_TYPES
-  end
+
+    def depends_on name, *args
+      @deps ||= []
+
+      case name
+      when String
+        # noop
+      when Hash
+        name = name.keys.first # indeed, we only support one mapping
+      when Symbol
+        name = name.to_s
+      when Formula
+        @deps << name
+        return # we trust formula dev to not dupe their own instantiations
+      else
+        raise "Unsupported type #{name.class}"
+      end
+
+      # we get duplicates because every new fork of this process repeats this
+      # step for some reason I am not sure about
+      @deps << name unless @deps.include? name
+    end
+  end  
 end
 
 # see ack.rb for an example usage
-- 
cgit v1.2.3