--- a/exception_lists/packaging	Mon Nov 05 16:17:08 2012 -0800
+++ b/exception_lists/packaging	Wed Nov 07 15:17:42 2012 -0800
@@ -83,3 +83,15 @@
 usr/lib/python2.6/vendor-packages/xcbgen/matcher.pyo
 usr/lib/python2.6/vendor-packages/xcbgen/state.pyo
 usr/lib/python2.6/vendor-packages/xcbgen/xtypes.pyo
+
+# No need to deliver libchromeXvMC.so since it requires DRI which we don't build with
+usr/lib/libchromeXvMC.so			i386
+usr/lib/libchromeXvMC.so.1			i386	
+usr/lib/libchromeXvMCPro.so			i386
+usr/lib/libchromeXvMCPro.so.1			i386	
+
+# No need to deliver libdrm_radeon on sparc
+usr/lib/xorg/libdrm_radeon.so	     		sparc
+usr/lib/xorg/libdrm_radeon.so.1	     		sparc
+usr/lib/xorg/sparcv9/libdrm_radeon.so	     	sparc
+usr/lib/xorg/sparcv9/libdrm_radeon.so.1	     	sparc

--- a/open-src/driver/xf86-input-mouse/Makefile	Mon Nov 05 16:17:08 2012 -0800
+++ b/open-src/driver/xf86-input-mouse/Makefile	Wed Nov 07 15:17:42 2012 -0800
@@ -54,6 +54,8 @@
 MODULE_PKGCONFIG_DIR=$(PKGCONFIG_DIR_SHARE)
 MODULE_PKGCONFIG_DIR_SET=yes
 
+MODULE_INSTALL_MAKEFLAGS = sdkdir='$(XORG_SDK_INCLUDES_DIR)'
+
 include ../Makefile.inc
 
 install_docs: $(PROTODIR)$(X11_DOC_DIR)/README.mouse

--- a/pkg/manifests/x11-library-libdrm.p5m	Mon Nov 05 16:17:08 2012 -0800
+++ b/pkg/manifests/x11-library-libdrm.p5m	Wed Nov 07 15:17:42 2012 -0800
@@ -38,7 +38,15 @@
 file path=usr/include/libdrm/mga_drm.h
 file path=usr/include/libdrm/nouveau_drm.h
 file path=usr/include/libdrm/r128_drm.h
+file path=usr/include/libdrm/r600_pci_ids.h
+file path=usr/include/libdrm/radeon_bo.h
+file path=usr/include/libdrm/radeon_bo_gem.h
+file path=usr/include/libdrm/radeon_bo_int.h
+file path=usr/include/libdrm/radeon_cs.h
+file path=usr/include/libdrm/radeon_cs_gem.h
+file path=usr/include/libdrm/radeon_cs_int.h
 file path=usr/include/libdrm/radeon_drm.h
+file path=usr/include/libdrm/radeon_surface.h
 file path=usr/include/libdrm/savage_drm.h
 file path=usr/include/libdrm/sis_drm.h
 file path=usr/include/libdrm/via_drm.h

--- a/pkg/manifests/x11-library-xcb-util.p5m	Mon Nov 05 16:17:08 2012 -0800
+++ b/pkg/manifests/x11-library-xcb-util.p5m	Wed Nov 07 15:17:42 2012 -0800
@@ -34,6 +34,7 @@
 #
 file path=usr/include/xcb/xcb_atom.h
 file path=usr/include/xcb/xcb_aux.h
+file path=usr/include/xcb/xcb_bitops.h
 file path=usr/include/xcb/xcb_event.h
 file path=usr/include/xcb/xcb_ewmh.h
 file path=usr/include/xcb/xcb_icccm.h

--- a/pkg/manifests/x11-server-xorg-driver-xorg-input-mouse.p5m	Mon Nov 05 16:17:08 2012 -0800
+++ b/pkg/manifests/x11-server-xorg-driver-xorg-input-mouse.p5m	Wed Nov 07 15:17:42 2012 -0800
@@ -24,6 +24,7 @@
 set name=pkg.summary \
     value="xf86-input-mouse - Mouse input driver for the Xorg X server"
 set name=pkg.description value="Xorg mouse input driver"
+file path=usr/include/xorg/xf86-mouse-properties.h
 file path=usr/lib/xorg/modules/input/mouse_drv.so
 file path=usr/share/doc/X11/README.mouse
 file path=usr/share/man/man7/mousedrv.7

--- a/pkg/manifests/x11-server-xorg.p5m	Mon Nov 05 16:17:08 2012 -0800
+++ b/pkg/manifests/x11-server-xorg.p5m	Wed Nov 07 15:17:42 2012 -0800
@@ -90,6 +90,7 @@
 file path=usr/include/xorg/geext.h
 file path=usr/include/xorg/geint.h
 file path=usr/include/xorg/globals.h
+file path=usr/include/xorg/glx_extinit.h
 file path=usr/include/xorg/glyphstr.h
 file path=usr/include/xorg/hotplug.h
 file path=usr/include/xorg/i2c_def.h
@@ -163,6 +164,7 @@
 file path=usr/include/xorg/wfbrename.h
 file path=usr/include/xorg/window.h
 file path=usr/include/xorg/windowstr.h
+file path=usr/include/xorg/xaarop.h
 file path=usr/include/xorg/xace.h
 file path=usr/include/xorg/xacestr.h
 file path=usr/include/xorg/xf86.h
@@ -191,6 +193,7 @@
 file path=usr/include/xorg/xf86fbman.h
 file path=usr/include/xorg/xf86i2c.h
 file path=usr/include/xorg/xf86int10.h
+file path=usr/include/xorg/xf86platformBus.h
 file path=usr/include/xorg/xf86sbusBus.h
 file path=usr/include/xorg/xf86str.h
 file path=usr/include/xorg/xf86xv.h