Adjust XQuartz/X11 module naming scheme

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

32 files changed, 66 insertions, 56 deletions

diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb
index 784d9f6fe..b208ed2d1 100644
--- a/Library/Formula/bsdmake.rb
+++ b/Library/Formula/bsdmake.rb
@@ -32,7 +32,7 @@ class Bsdmake < Formula
                  '@PREFIX@', prefix
 
     # X11 path shouldn't be munged
-    inreplace 'mk/sys.mk', '@PREFIX@', MacOS::XQuartz.prefix
+    inreplace 'mk/sys.mk', '@PREFIX@', MacOS::X11.prefix
 
     inreplace 'mk/bsd.own.mk' do |s|
       s.gsub! '@INSTALL_USER@', `id -un`.chomp
diff --git a/Library/Formula/fox.rb b/Library/Formula/fox.rb
index 0d661224b..90b811f59 100644
--- a/Library/Formula/fox.rb
+++ b/Library/Formula/fox.rb
@@ -19,9 +19,9 @@ class Fox < Formula
 
   def install
     # Yep, won't find freetype unless this is all set.
-    ENV.append "CFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
-    ENV.append "CPPFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
-    ENV.append "CXXFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
+    ENV.append "CFLAGS", "-I#{MacOS::X11.include}/freetype2"
+    ENV.append "CPPFLAGS", "-I#{MacOS::X11.include}/freetype2"
+    ENV.append "CXXFLAGS", "-I#{MacOS::X11.include}/freetype2"
 
     system "./configure", "--enable-release",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index 10185e031..dd1273f9c 100644
--- a/Library/Formula/gd.rb
+++ b/Library/Formula/gd.rb
@@ -17,7 +17,7 @@ class Gd < Formula
   end
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--with-freetype=#{MacOS::XQuartz.prefix}"
+    system "./configure", "--prefix=#{prefix}", "--with-freetype=#{MacOS::X11.prefix}"
     system "make install"
     (lib+'pkgconfig/gdlib.pc').write pkg_file
   end
diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index 889053c8c..e6cb3db2b 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -110,7 +110,7 @@ class Gdal < Formula
 
       # Backends supported by OS X.
       "--with-libz=/usr",
-      "--with-png=#{MacOS::XQuartz.prefix}",
+      "--with-png=#{MacOS::X11.prefix}",
       "--with-expat=/usr",
 
       # Default Homebrew backends.
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index 2ee013d25..8dde4d2aa 100644
--- a/Library/Formula/ghostscript.rb
+++ b/Library/Formula/ghostscript.rb
@@ -39,7 +39,7 @@ class Ghostscript < Formula
   def install
     ENV.deparallelize
     # ghostscript configure ignores LDFLAGs apparently
-    ENV['LIBS'] = "-L#{MacOS::XQuartz.lib}"
+    ENV['LIBS'] = "-L#{MacOS::X11.lib}"
 
     src_dir = ARGV.build_head? ? "gs" : "."
 
diff --git a/Library/Formula/gnu-shogi.rb b/Library/Formula/gnu-shogi.rb
index 4e7cd417e..dc2e9a4cd 100644
--- a/Library/Formula/gnu-shogi.rb
+++ b/Library/Formula/gnu-shogi.rb
@@ -23,8 +23,8 @@ class GnuShogi < Formula
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--x-include=#{MacOS::XQuartz.include}",
-                          "--x-lib=#{MacOS::XQuartz.lib}"
+                          "--x-include=#{MacOS::X11.include}",
+                          "--x-lib=#{MacOS::X11.lib}"
     system "make"
     system "make", "install", "MANDIR=#{man6}", "INFODIR=#{info}"
   end
diff --git a/Library/Formula/gpac.rb b/Library/Formula/gpac.rb
index ba8ab19b4..f7862afb2 100644
--- a/Library/Formula/gpac.rb
+++ b/Library/Formula/gpac.rb
@@ -37,9 +37,9 @@ class Gpac < Formula
             "--prefix=#{prefix}",
             "--mandir=#{man}",
             # gpac build system is barely functional
-            "--extra-cflags=-I#{MacOS::XQuartz.include}",
+            "--extra-cflags=-I#{MacOS::X11.include}",
             # Force detection of X libs on 64-bit kernel
