Make PLIST match BSD.x11.dist. Mostly cosmetic (added/deleted @dirrm

etc.) but I added five .o files to Server.

When we move to these ports as default, BSD.x11.dist will be changed so
we can get rid of all the @dirrm's.

Submitted by:	bento

8 files changed, 32 insertions, 48 deletions

diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
index a92b26787348..0cbe34efeeab 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
+++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
@@ -69,4 +69,3 @@ lib/X11/fonts/cyrillic/koi6x13.pcf.gz
 lib/X11/fonts/cyrillic/koi8x13.pcf.gz
 lib/X11/fonts/cyrillic/koi9x15.pcf.gz
 lib/X11/fonts/cyrillic/koinil2.pcf.gz
-@dirrm lib/X11/fonts/cyrillic
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
index 977ac4f4ad2b..24e5b6897a1e 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@@ -113,4 +113,3 @@ lib/X11/fonts/misc/olgl10.pcf.gz
 lib/X11/fonts/misc/olgl12.pcf.gz
 lib/X11/fonts/misc/olgl14.pcf.gz
 lib/X11/fonts/misc/olgl19.pcf.gz
-@dirrm lib/X11/fonts/misc
diff --git a/x11-fonts/XFree86-4-fontLatin2/pkg-plist b/x11-fonts/XFree86-4-fontLatin2/pkg-plist
index f715cea896c8..429cc8721ac2 100644
--- a/x11-fonts/XFree86-4-fontLatin2/pkg-plist
+++ b/x11-fonts/XFree86-4-fontLatin2/pkg-plist
@@ -335,4 +335,3 @@ lib/X11/fonts/latin2/75dpi/timR24.pcf.gz
 @dirrm lib/X11/fonts/latin2/100dpi
 @dirrm lib/X11/fonts/latin2/75dpi
 @dirrm lib/X11/fonts/latin2
-
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-plist b/x11-fonts/XFree86-4-fontScalable/pkg-plist
index 89f3176d73c4..4fb55d43fcd6 100644
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@@ -62,6 +62,4 @@ lib/X11/fonts/Type1/lcdxso.pfa
 lib/X11/fonts/Type1/lcdxsr.afm
 lib/X11/fonts/Type1/lcdxsr.pfa
 @dirrm lib/X11/fonts/CID
-@dirrm lib/X11/fonts/PEX
-@dirrm lib/X11/fonts/Speedo
-@dirrm lib/X11/fonts/Type1
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 26253ec0f14d..524f2c848178 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -70,8 +70,13 @@ lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
 lib/modules/extensions/libxie.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
 lib/modules/input/mouse_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/spaceorb_drv.o
 lib/modules/input/wacom_drv.o
 lib/modules/libafb.a
 lib/modules/libcfb.a
@@ -98,5 +103,8 @@ lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 lib/modules/v10002d.uc
 lib/modules/v20002d.uc
+@dirrm lib/modules/drivers
+@dirrm lib/modules/extensions
+@dirrm lib/modules/input
 @cwd /etc
 X11/xserver/SecurityPolicy
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 26253ec0f14d..524f2c848178 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -70,8 +70,13 @@ lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
 lib/modules/extensions/libxie.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
 lib/modules/input/mouse_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/spaceorb_drv.o
 lib/modules/input/wacom_drv.o
 lib/modules/libafb.a
 lib/modules/libcfb.a
@@ -98,5 +103,8 @@ lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 lib/modules/v10002d.uc
 lib/modules/v20002d.uc
+@dirrm lib/modules/drivers
+@dirrm lib/modules/extensions
+@dirrm lib/modules/input
 @cwd /etc
 X11/xserver/SecurityPolicy
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 7193a814496d..e794c4d888dc 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -461,32 +461,26 @@ lib/modules/fonts/libxtt.a
 @unexec rm -f %D/lib/X11/xinit
 @unexec rm -f %D/lib/X11/xsm
 @dirrm lib/X11/x11perfcomp
-@unexec rm -f %D/lib/X11/xkb/compiled
-@dirrm lib/X11/xkb/compat
-@dirrm lib/X11/xkb/geometry/digital
-@dirrm lib/X11/xkb/geometry/sgi
-@dirrm lib/X11/xkb/geometry
-@dirrm lib/X11/xkb/keycodes/digital
-@dirrm lib/X11/xkb/keycodes/sgi
-@dirrm lib/X11/xkb/keycodes
-@dirrm lib/X11/xkb/keymap/digital
-@dirrm lib/X11/xkb/keymap/sgi
-@dirrm lib/X11/xkb/keymap/sun
-@dirrm lib/X11/xkb/keymap
-@dirrm lib/X11/xkb/rules
-@dirrm lib/X11/xkb/semantics
-@dirrm lib/X11/xkb/symbols/digital
-@dirrm lib/X11/xkb/symbols/fujitsu
 @dirrm lib/X11/xkb/symbols/hp
 @dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/nec
 @dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/sony
-@dirrm lib/X11/xkb/symbols/sun
 @dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols
 @dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb
+@dirrm lib/X11/locale/armscii-8
+@dirrm lib/X11/locale/en_US.UTF-8
+@dirrm lib/X11/locale/georgian-academy
+@dirrm lib/X11/locale/georgian-ps
+@dirrm lib/X11/locale/ibm-cp1133
+@dirrm lib/X11/locale/iso8859-10
+@dirrm lib/X11/locale/iso8859-14
+@dirrm lib/X11/locale/iso8859-15
+@dirrm lib/X11/locale/koi8-u
+@dirrm lib/X11/locale/mulelao-1
+@dirrm lib/X11/locale/vi_VN.tcvn
+@dirrm lib/X11/locale/vi_VN.viscii
+@dirrm lib/modules/fonts
+@dirrm lib/modules/codeconv
+@dirrm include/bitmaps
 @cwd /etc
 X11/app-defaults/Beforelight
 X11/app-defaults/Bitmap
@@ -549,20 +543,8 @@ X11/xdm/xdm-config
 X11/xinit/xinitrc
 X11/xsm/system.xsm
 @unexec rm -f %D/X11/xdm/authdir
-@unexec rmdir %D/X11/app-defaults
-@unexec rmdir %D/X11/lbxproxy
-@unexec rmdir %D/X11/proxymngr
-@unexec rmdir %D/X11/rstart/commands/x11r6
-@unexec rmdir %D/X11/rstart/commands
-@unexec rmdir %D/X11/rstart/contexts
-@unexec rmdir %D/X11/rstart
-@unexec rmdir %D/X11/twm
 @unexec rmdir %D/X11/xdm/pixmaps
-@unexec rmdir %D/X11/xdm
-@unexec rmdir %D/X11/xinit
-@unexec rmdir %D/X11/xsm
 @cwd /var
 db/xkb/README
 @unexec rmdir %D/db/xdm
 @unexec rmdir %D/db/xkb
-
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 829560731bd3..1ea07cc2acdf 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -424,13 +424,4 @@ lib/libxkbui.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @dirrm include/DPS
 @dirrm include/GL
-@dirrm include/X11/ICE
-@dirrm include/X11/PEX5
-@dirrm include/X11/PM
-@dirrm include/X11/SM
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xmu
-@dirrm include/X11/extensions
 @dirrm include/X11/fonts/codeconv
-@dirrm include/X11/fonts
-@dirrm lib/X11/config