Make this package compile when using gcc 3.3.

4 files changed, 57 insertions, 1 deletions

diff --git a/lang/sather/distinfo b/lang/sather/distinfo
index 935926363ab..a2826125010 100644
--- a/lang/sather/distinfo
+++ b/lang/sather/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/04/29 23:40:02 jtb Exp $
+$NetBSD: distinfo,v 1.4 2004/01/13 20:56:31 kristerw Exp $
 
 SHA1 (sather-1.2.1.tar.gz) = 434f6b9c69d63a022c83f3693011415ad9730cb1
 Size (sather-1.2.1.tar.gz) = 4458088 bytes
@@ -21,6 +21,9 @@ SHA1 (patch-ap) = 5fedfb90a13d36406486d1d86bbcf0a22a0e19a5
 SHA1 (patch-aq) = 82dd99ac9741766fb010764353451f990b027f58
 SHA1 (patch-ar) = 7add10b00c76179d864405f81b984fc38a185a2c
 SHA1 (patch-as) = 8970360fdae89308baacbf5beb39b62c7137d4cc
+SHA1 (patch-at) = 47662072aee4c924e33d6396eecf4ba56f87f2cb
 SHA1 (patch-au) = c014dc73d0dae3f777ecf18380efce7478147550
 SHA1 (patch-av) = 89573de88e99140dfb7fdae226646e40792a5752
 SHA1 (patch-aw) = 87dbb259e058d7f246b523b8b4e101b02435c004
+SHA1 (patch-ax) = 21801b475c59f48d561fed063fc758cc331f92ec
+SHA1 (patch-ay) = 69237cba23aef19677d681db60fabcd9029893a7
diff --git a/lang/sather/patches/patch-at b/lang/sather/patches/patch-at
new file mode 100644
index 00000000000..2fbba7cebb0
--- /dev/null
+++ b/lang/sather/patches/patch-at
@@ -0,0 +1,27 @@
+$NetBSD: patch-at,v 1.3 2004/01/13 20:56:31 kristerw Exp $
+
+--- System/Common/floatmath.h.orig	Tue Jan 13 20:35:43 2004
++++ System/Common/floatmath.h	Tue Jan 13 20:36:30 2004
+@@ -104,14 +104,14 @@
+ #else
+ /* WITHOUT single-precision library */
+ 
+-#define _FM_F(name)	static FLT r_##name() {return name##();}
+-#define _FM_F_I(name)	static FLT r_##name(INT i) {return name##(i);}
+-#define _FM_F_F(name)	static FLT r_##name(FLT f) {return name##(f);}
+-#define _FM_F_FF(name)	static FLT r_##name(FLT f,FLT g) {return name##(f,g);}
+-#define _FM_F_FI(name)	static FLT r_##name(FLT f,INT i) {return name##(f,i);}
+-#define _FM_F_IF(name)	static FLT r_##name(INT i,FLT f) {return name##(i,f);}
+-#define _FM_B_F(name)	static BOOL ir_##name(FLT f) {return ir_##name##(f);}
+-#define _FM_I_F(name)	static INT ir_##name(FLT f) {return ir_##name##(f);}
++#define _FM_F(name)	static FLT r_##name() {return name();}
++#define _FM_F_I(name)	static FLT r_##name(INT i) {return name(i);}
++#define _FM_F_F(name)	static FLT r_##name(FLT f) {return name(f);}
++#define _FM_F_FF(name)	static FLT r_##name(FLT f,FLT g) {return name(f,g);}
++#define _FM_F_FI(name)	static FLT r_##name(FLT f,INT i) {return name(f,i);}
++#define _FM_F_IF(name)	static FLT r_##name(INT i,FLT f) {return name(i,f);}
++#define _FM_B_F(name)	static BOOL ir_##name(FLT f) {return ir_##name(f);}
++#define _FM_I_F(name)	static INT ir_##name(FLT f) {return ir_##name(f);}
+ #define _FM_V_FP(name)	static void r_##name(FLT f, FLT g[])\
+ 			{double a,b; sincos(f,&a,&b); g[0]=a; g[1]=b;}
+ 
diff --git a/lang/sather/patches/patch-ax b/lang/sather/patches/patch-ax
new file mode 100644
index 00000000000..86d8c05b15f
--- /dev/null
+++ b/lang/sather/patches/patch-ax
@@ -0,0 +1,13 @@
+$NetBSD: patch-ax,v 1.1 2004/01/13 20:56:31 kristerw Exp $
+
+--- Library/Ext/fortran.config.orig	Tue Jan 13 20:40:28 2004
++++ Library/Ext/fortran.config	Tue Jan 13 20:40:39 2004
+@@ -139,7 +139,7 @@
+ F_ARRAY3_CREATE_ARRAY3:   PP, exec "(@0)$1->arr_part";
+ 
+ F_ARRAY2_CREATE_MAT:	PP, exec "(@0)$1->arr_part";
+-#endif FORTRAN_CONFIG
++#endif
+ 
+ 
+ 
diff --git a/lang/sather/patches/patch-ay b/lang/sather/patches/patch-ay
new file mode 100644
index 00000000000..f6f161697c6
--- /dev/null
+++ b/lang/sather/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2004/01/13 20:56:31 kristerw Exp $
+
+--- Library/Ext/c.config.orig	Tue Jan 13 20:41:30 2004
++++ Library/Ext/c.config	Tue Jan 13 20:41:40 2004
+@@ -187,7 +187,7 @@
+ C_LONG_DOUBLE_PTR_IS_EQ:	PP,VSTD,exec	"$$=C_LONG_DOUBLE_PTR_IS_EQ($0,$1);" "$$";
+ 
+ 
+-#endif C_CONFIG
++#endif
+ 
+ 
+