From 2f483e349bc3cea290f993f7fe00984c8ce06f7d Mon Sep 17 00:00:00 2001
From: Michael Lapinsky
Date: Sun, 17 Apr 2011 19:45:22 -0700
Subject: Changed X11R6 paths to X11

Fixed formulas referencing X11 via the X11R6 symlink to instead reference the
path X11 should be at directly (in case the user doesn't have that symlink,
like I didn't)

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
---
 Library/Formula/openimageio.rb | 2 +-
 Library/Formula/qt.rb          | 2 +-
 Library/Formula/s-lang.rb      | 2 +-
 Library/Formula/scantailor.rb  | 2 +-
 Library/Formula/tiff2png.rb    | 4 ++--
 Library/Formula/zint.rb        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/openimageio.rb b/Library/Formula/openimageio.rb
index 5791a91a0..469f1b317 100644
--- a/Library/Formula/openimageio.rb
+++ b/Library/Formula/openimageio.rb
@@ -30,7 +30,7 @@ class Openimageio < Formula
       "#define BOOST_FILESYSTEM_VERSION 2\n#include <boost/filesystem.hpp>"
 
     # Add include path for libpng explicitly
-    system "cmake src/ #{std_cmake_parameters} -DUSE_QT:BOOL=OFF -DEMBEDPLUGINS:BOOL=ON -DCMAKE_CXX_FLAGS=-I/usr/X11R6/include"
+    system "cmake src/ #{std_cmake_parameters} -DUSE_QT:BOOL=OFF -DEMBEDPLUGINS:BOOL=ON -DCMAKE_CXX_FLAGS=-I/usr/X11/include"
     system "make install"
   end
 end
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 227e89b19..f61ec1ac2 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -28,7 +28,7 @@ class Qt < Formula
     ENV.append "CXXFLAGS", "-fvisibility=hidden"
     args = ["-prefix", prefix,
             "-system-libpng", "-system-zlib",
-            "-L/usr/X11R6/lib", "-I/usr/X11R6/include",
+            "-L/usr/X11/lib", "-I/usr/X11/include",
             "-confirm-license", "-opensource",
             "-cocoa", "-fast" ]
 
diff --git a/Library/Formula/s-lang.rb b/Library/Formula/s-lang.rb
index 54d6856e7..5e1e6e2f4 100644
--- a/Library/Formula/s-lang.rb
+++ b/Library/Formula/s-lang.rb
@@ -11,7 +11,7 @@ class SLang < Formula
   def install
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
-                          "--with-png=/usr/X11R6"
+                          "--with-png=/usr/X11"
     ENV.j1
     system "make"
     system "make install"
diff --git a/Library/Formula/scantailor.rb b/Library/Formula/scantailor.rb
index 82f1401ae..84b3f9d61 100644
--- a/Library/Formula/scantailor.rb
+++ b/Library/Formula/scantailor.rb
@@ -12,7 +12,7 @@ class Scantailor < Formula
   depends_on 'libtiff'
 
   def install
-    system "cmake . #{std_cmake_parameters} -DPNG_INCLUDE_DIR=/usr/X11R6/include"
+    system "cmake . #{std_cmake_parameters} -DPNG_INCLUDE_DIR=/usr/X11/include"
     system "make install"
   end
 end
diff --git a/Library/Formula/tiff2png.rb b/Library/Formula/tiff2png.rb
index 3ab6b9c6f..8912c6632 100644
--- a/Library/Formula/tiff2png.rb
+++ b/Library/Formula/tiff2png.rb
@@ -15,8 +15,8 @@ class Tiff2png < Formula
       s.change_make_var! 'LIBTIFF', HOMEBREW_PREFIX+"lib"
       s.change_make_var! 'TIFFINC', HOMEBREW_PREFIX+"include"
       s.change_make_var! 'LIBJPEG', HOMEBREW_PREFIX+"lib"
-      s.change_make_var! 'LIBPNG', '/usr/X11R6/lib'
-      s.change_make_var! 'PNGINC', '/usr/X11R6/include'
+      s.change_make_var! 'LIBPNG', '/usr/X11/lib'
+      s.change_make_var! 'PNGINC', '/usr/X11/include'
       s.change_make_var! 'ZLIB', '/usr/lib'
     end
 
diff --git a/Library/Formula/zint.rb b/Library/Formula/zint.rb
index 74e3e9d82..879c15a5e 100644
--- a/Library/Formula/zint.rb
+++ b/Library/Formula/zint.rb
@@ -10,7 +10,7 @@ class Zint < Formula
 
   def install
     cd('build')
-    system "cmake ..  #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} -DCMAKE_C_FLAGS=-I/usr/X11R6/include"
+    system "cmake ..  #{std_cmake_parameters} -DCMAKE_PREFIX_PATH=#{prefix} -DCMAKE_C_FLAGS=-I/usr/X11/include"
     system "make install"
   end
 
-- 
cgit v1.2.3