-            "--extra-ldflags=-L#{MacOS::XQuartz.lib}"]
+            "--extra-ldflags=-L#{MacOS::X11.lib}"]
 
     system "chmod +x configure"
     system "./configure", *args
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb
index 92fb15cb9..cc5826801 100644
--- a/Library/Formula/grass.rb
+++ b/Library/Formula/grass.rb
@@ -60,7 +60,7 @@ class Grass < Formula
 
     args = [
       "--disable-debug", "--disable-dependency-tracking",
-      "--with-libs=#{MacOS::XQuartz.lib} #{HOMEBREW_PREFIX}/lib",
+      "--with-libs=#{MacOS::X11.lib} #{HOMEBREW_PREFIX}/lib",
       "--with-includes=#{HOMEBREW_PREFIX}/include",
       "--enable-largefile",
       "--enable-shared",
@@ -74,7 +74,7 @@ class Grass < Formula
       "--with-sqlite",
       "--with-odbc",
       "--with-geos=#{HOMEBREW_PREFIX}/bin/geos-config",
-      "--with-png-includes=#{MacOS::XQuartz.include}",
+      "--with-png-includes=#{MacOS::X11.include}",
       "--with-png",
       "--with-readline-includes=#{readline.include}",
       "--with-readline-libs=#{readline.lib}",
@@ -82,7 +82,7 @@ class Grass < Formula
       "--with-nls-includes=#{gettext.include}",
       "--with-nls-libs=#{gettext.lib}",
       "--with-nls",
-      "--with-freetype-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.include}/freetype2",
+      "--with-freetype-includes=#{MacOS::X11.include} #{MacOS::X11.include}/freetype2",
       "--with-freetype",
       "--without-tcltk" # Disabled due to compatibility issues with OS X Tcl/Tk
     ]
@@ -106,7 +106,7 @@ class Grass < Formula
       args << "--with-cairo-includes=#{cairo.include}/cairo"
       args << "--with-cairo-libs=#{cairo.lib}"
     else
-      args << "--with-cairo-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.include}/cairo"
+      args << "--with-cairo-includes=#{MacOS::X11.include} #{MacOS::X11.include}/cairo"
     end
 
     args << "--with-cairo"
diff --git a/Library/Formula/libharu.rb b/Library/Formula/libharu.rb
index ce3dd1f19..761405bf5 100644
--- a/Library/Formula/libharu.rb
+++ b/Library/Formula/libharu.rb
@@ -21,7 +21,7 @@ class Libharu < Formula
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           # libpng doesn't get picked up
-                          "--with-png=#{MacOS::XQuartz.prefix}"
+                          "--with-png=#{MacOS::X11.prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
index ecaad9980..e2dcb8714 100644
--- a/Library/Formula/libwmf.rb
+++ b/Library/Formula/libwmf.rb
@@ -12,7 +12,7 @@ class Libwmf < Formula
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--with-freetype=#{MacOS::XQuartz.prefix}"
+                          "--with-freetype=#{MacOS::X11.prefix}"
     system "make"
     ENV.j1 # yet another rubbish Makefile
     system "make install"
diff --git a/Library/Formula/mame.rb b/Library/Formula/mame.rb
index 6daf2a79b..c62f84c8e 100644
--- a/Library/Formula/mame.rb
+++ b/Library/Formula/mame.rb
@@ -12,7 +12,7 @@ class Mame < Formula
 
   def install
     ENV['MACOSX_USE_LIBSDL'] = '1'
-    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.include}"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::X11.include}"
     ENV['PTR64'] = (MacOS.prefer_64_bit? ? '1' : '0')
 
     system 'make', 'TARGET=mame', 'SUBTARGET=mame'
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index 260bc1527..dd1a953ac 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -29,7 +29,7 @@ class Mapserver < Formula
       "--with-proj",
       "--with-gdal",
       "--with-ogr",
-      "--with-png=#{MacOS::XQuartz.prefix}"
+      "--with-png=#{MacOS::X11.prefix}"
     ]
 
     args.push "--with-geos" if ARGV.include? '--with-geos'
