--- files/patch-Makefile.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,64 +0,0 @@ ---- Makefile.orig Tue Nov 16 15:29:39 2004 -+++ Makefile Mon May 28 22:20:53 2007 -@@ -21,7 +21,7 @@ - # system libraries: - # - # --tcltklib = -ltix8.1.8.4 -ltk8.4 -ltcl8.4 -+tcltklib = `echo $(TIX_BUILD_LIB_SPEC)` `echo $(TK_LIB_SPEC)` `echo $(TCL_LIB_FLAG)` - # 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 $(PTHREAD_LIBS) $(SYSLIB2) - # (maybe you have to remove -ldl) - # - # -@@ -43,12 +43,12 @@ - # OCCINC_DIR=$(OCC_DIR)/inc - # OCCLIB_DIR=$(OCC_DIR)/lib - # --OCC_DIR=/opt/OpenCASCADE5.2 --OCCINC_DIR=$(OCC_DIR)/ros/inc --OCCLIB_DIR=$(OCC_DIR)/ros/lin/lib -+#OCC_DIR=/opt/OpenCASCADE5.2 -+#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 -+# occlib = -L$(OCCLIB_DIR) -lTKIGES -lTKBRep -lTKSTEP -lTKSTL -pthread - # - include $(LIBSRC_DIR)/makefile.mach.$(MACHINE) - # -@@ -58,7 +58,7 @@ - # - # - # --CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -DOPENGL $(METISINC) -+CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) -I./ngsolve/include -Ilibsrc/interface -DOPENGL $(METISINC) $(PTHREAD_CFLAGS) - # - LINKFLAGS1 = -lGL -lGLU -lX11 -lXext -lXmu - # -@@ -74,7 +74,7 @@ - # Additional NETGEN Applications: - # - # the demo add-on application: --# appdemo = -L./demoapp -ldemoapp -+appdemo = -L./demoapp -ldemoapp - # - # appaddon = -L./addon -laddon - -@@ -102,7 +102,7 @@ - cd libsrc; $(MAKE) - # - applib: --# cd demoapp; $(MAKE); -+ cd demoapp; $(MAKE); - # cd addon; $(MAKE) - # cd ngsolve; $(MAKE); - # cd metis; $(MAKE) --- files/patch-demoapp::Makefile.orig 2004-05-06 02:57:56.000000000 +0700 +++ files/patch-demoapp::Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,18 +0,0 @@ ---- demoapp/Makefile.orig Tue Feb 3 11:47:04 2004 -+++ demoapp/Makefile Mon May 3 22:16:08 2004 -@@ -10,13 +10,13 @@ - .SUFFIXES: .cc .o - # - .cc.o: -- $(CPLUSPLUS) -c -O2 $< -+ $(CPLUSPLUS) -c $(CPLUSPLUSFLAGS2) $< - # - # - # make lib from sources: - # - $(lib):: $(src) -- $(CPLUSPLUS) -c -O2 -I../libsrc/interface $(CPLUSPLUSFLAGS2) $? -+ $(CPLUSPLUS) -c -I../libsrc/interface $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) $? - $(AR) $(ARFLAGS) $@ *.o - -$(RM) *.o - # --- files/patch-libsrc::makefile.inc.orig 2004-11-22 02:58:15.000000000 +0600 +++ files/patch-libsrc::makefile.inc 1970-01-01 07:00:00.000000000 +0700 @@ -1,23 +0,0 @@ ---- libsrc/makefile.inc.orig Wed Aug 25 13:06:28 2004 -+++ libsrc/makefile.inc Wed Nov 17 21:52:12 2004 -@@ -24,9 +24,9 @@ - .SUFFIXES: .cpp .c .o - # - .cpp.o: -- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $< -+ $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) $(CPLUSPLUSFLAGSLIBRARY) $< - .c.o: -- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $< -+ $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) $(CPLUSPLUSFLAGSLIBRARY) $< - # - # - $(LIBB):: $(LIB_DIR) -@@ -34,7 +34,7 @@ - # make lib from sources: - # - $(LIBB):: $(src) -- $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $? -+ $(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) $(CPLUSPLUSFLAGSLIBRARY) $? - @$(AR) $(ARFLAGS) $@ *.o - -@$(RM) *.o - -@$(RANLIB) $@ --- files/patch-libsrc_csg_csg.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_csg_csg.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- ./libsrc/csg/csg.hpp.orig Thu Oct 7 00:10:13 2004 -+++ ./libsrc/csg/csg.hpp Tue May 29 22:54:13 2007 -@@ -22,7 +22,7 @@ - #ifndef SMALLLIB - #define _INCLUDE_MORE - #endif --#ifdef LINUX -+#if defined(LINUX ) || defined(FREEBSD) - #define _INCLUDE_MORE - #endif - --- files/patch-libsrc_linalg_densemat.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_linalg_densemat.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,10 +0,0 @@ ---- libsrc/linalg/densemat.hpp.orig Wed Nov 10 14:22:43 2004 -+++ libsrc/linalg/densemat.hpp Tue May 29 18:45:09 2007 -@@ -255,6 +255,6 @@ - - - -- -+extern void CalcInverse (const DenseMatrix & m1, DenseMatrix & m2); - - #endif --- files/patch-libsrc_makefile.mach.FREEBSD.orig 2008-09-01 21:27:08.000000000 +0700 +++ files/patch-libsrc_makefile.mach.FREEBSD 1970-01-01 07:00:00.000000000 +0700 @@ -1,16 +0,0 @@ ---- libsrc/makefile.mach.FREEBSD.orig 2004-05-06 05:24:29.000000000 +0800 -+++ libsrc/makefile.mach.FREEBSD 2008-09-01 22:24:10.000000000 +0800 -@@ -18,8 +18,11 @@ - tcltklib = `echo $(TIX_BUILD_LIB_SPEC)` `echo $(TK_LIB_SPEC)` `echo $(TCL_LIB_FLAG)` - - CFLAGS2 = --CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL --CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)` -+CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(LOCALBASE)/include -DFREEBSD -DOPENGL -DNGSOLVE \ -+ -ftemplate-depth-99 -finline-limit=20000 \ -+ -funroll-loops -+ -+CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step -I$(TCL_INCLUDEDIR) -I$(TK_INCLUDEDIR) - # - LINKFLAGS2 = -L$(LOCALBASE)/lib -L$(X11BASE)/lib - --- files/patch-libsrc_meshing_meshing.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_meshing_meshing.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- ./libsrc/meshing/meshing.hpp.orig Thu Oct 7 00:23:46 2004 -+++ ./libsrc/meshing/meshing.hpp Tue May 29 22:55:52 2007 -@@ -34,7 +34,7 @@ - #ifndef SMALLLIB - #define _INCLUDE_MORE - #endif --#ifdef LINUX -+#if defined(LINUX ) || defined(FREEBSD) - #define _INCLUDE_MORE - #endif - --- files/patch-libsrc_meshing_meshtype.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_meshing_meshtype.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- libsrc/meshing/meshtype.hpp.orig Sun Nov 7 17:12:10 2004 -+++ libsrc/meshing/meshtype.hpp Tue May 29 18:43:39 2007 -@@ -962,7 +962,7 @@ - class Identifications - { - private: -- Mesh & mesh; -+ class Mesh & mesh; - - /// identify points (thin layers, periodic b.c.) - INDEX_2_HASHTABLE * identifiedpoints; --- files/patch-libsrc_visualization_mvdraw.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_visualization_mvdraw.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,10 +0,0 @@ ---- libsrc/visualization/mvdraw.hpp.orig -+++ libsrc/visualization/mvdraw.hpp -@@ -250,6 +250,7 @@ - int seltria; - }; - -+extern VisualSceneSTLMeshing vsstlmeshing; - - - --- files/patch-libsrc_visualization_tlmeshing.cpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-libsrc_visualization_tlmeshing.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,13 +0,0 @@ ---- libsrc/visualization/stlmeshing.cpp.orig -+++ libsrc/visualization/stlmeshing.cpp -@@ -1062,9 +1062,9 @@ - } - - -+VisualSceneSTLMeshing vsstlmeshing; - - --VisualSceneSTLMeshing vsstlmeshing; - - #endif - --- files/patch-ngcore::Makefile.orig 2004-11-22 02:58:15.000000000 +0600 +++ files/patch-ngcore::Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,28 +0,0 @@ ---- ngcore/Makefile.orig Fri Jul 2 23:21:25 2004 -+++ ngcore/Makefile Sun Nov 21 18:11:55 2004 -@@ -108,6 +108,7 @@ - ../libsrc/general/mystring.cpp - # - # -+include ../libsrc/makefile.mach.$(MACHINE) - # - allsrc = $(main).cpp $(src) - # -@@ -116,14 +117,14 @@ - # - # - .cpp.o: -- gcc -c -O2 -w $< -o $(<:.cpp=.o) -I../libsrc/include -DNO_PARALLEL_THREADS -+ $(CPLUSPLUS) -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++ -+ $(CPLUSPLUS) -w -o $@ $(main).o -L. -lng -lm $(PTHREAD_LIBS) $(SYSLIB2) - # - # - 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 --- files/patch-ngsolve.Makefile.orig 2004-11-22 02:58:15.000000000 +0600 +++ files/patch-ngsolve.Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,19 +0,0 @@ ---- ngsolve/Makefile.orig Tue Nov 16 10:14:27 2004 -+++ ngsolve/Makefile Wed Nov 17 23:18:39 2004 -@@ -89,14 +89,14 @@ - 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 - # - $(lib):: $(src) -- $(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $? -+ $(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) -DNETGEN_ELTRANS $? - $(AR) $(ARFLAGS) $@ *.o - mv *.o ../lib/$(MACHINE) - -$(RM) *.o - -@$(RANLIB) $@ - # - $(lib2):: $(src2) -- $(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $? -+ $(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGS3) $? - $(AR) $(ARFLAGS) $@ *.o - -$(RM) *.o - -@$(RANLIB) $@ --- files/patch-ngsolve::tutorial::Makefile.orig 2004-11-22 02:58:15.000000000 +0600 +++ files/patch-ngsolve::tutorial::Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,47 +0,0 @@ ---- ./ngsolve/tutorial/Makefile.orig Tue Nov 16 09:57:27 2004 -+++ ./ngsolve/tutorial/Makefile Sun Nov 21 18:20:37 2004 -@@ -1,10 +1,12 @@ --COMPILE = gcc -O2 -I../include -I../../libsrc/include -finline-limit=50000 -ftemplate-depth-99 -mcpu=pentium4 -funroll-loops -fforce-addr -+include ../libsrc/makefile.mach.$(MACHINE) -+ -+COMPILE = $(CPLUSPLUS) $(CXXFLAGS) -I../include -I../../libsrc/include -finline-limit=50000 -ftemplate-depth-99 -funroll-loops -fforce-addr - # COMPILE = /opt/gcc40/bin/gcc -O2 -I../include -I../../libsrc/include -funroll-loops - # -finline-limit=10000 -march=pentium4 -fforce-addr -ftemplate-depth-99 - # COMPILE = icc -xB -O3 -Ob2 -I../include -Qoption,c,-ip_ninl_max_stats=10000 -Qoption,c,-ip_ninl_min_stats=100 -Qoption,c,-ip_ninl_max_total_stats=4000 - # COMPILE = icc -xN -O3 -Ob2 -I../include -opt_report_fileopt.rep -Qoption,c,-ip_ninl_max_stats=10000 -Qoption,c,-ip_ninl_min_stats=100 -Qoption,c,-ip_ninl_max_total_stats=4000 - --stdlib = -lm -pthread -lstdc++ -+stdlib = -lm $(PTHREAD_LIBS) $(SYSLIB2) - # stdlib = -L/opt/gcc40/lib -lm -pthread /opt/gcc40/lib/libstdc++.a - - default: -@@ -38,25 +40,25 @@ - libngstd.a: ../ngstd/bitarray.cpp ../ngstd/blockalloc.cpp ../ngstd/evalfunc.cpp ../ngstd/exception.cpp ../ngstd/flags.cpp ../ngstd/localheap.cpp ../ngstd/symboltable.cpp ../ngstd/table.cpp ../ngstd/templates.cpp ../../libsrc/general/moveablemem.cpp ../../libsrc/general/dynamicmem.cpp ../../libsrc/general/ngexception.cpp - @-rm *.o - $(COMPILE) -c $? -- ar -r libngstd.a *.o -+ $(AR) -r libngstd.a *.o - @-rm *.o - - libngbla.a: ../basiclinalg/bandmatrix.cpp ../basiclinalg/eigensystem.cpp ../basiclinalg/calcinverse.cpp ../basiclinalg/vecmat.cpp ../basiclinalg/cholesky.cpp - @-rm *.o - $(COMPILE) -c $? -- ar -r libngbla.a *.o -+ $(AR) -r libngbla.a *.o - @-rm *.o - - libngla.a: - @-rm *.o - $(COMPILE) -c ../linalg/*.cpp -- ar -r libngla.a *.o -+ $(AR) -r libngla.a *.o - @-rm *.o - - libngfem.a: ../fem/bdbequations.cpp ../fem/hdivhofe.cpp ../fem/coefficient.cpp ../fem/highorderfe.cpp ../fem/elementtopology.cpp ../fem/integrator.cpp ../fem/equilibrium.cpp ../fem/intrule.cpp ../fem/fastmat.cpp ../fem/l2hofe.cpp ../fem/finiteelement.cpp ../fem/maxwellintegrator.cpp ../fem/h1hofe.cpp ../fem/hcurlfe.cpp ../fem/recursive_pol.cpp ../fem/hcurlhofe.cpp ../fem/recursive_pol_trig.cpp ../fem/hdiv_equations.cpp ../fem/specialelement.cpp ../fem/hdivfe.cpp - - @-rm *.o - $(COMPILE) -c $? -- ar -r libngfem.a *.o -+ $(AR) -r libngfem.a *.o - @-rm *.o - --- files/patch-ngsolve_basiclinalg_calcinverse.cpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-ngsolve_basiclinalg_calcinverse.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- ngsolve/basiclinalg/calcinverse.cpp.orig Tue Nov 16 09:38:35 2004 -+++ ngsolve/basiclinalg/calcinverse.cpp Tue May 29 19:27:48 2007 -@@ -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; - } - --- files/patch-ngsolve_basiclinalg_expr3.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-ngsolve_basiclinalg_expr3.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,70 +0,0 @@ ---- ngsolve/basiclinalg/expr3.hpp.orig Sat Oct 2 10:26:56 2004 -+++ ngsolve/basiclinalg/expr3.hpp Tue May 29 19:33:11 2007 -@@ -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 - inline typename TA::TSCAL - InnerProduct (const MatExpr & a, const MatExpr & b) -@@ -862,16 +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,16 +889,6 @@ - /* **************************** L2Norm **************************** */ - - /// Euklidean norm squared --template --inline double L2Norm2 (const MatExpr & v) --{ -- typedef typename TA::TSCAL TSCAL; -- double sum = 0; -- for (int i = 0; i < v.Height(); i++) -- sum += L2Norm2 (v.Spec()(i)); // REval -- return sum; --} -- - - inline double L2Norm2 (double v) - { -@@ -908,6 +898,16 @@ - inline double L2Norm2 (Complex v) - { - return v.real()*v.real()+v.imag()*v.imag(); -+} -+ -+template -+inline double L2Norm2 (const MatExpr & v) -+{ -+ typedef typename TA::TSCAL TSCAL; -+ double sum = 0; -+ for (int i = 0; i < v.Height(); i++) -+ sum += L2Norm2 (v.Spec()(i)); // REval -+ return sum; - } - - template --- files/patch-ngsolve_comp_postproc.cpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-ngsolve_comp_postproc.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,21 +0,0 @@ ---- ngsolve/comp/postproc.cpp.orig -+++ ngsolve/comp/postproc.cpp -@@ -9,6 +9,7 @@ - */ - - #include -+#include - - namespace ngcomp - { -@@ -274,8 +275,8 @@ - if (dimflux > 1) - { - FlatMatrix elmat(dnumsflux.Size(), lh); -- dynamic_cast (fluxbli) -- . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); -+ BlockBilinearFormIntegrator const& fluxbli_ref = dynamic_cast (fluxbli); -+ fluxbli_ref . Block() . AssembleElementMatrix (felflux, eltrans, elmat, lh); - CholeskyFactors invelmat(elmat); - - FlatVector hv1(dnumsflux.Size(), lh); --- files/patch-ngsolve_linalg_order.cpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-ngsolve_linalg_order.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- ngsolve/linalg/order.cpp.orig -+++ 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); - } --- files/patch-ngsolve_linalg_order.hpp.orig 2007-05-31 02:21:11.000000000 +0700 +++ files/patch-ngsolve_linalg_order.hpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,11 +0,0 @@ ---- ngsolve/linalg/order.hpp.orig -+++ ngsolve/linalg/order.hpp -@@ -118,7 +118,7 @@ - /// - void * operator new(size_t); - /// -- void operator delete (void *, size_t); -+ void operator delete (void *); - }; - - --- files/patch-ngtcltk_ngappinit.cpp.orig 2008-09-01 22:21:14.000000000 +0700 +++ files/patch-ngtcltk_ngappinit.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,45 +0,0 @@ ---- ngtcltk/ngappinit.cpp.orig 2004-11-17 17:43:35.000000000 +0800 -+++ ngtcltk/ngappinit.cpp 2008-09-01 22:40:22.000000000 +0800 -@@ -3,10 +3,12 @@ - This file is a modification of tkAppInit.c from the Tcl/Tk package - */ - -+using namespace std; -+ - #include - #include "incvis.hpp" - #include -- -+#include - - namespace netgen - { -@@ -26,8 +28,6 @@ - * The following variable is a special hack that is needed in order for - * Sun shared libraries to be used for Tcl. - */ --// extern "C" int matherr(); --int *tclDummyMathPtr = (int *) matherr; - - - /* -@@ -194,8 +194,9 @@ - // For adding an application, parse the file here, - // and call the init-procedure below - // #define DEMOAPP -+#define DEMOAPP - #ifdef DEMOAPP -- Tcl_EvalFile (myinterp, "demoapp/demoapp.tcl"); -+ Tcl_EvalFile (myinterp, "%%DATADIR%%/demoapp.tcl"); - #endif - - #ifdef ADDON -@@ -316,7 +317,7 @@ - // #undef NGSOLVE - - --#ifdef NGSOLVE -+#if 0 - - extern int NGSolve_Init (Tcl_Interp * interp); - if (NGSolve_Init(interp) == TCL_ERROR) --- files/patch-togl::Makefile.orig 2008-04-20 00:46:54.000000000 +0700 +++ files/patch-togl::Makefile 1970-01-01 07:00:00.000000000 +0700 @@ -1,43 +0,0 @@ ---- ./togl/Makefile.orig Wed Jan 28 16:28:33 2004 -+++ ./togl/Makefile Sun Nov 21 18:37:12 2004 -@@ -57,33 +57,33 @@ - # Initial revision - # - -- -+include ../libsrc/makefile.mach.$(MACHINE) - - # Makefile for Togl demos - # You'll probably have to tinker with these macros: - - - # The C compiler: --CC = cc -+CC = $(CPLUSPLUS) - - # Compiler options: --COPTS = -c -O -+COPTS = -c $(CXXFLAGS) - - # Shared library linker command: --SHLINK = cc -G -+SHLINK = $(LINK) -shared - - # Name for the shared lib: - #SH_LIB = libtogl.so.1.3 - SH_LIB = - - # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: --INCLUDES = -I/usr/local/include -I/usr/include/tcl -I/usr/freeware/include -+INCLUDES = -I$(LOCALBASE)/include $(CPLUSPLUSFLAGS3) - - # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: --LIBDIRS = -L/usr/local/lib -+LIBDIRS = $(LINKFLAGS2) - - # Libraries to link with (-ldl for Linux only?): --LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -L/usr/freeware/lib32 -lX11 -lXmu -lXext -lXt -lm -ldl -+LIBS = $(tcltklib) -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm - - TK_FLAGS = - --- files/patch-togl::togl.cpp.orig 2007-01-26 05:55:45.000000000 +0600 +++ files/patch-togl::togl.cpp 1970-01-01 07:00:00.000000000 +0700 @@ -1,20 +0,0 @@ ---- togl/togl.cpp.orig Wed Sep 29 19:48:06 2004 -+++ togl/togl.cpp Fri Jan 26 00:30:29 2007 -@@ -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" --- Makefile.orig 2009-04-06 03:50:36.000000000 +0700 +++ Makefile 2010-06-03 14:32:31.000000000 +0700 @@ -2,91 +2,70 @@ # Date created: 29 April 2004 # Whom: Thierry Thomas # -# $FreeBSD: ports/cad/netgen/Makefile,v 1.21 2009/04/05 20:50:36 dhn Exp $ +# $FreeBSD$ # PORTNAME= netgen -PORTVERSION= 4.4 -PORTREVISION= 5 +PORTVERSION= 4.9.13 CATEGORIES= cad -MASTER_SITES= http://www.hpfem.jku.at/cgi/download.cgi?ID= -DISTNAME= ngs${PORTVERSION:S/.//g} +MASTER_SITES= SF/netgen-mesher/netgen-mesher/${PORTVERSION}/ MAINTAINER= stephen@missouri.edu COMMENT= An automatic 3D tetrahedral mesh generator -LIB_DEPENDS= tix8184:${PORTSDIR}/x11-toolkits/tix USE_GMAKE= yes USE_TK= 84 USE_TK_BUILD= 84 USE_GL= yes USE_XORG= xmu xi - -ALL_TARGET= ng +GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${TK_LIBDIR}/Togl-1.7 +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" +CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} --enable-jpeglib +LIB_DEPENDS+= tix8184:${PORTSDIR}/x11-toolkits/tix \ + jpeg.11:${PORTSDIR}/graphics/jpeg \ + togl.1:${PORTSDIR}/graphics/togl FETCH_BEFORE_ARGS+= -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +OPTIONS= OCC "Compile with OpenCascade geometry kernel" on \ + FFMPEG "video recording with FFmpeg" off + +.include + .if defined(WITH_OCC) LIB_DEPENDS+= TKernel.0:${PORTSDIR}/cad/opencascade -CXXFLAGS+= -DOCCGEOMETRY -DOCC52 -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/OpenCAS/ros/inc +CXXFLAGS+= -DOCCGEOMETRY -DOCC63 -DHAVE_WOK_CONFIG_H -DHAVE_CONFIG_H -D${ARCH} -I${LOCALBASE}/OpenCAS/ros/inc +CONFIGURE_ARGS+= --enable-occ .endif -TUTOS= boxcyl.geo cone.geo cube.geo cubeandspheres.geo cubemcyl.geo \ - cubemsphere.geo cylinder.geo cylsphere.geo demo2d.in2d ellipsoid.geo \ - ellipticcyl.geo fichera.geo hinge.stl lshape3d.geo manyholes.geo \ - matrix.geo part1.stl period.geo sculpture.geo shaft.geo sphere.geo \ - sphereincube.geo square.in2d test.msz trafo.geo twobricks.geo \ - twocubes.geo twocyl.geo - -DIRTCL= demoapp ngsolve ngtcltk +.if defined(WITH_FFMPEG) +LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+= --enable-ffmpeg +.endif MACHINE= ${OPSYS:U} +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=${GMAKE} \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} - .include .if ${ARCH} == "sparc64" BROKEN= internal gcc error (Bug 23159) .endif -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "Define WITH_OCC if IGES and STEP support is required." - @${ECHO_MSG} - pre-configure: ${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" \ - ${WRKSRC}/ngtcltk/ngappinit.cpp -.if defined(WITH_OCC) - ${REINPLACE_CMD} -e 's|^# occlib|occlib|;s|-pthread|${PTHREAD_LIBS}|' \ - ${WRKSRC}/libsrc/makefile.mach.FREEBSD \ - ${WRKSRC}/Makefile - ${REINPLACE_CMD} -e 's|^#OCC|OCC|;s|ros/lin/|ros/bsd/|; \ - s|/opt/OpenCASCADE5.2|${LOCALBASE}/OpenCAS|' \ - ${WRKSRC}/Makefile -.endif + ${WRKSRC}/ng/ngappinit.cpp -do-install: - ${MKDIR} ${DIRTCL:S|^|${PREFIX}/netgen/|g} - ${INSTALL_PROGRAM} ${WRKSRC}/ng ${PREFIX}/netgen - ${LN} -s ${PREFIX}/netgen/ng ${PREFIX}/bin -.for tcls in . ${DIRTCL} - ${CP} ${WRKSRC}/${tcls}/*.tcl ${PREFIX}/netgen/${tcls} -.endfor -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/tutorials ${DOCSDIR}/ngsolve - ${INSTALL_DATA} ${WRKSRC}/doc/ng4.pdf ${DOCSDIR} -. for doc in ${TUTOS} - ${INSTALL_DATA} ${WRKSRC}/tutorials/${doc} ${DOCSDIR}/tutorials -. endfor - ${CP} ${WRKSRC}/ngsolve/doc/* ${DOCSDIR}/ngsolve - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif +post-install: + ${CAT} ${PKGMESSAGE} .include --- distinfo.orig 2005-11-24 06:22:45.000000000 +0600 +++ distinfo 2010-06-03 11:21:13.000000000 +0700 @@ -1,3 +1,3 @@ -MD5 (ngs44.tar.gz) = ec0519fb348d4af48c42cd018ee2baee -SHA256 (ngs44.tar.gz) = 21e1ce63204a90f4a8d85cadc54847d9f1f58fb76d500a46baab2022fe7709d4 -SIZE (ngs44.tar.gz) = 3421202 +MD5 (netgen-4.9.13.tar.gz) = 2d56642ca673106837bcd08ff9913d57 +SHA256 (netgen-4.9.13.tar.gz) = a5f188bb0fafc0536389314efb8fe6d294b93512b54f2b67c9a3e5431c3b0412 +SIZE (netgen-4.9.13.tar.gz) = 1829916 --- pkg-plist.orig 2004-11-22 02:58:15.000000000 +0600 +++ pkg-plist 2010-06-03 11:21:16.000000000 +0700 @@ -1,139 +1,66 @@ -bin/ng -netgen/demoapp/demoapp.tcl -netgen/ng -netgen/ng.tcl -netgen/ngsolve/ngsolve.tcl -netgen/ngsolve/preproc.tcl -netgen/ngtcltk/dialog.tcl -netgen/ngtcltk/drawing.tcl -netgen/ngtcltk/menustat.tcl -netgen/ngtcltk/nghelp.tcl -netgen/ngtcltk/ngicon.tcl -netgen/ngtcltk/ngvisual.tcl -netgen/ngtcltk/parameters.tcl -netgen/ngtcltk/variables.tcl -netgen/startup.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/parameters.tcl +bin/sockets.tcl +bin/variables.tcl +include/ngexception.hpp +include/nginterface.h +include/nginterface_v2.hpp +include/nglib.h +include/parallelinterface.hpp +include/soldata.hpp +lib/libnglib.la +lib/libnglib.so %%PORTDOCS%%%%DOCSDIR%%/ng4.pdf -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/WARNINGS -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/contents.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/images.aux -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/images.log -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/images.pl -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/images.tex -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img1.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img10.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img11.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img12.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img13.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img14.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img15.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img16.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img17.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img18.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img19.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img2.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img20.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img21.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img22.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img23.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img24.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img25.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img26.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img27.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img28.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img29.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img3.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img30.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img31.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img32.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img33.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img34.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img35.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img36.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img37.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img38.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img39.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img4.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img40.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img41.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img42.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img43.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img44.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img45.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img46.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img47.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img48.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img5.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img6.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img7.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img8.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/img9.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/index.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/internals.pl -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/labels.pl -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/next.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/next_g.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/ngsolve.css -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/ngsolve.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node1.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node10.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node11.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node12.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node13.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node14.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node15.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node16.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node17.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node18.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node19.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node2.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node20.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node21.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node22.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node23.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node3.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node4.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node5.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node6.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node7.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node8.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/node9.html -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/prev.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/prev_g.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/up.png -%%PORTDOCS%%%%DOCSDIR%%/ngsolve/up_g.png -%%PORTDOCS%%%%DOCSDIR%%/tutorials/boxcyl.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cone.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cube.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cubeandspheres.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cubemcyl.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cubemsphere.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cylinder.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/cylsphere.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/demo2d.in2d -%%PORTDOCS%%%%DOCSDIR%%/tutorials/ellipsoid.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/ellipticcyl.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/fichera.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/hinge.stl -%%PORTDOCS%%%%DOCSDIR%%/tutorials/lshape3d.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/manyholes.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/matrix.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/part1.stl -%%PORTDOCS%%%%DOCSDIR%%/tutorials/period.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/sculpture.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/shaft.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/sphere.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/sphereincube.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/square.in2d -%%PORTDOCS%%%%DOCSDIR%%/tutorials/test.msz -%%PORTDOCS%%%%DOCSDIR%%/tutorials/trafo.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/twobricks.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/twocubes.geo -%%PORTDOCS%%%%DOCSDIR%%/tutorials/twocyl.geo -@dirrm netgen/demoapp -@dirrm netgen/ngsolve -@dirrm netgen/ngtcltk -@dirrm netgen -%%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorials -%%PORTDOCS%%@dirrm %%DOCSDIR%%/ngsolve +%%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%%/ellipsoid.geo +%%DATADIR%%/ellipticcyl.geo +%%DATADIR%%/extrusion.geo +%%DATADIR%%/fichera.geo +%%DATADIR%%/frame.step +%%DATADIR%%/hinge.stl +%%DATADIR%%/lshape3d.geo +%%DATADIR%%/manyholes.geo +%%DATADIR%%/manyholes2.geo +%%DATADIR%%/matrix.geo +%%DATADIR%%/ortho.geo +%%DATADIR%%/part1.stl +%%DATADIR%%/period.geo +%%DATADIR%%/revolution.geo +%%DATADIR%%/screw.step +%%DATADIR%%/sculpture.geo +%%DATADIR%%/shaft.geo +%%DATADIR%%/shell.geo +%%DATADIR%%/sphere.geo +%%DATADIR%%/sphereincube.geo +%%DATADIR%%/square.in2d +%%DATADIR%%/squarecircle.in2d +%%DATADIR%%/squarehole.in2d +%%DATADIR%%/torus.geo +%%DATADIR%%/trafo.geo +%%DATADIR%%/twobricks.geo +%%DATADIR%%/twocubes.geo +%%DATADIR%%/twocyl.geo +@dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% --- files/patch-ng_Makefile.am.orig 1970-01-01 07:00:00.000000000 +0700 +++ files/patch-ng_Makefile.am 2010-06-03 11:21:29.000000000 +0700 @@ -0,0 +1,11 @@ +--- ng/Makefile.am.orig 2010-05-20 19:08:54.000000000 +0700 ++++ ng/Makefile.am 2010-05-27 16:46:45.000000000 +0700 +@@ -16,7 +16,7 @@ + $(top_builddir)/libsrc/gprim/libgprim.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgen.la \ +- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) ++ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl-1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) + + # add for static linkage of ngsolve: + # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -L/opt/intel/mkl/10.2.1.017/lib/em64t /opt/intel/mkl/10.2.1.017/lib/em64t/libmkl_solver_lp64.a -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core --- files/patch-ng_Makefile.in.orig 1970-01-01 07:00:00.000000000 +0700 +++ files/patch-ng_Makefile.in 2010-06-03 15:09:34.000000000 +0700 @@ -0,0 +1,11 @@ +--- ng/Makefile.in.orig 2010-06-03 15:08:20.000000000 +0700 ++++ ng/Makefile.in 2010-06-03 15:08:42.000000000 +0700 +@@ -287,7 +287,7 @@ + $(top_builddir)/libsrc/gprim/libgprim.la \ + $(top_builddir)/libsrc/linalg/libla.la \ + $(top_builddir)/libsrc/general/libgen.la \ +- $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) ++ $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -ltogl $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) + + + # add for static linkage of ngsolve: --- files/pkg-message.in.orig 1970-01-01 07:00:00.000000000 +0700 +++ files/pkg-message.in 2010-06-03 11:21:35.000000000 +0700 @@ -0,0 +1,8 @@ + +************************************************************************* + + Set the environment variable: + + NETGENDIR=%%PREFIX%%/bin + +*************************************************************************