<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/933a1b346a89cf644cb6b467b9301958b56676ab">https://github.com/macports/macports-ports/commit/933a1b346a89cf644cb6b467b9301958b56676ab</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 933a1b346a89cf644cb6b467b9301958b56676ab
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Sep 20 14:09:00 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> netgen/ngsolve: update version 5.3.1/5.1->6.2.1808
</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/50687
</span>---
math/netgen/Portfile | 149 ++++++++++++++++++++------
math/netgen/files/patch-CMakeLists.txt.diff | 48 +++++++++
math/netgen/files/patch-configure.ac.diff | 8 --
math/netgen/files/patch-link-ng.diff | 11 ++
math/netgen/files/patch-ng-ng.tcl.diff | 11 --
math/netgen/files/patch-no-console.diff | 8 ++
math/netgen/files/patch-no-external.diff | 66 ++++++++++++
math/netgen/files/patch-no-pybind.diff | 11 ++
math/ngsolve/Portfile | 95 ++++++++++++----
math/ngsolve/files/patch-clapack.h.diff | 22 ++++
math/ngsolve/files/patch-extern-netgen.diff | 13 ---
math/ngsolve/files/patch-l2hofe-template.diff | 124 ---------------------
12 files changed, 357 insertions(+), 209 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 8b091e7..01b109b 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;'>@@ -2,11 +2,12 @@
</span>
PortSystem 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name netgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</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.1808 v
</span> platforms darwin
categories math
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,36 +19,120 @@ long_description ${description}. It accepts input from constructive \
</span> allows the handling of IGES and STEP files. NETGEN contains \
modules for mesh optimization and hierarchical mesh \
refinement.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ngsolve.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.hpfem.jku.at/netgen/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/netgen-mesher/netgen-mesher/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1516ded2576a1ff31bc848e3af966aa444cb84ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb97f79d8f4d55c00506ab334867285cde10873c8a8dc783522b47d2bc128bf9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ec1aabc5732a558bcf3744ea883b0b09c036ee0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 619548a62b16c635f81cfbc8611e1e65053cc41766cdd247d32bd1a4073ff1bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3002932
</span>
compilers.choose cc cxx
compilers.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:tcl port:tk port:tix port:Togl port:mesa port:libGLU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ng-ng.tcl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# there do not seem to be any tests include with this port. 'make check' does nothing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Other options that could be considered here:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-occ compile with OpenCascade geometry kernel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-nglib generate shared library nglib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-parallel enable mpi parallelization
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-jpeglib enable snapshots using library libjpeg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-ffmpeg enable video recording with FFmpeg, uses libavcodec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--enable-mkl link Intel's mkl library, necessary for ngsolve and mkl 11.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#Optional Packages:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--with-occ=dir use OpenCascade installed in directory dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--with-togl=dir directory containing libTogl1.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#--with-metis=dir path to metis 5.x
</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:#e0ffe0;'>+patchfiles-append patch-no-external.diff
</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:#e0ffe0;'>+patchfiles-append patch-no-pybind.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# link Tcl/Tk libraries like other systems (unnecessary?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-link-ng.diff
</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:#e0ffe0;'>+patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# prevent console window from appearing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see http://wiki.tcl.tk/26777
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no-console.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. ""} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tcl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tkdnd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:Togl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ffmpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pybind11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-tkinter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NATIVE_ARCH=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYBIND_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/${python_branch}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTCL_INCLUDE_PATH:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_INCLUDE_PATH:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENGL_glu_LIBRARY="" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_JPEG=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_MPEG=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tkdnd quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants Togl quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|MACPORTS_NO_X11|TRUE|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</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;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tkdnd x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants Togl x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXmu \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libGLU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib
</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;'>+if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</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;'>+variant occ description {(not supported) compile with OpenCascade geometry kernel} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:oce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DUSE_OCC=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_INCLUDE_DIR=${prefix}/include/oce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCC_LIBRARY=${prefix}/lib
</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;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Either +x11 or +quartz is required"
</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;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/Netgen1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/bin/startup.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${applications_dir}/Netgen.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${applications_dir}/Netgen.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/bin/netgen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Netgen.app/Contents/MacOS/Netgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/Info.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Netgen.app/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/Netgen.icns \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${applications_dir}/Netgen.app/Contents/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/python${python_branch}/site-packages/netgen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..133ff24
</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-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-05-01 12:26:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-09-02 09:02:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +118,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NG_INSTALL_SUFFIX netgen CACHE STRING "Suffix appended to install directories (project name)")
</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;'>++if(APPLE AND FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NG_INSTALL_DIR_BIN_DEFAULT Contents/MacOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NG_INSTALL_DIR_LIB_DEFAULT Contents/MacOS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(NG_INSTALL_DIR_CMAKE_DEFAULT Contents/Resources/CMake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,9 +176,6 @@
</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;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include (CheckIncludeFiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_include_files (dlfcn.h HAVE_DLFCN_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(HAVE_DLFCN_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,7 +228,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (USE_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TCL 8.5 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Threads REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE AND MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework AppKit")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(X11 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -246,7 +243,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DTOGL_WGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(APPLE AND MACPORTS_NO_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DTOGL_NSOPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS(-DTOGL_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,7 +423,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>English</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string>Netgen1</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string>Netgen</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Netgen.icns</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSHighResolutionCapable</key>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-configure.ac.diff b/math/netgen/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 99db32a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2013-11-18 00:34:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2013-11-18 00:35:37.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_INIT([netgen],[5.1],[],[])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AM_INIT_AUTOMAKE([-Wall -Wno-extra-portability -Werror foreign])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CONFIG_MACRO_DIR([m4])
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..31a9617
</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-ng.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ng/CMakeLists.txt.orig 2018-05-01 12:26:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ng/CMakeLists.txt 2018-09-02 05:59:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( netgen nglib gui )
</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;'>++ if(APPLE AND FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Leave decision about which tcl/tk version to use open to python (and it's tkinter package).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Thus, only link tcl/tk to the netgen executable and not to the gui library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries( netgen ${TK_LIBRARY} ${TCL_LIBRARY})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/files/patch-ng-ng.tcl.diff b/math/netgen/files/patch-ng-ng.tcl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6e7a22e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/files/patch-ng-ng.tcl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ng/ng.tcl.orig 2013-11-16 17:16:21.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ng/ng.tcl 2013-11-18 00:42:35.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -114,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ng_SetMeshingParameters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ng_SetVisParameters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ng_SetDebugParameters
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ng_STLDoctor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#Ng_STLDoctor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ng_GeometryOptions set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $hasocc == "yes" } {
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d64c45a
</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-no-console.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ng/onetcl.cpp.orig 2018-08-30 05:49:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ng/onetcl.cpp 2018-09-16 12:05:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char * ngscript[] = {""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++,"catch {console hide }\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,"catch {lappend auto_path $env(NETGENDIR) }\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,"catch {lappend auto_path $env(NETGENDIR)/../lib }\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,"if {[catch {Ng_GetCommandLineParameter batchmode} result ]} {\n"
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..87d526e
</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-no-external.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,66 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/external_projects/tcltk.cmake.orig 2018-08-30 05:49:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/external_projects/tcltk.cmake 2018-09-16 12:26:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,37 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use system tcl/tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${PYTHON_VERSION_STRING} STREQUAL "3.7")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # fetch tcl/tk sources to match the one used in Python 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ExternalProject_Add(project_tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL "https://prdownloads.sourceforge.net/tcl/tcl8.6.8-src.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL_MD5 81656d3367af032e0ae6157eff134f89
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UPDATE_COMMAND "" # Disable update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIGURE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUILD_COMMAND ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_COMMAND ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ExternalProject_Add(project_tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL "https://prdownloads.sourceforge.net/tcl/tk8.6.8-src.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL_MD5 5e0faecba458ee1386078fb228d008ba
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UPDATE_COMMAND "" # Disable update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIGURE_COMMAND ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUILD_COMMAND ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_COMMAND ""
</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;'>+- get_filename_component(PYTHON_LIB_DIR ${PYTHON_LIBRARY} DIRECTORY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(TCL_LIBRARY libtcl8.6.dylib PATHS ${PYTHON_LIB_DIR} NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(TK_LIBRARY libtk8.6.dylib PATHS ${PYTHON_LIB_DIR} NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TCL_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies/src/project_tcl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TK_DIR ${CMAKE_CURRENT_BINARY_DIR}/dependencies/src/project_tk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TCL_INCLUDE_PATH ${TCL_DIR}/generic;${TCL_DIR}/macosx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TK_INCLUDE_PATH ${TK_DIR}/generic;${TK_DIR}/macosx;${TK_DIR}/xlib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TCL 8.6 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TCL 8.5 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,25 +58,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set(TK_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tk.framework/Headers)
</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;'>+-ExternalProject_Add(project_tkdnd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL "http://sourceforge.net/projects/tkdnd/files/TkDND/TkDND%202.8/tkdnd2.8-src.tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- URL_MD5 a6d47a996ea957416469b12965d4db91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/tkdnd_macosx.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- UPDATE_COMMAND "" # Disable update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUILD_IN_SOURCE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIGURE_COMMAND ./configure --prefix=${CMAKE_INSTALL_PREFIX}/Contents/MacOS --libdir=${CMAKE_INSTALL_PREFIX}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BUILD_COMMAND make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL_COMMAND make install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG_DOWNLOAD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LOG_INSTALL 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-list(APPEND NETGEN_DEPENDENCIES project_tkdnd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ExternalProject_Add(project_win_tcltk
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1091907
</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-no-pybind.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/SuperBuild.cmake.orig 2018-05-01 12:26:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/SuperBuild.cmake 2018-09-01 16:04:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #######################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (USE_PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h PATHS ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies/pybind11/include NO_DEFAULT_PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(NG_INSTALL_PYBIND ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(NG_INSTALL_PYBIND OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( NOT PYBIND_INCLUDE_DIR )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if the pybind submodule is missing, try to initialize and update all submodules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/Portfile b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4dfbb4d..b28099e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,11 @@
</span>
PortSystem 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ngsolve
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve ngsolve 6.2.1808 v
</span> platforms darwin
categories math
license LGPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,33 +17,84 @@ long_description NGSolve is a general purpose Finite Element Library \
</span> heat flow equations, Maxwell equations, and solid \
mechanical problems. Several add-ons are available for \
particular application classes.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://ngsolve.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://sourceforge.net/apps/mediawiki/ngsolve/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/ngsolve/ngsolve/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0e0638b91b81fa1d6dbf7baf76794b225b6b7f8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5c3a035345cdcf526c1b6b3f1ec12b37a3c856c82c8d31e22ef87d1477f2eb82
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b71ebcd0bd215db5304ec6e1b6f29cdc92cae650 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 033ac0453ff099e0edd2fbfbd4071c02f842b6dc5a0bccb3a9ac77fa6b531af8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15026842
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc cxx
</span> compilers.setup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:tcl port:tk port:tix port:Togl port:netgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. ""} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid conflict with atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-clapack.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/basiclinalg/clapack.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/basiclinalg/ng_clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.ldflags-append -lcblas -lf77blas -latlas -llapack -lgfortran
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -lnglib -linterface -lgeom2d -lmesh -lstl -lcsg -lcsgvis -lz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_AMD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_CCOLAMD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_CHOLMOD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_UMFPACK \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:SuiteSparse_config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:netgen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-netgen=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-shared \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack="-framework Accelerate"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNETGEN_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_UMFPACK=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_NATIVE_ARCH=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBLA_VENDOR=Apple
</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;'>+variant atlas conflicts accelerate openblas description {Use MacPorts ATLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLA_VENDOR=ATLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FindBLAS.cmake and FindLAPACK.cmake do not seem to find MacPorts Atlas properly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBLAS_LIBRARIES=satlas \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES=satlas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-l2hofe-template.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-extern-netgen.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openblas conflicts atlas accelerate description {Use MacPorts OpenBLAS Libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/libopenblas.dylib:OpenBLAS lapack
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBLA_VENDOR=OpenBLAS
</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;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/python${python_branch}/site-packages/ngsolve \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages/
</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;'>+if {![variant_isset accelerate] && ![variant_isset atlas] && ![variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +accelerate
</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;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset accelerate] && ![variant_isset openblas] && ![variant_isset atlas] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You must select either the +accelerate, +atlas, or +openblas variant for linear algebra."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "No linear-algebra variant selected."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${destroot}${prefix}/bin "s,libngsolve,${prefix}/lib/libngsolve,g" ngsolve.tcl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/include/clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/Netgen.icns
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-clapack.h.diff b/math/ngsolve/files/patch-clapack.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..581e593
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/ngsolve/files/patch-clapack.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- basiclinalg/ng_lapack.hpp.orig 2018-08-30 23:18:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ basiclinalg/ng_lapack.hpp 2018-09-17 04:05:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int L_fp; // ?
</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;'>+-#include "clapack.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "ng_clapack.h"
</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;'>+--- basiclinalg/CMakeLists.txt.orig 2018-08-30 23:18:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ basiclinalg/CMakeLists.txt 2018-09-17 04:06:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install( FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bandmatrix.hpp cholesky.hpp matrix.hpp ng_lapack.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vector.hpp bla.hpp expr.hpp symmetricmatrix.hpp arch.hpp ng_clapack.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tensor.hpp cuda_bla.hpp avector.hpp ngblas.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION ${NGSOLVE_INSTALL_DIR_INCLUDE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPONENT ngsolve_devel
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-extern-netgen.diff b/math/ngsolve/files/patch-extern-netgen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 12ff901..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/patch-extern-netgen.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;'>---- solve/ngs.cpp.orig 2014-06-01 15:17:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ solve/ngs.cpp 2014-06-01 15:18:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,8 +2,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace netgen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int h_argc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char ** h_argv;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern int h_argc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extern char ** h_argv;
</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;'>- int main(int argc, char ** argv)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/ngsolve/files/patch-l2hofe-template.diff b/math/ngsolve/files/patch-l2hofe-template.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 562c7d9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/ngsolve/files/patch-l2hofe-template.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,124 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- fem/l2hofe.cpp.orig 2014-05-31 11:21:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ fem/l2hofe.cpp 2014-05-31 11:25:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,18 +17,18 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typename L2HighOrderFE<ET,SHAPES,BASE>::TPRECOMP L2HighOrderFE<ET,SHAPES,BASE>::precomp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typename L2HighOrderFE<ET,SHAPES,BASE>::TPRECOMP_TRACE L2HighOrderFE<ET,SHAPES,BASE>::precomp_trace(320);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typename L2HighOrderFE<ET,SHAPES,BASE>::TPRECOMP_GRAD L2HighOrderFE<ET,SHAPES,BASE>::precomp_grad(40);
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PrecomputeTrace ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PrecomputeGrad ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,7 +72,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PrecomputeShapes (const IntegrationRule & ir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,7 +95,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Evaluate (const IntegrationRule & ir, FlatVector<double> coefs, FlatVector<double> vals) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,7 +108,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EvaluateTrans (const IntegrationRule & ir, FlatVector<> values, FlatVector<> coefs) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,7 +128,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EvaluateGrad (const IntegrationRule & ir, FlatVector<> coefs, FlatMatrixFixWidth<DIM> values) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EvaluateGradTrans (const IntegrationRule & ir, FlatMatrixFixWidth<DIM> values, FlatVector<> coefs) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetGradient (FlatVector<> coefs, FlatMatrixFixWidth<DIM> grad) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,7 +179,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DGFiniteElement<DIM>::GetGradient (coefs, grad);
</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;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetGradientTrans (FlatMatrixFixWidth<DIM> grad, FlatVector<> coefs) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +203,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetTrace (int facet, FlatVector<> coefs, FlatVector<> fcoefs) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -218,7 +218,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DGFiniteElement<DIM>::GetTrace (facet, coefs, fcoefs);
</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;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetTraceTrans (int facet, FlatVector<> fcoefs, FlatVector<> coefs) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,7 +232,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ template <ELEMENT_TYPE ET, template <ELEMENT_TYPE ET2> class SHAPES, class BASE>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void L2HighOrderFE<ET,SHAPES,BASE> ::
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetDiagMassMatrix (FlatVector<> mass) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>