From nobody Fri Aug 11 03:38:23 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMTz35RKrz4m700; Fri, 11 Aug 2023 03:38:23 +0000 (UTC) (envelope-from git@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 4RMTz34vSjz4RSW; Fri, 11 Aug 2023 03:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691725103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qsRSqWRXu2VSFmaU/hWKfFUmZBy9qorVktiyunTS7j8=; b=Js25+jxIXbirItAeNT4GuWsjt2T8BlDbnlp2aElEw7qDrWpk8nRvgYA0hHeeyOwiTsxki5 ds6Nr9mZefQ91b+9YbV7mR8uMHe5KeAvfPOQtebHIJCxccRcjMjDT2HLo7zEC/N9z5Hq/j 81TwnTnICno/8siEbdE4G34lYHms7LFbJFKqh7Hlj4W7xVBo3ujv3l89rsXoUpxOafjDc3 Jkd/nJSKBgXqRwUv10HfLvRZuobNcDLJVSwoc+ckdbTvzkrXgrvCBQKxaidoHL5caNx6zN h2ZAgyD0BN0lIcGrJv+BMHpKgSNNumuUO3k7wJpGxdRAiGsLYZMdV3nreu9htg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691725103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qsRSqWRXu2VSFmaU/hWKfFUmZBy9qorVktiyunTS7j8=; b=S7m1pT+mAEMZ7Rg+8Cth+6Hp7AwxPmEfW+GIjFlyrwXexRlFCXm5QDWfqT7DdmCx6i9vgB YjeV/hEBhxFs15v4nsgaxxYGKzoQENc0EhCT4lC/HcxLhf6Ej5xbgbyLs5qcqj0TF1uO3/ nAoGiqiQe6oMdzjvLZoUgmxApmfHGeEz7VI5K+/eDiyIlAMSVZn8cuyrRugH7nlhdm0Ebx NhOQ9rzPAZ+ZME+S90f/XbbhESWvjLth51RFdIlQMfUzg/wtgIkcHCopwSpHnDiCm8jnZg ZpK61EHBt4MTt7JhN6UYzeVYRNBTeWhPOSBlXbsh3HAhYxfZ/izEJvrZt/Fgwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691725103; a=rsa-sha256; cv=none; b=vgQr+OpAotGeArwAF4nGXXn5sc/P9Qevy4K5MKKDOWApMDvD6HPzKg2An99e7oCJ305OX4 o9N4oioDwh6AnHyGQMP3D0Oi/GMA49EtKSEVeK/uNmeWN2tgzDUOIuoPiznX0elMqQJv+7 FBMUOkTURwizs6msU6i4k+biJkBa6apBV8bjKR8Q5tUa6PiTLdLFLodkZo0Pejefcs9qmO uiryEJTjkSItS94Aho2mc8H2qfdXJlXgtdErM/bTpEQQI62HbnVUjbUMBGuhoGpEqcgrHV UkhOWYt7TUm3KrEPWbZoQoiA8shM7Fk933QCQbChWclMgcV6fWFhTQB1DUyUcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMTz33xg3z8SR; Fri, 11 Aug 2023 03:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B3cNqw043631; Fri, 11 Aug 2023 03:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B3cNL4043628; Fri, 11 Aug 2023 03:38:23 GMT (envelope-from git) Date: Fri, 11 Aug 2023 03:38:23 GMT Message-Id: <202308110338.37B3cNL4043628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 2717f14ed764 - main - math/octave: Update to 8.3.0. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2717f14ed7645a468d22a05bf7000ee12b239f7c Auto-Submitted: auto-generated The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=2717f14ed7645a468d22a05bf7000ee12b239f7c commit 2717f14ed7645a468d22a05bf7000ee12b239f7c Author: Stephen Montgomery-Smith AuthorDate: 2023-08-11 03:37:38 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2023-08-11 03:37:38 +0000 math/octave: Update to 8.3.0. --- Mk/Uses/octave.mk | 2 +- math/octave/Makefile | 1 - math/octave/distinfo | 6 +- .../files/patch-liboctave_numeric_sparse-qr.cc | 92 ---------------------- math/octave/pkg-plist | 6 +- 5 files changed, 7 insertions(+), 100 deletions(-) diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk index 15cf67e4879a..a45c0286a77d 100644 --- a/Mk/Uses/octave.mk +++ b/Mk/Uses/octave.mk @@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= octave:${octave_ARGS}' usage: argument [${arg}] is not . endif . endfor -OCTAVE_VERSION= 8.2.0 +OCTAVE_VERSION= 8.3.0 . if empty(octave_ARGS:Menv) BUILD_DEPENDS+= octave:math/octave diff --git a/math/octave/Makefile b/math/octave/Makefile index 2710d16b9025..6a8f4d69eb57 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,6 +1,5 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} -PORTREVISION= 2 CATEGORIES= math MASTER_SITES= GNU diff --git a/math/octave/distinfo b/math/octave/distinfo index 3b96dde27391..5a4824d45fe3 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681536019 -SHA256 (octave-8.2.0.tar.xz) = b7b9d6e5004ff039450cfedd2a59ddbe2a3c22296df927a8af994182eb2670de -SIZE (octave-8.2.0.tar.xz) = 26970452 +TIMESTAMP = 1691723084 +SHA256 (octave-8.3.0.tar.xz) = 919c9494f02ca435e1e3474990e6df8ddef9acbc9c90565e08d40b8f50445ba9 +SIZE (octave-8.3.0.tar.xz) = 26970776 diff --git a/math/octave/files/patch-liboctave_numeric_sparse-qr.cc b/math/octave/files/patch-liboctave_numeric_sparse-qr.cc deleted file mode 100644 index 0ea48c7d50eb..000000000000 --- a/math/octave/files/patch-liboctave_numeric_sparse-qr.cc +++ /dev/null @@ -1,92 +0,0 @@ ---- liboctave/numeric/sparse-qr.cc.orig 2023-04-13 16:43:35 UTC -+++ liboctave/numeric/sparse-qr.cc -@@ -1786,7 +1786,7 @@ sparse_qr::sparse_qr_rep::Q (bool - OCTAVE_LOCAL_BUFFER (cs_complex_t, bvec, nr); - - for (octave_idx_type i = 0; i < nr; i++) -- bvec[i] = cs_complex_t (0.0, 0.0); -+ bvec[i] = (cs_complex_t)0; - - OCTAVE_LOCAL_BUFFER (Complex, buf, S->m2); - -@@ -1813,7 +1813,7 @@ sparse_qr::sparse_qr_rep::Q (bool - for (octave_idx_type i = 0; i < nr; i++) - vec[i+idx] = buf[i]; - -- bvec[j] = cs_complex_t (0.0, 0.0); -+ bvec[j] = (cs_complex_t)0; - } - } - -@@ -2073,7 +2073,7 @@ sparse_qr::sparse_qr_rep::tall_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < S->m2; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_ipvec) (S->pinv, - reinterpret_cast(Xx), -@@ -2143,7 +2143,7 @@ sparse_qr::sparse_qr_rep::wide_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < nbuf; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast (Xx), - buf, nr); -@@ -2206,7 +2206,7 @@ sparse_qr::sparse_qr_rep::tall_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < S->m2; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_ipvec) (S->pinv, - reinterpret_cast (Xx), -@@ -2304,7 +2304,7 @@ sparse_qr::sparse_qr_rep::wide_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < nbuf; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_pvec) (S->q, - reinterpret_cast (Xx), -@@ -2392,7 +2392,7 @@ sparse_qr::sparse_qr_rep::tall_so - octave_quit (); - - for (octave_idx_type j = nr; j < S->m2; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_ipvec) (S->pinv, bvec + bidx, buf, nr); - -@@ -2460,7 +2460,7 @@ sparse_qr::sparse_qr_rep::wide_so - octave_quit (); - - for (octave_idx_type j = nr; j < nbuf; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_pvec) (S->q, bvec + bidx, buf, nr); - CXSPARSE_ZNAME (_utsolve) (N->U, buf); -@@ -2522,7 +2522,7 @@ sparse_qr::sparse_qr_rep::tall_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < S->m2; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_ipvec) (S->pinv, - reinterpret_cast (Xx), -@@ -2620,7 +2620,7 @@ sparse_qr::sparse_qr_rep::wide_so - Xx[j] = b.xelem (j, i); - - for (octave_idx_type j = nr; j < nbuf; j++) -- buf[j] = cs_complex_t (0.0, 0.0); -+ buf[j] = (cs_complex_t)0; - - CXSPARSE_ZNAME (_pvec) (S->q, reinterpret_cast(Xx), - buf, nr); diff --git a/math/octave/pkg-plist b/math/octave/pkg-plist index 603756dfda8c..2c5a986545d0 100644 --- a/math/octave/pkg-plist +++ b/math/octave/pkg-plist @@ -767,13 +767,13 @@ include/octave-%%OCTAVE_VERSION%%/octave/xnorm.h include/octave-%%OCTAVE_VERSION%%/octave/xpow.h lib/octave/%%OCTAVE_VERSION%%/liboctave.so lib/octave/%%OCTAVE_VERSION%%/liboctave.so.10 -lib/octave/%%OCTAVE_VERSION%%/liboctave.so.10.0.0 +lib/octave/%%OCTAVE_VERSION%%/liboctave.so.10.0.1 lib/octave/%%OCTAVE_VERSION%%/liboctgui.so lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.9 -lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.9.0.0 +lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.9.0.1 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.11 -lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.11.0.0 +lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.11.0.1 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/PKG_ADD lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__delaunayn__.oct lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__fltk_uigetfile__.oct