<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/673cf7b329f641cee22eb583a73f2ef3478445c1">https://github.com/macports/macports-ports/commit/673cf7b329f641cee22eb583a73f2ef3478445c1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 673cf7b329f641cee22eb583a73f2ef3478445c1
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 30 11:22:43 2023 -0700

<span style='display:block; white-space:pre;color:#404040;'>    scotch: update version 7.0.1->7.0.2
</span>---
 science/scotch/Portfile                            | 10 +--
 science/scotch/files/cmake-shared-library.diff     | 88 ----------------------
 .../files/patch-undefined_dynamic_lookup.diff      | 16 ++++
 3 files changed, 21 insertions(+), 93 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/Portfile b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1fe98f2162..3a74a843f00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup                   cmake 1.1
</span> PortGroup                   gitlab 1.0
 
 gitlab.instance             https://gitlab.inria.fr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup                scotch scotch 7.0.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup                scotch scotch 7.0.2 v
</span> 
 categories                  science
 maintainers                 {mcalhoun @MarcusCalhoun-Lopez} {@catap korins.ky:kirill} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,9 +17,9 @@ description                 a software package for graph and mesh/hypergraph \
</span>                             partitioning and sparse matrix ordering
 long_description            Scotch is {*}${description}.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums                   rmd160  85379220f8ab06a57c1f8737732e05fd178f340c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            sha256  2f9620bb9bb4376e12b36098d93b48cc77e7486e77b778c8047aba191977af28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            size    6403898
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums                   rmd160  013b48bd2b4714e23de41933f194d62d645350e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            sha256  7723a0da3ed38250b9830998a6791c6584f116b3df4ac9f6a141a46043ed376e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            size    6418957
</span> 
 compilers.choose            cc fc
 mpi.setup                   require
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ depends_lib-append          port:bzip2 \
</span> 
 depends_test-append         port:mumps
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append           cmake-shared-library.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-undefined_dynamic_lookup.diff
</span> 
 # MPI implementation is not threadsafe, do not use DSCOTCH_PTHREAD
 configure.args-append       -DMPI_THREAD_MULTIPLE=OFF
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/cmake-shared-library.diff b/science/scotch/files/cmake-shared-library.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6df17e89c63..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/cmake-shared-library.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,88 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.inria.fr/scotch/scotch/-/issues/16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/check/CMakeLists.txt src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6505918..323580a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,8 +52,15 @@ set(tgt ${PROJECT_SOURCE_DIR}/tgt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Macro to add quickly a Scotch test executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function(add_test_scotch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   add_executable(${ARGV0} ${ARGV0}.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  set_target_properties(${ARGV0} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  target_link_libraries(${ARGV0} scotch scotcherr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set_target_properties(${ARGV0} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    BUILD_WITH_INSTALL_RPATH FALSE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    target_link_directories(${ARGV0} PRIVATE ../libscotch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    target_link_libraries(${ARGV0} PRIVATE scotch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    target_link_libraries(${ARGV0} scotch scotcherr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if(${ARGC} GREATER_EQUAL 2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_test(NAME ${ARGV0} COMMAND ${ARGV0})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/libscotch/CMakeLists.txt src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d1ca5b7..b3efbd5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libscotch/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -550,7 +550,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   target_compile_definitions(scotch PRIVATE SCOTCH_DEBUG_LIBRARY1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_library(scotcherr library_error.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_library(scotcherr STATIC library_error.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(scotcherr PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -558,7 +558,17 @@ target_include_directories(scotcherr PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_dependencies(scotcherr scotch_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_library(scotcherrexit library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option(SCOTCH_SHARED_USE_SCOTCHERR "Linking shared library against libscotcherr instead of libscotcherrexit" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (BUILD_SHARED_LIBS AND SCOTCH_SHARED_USE_SCOTCHERR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  message(STATUS "Building shared library linked against libscotcherr")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  target_link_libraries(scotch PRIVATE scotcherr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif (BUILD_SHARED_LIBS AND NOT SCOTCH_SHARED_USE_SCOTCHERR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  message(STATUS "Building shared library linked against libscotcherrexit")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  target_link_libraries(scotch PRIVATE scotcherrexit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_library(scotcherrexit STATIC library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(scotcherrexit PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,6 +779,10 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   add_dependencies(ptscotcherr ptscotch_h scotch_h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    target_link_libraries(ptscotch PRIVATE ptscotcherr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   add_library(ptscotcherrexit library_error_exit.c)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   target_include_directories(ptscotcherrexit PUBLIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -790,6 +804,8 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach(_target ${TARGETS_LIST})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  set_target_properties(${_target} PROPERTIES POSITION_INDEPENDENT_CODE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    ${BUILD_SHARED_LIBS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   install(EXPORT ${_target}Targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     FILE ${_target}Targets.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     NAMESPACE SCOTCH::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/libscotchmetis/CMakeLists.txt src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 80cc2ac..1736e31 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libscotchmetis/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,6 +163,7 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       $<INSTALL_INTERFACE:include>)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     target_link_libraries(ptscotchparmetisv${version} PRIVATE scotch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+    target_link_libraries(ptscotchparmetisv${version} PRIVATE ptscotch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     target_link_libraries(ptscotchparmetisv${version} PUBLIC MPI::MPI_C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     add_dependencies(ptscotchparmetisv${version} ptscotch_h)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/patch-undefined_dynamic_lookup.diff b/science/scotch/files/patch-undefined_dynamic_lookup.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e5eebe0a877
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/files/patch-undefined_dynamic_lookup.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://gitlab.inria.fr/scotch/scotch/-/issues/16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://gitlab.inria.fr/scotch/scotch/-/commit/d0ab114bb31a75cc2ee06b73f1f30ca69ee2af85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/esmumps/CMakeLists.txt.orig        2022-12-24 06:50:30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/esmumps/CMakeLists.txt     2023-01-30 09:23:18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,6 +136,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dummy PTEsMUMPS library file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(ptesmumps ${esmumps_src} ${esmumps_headers})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set_target_properties(ptesmumps PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(ptesmumps PROPERTIES PUBLIC_HEADER "${GENERATED_INCLUDE_DIR}/esmumps.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(ptesmumps PRIVATE
</span></pre><pre style='margin:0'>

</pre>