gnuplot 4.4.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 25 insertions, 7 deletions

diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 26f9817f3..1b7ee2d1a 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -1,30 +1,48 @@
 require 'formula'
 
 class Gnuplot < Formula
-  url 'http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.4.2/gnuplot-4.4.2.tar.gz'
+  url 'http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.4.3/gnuplot-4.4.3.tar.gz'
   homepage 'http://www.gnuplot.info'
-  md5 'a4f0dd89f9b9334890464f687ddd9f50'
+  md5 '639603752996f4923bc02c895fa03b45'
 
   depends_on 'pkg-config' => :build
   depends_on 'readline'
-  depends_on 'gd' unless ARGV.include? "--nogd"
+  depends_on 'pango' # cairo support
   depends_on 'pdflib-lite' if ARGV.include? "--pdf"
+  depends_on 'lua' unless ARGV.include? '--nolua'
+  depends_on 'gd' unless ARGV.include? "--nogd"
 
   def options
     [
-      ["--pdf", "Build with pdf support."],
-      ["--without-lua", "Build without lua support."],
+      ["--pdf", "Build with pdflib-lite support."],
+      ["--nolua", "Build without lua support."],
       ["--nogd", "Build without gd support."]
     ]
   end
 
   def install
+    # Without this I got:
+    # ld: rel32 out of range in _fit_command from fit.o
+    # - adamv
+    ENV.j1
+
+    # Help configure find libraries
     ENV.x11
+    readline = Formula.factory 'readline'
+    pdflib = Formula.factory 'pdflib-lite'
+    gd = Formula.factory 'gd'
+
     args = ["--disable-debug", "--disable-dependency-tracking",
             "--prefix=#{prefix}",
-            "--with-readline=#{prefix}",
+            "--with-readline=#{readline.prefix}",
             "--disable-wxwidgets"]
-    args << "--without-lua" if ARGV.include? "--without-lua"
+    args << "--with-pdf=#{pdflib.prefix}" if ARGV.include? '--pdf'
+    args << "--without-lua" if ARGV.include? "--nolua"
+    if ARGV.include? '--nogd'
+      args << '--without-gd'
+    else
+      args << "--with-gd=#{gd.prefix}"
+    end
 
     system "./configure", *args
     system "make install"