pkg/26941: audio/mpg123 broken for mac68k

[hbent%cs.oberlin.edu@localhost]

>Number:         26941
>Category:       pkg
>Synopsis:       audio/mpg123 broken for mac68k
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 13 22:04:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Henry R. Bent
>Release:        NetBSD 2.0_BETA
>Organization:
Oberlin College CIT
>Environment:
NetBSD aurora 2.0_BETA NetBSD 2.0_BETA (aurora) #0: Sat May  1 15:08:28 EDT 
2004  root@aurora:/usr/src/sys/arch/mac68k/compile/aurora mac68k
>Description:
audio/mpg123 stops because the mac68k port already defines "struct frame" in 
<machine/cpu.h> which is presumably being pulled in by something.  Output:

===> Building for mpg123-0.59.18nb3
/usr/bin/make CC=cc LDFLAGS=  OBJECTS='decode.o dct64.o audio_sun.o term.o'  
CFLAGS='-O2 -Wall -ansi -pedantic -O3 -fomit-frame-pointer  -ffast-math 
-DREAL_IS_FLOAT -DREAD_MMAP  -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL'  
mpg123-make
cc -O2 -Wall -ansi -pedantic -O3 -fomit-frame-pointer  -ffast-math 
-DREAL_IS_FLOAT -DREAD_MMAP  -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL   
-c mpg123.c
In file included from mpg123.c:30:
mpg123.h:206: error: redefinition of `struct frame'
mpg123.c:483: warning: initialization makes integer from pointer without a cast
*** Error code 1


>How-To-Repeat:
Build audio/mpg123 on a mac68k system running 2.0.  I have no idea if this 
affects earlier versions of NetBSD.
>Fix:
I haven't tried this, but I suppose you could rename all instances of "struct 
frame" in mpg123 to "struct mpg123frame" or the like.  There must be a better 
way, though.
>Release-Note:
>Audit-Trail:
>Unformatted: