ports/80634: [PATCH] fix gracer build on gcc3

[Eric Anholt]

>Number:         80634
>Category:       ports
>Synopsis:       [PATCH] fix gracer build on gcc3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu May 05 02:20:01 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Eric Anholt
>Release:        FreeBSD 6.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD leguin.anholt.net 6.0-CURRENT FreeBSD 6.0-CURRENT #9: Tue Apr 19 23:36:20 PDT 2005 anholt at leguin.anholt.net:/usr/src/current/sys/amd64/compile/MYKERNEL amd64

>Description:
	gracer build was broken with gcc3 due to empty cases at the end of
	switch statements.  Attached patch fixes that plus a bit of warning
	noise.

	It looks ugly to me when playing (colors are wrong) but I'm betting
	that's a 64-bit issue.

>How-To-Repeat:

>Fix:

--- gracer-unbreak.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/games/gracer/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- Makefile	18 Sep 2004 17:36:33 -0000	1.25
+++ Makefile	2 Apr 2005 02:20:27 -0000
@@ -36,10 +36,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile on FreeBSD >= 5.x"
-.endif
-
 pre-patch:
 	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/common/gr_memory.h
Index: files/patch-ac2scene.c
===================================================================
RCS file: files/patch-ac2scene.c
diff -N files/patch-ac2scene.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-ac2scene.c	2 Apr 2005 02:45:45 -0000
@@ -0,0 +1,37 @@
+--- ac2scene/ac2scene.c.orig	Fri Apr  1 18:36:19 2005
++++ ac2scene/ac2scene.c	Fri Apr  1 18:36:48 2005
+@@ -160,8 +160,6 @@
+       return 1;
+     }
+     break;
+-
+-  default:
+   }
+ 
+   return 0;
+@@ -232,8 +230,6 @@
+       return 1;
+     }
+     break;
+-
+-  default:
+   }
+ 
+   return 0;
+@@ -315,7 +311,6 @@
+       return 1;
+     }
+     break;
+-  default:
+   }
+ 
+   return 0;
+@@ -397,8 +392,6 @@
+       hints[i]->state = GR_SCENE_OPT_QUAD_STRIP_START;
+       hints[i]->surf->elements = gr_new (GrSElement, num_quads * 2 + 2);
+       break;
+-
+-    default:
+     }
+   }
+ 
Index: files/patch-glbind.c
===================================================================
RCS file: files/patch-glbind.c
diff -N files/patch-glbind.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-glbind.c	5 May 2005 01:46:35 -0000
@@ -0,0 +1,29 @@
+--- src/glbind.c.orig	Wed May  4 18:45:48 2005
++++ src/glbind.c	Wed May  4 18:46:20 2005
+@@ -2147,8 +2147,6 @@
+     TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
+     GL_CHECK(glLightModeli (pname, i));
+     return 3;
+-
+-  default:
+   }
+ 
+ ERROR:
+@@ -2886,8 +2884,6 @@
+     }
+     GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
+     return 6;
+-
+-  default:
+   }
+ 
+ ERROR:
+@@ -3078,8 +3074,6 @@
+     param[0] = d;
+     GL_CHECK(glTexParameterf (target, pname, param[0]));
+     return 4;
+-
+-  default:
+   }
+ 
+ ERROR:
Index: files/patch-glutwidgets.c
===================================================================
RCS file: files/patch-glutwidgets.c
diff -N files/patch-glutwidgets.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-glutwidgets.c	5 May 2005 01:51:24 -0000
@@ -0,0 +1,54 @@
+--- src/glutwidgets.c.orig	Wed May  4 18:47:07 2005
++++ src/glutwidgets.c	Wed May  4 18:48:56 2005
+@@ -254,7 +254,6 @@
+ 	widget->x -= (width - screen_width) / 2;
+ 	widget->width += (width - screen_width);
+ 	break;
+-      default:
+       }
+       switch (widget->anchor & GR_VERTICAL_MASK) {
+       case GR_BOTTOM:
+@@ -267,7 +266,6 @@
+ 	widget->y -= (height - screen_height) / 2;
+ 	widget->height += (width - screen_height);
+ 	break;
+-      default:
+       }
+       glut_widget_calc_bbox (widget);
+     }
+@@ -325,8 +323,6 @@
+ 	glut_widget_set_focus (glut_next_focus_widget (NULL));
+       }
+       break;
+-
+-    default:
+     }
+   }
+ 
+@@ -502,8 +498,6 @@
+ 	glut_widget_set_focus (widget);
+       }
+       break;
+-
+-    default:
+     }
+   }
+ 
+@@ -1297,8 +1291,6 @@
+     }
+     glut_post_redisplay ();
+     break;
+-
+-  default:
+   }
+ }
+ 
+@@ -1569,8 +1561,6 @@
+     case GR_RIGHT:
+       width = glut_label_width (obj) / 2;
+       break;
+-
+-    default:
+     }
+ 
+     glColor4fv (widget->fg_color[GR_STATE_NORMAL]);
Index: files/patch-gr_memory.h
===================================================================
RCS file: files/patch-gr_memory.h
diff -N files/patch-gr_memory.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-gr_memory.h	5 May 2005 01:51:12 -0000
@@ -0,0 +1,11 @@
+--- common/gr_memory.h.orig	Wed May  4 18:49:43 2005
++++ common/gr_memory.h	Wed May  4 18:49:45 2005
+@@ -64,7 +64,7 @@
+ void	gr_dlist_free			(GrDList *list);
+ 
+ #define gr_FOREACH(l,p) \
+-  for (; (l) != NULL && ((void *)(p) = (l)->data, 1); (l) = (l)->next) 
++  for (; (l) != NULL && ((p) = (l)->data, 1); (l) = (l)->next) 
+ 
+ void	gr_ref_incr			(GrRef *ref);
+ void	gr_ref_decr			(GrRef *ref);
Index: files/patch-gr_world.c
===================================================================
RCS file: files/patch-gr_world.c
diff -N files/patch-gr_world.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-gr_world.c	5 May 2005 01:51:40 -0000
@@ -0,0 +1,11 @@
+--- src/gr_world.c.orig	Wed May  4 18:49:13 2005
++++ src/gr_world.c	Wed May  4 18:49:24 2005
+@@ -167,8 +167,6 @@
+     case GR_CLINE_B_TO_A:
+       vehicle->lap_count --;
+       break;
+-
+-    default:
+     }
+ 
+     tlist = entry->triggers;
--- gracer-unbreak.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: