From nobody Thu Mar 21 18:02:13 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 4V0tZs4fYtz5FB6w; Thu, 21 Mar 2024 18:02:13 +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 4V0tZs2BPDz4639; Thu, 21 Mar 2024 18:02:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044133; 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=vMb5c8xpj4t1c/aCb3+CiJv2WTBoDe3NGOmGyAmBxbw=; b=gfaNZ8Oe7/l79kug3Thug40MTv4p+vsawWR+XaU1v1qH5+UnQFuhaf6dqefdOs9avwjlsV dh7ybGKBPawlGRaBMsGKkG0vBUq7Z5OJ+GEyRtHiWhcd/u0FAkvpBfMb40ALlxfqFz9TFX 2LserjE0n4HhVyxL++VzVquPf4rXPLu+ge0lniWx+gdVIHFzeEU4roddlue0vc8kd5qbQk IBazlpurABwgg3JCtnJSE2OZdV7WUoOYNlArS/KIVBNLyGR2oSNiTpp622N8dUUrbCnB7g 7rqKGtJnXai13x+udYF11BcIjbq3J9KzVuxjd9xM5ruFptY5agT0abtgMXlmwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044133; a=rsa-sha256; cv=none; b=nen1onek4miRzbuvNwtRhIdTfs0qQRoLsj+jNk8uktblAH/lUqLVCtYhpq4cqmDjdIAysB SFpJKpjkDQETSH5f93fI8Ny2wYYqGRw8DFyT227VdLNrwSlMgb1g0o/e32yp9xQNPj1jNz ejH842G5Q172RuRpi5hohXcv/lXqdV1eyaYyjgPoPC6uiGL4XgYT1lYtBP1SMTyijigLQ3 9txPt8Nf96kZZgs+hSW6Ver4Ukr7Je2vHixpIJTLOgjq49oZx64LRHWuip7WyQXNhbasCo tFVJoA2Ho/FGKXIFn0iRHYbjAWeC7x6vwcvq/cHW6fuRe9ljPI2U2rLnH5KeVw== 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=1711044133; 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=vMb5c8xpj4t1c/aCb3+CiJv2WTBoDe3NGOmGyAmBxbw=; b=EMvyySsRBj/ALMX9eSb4D0ZVZ27tzJI+2U8NffaWrAWdg4kKjmxt6P+JL48FUhMXDmhGLI XXDAp5hjAspHu5XvQLXpjTTTrwDkluV33hjLCC8hHy2qFnN3Ag950DbiTkivMz/4Ew+f3A EG95ynv5QhWzqjHpesk2dE9VNUjwralmXNU+s1x8sIHXRpnw6rHWy8IKyfoCmu8Cp1Ofeb G2pdCBUmtakD3bzW9XxSf444Ormiuzcx7xmmKDVK3wM+x+tmKI5scSQeqhDuoJ20OmAURc Gs5WCBP3uaR3UAbZecvRbNuCod630ixrW12IV5G5iZUvf9Ea05JAVDB88j29BA== 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 4V0tZs1p9xzm5x; Thu, 21 Mar 2024 18:02:13 +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 42LI2DKv023282; Thu, 21 Mar 2024 18:02:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2Dkq023279; Thu, 21 Mar 2024 18:02:13 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:13 GMT Message-Id: <202403211802.42LI2Dkq023279@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: d0646a9501a8 - main - science/elmerfem: support opencascade-7.8.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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0646a9501a862ba21e8f9c1e919d94580036379 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0646a9501a862ba21e8f9c1e919d94580036379 commit d0646a9501a862ba21e8f9c1e919d94580036379 Author: Henrik Gulbrandsen AuthorDate: 2024-03-16 13:02:09 +0000 Commit: Thierry Thomas CommitDate: 2024-03-21 18:01:17 +0000 science/elmerfem: support opencascade-7.8.0 PR: 277307 --- science/elmerfem/Makefile | 8 ++++---- science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/science/elmerfem/Makefile b/science/elmerfem/Makefile index e14f822e06da..3f807b3cb60c 100644 --- a/science/elmerfem/Makefile +++ b/science/elmerfem/Makefile @@ -1,7 +1,7 @@ PORTNAME= elmerfem DISTVERSIONPREFIX= release- DISTVERSION= 9.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= science PATCH_SITES= https://github.com/ElmerCSC/${PORTNAME}/commit/ @@ -97,10 +97,10 @@ post-patch: @${REINPLACE_CMD} -e 's,"metis.*/metis\.h",,' \ ${WRKSRC}/elmergrid/src/egparallel.c -post-patch-OCC-on: - @${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \ +pre-configure-OCC-on: + ${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" - @${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \ + ${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \ "${WRKSRC}/cmake/Modules/FindOCE.cmake" post-configure: diff --git a/science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt b/science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt new file mode 100644 index 000000000000..1207457d52e1 --- /dev/null +++ b/science/elmerfem/files/patch-ElmerGUI_CMakeLists.txt @@ -0,0 +1,15 @@ +--- ElmerGUI/CMakeLists.txt.orig 2020-11-10 19:52:44 UTC ++++ ElmerGUI/CMakeLists.txt +@@ -83,7 +83,11 @@ IF(WITH_OCC) + MESSAGE(STATUS " [ElmerGUI] OCE_VERSION: " ${OCE_VERSION}) + MESSAGE(STATUS " [ElmerGUI] OCE_INCLUDE_DIRS: " ${OCE_INCLUDE_DIRS}) + ENDIF() +- SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "") ++ IF(OCE_VERSION AND OCE_VERSION VERSION_GREATER_EQUAL "7.8.0") ++ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKDESTEP;TKMesh;TKDEIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKTopAlgo;TKXSBase" CACHE INTERNAL "") ++ ELSE() ++ SET(ELMER_OCC_LIBS "TKernel;TKMath;TKG3d;TKG2d;TKBRep;TKSTEP;TKMesh;TKIGES;TKG2d;TKGeomBase;TKBool;TKBO;TKGeomAlgo;TKPrim;TKShHealing;TKSTEP209;TKSTEPAttr;TKSTEPBase;TKTopAlgo;TKXSBase" CACHE INTERNAL "") ++ ENDIF() + MESSAGE(STATUS " [ElmerGUI] ELMER_OCC_LIBS: " "${ELMER_OCC_LIBS}") + MESSAGE(STATUS "------------------------------------------------") + ENDIF()