Use ARGV.include? instead of ARGV.flag? in formula

ARGV.flag? will notice short options, and so ARGV.flag? '--devel' will
be triggered by '-d', which is obviously undesired.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/Library/Formula/libmusicbrainz.rb b/Library/Formula/libmusicbrainz.rb
index 30f6d5764..fcc6348fb 100644
--- a/Library/Formula/libmusicbrainz.rb
+++ b/Library/Formula/libmusicbrainz.rb
@@ -2,7 +2,7 @@ require 'formula'
 
 class Libmusicbrainz < Formula
   homepage 'http://musicbrainz.org'
-  if ARGV.flag? '--devel'
+  if ARGV.include? '--devel'
     version '4.0.0beta1'
     url 'ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-4.0.0beta1.tar.gz'
     md5 '7dffa8fa08e4c0bc8119b8f48a15da41'
diff --git a/Library/Formula/mjpegtools.rb b/Library/Formula/mjpegtools.rb
index a761742bb..22d4dfcaa 100644
--- a/Library/Formula/mjpegtools.rb
+++ b/Library/Formula/mjpegtools.rb
@@ -27,7 +27,7 @@ class Mjpegtools < Formula
     args = ["--disable-dependency-tracking",
             "--enable-simd-accel",
             "--prefix=#{prefix}"]
-    args << "--without-x" if ARGV.flag? "--without-x"
+    args << "--without-x" if ARGV.include? "--without-x"
 
     system "./configure", *args
     system "make install"
diff --git a/Library/Formula/scantailor.rb b/Library/Formula/scantailor.rb
index d285d0704..64432d500 100644
--- a/Library/Formula/scantailor.rb
+++ b/Library/Formula/scantailor.rb
@@ -3,7 +3,7 @@ require 'formula'
 class Scantailor < Formula
   homepage 'http://scantailor.sourceforge.net/'
 
-  unless ARGV.flag? '--enhanced'
+  unless ARGV.include? '--enhanced'
     url 'http://downloads.sourceforge.net/project/scantailor/scantailor/0.9.10/scantailor-0.9.10.tar.gz'
     md5 'f962c93a2d63b449fa3f6612ade3b028'
   else
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 8925a49a4..de64ed2d8 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -13,7 +13,7 @@ end
 class Wine < Formula
   homepage 'http://winehq.org/'
 
-  if ARGV.flag? '--devel'
+  if ARGV.include? '--devel'
     url 'http://downloads.sourceforge.net/project/wine/Source/wine-1.3.32.tar.bz2'
     sha256 'fe1691ef8e9c5c4afeb345ad0f0b364d055cfe67a7e64b0a4a44da4d85cfa8b6'
   else
@@ -27,7 +27,7 @@ class Wine < Formula
   depends_on 'libicns'
 
   # gnutls not needed since 1.3.16
-  depends_on 'gnutls' unless ARGV.flag? '--devel' or ARGV.build_head?
+  depends_on 'gnutls' unless ARGV.include? '--devel' or ARGV.build_head?
 
   fails_with_llvm 'Wine dies with an "Unhandled exception code" when built with LLVM'
 
@@ -74,7 +74,7 @@ EOS
     rm_rf share+'applications'
 
     # Download Gecko once so we don't need to redownload for each prefix
-    gecko = (ARGV.flag? '--devel') ? WineGecko.new : WineGeckoOld.new
+    gecko = (ARGV.include? '--devel') ? WineGecko.new : WineGeckoOld.new
     gecko.brew { (share+'wine/gecko').install Dir["*"] }
 
     # Use a wrapper script, so rename wine to wine.bin
@@ -88,7 +88,7 @@ EOS
   # We have backported Camillo Lugaresi's patch from upstream. The patch can
   # be removed from this formula once it lands in both the devel and stable
   # branches of Wine.
-  if MacOS.lion? and not (ARGV.flag? '--devel' or ARGV.build_head?)
+  if MacOS.lion? and not (ARGV.include? '--devel' or ARGV.build_head?)
     def patches; DATA; end
   end