Update formulae for new XQuartz module

34 files changed, 56 insertions, 52 deletions

diff --git a/Library/Formula/bsdmake.rb b/Library/Formula/bsdmake.rb
index a443ab656..784d9f6fe 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.x11_prefix
+    inreplace 'mk/sys.mk', '@PREFIX@', MacOS::XQuartz.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 cc4d8c662..0d661224b 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.x11_prefix}/include/freetype2"
-    ENV.append "CPPFLAGS", "-I#{MacOS.x11_prefix}/include/freetype2"
-    ENV.append "CXXFLAGS", "-I#{MacOS.x11_prefix}/include/freetype2"
+    ENV.append "CFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
+    ENV.append "CPPFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
+    ENV.append "CXXFLAGS", "-I#{MacOS::XQuartz.include}/freetype2"
 
     system "./configure", "--enable-release",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index 6d9700de6..10185e031 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.x11_prefix}"
+    system "./configure", "--prefix=#{prefix}", "--with-freetype=#{MacOS::XQuartz.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 2b5cde1cd..889053c8c 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.x11_prefix}",
+      "--with-png=#{MacOS::XQuartz.prefix}",
       "--with-expat=/usr",
 
       # Default Homebrew backends.
diff --git a/Library/Formula/ghostscript.rb b/Library/Formula/ghostscript.rb
index e3e38ee8c..2ee013d25 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.x11_prefix}/lib"
+    ENV['LIBS'] = "-L#{MacOS::XQuartz.lib}"
 
     src_dir = ARGV.build_head? ? "gs" : "."
 
diff --git a/Library/Formula/gnu-shogi.rb b/Library/Formula/gnu-shogi.rb
index 37dd14538..4e7cd417e 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.x11_prefix}/include",
-                          "--x-lib=#{MacOS.x11_prefix}/lib"
+                          "--x-include=#{MacOS::XQuartz.include}",
+                          "--x-lib=#{MacOS::XQuartz.lib}"
     system "make"
     system "make", "install", "MANDIR=#{man6}", "INFODIR=#{info}"
   end
diff --git a/Library/Formula/gpac.rb b/Library/Formula/gpac.rb
index 33601361b..ba8ab19b4 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.x11_prefix}/include",
+            "--extra-cflags=-I#{MacOS::XQuartz.include}",
             # Force detection of X libs on 64-bit kernel
-            "--extra-ldflags=-L#{MacOS.x11_prefix}/lib"]
+            "--extra-ldflags=-L#{MacOS::XQuartz.lib}"]
 
     system "chmod +x configure"
     system "./configure", *args
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb
index b1f2f21e5..92fb15cb9 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.x11_prefix}/lib #{HOMEBREW_PREFIX}/lib",
+      "--with-libs=#{MacOS::XQuartz.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.x11_prefix}/include",
+      "--with-png-includes=#{MacOS::XQuartz.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.x11_prefix}/include #{MacOS.x11_prefix}/include/freetype2",
+      "--with-freetype-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.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.x11_prefix}/include #{MacOS.x11_prefix}/include/cairo"
+      args << "--with-cairo-includes=#{MacOS::XQuartz.include} #{MacOS::XQuartz.include}/cairo"
     end
 
     args << "--with-cairo"
diff --git a/Library/Formula/libharu.rb b/Library/Formula/libharu.rb
index e18f491b1..ce3dd1f19 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.x11_prefix}"
+                          "--with-png=#{MacOS::XQuartz.prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
index 86d9c7b6c..ecaad9980 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.x11_prefix}"
+                          "--with-freetype=#{MacOS::XQuartz.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 55118a501..6daf2a79b 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.x11_prefix}/include"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.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 011196485..260bc1527 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.x11_prefix}"
+      "--with-png=#{MacOS::XQuartz.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 aba6160af..1e643c1ef 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.x11_prefix}/lib"
+      s.gsub! /-L\$\(TOP\)\/\$\(LIB_DIR\)/, "-L#{MacOS::XQuartz.lib}"
     end
 
     inreplace 'src/glw/Makefile' do |s|
diff --git a/Library/Formula/mess.rb b/Library/Formula/mess.rb
index 0befcc5c6..84dce27e3 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.x11_prefix}/include"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.include}"
     ENV['PTR64'] = (MacOS.prefer_64_bit? ? '1' : '0')
 
     system 'make'
diff --git a/Library/Formula/pdf2image.rb b/Library/Formula/pdf2image.rb
index 95a7587de..9308e7d1c 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.x11_prefix}/lib"
+    inreplace ["src/Makefile", "xpdf/Makefile"], "LDFLAGS =", "LDFLAGS=-L#{MacOS::XQuartz.lib}"
 
     system "make"
     system "make install"
