Pullup additional patches requested by mrg in ticket #1178:

external/mit/xorg/include/xcb-proto/Makefile	patch
external/mit/xorg/lib/fontconfig/src/Makefile	patch
external/mit/xorg/server/xorg-server/Makefile	patch
xsrc/external/mit/fontconfig/include/config.h	patch

	- Fix compile error on non x86 archs.
	- Fix unexpanded @@ in .pc files.