Attachment #53298 for bug #80634

View | Details | Raw Unified | Return to bug 80634
Collapse All | Expand All

Lines 36-45 Link Here

(-)Makefile (-4 lines)
36		36
37	.include <bsd.port.pre.mk>	37	.include <bsd.port.pre.mk>
38		38
39	.if ${OSVERSION} >= 502126
40	BROKEN= "Does not compile on FreeBSD >= 5.x"
41	.endif
42
43	pre-patch:	39	pre-patch:
44	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \	40	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
45	${WRKSRC}/common/gr_memory.h	41	${WRKSRC}/common/gr_memory.h




--- 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:
     }
   }
 




--- 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:




--- 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]);

Added Link Here

(-)files/patch-gr_memory.h (+11 lines)
1	--- common/gr_memory.h.orig Wed May 4 18:49:43 2005
2	+++ common/gr_memory.h Wed May 4 18:49:45 2005
3	@@ -64,7 +64,7 @@
4	void gr_dlist_free (GrDList *list);
5
6	#define gr_FOREACH(l,p) \
7	- for (; (l) != NULL && ((void *)(p) = (l)->data, 1); (l) = (l)->next)
8	+ for (; (l) != NULL && ((p) = (l)->data, 1); (l) = (l)->next)
9
10	void gr_ref_incr (GrRef *ref);
11	void gr_ref_decr (GrRef *ref);

Added Link Here

(-)files/patch-gr_world.c (+11 lines)
1	--- src/gr_world.c.orig Wed May 4 18:49:13 2005
2	+++ src/gr_world.c Wed May 4 18:49:24 2005
3	@@ -167,8 +167,6 @@
4	case GR_CLINE_B_TO_A:
5	vehicle->lap_count --;
6	break;
7	-
8	- default:
9	}
10
11	tlist = entry->triggers;

Return to bug 80634

Added Link Here

(-)files/patch-ac2scene.c (+37 lines)
1	--- ac2scene/ac2scene.c.orig Fri Apr 1 18:36:19 2005
2	+++ ac2scene/ac2scene.c Fri Apr 1 18:36:48 2005
3	@@ -160,8 +160,6 @@
4	return 1;
5	}
6	break;
7	-
8	- default:
9	}
10
11	return 0;
12	@@ -232,8 +230,6 @@
13	return 1;
14	}
15	break;
16	-
17	- default:
18	}
19
20	return 0;
21	@@ -315,7 +311,6 @@
22	return 1;
23	}
24	break;
25	- default:
26	}
27
28	return 0;
29	@@ -397,8 +392,6 @@
30	hints[i]->state = GR_SCENE_OPT_QUAD_STRIP_START;
31	hints[i]->surf->elements = gr_new (GrSElement, num_quads * 2 + 2);
32	break;
33	-
34	- default:
35	}
36	}
37

Added Link Here

(-)files/patch-glbind.c (+29 lines)
1	--- src/glbind.c.orig Wed May 4 18:45:48 2005
2	+++ src/glbind.c Wed May 4 18:46:20 2005
3	@@ -2147,8 +2147,6 @@
4	TCL_CHECK(Tcl_GetIntFromObj(interp, objv[2], &i), ERROR);
5	GL_CHECK(glLightModeli (pname, i));
6	return 3;
7	-
8	- default:
9	}
10
11	ERROR:
12	@@ -2886,8 +2884,6 @@
13	}
14	GL_CHECK(glTexEnvfv (GL_TEXTURE_ENV, pname, param));
15	return 6;
16	-
17	- default:
18	}
19
20	ERROR:
21	@@ -3078,8 +3074,6 @@
22	param[0] = d;
23	GL_CHECK(glTexParameterf (target, pname, param[0]));
24	return 4;
25	-
26	- default:
27	}
28
29	ERROR:

Added Link Here

(-)files/patch-glutwidgets.c (+54 lines)
1	--- src/glutwidgets.c.orig Wed May 4 18:47:07 2005
2	+++ src/glutwidgets.c Wed May 4 18:48:56 2005
3	@@ -254,7 +254,6 @@
4	widget->x -= (width - screen_width) / 2;
5	widget->width += (width - screen_width);
6	break;
7	- default:
8	}
9	switch (widget->anchor & GR_VERTICAL_MASK) {
10	case GR_BOTTOM:
11	@@ -267,7 +266,6 @@
12	widget->y -= (height - screen_height) / 2;
13	widget->height += (width - screen_height);
14	break;
15	- default:
16	}
17	glut_widget_calc_bbox (widget);
18	}
19	@@ -325,8 +323,6 @@
20	glut_widget_set_focus (glut_next_focus_widget (NULL));
21	}
22	break;
23	-
24	- default:
25	}
26	}
27
28	@@ -502,8 +498,6 @@
29	glut_widget_set_focus (widget);
30	}
31	break;
32	-
33	- default:
34	}
35	}
36
37	@@ -1297,8 +1291,6 @@
38	}
39	glut_post_redisplay ();
40	break;
41	-
42	- default:
43	}
44	}
45
46	@@ -1569,8 +1561,6 @@
47	case GR_RIGHT:
48	width = glut_label_width (obj) / 2;
49	break;
50	-
51	- default:
52	}
53
54	glColor4fv (widget->fg_color[GR_STATE_NORMAL]);