diff options
| author | Jack Nagel | 2012-06-06 20:35:12 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-07-01 12:41:00 -0500 |
| commit | a2d4d9d832e60e2b007990f394b22e77b6dfa3ba (patch) | |
| tree | 61d17f0eb86471a00b2bf117d13f067f73e372b8 /Library/Formula/grass.rb | |
| parent | 06c2ea036322bd1d05330711aa41273cddc77ede (diff) | |
| download | homebrew-a2d4d9d832e60e2b007990f394b22e77b6dfa3ba.tar.bz2 | |
Update formulae for XQuartz compatibility
Diffstat (limited to 'Library/Formula/grass.rb')
| -rw-r--r-- | Library/Formula/grass.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index 8d7ffe042..b1f2f21e5 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -31,8 +31,8 @@ class Grass < Formula depends_on "libtiff" depends_on "unixodbc" depends_on "fftw" - depends_on "cairo" if MacOS.leopard? + depends_on :x11 # Patches ensure 32 bit system python is used for wxWidgets and that files # are not installed outside of the prefix. @@ -60,7 +60,7 @@ class Grass < Formula args = [ "--disable-debug", "--disable-dependency-tracking", - "--with-libs=/usr/X11/lib #{HOMEBREW_PREFIX}/lib", + "--with-libs=#{MacOS.x11_prefix}/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=/usr/X11/include", + "--with-png-includes=#{MacOS.x11_prefix}/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=/usr/X11/include /usr/X11/include/freetype2", + "--with-freetype-includes=#{MacOS.x11_prefix}/include #{MacOS.x11_prefix}/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=/usr/X11/include /usr/X11/include/cairo" + args << "--with-cairo-includes=#{MacOS.x11_prefix}/include #{MacOS.x11_prefix}/include/cairo" end args << "--with-cairo" |