Upgrade XFree86 packages to 4.4.0.

To see a full list of changes, please review:
http://xfree86.org/4.4.0/RELNOTES.html

These packages has been tested under NetBSD 1.6/-current, FreeBSD 4.x/5.x,
and GNU/Linux (i386) by Jeremy C. Reed, Michal Pasternak and myself.

7 files changed, 511 insertions, 381 deletions

diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index 88a8a0af42c..090309a30d0 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,75 +1,56 @@
-# $NetBSD: Makefile,v 1.5 2004/02/04 23:56:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/28 22:06:16 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
-PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XFREE}
-DISTFILES=		X430src-1.tgz X430src-2.tgz \
-			X430src-3.tgz X430src-4.tgz
+DISTFILES=		XFree86-4.4.0-src-1.tgz XFree86-4.4.0-src-2.tgz \
+			XFree86-4.4.0-src-3.tgz
 
 MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 X server and related programs
 
-USE_IMAKE=		yes
-USE_BUILDLINK2=		yes
-DISTINFO_FILE=		${.CURDIR}/../XFree86-libs/distinfo
-PATCHDIR=		${.CURDIR}/../XFree86-libs/patches
+USE_X11=		yes
+USE_BUILDLINK3=		yes
+DISTINFO_FILE=		${.CURDIR}/../../x11/XFree86-libs/distinfo
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-libs/patches
 
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau \
 			programs/Xserver
-XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
-XINSTALL_DIRS=		lib/font programs/Xserver
+XINCLUDE_DIRS=		lib/xkbfile lib/xtrans 
+XINSTALL_DIRS=		lib/font/FreeType lib/font/X-TrueType \
+			lib/font/Speedo lib/font/Type1 \
+			lib/font/bitmap programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver
 
-.include "../../mk/bsd.prefs.mk"
+REPLACE_PERL=		exports/lib/modules/getconfig*
 
-.if ${OPSYS} == "NetBSD"
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
-PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_MANNEWSUFFIX}
-.else
-PLIST_SUBST+=		MANPAGE_LIB_SUFFIX=${IMAKE_FILEMAN_SUFFIX}
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
-.endif
+SUBST_CLASSES=		parser
+SUBST_STAGE.parser=	pre-install
+SUBST_FILES.parser=	programs/Xserver/hw/xfree86/parser/Makefile
+SUBST_SED.parser=	-e '/$$(INSTALL).*lib$$(LIBNAME).a/ d'
+SUBST_SED.parser+=	-e '/$$(RANLIB).*lib$$(LIBNAME).a/ d'
+SUBST_SED.parser+=	-e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|'
+SUBST_MESSAGE.parser=	"Fixing parser Makefile."
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
-PLIST_SUBST+=		DRIMODULES=
-USE_PERL5=		yes # Still we need perl (at least for now)
-.  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
-XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
-XINSTALL_DIRS+=		lib/GL/mesa/src/drv
-.  endif
-.else
-PLIST_SUBST+=		LIBDRI="@comment "
-PLIST_SUBST+=		DRIMODULES="@comment "
-.endif
+SUBST_CLASSES+=		stubs
+SUBST_STAGE.stubs=	pre-install
+SUBST_FILES.stubs=	lib/font/stubs/Makefile
+SUBST_SED.stubs=	-e '/$$(INSTALL).*libfntstubs.a/ d'
+SUBST_SED.stubs+=	-e '/$$(RANLIB).*libfntstubs.a/ d'
+SUBST_MESSAGE.stubs=	"Fixing stubs Makefile."
 
-.if ${OPSYS} == "Linux"
-PLIST_SUBST+=		KBDMODE="@comment "
-.else
-PLIST_SUBST+=		KBDMODE=
-.endif
+.include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+=		LIBDRI=
+.if ${OPSYS} != "NetBSD"
+USE_PERL5=	build # Yeah, we need this :-)
 .endif
 