diff --git a/Library/Formula/pil.rb b/Library/Formula/pil.rb
index 607625901..810a6de2d 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.x11_prefix}/include")'
+              "add_directory(include_dirs, \"#{MacOS::XQuartz.include}\")"
 
       s.gsub! 'add_directory(include_dirs, "/sw/lib/freetype2/include")',
-              'add_directory(library_dirs, "#{MacOS.x11_prefix}/lib")'
+              "add_directory(library_dirs, \"#{MacOS::XQuartz.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 78609e500..0fd678d8d 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.x11_prefix}/include"
+    ENV['INCPATH'] = "-I./src/lib/util -I#{MacOS::XQuartz.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 656f7b15b..c45f7ce07 100644
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -11,7 +11,8 @@ class SLang < Formula
 
   def install
     system "./configure", "--prefix=#{prefix}",
-                          "--with-png=#{MacOS.x11_prefix}"
+                          "--with-pnglib=#{MacOS::XQuartz.lib}",
+                          "--with-pnginc=#{MacOS::XQuartz.include}"
     ENV.j1
     system "make"
     system "make install"
diff --git a/Library/Formula/scantailor.rb b/Library/Formula/scantailor.rb
index b1646c930..849a29353 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.x11_prefix}/include", *std_cmake_args
+    system "cmake", ".", "-DPNG_INCLUDE_DIR=#{MacOS::XQuartz.include}", *std_cmake_args
     system "make install"
   end
 end
diff --git a/Library/Formula/sdl_gfx.rb b/Library/Formula/sdl_gfx.rb
index 969a86401..6d7c1b0c2 100644
--- a/Library/Formula/sdl_gfx.rb
+++ b/Library/Formula/sdl_gfx.rb
@@ -13,7 +13,7 @@ class SdlGfx < Formula
 
   def install
     ENV.universal_binary if ARGV.build_universal?
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-sdltest"
     system "make install"
diff --git a/Library/Formula/sdl_image.rb b/Library/Formula/sdl_image.rb
index 95f021eeb..0617201c6 100644
--- a/Library/Formula/sdl_image.rb
+++ b/Library/Formula/sdl_image.rb
@@ -5,8 +5,9 @@ class SdlImage < Formula
   url 'http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz'
   sha1 '5e3e393d4e366638048bbb10d6a269ea3f4e4cf2'
 
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
-  depends_on :x11 # for Freetype
+  depends_on :x11
 
   def options
     [['--universal', 'Build universal binaries.']]
@@ -18,8 +19,7 @@ class SdlImage < Formula
 
     system "./configure", "--prefix=#{prefix}",
                           "--disable-dependency-tracking",
-                          "--disable-sdltest",
-                          "--with-freetype-exec-prefix=#{MacOS.x11_prefix}"
+                          "--disable-sdltest"
     system "make install"
   end
 end
diff --git a/Library/Formula/sdl_mixer.rb b/Library/Formula/sdl_mixer.rb
index a7495d18d..73f3eb70d 100644
--- a/Library/Formula/sdl_mixer.rb
+++ b/Library/Formula/sdl_mixer.rb
@@ -5,6 +5,7 @@ class SdlMixer < Formula
   url 'http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz'
   sha1 'a20fa96470ad9e1052f1957b77ffa68fb090b384'
 
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
   depends_on 'flac' => :optional
   depends_on 'libmikmod' => :optional
diff --git a/Library/Formula/sdl_net.rb b/Library/Formula/sdl_net.rb
index a4b2129e6..e4fb8b183 100644
--- a/Library/Formula/sdl_net.rb
+++ b/Library/Formula/sdl_net.rb
@@ -5,6 +5,7 @@ class SdlNet < Formula
   url 'http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz'
   sha1 'fd393059fef8d9925dc20662baa3b25e02b8405d'
 
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
 
   def options
diff --git a/Library/Formula/sdl_ttf.rb b/Library/Formula/sdl_ttf.rb
index 8b19ec4ff..46b42b993 100644
--- a/Library/Formula/sdl_ttf.rb
+++ b/Library/Formula/sdl_ttf.rb
@@ -5,8 +5,9 @@ class SdlTtf < Formula
   url 'http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz'
   sha1 '0ccf7c70e26b7801d83f4847766e09f09db15cc6'
 
+  depends_on 'pkg-config' => :build
   depends_on 'sdl'
-  depends_on :x11 # for Freetype
+  depends_on :x11
 
   def options
     [['--universal', 'Build universal binaries.']]
@@ -15,10 +16,10 @@ class SdlTtf < Formula
   def install
     ENV.universal_binary if ARGV.build_universal?
 
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--disable-sdltest",
-                          "--with-freetype-exec-prefix=#{MacOS.x11_prefix}"
+                          "--disable-sdltest"
     system "make install"
   end
 end
