Update meta-pkgs/xorg to 6.9.0.

The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html

Thanks to joerg@ and reed@ for testing on DragonFlyBSD.

Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.

3 files changed, 223 insertions, 172 deletions

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index d32b1fd126d..763546dfb05 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2005/12/08 09:52:17 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/18 23:53:06 xtraeme Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
-PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R${XORG_VER}-src1.tar.gz \
@@ -83,11 +82,9 @@ post-install:
 .  include "../../x11/Xrender/buildlink3.mk"
 .endif
 
-# Radeon driver fix applied on this version.
-BUILDLINK_DEPENDS.xorg-libs+=	xorg-libs>=6.8.2nb1
-
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/xorg/Makefile.common"
+.include "../../x11/Xrender/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-server/PLIST b/x11/xorg-server/PLIST
index 89538450474..16416890ff1 100644
--- a/x11/xorg-server/PLIST
+++ b/x11/xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/12/02 17:51:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/01/18 23:53:06 xtraeme Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -218,8 +218,11 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/models/SPSPARC2/model-config
 ${X11ROOT_PREFIX}/lib/X11/xserver/POSIX
 ${X11ROOT_PREFIX}/lib/X11/xserver/README
 ${X11ROOT_PREFIX}/lib/X11/xserver/SecurityPolicy
+${X11ROOT_PREFIX}/lib/X11/xserver/af
 ${X11ROOT_PREFIX}/lib/X11/xserver/af_ZA
 ${X11ROOT_PREFIX}/lib/X11/xserver/af_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/af_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/afrikaans
 ${X11ROOT_PREFIX}/lib/X11/xserver/ar
 ${X11ROOT_PREFIX}/lib/X11/xserver/ar_AE
 ${X11ROOT_PREFIX}/lib/X11/xserver/ar_AE.iso88596