-pre-install:
-	@cd ${WRKSRC}/programs/Xserver/hw/xfree86/parser && \
-		${CP} Makefile Makefile.orig && \
-		${SED} -e '/$$(INSTALL).*lib$$(LIBNAME).a/ d' \
-		-e '/$$(RANLIB).*lib$$(LIBNAME).a/ d' \
-		-e 's|$$(INSTALL) $$(INSTALLFLAGS) $$(INSTINCFLAGS)|echo|' \
-		Makefile.orig > Makefile
-	@cd ${WRKSRC}/lib/font/stubs && \
-		${CP} Makefile Makefile.orig && \
-		${SED} -e '/$$(INSTALL).*libfntstubs.a/ d' \
-			-e '/$$(RANLIB).*libfntstubs.a/ d' Makefile.orig \
-			> Makefile
+post-install:
+	${CHMOD} a+r ${X11ROOT}/bin/XFree86
 
-.include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/XFree86/Makefile.common"
-.include "../../x11/XFree86-libs/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XFree86-server/PLIST b/x11/XFree86-server/PLIST
deleted file mode 100644
index f2e0338ee95..00000000000
--- a/x11/XFree86-server/PLIST
+++ /dev/null
@@ -1,290 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/02 14:16:44 xtraeme Exp $
-X11R6/bin/X
-X11R6/bin/XFree86
-X11R6/bin/Xnest
-X11R6/bin/Xprt
-X11R6/bin/Xvfb
-X11R6/bin/gtf
-X11R6/bin/inb
-X11R6/bin/inl
-X11R6/bin/inw
-X11R6/bin/ioport
-${KBDMODE}X11R6/bin/kbd_mode
-X11R6/bin/mmapr
-X11R6/bin/mmapw
-X11R6/bin/outb
-X11R6/bin/outl
-X11R6/bin/outw
-X11R6/bin/pcitweak
-X11R6/bin/scanpci
-X11R6/bin/xf86cfg
-X11R6/bin/xf86config
-X11R6/include/X11/bitmaps/card.xbm
-X11R6/include/X11/bitmaps/down.xbm
-X11R6/include/X11/bitmaps/keyboard.xbm
-X11R6/include/X11/bitmaps/left.xbm
-X11R6/include/X11/bitmaps/monitor.xbm
-X11R6/include/X11/bitmaps/mouse.xbm
-X11R6/include/X11/bitmaps/narrower.xbm
-X11R6/include/X11/bitmaps/right.xbm
-X11R6/include/X11/bitmaps/shorter.xbm
-X11R6/include/X11/bitmaps/taller.xbm
-X11R6/include/X11/bitmaps/up.xbm
-X11R6/include/X11/bitmaps/wider.xbm
-X11R6/include/X11/pixmaps/card.xpm
-X11R6/include/X11/pixmaps/computer.xpm
-X11R6/include/X11/pixmaps/keyboard.xpm
-X11R6/include/X11/pixmaps/monitor.xpm
-X11R6/include/X11/pixmaps/mouse.xpm
-X11R6/lib/X11/Cards
-X11R6/lib/X11/Options
-X11R6/lib/X11/XF86Config.98
-X11R6/lib/X11/XF86Config.eg
-X11R6/lib/X11/app-defaults/XF86Cfg
-X11R6/lib/X11/doc/BUILD
-X11R6/lib/X11/doc/BugReport
-X11R6/lib/X11/doc/DESIGN
-X11R6/lib/X11/doc/Install
-X11R6/lib/X11/doc/LICENSE
-X11R6/lib/X11/doc/README
-X11R6/lib/X11/doc/README.DECtga
-X11R6/lib/X11/doc/README.DGA
-X11R6/lib/X11/doc/README.DRI
-X11R6/lib/X11/doc/README.DRIcomp
-X11R6/lib/X11/doc/README.I128
-X11R6/lib/X11/doc/README.SiS
-X11R6/lib/X11/doc/README.XKB-Config
-X11R6/lib/X11/doc/README.XKB-Enhancing
-X11R6/lib/X11/doc/README.apm
-X11R6/lib/X11/doc/README.ati
-X11R6/lib/X11/doc/README.chips
-X11R6/lib/X11/doc/README.cyrix
-X11R6/lib/X11/doc/README.dps
-X11R6/lib/X11/doc/README.fonts
-X11R6/lib/X11/doc/README.i740
-X11R6/lib/X11/doc/README.i810
-X11R6/lib/X11/doc/README.mouse
-X11R6/lib/X11/doc/README.newport
-X11R6/lib/X11/doc/README.r128
-X11R6/lib/X11/doc/README.rapidaccess
-X11R6/lib/X11/doc/README.rendition
-X11R6/lib/X11/doc/README.s3virge
-X11R6/lib/X11/doc/RELNOTES
-X11R6/lib/X11/doc/ServersOnly
-X11R6/lib/X11/doc/Status
-X11R6/lib/X11/doc/Versions
-X11R6/lib/X11/doc/VideoBoard98
-X11R6/lib/X11/etc/Xinstall.sh
-X11R6/lib/X11/etc/xmodmap.std
-X11R6/lib/X11/xserver/SecurityPolicy
-X11R6/lib/modules/codeconv/libARABIC.a
-X11R6/lib/modules/codeconv/libARMSCII8.a
-X11R6/lib/modules/codeconv/libBIG5.a
-X11R6/lib/modules/codeconv/libBIG5HKSCS.a
-X11R6/lib/modules/codeconv/libDOSENCODING.a
-X11R6/lib/modules/codeconv/libGB2312.a
-X11R6/lib/modules/codeconv/libGBK.a
-X11R6/lib/modules/codeconv/libGEORGIAN.a
-X11R6/lib/modules/codeconv/libISO8859_1.a
-X11R6/lib/modules/codeconv/libISO8859_10.a
-X11R6/lib/modules/codeconv/libISO8859_11.a
-X11R6/lib/modules/codeconv/libISO8859_14.a
-X11R6/lib/modules/codeconv/libISO8859_15.a
-X11R6/lib/modules/codeconv/libISO8859_2.a
-X11R6/lib/modules/codeconv/libISO8859_3.a
-X11R6/lib/modules/codeconv/libISO8859_4.a
-X11R6/lib/modules/codeconv/libISO8859_5.a
-X11R6/lib/modules/codeconv/libISO8859_6.a
-X11R6/lib/modules/codeconv/libISO8859_7.a
-X11R6/lib/modules/codeconv/libISO8859_8.a
-X11R6/lib/modules/codeconv/libISO8859_9.a
-X11R6/lib/modules/codeconv/libJISX0201.a
-X11R6/lib/modules/codeconv/libJISX0208.a
-X11R6/lib/modules/codeconv/libJISX0212.a
-X11R6/lib/modules/codeconv/libKOI8.a
-X11R6/lib/modules/codeconv/libKSC5601.a
-X11R6/lib/modules/codeconv/libKSCJOHAB.a
-X11R6/lib/modules/codeconv/libMULEENCODING.a
-X11R6/lib/modules/codeconv/libTCVN.a
-X11R6/lib/modules/codeconv/libVISCII.a
-${LIBDRI}X11R6/lib/modules/extensions/libdri.a
-${DRIMODULES}X11R6/lib/modules/dri/gamma_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/i810_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/i830_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/mga_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/r128_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/r200_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/radeon_dri.so
-${DRIMODULES}X11R6/lib/modules/dri/tdfx_dri.so
-X11R6/lib/modules/drivers/apm_drv.o
-X11R6/lib/modules/drivers/ark_drv.o
-X11R6/lib/modules/drivers/ati_drv.o
-X11R6/lib/modules/drivers/atimisc_drv.o
-X11R6/lib/modules/drivers/chips_drv.o
-X11R6/lib/modules/drivers/cirrus_alpine.o
-X11R6/lib/modules/drivers/cirrus_drv.o
-X11R6/lib/modules/drivers/cirrus_laguna.o
-X11R6/lib/modules/drivers/cyrix_drv.o
-X11R6/lib/modules/drivers/glint_drv.o
-X11R6/lib/modules/drivers/i128_drv.o
-X11R6/lib/modules/drivers/i740_drv.o
-X11R6/lib/modules/drivers/i810_drv.o
-X11R6/lib/modules/drivers/mga_drv.o
-X11R6/lib/modules/drivers/neomagic_drv.o
-X11R6/lib/modules/drivers/nsc_drv.o
-X11R6/lib/modules/drivers/nv_drv.o
-X11R6/lib/modules/drivers/r128_drv.o
-X11R6/lib/modules/drivers/radeon_drv.o
-X11R6/lib/modules/drivers/rendition_drv.o
-X11R6/lib/modules/drivers/s3_drv.o
-X11R6/lib/modules/drivers/s3virge_drv.o
-X11R6/lib/modules/drivers/savage_drv.o
-X11R6/lib/modules/drivers/siliconmotion_drv.o
-X11R6/lib/modules/drivers/sis_drv.o
-X11R6/lib/modules/drivers/tdfx_drv.o
-X11R6/lib/modules/drivers/tga_drv.o
-X11R6/lib/modules/drivers/trident_drv.o
-X11R6/lib/modules/drivers/tseng_drv.o
-X11R6/lib/modules/drivers/vesa_drv.o
-X11R6/lib/modules/drivers/vga_drv.o
-X11R6/lib/modules/drivers/vmware_drv.o
-X11R6/lib/modules/extensions/libGLcore.a
-X11R6/lib/modules/extensions/libdbe.a
-X11R6/lib/modules/extensions/libextmod.a
-X11R6/lib/modules/extensions/libglx.a
-X11R6/lib/modules/extensions/librecord.a
-X11R6/lib/modules/extensions/libxtrap.a
-X11R6/lib/modules/fonts/libbitmap.a
-X11R6/lib/modules/fonts/libfreetype.a
-X11R6/lib/modules/fonts/libspeedo.a
-X11R6/lib/modules/fonts/libtype1.a
-X11R6/lib/modules/fonts/libxtt.a
-X11R6/lib/modules/input/calcomp_drv.o
-X11R6/lib/modules/input/citron_drv.o
-X11R6/lib/modules/input/digitaledge_drv.o
-X11R6/lib/modules/input/dmc_drv.o
-X11R6/lib/modules/input/dynapro_drv.o
-X11R6/lib/modules/input/elographics_drv.o
-X11R6/lib/modules/input/fpit_drv.o
-X11R6/lib/modules/input/hyperpen_drv.o
-X11R6/lib/modules/input/js_x_drv.o
-X11R6/lib/modules/input/kbd_drv.o
-X11R6/lib/modules/input/magellan_drv.o
-X11R6/lib/modules/input/microtouch_drv.o
-X11R6/lib/modules/input/mouse_drv.o
-X11R6/lib/modules/input/mutouch_drv.o
-X11R6/lib/modules/input/palmax_drv.o
-X11R6/lib/modules/input/penmount_drv.o
-X11R6/lib/modules/input/spaceorb_drv.o
-X11R6/lib/modules/input/summa_drv.o
-X11R6/lib/modules/input/tek4957_drv.o
-X11R6/lib/modules/input/void_drv.o
-X11R6/lib/modules/input/wacom_drv.o
-X11R6/lib/modules/libafb.a
-X11R6/lib/modules/libcfb.a
-X11R6/lib/modules/libcfb16.a
-X11R6/lib/modules/libcfb24.a
-X11R6/lib/modules/libcfb32.a
-X11R6/lib/modules/libddc.a
-X11R6/lib/modules/libfb.a
-X11R6/lib/modules/libi2c.a
-X11R6/lib/modules/libint10.a
-X11R6/lib/modules/liblayer.a
-X11R6/lib/modules/libmfb.a
-X11R6/lib/modules/libpcidata.a
-X11R6/lib/modules/librac.a
-X11R6/lib/modules/libramdac.a
-X11R6/lib/modules/libscanpci.a
-X11R6/lib/modules/libshadow.a
-X11R6/lib/modules/libshadowfb.a
-X11R6/lib/modules/libvbe.a
-X11R6/lib/modules/libvgahw.a
-X11R6/lib/modules/libxaa.a
-X11R6/lib/modules/libxf1bpp.a
-X11R6/lib/modules/libxf24_32bpp.a
-X11R6/lib/modules/libxf4bpp.a
-X11R6/lib/modules/libxf8_16bpp.a
-X11R6/lib/modules/libxf8_32bpp.a
-X11R6/lib/modules/v10002d.uc
-X11R6/lib/modules/v20002d.uc
-X11R6/${IMAKE_MAN_DIR}/XFree86.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/Xnest.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/Xserver.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/gtf.${IMAKE_MANNEWSUFFIX}
-${KBDMODE}X11R6/${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/scanpci.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xf86config.${IMAKE_MANNEWSUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidMode.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
-X11R6/${IMAKE_FILEMAN_DIR}/XF86Config.${MANPAGE_LIB_SUFFIX}
-@dirrm X11R6/lib/modules/input
-@dirrm X11R6/lib/modules/fonts
-@dirrm X11R6/lib/modules/extensions
-@dirrm X11R6/lib/modules/drivers
-@dirrm X11R6/lib/X11/xserver
-@dirrm X11R6/include/X11/pixmaps
diff --git a/x11/XFree86-server/PLIST.FreeBSD b/x11/XFree86-server/PLIST.FreeBSD
new file mode 100644
index 00000000000..04ef69bd055
--- /dev/null
+++ b/x11/XFree86-server/PLIST.FreeBSD
@@ -0,0 +1,74 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.3 2004/03/28 22:06:16 xtraeme Exp $
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/lib/modules/freebsd/libdrm.a
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/ati_pcigart.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drmP.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_agpsupport.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_auth.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_bufs.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_context.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_dma.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drawable.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_drv.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_fops.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_ioctl.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_irq.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_lock.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_memory_debug.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_freebsd.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_os_netbsd.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_pci.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sarea.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_scatter.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_sysctl.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/drm_vm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_dma.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_drv.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_irq.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_state.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_ucode.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga_warp.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_cce.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_drv.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_irq.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128_state.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_cp.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_drv.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_irq.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_mem.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon_state.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drm.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_drv.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_ds.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis_mm.c
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx.h
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx/Makefile
+${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx_drv.c
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/tdfx
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/sis
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/radeon
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/r128
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel/mga
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm/kernel
+@dirrm ${X11ROOT_PREFIX}/src/bsd/drm
+@dirrm ${X11ROOT_PREFIX}/lib/modules/freebsd
diff --git a/x11/XFree86-server/PLIST.Linux b/x11/XFree86-server/PLIST.Linux
new file mode 100644
index 00000000000..1cc13d525e6
--- /dev/null
+++ b/x11/XFree86-server/PLIST.Linux
@@ -0,0 +1,96 @@
+@comment $NetBSD: PLIST.Linux,v 1.3 2004/03/28 22:06:16 xtraeme Exp $
+${X11ROOT_PREFIX}/lib/modules/drivers/linux/v4l_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/aiptek_drv.o
+${X11ROOT_PREFIX}/lib/modules/input/linux/ur98_drv.o
+${X11ROOT_PREFIX}/lib/modules/linux/libdrm.a
+${X11ROOT_PREFIX}/lib/modules/linux/libfbdevhw.a
+${X11ROOT_PREFIX}/lib/modules/linux/libint10.a
+${X11ROOT_PREFIX}/man/man4/aiptek.4
+${X11ROOT_PREFIX}/man/man4/ur98.4
+${X11ROOT_PREFIX}/man/man4/v4l.4
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drmP.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_agpsupport.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_auth.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_bufs.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_context.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_dma.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drawable.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_fops.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_init.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_ioctl.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_irq.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_lock.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_memory_debug.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_os_linux.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_proc.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_sarea.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_scatter.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_stub.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/drm_vm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_context.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lists.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_lock.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_old_dma.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_dma.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/gamma_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i810.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_dma.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i810_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_dma.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/i830_irq.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/ati_pcigart.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_cce.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_irq.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/r128_state.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_cp.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_irq.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_mem.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/radeon_state.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_ds.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/sis_mm.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drm.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_ucode.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_dma.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_irq.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_state.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/mga_warp.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx.h
+${X11ROOT_PREFIX}/src/linux/drm/kernel/tdfx_drv.c
+${X11ROOT_PREFIX}/src/linux/drm/kernel/Config.in
+${X11ROOT_PREFIX}/src/linux/drm/kernel/Kconfig
+${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.linux
+${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile.kernel
+${X11ROOT_PREFIX}/src/linux/drm/kernel/Makefile
+@dirrm ${X11ROOT_PREFIX}/src/linux/drm/kernel
+@dirrm ${X11ROOT_PREFIX}/src/linux/drm
+@dirrm ${X11ROOT_PREFIX}/src/linux
+@dirrm ${X11ROOT_PREFIX}/src
+@dirrm ${X11ROOT_PREFIX}/lib/modules/linux
diff --git a/x11/XFree86-server/PLIST.NetBSD b/x11/XFree86-server/PLIST.NetBSD
new file mode 100644
index 00000000000..0a6f36fd71a
--- /dev/null
+++ b/x11/XFree86-server/PLIST.NetBSD
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.NetBSD,v 1.3 2004/03/28 22:06:16 xtraeme Exp $
+${X11ROOT_PREFIX}/bin/kbd_mode
+${X11ROOT_PREFIX}/${MAN_DIR}/kbd_mode.${MAN_SUFFIX}
diff --git a/x11/XFree86-server/PLIST.common b/x11/XFree86-server/PLIST.common
new file mode 100644
index 00000000000..74d9bb5ce85
--- /dev/null
+++ b/x11/XFree86-server/PLIST.common
@@ -0,0 +1,295 @@
+@comment $NetBSD: PLIST.common,v 1.3 2004/03/28 22:06:16 xtraeme Exp $
+${X11ROOT_PREFIX}/bin/X
+${X11ROOT_PREFIX}/bin/XFree86
+${X11ROOT_PREFIX}/bin/Xnest
+${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/xf86cfg
+${X11ROOT_PREFIX}/bin/xf86config
+${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/XF86Config.98
+${X11ROOT_PREFIX}/lib/X11/XF86Config.eg
+${X11ROOT_PREFIX}/lib/X11/app-defaults/XF86Cfg
+${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/README
+${X11ROOT_PREFIX}/lib/X11/doc/README.DECtga
+${X11ROOT_PREFIX}/lib/X11/doc/README.DRI
+${X11ROOT_PREFIX}/lib/X11/doc/README.DRIcomp
+${X11ROOT_PREFIX}/lib/X11/doc/README.I128
+${X11ROOT_PREFIX}/lib/X11/doc/README.SiS
+${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/xfree86.cfg
+${X11ROOT_PREFIX}/lib/X11/xserver/SecurityPolicy
+${X11ROOT_PREFIX}/lib/modules/codeconv/libARABIC.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libARMSCII8.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libBIG5HKSCS.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libDOSENCODING.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libGB18030.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libGB2312.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libGBK.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libGEORGIAN.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_1.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_10.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_11.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_13.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_14.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_15.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_2.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_3.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_4.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_5.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_6.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_7.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_8.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libISO8859_9.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0201.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0208.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libJISX0212.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libKOI8.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libKSC5601.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libKSCJOHAB.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libMULEENCODING.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libTCVN.a
+${X11ROOT_PREFIX}/lib/modules/codeconv/libVISCII.a
+${X11ROOT_PREFIX}/lib/modules/drivers/apm_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/ark_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/ati_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/atimisc_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/chips_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_alpine.o
+${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/cirrus_laguna.o
+${X11ROOT_PREFIX}/lib/modules/drivers/cyrix_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/dummy_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/fbdev_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/glint_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/i128_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/i740_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/i810_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/mga_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/neomagic_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/nsc_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/nv_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/r128_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/radeon_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/rendition_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/riva128.o
+${X11ROOT_PREFIX}/lib/modules/drivers/s3_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/s3virge_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/savage_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/siliconmotion_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/sis_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/tdfx_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/tga_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/trident_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/tseng_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/vesa_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/vga_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/via_drv.o
+${X11ROOT_PREFIX}/lib/modules/drivers/vmware_drv.o
+${X11ROOT_PREFIX}/lib/modules/extensions/libGLcore.a
+${X11ROOT_PREFIX}/lib/modules/extensions/libdbe.a
+${LIBDRI}${X11ROOT_PREFIX}/lib/modules/extensions/libdri.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/libspeedo.a
+${X11ROOT_PREFIX}/lib/modules/fonts/libfreetype.a
+${X11ROOT_PREFIX}/lib/modules/fonts/libtype1.a
+${X11ROOT_PREFIX}/lib/modules/fonts/libxtt.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/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/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/v10002d.uc
+${X11ROOT_PREFIX}/lib/modules/v20002d.uc
+${X11ROOT_PREFIX}/${MAN_DIR}/XFree86.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/Xnest.${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}/xf86cfg.${MAN_SUFFIX}
+${X11ROOT_PREFIX}/${MAN_DIR}/xf86config.${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}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/apm.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/chips.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/cirrus.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/citron.${KERNMAN_SUFFIX}
+${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}/fbdev.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/fbdevhw.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/fpit.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/glint.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/i128.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/i740.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/i810.${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}/mga.${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}/neomagic.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/nsc.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/nv.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/palmax.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/penmount.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/r128.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/radeon.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/rendition.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/s3virge.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/savage.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/siliconmotion.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/sis.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/tdfx.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/tek4957.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/trident.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/tseng.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/vesa.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/vga.${KERNMAN_SUFFIX}
+${X11ROOT_PREFIX}/${KERNMAN_DIR}/via.${KERNMAN_SUFFIX}
+${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}/XF86Config.${FILEMAN_SUFFIX}
+${X11ROOT_PREFIX}/${FILEMAN_DIR}/getconfig.${FILEMAN_SUFFIX}
+@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/codeconv
+@dirrm ${X11ROOT_PREFIX}/lib/modules
+@dirrm ${X11ROOT_PREFIX}/lib/X11/xserver
+@dirrm ${X11ROOT_PREFIX}/lib/X11/getconfig
+@dirrm ${X11ROOT_PREFIX}/include/X11/pixmaps
diff --git a/x11/XFree86-server/files/host.def b/x11/XFree86-server/files/host.def
index 8e186d7e25c..a6a46c31d3f 100644
--- a/x11/XFree86-server/files/host.def
+++ b/x11/XFree86-server/files/host.def
@@ -1,8 +1,4 @@
-/*
- * $NetBSD: host.def,v 1.2 2004/02/02 14:16:44 xtraeme Exp $
- *
- * XFree86 packages for pkgsrc system
- */
+/* $NetBSD: host.def,v 1.3 2004/03/28 22:06:16 xtraeme Exp $ */
 
 #define ProjectRoot @PREFIX@
 #define BuildHtmlManPages NO
@@ -18,7 +14,6 @@
 
 #define NothingOutsideProjectRoot YES
 #define InstallXserverSetUID YES
-#define HasGlide3 YES
 
 #define BuildServer YES
 #define LibInstallBuild YES
@@ -28,43 +23,19 @@
 #define BuildGLXLibrary YES
 #define BuildXFree86ConfigTools YES
 #define UseInstalledPrograms YES
-#define StandardIncludes -I@BLNK@/include -I@PREFIX@/include
 
-#ifdef LinuxArchitecture
-#define InstallAppDefFiles YES
-#define LdPostLib @LDFLAGS@
-#endif
+#define BuildFontCache NO
+#define BuiltFontLib NO
 
-#define XTrueTypeInstallCConvHeaders NO
-
-/* Don't build with SecureRPC, we need to fix this ... */
+#define StandardIncludes -I@BLNK@/include
+#define ExtraLoadFlags @LDFLAGS@
 
-#if defined(NetBSDArchitecture)
-# define HasSecureRPC NO
-#endif
+#define XTrueTypeInstallCConvHeaders NO
 
-/* DRI/DRM Support only in FreeBSD/Linux at this moment */
+#define HasFreetype2 YES
+#define Freetype2Dir @BLNK@
 
-#if defined(FreeBSDArchitecture)
-# define BuildXF86DRI YES
-# define BuildXF86DRM NO
-# define HasSecureRPC YES
-#elif defined(LinuxArchitecture)
-# define BuildXF86DRI YES
-# define BuildXF86DRM YES
-#endif
+#define HasFontconfig YES
+#define FontconfigDir @BLNK@
 
-#if defined(i386Architecture)
-# define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
-				neomagic i740 tdfx savage \
-				cirrus vmware tseng trident chips apm \
-				i128 nsc ati i810 ark cyrix siliconmotion \
-				vesa vga
-#elif defined(ia64Architecture)
-# define XF86CardDrivers	mga nv tdfx glint ati vga
-#elif defined(AlphaArchitecture)
-# define XF86CardDrivers	mga glint nv tga s3 s3virge rendition \
-				tdfx savage cirrus ati siliconmotion vga
-#elif defined(Sparc64Architecture)
-# define XF86CardDrivers	nv ati sunffb
-#endif
+#define BuildHtmlManPages NO