Index: Mk/bsd.xorg.mk
===================================================================
--- Mk/bsd.xorg.mk	(revision 432622)
+++ Mk/bsd.xorg.mk	(working copy)
@@ -296,12 +296,16 @@
 RUN_DEPENDS+=			${${_module}_BUILD_DEPENDS}
 .endfor
 
-.for _module in ${USE_XORG:C/\:.*//g}
-. if ${XORG_MODULES:M${_module}} == ""
-IGNORE=				requires unknown xorg module (${_module})
+.for _component in ${USE_XORG}
+. if ${XORG_MODULES:M${${_component:C/\:.*//g}}} == ""
+IGNORE=				requires unknown xorg module (${_component:C/\:.*//g})
 . endif
-LIB_PC_DEPENDS+=		${${_module}_LIB_PC_DEPENDS}
-BUILD_DEPENDS+=			${${_module}_BUILD_DEPENDS}
+. if ${_component:M*\:build} == ""
+LIB_PC_DEPENDS+=		${${_component:C/\:.*//g}_LIB_PC_DEPENDS}
+. else
+BUILD_DEPENDS+=			${${_component:C/\:.*//g}_LIB_PC_DEPENDS}
+. endif
+BUILD_DEPENDS+=			${${_component:C/\:.*//g}_BUILD_DEPENDS}
 .endfor
 
 RUN_DEPENDS+=			${LIB_PC_DEPENDS}