>Number:         36383
>Category:       pkg
>Synopsis:       fixed error in build of graphics/urt
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed May 23 23:25:01 +0000 2007
>Originator:     brad harder <bharder@methodlogic.net>
>Release:        NetBSD 4.0_BETA2
>Organization:
http://www.methodlogic.net
>Environment:
System: NetBSD manchester 4.0_BETA2 NetBSD 4.0_BETA2 (manchester) #30: Tue May 8 18:41:42 PDT 2007 root@manchester:/usr/obj/sys/arch/i386/compile/manchester i386
Architecture: i386
Machine: i386
>Description:
	pkgsrc/graphics/urt had an error where a struct typedef named "stack_t" collided with "stack_t" in /usr/include/sys/sigtypes.h. This occured in build of work/tools/clock/rleClock.c. The PLIST still incorrectly listed the rleClock binary and manpage as being installed, though they weren't built.
>How-To-Repeat:
	cd /usr/pkgsrc/graphics/urt; make
>Fix:

patch-ay 
SHA1 (patch-ay) = eb602475db619e3db796c019d6cf66bf5c97a537
==========================================================

	
$NetBSD$

--- tools/clock/rleClock.c.orig	1992-04-30 07:19:39.000000000 -0700
+++ tools/clock/rleClock.c
@@ -909,14 +909,14 @@ drawText()
 typedef struct {
     short x, y;
     int dir;
-} stack_t;
+} rle_clock_stack_t;
 
 #define NORTH 0
 #define WEST 1
 #define SOUTH 2
 #define EAST 3
 struct {
-	stack_t *s;
+	rle_clock_stack_t *s;
 	int	top;
 	int allocked;
 } Stack;
@@ -929,9 +929,9 @@ areaFlood(firstX, firstY, mask, match, v
 int firstX, firstY;
 int mask, match, value;
 {
-    register stack_t *sp;
+    register rle_clock_stack_t *sp;
 
-    Stack.s = (stack_t *) calloc(256, sizeof(stack_t));
+    Stack.s = (rle_clock_stack_t *) calloc(256, sizeof(rle_clock_stack_t));
     Stack.allocked = 256;
     Stack.top = -1;
     stackPush(firstX, firstY, NORTH);
@@ -964,7 +964,7 @@ int x, y, dir;
 {
     if (++Stack.top >= Stack.allocked) {
 	    Stack.allocked += 256;
-	    Stack.s = (stack_t *) realloc(Stack.s, Stack.allocked * sizeof(stack_t));
+	    Stack.s = (rle_clock_stack_t *) realloc(Stack.s, Stack.allocked * sizeof(rle_clock_stack_t));
 if(Debug)fprintf(stderr, "Stack growing to %d\n", Stack.allocked);
     }
 	Stack.s[Stack.top].x = x;