Unify PLIST. OK'd by xtraeme@.

22 files changed, 1858 insertions, 1850 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index cd001377d99..80931cc5ce9 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/23 22:44:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2005/03/30 20:29:19 hira Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
@@ -15,6 +15,17 @@ BUILD_DEPENDS=		xorg-imake>=${XORG_VER}:../../x11/xorg-imake
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC=		${WRKDIR}/.PLIST_SRC
+XORG_PLIST_ENTRY=	${OPSYS}
+.if ${OPSYS} == "NetBSD"
+.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
+XORG_PLIST_ENTRY+=	NetBSD-i386
+.  endif
+.endif
+.if ${OPSYS} != "Darwin"
+XORG_PLIST_ENTRY+=	i18n
+.endif
+
 .include "../../meta-pkgs/xorg/Makefile.common"
 
 .if ${X11ROOT} == ${LOCALBASE}
@@ -39,8 +50,9 @@ SUBST_FILES.mkstrs=	config/cf/Library.tmpl
 SUBST_SED.mkstrs=	-e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g'
 SUBST_MESSAGE.mkstrs=	"Fixing path of makestrs."
 
-.if ${OPSYS} == "Linux"
 post-install:
+	@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
+.if ${OPSYS} == "Linux"
 	@${LDCONFIG} ${X11ROOT}/lib || ${TRUE}
 .endif
 
@@ -55,20 +67,6 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f}
 .endfor
 
