Index: head/math/octave-forge-level-set/Makefile =================================================================== --- head/math/octave-forge-level-set/Makefile (revision 566262) +++ head/math/octave-forge-level-set/Makefile (revision 566263) @@ -1,32 +1,30 @@ # Created by: Stephen Montgomery-Smith # $FreeBSD$ PORTNAME= octave-forge-level-set PORTVERSION= 0.3.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org COMMENT= Octave-forge package ${OCTAVE_PKGNAME} LICENSE= GPLv3 ALL_TARGET= oct USES= compiler:c++0x GNU_CONFIGURE= yes - -BROKEN= does not build with octave-6.2.0 # OCTSRC is the name of the directory of the package. # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}. OCTSRC= ${OCTAVE_PKGNAME} WRKSRC= ${WRKDIR}/${OCTSRC}/src .include "${.CURDIR}/../../Mk/bsd.octave.mk" post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC} .include Index: head/math/octave-forge-level-set/files/patch-FastMarching.cpp =================================================================== --- head/math/octave-forge-level-set/files/patch-FastMarching.cpp (revision 566262) +++ head/math/octave-forge-level-set/files/patch-FastMarching.cpp (revision 566263) @@ -1,10 +1,10 @@ ---- FastMarching.cpp-orig 2015-02-20 03:51:59.000000000 +0000 -+++ FastMarching.cpp 2015-02-20 03:52:16.000000000 +0000 +--- FastMarching.cpp.orig 2015-12-17 12:32:55 UTC ++++ FastMarching.cpp @@ -22,6 +22,7 @@ #include #include #include +#include namespace fastMarching { Index: head/math/octave-forge-level-set/files/patch-geomGamma.cpp =================================================================== --- head/math/octave-forge-level-set/files/patch-geomGamma.cpp (nonexistent) +++ head/math/octave-forge-level-set/files/patch-geomGamma.cpp (revision 566263) @@ -0,0 +1,11 @@ +--- geomGamma.cpp.orig 2021-02-22 04:26:32 UTC ++++ geomGamma.cpp +@@ -192,7 +192,7 @@ DEFUN_DLD (__levelset_geomGamma, args, nargout, + const Matrix inout = args(4).matrix_value (); + + /* Extract and check the dimensions. */ +- const unsigned nNodes = phi.nelem (); ++ const unsigned nNodes = phi.numel (); + const unsigned nElem = getDimension (nodelist, -1, 4); + const unsigned nBdryEl = getDimension (bdryInd, -1, 1); + getDimension (edges, nBdryEl, 4); Property changes on: head/math/octave-forge-level-set/files/patch-geomGamma.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp =================================================================== --- head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp (nonexistent) +++ head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp (revision 566263) @@ -0,0 +1,20 @@ +--- internal_fastmarching.cpp.orig 2021-02-22 04:24:09 UTC ++++ internal_fastmarching.cpp +@@ -74,7 +74,7 @@ DEFUN_DLD (__levelset_internal_fastmarching, args, nar + { + const Array idx = getOctaveIdx (c); + assert (c.size () == D +- && static_cast (idx.length ()) == D); ++ && static_cast (idx.numel ()) == D); + + if (domain(idx)) + { +@@ -99,7 +99,7 @@ DEFUN_DLD (__levelset_internal_fastmarching, args, nar + { + const Array idx = getOctaveIdx (c); + assert (c.size () == D +- && static_cast (idx.length ()) == D); ++ && static_cast (idx.numel ()) == D); + + const Grid& constGrid(grid); + const Entry* e = constGrid.get (c); Property changes on: head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/octave-forge-level-set/files/patch-internal__mesh.cpp =================================================================== --- head/math/octave-forge-level-set/files/patch-internal__mesh.cpp (nonexistent) +++ head/math/octave-forge-level-set/files/patch-internal__mesh.cpp (revision 566263) @@ -0,0 +1,20 @@ +--- internal_mesh.cpp.orig 2021-02-22 04:30:13 UTC ++++ internal_mesh.cpp +@@ -300,7 +300,7 @@ getInnerSegment (const octave_scalar_map& segs, + + assert (innerPts.empty ()); + const ColumnVector inners = segs.contents ("inners").column_vector_value (); +- const unsigned nInners = inners.nelem (); ++ const unsigned nInners = inners.numel (); + for (unsigned i = 0; i < nInners; ++i) + innerPts.push_back (inners(nInners - i - 1) - 1); + } +@@ -387,7 +387,7 @@ DEFUN_DLD (__levelset_internal_mesh, args, nargout, + { + const unsigned cur = bdryElems(i) - 1; + const Cell cellSegs = bdryelSegs(i).cell_value (); +- const unsigned nSegs = cellSegs.nelem (); ++ const unsigned nSegs = cellSegs.numel (); + + std::vector segs; + indexArr endEdges; Property changes on: head/math/octave-forge-level-set/files/patch-internal__mesh.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property