Update to gnuplot 5.2.1.
While at it remove obsolete emacs dependency, use GNU readline and take maintainership. OK and input feinerer@, OK steven@
This commit is contained in:
pirofti
parent
e85de0c402
commit
569fbf97f8
@ -1,23 +1,25 @@
|
||||
# $OpenBSD: Makefile,v 1.66 2017/07/26 22:45:26 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.67 2017/11/04 17:21:41 pirofti Exp $
|
||||
|
||||
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 <pirofti@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 ereadline ${COMPILER_LIBCXX} z
|
||||
|
||||
BUILD_DEPENDS = emacs->=24:editors/emacs
|
||||
LIB_DEPENDS += devel/readline \
|
||||
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=${LOCALBASE} \
|
||||
--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>
|
||||
|
||||
@ -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
|
||||
|
||||
43
math/gnuplot/patches/patch-configure
Normal file
43
math/gnuplot/patches/patch-configure
Normal file
@ -0,0 +1,43 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2017/11/04 17:21:41 pirofti Exp $
|
||||
|
||||
readline -> ereadline
|
||||
|
||||
Index: configure
|
||||
--- configure.orig
|
||||
+++ configure
|
||||
@@ -10127,7 +10127,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;}
|
||||
@@ -10220,7 +10220,7 @@ if ${ac_cv_lib_readline_remove_history+:} false; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
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. */
|
||||
|
||||
@@ -10251,7 +10251,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
|
||||
@@ -10292,7 +10292,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;}
|
||||
16
math/gnuplot/patches/patch-src_command_c
Normal file
16
math/gnuplot/patches/patch-src_command_c
Normal file
@ -0,0 +1,16 @@
|
||||
$OpenBSD: patch-src_command_c,v 1.1 2017/11/04 17:21:41 pirofti Exp $
|
||||
|
||||
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
|
||||
@ -1,12 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.18 2015/06/03 07:28:28 pirofti Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.19 2017/11/04 17:21:41 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user