Fix pthread linkage and 'label at end of compound statement' problems.

11 files changed, 121 insertions, 4 deletions

diff --git a/games/nagi/distinfo b/games/nagi/distinfo
index a45685e1e0f..1d08b55beb4 100644
--- a/games/nagi/distinfo
+++ b/games/nagi/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:12:00 agc Exp $
+$NetBSD: distinfo,v 1.3 2006/03/28 21:51:53 joerg Exp $
 
 SHA1 (nagi_src_-_2002-11-14.tar.gz) = 3afeae70e78dd36a3d8b114212992318a8182372
 RMD160 (nagi_src_-_2002-11-14.tar.gz) = 0dbbb6895ba067d91d5afd3ba11c8f82aacf1488
@@ -6,4 +6,13 @@ Size (nagi_src_-_2002-11-14.tar.gz) = 168462 bytes
 SHA1 (patch-aa) = 92da2bdf74408185e5bcf8ca4633f29562fdc041
 SHA1 (patch-ab) = be98a1935d935d0da3b88ec7ae4b74fa4d3d57fe
 SHA1 (patch-ac) = 10ec8958798d0f50af5a3ddd5fb2fedfd53c3f13
-SHA1 (patch-ad) = 138424ecf4d319a697c27f6c2ddbfb221c64dcec
+SHA1 (patch-ad) = 3f6cb5448ac719ceae53f859a3b015a50491e7d9
+SHA1 (patch-ae) = 8ab722a361ae1bba01ac4bb9aa6c421f3a0ef44e
+SHA1 (patch-af) = 3609522591c35577101057b7788dadd4adbdc77d
+SHA1 (patch-ag) = 3b403c462fb68ca05af0d1192217f11d05b196dd
+SHA1 (patch-ah) = 12c700341b5917fece51f28d6db1941156bd854f
+SHA1 (patch-ai) = 566176ac035ab5378234d9108856a6bf00ef4f99
+SHA1 (patch-aj) = 1e11131742814af3af1bfa2a3159712d1b0c12e7
+SHA1 (patch-ak) = 50a507e37ce0d347c624f25045161ce9bf0bc7c8
+SHA1 (patch-al) = 73f029bd9bce9860fdb21508c724a9ff2eda6a84
+SHA1 (patch-am) = 291aea5cdc08121061004bd4bf982cd7eb44f9af
diff --git a/games/nagi/patches/patch-ad b/games/nagi/patches/patch-ad
index 57b1fa65eb7..b74bb0d8ca5 100644
--- a/games/nagi/patches/patch-ad
+++ b/games/nagi/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/08/16 15:33:01 drochner Exp $
+$NetBSD: patch-ad,v 1.2 2006/03/28 21:51:53 joerg Exp $
 
 --- Makefile.linux.orig	2003-08-11 15:44:26.000000000 +0200
 +++ Makefile.linux	2003-08-11 15:46:00.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2003/08/16 15:33:01 drochner Exp $
  CFLAGS += -DRAD_LINUX -DRAD_WARN
  
 -LIB = -lSDLmain -lSDL -lpthread
-+LIB = -lSDLmain -lSDL -lpthread -lcompat
++LIB = -lSDLmain -lSDL ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} -lcompat
  
  all:	nagi
  
