From nobody Fri Mar 22 11:29:39 2024 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 4V1KqR32NZz5Dh5j; Fri, 22 Mar 2024 11:29:39 +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 4V1KqR2Xfzz4pSt; Fri, 22 Mar 2024 11:29:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711106979; 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=s77ehVn0wRHClLY4qMi0aHXRT2x7Ru+u1JHqClMJtBw=; b=aG6FDJhyHeEjnDlgbsmMNU7DRw9D9042OGGwfzWZOp+M//5ABLUiUUm+m+48gnXXdHZGA1 RBBp0CkQNAx1l9G/FsUlFZC65CAh+7gJUAPdQDHs3FE/HAVLb3X/baTRk/kgNMhUDyvcKP lCDJ03FljtUg92/VEwREdoEz46MKP1D9GgnAr27ksF7lNk52JrmHeOTQMFCiRM6u6HXlcY T2fi31tXdVpJ60iflr+G4zmWcISBni+3iTjtXO+iywkS9mG8ZuNBtOP2DlVE4THVTBcupP KKoe5m8iShPVREp4y5n2KpWGfLgB9eYMwyq9EvTy8weynggv9fSjf7enRal2CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711106979; a=rsa-sha256; cv=none; b=lSqtx7P5AzlG0e3caRYVTJHW+XhXMhBGOQZd9gQ6rpW2nzwOOi7MRQi+u7CHI38vLgNPOq 6t4EKpSjCBSRnDjJkrBohv3qT9zciECgvyJg8Uk/8xvSSJgRwRqW8pCs/SrzcU7QfQDCh7 Byn8qVUca/vPoNdCLka8Fqlr9KN9Fl1J2k5xsDFJq6NrldWnb3DqTwJzYRQKE+28Dr+9JB NS/WSUSd7WQn1hFyz+OD9q+Ix8z5hthDNSZNaMpUzvlmZ8xut9wuzFCLwPjJeqFbBXXR8A upYMZKFQAhqpXmnKfjaEPTnuJkksnDzCAN+YuDwV1W+IXiVudEHKY7NSp0XGMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711106979; 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=s77ehVn0wRHClLY4qMi0aHXRT2x7Ru+u1JHqClMJtBw=; b=kec8PzmEGCWrxkAkCQ9NgzGuxt29QeooxqKtbUwGrGFxLqnr8VkUgFEnWo8lfnYPCYoD49 AAcv9BA/UdZg76zt9PV+CS//KZF8Je6SyMV1fEHag6lFq7ZUvhy8H2DqzJ2JdaLvzMvP8h Po7NJY3XG6MFNTmG0KZQOoQCjmdnwUnpxpr5yvlYNwIPhsENq7jIvoBUNTSBORFQcnxw+W 3idScccqOy8fsihtbQoEiogrLylHsJfv7KRrEFApB0QjjbfYEt5Cs9mkpQGbEbMInMNkoo wx9hBvRSyxoUGos9+FOYVx/BRhRNyeR9n9t9/7KZ+EnmPb2sxmuICRWAf7RVAQ== 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 4V1KqR261fz1GZ9; Fri, 22 Mar 2024 11:29:39 +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 42MBTdNl084002; Fri, 22 Mar 2024 11:29:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MBTdiR083999; Fri, 22 Mar 2024 11:29:39 GMT (envelope-from git) Date: Fri, 22 Mar 2024 11:29:39 GMT Message-Id: <202403221129.42MBTdiR083999@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: bbb76dace979 - main - cad/opencascade: the initial tarball has been reworked 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbb76dace979e046a3ac1cbcf1ed51595f6d2aea Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbb76dace979e046a3ac1cbcf1ed51595f6d2aea commit bbb76dace979e046a3ac1cbcf1ed51595f6d2aea Author: Thierry Thomas AuthorDate: 2024-03-22 11:21:35 +0000 Commit: Thierry Thomas CommitDate: 2024-03-22 11:21:35 +0000 cad/opencascade: the initial tarball has been reworked Upstream reworked the tarball to integrate several patches without bumping revision. PR: 277881 Reported by: Sergey Kiselev --- cad/opencascade/Makefile | 2 ++ cad/opencascade/distinfo | 10 +++--- cad/opencascade/files/patch-adm_UDLIST | 10 ------ .../patch-src_Message_Message__AttributeMeter.cxx | 10 ------ .../patch-src_NCollection_NCollection__Array1.hxx | 39 ---------------------- ...h-src_NCollection_NCollection__DynamicArray.hxx | 29 ---------------- ...patch-src_NCollection_NCollection__Iterator.hxx | 19 ----------- 7 files changed, 7 insertions(+), 112 deletions(-) diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 6d6caf8f84de..6796cab56497 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,7 +1,9 @@ PORTNAME= opencascade DISTVERSIONPREFIX= V DISTVERSION= 7_8_0 +PORTREVISION= 1 CATEGORIES= cad science +DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation diff --git a/cad/opencascade/distinfo b/cad/opencascade/distinfo index 1854ffc388f5..89e9a325924c 100644 --- a/cad/opencascade/distinfo +++ b/cad/opencascade/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1711092244 -SHA256 (documentation.tar.xz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530 -SIZE (documentation.tar.xz) = 48428565 -SHA256 (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7 -SIZE (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428333 +TIMESTAMP = 1711099991 +SHA256 (opencascade-7_8_0/documentation.tar.xz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530 +SIZE (opencascade-7_8_0/documentation.tar.xz) = 48428565 +SHA256 (opencascade-7_8_0/Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 096cd0f268fa9f6a50818e1d628ac92ecf87e10fd72187e2e8d6be57dfe12530 +SIZE (opencascade-7_8_0/Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428565 diff --git a/cad/opencascade/files/patch-adm_UDLIST b/cad/opencascade/files/patch-adm_UDLIST deleted file mode 100644 index feee670d3393..000000000000 --- a/cad/opencascade/files/patch-adm_UDLIST +++ /dev/null @@ -1,10 +0,0 @@ ---- adm/UDLIST.orig 2023-12-04 15:53:08 UTC -+++ adm/UDLIST -@@ -32,6 +32,7 @@ r OS - n gp - n math - r OS -+n FlexLexer - t TKMath - t TKernel - n Adaptor2d diff --git a/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx b/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx deleted file mode 100644 index 38686e6cd8b4..000000000000 --- a/cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx +++ /dev/null @@ -1,10 +0,0 @@ ---- src/Message/Message_AttributeMeter.cxx.orig 2023-12-04 15:53:08 UTC -+++ src/Message/Message_AttributeMeter.cxx -@@ -253,6 +253,6 @@ void Message_AttributeMeter::DumpJson (Standard_OStrea - anIterator.More(); anIterator.Next()) - { - OCCT_DUMP_VECTOR_CLASS (theOStream, Message::MetricToString (anIterator.Key()), -- 2, anIterator.Value(), anIterator.Value()) -+ 2, anIterator.Value().first, anIterator.Value().second) - } - } diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx deleted file mode 100644 index 7a3f36deeade..000000000000 --- a/cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx +++ /dev/null @@ -1,39 +0,0 @@ ---- src/NCollection/NCollection_Array1.hxx.orig 2023-12-04 15:53:08 UTC -+++ src/NCollection/NCollection_Array1.hxx -@@ -72,26 +72,10 @@ class NCollection_Array1 (public) - - using iterator = NCollection_IndexedIterator; - using const_iterator = NCollection_IndexedIterator; -+ using Iterator = NCollection_Iterator>; - - public: - -- // Iterator class -- class Iterator : public NCollection_Iterator -- { -- public: -- using NCollection_Iterator::NCollection_Iterator; -- -- const_reference Value() const -- { -- return *NCollection_Iterator::ValueIter(); -- } -- -- reference ChangeValue() -- { -- return *NCollection_Iterator::ChangeValueIter(); -- } -- }; -- - const_iterator begin() const - { - return const_iterator(*this); -@@ -150,7 +134,7 @@ class NCollection_Array1 (public) - mySize(theUpper - theLower + 1), - myPointer(nullptr), - myIsOwner(false), -- allocator_type(theAlloc) -+ myAllocator(theAlloc) - { - if (mySize == 0) - { diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx deleted file mode 100644 index 28bc7579f5fa..000000000000 --- a/cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx +++ /dev/null @@ -1,29 +0,0 @@ ---- src/NCollection/NCollection_DynamicArray.hxx.orig 2023-12-04 15:53:08 UTC -+++ src/NCollection/NCollection_DynamicArray.hxx -@@ -77,25 +77,9 @@ class NCollection_DynamicArray (public) - - using iterator = NCollection_IndexedIterator; - using const_iterator = NCollection_IndexedIterator; -+ using Iterator = NCollection_Iterator>; - - public: -- -- // Iterator class -- class Iterator : public NCollection_Iterator -- { -- public: -- using NCollection_Iterator::NCollection_Iterator; -- -- const_reference Value() const -- { -- return *NCollection_Iterator::ValueIter(); -- } -- -- reference ChangeValue() -- { -- return *NCollection_Iterator::ChangeValueIter(); -- } -- }; - - const_iterator begin() const - { diff --git a/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx b/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx deleted file mode 100644 index 81d01c6b6809..000000000000 --- a/cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx +++ /dev/null @@ -1,19 +0,0 @@ ---- src/NCollection/NCollection_Iterator.hxx.orig 2023-12-04 15:53:08 UTC -+++ src/NCollection/NCollection_Iterator.hxx -@@ -94,6 +94,16 @@ class NCollection_Iterator (public) - ++(myCur); - } - -+ const typename Container::const_reference Value() const -+ { -+ return *myCur; -+ } -+ -+ const typename Container::reference ChangeValue() -+ { -+ return *myCur; -+ } -+ - bool operator==(const NCollection_Iterator& theOther) { return myLast == theOther.myLast && myCur == theOther.myCur; } - - bool operator!=(const NCollection_Iterator& theOther) { return myLast != theOther.myLast || myCur != theOther.myCur; }