diff --git a/Library/Formula/sqsh.rb b/Library/Formula/sqsh.rb
index dad6eebd9..0aceae8c3 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.x11_prefix}/lib"
-      args << "--x-includes=#{MacOS.x11_prefix}/includes"
+      args << "--x-libraries=#{MacOS::XQuartz.lib}"
+      args << "--x-includes=#{MacOS::XQuartz.include}"
     end
 
     ENV['SYBASE'] = Freetds.new("freetds").prefix
diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb
index daab5d10e..6b9ac3ece 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 x11_installed?
+  depends_on :x11 if MacOS::XQuartz.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 x11_installed?
+    unless MacOS::XQuartz.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 8194d8fc7..25642e55b 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.x11_prefix}/lib -lc -lX11"
+    inreplace 'config.mk', "LIBS = -L/usr/lib -lc -lX11', 'LIBS = -L#{MacOS::XQuartz.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 07520fc28..be1c29dbf 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.x11_prefix}/share/aclocal/pkg.m4", "aclocal" if MACOS_VERSION < 10.7
+    cp "#{MacOS::XQuartz.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 d7caae35d..fd10e6c5b 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.x11_prefix}/lib",
-                                         "PNGINC=#{MacOS.x11_prefix}/include",
+                                         "LIBPNG=#{MacOS::XQuartz.lib}",
+                                         "PNGINC=#{MacOS::XQuartz.include}",
                                          "ZLIB=/usr/lib",
                                          "DEBUGFLAGS="
     bin.install 'tiff2png'
diff --git a/Library/Formula/vtk.rb b/Library/Formula/vtk.rb
index 8dc517551..630ee8560 100644
--- a/Library/Formula/vtk.rb
+++ b/Library/Formula/vtk.rb
@@ -63,9 +63,9 @@ class Vtk < Formula
     args << "-DVTK_USE_COCOA:BOOL=ON" unless ARGV.include? "--x11"
 
     if ARGV.include? '--x11'
-      args << "-DOPENGL_INCLUDE_DIR:PATH='#{MacOS.x11_prefix}/include'"
-      args << "-DOPENGL_gl_LIBRARY:FILEPATH='#{MacOS.x11_prefix}/lib/libGL.dylib'"
-      args << "-DOPENGL_glu_LIBRARY:FILEPATH='#{MacOS.x11_prefix}/lib/libGLU.dylib"
+      args << "-DOPENGL_INCLUDE_DIR:PATH='#{MacOS::XQuartz.include}'"
+      args << "-DOPENGL_gl_LIBRARY:FILEPATH='#{MacOS::XQuartz.lib}/libGL.dylib'"
+      args << "-DOPENGL_glu_LIBRARY:FILEPATH='#{MacOS::XQuartz.lib}/libGLU.dylib"
       args << "-DVTK_USE_COCOA:BOOL=OFF"
       args << "-DVTK_USE_X:BOOL=ON"
     end
diff --git a/Library/Formula/wine.rb b/Library/Formula/wine.rb
index 53ebad1df..33b673f8c 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.x11_prefix}/lib:#{HOMEBREW_PREFIX}/lib:/usr/lib" "#{bin}/wine.bin" "$@"
+    DYLD_FALLBACK_LIBRARY_PATH="#{MacOS::XQuartz.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.x11_prefix}/include/",
-            "--x-lib=#{MacOS.x11_prefix}/lib/",
+            "--x-include=#{MacOS::XQuartz.include}",
+            "--x-lib=#{MacOS::XQuartz.lib}",
             "--with-x",
             "--with-coreaudio",
             "--with-opengl"]
diff --git a/Library/Formula/xpdf.rb b/Library/Formula/xpdf.rb
index 0f06f02b4..5a90abc25 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.x11_prefix}/include -I#{MacOS.x11_prefix}/include/freetype2"
+    ENV.append_to_cflags "-I#{MacOS::XQuartz.include} -#{MacOS::XQuartz.include}/freetype2"
 
     system "./configure", "--prefix=#{prefix}", "--mandir=#{man}"
     system "make"
diff --git a/Library/Formula/xspringies.rb b/Library/Formula/xspringies.rb
index fb562cc15..eb8d14532 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.x11_prefix}/lib -lm -lX11"
+      s.change_make_var! "LIBS", "-L#{MacOS::XQuartz.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 3721b3744..042488e34 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.x11_prefix}/include",
+                      "-DCMAKE_C_FLAGS=-I#{MacOS::XQuartz.include}",
                       *std_cmake_args
       system "make install"
     end