From nobody Sat Sep 17 12:39:04 2022 X-Original-To: dev-commits-ports-branches@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 4MV9VJ5294z4cgkW; Sat, 17 Sep 2022 12:39:04 +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 4MV9VJ4Zm5z45H7; Sat, 17 Sep 2022 12:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663418344; 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=PwtVM0PzlPur9FQscUsIfEFl8g3q7QtdyOU/swj52/I=; b=oWA36d0zocXB2yWhRzPp/EuNzIxZEiKkgGsUYgKjQ3le3AVS784xMCQPCoJjltaMu37qku 045oJb5F3OmJul5pPZJbsXgK5VMmo3ClNxN1xWnjjOYH39ADm6TtIiZgrNtOlxUz22W2ne 5bekIky0h7WLoGiNS+A7D4sHctzKMY889o6fW9KMF8UQj2o4RLwxB9B87kX+K9ZAEnIIe8 ReI7pPbznk2K8qDXiM+9gqpSUPN25zcTIQcVg4YpoqY2MqVW++Nz00Utq+1F+HMnyG2NLE NV9NszCRi65DDmVEWIC7bg8/5v4/qseTkBOxFKxetb2pNIGaOj3QGwlk0D3x+A== 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 4MV9VJ3VftzhwC; Sat, 17 Sep 2022 12:39:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28HCd48X041031; Sat, 17 Sep 2022 12:39:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HCd4Wo041030; Sat, 17 Sep 2022 12:39:04 GMT (envelope-from git) Date: Sat, 17 Sep 2022 12:39:04 GMT Message-Id: <202209171239.28HCd4Wo041030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thierry Thomas Subject: git: 3f4f4b240990 - 2022Q3 - cad/opencascade: fix cmake files List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3f4f4b240990348b8b261be32e797811f5ee09b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663418344; 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=PwtVM0PzlPur9FQscUsIfEFl8g3q7QtdyOU/swj52/I=; b=v/icNkq/fKz6AmQPT0mafdOS7YXyjDn++bULxaau3OX8HMyXThGRMOe7skUDXU97bj8apx 5v50lIj0Ds8Ydh26mFMjhfOMBgpXTLbeHo1AJdNTHVOgnl/EFjBcZBiZagVovbX7g1DwLu nxOz8C+zWhdJBJ9SZLV0b60/ZY8SKbU7Yyp3x4B+vs1Ew/xZP/+m0lLrXp3jaif5udBkQA ntAPySdJ5sBikgmSDt6Lx5DAjIUFuJKskdtA+RfBwDxTQzLiMq5EMBeuq7p8tb0Y+CSIs8 HzcjaMatyk3vt7X5kObCAsuwK5dBfShiZEl6KMGy22gcMq9Q74IgVur6L5jEFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663418344; a=rsa-sha256; cv=none; b=KkTEkRaNnym8lbyTHvjrkG1Pwq6NF6EbBfzaWpuPr+byxO2U6aGHTBVDg/80FhEXvcS/7x m2dJw3yWsW23vGruzXXrSse7REEBBWfKbVkxFjKvt3+aDR2974dXKCYQu+yvsXUgxXiTi6 F7k20sH0fZsc6ZPexp1AhMlvEgAANc8M/db61Ace+hmQKda9geppLwcWjSJDAuqTDo2ess twllozAQPi8CT1Mptj8ZyVh0g10QpgdAu3n1H3xqF+kqQaoAffvZ73KIFxWGFskSHdEW5p zoSN/gkpGZqTcnFWEKbIRlo/YcKjy0qc5Ye3wOng4PkTUaEZtoGjZQXkJ3on1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f4f4b240990348b8b261be32e797811f5ee09b4 commit 3f4f4b240990348b8b261be32e797811f5ee09b4 Author: Thierry Thomas AuthorDate: 2022-09-10 11:05:31 +0000 Commit: Thierry Thomas CommitDate: 2022-09-17 12:38:38 +0000 cad/opencascade: fix cmake files A cmake macro, which should have configured $OCCT_INSTALL_BIN_LETTER was not applied correctly. Thus some cmake files where badly configured, and some consumers could not use them. PR: 266280 Reported by: yuri MFH: 2022Q3 (cherry picked from commit 31735a5b1aae9a7967e8cc5f12ffab7779acc53c) --- cad/opencascade/Makefile | 8 +++++++- .../files/patch-adm_cmake_occt__macros.cmake | 17 ++++++++++++++++- .../files/patch-src_Standard_Standard__CString.cxx | 4 ++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index 29bf7a6099a6..dd0530ac92f8 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -2,7 +2,7 @@ PORTNAME= opencascade PORTVERSION= 7.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -64,6 +64,12 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \ -DUSE_RAPIDJSON:BOOL=ON \ -DUSE_VTK:BOOL=ON \ -D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER} +CONFIGURE_ENV+= DESTDIR=${STAGEDIR} + +.if defined(MAINTAINER_MODE) +CMAKE_ARGS+= -DCMAKE_MESSAGE_CONTEXT_SHOW:BOOL=ON \ + -DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG +.endif # TODO: TBB to be replaced by onetbb later #CMAKE_ARGS+= -DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON diff --git a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake index d56ea8699ddf..8ab6018984b8 100644 --- a/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake +++ b/cad/opencascade/files/patch-adm_cmake_occt__macros.cmake @@ -1,4 +1,4 @@ ---- adm/cmake/occt_macros.cmake.orig 2020-11-03 14:49:43 UTC +--- adm/cmake/occt_macros.cmake.orig 2021-10-30 11:13:37 UTC +++ adm/cmake/occt_macros.cmake @@ -47,7 +47,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS) elseif(APPLE) @@ -18,3 +18,18 @@ string(TIMESTAMP CURRENT_TIME "%H:%M:%S") message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...") +@@ -592,12 +592,12 @@ macro (OCCT_UPDATE_TARGET_FILE) + "cmake_policy(PUSH) + cmake_policy(SET CMP0007 NEW) + string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE) +- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") ++ file (GLOB ALL_OCCT_TARGET_FILES \"$ENV{DESTDIR}${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\") + foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES}) + file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT) + file (REMOVE \"\${TARGET_FILENAME}\") + foreach (line IN LISTS TARGET_FILE_CONTENT) +- string (REGEX REPLACE \"[\\\\]?[\\\$]{OCCT_INSTALL_BIN_LETTER}\" \"\${OCCT_INSTALL_BIN_LETTER}\" line \"\${line}\") ++ string (REGEX REPLACE \"[\\\\]?[\\\$]{OCCT_INSTALL_BIN_LETTER}\" \"${OCCT_INSTALL_BIN_LETTER}\" line \"\${line}\") + file (APPEND \"\${TARGET_FILENAME}\" \"\${line}\\n\") + endforeach() + endforeach() diff --git a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx index a8162b9e0c23..11083adad1b6 100644 --- a/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx +++ b/cad/opencascade/files/patch-src_Standard_Standard__CString.cxx @@ -1,6 +1,6 @@ ---- src/Standard/Standard_CString.cxx.orig 2020-11-03 14:50:08 UTC +--- src/Standard/Standard_CString.cxx.orig 2021-10-30 11:13:58 UTC +++ src/Standard/Standard_CString.cxx -@@ -83,7 +83,7 @@ Standard_Integer HashCodes (const Standard_CString the +@@ -82,7 +82,7 @@ Standard_Integer HashCodes (const Standard_CString the // strtod, strtol, strtoll functions. For other system with locale-depended // implementations problems may appear if "C" locale is not set explicitly. #if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)