Fix option usage

11 files changed, 26 insertions, 27 deletions

diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
index 606ca688c..a85b694e9 100644
--- a/Library/Formula/avidemux.rb
+++ b/Library/Formula/avidemux.rb
@@ -33,7 +33,7 @@ class Avidemux < Formula
   fails_with :clang do
     build 318
     cause "error in backend: Couldn't allocate input reg for constraint"
-  end unless build.include? '--with-debug'
+  end unless build.include? 'with-debug'
 
   def patches
     # Symbols undefined due to optimization.  Fixed in head. Remove @ 2.5.7.
@@ -77,7 +77,7 @@ class Avidemux < Formula
         -DGTK=OFF
         -DSDL=OFF
       ]
-      if build.include? '--with-debug' then
+      if build.include? 'with-debug' then
         (ENV.compiler == :clang) ? ENV.Og : ENV.O2
         ENV.deparallelize
         ENV.remove_from_cflags '-w'
@@ -125,7 +125,7 @@ class Avidemux < Formula
         -DAVIDEMUX_INSTALL_PREFIX=#{prefix}
         -DAVIDEMUX_CORECONFIG_DIR=#{buildpath}/corebuild/config
       ]
-      if build.include? '--with-debug' then
+      if build.include? 'with-debug' then
         args << '-DCMAKE_BUILD_TYPE=Debug'
         args << '-DCMAKE_VERBOSE_MAKEFILE=true'
         if ENV.compiler != :clang
diff --git a/Library/Formula/avrdude.rb b/Library/Formula/avrdude.rb
index 10fc19fa7..0d920423d 100644
--- a/Library/Formula/avrdude.rb
+++ b/Library/Formula/avrdude.rb
@@ -7,7 +7,7 @@ class Avrdude < Formula
 
   option 'with-usb', 'Compile AVRDUDE with USB support.'
 
-  depends_on 'libusb-compat' if build.include? '--with-usb'
+  depends_on 'libusb-compat' if build.include? 'with-usb'
 
   def install
     system "./configure", "--disable-dependency-tracking",
diff --git a/Library/Formula/bazaar.rb b/Library/Formula/bazaar.rb
index d231822a0..c73c8da56 100644
--- a/Library/Formula/bazaar.rb
+++ b/Library/Formula/bazaar.rb
@@ -14,13 +14,13 @@ class Bazaar < Formula
     system "make man1/bzr.1"
     man1.install "man1/bzr.1"
 
-    if build.include? "--system"
+    if build.include? "system"
       ENV.prepend "PATH", "/System/Library/Frameworks/Python.framework/Versions/Current/bin", ":"
     end
 
     # Find the arch for the Python we are building against.
     # We remove 'ppc' support, so we can pass Intel-optimized CFLAGS.
-    if build.include? "--system"
+    if build.include? "system"
       python_cmd = "/usr/bin/python"
     else
       python_cmd = "python"
@@ -31,7 +31,7 @@ class Bazaar < Formula
     ENV['ARCHFLAGS'] = archs.as_arch_flags
 
     system "make"
-    inreplace "bzr", "#! /usr/bin/env python", "#!/usr/bin/python" if build.include? "--system"
+    inreplace "bzr", "#! /usr/bin/env python", "#!/usr/bin/python" if build.include? "system"
     libexec.install 'bzr', 'bzrlib'
 
     bin.install_symlink libexec+'bzr'
diff --git a/Library/Formula/berkeley-db.rb b/Library/Formula/berkeley-db.rb
index 98eca722d..711c3ab5a 100644
--- a/Library/Formula/berkeley-db.rb
+++ b/Library/Formula/berkeley-db.rb
@@ -15,7 +15,7 @@ class BerkeleyDb < Formula
             "--prefix=#{prefix}",
             "--mandir=#{man}",
             "--enable-cxx"]
-    args << "--enable-java" unless build.include? "--without-java"
+    args << "--enable-java" unless build.include? "without-java"
 
     # BerkeleyDB requires you to build everything from the build_unix subdirectory
     cd 'build_unix' do
diff --git a/Library/Formula/bitlbee.rb b/Library/Formula/bitlbee.rb
index 08b78a592..c7b9a1a7f 100644
--- a/Library/Formula/bitlbee.rb
+++ b/Library/Formula/bitlbee.rb
@@ -9,7 +9,7 @@ class Bitlbee < Formula
 
   depends_on 'glib'
   depends_on 'gnutls'
-  depends_on 'libpurple' if build.include? '--purple'
+  depends_on 'libpurple' if build.include? 'purple'
 
   def install
     # By default Homebrew will set ENV['LD'] to the same as ENV['CC'] which
@@ -26,7 +26,7 @@ class Bitlbee < Formula
             "--config=#{var}/bitlbee/lib/",
             "--ipsocket=#{var}/bitlbee/run/bitlbee.sock"]
 
-    args << "--purple=1" if build.include? "--purple"
+    args << "--purple=1" if build.include? "purple"
 
     system "./configure", *args
 
diff --git a/Library/Formula/blahtexml.rb b/Library/Formula/blahtexml.rb
index 374bb5379..cf544664e 100644
--- a/Library/Formula/blahtexml.rb
+++ b/Library/Formula/blahtexml.rb
@@ -7,12 +7,12 @@ class Blahtexml < Formula
 
   option 'blahtex-only', "Build only blahtex, not blahtexml"
 
-  depends_on 'xerces-c' unless build.include? '--blahtex-only'
+  depends_on 'xerces-c' unless build.include? 'blahtex-only'
 
   def install
     system "make blahtex-mac"
     bin.install 'blahtex'
