Permalink
Browse files

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>
  • Loading branch information...
1 parent a3cec7e commit 2f483e349bc3cea290f993f7fe00984c8ce06f7d @Sep102 Sep102 committed with adamv Apr 18, 2011
View
2 Library/Formula/openimageio.rb
@@ -30,7 +30,7 @@ def install
"#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
View
2 Library/Formula/qt.rb
@@ -28,7 +28,7 @@ def install
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" ]
View
2 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"
View
2 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
View
4 Library/Formula/tiff2png.rb
@@ -15,8 +15,8 @@ def install
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
View
2 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

0 comments on commit 2f483e3

Please sign in to comment.