pkg/48511: x11/libxkbcommon is missing dependencies and can't find modular-xorgs xkb data

[nros%users.sourceforge.net@localhost]

>Number:         48511
>Category:       pkg
>Synopsis:       x11/libxkbcommon is missing dependencies and can't find 
>modular-xorgs xkb data
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 11 18:25:02 +0000 2014
>Originator:     Niclas Rosenvik
>Release:        pkgsrc-2013Q4
>Organization:
>Environment:
NetBSD localhost 6.1.2 NetBSD 6.1.2 (GENERIC) amd64
>Description:
libxkbcommon is missing two dependencies and has the directory for xkb data 
hardcoded. This causes it to not find the data when modular-xorg is used 
instead of x11-native in netbsd. The configure-script tries to read this from 
xkeyboard-config.pc but can't find it. And the hardcoded xkb-config-root is 
wrong for modular-xorg since it's xkb data is in ${X11BASE}/share/X11/xkb

"make configure" complains like this:
Package xkeyboard-config was not found in the pkg-config search path.
Perhaps you should add the directory containing `xkeyboard-config.pc'
to the PKG_CONFIG_PATH environment variable
No package 'xkeyboard-config' found

and 

Package xorg-macros was not found in the pkg-config search path.
Perhaps you should add the directory containing `xorg-macros.pc'
to the PKG_CONFIG_PATH environment variable
No package 'xorg-macros' found
>How-To-Repeat:
use modular-xorg not x11-native in netbsd.
in x11/libxkbcommon.
make configure 
grep "XKBCONFIG" work/libxkbcommon-0.3.2/config.status
ls <the directory that XKBCONFIGROOT points to>

>Fix:
This fix works in netbsd with both x11=native and x11=modular.
I don't know about other platforms like irix solaris etc.
It makes the configure script read the data directory from 
xkeyboard-config.pc .

remove the line:
CONFIGURE_ARGS+=        --with-xkb-config-root=${X11BASE}/lib/X11/xkb

add:
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/xkeyboard-config/buildlink3.mk"

to the Makefile in x11/libxkbcommon