One PLIST file for >=4 Operating Systems is not so good.

6 files changed, 529 insertions, 265 deletions

diff --git a/x11/XFree86-libs/PLIST.FreeBSD b/x11/XFree86-libs/PLIST.FreeBSD
new file mode 100644
index 00000000000..160d94fd03d
--- /dev/null
+++ b/x11/XFree86-libs/PLIST.FreeBSD
@@ -0,0 +1,114 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.3 2004/07/21 23:47:31 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/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.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
diff --git a/x11/XFree86-libs/PLIST.Linux b/x11/XFree86-libs/PLIST.Linux
new file mode 100644
index 00000000000..81895769b8c
--- /dev/null
+++ b/x11/XFree86-libs/PLIST.Linux
@@ -0,0 +1,122 @@
+@comment $NetBSD: PLIST.Linux,v 1.5 2004/07/21 23:47:31 xtraeme Exp $
+${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/libXThrStub.so
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
+${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/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/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
+${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/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/XFree86-libs/PLIST.NetBSD b/x11/XFree86-libs/PLIST.NetBSD
new file mode 100644
index 00000000000..4d5fdf79cd2
--- /dev/null
+++ b/x11/XFree86-libs/PLIST.NetBSD
@@ -0,0 +1,150 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.5 2004/07/21 23:47:31 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/libXThrStub.so
+${X11ROOT_PREFIX}/lib/libXThrStub.so.6
+${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/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/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/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1
+${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
+${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/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
+${X11ROOT_PREFIX}/lib/libXxf86dga.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/XFree86-libs/PLIST.OpenBSD b/x11/XFree86-libs/PLIST.OpenBSD
new file mode 100644
index 00000000000..2e234da5a39
--- /dev/null
+++ b/x11/XFree86-libs/PLIST.OpenBSD
@@ -0,0 +1,77 @@
+@comment $NetBSD: PLIST.OpenBSD,v 1.1 2004/07/21 23:47:31 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/libFS.a
+${X11ROOT_PREFIX}/lib/libFS.so.7.0
+${X11ROOT_PREFIX}/lib/libGL.a
+${X11ROOT_PREFIX}/lib/libGL.so.2.0
+${X11ROOT_PREFIX}/lib/libGLU.a
+${X11ROOT_PREFIX}/lib/libGLU.so.2.0
+${X11ROOT_PREFIX}/lib/libGLw.a
+${X11ROOT_PREFIX}/lib/libGLw.so.2.0
+${X11ROOT_PREFIX}/lib/libICE.a
+${X11ROOT_PREFIX}/lib/libICE.so.7.0
+${X11ROOT_PREFIX}/lib/libOSMesa.a
+${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
+${X11ROOT_PREFIX}/lib/libSM.a
+${X11ROOT_PREFIX}/lib/libSM.so.7.0
+${X11ROOT_PREFIX}/lib/libX11.a
+${X11ROOT_PREFIX}/lib/libX11.so.7.0
+${X11ROOT_PREFIX}/lib/libXRes.a
+${X11ROOT_PREFIX}/lib/libXRes.so.1.0
+${X11ROOT_PREFIX}/lib/libXThrStub.so.7.0
+${X11ROOT_PREFIX}/lib/libXTrap.a
+${X11ROOT_PREFIX}/lib/libXTrap.so.7.0
+${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXaw.a
+${X11ROOT_PREFIX}/lib/libXaw.so.7.1
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXdmcp.a
+${X11ROOT_PREFIX}/lib/libXext.a
+${X11ROOT_PREFIX}/lib/libXext.so.7.0
+${X11ROOT_PREFIX}/lib/libXfont.a
+${X11ROOT_PREFIX}/lib/libXfont.so.2.0
+${X11ROOT_PREFIX}/lib/libXfontcache.a
+${X11ROOT_PREFIX}/lib/libXfontcache.so.2.0
+${X11ROOT_PREFIX}/lib/libXi.a
+${X11ROOT_PREFIX}/lib/libXi.so.7.0
+${X11ROOT_PREFIX}/lib/libXinerama.a
+${X11ROOT_PREFIX}/lib/libXinerama.so.2.0
+${X11ROOT_PREFIX}/lib/libXmu.a
+${X11ROOT_PREFIX}/lib/libXmu.so.7.0
+${X11ROOT_PREFIX}/lib/libXmuu.a
+${X11ROOT_PREFIX}/lib/libXmuu.so.2.0
+${X11ROOT_PREFIX}/lib/libXp.a
+${X11ROOT_PREFIX}/lib/libXp.so.7.0
+${X11ROOT_PREFIX}/lib/libXpm.a
+${X11ROOT_PREFIX}/lib/libXpm.so.5.0
+${X11ROOT_PREFIX}/lib/libXss.a
+${X11ROOT_PREFIX}/lib/libXss.so.2.0
+${X11ROOT_PREFIX}/lib/libXt.a
+${X11ROOT_PREFIX}/lib/libXt.so.7.0
+${X11ROOT_PREFIX}/lib/libXtst.a
+${X11ROOT_PREFIX}/lib/libXtst.so.7.0
+${X11ROOT_PREFIX}/lib/libXv.a
+${X11ROOT_PREFIX}/lib/libXv.so.2.0
+${X11ROOT_PREFIX}/lib/libXvMC.a
+${X11ROOT_PREFIX}/lib/libXvMC.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86dga.a
+${X11ROOT_PREFIX}/lib/libXxf86dga.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86misc.a
+${X11ROOT_PREFIX}/lib/libXxf86misc.so.2.0
+${X11ROOT_PREFIX}/lib/libXxf86vm.a
+${X11ROOT_PREFIX}/lib/libXxf86vm.so.2.0
+${X11ROOT_PREFIX}/lib/libdps.a
+${X11ROOT_PREFIX}/lib/libdps.so.2.0
+${X11ROOT_PREFIX}/lib/libdpstk.a
+${X11ROOT_PREFIX}/lib/libdpstk.so.2.0
+${X11ROOT_PREFIX}/lib/libfntstubs.a
+${X11ROOT_PREFIX}/lib/libfontenc.a
+${X11ROOT_PREFIX}/lib/libfontenc.so.2.0
+${X11ROOT_PREFIX}/lib/liboldX.a
+${X11ROOT_PREFIX}/lib/liboldX.so.7.0
+${X11ROOT_PREFIX}/lib/libpsres.a
+${X11ROOT_PREFIX}/lib/libpsres.so.2.0
+${X11ROOT_PREFIX}/lib/libxf86config.a
+${X11ROOT_PREFIX}/lib/libxkbfile.a
+${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
+${X11ROOT_PREFIX}/lib/libxkbui.a
+${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
diff --git a/x11/XFree86-libs/PLIST b/x11/XFree86-libs/PLIST.common
index e6cf10984d9..3441b70dcc1 100644
--- a/x11/XFree86-libs/PLIST
+++ b/x11/XFree86-libs/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/27 21:49:57 reed Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2004/07/21 23:47:31 xtraeme Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -519,267 +519,3 @@ ${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/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libFS.a
-${X11ROOT_PREFIX}/lib/libFS.so
-${X11ROOT_PREFIX}/lib/libFS.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libFS.so.6.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libGL.a
-${X11ROOT_PREFIX}/lib/libGL.so
-${X11ROOT_PREFIX}/lib/libGL.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libGL.so.1.2
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libGLU.a
-${X11ROOT_PREFIX}/lib/libGLU.so
-${X11ROOT_PREFIX}/lib/libGLU.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libGLU.so.1.3
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libGLw.a
-${X11ROOT_PREFIX}/lib/libGLw.so
-${X11ROOT_PREFIX}/lib/libGLw.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libGLw.so.1.0
-${I810XVMC}${X11ROOT_PREFIX}/lib/libI810XvMC.so
-${I810XVMC}${X11ROOT_PREFIX}/lib/libI810XvMC.so.1
-${I810XVMC}${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libICE.a
-${X11ROOT_PREFIX}/lib/libICE.so
-${X11ROOT_PREFIX}/lib/libICE.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libICE.so.6.3
-${X11ROOT_PREFIX}/lib/libOSMesa.a
-${X11ROOT_PREFIX}/lib/libOSMesa.so
-${X11ROOT_PREFIX}/lib/libOSMesa.so.4
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libOSMesa.so.4.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libSM.a
-${X11ROOT_PREFIX}/lib/libSM.so
-${X11ROOT_PREFIX}/lib/libSM.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libSM.so.6.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libX11.a
-${X11ROOT_PREFIX}/lib/libX11.so
-${X11ROOT_PREFIX}/lib/libX11.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libX11.so.6.2
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXRes.a
-${X11ROOT_PREFIX}/lib/libXRes.so
-${X11ROOT_PREFIX}/lib/libXRes.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so
-${LIBXTHRSTUB}${X11ROOT_PREFIX}/lib/libXThrStub.so.6
-${LIBXTHRSTUB}${XTHRSTUB_MINOR}${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXTrap.a
-${X11ROOT_PREFIX}/lib/libXTrap.so
-${X11ROOT_PREFIX}/lib/libXTrap.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
-${X11ROOT_PREFIX}/lib/libXau.a
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXaw.a
-${X11ROOT_PREFIX}/lib/libXaw.so
-${X11ROOT_PREFIX}/lib/libXaw.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXaw.so.6.1
-${X11ROOT_PREFIX}/lib/libXaw.so.7
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXaw.so.7.0
-${X11ROOT_PREFIX}/lib/libXdmcp.a
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXext.a
-${X11ROOT_PREFIX}/lib/libXext.so
-${X11ROOT_PREFIX}/lib/libXext.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXext.so.6.4
-${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXfontcache.a
-${X11ROOT_PREFIX}/lib/libXfontcache.so
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXi.a
-${X11ROOT_PREFIX}/lib/libXi.so
-${X11ROOT_PREFIX}/lib/libXi.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXi.so.6.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXinerama.a
-${X11ROOT_PREFIX}/lib/libXinerama.so
-${X11ROOT_PREFIX}/lib/libXinerama.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXmu.a
-${X11ROOT_PREFIX}/lib/libXmu.so
-${X11ROOT_PREFIX}/lib/libXmu.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXmu.so.6.2
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXmuu.a
-${X11ROOT_PREFIX}/lib/libXmuu.so
-${X11ROOT_PREFIX}/lib/libXmuu.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXmuu.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXp.a
-${X11ROOT_PREFIX}/lib/libXp.so
-${X11ROOT_PREFIX}/lib/libXp.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXp.so.6.2
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXpm.a
-${X11ROOT_PREFIX}/lib/libXpm.so
-${X11ROOT_PREFIX}/lib/libXpm.so.4
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXpm.so.4.11
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXss.a
-${X11ROOT_PREFIX}/lib/libXss.so
-${X11ROOT_PREFIX}/lib/libXss.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXss.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXt.a
-${X11ROOT_PREFIX}/lib/libXt.so
-${X11ROOT_PREFIX}/lib/libXt.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXt.so.6.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXtst.a
-${X11ROOT_PREFIX}/lib/libXtst.so
-${X11ROOT_PREFIX}/lib/libXtst.so.6
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXtst.so.6.1
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXv.a
-${X11ROOT_PREFIX}/lib/libXv.so
-${X11ROOT_PREFIX}/lib/libXv.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXv.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXvMC.a
-${X11ROOT_PREFIX}/lib/libXvMC.so
-${X11ROOT_PREFIX}/lib/libXvMC.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXvMC.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXxf86dga.a
-${X11ROOT_PREFIX}/lib/libXxf86dga.so
-${X11ROOT_PREFIX}/lib/libXxf86dga.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXxf86dga.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXxf86misc.a
-${X11ROOT_PREFIX}/lib/libXxf86misc.so
-${X11ROOT_PREFIX}/lib/libXxf86misc.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXxf86misc.so.1.1
-${XF86RUSH}${X11ROOT_PREFIX}/lib/libXxf86rush.so
-${XF86RUSH}${X11ROOT_PREFIX}/lib/libXxf86rush.so.1
-${XF86RUSH}${X11ROOT_PREFIX}/lib/libXxf86rush.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libXxf86vm.a
-${X11ROOT_PREFIX}/lib/libXxf86vm.so
-${X11ROOT_PREFIX}/lib/libXxf86vm.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libXxf86vm.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libdps.a
-${X11ROOT_PREFIX}/lib/libdps.so
-${X11ROOT_PREFIX}/lib/libdps.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libdps.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libdpstk.a
-${X11ROOT_PREFIX}/lib/libdpstk.so
-${X11ROOT_PREFIX}/lib/libdpstk.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libdpstk.so.1.0
-${X11ROOT_PREFIX}/lib/libfntstubs.a
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libfontenc.a
-${X11ROOT_PREFIX}/lib/libfontenc.so
-${X11ROOT_PREFIX}/lib/libfontenc.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libfontenc.so.1.0
-${X11ROOT_PREFIX}/lib/liboldX.a
-${LIBOLDX}${X11ROOT_PREFIX}/lib/liboldX.so
-${LIBOLDX}${X11ROOT_PREFIX}/lib/liboldX.so.6
-${LIBOLDX}${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/liboldX.so.6.0
-${X11ROOT_PREFIX}/lib/libpsres.a
-${X11ROOT_PREFIX}/lib/libpsres.so
-${X11ROOT_PREFIX}/lib/libpsres.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libpsres.so.1.0
-${X11ROOT_PREFIX}/lib/libxf86config.a
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libxkbfile.a
-${X11ROOT_PREFIX}/lib/libxkbfile.so
-${X11ROOT_PREFIX}/lib/libxkbfile.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
-${STATIC_LIB}${X11ROOT_PREFIX}/lib/libxkbui.a
-${X11ROOT_PREFIX}/lib/libxkbui.so
-${X11ROOT_PREFIX}/lib/libxkbui.so.1
-${SHARED_LIB_MINOR}${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheChangeCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheStatistics.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryVersion.${LIBMAN_SUFFIX}
-${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}
-${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}/Xfontcache.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX}
-@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/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/lib/common
-@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
-@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/codeconv
-@dirrm ${X11ROOT_PREFIX}/include/X11/fonts
-@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
-@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/XFree86-libs/PLIST.common_end b/x11/XFree86-libs/PLIST.common_end
new file mode 100644
index 00000000000..a45503a1fac
--- /dev/null
+++ b/x11/XFree86-libs/PLIST.common_end
@@ -0,0 +1,65 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2004/07/21 23:47:31 xtraeme Exp $
+@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/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/lib/common
+@dirrm ${X11ROOT_PREFIX}/lib/X11/locale/lib
+@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/codeconv
+@dirrm ${X11ROOT_PREFIX}/include/X11/fonts
+@dirrm ${X11ROOT_PREFIX}/include/X11/extensions
+@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