Updated gfortran to install for XCode 3.2.3 without force

Most of the action in XCode 3.2.3 focused on changes to LLVM and Clang.
As a result, the build of Gfortran provided for XCode 3.2.2 passes the
fortran testsuite when installed alongside XCode 3.2.3.

The gfortran brew has been updated to install gfortran-3.2.2 for XCode
3.2.3 without the use of the --force argument.

The brew has also been modified to facilitate the inclusion of binaries
compiled against XCode 3.2.3 once they appear.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 17 insertions, 14 deletions

diff --git a/Library/Formula/gfortran.rb b/Library/Formula/gfortran.rb
index 4c455b6a9..3d645bda5 100644
--- a/Library/Formula/gfortran.rb
+++ b/Library/Formula/gfortran.rb
@@ -23,9 +23,18 @@ class Gfortran <Formula
     version "4.2.4-5577"
   else
     # Snow Leopard
-    url 'http://r.research.att.com/gfortran-42-5659.pkg'
-    md5 '71bd546baa45c9c0fb4943cdd72ee274'
-    version "4.2.4-5659"
+    case gcc_42_build
+    when 5659
+      url 'http://r.research.att.com/gfortran-42-5659.pkg'
+      md5 '71bd546baa45c9c0fb4943cdd72ee274'
+      version "4.2.4-5659"
+    else
+      # These links should be updated to point to gfortran
+      # binaries for XCode build 5664 when they appear.
+      url 'http://r.research.att.com/gfortran-42-5659.pkg'
+      md5 '71bd546baa45c9c0fb4943cdd72ee274'
+      version "4.2.4-5659"
+    end
   end
 
   homepage 'http://r.research.att.com/tools/'
@@ -54,20 +63,14 @@ class Gfortran <Formula
       safe_system "pax --insecure -rz -f Payload.gz -s ',./usr,#{prefix},'"
       safe_system "ln -sf #{man1}/gfortran-4.2.1 #{man1}/gfortran.1"
     when 5664
-      if ARGV.force?
-        opoo "XCode 3.2.3 detected, but using gfortran 4.2.4 for XCode 3.2.2"
-        ohai "Installing gfortran 4.2.4 for XCode 3.2.2 (build 5659)"
-        safe_system "pax --insecure -rz -f Payload.gz -s ',./usr,#{prefix},'"
-        safe_system "ln -sf #{man1}/gfortran-4.2.1 #{man1}/gfortran.1"
-      else
-        onoe "XCode 3.2.3 detected, but not supported"
-        puts "To force installation on XCode 3.2.3 use:"
-        puts "\tbrew install --force gfortran"
-      end
+      # This section should be updated when binaries for 5664 appear.
+      ohai "Installing gfortran 4.2.4 for XCode 3.2.2 (build 5659)"
+      safe_system "pax --insecure -rz -f Payload.gz -s ',./usr,#{prefix},'"
+      safe_system "ln -sf #{man1}/gfortran-4.2.1 #{man1}/gfortran.1"
     else
       onoe <<-EOS.undent
         Currently the gfortran compiler provided by this brew is only supported
-        for XCode 3.1.4 on OS X 10.5.x and XCode 3.2.2 on OS X 10.6.x
+        for XCode 3.1.4 on OS X 10.5.x and XCode 3.2.2/3.2.3 on OS X 10.6.x
       EOS
     end
   end