maintenance update to 4.4.1

test and feedback on port consistency from kn@
ok rsadowski@
This commit is contained in:
steven 2019-01-13 22:43:59 +00:00
parent 6b2028f1bd
commit fe39d46192
6 changed files with 29 additions and 31 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.105 2018/08/11 04:58:47 naddy Exp $
# $OpenBSD: Makefile,v 1.106 2019/01/13 22:43:59 steven Exp $
COMMENT = high-level language for numerical computations
VERSION = 4.4.0
VERSION = 4.4.1
DISTNAME = octave-${VERSION}
CATEGORIES = math
REVISION = 1
SHARED_LIBS += octave 10.0
SHARED_LIBS += octgui 4.0
SHARED_LIBS += octinterp 9.0
SHARED_LIBS += octave 11.0
SHARED_LIBS += octgui 5.0
SHARED_LIBS += octinterp 10.0
HOMEPAGE = https://www.gnu.org/software/octave/
@ -24,15 +23,15 @@ WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
WANTLIB += Qt5Help Qt5Sql qscintilla2_qt5
WANTLIB += 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 += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += fftw3f_threads fontconfig freetype gl2ps glapi
WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
WANTLIB += arpack blas btf bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += curses cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
WANTLIB += icui18n icuuc pcre2-16
WANTLIB += fftw3f_threads fontconfig freetype gl2ps glapi glpk glut
WANTLIB += gmp hdf5 iconv icui18n icuuc intl klu lapack lcms2 ltdl lzma
WANTLIB += m nghttp2 ogg pcre pcre2-16 png png16 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
MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
@ -40,16 +39,17 @@ MODULES = fortran \
x11/qt5
BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} \
math/gnuplot \
print/texinfo \
textproc/gsed \
math/gnuplot
textproc/gsed
MODFORTRAN_COMPILER = gfortran
# configure checks for desktop-file-install(1)
BUILD_DEPENDS +=devel/desktop-file-utils
RUN_DEPENDS = devel/desktop-file-utils
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS} \
audio/libsndfile \

View File

@ -1,2 +1,2 @@
SHA256 (octave-4.4.0.tar.gz) = cvhGN5/Ox+gT1Grcus0GnXLE9Nj2ADvNksNROq/NbpY=
SIZE (octave-4.4.0.tar.gz) = 29009355
SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
SIZE (octave-4.4.1.tar.gz) = 28626462

View File

@ -1,11 +1,11 @@
$OpenBSD: patch-configure,v 1.12 2018/05/24 21:23:50 steven Exp $
$OpenBSD: patch-configure,v 1.13 2019/01/13 22:43:59 steven Exp $
Use GNU readline as our base readline lacks rl_prefer_env_winsize.
Index: configure
--- configure.orig
+++ configure
@@ -66013,13 +66013,13 @@ fi
@@ -66327,13 +66327,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. */
@@ -66058,7 +66058,7 @@ fi
@@ -66372,7 +66372,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,8 +1,8 @@
$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.2 2017/11/03 12:28:53 steven Exp $
$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.3 2019/01/13 22:43:59 steven Exp $
Index: scripts/pkg/private/configure_make.m
--- scripts/pkg/private/configure_make.m.orig
+++ scripts/pkg/private/configure_make.m
@@ -87,7 +87,7 @@ function configure_make (desc, packdir, verbose)
@@ -91,7 +91,7 @@ function configure_make (desc, packdir, verbose)
endif
if (exist (fullfile (src, "Makefile"), "file"))

View File

@ -2,7 +2,7 @@ GNU Octave is a high-level language, primarily intended for numerical
computations. It provides a convenient command line interface for
solving linear and nonlinear problems numerically, and for performing
other numerical experiments using a language that is mostly compatible
with Matlab. It may also be used as a batch-oriented language.
with Matlab. It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating
@ -10,4 +10,4 @@ ordinary functions, manipulating polynomials, and integrating ordinary
differential and differential-algebraic equations. It is easily extensible
and customizable via user-defined functions written in Octave's own
language, or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
or other languages.

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.24 2018/06/27 21:03:57 espie Exp $
@comment $OpenBSD: PLIST,v 1.25 2019/01/13 22:43:59 steven Exp $
bin/mkoctfile
@bin bin/mkoctfile-${VERSION}
bin/octave
@ -703,7 +703,6 @@ include/octave-${VERSION}/octave/sparse-util.h
include/octave-${VERSION}/octave/sparse-xdiv.h
include/octave-${VERSION}/octave/sparse-xpow.h
include/octave-${VERSION}/octave/str-vec.h
include/octave-${VERSION}/octave/sun-utils.h
include/octave-${VERSION}/octave/svd.h
include/octave-${VERSION}/octave/symrec.h
include/octave-${VERSION}/octave/symscope.h
@ -944,9 +943,6 @@ share/octave/${VERSION}/etc/tests/fixed/bug-44940/
share/octave/${VERSION}/etc/tests/fixed/bug-44940/bug-44940.tst
share/octave/${VERSION}/etc/tests/fixed/bug-44940/class_bug44940.m
share/octave/${VERSION}/etc/tests/fixed/bug-46330.tst
share/octave/${VERSION}/etc/tests/fixed/bug-46497/
share/octave/${VERSION}/etc/tests/fixed/bug-46497/bug-46497.tst
share/octave/${VERSION}/etc/tests/fixed/bug-46497/class_bug46497.m
share/octave/${VERSION}/etc/tests/fixed/bug-46660/
share/octave/${VERSION}/etc/tests/fixed/bug-46660/bug-46660.tst
share/octave/${VERSION}/etc/tests/fixed/bug-46660/class_bug46660.m
@ -1457,6 +1453,7 @@ share/octave/${VERSION}/m/deprecated/octave_config_info.m
share/octave/${VERSION}/m/deprecated/onenormest.m
share/octave/${VERSION}/m/deprecated/paren.m
share/octave/${VERSION}/m/deprecated/semicolon.m
share/octave/${VERSION}/m/deprecated/setstr.m
share/octave/${VERSION}/m/deprecated/sleep.m
share/octave/${VERSION}/m/deprecated/tmpnam.m
share/octave/${VERSION}/m/deprecated/toascii.m
@ -2398,3 +2395,4 @@ share/octave/site/m/
share/octave/site/m/startup/
share/octave/site/m/startup/octaverc
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor