1 files changed, 70 insertions, 60 deletions
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 1baaee262b6e..efc379a420dd 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -1,7 +1,16 @@
 bin/X
 bin/XFree86
-%%XIE:%%bin/joycal
+bin/gtf
+bin/inb
+bin/inl
+bin/inw
+bin/ioport
 bin/kbd_mode
+bin/mmapr
+bin/mmapw
+bin/outb
+bin/outl
+bin/outw
 bin/pcitweak
 %%ALPHA_NA%%bin/scanpci
 bin/xf86cfg
@@ -23,11 +32,11 @@ include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
-lib/X11/app-defaults/XF86Cfg
 lib/X11/Cards
 lib/X11/Options
 lib/X11/XF86Config.98
 lib/X11/XF86Config.eg
+lib/X11/app-defaults/XF86Cfg
 lib/X11/doc/BUILD
 lib/X11/doc/BugReport
 lib/X11/doc/DESIGN
@@ -38,23 +47,24 @@ lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
 lib/X11/doc/README.DRIcomp
-%%I386:%%lib/X11/doc/README.I128
-%%I386:%%lib/X11/doc/README.SiS
-%%I386:%%lib/X11/doc/README.apm
+%%I386%%lib/X11/doc/README.I128
+%%I386%%lib/X11/doc/README.SiS
+lib/X11/doc/README.XKB-Config
+lib/X11/doc/README.XKB-Enhancing
+%%I386%%lib/X11/doc/README.apm
 lib/X11/doc/README.ati
-%%I386:%%lib/X11/doc/README.chips
-%%I386:%%lib/X11/doc/README.cyrix
+%%I386%%lib/X11/doc/README.chips
+%%I386%%lib/X11/doc/README.cyrix
 lib/X11/doc/README.dps
 lib/X11/doc/README.fonts
-%%I386:%%lib/X11/doc/README.i740
-%%I386:%%lib/X11/doc/README.i810
-%%MATROX%%lib/X11/doc/README.mga_HALLIB
+%%I386%%lib/X11/doc/README.i740
+%%I386%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-%%I386:%%lib/X11/doc/README.newport
-%%I386:%%lib/X11/doc/README.r128
+%%I386%%lib/X11/doc/README.newport
+lib/X11/doc/README.r128
 lib/X11/doc/README.rapidaccess
-lib/X11/doc/README.rendition
-lib/X11/doc/README.s3virge
+%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition
+%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
@@ -65,6 +75,9 @@ lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/xserver/SecurityPolicy
+lib/libXfont.a
+lib/libXfont.so
+lib/libXfont.so.1
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
 lib/modules/codeconv/libBIG5.a
@@ -96,54 +109,51 @@ lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
 %%DRI%%lib/modules/dri/gamma_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i810_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i830_dri.so
 %%DRI%%lib/modules/dri/mga_dri.so
 %%DRI%%lib/modules/dri/radeon_dri.so
+%%DRI%%lib/modules/dri/r200_dri.so
 %%DRI%%lib/modules/dri/r128_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
 %%DRI%%lib/modules/dri/tdfx_dri.so
-%%I386:%%lib/modules/drivers/apm_drv.o
-%%I386:%%lib/modules/drivers/ark_drv.o
+%%I386%%lib/modules/drivers/apm_drv.o
+%%I386%%lib/modules/drivers/ark_drv.o
 lib/modules/drivers/ati_drv.o
 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
-%%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
-%%MATROX%%lib/modules/drivers/mga_hal_drv.o
-%%I386:%%lib/modules/drivers/neomagic_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
+%%SPARC64_NA%%lib/modules/drivers/glint_drv.o
+%%I386%%lib/modules/drivers/i128_drv.o
+%%I386%%lib/modules/drivers/i740_drv.o
+%%I386%%lib/modules/drivers/i810_drv.o
+%%SPARC64_NA%%lib/modules/drivers/mga_drv.o
+%%I386%%lib/modules/drivers/neomagic_drv.o
+%%I386%%lib/modules/drivers/nsc_drv.o
 lib/modules/drivers/nv_drv.o
 lib/modules/drivers/r128_drv.o
 lib/modules/drivers/radeon_drv.o
-lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/s3_drv.o
-lib/modules/drivers/s3virge_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
-%%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
-%%I386:%%lib/modules/drivers/vmware_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
+%%I386%%lib/modules/drivers/sis_drv.o
+%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
+%%I386%%lib/modules/drivers/trident_drv.o
+%%I386%%lib/modules/drivers/tseng_drv.o
+%%I386%%lib/modules/drivers/vesa_drv.o
+%%SPARC64_NA%%lib/modules/drivers/vga_drv.o
+%%I386%%lib/modules/drivers/vmware_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
 %%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
-lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
-lib/modules/extensions/libxie.a
 lib/modules/extensions/libxtrap.a
 lib/modules/fonts/libbitmap.a
 lib/modules/fonts/libfreetype.a
@@ -151,20 +161,20 @@ lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
 %%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/citron_drv.o
+lib/modules/input/digitaledge_drv.o
+lib/modules/input/dynapro_drv.o
+lib/modules/input/elo2300_drv.o
+lib/modules/input/elographics_drv.o
+lib/modules/input/kbd_drv.o
+lib/modules/input/magellan_drv.o
+lib/modules/input/microtouch_drv.o
 lib/modules/input/mouse_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/input/mutouch_drv.o
+lib/modules/input/spaceorb_drv.o
+lib/modules/input/summa_drv.o
+lib/modules/input/void_drv.o
+lib/modules/input/wacom_drv.o
 %%ALPHA_NA%%lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a