Index: head/math/gnuplot/Makefile =================================================================== --- head/math/gnuplot/Makefile (revision 543605) +++ head/math/gnuplot/Makefile (revision 543606) @@ -1,110 +1,109 @@ # $FreeBSD$ PORTNAME= gnuplot -PORTVERSION= 5.2.8 -PORTREVISION= 2 +PORTVERSION= 5.4.0 CATEGORIES= math graphics MASTER_SITES= SF MAINTAINER= glewis@FreeBSD.org COMMENT?= Command-line driven graphing utility LICENSE= Gnuplot LICENSE_NAME= Gnuplot license LICENSE_FILE= ${WRKSRC}/Copyright LICENSE_PERMS= dist-mirror pkg-mirror auto-accept CONFLICTS_INSTALL?= gnuplot-lite-[0-9]* USES+= compiler:c++11-lang groff iconv pkgconfig readline GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+=--with-readline=gnu \ --without-linux-vga \ --without-lisp-files \ --without-tutorial \ --with-bitmap-terminals \ --with-qt=no .if defined(LITE) CONFIGURE_ARGS+=--disable-x11-mbfonts \ --disable-x11-external \ --disable-wxwidgets \ --without-x \ --without-ggi \ --without-gd \ --without-caca \ --without-wx \ --without-gpic \ --without-mif \ --without-cairo \ --without-lua \ --without-latex \ --without-kpsexpand PLIST_SUB+= X11="@comment " .else USES+= gnome jpeg lua:53 ncurses xorg USE_TEX= kpathsea USE_GNOME+= atk cairo gtk30 gdkpixbuf2 USE_WX= 3.0+ USE_XORG+= x11 LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libgd.so:graphics/gd \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libtiff.so:graphics/tiff CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \ --with-gpic \ --with-mif \ --with-kpsexpand \ --with-latex \ ac_cv_prog_KPSEXPAND=${LOCALBASE}/bin/kpsexpand \ ac_cv_prog_PLAINTEX=${LOCALBASE}/bin/tex \ ac_cv_prog_LATEX=${LOCALBASE}/bin/latex \ ac_cv_prog_PDFLATEX=${LOCALBASE}/bin/pdflatex PLIST_SUB+= X11="" .endif TEST_TARGET= check PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES GRIDBOX GRIDBOX_DESC= Use the gridbox optimization for hidden3d GRIDBOX_CONFIGURE_OFF= --disable-h3d-quadtree --enable-h3d-gridbox post-patch: @${REINPLACE_CMD} -e \ '/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in @${REINPLACE_CMD} -e \ 's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e \ 's|luaL_checkint(|(int)luaL_checkinteger(|' ${WRKSRC}/term/lua.trm post-build-DOCS-on: @cd ${WRKSRC}/docs && ${MAKE} groff pre-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/5.2 ; \ + ${MKDIR} ${STAGEDIR}${DATADIR}/5.4 ; \ ${INSTALL_DATA} ${WRKSRC}/share/gnuplotrc \ - ${STAGEDIR}${DATADIR}/5.2/gnuplotrc.sample + ${STAGEDIR}${DATADIR}/5.4/gnuplotrc.sample post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/psdoc cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \ gnuplot.ps ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${STAGEDIR}${DOCSDIR}/psdoc .if defined(LITE) post-stage: - @cd ${STAGEDIR}${PREFIX} && ${RMDIR} libexec/gnuplot/5.2 libexec/gnuplot + @cd ${STAGEDIR}${PREFIX} && ${RMDIR} libexec/gnuplot/5.4 libexec/gnuplot .endif .include Index: head/math/gnuplot/distinfo =================================================================== --- head/math/gnuplot/distinfo (revision 543605) +++ head/math/gnuplot/distinfo (revision 543606) @@ -1,3 +1,3 @@ -TIMESTAMP = 1575266871 -SHA256 (gnuplot-5.2.8.tar.gz) = 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 -SIZE (gnuplot-5.2.8.tar.gz) = 5340677 +TIMESTAMP = 1595672042 +SHA256 (gnuplot-5.4.0.tar.gz) = eb4082f03a399fd1e9e2b380cf7a4f785e77023d8dcc7e17570c1b5570a49c47 +SIZE (gnuplot-5.4.0.tar.gz) = 5622595 Index: head/math/gnuplot/files/patch-src-command.c =================================================================== --- head/math/gnuplot/files/patch-src-command.c (revision 543605) +++ head/math/gnuplot/files/patch-src-command.c (nonexistent) @@ -1,10 +0,0 @@ ---- src/command.c.orig 2017-11-01 18:12:31.201708000 -0700 -+++ src/command.c 2017-11-01 18:13:03.695758000 -0700 -@@ -119,6 +119,7 @@ - - #ifndef _Windows - # include "help.h" -+# include - #endif /* _Windows */ - - #ifdef _Windows Property changes on: head/math/gnuplot/files/patch-src-command.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/gnuplot/pkg-plist =================================================================== --- head/math/gnuplot/pkg-plist (revision 543605) +++ head/math/gnuplot/pkg-plist (revision 543606) @@ -1,40 +1,40 @@ bin/gnuplot -%%X11%%libexec/gnuplot/5.2/gnuplot_x11 -man/man1/gnuplot-ja.1.gz +%%X11%%libexec/gnuplot/5.4/gnuplot_x11 man/man1/gnuplot.1.gz -%%DATADIR%%/5.2/PostScript/8859-1.ps -%%DATADIR%%/5.2/PostScript/8859-15.ps -%%DATADIR%%/5.2/PostScript/8859-2.ps -%%DATADIR%%/5.2/PostScript/8859-9.ps -%%DATADIR%%/5.2/PostScript/aglfn.txt -%%DATADIR%%/5.2/PostScript/cp1250.ps -%%DATADIR%%/5.2/PostScript/cp1251.ps -%%DATADIR%%/5.2/PostScript/cp1252.ps -%%DATADIR%%/5.2/PostScript/cp437.ps -%%DATADIR%%/5.2/PostScript/cp850.ps -%%DATADIR%%/5.2/PostScript/cp852.ps -%%DATADIR%%/5.2/PostScript/koi8r.ps -%%DATADIR%%/5.2/PostScript/koi8u.ps -%%DATADIR%%/5.2/PostScript/prologue.ps -%%DATADIR%%/5.2/PostScript/utf-8.ps -%%X11%%%%DATADIR%%/5.2/app-defaults/Gnuplot -%%DATADIR%%/5.2/colors_default.gp -%%DATADIR%%/5.2/colors_mono.gp -%%DATADIR%%/5.2/colors_podo.gp -%%DATADIR%%/5.2/gnuplot.gih -@sample %%DATADIR%%/5.2/gnuplotrc.sample -%%DATADIR%%/5.2/js/README -%%DATADIR%%/5.2/js/canvasmath.js -%%DATADIR%%/5.2/js/canvastext.js -%%DATADIR%%/5.2/js/gnuplot_common.js -%%DATADIR%%/5.2/js/gnuplot_dashedlines.js -%%DATADIR%%/5.2/js/gnuplot_mouse.css -%%DATADIR%%/5.2/js/gnuplot_mouse.js -%%DATADIR%%/5.2/js/gnuplot_svg.js -%%DATADIR%%/5.2/js/grid.png -%%DATADIR%%/5.2/js/help.png -%%DATADIR%%/5.2/js/nextzoom.png -%%DATADIR%%/5.2/js/previouszoom.png -%%DATADIR%%/5.2/js/return.png -%%DATADIR%%/5.2/js/textzoom.png -%%DATADIR%%/5.2/lua/gnuplot-tikz.lua +%%DATADIR%%/5.4/PostScript/8859-1.ps +%%DATADIR%%/5.4/PostScript/8859-15.ps +%%DATADIR%%/5.4/PostScript/8859-2.ps +%%DATADIR%%/5.4/PostScript/8859-9.ps +%%DATADIR%%/5.4/PostScript/aglfn.txt +%%DATADIR%%/5.4/PostScript/cp1250.ps +%%DATADIR%%/5.4/PostScript/cp1251.ps +%%DATADIR%%/5.4/PostScript/cp1252.ps +%%DATADIR%%/5.4/PostScript/cp437.ps +%%DATADIR%%/5.4/PostScript/cp850.ps +%%DATADIR%%/5.4/PostScript/cp852.ps +%%DATADIR%%/5.4/PostScript/koi8r.ps +%%DATADIR%%/5.4/PostScript/koi8u.ps +%%DATADIR%%/5.4/PostScript/prologue.ps +%%DATADIR%%/5.4/PostScript/utf-8.ps +%%X11%%%%DATADIR%%/5.4/app-defaults/Gnuplot +%%DATADIR%%/5.4/colors_default.gp +%%DATADIR%%/5.4/colors_mono.gp +%%DATADIR%%/5.4/colors_podo.gp +%%DATADIR%%/5.4/gnuplot.gih +@sample %%DATADIR%%/5.4/gnuplotrc.sample +%%DATADIR%%/5.4/js/README +%%DATADIR%%/5.4/js/canvasmath.js +%%DATADIR%%/5.4/js/canvastext.js +%%DATADIR%%/5.4/js/gnuplot_common.js +%%DATADIR%%/5.4/js/gnuplot_dashedlines.js +%%DATADIR%%/5.4/js/gnuplot_mouse.css +%%DATADIR%%/5.4/js/gnuplot_mouse.js +%%DATADIR%%/5.4/js/gnuplot_svg.js +%%DATADIR%%/5.4/js/gnuplot_svg_2018.js +%%DATADIR%%/5.4/js/grid.png +%%DATADIR%%/5.4/js/help.png +%%DATADIR%%/5.4/js/nextzoom.png +%%DATADIR%%/5.4/js/previouszoom.png +%%DATADIR%%/5.4/js/return.png +%%DATADIR%%/5.4/js/textzoom.png +%%DATADIR%%/5.4/lua/gnuplot-tikz.lua