Add support for Darwin/MacOSX

7 files changed, 332 insertions, 279 deletions

diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 1efe7cb7ccb..6599a40ff69 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.18 2005/03/02 02:12:55 hira Exp $
+# $NetBSD: Makefile,v 1.19 2005/03/22 14:01:20 adam Exp $
 
-DISTNAME=		${DISTFILES}
-PKGNAME=		xorg-server-${XORG_VER}
-PKGREVISION=		1
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_XORG}
-DISTFILES=		X11R${XORG_VER}-src1.tar.gz \
-			X11R${XORG_VER}-src2.tar.gz \
-			X11R${XORG_VER}-src3.tar.gz		
+DISTNAME=	${DISTFILES}
+PKGNAME=	xorg-server-${XORG_VER}
+PKGREVISION=	1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG}
+DISTFILES=	X11R${XORG_VER}-src1.tar.gz \
+		X11R${XORG_VER}-src2.tar.gz \
+		X11R${XORG_VER}-src3.tar.gz
 
-MAINTAINER=		xtraeme@NetBSD.org
-HOMEPAGE=		http://www.x.org/
-COMMENT=		X.org X server and related programs
+MAINTAINER=	xtraeme@NetBSD.org
+HOMEPAGE=	http://www.x.org/
+COMMENT=	X.org X server and related programs
 
-USE_X11=		yes
 USE_BUILDLINK3=		yes
+USE_X11=		yes
 DISTINFO_FILE=		${.CURDIR}/../../x11/xorg-libs/distinfo
 PATCHDIR=		${.CURDIR}/../../x11/xorg-libs/patches
 
@@ -49,10 +49,23 @@ SUBST_MESSAGE.stubs=	"Fixing stubs Makefile."
 USE_PERL5=	build # Yeah, we need this :-)
 .endif
 
+.if ${OPSYS} == "Darwin"
+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:
+.if ${OPSYS} == "Darwin"
+	${CHMOD} a+r ${X11ROOT}/bin/XDarwin
+.else
 	${CHMOD} a+r ${X11ROOT}/bin/Xorg
+.endif
 
 .if ${OPSYS} == "Linux"
 .  include "../../x11/Xrender/buildlink3.mk"
diff --git a/x11/xorg-server/PLIST.Darwin b/x11/xorg-server/PLIST.Darwin
new file mode 100644
index 00000000000..d233bfcc980
--- /dev/null
+++ b/x11/xorg-server/PLIST.Darwin
@@ -0,0 +1,35 @@
+@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.common b/x11/xorg-server/PLIST.common
index 43236e28bea..50783282e4e 100644
--- a/x11/xorg-server/PLIST.common
+++ b/x11/xorg-server/PLIST.common
@@ -1,85 +1,8 @@
-@comment $NetBSD: PLIST.common,v 1.9 2005/03/02 02:12:55 hira Exp $
+@comment $NetBSD: PLIST.common,v 1.10 2005/03/22 14:01:20 adam Exp $
 ${X11ROOT_PREFIX}/bin/X
-${X11ROOT_PREFIX}/bin/XFree86
 ${X11ROOT_PREFIX}/bin/Xnest
-${X11ROOT_PREFIX}/bin/Xorg
 ${X11ROOT_PREFIX}/bin/Xprt
 ${X11ROOT_PREFIX}/bin/Xvfb
