aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/mplayer.rb
diff options
context:
space:
mode:
authorAdam Vandenberg2010-06-28 14:55:31 -0700
committerAdam Vandenberg2010-07-08 22:45:03 -0700
commitd5c16f2fdbc90e063b527394b4d9dc48d7976acc (patch)
tree03826e5873a5416f6cceff03fd794516b368c175 /Library/Formula/mplayer.rb
parent958cf50d8231aa38596cfe9bfad385f101ce78e0 (diff)
downloadhomebrew-d5c16f2fdbc90e063b527394b4d9dc48d7976acc.tar.bz2
Improved Subversion support.
Homebrew will now use the svn binary pointed to by HOMEBREW_SVN if set, use a Homebrew-installed svn if present, finally falling back to the system-provided svn binary. If a formula (mplayer) requires a newer version of Subversion than what Leopard provides, it can use the "StrictSubversionDownloadStrategy" download strategy to warn the user. These changes also fix an issue with forcing exports not working on a stock Leopard subversion, but letting the user either specify a specific binary or install Subversion via Homebrew and pick that up instead.
Diffstat (limited to 'Library/Formula/mplayer.rb')
-rw-r--r--Library/Formula/mplayer.rb14
1 files changed, 2 insertions, 12 deletions
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 37d273c9e..59406431c 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -2,14 +2,12 @@ require 'formula'
class Mplayer <Formula
homepage 'http://www.mplayerhq.hu/'
- head 'svn://svn.mplayerhq.hu/mplayer/trunk'
+ # http://github.com/mxcl/homebrew/issues/issue/87
+ head 'svn://svn.mplayerhq.hu/mplayer/trunk', :using => StrictSubversionDownloadStrategy
depends_on 'pkg-config' => :recommended
depends_on 'yasm' => :optional
- # http://github.com/mxcl/homebrew/issues/#issue/87
- depends_on :subversion if MACOS_VERSION < 10.6
-
def install
# Do not use pipes, per bug report
# http://github.com/mxcl/homebrew/issues#issue/622
@@ -30,11 +28,3 @@ class Mplayer <Formula
system "make install"
end
end
-
-if MACOS_VERSION < 10.6
- class SubversionDownloadStrategy
- def svn
- Formula.factory('subversion').bin+'svn'
- end
- end
-end