Make this compile (__STDC__ wrongly undefined, and also attr_t redefinition

conflict with curses)

5 files changed, 59 insertions, 1 deletions

diff --git a/games/netmaj/distinfo b/games/netmaj/distinfo
index 1aa9f680071..bc5add302b8 100644
--- a/games/netmaj/distinfo
+++ b/games/netmaj/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/04/22 09:58:59 kei Exp $
+$NetBSD: distinfo,v 1.2 2004/01/23 19:05:45 agc Exp $
 
 SHA1 (netmaj-2.0.7.tar.gz) = 1363ea8ca42079fb444b25c605d264b5f083e260
 Size (netmaj-2.0.7.tar.gz) = 213819 bytes
@@ -9,3 +9,7 @@ SHA1 (patch-ad) = 0b0c286ea94a52181305bbb1489bc842bb7586bf
 SHA1 (patch-ae) = 6bee67884b364ea874befd952f54d6141a41807f
 SHA1 (patch-af) = 1b10eaa70c262a215f84098b5c5600efe57f1071
 SHA1 (patch-ag) = 0aec049d77592be348b40d37cd53510f5b600561
+SHA1 (patch-ah) = d2ad2b03dd7171418eba9617549081cd89982b96
+SHA1 (patch-ai) = 342bf9ac6bf030a83529fb321ea373d10cf2f591
+SHA1 (patch-aj) = a25f2e0f81c10121767dae99bd6c09be69467a13
+SHA1 (patch-ak) = 479f09a2d9a3a853b55304fa49a72f055e29cdea
diff --git a/games/netmaj/patches/patch-ah b/games/netmaj/patches/patch-ah
new file mode 100644
index 00000000000..79fb25fb528
--- /dev/null
+++ b/games/netmaj/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2004/01/23 19:05:45 agc Exp $
+
+--- pai.h	2004/01/23 18:56:09	1.1
++++ pai.h	2004/01/23 18:57:00
+@@ -122,7 +122,7 @@
+ 		    ||(K_SOU_2 <= (p) && (p) <= K_SOU_9) )?((p)-1):0)
+ 
+ 
+-typedef int attr_t;
++typedef int pai_attr_t;
+ 
+ #define R_MASK		0007
+ #define F_MASK		0070
diff --git a/games/netmaj/patches/patch-ai b/games/netmaj/patches/patch-ai
new file mode 100644
index 00000000000..155ad5936a4
--- /dev/null
+++ b/games/netmaj/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/01/23 19:05:45 agc Exp $
+
+--- global.h	2004/01/23 18:57:54	1.1
++++ global.h	2004/01/23 18:58:17
+@@ -70,7 +70,7 @@
+ typedef struct river {
+ 	pai_t in;		/* get pai */
+ 	pai_t out;		/* put pai */
+-	attr_t attr;		/* attr (how get, how put, how ...)*/
++	pai_attr_t attr;		/* attr (how get, how put, how ...)*/
+ 	struct river *prev;
+ 	struct river *next;
+ } river_t;
diff --git a/games/netmaj/patches/patch-aj b/games/netmaj/patches/patch-aj
new file mode 100644
index 00000000000..7e7a6a3352b
--- /dev/null
+++ b/games/netmaj/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/01/23 19:05:45 agc Exp $
+
+--- log.c	2004/01/23 18:57:54	1.1
++++ log.c	2004/01/23 18:58:33
+@@ -31,7 +31,7 @@
+ 	return pai_strings[n];
+ }
+ 
+-char *attr2str(n) attr_t n; {
++char *attr2str(n) pai_attr_t n; {
+ 	static char buf[4];
+ 	buf[0] = F_CHARS[F_GET(n)>>F_SHFT];
+ 	buf[1] = T_CHARS[T_GET(n)>>T_SHFT];
diff --git a/games/netmaj/patches/patch-ak b/games/netmaj/patches/patch-ak
new file mode 100644
index 00000000000..f72853ef461
--- /dev/null
+++ b/games/netmaj/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2004/01/23 19:05:45 agc Exp $
+
+--- lib/libcurses/printw.c	2004/01/23 19:01:18	1.1
++++ lib/libcurses/printw.c	2004/01/23 19:01:45
+@@ -42,10 +42,6 @@
+  * is not in effect.
+  */
+ 
+-#ifdef __GNUC__
+-#undef __STDC__
+-#endif
+-
+ #if __STDC__
+ #include <stdarg.h>
+ #else