<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/25121e9af5e0e1b99407b11d273f97351c6372a7">https://github.com/macports/macports-ports/commit/25121e9af5e0e1b99407b11d273f97351c6372a7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 25121e9af5e0e1b99407b11d273f97351c6372a7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 16 11:29:06 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> opencascade: update version 7.3.0->7.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/59139
</span>---
science/opencascade/Portfile | 16 +++++++++-------
science/opencascade/files/patch-CMakeLists.txt.diff | 6 +++---
science/opencascade/files/patch-env.sh.in.diff | 4 ++--
3 files changed, 14 insertions(+), 12 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 2a64daa..2c8509c 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,8 @@ PortGroup cmake 1.1
</span> PortGroup muniversal 1.0
name opencascade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories science
platforms darwin
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,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 1e55daf36edaacca40eb12d2e187867b64e33c8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7298c5eadc6dd0aeb6265ff2958e8e742d6e3aa65227acce8094f96f1bf6d2ac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 48576720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 791f53a085811bd2385f7708fe0b1a1a488f7cc0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49210449
</span>
# OCE is the Open CASCADE Community Edition
conflicts oce
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,20 +35,21 @@ compiler.cxx_standard 2011
</span> configure.args-append -DCMAKE_CXX_STANDARD=11 \
-DCMAKE_CXX_STANDARD_REQUIRED=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append path:lib/pkgconfig/RapidJSON.pc:rapidjson
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append port:freeimage \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gl2ps \
</span> port:tbb \
port:tcl \
port:tk
configure.args-append -DUSE_FREEIMAGE=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_GL2PS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_RAPIDJSON=ON \
</span> -DUSE_TBB=ON \
-DBUILD_DOC_Overview=OFF \
-D3RDPARTY_FREEIMAGE_DIR=${prefix} \
-D3RDPARTY_FREETYPE_DIR=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -D3RDPARTY_GL2PS_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D3RDPARTY_RAPIDJSON=${prefix} \
</span> -D3RDPARTY_TBB_DIR=${prefix} \
-D3RDPARTY_TCL_DIR=${prefix} \
-D3RDPARTY_TCL_INCLUDE_DIR=${prefix}/include \
<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 a309cf0..0dd87d8 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;'>@@ -9,7 +9,7 @@
</span>
# macro: include patched file if it exists
macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -879,16 +879,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -886,16 +886,7 @@
</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,7 +26,7 @@
</span>
if (WIN32)
set (THIRDPARTY_DIR_REPLACE "%THIRDPARTY_DIR%")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1107,7 +1098,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1122,7 +1113,7 @@
</span> endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> if (BUILD_MODULE_${OCCT_MODULE})
--- adm/cmake/occt_macros.cmake.orig 2018-05-29 03:14:02.000000000 -0700
+++ adm/cmake/occt_macros.cmake 2018-06-28 11:39:17.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -593,7 +593,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -598,7 +598,7 @@
</span> "cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/opencascade/files/patch-env.sh.in.diff b/science/opencascade/files/patch-env.sh.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 95987e3..d8ab050 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/opencascade/files/patch-env.sh.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/opencascade/files/patch-env.sh.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- adm/templates/env.sh.in.orig 2018-05-29 03:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ adm/templates/env.sh.in 2018-06-28 09:17:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- adm/templates/env.install.sh.in.orig 2018-05-29 03:14:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ adm/templates/env.install.sh.in 2018-06-28 09:17:21.000000000 -0700
</span> @@ -30,7 +30,6 @@
aSystem=`uname -s`
if [ "$aSystem" == "Darwin" ]; then
</pre><pre style='margin:0'>
</pre>