aboutsummaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorStephen Montgomery-Smith <stephen@FreeBSD.org>2020-05-26 02:33:57 +0000
committerStephen Montgomery-Smith <stephen@FreeBSD.org>2020-05-26 02:33:57 +0000
commit4d678ffe697be8a0cb81583507bd697d74785bf7 (patch)
treef6f2ee5d8e64f07cc4382f9923d335a8fe4a09bf /cad
parentf2f22f3e9b89a1c3ea443df3b362c56742f5166e (diff)
downloadports-4d678ffe697be8a0cb81583507bd697d74785bf7.tar.gz
ports-4d678ffe697be8a0cb81583507bd697d74785bf7.zip
Notes
Diffstat (limited to 'cad')
-rw-r--r--cad/netgen/Makefile79
-rw-r--r--cad/netgen/distinfo9
-rw-r--r--cad/netgen/files/netgen_copy_include_for_salome39
-rw-r--r--cad/netgen/files/patch-configure155
-rw-r--r--cad/netgen/files/patch-configure.ac11
-rw-r--r--cad/netgen/files/patch-libsrc_csg_Makefile.am11
-rw-r--r--cad/netgen/files/patch-libsrc_csg_Makefile.in11
-rw-r--r--cad/netgen/files/patch-libsrc_geom2d_Makefile.am10
-rw-r--r--cad/netgen/files/patch-libsrc_geom2d_Makefile.in11
-rw-r--r--cad/netgen/files/patch-libsrc_occ_Makefile.am9
-rw-r--r--cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx13
-rw-r--r--cad/netgen/files/patch-libsrc_stlgeom_Makefile.am11
-rw-r--r--cad/netgen/files/patch-libsrc_stlgeom_Makefile.in11
-rw-r--r--cad/netgen/files/patch-libsrc_visualization_Makefile.am11
-rw-r--r--cad/netgen/files/patch-libsrc_visualization_Makefile.in11
-rw-r--r--cad/netgen/files/patch-ng_Makefile.am19
-rw-r--r--cad/netgen/files/patch-ng_Makefile.in20
-rw-r--r--cad/netgen/files/patch-ng_drawing.tcl11
-rw-r--r--cad/netgen/files/patch-ng_ngpkg.cpp95
-rw-r--r--cad/netgen/files/patch-nglib_Makefile.in11
-rw-r--r--cad/netgen/files/pkg-message.in10
-rw-r--r--cad/netgen/pkg-plist384
22 files changed, 244 insertions, 708 deletions
diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index 3e07adb87ce2..2f7892f26039 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -2,69 +2,44 @@
# $FreeBSD$
PORTNAME= netgen
-PORTVERSION= 5.3.1
-PORTREVISION= 11
+PORTVERSION= 6.2.2004
+DISTVERSIONPREFIX= v
CATEGORIES= cad
-#MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION:C|\.[[:digit:]]+$||}/
-MASTER_SITES= http://faculty.missouri.edu/~stephen/
MAINTAINER= stephen@FreeBSD.org
COMMENT= Automatic 3D tetrahedral mesh generator
-LIB_DEPENDS= libTix8.4.3.so:x11-toolkits/tix \
- libtogl.so:graphics/togl
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
-OCC_BROKEN= Does not compile because of issues with cad/opencascade
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
-USE_LDCONFIG= yes
-USES= gl gmake jpeg libtool localbase tk:tea xorg
-USE_GL= gl glu
-USE_XORG= x11 xmu xi
-MAKE_JOBS_UNSAFE= yes
-CPPFLAGS+= -isystem ${LOCALBASE}/lib/Togl-1.7
-CONFIGURE_ARGS= --enable-jpeglib
-INSTALL_TARGET= install-strip
-
-FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
-OPTIONS_DEFINE= OCC FFMPEG
-OCC_DESC= Compile with OpenCascade geometry kernel
-FFMPEG_DESC= video recording with FFmpeg
-OPTIONS_DEFAULT= # OCC
-
-BROKEN_sparc64= internal gcc error (Bug 23159)
+USES= cmake python tcl tk gl xorg
-OCC_LIB_DEPENDS= libTKernel.so:cad/opencascade
-OCC_CXXFLAGS= -DOCCGEOMETRY -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/include/OpenCASCADE
-OCC_CONFIGURE_ON= --enable-occ
+USE_GITHUB= yes
+GH_ACCOUNT= NGSolve
+GH_PROJECT= netgen:1 pybind11:2
+GH_TAGNAME= v${PORTVERSION}:1 v2.4.3:2
+GH_SUBDIR= external_dependencies/pybind11:2
-FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
-FFMPEG_CONFIGURE_ON= --enable-ffmpeg
-
-MACHINE= ${OPSYS:tu}
-
-SUB_LIST= PREFIX=${PREFIX}
-SUB_FILES= pkg-message
-MAKE_ENV= TK_VER=${TK_VER} TCL_VER=${TCL_VER} \
- TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" \
- TK_INCLUDEDIR="${TK_INCLUDEDIR}" \
- MACHINE=${MACHINE} MAKE=${MAKE_CMD}
+USE_GL= gl glu
+USE_XORG= x11 xmu xi
+USE_LDCONFIG= yes
-post-patch:
- @${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \
- ${WRKSRC}/ng/ng.tcl \
- ${WRKSRC}/ng/ngappinit.cpp
+CFLAGS+= -I${LOCALBASE}/include -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
+CXXFLAGS+= -I${LOCALBASE}/include -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
-post-install:
-# copy some additional headers for build cad/salome-netgenplugin
- ${MKDIR} ${STAGEDIR}${DATADIR}/include
- ${SH} ${FILESDIR}/netgen_copy_include_for_salome ${WRKSRC} ${STAGEDIR}${PREFIX}
- ${LN} ${STAGEDIR}${PREFIX}/lib/libnglib.so ${STAGEDIR}${PREFIX}/lib/libnglib.so.1
+OPTIONS_DEFINE= JPEG MPEG CGNS
-.include <bsd.port.pre.mk>
+JPEG_DESC= Enable snapshots using jpeg
+MPEG_DESC= Enable recording with FFmpeg
+CGNS_DESC= Enable CGNS file read/write support
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300014
-BROKEN= does not build with recent versions of FreeBSD
-.endif
+JPEG_CMAKE_BOOL= USE_JPEG
+JPEG_USES= jpeg
+MPEG_CMAKE_BOOL= USE_MPEG
+MPEG_LIB_DEPENDS= libavcodec.so:multimedia/libav
+CGNS_CMAKE_BOOL= USE_CGNS
+CGNS_LIB_DEPENDS= libcgns.so:science/cgnslib
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/netgen/distinfo b/cad/netgen/distinfo
index 46a65d44bc36..6e82a9e49be5 100644
--- a/cad/netgen/distinfo
+++ b/cad/netgen/distinfo
@@ -1,2 +1,7 @@
-SHA256 (netgen-5.3.1.tar.gz) = cb97f79d8f4d55c00506ab334867285cde10873c8a8dc783522b47d2bc128bf9
-SIZE (netgen-5.3.1.tar.gz) = 1857185
+TIMESTAMP = 1590458542
+SHA256 (NGSolve-netgen-v6.2.2004_GH0.tar.gz) = a41111470baf65090066df85957aea8afdcb568a18f1915946228f3918d91928
+SIZE (NGSolve-netgen-v6.2.2004_GH0.tar.gz) = 3245092
+SHA256 (NGSolve-netgen-v6.2.2004_GH0.tar.gz) = a41111470baf65090066df85957aea8afdcb568a18f1915946228f3918d91928
+SIZE (NGSolve-netgen-v6.2.2004_GH0.tar.gz) = 3245092
+SHA256 (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d
+SIZE (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 571127
diff --git a/cad/netgen/files/netgen_copy_include_for_salome b/cad/netgen/files/netgen_copy_include_for_salome
deleted file mode 100644
index f54ade782f06..000000000000
--- a/cad/netgen/files/netgen_copy_include_for_salome
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-src_dir=$1
-install_dir=$2
-
-if ! test -d $src_dir/libsrc ; then
- echo "No dir $src_dir/libsrc ... Bye"
- exit 1
-fi
-if ! test -d $install_dir/share/netgen ; then
- echo "No dir $install_dir/share/netgen ... Bye"
- exit 1
-fi
-
-dest_dir=$install_dir/share/netgen/include
-mkdir -p $dest_dir > /dev/null 2>&1
-cp -af $src_dir/libsrc/csg/*.hpp $dest_dir
-cp -af $src_dir/libsrc/general/*.hpp $dest_dir
-cp -af $src_dir/libsrc/geom2d/*.hpp $dest_dir
-cp -af $src_dir/libsrc/gprim/*.hpp $dest_dir
-cp -af $src_dir/libsrc/interface/*.hpp $dest_dir
-cp -af $src_dir/libsrc/linalg/*.hpp $dest_dir
-cp -af $src_dir/libsrc/meshing/*.hpp $dest_dir
-cp -af $src_dir/libsrc/stlgeom/*.hpp $dest_dir
-cp -af $src_dir/libsrc/visualization/*.hpp $dest_dir
-
-cp -af $src_dir/libsrc/occ/*.hpp $dest_dir
-cp -af $src_dir/libsrc/occ/*.hxx $dest_dir
-cp -af $src_dir/libsrc/occ/*.ixx $dest_dir
-cp -af $src_dir/libsrc/occ/*.jxx $dest_dir
-cp -af $src_dir/libsrc/occ/*.h $dest_dir
-
-cp -af $src_dir/libsrc/include/mystdlib.h $dest_dir
-cp -af $src_dir/libsrc/include/mydefs.hpp $dest_dir
-# cp -af $src_dir/libsrc/include/parallel.hpp $dest_dir
-
-rm -f $dest_dir/ngexception.hpp
-rm -f $dest_dir/paralleltop.hpp
-rm -f $dest_dir/soldata.hpp
diff --git a/cad/netgen/files/patch-configure b/cad/netgen/files/patch-configure
deleted file mode 100644
index eed74a6729eb..000000000000
--- a/cad/netgen/files/patch-configure
+++ /dev/null
@@ -1,155 +0,0 @@
---- configure.orig 2014-10-06 11:04:36 UTC
-+++ configure
-@@ -9219,7 +9219,7 @@ $as_echo_n "checking whether the $compiler linker ($LD
- hardcode_minus_L=no
- hardcode_shlibpath_var=unsupported
- inherit_rpath=no
-- link_all_deplibs=unknown
-+ link_all_deplibs=no
- module_cmds=
- module_expsym_cmds=
- old_archive_from_new_cmds=
-@@ -9488,7 +9488,7 @@ _LT_EOF
- wlarc=
- else
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- fi
- ;;
-
-@@ -9507,7 +9507,7 @@ _LT_EOF
- _LT_EOF
- elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- else
- ld_shlibs=no
- fi
-@@ -9536,7 +9536,7 @@ _LT_EOF
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- else
- ld_shlibs=no
- fi
-@@ -9554,7 +9554,7 @@ _LT_EOF
- *)
- if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- else
- ld_shlibs=no
- fi
-@@ -10142,7 +10142,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
- hardcode_direct_absolute=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-- archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+ archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver'
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- export_dynamic_flag_spec='${wl}-E'
- else
-@@ -10920,7 +10920,7 @@ freebsd* | dragonfly*)
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
- need_version=no
- need_lib_prefix=no
- ;;
-@@ -12015,7 +12015,7 @@ striplib=
- old_striplib=
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -12263,7 +12263,7 @@ hardcode_automatic_CXX=no
- inherit_rpath_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
--link_all_deplibs_CXX=unknown
-+link_all_deplibs_CXX=no
- old_archive_cmds_CXX=$old_archive_cmds
- reload_flag_CXX=$reload_flag
- reload_cmds_CXX=$reload_cmds
-@@ -12481,7 +12481,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
- # archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
-
- hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
- export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13100,7 +13100,7 @@ fi
- case `$CC -V 2>&1` in
- *"Version 7."*)
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- ;;
- *) # Version 8.0 or newer
- tmp_idyn=
-@@ -13108,7 +13108,7 @@ fi
- ia64*) tmp_idyn=' -i_dynamic';;
- esac
- archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib'
- ;;
- esac
- archive_cmds_need_lc_CXX=no
-@@ -13140,7 +13140,7 @@ fi
- ;;
- *) # Version 6 and above use weak symbols
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib'
- ;;
- esac
-
-@@ -13151,7 +13151,7 @@ fi
- cxx*)
- # Compaq C++
- archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver'
-
- runpath_var=LD_RUN_PATH
- hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13185,7 +13185,7 @@ fi
- # Sun C++ 5.9
- no_undefined_flag_CXX=' -zdefs'
- archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-- archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver'
- hardcode_libdir_flag_spec_CXX='-R$libdir'
- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- compiler_needs_object_CXX=yes
-@@ -13258,7 +13258,7 @@ fi
- archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-- archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+ archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib'
- export_dynamic_flag_spec_CXX='${wl}-E'
- whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
-@@ -14766,7 +14766,7 @@ freebsd* | dragonfly*)
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' soname_spec='$libname$release$shared_ext$major'
- need_version=no
- need_lib_prefix=no
- ;;
diff --git a/cad/netgen/files/patch-configure.ac b/cad/netgen/files/patch-configure.ac
deleted file mode 100644
index ddf5ddac5ffc..000000000000
--- a/cad/netgen/files/patch-configure.ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig 2019-11-24 01:01:36 UTC
-+++ configure.ac
-@@ -180,7 +180,7 @@ case "${TEA_WINDOWINGSYSTEM}" in
- ;;
- x11)
- AC_SUBST(TOGL_WINDOWINGSYSTEM,TOGL_X11)
-- TEA_ADD_LIBS([-lGL -lXmu -lX11])
-+ TEA_ADD_LIBS([-lGL -lXmu -lX11 -pthread])
- LIBGLU=-lGLU
- ;;
- win32)
diff --git a/cad/netgen/files/patch-libsrc_csg_Makefile.am b/cad/netgen/files/patch-libsrc_csg_Makefile.am
deleted file mode 100644
index 80f0b9b74e50..000000000000
--- a/cad/netgen/files/patch-libsrc_csg_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/csg/Makefile.am.orig 2014-08-29 09:54:06 UTC
-+++ libsrc/csg/Makefile.am
-@@ -5,7 +5,7 @@ polyhedra.hpp specpoin.hpp csg.hpp explicitcurve2d.hpp
- revolution.hpp spline3d.hpp vscsg.hpp
-
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
-
- lib_LTLIBRARIES = libcsg.la
diff --git a/cad/netgen/files/patch-libsrc_csg_Makefile.in b/cad/netgen/files/patch-libsrc_csg_Makefile.in
deleted file mode 100644
index d74c5b35226b..000000000000
--- a/cad/netgen/files/patch-libsrc_csg_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/csg/Makefile.in.orig 2014-10-06 11:04:37 UTC
-+++ libsrc/csg/Makefile.in
-@@ -285,7 +285,7 @@ meshsurf.hpp solid.hpp triapprox.hpp csgeom.hpp edgefl
- polyhedra.hpp specpoin.hpp csg.hpp explicitcurve2d.hpp identify.hpp \
- revolution.hpp spline3d.hpp vscsg.hpp
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
- lib_LTLIBRARIES = libcsg.la $(am__append_1)
- libcsg_la_SOURCES = algprim.cpp brick.cpp \
diff --git a/cad/netgen/files/patch-libsrc_geom2d_Makefile.am b/cad/netgen/files/patch-libsrc_geom2d_Makefile.am
deleted file mode 100644
index f8a00e76ffbc..000000000000
--- a/cad/netgen/files/patch-libsrc_geom2d_Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- libsrc/geom2d/Makefile.am.orig 2014-08-29 09:54:06 UTC
-+++ libsrc/geom2d/Makefile.am
-@@ -1,6 +1,6 @@
- noinst_HEADERS = geom2dmesh.hpp geometry2d.hpp vsgeom2d.hpp
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
-
- METASOURCES = AUTO
-
diff --git a/cad/netgen/files/patch-libsrc_geom2d_Makefile.in b/cad/netgen/files/patch-libsrc_geom2d_Makefile.in
deleted file mode 100644
index c177a1ad1ae5..000000000000
--- a/cad/netgen/files/patch-libsrc_geom2d_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/geom2d/Makefile.in.orig 2014-10-06 11:04:37 UTC
-+++ libsrc/geom2d/Makefile.in
-@@ -275,7 +275,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- noinst_HEADERS = geom2dmesh.hpp geometry2d.hpp vsgeom2d.hpp
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
- lib_LTLIBRARIES = libgeom2d.la $(am__append_1)
- libgeom2d_la_SOURCES = genmesh2d.cpp geom2dmesh.cpp geometry2d.cpp
diff --git a/cad/netgen/files/patch-libsrc_occ_Makefile.am b/cad/netgen/files/patch-libsrc_occ_Makefile.am
deleted file mode 100644
index 864a9f49879a..000000000000
--- a/cad/netgen/files/patch-libsrc_occ_Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
---- libsrc/occ/Makefile.am.orig 2014-08-29 09:54:03 UTC
-+++ libsrc/occ/Makefile.am
-@@ -1,5 +1,4 @@
--noinst_HEADERS = occgeom.hpp occmeshsurf.hpp \
--Partition_Inter2d.hxx Partition_Loop2d.hxx Partition_Loop.hxx \
-+noinst_HEADERS = Partition_Inter2d.hxx Partition_Loop2d.hxx Partition_Loop.hxx \
- Partition_Inter3d.hxx Partition_Loop3d.hxx Partition_Spliter.hxx \
- Partition_Inter2d.ixx Partition_Loop2d.ixx Partition_Loop.ixx \
- Partition_Inter3d.ixx Partition_Loop3d.ixx Partition_Spliter.ixx \
diff --git a/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx b/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx
deleted file mode 100644
index a18d236b26e4..000000000000
--- a/cad/netgen/files/patch-libsrc_occ_Partition__Loop2d.cxx
+++ /dev/null
@@ -1,13 +0,0 @@
---- libsrc/occ/Partition_Loop2d.cxx.orig 2014-08-29 09:54:03 UTC
-+++ libsrc/occ/Partition_Loop2d.cxx
-@@ -52,6 +52,10 @@
- #include <gp_Pnt.hxx>
- #include <gp_Pnt2d.hxx>
-
-+#ifndef PI
-+#define PI 3.14159265358979323846
-+#endif
-+
- //=======================================================================
- //function : Partition_Loop2d
- //purpose :
diff --git a/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am b/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am
deleted file mode 100644
index af05a41a166c..000000000000
--- a/cad/netgen/files/patch-libsrc_stlgeom_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/stlgeom/Makefile.am.orig 2016-04-21 10:58:05 UTC
-+++ libsrc/stlgeom/Makefile.am
-@@ -1,7 +1,7 @@
- noinst_HEADERS = meshstlsurface.hpp stlgeom.hpp stlline.hpp \
- stltool.hpp stltopology.hpp vsstl.hpp
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
-
- lib_LTLIBRARIES = libstl.la
diff --git a/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in b/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in
deleted file mode 100644
index 66649b85183d..000000000000
--- a/cad/netgen/files/patch-libsrc_stlgeom_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/stlgeom/Makefile.in.orig 2016-04-21 10:58:59 UTC
-+++ libsrc/stlgeom/Makefile.in
-@@ -278,7 +278,7 @@ top_srcdir = @top_srcdir@
- noinst_HEADERS = meshstlsurface.hpp stlgeom.hpp stlline.hpp \
- stltool.hpp stltopology.hpp vsstl.hpp
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
- lib_LTLIBRARIES = libstl.la $(am__append_1)
- libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \
diff --git a/cad/netgen/files/patch-libsrc_visualization_Makefile.am b/cad/netgen/files/patch-libsrc_visualization_Makefile.am
deleted file mode 100644
index 66b4a76a6189..000000000000
--- a/cad/netgen/files/patch-libsrc_visualization_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/visualization/Makefile.am.orig 2016-04-21 10:59:46 UTC
-+++ libsrc/visualization/Makefile.am
-@@ -3,7 +3,7 @@ visual.hpp vssolution.hpp
-
- include_HEADERS = soldata.hpp
-
--AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES)
-+AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
-
- if NGGUI
diff --git a/cad/netgen/files/patch-libsrc_visualization_Makefile.in b/cad/netgen/files/patch-libsrc_visualization_Makefile.in
deleted file mode 100644
index db9bfd5ead9c..000000000000
--- a/cad/netgen/files/patch-libsrc_visualization_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/visualization/Makefile.in.orig 2014-10-06 11:04:37 UTC
-+++ libsrc/visualization/Makefile.in
-@@ -275,7 +275,7 @@ noinst_HEADERS = meshdoc.hpp mvdraw.hpp vispar.hpp \
- visual.hpp vssolution.hpp
-
- include_HEADERS = soldata.hpp
--AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES)
-+AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(OCCFLAGS) $(TCL_INCLUDES) $(TK_INCLUDES)
- METASOURCES = AUTO
- @NGGUI_TRUE@noinst_LTLIBRARIES = libvisual.la
- libvisual_la_SOURCES = meshdoc.cpp mvdraw.cpp \
diff --git a/cad/netgen/files/patch-ng_Makefile.am b/cad/netgen/files/patch-ng_Makefile.am
deleted file mode 100644
index 83615716f1f9..000000000000
--- a/cad/netgen/files/patch-ng_Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
---- ng/Makefile.am.orig 2014-08-29 09:54:01 UTC
-+++ ng/Makefile.am
-@@ -1,6 +1,6 @@
- include_HEADERS =
-
--AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES)
-+AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include -I$(top_srcdir)/libsrc/interface -DOPENGL -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(TK_INCLUDES)
-
-
- if NGGUI
-@@ -22,7 +22,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/li
- $(top_builddir)/libsrc/csg/libcsg.la \
- $(top_builddir)/libsrc/interface/libinterface.la \
- $(top_builddir)/libsrc/meshing/libmesh.la \
-- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
-+ -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
-
-
- #
diff --git a/cad/netgen/files/patch-ng_Makefile.in b/cad/netgen/files/patch-ng_Makefile.in
deleted file mode 100644
index 408b46564cbc..000000000000
--- a/cad/netgen/files/patch-ng_Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- ng/Makefile.in.orig 2014-10-06 11:04:37 UTC
-+++ ng/Makefile.in
-@@ -303,7 +303,7 @@ include_HEADERS =
- AM_CPPFLAGS = -I$(top_srcdir)/libsrc/include \
- -I$(top_srcdir)/libsrc/interface -DOPENGL \
- -D$(TOGL_WINDOWINGSYSTEM) $(TCL_INCLUDES) $(MPI_INCLUDES) \
-- $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(am__append_1)
-+ $(FFMPEG_INCLUDES) $(JPEGLIB_INCLUDES) $(TK_INCLUDES) $(am__append_1)
- netgen_SOURCES = demoview.cpp ngappinit.cpp onetcl.cpp parallelfunc.cpp ngpkg.cpp demoview.hpp parallelfunc.hpp togl_1_7.h
- @NGMKL_TRUE@MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def
- # -lpardiso500-GNU472-X86-64 -lgfortran
-@@ -312,7 +312,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/li
- $(top_builddir)/libsrc/csg/libcsg.la \
- $(top_builddir)/libsrc/interface/libinterface.la \
- $(top_builddir)/libsrc/meshing/libmesh.la \
-- -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
-+ -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(MKL_LIBS)
-
-
- #
diff --git a/cad/netgen/files/patch-ng_drawing.tcl b/cad/netgen/files/patch-ng_drawing.tcl
deleted file mode 100644
index afead34a95d5..000000000000
--- a/cad/netgen/files/patch-ng_drawing.tcl
+++ /dev/null
@@ -1,11 +0,0 @@
---- ng/drawing.tcl.orig 2019-03-10 18:49:31 UTC
-+++ ng/drawing.tcl
-@@ -11,7 +11,7 @@ set oldmousey 0
- # use this one for Togl 2.0
- # if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true -create init -display draw -reshape reshape }] } {
-
--if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect true }] } { puts "no OpenGL"
-+if {[catch {togl .ndraw -width 400 -height 300 -rgba true -double true -depth true -privatecmap false -stereo false -indirect false }] } { puts "no OpenGL"
- } {
- #
- pack .ndraw -expand true -fill both -padx 10 -pady 10
diff --git a/cad/netgen/files/patch-ng_ngpkg.cpp b/cad/netgen/files/patch-ng_ngpkg.cpp
deleted file mode 100644
index dd7691083acd..000000000000
--- a/cad/netgen/files/patch-ng_ngpkg.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
---- ng/ngpkg.cpp.orig 2014-08-29 09:54:01 UTC
-+++ ng/ngpkg.cpp
-@@ -2266,7 +2266,7 @@ namespace netgen
- static int gopsize = DEFAULT_GOP_SIZE;
- static int bframes = DEFAULT_B_FRAMES;
- static int MPGbufsize = DEFAULT_MPG_BUFSIZE;
-- static CodecID codec_id = CODEC_ID_MPEG1VIDEO;
-+ static AVCodecID codec_id = AV_CODEC_ID_MPEG1VIDEO;
- static FILE *MPGfile;
- static buffer_t buff;
- static struct SwsContext *img_convert_ctx;
-@@ -2338,8 +2338,8 @@ namespace netgen
- context->time_base = s;
- context->gop_size = gopsize;
- context->max_b_frames = bframes;
-- context->pix_fmt = PIX_FMT_YUV420P;
-- context->flags |= CODEC_FLAG_PSNR;
-+ context->pix_fmt = AV_PIX_FMT_YUV420P;
-+ context->flags |= AV_CODEC_FLAG_PSNR;
-
- // if( avcodec_open( context, codec ) < 0 ) {
- if( avcodec_open2( context, codec, NULL) < 0 ) {
-@@ -2351,7 +2351,7 @@ namespace netgen
- return TCL_ERROR;
- }
-
-- YUVpicture = avcodec_alloc_frame();
-+ YUVpicture = av_frame_alloc();
-
- YUVpicture->data[0] = buff.YUV;
- YUVpicture->data[1] = buff.YUV + PIXsize;
-@@ -2360,7 +2360,7 @@ namespace netgen
- YUVpicture->linesize[1] = nx / 2;
- YUVpicture->linesize[2] = nx / 2;
-
-- RGBpicture = avcodec_alloc_frame();
-+ RGBpicture = av_frame_alloc();
-
- RGBpicture->data[0] = buff.RGB;
- RGBpicture->data[1] = buff.RGB;
-@@ -2405,8 +2405,8 @@ namespace netgen
- // Convert to YUV:
- //----------------
- if( img_convert_ctx == NULL )
-- img_convert_ctx = sws_getContext( nx, ny, PIX_FMT_RGB24,
-- nx, ny, PIX_FMT_YUV420P,
-+ img_convert_ctx = sws_getContext( nx, ny, AV_PIX_FMT_RGB24,
-+ nx, ny, AV_PIX_FMT_YUV420P,
- SWS_BICUBIC, NULL, NULL, NULL );
-
- if( img_convert_ctx == NULL ) {
-@@ -2420,8 +2420,15 @@ namespace netgen
-
- // Encode frame:
- //--------------
-- bytes = avcodec_encode_video( context, buff.MPG,
-- MPGbufsize, YUVpicture );
-+ AVPacket pkt;
-+ av_init_packet( &pkt );
-+ pkt.data = buff.MPG;
-+ pkt.size = MPGbufsize;
-+
-+ int got_packet = 0;
-+ int ret = avcodec_encode_video2( context, &pkt, YUVpicture,
-+ &got_packet );
-+ bytes = ret ? ret : pkt.size;
- count_frames++;
- print_info( count_frames, context, bytes );
- fwrite( buff.MPG, 1, bytes, MPGfile );
-@@ -2442,8 +2449,15 @@ namespace netgen
-
- // Get the delayed frames, if any:
- //--------------------------------
-+ AVPacket pkt;
-+ av_init_packet( &pkt );
-+ pkt.data = buff.MPG;
-+ pkt.size = MPGbufsize;
-+
-+ int got_packet = 0;
- for( ; bytes; ) {
-- bytes = avcodec_encode_video( context, buff.MPG, MPGbufsize, NULL );
-+ int ret = avcodec_encode_video2( context, &pkt, NULL, &got_packet );
-+ bytes = ret ? ret : pkt.size;
- count_frames++;
- print_info( count_frames, context, bytes );
- fwrite( buff.MPG, 1, bytes, MPGfile );
-@@ -2451,7 +2465,7 @@ namespace netgen
-
- // Add sequence end code:
- //-----------------------
-- if( codec_id == CODEC_ID_MPEG1VIDEO ) {
-+ if( codec_id == AV_CODEC_ID_MPEG1VIDEO ) {
- buff.MPG[0] = 0x00;
- buff.MPG[1] = 0x00;
- buff.MPG[2] = 0x01;
diff --git a/cad/netgen/files/patch-nglib_Makefile.in b/cad/netgen/files/patch-nglib_Makefile.in
deleted file mode 100644
index 5c88a3d70bd0..000000000000
--- a/cad/netgen/files/patch-nglib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- nglib/Makefile.in.orig 2014-10-06 11:04:37 UTC
-+++ nglib/Makefile.in
-@@ -129,7 +129,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-- $(LDFLAGS) -o $@
-+ $(LDFLAGS) -o $@ -pthread
- SOURCES = $(libnglib_la_SOURCES) $(ng_stl_SOURCES) $(ng_vol_SOURCES)
- DIST_SOURCES = $(libnglib_la_SOURCES) $(ng_stl_SOURCES) \
- $(ng_vol_SOURCES)
diff --git a/cad/netgen/files/pkg-message.in b/cad/netgen/files/pkg-message.in
deleted file mode 100644
index a028ebe47d75..000000000000
--- a/cad/netgen/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
- message: <<EOM
- If you installed netgen to nondefault prefix,
- make sure that you set the environment variable:
-
- NETGENDIR=%%PREFIX%%/bin
-EOM
-}
-]
diff --git a/cad/netgen/pkg-plist b/cad/netgen/pkg-plist
index 56464c3d7899..d24eb87568a8 100644
--- a/cad/netgen/pkg-plist
+++ b/cad/netgen/pkg-plist
@@ -1,63 +1,235 @@
-bin/acisgeom.tcl
-bin/csgeom.tcl
-bin/dialog.tcl
-bin/drawing.tcl
-bin/menustat.tcl
bin/netgen
-bin/netgen.ocf
-bin/ng.tcl
-bin/ng_stl
-bin/ng_vol
-bin/nghelp.tcl
-bin/ngicon.tcl
-bin/ngshell.tcl
-bin/ngtesting.tcl
-bin/ngvisual.tcl
-bin/occgeom.tcl
-bin/parameters.tcl
-bin/sockets.tcl
-bin/stlgeom.tcl
-bin/variables.tcl
-include/ngexception.hpp
+include/core/archive.hpp
+include/core/array.hpp
+include/core/bitarray.hpp
+include/core/concurrentqueue.h
+include/core/exception.hpp
+include/core/flags.hpp
+include/core/hashtable.hpp
+include/core/localheap.hpp
+include/core/logging.hpp
+include/core/mpi_wrapper.hpp
+include/core/ngcore.hpp
+include/core/ngcore_api.hpp
+include/core/paje_trace.hpp
+include/core/profiler.hpp
+include/core/python_ngcore.hpp
+include/core/signal.hpp
+include/core/symboltable.hpp
+include/core/table.hpp
+include/core/taskmanager.hpp
+include/core/type_traits.hpp
+include/core/utils.hpp
+include/core/version.hpp
+include/core/xbool.hpp
+include/csg/algprim.hpp
+include/csg/brick.hpp
+include/csg/csg.hpp
+include/csg/csgeom.hpp
+include/csg/csgparser.hpp
+include/csg/curve2d.hpp
+include/csg/edgeflw.hpp
+include/csg/explicitcurve2d.hpp
+include/csg/extrusion.hpp
+include/csg/gencyl.hpp
+include/csg/geoml.hpp
+include/csg/identify.hpp
+include/csg/manifold.hpp
+include/csg/meshsurf.hpp
+include/csg/polyhedra.hpp
+include/csg/revolution.hpp
+include/csg/singularref.hpp
+include/csg/solid.hpp
+include/csg/specpoin.hpp
+include/csg/spline3d.hpp
+include/csg/splinesurface.hpp
+include/csg/surface.hpp
+include/csg/triapprox.hpp
+include/csg/vscsg.hpp
+include/general/autodiff.hpp
+include/general/autoptr.hpp
+include/general/dynamicmem.hpp
+include/general/gzstream.h
+include/general/hashtabl.hpp
+include/general/mpi_interface.hpp
+include/general/myadt.hpp
+include/general/mystring.hpp
+include/general/netgenout.hpp
+include/general/ngarray.hpp
+include/general/ngbitarray.hpp
+include/general/ngpython.hpp
+include/general/ngsimd.hpp
+include/general/optmem.hpp
+include/general/parthreads.hpp
+include/general/seti.hpp
+include/general/sort.hpp
+include/general/spbita2d.hpp
+include/general/stack.hpp
+include/general/table.hpp
+include/general/template.hpp
+include/geom2d/geometry2d.hpp
+include/geom2d/spline2d.hpp
+include/geom2d/vsgeom2d.hpp
+include/gprim/adtree.hpp
+include/gprim/geom2d.hpp
+include/gprim/geom3d.hpp
+include/gprim/geomfuncs.hpp
+include/gprim/geomobjects.hpp
+include/gprim/geomops.hpp
+include/gprim/geomops2.hpp
+include/gprim/geomtest3d.hpp
+include/gprim/gprim.hpp
+include/gprim/spline.hpp
+include/gprim/splinegeometry.hpp
+include/gprim/transform3d.hpp
+include/include/acisgeom.hpp
+include/include/csg.hpp
+include/include/geometry2d.hpp
+include/include/gprim.hpp
+include/include/incopengl.hpp
+include/include/inctcl.hpp
+include/include/incvis.hpp
+include/include/linalg.hpp
+include/include/meshing.hpp
+include/include/myadt.hpp
+include/include/mydefs.hpp
+include/include/mystdlib.h
+include/include/nginterface_v2_impl.hpp
+include/include/ngsimd.hpp
+include/include/occgeom.hpp
+include/include/opti.hpp
+include/include/parallel.hpp
+include/include/stlgeom.hpp
+include/include/visual.hpp
+include/interface/writeuser.hpp
+include/linalg/densemat.hpp
+include/linalg/linalg.hpp
+include/linalg/opti.hpp
+include/linalg/polynomial.hpp
+include/linalg/vector.hpp
+include/meshing/adfront2.hpp
+include/meshing/adfront3.hpp
+include/meshing/basegeom.hpp
+include/meshing/bcfunctions.hpp
+include/meshing/bisect.hpp
+include/meshing/boundarylayer.hpp
+include/meshing/classifyhpel.hpp
+include/meshing/clusters.hpp
+include/meshing/curvedelems.hpp
+include/meshing/findip.hpp
+include/meshing/findip2.hpp
+include/meshing/geomsearch.hpp
+include/meshing/global.hpp
+include/meshing/hpref_hex.hpp
+include/meshing/hpref_prism.hpp
+include/meshing/hpref_pyramid.hpp
+include/meshing/hpref_quad.hpp
+include/meshing/hpref_segm.hpp
+include/meshing/hpref_tet.hpp
+include/meshing/hpref_trig.hpp
+include/meshing/hprefinement.hpp
+include/meshing/improve2.hpp
+include/meshing/improve3.hpp
+include/meshing/localh.hpp
+include/meshing/meshclass.hpp
+include/meshing/meshfunc.hpp
+include/meshing/meshing.hpp
+include/meshing/meshing2.hpp
+include/meshing/meshing3.hpp
+include/meshing/meshtool.hpp
+include/meshing/meshtype.hpp
+include/meshing/msghandler.hpp
+include/meshing/paralleltop.hpp
+include/meshing/python_mesh.hpp
+include/meshing/ruler2.hpp
+include/meshing/ruler3.hpp
+include/meshing/specials.hpp
+include/meshing/topology.hpp
+include/meshing/validate.hpp
+include/mydefs.hpp
include/nginterface.h
include/nginterface_v2.hpp
include/nglib.h
+include/occ/occgeom.hpp
+include/occ/occmeshsurf.hpp
+include/occ/vsocc.hpp
+include/pybind11/LICENSE
+include/pybind11/attr.h
+include/pybind11/buffer_info.h
+include/pybind11/cast.h
+include/pybind11/chrono.h
+include/pybind11/common.h
+include/pybind11/complex.h
+include/pybind11/detail/class.h
+include/pybind11/detail/common.h
+include/pybind11/detail/descr.h
+include/pybind11/detail/init.h
+include/pybind11/detail/internals.h
+include/pybind11/detail/typeid.h
+include/pybind11/eigen.h
+include/pybind11/embed.h
+include/pybind11/eval.h
+include/pybind11/functional.h
+include/pybind11/iostream.h
+include/pybind11/numpy.h
+include/pybind11/operators.h
+include/pybind11/options.h
+include/pybind11/pybind11.h
+include/pybind11/pytypes.h
+include/pybind11/stl.h
+include/pybind11/stl_bind.h
include/soldata.hpp
+include/stlgeom/meshstlsurface.hpp
+include/stlgeom/stlgeom.hpp
+include/stlgeom/stlline.hpp
+include/stlgeom/stltool.hpp
+include/stlgeom/stltopology.hpp
+include/stlgeom/vsstl.hpp
+include/visualization/meshdoc.hpp
+include/visualization/mvdraw.hpp
+include/visualization/vispar.hpp
+include/visualization/visual.hpp
+include/visualization/vssolution.hpp
+lib/cmake/netgen/NetgenConfig.cmake
+lib/cmake/netgen/netgen-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/netgen/netgen-targets.cmake
lib/libcsg.so
-lib/libcsg.so.0.0.0
lib/libcsgvis.so
-lib/libcsgvis.so.0.0.0
lib/libgeom2d.so
-lib/libgeom2d.so.0.0.0
lib/libgeom2dvis.so
-lib/libgeom2dvis.so.0.0.0
+lib/libgui.so
lib/libinterface.so
-lib/libinterface.so.0.0.0
lib/libmesh.so
-lib/libmesh.so.0.0.0
+lib/libngcore.so
+lib/libnglib.so
lib/libocc.so
-lib/libocc.so.0.0.0
lib/liboccvis.so
-lib/liboccvis.so.0.0.0
-lib/libnglib.so
-lib/libnglib.so.1
lib/libstl.so
-lib/libstl.so.0.0.0
lib/libstlvis.so
-lib/libstlvis.so.0.0.0
-%%DOCSDIR%%/ng4.pdf
-%%DATADIR%%/boxcyl.geo
+lib/libvisual.so
+%%PYTHON_SITELIBDIR%%/netgen/NgOCC.py
+%%PYTHON_SITELIBDIR%%/netgen/__init__.py
+%%PYTHON_SITELIBDIR%%/netgen/csg.py
+%%PYTHON_SITELIBDIR%%/netgen/geom2d.py
+%%PYTHON_SITELIBDIR%%/netgen/gui.py
+%%PYTHON_SITELIBDIR%%/netgen/libngpy.so
+%%PYTHON_SITELIBDIR%%/netgen/meshing.py
+%%PYTHON_SITELIBDIR%%/netgen/occ.py
+%%PYTHON_SITELIBDIR%%/netgen/read_gmsh.py
+%%PYTHON_SITELIBDIR%%/netgen/stl.py
+%%PYTHON_SITELIBDIR%%/pyngcore.so
%%DATADIR%%/boundarycondition.geo
+%%DATADIR%%/boxcyl.geo
%%DATADIR%%/circle_on_cube.geo
%%DATADIR%%/cone.geo
%%DATADIR%%/cube.geo
-%%DATADIR%%/cube.surf
%%DATADIR%%/cubeandring.geo
%%DATADIR%%/cubeandspheres.geo
%%DATADIR%%/cubemcyl.geo
%%DATADIR%%/cubemsphere.geo
%%DATADIR%%/cylinder.geo
%%DATADIR%%/cylsphere.geo
+%%DATADIR%%/doc/ng4.pdf
%%DATADIR%%/ellipsoid.geo
%%DATADIR%%/ellipticcyl.geo
%%DATADIR%%/extrusion.geo
@@ -71,6 +243,9 @@ lib/libstlvis.so.0.0.0
%%DATADIR%%/ortho.geo
%%DATADIR%%/part1.stl
%%DATADIR%%/period.geo
+%%DATADIR%%/py_tutorials/exportNeutral.py
+%%DATADIR%%/py_tutorials/mesh.py
+%%DATADIR%%/py_tutorials/shaft.geo
%%DATADIR%%/revolution.geo
%%DATADIR%%/screw.step
%%DATADIR%%/sculpture.geo
@@ -86,142 +261,3 @@ lib/libstlvis.so.0.0.0
%%DATADIR%%/twobricks.geo
%%DATADIR%%/twocubes.geo
%%DATADIR%%/twocyl.geo
-%%DATADIR%%/include/Partition_Inter2d.hxx
-%%DATADIR%%/include/Partition_Inter2d.ixx
-%%DATADIR%%/include/Partition_Inter2d.jxx
-%%DATADIR%%/include/Partition_Inter3d.hxx
-%%DATADIR%%/include/Partition_Inter3d.ixx
-%%DATADIR%%/include/Partition_Inter3d.jxx
-%%DATADIR%%/include/Partition_Loop.hxx
-%%DATADIR%%/include/Partition_Loop.ixx
-%%DATADIR%%/include/Partition_Loop.jxx
-%%DATADIR%%/include/Partition_Loop2d.hxx
-%%DATADIR%%/include/Partition_Loop2d.ixx
-%%DATADIR%%/include/Partition_Loop2d.jxx
-%%DATADIR%%/include/Partition_Loop3d.hxx
-%%DATADIR%%/include/Partition_Loop3d.ixx
-%%DATADIR%%/include/Partition_Loop3d.jxx
-%%DATADIR%%/include/Partition_Spliter.hxx
-%%DATADIR%%/include/Partition_Spliter.ixx
-%%DATADIR%%/include/Partition_Spliter.jxx
-%%DATADIR%%/include/adfront2.hpp
-%%DATADIR%%/include/adfront3.hpp
-%%DATADIR%%/include/adtree.hpp
-%%DATADIR%%/include/algprim.hpp
-%%DATADIR%%/include/archive_base.hpp
-%%DATADIR%%/include/array.hpp
-%%DATADIR%%/include/autodiff.hpp
-%%DATADIR%%/include/autoptr.hpp
-%%DATADIR%%/include/basegeom.hpp
-%%DATADIR%%/include/bcfunctions.hpp
-%%DATADIR%%/include/bisect.hpp
-%%DATADIR%%/include/bitarray.hpp
-%%DATADIR%%/include/boundarylayer.hpp
-%%DATADIR%%/include/brick.hpp
-%%DATADIR%%/include/classifyhpel.hpp
-%%DATADIR%%/include/clusters.hpp
-%%DATADIR%%/include/csg.hpp
-%%DATADIR%%/include/csgeom.hpp
-%%DATADIR%%/include/csgparser.hpp
-%%DATADIR%%/include/curve2d.hpp
-%%DATADIR%%/include/curvedelems.hpp
-%%DATADIR%%/include/densemat.hpp
-%%DATADIR%%/include/dynamicmem.hpp
-%%DATADIR%%/include/edgeflw.hpp
-%%DATADIR%%/include/explicitcurve2d.hpp
-%%DATADIR%%/include/extrusion.hpp
-%%DATADIR%%/include/findip.hpp
-%%DATADIR%%/include/findip2.hpp
-%%DATADIR%%/include/flags.hpp
-%%DATADIR%%/include/gencyl.hpp
-%%DATADIR%%/include/geom2d.hpp
-%%DATADIR%%/include/geom2dmesh.hpp
-%%DATADIR%%/include/geom3d.hpp
-%%DATADIR%%/include/geometry2d.hpp
-%%DATADIR%%/include/geomfuncs.hpp
-%%DATADIR%%/include/geoml.hpp
-%%DATADIR%%/include/geomobjects.hpp
-%%DATADIR%%/include/geomobjects2.hpp
-%%DATADIR%%/include/geomops.hpp
-%%DATADIR%%/include/geomops2.hpp
-%%DATADIR%%/include/geomsearch.hpp
-%%DATADIR%%/include/geomtest3d.hpp
-%%DATADIR%%/include/global.hpp
-%%DATADIR%%/include/gprim.hpp
-%%DATADIR%%/include/hashtabl.hpp
-%%DATADIR%%/include/hpref_hex.hpp
-%%DATADIR%%/include/hpref_prism.hpp
-%%DATADIR%%/include/hpref_pyramid.hpp
-%%DATADIR%%/include/hpref_quad.hpp
-%%DATADIR%%/include/hpref_segm.hpp
-%%DATADIR%%/include/hpref_tet.hpp
-%%DATADIR%%/include/hpref_trig.hpp
-%%DATADIR%%/include/hprefinement.hpp
-%%DATADIR%%/include/identify.hpp
-%%DATADIR%%/include/improve2.hpp
-%%DATADIR%%/include/improve3.hpp
-%%DATADIR%%/include/linalg.hpp
-%%DATADIR%%/include/localh.hpp
-%%DATADIR%%/include/manifold.hpp
-%%DATADIR%%/include/meshclass.hpp
-%%DATADIR%%/include/meshdoc.hpp
-%%DATADIR%%/include/meshfunc.hpp
-%%DATADIR%%/include/meshing.hpp
-%%DATADIR%%/include/meshing2.hpp
-%%DATADIR%%/include/meshing3.hpp
-%%DATADIR%%/include/meshstlsurface.hpp
-%%DATADIR%%/include/meshsurf.hpp
-%%DATADIR%%/include/meshtool.hpp
-%%DATADIR%%/include/meshtype.hpp
-%%DATADIR%%/include/mpi_interface.hpp
-%%DATADIR%%/include/msghandler.hpp
-%%DATADIR%%/include/mvdraw.hpp
-%%DATADIR%%/include/myadt.hpp
-%%DATADIR%%/include/mydefs.hpp
-%%DATADIR%%/include/mystdlib.h
-%%DATADIR%%/include/mystring.hpp
-%%DATADIR%%/include/netgenout.hpp
-%%DATADIR%%/include/occgeom.hpp
-%%DATADIR%%/include/occmeshsurf.hpp
-%%DATADIR%%/include/opti.hpp
-%%DATADIR%%/include/optmem.hpp
-%%DATADIR%%/include/parthreads.hpp
-%%DATADIR%%/include/polyhedra.hpp
-%%DATADIR%%/include/polynomial.hpp
-%%DATADIR%%/include/profiler.hpp
-%%DATADIR%%/include/revolution.hpp
-%%DATADIR%%/include/ruler2.hpp
-%%DATADIR%%/include/ruler3.hpp
-%%DATADIR%%/include/seti.hpp
-%%DATADIR%%/include/singularref.hpp
-%%DATADIR%%/include/solid.hpp
-%%DATADIR%%/include/sort.hpp
-%%DATADIR%%/include/spbita2d.hpp
-%%DATADIR%%/include/specials.hpp
-%%DATADIR%%/include/specpoin.hpp
-%%DATADIR%%/include/spline.hpp
-%%DATADIR%%/include/spline3d.hpp
-%%DATADIR%%/include/splinegeometry.hpp
-%%DATADIR%%/include/stack.hpp
-%%DATADIR%%/include/stlgeom.hpp
-%%DATADIR%%/include/stlline.hpp
-%%DATADIR%%/include/stltool.hpp
-%%DATADIR%%/include/stltopology.hpp
-%%DATADIR%%/include/surface.hpp
-%%DATADIR%%/include/symbolta.hpp
-%%DATADIR%%/include/table.hpp
-%%DATADIR%%/include/template.hpp
-%%DATADIR%%/include/topology.hpp
-%%DATADIR%%/include/transform3d.hpp
-%%DATADIR%%/include/triapprox.hpp
-%%DATADIR%%/include/utilities.h
-%%DATADIR%%/include/validate.hpp
-%%DATADIR%%/include/vector.hpp
-%%DATADIR%%/include/vispar.hpp
-%%DATADIR%%/include/visual.hpp
-%%DATADIR%%/include/vscsg.hpp
-%%DATADIR%%/include/vsgeom2d.hpp
-%%DATADIR%%/include/vsocc.hpp
-%%DATADIR%%/include/vssolution.hpp
-%%DATADIR%%/include/vsstl.hpp
-%%DATADIR%%/include/writeuser.hpp