<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/c0c4dd1648c3d4b884876c16de62206914fdda62">https://github.com/macports/macports-ports/commit/c0c4dd1648c3d4b884876c16de62206914fdda62</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c0c4dd1648c3d4b884876c16de62206914fdda62
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Apr 30 06:03:00 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> netgen: update version 6.2.1910->6.2.2004
</span>---
math/netgen/Portfile | 14 +++++++-------
math/netgen/files/patch-CMakeLists.txt.diff | 16 ++++++++--------
math/netgen/files/patch-no-console.diff | 5 +++--
math/netgen/files/patch-no-pybind.diff | 2 +-
4 files changed, 19 insertions(+), 18 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 aaefe26..5793ad1 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;'>@@ -6,8 +6,8 @@ PortGroup github 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve netgen 6.2.1910 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve netgen 6.2.2004 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;'>@@ -21,9 +21,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 08db2821439b6481cb9e9feb3035cc82c6199d2f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 65e24f3fb985f49e81576636c10e31adfe563e7103f59e2cf60dc0727192793f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3240118
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 93f0fe02505d76ad77cc3b9be2624a329f2078c8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0b15e66e57551e25e8eecaf02751d78cb8182bc3c7d59ae2d01711b05c59e8a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3245293
</span>
compiler.cxx_standard 2011
compilers.choose cc cxx
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,14 +130,14 @@ variant oce conflicts opencascade description {(not supported) compile with Open
</span> depends_lib-append port:oce
configure.args-append -DUSE_OCC=ON \
-DOCC_INCLUDE_DIR=${prefix}/include/oce \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_LIBRARY=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_LIBRARY_DIR=${prefix}/lib
</span> }
variant opencascade conflicts oce description {(not supported) compile with Open CASCADE geometry kernel} {
depends_lib-append port:opencascade
configure.args-append -DUSE_OCC=ON \
-DOCC_INCLUDE_DIR=${prefix}/include/opencascade \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCC_LIBRARY=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_LIBRARY_DIR=${prefix}/lib
</span> }
pre-configure {
<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 4b7e906..4986415 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,6 +1,6 @@
</span> --- CMakeLists.txt.orig 2019-12-15 12:10:31.000000000 -0700
+++ CMakeLists.txt 2019-12-20 03:10:36.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,7 +134,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +129,7 @@
</span>
set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</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;'>-@@ -143,7 +143,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@
</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;'>@@ -18,7 +18,7 @@
</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;'>-@@ -156,7 +156,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +151,7 @@
</span> set(NG_INSTALL_DIR_INCLUDE_DEFAULT include)
set(NG_RPATH_TOKEN "\$ORIGIN")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</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;'>-@@ -192,9 +192,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -187,9 +187,6 @@
</span> 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)
install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> include (CheckIncludeFiles)
check_include_files (dlfcn.h HAVE_DLFCN_H)
if(HAVE_DLFCN_H)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -247,11 +244,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,11 +235,11 @@
</span> if (USE_GUI)
find_package(TCL 8.5 REQUIRED)
find_package(Threads REQUIRED)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@
</span> find_package(OpenGL REQUIRED)
add_definitions(-DTCL -DOPENGL -DUSE_TOGL_2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,11 +259,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,11 +250,11 @@
</span> if(WIN32)
add_definitions(-DTOGL_WGL)
else(WIN32)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span> endif(WIN32)
endif (USE_GUI)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -278,7 +275,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +266,7 @@
</span> endif()
if (USE_PYTHON)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@
</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;'>-@@ -482,7 +479,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -539,7 +536,7 @@
</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-no-console.diff b/math/netgen/files/patch-no-console.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d64c45a..fbf590d 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,7 +1,8 @@
</span> --- ng/onetcl.cpp.orig 2018-08-30 05:49:56.000000000 -0700
+++ ng/onetcl.cpp 2018-09-16 12:05:01.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char * ngscript[] = {""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mydefs.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DLL_HEADER const char * ngscript[] = {""
</span> +,"catch {console hide }\n"
,"catch {lappend auto_path $env(NETGENDIR) }\n"
,"catch {lappend auto_path $env(NETGENDIR)/../lib }\n"
<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 1091907..0ef282f 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,6 +1,6 @@
</span> --- cmake/SuperBuild.cmake.orig 2018-05-01 12:26:47.000000000 -0700
+++ cmake/SuperBuild.cmake 2018-09-01 16:04:34.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span> #######################################################################
if (USE_PYTHON)
find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
</pre><pre style='margin:0'>
</pre>