Yaws 1.94

Make yapps the default, like MacPorts, since the caveats suggest you'll
usually want them anyway.

1 files changed, 7 insertions, 18 deletions

diff --git a/Library/Formula/yaws.rb b/Library/Formula/yaws.rb
index 09adeef06..8c3de1e52 100644
--- a/Library/Formula/yaws.rb
+++ b/Library/Formula/yaws.rb
@@ -2,20 +2,16 @@ require 'formula'
 
 class Yaws < Formula
   homepage 'http://yaws.hyber.org'
-  url 'http://yaws.hyber.org/download/yaws-1.92.tar.gz'
-  md5 'd0c05d2041df79089f7de5d8437ee34b'
+  url 'http://yaws.hyber.org/download/yaws-1.94.tar.gz'
+  sha1 '36295e40bb4db1812901c31d41152f942a63b5cc'
 
-  depends_on 'erlang'
+  option "without-yapp", "Omit yaws applications"
+  option '32-bit'
 
-  def options
-    [
-      ["--with-yapp", "Build and install yaws applications"],
-      ['--32-bit', "Build 32-bit only."]
-    ]
-  end
+  depends_on 'erlang'
 
   def install
-    if ARGV.build_32_bit?
+    if build.build_32_bit?
       %w{ CFLAGS LDFLAGS }.each do |compiler_flag|
         ENV.remove compiler_flag, "-arch x86_64"
         ENV.append compiler_flag, "-arch i386"
@@ -26,7 +22,7 @@ class Yaws < Formula
       system "./configure", "--prefix=#{prefix}"
       system "make install"
 
-      if ARGV.include? '--with-yapp'
+      unless build.include? 'without-yapp'
         cd 'applications/yapp' do
           system "make"
           system "make install"
@@ -34,11 +30,4 @@ class Yaws < Formula
       end
     end
   end
-
-  def caveats; <<-EOS.undent
-    Usually you want to build yapp (yaws applications) as well.
-    To do so, use:
-      brew install yaws --with-yapp
-    EOS
-  end
 end