<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e0cfad9528cb78fd6d94a7bdab8e79785c899dc2">https://github.com/macports/macports-ports/commit/e0cfad9528cb78fd6d94a7bdab8e79785c899dc2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e0cfad9528c netgen: update to 6.2.2204
</span>e0cfad9528c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e0cfad9528cb78fd6d94a7bdab8e79785c899dc2
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Dec 7 03:08:14 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> netgen: update to 6.2.2204
</span>---
math/netgen/Portfile | 29 ++++------
math/netgen/files/patch-CMakeLists.txt.diff | 64 ++++++++++-------------
math/netgen/files/patch-MacPorts-rpath.diff | 13 +++++
math/netgen/files/patch-cmake-version.diff | 15 ++++++
math/netgen/files/patch-link-agains-ffmpeg.diff | 13 +++++
math/netgen/files/patch-link-ng.diff | 13 -----
math/netgen/files/patch-no-console.diff | 6 ++-
math/netgen/files/patch-no-external.diff | 32 ++++++------
math/netgen/files/patch-no-pybind.diff | 10 ++--
math/netgen/files/patch-propagate_c_compiler.diff | 12 +++--
10 files changed, 110 insertions(+), 97 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/Portfile b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d322e8dcf8..d9163ff027f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ PortGroup cmake 1.1
</span> PortGroup active_variants 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve netgen 6.2.2004 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve netgen 6.2.2204 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
categories math
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ long_description ${description}. It accepts input from constructive \
</span> refinement.
homepage https://ngsolve.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 93f0fe02505d76ad77cc3b9be2624a329f2078c8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0b15e66e57551e25e8eecaf02751d78cb8182bc3c7d59ae2d01711b05c59e8a9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3245293
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2dec1f2fc90f11fca6ad5ab28622f2b5fdc37e72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae1dd9e0b9e2946ba9390b222e33dc9227ddfc1ef2f1528c64edbfdc25ec3587 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3395435
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +36,11 @@ compilers.setup
</span>
patchfiles-append patch-no-external.diff \
patch-no-pybind.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-link-ng.diff \
</span> patch-CMakeLists.txt.diff \
patch-no-console.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-link-agains-ffmpeg.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-version.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-MacPorts-rpath.diff \
</span> patch-propagate_c_compiler.diff
depends_lib-append port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +56,7 @@ configure.args-append -DUSE_NATIVE_ARCH=OFF \
</span> -DTCL_INCLUDE_PATH:PATH=${prefix}/include \
-DTK_INCLUDE_PATH:PATH=${prefix}/include \
-DOPENGL_glu_LIBRARY="" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNETGEN_VERSION_GIT="v${version}" \
</span> -DUSE_JPEG=ON \
-DUSE_MPEG=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,20 +153,6 @@ if {![variant_isset quartz] && ![variant_isset x11]} {
</span> default_variants +x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant oce conflicts opencascade description {(not supported) compile with Open CASCADE Community Edition geometry kernel} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:oce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DUSE_OCC=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_INCLUDE_DIR=${prefix}/include/oce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_LIBRARY_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant opencascade conflicts oce description {(not supported) compile with Open CASCADE geometry kernel} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:opencascade
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DUSE_OCC=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_INCLUDE_DIR=${prefix}/include/opencascade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_LIBRARY_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
if {![variant_isset quartz] && ![variant_isset x11]} {
error "Either +x11 or +quartz is required"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-CMakeLists.txt.diff b/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 54fc2d5c16f..43ff667e27c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-behave like other systems except use of RPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+behave like other systems except use of RPATH
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2019-12-15 12:10:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-12-20 03:10:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -129,7 +129,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 0a05ebb1..677d586b 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;'>+@@ -133,7 +133,7 @@ endif(USE_PYTHON)
</span>
set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +13,7 @@ behave like other systems except use of RPATH
</span> set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS)
set(NG_INSTALL_DIR_CMAKE_DEFAULT Contents/Resources/CMake)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@ if(APPLE)
</span> set(NG_INSTALL_DIR_INCLUDE_DEFAULT Contents/Resources/include)
set(NG_RPATH_TOKEN "@loader_path")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +22,7 @@ behave like other systems except use of RPATH
</span> set(NG_INSTALL_DIR_BIN_DEFAULT bin)
set(NG_INSTALL_DIR_LIB_DEFAULT lib)
if(WIN32)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +151,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,7 +155,7 @@ else(APPLE)
</span> set(NG_INSTALL_DIR_INCLUDE_DEFAULT include)
set(NG_RPATH_TOKEN "\$ORIGIN")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,47 +31,37 @@ behave like other systems except use of RPATH
</span>
set(NG_INSTALL_DIR_PYTHON ${NG_INSTALL_DIR_PYTHON_DEFAULT} CACHE STRING "Install directory for Python files")
set(NG_INSTALL_DIR_BIN ${NG_INSTALL_DIR_BIN_DEFAULT} CACHE STRING "Install directory for executables")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,9 +187,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(NG_INSTALL_DIR EXPORT netgen-targets RUNTIME DESTINATION ${NG_INSTALL_DIR_BIN} COMPONENT netgen LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN};${NG_RPATH_TOKEN}/${NETGEN_RPATH}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include (CheckIncludeFiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_include_files (dlfcn.h HAVE_DLFCN_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_DLFCN_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,11 +235,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -261,13 +261,13 @@ if (USE_GUI)
</span> find_package(TCL 8.5 REQUIRED)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TclStub 8.5 REQUIRED)
</span> find_package(Threads REQUIRED)
- if(APPLE)
+ if(APPLE AND MACPORTS_NO_X11)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit")
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(netgen_gui INTERFACE "-framework AppKit")
</span> - else(APPLE)
+ else(APPLE AND MACPORTS_NO_X11)
find_package(X11 REQUIRED)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( netgen_gui INTERFACE ${X11_Xmu_LIB} ${X11_X11_LIB})
</span> - endif(APPLE)
+ endif(APPLE AND MACPORTS_NO_X11)
find_package(OpenGL REQUIRED)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -253,11 +250,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DTOGL_WGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLE AND MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DTOGL_NSOPENGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else(APPLE AND MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS(-DTOGL_X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif(APPLE AND MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif (USE_GUI)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -269,7 +266,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(netgen_gui INTERFACE -DTCL -DOPENGL -DUSE_TOGL_2 -DUSE_TCL_STUBS -DUSE_TK_STUBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,7 +286,11 @@ if (USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(netgen_gui INTERFACE -DTOGL_WGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_compile_definitions(netgen_gui INTERFACE -DTOGL_NSOPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_compile_definitions(netgen_gui INTERFACE -DTOGL_NSOPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_compile_definitions(netgen_gui INTERFACE -DTOGL_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_definitions(netgen_gui INTERFACE -DTOGL_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,7 +306,7 @@ else()
</span> endif()
if (USE_PYTHON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +70,7 @@ behave like other systems except use of RPATH
</span> find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR})
if( PYBIND_INCLUDE_DIR )
message(STATUS "Found Pybind11: ${PYBIND_INCLUDE_DIR}")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -539,7 +536,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -652,7 +656,7 @@ open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh || open -a
</span> <key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-MacPorts-rpath.diff b/math/netgen/files/patch-MacPorts-rpath.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..37487cfd88d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-MacPorts-rpath.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</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 0a05ebb1..821e790f 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;'>+@@ -191,8 +191,6 @@ endif(USE_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NG_INSTALL_DIR EXPORT netgen-targets RUNTIME DESTINATION ${NG_INSTALL_DIR_BIN} COMPONENT netgen LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN};${NG_RPATH_TOKEN}/${NETGEN_RPATH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_FOR_CONDA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(RELATIVE_PATH py_rpath "/bin" "/${NG_INSTALL_DIR_LIB}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${py_rpath}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-cmake-version.diff b/math/netgen/files/patch-cmake-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..169ae71a466
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-cmake-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/NGSolve/netgen/pull/142
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/generate_version_file.cmake cmake/generate_version_file.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c4a579d1..c47b6039 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/generate_version_file.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/generate_version_file.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@ string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.[0-9]+\\-[0-9]+\\-([0-9a-z]+).*" "\\1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NETGEN_VERSION_SHORT ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}.${NETGEN_VERSION_PATCH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NETGEN_VERSION_LONG ${NETGEN_VERSION_SHORT}-${NETGEN_VERSION_TWEAK}-${NETGEN_VERSION_HASH})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(NETGEN_VERSION_TWEAK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NETGEN_VERSION_TWEAK AND NOT NETGEN_VERSION_TWEAK STREQUAL git_version_string)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # no release version - nightly build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NETGEN_VERSION ${NETGEN_VERSION_LONG})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-link-agains-ffmpeg.diff b/math/netgen/files/patch-link-agains-ffmpeg.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e02a7ec1a44
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-link-agains-ffmpeg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git nglib/CMakeLists.txt nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 370b670b..5fc61ecf 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nglib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@ endif(USE_OCC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(nglib PUBLIC ngcore)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries( nglib PRIVATE ${MPI_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${MKL_LIBRARIES} ${ZLIB_LIBRARIES} ${OCC_LIBRARIES} netgen_cgns )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS nglib netgen_cgns ${NG_INSTALL_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(FILES nglib.h DESTINATION ${NG_INSTALL_DIR_INCLUDE} COMPONENT netgen_devel)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-link-ng.diff b/math/netgen/files/patch-link-ng.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a1decac23d6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-link-ng.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-link Tcl/Tk libraries like other systems (unnecessary?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ng/CMakeLists.txt.orig 2018-11-23 02:52:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ng/CMakeLists.txt 2018-12-10 05:04:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries( gui PUBLIC nglib )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries( gui PRIVATE ${LIBTOGL} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${X11_Xmu_LIB} ${X11_X11_LIB} ${OCC_LIBRARIES} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(TRUE OR NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries( gui PRIVATE ${TCL_LIBRARY} ${TK_LIBRARY})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-no-console.diff b/math/netgen/files/patch-no-console.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c4dcb9c3e13..5016fd08f2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-no-console.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-no-console.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span> prevent console window from appearing
see https://wiki.tcl-lang.org/page/console+hide
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- ng/onetcl.cpp.orig 2018-08-30 05:49:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ng/onetcl.cpp 2018-09-16 12:05:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ng/onetcl.cpp ng/onetcl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4b999a6f..12fc57d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ng/onetcl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ng/onetcl.cpp
</span> @@ -1,5 +1,6 @@
#include <mydefs.hpp>
DLL_HEADER const char * ngscript[] = {""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-no-external.diff b/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bf71023d3bd..51175d9cfea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-no-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-do not attempt to download & install tkdnd or Tcl/Tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+do not attempt to download & install tkdnd or Tcl/Tk
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/external_projects/tcltk.cmake.orig 2018-08-30 05:49:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/external_projects/tcltk.cmake 2018-09-16 12:26:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,121 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/external_projects/tcltk.cmake cmake/external_projects/tcltk.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 637c1899..1dd10dd2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/external_projects/tcltk.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/external_projects/tcltk.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,117 +64,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(SKBUILD)
</span> if(APPLE)
- set(tcl_prefix ${CMAKE_INSTALL_PREFIX})
- # URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tcl8.6.9-src.tar.gz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,10 +19,7 @@ do not attempt to download & install tkdnd or Tcl/Tk
</span> - CONFIGURE_COMMAND ../project_tcl/macosx/configure --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin
- BUILD_COMMAND make -j4 binaries libraries
- INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_DOWNLOAD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_INSTALL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SUBPROJECT_ARGS}
</span> - )
-
- # URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tk8.6.9.1-src.tar.gz"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +33,7 @@ do not attempt to download & install tkdnd or Tcl/Tk
</span> - CONFIGURE_COMMAND ../project_tk/macosx/configure --enable-aqua=yes --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin --with-tcl=${tcl_prefix}/Contents/Frameworks/Tcl.framework
- BUILD_COMMAND make -j4 binaries libraries
- INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_DOWNLOAD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_INSTALL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SUBPROJECT_ARGS}
</span> - )
-
- ExternalProject_Add(project_tkdnd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +48,7 @@ do not attempt to download & install tkdnd or Tcl/Tk
</span> - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/Contents/MacOS
- -DTCL_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/Headers
- -DTK_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/Headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_DOWNLOAD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LOG_INSTALL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${SUBPROJECT_ARGS}
</span> - )
-
- list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk project_tkdnd)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +58,9 @@ do not attempt to download & install tkdnd or Tcl/Tk
</span> - set(TK_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework)
- set(TK_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/Headers)
-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TCL_STUB_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/libtclstub8.6.a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TK_STUB_LIBRARY ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/libtkstub8.6.a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> -# # use system tcl/tk
-# if((${PYTHON_VERSION_STRING} VERSION_EQUAL "3.7") OR (${PYTHON_VERSION_STRING} VERSION_GREATER "3.7"))
-# # fetch tcl/tk sources to match the one used in Python 3.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +119,7 @@ do not attempt to download & install tkdnd or Tcl/Tk
</span> -# find_package(TCL 8.5 REQUIRED)
-# endif()
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(TCL 8.5 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(TCL 8.5 REQUIRED)
</span> elseif(WIN32)
ExternalProject_Add(project_win_tcltk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-no-pybind.diff b/math/netgen/files/patch-no-pybind.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 89fb5aced37..ddf26601f1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-no-pybind.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-no-pybind.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-do not install another version of pybind11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+do not install another version of pybind11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/SuperBuild.cmake.orig 2018-05-01 12:26:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/SuperBuild.cmake 2018-09-01 16:04:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/SuperBuild.cmake cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 13d6915a..5abdd844 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ endif()
</span> #######################################################################
if (USE_PYTHON)
find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-propagate_c_compiler.diff b/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cc0db6151fc..c5dfc6cf340 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/files/patch-propagate_c_compiler.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,13 +3,15 @@ The C compiler is not used.
</span> However, the C compiler is checked.
This causes an error if "Using the Right Compiler" is being tested (https://trac.macports.org/wiki/UsingTheRightCompiler#testing).
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/SuperBuild.cmake.orig 2021-04-21 06:22:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/SuperBuild.cmake 2021-04-21 06:26:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -112,6 +112,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/SuperBuild.cmake cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 13d6915a..5f924c81 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/SuperBuild.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,6 +210,7 @@ endif(USE_MPI)
</span> #######################################################################
# propagate cmake variables to Netgen subproject
set_vars( NETGEN_CMAKE_ARGS
+ CMAKE_C_COMPILER
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_CXX_COMPILER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMAKE_BUILD_TYPE
</span> CMAKE_SHARED_LINKER_FLAGS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_SHARED_LINKER_FLAGS_RELEASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_CXX_FLAGS
</span></pre><pre style='margin:0'>
</pre>