Tidied things up a little in light of recent changes

6 files changed, 9 insertions, 10 deletions

diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 2022ef952..4bc2f90b1 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -6,9 +6,6 @@ class Boost <Formula
   @md5='a17281fd88c48e0d866e1a12deecbcc0'
 
   def install
-    #TODO we can save 6300 links if we just had the intelligence to symlink
-    #the include/boost dir and not more
-
     # we specify libdir too because the script is apparently broken
     system "./bootstrap.sh --prefix='#{prefix}' --libdir='#{lib}'"
     system "./bjam --layout=system --prefix='#{prefix}' --libdir='#{lib}' install"
diff --git a/Library/Formula/cmake.rb b/Library/Formula/cmake.rb
index 32f77bb96..22c97e861 100644
--- a/Library/Formula/cmake.rb
+++ b/Library/Formula/cmake.rb
@@ -4,11 +4,13 @@ class Cmake <Formula
   @url='http://www.cmake.org/files/v2.6/cmake-2.6.3.tar.gz'
   @md5='5ba47a94ce276f326abca1fd72a7e7c6'
 
+  def deps
+    LibraryDep.new 'xmlrpc', 'xmlrpc-c'
+
   def install
     system "./bootstrap --prefix=#{prefix} --system-libs"
     system "make install"
 
     ['man','doc'].each { |d| (prefix+d).mv prefix+'share' }
-    (doc.parent+'cmake-2.6').mv doc
   end
 end
\ No newline at end of file
diff --git a/Library/Formula/liblastfm.rb b/Library/Formula/liblastfm.rb
index 6f2b6a375..52444bdfa 100644
--- a/Library/Formula/liblastfm.rb
+++ b/Library/Formula/liblastfm.rb
@@ -6,9 +6,9 @@ class Liblastfm <Formula
   @md5='3f73222ebc31635941832b01e7a494b6'
 
   def deps
-    dep_test_bin 'qmake' or 'qt'
-    dep_test_lib 'fftw3f' or 'fftw'
-    dep_test_lib 'samplerate' or 'libsamplerate'
+    BinaryDep.new 'qmake', 'qt'
+    LibraryDep.new 'fftw3f', 'fftw'
+    LibraryDep.new 'samplerate'
   end
 
   def install
diff --git a/Library/Formula/libvorbis.rb b/Library/Formula/libvorbis.rb
index 30ff4307e..6c9367e0e 100644
--- a/Library/Formula/libvorbis.rb
+++ b/Library/Formula/libvorbis.rb
@@ -6,7 +6,7 @@ class Libvorbis <Formula
   @homepage='http://vorbis.com'
 
   def deps
-    test_lib 'ogg'
+    LibraryDep.new 'ogg'
   end
 
   def install
diff --git a/Library/Formula/pkg-config.rb b/Library/Formula/pkg-config.rb
index 9254c5a65..d95229e4c 100644
--- a/Library/Formula/pkg-config.rb
+++ b/Library/Formula/pkg-config.rb
@@ -5,7 +5,7 @@ class PkgConfig <Formula
   @url='http://pkgconfig.freedesktop.org/releases/pkg-config-0.23.tar.gz'
   @md5='d922a88782b64441d06547632fd85744'
 
-  #TODO depend on our glib? --with-installed-glib
+  #TODO depend on our glib if available. --with-installed-glib
 
   def install
     system "./configure --with-pc-path=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:#{$root}/lib/pkgconfig --disable-debug --prefix='#{prefix}'"
diff --git a/Library/Formula/yajl.rb b/Library/Formula/yajl.rb
index f72432dda..962feba81 100644
--- a/Library/Formula/yajl.rb
+++ b/Library/Formula/yajl.rb
@@ -6,7 +6,7 @@ class Yajl <Formula
   @md5='f4a3cbc764c43231ed1aedc54438b69b'
 
   def deps
-    dep_test_bin 'cmake'
+    BinaryDep.new 'cmake'
   end
 
   def install