<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fa9ef218d6fc49c112ee73e1aca5cce889446cbd">https://github.com/macports/macports-ports/commit/fa9ef218d6fc49c112ee73e1aca5cce889446cbd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fa9ef218d6fc49c112ee73e1aca5cce889446cbd
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Dec 2 20:08:00 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> opencascade: update to 7.7.0
</span>---
science/opencascade/Portfile | 19 +++------
.../opencascade/files/patch-CMakeLists.txt.diff | 48 +++++++++++++---------
2 files changed, 34 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opencascade/Portfile b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b449f05d417..a7d7ea78f18 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opencascade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.1
</span> PortGroup muniversal 1.0
name opencascade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.7.0
</span> revision 0
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ master_sites "https://git.dev.opencascade.org/gitweb/?p=occt.git;
</span> extract.suffix .tgz
worksrcdir occt-V${git_version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 693c252be09f30832db9fe81e410119c1f28e2d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 48193117
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2cd1b528d2f1fb40bd9b0f2646ddea3fef0d3733 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 075ca1dddd9646fcf331a809904925055747a951a6afd07a463369b9b441b445 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 48391263
</span>
# OCE is the Open CASCADE Community Edition
conflicts oce
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ depends_build-append path:lib/pkgconfig/RapidJSON.pc:rapidjson
</span>
depends_lib-append port:freeimage \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tbb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:onetbb \
</span> port:tcl \
port:tk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,19 +46,12 @@ configure.args-append -DUSE_FREEIMAGE=ON \
</span> -DUSE_RAPIDJSON=ON \
-DUSE_TBB=ON \
-DBUILD_DOC_Overview=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_FREEIMAGE_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_FREETYPE_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_RAPIDJSON=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_TBB_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_TCL_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_TCL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_TK_INCLUDE_DIR=${prefix}/include \
</span> -D3RDPARTY_DIR=${prefix}
# see https://trac.macports.org/ticket/59917
if {${os.major} < 12} {
configure.cxxflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -F/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -F/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks
</span> }
variant docs description {Build and install documentation} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opencascade/files/patch-CMakeLists.txt.diff b/science/opencascade/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0dd87d809e9..12a8966fe69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opencascade/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opencascade/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-05-29 03:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-06-28 09:22:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd17283f77..6d1450124c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
</span>
set (CMAKE_SUPPRESS_REGENERATION TRUE)
-set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
+set (CMAKE_CONFIGURATION_TYPES MacPorts Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # macro: include patched file if it exists
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -886,16 +886,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set using C++ standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (BUILD_CPP_STANDARD "C++11" CACHE STRING "Select using c++ standard.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1020,16 +1020,7 @@ else()
</span> set (ADDITIONAL_CUSTOM_CONTENT "\nif [ -e \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" ]; then\n source \"\${aScriptPath}/${SUB_CUSTOM_NAME}\" \"\$1\" \"\$2\" \nfi")
endif()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,23 +28,29 @@
</span>
if (WIN32)
set (THIRDPARTY_DIR_REPLACE "%THIRDPARTY_DIR%")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1122,7 +1113,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git adm/cmake/occt_macros.cmake adm/cmake/occt_macros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9fd3ec4cfb..c992c2e942 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- adm/cmake/occt_macros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ adm/cmake/occt_macros.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach (OCCT_MODULE ${OCCT_MODULES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (BUILD_MODULE_${OCCT_MODULE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- adm/cmake/occt_macros.cmake.orig 2018-05-29 03:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ adm/cmake/occt_macros.cmake 2018-06-28 11:39:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -598,7 +598,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cmake_policy(PUSH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_policy(SET CMP0007 NEW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install (CODE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
</span> - 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}/${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}\")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git adm/cmake/tbb.cmake adm/cmake/tbb.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4e5f724ac2..31c55a10ff 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- adm/cmake/tbb.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ adm/cmake/tbb.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,7 +191,7 @@ else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(TOUPPER "${LIB}" LIB_UPPER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Achive *.so files and directory containing it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_MACPORTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Reserve cache variable for *.so.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
</span></pre><pre style='margin:0'>
</pre>