1 files changed, 22 insertions, 11 deletions
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index bfce700b066b..29e90c810158 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -6,10 +6,12 @@ include/xorg/BT.h
 include/xorg/IBM.h
 include/xorg/TI.h
 include/xorg/XIstubs.h
-include/xorg/bstore.h
-include/xorg/bstorestr.h
+%%NEW%%include/xorg/Xprintf.h
 include/xorg/bt829.h
-include/xorg/cfb8_16.h
+%%OLD%%include/xorg/bstore.h
+%%OLD%%include/xorg/bstorestr.h
+%%NEW%%include/xorg/callback.h
+%%OLD%%include/xorg/cfb8_16.h
 include/xorg/closestr.h
 include/xorg/closure.h
 include/xorg/colormap.h
@@ -56,8 +58,9 @@ include/xorg/hotplug.h
 include/xorg/i2c_def.h
 include/xorg/input.h
 include/xorg/inputstr.h
+%%NEW%%include/xorg/list.h
 include/xorg/mi.h
-include/xorg/mibank.h
+%%OLD%%include/xorg/mibank.h
 include/xorg/mibstore.h
 include/xorg/micmap.h
 include/xorg/micoord.h
@@ -72,6 +75,8 @@ include/xorg/misc.h
 include/xorg/miscstruct.h
 include/xorg/mispans.h
 include/xorg/mistruct.h
+%%NEW%%include/xorg/misync.h
+%%NEW%%include/xorg/misyncstr.h
 include/xorg/miwideline.h
 include/xorg/mizerarc.h
 include/xorg/mioverlay.h
@@ -89,10 +94,10 @@ include/xorg/property.h
 include/xorg/propertyst.h
 include/xorg/ptrveloc.h
 include/xorg/randrstr.h
+%%OLD%%include/xorg/renderedge.h
 include/xorg/region.h
 include/xorg/regionstr.h
 include/xorg/registry.h
-include/xorg/renderedge.h
 include/xorg/resource.h
 include/xorg/rgb.h
 include/xorg/rrtransform.h
@@ -107,6 +112,7 @@ include/xorg/shmint.h
 include/xorg/site.h
 include/xorg/swaprep.h
 include/xorg/swapreq.h
+%%NEW%%include/xorg/syncsdk.h
 include/xorg/tda8425.h
 include/xorg/tda9850.h
 include/xorg/tda9885.h
@@ -120,7 +126,7 @@ include/xorg/wfbrename.h
 include/xorg/window.h
 include/xorg/windowstr.h
 include/xorg/xaa.h
-include/xorg/xaaWrapper.h
+%%OLD%%include/xorg/xaaWrapper.h
 include/xorg/xaalocal.h
 include/xorg/xaarop.h
 include/xorg/xace.h
@@ -182,6 +188,8 @@ lib/xorg/modules/libexa.la
 lib/xorg/modules/libexa.so
 lib/xorg/modules/libfb.la
 lib/xorg/modules/libfb.so
+%%NEW%%lib/xorg/modules/libfbdevhw.so
+%%NEW%%lib/xorg/modules/libfbdevhw.la
 lib/xorg/modules/libint10.la
 lib/xorg/modules/libint10.so
 lib/xorg/modules/libshadow.la
@@ -196,10 +204,10 @@ lib/xorg/modules/libwfb.la
 lib/xorg/modules/libwfb.so
 lib/xorg/modules/libxaa.la
 lib/xorg/modules/libxaa.so
-lib/xorg/modules/libxf8_16bpp.la
-lib/xorg/modules/libxf8_16bpp.so
-lib/xorg/modules/linux/libfbdevhw.la
-lib/xorg/modules/linux/libfbdevhw.so
+%%OLD%%lib/xorg/modules/libxf8_16bpp.la
+%%OLD%%lib/xorg/modules/libxf8_16bpp.so
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.la
+%%OLD%%lib/xorg/modules/linux/libfbdevhw.so
 lib/xorg/modules/multimedia/bt829_drv.la
 lib/xorg/modules/multimedia/bt829_drv.so
 lib/xorg/modules/multimedia/fi1236_drv.la
@@ -217,10 +225,12 @@ lib/xorg/modules/multimedia/uda1380_drv.so
 lib/xorg/protocol.txt
 libdata/pkgconfig/xorg-server.pc
 share/aclocal/xorg-server.m4
+%%NEW%%@exec /bin/mkdir -p %D/share/X11/xorg.conf.d
+%%NEW%%@dirrm share/doc/xorg-server
 @dirrm include/xorg
 @dirrm lib/xorg/modules/extensions
-@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules/multimedia
+%%OLD%%@dirrm lib/xorg/modules/linux
 @dirrm lib/xorg/modules
 @dirrm lib/xorg
 @dirrmtry include/X11/bitmaps
@@ -230,5 +240,6 @@ share/aclocal/xorg-server.m4
 @dirrmtry lib/X11/xserver
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg
+%%NEW%%@dirrmtry share/X11/xorg.conf.d
 @dirrmtry share/X11/app-defaults
 @dirrmtry share/X11