Remove special X11 proxy deps

5 files changed, 10 insertions, 38 deletions

diff --git a/Library/Formula/gd.rb b/Library/Formula/gd.rb
index bb11cc330..807b9a9b5 100644
--- a/Library/Formula/gd.rb
+++ b/Library/Formula/gd.rb
@@ -28,36 +28,24 @@ class Gd < Formula
     cause "Undefined symbols when linking"
   end
 
-  def png_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/libpng" : MacOS::X11.prefix
-  end
-
-  def fontconfig_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/fontconfig" : MacOS::X11.prefix
-  end
-
-  def freetype_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/freetype" : MacOS::X11.prefix
-  end
-
   def install
     ENV.universal_binary if build.universal?
     args = %W{--disable-dependency-tracking --prefix=#{prefix}}
 
     if build.with? "libpng"
-      args << "--with-png=#{png_prefix}"
+      args << "--with-png=#{Formula["libpng"].opt_prefix}"
     else
       args << "--without-png"
     end
 
     if build.with? "fontconfig"
-      args << "--with-fontconfig=#{fontconfig_prefix}"
+      args << "--with-fontconfig=#{Formula["fontconfig"].opt_prefix}"
     else
       args << "--without-fontconfig"
     end
 
     if build.with? "freetype"
-      args << "--with-freetype=#{freetype_prefix}"
+      args << "--with-freetype=#{Formula["freetype"].opt_prefix}"
     else
       args << "--without-freetype"
     end
diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index 35e29d4d1..91654a00f 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -55,10 +55,6 @@ class Gdal < Formula
     depends_on "poppler"
   end
 
-  def png_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/libpng" : MacOS::X11.prefix
-  end
-
   def get_configure_args
     args = [
       # Base configuration.
@@ -79,7 +75,7 @@ class Gdal < Formula
       # Backends supported by OS X.
       "--with-libiconv-prefix=/usr",
       "--with-libz=/usr",
-      "--with-png=#{png_prefix}",
+      "--with-png=#{Formula["libpng"].opt_prefix}",
       "--with-expat=/usr",
       "--with-curl=/usr/bin/curl-config",
 
diff --git a/Library/Formula/libharu.rb b/Library/Formula/libharu.rb
index cfb2b3fa8..c835b3163 100644
--- a/Library/Formula/libharu.rb
+++ b/Library/Formula/libharu.rb
@@ -16,16 +16,11 @@ class Libharu < Formula
     "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/libharu/files/libharu-2.2.1-libpng-1.5.patch?revision=1.1"
   end
 
-  def png_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/libpng" : MacOS::X11.prefix
-  end
-
   def install
     system "./configure", "--disable-debug",
                           "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          # libpng doesn't get picked up
-                          "--with-png=#{png_prefix}"
+                          "--with-png=#{Formula["libpng"].opt_prefix}"
     system "make install"
   end
 end
diff --git a/Library/Formula/libwmf.rb b/Library/Formula/libwmf.rb
index 3225078b2..f4139be21 100644
--- a/Library/Formula/libwmf.rb
+++ b/Library/Formula/libwmf.rb
@@ -10,15 +10,11 @@ class Libwmf < Formula
   depends_on :freetype
   depends_on :libpng
 
-  def dep_prefix(dep)
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/#{dep}" : MacOS::X11.prefix
-  end
-
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--with-png=#{dep_prefix("libpng")}",
-                          "--with-freetype=#{dep_prefix("freetype")}"
+                          "--with-png=#{Formula["libpng"].opt_prefix}",
+                          "--with-freetype=#{Formula["freetype"].opt_prefix}"
     system "make"
     ENV.j1 # yet another rubbish Makefile
     system "make install"
diff --git a/Library/Formula/s-lang.rb b/Library/Formula/s-lang.rb
index 66c254f96..7b3355cd6 100644
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -10,14 +10,11 @@ class SLang < Formula
   depends_on 'pcre' => :optional
   depends_on 'oniguruma' => :optional
 
-  def png_prefix
-    MacOS.version >= :mountain_lion ? HOMEBREW_PREFIX/"opt/libpng" : MacOS::X11.prefix
-  end
-
   def install
+    png = Formula["libpng"]
     system "./configure", "--prefix=#{prefix}",
-                          "--with-pnglib=#{png_prefix}/lib",
-                          "--with-pnginc=#{png_prefix}/include"
+                          "--with-pnglib=#{png.lib}",
+                          "--with-pnginc=#{png.include}"
     ENV.j1
     system "make"
     system "make install"