diff --git a/Library/Formula/mesalib-glw.rb b/Library/Formula/mesalib-glw.rb
index 1e643c1ef..b145e53b8 100644
--- a/Library/Formula/mesalib-glw.rb
+++ b/Library/Formula/mesalib-glw.rb
@@ -30,7 +30,7 @@ class MesalibGlw < Formula
     inreplace 'configs/autoconf' do |s|
       s.gsub! /.so/, '.dylib'
       s.gsub! /SRC_DIRS = mesa glw/, 'SRC_DIRS = glw'
-      s.gsub! /-L\$\(TOP\)\/\$\(LIB_DIR\)/, "-L#{MacOS::XQuartz.lib}"
+      s.gsub! /-L\$\(TOP\)\/\$\(LIB_DIR\)/, "-L#{MacOS::X11.lib}"
     end
 
     inreplace 'src/glw/Makefile' do |s|
diff --git a/Library/Formula/mess.rb b/Library/Formula/mess.rb
index 84dce27e3..ae40b664f 100644
--- a/Library/Formula/mess.rb
+++ b/Library/Formula/mess.rb
@@ -12,7 +12,7 @@ class Mess < Formula
 
   def install
     ENV['MACOSX_USE_LIBSDL'] = '1'
-    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.include}"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::X11.include}"
     ENV['PTR64'] = (MacOS.prefer_64_bit? ? '1' : '0')
 
     system 'make'
diff --git a/Library/Formula/pdf2image.rb b/Library/Formula/pdf2image.rb
index 9308e7d1c..f8e09ecc0 100644
--- a/Library/Formula/pdf2image.rb
+++ b/Library/Formula/pdf2image.rb
@@ -15,7 +15,7 @@ class Pdf2image < Formula
     inreplace "Makefile", "/man/", "/share/man/"
 
     # Add X11 libs manually; the Makefiles don't use LDFLAGS properly
-    inreplace ["src/Makefile", "xpdf/Makefile"], "LDFLAGS =", "LDFLAGS=-L#{MacOS::XQuartz.lib}"
+    inreplace ["src/Makefile", "xpdf/Makefile"], "LDFLAGS =", "LDFLAGS=-L#{MacOS::X11.lib}"
 
     system "make"
     system "make install"
diff --git a/Library/Formula/pil.rb b/Library/Formula/pil.rb
index 810a6de2d..6eb951002 100644
--- a/Library/Formula/pil.rb
+++ b/Library/Formula/pil.rb
@@ -22,10 +22,10 @@ class Pil < Formula
     inreplace "setup.py" do |s|
       # Tell setup where Freetype2 is on 10.5/10.6
       s.gsub! 'add_directory(include_dirs, "/sw/include/freetype2")',
-              "add_directory(include_dirs, \"#{MacOS::XQuartz.include}\")"
+              "add_directory(include_dirs, \"#{MacOS::X11.include}\")"
 
       s.gsub! 'add_directory(include_dirs, "/sw/lib/freetype2/include")',
-              "add_directory(library_dirs, \"#{MacOS::XQuartz.lib}\")"
+              "add_directory(library_dirs, \"#{MacOS::X11.lib}\")"
 
       # Tell setup where our stuff is
       s.gsub! 'add_directory(library_dirs, "/sw/lib")',
diff --git a/Library/Formula/rom-tools.rb b/Library/Formula/rom-tools.rb
index 0fd678d8d..3e5df4b00 100644
--- a/Library/Formula/rom-tools.rb
+++ b/Library/Formula/rom-tools.rb
@@ -12,7 +12,7 @@ class RomTools < Formula
 
   def install
     ENV['MACOSX_USE_LIBSDL'] = '1'
-    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.include}"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::X11.include}"
     ENV['PTR64'] = (MacOS.prefer_64_bit? ? '1' : '0')
 
     system 'make romcmp'
diff --git a/Library/Formula/s-lang.rb b/Library/Formula/s-lang.rb
index c45f7ce07..78abc4235 100644
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -11,8 +11,8 @@ class SLang < Formula
 
   def install
     system "./configure", "--prefix=#{prefix}",
-                          "--with-pnglib=#{MacOS::XQuartz.lib}",
-                          "--with-pnginc=#{MacOS::XQuartz.include}"
+                          "--with-pnglib=#{MacOS::X11.lib}",
+                          "--with-pnginc=#{MacOS::X11.include}"
     ENV.j1
     system "make"
     system "make install"
