Hi,
Here's an update for gnuplot to the latest release, all regress tests works
fine and my own plots still looks good. Please test this on your data and
report any regressions; OK?
--
Cheers,
Jasper
"Stay Hungry. Stay Foolish"
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.54
diff -p -u -r1.54 Makefile
--- Makefile 11 Mar 2013 11:23:54 -0000 1.54
+++ Makefile 22 May 2013 08:03:22 -0000
@@ -2,9 +2,8 @@
COMMENT = command-driven interactive function plotting program
-V = 4.4
+V = 4.6
PATCHLEVEL = 3
-REVISION = 3
DISTNAME = gnuplot-${V}.${PATCHLEVEL}
CATEGORIES = math graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
@@ -12,9 +11,10 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE
HOMEPAGE = http://www.gnuplot.info/
# see Copyright in source
+# http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c m ncurses readline stdc++ termcap z
+WANTLIB = c m ncurses readline stdc++ z
FLAVORS = no_cairo no_x11
FLAVOR ?=
@@ -26,6 +26,7 @@ CONFIGURE_ARGS = --without-linux-vga \
--with-readline \
--with-lasergnu \
--disable-wxwidgets \
+ --disable-qt \
--without-lua \
--without-lisp-files \
--without-pdf
@@ -44,8 +45,7 @@ CONFIGURE_ARGS += --without-x \
.else
MODULES += converters/libiconv
LIB_DEPENDS += graphics/gd
-USE_GROFF = Yes
-WANTLIB += X11 fontconfig freetype ${MODLIBICONV_WANTLIB} jpeg png gd>=20
+WANTLIB += X11 fontconfig freetype jpeg png gd>=20 ${MODLIBICONV_WANTLIB}
CONFIGURE_ARGS += --with-x
.endif
@@ -55,10 +55,7 @@ CONFIGURE_ARGS += --without-cairo
MODULES += devel/gettext
LIB_DEPENDS += devel/pango \
graphics/cairo
-WANTLIB += GL Xrender \
- expat gmodule-2.0 gobject-2.0 gthread-2.0 pixman-1 \
- pthread pthread-stubs xcb xcb-render xcb-shm \
- pangocairo-1.0 cairo glib-2.0 pango-1.0 pangoft2-1.0
+WANTLIB += gobject-2.0 pangocairo-1.0 cairo glib-2.0 pango-1.0 pangoft2-1.0
.endif
post-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/gnuplot/distinfo,v
retrieving revision 1.12
diff -p -u -r1.12 distinfo
--- distinfo 19 Jun 2011 21:00:24 -0000 1.12
+++ distinfo 22 May 2013 08:03:22 -0000
@@ -1,5 +1,2 @@
-MD5 (gnuplot-4.4.3.tar.gz) = Y5YDdSmW9JI7wCyJX6A7RQ==
-RMD160 (gnuplot-4.4.3.tar.gz) = kCkOsra5QE3FIAgEOb3ukFbmH8Q=
-SHA1 (gnuplot-4.4.3.tar.gz) = pNMVuSiHOePLqgTY3dp4YbQAm9Q=
-SHA256 (gnuplot-4.4.3.tar.gz) = b6ojbtXHRPNKmsWO+J2rYXehXFg13DZEoKEneUOUJuY=
-SIZE (gnuplot-4.4.3.tar.gz) = 3305912
+SHA256 (gnuplot-4.6.3.tar.gz) = 31/6+iX7MrPswCBqUg9ryoaA5tzJYe/TDfNMCht+p/U=
+SIZE (gnuplot-4.6.3.tar.gz) = 4973116
Index: patches/patch-docs_Makefile_in
===================================================================
RCS file: patches/patch-docs_Makefile_in
diff -N patches/patch-docs_Makefile_in
--- patches/patch-docs_Makefile_in 6 Jan 2011 23:45:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-docs_Makefile_in,v 1.1 2011/01/06 23:45:07 jasper Exp $
---- docs/Makefile.in.orig Thu Jan 6 21:40:56 2011
-+++ docs/Makefile.in Thu Jan 6 21:41:06 2011
-@@ -79,7 +79,7 @@ CFLAGS = @CFLAGS@
- GIHDIR = @GIHDIR@
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/term
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -ltermcap
-
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- CCLD = $(CC)
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- patches/patch-src_Makefile_in 6 Jan 2011 23:45:07 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2011/01/06 23:45:07 jasper Exp $
---- src/Makefile.in.orig Thu Jan 6 21:38:39 2011
-+++ src/Makefile.in Thu Jan 6 21:40:48 2011
-@@ -205,9 +205,9 @@ GDLIB_CONFIG = @GDLIB_CONFIG@
- GIHDIR = @GIHDIR@
- GREP = @GREP@
- GTK28_CFLAGS = @GTK28_CFLAGS@
--GTK28_LIBS = @GTK28_LIBS@
-+GTK28_LIBS = @GTK28_LIBS@
- GTK_CFLAGS = @GTK_CFLAGS@
--GTK_LIBS = @GTK_LIBS@
-+GTK_LIBS = @GTK_LIBS@ -ltermcap
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -219,7 +219,7 @@ LATEX = @LATEX@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBRARIES_FOR_X = @LIBRARIES_FOR_X@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -ltermcap
- LINUXSUID = @LINUXSUID@
- LISPDIR = @LISPDIR@
- LN_S = @LN_S@
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/gnuplot/pkg/PLIST,v
retrieving revision 1.16
diff -p -u -r1.16 PLIST
--- pkg/PLIST 19 Jun 2011 21:00:24 -0000 1.16
+++ pkg/PLIST 22 May 2013 08:03:22 -0000
@@ -4,7 +4,10 @@ bin/lasergnu
@info info/gnuplot.info
@man man/man1/gnuplot.1
@man man/man1/lasergnu.1
+share/emacs/site-lisp/gnuplot-eldoc.el
+share/emacs/site-lisp/gnuplot-eldoc.elc
share/gnuplot/
+!%%no_x11%%
share/gnuplot/${V}/
share/gnuplot/${V}/PostScript/
share/gnuplot/${V}/PostScript/8859-1.ps
@@ -21,14 +24,21 @@ share/gnuplot/${V}/PostScript/koi8r.ps
share/gnuplot/${V}/PostScript/koi8u.ps
share/gnuplot/${V}/PostScript/prologue.ps
share/gnuplot/${V}/PostScript/utf-8.ps
+share/gnuplot/${V}/colors_default.gp
+share/gnuplot/${V}/colors_mono.gp
+share/gnuplot/${V}/colors_podo.gp
share/gnuplot/${V}/gnuplot.gih
+share/gnuplot/${V}/gnuplot.pdf
+share/gnuplot/${V}/gnuplotrc
share/gnuplot/${V}/js/
share/gnuplot/${V}/js/README
share/gnuplot/${V}/js/canvasmath.js
share/gnuplot/${V}/js/canvastext.js
share/gnuplot/${V}/js/gnuplot_common.js
+share/gnuplot/${V}/js/gnuplot_dashedlines.js
share/gnuplot/${V}/js/gnuplot_mouse.css
share/gnuplot/${V}/js/gnuplot_mouse.js
+share/gnuplot/${V}/js/gnuplot_svg.js
share/gnuplot/${V}/js/grid.png
share/gnuplot/${V}/js/help.png
share/gnuplot/${V}/js/nextzoom.png
@@ -36,4 +46,3 @@ share/gnuplot/${V}/js/previouszoom.png
share/gnuplot/${V}/js/textzoom.png
share/gnuplot/${V}/lua/
share/gnuplot/${V}/lua/gnuplot-tikz.lua
-!%%no_x11%%
