Fix GCC 3.4+: label at end of compound statement.

5 files changed, 104 insertions, 2 deletions

diff --git a/devel/pedisassem/distinfo b/devel/pedisassem/distinfo
index f06a6e792ce..9f8cca5a0f8 100644
--- a/devel/pedisassem/distinfo
+++ b/devel/pedisassem/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:30 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/12/20 14:22:00 joerg Exp $
 
 SHA1 (dsasmsrc.zip) = bc50eb6786dd0f5c68e61036587e04919721156c
 RMD160 (dsasmsrc.zip) = fac4e2e37f5b3c6649a32e4ed6004079e2cb60bb
 Size (dsasmsrc.zip) = 104759 bytes
 SHA1 (patch-aa) = fa289b7dad71b9c732681dd57ffd06a9118dc2d3
+SHA1 (patch-ab) = 5ee866f0bc5faa6658485b0b5a77dd2e84aa781a
+SHA1 (patch-ac) = ad261e1f1b3672021441d7a9a78534a6054a026f
diff --git a/devel/pedisassem/patches/patch-ab b/devel/pedisassem/patches/patch-ab
new file mode 100644
index 00000000000..0803edf9e0e
--- /dev/null
+++ b/devel/pedisassem/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2005/12/20 14:22:00 joerg Exp $
+
+--- print.c.orig	2005-12-20 14:15:56.000000000 +0000
++++ print.c
+@@ -226,6 +226,7 @@ int n;
+         case 32: pr1ntf("dword"); printCol+=5; break;
+         case 64: pr1ntf("qword"); printCol+=5; break;
+         default:
++	    break;
+     }
+     prefix();
+ }
+@@ -431,6 +432,7 @@ void nmonicprint()
+             case 16: print16case();
+                      break;
+             default:
++		     break;
+         }
+     }
+     else 
+@@ -450,6 +452,7 @@ void nmonicprint()
+             case  5: print25case();
+                      break;
+             default:
++		     break;
+         }
+     }    
+ } /* end of nmonicprint() */
diff --git a/devel/pedisassem/patches/patch-ac b/devel/pedisassem/patches/patch-ac
new file mode 100644
index 00000000000..288aabca8a3
--- /dev/null
+++ b/devel/pedisassem/patches/patch-ac
@@ -0,0 +1,59 @@
+$NetBSD: patch-ac,v 1.1 2005/12/20 14:22:00 joerg Exp $
+
+--- main.c.orig	2005-12-20 14:14:04.000000000 +0000
++++ main.c
+@@ -2147,6 +2147,7 @@ PBYTE  q, qq;
+                 /*----------*/popTrace();
+             }
+         default:
++	    break;
+     }
+     return 1;
+ }
+@@ -2247,6 +2248,7 @@ BYTE   b, bb;
+             /*-----------*/popTrace();
+             break;
+         default:
++	    break;
+     }
+ }
+ 
+@@ -2307,6 +2309,7 @@ _key_    y;
+         {
+             case  8: changeTo80Real(r,rmax);  break;
+             default: 
++		break;
+         }
+     }
+ }
+@@ -2971,6 +2974,7 @@ BYTE           b;
+             //if (ref<pos+4) { eraseUncertain(ref); break; }
+ 
+             default:
++		break;
+         }
+     }
+  //
+@@ -3043,6 +3047,7 @@ BYTE           b;
+                      }
+                  }
+             default:
++		break;
+         }
+     }
+ }
+@@ -3218,6 +3223,7 @@ DWORD   i;
+              }
+              break;
+         default:
++	     break;
+     }
+     /*-----------*/popTrace();
+ }
+@@ -4550,4 +4556,4 @@ void addLabels(DWORD r, int pri)
+     }*/
+     addLabelsNum++;
+     setFirstTime(r);
+-}
+\ No newline at end of file
++}
diff --git a/games/xconq/distinfo b/games/xconq/distinfo
index 9bfb8b4f782..c0fdf8bbf91 100644
--- a/games/xconq/distinfo
+++ b/games/xconq/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 23:12:04 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/12/20 14:26:10 joerg Exp $
 
 SHA1 (xconq-7.4.1.tar.gz) = b7d03d17806500f05c23889a00b7608843a27ce7
 RMD160 (xconq-7.4.1.tar.gz) = e596eaccb6a48709e9ceb58fc59e715e36dbf43a
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 2a5989750d187d911e7bf443a1354a390dd7ab2d
 SHA1 (patch-ah) = 56ed616d61b2029bbf1dcd9a9fb1b89793761c5c
 SHA1 (patch-ai) = 10d285f9693f79f8591f1f24baf8916f0973b9a1
 SHA1 (patch-aj) = 89d6d7e50c776ef2628897a081da7b9f61cddc4d
+SHA1 (patch-ak) = c8ed8ac403cd9dc1fc1c6befdd175f1e3f4d4ddb
diff --git a/games/xconq/patches/patch-ak b/games/xconq/patches/patch-ak
new file mode 100644
index 00000000000..945fd9e5729
--- /dev/null
+++ b/games/xconq/patches/patch-ak
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2005/12/20 14:26:10 joerg Exp $
+
+--- tcltk/tkmain.c.orig	2005-12-20 14:23:32.000000000 +0000
++++ tcltk/tkmain.c
+@@ -1381,6 +1381,7 @@ could_attack(Unit *unit, int u2, Side *s
+ 	  return TRUE;
+       case 1:
+       default:
++	  break;
+     }
+     return FALSE;
+ }