diff --git a/games/nagi/patches/patch-ae b/games/nagi/patches/patch-ae
new file mode 100644
index 00000000000..15da8f18d46
--- /dev/null
+++ b/games/nagi/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- objects.c.orig	2006-03-28 20:46:22.000000000 +0000
++++ objects.c
+@@ -146,6 +146,7 @@ int object_file_load()
+ 		
+ 		count = 0;
+ 	obj_continue:
++		;
+ 	}
+ 	
+ 	// bung in a '\0' at the end if one doesn't exist
diff --git a/games/nagi/patches/patch-af b/games/nagi/patches/patch-af
new file mode 100644
index 00000000000..452ac109db7
--- /dev/null
+++ b/games/nagi/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- view/obj_proximity.c.orig	2006-03-28 20:51:44.000000000 +0000
++++ view/obj_proximity.c
+@@ -40,6 +40,7 @@ u16 obj_chk_contact(VIEW *v)
+ 					return 1;
+ 			
+ 			loc472e:
++				;
+ 		}
+ 	}
+ 	return 0;
diff --git a/games/nagi/patches/patch-ag b/games/nagi/patches/patch-ag
new file mode 100644
index 00000000000..e492be03ee0
--- /dev/null
+++ b/games/nagi/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- view/obj_loop.c.orig	2006-03-28 20:53:13.000000000 +0000
++++ view/obj_loop.c
+@@ -63,6 +63,7 @@ void obj_loop_update(VIEW *v)
+ 					c = max;
+ 				break;
+ 			default:
++				break;
+ 		}
+ 		
+ 		obj_cel_set(v, c);
diff --git a/games/nagi/patches/patch-ah b/games/nagi/patches/patch-ah
new file mode 100644
index 00000000000..d4fc86cf5e4
--- /dev/null
+++ b/games/nagi/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- view/obj_motion.c.orig	2006-03-28 20:55:02.000000000 +0000
++++ view/obj_motion.c
+@@ -67,6 +67,7 @@ void obj_motion_update(VIEW *v)
+ 			obj_move_update(v);
+                 	break;
+ 	        default:
++			break;
+         }
+ 
+ 	if (state.block_state == 0)
diff --git a/games/nagi/patches/patch-ai b/games/nagi/patches/patch-ai
new file mode 100644
index 00000000000..0507c5323c9
--- /dev/null
+++ b/games/nagi/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- ui/msg.c.orig	2006-03-28 21:24:15.000000000 +0000
++++ ui/msg.c
+@@ -386,6 +386,7 @@ u8 *r_display1f93(u8 *given_source, u8 *
+ 							break;
+ 						
+ 						default:
++							break;
+ 					}
+ 					break;
+ 					
diff --git a/games/nagi/patches/patch-aj b/games/nagi/patches/patch-aj
new file mode 100644
index 00000000000..f3c6f569769
--- /dev/null
+++ b/games/nagi/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- ui/events.c.orig	2006-03-28 21:28:10.000000000 +0000
++++ ui/events.c
+@@ -315,6 +315,7 @@ AGI_EVENT *event_read(void)
+ 				break;
+ 			
+ 			default:
++				break;
+ 		}
+ 	}
+ 
diff --git a/games/nagi/patches/patch-ak b/games/nagi/patches/patch-ak
new file mode 100644
index 00000000000..b6063fac89e
--- /dev/null
+++ b/games/nagi/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- ui/cmd_input.c.orig	2006-03-28 21:29:27.000000000 +0000
++++ ui/cmd_input.c
+@@ -95,6 +95,7 @@ void input_poll(void)
+ 				mouse_event_handle(si);	
+ 				break;
+ 			default:	
++				break;
+ 		}
+ 		si = control_key_map(  event_read()  );
+ 	}
diff --git a/games/nagi/patches/patch-al b/games/nagi/patches/patch-al
new file mode 100644
index 00000000000..a5c66c53982
--- /dev/null
+++ b/games/nagi/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- ui/menu.c.orig	2006-03-28 21:31:35.000000000 +0000
++++ ui/menu.c
+@@ -358,6 +358,7 @@ menu_loop:
+ 					break;
+ 				
+ 				default:	// NONE?
++					break;
+ 			}
+ 			break;
+ 	}
diff --git a/games/nagi/patches/patch-am b/games/nagi/patches/patch-am
new file mode 100644
index 00000000000..693aa0f515c
--- /dev/null
+++ b/games/nagi/patches/patch-am
@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.1 2006/03/28 21:51:53 joerg Exp $
+
+--- ui/list_box.c.orig	2006-03-28 21:32:55.000000000 +0000
++++ ui/list_box.c
+@@ -205,6 +205,7 @@ int list_box(u8 **list, int size, int in
+ 						break;
+ 						
+ 					default:
++						break;
+ 				}
+ 				
+ 				if (item_cur < 0)