-${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/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
-${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/X11/xserver/C/print/Xprinters
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes/document
 ${X11ROOT_PREFIX}/lib/X11/xserver/C/print/attributes/job
@@ -951,181 +874,8 @@ ${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
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
-${CARDDRIVER.ark}${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
-${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}/lib/modules/drivers/cyrix_drv.o
-${CARDDRIVER.dummy}${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/lib/modules/drivers/imstt_drv.o
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/lib/modules/drivers/newport_drv.o
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
-${CARDDRIVER.s3}${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
-${CARDDRIVER.tga}${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
-${CARDDRIVER.via}${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
-${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
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v10002d.uc
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/lib/modules/v20002d.uc
 ${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}
-${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}/${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}
-${CARDDRIVER.apm}${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
-${CARDDRIVER.chips}${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
-${CARDDRIVER.cirrus}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
-${CARDDRIVER.cyrix}${X11ROOT_PREFIX}/${KERNMAN_DIR}/cyrix.${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}
-${CARDDRIVER.glint}${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
-${CARDDRIVER.i128}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
-${CARDDRIVER.i740}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
-${CARDDRIVER.i810}${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${KERNMAN_SUFFIX}
-${CARDDRIVER.imstt}${X11ROOT_PREFIX}/${KERNMAN_DIR}/imstt.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/js_x.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/kbd.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/keyboard.${KERNMAN_SUFFIX}
-${CARDDRIVER.mga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/mga.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/microtouch.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/mouse.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/mutouch.${KERNMAN_SUFFIX}
-${CARDDRIVER.neomagic}${X11ROOT_PREFIX}/${KERNMAN_DIR}/neomagic.${KERNMAN_SUFFIX}
-${CARDDRIVER.newport}${X11ROOT_PREFIX}/${KERNMAN_DIR}/newport.${KERNMAN_SUFFIX}
-${CARDDRIVER.nsc}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
-${CARDDRIVER.nv}${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
-${CARDDRIVER.ati}${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
-${CARDDRIVER.rendition}${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
-${CARDDRIVER.s3virge}${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
-${CARDDRIVER.savage}${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
-${CARDDRIVER.siliconmotion}${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
-${CARDDRIVER.sis}${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
-${CARDDRIVER.tdfx}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX}
-${CARDDRIVER.trident}${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
-${CARDDRIVER.tseng}${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
-${CARDDRIVER.vesa}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
-${CARDDRIVER.vga}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
-${CARDDRIVER.via}${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
-${CARDDRIVER.vmware}${X11ROOT_PREFIX}/${KERNMAN_DIR}/vmware.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/void.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${KERNMAN_DIR}/wacom.${KERNMAN_SUFFIX}
-${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
-${X11ROOT_PREFIX}/${FILEMAN_DIR}/xorg.conf.${FILEMAN_SUFFIX}
diff --git a/x11/xorg-server/PLIST.common_cards b/x11/xorg-server/PLIST.common_cards
new file mode 100644
index 00000000000..35a6cf272ce
--- /dev/null
+++ b/x11/xorg-server/PLIST.common_cards
@@ -0,0 +1,257 @@
+@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
index 9022bab0514..acf8cf5f1ab 100644
--- a/x11/xorg-server/PLIST.common_end
+++ b/x11/xorg-server/PLIST.common_end
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST.common_end,v 1.3 2005/02/09 20:08:26 xtraeme Exp $
-@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
+@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
@@ -27,5 +22,4 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/C
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver/en_US
 @dirrm ${X11ROOT_PREFIX}/lib/X11/xserver
-@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig
 @unexec ${RMDIR} %D/${X11ROOT_PREFIX}/include/X11/pixmaps 2>/dev/null || ${TRUE}
diff --git a/x11/xorg-server/files/host.def b/x11/xorg-server/files/host.def
index 5cb165948b7..f93d3ffa70b 100644
--- a/x11/xorg-server/files/host.def
+++ b/x11/xorg-server/files/host.def
@@ -1,4 +1,4 @@
-/* $NetBSD: host.def,v 1.9 2005/03/01 19:00:11 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.10 2005/03/22 14:01:20 adam Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
@@ -9,7 +9,7 @@
 #define MakeCmd @MAKE@
 
 #ifndef LinuxArchitecture
-#define HasGnuMake      NO
+#define HasGnuMake NO
 #endif
 
 #define ImakeCmd @IMAKE@
@@ -25,12 +25,18 @@
 #define BuildServer YES
 #define LibInstallBuild YES
 #define ModInstall YES
-#define XF86Server YES
 #define BuildServersOnly YES
 #define BuildGLXLibrary YES
-#define BuildXFree86ConfigTools YES
 #define UseInstalledPrograms YES
 
+#ifdef DarwinArchitecture
+#define XDarwinServer YES
+#else
+#define XF86Server YES
+#define BuildXFree86ConfigTools YES
+#define XF86CardDrivers @CARDDRIVERS@
+#endif
+
 #ifndef LinuxArchitecture
 #define HasNcurses		NO
 #define BuildGISWxprintglue	NO
@@ -62,5 +68,3 @@
 #define MiscManSuffix @MISCMAN_SUFFIX@
 #define MiscManDir @PREFIX@/@MISCMAN_DIR@
 #define DriverManDir @PREFIX@/@KERNMAN_DIR@
-
-#define	XF86CardDrivers	@CARDDRIVERS@
diff --git a/x11/xorg-server/options.mk b/x11/xorg-server/options.mk
index 1e840d5aa6b..bfa3b0303f6 100644
--- a/x11/xorg-server/options.mk
+++ b/x11/xorg-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/01/24 17:24:08 hira Exp $
+# $NetBSD: options.mk,v 1.3 2005/03/22 14:01:20 adam Exp $
 
 _COMMONCARDDRIVERS=	apm ark ati chips cirrus cyrix dummy glint i128 mga \
 			neomagic nv rendition s3 s3virge savage siliconmotion \
@@ -7,7 +7,7 @@ _NOTX86_64CARDDRIVERS=	i740 i810 imstt newport nsc via vmware
 _LINUXCARDDRIVERS=	fbdev v4l
 
 _ALLCARDDRIVERS=	${_COMMONCARDDRIVERS} ${_NOTX86_64CARDDRIVERS} \
-			${_LINUXCARDDRIVERS} 
+			${_LINUXCARDDRIVERS}
 
 _OSCARDDRIVERS=		# defined