-    unless build.include? '--blahtex-only'
+    unless build.include? 'blahtex-only'
       system "make blahtexml-mac"
       bin.install 'blahtexml'
     end
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 3d098b45b..0c264deae 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -35,7 +35,7 @@ class Boost < Formula
   option 'with-icu', 'Build regexp engine with icu support'
 
   depends_on UniversalPython.new if needs_universal_python?
-  depends_on "icu4c" if build.include? "--with-icu"
+  depends_on "icu4c" if build.include? "with-icu"
 
   fails_with :llvm do
     build 2335
@@ -64,13 +64,13 @@ class Boost < Formula
     # Force boost to compile using the appropriate GCC version
     open("user-config.jam", "a") do |file|
       file.write "using darwin : : #{ENV.cxx} ;\n"
-      file.write "using mpi ;\n" if build.include? '--with-mpi'
+      file.write "using mpi ;\n" if build.include? 'with-mpi'
     end
 
     # we specify libdir too because the script is apparently broken
     bargs = ["--prefix=#{prefix}", "--libdir=#{lib}"]
 
-    if build.include? "--with-icu"
+    if build.include? "with-icu"
       icu4c_prefix = Formula.factory('icu4c').prefix
       bargs << "--with-icu=#{icu4c_prefix}"
     end
@@ -84,7 +84,7 @@ class Boost < Formula
             "install"]
 
     args << "address-model=32_64" << "architecture=x86" << "pch=off" if build.universal?
-    args << "--without-python" if build.include? "--without-python"
+    args << "--without-python" if build.include? "without-python"
 
     system "./bootstrap.sh", *bargs
     system "./bjam", *args
diff --git a/Library/Formula/botan.rb b/Library/Formula/botan.rb
index 6d4eb08db..fc7cbdbc5 100644
--- a/Library/Formula/botan.rb
+++ b/Library/Formula/botan.rb
@@ -10,7 +10,7 @@ class Botan < Formula
   def install
     args = ["--prefix=#{prefix}"]
     args << "--cpu=x86_64" if MacOS.prefer_64_bit?
-    args << "--enable-debug" if build.include? "--enable-debug"
+    args << "--enable-debug" if build.include? "enable-debug"
     # The --cc option needs "clang" or "gcc" and not the full path.
     args << "--cc=#{ENV.compiler.to_s}"
 
diff --git a/Library/Formula/bullet.rb b/Library/Formula/bullet.rb
index 4872ec081..33a090a33 100644
--- a/Library/Formula/bullet.rb
+++ b/Library/Formula/bullet.rb
@@ -18,24 +18,24 @@ class Bullet < Formula
   def install
     args = []
 
-    if build.include? "--framework"
+    if build.include? "framework"
       args << "-DBUILD_SHARED_LIBS=ON" << "-DFRAMEWORK=ON"
       args << "-DCMAKE_INSTALL_PREFIX=#{prefix}/Frameworks"
       args << "-DCMAKE_INSTALL_NAME_DIR=#{prefix}/Frameworks"
     else
-      args << "-DBUILD_SHARED_LIBS=ON" if build.include? "--shared"
+      args << "-DBUILD_SHARED_LIBS=ON" if build.include? "shared"
       args << "-DCMAKE_INSTALL_PREFIX=#{prefix}"
     end
 
     args << "-DCMAKE_OSX_ARCHITECTURES='i386;x86_64'" if build.universal?
-    args << "-DBUILD_DEMOS=OFF" if not build.include? "--build-demo"
-    args << "-DBUILD_EXTRAS=OFF" if not build.include? "--build-extra"
+    args << "-DBUILD_DEMOS=OFF" if not build.include? "build-demo"
+    args << "-DBUILD_EXTRAS=OFF" if not build.include? "build-extra"
 
     system "cmake", *args
     system "make"
     system "make install"
 
-    prefix.install 'Demos' if build.include? "--build-demo"
-    prefix.install 'Extras' if build.include? "--build-extra"
+    prefix.install 'Demos' if build.include? "build-demo"
+    prefix.install 'Extras' if build.include? "build-extra"
   end
 end
diff --git a/Library/Formula/camlp5.rb b/Library/Formula/camlp5.rb
index 3aa2e0bf6..40d995351 100644
--- a/Library/Formula/camlp5.rb
+++ b/Library/Formula/camlp5.rb
@@ -10,8 +10,7 @@ class Camlp5 < Formula
   option 'strict', 'Compile in strict mode'
 
   def install
-    # compile for strict or transitional
-    if build.include? '--strict'
+    if build.include? 'strict'
       strictness = "-strict"
     else
       strictness = "-transitional"
diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb
index a3dd87b90..b458fc80e 100644
--- a/Library/Formula/wget.rb
+++ b/Library/Formula/wget.rb
@@ -11,7 +11,7 @@ class Wget < Formula
   option "enable-iri", "Enable iri support"
 
   depends_on "openssl" if MacOS.leopard?
-  depends_on "libidn" if build.include? "--enable-iri"
+  depends_on "libidn" if build.include? "enable-iri"
 
   if build.head?
     depends_on "autoconf" => :build
@@ -26,7 +26,7 @@ class Wget < Formula
             "--sysconfdir=#{etc}",
             "--with-ssl=openssl"]
 
-    args << "--disable-iri" unless build.include? "--enable-iri"
+    args << "--disable-iri" unless build.include? "enable-iri"
 
     system "./configure", *args
     system "make install"