Now that octave has been updated, here is an update to the latest gnuplot version. It depends on libcerf which is a new port that I posted earlier on the mailing list.
While at it take maintainership. OK? Also available on github: https://github.com/jasperla/openbsd-wip/tree/master/math/gnuplot Index: Makefile =================================================================== RCS file: /cvs/ports/math/gnuplot/Makefile,v retrieving revision 1.66 diff -u -p -u -p -r1.66 Makefile --- Makefile 26 Jul 2017 22:45:26 -0000 1.66 +++ Makefile 4 Nov 2017 11:04:45 -0000 @@ -2,22 +2,24 @@ COMMENT = command-driven interactive function plotting program -V = 4.6 -PATCHLEVEL = 6 -REVISION = 3 +V = 5.2 +PATCHLEVEL = 1 DISTNAME = gnuplot-${V}.${PATCHLEVEL} CATEGORIES = math graphics MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/} HOMEPAGE = http://www.gnuplot.info/ +MAINTAINER = Paul Irofti <piro...@openbsd.org> + # see Copyright in source # http://gnuplot.cvs.sourceforge.net/gnuplot/gnuplot/Copyright PERMIT_PACKAGE_CDROM = Yes -WANTLIB += c m ncurses readline ${COMPILER_LIBCXX} z +WANTLIB += c cerf m ncurses readline ${COMPILER_LIBCXX} z BUILD_DEPENDS = emacs->=24:editors/emacs +LIB_DEPENDS += math/libcerf FLAVORS = no_cairo no_x11 FLAVOR ?= @@ -26,15 +28,16 @@ CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --without-linux-vga \ --without-latex \ --without-tutorial \ - --with-readline \ - --with-lasergnu \ + --with-readline=bsd \ --disable-wxwidgets \ - --disable-qt \ + --with-qt=no \ --without-lua \ --without-pdf CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +USE_GMAKE = Yes + FAKE_FLAGS = appdefaultdir="${PREFIX}/lib/X11/app-defaults/" TEST_IS_INTERACTIVE = x11 @@ -54,12 +57,9 @@ CONFIGURE_ARGS += --with-x CONFIGURE_ARGS += --without-cairo .else LIB_DEPENDS += devel/gettext \ - devel/pango \ + devel/pango \ graphics/cairo WANTLIB += cairo gobject-2.0 glib-2.0 intl pango-1.0 pangocairo-1.0 .endif - -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin/lasergnu .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/math/gnuplot/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo 3 Jun 2015 07:28:28 -0000 1.14 +++ distinfo 4 Nov 2017 11:04:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (gnuplot-4.6.6.tar.gz) = HxlZb9CQRfIiJa+/7BH6kbmtHZW59IQGNi9RfU8TAnQ= -SIZE (gnuplot-4.6.6.tar.gz) = 5059214 +SHA256 (gnuplot-5.2.1.tar.gz) = fcaw+2syFpHonjRDhzEKjmYU8MTl6xWpDcdCpT2Afog= +SIZE (gnuplot-5.2.1.tar.gz) = 5295961 Index: patches/patch-src_command_c =================================================================== RCS file: patches/patch-src_command_c diff -N patches/patch-src_command_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_command_c 4 Nov 2017 11:04:45 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +command.o: In function `report_error': +command.c:(.text+0x5842): undefined reference to `WEXITSTATUS' + +Index: src/command.c +--- src/command.c.orig ++++ src/command.c +@@ -119,6 +119,7 @@ int thread_rl_RetCode = -1; /* return code from readli + + #ifndef _Windows + # include "help.h" ++# include <sys/wait.h> + #endif /* _Windows */ + + #ifdef _Windows Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/math/gnuplot/pkg/PLIST,v retrieving revision 1.18 diff -u -p -u -p -r1.18 PLIST --- pkg/PLIST 3 Jun 2015 07:28:28 -0000 1.18 +++ pkg/PLIST 4 Nov 2017 11:04:45 -0000 @@ -1,12 +1,7 @@ @comment $OpenBSD: PLIST,v 1.18 2015/06/03 07:28:28 pirofti Exp $ @bin bin/gnuplot -bin/lasergnu +@man man/man1/gnuplot-ja.1 @man man/man1/gnuplot.1 -@man man/man1/lasergnu.1 -share/emacs/site-lisp/gnuplot-gui.el -share/emacs/site-lisp/gnuplot-gui.elc -share/emacs/site-lisp/gnuplot.el -share/emacs/site-lisp/gnuplot.elc share/gnuplot/ !%%no_x11%% share/gnuplot/${V}/ @@ -18,6 +13,7 @@ share/gnuplot/${V}/PostScript/8859-9.ps share/gnuplot/${V}/PostScript/aglfn.txt share/gnuplot/${V}/PostScript/cp1250.ps share/gnuplot/${V}/PostScript/cp1251.ps +share/gnuplot/${V}/PostScript/cp1252.ps share/gnuplot/${V}/PostScript/cp437.ps share/gnuplot/${V}/PostScript/cp850.ps share/gnuplot/${V}/PostScript/cp852.ps @@ -29,7 +25,6 @@ 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 @@ -44,6 +39,7 @@ share/gnuplot/${V}/js/grid.png share/gnuplot/${V}/js/help.png share/gnuplot/${V}/js/nextzoom.png share/gnuplot/${V}/js/previouszoom.png +share/gnuplot/${V}/js/return.png share/gnuplot/${V}/js/textzoom.png share/gnuplot/${V}/lua/ share/gnuplot/${V}/lua/gnuplot-tikz.lua
