From nobody Sat Sep 10 11:12:18 2022 X-Original-To: dev-commits-ports-all@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 4MPqvQ3k98z4bmS7; Sat, 10 Sep 2022 11:12:18 +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 4MPqvQ3FwXz3g7T; Sat, 10 Sep 2022 11:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662808338; 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=MrKDkhHzMd2hcLb/vMwMOJhX4HoDoiEadTtkgmrR//c=; b=tD76x6vKdVRVZKPUq+Sb7q73mQvKcLLz/CKc3Bm6jQQuHXB0pKeIs60SoyZ542KMqCg+qt Frp59CFWKm60sWhqJY4d3vWCcKdedjEQAKZwkg4ysnVT6BIo4eawJRurZ1JPQCgSLp1iWT kKc8RAJUYovvABIVb4ocaHljUG7KDAqLuIQAXH5qL1D2xRyMbhD0O+aqragQGohSR75CEf 24SvqzX57yU9KVEZiDikGnSTgHLa8J8JdPjcmWL5tANVSzsrJYm9En5WyzOTKV50I00KO5 L5oIHu/vYU0LpDo7/tszurVjl3VNHfEBLwfX0KpVWiPqiCyWBmu6TAlp2IpcuA== 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 4MPqvQ2K9pzHNH; Sat, 10 Sep 2022 11:12:18 +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 28ABCIlW089336; Sat, 10 Sep 2022 11:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28ABCIog089335; Sat, 10 Sep 2022 11:12:18 GMT (envelope-from git) Date: Sat, 10 Sep 2022 11:12:18 GMT Message-Id: <202209101112.28ABCIog089335@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: 31735a5b1aae - main - cad/opencascade: fix cmake files List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 31735a5b1aae9a7967e8cc5f12ffab7779acc53c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662808338; 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=MrKDkhHzMd2hcLb/vMwMOJhX4HoDoiEadTtkgmrR//c=; b=gBdLQbEgtTVAZAs54A6DiUDVdMVNKxfn+JqzZJukhMgfMI9sBFEXC8yOooy5VS/n7cGUxT ZPze71GZyfAIqQe0fIMSYTxGZIDON8lM2VxDxqZbckeyXqpRvHXR+4Z/hegbNG94WozjwY YxbxMFnA99rHlp/9dUNrrJXjdEW2bAJDuK0x+rY0Er/6W6SBbFE/6WAT3FWMh5ZshP+Jg/ RrsxfMFS8dZhdS+MEduMMNBQxOLg1b14wKSp2NpmRLPu9tnGzZ7skfivLclTLH099/YDIN qAnmnpxcCAemNbqa+4OBvBfz5XGOLsHplogQsGagFFfXL7GxM6GWrjxuhKO7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662808338; a=rsa-sha256; cv=none; b=IiSRrLuPfyF/Fjtq+GDS3cKFFYC8tIligrfe6NyA+GCeg/MYWStq8XU7k7D79psw1K5iNG ZNwzKTjq98cLHwHflKqp7+hjHKVN6VpjTCQfBSK42QK/reU1ZMDl2sOQ6oxjj27X6ArolR 9GrDai7woLaYLPlVIPrC1lNPEBsA0e9SeIJZvLGxTo9SmisekNSLJTsUrIQgp88rR+pj10 sdlcNUrE760UWg/fTfa0A06ARgtDpkTGaC9eQhBBWWFHAqWHYtAoqzbpCVFOW5P0vDqNV5 Bc8ppp7P1vp9hjJL1J7z6Rgr9dx74eAKNY4nu9qq1duKtdlmVBNizS/D5by2yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=31735a5b1aae9a7967e8cc5f12ffab7779acc53c commit 31735a5b1aae9a7967e8cc5f12ffab7779acc53c Author: Thierry Thomas AuthorDate: 2022-09-10 11:05:31 +0000 Commit: Thierry Thomas CommitDate: 2022-09-10 11:12:13 +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 --- 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 be914a913f09..9704f68d1ecc 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencascade PORTVERSION= 7.6.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad science MASTER_SITES= LOCAL/thierry @@ -63,6 +63,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__)