1 files changed, 57 insertions, 81 deletions
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index f56b79fee502..f519e7233fba 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -3,16 +3,16 @@ bin/XFree86
 bin/getconfig
 bin/getconfig.pl
 bin/gtf
-%%SPARC64_NA%%bin/inb
-%%SPARC64_NA%%bin/inl
-%%SPARC64_NA%%bin/inw
-%%SPARC64_NA%%bin/ioport
+%%PPC_NA%%%%SPARC64_NA%%bin/inb
+%%PPC_NA%%%%SPARC64_NA%%bin/inl
+%%PPC_NA%%%%SPARC64_NA%%bin/inw
+%%PPC_NA%%%%SPARC64_NA%%bin/ioport
 bin/kbd_mode
 bin/mmapr
 bin/mmapw
-%%SPARC64_NA%%bin/outb
-%%SPARC64_NA%%bin/outl
-%%SPARC64_NA%%bin/outw
+%%PPC_NA%%%%SPARC64_NA%%bin/outb
+%%PPC_NA%%%%SPARC64_NA%%bin/outl
+%%PPC_NA%%%%SPARC64_NA%%bin/outw
 bin/pcitweak
 %%I386%%bin/scanpci
 bin/xf86cfg
@@ -39,85 +39,52 @@ 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
-lib/X11/doc/Install
-lib/X11/doc/Japanese/README98
-lib/X11/doc/Japanese/README98.1st
-lib/X11/doc/LICENSE
-lib/X11/doc/README
-lib/X11/doc/README.DECtga
-lib/X11/doc/README.DRI
-lib/X11/doc/README.DRIcomp
-lib/X11/doc/README.I128
-lib/X11/doc/README.SiS
-lib/X11/doc/README.XKB-Config
-lib/X11/doc/README.XKB-Enhancing
-lib/X11/doc/README.apm
-lib/X11/doc/README.ati
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
-lib/X11/doc/README.dps
-lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
-lib/X11/doc/README.mouse
-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
-lib/X11/doc/RELNOTES
-lib/X11/doc/Versions
-lib/X11/doc/VideoBoard98
+share/doc/XFree86/BUILD
+share/doc/XFree86/BugReport
+share/doc/XFree86/DESIGN
+share/doc/XFree86/Install
+share/doc/XFree86/Japanese/README98
+share/doc/XFree86/Japanese/README98.1st
+share/doc/XFree86/LICENSE
+share/doc/XFree86/README
+share/doc/XFree86/README.DECtga
+share/doc/XFree86/README.DRI
+share/doc/XFree86/README.DRIcomp
+share/doc/XFree86/README.I128
+share/doc/XFree86/README.SiS
+share/doc/XFree86/README.XKB-Config
+share/doc/XFree86/README.XKB-Enhancing
+share/doc/XFree86/README.apm
+share/doc/XFree86/README.ati
+share/doc/XFree86/README.chips
+share/doc/XFree86/README.cyrix
+share/doc/XFree86/README.dps
+share/doc/XFree86/README.fonts
+share/doc/XFree86/README.i740
+share/doc/XFree86/README.i810
+share/doc/XFree86/README.mouse
+share/doc/XFree86/README.newport
+share/doc/XFree86/README.r128
+share/doc/XFree86/README.rapidaccess
+share/doc/XFree86/README.rendition
+share/doc/XFree86/README.s3virge
+share/doc/XFree86/RELNOTES
+share/doc/XFree86/Versions
+share/doc/XFree86/VideoBoard98
 lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/getconfig/cfg.sample
 lib/X11/getconfig/xfree86.cfg
-lib/X11/xserver/SecurityPolicy.default-Server
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libBIG5HKSCS.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB18030.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGBK.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_13.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
 %%AMD64_I386%%lib/modules/drivers/apm_drv.o
 %%AMD64_I386%%lib/modules/drivers/ark_drv.o
 lib/modules/drivers/ati_drv.o
 lib/modules/drivers/atimisc_drv.o
 %%AMD64_I386%%lib/modules/drivers/chips_drv.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o
-%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o
+%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_alpine.o
+%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_drv.o
+%%PPC_NA%%%%SPARC64_NA%%lib/modules/drivers/cirrus_laguna.o
 %%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
 %%AMD64%%lib/modules/drivers/dummy_drv.o
 %%AMD64%%lib/modules/drivers/fbdev_drv.o
@@ -131,16 +98,16 @@ lib/modules/drivers/atimisc_drv.o
 lib/modules/drivers/nv_drv.o
 lib/modules/drivers/r128_drv.o
 lib/modules/drivers/radeon_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
+%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
 lib/modules/drivers/riva128.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
+%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
 %%AMD64_I386%%lib/modules/drivers/sis_drv.o
 %%SPARC64%%lib/modules/drivers/sunffb_drv.o
 %%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
+%%PPC_NA%%%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
 %%AMD64_I386%%lib/modules/drivers/trident_drv.o
 %%AMD64_I386%%lib/modules/drivers/tseng_drv.o
 %%AMD64_I386%%lib/modules/drivers/vesa_drv.o
@@ -200,7 +167,16 @@ lib/modules/libxf4bpp.a
 lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 %%SPARC64%%lib/modules/libxf8_32wid.a
-%%SPARC64_NA%%lib/modules/v10002d.uc
-%%SPARC64_NA%%lib/modules/v20002d.uc
+%%PPC_NA%%%%SPARC64_NA%%lib/modules/v10002d.uc
+%%PPC_NA%%%%SPARC64_NA%%lib/modules/v20002d.uc
+@dirrm lib/X11/etc
 @dirrm lib/X11/getconfig
-@unexec rmdir %D/lib/X11/doc/Japanese 2>/dev/null || true
+@dirrm lib/modules/drivers
+@dirrm lib/modules/extensions
+@dirrm lib/modules/fonts
+@dirrm lib/modules/freebsd
+@dirrm lib/modules/input
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
+@unexec rmdir %D/lib/modules 2>/dev/null || true
+@unexec rmdir %D/share/doc/XFree86/Japanese 2>/dev/null || true
+@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true