Re: UPDATE: math/octave
Builds, installs and runs fine here on amd64 - which you already knew, I
guess ;-)
On 11/9/22 19:45, Steven Mestdagh wrote:
Below is a maintenance update for octave.
On amd64 it seems to be fine. The test suite gives the following result:
PASS17011
FAIL 14
REGRESSION 6
XFAIL (reported bug) 33
SKIP (missing feature)226
SKIP (run-time condition) 42
For comparison, the test suite result with the previous release 7.2.0
PASS16952
FAIL 18
REGRESSION 6
XFAIL (reported bug) 31
SKIP (missing feature)226
SKIP (run-time condition) 42
Please test/comment/ok.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.131
diff -u -p -u -r1.131 Makefile
--- Makefile24 Aug 2022 19:53:38 - 1.131
+++ Makefile9 Nov 2022 18:39:11 -
@@ -1,13 +1,13 @@
COMMENT = Scientific Programming Language
-VERSION = 7.2.0
+VERSION = 7.3.0
DISTNAME =octave-${VERSION}
EXTRACT_SUFX =.tar.xz
CATEGORIES = math
-SHARED_LIBS += octave 15.0
-SHARED_LIBS += octgui 9.0
-SHARED_LIBS += octinterp 14.0
+SHARED_LIBS += octave 16.0
+SHARED_LIBS += octgui 10.0
+SHARED_LIBS += octinterp 15.0
HOMEPAGE = https://www.gnu.org/software/octave/
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo24 Aug 2022 19:53:38 - 1.25
+++ distinfo9 Nov 2022 18:39:11 -
@@ -1,2 +1,2 @@
-SHA256 (octave-7.2.0.tar.xz) = Su94w8nUn3XWTM1VJn30CzAg5kFPaeqHV6GTliizAXE=
-SIZE (octave-7.2.0.tar.xz) = 26224708
+SHA256 (octave-7.3.0.tar.xz) = pQjuauvM+miWfJ5+Cgh5PEyo5N2s5yOqvbj3GtNNV/E=
+SIZE (octave-7.3.0.tar.xz) = 26215288
Index: patches/patch-scripts_miscellaneous_unpack_m
===
RCS file: /cvs/ports/math/octave/patches/patch-scripts_miscellaneous_unpack_m,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-scripts_miscellaneous_unpack_m
--- patches/patch-scripts_miscellaneous_unpack_m26 Apr 2022 14:47:40
- 1.4
+++ patches/patch-scripts_miscellaneous_unpack_m9 Nov 2022 18:39:11
-
@@ -25,7 +25,7 @@ Index: scripts/miscellaneous/unpack.m
@__parse_tar__, false};
commandlist.tarbz = commandlist.tarbz2;
commandlist.tbz2 = commandlist.tarbz2;
-@@ -328,7 +328,9 @@ function files = __parse_gzip__ (output)
+@@ -332,7 +332,9 @@ function files = __parse_gzip__ (output)
## Parse the output from gzip and gunzip returning the files
## compressed (or decompressed).
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -u -r1.29 PLIST
--- pkg/PLIST 26 Apr 2022 14:47:40 - 1.29
+++ pkg/PLIST 9 Nov 2022 18:39:12 -
@@ -1101,6 +1101,9 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1_and_2.m
share/octave/${VERSION}/etc/tests/fixed/classdef-multiple-inheritance/classdef-multiple-inheritance.tst
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/amethod.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/@class_bug62802/class_bug62802.m
share/octave/${VERSION}/etc/tests/fixed/classdef/bug_60763.m
share/octave/${VERSION}/etc/tests/fixed/classdef/class_bug52614A.m
share/octave/${VERSION}/etc/tests/fixed/classdef/class_bug52614B.m
Re: [update] math/octave 7.1.0
Le Sat, Apr 23, 2022 at 11:59:07AM +0200, Volker Schlecht a écrit : > > > i've tried your diff and it fails to package here, some tests are > > apparently installed in the wrong dir ? > > Ha ... yes, turns out I was missing a patch from upstream: > > https://savannah.gnu.org/bugs/index.php?62295 > > The attached diff includes that, and the fix to use PORTHOME instead of > tweaking TEST_ENV. thanks, that builds & packages fine, tests still running here. > steven@: I'd be willing to take over as maintainer, just in case you're > interested in passing it on. i can take care of commiting qhull/octave/plplot & tweaks here and there (WANTLIB fixes for gdal/postgis) anytime :) but usually MAINTAINER has the last word ! Landry
Re: [update] math/octave 7.1.0
Le Sat, Apr 16, 2022 at 10:11:11PM +0200, Volker Schlecht a écrit :
> Hi,
>
> so here's my shot at the octave update. There are some remaining failing
> tests (they have been failing in 5.2.0 as well), that are due to Octave
> banking on some specific behaviors of GNU libstdc++ ... (un)fortunately
> these are all documented:
>
> https://lists.gnu.org/archive/html/octave-maintainers/2018-04/msg00152.html
>
> The most disturbing one is the difference in parsing imaginary parts of
> complex numbers, so using dlmread or str2double is badly broken on systems
> building with libc++:
>
> https://bugs.llvm.org/show_bug.cgi?id=17782
>
> That's not a regression vs. the 5.2.0 port - it's been in there as well.
>
> I added a dependency on gtar, because Octave assumes either bsdtar or GNU
> tar, and enforcing GNU tar seemed to be the most straightforward way of
> addressing that.
thanks for all the details on the failing tests & the gtar thing, its
much clearer now.
i've tried your diff and it fails to package here, some tests are
apparently installed in the wrong dir ?
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@cell/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@char/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@double/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@function_handle/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@int16/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@int32/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@int64/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@int8/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@logical/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@single/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@struct/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@uint16/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@uint32/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@uint64/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/@uint8/tbcover.m
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/bc-overloads.tst
does not exist
Error:
/usr/obj/ports/octave-7.1.0/fake-amd64/usr/local/share/octave/7.1.0/etc/tests/fixed/build/pobj/octave-7.1.0/build-amd64/test/tbcover.m
does not exist
> +# Some tests fail when a tilde doesn't expand to a home directory
> +TEST_ENV = HOME="${WRKSRC}"
tb@ commented on this and said this should be PORTHOME=${WRKSRC}, so i've done
that locally and it failed to package => the below chunk of PLIST is wrong :)
> +share/octave/${VERSION}/etc/tests/fixed/build/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/test/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/test/@cell/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/test/@cell/tbcover.m
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/test/@char/
> +share/octave/${VERSION}/etc/tests/fixed/build/pobj/octave-${VERSION}/build-amd64/test/@char/tbcover.m
>
Re: [update] math/octave 7.1.0
Le Sat, Apr 16, 2022 at 10:11:11PM +0200, Volker Schlecht a écrit : > Hi, > > so here's my shot at the octave update. There are some remaining failing > tests (they have been failing in 5.2.0 as well), that are due to Octave > banking on some specific behaviors of GNU libstdc++ ... (un)fortunately > these are all documented: > > https://lists.gnu.org/archive/html/octave-maintainers/2018-04/msg00152.html so those are *not* regressions ? > > The most disturbing one is the difference in parsing imaginary parts of > complex numbers, so using dlmread or str2double is badly broken on systems > building with libc++: > > https://bugs.llvm.org/show_bug.cgi?id=17782 > > That's not a regression vs. the 5.2.0 port - it's been in there as well. > > I added a dependency on gtar, because Octave assumes either bsdtar or GNU > tar, and enforcing GNU tar seemed to be the most straightforward way of > addressing that. thanks for that tedious work - btw the port has a maintainer, which i'm ccing now :) steven, now is the time to comment on this update (which depends on qhull in the same thread) as for that last thing, from my reading of the patch, if it correctly detects bsd tar by running 'tar --version' and assuming its bsdtar if the latter fail, then we're sure that our tar will be properly detected/used ? or it assumes/looks for a command named 'bsdtar' ? either way, since on OpenBSD GNU tar is gtar i dont see how ther could be mixup between both, so if at runtime it works with our tar why the need to patch it ? looking at the patch all tar usages seems covered by our tar options.. Landry
Re: UPDATE: math/octave
On Mon, Apr 20, 2020 at 01:45:38PM +0200, Steven Mestdagh wrote:
> Stuart Henderson [2020-04-19, 22:24:32]:
> > On 2020/04/19 22:04, Stuart Henderson wrote:
> > > On 2020/04/18 14:38, Steven Mestdagh wrote:
> > > > update octave, and reinstate wantlib that was somehow removed earlier.
> > > > tested lightly on amd64, test suite shows no regression compared to
> > > > version 5.1.0 in tree.
> > > >
> > > > please test/comment/ok.
> > >
> > > Not an Octave user and I can't really comment on whether the update is
> > > important/safe to have before release or not (ports-wise it looks good
> > > though).. but one way or the other the WANTLIB definitely needs fixing.
> > >
> >
> > oh, it picks up fltk if present at configure time, it either needs
> > wantlib+lib_depends additions, or --without-fltk
>
> thanks Stuart, I updated the diff to disable fltk.
OK. I say postpone until after release as it is not critical. But I
don't care eitherway. Just trying to keep naddy happy :)
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.118
> diff -u -p -u -r1.118 Makefile
> --- Makefile 5 Apr 2020 15:44:52 - 1.118
> +++ Makefile 20 Apr 2020 06:56:04 -
> @@ -2,14 +2,13 @@
>
> COMMENT =high-level language for numerical computations
>
> -VERSION =5.1.0
> +VERSION =5.2.0
> DISTNAME = octave-${VERSION}
> CATEGORIES = math
> -REVISION = 4
>
> -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/
>
> @@ -56,11 +55,29 @@ 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
> # --disable-readline: needs GNU readline
> CONFIGURE_ARGS = --disable-java \
> + --without-fltk \
> octave_cv_version_2_6_0=yes
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
> -I${LOCALBASE}/include/ereadline" \
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.22
> diff -u -p -u -r1.22 distinfo
> --- distinfo 6 May 2019 21:09:52 - 1.22
> +++ distinfo 20 Apr 2020 06:56:04 -
> @@ -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
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.14
> diff -u -p -u -r1.14 patch-configure
> --- patches/patch-configure 6 May 2019 21:09:52 - 1.14
> +++ patches/patch-configure 20 Apr 2020 06:56:04 -
> @@ -5,7 +5,7 @@ Use GNU readline as our base readline la
> 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 :
> Index: pkg/PLIST
>
Re: UPDATE: math/octave
Stuart Henderson [2020-04-19, 22:24:32]:
> On 2020/04/19 22:04, Stuart Henderson wrote:
> > On 2020/04/18 14:38, Steven Mestdagh wrote:
> > > update octave, and reinstate wantlib that was somehow removed earlier.
> > > tested lightly on amd64, test suite shows no regression compared to
> > > version 5.1.0 in tree.
> > >
> > > please test/comment/ok.
> >
> > Not an Octave user and I can't really comment on whether the update is
> > important/safe to have before release or not (ports-wise it looks good
> > though).. but one way or the other the WANTLIB definitely needs fixing.
> >
>
> oh, it picks up fltk if present at configure time, it either needs
> wantlib+lib_depends additions, or --without-fltk
thanks Stuart, I updated the diff to disable fltk.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.118
diff -u -p -u -r1.118 Makefile
--- Makefile5 Apr 2020 15:44:52 - 1.118
+++ Makefile20 Apr 2020 06:56:04 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 5.1.0
+VERSION = 5.2.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 4
-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/
@@ -56,11 +55,29 @@ 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
# --disable-readline: needs GNU readline
CONFIGURE_ARGS = --disable-java \
+ --without-fltk \
octave_cv_version_2_6_0=yes
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/ereadline" \
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo6 May 2019 21:09:52 - 1.22
+++ distinfo20 Apr 2020 06:56:04 -
@@ -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
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -u -r1.14 patch-configure
--- patches/patch-configure 6 May 2019 21:09:52 - 1.14
+++ patches/patch-configure 20 Apr 2020 06:56:04 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
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 :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.26
diff -u -p -u -r1.26 PLIST
--- pkg/PLIST 6 May 2019 21:09:52 - 1.26
+++ pkg/PLIST 20 Apr 2020 06:56:05 -
@@ -776,13 +776,13 @@ lib/octave/${VERSION}/convhulln.a
lib/octave/${VERSION}/dmperm.a
lib/octave/${VERSION}/fftw.a
lib/octave/${VERSION}/gzip.a
Re: UPDATE: math/octave
On 2020/04/19 22:04, Stuart Henderson wrote: > On 2020/04/18 14:38, Steven Mestdagh wrote: > > update octave, and reinstate wantlib that was somehow removed earlier. > > tested lightly on amd64, test suite shows no regression compared to > > version 5.1.0 in tree. > > > > please test/comment/ok. > > Not an Octave user and I can't really comment on whether the update is > important/safe to have before release or not (ports-wise it looks good > though).. but one way or the other the WANTLIB definitely needs fixing. > oh, it picks up fltk if present at configure time, it either needs wantlib+lib_depends additions, or --without-fltk octave-5.2.0(math/octave): Missing: Xau.10 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (system lib) Missing: Xcursor.5 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (system lib) Missing: Xdmcp.11 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (system lib) Missing: Xft.12 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (system lib) Missing: Xinerama.6 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (system lib) Missing lib: fltk.8 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (NOT REACHABLE) Missing lib: fltk_gl.8 (/usr/local/lib/octave/5.2.0/oct/x86_64-unknown-openbsd6.7/__init_fltk__.oct) (NOT REACHABLE) WANTLIB += Xau Xcursor Xdmcp Xft Xinerama *** Error 1 in target 'port-lib-depends-check' (ignored)
Re: UPDATE: math/octave
On 2020/04/18 14:38, Steven Mestdagh wrote: > update octave, and reinstate wantlib that was somehow removed earlier. > tested lightly on amd64, test suite shows no regression compared to > version 5.1.0 in tree. > > please test/comment/ok. Not an Octave user and I can't really comment on whether the update is important/safe to have before release or not (ports-wise it looks good though).. but one way or the other the WANTLIB definitely needs fixing.
Re: UPDATE: math/octave (Qt 5.13 fixes)
On Thu, Feb 27, 2020 at 09:43:20PM +0100, Rafael Sadowski wrote:
> On Thu Feb 27, 2020 at 08:53:15AM +0100, Rafael Sadowski wrote:
> > This update fix my build issues with the upcoming Qt 5.13 update.
> >
> > Not check shared libs or runtime and will not. Steven do you have time
> > to take a look?
> >
> > Rafael
> >
>
> Please forget the previous diff. This one fixes our current version
> without trouble.
>
> OK?
OK.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.114
> diff -u -p -u -p -r1.114 Makefile
> --- Makefile 10 Aug 2019 19:41:08 - 1.114
> +++ Makefile 27 Feb 2020 12:00:01 -
> @@ -5,7 +5,7 @@ COMMENT = high-level language for numeri
> VERSION =5.1.0
> DISTNAME = octave-${VERSION}
> CATEGORIES = math
> -REVISION = 2
> +REVISION = 3
>
> SHARED_LIBS += octave 12.0
> SHARED_LIBS += octgui 6.0
> @@ -83,7 +83,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
> LRELEASE="${MODQT_LRELEASE}" \
> CFLAGS="${CFLAGS} -std=gnu11" \
> CXXFLAGS="${CXXFLAGS} -std=gnu++11" \
> - QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator
> + QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator \
> +
> COLLECTIONGENERATOR=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator
>
> # needed to build on amd64
> GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
Re: UPDATE: math/octave (Qt 5.13 fixes)
On Thu Feb 27, 2020 at 08:53:15AM +0100, Rafael Sadowski wrote:
> This update fix my build issues with the upcoming Qt 5.13 update.
>
> Not check shared libs or runtime and will not. Steven do you have time
> to take a look?
>
> Rafael
>
Please forget the previous diff. This one fixes our current version
without trouble.
OK?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.114
diff -u -p -u -p -r1.114 Makefile
--- Makefile10 Aug 2019 19:41:08 - 1.114
+++ Makefile27 Feb 2020 12:00:01 -
@@ -5,7 +5,7 @@ COMMENT = high-level language for numeri
VERSION = 5.1.0
DISTNAME = octave-${VERSION}
CATEGORIES = math
-REVISION = 2
+REVISION = 3
SHARED_LIBS += octave 12.0
SHARED_LIBS += octgui 6.0
@@ -83,7 +83,8 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
LRELEASE="${MODQT_LRELEASE}" \
CFLAGS="${CFLAGS} -std=gnu11" \
CXXFLAGS="${CXXFLAGS} -std=gnu++11" \
- QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator
+ QHELPGENERATOR=${LOCALBASE}/lib/qt5/bin/qhelpgenerator \
+
COLLECTIONGENERATOR=${LOCALBASE}/lib/qt5/bin/qcollectiongenerator
# needed to build on amd64
GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
Re: UPDATE: math/octave
On Sat, May 04, 2019 at 12:20:09AM +0200, Steven Mestdagh wrote: > updated diff against -current. > any feedback on this? Keeps working fine for me in light usage on amd64, OK kn.
Re: UPDATE: math/octave
Steven Mestdagh [2019-04-25, 07:53:23]:
> This brings octave to the latest version. Tested ok on amd64.
> Would be nice if someone could build/test on other archs.
updated diff against -current.
any feedback on this?
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.109
diff -u -p -u -r1.109 Makefile
--- Makefile28 Apr 2019 21:08:27 - 1.109
+++ Makefile3 May 2019 22:17:12 -
@@ -2,14 +2,13 @@
COMMENT = high-level language for numerical computations
-VERSION = 4.4.1
+VERSION = 5.1.0
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math
-SHARED_LIBS += octave 11.0
-SHARED_LIBS += octgui 5.0
-SHARED_LIBS += octinterp 10.0
+SHARED_LIBS += octave 12.0
+SHARED_LIBS += octgui 6.0
+SHARED_LIBS += octinterp 11.0
HOMEPAGE = https://www.gnu.org/software/octave/
@@ -21,7 +20,7 @@ PERMIT_PACKAGE_CDROM =Yes
WANTLIB += ${MODFORTRAN_WANTLIB}
WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE
WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
-WANTLIB += Qt5Help Qt5Sql qscintilla2_qt5
+WANTLIB += Qt5Help Qt5Xml Qt5Sql qscintilla2_qt5
WANTLIB += SM X11 X11-xcb Xdamage
WANTLIB += Xext Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm amd
WANTLIB += arpack blas btf bz2 c camd ccolamd cholmod colamd crypto curl
@@ -29,7 +28,7 @@ WANTLIB += curses cxsparse drm ereadline
WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
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 += 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
Index: distinfo
===
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.21
diff -u -p -u -r1.21 distinfo
--- distinfo13 Jan 2019 22:43:59 - 1.21
+++ distinfo3 May 2019 22:17:12 -
@@ -1,2 +1,2 @@
-SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
-SIZE (octave-4.4.1.tar.gz) = 28626462
+SHA256 (octave-5.1.0.tar.gz) = 42sRJMrCfHyqUcxX3kCMMWdtXwCWNJtNULV7/hvNdJU=
+SIZE (octave-5.1.0.tar.gz) = 32034788
Index: patches/patch-configure
===
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.13
diff -u -p -u -r1.13 patch-configure
--- patches/patch-configure 13 Jan 2019 22:43:59 - 1.13
+++ patches/patch-configure 3 May 2019 22:17:12 -
@@ -5,7 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -66327,13 +66327,13 @@ fi
+@@ -67197,13 +67197,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. */
-@@ -66372,7 +66372,7 @@ fi
+@@ -67242,7 +67242,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 :
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.25
diff -u -p -u -r1.25 PLIST
--- pkg/PLIST 13 Jan 2019 22:43:59 - 1.25
+++ pkg/PLIST 3 May 2019 22:17:13 -
@@ -135,7 +135,6 @@ include/octave-${VERSION}/octave/graphic
include/octave-${VERSION}/octave/graphics-props.cc
include/octave-${VERSION}/octave/graphics-toolkit.h
include/octave-${VERSION}/octave/graphics.h
-include/octave-${VERSION}/octave/gripes.h
include/octave-${VERSION}/octave/gsvd.h
include/octave-${VERSION}/octave/gtk-manager.h
include/octave-${VERSION}/octave/help.h
@@ -159,11 +158,9 @@ include/octave-${VERSION}/octave/libocti
include/octave-${VERSION}/octave/lo-amos-proto.h
include/octave-${VERSION}/octave/lo-arpack-proto.h
include/octave-${VERSION}/octave/lo-array-errwarn.h
-include/octave-${VERSION}/octave/lo-array-gripes.h
include/octave-${VERSION}/octave/lo-blas-proto.h
include/octave-${VERSION}/octave/lo-cutils.h
include/octave-${VERSION}/octave/lo-error.h
-include/octave-${VERSION}/octave/lo-fftpack-proto.h
include/octave-${VERSION}/octave/lo-hash.h
include/octave-${VERSION}/octave/lo-ieee.h
include/octave-${VERSION}/octave/lo-lapack-proto.h
@@ -636,6 +633,7 @@ include/octave-${VERSION}/octave/pr-outp
include/octave-${VERSION}/octave/procstream.h
Re: UPDATE: math/octave
On Thu, Jan 10, 2019 at 09:42:48PM +0100, Steven Mestdagh wrote:
> maintenance update, seems to work fine on amd64.
> test suite shows 2 failures less than with the previous version.
>
> comments / ok?
OK (with the fixes from kn@)
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.105
> diff -u -p -u -r1.105 Makefile
> --- Makefile 11 Aug 2018 04:58:47 - 1.105
> +++ Makefile 10 Jan 2019 20:39:00 -
> @@ -2,14 +2,13 @@
>
> 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/
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.20
> diff -u -p -u -r1.20 distinfo
> --- distinfo 24 May 2018 21:23:50 - 1.20
> +++ distinfo 10 Jan 2019 20:39:00 -
> @@ -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
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.12
> diff -u -p -u -r1.12 patch-configure
> --- patches/patch-configure 24 May 2018 21:23:50 - 1.12
> +++ patches/patch-configure 10 Jan 2019 20:39:00 -
> @@ -5,7 +5,7 @@ Use GNU readline as our base readline la
> 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 :
> Index: patches/patch-scripts_pkg_private_configure_make_m
> ===
> RCS file:
> /cvs/ports/math/octave/patches/patch-scripts_pkg_private_configure_make_m,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-scripts_pkg_private_configure_make_m
> --- patches/patch-scripts_pkg_private_configure_make_m3 Nov 2017
> 12:28:53 - 1.2
> +++ patches/patch-scripts_pkg_private_configure_make_m10 Jan 2019
> 20:39:00 -
> @@ -1,8 +1,8 @@
> -$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.2 2017/11/03
> 12:28:53 steven Exp $
> +$OpenBSD$
> 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"))
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/octave/pkg/PLIST,v
> retrieving revision 1.24
> diff -u -p -u -r1.24 PLIST
> --- pkg/PLIST 27 Jun 2018 21:03:57 - 1.24
> +++ pkg/PLIST 10 Jan 2019 20:39:00 -
> @@ -703,7 +703,6 @@ include/octave-${VERSION}/octave/sparse-
> 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/
> 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
Re: UPDATE: math/octave
On Thu, Jan 10, 2019 at 09:42:48PM +0100, Steven Mestdagh wrote: > maintenance update, seems to work fine on amd64. > test suite shows 2 failures less than with the previous version. Keeps working fine on amd64, thanks. > comments / ok? $ portcheck trailing whitespace in pkg/DESCR missing RDEP on x11/gtk+3,-guic math/octave $ make port-lib-depends-check octave-4.4.1(math/octave): Missing: btf.2 from suitesparse-4.4.6p0 (/usr/local/lib/octave/4.4.1/oct/x86_64-unknown-openbsd6.4/__ode15__.oct) Missing: klu.2 from suitesparse-4.4.6p0 (/usr/local/lib/octave/4.4.1/oct/x86_64-unknown-openbsd6.4/__ode15__.oct) Missing: png16.17 from png-1.6.35 (/usr/local/lib/octave/4.4.1/liboctinterp.so.10.0) Missing: xcb-dri3.0 (/usr/local/libexec/octave/4.4.1/exec/x86_64-unknown-openbsd6.4/octave-gui) (system lib) Missing: xcb-present.0 (/usr/local/libexec/octave/4.4.1/exec/x86_64-unknown-openbsd6.4/octave-gui) (system lib) Missing: xcb-sync.1 (/usr/local/libexec/octave/4.4.1/exec/x86_64-unknown-openbsd6.4/octave-gui) (system lib) Missing: xcb-xfixes.1 (/usr/local/libexec/octave/4.4.1/exec/x86_64-unknown-openbsd6.4/octave-gui) (system lib) Missing: xshmfence.0 (/usr/local/libexec/octave/4.4.1/exec/x86_64-unknown-openbsd6.4/octave-gui) (system lib) Extra: png.17 WANTLIB += btf klu png16 xcb-dri3 xcb-present xcb-sync xcb-xfixes WANTLIB += xshmfence *** Error 1 in target 'port-lib-depends-check' (ignored) Please sort BDEP; I'd say you can just merge both lines together as well.
Re: UPDATE: math/octave
On Tue, Apr 24, 2018 at 08:53:49PM +0300, Paul Irofti wrote: > On Wed, Apr 04, 2018 at 11:07:38AM +0300, Paul Irofti wrote: > > I get this when runninng make with your diff: > > > > $ make update > > Fatal: unknown keyword gcc in COMPILER (in math/octave) > > *** Error 1 in /usr/ports/math/octave > > (/usr/ports/infrastructure/mk/bsd.port.mk:3520 '.BEGIN': @exit 1) > > Sorry, that was my fault. > > I built and installed octave just fine. Problem is when I plot something > and then close the plot window octave exits: > > octave exited with signal 11 > > or > > octave exited with signal 10 > > Any ideas why? The problem is elsewhere as this happens with the old version too, so OK. Please commit.
Re: UPDATE: math/octave
On Wed, Apr 04, 2018 at 11:07:38AM +0300, Paul Irofti wrote: > I get this when runninng make with your diff: > > $ make update > Fatal: unknown keyword gcc in COMPILER (in math/octave) > *** Error 1 in /usr/ports/math/octave > (/usr/ports/infrastructure/mk/bsd.port.mk:3520 '.BEGIN': @exit 1) Sorry, that was my fault. I built and installed octave just fine. Problem is when I plot something and then close the plot window octave exits: octave exited with signal 11 or octave exited with signal 10 Any ideas why?
Re: UPDATE: math/octave
I get this when runninng make with your diff:
$ make update
Fatal: unknown keyword gcc in COMPILER (in math/octave)
*** Error 1 in /usr/ports/math/octave
(/usr/ports/infrastructure/mk/bsd.port.mk:3520 '.BEGIN': @exit 1)
On Sat, Mar 31, 2018 at 11:25:52AM +0200, Steven Mestdagh wrote:
> please test/comment/ok this update for octave.
> it seems to work fine on amd64.
>
> note that I've just committed a change to qrupdate that prevents octave
> from linking in the g2c library and crashing on some computations.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.101
> diff -u -p -u -r1.101 Makefile
> --- Makefile 28 Feb 2018 19:23:56 - 1.101
> +++ Makefile 31 Mar 2018 06:44:49 -
> @@ -2,14 +2,13 @@
>
> COMMENT =high-level language for numerical computations
>
> -VERSION =4.2.1
> +VERSION =4.2.2
> DISTNAME = octave-${VERSION}
> -REVISION = 2
> CATEGORIES = math
>
> -SHARED_LIBS += octave 8.0
> -SHARED_LIBS += octgui 2.0
> -SHARED_LIBS += octinterp 7.0
> +SHARED_LIBS += octave 9.0
> +SHARED_LIBS += octgui 3.0
> +SHARED_LIBS += octinterp 8.0
>
> HOMEPAGE = https://www.gnu.org/software/octave/
>
> @@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama X
> WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
> WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
> WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
> -WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
> +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
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.18
> diff -u -p -u -r1.18 distinfo
> --- distinfo 3 Nov 2017 12:28:53 - 1.18
> +++ distinfo 31 Mar 2018 06:44:49 -
> @@ -1,2 +1,2 @@
> -SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
> -SIZE (octave-4.2.1.tar.gz) = 25409651
> +SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
> +SIZE (octave-4.2.2.tar.gz) = 25624087
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.10
> diff -u -p -u -r1.10 patch-configure
> --- patches/patch-configure 3 Nov 2017 12:28:53 - 1.10
> +++ patches/patch-configure 31 Mar 2018 06:44:49 -
> @@ -5,16 +5,7 @@ Use GNU readline as our base readline la
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
> - ;;
> - 5)
> - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
> -- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
> -+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
> - ;;
> - *)
> - as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
> -@@ -44617,13 +44617,13 @@ fi
> +@@ -44777,13 +44777,13 @@ fi
>
> ac_octave_save_LIBS="$LIBS"
> LIBS="$TERM_LIBS"
> @@ -31,7 +22,7 @@ Index: configure
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> -@@ -44662,7 +44662,7 @@ fi
> +@@ -44822,7 +44822,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 :
> Index: patches/patch-liboctave_system_file-stat_cc
> ===
> RCS file: patches/patch-liboctave_system_file-stat_cc
> diff -N patches/patch-liboctave_system_file-stat_cc
> --- patches/patch-liboctave_system_file-stat_cc 3 Nov 2017 12:28:53
> - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53
> steven Exp $
> -
> -Index: liboctave/system/file-stat.cc
> liboctave/system/file-stat.cc.orig
> -+++ liboctave/system/file-stat.cc
> -@@ -174,7 +174,7 @@ namespace octave
> - update_internal ();
> - }
> -
> --inline file_stat::~file_stat () { }
> -+file_stat::~file_stat () { }
> -
> - void
> - file_stat::update_internal (bool force)
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/math/octave/pkg/PLIST,v
> retrieving revision 1.21
>
Re: UPDATE: math/octave
On Thu, Nov 02, 2017 at 10:56:22AM +0100, Steven Mestdagh wrote:
> comments welcome.
Had a similar diff in openbsd-wip on github that did not work when gcc
was around. Looks like clang fixed that, OK!
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.97
> diff -u -p -u -r1.97 Makefile
> --- Makefile 30 Oct 2017 13:55:10 - 1.97
> +++ Makefile 2 Nov 2017 09:30:57 -
> @@ -2,14 +2,13 @@
>
> COMMENT =high-level language for numerical computations
>
> -VERSION =4.0.2
> +VERSION =4.2.1
> DISTNAME = octave-${VERSION}
> -REVISION = 6
> CATEGORIES = math
>
> -SHARED_LIBS += octave 7.0 # 3.0
> -SHARED_LIBS += octgui 1.0 # 1.0
> -SHARED_LIBS += octinterp 6.0 # 3.0
> +SHARED_LIBS += octave 8.0
> +SHARED_LIBS += octgui 2.0
> +SHARED_LIBS += octinterp 7.0
>
> HOMEPAGE = https://www.gnu.org/software/octave/
>
> @@ -19,22 +18,26 @@ MAINTAINER = Steven Mestdagh PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB += ${MODFORTRAN_WANTLIB}
> -WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE OSMesa QtGui
> -WANTLIB += QtNetwork QtOpenGL SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp
> +WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE OSMesa
> +WANTLIB += Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Core
> +WANTLIB += qscintilla2_qt5
> +WANTLIB += SM X11 X11-xcb Xau Xcursor Xdamage Xdmcp
> WANTLIB += Xext Xfixes Xft Xi Xinerama 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 fltk fltk_gl fontconfig freetype gl2ps glapi
> WANTLIB += glpk glut gmp hdf5 lapack lcms2 ltdl lzma m ncurses nghttp2
> WANTLIB += ogg pcre png portaudio pthread qhull qrupdate
> -WANTLIB += qscintilla2_qt4 sndfile sndio ssl ${COMPILER_LIBCXX}
> suitesparseconfig
> -WANTLIB += umfpack usbhid util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
> +WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
> +WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
> +WANTLIB += execinfo glib-2.0 graphite2 gthread-2.0 harfbuzz icudata
> +WANTLIB += icui18n icuuc pcre2-16
>
> MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
>
> MODULES =devel/gettext \
> fortran \
> - x11/qt4
> + x11/qt5
>
> BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} \
> print/texinfo \
> @@ -52,7 +55,7 @@ LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
> devel/glpk \
> devel/pcre \
> devel/readline \
> - editors/qscintilla \
> + editors/qscintilla,qt5 \
> graphics/GraphicsMagick \
> math/arpack \
> math/fftw3 \
> @@ -69,12 +72,14 @@ SEPARATE_BUILD = Yes
> USE_GMAKE = Yes
> CONFIGURE_STYLE =gnu
> # --disable-readline: needs GNU readline
> -CONFIGURE_ARGS = --disable-java
> +CONFIGURE_ARGS = --disable-java \
> + octave_cv_version_2_6_0=yes
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
> -I${LOCALBASE}/include/ereadline" \
> LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
> LRELEASE="${MODQT_LRELEASE}" \
> - F77=${FC}
> + F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
> +
>
> # needed to build on amd64
> GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 distinfo
> --- distinfo 23 Apr 2016 12:44:14 - 1.17
> +++ distinfo 2 Nov 2017 09:30:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (octave-4.0.2.tar.gz) = Oc2P02whj8AK2s4o10psfJxvqrcROlujxDcjJMdVvcE=
> -SIZE (octave-4.0.2.tar.gz) = 22175922
> +SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
> +SIZE (octave-4.2.1.tar.gz) = 25409651
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 patch-configure
> --- patches/patch-configure 23 Apr 2016 12:44:14 - 1.9
> +++ patches/patch-configure 2 Nov 2017 09:30:57 -
> @@ -2,9 +2,19 @@ $OpenBSD: patch-configure,v 1.9 2016/04/
>
> Use GNU readline as our base readline lacks rl_prefer_env_winsize.
>
> configure.orig Wed Apr 20 21:02:19 2016
> -+++ configureFri Apr 22 23:52:05 2016
> -@@ -39759,13 +39759,13 @@ fi
> +Index: configure
> +--- configure.orig
> configure
> +@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt
Re: UPDATE: math/octave 2.9.12 - 2.9.13
Daniel Dickman [2007-07-27, 01:56:52]: I've put together an update patch for octave. Seems like some of the OpenBSD patches have been merged upstream. thanks, i've made the same update yesterday with some more tweaks.
Re: update: math/octave
hi,
this update fixes MASTER_SITES and enables use of the fftw3 library.
doesn't break anything on i386.
Index: Makefile
===
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile2 Nov 2005 18:20:58 - 1.9
+++ Makefile4 Nov 2005 20:44:31 -
@@ -6,6 +6,7 @@
VERSION= 2.1.71
DISTNAME= octave-${VERSION}
+PKGNAME= ${DISTNAME}p0
CATEGORIES=math
HOMEPAGE= http://www.octave.org/
@@ -21,15 +22,16 @@
WANTLIB= c g2c m ncurses readline stdc++
MASTER_SITES= ftp://ftp.octave.org/pub/octave/ \
- ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave \
+ ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/ \
ftp://neacm.fe.up.pt/pub/octave/ \
- ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave
+ ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/
MODULES= gcc3
MODGCC3_ARCHES=alpha sparc
MODGCC3_LANGS= C++
BUILD_DEPENDS= ::print/teTeX/base \
::textproc/texi2html
+LIB_DEPENDS= fftw3.3::math/fftw3
REGRESS_DEPENDS=::devel/dejagnu
USE_GMAKE= Yes
@@ -37,7 +39,12 @@
SEPARATE_BUILD=simple
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.59
-CONFIGURE_ARGS=${CONFIGURE_SHARED}
+CONFIGURE_ARGS=${CONFIGURE_SHARED} \
+ --with-fftw \
+ --without-mpi \
+ --without-hdf5
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
MAKE_ENV= SHLIB_VER=${SHLIB_VER}
# need shared library version for machines which support shared libraries.
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
Re: update: math/octave
This octave update now also fixes regression tests, thanks to some suggestions by pval@ and [EMAIL PROTECTED] On my sparc64 all tests pass, on my i386 one test does not pass. This is related to PR 4578. tgz attached (it's smaller than the diff). Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm octave.tgz Description: application/tar-gz
Re: update: math/octave
On Sat, Sep 24, 2005 at 12:56:15AM +0200, steven mestdagh wrote: hmm yes, something like 12 out of 1200 tests fail. however, when issuing 'gmake check' in the test directory, only 1 test fails. the exp() function does not return the expected (by the test scripts anyway) result: value expected exp (Inf) NaN Inf exp (-Inf) NaN 0 any ideas? I'll try to figure out why those other tests fail. so, those other 11 tests are failing because HOME is set to something nonexistent. is there a good way to fix such things? these tests are still doing the same, but i got some inspiration from other ports to fix other things - added MODULES=gcc3 (octave only compiles with gcc3) - does anyone want to test such architectures? - fixed the shared library names, get rid of symlinks there - used GNU_ARCH within packing list - patched configure to not test for runtest (it is included in REGRESS_DEPENDS) Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm octave.tgz Description: application/tar-gz
Re: update: math/octave
On Fri, Sep 23, 2005 at 09:06:03AM +0200, Aleksander Piotrowski wrote: steven mestdagh [EMAIL PROTECTED] wrote: Ignore the remark, just make sure your limits are sufficiently high and you have sufficient virtual memory. I tested it on sparc64 as well and it works fine. And what about regression tests? IIRC I saw some errors on i386. I'll post detailed info in the evening. hmm yes, something like 12 out of 1200 tests fail. however, when issuing 'gmake check' in the test directory, only 1 test fails. the exp() function does not return the expected (by the test scripts anyway) result: value expected exp (Inf) NaN Inf exp (-Inf) NaN 0 any ideas? I'll try to figure out why those other tests fail. -- steven Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
