<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e6faef40774d7843e566d622e31a71fa4d2a97b4">https://github.com/macports/macports-ports/commit/e6faef40774d7843e566d622e31a71fa4d2a97b4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e6faef40774d7843e566d622e31a71fa4d2a97b4
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Dec 6 12:43:42 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> oce, opencascade: install into libexec
</span>---
graphics/oce/Portfile | 38 ++++++++++++++++++++++++++++++++------
science/opencascade/Portfile | 24 ++++++++++++++++++++----
2 files changed, 52 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/oce/Portfile b/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 215c2c4a701..9f40cfdfa8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/oce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup github 1.0
</span>
github.setup tpaviot oce 0.18.3 OCE-
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
platforms darwin
maintainers {gmail.com:mark.brethen @mbrethen} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +20,13 @@ checksums rmd160 3bfe060893dca29baefd70d88b05098f9457ee20 \
</span> sha256 792ec7d735f1e8ffb9db4bf20fc724c6ec2d2a435aa78e5df795c36fb0f360a1 \
size 24636499
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OCE is the Open CASCADE Community Edition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts opencascade
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:freetype
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DOCE_INSTALL_PREFIX:PATH=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCE_INSTALL_CMAKE_DATA_DIR:PATH=${prefix}/lib/cmake/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# install it into libexec to avoid conflict with opencascade port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DOCE_INSTALL_PREFIX:PATH=${cmake.install_prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCE_INSTALL_CMAKE_DATA_DIR:PATH=${cmake.install_prefix}/lib/cmake/${subport}
</span>
variant test description {Build and run unit testing framework} {
configure.args-append -DOCE_TESTING:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +42,9 @@ variant draw description {Build DRAW test harness} {
</span>
variant tbb description {Use TBB for memory allocation} {
depends_lib-append port:tbb
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DOCE_MULTITHREAD_LIBRARY:STRING=TBB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOCE_MULTITHREAD_LIBRARY:STRING=TBB \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_INCLUDE_DIR:FILEPATH=${prefix}/libexec/tbb/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTBB_LIB_DIR:FILEPATH=${prefix}/libexec/tbb/lib
</span> }
variant freeimage description {Build with FreeImage support} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,3 +56,26 @@ variant gl2ps description {Build with gl2ps support} {
</span> depends_lib-append port:gl2ps
configure.args-append -DOCE_WITH_GL2PS:BOOL=ON
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep this port at perfix's cmake's lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${cmake.install_prefix}/lib/cmake *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake/${cmakedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakefile [glob -tails -directory ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/cmake/${cmakedir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\\\${CMAKE_CURRENT_LIST_DIR}|${cmake.install_prefix}/lib/cmake/${cmakedir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\\\${CMAKE_CURRENT_LIST_FILE}|${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is unmaintained version of occt tools. Consider to use opencascade port instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/tpaviot/oce/issues/745
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><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 a7d7ea78f18..8ff2d3b37dd 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;'>@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
</span>
name opencascade
version 7.7.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
platforms darwin
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,6 @@ checksums rmd160 2cd1b528d2f1fb40bd9b0f2646ddea3fef0d3733 \
</span> sha256 075ca1dddd9646fcf331a809904925055747a951a6afd07a463369b9b441b445 \
size 48391263
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# OCE is the Open CASCADE Community Edition
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts oce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append patch-CMakeLists.txt.diff \
patch-env.sh.in.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +39,9 @@ depends_lib-append port:freeimage \
</span> port:tcl \
port:tk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# install it into libexec to avoid conflict with oce port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.install_prefix ${prefix}/libexec/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -DUSE_FREEIMAGE=ON \
-DUSE_RAPIDJSON=ON \
-DUSE_TBB=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,4 +72,20 @@ if {${universal_possible} && [variant_isset universal]} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# keep this port at perfix's cmake's lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakedir [glob -type d -nocomplain -tails -directory ${destroot}${cmake.install_prefix}/lib/cmake *] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/cmake/${cmakedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cmakefile [glob -tails -directory ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir} *.cmake] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/cmake/${cmakedir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\\\${CMAKE_CURRENT_LIST_DIR}|${cmake.install_prefix}/lib/cmake/${cmakedir}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|\\\${CMAKE_CURRENT_LIST_FILE}|${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${cmake.install_prefix}/lib/cmake/${cmakedir}/${cmakefile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url https://www.opencascade.com/content/latest-release
</pre><pre style='margin:0'>
</pre>