pkg/51085: pkgsrc-2016Q1/X11_TYPE=modular build broken (several pkgs)

[ignatios%cs.uni-bonn.de@localhost]

>Number:         51085
>Category:       pkg
>Synopsis:       pkgsrc-2016Q1/X11_TYPE=modular build broken (several pkgs)
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 22 13:30:00 +0000 2016
>Originator:     ignatios%cs.uni-bonn.de@localhost
>Release:        NetBSD 6.1.5_PATCH
>Organization:
computer science department, university of Bonn, Germany
>Environment:
NetBSD random83 6.1.5_PATCH NetBSD 6.1.5_PATCH (XEN3PAE_DOMU) #10: Mon Oct 20 11:28:07 CEST 2014  ignatios%random84.cs.uni-bonn.de@localhost:/var/itch/sources/6.1/oi386/sys/arch/i386/compile/XEN3PAE_DOMU i386

Architecture: i386
Machine: i386
pkgsrc: 2016Q1
X11_TYPE=modular

>Description:
My package build for 2016Q1 left me with this:
Failed: modular-xorg-apps-1.14.1.7 mupdf-1.8nb3 modular-xorg-server-1.18.2 xf86-
input-keyboard-1.8.1nb2 xf86-input-mouse-1.9.1nb3 xf86-video-vesa-2.3.4nb1

I checked individual packages, and found, e.g., when buidling xf86-input-mouse:

In file included from glxdri2.c:36:0:
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/GL/internal/dri_interface.h:46:22: error: redefinition of typedef 'drm_context_t'
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/libdrm/drm.h:72:22: note: previous declaration of 'drm_context_t' was here
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/GL/internal/dri_interface.h:47:22: error: redefinition of typedef 'drm_drawable_t'
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/libdrm/drm.h:73:22: note: previous declaration of 'drm_drawable_t' was here
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/GL/internal/dri_interface.h:48:30: error: redefinition of typedef 'drm_clip_rect_t'
/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/.buildlink/include/libdrm/drm.h:829:30: note: previous declaration of 'drm_clip_rect_t' was here
Makefile:716: recipe for target 'glxdri2.lo' failed
gmake[1]: *** [glxdri2.lo] Error 1
gmake[1]: Leaving directory '/pkg_comp/obj/pkgsrc/x11/modular-xorg-server/default/xorg-server-1.18.2/glx'
Makefile:767: recipe for target 'all-recursive' failed
gmake: *** [all-recursive] Error 1
*** Error code 2

Stop.
make: stopped in /usr/pkgsrc/x11/modular-xorg-server
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/x11/modular-xorg-server
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/x11/xf86-input-keyboard




>How-To-Repeat:
	make package

>Fix:
	unknown.
 workaround: possibly PKG_OPTIONS.modular-xorg-server+=-dri