pkg/40198: www/amaya compile errors (modular xorg, NetBSD 4.0) .. again

[kre%munnari.OZ.AU@localhost]

>Number:         40198
>Category:       pkg
>Synopsis:       www/amaya compile errors (modular xorg, NetBSD 4.0) .. again
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Dec 16 10:55:00 +0000 2008
>Originator:     Robert Elz
>Release:        NetBSD 4.0_STABLE  (pkgsrc current within past 4 hours)
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD jade.coe.psu.ac.th 4.0_STABLE NetBSD 4.0_STABLE 
(JADE-1.696-20080517) #9: Fri May 23 18:55:13 ICT 2008 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/4/kernels/JADE i386
Architecture: i386
Machine: i386
>Description:
        Attempting to build www/amaya on a NetBSD 4.0 system without
        the 4.0 x sets, but with X11_TYPE=modular (modular xorg)
        bombs with a compilation errro (redefinition of __intptr_t)

>How-To-Repeat:
        I use pkg_comp with NetBSD 4.0 (release) sets istalled, except the
        X sets (none of those), with libkver simulating a 4.0 execution
        environment, and X11_TYPE=modular to get pkgsrc's modular xorg.

        Aside (perhaps) from NetBSD 4 (rather than 5_BETA or current)
        I doubt any of the above is relevant to this error.

        When building, we eventually get to ...

gmake[1]: Leaving directory 
`/pkg_comp/obj/pkgsrc/www/amaya/4x/Amaya/work/thotlib'
gmake[1]: Entering directory 
`/pkg_comp/obj/pkgsrc/www/amaya/4x/Amaya/work/thotlib'
c++ -O2 -Dunix -fno-strict-aliasing -I/usr/pkg/include 
-I/usr/pkg/include/freetype2 -I/usr/include -Wall -x c++ -D__cplusplus -D_UNIX 
-D_GL -D_WX -DHAVE_CONFIG_H -I.. -I../../amaya/xpm -I../../thotlib/include 
-I../../thotlib/internals/var -I../../thotlib/internals/h 
-I../../thotlib/internals/f   
-I/pkg_comp/obj/pkgsrc/www/amaya/4x/wxWidgets/src/png 
-I/pkg_comp/obj/pkgsrc/www/amaya/4x/wxWidgets/src/jpeg 
-I/pkg_comp/obj/pkgsrc/www/amaya/4x/wxWidgets/src/tiff 
-I/pkg_comp/obj/pkgsrc/www/amaya/4x/Amaya/work/wxWidgets_RELEASE/lib/wx/include/gtk2-unicode-release-static-2.8
 -I/pkg_comp/obj/pkgsrc/www/amaya/4x/wxWidgets/include 
-I/pkg_comp/obj/pkgsrc/www/amaya/4x/wxWidgets/contrib/include 
-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread -I/usr/include   
-I/usr/pkg/include/freetype2 -I/usr/pkg/include  -c 
../../thotlib/base/AmayaAppInstance.cpp -o base/AmayaAppInstance.o
../../thotlib/include/thot_sys.h:257: error: conflicting declaration 'typedef 
long int __intptr_t'
/usr/include/machine/int_types.h:65: error: '__intptr_t' has a previous 
declaration as 'typedef int __intptr_t'
gmake[1]: *** [base/AmayaAppInstance.o] Error 1
gmake[1]: Leaving directory 
`/pkg_comp/obj/pkgsrc/www/amaya/4x/Amaya/work/thotlib'
gmake: *** [all] Error 1
*** Error code 2

Stop.
make: stopped in /usr/pkgsrc/www/amaya

>Fix:
        Remove the typedef ??   Apps shouldn't be providing their own
        __*_t types, should they?