diff --git a/Library/Formula/scantailor.rb b/Library/Formula/scantailor.rb
index 849a29353..a1201a422 100644
--- a/Library/Formula/scantailor.rb
+++ b/Library/Formula/scantailor.rb
@@ -24,7 +24,7 @@ class Scantailor < Formula
   end
 
   def install
-    system "cmake", ".", "-DPNG_INCLUDE_DIR=#{MacOS::XQuartz.include}", *std_cmake_args
+    system "cmake", ".", "-DPNG_INCLUDE_DIR=#{MacOS::X11.include}", *std_cmake_args
     system "make install"
   end
 end
diff --git a/Library/Formula/sqsh.rb b/Library/Formula/sqsh.rb
index 0aceae8c3..5f64b52ed 100644
--- a/Library/Formula/sqsh.rb
+++ b/Library/Formula/sqsh.rb
@@ -24,8 +24,8 @@ class Sqsh < Formula
 
     if ARGV.include? "--with-x"
       args << "--with-x"
-      args << "--x-libraries=#{MacOS::XQuartz.lib}"
-      args << "--x-includes=#{MacOS::XQuartz.include}"
+      args << "--x-libraries=#{MacOS::X11.lib}"
+      args << "--x-includes=#{MacOS::X11.include}"
     end
 
     ENV['SYBASE'] = Freetds.new("freetds").prefix
diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb
index 6b9ac3ece..135f114ef 100644
--- a/Library/Formula/swi-prolog.rb
+++ b/Library/Formula/swi-prolog.rb
@@ -12,7 +12,7 @@ class SwiProlog < Formula
   depends_on 'jpeg'
   depends_on 'mcrypt'
   depends_on 'gawk'
-  depends_on :x11 if MacOS::XQuartz.installed?
+  depends_on :x11 if MacOS::X11.installed?
 
   # 10.5 versions of these are too old
   if MacOS.leopard?
@@ -34,7 +34,7 @@ class SwiProlog < Formula
     args = ["--prefix=#{prefix}", "--mandir=#{man}"]
     ENV.append 'DISABLE_PKGS', "jpl" if ARGV.include? "--without-jpl"
 
-    unless MacOS::XQuartz.installed?
+    unless MacOS::X11.installed?
       # SWI-Prolog requires X11 for XPCE
       opoo "It appears that X11 is not installed. The XPCE packages will not be built."
       ENV.append 'DISABLE_PKGS', "xpce"
diff --git a/Library/Formula/tabbed.rb b/Library/Formula/tabbed.rb
index 25642e55b..24efc91c3 100644
--- a/Library/Formula/tabbed.rb
+++ b/Library/Formula/tabbed.rb
@@ -9,7 +9,7 @@ class Tabbed < Formula
   depends_on :x11
 
   def install
-    inreplace 'config.mk', "LIBS = -L/usr/lib -lc -lX11', 'LIBS = -L#{MacOS::XQuartz.lib} -lc -lX11"
+    inreplace 'config.mk', "LIBS = -L/usr/lib -lc -lX11', 'LIBS = -L#{MacOS::X11.lib} -lc -lX11"
     inreplace 'tabbed.1', 'new surf-window.', 'new xterm-window.'
     inreplace 'config.def.h',
       '{ MODKEY|ShiftMask,             XK_Return, spawn,          { .v = (char*[]){ "surf", "-e", winid, NULL} } },',
diff --git a/Library/Formula/thrift.rb b/Library/Formula/thrift.rb
index be1c29dbf..bcceac526 100644
--- a/Library/Formula/thrift.rb
+++ b/Library/Formula/thrift.rb
@@ -13,7 +13,7 @@ class Thrift < Formula
     # No reason for this step is known. On Lion at least the pkg.m4 doesn't
     # even exist. Turns out that it isn't needed on Lion either. Possibly it
     # isn't needed anymore at all but I can't test that.
-    cp "#{MacOS::XQuartz.share}/aclocal/pkg.m4", "aclocal" if MACOS_VERSION < 10.7
+    cp "#{MacOS::X11.share}/aclocal/pkg.m4", "aclocal" if MACOS_VERSION < 10.7
 
     system "./bootstrap.sh" if ARGV.build_head?
 
diff --git a/Library/Formula/tiff2png.rb b/Library/Formula/tiff2png.rb
index fd10e6c5b..98e690084 100644
--- a/Library/Formula/tiff2png.rb
+++ b/Library/Formula/tiff2png.rb
@@ -18,8 +18,8 @@ class Tiff2png < Formula
                                          "LIBTIFF=#{HOMEBREW_PREFIX}/lib",
                                          "TIFFINC=#{HOMEBREW_PREFIX}/include",
                                          "LIBJPEG=#{HOMEBREW_PREFIX}/lib",
-                                         "LIBPNG=#{MacOS::XQuartz.lib}",
-                                         "PNGINC=#{MacOS::XQuartz.include}",
+                                         "LIBPNG=#{MacOS::X11.lib}",
+                                         "PNGINC=#{MacOS::X11.include}",
                                          "ZLIB=/usr/lib",
                                          "DEBUGFLAGS="
     bin.install 'tiff2png'
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 33b673f8c..0a7a1b5a2 100644
--- a/Library/Formula/wine.rb
+++ b/Library/Formula/wine.rb
@@ -46,7 +46,7 @@ class Wine < Formula
 
   def wine_wrapper; <<-EOS.undent
     #!/bin/sh
-    DYLD_FALLBACK_LIBRARY_PATH="#{MacOS::XQuartz.lib}:#{HOMEBREW_PREFIX}/lib:/usr/lib" "#{bin}/wine.bin" "$@"
+    DYLD_FALLBACK_LIBRARY_PATH="#{MacOS::X11.lib}:#{HOMEBREW_PREFIX}/lib:/usr/lib" "#{bin}/wine.bin" "$@"
     EOS
   end
 
@@ -67,8 +67,8 @@ class Wine < Formula
     ENV.append "LDFLAGS", "#{build32} -framework CoreServices -lz -lGL -lGLU"
 
     args = ["--prefix=#{prefix}",
-            "--x-include=#{MacOS::XQuartz.include}",
-            "--x-lib=#{MacOS::XQuartz.lib}",
+            "--x-include=#{MacOS::X11.include}",
+            "--x-lib=#{MacOS::X11.lib}",
             "--with-x",
             "--with-coreaudio",
             "--with-opengl"]
diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index 5a90abc25..84e951e14 100644
--- a/Library/Formula/xpdf.rb
+++ b/Library/Formula/xpdf.rb
@@ -12,7 +12,7 @@ class Xpdf < Formula
   def patches; DATA; end
 
   def install
-    ENV.append_to_cflags "-I#{MacOS::XQuartz.include} -#{MacOS::XQuartz.include}/freetype2"
+    ENV.append_to_cflags "-I#{MacOS::X11.include} -#{MacOS::X11.include}/freetype2"
 
     system "./configure", "--prefix=#{prefix}", "--mandir=#{man}"
     system "make"
diff --git a/Library/Formula/xspringies.rb b/Library/Formula/xspringies.rb
index eb8d14532..a19114c50 100644
--- a/Library/Formula/xspringies.rb
+++ b/Library/Formula/xspringies.rb
@@ -9,7 +9,7 @@ class Xspringies < Formula
 
   def install
     inreplace 'Makefile.std' do |s|
-      s.change_make_var! "LIBS", "-L#{MacOS::XQuartz.lib} -lm -lX11"
+      s.change_make_var! "LIBS", "-L#{MacOS::X11.lib} -lm -lX11"
       s.gsub! 'mkdirhier', 'mkdir -p'
     end
     system "make", "-f", "Makefile.std", "DDIR=#{prefix}/", "install"
diff --git a/Library/Formula/zint.rb b/Library/Formula/zint.rb
index 042488e34..9837132fb 100644
--- a/Library/Formula/zint.rb
+++ b/Library/Formula/zint.rb
@@ -14,7 +14,7 @@ class Zint < Formula
     mkdir 'zint-build' do
       system "cmake", "..",
                       "-DCMAKE_PREFIX_PATH=#{prefix}",
-                      "-DCMAKE_C_FLAGS=-I#{MacOS::XQuartz.include}",
+                      "-DCMAKE_C_FLAGS=-I#{MacOS::X11.include}",
                       *std_cmake_args
       system "make install"
     end
diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/--config.rb
index d70af5f99..5c3da0303 100644
--- a/Library/Homebrew/cmd/--config.rb
+++ b/Library/Homebrew/cmd/--config.rb
@@ -60,7 +60,7 @@ module Homebrew extend self
 
   def describe_x11
     return "N/A" unless MacOS::XQuartz.installed?
-    return "#{MacOS::XQuartz.version} @ " + describe_path(MacOS::XQuartz.prefix)
+    return "XQuartz #{MacOS::XQuartz.version} in " + describe_path(MacOS::XQuartz.prefix)
   end
 
   def describe_perl
diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb
index a06978398..a8b6afb70 100644
--- a/Library/Homebrew/compat/compatibility.rb
+++ b/Library/Homebrew/compat/compatibility.rb
@@ -34,7 +34,7 @@ def llvm_build
 end
 
 def x11_installed?
-  MacOS::XQuartz.installed?
+  MacOS::X11.installed?
 end
 
 def macports_or_fink_installed?
@@ -191,10 +191,10 @@ module MacOS extend self
   end
 
   def x11_installed?
-    XQuartz.installed?
+    X11.installed?
   end
 
   def x11_prefix
-    XQuartz.prefix
+    X11.prefix
   end
 end
diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index 7b0214816..436886318 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -314,26 +314,26 @@ Please take one of the following actions:
   end
 
   def x11
-    unless MacOS::XQuartz.installed?
+    unless MacOS::X11.installed?
       opoo "You do not have X11 installed, this formula may not build."
     end
 
     # There are some config scripts here that should go in the PATH
-    prepend 'PATH', MacOS::XQuartz.bin, ':'
+    prepend 'PATH', MacOS::X11.bin, ':'
 
-    prepend 'PKG_CONFIG_PATH', MacOS::XQuartz.lib/'pkgconfig', ':'
-    prepend 'PKG_CONFIG_PATH', MacOS::XQuartz.share/'pkgconfig', ':'
+    prepend 'PKG_CONFIG_PATH', MacOS::X11.lib/'pkgconfig', ':'
+    prepend 'PKG_CONFIG_PATH', MacOS::X11.share/'pkgconfig', ':'
 
-    append 'LDFLAGS', "-L#{MacOS::XQuartz.lib}"
-    append 'CMAKE_PREFIX_PATH', MacOS::XQuartz.prefix, ':'
-    append 'CMAKE_INCLUDE_PATH', MacOS::XQuartz.include, ':'
+    append 'LDFLAGS', "-L#{MacOS::X11.lib}"
+    append 'CMAKE_PREFIX_PATH', MacOS::X11.prefix, ':'
+    append 'CMAKE_INCLUDE_PATH', MacOS::X11.include, ':'
 
-    append 'CPPFLAGS', "-I#{MacOS::XQuartz.include}"
+    append 'CPPFLAGS', "-I#{MacOS::X11.include}"
 
     unless MacOS::CLT.installed?
       append 'CMAKE_PREFIX_PATH', MacOS.sdk_path/'usr/X11', ':'
-      append 'CPPFLAGS', "-I#{MacOS::XQuartz.include}/freetype2"
-      append 'CFLAGS', "-I#{MacOS::XQuartz.include}"
+      append 'CPPFLAGS', "-I#{MacOS::X11.include}/freetype2"
+      append 'CFLAGS', "-I#{MacOS::X11.include}"
     end
   end
   alias_method :libpng, :x11
diff --git a/Library/Homebrew/macos/xquartz.rb b/Library/Homebrew/macos/xquartz.rb
index d00c55680..cc7207d63 100644
--- a/Library/Homebrew/macos/xquartz.rb
+++ b/Library/Homebrew/macos/xquartz.rb
@@ -26,6 +26,16 @@ module MacOS::XQuartz extend self
   def installed?
     not prefix.nil?
   end
+end
+
+module MacOS::X11 extend self
+  def prefix
+    MacOS::XQuartz.prefix
+  end
+
+  def installed?
+    MacOS::XQuartz.installed?
+  end
 
   # If XQuartz and/or the CLT are installed, headers will be found under
   # /opt/X11/include or /usr/X11/include. For Xcode-only systems, they are