subversion: update requirements

* serf needs to be universal when building universal
* make universal requirements fatal

1 files changed, 30 insertions, 2 deletions

diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index f63149362..68e409a6d 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -9,9 +9,14 @@ def with_unicode_path?; ARGV.include? "--unicode-path"; end
 class UniversalNeon < Requirement
   def message; <<-EOS.undent
       A universal build was requested, but neon was already built for a single arch.
-      You may need to `brew rm neon` first.
+      You will need to `brew rm neon` first.
     EOS
   end
+
+  def fatal?
+    true
+  end
+
   def satisfied?
     f = Formula.factory('neon')
     !f.installed? || archs_for_command(f.lib+'libneon.dylib').universal?
@@ -21,15 +26,37 @@ end
 class UniversalSqlite < Requirement
   def message; <<-EOS.undent
       A universal build was requested, but sqlite was already built for a single arch.
-      You may need to `brew rm sqlite` first.
+      You will need to `brew rm sqlite` first.
     EOS
   end
+
+  def fatal?
+    true
+  end
+
   def satisfied?
     f = Formula.factory('sqlite')
     !f.installed? || archs_for_command(f.lib+'libsqlite3.dylib').universal?
   end
 end
 
+class UniversalSerf < Requirement
+  def message; <<-EOS.undent
+      A universal build was requested, but serf was already built for a single arch.
+      You will need to `brew rm serf` first.
+    EOS
+  end
+
+  def fatal?
+    true
+  end
+
+  def satisfied?
+    f = Formula.factory('serf')
+    !f.installed? || archs_for_command(f.lib+'libserf-1.0.0.0.dylib').universal?
+  end
+end
+
 class Subversion < Formula
   homepage 'http://subversion.apache.org/'
   url 'http://www.apache.org/dyn/closer.cgi?path=subversion/subversion-1.7.5.tar.bz2'
@@ -47,6 +74,7 @@ class Subversion < Formula
   if ARGV.build_universal?
     depends_on UniversalNeon.new
     depends_on UniversalSqlite.new
+    depends_on UniversalSerf.new
   end
 
   def options