diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile index 19f2fa232cb5..248fcbe9f274 100644 --- a/math/gnuplot/Makefile +++ b/math/gnuplot/Makefile @@ -1,111 +1,110 @@ PORTNAME= gnuplot -PORTVERSION= 5.4.1 -PORTREVISION= 6 +PORTVERSION= 5.4.10 CATEGORIES= math graphics MASTER_SITES= SF MAINTAINER= glewis@FreeBSD.org COMMENT?= Command-line driven graphing utility WWW= http://www.gnuplot.info/ LICENSE= Gnuplot LICENSE_NAME= Gnuplot license LICENSE_FILE= ${WRKSRC}/Copyright LICENSE_PERMS= dist-mirror pkg-mirror auto-accept CONFLICTS_INSTALL?= gnuplot-lite USES+= compiler:c++11-lang cpe groff iconv pkgconfig readline CPE_VENDOR= gnuplot_project GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX=${PREFIX}/share 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 tex 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.4 ; \ ${INSTALL_DATA} ${WRKSRC}/share/gnuplotrc \ ${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.4 libexec/gnuplot .endif .include diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo index 79a37429ebf6..8ff33140aeda 100644 --- a/math/gnuplot/distinfo +++ b/math/gnuplot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1614128412 -SHA256 (gnuplot-5.4.1.tar.gz) = 6b690485567eaeb938c26936e5e0681cf70c856d273cc2c45fabf64d8bc6590e -SIZE (gnuplot-5.4.1.tar.gz) = 5608076 +TIMESTAMP = 1712276746 +SHA256 (gnuplot-5.4.10.tar.gz) = 975d8c1cc2c41c7cedc4e323aff035d977feb9a97f0296dd2a8a66d197a5b27c +SIZE (gnuplot-5.4.10.tar.gz) = 5687565 diff --git a/math/gnuplot/files/patch-configure b/math/gnuplot/files/patch-configure deleted file mode 100644 index 246bcdf65f8b..000000000000 --- a/math/gnuplot/files/patch-configure +++ /dev/null @@ -1,117 +0,0 @@ ---- configure.orig 2017-11-23 11:59:30.644837000 -0800 -+++ configure 2017-11-23 12:01:09.450617000 -0800 -@@ -11246,12 +11246,12 @@ - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null` -+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11264,12 +11264,12 @@ - pkg_cv_LUA_LIBS="$LUA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null` -+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11288,9 +11288,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"` -+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"` - else -- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"` -+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 -@@ -11739,7 +11739,7 @@ - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- LUA=lua5.3 -+ LUA=lua53 - fi - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -11754,12 +11754,12 @@ - pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.3" 2>/dev/null` -+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-5.3" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11772,12 +11772,12 @@ - pkg_cv_LUA_LIBS="$LUA_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.3\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "lua5.3") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.3\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "lua-5.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.3" 2>/dev/null` -+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-5.3" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -11796,9 +11796,9 @@ - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.3"` -+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.3"` - else -- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.3"` -+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.3"` - fi - # Put the nasty error message in config.log where it belongs - echo "$LUA_PKG_ERRORS" >&5 -@@ -12247,7 +12247,7 @@ - LUA_LIBS=$pkg_cv_LUA_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- LUA=lua5.3 -+ LUA=lua53 - fi - else - LUA_CFLAGS=$pkg_cv_LUA_CFLAGS -@@ -12290,7 +12290,7 @@ - return 0; - } - _ACEOF --for ac_lib in '' lua lua5.3 lua5.2 lua5.1; do -+for ac_lib in '' lua lua53 lua5.2 lua5.1; do - if test -z "$ac_lib"; then - ac_res="none required" - else