pkg/41585: x11/openbsd-input-ws fails to compile (NetBSD 4.0) after modular-xorg-server upgrade

[kre%munnari.OZ.AU@localhost]

>Number:         41585
>Category:       pkg
>Synopsis:       x11/openbsd-input-ws fails to compile (NetBSD 4.0) after 
>modular-xorg-server upgrade
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jun 13 05:20:00 +0000 2009
>Originator:     Robert Elz
>Release:        NetBSD 4.0_STABLE
>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:
        After the (relatively) recent x11/modular-xorg-server upgrade
        x11/openbsd-input-ws compilations fail (on a NetBSD 4.0 release syystem)
>How-To-Repeat:
        Attempt to build x11/openbsd-input-ws - I use pkg_comp with libkver
        and the NetBSD 4.0 release sets (and sources) - except the x* sets
        intalled, but I doubt that's relevant for this problem.

        Expect to see ...

===> Building for openbsd-input-ws-1.2nb2
/usr/bin/make  all-recursive
Making all in src
if /bin/sh ../libtool --tag=CC --mode=compile cc -DHAVE_CONFIG_H  -I. -I. -I..  
 -I/usr/pkg/include   -O2 -I/usr/pkg/include -I/usr/pkg/include/xorg 
-I/usr/pkg/include/pixman-1 -I/usr/pkg/include    -I../src -MT ws.lo -MD -MP 
-MF ".deps/ws.Tpo" -c -o ws.lo ws.c;  then mv -f ".deps/ws.Tpo" ".deps/ws.Plo"; 
else rm -f ".deps/ws.Tpo"; exit 1; fi
mkdir .libs
 cc -DHAVE_CONFIG_H -I. -I.. 
-I/pkg_comp/obj/pkgsrc/x11/openbsd-input-ws/4x/.buildlink/include -O2 
-I/pkg_comp/obj/pkgsrc/x11/openbsd-input-ws/4x/.buildlink/include/xorg 
-I/pkg_comp/obj/pkgsrc/x11/openbsd-input-ws/4x/.buildlink/include/pixman-1 
-I../src -MT ws.lo -MD -MP -MF .deps/ws.Tpo -c ws.c  -fPIC -DPIC -o .libs/ws.o
ws.c:86: error: 'XF86_VERSION_CURRENT' undeclared here (not in a function)
ws.c:127: warning: 'ModuleInfoRec' is deprecated
ws.c: In function 'SetupProc':
ws.c:166: warning: 'xf86AddModuleInfo' is deprecated (declared at 
/pkg_comp/obj/pkgsrc/x11/openbsd-input-ws/4x/.buildlink/include/xorg/xf86.h:313)
ws.c: In function 'wsProc':
ws.c:386: warning: passing argument 4 of 'InitPointerDeviceStruct' from 
incompatible pointer type
ws.c:386: warning: passing argument 5 of 'InitPointerDeviceStruct' makes 
integer from pointer without a cast
ws.c:386: error: too many arguments to function 'InitPointerDeviceStruct'
*** Error code 1

Stop.
make: stopped in 
/pkg_comp/obj/pkgsrc/x11/openbsd-input-ws/4x/openbsd-input-ws-1.2/src
*** Error code 1

>Fix: