1 files changed, 55 insertions, 43 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 7f9f241ba469..e2d10250b3e6 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -1,10 +1,10 @@
 bin/SuperProbe
 bin/X
 bin/XFree86
+%%XIE:%%bin/joycal
 bin/kbd_mode
 bin/pcitweak
 bin/scanpci
-bin/showrgb
 bin/xf86config
 lib/X11/Cards
 lib/X11/XF86Config.98
@@ -18,33 +18,31 @@ lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
 lib/X11/doc/README.DRIcomp
-lib/X11/doc/README.SiS
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
+%%I386:%%lib/X11/doc/README.I128
+%%I386:%%lib/X11/doc/README.SiS
+%%I386:%%lib/X11/doc/README.apm
+%%I386:%%lib/X11/doc/README.ati
+%%I386:%%lib/X11/doc/README.chips
+%%I386:%%lib/X11/doc/README.cyrix
 lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
+%%I386:%%lib/X11/doc/README.i740
+%%I386:%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-lib/X11/doc/README.r128
+%%I386:%%lib/X11/doc/README.newport
+%%I386:%%lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html
-lib/X11/doc/html/manindex4.html
-lib/X11/doc/html/manindex5.html
 lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
-lib/X11/rgb.txt
 lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
@@ -74,36 +72,44 @@ lib/modules/codeconv/libKSCJOHAB.a
 lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
-lib/modules/dri/gamma_dri.so
-lib/modules/dri/i810_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
-lib/modules/drivers/apm_drv.o
-lib/modules/drivers/ati_drv.o
-lib/modules/drivers/chips_drv.o
-lib/modules/drivers/cirrus_alpine.o
-lib/modules/drivers/cirrus_drv.o
-lib/modules/drivers/cirrus_laguna.o
-lib/modules/drivers/cyrix_drv.o
-lib/modules/drivers/fbdev_drv.o
+%%DRI%%lib/modules/dri/gamma_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
+%%DRI%%lib/modules/dri/mga_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
+%%I386:%%lib/modules/drivers/apm_drv.o
+%%I386:%%lib/modules/drivers/ark_drv.o
+%%I386:%%lib/modules/drivers/ati_drv.o
+%%I386:%%lib/modules/drivers/atimisc_drv.o
+%%I386:%%lib/modules/drivers/chips_drv.o
+%%I386:%%lib/modules/drivers/cirrus_alpine.o
+%%I386:%%lib/modules/drivers/cirrus_drv.o
+%%I386:%%lib/modules/drivers/cirrus_laguna.o
+%%I386:%%lib/modules/drivers/cyrix_drv.o
+%%I386:%%lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
-lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
+%%I386:%%lib/modules/drivers/i128_drv.o
+%%I386:%%lib/modules/drivers/i740_drv.o
+%%I386:%%lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
-lib/modules/drivers/neomagic_drv.o
+%%I386:%%lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/radeon_drv.o
 lib/modules/drivers/rendition_drv.o
 lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/sis_drv.o
+lib/modules/drivers/savage_drv.o
+lib/modules/drivers/siliconmotion_drv.o
+%%I386:%%lib/modules/drivers/sis_drv.o
 lib/modules/drivers/tdfx_drv.o
 lib/modules/drivers/tga_drv.o
-lib/modules/drivers/trident_drv.o
-lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/trident_drv.o
+%%I386:%%lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/vesa_drv.o
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
+%%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
@@ -114,16 +120,21 @@ lib/modules/fonts/libfreetype.a
 lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
-lib/modules/freebsd/libdrm.a
-lib/modules/input/dynapro_drv.o
-lib/modules/input/elo2300_drv.o
-lib/modules/input/elographics_drv.o
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
+%%DRI%%lib/modules/freebsd/libdrm.a
+%%XIE:%%lib/modules/input/citron_drv.o
+%%XIE:%%lib/modules/input/digitaledge_drv.o
+%%XIE:%%lib/modules/input/dynapro_drv.o
+%%XIE:%%lib/modules/input/elo2300_drv.o
+%%XIE:%%lib/modules/input/elographics_drv.o
+%%XIE:%%lib/modules/input/joystick_drv.o
+%%XIE:%%lib/modules/input/magellan_drv.o
+%%XIE:%%lib/modules/input/microtouch_drv.o
 lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/wacom_drv.o
+%%XIE:%%lib/modules/input/mutouch_drv.o
+%%XIE:%%lib/modules/input/spaceorb_drv.o
+%%XIE:%%lib/modules/input/summa_drv.o
+%%XIE:%%lib/modules/input/void_drv.o
+%%XIE:%%lib/modules/input/wacom_drv.o
 lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
@@ -138,6 +149,7 @@ lib/modules/libpcidata.a
 lib/modules/librac.a
 lib/modules/libramdac.a
 lib/modules/libscanpci.a
+lib/modules/libshadow.a
 lib/modules/libshadowfb.a
 lib/modules/libvbe.a
 lib/modules/libvgahw.a