From f1a2ff6ffe9ab742f6855b8de64d944bbae57112 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sun, 22 Aug 2004 19:41:04 +0000
Subject: [PATCH] Fix build with gcc-3.4

---
 games/bombermaze/files/patch-src_map.cc       | 23 +++++++++++++
 .../files/patch-dweputils_dwepcrack_weakksa.c | 16 +++++++++
 sysutils/cotty/files/patch-cotty-0.4c.c       | 34 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 games/bombermaze/files/patch-src_map.cc
 create mode 100644 net-mgmt/bsd-airtools/files/patch-dweputils_dwepcrack_weakksa.c
 create mode 100644 sysutils/cotty/files/patch-cotty-0.4c.c

diff --git a/games/bombermaze/files/patch-src_map.cc b/games/bombermaze/files/patch-src_map.cc
new file mode 100644
index 000000000000..0e5e66185352
--- /dev/null
+++ b/games/bombermaze/files/patch-src_map.cc
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- src/map.cc.orig	Sun Feb 25 08:50:07 2001
++++ src/map.cc	Sun Aug 22 21:25:12 2004
+@@ -1587,7 +1587,7 @@
+   width = w;
+   height = h;
+ 
+-  map = new (char *)[width];
++  map = new char * [width];
+ 
+   unsigned i;
+   for (i = 0; i < width; i++)
+@@ -1728,7 +1728,7 @@
+ 
+ void GameMap::allocate_map(MapSquare ***m)
+ {
+-  *m = new (MapSquare *)[width];
++  *m = new MapSquare * [width];
+   int i;
+   for (i = 0; i < width; i++)
+   {
diff --git a/net-mgmt/bsd-airtools/files/patch-dweputils_dwepcrack_weakksa.c b/net-mgmt/bsd-airtools/files/patch-dweputils_dwepcrack_weakksa.c
new file mode 100644
index 000000000000..d7a1701dbf11
--- /dev/null
+++ b/net-mgmt/bsd-airtools/files/patch-dweputils_dwepcrack_weakksa.c
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- dweputils/dwepcrack/weakksa.c.orig	Sun Aug 22 21:34:55 2004
++++ dweputils/dwepcrack/weakksa.c	Sun Aug 22 21:35:13 2004
+@@ -168,8 +168,8 @@
+           memcpy(samples[B].s[samples[B].len].iv, iv, IV_SIZE);
+           samples[B].s[samples[B].len++].byte = iv[4] ^ 0xaa;
+ 
+-          fail:
+-        }
++          fail: break;
++	}
+       }
+     }
+   }
diff --git a/sysutils/cotty/files/patch-cotty-0.4c.c b/sysutils/cotty/files/patch-cotty-0.4c.c
new file mode 100644
index 000000000000..302d0b746512
--- /dev/null
+++ b/sysutils/cotty/files/patch-cotty-0.4c.c
@@ -0,0 +1,34 @@
+
+$FreeBSD$
+
+--- cotty-0.4c.c.orig	Sun Aug 22 21:39:06 2004
++++ cotty-0.4c.c	Sun Aug 22 21:40:01 2004
+@@ -748,6 +748,7 @@
+ 		return 1;
+ 	case normal:
+ 	case keep_current:
++	break;
+ 	}
+ 	return 2;
+ }
+@@ -762,7 +763,8 @@
+ 	case normal:
+ 	case keep_current:
+ 	case direct:
+-	}
++	break;
++	}	
+ 	return 2;
+ }
+ 
+@@ -989,8 +991,8 @@
+ 		strcpy(tty_name[1],pty_name[0]);
+ 		strcpy(pty_name[1],tty_name[0]);
+ 		break;
+-	case normal:
+-	case keep_current:
++	case normal: break;
++	case keep_current: break;
+ 	}
+ 	/* we don't need those null fds anymore */
+ 	for (j=0;j<3;j++) {