diff options
| -rw-r--r-- | Library/Formula/gnuplot.rb | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb index c15119130..4910fc52a 100644 --- a/Library/Formula/gnuplot.rb +++ b/Library/Formula/gnuplot.rb @@ -2,16 +2,19 @@ require 'formula' class Gnuplot < Formula homepage 'http://www.gnuplot.info' - url 'http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.0/gnuplot-4.6.0.tar.gz' - sha1 '9a43ae13546d97d4b174533ddac31a14e0edc9b2' + url 'http://downloads.sourceforge.net/project/gnuplot/gnuplot/4.6.1/gnuplot-4.6.1.tar.gz' + sha1 '1ea21a628223159b0297ae65fe8293afd5aab3c0' head 'cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot', :using => :cvs - option 'pdf', 'Build with pdflib-lite support' - option 'wx', 'Build with wxWidgets support' - option 'nolua', 'Build without lua support' - option 'nogd', 'Build without gd support' - option 'with-x', 'Build with X support' + option 'pdf', 'Build the PDF terminal using pdflib-lite' + option 'wx', 'Build the wxWidgets terminal using pango' + option 'with-x', 'Build the X11 terminal' + option 'qt', 'Build the Qt4 terminal' + option 'cairo', 'Build the Cario based terminals' + option 'nolua', 'Build without the lua/TikZ terminal' + option 'nogd', 'Build without gd support' + option 'tests', 'Verify the build with make check (1 min)' option 'without-emacs', 'Do not build Emacs lisp files' if build.head? @@ -21,19 +24,13 @@ class Gnuplot < Formula depends_on 'pkg-config' => :build depends_on 'readline' - depends_on 'pango' unless build.include? 'with-x' or MacOS::X11.installed? - depends_on :x11 if build.include? 'with-x' or MacOS::X11.installed? + depends_on 'pango' if build.include? 'cairo' or build.include? 'wx' + depends_on :x11 if build.include? 'with-x' or MacOS::X11.installed? depends_on 'pdflib-lite' if build.include? 'pdf' - depends_on 'lua' unless build.include? 'nolua' - depends_on 'gd' unless build.include? 'nogd' - depends_on 'wxmac' if build.include? 'wx' - - def patches - # MacPorts patch --without-aquaterm as a configuration option. Submitted - # upstream: - # http://sourceforge.net/tracker/?func=detail&aid=3476165&group_id=2055&atid=302055 - {:p0 => 'https://trac.macports.org/export/96897/trunk/dports/math/gnuplot/files/patch-configure-aquaterm.diff'} - end + depends_on 'lua' unless build.include? 'nolua' + depends_on 'gd' unless build.include? 'nogd' + depends_on 'wxmac' if build.include? 'wx' + depends_on 'qt' if build.include? 'qt' def install # Help configure find libraries @@ -41,30 +38,27 @@ class Gnuplot < Formula pdflib = Formula.factory 'pdflib-lite' gd = Formula.factory 'gd' - # Aquaterm disabled due to breakage. See: - # https://github.com/mxcl/homebrew/issues/14647 args = %W[ - --disable-debug --disable-dependency-tracking --prefix=#{prefix} --with-readline=#{readline.prefix} - --without-aquaterm + --without-latex + --without-tutorial ] - args << "--disable-wxwidgets" unless build.include? 'wx' args << "--with-pdf=#{pdflib.prefix}" if build.include? 'pdf' - args << "--without-lua" if build.include? 'nolua' - args << "--without-lisp-files" if build.include? 'without-emacs' - - if build.include? 'nogd' - args << '--without-gd' - else - args << "--with-gd=#{gd.prefix}" - end - - system 'autoreconf' if build.head? + args << '--with' + ((build.include? 'nogd') ? 'out-gd' : "-gd=#{gd.prefix}") + args << '--disable-wxwidgets' unless build.include? 'wx' + args << '--without-cairo' unless build.include? 'cairo' + args << '--enable-qt' if build.include? 'qt' + args << '--without-lua' if build.include? 'nolua' + args << '--without-lisp-files' if build.include? 'without-emacs' + system './prepare' if build.head? system "./configure", *args + ENV.j1 # or else emacs tries to edit the same file with two threads + system 'make' + system 'make check' if build.include? 'tests' # Awesome testsuite system "make install" end |