@@ -282,10 +285,17 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG
 ${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.ISO8859-5
 ${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.cp1251
 ${X11ROOT_PREFIX}/lib/X11/xserver/bg_BG.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/bn_IN.UTF-8
+${X11ROOT_PREFIX}/lib/X11/xserver/bn_IN.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/bokmal
 ${X11ROOT_PREFIX}/lib/X11/xserver/br_FR
 ${X11ROOT_PREFIX}/lib/X11/xserver/br_FR.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/bs
 ${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA
+${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.ISO-8859-2
+${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.ISO8859-2
+${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.ISO_8859-2
+${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.UTF-8
 ${X11ROOT_PREFIX}/lib/X11/xserver/bs_BA.iso88592
 ${X11ROOT_PREFIX}/lib/X11/xserver/ca
 ${X11ROOT_PREFIX}/lib/X11/xserver/ca.ISO8859-1
@@ -549,6 +559,8 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.iso88591
 ${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.iso885915@euro
 ${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/gl_ES@euro
+${X11ROOT_PREFIX}/lib/X11/xserver/gu_IN.UTF-8
+${X11ROOT_PREFIX}/lib/X11/xserver/gu_IN.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/gv_GB
 ${X11ROOT_PREFIX}/lib/X11/xserver/gv_GB.iso88591
 ${X11ROOT_PREFIX}/lib/X11/xserver/he
@@ -625,6 +637,9 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/korean
 ${X11ROOT_PREFIX}/lib/X11/xserver/korean.euc
 ${X11ROOT_PREFIX}/lib/X11/xserver/kw_GB
 ${X11ROOT_PREFIX}/lib/X11/xserver/kw_GB.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/ky_KG
+${X11ROOT_PREFIX}/lib/X11/xserver/ky_KG.UTF-8
+${X11ROOT_PREFIX}/lib/X11/xserver/ky_KG.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/lithuanian
 ${X11ROOT_PREFIX}/lib/X11/xserver/lt
 ${X11ROOT_PREFIX}/lib/X11/xserver/lt.ISO8859-13
@@ -651,6 +666,7 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/mt_MT
 ${X11ROOT_PREFIX}/lib/X11/xserver/mt_MT.iso88593
 ${X11ROOT_PREFIX}/lib/X11/xserver/nb_NO
 ${X11ROOT_PREFIX}/lib/X11/xserver/nb_NO.ISO-8859-1
+${X11ROOT_PREFIX}/lib/X11/xserver/ndebele
 ${X11ROOT_PREFIX}/lib/X11/xserver/nl
 ${X11ROOT_PREFIX}/lib/X11/xserver/nl.ISO8859-1
 ${X11ROOT_PREFIX}/lib/X11/xserver/nl.ISO8859-15
@@ -678,8 +694,18 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.ISO8859-1@nynorsk
 ${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.iso88591
 ${X11ROOT_PREFIX}/lib/X11/xserver/no_NO.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/norwegian
+${X11ROOT_PREFIX}/lib/X11/xserver/nr
+${X11ROOT_PREFIX}/lib/X11/xserver/nr_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/nr_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/nr_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/nso
+${X11ROOT_PREFIX}/lib/X11/xserver/nso_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/nso_ZA.iso885915
+${X11ROOT_PREFIX}/lib/X11/xserver/nso_ZA.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/oc_FR
 ${X11ROOT_PREFIX}/lib/X11/xserver/oc_FR.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/pa_IN.UTF-8
+${X11ROOT_PREFIX}/lib/X11/xserver/pa_IN.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL
 ${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.ISO8859-2
 ${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.UTF-8
@@ -687,18 +713,18 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.iso88592
 ${X11ROOT_PREFIX}/lib/X11/xserver/pl_PL.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/polish
 ${X11ROOT_PREFIX}/lib/X11/xserver/portuguese
-${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.88591
-${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.88591.en
-${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO-8859-1
-${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO_8859-1
-${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.iso885915
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt.ISO8859-1
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt.ISO8859-15
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR
+${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.88591
+${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.88591.en
+${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO-8859-1
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO8859-1
+${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.ISO_8859-1
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.UTF-8
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.iso885915
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_BR.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT
 ${X11ROOT_PREFIX}/lib/X11/xserver/pt_PT.ISO8859-1
@@ -731,12 +757,20 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/ru_UA.koi8u
 ${X11ROOT_PREFIX}/lib/X11/xserver/russian
 ${X11ROOT_PREFIX}/lib/X11/xserver/se_NO
 ${X11ROOT_PREFIX}/lib/X11/xserver/se_NO.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/sepedi
+${X11ROOT_PREFIX}/lib/X11/xserver/sesotho
+${X11ROOT_PREFIX}/lib/X11/xserver/setswana
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh.ISO8859-2
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh_BA.ISO8859-2@bosnia
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU.iso88592
 ${X11ROOT_PREFIX}/lib/X11/xserver/sh_YU.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/si
+${X11ROOT_PREFIX}/lib/X11/xserver/si_LK
+${X11ROOT_PREFIX}/lib/X11/xserver/si_LK.UTF8
+${X11ROOT_PREFIX}/lib/X11/xserver/sinhala
+${X11ROOT_PREFIX}/lib/X11/xserver/siswati
 ${X11ROOT_PREFIX}/lib/X11/xserver/sk
 ${X11ROOT_PREFIX}/lib/X11/xserver/sk.ISO8859-2
 ${X11ROOT_PREFIX}/lib/X11/xserver/sk_SK
@@ -763,6 +797,14 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.iso88592
 ${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.iso88595@cyrillic
 ${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/sr_YU@cyrillic
+${X11ROOT_PREFIX}/lib/X11/xserver/ss
+${X11ROOT_PREFIX}/lib/X11/xserver/ss_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/ss_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/ss_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/st
+${X11ROOT_PREFIX}/lib/X11/xserver/st_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/st_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/st_ZA.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/su
 ${X11ROOT_PREFIX}/lib/X11/xserver/su.ISO8859-1
 ${X11ROOT_PREFIX}/lib/X11/xserver/sv
@@ -798,6 +840,10 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/th_TH.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/thai
 ${X11ROOT_PREFIX}/lib/X11/xserver/tl_PH
 ${X11ROOT_PREFIX}/lib/X11/xserver/tl_PH.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/tn
+${X11ROOT_PREFIX}/lib/X11/xserver/tn_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/tn_ZA.iso885915
+${X11ROOT_PREFIX}/lib/X11/xserver/tn_ZA.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr.ISO8859-9
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR
@@ -805,6 +851,11 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.ISO8859-9
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.UTF-8
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.iso88599
 ${X11ROOT_PREFIX}/lib/X11/xserver/tr_TR.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/ts
+${X11ROOT_PREFIX}/lib/X11/xserver/ts_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/ts_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/ts_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/tsonga
 ${X11ROOT_PREFIX}/lib/X11/xserver/turkish
 ${X11ROOT_PREFIX}/lib/X11/xserver/uk_UA
 ${X11ROOT_PREFIX}/lib/X11/xserver/uk_UA.koi8u
@@ -813,6 +864,10 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/ur_PK
 ${X11ROOT_PREFIX}/lib/X11/xserver/ur_PK.utf8
 ${X11ROOT_PREFIX}/lib/X11/xserver/uz_UZ
 ${X11ROOT_PREFIX}/lib/X11/xserver/uz_UZ.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/ve
+${X11ROOT_PREFIX}/lib/X11/xserver/ve_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/ve_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/venda
 ${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN
 ${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN.tcvn
 ${X11ROOT_PREFIX}/lib/X11/xserver/vi_VN.utf8
@@ -820,6 +875,11 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE
 ${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE.iso88591
 ${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE.iso885915@euro
 ${X11ROOT_PREFIX}/lib/X11/xserver/wa_BE@euro
+${X11ROOT_PREFIX}/lib/X11/xserver/xh
+${X11ROOT_PREFIX}/lib/X11/xserver/xh_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/xh_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/xh_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/xhosa
 ${X11ROOT_PREFIX}/lib/X11/xserver/yi_US
 ${X11ROOT_PREFIX}/lib/X11/xserver/yi_US.cp1255
 ${X11ROOT_PREFIX}/lib/X11/xserver/zh
@@ -874,78 +934,84 @@ ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.UTF-8@zhuyin
 ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.big5
 ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.euctw
 ${X11ROOT_PREFIX}/lib/X11/xserver/zh_TW.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/zu
+${X11ROOT_PREFIX}/lib/X11/xserver/zu_ZA
+${X11ROOT_PREFIX}/lib/X11/xserver/zu_ZA.iso88591
+${X11ROOT_PREFIX}/lib/X11/xserver/zu_ZA.utf8
+${X11ROOT_PREFIX}/lib/X11/xserver/zulu
+
 ${X11ROOT_PREFIX}/${MAN_DIR}/Xnest.${MAN_SUFFIX}
 ${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.xorg-server-apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
-${CARDDRIVER.xorg-server-ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
+${CARDDRIVER.xorg-server-apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.so
+${CARDDRIVER.xorg-server-ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.so
 ${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
 ${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
-${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
-${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
-${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.so
 ${CARDDRIVER.xorg-server-chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
+${CARDDRIVER.xorg-server-chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.so
 ${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
-${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
-${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.so
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.so
+${CARDDRIVER.xorg-server-cirrus}${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.so
 ${CARDDRIVER.xorg-server-cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
-${CARDDRIVER.xorg-server-dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
+${CARDDRIVER.xorg-server-cyrix}${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.so
+${CARDDRIVER.xorg-server-dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.so
 ${CARDDRIVER.xorg-server-glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
+${CARDDRIVER.xorg-server-glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.so
 ${CARDDRIVER.xorg-server-i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
+${CARDDRIVER.xorg-server-i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.so
 ${CARDDRIVER.xorg-server-i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
+${CARDDRIVER.xorg-server-i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.so
 ${CARDDRIVER.xorg-server-i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
+${CARDDRIVER.xorg-server-i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.so
 ${CARDDRIVER.xorg-server-imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
+${CARDDRIVER.xorg-server-imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.so
 ${CARDDRIVER.xorg-server-mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
+${CARDDRIVER.xorg-server-mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.so
 ${CARDDRIVER.xorg-server-neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
+${CARDDRIVER.xorg-server-neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.so
 ${CARDDRIVER.xorg-server-newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
+${CARDDRIVER.xorg-server-newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.so
 ${CARDDRIVER.xorg-server-nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
+${CARDDRIVER.xorg-server-nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.so
 ${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
-${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
+${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.so
+${CARDDRIVER.xorg-server-nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.so
 ${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
+${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.so
 ${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
 ${CARDDRIVER.xorg-server-rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
 ${CARDDRIVER.xorg-server-s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
-${CARDDRIVER.xorg-server-s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
+${CARDDRIVER.xorg-server-s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.so
+${CARDDRIVER.xorg-server-s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.so
 ${CARDDRIVER.xorg-server-savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
+${CARDDRIVER.xorg-server-savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.so
 ${CARDDRIVER.xorg-server-siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
+${CARDDRIVER.xorg-server-siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.so
 ${CARDDRIVER.xorg-server-sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
+${CARDDRIVER.xorg-server-sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.so
 ${CARDDRIVER.xorg-server-tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
-${CARDDRIVER.xorg-server-tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
+${CARDDRIVER.xorg-server-tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.so
+${CARDDRIVER.xorg-server-tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.so
 ${CARDDRIVER.xorg-server-trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
+${CARDDRIVER.xorg-server-trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.so
 ${CARDDRIVER.xorg-server-tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
+${CARDDRIVER.xorg-server-tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.so
 ${CARDDRIVER.xorg-server-vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
+${CARDDRIVER.xorg-server-vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.so
 ${CARDDRIVER.xorg-server-vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
+${CARDDRIVER.xorg-server-vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.so
 ${CARDDRIVER.xorg-server-via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
+${CARDDRIVER.xorg-server-via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.so
 ${CARDDRIVER.xorg-server-vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
-${CARDDRIVER.xorg-server-vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
+${CARDDRIVER.xorg-server-vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.so
 ${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
@@ -965,28 +1031,6 @@ ${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}
@@ -1043,65 +1087,72 @@ ${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/extensions/libGLcore.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libextmod.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libglx.so
+${X11ROOT_PREFIX}/lib/modules/extensions/librecord.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libxtrap.so
+${X11ROOT_PREFIX}/lib/modules/fonts/libbitmap.so
 ${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/modules/fonts/libtype1.so
+${X11ROOT_PREFIX}/lib/modules/input/acecad_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/calcomp_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/citron_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/digitaledge_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/dmc_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/dynapro_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/elographics_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/fpit_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/hyperpen_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/js_x_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/kbd_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/keyboard_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/magellan_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/microtouch_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/mouse_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/mutouch_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/palmax_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/penmount_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/spaceorb_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/summa_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/tek4957_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/void_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/wacom_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/bt829_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/fi1236_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/msp3430_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/tda8425_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/tda9850_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/tda9885_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/theatre200_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_detect_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_drv.so
+${X11ROOT_PREFIX}/lib/modules/multimedia/uda1380_drv.so
+${X11ROOT_PREFIX}/lib/modules/libafb.so
+${X11ROOT_PREFIX}/lib/modules/libcfb.so
+${X11ROOT_PREFIX}/lib/modules/libcfb16.so
+${X11ROOT_PREFIX}/lib/modules/libcfb32.so
+${X11ROOT_PREFIX}/lib/modules/libexa.so
+${X11ROOT_PREFIX}/lib/modules/libddc.so
+${X11ROOT_PREFIX}/lib/modules/libfb.so
+${X11ROOT_PREFIX}/lib/modules/libi2c.so
+${X11ROOT_PREFIX}/lib/modules/libint10.so
+${X11ROOT_PREFIX}/lib/modules/liblayer.so
+${X11ROOT_PREFIX}/lib/modules/libmfb.so
+${X11ROOT_PREFIX}/lib/modules/libpcidata.so
+${X11ROOT_PREFIX}/lib/modules/librac.so
+${X11ROOT_PREFIX}/lib/modules/libramdac.so
+${X11ROOT_PREFIX}/lib/modules/libscanpci.so
+${X11ROOT_PREFIX}/lib/modules/libshadow.so
+${X11ROOT_PREFIX}/lib/modules/libshadowfb.so
+${X11ROOT_PREFIX}/lib/modules/libvbe.so
+${X11ROOT_PREFIX}/lib/modules/libvgahw.so
+${X11ROOT_PREFIX}/lib/modules/libxaa.so
+${X11ROOT_PREFIX}/lib/modules/libxf1bpp.so
+${X11ROOT_PREFIX}/lib/modules/libxf4bpp.so
+${X11ROOT_PREFIX}/lib/modules/libxf8_16bpp.so
+${X11ROOT_PREFIX}/lib/modules/libxf8_32bpp.so
 ${X11ROOT_PREFIX}/lib/X11/doc/README
 ${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga
 ${X11ROOT_PREFIX}/lib/X11/doc/README.Darwin
@@ -1114,8 +1165,6 @@ ${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
@@ -1132,49 +1181,52 @@ ${X11ROOT_PREFIX}/lib/X11/doc/README.s3virge
 @dirrm ${X11ROOT_PREFIX}/lib/modules/fonts
 @dirrm ${X11ROOT_PREFIX}/lib/modules/extensions
 @dirrm ${X11ROOT_PREFIX}/lib/modules/drivers
+@dirrm ${X11ROOT_PREFIX}/lib/modules/multimedia
+@dirrm ${X11ROOT_PREFIX}/lib/modules/internal
 @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/XDarwin.sopp/Contents/Info.plist
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/MacOS/XDarwin
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/PkgInfo
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Dutch.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Dutch.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/English.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/English.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/French.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/French.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/German.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/German.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Japanese.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Japanese.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Portuguese.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Portuguese.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Spanish.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Spanish.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Swedish.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/Swedish.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/cr.bundle/Contents/MacOS/cr
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/fullscreen.bundle/Contents/MacOS/fullscreen
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/glxAGL.bundle/Contents/MacOS/glxAGL
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/glxCGL.bundle/Contents/MacOS/glxCGL
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/glxMesa.bundle/Contents/MacOS/glxMesa
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/ko.lproj/InfoPlist.strings
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/ko.lproj/XDarwinHelp.html
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/Contents/Resources/startXClients
+${DARWIN_QUARTZ}${X11ROOT_PREFIX}/bin/XDarwin.sopp/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}/bin/Xdmx
 ${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}/lib/modules/extensions/libdrm.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.so
 ${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
 @dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
 @dirrm ${X11ROOT_PREFIX}/etc/rc.d
@@ -1182,8 +1234,8 @@ ${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
 @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}/lib/modules/extensions/libdrm.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.so
 ${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
 @dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
 @dirrm ${X11ROOT_PREFIX}/etc/rc.d
@@ -1210,14 +1262,14 @@ ${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.xorg-server-fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
-${X11ROOT_PREFIX}/lib/modules/extensions/libdri.a
-${CARDDRIVER.xorg-server-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
+${CARDDRIVER.xorg-server-fbdev}${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.so
+${X11ROOT_PREFIX}/lib/modules/extensions/libdri.so
+${CARDDRIVER.xorg-server-v4l}${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.so
+${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.so
+${X11ROOT_PREFIX}/lib/modules/linux/libdrm.so
+${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.so
+${X11ROOT_PREFIX}/lib/modules/linux/libint10.so
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/aiptek.${KERNMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${KERNMAN_DIR}/ur98.${KERNMAN_SUFFIX}
 ${CARDDRIVER.xorg-server-v4l}${X11ROOT_PREFIX}/${KERNMAN_DIR}/v4l.${KERNMAN_SUFFIX}
diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def
index caed252b1e4..f2989019642 100644
--- a/x11/xorg-server/files/host.def
+++ b/x11/xorg-server/files/host.def
@@ -1,10 +1,10 @@
-/* $NetBSD: host.def,v 1.12 2005/10/05 00:31:23 reed Exp $ */
+/* $NetBSD: host.def,v 1.13 2006/01/18 23:53:06 xtraeme Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
 
 /* Workaround */
-#define XorgVersion 682
+#define XorgVersion 690
 
 #define MakeCmd @MAKE@
 
@@ -65,7 +65,9 @@
 
 #define DriverManSuffix @KERNMAN_SUFFIX@
 #define MiscManSuffix @MISCMAN_SUFFIX@
+#ifndef NetBSDArchitecture
 #define FileManSuffix @FILEMAN_SUFFIX@
+#endif
 #define MiscManDir @PREFIX@/@MISCMAN_DIR@
 #define DriverManDir @PREFIX@/@KERNMAN_DIR@
 #define FileManDir @PREFIX@/@FILEMAN_DIR@