aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Howell2009-12-04 17:44:18 +0000
committerMax Howell2009-12-04 18:16:32 +0000
commitcbd7ff972c52ebcbe87f03040fa606b1b2c1c706 (patch)
tree0d4a00b8edff82d31ce859b0e08ad6c3f20ffeaa
parent928317d80f67d7cbc73bfa4f04bcd1e4e6cdf980 (diff)
downloadhomebrew-cbd7ff972c52ebcbe87f03040fa606b1b2c1c706.tar.bz2
Fixes broken SubversionDownloadStrategy
Being able to commit parts of diffs can bite you if you aren't careful.
-rw-r--r--Library/Formula/mplayer.rb12
-rw-r--r--Library/Homebrew/download_strategy.rb5
2 files changed, 15 insertions, 2 deletions
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 850bb0de1..5e6b99e23 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -11,8 +11,16 @@ class Mplayer <Formula
def install
ENV.gcc_4_2 # llvm chokes on labels within mlp inline asm
- system "./configure --prefix='#{prefix}'"
+ system "./configure", "--prefix=#{prefix}"
system "make"
system "make install"
end
-end \ No newline at end of file
+end
+
+if MACOS_VERSION < 10.6
+ class SubversionDownloadStrategy
+ def svn
+ Formula.factory('subversion').bin+'svn'
+ end
+ end
+end
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 4f3f2146b..579968e85 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -126,6 +126,11 @@ class SubversionDownloadStrategy <AbstractDownloadStrategy
args << '-q' unless ARGV.verbose?
safe_system *args
end
+
+ # currently only used by mplayer.rb
+ def svn
+ '/usr/bin/svn'
+ end
end
class GitDownloadStrategy <AbstractDownloadStrategy