mplayer: make x11 option name more consistent.

1 files changed, 6 insertions, 5 deletions

diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index d99d11106..aabd38eed 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -30,14 +30,15 @@ class Mplayer < Formula
     patch :DATA
   end
 
-  option 'with-x', 'Build with X11 support'
   option 'without-osd', 'Build without OSD'
 
   depends_on 'yasm' => :build
   depends_on 'libcaca' => :optional
-  depends_on :x11 if build.with? 'x'
+  depends_on :x11 => :optional
 
-  if build.with? 'osd' or build.with? 'x'
+  deprecated_option "with-x", "with-x11"
+
+  if build.with? 'osd' or build.with? 'x11'
     # These are required for the OSD. We can get them from X11, or we can
     # build our own.
     depends_on "fontconfig"
@@ -69,8 +70,8 @@ class Mplayer < Formula
     ]
 
     args << "--enable-menu" if build.with? 'osd'
-    args << "--disable-x11" if build.without? 'x'
-    args << "--enable-freetype" if build.with?('osd') || build.with?('x')
+    args << "--disable-x11" if build.without? 'x11'
+    args << "--enable-freetype" if build.with?('osd') || build.with?('x11')
     args << "--enable-caca" if build.with? 'libcaca'
 
     system "./configure", *args