Fix build with gcc 3.4

2 files changed, 45 insertions, 4 deletions

diff --git a/math/rascal/Makefile b/math/rascal/Makefile
index a49c540660f3..c863041ce94d 100644
--- a/math/rascal/Makefile
+++ b/math/rascal/Makefile
@@ -31,10 +31,6 @@ MAN1=	rascal.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile with gcc 3.4.2"
-.endif
-
 .if ${OSVERSION} < 502000
 BUILD_DEPENDS=	${LOCALBASE}/lib/libreadline.so.4:${PORTSDIR}/devel/readline
 RUN_DEPENDS=	${LOCALBASE}/lib/libreadline.so.4:${PORTSDIR}/devel/readline
diff --git a/math/rascal/files/patch-mmatrix.hpp b/math/rascal/files/patch-mmatrix.hpp
new file mode 100644
index 000000000000..29fa7f77fcbb
--- /dev/null
+++ b/math/rascal/files/patch-mmatrix.hpp
@@ -0,0 +1,45 @@
+--- modules/mmatrix.hpp.orig	Mon Aug 16 19:17:01 2004
++++ modules/mmatrix.hpp	Mon Aug 16 19:27:48 2004
+@@ -33,14 +33,14 @@
+    public:
+       mmatrix(int aN,int aM) : N(aN),M(aM) 
+       { 
+-         a=new (T *)[N];
++         a=new T *[N];
+          int i;
+          for(i=0;i<N;i++)
+             a[i]=new T[M];
+       }
+       mmatrix(int aN,int aM,const T & x,const T & y) : N(aN),M(aM) 
+       { 
+-         a=new (T *)[N];
++         a=new T *[N];
+          int i;
+          for(i=0;i<N;i++)
+             a[i]=new T[M];
+@@ -51,14 +51,14 @@
+       }
+       mmatrix(const T & b) : N(1),M(1)
+       {
+-         a=new (T *)[1];
++         a=new T *[1];
+          a[0]=new T[1];
+          a[0][0]=b;
+       }
+       mmatrix(const mmatrix<T> &b) : N(b.N),M(b.M)
+       { 
+          int i,j; 
+-         a=new (T *)[N];   
++         a=new T *[N];   
+          for(i=0;i<N;i++) 
+          {
+             a[i]=new T[M];
+@@ -77,7 +77,7 @@
+          {
+             for(i=0;i<N;i++) delete [] a[i]; delete [] a;  // what if self-assigment ?!??
+             N=b.N;M=b.M;
+-            a=new (T *)[N];
++            a=new T *[N];
+             for(i=0;i<N;i++)
+                a[i]=new T[M];
+          }