r: use new dsl

1 files changed, 6 insertions, 14 deletions

diff --git a/Library/Formula/r.rb b/Library/Formula/r.rb
index 3177d54a1..7ad86694b 100644
--- a/Library/Formula/r.rb
+++ b/Library/Formula/r.rb
@@ -1,9 +1,5 @@
 require 'formula'
 
-def valgrind?
-  ARGV.include? '--with-valgrind'
-end
-
 class RBashCompletion < Formula
   # This is the same script that Debian packages use.
   url 'http://rcompletion.googlecode.com/svn-history/r28/trunk/bash_completion/R', :using => :curl
@@ -18,21 +14,17 @@ class R < Formula
 
   head 'https://svn.r-project.org/R/trunk'
 
+  option 'with-valgrind', 'Compile an unoptimized build with support for the Valgrind debugger'
+
   depends_on 'readline'
   depends_on 'libtiff'
   depends_on 'jpeg'
   depends_on :x11
 
-  depends_on 'valgrind' if valgrind?
-
-  def options
-    [
-      ['--with-valgrind', 'Compile an unoptimized build with support for the Valgrind debugger.']
-    ]
-  end
+  depends_on 'valgrind' if build.include? 'with-valgrind'
 
   def install
-    ENV.Og if valgrind?
+    ENV.Og if build.include? 'with-valgrind'
     ENV.fortran
 
     args = [
@@ -41,10 +33,10 @@ class R < Formula
       "--enable-R-framework",
       "--with-lapack"
     ]
-    args << '--with-valgrind-instrumentation=2' if valgrind?
+    args << '--with-valgrind-instrumentation=2' if build.include? 'with-valgrind'
 
     # Pull down recommended packages if building from HEAD.
-    system './tools/rsync-recommended' if ARGV.build_head?
+    system './tools/rsync-recommended' if build.head?
 
     system "./configure", *args
     system "make"