From owner-svn-ports-all@freebsd.org Mon Feb 22 04:35:05 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 454CE546C5B; Mon, 22 Feb 2021 04:35:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DkTqs1ThBz4ZBr; Mon, 22 Feb 2021 04:35:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 25B4F1F371; Mon, 22 Feb 2021 04:35:05 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11M4Z414025508; Mon, 22 Feb 2021 04:35:04 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11M4Z3xE025503; Mon, 22 Feb 2021 04:35:03 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <202102220435.11M4Z3xE025503@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Mon, 22 Feb 2021 04:35:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566263 - in head/math/octave-forge-level-set: . files X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: in head/math/octave-forge-level-set: . files X-SVN-Commit-Revision: 566263 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 04:35:05 -0000 Author: stephen Date: Mon Feb 22 04:35:03 2021 New Revision: 566263 URL: https://svnweb.freebsd.org/changeset/ports/566263 Log: - Unbreak with patches. - Bump portrevision. Added: head/math/octave-forge-level-set/files/patch-geomGamma.cpp (contents, props changed) head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp (contents, props changed) head/math/octave-forge-level-set/files/patch-internal__mesh.cpp (contents, props changed) Modified: head/math/octave-forge-level-set/Makefile head/math/octave-forge-level-set/files/patch-FastMarching.cpp Modified: head/math/octave-forge-level-set/Makefile ============================================================================== --- head/math/octave-forge-level-set/Makefile Mon Feb 22 04:23:01 2021 (r566262) +++ head/math/octave-forge-level-set/Makefile Mon Feb 22 04:35:03 2021 (r566263) @@ -3,7 +3,7 @@ PORTNAME= octave-forge-level-set PORTVERSION= 0.3.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org @@ -14,8 +14,6 @@ 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}. Modified: head/math/octave-forge-level-set/files/patch-FastMarching.cpp ============================================================================== --- head/math/octave-forge-level-set/files/patch-FastMarching.cpp Mon Feb 22 04:23:01 2021 (r566262) +++ head/math/octave-forge-level-set/files/patch-FastMarching.cpp Mon Feb 22 04:35:03 2021 (r566263) @@ -1,5 +1,5 @@ ---- 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 Added: head/math/octave-forge-level-set/files/patch-geomGamma.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-level-set/files/patch-geomGamma.cpp Mon Feb 22 04:35:03 2021 (r566263) @@ -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); Added: head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-level-set/files/patch-internal__fastmarching.cpp Mon Feb 22 04:35:03 2021 (r566263) @@ -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); Added: head/math/octave-forge-level-set/files/patch-internal__mesh.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/octave-forge-level-set/files/patch-internal__mesh.cpp Mon Feb 22 04:35:03 2021 (r566263) @@ -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;