11 files changed, 14 insertions, 15 deletions
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index cf4e5a9af..946665cd6 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -36,7 +36,7 @@ class Gnuplot < Formula
   depends_on LuaRequirement unless build.include? 'nolua'
   depends_on 'readline'
   depends_on 'pango'       if build.include? 'cairo' or build.include? 'wx'
-  depends_on :x11          if build.with? "x" or MacOS::X11.installed?
+  depends_on :x11          if build.with? "x"
   depends_on 'pdflib-lite' if build.include? 'pdf'
   depends_on 'gd'          unless build.include? 'nogd'
   depends_on 'wxmac'       if build.include? 'wx'
diff --git a/Library/Formula/gource.rb b/Library/Formula/gource.rb
index 1425d65bc..75037c39c 100644
--- a/Library/Formula/gource.rb
+++ b/Library/Formula/gource.rb
@@ -13,7 +13,7 @@ class Gource < Formula
     depends_on :libtool
   end
 
-  depends_on :x11 if MacOS::X11.installed?
+  depends_on :x11 => :optional
   depends_on :freetype
 
   depends_on 'pkg-config' => :build
diff --git a/Library/Formula/gpac.rb b/Library/Formula/gpac.rb
index a5b916403..41579dc10 100644
--- a/Library/Formula/gpac.rb
+++ b/Library/Formula/gpac.rb
@@ -15,7 +15,7 @@ class Gpac < Formula
 
   head 'https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac'
 
-  depends_on :x11 => MacOS::X11.installed? ? :recommended : :optional
+  depends_on :x11 => :recommended
 
   depends_on 'pkg-config' => :build
   depends_on 'a52dec' => :optional
diff --git a/Library/Formula/graphviz.rb b/Library/Formula/graphviz.rb
index 8fed50c95..08c835626 100644
--- a/Library/Formula/graphviz.rb
+++ b/Library/Formula/graphviz.rb
@@ -18,7 +18,6 @@ class Graphviz < Formula
   option :universal
   option 'with-bindings', 'Build Perl/Python/Ruby/etc. bindings'
   option 'with-pangocairo', 'Build with Pango/Cairo for alternate PDF output'
-  option 'with-freetype', 'Build with FreeType support'
   option 'with-x', 'Build with X11 support'
   option 'with-app', 'Build GraphViz.app (requires full XCode install)'
   option 'with-gts', 'Build with GNU GTS support (required by prism)'
@@ -30,8 +29,8 @@ class Graphviz < Formula
   depends_on 'swig' if build.with? "bindings"
   depends_on 'gts' => :optional
   depends_on "librsvg" => :optional
-  depends_on "freetype" if build.with? "freetype" or MacOS::X11.installed?
-  depends_on :x11 if build.with? "x" or MacOS::X11.installed?
+  depends_on "freetype" => :optional
+  depends_on :x11 if build.with? "x"
   depends_on :xcode if build.with? "app"
 
   fails_with :clang do
@@ -53,8 +52,8 @@ class Graphviz < Formula
     args << "--with-gts" if build.with? 'gts'
     args << "--disable-swig" if build.without? "bindings"
     args << "--without-pangocairo" if build.without? "pangocairo"
-    args << "--without-freetype2" if build.without? "freetype" or MacOS::X11.installed?
-    args << "--without-x" if build.without? "x" or MacOS::X11.installed?
+    args << "--without-freetype2" if build.without? "freetype"
+    args << "--without-x" if build.without? "x"
     args << "--without-rsvg" if build.without? "librsvg"
 
     system "./configure", *args
diff --git a/Library/Formula/imlib2.rb b/Library/Formula/imlib2.rb
index c244f9638..78497c403 100644
--- a/Library/Formula/imlib2.rb
+++ b/Library/Formula/imlib2.rb
@@ -10,7 +10,7 @@ class Imlib2 < Formula
 
   depends_on 'freetype'
   depends_on 'libpng' => :recommended
-  depends_on :x11 if MacOS::X11.installed? or build.with? "x"
+  depends_on :x11 if build.with? "x"
   depends_on 'pkg-config' => :build
   depends_on 'jpeg' => :recommended
 
diff --git a/Library/Formula/libcaca.rb b/Library/Formula/libcaca.rb
index 532981dc5..c11c875ec 100644
--- a/Library/Formula/libcaca.rb
+++ b/Library/Formula/libcaca.rb
@@ -8,7 +8,7 @@ class Libcaca < Formula
 
   option 'with-imlib2', 'Build with Imlib2 support'
 
-  depends_on :x11 if MacOS::X11.installed? or build.with? "imlib2"
+  depends_on :x11 if build.with? "imlib2"
 
   if build.with? "imlib2"
     depends_on 'pkg-config' => :build
diff --git a/Library/Formula/mit-scheme.rb b/Library/Formula/mit-scheme.rb
index 6abe8df0a..299e20acc 100644
--- a/Library/Formula/mit-scheme.rb
+++ b/Library/Formula/mit-scheme.rb
@@ -8,7 +8,7 @@ class MitScheme < Formula
 
   conflicts_with 'tinyscheme', :because => 'both install a `scheme` binary'
 
-  depends_on :x11 if MacOS::X11.installed?
+  depends_on :x11 => :optional
 
   def install
     # The build breaks __HORRIBLY__ with parallel make -- one target will erase something
diff --git a/Library/Formula/mjpegtools.rb b/Library/Formula/mjpegtools.rb
index a4a40afe8..1ef557f2f 100644
--- a/Library/Formula/mjpegtools.rb
+++ b/Library/Formula/mjpegtools.rb
@@ -5,7 +5,7 @@ class Mjpegtools < Formula
   url 'https://downloads.sourceforge.net/project/mjpeg/mjpegtools/2.1.0/mjpegtools-2.1.0.tar.gz'
   sha1 'b9effa86280e23d67369e842e5cb645948583097'
 
-  depends_on :x11 if MacOS::X11.installed?
+  depends_on :x11 => :optional
 
   depends_on 'pkg-config' => :build
   depends_on 'jpeg'
diff --git a/Library/Formula/ngspice.rb b/Library/Formula/ngspice.rb
index a2ebbd8ee..72d005439 100644
--- a/Library/Formula/ngspice.rb
+++ b/Library/Formula/ngspice.rb
@@ -8,7 +8,7 @@ class Ngspice < Formula
   option "with-x", "Build with X support"
   option "without-xspice", "Build without x-spice extensions"
 
-  depends_on :x11 if MacOS::X11.installed? or build.with? "x"
+  depends_on :x11 if build.with? "x"
 
   def install
     args = %W[
diff --git a/Library/Formula/objective-caml.rb b/Library/Formula/objective-caml.rb
index 4efb366d8..d4610917e 100644
--- a/Library/Formula/objective-caml.rb
+++ b/Library/Formula/objective-caml.rb
@@ -9,7 +9,7 @@ class ObjectiveCaml < Formula
 
   revision 1
 
-  depends_on :x11 if MacOS::X11.installed?
+  depends_on :x11
 
   bottle do
     revision 3
diff --git a/Library/Formula/plplot.rb b/Library/Formula/plplot.rb
index c35b194ca..432e58b67 100644
--- a/Library/Formula/plplot.rb
+++ b/Library/Formula/plplot.rb
@@ -16,7 +16,7 @@ class Plplot < Formula
     args = std_cmake_args
     args << '-DPLD_wxwidgets=OFF' << '-DENABLE_wxwidgets=OFF'
     args << '-DENABLE_java=OFF' if build.without? 'java'
-    args << '-DPLD_xcairo=OFF' unless MacOS::X11.installed?
+    args << '-DPLD_xcairo=OFF' if build.without? 'x11'
     mkdir "plplot-build" do
       system "cmake", "..", *args
       system "make"