ossp-uuid: use options dsl

1 files changed, 7 insertions, 11 deletions

diff --git a/Library/Formula/ossp-uuid.rb b/Library/Formula/ossp-uuid.rb
index 4bd97607b..134481bb0 100644
--- a/Library/Formula/ossp-uuid.rb
+++ b/Library/Formula/ossp-uuid.rb
@@ -1,31 +1,27 @@
 require 'formula'
 
 class OsspUuid < Formula
+  homepage 'http://www.ossp.org/pkg/lib/uuid/'
   url 'ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz'
   mirror 'http://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz'
-  homepage 'http://www.ossp.org/pkg/lib/uuid/'
   md5 '5db0d43a9022a6ebbbc25337ae28942f'
 
-  def options
-    [
-      ["--32-bit", "Build 32-bit only."],
-      ["--universal", "Build with universal binaries and libraries."],
-    ]
-  end
+  option :universal
+  option "32-bit"
 
   def install
-    if ARGV.build_universal?
+    if build.universal?
       ENV.universal_binary
-    elsif ARGV.include? '--32-bit'
+    elsif build.build_32_bit?
       ENV.append 'CFLAGS', '-arch i386'
       ENV.append 'LDFLAGS', '-arch i386'
     end
 
     system "./configure", "--disable-debug",
+                          "--prefix=#{prefix}",
                           "--without-perl",
                           "--without-php",
-                          "--without-pgsql",
-                          "--prefix=#{prefix}"
+                          "--without-pgsql"
     system "make"
     system "make install"
   end