Move X11 machinery into MacOS::XQuartz namespace

In order to better support Xcode-only systems, where X11 libs and
executables live under /usr/X11 but headers live in the SDK, move the
x11_* helper methods into a new module.

This allows us to keep some of the CLT/Xcode-only and Apple X11/XQuartz
logic hidden from outside code, like ENV.x11.

Since Apple's X11 is actually XQuartz, name the module "MacOS::XQuartz".

2 files changed, 3 insertions, 3 deletions

diff --git a/Library/Homebrew/cmd/--config.rb b/Library/Homebrew/cmd/--config.rb
index 3b749c5ab..d70af5f99 100644
--- a/Library/Homebrew/cmd/--config.rb
+++ b/Library/Homebrew/cmd/--config.rb
@@ -59,8 +59,8 @@ module Homebrew extend self
   end
 
   def describe_x11
-    return "N/A" unless MacOS.x11_installed?
-    return "#{MacOS.xquartz_version} @ " + describe_path(MacOS.x11_prefix)
+    return "N/A" unless MacOS::XQuartz.installed?
+    return "#{MacOS::XQuartz.version} @ " + describe_path(MacOS::XQuartz.prefix)
   end
 
   def describe_perl
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index 922c9ca70..1b723daaf 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -168,7 +168,7 @@ def check_for_stray_las
 end
 
 def check_for_x11
-  unless MacOS.x11_installed? then <<-EOS.undent
+  unless MacOS::XQuartz.installed? then <<-EOS.undent
     X11 is not installed.
     You don't have X11 installed as part of your OS X installation.
     This is not required for all formulae, but is expected by some.