aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Borm (boroli) <oli.borm@web.de>2009-10-01 21:21:27 +0200
committerOliver Borm (boroli) <oli.borm@web.de>2009-10-01 21:21:27 +0200
commitdcebc99992933e446be4483ce9c30565a6e949e9 (patch)
tree05a820c63504fb8818e3c571dd1299fe120c6422
parentsci-mathematics/netgen: Changed opencascade path to /opt/opencascade-6.3/ros ... (diff)
downloadsci-dcebc99992933e446be4483ce9c30565a6e949e9.tar.gz
sci-dcebc99992933e446be4483ce9c30565a6e949e9.tar.bz2
sci-dcebc99992933e446be4483ce9c30565a6e949e9.zip
sci-mathematics/netgen: fixed libTogl location as it changed; removed old 4.4er patches
-rw-r--r--sci-mathematics/netgen/files/debian-netgen_4.4-7.patch302
-rw-r--r--sci-mathematics/netgen/files/densemat.patch12
-rw-r--r--sci-mathematics/netgen/files/meshtype.patch11
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-datadir.patch22
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-declarations.patch167
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-makefiles.patch390
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-order.patch22
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-stdlib.patch115
-rw-r--r--sci-mathematics/netgen/files/netgen-4.4-tkversion.patch20
-rw-r--r--sci-mathematics/netgen/files/togl_tk.patch53
-rw-r--r--sci-mathematics/netgen/netgen-4.9.11-r1.ebuild (renamed from sci-mathematics/netgen/netgen-4.9.11.ebuild)0
11 files changed, 0 insertions, 1114 deletions
diff --git a/sci-mathematics/netgen/files/debian-netgen_4.4-7.patch b/sci-mathematics/netgen/files/debian-netgen_4.4-7.patch
deleted file mode 100644
index 1238ce0aa..000000000
--- a/sci-mathematics/netgen/files/debian-netgen_4.4-7.patch
+++ /dev/null
@@ -1,302 +0,0 @@
---- ./ngsolve/basiclinalg/calcinverse.cpp
-+++ ./ngsolve/basiclinalg/calcinverse.cpp
-@@ -9,7 +9,7 @@
- {
- double sum = 0;
- for (int i = 0; i < N; i++)
-- sum += abs(m(i,i));
-+ sum += std::abs(m(i,i));
- return sum;
- }
- inline double abs (double a)
---- ./ng.tcl
-+++ ./ng.tcl
-@@ -7,7 +7,7 @@
-
- set progname "NETGEN"
-
--set ngdir ""
-+set ngdir "/usr/share/netgen"
- if { [lsearch [array names env] NETGENDIR] != -1 } {
- set ngdir $env(NETGENDIR)
- }
---- ./togl/LICENSE.togl
-+++ ./togl/LICENSE.togl
-@@ -0,0 +1,27 @@
-+This software is copyrighted by Brian Paul (brian@mesa3d.org)
-+and Benjamin Bederson (bederson@cs.umd.edu). The following
-+terms apply to all files associated with the software unless explicitly
-+disclaimed in individual files.
-+
-+The authors hereby grant permission to use, copy, modify, distribute,
-+and license this software and its documentation for any purpose, provided
-+that existing copyright notices are retained in all copies and that this
-+notice is included verbatim in any distributions. No written agreement,
-+license, or royalty fee is required for any of the authorized uses.
-+Modifications to this software may be copyrighted by their authors
-+and need not follow the licensing terms described here, provided that
-+the new terms are clearly indicated on the first page of each file where
-+they apply.
-+
-+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-+
-+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
-+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-+MODIFICATIONS.
---- ./togl/license.terms
-+++ ./togl/license.terms
-@@ -0,0 +1,39 @@
-+This software is copyrighted by the Regents of the University of
-+California, Sun Microsystems, Inc., Scriptics Corporation,
-+and other parties. The following terms apply to all files associated
-+with the software unless explicitly disclaimed in individual files.
-+
-+The authors hereby grant permission to use, copy, modify, distribute,
-+and license this software and its documentation for any purpose, provided
-+that existing copyright notices are retained in all copies and that this
-+notice is included verbatim in any distributions. No written agreement,
-+license, or royalty fee is required for any of the authorized uses.
-+Modifications to this software may be copyrighted by their authors
-+and need not follow the licensing terms described here, provided that
-+the new terms are clearly indicated on the first page of each file where
-+they apply.
-+
-+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGE.
-+
-+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
-+IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-+NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-+MODIFICATIONS.
-+
-+GOVERNMENT USE: If you are acquiring this software on behalf of the
-+U.S. government, the Government shall have only "Restricted Rights"
-+in the software and related documentation as defined in the Federal
-+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
-+are acquiring the software on behalf of the Department of Defense, the
-+software shall be classified as "Commercial Computer Software" and the
-+Government shall have only "Restricted Rights" as defined in Clause
-+252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
-+authors grant the U.S. Government and others acting in its behalf
-+permission to use and distribute the software in accordance with the
-+terms specified in this license.
---- ./ngtcltk/ngappinit.cpp
-+++ ./ngtcltk/ngappinit.cpp
-@@ -77,7 +77,7 @@
- if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR")))
- ngdir = getenv ("NETGENDIR");
- else
-- ngdir = ".";
-+ ngdir = "/usr/share/netgen";
-
- verbose = parameters.GetDefineFlag ("V");
-
---- ./ngtcltk/nghelp.tcl
-+++ ./ngtcltk/nghelp.tcl
-@@ -1,6 +1,6 @@
- proc print_commandline_help { } {
-
-- puts "Usage: ng { options }"
-+ puts "Usage: netgen { options }"
-
- puts "-geofile=filename Input geometry file (alternative: ng filename)"
- puts "-meshfile=filename Output mesh file"
---- ./ngsolve/comp/postproc.cpp
-+++ ./ngsolve/comp/postproc.cpp
-@@ -9,6 +9,7 @@
- */
-
- #include <comp.hpp>
-+#include <fem.hpp>
-
- namespace ngcomp
- {
-@@ -274,8 +275,8 @@
- if (dimflux > 1)
- {
- FlatMatrix<SCAL> elmat(dnumsflux.Size(), lh);
-- dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli)
-- . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh);
-+ BlockBilinearFormIntegrator const& fluxbli_ref = dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli);
-+ fluxbli_ref . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh);
- CholeskyFactors<SCAL> invelmat(elmat);
-
- FlatVector<SCAL> hv1(dnumsflux.Size(), lh);
---- ./ngsolve/linalg/order.cpp
-+++ ./ngsolve/linalg/order.cpp
-@@ -54,7 +54,7 @@
- return ball.Alloc();
- }
-
-- void CliqueEl :: operator delete (void * p, size_t)
-+ void CliqueEl :: operator delete (void * p)
- {
- ball.Free (p);
- }
---- ./ngsolve/linalg/order.hpp
-+++ ./ngsolve/linalg/order.hpp
-@@ -118,7 +118,7 @@
- ///
- void * operator new(size_t);
- ///
-- void operator delete (void *, size_t);
-+ void operator delete (void *);
- };
-
-
---- ./ngsolve/basiclinalg/expr3.hpp
-+++ ./ngsolve/basiclinalg/expr3.hpp
-@@ -851,6 +851,16 @@
- /**
- Inner product
- */
-+inline double InnerProduct ( const double& a, const double& b )
-+{
-+ return a * b;
-+}
-+
-+inline Complex InnerProduct ( const Complex& a, const Complex b)
-+{
-+ return a * b;
-+}
-+
- template <class TA, class TB>
- inline typename TA::TSCAL
- InnerProduct (const MatExpr<TA> & a, const MatExpr<TB> & b)
-@@ -862,15 +872,6 @@
- return sum;
- }
-
--inline double InnerProduct (double a, double b)
--{
-- return a * b;
--}
--
--inline Complex InnerProduct (Complex a, Complex b)
--{
-- return a * b;
--}
-
-
- /* **************************** Trace **************************** */
-@@ -889,6 +890,16 @@
- /* **************************** L2Norm **************************** */
-
- /// Euklidean norm squared
-+inline double L2Norm2 (const double& v)
-+{
-+ return v*v;
-+}
-+
-+inline double L2Norm2 (Complex v)
-+{
-+ return v.real()*v.real()+v.imag()*v.imag();
-+}
-+
- template <class TA>
- inline double L2Norm2 (const MatExpr<TA> & v)
- {
-@@ -899,17 +910,6 @@
- return sum;
- }
-
--
--inline double L2Norm2 (double v)
--{
-- return v*v;
--}
--
--inline double L2Norm2 (Complex v)
--{
-- return v.real()*v.real()+v.imag()*v.imag();
--}
--
- template <class TA>
- inline double L2Norm (const MatExpr<TA> & v)
- {
---- ./Makefile
-+++ ./Makefile
-@@ -29,7 +29,7 @@
- # tcltklib = -ltix8.2 -ltk8.4 -ltcl8.4
- #
- #
--syslib = $(tcltklib) -lGL -lGLU -lX11 -lXi -lm -ldl -lpthread $(SYSLIB2)
-+syslib = $(tcltklib) -lGL -lGLU -lX11 -lm -ldl -lpthread $(SYSLIB2)
- # (maybe you have to remove -ldl)
- #
- #
-@@ -49,6 +49,7 @@
-
- # add libs in makefile.mach.$(MACHINE)
- # occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL
-+occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool -lXxf86vm
- #
- include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
- #
-@@ -117,7 +120,7 @@
- #
- .PHONY : clean
- clean:
-- -@rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o
-+ -rm *.o ngtcltk/*.o togl/*.o lib/$(MACHINE)/lib*.a lib/$(MACHINE)/*.o ng
- #
- #
- .PHONY : cleanapp
---- ./libsrc/makefile.mach.LINUX
-+++ ./libsrc/makefile.mach.LINUX
-@@ -16,12 +16,18 @@
- #
- CFLAGS2 =
-
--CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \
-- -ftemplate-depth-99 -finline-limit=20000 \
-+CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL -I/usr/include/tcl8.4 -I/usr/include/tk8.4 -I/usr/X11R6/include \
-+ -DLINUX -DOPENGL \
-+ -finline-limit=20000 \
- -funroll-loops -DNGSOLVE
-
- LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++
-
-+OCC_DIR=/opt/OpenCASCADE5.2
-+OCCINC_DIR=$(OCC_DIR)/ros/inc
-+OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib
-+CPLUSPLUSFLAGS2 += -DOCCGEOMETRY -DOCC52 -DUSE_STL_STREAM -DHAVE_IOSTREAM -DHAVE_LIMITS -I$(OCCINC_DIR)
-+LINKFLAGS2 += -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool
-
- goalngs=goalngs
-
---- ./libsrc/visualization/mvdraw.hpp
-+++ ./libsrc/visualization/mvdraw.hpp
-@@ -250,6 +250,7 @@
- int seltria;
- };
-
-+extern VisualSceneSTLMeshing vsstlmeshing;
-
-
-
---- ./libsrc/visualization/stlmeshing.cpp
-+++ ./libsrc/visualization/stlmeshing.cpp
-@@ -1062,9 +1062,9 @@
- }
-
-
-+VisualSceneSTLMeshing vsstlmeshing;
-
-
--VisualSceneSTLMeshing vsstlmeshing;
-
- #endif
-
diff --git a/sci-mathematics/netgen/files/densemat.patch b/sci-mathematics/netgen/files/densemat.patch
deleted file mode 100644
index 8cf10015c..000000000
--- a/sci-mathematics/netgen/files/densemat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libsrc/linalg/densemat.hpp~ 2006-04-07 22:07:41.000000000 +0000
-+++ ./libsrc/linalg/densemat.hpp 2006-04-07 22:08:04.000000000 +0000
-@@ -14,6 +14,9 @@
-
- #include <assert.h>
-
-+class DenseMatrix;
-+void CalcInverse (const DenseMatrix & m1, DenseMatrix & m2);
-+
- class DenseMatrix
- {
- protected:
diff --git a/sci-mathematics/netgen/files/meshtype.patch b/sci-mathematics/netgen/files/meshtype.patch
deleted file mode 100644
index 2157b02a2..000000000
--- a/sci-mathematics/netgen/files/meshtype.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsrc/meshing/meshtype.hpp.org 2004-11-07 17:12:10.000000000 +0100
-+++ libsrc/meshing/meshtype.hpp 2006-10-13 22:18:00.000000000 +0200
-@@ -954,7 +954,7 @@
-
-
-
--
-+class Mesh;
-
- /**
- Identification of periodic surfaces, close surfaces, etc.
diff --git a/sci-mathematics/netgen/files/netgen-4.4-datadir.patch b/sci-mathematics/netgen/files/netgen-4.4-datadir.patch
deleted file mode 100644
index ecfdf776f..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-datadir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ng.tcl.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ng.tcl 2008-05-09 08:50:56.000000000 +0100
-@@ -7,7 +7,7 @@
-
- set progname "NETGEN"
-
--set ngdir ""
-+set ngdir "/usr/share/netgen"
- if { [lsearch [array names env] NETGENDIR] != -1 } {
- set ngdir $env(NETGENDIR)
- }
---- ngtcltk/ngappinit.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngtcltk/ngappinit.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -77,7 +77,7 @@
- if (getenv ("NETGENDIR") && strlen (getenv ("NETGENDIR")))
- ngdir = getenv ("NETGENDIR");
- else
-- ngdir = ".";
-+ ngdir = "/usr/share/netgen";
-
- verbose = parameters.GetDefineFlag ("V");
-
diff --git a/sci-mathematics/netgen/files/netgen-4.4-declarations.patch b/sci-mathematics/netgen/files/netgen-4.4-declarations.patch
deleted file mode 100644
index 52810a355..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-declarations.patch
+++ /dev/null
@@ -1,167 +0,0 @@
---- libsrc/linalg/densemat.hpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/linalg/densemat.hpp 2008-05-09 08:50:56.000000000 +0100
-@@ -14,6 +14,9 @@
-
- #include <assert.h>
-
-+class DenseMatrix;
-+void CalcInverse (const DenseMatrix & m1, DenseMatrix & m2);
-+
- class DenseMatrix
- {
- protected:
---- libsrc/meshing/meshtype.hpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/meshing/meshtype.hpp 2008-05-09 08:50:56.000000000 +0100
-@@ -955,7 +955,7 @@
-
-
-
--
-+ class Mesh;
- /**
- Identification of periodic surfaces, close surfaces, etc.
- */
---- libsrc/visualization/mvdraw.hpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/visualization/mvdraw.hpp 2008-05-09 08:50:56.000000000 +0100
-@@ -250,6 +250,7 @@
- int seltria;
- };
-
-+extern VisualSceneSTLMeshing vsstlmeshing;
-
-
-
---- ngsolve/comp/postproc.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/comp/postproc.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -9,6 +9,7 @@
- */
-
- #include <comp.hpp>
-+#include <fem.hpp>
-
- namespace ngcomp
- {
-@@ -274,8 +275,8 @@
- if (dimflux > 1)
- {
- FlatMatrix<SCAL> elmat(dnumsflux.Size(), lh);
-- dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli)
-- . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh);
-+ BlockBilinearFormIntegrator const& fluxbli_ref = dynamic_cast<const BlockBilinearFormIntegrator&> (fluxbli);
-+ fluxbli_ref . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh);
- CholeskyFactors<SCAL> invelmat(elmat);
-
- FlatVector<SCAL> hv1(dnumsflux.Size(), lh);
---- libsrc/interface/nglib.cpp.orig 2004-07-02 21:20:09.000000000 +0000
-+++ libsrc/interface/nglib.cpp 2008-04-10 17:40:26.000000000 +0000
-@@ -24,10 +24,18 @@
-
- // #include <FlexLexer.h>
-
-+#include <tcl.h>
-+#include <incvis.hpp>
-+
- namespace netgen {
- extern void MeshFromSpline2D (SplineGeometry2d & geometry,
- Mesh *& mesh,
- MeshingParameters & mp);
-+#include "../visualization/mvdraw.hpp"
-+#include "../visualization/soldata.hpp"
-+#include "../visualization/vssolution.hpp"
-+ Tcl_Interp * tcl_interp;
-+ VisualSceneSolution vssolution;
- }
-
-
---- libsrc/visualization/vssolution.cpp.orig 2004-11-10 13:22:09.000000000 +0000
-+++ libsrc/visualization/vssolution.cpp 2008-04-10 17:41:56.000000000 +0000
-@@ -16,6 +16,19 @@
- extern AutoPtr<Mesh> mesh;
-
-
-+ SYMBOLTABLE<VisualScene*> & GetVisualizationScenes ()
-+ {
-+ static SYMBOLTABLE<VisualScene*> vss;
-+ return vss;
-+ }
-+
-+ void AddVisualizationScene (const string & name,
-+ VisualScene * vs)
-+ {
-+ GetVisualizationScenes().Set (name.c_str(), vs);
-+ }
-+
-+
- VisualSceneSolution :: SolData :: SolData ()
- : name (0), data (0), solclass(0)
- { ; }
---- ngsolve/basiclinalg/expr3.hpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/basiclinalg/expr3.hpp 2008-05-09 08:50:56.000000000 +0100
-@@ -851,6 +851,16 @@
- /**
- Inner product
- */
-+inline double InnerProduct ( const double& a, const double& b )
-+{
-+ return a * b;
-+}
-+
-+inline Complex InnerProduct ( const Complex& a, const Complex b)
-+{
-+ return a * b;
-+}
-+
- template <class TA, class TB>
- inline typename TA::TSCAL
- InnerProduct (const MatExpr<TA> & a, const MatExpr<TB> & b)
-@@ -862,15 +872,6 @@
- return sum;
- }
-
--inline double InnerProduct (double a, double b)
--{
-- return a * b;
--}
--
--inline Complex InnerProduct (Complex a, Complex b)
--{
-- return a * b;
--}
-
-
- /* **************************** Trace **************************** */
-@@ -889,6 +890,16 @@
- /* **************************** L2Norm **************************** */
-
- /// Euklidean norm squared
-+inline double L2Norm2 (const double& v)
-+{
-+ return v*v;
-+}
-+
-+inline double L2Norm2 (Complex v)
-+{
-+ return v.real()*v.real()+v.imag()*v.imag();
-+}
-+
- template <class TA>
- inline double L2Norm2 (const MatExpr<TA> & v)
- {
-@@ -899,17 +910,6 @@
- return sum;
- }
-
--
--inline double L2Norm2 (double v)
--{
-- return v*v;
--}
--
--inline double L2Norm2 (Complex v)
--{
-- return v.real()*v.real()+v.imag()*v.imag();
--}
--
- template <class TA>
- inline double L2Norm (const MatExpr<TA> & v)
- {
diff --git a/sci-mathematics/netgen/files/netgen-4.4-makefiles.patch b/sci-mathematics/netgen/files/netgen-4.4-makefiles.patch
deleted file mode 100644
index b08782561..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-makefiles.patch
+++ /dev/null
@@ -1,390 +0,0 @@
---- libsrc/csg/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/csg/Makefile 2008-05-10 08:03:31.000000000 +0100
-@@ -10,7 +10,7 @@
- #
- # lex.yy.cpp geometry.cpp
- #
--lib = csg
-+lib = ngcsg
- libpath = libsrc/csg
- #
- #
---- libsrc/general/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/general/Makefile 2008-05-10 08:02:56.000000000 +0100
-@@ -5,7 +5,7 @@
- spbita2d.cpp seti.cpp optmem.cpp sort.cpp mystring.cpp parthreads.cpp \
- moveablemem.cpp dynamicmem.cpp ngexception.cpp
- #
--lib = gen
-+lib = nggen
- libpath = libsrc/general
- #
- include ../makefile.inc
---- libsrc/geom2d/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/geom2d/Makefile 2008-05-10 08:03:44.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = spline2d.cpp geom2dmesh.cpp splinegeometry2.cpp genmesh2d.cpp
- #
--lib = geom2d
-+lib = nggeom2d
- libpath = libsrc/geom2d
- #
- #
---- libsrc/gprim/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/gprim/Makefile 2008-05-10 08:03:16.000000000 +0100
-@@ -6,7 +6,7 @@
-
- # reftrans.cpp rot3d.cpp
- #
--lib = gprim
-+lib = nggprim
- libpath = libsrc/gprim
- #
- #
---- libsrc/interface/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/interface/Makefile 2008-05-10 08:01:54.000000000 +0100
-@@ -1,4 +1,4 @@
--src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp
-+src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp
- #
- lib = nginterface
- libpath = libsrc/interface
---- libsrc/linalg/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/linalg/Makefile 2008-05-10 07:59:05.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = basemat.cpp densemat.cpp vector.cpp sparsmat.cpp polynomial.cpp
- #
--lib = la
-+lib = ngla
- libpath = libsrc/linalg
- #
- #
---- libsrc/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/Makefile 2008-05-10 09:35:09.000000000 +0100
-@@ -11,7 +11,9 @@
- @ (cd csg; $(MAKE) -f Makefile)
- @ (cd geom2d; $(MAKE) -f Makefile)
- @ (cd stlgeom; $(MAKE) -f Makefile)
-+ifdef WITH_OCC
- @ (cd occ; $(MAKE) -f Makefile)
-+endif
- @ (cd meshing; $(MAKE) -f Makefile)
- @ (cd opti; $(MAKE) -f Makefile)
- @ (cd visualization; $(MAKE) -f Makefile)
---- libsrc/makefile.mach.LINUX.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/makefile.mach.LINUX 2008-05-10 09:32:02.000000000 +0100
-@@ -4,11 +4,8 @@
- #
- # CC=/opt/gcc-dev/bin/gcc
- # CC=/usr/local/bin/gcc
--CC=gcc
--CPLUSPLUS=$(CC)
- AR=ar
- LINK=$(CC)
--MAKE=make
- RM=rm
- RANLIB=ranlib
- #
-@@ -16,16 +12,23 @@
- #
- CFLAGS2 =
-
--CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \
-- -ftemplate-depth-99 -finline-limit=20000 \
-- -funroll-loops -DNGSOLVE
--
--LINKFLAGS2 = -L/usr/openwin/lib -L/usr/X11R6/lib -L/usr/lib/GL3.5 -lstdc++
--
-+CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I/usr/include/GL -D$(MACHINE) -DOPENGL -DNGSOLVE
-+# -ftemplate-depth-99 -finline-limit=20000 \
-+# -funroll-loops -DNGSOLVE
-+
-+LINKFLAGS2 =
-+
-+ifdef WITH_OCC
-+OCC_DIR=$(CASROOT)/..
-+OCCINC_DIR=$(OCC_DIR)/ros/inc
-+OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib
-+CPLUSPLUSFLAGS2 += -DOCCGEOMETRY -DOCC52 -DUSE_STL_STREAM -I$(OCCINC_DIR)
-+LINKFLAGS2 += -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool
-+endif
-
- goalngs=goalngs
-
- # lapack = -llapack -lblas -lgmp -lg2c
-
-
--appngs = lib/$(MACHINE)/*.o -lngsolvebasic
-\ No newline at end of file
-+appngs = lib/$(MACHINE)/*.o -lngsolvebasic
---- libsrc/meshing/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/meshing/Makefile 2008-05-10 08:04:41.000000000 +0100
-@@ -9,7 +9,7 @@
- boundarylayer.cpp specials.cpp msghandler.cpp \
- pyramidrls.cpp pyramid2rls.cpp prism2rls.cpp curvedelems.cpp curvedelems2.cpp
- #
--lib = mesh
-+lib = ngmesh
- libpath = libsrc/meshing
- #
- include ../makefile.inc
---- libsrc/occ/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/occ/Makefile 2008-05-10 08:04:28.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = occgeom.cpp occmeshsurf.cpp occgenmesh.cpp
-
--lib = occ
-+lib = ngocc
- libpath = libsrc/occ
- #
- #
---- libsrc/opti/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/opti/Makefile 2008-05-10 08:05:02.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = bfgs.cpp linsearch.cpp linopt.cpp
- #
--lib = opti
-+lib = ngopti
- libpath = libsrc/opti
- #
- #
---- libsrc/stlgeom/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/stlgeom/Makefile 2008-05-10 08:04:12.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = stlgeom.cpp stltopology.cpp stlgeomchart.cpp stlgeommesh.cpp meshstlsurface.cpp stlline.cpp stltool.cpp
- #
--lib = stlgeom
-+lib = ngstlgeom
- libpath = libsrc/stlgeom
- #
- #
---- libsrc/visualization/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ libsrc/visualization/Makefile 2008-05-10 08:05:20.000000000 +0100
-@@ -3,7 +3,7 @@
- #
- src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vsocc.cpp vssolution.cpp meshdoc.cpp
- #
--lib = vis
-+lib = ngvis
- libpath = libsrc/visualization
- #
- #
---- Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ Makefile 2008-05-10 09:33:45.000000000 +0100
-@@ -14,14 +14,14 @@
- #
- #
- #
--mylib = -lnginterface -lvis -lcsg -lstlgeom -lgeom2d -lmesh -lgprim -lopti \
-- -lla -lgen -locc
-+mylib = -lnginterface -lngvis -lngcsg -lngstlgeom -lnggeom2d -lngmesh -lnggprim -lngopti \
-+ -lngla -lnggen
- #
- #
- # system libraries:
- #
- #
--tcltklib = -ltix8.1.8.4 -ltk8.4 -ltcl8.4
-+tcltklib = -lTix -ltk -ltcl
- # tcltklib = -ltix4.1.8.3 -ltk8.3 -ltcl8.3
- # tcltklib = -ltix8.2 -ltk8.3 -ltcl8.3
- # tcltklib = /usr/lib/libtix8.1.8.3.so -ltk8.3 -ltcl8.3
-@@ -29,7 +29,7 @@
- # tcltklib = -ltix8.2 -ltk8.4 -ltcl8.4
- #
- #
--syslib = $(tcltklib) -lGL -lGLU -lX11 -lXi -lm -ldl -lpthread $(SYSLIB2)
-+syslib = $(tcltklib) -lGL -lGLU -lX11 -lXi -lm -ldl -lpthread $(SYSLIB2)
- # (maybe you have to remove -ldl)
- #
- #
-@@ -43,12 +43,15 @@
- # OCCINC_DIR=$(OCC_DIR)/inc
- # OCCLIB_DIR=$(OCC_DIR)/lib
- #
--OCC_DIR=/opt/OpenCASCADE5.2
-+OCC_DIR=$(CASROOT)/..
- OCCINC_DIR=$(OCC_DIR)/ros/inc
- OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib
-
- # add libs in makefile.mach.$(MACHINE)
--# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL
-+ifdef WITH_OCC
-+#occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL
-+ occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -lTKTopAlgo -lTKG3d -lTKG2d -lTKXSBase -lTKOffset -lTKFillet -lTKGeomBase -lTKGeomAlgo -lTKShHealing -lTKBO -lTKPrim -lTKernel -lTKMath -lTKBool -lXxf86vm
-+endif
- #
- include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
- #
-@@ -66,7 +69,7 @@
- CPLUSPLUSFLAGS = $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3)
- #
- .cpp.o:
-- $(CPLUSPLUS) $(CPLUSPLUSFLAGS) $< -o $(<:.cpp=.o)
-+ $(CXX) $(CPLUSPLUSFLAGS) $< -o $(<:.cpp=.o)
- #
- #
- #
---- ngcore/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngcore/Makefile 2008-05-10 08:33:06.000000000 +0100
-@@ -116,14 +116,15 @@
- #
- #
- .cpp.o:
-- gcc -c -O2 -w $< -o $(<:.cpp=.o) -I../libsrc/include -DNO_PARALLEL_THREADS
-+ $(CXX) -c $(CXXFLAGS) -w $< -o $(<:.cpp=.o) -I../libsrc/include -DNO_PARALLEL_THREADS
-+
- #
--$(main) : $(main).o libng.a
-- gcc -w -o $@ $(main).o -L. -lng -lm -lpthread -lstdc++
-+$(main) : $(main).o libng.a libng.so
-+ $(CXX) -w -o $@ $(main).o -L. -lng -lm -lpthread -lstdc++
- #
- #
- libng.a : $(src:.cpp=.o)
-- ar r libng.a $(src:.cpp=.o)
-+ $(AR) r libng.a $(src:.cpp=.o)
- #
- clean:
- -@rm -r ngcore *.o */*.o */*/*.o */*/*/*.o */*/ii_files
---- ngsolve/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/Makefile 2008-05-10 08:16:10.000000000 +0100
-@@ -66,6 +66,8 @@
- #
- lib = ../lib/$(MACHINE)/libngsolve.a
- lib2 = ../lib/$(MACHINE)/libngsolvebasic.a
-+slib = libngsolve.so
-+slib2 = libngsolvebasic.so
- libold = ../lib/$(MACHINE)/libngsolve_oldla.a
- #
- #
-@@ -74,32 +76,47 @@
- #
- #
- # .PRECIOUS: .cpp .hh
--# .SUFFIXES: .cpp .o
-+.SUFFIXES: .cpp .o .lo
- #
- # .cpp.o:
- # $(CPLUSPLUS) -c $<
--#
--#
-+
-+
- #
- #
- # make lib from sources:
- #
--goal: $(lib) $(lib2)
-+goal: $(lib) $(lib2) ../lib/$(MACHINE)/$(slib) ../lib/$(MACHINE)/$(slib2)
- #
- pebblesinc = -I../../pebbles_old/libsrc/setup -I../../pebbles_old/libsrc/solver -I../../pebbles_old/libsrc/prepro -I../../pebbles_old/libsrc/parallel -I../../pebbles_old/libsrc
- #
-+.cpp.lo:
-+ $(CXX) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS -fPIC -DPIC $< -o $@
-+
- $(lib):: $(src)
-- $(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $?
-+ $(CXX) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $?
- $(AR) $(ARFLAGS) $@ *.o
- mv *.o ../lib/$(MACHINE)
- -$(RM) *.o
- -@$(RANLIB) $@
- #
-+../lib/$(MACHINE)/$(slib):: $(src:%.cpp=%.lo)
-+ $(CXX) -shared -ltcl -lpthread -lm -lstdc++ -o ../lib/$(MACHINE)/$(slib).4.4 $^ -Wl,-soname,$(slib).4.4
-+ ln -sf $(slib).4.4 $@.4
-+ ln -sf $(slib).4.4 $@
-+
-+
- $(lib2):: $(src2)
-- $(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $?
-+ $(CXX) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $?
- $(AR) $(ARFLAGS) $@ *.o
- -$(RM) *.o
- -@$(RANLIB) $@
-+
-+../lib/$(MACHINE)/$(slib2):: $(src2:%.cpp=%.lo)
-+ $(CXX) -shared -lm -lstdc++ -o ../lib/$(MACHINE)/$(slib2).4.4 $^ -Wl,-soname,$(slib2).4.4
-+ ln -sf $(slib2).4.4 $@.4
-+ ln -sf $(slib2).4.4 $@
-+
- #
- #
- #
---- togl/Makefile.orig 2008-05-08 17:44:10.000000000 +0100
-+++ togl/Makefile 2008-05-10 08:23:29.000000000 +0100
-@@ -64,13 +64,13 @@
-
-
- # The C compiler:
--CC = cc
-+#CC = cc
-
- # Compiler options:
--COPTS = -c -O
-+COPTS = -c
-
- # Shared library linker command:
--SHLINK = cc -G
-+SHLINK = $(LINK) -shared
-
- # Name for the shared lib:
- #SH_LIB = libtogl.so.1.3
-@@ -91,7 +91,7 @@
- #### Shouldn't have to change anything beyond this point ####
-
-
--CFLAGS = $(COPTS) $(INCLUDES) $(TK_FLAGS) -DSTEREO -D__sgi
-+CFLAGS := $(CFLAGS) $(COPTS) $(INCLUDES) $(TK_FLAGS) -DSTEREO -D__sgi
-
- LFLAGS = $(LIBDIRS)
-
---- libsrc/makefile.inc.orig 2008-05-19 21:57:27.000000000 +0100
-+++ libsrc/makefile.inc 2008-05-19 21:56:36.000000000 +0100
-@@ -18,23 +18,35 @@
- #
- ARFLAGS = r
- #
-+LIBA=lib$(lib).so
- LIBB=$(LIB_DIR)/lib$(lib).a
- #
- .PRECIOUS: .cpp .c
--.SUFFIXES: .cpp .c .o
-+.SUFFIXES: .cpp .c .o .lo
- #
- .cpp.o:
-- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
-+ $(CXX) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
- .c.o:
-- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
-+ $(CXX) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
-+
-+.cpp.lo:
-+ $(CXX) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) -fPIC -DPIC $< -o $@
-+
-+all: $(LIBA) $(LIBB)
-+
- #
- #
-+$(LIBA):: $(LIB_DIR)
- $(LIBB):: $(LIB_DIR)
- #
- # make lib from sources:
- #
--$(LIBB):: $(src)
-- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $?
-+$(LIBA):: $(src:%.cpp=%.lo)
-+ $(CXX) -shared $(CPLUSPLUSFLAGSLIBRARY) -o $(LIB_DIR)/$@.4.4 *.lo -Wl,-soname,$@.4.4
-+ ln -sf $@.4.4 $(LIB_DIR)/$@.4
-+ ln -sf $@.4.4 $(LIB_DIR)/$@
-+
-+$(LIBB):: $(src:%.cpp=%.o)
- @$(AR) $(ARFLAGS) $@ *.o
- -@$(RM) *.o
- -@$(RANLIB) $@
diff --git a/sci-mathematics/netgen/files/netgen-4.4-order.patch b/sci-mathematics/netgen/files/netgen-4.4-order.patch
deleted file mode 100644
index 57ec5ba4d..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-order.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ngsolve/linalg/order.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/linalg/order.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -54,7 +54,7 @@
- return ball.Alloc();
- }
-
-- void CliqueEl :: operator delete (void * p, size_t)
-+ void CliqueEl :: operator delete (void * p)
- {
- ball.Free (p);
- }
---- ngsolve/linalg/order.hpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/linalg/order.hpp 2008-05-09 08:50:56.000000000 +0100
-@@ -118,7 +118,7 @@
- ///
- void * operator new(size_t);
- ///
-- void operator delete (void *, size_t);
-+ void operator delete (void *);
- };
-
-
diff --git a/sci-mathematics/netgen/files/netgen-4.4-stdlib.patch b/sci-mathematics/netgen/files/netgen-4.4-stdlib.patch
deleted file mode 100644
index 47599ff1b..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-stdlib.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- ngsolve/basiclinalg/calcinverse.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/basiclinalg/calcinverse.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -10,7 +10,7 @@
- {
- double sum = 0;
- for (int i = 0; i < N; i++)
-- sum += abs(m(i,i));
-+ sum += std::abs(m(i,i));
- return sum;
- }
-
---- ngsolve/comp/fespace.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/comp/fespace.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -10,6 +10,8 @@
-
- #include <comp.hpp>
- #include <multigrid.hpp>
-+#include <cstdlib>
-+
- using namespace ngmg;
-
- namespace ngcomp
---- ngsolve/solve/shapetester.cpp.orig 2008-05-08 17:44:10.000000000 +0100
-+++ ngsolve/solve/shapetester.cpp 2008-05-09 08:50:56.000000000 +0100
-@@ -1,6 +1,7 @@
-
- #include <solve.hpp>
- // #include <nginterface.h>
-+#include <cstdlib>
-
-
- namespace ngsolve
---- libsrc/include/mystdlib.h.orig 2008-04-07 10:33:54.000000000 +0200
-+++ libsrc/include/mystdlib.h 2008-04-07 10:38:23.000000000 +0200
-@@ -6,6 +6,7 @@
- #include <iomanip>
- #include <fstream>
- #include <sstream>
-+#include <cstring>
-
- #ifdef OLDCINCLUDE
-
---- ngsolve/ngstd/array.hpp.orig 2008-04-07 10:33:54.000000000 +0200
-+++ ngsolve/ngstd/array.hpp 2008-04-07 10:39:49.000000000 +0200
-@@ -7,6 +7,7 @@
- /* Date: 01. Jun. 95 */
- /**************************************************************************/
-
-+#include <cstring>
-
- /**
- Exception thrown by array range check.
-@@ -291,7 +292,7 @@
- T * p = new T[nsize];
-
- int mins = (nsize < this->size) ? nsize : this->size;
-- memcpy (p, this->data, mins * sizeof(T));
-+ std::memcpy (p, this->data, mins * sizeof(T));
-
- if (ownmem)
- delete [] this->data;
---- ngsolve/linalg/basevector.cpp.orig 2008-04-07 10:33:55.000000000 +0200
-+++ ngsolve/linalg/basevector.cpp 2008-04-07 10:39:13.000000000 +0200
-@@ -9,6 +9,7 @@
- */
-
- #include <la.hpp>
-+#include <cstdlib>
- namespace ngla
- {
- using namespace ngla;
-@@ -146,7 +147,7 @@
- {
- FlatVector<double> fv = FVDouble();
- for (int i = 0; i < fv.Size(); i++)
-- fv(i) = double (rand()) / RAND_MAX;
-+ fv(i) = double (std::rand()) / RAND_MAX;
- }
-
-
---- ngsolve/ngstd/flags.cpp.orig 2008-04-07 10:33:55.000000000 +0200
-+++ ngsolve/ngstd/flags.cpp 2008-04-07 10:38:23.000000000 +0200
-@@ -5,7 +5,8 @@
- /**************************************************************************/
-
- #include <ngstd.hpp>
--
-+#include <cstring>
-+#include <cstdlib>
- namespace ngstd
- {
- using namespace ngstd;
---- ngsolve/linalg/blockjacobi.cpp.orig 2006-04-07 09:27:13.000000000 +0200
-+++ ngsolve/linalg/blockjacobi.cpp 2008-04-07 10:38:23.000000000 +0200
-@@ -7,7 +7,7 @@
-
-
- #include <la.hpp>
--
-+#include <cstdlib>
- namespace ngla
- {
- using namespace ngla;
---- ngsolve/ngstd/ngstd.hpp.orig 2008-04-07 10:38:37.000000000 +0200
-+++ ngsolve/ngstd/ngstd.hpp 2008-04-07 10:38:54.000000000 +0200
-@@ -1,6 +1,9 @@
- #ifndef FILE_NGSTD
- #define FILE_NGSTD
-
-+#include <cstring>
-+#include <cstdlib>
-+
- /*********************************************************************/
- /* File: ngstd.hpp */
- /* Author: Joachim Schoeberl */
diff --git a/sci-mathematics/netgen/files/netgen-4.4-tkversion.patch b/sci-mathematics/netgen/files/netgen-4.4-tkversion.patch
deleted file mode 100644
index e36e6c217..000000000
--- a/sci-mathematics/netgen/files/netgen-4.4-tkversion.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- togl/togl.cpp.orig 2008-05-19 20:36:06.000000000 +0100
-+++ togl/togl.cpp 2008-05-19 20:40:30.000000000 +0100
-@@ -138,14 +138,14 @@
- # include "tkInt8.4p3.h"
- #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==4
- # include "tkInt8.4p4.h"
--#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==6
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL>=6
- # include "tkInt8.4p6.h"
- #else
-- Sorry, you will have to edit togl.c to include the right tkInt.h file
-+ #error Sorry, you will have to edit togl.c to include the right tkInt.h file
- #endif
- #elif defined(WIN32)
- #if TK_MAJOR_VERSION<8
-- Sorry Windows version requires Tcl/Tk ver 8.0 or higher.
-+ #error Sorry Windows version requires Tcl/Tk ver 8.0 or higher.
- #endif
- #include "tkInt.h"
- #include "tkWinInt.h"
diff --git a/sci-mathematics/netgen/files/togl_tk.patch b/sci-mathematics/netgen/files/togl_tk.patch
deleted file mode 100644
index 6a9440a0f..000000000
--- a/sci-mathematics/netgen/files/togl_tk.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- togl/togl.cpp.org 2004-09-29 19:48:06.000000000 +0200
-+++ togl/togl.cpp 2006-10-13 21:39:50.000000000 +0200
-@@ -138,8 +138,50 @@
- # include "tkInt8.4p3.h"
- #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==4
- # include "tkInt8.4p4.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==5
-+# include "tkInt8.4p5.h"
- #elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==6
- # include "tkInt8.4p6.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==7
-+# include "tkInt8.4p7.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==8
-+# include "tkInt8.4p8.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==9
-+# include "tkInt8.4p9.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==10
-+# include "tkInt8.4p10.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==11
-+# include "tkInt8.4p11.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==12
-+# include "tkInt8.4p12.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==13
-+# include "tkInt8.4p13.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==14
-+# include "tkInt8.4p14.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==15
-+# include "tkInt8.4p15.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==16
-+# include "tkInt8.4p16.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==17
-+# include "tkInt8.4p17.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==18
-+# include "tkInt8.4p18.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==19
-+# include "tkInt8.4p19.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==20
-+# include "tkInt8.4p20.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==21
-+# include "tkInt8.4p21.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==22
-+# include "tkInt8.4p22.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==23
-+# include "tkInt8.4p23.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==24
-+# include "tkInt8.4p24.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==25
-+# include "tkInt8.4p25.h"
-+#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==4 && TK_RELEASE_SERIAL==26
-+# include "tkInt8.4p26.h"
- #else
- Sorry, you will have to edit togl.c to include the right tkInt.h file
- #endif
diff --git a/sci-mathematics/netgen/netgen-4.9.11.ebuild b/sci-mathematics/netgen/netgen-4.9.11-r1.ebuild
index e52970d92..e52970d92 100644
--- a/sci-mathematics/netgen/netgen-4.9.11.ebuild
+++ b/sci-mathematics/netgen/netgen-4.9.11-r1.ebuild