Seems this diff changes it to use headers from ports readline but the
library from base readline, which is likely to cause problems.
--
Sent from a phone, apologies for poor formatting.
On 17 August 2023 23:09:44 "Gonzalo L. Rodriguez" <gonz...@x61.ar> wrote:
Hi,
Update for GNUPlot to 5.4.8:
http://www.gnuplot.info/ReleaseNotes_5_4_8.html
OK? Comments?
Cheers.-
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/gnuplot/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- Makefile 31 Mar 2022 17:16:30 -0000 1.79
+++ Makefile 17 Aug 2023 22:06:29 -0000
@@ -1,11 +1,10 @@
COMMENT = command-driven interactive function plotting program
-V = 5.2
-PATCHLEVEL = 7
+V = 5.4
+PATCHLEVEL = 8
DISTNAME = gnuplot-${V}.${PATCHLEVEL}
CATEGORIES = math graphics
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
-REVISION = 1
HOMEPAGE = http://www.gnuplot.info/
@@ -51,6 +50,7 @@ CONFIGURE_ARGS += --without-x \
.else
LIB_DEPENDS += converters/libiconv graphics/gd
WANTLIB += X11 fontconfig freetype gd iconv jpeg png tiff webp
+WANTLIB += readline
CONFIGURE_ARGS += --with-x
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/gnuplot/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo 8 Nov 2019 23:29:56 -0000 1.19
+++ distinfo 17 Aug 2023 22:06:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-5.2.7.tar.gz) = l/5QP/Oy41b+KuMiA/x/0s+c7x9Gtg/kbcUBoii59O0=
-SIZE (gnuplot-5.2.7.tar.gz) = 5335673
+SHA256 (gnuplot-5.4.8.tar.gz) = kxJ5x8qtGv99RstHZvH/QcJtm+na8Lzwx53u7j2R9c8=
+SIZE (gnuplot-5.4.8.tar.gz) = 5684061
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/gnuplot/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 11 Mar 2022 19:36:15 -0000 1.3
+++ patches/patch-configure 17 Aug 2023 22:06:29 -0000
@@ -3,39 +3,21 @@ readline -> ereadline
Index: configure
--- configure.orig
+++ configure
-@@ -10168,7 +10168,7 @@ fi
+@@ -11738,7 +11738,7 @@ fi
if test -d $with_readline/lib; then
LDFLAGS="$LDFLAGS -L$with_readline/lib"
fi
- if test ! -d $with_readline/include/readline; then
+ if test ! -d $with_readline/include/ereadline; then
if test -d $with_readline/include/editline; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
$with_readline contains libedit, not readline!" >&5
- $as_echo "$as_me: WARNING: $with_readline contains libedit, not
readline!" >&2;}
-@@ -10261,7 +10261,7 @@ if ${ac_cv_lib_readline_remove_history+:} false; then
- $as_echo_n "(cached) " >&6
- else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING:
$with_readline contains libedit, not readline!" >&5
+ printf "%s\n" "$as_me: WARNING: $with_readline contains libedit, not
readline!" >&2;}
+@@ -11830,7 +11830,7 @@ then :
+ printf %s "(cached) " >&6
+ else $as_nop
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline ${gp_tcap} $LIBS"
+LIBS="-lereadline ${gp_tcap} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -10292,7 +10292,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_readline_remove_history" >&5
- $as_echo "$ac_cv_lib_readline_remove_history" >&6; }
- if test "x$ac_cv_lib_readline_remove_history" = xyes; then :
-- TERMLIBS="-lreadline $gp_tcap $TERMLIBS"
-+ TERMLIBS="-lereadline $gp_tcap $TERMLIBS"
- fi
-
- if test "$ac_cv_lib_readline_remove_history" = no; then
-@@ -10333,7 +10333,7 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_history_remove_history" >&5
- $as_echo "$ac_cv_lib_history_remove_history" >&6; }
- if test "x$ac_cv_lib_history_remove_history" = xyes; then :
-- TERMLIBS="-lreadline -lhistory $gp_tcap $TERMLIBS"
-+ TERMLIBS="-lereadline -lhistory $gp_tcap $TERMLIBS"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU readline not
found - falling back to builtin readline" >&5
- $as_echo "$as_me: WARNING: GNU readline not found - falling back to
builtin readline" >&2;}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/gnuplot/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 11 Mar 2022 19:36:15 -0000 1.20
+++ pkg/PLIST 17 Aug 2023 22:06:29 -0000
@@ -1,5 +1,4 @@
@bin bin/gnuplot
-@man man/man1/gnuplot-ja.1
@man man/man1/gnuplot.1
share/gnuplot/
!%%no_x11%%
@@ -34,6 +33,7 @@ share/gnuplot/${V}/js/gnuplot_dashedline
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/gnuplot_svg_2018.js
share/gnuplot/${V}/js/grid.png
share/gnuplot/${V}/js/help.png
share/gnuplot/${V}/js/nextzoom.png
--
%gonzalo