-.if ${OPSYS} == "NetBSD"
-.  if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)
-PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}
-PLIST_SRC+=	${.CURDIR}/PLIST.${OPSYS}.i386
-.  endif
-.else
-PLIST_SRC+=     ${.CURDIR}/PLIST.${OPSYS}
-.endif
-PLIST_SRC+=	${.CURDIR}/PLIST.common
-.if ${OPSYS} != "Darwin"
-PLIST_SRC+=	${.CURDIR}/PLIST.common_i18n
-.endif
-PLIST_SRC+=	${.CURDIR}/PLIST.common_end
-
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST
new file mode 100644
index 00000000000..e3afc355c07
--- /dev/null
+++ b/x11/xorg-libs/PLIST
@@ -0,0 +1,1451 @@
+@comment $NetBSD: PLIST,v 1.1 2005/03/30 20:29:19 hira Exp $
+${X11ROOT_PREFIX}/include/DPS/ColorSB.h
+${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
+${X11ROOT_PREFIX}/include/DPS/DPSScrollWP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreatP.h
+${X11ROOT_PREFIX}/include/DPS/FontCreato.h
+${X11ROOT_PREFIX}/include/DPS/FontSB.h
+${X11ROOT_PREFIX}/include/DPS/FontSBP.h
+${X11ROOT_PREFIX}/include/DPS/FontSamplP.h
+${X11ROOT_PREFIX}/include/DPS/FontSample.h
+${X11ROOT_PREFIX}/include/DPS/PSres.h
+${X11ROOT_PREFIX}/include/DPS/XDPS.h
+${X11ROOT_PREFIX}/include/DPS/XDPSlib.h
+${X11ROOT_PREFIX}/include/DPS/XDPSproto.h
+${X11ROOT_PREFIX}/include/DPS/dpsNXargs.h
+${X11ROOT_PREFIX}/include/DPS/dpsXclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsXcommon.h
+${X11ROOT_PREFIX}/include/DPS/dpsXpreview.h
+${X11ROOT_PREFIX}/include/DPS/dpsXshare.h
+${X11ROOT_PREFIX}/include/DPS/dpsXuserpath.h
+${X11ROOT_PREFIX}/include/DPS/dpsclient.h
+${X11ROOT_PREFIX}/include/DPS/dpsconfig.h
+${X11ROOT_PREFIX}/include/DPS/dpsexcept.h
+${X11ROOT_PREFIX}/include/DPS/dpsfriends.h
+${X11ROOT_PREFIX}/include/DPS/dpsops.h
+${X11ROOT_PREFIX}/include/DPS/psops.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwDrawAP.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawA.h
+${X11ROOT_PREFIX}/include/GL/GLwMDrawAP.h
+${X11ROOT_PREFIX}/include/GL/gl.h
+${X11ROOT_PREFIX}/include/GL/glext.h
+${X11ROOT_PREFIX}/include/GL/glu.h
+${X11ROOT_PREFIX}/include/GL/glx.h
+${X11ROOT_PREFIX}/include/GL/glxext.h
+${X11ROOT_PREFIX}/include/GL/glxint.h
+${X11ROOT_PREFIX}/include/GL/glxmd.h
+${X11ROOT_PREFIX}/include/GL/glxproto.h
+${X11ROOT_PREFIX}/include/GL/glxtokens.h
+${X11ROOT_PREFIX}/include/GL/osmesa.h
+${X11ROOT_PREFIX}/include/X11/Composite.h
+${X11ROOT_PREFIX}/include/X11/CompositeP.h
+${X11ROOT_PREFIX}/include/X11/ConstrainP.h
+${X11ROOT_PREFIX}/include/X11/Constraint.h
+${X11ROOT_PREFIX}/include/X11/Core.h
+${X11ROOT_PREFIX}/include/X11/CoreP.h
+${X11ROOT_PREFIX}/include/X11/DECkeysym.h
+${X11ROOT_PREFIX}/include/X11/HPkeysym.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICE.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEconn.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICElib.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEmsg.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEproto.h
+${X11ROOT_PREFIX}/include/X11/ICE/ICEutil.h
+${X11ROOT_PREFIX}/include/X11/Intrinsic.h
+${X11ROOT_PREFIX}/include/X11/IntrinsicP.h
+${X11ROOT_PREFIX}/include/X11/Object.h
+${X11ROOT_PREFIX}/include/X11/ObjectP.h
+${X11ROOT_PREFIX}/include/X11/RectObj.h
+${X11ROOT_PREFIX}/include/X11/RectObjP.h
+${X11ROOT_PREFIX}/include/X11/SM/SM.h
+${X11ROOT_PREFIX}/include/X11/SM/SMlib.h
+${X11ROOT_PREFIX}/include/X11/SM/SMproto.h
+${X11ROOT_PREFIX}/include/X11/Shell.h
+${X11ROOT_PREFIX}/include/X11/ShellP.h
+${X11ROOT_PREFIX}/include/X11/StringDefs.h
+${X11ROOT_PREFIX}/include/X11/Sunkeysym.h
+${X11ROOT_PREFIX}/include/X11/Vendor.h
+${X11ROOT_PREFIX}/include/X11/VendorP.h
+${X11ROOT_PREFIX}/include/X11/X.h
+${X11ROOT_PREFIX}/include/X11/X10.h
+${X11ROOT_PREFIX}/include/X11/XF86keysym.h
+${X11ROOT_PREFIX}/include/X11/XKBlib.h
+${X11ROOT_PREFIX}/include/X11/XWDFile.h
+${X11ROOT_PREFIX}/include/X11/Xalloca.h
+${X11ROOT_PREFIX}/include/X11/Xarch.h
+${X11ROOT_PREFIX}/include/X11/Xatom.h
+${X11ROOT_PREFIX}/include/X11/Xauth.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AllWidgets.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiText.h
+${X11ROOT_PREFIX}/include/X11/Xaw/AsciiTextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Box.h
+${X11ROOT_PREFIX}/include/X11/Xaw/BoxP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Cardinals.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Command.h
+${X11ROOT_PREFIX}/include/X11/Xaw/CommandP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Dialog.h
+${X11ROOT_PREFIX}/include/X11/Xaw/DialogP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Form.h
+${X11ROOT_PREFIX}/include/X11/Xaw/FormP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Grip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/GripP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Label.h
+${X11ROOT_PREFIX}/include/X11/Xaw/LabelP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/List.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ListP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButtoP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MenuButton.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Paned.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PanedP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Print.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PrintSP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h
+${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Scrollbar.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ScrollbarP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Simple.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenu.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SimpleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Sme.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSB.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSBP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLine.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeLineP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/SmeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripCharP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/StripChart.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.c
+${X11ROOT_PREFIX}/include/X11/Xaw/Template.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TemplateP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Text.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSink.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSinkP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrc.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TextSrcP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tip.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TipP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Toggle.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ToggleP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Tree.h
+${X11ROOT_PREFIX}/include/X11/Xaw/TreeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/VendorEP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Viewport.h
+${X11ROOT_PREFIX}/include/X11/Xaw/ViewportP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawImP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/XawInit.h
+${X11ROOT_PREFIX}/include/X11/Xcms.h
+${X11ROOT_PREFIX}/include/X11/Xdefs.h
+${X11ROOT_PREFIX}/include/X11/Xdmcp.h
+${X11ROOT_PREFIX}/include/X11/Xfuncproto.h
+${X11ROOT_PREFIX}/include/X11/Xfuncs.h
+${X11ROOT_PREFIX}/include/X11/Xlib.h
+${X11ROOT_PREFIX}/include/X11/Xlibint.h
+${X11ROOT_PREFIX}/include/X11/Xlocale.h
+${X11ROOT_PREFIX}/include/X11/Xmd.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Atoms.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CharSet.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CloseHook.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Converters.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CurUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/CvtCache.h
+${X11ROOT_PREFIX}/include/X11/Xmu/DisplayQue.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Drawing.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Editres.h
+${X11ROOT_PREFIX}/include/X11/Xmu/EditresP.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Error.h
+${X11ROOT_PREFIX}/include/X11/Xmu/ExtAgent.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Initer.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Lookup.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Misc.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdCmap.h
+${X11ROOT_PREFIX}/include/X11/Xmu/StdSel.h
+${X11ROOT_PREFIX}/include/X11/Xmu/SysUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h
+${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h
+${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h
+${X11ROOT_PREFIX}/include/X11/Xos.h
+${X11ROOT_PREFIX}/include/X11/Xos_r.h
+${X11ROOT_PREFIX}/include/X11/Xosdefs.h
+${X11ROOT_PREFIX}/include/X11/Xpoll.h
+${X11ROOT_PREFIX}/include/X11/XprintAppUtil/xpapputil.h
+${X11ROOT_PREFIX}/include/X11/XprintUtil/xprintutil.h
+${X11ROOT_PREFIX}/include/X11/Xproto.h
+${X11ROOT_PREFIX}/include/X11/Xprotostr.h
+${X11ROOT_PREFIX}/include/X11/Xresource.h
+${X11ROOT_PREFIX}/include/X11/Xthreads.h
+${X11ROOT_PREFIX}/include/X11/Xutil.h
+${X11ROOT_PREFIX}/include/X11/ap_keysym.h
+${X11ROOT_PREFIX}/include/X11/bitmaps/1x1
+${X11ROOT_PREFIX}/include/X11/bitmaps/2x2
+${X11ROOT_PREFIX}/include/X11/bitmaps/black
+${X11ROOT_PREFIX}/include/X11/bitmaps/boxes
+${X11ROOT_PREFIX}/include/X11/bitmaps/calculator
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/cross_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple1
+${X11ROOT_PREFIX}/include/X11/bitmaps/dimple3
+${X11ROOT_PREFIX}/include/X11/bitmaps/dot
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar7
+${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar8
+${X11ROOT_PREFIX}/include/X11/bitmaps/escherknot
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagdown
+${X11ROOT_PREFIX}/include/X11/bitmaps/flagup
+${X11ROOT_PREFIX}/include/X11/bitmaps/flipped_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray1
+${X11ROOT_PREFIX}/include/X11/bitmaps/gray3
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid16
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid2
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid4
+${X11ROOT_PREFIX}/include/X11/bitmaps/grid8
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines2
+${X11ROOT_PREFIX}/include/X11/bitmaps/hlines3
+${X11ROOT_PREFIX}/include/X11/bitmaps/icon
+${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard16
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/letters
+${X11ROOT_PREFIX}/include/X11/bitmaps/light_gray
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailempty
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailemptymsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfull
+${X11ROOT_PREFIX}/include/X11/bitmaps/mailfullmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/mensetmanus
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu10
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu12
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu16
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu6
+${X11ROOT_PREFIX}/include/X11/bitmaps/menu8
+${X11ROOT_PREFIX}/include/X11/bitmaps/noletters
+${X11ROOT_PREFIX}/include/X11/bitmaps/opendot
+${X11ROOT_PREFIX}/include/X11/bitmaps/opendotMask
+${X11ROOT_PREFIX}/include/X11/bitmaps/plaid
+${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptr
+${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptrmsk
+${X11ROOT_PREFIX}/include/X11/bitmaps/root_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/scales
+${X11ROOT_PREFIX}/include/X11/bitmaps/sipb
+${X11ROOT_PREFIX}/include/X11/bitmaps/star
+${X11ROOT_PREFIX}/include/X11/bitmaps/starMask
+${X11ROOT_PREFIX}/include/X11/bitmaps/stipple
+${X11ROOT_PREFIX}/include/X11/bitmaps/target
+${X11ROOT_PREFIX}/include/X11/bitmaps/terminal
+${X11ROOT_PREFIX}/include/X11/bitmaps/tie_fighter
+${X11ROOT_PREFIX}/include/X11/bitmaps/vlines2
+${X11ROOT_PREFIX}/include/X11/bitmaps/vlines3
+${X11ROOT_PREFIX}/include/X11/bitmaps/weird_size
+${X11ROOT_PREFIX}/include/X11/bitmaps/wide_weave
+${X11ROOT_PREFIX}/include/X11/bitmaps/wingdogs
+${X11ROOT_PREFIX}/include/X11/bitmaps/woman
+${X11ROOT_PREFIX}/include/X11/bitmaps/xfd_icon
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo11
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo16
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo32
+${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo64
+${X11ROOT_PREFIX}/include/X11/bitmaps/xsnow
+${X11ROOT_PREFIX}/include/X11/cursorfont.h
+${X11ROOT_PREFIX}/include/X11/extensions/MITMisc.h
+${X11ROOT_PREFIX}/include/X11/extensions/Print.h
+${X11ROOT_PREFIX}/include/X11/extensions/Printstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XEVI.h
+${X11ROOT_PREFIX}/include/X11/extensions/XEVIstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XI.h
+${X11ROOT_PREFIX}/include/X11/extensions/XInput.h
+${X11ROOT_PREFIX}/include/X11/extensions/XIproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKB.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBbells.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBconfig.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBfile.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBgeom.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBrules.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBsrv.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKBui.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKM.h
+${X11ROOT_PREFIX}/include/X11/extensions/XKMformat.h
+${X11ROOT_PREFIX}/include/X11/extensions/XLbx.h
+${X11ROOT_PREFIX}/include/X11/extensions/XRes.h
+${X11ROOT_PREFIX}/include/X11/extensions/XResproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/XShm.h
+${X11ROOT_PREFIX}/include/X11/extensions/XTest.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xag.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xagsrv.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xagstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcomposite.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcup.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcupstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdamage.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdbe.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdbeproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xevie.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xeviestr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xext.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xfixes.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xinerama.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xv.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMC.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMClib.h
+${X11ROOT_PREFIX}/include/X11/extensions/XvMCproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xvlib.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xvproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/composite.h
+${X11ROOT_PREFIX}/include/X11/extensions/compositeproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/damageproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/damagewire.h
+${X11ROOT_PREFIX}/include/X11/extensions/dpms.h
+${X11ROOT_PREFIX}/include/X11/extensions/dpmsstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/extutil.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxbuf.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxbufstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxdeltastr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbximage.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxopts.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/lbxzlib.h
+${X11ROOT_PREFIX}/include/X11/extensions/mitmiscstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/multibuf.h
+${X11ROOT_PREFIX}/include/X11/extensions/multibufst.h
+${X11ROOT_PREFIX}/include/X11/extensions/panoramiXext.h
+${X11ROOT_PREFIX}/include/X11/extensions/panoramiXproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/randr.h
+${X11ROOT_PREFIX}/include/X11/extensions/randrproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/record.h
+${X11ROOT_PREFIX}/include/X11/extensions/recordstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/render.h
+${X11ROOT_PREFIX}/include/X11/extensions/renderproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/saver.h
+${X11ROOT_PREFIX}/include/X11/extensions/saverproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/scrnsaver.h
+${X11ROOT_PREFIX}/include/X11/extensions/security.h
+${X11ROOT_PREFIX}/include/X11/extensions/securstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/shape.h
+${X11ROOT_PREFIX}/include/X11/extensions/shapestr.h
+${X11ROOT_PREFIX}/include/X11/extensions/shmstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/sync.h
+${X11ROOT_PREFIX}/include/X11/extensions/syncstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xcmiscstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xevieplaceholder.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfont.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86misc.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86mscstr.h
+${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rush.h
+${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rushstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86vmode.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86vmstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xfixesproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/xfixeswire.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtestext1.h
+${X11ROOT_PREFIX}/include/X11/extensions/xteststr.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapbits.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapddmi.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapdi.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapemacros.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtraplib.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtraplibp.h
+${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h
+${X11ROOT_PREFIX}/include/X11/fonts/FS.h
+${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h
+${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h
+${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h
+${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h
+${X11ROOT_PREFIX}/include/X11/keysym.h
+${X11ROOT_PREFIX}/include/X11/keysymdef.h
+${X11ROOT_PREFIX}/include/X11/xpm.h
+${X11ROOT_PREFIX}/include/xf86Optrec.h
+${X11ROOT_PREFIX}/include/xf86Parser.h
+${X11ROOT_PREFIX}/lib/pkgconfig/xcomposite.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xdamage.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xevie.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xfixes.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/fixesext.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/compositeext.pc
+${X11ROOT_PREFIX}/lib/X11/XErrorDB
+${X11ROOT_PREFIX}/lib/X11/XKeysymDB
+${X11ROOT_PREFIX}/lib/X11/Xcms.txt
+${X11ROOT_PREFIX}/lib/X11/locale/C/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/compose.dir
+${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ja/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ko/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/ko/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/locale.alias
+${X11ROOT_PREFIX}/lib/X11/locale/locale.dir
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xevie.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfixes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XRes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientPixmapBytes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientResources.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClients.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryExtension.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverAllocInfo.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverGetRegistered.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryExtension.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryInfo.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverRegister.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSelectInput.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSetAttributes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX}
+@comment begin Darwin
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewm.h
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewmstr.h
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.0.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.a
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.dylib
+${X11ROOT_PREFIX}/lib/libFS.6.0.dylib
+${X11ROOT_PREFIX}/lib/libFS.6.dylib
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.dylib
+${X11ROOT_PREFIX}/lib/libGL.1.2.dylib
+${X11ROOT_PREFIX}/lib/libGL.1.dylib
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.dylib
+${X11ROOT_PREFIX}/lib/libGLU.1.3.dylib
+${X11ROOT_PREFIX}/lib/libGLU.1.dylib
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.dylib
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libICE.6.3.dylib
+${X11ROOT_PREFIX}/lib/libICE.6.dylib
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.4.0.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.4.dylib
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.dylib
+${X11ROOT_PREFIX}/lib/libSM.6.0.dylib
+${X11ROOT_PREFIX}/lib/libSM.6.dylib
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.dylib
+${X11ROOT_PREFIX}/lib/libX11.6.2.dylib
+${X11ROOT_PREFIX}/lib/libX11.6.dylib
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.dylib
+${X11ROOT_PREFIX}/lib/libXRes.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXRes.1.dylib
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.6.4.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.6.dylib
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.dylib
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.6.1.dylib
+${X11ROOT_PREFIX}/lib/libXaw.6.dylib
+${X11ROOT_PREFIX}/lib/libXaw.7.0.dylib
+${X11ROOT_PREFIX}/lib/libXaw.7.dylib
+${X11ROOT_PREFIX}/lib/libXaw.8.0.dylib
+${X11ROOT_PREFIX}/lib/libXaw.8.dylib
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.1.dylib
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.1.dylib
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.dylib
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXevie.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXevie.1.dylib
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.dylib
+${X11ROOT_PREFIX}/lib/libXext.6.4.dylib
+${X11ROOT_PREFIX}/lib/libXext.6.dylib
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.3.0.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.3.dylib
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.dylib
+${X11ROOT_PREFIX}/lib/libXfont.1.5.dylib
+${X11ROOT_PREFIX}/lib/libXfont.1.dylib
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.dylib
+${X11ROOT_PREFIX}/lib/libXi.6.0.dylib
+${X11ROOT_PREFIX}/lib/libXi.6.dylib
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.1.dylib
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.dylib
+${X11ROOT_PREFIX}/lib/libXmu.6.2.dylib
+${X11ROOT_PREFIX}/lib/libXmu.6.dylib
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.1.dylib
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.dylib
+${X11ROOT_PREFIX}/lib/libXp.6.2.dylib
+${X11ROOT_PREFIX}/lib/libXp.6.dylib
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.dylib
+${X11ROOT_PREFIX}/lib/libXpm.4.11.dylib
+${X11ROOT_PREFIX}/lib/libXpm.4.dylib
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.dylib
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libXss.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXss.1.dylib
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.dylib
+${X11ROOT_PREFIX}/lib/libXt.6.0.dylib
+${X11ROOT_PREFIX}/lib/libXt.6.dylib
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.dylib
+${X11ROOT_PREFIX}/lib/libXtst.6.1.dylib
+${X11ROOT_PREFIX}/lib/libXtst.6.dylib
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.dylib
+${X11ROOT_PREFIX}/lib/libXv.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXv.1.dylib
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.1.dylib
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.1.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.1.0.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.1.dylib
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.dylib
+${X11ROOT_PREFIX}/lib/libdps.1.0.dylib
+${X11ROOT_PREFIX}/lib/libdps.1.dylib
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.1.0.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.1.dylib
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.dylib
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.1.0.dylib
+${X11ROOT_PREFIX}/lib/libfontenc.1.dylib
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.dylib
+${X11ROOT_PREFIX}/lib/liboldX.6.0.dylib
+${X11ROOT_PREFIX}/lib/liboldX.6.dylib
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.dylib
+${X11ROOT_PREFIX}/lib/libpsres.1.0.dylib
+${X11ROOT_PREFIX}/lib/libpsres.1.dylib
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.dylib
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.1.0.dylib
+${X11ROOT_PREFIX}/lib/libxkbfile.1.dylib
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.1.0.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.1.dylib
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.dylib
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/man/man3/AppleWM.3
+@comment end Darwin
+@comment begin DragonFly
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+@comment end DragonFly
+@comment begin FreeBSD
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so
+${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${LIBXTHRSTUB}${XTHRSTUB_MINOR}${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+@comment end FreeBSD
+@comment begin Linux
+${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
+${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libI810XvMC.so
+${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
+${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libICE.so.6.3
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.6.1
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXext.so.6.4
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libdmx.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.so
+${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
+${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libpsres.so.1.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
+@comment end Linux
+@comment begin NetBSD
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so
+${X11ROOT_PREFIX}/lib/libFS.so.6
+${X11ROOT_PREFIX}/lib/libFS.so.6.0
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so
+${X11ROOT_PREFIX}/lib/libGL.so.1
+${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so
+${X11ROOT_PREFIX}/lib/libGLU.so.1
+${X11ROOT_PREFIX}/lib/libGLU.so.1.3
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so
+${X11ROOT_PREFIX}/lib/libGLw.so.1
+${X11ROOT_PREFIX}/lib/libGLw.so.1.0
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so
+${X11ROOT_PREFIX}/lib/libICE.so.6
+${X11ROOT_PREFIX}/lib/libICE.so.6.3
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so
+${X11ROOT_PREFIX}/lib/libSM.so.6
+${X11ROOT_PREFIX}/lib/libSM.so.6.0
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so
+${X11ROOT_PREFIX}/lib/libX11.so.6
+${X11ROOT_PREFIX}/lib/libX11.so.6.2
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so
+${X11ROOT_PREFIX}/lib/libXRes.so.1
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so
+${X11ROOT_PREFIX}/lib/libXTrap.so.6
+${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so
+${X11ROOT_PREFIX}/lib/libXaw.so.6
+${X11ROOT_PREFIX}/lib/libXaw.so.6.1
+${X11ROOT_PREFIX}/lib/libXaw.so.7
+${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so
+${X11ROOT_PREFIX}/lib/libXext.so.6
+${X11ROOT_PREFIX}/lib/libXext.so.6.4
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so
+${X11ROOT_PREFIX}/lib/libXfont.so.1
+${X11ROOT_PREFIX}/lib/libXfont.so.1.5
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so
+${X11ROOT_PREFIX}/lib/libXi.so.6
+${X11ROOT_PREFIX}/lib/libXi.so.6.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so
+${X11ROOT_PREFIX}/lib/libXinerama.so.1
+${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so
+${X11ROOT_PREFIX}/lib/libXmu.so.6
+${X11ROOT_PREFIX}/lib/libXmu.so.6.2
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so
+${X11ROOT_PREFIX}/lib/libXmuu.so.1
+${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so
+${X11ROOT_PREFIX}/lib/libXp.so.6
+${X11ROOT_PREFIX}/lib/libXp.so.6.2
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so
+${X11ROOT_PREFIX}/lib/libXpm.so.4
+${X11ROOT_PREFIX}/lib/libXpm.so.4.11
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so
+${X11ROOT_PREFIX}/lib/libXss.so.1
+${X11ROOT_PREFIX}/lib/libXss.so.1.0
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so
+${X11ROOT_PREFIX}/lib/libXt.so.6
+${X11ROOT_PREFIX}/lib/libXt.so.6.0
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so
+${X11ROOT_PREFIX}/lib/libXtst.so.6
+${X11ROOT_PREFIX}/lib/libXtst.so.6.1
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so
+${X11ROOT_PREFIX}/lib/libXv.so.1
+${X11ROOT_PREFIX}/lib/libXv.so.1.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so
+${X11ROOT_PREFIX}/lib/libXvMC.so.1
+${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so
+${X11ROOT_PREFIX}/lib/libdps.so.1
+${X11ROOT_PREFIX}/lib/libdps.so.1.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so
+${X11ROOT_PREFIX}/lib/libdpstk.so.1
+${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so
+${X11ROOT_PREFIX}/lib/libfontenc.so.1
+${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so
+${X11ROOT_PREFIX}/lib/liboldX.so.6
+${X11ROOT_PREFIX}/lib/liboldX.so.6.0
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so
+${X11ROOT_PREFIX}/lib/libpsres.so.1
+${X11ROOT_PREFIX}/lib/libpsres.so.1.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so
+${X11ROOT_PREFIX}/lib/libxkbui.so.1
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
+@comment end NetBSD
+@comment begin NetBSD-i386
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1str.h
+${X11ROOT_PREFIX}/include/X11/extensions/xf86dgastr.h
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyArea.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyTransparentArea.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACreateColormap.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAFillRectangle.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAGetViewportStatus.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAInstallColormap.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAKeyEventToXKeyEvent.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAOpenFramebuffer.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryExtension.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryModes.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASelectInput.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetClientVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetViewport.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASync.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86DGA.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XFree86-DGA.${LIBMAN_SUFFIX}
+@comment end NetBSD-i386
+@comment begin OpenBSD
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so.8.0
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so.3.0
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so.3.0
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so.3.0
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so.8.0
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so.8.0
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so.8.0
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so.2.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so.8.0
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXaw.so.9.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so.8.0
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so.3.0
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so.8.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so.3.0
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so.8.0
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so.3.0
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so.8.0
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so.6.0
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so.3.0
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so.8.0
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so.8.0
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so.3.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so.3.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.3.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.3.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.3.0
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so.3.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so.3.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so.3.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so.8.0
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so.3.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so.2.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so.2.0
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+@comment end OpenBSD
+@comment begin i18n
+${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/ximcp.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcDef.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcUTF8Load.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlibi18n.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlocale.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xomGeneric.so.2
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XI18N_OBJS
+${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib/common
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
+@comment end i18n
+@dirrm ${X11ROOT_PREFIX}/lib/pkgconfig
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale
+@dirrm ${X11ROOT_PREFIX}/include/X11/fonts
+@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
+@dirrm ${X11ROOT_PREFIX}/include/X11/bitmaps
+@dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil
+@dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil
+@dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
+@dirrm ${X11ROOT_PREFIX}/include/X11/Xaw
+@dirrm ${X11ROOT_PREFIX}/include/X11/SM
+@dirrm ${X11ROOT_PREFIX}/include/X11/ICE
+@dirrm ${X11ROOT_PREFIX}/include/GL
+@dirrm ${X11ROOT_PREFIX}/include/DPS
diff --git a/x11/xorg-libs/PLIST.Darwin b/x11/xorg-libs/PLIST.Darwin
deleted file mode 100644
index 46fbf2a8a1d..00000000000
--- a/x11/xorg-libs/PLIST.Darwin
+++ /dev/null
@@ -1,163 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2005/03/22 09:48:48 adam Exp $
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewm.h
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/include/X11/extensions/applewmstr.h
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.0.dylib
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.1.dylib
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.a
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/lib/libAppleWM.dylib
-${X11ROOT_PREFIX}/lib/libFS.6.0.dylib
-${X11ROOT_PREFIX}/lib/libFS.6.dylib
-${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.dylib
-${X11ROOT_PREFIX}/lib/libGL.1.2.dylib
-${X11ROOT_PREFIX}/lib/libGL.1.dylib
-${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.dylib
-${X11ROOT_PREFIX}/lib/libGLU.1.3.dylib
-${X11ROOT_PREFIX}/lib/libGLU.1.dylib
-${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.dylib
-${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libICE.6.3.dylib
-${X11ROOT_PREFIX}/lib/libICE.6.dylib
-${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.dylib
-${X11ROOT_PREFIX}/lib/libOSMesa.4.0.dylib
-${X11ROOT_PREFIX}/lib/libOSMesa.4.dylib
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.dylib
-${X11ROOT_PREFIX}/lib/libSM.6.0.dylib
-${X11ROOT_PREFIX}/lib/libSM.6.dylib
-${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.dylib
-${X11ROOT_PREFIX}/lib/libX11.6.2.dylib
-${X11ROOT_PREFIX}/lib/libX11.6.dylib
-${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.dylib
-${X11ROOT_PREFIX}/lib/libXRes.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXRes.1.dylib
-${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.dylib
-${X11ROOT_PREFIX}/lib/libXTrap.6.4.dylib
-${X11ROOT_PREFIX}/lib/libXTrap.6.dylib
-${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.dylib
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.6.1.dylib
-${X11ROOT_PREFIX}/lib/libXaw.6.dylib
-${X11ROOT_PREFIX}/lib/libXaw.7.0.dylib
-${X11ROOT_PREFIX}/lib/libXaw.7.dylib
-${X11ROOT_PREFIX}/lib/libXaw.8.0.dylib
-${X11ROOT_PREFIX}/lib/libXaw.8.dylib
-${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.dylib
-${X11ROOT_PREFIX}/lib/libXcomposite.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXcomposite.1.dylib
-${X11ROOT_PREFIX}/lib/libXcomposite.a
-${X11ROOT_PREFIX}/lib/libXcomposite.dylib
-${X11ROOT_PREFIX}/lib/libXdamage.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXdamage.1.dylib
-${X11ROOT_PREFIX}/lib/libXdamage.a
-${X11ROOT_PREFIX}/lib/libXdamage.dylib
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXevie.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXevie.1.dylib
-${X11ROOT_PREFIX}/lib/libXevie.a
-${X11ROOT_PREFIX}/lib/libXevie.dylib
-${X11ROOT_PREFIX}/lib/libXext.6.4.dylib
-${X11ROOT_PREFIX}/lib/libXext.6.dylib
-${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.dylib
-${X11ROOT_PREFIX}/lib/libXfixes.3.0.dylib
-${X11ROOT_PREFIX}/lib/libXfixes.3.dylib
-${X11ROOT_PREFIX}/lib/libXfixes.a
-${X11ROOT_PREFIX}/lib/libXfixes.dylib
-${X11ROOT_PREFIX}/lib/libXfont.1.5.dylib
-${X11ROOT_PREFIX}/lib/libXfont.1.dylib
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.dylib
-${X11ROOT_PREFIX}/lib/libXi.6.0.dylib
-${X11ROOT_PREFIX}/lib/libXi.6.dylib
-${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.dylib
-${X11ROOT_PREFIX}/lib/libXinerama.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXinerama.1.dylib
-${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.dylib
-${X11ROOT_PREFIX}/lib/libXmu.6.2.dylib
-${X11ROOT_PREFIX}/lib/libXmu.6.dylib
-${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.dylib
-${X11ROOT_PREFIX}/lib/libXmuu.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXmuu.1.dylib
-${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.dylib
-${X11ROOT_PREFIX}/lib/libXp.6.2.dylib
-${X11ROOT_PREFIX}/lib/libXp.6.dylib
-${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.dylib
-${X11ROOT_PREFIX}/lib/libXpm.4.11.dylib
-${X11ROOT_PREFIX}/lib/libXpm.4.dylib
-${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.dylib
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
-${X11ROOT_PREFIX}/lib/libXss.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXss.1.dylib
-${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.dylib
-${X11ROOT_PREFIX}/lib/libXt.6.0.dylib
-${X11ROOT_PREFIX}/lib/libXt.6.dylib
-${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.dylib
-${X11ROOT_PREFIX}/lib/libXtst.6.1.dylib
-${X11ROOT_PREFIX}/lib/libXtst.6.dylib
-${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.dylib
-${X11ROOT_PREFIX}/lib/libXv.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXv.1.dylib
-${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.dylib
-${X11ROOT_PREFIX}/lib/libXvMC.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXvMC.1.dylib
-${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.dylib
-${X11ROOT_PREFIX}/lib/libXxf86misc.1.1.dylib
-${X11ROOT_PREFIX}/lib/libXxf86misc.1.dylib
-${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.dylib
-${X11ROOT_PREFIX}/lib/libXxf86vm.1.0.dylib
-${X11ROOT_PREFIX}/lib/libXxf86vm.1.dylib
-${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.dylib
-${X11ROOT_PREFIX}/lib/libdps.1.0.dylib
-${X11ROOT_PREFIX}/lib/libdps.1.dylib
-${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.dylib
-${X11ROOT_PREFIX}/lib/libdpstk.1.0.dylib
-${X11ROOT_PREFIX}/lib/libdpstk.1.dylib
-${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.dylib
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.1.0.dylib
-${X11ROOT_PREFIX}/lib/libfontenc.1.dylib
-${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.dylib
-${X11ROOT_PREFIX}/lib/liboldX.6.0.dylib
-${X11ROOT_PREFIX}/lib/liboldX.6.dylib
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.dylib
-${X11ROOT_PREFIX}/lib/libpsres.1.0.dylib
-${X11ROOT_PREFIX}/lib/libpsres.1.dylib
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.dylib
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.1.0.dylib
-${X11ROOT_PREFIX}/lib/libxkbfile.1.dylib
-${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.dylib
-${X11ROOT_PREFIX}/lib/libxkbui.1.0.dylib
-${X11ROOT_PREFIX}/lib/libxkbui.1.dylib
-${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.dylib
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/man/man3/AppleWM.3
diff --git a/x11/xorg-libs/PLIST.DragonFly b/x11/xorg-libs/PLIST.DragonFly
deleted file mode 100644
index 53afd12f49e..00000000000
--- a/x11/xorg-libs/PLIST.DragonFly
+++ /dev/null
@@ -1,123 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/01/25 17:49:57 xtraeme Exp $
-${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6
-${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1
-${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1
-${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libGLw.so
-${X11ROOT_PREFIX}/lib/libGLw.so.1
-${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4
-${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6
-${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6
-${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1
-${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6
-${X11ROOT_PREFIX}/lib/libXaw.so.7
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6
-${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1
-${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6
-${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1
-${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6
-${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4
-${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1
-${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6
-${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6
-${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1
-${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
-${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1
-${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.so
-${X11ROOT_PREFIX}/lib/liboldX.so.6
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1
-${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1
-${X11ROOT_PREFIX}/lib/libXaw.so.8
-${X11ROOT_PREFIX}/lib/libXcomposite.a
-${X11ROOT_PREFIX}/lib/libXcomposite.so
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1
-${X11ROOT_PREFIX}/lib/libXdamage.a
-${X11ROOT_PREFIX}/lib/libXdamage.so
-${X11ROOT_PREFIX}/lib/libXdamage.so.1
-${X11ROOT_PREFIX}/lib/libXevie.a
-${X11ROOT_PREFIX}/lib/libXevie.so
-${X11ROOT_PREFIX}/lib/libXevie.so.1
-${X11ROOT_PREFIX}/lib/libXfixes.a
-${X11ROOT_PREFIX}/lib/libXfixes.so
-${X11ROOT_PREFIX}/lib/libXfixes.so.3
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
diff --git a/x11/xorg-libs/PLIST.FreeBSD b/x11/xorg-libs/PLIST.FreeBSD
deleted file mode 100644
index 9c38b31643a..00000000000
--- a/x11/xorg-libs/PLIST.FreeBSD
+++ /dev/null
@@ -1,126 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
-${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6
-${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1
-${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1
-${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libGLw.so
-${X11ROOT_PREFIX}/lib/libGLw.so.1
-${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4
-${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6
-${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6
-${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1
-${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so
-${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so.6
-${LIBXTHRSTUB}${XTHRSTUB_MINOR}${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
-${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6
-${X11ROOT_PREFIX}/lib/libXaw.so.7
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6
-${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1
-${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6
-${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1
-${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6
-${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4
-${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1
-${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6
-${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6
-${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1
-${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
-${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1
-${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.so
-${X11ROOT_PREFIX}/lib/liboldX.so.6
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1
-${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1
-${X11ROOT_PREFIX}/lib/libXaw.so.8
-${X11ROOT_PREFIX}/lib/libXcomposite.a
-${X11ROOT_PREFIX}/lib/libXcomposite.so
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1
-${X11ROOT_PREFIX}/lib/libXdamage.a
-${X11ROOT_PREFIX}/lib/libXdamage.so
-${X11ROOT_PREFIX}/lib/libXdamage.so.1
-${X11ROOT_PREFIX}/lib/libXevie.a
-${X11ROOT_PREFIX}/lib/libXevie.so
-${X11ROOT_PREFIX}/lib/libXevie.so.1
-${X11ROOT_PREFIX}/lib/libXfixes.a
-${X11ROOT_PREFIX}/lib/libXfixes.so
-${X11ROOT_PREFIX}/lib/libXfixes.so.3
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
diff --git a/x11/xorg-libs/PLIST.Linux b/x11/xorg-libs/PLIST.Linux
deleted file mode 100644
index 2f71133c642..00000000000
--- a/x11/xorg-libs/PLIST.Linux
+++ /dev/null
@@ -1,135 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.4 2005/03/22 09:48:48 adam Exp $
-${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
-${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6
-${X11ROOT_PREFIX}/lib/libFS.so.6.0
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1
-${X11ROOT_PREFIX}/lib/libGL.so.1.2
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1
-${X11ROOT_PREFIX}/lib/libGLU.so.1.3
-${X11ROOT_PREFIX}/lib/libGLw.so
-${X11ROOT_PREFIX}/lib/libGLw.so.1
-${X11ROOT_PREFIX}/lib/libGLw.so.1.0
-${X11ROOT_PREFIX}/lib/libI810XvMC.so
-${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
-${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6
-${X11ROOT_PREFIX}/lib/libICE.so.6.3
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6
-${X11ROOT_PREFIX}/lib/libSM.so.6.0
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6
-${X11ROOT_PREFIX}/lib/libX11.so.6.2
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1
-${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6
-${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6
-${X11ROOT_PREFIX}/lib/libXaw.so.6.1
-${X11ROOT_PREFIX}/lib/libXaw.so.7
-${X11ROOT_PREFIX}/lib/libXaw.so.7.0
-${X11ROOT_PREFIX}/lib/libXaw.so.8
-${X11ROOT_PREFIX}/lib/libXaw.so.8.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6
-${X11ROOT_PREFIX}/lib/libXext.so.6.4
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6
-${X11ROOT_PREFIX}/lib/libXi.so.6.0
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1
-${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
-${X11ROOT_PREFIX}/lib/libXcomposite.so
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
-${X11ROOT_PREFIX}/lib/libXdamage.so
-${X11ROOT_PREFIX}/lib/libXdamage.so.1
-${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
-${X11ROOT_PREFIX}/lib/libXevie.so
-${X11ROOT_PREFIX}/lib/libXevie.so.1
-${X11ROOT_PREFIX}/lib/libXevie.so.1.0
-${X11ROOT_PREFIX}/lib/libXfixes.so
-${X11ROOT_PREFIX}/lib/libXfixes.so.3
-${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
-${X11ROOT_PREFIX}/lib/libdmx.a
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6
-${X11ROOT_PREFIX}/lib/libXmu.so.6.2
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1
-${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6
-${X11ROOT_PREFIX}/lib/libXp.so.6.2
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4
-${X11ROOT_PREFIX}/lib/libXpm.so.4.11
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1
-${X11ROOT_PREFIX}/lib/libXss.so.1.0
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6
-${X11ROOT_PREFIX}/lib/libXt.so.6.0
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6
-${X11ROOT_PREFIX}/lib/libXtst.so.6.1
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1
-${X11ROOT_PREFIX}/lib/libXv.so.1.0
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
-${X11ROOT_PREFIX}/lib/libXxf86rush.so
-${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
-${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1
-${X11ROOT_PREFIX}/lib/libdps.so.1.0
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1
-${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1
-${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1
-${X11ROOT_PREFIX}/lib/libpsres.so.1.0
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1
-${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/PLIST.NetBSD b/x11/xorg-libs/PLIST.NetBSD
deleted file mode 100644
index a58213ab61f..00000000000
--- a/x11/xorg-libs/PLIST.NetBSD
+++ /dev/null
@@ -1,159 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.3 2005/02/09 11:39:19 xtraeme Exp $
-${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6
-${X11ROOT_PREFIX}/lib/libFS.so.6.0
-${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1
-${X11ROOT_PREFIX}/lib/libGL.so.1.2
-${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1
-${X11ROOT_PREFIX}/lib/libGLU.so.1.3
-${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libGLw.so
-${X11ROOT_PREFIX}/lib/libGLw.so.1
-${X11ROOT_PREFIX}/lib/libGLw.so.1.0
-${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6
-${X11ROOT_PREFIX}/lib/libICE.so.6.3
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
-${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6
-${X11ROOT_PREFIX}/lib/libSM.so.6.0
-${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6
-${X11ROOT_PREFIX}/lib/libX11.so.6.2
-${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1
-${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6
-${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6
-${X11ROOT_PREFIX}/lib/libXaw.so.6.1
-${X11ROOT_PREFIX}/lib/libXaw.so.7
-${X11ROOT_PREFIX}/lib/libXaw.so.7.0
-${X11ROOT_PREFIX}/lib/libXaw.so.8
-${X11ROOT_PREFIX}/lib/libXaw.so.8.0
-${X11ROOT_PREFIX}/lib/libXcomposite.a
-${X11ROOT_PREFIX}/lib/libXcomposite.so
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
-${X11ROOT_PREFIX}/lib/libXdamage.a
-${X11ROOT_PREFIX}/lib/libXdamage.so
-${X11ROOT_PREFIX}/lib/libXdamage.so.1
-${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
-${X11ROOT_PREFIX}/lib/libXevie.a
-${X11ROOT_PREFIX}/lib/libXevie.so
-${X11ROOT_PREFIX}/lib/libXevie.so.1
-${X11ROOT_PREFIX}/lib/libXevie.so.1.0
-${X11ROOT_PREFIX}/lib/libXfixes.a
-${X11ROOT_PREFIX}/lib/libXfixes.so
-${X11ROOT_PREFIX}/lib/libXfixes.so.3
-${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6
-${X11ROOT_PREFIX}/lib/libXext.so.6.4
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6
-${X11ROOT_PREFIX}/lib/libXi.so.6.0
-${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1
-${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
-${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6
-${X11ROOT_PREFIX}/lib/libXmu.so.6.2
-${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1
-${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
-${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6
-${X11ROOT_PREFIX}/lib/libXp.so.6.2
-${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4
-${X11ROOT_PREFIX}/lib/libXpm.so.4.11
-${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1
-${X11ROOT_PREFIX}/lib/libXss.so.1.0
-${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6
-${X11ROOT_PREFIX}/lib/libXt.so.6.0
-${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6
-${X11ROOT_PREFIX}/lib/libXtst.so.6.1
-${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1
-${X11ROOT_PREFIX}/lib/libXv.so.1.0
-${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
-${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
-${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1
-${X11ROOT_PREFIX}/lib/libdps.so.1.0
-${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1
-${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1
-${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.so
-${X11ROOT_PREFIX}/lib/liboldX.so.6
-${X11ROOT_PREFIX}/lib/liboldX.so.6.0
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1
-${X11ROOT_PREFIX}/lib/libpsres.so.1.0
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
-${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1
-${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/xorg-libs/PLIST.NetBSD.i386 b/x11/xorg-libs/PLIST.NetBSD.i386
deleted file mode 100644
index 819a0ee5ffc..00000000000
--- a/x11/xorg-libs/PLIST.NetBSD.i386
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD.i386,v 1.1 2005/02/09 11:39:19 xtraeme Exp $
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dga1str.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86dgastr.h
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACopyTransparentArea.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACreateColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAFillRectangle.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAGetViewportStatus.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAInstallColormap.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAKeyEventToXKeyEvent.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAOpenFramebuffer.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryModes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASelectInput.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetClientVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASetViewport.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGASync.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86DGA.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XFree86-DGA.${LIBMAN_SUFFIX}
diff --git a/x11/xorg-libs/PLIST.OpenBSD b/x11/xorg-libs/PLIST.OpenBSD
deleted file mode 100644
index e038b7ed9e9..00000000000
--- a/x11/xorg-libs/PLIST.OpenBSD
+++ /dev/null
@@ -1,85 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.4 2005/01/15 17:04:22 xtraeme Exp $
-${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.so.8.0
-${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.so.3.0
-${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.so.3.0
-${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libGLw.so.3.0
-${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.so.8.0
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
-${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.so.8.0
-${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.so.8.0
-${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.so.2.0
-${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.so.8.0
-${X11ROOT_PREFIX}/lib/libXau.a
-${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.so.7.0
-${X11ROOT_PREFIX}/lib/libXaw.so.8.0
-${X11ROOT_PREFIX}/lib/libXaw.so.9.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.so.8.0
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so.3.0
-${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.so.8.0
-${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.so.3.0
-${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.so.8.0
-${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.so.3.0
-${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.so.8.0
-${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.so.6.0
-${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.so.3.0
-${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.so.8.0
-${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.so.8.0
-${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.so.3.0
-${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.so.3.0
-${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.3.0
-${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.3.0
-${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.3.0
-${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.so.3.0
-${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.so.3.0
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.so.3.0
-${X11ROOT_PREFIX}/lib/liboldX.a
-${X11ROOT_PREFIX}/lib/liboldX.so.8.0
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so.3.0
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so.2.0
-${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.so.2.0
-${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
-${X11ROOT_PREFIX}/lib/libXprintUtil.a
-${X11ROOT_PREFIX}/lib/libXevie.so.1.0
-${X11ROOT_PREFIX}/lib/libXevie.a
-${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
-${X11ROOT_PREFIX}/lib/libXfixes.a
-${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
-${X11ROOT_PREFIX}/lib/libXdamage.a
-${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
-${X11ROOT_PREFIX}/lib/libXcomposite.a
diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common
deleted file mode 100644
index 7e87ee0992a..00000000000
--- a/x11/xorg-libs/PLIST.common
+++ /dev/null
@@ -1,496 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.8 2005/03/22 09:48:48 adam Exp $
-${X11ROOT_PREFIX}/include/DPS/ColorSB.h
-${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
-${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
-${X11ROOT_PREFIX}/include/DPS/DPSScrollWP.h
-${X11ROOT_PREFIX}/include/DPS/FontCreatP.h
-${X11ROOT_PREFIX}/include/DPS/FontCreato.h
-${X11ROOT_PREFIX}/include/DPS/FontSB.h
-${X11ROOT_PREFIX}/include/DPS/FontSBP.h
-${X11ROOT_PREFIX}/include/DPS/FontSamplP.h
-${X11ROOT_PREFIX}/include/DPS/FontSample.h
-${X11ROOT_PREFIX}/include/DPS/PSres.h
-${X11ROOT_PREFIX}/include/DPS/XDPS.h
-${X11ROOT_PREFIX}/include/DPS/XDPSlib.h
-${X11ROOT_PREFIX}/include/DPS/XDPSproto.h
-${X11ROOT_PREFIX}/include/DPS/dpsNXargs.h
-${X11ROOT_PREFIX}/include/DPS/dpsXclient.h
-${X11ROOT_PREFIX}/include/DPS/dpsXcommon.h
-${X11ROOT_PREFIX}/include/DPS/dpsXpreview.h
-${X11ROOT_PREFIX}/include/DPS/dpsXshare.h
-${X11ROOT_PREFIX}/include/DPS/dpsXuserpath.h
-${X11ROOT_PREFIX}/include/DPS/dpsclient.h
-${X11ROOT_PREFIX}/include/DPS/dpsconfig.h
-${X11ROOT_PREFIX}/include/DPS/dpsexcept.h
-${X11ROOT_PREFIX}/include/DPS/dpsfriends.h
-${X11ROOT_PREFIX}/include/DPS/dpsops.h
-${X11ROOT_PREFIX}/include/DPS/psops.h
-${X11ROOT_PREFIX}/include/GL/GLwDrawA.h
-${X11ROOT_PREFIX}/include/GL/GLwDrawAP.h
-${X11ROOT_PREFIX}/include/GL/GLwMDrawA.h
-${X11ROOT_PREFIX}/include/GL/GLwMDrawAP.h
-${X11ROOT_PREFIX}/include/GL/gl.h
-${X11ROOT_PREFIX}/include/GL/glext.h
-${X11ROOT_PREFIX}/include/GL/glu.h
-${X11ROOT_PREFIX}/include/GL/glx.h
-${X11ROOT_PREFIX}/include/GL/glxext.h
-${X11ROOT_PREFIX}/include/GL/glxint.h
-${X11ROOT_PREFIX}/include/GL/glxmd.h
-${X11ROOT_PREFIX}/include/GL/glxproto.h
-${X11ROOT_PREFIX}/include/GL/glxtokens.h
-${X11ROOT_PREFIX}/include/GL/osmesa.h
-${X11ROOT_PREFIX}/include/X11/Composite.h
-${X11ROOT_PREFIX}/include/X11/CompositeP.h
-${X11ROOT_PREFIX}/include/X11/ConstrainP.h
-${X11ROOT_PREFIX}/include/X11/Constraint.h
-${X11ROOT_PREFIX}/include/X11/Core.h
-${X11ROOT_PREFIX}/include/X11/CoreP.h
-${X11ROOT_PREFIX}/include/X11/DECkeysym.h
-${X11ROOT_PREFIX}/include/X11/HPkeysym.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICE.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICEconn.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICElib.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICEmsg.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICEproto.h
-${X11ROOT_PREFIX}/include/X11/ICE/ICEutil.h
-${X11ROOT_PREFIX}/include/X11/Intrinsic.h
-${X11ROOT_PREFIX}/include/X11/IntrinsicP.h
-${X11ROOT_PREFIX}/include/X11/Object.h
-${X11ROOT_PREFIX}/include/X11/ObjectP.h
-${X11ROOT_PREFIX}/include/X11/RectObj.h
-${X11ROOT_PREFIX}/include/X11/RectObjP.h
-${X11ROOT_PREFIX}/include/X11/SM/SM.h
-${X11ROOT_PREFIX}/include/X11/SM/SMlib.h
-${X11ROOT_PREFIX}/include/X11/SM/SMproto.h
-${X11ROOT_PREFIX}/include/X11/Shell.h
-${X11ROOT_PREFIX}/include/X11/ShellP.h
-${X11ROOT_PREFIX}/include/X11/StringDefs.h
-${X11ROOT_PREFIX}/include/X11/Sunkeysym.h
-${X11ROOT_PREFIX}/include/X11/Vendor.h
-${X11ROOT_PREFIX}/include/X11/VendorP.h
-${X11ROOT_PREFIX}/include/X11/X.h
-${X11ROOT_PREFIX}/include/X11/X10.h
-${X11ROOT_PREFIX}/include/X11/XF86keysym.h
-${X11ROOT_PREFIX}/include/X11/XKBlib.h
-${X11ROOT_PREFIX}/include/X11/XWDFile.h
-${X11ROOT_PREFIX}/include/X11/Xalloca.h
-${X11ROOT_PREFIX}/include/X11/Xarch.h
-${X11ROOT_PREFIX}/include/X11/Xatom.h
-${X11ROOT_PREFIX}/include/X11/Xauth.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AllWidgets.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSink.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSinkP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrc.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiSrcP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiText.h
-${X11ROOT_PREFIX}/include/X11/Xaw/AsciiTextP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Box.h
-${X11ROOT_PREFIX}/include/X11/Xaw/BoxP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Cardinals.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Command.h
-${X11ROOT_PREFIX}/include/X11/Xaw/CommandP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Dialog.h
-${X11ROOT_PREFIX}/include/X11/Xaw/DialogP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Form.h
-${X11ROOT_PREFIX}/include/X11/Xaw/FormP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Grip.h
-${X11ROOT_PREFIX}/include/X11/Xaw/GripP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Label.h
-${X11ROOT_PREFIX}/include/X11/Xaw/LabelP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/List.h
-${X11ROOT_PREFIX}/include/X11/Xaw/ListP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MenuButtoP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MenuButton.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MultiSink.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MultiSinkP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrc.h
-${X11ROOT_PREFIX}/include/X11/Xaw/MultiSrcP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Paned.h
-${X11ROOT_PREFIX}/include/X11/Xaw/PanedP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h
-${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h
-${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Print.h
-${X11ROOT_PREFIX}/include/X11/Xaw/PrintSP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h
-${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Scrollbar.h
-${X11ROOT_PREFIX}/include/X11/Xaw/ScrollbarP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Simple.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SimpleMenu.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SimpleP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Sme.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSB.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SmeBSBP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SmeLine.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SmeLineP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/SmeP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/StripCharP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/StripChart.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Template.c
-${X11ROOT_PREFIX}/include/X11/Xaw/Template.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TemplateP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Text.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TextP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TextSink.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TextSinkP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TextSrc.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TextSrcP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Tip.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TipP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Toggle.h
-${X11ROOT_PREFIX}/include/X11/Xaw/ToggleP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Tree.h
-${X11ROOT_PREFIX}/include/X11/Xaw/TreeP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/VendorEP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/Viewport.h
-${X11ROOT_PREFIX}/include/X11/Xaw/ViewportP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/XawImP.h
-${X11ROOT_PREFIX}/include/X11/Xaw/XawInit.h
-${X11ROOT_PREFIX}/include/X11/Xcms.h
-${X11ROOT_PREFIX}/include/X11/Xdefs.h
-${X11ROOT_PREFIX}/include/X11/Xdmcp.h
-${X11ROOT_PREFIX}/include/X11/Xfuncproto.h
-${X11ROOT_PREFIX}/include/X11/Xfuncs.h
-${X11ROOT_PREFIX}/include/X11/Xlib.h
-${X11ROOT_PREFIX}/include/X11/Xlibint.h
-${X11ROOT_PREFIX}/include/X11/Xlocale.h
-${X11ROOT_PREFIX}/include/X11/Xmd.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Atoms.h
-${X11ROOT_PREFIX}/include/X11/Xmu/CharSet.h
-${X11ROOT_PREFIX}/include/X11/Xmu/CloseHook.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Converters.h
-${X11ROOT_PREFIX}/include/X11/Xmu/CurUtil.h
-${X11ROOT_PREFIX}/include/X11/Xmu/CvtCache.h
-${X11ROOT_PREFIX}/include/X11/Xmu/DisplayQue.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Drawing.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Editres.h
-${X11ROOT_PREFIX}/include/X11/Xmu/EditresP.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Error.h
-${X11ROOT_PREFIX}/include/X11/Xmu/ExtAgent.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Initer.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Lookup.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Misc.h
-${X11ROOT_PREFIX}/include/X11/Xmu/StdCmap.h
-${X11ROOT_PREFIX}/include/X11/Xmu/StdSel.h
-${X11ROOT_PREFIX}/include/X11/Xmu/SysUtil.h
-${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h
-${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h
-${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h
-${X11ROOT_PREFIX}/include/X11/Xos.h
-${X11ROOT_PREFIX}/include/X11/Xos_r.h
-${X11ROOT_PREFIX}/include/X11/Xosdefs.h
-${X11ROOT_PREFIX}/include/X11/Xpoll.h
-${X11ROOT_PREFIX}/include/X11/XprintAppUtil/xpapputil.h
-${X11ROOT_PREFIX}/include/X11/XprintUtil/xprintutil.h
-${X11ROOT_PREFIX}/include/X11/Xproto.h
-${X11ROOT_PREFIX}/include/X11/Xprotostr.h
-${X11ROOT_PREFIX}/include/X11/Xresource.h
-${X11ROOT_PREFIX}/include/X11/Xthreads.h
-${X11ROOT_PREFIX}/include/X11/Xutil.h
-${X11ROOT_PREFIX}/include/X11/ap_keysym.h
-${X11ROOT_PREFIX}/include/X11/bitmaps/1x1
-${X11ROOT_PREFIX}/include/X11/bitmaps/2x2
-${X11ROOT_PREFIX}/include/X11/bitmaps/black
-${X11ROOT_PREFIX}/include/X11/bitmaps/boxes
-${X11ROOT_PREFIX}/include/X11/bitmaps/calculator
-${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptr
-${X11ROOT_PREFIX}/include/X11/bitmaps/cntr_ptrmsk
-${X11ROOT_PREFIX}/include/X11/bitmaps/cross_weave
-${X11ROOT_PREFIX}/include/X11/bitmaps/dimple1
-${X11ROOT_PREFIX}/include/X11/bitmaps/dimple3
-${X11ROOT_PREFIX}/include/X11/bitmaps/dot
-${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar7
-${X11ROOT_PREFIX}/include/X11/bitmaps/dropbar8
-${X11ROOT_PREFIX}/include/X11/bitmaps/escherknot
-${X11ROOT_PREFIX}/include/X11/bitmaps/flagdown
-${X11ROOT_PREFIX}/include/X11/bitmaps/flagup
-${X11ROOT_PREFIX}/include/X11/bitmaps/flipped_gray
-${X11ROOT_PREFIX}/include/X11/bitmaps/gray
-${X11ROOT_PREFIX}/include/X11/bitmaps/gray1
-${X11ROOT_PREFIX}/include/X11/bitmaps/gray3
-${X11ROOT_PREFIX}/include/X11/bitmaps/grid16
-${X11ROOT_PREFIX}/include/X11/bitmaps/grid2
-${X11ROOT_PREFIX}/include/X11/bitmaps/grid4
-${X11ROOT_PREFIX}/include/X11/bitmaps/grid8
-${X11ROOT_PREFIX}/include/X11/bitmaps/hlines2
-${X11ROOT_PREFIX}/include/X11/bitmaps/hlines3
-${X11ROOT_PREFIX}/include/X11/bitmaps/icon
-${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard16
-${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptr
-${X11ROOT_PREFIX}/include/X11/bitmaps/left_ptrmsk
-${X11ROOT_PREFIX}/include/X11/bitmaps/letters
-${X11ROOT_PREFIX}/include/X11/bitmaps/light_gray
-${X11ROOT_PREFIX}/include/X11/bitmaps/mailempty
-${X11ROOT_PREFIX}/include/X11/bitmaps/mailemptymsk
-${X11ROOT_PREFIX}/include/X11/bitmaps/mailfull
-${X11ROOT_PREFIX}/include/X11/bitmaps/mailfullmsk
-${X11ROOT_PREFIX}/include/X11/bitmaps/mensetmanus
-${X11ROOT_PREFIX}/include/X11/bitmaps/menu10
-${X11ROOT_PREFIX}/include/X11/bitmaps/menu12
-${X11ROOT_PREFIX}/include/X11/bitmaps/menu16
-${X11ROOT_PREFIX}/include/X11/bitmaps/menu6
-${X11ROOT_PREFIX}/include/X11/bitmaps/menu8
-${X11ROOT_PREFIX}/include/X11/bitmaps/noletters
-${X11ROOT_PREFIX}/include/X11/bitmaps/opendot
-${X11ROOT_PREFIX}/include/X11/bitmaps/opendotMask
-${X11ROOT_PREFIX}/include/X11/bitmaps/plaid
-${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptr
-${X11ROOT_PREFIX}/include/X11/bitmaps/right_ptrmsk
-${X11ROOT_PREFIX}/include/X11/bitmaps/root_weave
-${X11ROOT_PREFIX}/include/X11/bitmaps/scales
-${X11ROOT_PREFIX}/include/X11/bitmaps/sipb
-${X11ROOT_PREFIX}/include/X11/bitmaps/star
-${X11ROOT_PREFIX}/include/X11/bitmaps/starMask
-${X11ROOT_PREFIX}/include/X11/bitmaps/stipple
-${X11ROOT_PREFIX}/include/X11/bitmaps/target
-${X11ROOT_PREFIX}/include/X11/bitmaps/terminal
-${X11ROOT_PREFIX}/include/X11/bitmaps/tie_fighter
-${X11ROOT_PREFIX}/include/X11/bitmaps/vlines2
-${X11ROOT_PREFIX}/include/X11/bitmaps/vlines3
-${X11ROOT_PREFIX}/include/X11/bitmaps/weird_size
-${X11ROOT_PREFIX}/include/X11/bitmaps/wide_weave
-${X11ROOT_PREFIX}/include/X11/bitmaps/wingdogs
-${X11ROOT_PREFIX}/include/X11/bitmaps/woman
-${X11ROOT_PREFIX}/include/X11/bitmaps/xfd_icon
-${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo11
-${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo16
-${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo32
-${X11ROOT_PREFIX}/include/X11/bitmaps/xlogo64
-${X11ROOT_PREFIX}/include/X11/bitmaps/xsnow
-${X11ROOT_PREFIX}/include/X11/cursorfont.h
-${X11ROOT_PREFIX}/include/X11/extensions/MITMisc.h
-${X11ROOT_PREFIX}/include/X11/extensions/Print.h
-${X11ROOT_PREFIX}/include/X11/extensions/Printstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/XEVI.h
-${X11ROOT_PREFIX}/include/X11/extensions/XEVIstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/XI.h
-${X11ROOT_PREFIX}/include/X11/extensions/XInput.h
-${X11ROOT_PREFIX}/include/X11/extensions/XIproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKB.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBbells.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBconfig.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBfile.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBgeom.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBrules.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBsrv.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKBui.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKM.h
-${X11ROOT_PREFIX}/include/X11/extensions/XKMformat.h
-${X11ROOT_PREFIX}/include/X11/extensions/XLbx.h
-${X11ROOT_PREFIX}/include/X11/extensions/XRes.h
-${X11ROOT_PREFIX}/include/X11/extensions/XResproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/XShm.h
-${X11ROOT_PREFIX}/include/X11/extensions/XTest.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xag.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xagsrv.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xagstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xcomposite.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xcup.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xcupstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xdamage.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xdbe.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xdbeproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xevie.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xeviestr.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xext.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xfixes.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xinerama.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xv.h
-${X11ROOT_PREFIX}/include/X11/extensions/XvMC.h
-${X11ROOT_PREFIX}/include/X11/extensions/XvMClib.h
-${X11ROOT_PREFIX}/include/X11/extensions/XvMCproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xvlib.h
-${X11ROOT_PREFIX}/include/X11/extensions/Xvproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/composite.h
-${X11ROOT_PREFIX}/include/X11/extensions/compositeproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/damageproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/damagewire.h
-${X11ROOT_PREFIX}/include/X11/extensions/dpms.h
-${X11ROOT_PREFIX}/include/X11/extensions/dpmsstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/extutil.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxbuf.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxbufstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxdeltastr.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbximage.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxopts.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/lbxzlib.h
-${X11ROOT_PREFIX}/include/X11/extensions/mitmiscstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/multibuf.h
-${X11ROOT_PREFIX}/include/X11/extensions/multibufst.h
-${X11ROOT_PREFIX}/include/X11/extensions/panoramiXext.h
-${X11ROOT_PREFIX}/include/X11/extensions/panoramiXproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/randr.h
-${X11ROOT_PREFIX}/include/X11/extensions/randrproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/record.h
-${X11ROOT_PREFIX}/include/X11/extensions/recordstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/render.h
-${X11ROOT_PREFIX}/include/X11/extensions/renderproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/saver.h
-${X11ROOT_PREFIX}/include/X11/extensions/saverproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/scrnsaver.h
-${X11ROOT_PREFIX}/include/X11/extensions/security.h
-${X11ROOT_PREFIX}/include/X11/extensions/securstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/shape.h
-${X11ROOT_PREFIX}/include/X11/extensions/shapestr.h
-${X11ROOT_PREFIX}/include/X11/extensions/shmstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/sync.h
-${X11ROOT_PREFIX}/include/X11/extensions/syncstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xcmiscstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xevieplaceholder.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfont.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86bigfstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86misc.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86mscstr.h
-${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rush.h
-${XF86RUSH}${X11ROOT_PREFIX}/include/X11/extensions/xf86rushstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86vmode.h
-${X11ROOT_PREFIX}/include/X11/extensions/xf86vmstr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xfixesproto.h
-${X11ROOT_PREFIX}/include/X11/extensions/xfixeswire.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtestext1.h
-${X11ROOT_PREFIX}/include/X11/extensions/xteststr.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtrapbits.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtrapddmi.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtrapdi.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtrapemacros.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtraplib.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtraplibp.h
-${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h
-${X11ROOT_PREFIX}/include/X11/fonts/FS.h
-${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h
-${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h
-${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h
-${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h
-${X11ROOT_PREFIX}/include/X11/keysym.h
-${X11ROOT_PREFIX}/include/X11/keysymdef.h
-${X11ROOT_PREFIX}/include/X11/xpm.h
-${X11ROOT_PREFIX}/include/xf86Optrec.h
-${X11ROOT_PREFIX}/include/xf86Parser.h
-${X11ROOT_PREFIX}/lib/pkgconfig/xcomposite.pc
-${X11ROOT_PREFIX}/lib/pkgconfig/xdamage.pc
-${X11ROOT_PREFIX}/lib/pkgconfig/xevie.pc
-${X11ROOT_PREFIX}/lib/pkgconfig/xfixes.pc
-${X11ROOT_PREFIX}/lib/pkgconfig/fixesext.pc
-${X11ROOT_PREFIX}/lib/pkgconfig/compositeext.pc
-${X11ROOT_PREFIX}/lib/X11/XErrorDB
-${X11ROOT_PREFIX}/lib/X11/XKeysymDB
-${X11ROOT_PREFIX}/lib/X11/Xcms.txt
-${X11ROOT_PREFIX}/lib/X11/locale/C/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/compose.dir
-${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ja/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ja/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ko/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/ko/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/locale.alias
-${X11ROOT_PREFIX}/lib/X11/locale/locale.dir
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xevie.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfixes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XRes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientPixmapBytes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClientResources.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryClients.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XResQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverAllocInfo.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverGetRegistered.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryInfo.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverRegister.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSelectInput.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSetAttributes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX}
diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end
deleted file mode 100644
index b379268a919..00000000000
--- a/x11/xorg-libs/PLIST.common_end
+++ /dev/null
@@ -1,67 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2005/03/22 09:48:48 adam Exp $
-@dirrm ${X11ROOT_PREFIX}/lib/pkgconfig
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_CN
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tscii-0
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/th_TH
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-u
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-r
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/koi8-c
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ko
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ja
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/el_GR.UTF-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale
-@dirrm ${X11ROOT_PREFIX}/include/X11/fonts
-@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
-@dirrm ${X11ROOT_PREFIX}/include/X11/bitmaps
-@dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil
-@dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil
-@dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
-@dirrm ${X11ROOT_PREFIX}/include/X11/Xaw
-@dirrm ${X11ROOT_PREFIX}/include/X11/SM
-@dirrm ${X11ROOT_PREFIX}/include/X11/ICE
-@dirrm ${X11ROOT_PREFIX}/include/GL
-@dirrm ${X11ROOT_PREFIX}/include/DPS
diff --git a/x11/xorg-libs/PLIST.common_i18n b/x11/xorg-libs/PLIST.common_i18n
deleted file mode 100644
index 80950d671a1..00000000000
--- a/x11/xorg-libs/PLIST.common_i18n
+++ /dev/null
@@ -1,60 +0,0 @@
-@comment $NetBSD: PLIST.common_i18n,v 1.1 2005/03/22 09:48:48 adam Exp $
-${X11ROOT_PREFIX}/lib/X11/locale/C/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/armscii-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/en_US.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-academy/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/georgian-ps/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ibm-cp1133/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iscii-dev/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/isiri-3342/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-1/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-10/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-11/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-13/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-14/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-15/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-2/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-3/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-4/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-5/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-6/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-7/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/iso8859-9e/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ja.JIS/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ja.SJIS/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ja/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ko/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-c/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-r/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/koi8-u/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/ximcp.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcDef.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlcUTF8Load.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlibi18n.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xlocale.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/lib/common/xomGeneric.so.2
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1251/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1255/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/microsoft-cp1256/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/mulelao-1/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/nokhchi-1/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/tatar-cyr/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/th_TH/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/tscii-0/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/vi_VN.viscii/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_CN/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XI18N_OBJS
-${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib/common
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 6599a40ff69..1dfaa32863a 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/03/22 14:01:20 adam Exp $
+# $NetBSD: Makefile,v 1.20 2005/03/30 20:29:20 hira Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
@@ -26,6 +26,9 @@ XINSTALL_DIRS=		lib/font/FreeType \
 			lib/font/bitmap programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver
 
+PLIST_SRC=		${WRKDIR}/.PLIST_SRC
+XORG_PLIST_ENTRY=	${OPSYS}
+
 REPLACE_PERL=		exports/lib/modules/getconfig*
 
 SUBST_CLASSES+=		parser
@@ -53,14 +56,10 @@ USE_PERL5=	build # Yeah, we need this :-)
 BUILDLINK_PASSTHRU_DIRS+=	/System
 .else
 .include "options.mk"
-
-PLIST_SRC+=	PLIST.${OPSYS}
-PLIST_SRC+=	PLIST.common_cards
-PLIST_SRC+=	PLIST.common
-PLIST_SRC+=	PLIST.common_end
 .endif
 
 post-install:
+	@${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if ${OPSYS} == "Darwin"
 	${CHMOD} a+r ${X11ROOT}/bin/XDarwin
 .else
diff --git a/x11/xorg-server/PLIST.common b/x11/xorg-server/PLIST
index 50783282e4e..e17b7121c8e 100644
--- a/x11/xorg-server/PLIST.common
+++ b/x11/xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.10 2005/03/22 14:01:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.1 2005/03/30 20:29:20 hira Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -879,3 +879,390 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/Xorg.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xprt.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xserver.${MAN_SUFFIX}
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xvfb.${MAN_SUFFIX}
+${CARDDRIVER.apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
+${CARDDRIVER.apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
+${CARDDRIVER.ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
+${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
+${CARDDRIVER.chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
+${CARDDRIVER.chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
+${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
+${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
+${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
+${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
+${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX}
+${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
+${CARDDRIVER.dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
+${CARDDRIVER.glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
+${CARDDRIVER.glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
+${CARDDRIVER.i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
+${CARDDRIVER.i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
+${CARDDRIVER.i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
+${CARDDRIVER.i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
+${CARDDRIVER.i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
+${CARDDRIVER.i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
+${CARDDRIVER.imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
+${CARDDRIVER.imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
+${CARDDRIVER.mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
+${CARDDRIVER.mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
+${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
+${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
+${CARDDRIVER.newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
+${CARDDRIVER.newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
+${CARDDRIVER.nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
+${CARDDRIVER.nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
+${CARDDRIVER.nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
+${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
+${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
+${CARDDRIVER.rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
+${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
+${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
+${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
+${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
+${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
+${CARDDRIVER.s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
+${CARDDRIVER.savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
+${CARDDRIVER.savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
+${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
+${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
+${CARDDRIVER.sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
+${CARDDRIVER.sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
+${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
+${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
+${CARDDRIVER.tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
+${CARDDRIVER.trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
+${CARDDRIVER.trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
+${CARDDRIVER.tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
+${CARDDRIVER.tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
+${CARDDRIVER.vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
+${CARDDRIVER.vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
+${CARDDRIVER.vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
+${CARDDRIVER.vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
+${CARDDRIVER.via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
+${CARDDRIVER.via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
+${CARDDRIVER.vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
+${CARDDRIVER.vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
+${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
+${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/dmc.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/dynapro.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/elographics.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeDeleteModeLine.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetAllModeLines.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetDotClocks.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGamma.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRamp.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetModeLine.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetMonitor.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetPermissions.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetViewPort.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeLockModeSwitch.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeModModeLine.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryExtension.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetClientVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGamma.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGammaRamp.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetViewPort.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchToMode.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/getconfig.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/gtf.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/pcitweak.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/scanpci.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/xorgcfg.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/xorgconfig.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/bin/XFree86
+${X11ROOT_PREFIX}/bin/Xorg
+${X11ROOT_PREFIX}/bin/getconfig
+${X11ROOT_PREFIX}/bin/getconfig.pl
+${X11ROOT_PREFIX}/bin/gtf
+${X11ROOT_PREFIX}/bin/inb
+${X11ROOT_PREFIX}/bin/inl
+${X11ROOT_PREFIX}/bin/inw
+${X11ROOT_PREFIX}/bin/ioport
+${X11ROOT_PREFIX}/bin/mmapr
+${X11ROOT_PREFIX}/bin/mmapw
+${X11ROOT_PREFIX}/bin/outb
+${X11ROOT_PREFIX}/bin/outl
+${X11ROOT_PREFIX}/bin/outw
+${X11ROOT_PREFIX}/bin/pcitweak
+${X11ROOT_PREFIX}/bin/scanpci
+${X11ROOT_PREFIX}/bin/xorgcfg
+${X11ROOT_PREFIX}/bin/xorgconfig
+${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/down.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/left.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/monitor.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/mouse.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/narrower.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/right.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/shorter.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/taller.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/up.xbm
+${X11ROOT_PREFIX}/include/X11/bitmaps/wider.xbm
+${X11ROOT_PREFIX}/include/X11/pixmaps/card.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/computer.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/keyboard.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/monitor.xpm
+${X11ROOT_PREFIX}/include/X11/pixmaps/mouse.xpm
+${X11ROOT_PREFIX}/lib/X11/Cards
+${X11ROOT_PREFIX}/lib/X11/Options
+${X11ROOT_PREFIX}/lib/X11/app-defaults/XOrgCfg
+${X11ROOT_PREFIX}/lib/X11/doc/BUILD
+${X11ROOT_PREFIX}/lib/X11/doc/BugReport
+${X11ROOT_PREFIX}/lib/X11/doc/DESIGN
+${X11ROOT_PREFIX}/lib/X11/doc/Install
+${X11ROOT_PREFIX}/lib/X11/doc/LICENSE
+${X11ROOT_PREFIX}/lib/X11/doc/OS2.Notes
+${X11ROOT_PREFIX}/lib/X11/doc/RELNOTES
+${X11ROOT_PREFIX}/lib/X11/doc/Versions
+${X11ROOT_PREFIX}/lib/X11/doc/VideoBoard98
+${X11ROOT_PREFIX}/lib/X11/etc/Xinstall.sh
+${X11ROOT_PREFIX}/lib/X11/etc/xmodmap.std
+${X11ROOT_PREFIX}/lib/X11/getconfig/cfg.sample
+${X11ROOT_PREFIX}/lib/X11/getconfig/xorg.cfg
+${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libglx.a
+${X11ROOT_PREFIX}/lib/modules/extensions/librecord.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libxtrap.a
+${X11ROOT_PREFIX}/lib/modules/fonts/libbitmap.a
+${X11ROOT_PREFIX}/lib/modules/fonts/libfreetype.so
+${X11ROOT_PREFIX}/lib/modules/fonts/libtype1.a
+${X11ROOT_PREFIX}/lib/modules/input/acecad_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/calcomp_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/citron_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/digitaledge_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/dmc_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/dynapro_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/elographics_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/fpit_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/hyperpen_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/js_x_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/kbd_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/keyboard_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/magellan_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/microtouch_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/mouse_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/mutouch_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/palmax_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/penmount_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/spaceorb_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/summa_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/tek4957_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/void_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/wacom_drv.o
+${X11ROOT_PREFIX}/lib/modules/libafb.a
+${X11ROOT_PREFIX}/lib/modules/libcfb.a
+${X11ROOT_PREFIX}/lib/modules/libcfb16.a
+${X11ROOT_PREFIX}/lib/modules/libcfb24.a
+${X11ROOT_PREFIX}/lib/modules/libcfb32.a
+${X11ROOT_PREFIX}/lib/modules/libcw.a
+${X11ROOT_PREFIX}/lib/modules/libdamage.a
+${X11ROOT_PREFIX}/lib/modules/libddc.a
+${X11ROOT_PREFIX}/lib/modules/libfb.a
+${X11ROOT_PREFIX}/lib/modules/libi2c.a
+${X11ROOT_PREFIX}/lib/modules/libint10.a
+${X11ROOT_PREFIX}/lib/modules/liblayer.a
+${X11ROOT_PREFIX}/lib/modules/libmfb.a
+${X11ROOT_PREFIX}/lib/modules/libpcidata.a
+${X11ROOT_PREFIX}/lib/modules/librac.a
+${X11ROOT_PREFIX}/lib/modules/libramdac.a
+${X11ROOT_PREFIX}/lib/modules/libscanpci.a
+${X11ROOT_PREFIX}/lib/modules/libshadow.a
+${X11ROOT_PREFIX}/lib/modules/libshadowfb.a
+${X11ROOT_PREFIX}/lib/modules/libvbe.a
+${X11ROOT_PREFIX}/lib/modules/libvgahw.a
+${X11ROOT_PREFIX}/lib/modules/libxaa.a
+${X11ROOT_PREFIX}/lib/modules/libxf1bpp.a
+${X11ROOT_PREFIX}/lib/modules/libxf24_32bpp.a
+${X11ROOT_PREFIX}/lib/modules/libxf4bpp.a
+${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.a
+${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.a
+${X11ROOT_PREFIX}/lib/X11/doc/README
+${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga
+${X11ROOT_PREFIX}/lib/X11/doc/README.Darwin
+${X11ROOT_PREFIX}/lib/X11/doc/README.I128
+${X11ROOT_PREFIX}/lib/X11/doc/README.LynxOS
+${X11ROOT_PREFIX}/lib/X11/doc/README.NetBSD
+${X11ROOT_PREFIX}/lib/X11/doc/README.OpenBSD
+${X11ROOT_PREFIX}/lib/X11/doc/README.SCO
+${X11ROOT_PREFIX}/lib/X11/doc/README.SiS
+${X11ROOT_PREFIX}/lib/X11/doc/README.Solaris
+${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Config
+${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Enhancing
+${X11ROOT_PREFIX}/lib/X11/doc/README.apm
+${X11ROOT_PREFIX}/lib/X11/doc/README.ati
+${X11ROOT_PREFIX}/lib/X11/doc/README.chips
+${X11ROOT_PREFIX}/lib/X11/doc/README.cyrix
+${X11ROOT_PREFIX}/lib/X11/doc/README.dps
+${X11ROOT_PREFIX}/lib/X11/doc/README.fonts
+${X11ROOT_PREFIX}/lib/X11/doc/README.i740
+${X11ROOT_PREFIX}/lib/X11/doc/README.i810
+${X11ROOT_PREFIX}/lib/X11/doc/README.mouse
+${X11ROOT_PREFIX}/lib/X11/doc/README.newport
+${X11ROOT_PREFIX}/lib/X11/doc/README.r128
+${X11ROOT_PREFIX}/lib/X11/doc/README.rapidaccess
+${X11ROOT_PREFIX}/lib/X11/doc/README.rendition
+${X11ROOT_PREFIX}/lib/X11/doc/README.s3virge
+@dirrm ${X11ROOT_PREFIX}/lib/modules/input
+@dirrm ${X11ROOT_PREFIX}/lib/modules/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/modules/extensions
+@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers
+@dirrm ${X11ROOT_PREFIX}/lib/modules
+@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig
+@comment begin Darwin
+${X11ROOT_PREFIX}/bin/XDarwin
+${X11ROOT_PREFIX}/bin/dumpkeymap
+${X11ROOT_PREFIX}/etc/init.d/xprint
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Info.plist
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/MacOS/XDarwin
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/PkgInfo
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Dutch.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Dutch.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/English.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/English.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/French.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/French.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/German.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/German.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Japanese.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Japanese.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Portuguese.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Portuguese.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Spanish.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Spanish.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Swedish.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Swedish.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/cr.bundle/Contents/MacOS/cr
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/fullscreen.bundle/Contents/MacOS/fullscreen
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxAGL.bundle/Contents/MacOS/glxAGL
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxCGL.bundle/Contents/MacOS/glxCGL
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxMesa.bundle/Contents/MacOS/glxMesa
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/ko.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/ko.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/startXClients
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/xpr.bundle/Contents/MacOS/xpr
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwinStartup
+${X11ROOT_PREFIX}/${MAN_DIR}/XDarwin.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/dumpkeymap.${MAN_SUFFIX}
+@comment end Darwin
+@comment begin DragonFly
+${X11ROOT_PREFIX}/etc/rc.d/xprint
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
+@dirrm ${X11ROOT_PREFIX}/etc/rc.d
+@comment end DragonFly
+@comment begin FreeBSD
+${X11ROOT_PREFIX}/etc/rc.d/xprint
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
+@dirrm ${X11ROOT_PREFIX}/etc/rc.d
+@comment end FreeBSD
+@comment begin Linux
+${X11ROOT_PREFIX}/bin/Xdmx
+${X11ROOT_PREFIX}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
+${X11ROOT_PREFIX}/etc/X11/Xsession.d/92xprint-xpserverlist.sh
+${X11ROOT_PREFIX}/etc/rc.d/rc2.d/K21xprint
+${X11ROOT_PREFIX}/etc/rc.d/rc2.d/S21xprint
+${X11ROOT_PREFIX}/etc/rc.d/rc3.d/K21xprint
+${X11ROOT_PREFIX}/etc/rc.d/rc3.d/S21xprint
+${X11ROOT_PREFIX}/etc/rc.d/rc5.d/K21xprint
+${X11ROOT_PREFIX}/etc/rc.d/rc5.d/S21xprint
+${X11ROOT_PREFIX}/etc/profile.d/xprint.csh
+${X11ROOT_PREFIX}/etc/profile.d/xprint.sh
+${X11ROOT_PREFIX}/${MAN_DIR}/Xdmx.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdev.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/etc/init.d/xprint
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/fonts
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/fonts
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/fonts
+${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/model-config
+${CARDDRIVER.fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
+${CARDDRIVER.v4l}${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o
+${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a
+${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a
+${X11ROOT_PREFIX}/lib/modules/linux/libint10.a
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/aiptek.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/ur98.${KERNMAN_SUFFIX}
+${CARDDRIVER.v4l}${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS
+@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers/linux
+@dirrm ${X11ROOT_PREFIX}/lib/modules/input/linux
+@dirrm ${X11ROOT_PREFIX}/lib/modules/linux
+@dirrm ${X11ROOT_PREFIX}/etc/init.d
+@comment end Linux
+@comment begin NetBSD
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/etc/init.d/xprint
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/etc/init.d
+@comment end NetBSD
+@comment begin OpenBSD
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/etc/init.d/xprint
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+@dirrm ${X11ROOT_PREFIX}/etc/init.d
+@comment end OpenBSD
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config/raster
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver
+@unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE}
diff --git a/x11/xorg-server/PLIST.Darwin b/x11/xorg-server/PLIST.Darwin
deleted file mode 100644
index d233bfcc980..00000000000
--- a/x11/xorg-server/PLIST.Darwin
+++ /dev/null
@@ -1,35 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2005/03/22 14:01:20 adam Exp $
-${X11ROOT_PREFIX}/bin/XDarwin
-${X11ROOT_PREFIX}/bin/dumpkeymap
-${X11ROOT_PREFIX}/etc/init.d/xprint
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Info.plist
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/MacOS/XDarwin
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/PkgInfo
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Dutch.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Dutch.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/English.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/English.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/French.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/French.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/German.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/German.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Japanese.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Japanese.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Portuguese.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Portuguese.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Spanish.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Spanish.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Swedish.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/Swedish.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/cr.bundle/Contents/MacOS/cr
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/fullscreen.bundle/Contents/MacOS/fullscreen
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxAGL.bundle/Contents/MacOS/glxAGL
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxCGL.bundle/Contents/MacOS/glxCGL
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/glxMesa.bundle/Contents/MacOS/glxMesa
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/ko.lproj/InfoPlist.strings
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/ko.lproj/XDarwinHelp.html
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/startXClients
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.app/Contents/Resources/xpr.bundle/Contents/MacOS/xpr
-${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwinStartup
-${X11ROOT_PREFIX}/${MAN_DIR}/XDarwin.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/dumpkeymap.${MAN_SUFFIX}
diff --git a/x11/xorg-server/PLIST.DragonFly b/x11/xorg-server/PLIST.DragonFly
deleted file mode 100644
index 311aab12f52..00000000000
--- a/x11/xorg-server/PLIST.DragonFly
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.DragonFly,v 1.1 2005/01/25 17:49:57 xtraeme Exp $
-${X11ROOT_PREFIX}/etc/rc.d/xprint
-${X11ROOT_PREFIX}/bin/kbd_mode
-${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
-${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
-@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
-@dirrm ${X11ROOT_PREFIX}/etc/rc.d
diff --git a/x11/xorg-server/PLIST.FreeBSD b/x11/xorg-server/PLIST.FreeBSD
deleted file mode 100644
index 896a1a43544..00000000000
--- a/x11/xorg-server/PLIST.FreeBSD
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
-${X11ROOT_PREFIX}/etc/rc.d/xprint
-${X11ROOT_PREFIX}/bin/kbd_mode
-${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
-${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
-@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
-@dirrm ${X11ROOT_PREFIX}/etc/rc.d
diff --git a/x11/xorg-server/PLIST.Linux b/x11/xorg-server/PLIST.Linux
deleted file mode 100644
index 36e90d42284..00000000000
--- a/x11/xorg-server/PLIST.Linux
+++ /dev/null
@@ -1,40 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.6 2005/02/09 17:58:14 xtraeme Exp $
-${X11ROOT_PREFIX}/bin/Xdmx
-${X11ROOT_PREFIX}/etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh
-${X11ROOT_PREFIX}/etc/X11/Xsession.d/92xprint-xpserverlist.sh
-${X11ROOT_PREFIX}/etc/rc.d/rc2.d/K21xprint
-${X11ROOT_PREFIX}/etc/rc.d/rc2.d/S21xprint
-${X11ROOT_PREFIX}/etc/rc.d/rc3.d/K21xprint
-${X11ROOT_PREFIX}/etc/rc.d/rc3.d/S21xprint
-${X11ROOT_PREFIX}/etc/rc.d/rc5.d/K21xprint
-${X11ROOT_PREFIX}/etc/rc.d/rc5.d/S21xprint
-${X11ROOT_PREFIX}/etc/profile.d/xprint.csh
-${X11ROOT_PREFIX}/etc/profile.d/xprint.sh
-${X11ROOT_PREFIX}/${MAN_DIR}/Xdmx.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdev.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/etc/init.d/xprint
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/fonts
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/fonts
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/fonts
-${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault/model-config
-${CARDDRIVER.fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
-${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
-${CARDDRIVER.v4l}${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o
-${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a
-${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a
-${X11ROOT_PREFIX}/lib/modules/linux/libint10.a
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/aiptek.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/ur98.${KERNMAN_SUFFIX}
-${CARDDRIVER.v4l}${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONBJ10E-GS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/GSdefault
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PS2PDFspooldir-GS
-@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers/linux
-@dirrm ${X11ROOT_PREFIX}/lib/modules/input/linux
-@dirrm ${X11ROOT_PREFIX}/lib/modules/linux
-@dirrm ${X11ROOT_PREFIX}/etc/init.d
diff --git a/x11/xorg-server/PLIST.NetBSD b/x11/xorg-server/PLIST.NetBSD
deleted file mode 100644
index fc669b6e029..00000000000
--- a/x11/xorg-server/PLIST.NetBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/10/08 03:35:25 xtraeme Exp $
-${X11ROOT_PREFIX}/bin/kbd_mode
-${X11ROOT_PREFIX}/etc/init.d/xprint
-${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
-@dirrm ${X11ROOT_PREFIX}/etc/init.d
diff --git a/x11/xorg-server/PLIST.OpenBSD b/x11/xorg-server/PLIST.OpenBSD
deleted file mode 100644
index 97e84ecf97c..00000000000
--- a/x11/xorg-server/PLIST.OpenBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.OpenBSD,v 1.1 2005/01/25 17:55:45 xtraeme Exp $
-${X11ROOT_PREFIX}/bin/kbd_mode
-${X11ROOT_PREFIX}/etc/init.d/xprint
-${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
-@dirrm ${X11ROOT_PREFIX}/etc/init.d
diff --git a/x11/xorg-server/PLIST.common_cards b/x11/xorg-server/PLIST.common_cards
deleted file mode 100644
index 35a6cf272ce..00000000000
--- a/x11/xorg-server/PLIST.common_cards
+++ /dev/null
@@ -1,257 +0,0 @@
-@comment $NetBSD: PLIST.common_cards,v 1.1 2005/03/22 14:01:20 adam Exp $
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
-${CARDDRIVER.ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
-${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX}
-${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
-${CARDDRIVER.dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
-${CARDDRIVER.s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
-${CARDDRIVER.tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
-${CARDDRIVER.via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
-${CARDDRIVER.via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
-${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
-${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/dmc.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/dynapro.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/elographics.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeDeleteModeLine.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetAllModeLines.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetDotClocks.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGamma.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRamp.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetModeLine.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetMonitor.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetPermissions.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeGetViewPort.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeLockModeSwitch.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeModModeLine.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeQueryVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetClientVersion.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGamma.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetGammaRamp.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSetViewPort.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeSwitchToMode.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/XF86VidModeValidateModeLine.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/getconfig.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/gtf.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/pcitweak.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/scanpci.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/xorgcfg.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/${MAN_DIR}/xorgconfig.${MAN_SUFFIX}
-${X11ROOT_PREFIX}/bin/XFree86
-${X11ROOT_PREFIX}/bin/Xorg
-${X11ROOT_PREFIX}/bin/getconfig
-${X11ROOT_PREFIX}/bin/getconfig.pl
-${X11ROOT_PREFIX}/bin/gtf
-${X11ROOT_PREFIX}/bin/inb
-${X11ROOT_PREFIX}/bin/inl
-${X11ROOT_PREFIX}/bin/inw
-${X11ROOT_PREFIX}/bin/ioport
-${X11ROOT_PREFIX}/bin/mmapr
-${X11ROOT_PREFIX}/bin/mmapw
-${X11ROOT_PREFIX}/bin/outb
-${X11ROOT_PREFIX}/bin/outl
-${X11ROOT_PREFIX}/bin/outw
-${X11ROOT_PREFIX}/bin/pcitweak
-${X11ROOT_PREFIX}/bin/scanpci
-${X11ROOT_PREFIX}/bin/xorgcfg
-${X11ROOT_PREFIX}/bin/xorgconfig
-${X11ROOT_PREFIX}/include/X11/bitmaps/card.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/down.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/keyboard.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/left.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/monitor.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/mouse.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/narrower.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/right.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/shorter.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/taller.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/up.xbm
-${X11ROOT_PREFIX}/include/X11/bitmaps/wider.xbm
-${X11ROOT_PREFIX}/include/X11/pixmaps/card.xpm
-${X11ROOT_PREFIX}/include/X11/pixmaps/computer.xpm
-${X11ROOT_PREFIX}/include/X11/pixmaps/keyboard.xpm
-${X11ROOT_PREFIX}/include/X11/pixmaps/monitor.xpm
-${X11ROOT_PREFIX}/include/X11/pixmaps/mouse.xpm
-${X11ROOT_PREFIX}/lib/X11/Cards
-${X11ROOT_PREFIX}/lib/X11/Options
-${X11ROOT_PREFIX}/lib/X11/app-defaults/XOrgCfg
-${X11ROOT_PREFIX}/lib/X11/doc/BUILD
-${X11ROOT_PREFIX}/lib/X11/doc/BugReport
-${X11ROOT_PREFIX}/lib/X11/doc/DESIGN
-${X11ROOT_PREFIX}/lib/X11/doc/Install
-${X11ROOT_PREFIX}/lib/X11/doc/LICENSE
-${X11ROOT_PREFIX}/lib/X11/doc/OS2.Notes
-${X11ROOT_PREFIX}/lib/X11/doc/RELNOTES
-${X11ROOT_PREFIX}/lib/X11/doc/Versions
-${X11ROOT_PREFIX}/lib/X11/doc/VideoBoard98
-${X11ROOT_PREFIX}/lib/X11/etc/Xinstall.sh
-${X11ROOT_PREFIX}/lib/X11/etc/xmodmap.std
-${X11ROOT_PREFIX}/lib/X11/getconfig/cfg.sample
-${X11ROOT_PREFIX}/lib/X11/getconfig/xorg.cfg
-${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libglx.a
-${X11ROOT_PREFIX}/lib/modules/extensions/librecord.a
-${X11ROOT_PREFIX}/lib/modules/extensions/libxtrap.a
-${X11ROOT_PREFIX}/lib/modules/fonts/libbitmap.a
-${X11ROOT_PREFIX}/lib/modules/fonts/libfreetype.so
-${X11ROOT_PREFIX}/lib/modules/fonts/libtype1.a
-${X11ROOT_PREFIX}/lib/modules/input/acecad_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/calcomp_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/citron_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/digitaledge_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/dmc_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/dynapro_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/elographics_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/fpit_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/hyperpen_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/js_x_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/kbd_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/keyboard_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/magellan_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/microtouch_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/mouse_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/mutouch_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/palmax_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/penmount_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/spaceorb_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/summa_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/tek4957_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/void_drv.o
-${X11ROOT_PREFIX}/lib/modules/input/wacom_drv.o
-${X11ROOT_PREFIX}/lib/modules/libafb.a
-${X11ROOT_PREFIX}/lib/modules/libcfb.a
-${X11ROOT_PREFIX}/lib/modules/libcfb16.a
-${X11ROOT_PREFIX}/lib/modules/libcfb24.a
-${X11ROOT_PREFIX}/lib/modules/libcfb32.a
-${X11ROOT_PREFIX}/lib/modules/libcw.a
-${X11ROOT_PREFIX}/lib/modules/libdamage.a
-${X11ROOT_PREFIX}/lib/modules/libddc.a
-${X11ROOT_PREFIX}/lib/modules/libfb.a
-${X11ROOT_PREFIX}/lib/modules/libi2c.a
-${X11ROOT_PREFIX}/lib/modules/libint10.a
-${X11ROOT_PREFIX}/lib/modules/liblayer.a
-${X11ROOT_PREFIX}/lib/modules/libmfb.a
-${X11ROOT_PREFIX}/lib/modules/libpcidata.a
-${X11ROOT_PREFIX}/lib/modules/librac.a
-${X11ROOT_PREFIX}/lib/modules/libramdac.a
-${X11ROOT_PREFIX}/lib/modules/libscanpci.a
-${X11ROOT_PREFIX}/lib/modules/libshadow.a
-${X11ROOT_PREFIX}/lib/modules/libshadowfb.a
-${X11ROOT_PREFIX}/lib/modules/libvbe.a
-${X11ROOT_PREFIX}/lib/modules/libvgahw.a
-${X11ROOT_PREFIX}/lib/modules/libxaa.a
-${X11ROOT_PREFIX}/lib/modules/libxf1bpp.a
-${X11ROOT_PREFIX}/lib/modules/libxf24_32bpp.a
-${X11ROOT_PREFIX}/lib/modules/libxf4bpp.a
-${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.a
-${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.a
-${X11ROOT_PREFIX}/lib/X11/doc/README
-${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga
-${X11ROOT_PREFIX}/lib/X11/doc/README.Darwin
-${X11ROOT_PREFIX}/lib/X11/doc/README.I128
-${X11ROOT_PREFIX}/lib/X11/doc/README.LynxOS
-${X11ROOT_PREFIX}/lib/X11/doc/README.NetBSD
-${X11ROOT_PREFIX}/lib/X11/doc/README.OpenBSD
-${X11ROOT_PREFIX}/lib/X11/doc/README.SCO
-${X11ROOT_PREFIX}/lib/X11/doc/README.SiS
-${X11ROOT_PREFIX}/lib/X11/doc/README.Solaris
-${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Config
-${X11ROOT_PREFIX}/lib/X11/doc/README.XKB-Enhancing
-${X11ROOT_PREFIX}/lib/X11/doc/README.apm
-${X11ROOT_PREFIX}/lib/X11/doc/README.ati
-${X11ROOT_PREFIX}/lib/X11/doc/README.chips
-${X11ROOT_PREFIX}/lib/X11/doc/README.cyrix
-${X11ROOT_PREFIX}/lib/X11/doc/README.dps
-${X11ROOT_PREFIX}/lib/X11/doc/README.fonts
-${X11ROOT_PREFIX}/lib/X11/doc/README.i740
-${X11ROOT_PREFIX}/lib/X11/doc/README.i810
-${X11ROOT_PREFIX}/lib/X11/doc/README.mouse
-${X11ROOT_PREFIX}/lib/X11/doc/README.newport
-${X11ROOT_PREFIX}/lib/X11/doc/README.r128
-${X11ROOT_PREFIX}/lib/X11/doc/README.rapidaccess
-${X11ROOT_PREFIX}/lib/X11/doc/README.rendition
-${X11ROOT_PREFIX}/lib/X11/doc/README.s3virge
-@dirrm ${X11ROOT_PREFIX}/lib/modules/input
-@dirrm ${X11ROOT_PREFIX}/lib/modules/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/modules/extensions
-@dirrm ${X11ROOT_PREFIX}/lib/modules/drivers
-@dirrm ${X11ROOT_PREFIX}/lib/modules
-@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig
diff --git a/x11/xorg-server/PLIST.common_end b/x11/xorg-server/PLIST.common_end
deleted file mode 100644
index acf8cf5f1ab..00000000000
--- a/x11/xorg-server/PLIST.common_end
+++ /dev/null
@@ -1,25 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.4 2005/03/22 14:01:20 adam Exp $
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print/attributes
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US/print
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSspooldir
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/PSdefault
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4family
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPLJ4050-PS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/HPDJ1600C
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS/fonts
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/CANONC3200-PS
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config/raster
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/ddx-config
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C/print
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US
-@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver
-@unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE}