sync ports with The Matrix
This commit is contained in:
parent
9d4d2e721a
commit
79bc6d9d97
GPG key ID:
F42C07F07E2E35B7
846 changed files with 10693 additions and 8131 deletions
|
|
@ -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/
|
||||
|
||||
|
|
@ -49,15 +48,16 @@ SUBST_VARS = V
|
|||
CONFIGURE_ARGS += --without-x \
|
||||
--without-gd
|
||||
.else
|
||||
LIB_DEPENDS += converters/libiconv graphics/gd
|
||||
WANTLIB += X11 fontconfig freetype gd iconv jpeg png tiff webp
|
||||
LIB_DEPENDS += graphics/gd
|
||||
WANTLIB += X11 gd
|
||||
CONFIGURE_ARGS += --with-x
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:Mno_cairo} || ${FLAVOR:Mno_x11}
|
||||
CONFIGURE_ARGS += --without-cairo
|
||||
.else
|
||||
LIB_DEPENDS += devel/gettext,-runtime \
|
||||
LIB_DEPENDS += converters/libiconv \
|
||||
devel/gettext,-runtime \
|
||||
devel/pango \
|
||||
graphics/cairo
|
||||
WANTLIB += cairo gobject-2.0 glib-2.0 intl pango-1.0 pangocairo-1.0 harfbuzz
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,39 +3,39 @@ 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 :
|
||||
@@ -11860,7 +11860,7 @@ fi
|
||||
printf "%s\n" "$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 :
|
||||
@@ -11901,7 +11901,7 @@ fi
|
||||
printf "%s\n" "$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;}
|
||||
else $as_nop
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: GNU readline not found - falling back to builtin readline" >&5
|
||||
printf "%s\n" "$as_me: WARNING: GNU readline not found - falling back to builtin readline" >&2;}
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
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
|
||||
@@ -115,6 +115,7 @@ int thread_rl_RetCode = -1; /* return code from readli
|
||||
|
||||
#ifndef _Windows
|
||||
# include "help.h"
|
||||
+# include <sys/wait.h>
|
||||
#endif /* _Windows */
|
||||
|
||||
#ifdef _Windows
|
||||
|
|
@ -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_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/gnuplot_svg_2018.js
|
||||
share/gnuplot/${V}/js/grid.png
|
||||
share/gnuplot/${V}/js/help.png
|
||||
share/gnuplot/${V}/js/nextzoom.png
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue