update to 5.2.0

ok pirofti@
This commit is contained in:
steven 2020-05-16 08:08:21 +00:00
parent 7f481c0aef
commit 48d4b296a4
4 changed files with 37 additions and 30 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.119 2020/05/05 18:41:56 rsadowski Exp $
# $OpenBSD: Makefile,v 1.120 2020/05/16 08:08:21 steven Exp $
COMMENT = high-level language for numerical computations
VERSION = 5.1.0
VERSION = 5.2.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
REVISION = 5
SHARED_LIBS += octave 12.0
SHARED_LIBS += octgui 6.0
SHARED_LIBS += octinterp 11.0
SHARED_LIBS += octave 13.0
SHARED_LIBS += octgui 7.0
SHARED_LIBS += octinterp 12.0
HOMEPAGE = https://www.gnu.org/software/octave/
@ -18,21 +17,6 @@ MAINTAINER = Steven Mestdagh <steven@openbsd.org>
# GPLv3
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC GL GLU GraphicsMagick GraphicsMagick++
WANTLIB += ICE Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport
WANTLIB += Qt5Sql Qt5Widgets Qt5Xml SM X11 X11-xcb Xdamage Xext
WANTLIB += Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd arpack
WANTLIB += blas btf bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += curses cxsparse double-conversion drm ereadline execinfo
WANTLIB += expat fftw3 fftw3_threads fftw3f fftw3f_threads fontconfig
WANTLIB += freetype gl2ps glapi glib-2.0 glpk glut gmp graphite2
WANTLIB += gthread-2.0 harfbuzz hdf5 iconv icudata icui18n icuio
WANTLIB += icuuc intl klu lapack lcms2 ltdl lzma m nghttp2 ogg
WANTLIB += pcre pcre2-16 png portaudio qhull qrupdate qscintilla2_qt5
WANTLIB += sndfile sndio ssl suitesparseconfig umfpack util vorbis
WANTLIB += vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present
WANTLIB += xcb-sync xcb-xfixes xshmfence z zstd
MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
MODULES = fortran \
@ -70,6 +54,23 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS} \
print/gl2ps \
x11/qt5/qttools,-main
WANTLIB += ${MODFORTRAN_WANTLIB}
WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5 SM X11 X11-xcb Xdamage
WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += curses cxsparse double-conversion drm ereadline expat
WANTLIB += execinfo fftw3 fftw3_threads fftw3f fftw3f_threads
WANTLIB += fontconfig freetype gl2ps glapi glpk glut
WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz icudata icuio
WANTLIB += gmp hdf5 iconv icui18n icuuc intl lapack lcms2 ltdl lzma
WANTLIB += m nghttp2 ogg pcre pcre2-16 png portaudio pthread qhull
WANTLIB += qrupdate sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-dri3 xcb-glx
WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z zstd
SEPARATE_BUILD = Yes
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu

View File

@ -1,2 +1,2 @@
SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
SIZE (octave-5.1.0.tar.gz) = 32034788
SHA256 (octave-5.2.0.tar.gz) = L+pis8eNbzjpRR2opNJgI4QHJZd9/+5SUNPRgPVlleE=
SIZE (octave-5.2.0.tar.gz) = 33360285

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.14 2019/05/06 21:09:52 steven Exp $
$OpenBSD: patch-configure,v 1.15 2020/05/16 08:08:22 steven Exp $
Use GNU readline as our base readline lacks rl_prefer_env_winsize.
Index: configure
--- configure.orig
+++ configure
@@ -67197,13 +67197,13 @@ fi
@@ -67123,13 +67123,13 @@ fi
ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@ -22,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -67242,7 +67242,7 @@ fi
@@ -67168,7 +67168,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2019/05/06 21:09:52 steven Exp $
@comment $OpenBSD: PLIST,v 1.27 2020/05/16 08:08:22 steven Exp $
bin/mkoctfile
@bin bin/mkoctfile-${VERSION}
bin/octave
@ -776,13 +776,13 @@ lib/octave/${VERSION}/convhulln.a
lib/octave/${VERSION}/dmperm.a
lib/octave/${VERSION}/fftw.a
lib/octave/${VERSION}/gzip.a
lib/octave/${VERSION}/liboctave.a
@static-lib lib/octave/${VERSION}/liboctave.a
lib/octave/${VERSION}/liboctave.la
@lib lib/octave/${VERSION}/liboctave.so.${LIBoctave_VERSION}
lib/octave/${VERSION}/liboctgui.a
@static-lib lib/octave/${VERSION}/liboctgui.a
lib/octave/${VERSION}/liboctgui.la
@lib lib/octave/${VERSION}/liboctgui.so.${LIBoctgui_VERSION}
lib/octave/${VERSION}/liboctinterp.a
@static-lib lib/octave/${VERSION}/liboctinterp.a
lib/octave/${VERSION}/liboctinterp.la
@lib lib/octave/${VERSION}/liboctinterp.so.${LIBoctinterp_VERSION}
lib/octave/${VERSION}/oct/
@ -844,6 +844,9 @@ libexec/octave/site/exec/${GNU_ARCH}/
@man man/man1/octave-config.1
@man man/man1/octave.1
share/applications/org.octave.Octave.desktop
share/icons/hicolor/1024x1024/
share/icons/hicolor/1024x1024/apps/
share/icons/hicolor/1024x1024/apps/octave.png
share/icons/hicolor/128x128/apps/octave.png
share/icons/hicolor/16x16/apps/octave.png
share/icons/hicolor/22x22/apps/octave.png
@ -1107,6 +1110,7 @@ share/octave/${VERSION}/etc/tests/fixed/classes/@Sneetch/display.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/Snork.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/cack.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/ctranspose.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/display.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/double.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/end.m
@ -1139,6 +1143,7 @@ share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/subsindex.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/subsref.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/tattack.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/times.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/transpose.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uminus.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/uplus.m
share/octave/${VERSION}/etc/tests/fixed/classes/@Snork/vertcat.m
@ -1386,6 +1391,7 @@ share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov-usr-fcn.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave-value/ov.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/octave.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/bp-table.cc-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/lex.ll-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/oct-parse.yy-tst
share/octave/${VERSION}/etc/tests/libinterp/parse-tree/pt-assign.cc-tst