1 files changed, 12 insertions, 40 deletions
diff --git a/source/x/x11/modularize b/source/x/x11/modularize
index 47da583f..d6eb2f68 100644
--- a/source/x/x11/modularize
+++ b/source/x/x11/modularize
@@ -1,7 +1,6 @@
 # If a package is listed here, it will be built apart from the
 # usual "grab bag" package that's made from each source directory.
 
-applewmproto
 appres
 bdftopcf
 beforelight
@@ -9,7 +8,6 @@ bigreqsproto
 bitmap
 compiz
 compositeproto
-constype
 damageproto
 dmxproto
 dri2proto
@@ -67,16 +65,15 @@ imake
 inputproto
 intel-gpu-tools
 kbproto
-libAppleWM
 libFS
 libICE
 libSM
-libWindowsWM
 libX11
 libXScrnSaver
-libXTrap
 libXau
 libXaw
+libXaw3d
+libXcm
 libXcomposite
 libXcursor
 libXdamage
@@ -92,8 +89,6 @@ libXinerama
 libXmu
 libXp
 libXpm
-libXprintAppUtil
-libXprintUtil
 libXrandr
 libXrender
 libXres
@@ -110,38 +105,31 @@ libpciaccess
 libpthread-stubs
 libxcb
 libxkbfile
-libxkbui
 listres
 lndir
 luit
 makedepend
-mkcfm
 mkcomposecache
 mkfontdir
 mkfontscale
 oclock
 pixman
 printproto
-proxymngr
 randrproto
 recordproto
 rendercheck
 renderproto
 resourceproto
 rgb
-rstart
-scripts
 scrnsaverproto
 sessreg
 setxkbmap
 showfont
 smproxy
-trapproto
 twm
 util-macros
 videoproto
 viewres
-windowswmproto
 x11perf
 xauth
 xbacklight
@@ -150,6 +138,10 @@ xbitmaps
 xcalc
 xcb-proto
 xcb-util
+xcb-util-image
+xcb-util-keysyms
+xcb-util-renderutil
+xcb-util-wm
 xclipboard
 xclock
 xcmiscproto
@@ -169,17 +161,13 @@ xextproto
 xeyes
 xf86-input-acecad
 xf86-input-aiptek
-xf86-input-citron
 xf86-input-evdev
 xf86-input-joystick
-xf86-input-keyboard
-xf86-input-mouse
 xf86-input-penmount
 xf86-input-synaptics
 xf86-input-vmmouse
 xf86-input-void
 xf86-input-wacom
-xf86-video-geode
 xf86-video-apm
 xf86-video-ark
 xf86-video-ast
@@ -187,19 +175,19 @@ xf86-video-ati
 xf86-video-chips
 xf86-video-cirrus
 xf86-video-dummy
-xf86-video-fbdev
+xf86-video-geode
 xf86-video-glint
 xf86-video-i128
 xf86-video-i740
-xf86-video-i810
 xf86-video-intel
 xf86-video-mach64
 xf86-video-mga
+xf86-video-modesetting
 xf86-video-neomagic
 xf86-video-nouveau
-xf86-video-nsc
 xf86-video-nv
 xf86-video-openchrome
+xf86-video-qxl
 xf86-video-r128
 xf86-video-rendition
 xf86-video-s3
@@ -208,13 +196,6 @@ xf86-video-savage
 xf86-video-siliconmotion
 xf86-video-sis
 xf86-video-sisusb
-xf86-video-sunbw2
-xf86-video-suncg14
-xf86-video-suncg3
-xf86-video-suncg6
-xf86-video-sunffb
-xf86-video-sunleo
-xf86-video-suntcx
 xf86-video-tdfx
 xf86-video-tga
 xf86-video-trident
@@ -223,22 +204,17 @@ xf86-video-v4l
 xf86-video-vesa
 xf86-video-vmware
 xf86-video-voodoo
-xf86-video-wsfb
 xf86-video-xgi
-xf86-video-xgixp
 xf86bigfontproto
 xf86dga
 xf86dgaproto
 xf86driproto
 xf86miscproto
-xf86rushproto
 xf86vidmodeproto
 xfd
-xfindproxy
 xfontsel
 xfs
 xfsinfo
-xfwp
 xgamma
 xgc
 xhost
@@ -265,27 +241,23 @@ xmore
 xorg-cf-files
 xorg-docs
 xorg-server
+xorg-server-xephyr
+xorg-server-xnest
+xorg-server-xvfb
 xorg-sgml-doctools
-xphelloworld
-xplsprinters
 xpr
-xprehashprinterlist
 xprop
 xproto
-xproxymanagementprotocol
 xpyb
 xrandr
 xrdb
 xrefresh
 xscope
 xset
-xsetmode
-xsetpointer
 xsetroot
 xsm
 xstdcmap
 xtrans
-xtrap
 xvidtune
 xvinfo
 xwd