Update to 4.0.1. Remove libraries from -clients. Try to extract

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

18 files changed, 502 insertions, 213 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 43c49176e0d5..e124aae7c362 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XFontServer-4.0
+# New ports collection makefile for:	XFree86XFontServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	FontServer
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers x11-fonts
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	FreeBSDPortsInstall FreeBSDPortsInstall.man
+MANCOMPRESSED=		yes
+MAN1=			xfs.1
 
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= FreeBSDPortsInstall
-.else
-INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man
-MANCOMPRESSED=	yes
-MAN1=		xfs.1
-.endif
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist
index c5fd7a27ba89..ced5ee87b536 100644
--- a/x11-servers/XFree86-4-FontServer/pkg-plist
+++ b/x11-servers/XFree86-4-FontServer/pkg-plist
@@ -1,4 +1,2 @@
 bin/xfs
-@cwd /etc
-X11/fs/config
-@unexec rmdir /etc/X11/fs
+lib/X11/fs/config
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index f5c33725d1c0..48541ec6dbb0 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -26,6 +26,13 @@ configure () {
 	InstallFSConfig=YES
     fi
 
+    # It's good for FreeBSD ports/packages system.
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+    # I want to set this line.
+    # but the probrem is too deep. not yet done.
+    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
     # disable some configs: there are not used this ports
     for i in BuildFonts \
 	Build75DpiFonts \
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 1d60f1e8e881..e6d2cd0a8793 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XNestServer-4.0
+# New ports collection makefile for:	XFree86XNestServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	NestServer
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	installXnest installXnest.man
+MANCOMPRESSED=		yes
+MAN1=			Xnest.1
 
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= installXnest
-.else
-INSTALL_TARGET= installXnest installXnest.man
-MANCOMPRESSED=	yes
-MAN1=		Xnest.1
-.endif
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 510454fc8209..3aceb8dc4615 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XPrintServer-4.0
+# New ports collection makefile for:	XFree86XPrintServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,31 +6,31 @@
 #
 
 PORTNAME=	PrintServer
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	installXprt
 
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR}
-ALL_TARGET=	FreeBSDPortsBuild
-INSTALL_TARGET= installXprt
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 522c26e3c79d..1cf6d7482645 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XServer-4.0
+# New ports collection makefile for:	XFree86XServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,51 +6,88 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR} \
-		ExtendedInputDevices=${ExtendedInputDevices}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= FreeBSDPortsInstall
-.else
-INSTALL_TARGET= FreeBSDPortsInstall  FreeBSDPortsInstall.man
-MANCOMPRESSED=	yes
-MAN1=		SuperProbe.1 XFree86.1 Xserver.1 \
-		kbd_mode.1 xf86config.1 showrgb.1
-MAN3=		XF86VidMode.3 XF86VidModeDeleteModeLine.3 \
-		XF86VidModeGetAllModeLines.3 XF86VidModeGetModeLine.3 \
-		XF86VidModeGetMonitor.3 XF86VidModeGetViewPort.3 \
-		XF86VidModeLockModeSwitch.3 XF86VidModeModModeLine.3 \
-		XF86VidModeQueryExtension.3 XF86VidModeQueryVersion.3 \
-		XF86VidModeSetViewPort.3 XF86VidModeSwitchMode.3 \
-		XF86VidModeSwitchToMode.3
-MAN4=		apm.4 ati.4 chips.4 cirrus.4 dynapro.4 fbdev.4 \
-		glint.4 i740.4 keyboard.4 mga.4 microtouch.4 mouse.4 \
-		neomagic.4 nv.4 r128.4 rendition.4 s3virge.4 sis.4 \
-		tdfx.4 trident.4 tseng.4 vga.4 wacom.4
-MAN5= 		XF86Config.5
-.endif
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR} \
+			ExtendedInputDevices=${ExtendedInputDevices}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	FreeBSDPortsInstall  FreeBSDPortsInstall.man
+MANCOMPRESSED=		yes
+MAN1=			SuperProbe.1 \
+			XFree86.1 \
+			Xserver.1 \
+			imake.1 \
+			kbd_mode.1 \
+			lndir.1 \
+			makedepend.1 \
+			makeg.1 \
+			makestrs.1 \
+			mkdirhier.1 \
+			pswrap.1 \
+			revpath.1 \
+			rman.1 \
+			showrgb.1 \
+			xf86config.1 \
+			xmkmf.1
+MAN3=			XF86VidMode.3 \
+			XF86VidModeDeleteModeLine.3 \
+			XF86VidModeGetAllModeLines.3 \
+			XF86VidModeGetModeLine.3 \
+			XF86VidModeGetMonitor.3 \
+			XF86VidModeGetViewPort.3 \
+			XF86VidModeLockModeSwitch.3 \
+			XF86VidModeModModeLine.3 \
+			XF86VidModeQueryExtension.3 \
+			XF86VidModeQueryVersion.3 \
+			XF86VidModeSetViewPort.3 \
+			XF86VidModeSwitchMode.3 \
+			XF86VidModeSwitchToMode.3
+MAN4=			apm.4 \
+			ati.4 \
+			chips.4 \
+			cirrus.4 \
+			cyrix.4 \
+			dynapro.4 \
+			elographics.4 \
+			fbdev.4 \
+			glint.4 \
+			i740.4 \
+			i810.4 \
+			keyboard.4 \
+			mga.4 \
+			microtouch.4 \
+			mouse.4 \
+			mutouch.4 \
+			neomagic.4 \
+			nv.4 \
+			r128.4 \
+			rendition.4 \
+			s3virge.4 \
+			sis.4 \
+			tdfx.4 \
+			trident.4 \
+			tseng.4 \
+			vga.4 \
+			wacom.4
+MAN5= 			XF86Config.5
 
 # User Config:
 # If you want to disabe Extended input devices (such as wacom tablets),
@@ -59,7 +96,10 @@ ExtendedInputDevices?=	YES
 
 pre-fetch:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	${SH} ${PKGDIR}/INSTALL
+${SH} ${PKGDIR}/INSTALL
 .endif
 
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 98920201219e..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,2 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 524f2c848178..25f491fc6944 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -17,6 +17,7 @@ lib/X11/doc/README
 lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
+lib/X11/doc/README.DRIcomp
 lib/X11/doc/README.SiS
 lib/X11/doc/README.apm
 lib/X11/doc/README.ati
@@ -33,6 +34,67 @@ lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
 lib/X11/doc/VideoBoard98
+lib/X11/doc/html/SuperProbe.1.html
+lib/X11/doc/html/XF86Config.5.html
+lib/X11/doc/html/XF86VidMode.3.html
+lib/X11/doc/html/XF86VidModeDeleteModeLine.3.html
+lib/X11/doc/html/XF86VidModeGetAllModeLines.3.html
+lib/X11/doc/html/XF86VidModeGetModeLine.3.html
+lib/X11/doc/html/XF86VidModeGetMonitor.3.html
+lib/X11/doc/html/XF86VidModeGetViewPort.3.html
+lib/X11/doc/html/XF86VidModeLockModeSwitch.3.html
+lib/X11/doc/html/XF86VidModeModModeLine.3.html
+lib/X11/doc/html/XF86VidModeQueryExtension.3.html
+lib/X11/doc/html/XF86VidModeQueryVersion.3.html
+lib/X11/doc/html/XF86VidModeSetViewPort.3.html
+lib/X11/doc/html/XF86VidModeSwitchMode.3.html
+lib/X11/doc/html/XF86VidModeSwitchToMode.3.html
+lib/X11/doc/html/XFree86.1.html
+lib/X11/doc/html/Xserver.1.html
+lib/X11/doc/html/apm.4.html
+lib/X11/doc/html/ati.4.html
+lib/X11/doc/html/chips.4.html
+lib/X11/doc/html/cirrus.4.html
+lib/X11/doc/html/cyrix.4.html
+lib/X11/doc/html/dynapro.4.html
+lib/X11/doc/html/elographics.4.html
+lib/X11/doc/html/fbdev.4.html
+lib/X11/doc/html/glint.4.html
+lib/X11/doc/html/i740.4.html
+lib/X11/doc/html/i810.4.html
+lib/X11/doc/html/imake.1.html
+lib/X11/doc/html/kbd_mode.1.html
+lib/X11/doc/html/keyboard.4.html
+lib/X11/doc/html/lndir.1.html
+lib/X11/doc/html/makedepend.1.html
+lib/X11/doc/html/makeg.1.html
+lib/X11/doc/html/makestrs.1.html
+lib/X11/doc/html/manindex1.html
+lib/X11/doc/html/manindex3.html
+lib/X11/doc/html/manindex4.html
+lib/X11/doc/html/manindex5.html
+lib/X11/doc/html/mga.4.html
+lib/X11/doc/html/microtouch.4.html
+lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mouse.4.html
+lib/X11/doc/html/mutouch.4.html
+lib/X11/doc/html/neomagic.4.html
+lib/X11/doc/html/nv.4.html
+lib/X11/doc/html/pswrap.1.html
+lib/X11/doc/html/r128.4.html
+lib/X11/doc/html/rendition.4.html
+lib/X11/doc/html/revpath.1.html
+lib/X11/doc/html/rman.1.html
+lib/X11/doc/html/s3virge.4.html
+lib/X11/doc/html/showrgb.1.html
+lib/X11/doc/html/sis.4.html
+lib/X11/doc/html/tdfx.4.html
+lib/X11/doc/html/trident.4.html
+lib/X11/doc/html/tseng.4.html
+lib/X11/doc/html/vga.4.html
+lib/X11/doc/html/wacom.4.html
+lib/X11/doc/html/xf86config.1.html
+lib/X11/doc/html/xmkmf.1.html
 lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
@@ -40,16 +102,50 @@ lib/X11/etc/xmodmap.std
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
 lib/X11/rgb.txt
-lib/libxf86config.a
+lib/X11/xserver/SecurityPolicy
+lib/modules/codeconv/libARABIC.a
+lib/modules/codeconv/libARMSCII8.a
+lib/modules/codeconv/libBIG5.a
+lib/modules/codeconv/libDOSENCODING.a
+lib/modules/codeconv/libGB2312.a
+lib/modules/codeconv/libGEORGIAN.a
+lib/modules/codeconv/libISO8859_1.a
+lib/modules/codeconv/libISO8859_10.a
+lib/modules/codeconv/libISO8859_11.a
+lib/modules/codeconv/libISO8859_14.a
+lib/modules/codeconv/libISO8859_15.a
+lib/modules/codeconv/libISO8859_2.a
+lib/modules/codeconv/libISO8859_3.a
+lib/modules/codeconv/libISO8859_4.a
+lib/modules/codeconv/libISO8859_5.a
+lib/modules/codeconv/libISO8859_6.a
+lib/modules/codeconv/libISO8859_7.a
+lib/modules/codeconv/libISO8859_8.a
+lib/modules/codeconv/libISO8859_9.a
+lib/modules/codeconv/libJISX0201.a
+lib/modules/codeconv/libJISX0208.a
+lib/modules/codeconv/libJISX0212.a
+lib/modules/codeconv/libKOI8.a
+lib/modules/codeconv/libKSC5601.a
+lib/modules/codeconv/libKSCJOHAB.a
+lib/modules/codeconv/libMULEENCODING.a
+lib/modules/codeconv/libTCVN.a
+lib/modules/codeconv/libVISCII.a
+lib/modules/dri/gamma_dri.so
+lib/modules/dri/i810_dri.so
+lib/modules/dri/mga_dri.so
+lib/modules/dri/r128_dri.so
 lib/modules/drivers/apm_drv.o
 lib/modules/drivers/ati_drv.o
 lib/modules/drivers/chips_drv.o
 lib/modules/drivers/cirrus_alpine.o
 lib/modules/drivers/cirrus_drv.o
 lib/modules/drivers/cirrus_laguna.o
+lib/modules/drivers/cyrix_drv.o
 lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
 lib/modules/drivers/i740_drv.o
+lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
 lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
@@ -64,11 +160,18 @@ lib/modules/drivers/tseng_drv.o
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
+lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
 lib/modules/extensions/libxie.a
+lib/modules/fonts/libbitmap.a
+lib/modules/fonts/libfreetype.a
+lib/modules/fonts/libspeedo.a
+lib/modules/fonts/libtype1.a
+lib/modules/fonts/libxtt.a
+lib/modules/freebsd/libdrm.a
 lib/modules/input/dynapro_drv.o
 lib/modules/input/elo2300_drv.o
 lib/modules/input/elographics_drv.o
@@ -103,8 +206,3 @@ lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 lib/modules/v10002d.uc
 lib/modules/v20002d.uc
-@dirrm lib/modules/drivers
-@dirrm lib/modules/extensions
-@dirrm lib/modules/input
-@cwd /etc
-X11/xserver/SecurityPolicy
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 9c1ae0818a6f..5539850adccc 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -26,8 +26,16 @@ configure () {
 	ExtendedInputDevices=YES
     fi
 
+    # It's good for FreeBSD ports/packages system.
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+    # I want to set this line.
+    # but the probrem is too deep. not yet done.
+    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
     # disable some configs: there are not used this ports
-    for i in BuildFonts \
+    for i in \
+	BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@@ -40,12 +48,14 @@ configure () {
 	XVirtualFramebufferServer \
 	XprtServer \
 	LibHeaders \
+	LibInstall \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
     do \
 	echo "#define $i NO" >> $LOCALDEF
     done
     echo "#define BuildServer YES" >> $LOCALDEF
+    echo "#define LibInstallBuild YES" >> $LOCALDEF
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     cat >> $LOCALDEF <<END
@@ -53,7 +63,8 @@ configure () {
                                 neomagic i740 tdfx \
                                 cirrus tseng trident chips apm \
                                 GlideDriver fbdev \
-                                ati r128 vga XF86ExtraCardDrivers
+                                ati r128 AgpGartDrivers cyrix \
+				vga  XF86OSCardDrivers XF86ExtraCardDrivers
 END
     if [ $ExtendedInputDevices != "YES" ]; then
 	echo "#define XInputDrivers mouse" >> $LOCALDEF
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 522c26e3c79d..1cf6d7482645 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XServer-4.0
+# New ports collection makefile for:	XFree86XServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,51 +6,88 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR} \
-		ExtendedInputDevices=${ExtendedInputDevices}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= FreeBSDPortsInstall
-.else
-INSTALL_TARGET= FreeBSDPortsInstall  FreeBSDPortsInstall.man
-MANCOMPRESSED=	yes
-MAN1=		SuperProbe.1 XFree86.1 Xserver.1 \
-		kbd_mode.1 xf86config.1 showrgb.1
-MAN3=		XF86VidMode.3 XF86VidModeDeleteModeLine.3 \
-		XF86VidModeGetAllModeLines.3 XF86VidModeGetModeLine.3 \
-		XF86VidModeGetMonitor.3 XF86VidModeGetViewPort.3 \
-		XF86VidModeLockModeSwitch.3 XF86VidModeModModeLine.3 \
-		XF86VidModeQueryExtension.3 XF86VidModeQueryVersion.3 \
-		XF86VidModeSetViewPort.3 XF86VidModeSwitchMode.3 \
-		XF86VidModeSwitchToMode.3
-MAN4=		apm.4 ati.4 chips.4 cirrus.4 dynapro.4 fbdev.4 \
-		glint.4 i740.4 keyboard.4 mga.4 microtouch.4 mouse.4 \
-		neomagic.4 nv.4 r128.4 rendition.4 s3virge.4 sis.4 \
-		tdfx.4 trident.4 tseng.4 vga.4 wacom.4
-MAN5= 		XF86Config.5
-.endif
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR} \
+			ExtendedInputDevices=${ExtendedInputDevices}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	FreeBSDPortsInstall  FreeBSDPortsInstall.man
+MANCOMPRESSED=		yes
+MAN1=			SuperProbe.1 \
+			XFree86.1 \
+			Xserver.1 \
+			imake.1 \
+			kbd_mode.1 \
+			lndir.1 \
+			makedepend.1 \
+			makeg.1 \
+			makestrs.1 \
+			mkdirhier.1 \
+			pswrap.1 \
+			revpath.1 \
+			rman.1 \
+			showrgb.1 \
+			xf86config.1 \
+			xmkmf.1
+MAN3=			XF86VidMode.3 \
+			XF86VidModeDeleteModeLine.3 \
+			XF86VidModeGetAllModeLines.3 \
+			XF86VidModeGetModeLine.3 \
+			XF86VidModeGetMonitor.3 \
+			XF86VidModeGetViewPort.3 \
+			XF86VidModeLockModeSwitch.3 \
+			XF86VidModeModModeLine.3 \
+			XF86VidModeQueryExtension.3 \
+			XF86VidModeQueryVersion.3 \
+			XF86VidModeSetViewPort.3 \
+			XF86VidModeSwitchMode.3 \
+			XF86VidModeSwitchToMode.3
+MAN4=			apm.4 \
+			ati.4 \
+			chips.4 \
+			cirrus.4 \
+			cyrix.4 \
+			dynapro.4 \
+			elographics.4 \
+			fbdev.4 \
+			glint.4 \
+			i740.4 \
+			i810.4 \
+			keyboard.4 \
+			mga.4 \
+			microtouch.4 \
+			mouse.4 \
+			mutouch.4 \
+			neomagic.4 \
+			nv.4 \
+			r128.4 \
+			rendition.4 \
+			s3virge.4 \
+			sis.4 \
+			tdfx.4 \
+			trident.4 \
+			tseng.4 \
+			vga.4 \
+			wacom.4
+MAN5= 			XF86Config.5
 
 # User Config:
 # If you want to disabe Extended input devices (such as wacom tablets),
@@ -59,7 +96,10 @@ ExtendedInputDevices?=	YES
 
 pre-fetch:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-	${SH} ${PKGDIR}/INSTALL
+${SH} ${PKGDIR}/INSTALL
 .endif
 
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 98920201219e..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,2 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 524f2c848178..25f491fc6944 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -17,6 +17,7 @@ lib/X11/doc/README
 lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
+lib/X11/doc/README.DRIcomp
 lib/X11/doc/README.SiS
 lib/X11/doc/README.apm
 lib/X11/doc/README.ati
@@ -33,6 +34,67 @@ lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
 lib/X11/doc/VideoBoard98
+lib/X11/doc/html/SuperProbe.1.html
+lib/X11/doc/html/XF86Config.5.html
+lib/X11/doc/html/XF86VidMode.3.html
+lib/X11/doc/html/XF86VidModeDeleteModeLine.3.html
+lib/X11/doc/html/XF86VidModeGetAllModeLines.3.html
+lib/X11/doc/html/XF86VidModeGetModeLine.3.html
+lib/X11/doc/html/XF86VidModeGetMonitor.3.html
+lib/X11/doc/html/XF86VidModeGetViewPort.3.html
+lib/X11/doc/html/XF86VidModeLockModeSwitch.3.html
+lib/X11/doc/html/XF86VidModeModModeLine.3.html
+lib/X11/doc/html/XF86VidModeQueryExtension.3.html
+lib/X11/doc/html/XF86VidModeQueryVersion.3.html
+lib/X11/doc/html/XF86VidModeSetViewPort.3.html
+lib/X11/doc/html/XF86VidModeSwitchMode.3.html
+lib/X11/doc/html/XF86VidModeSwitchToMode.3.html
+lib/X11/doc/html/XFree86.1.html
+lib/X11/doc/html/Xserver.1.html
+lib/X11/doc/html/apm.4.html
+lib/X11/doc/html/ati.4.html
+lib/X11/doc/html/chips.4.html
+lib/X11/doc/html/cirrus.4.html
+lib/X11/doc/html/cyrix.4.html
+lib/X11/doc/html/dynapro.4.html
+lib/X11/doc/html/elographics.4.html
+lib/X11/doc/html/fbdev.4.html
+lib/X11/doc/html/glint.4.html
+lib/X11/doc/html/i740.4.html
+lib/X11/doc/html/i810.4.html
+lib/X11/doc/html/imake.1.html
+lib/X11/doc/html/kbd_mode.1.html
+lib/X11/doc/html/keyboard.4.html
+lib/X11/doc/html/lndir.1.html
+lib/X11/doc/html/makedepend.1.html
+lib/X11/doc/html/makeg.1.html
+lib/X11/doc/html/makestrs.1.html
+lib/X11/doc/html/manindex1.html
+lib/X11/doc/html/manindex3.html
+lib/X11/doc/html/manindex4.html
+lib/X11/doc/html/manindex5.html
+lib/X11/doc/html/mga.4.html
+lib/X11/doc/html/microtouch.4.html
+lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mouse.4.html
+lib/X11/doc/html/mutouch.4.html
+lib/X11/doc/html/neomagic.4.html
+lib/X11/doc/html/nv.4.html
+lib/X11/doc/html/pswrap.1.html
+lib/X11/doc/html/r128.4.html
+lib/X11/doc/html/rendition.4.html
+lib/X11/doc/html/revpath.1.html
+lib/X11/doc/html/rman.1.html
+lib/X11/doc/html/s3virge.4.html
+lib/X11/doc/html/showrgb.1.html
+lib/X11/doc/html/sis.4.html
+lib/X11/doc/html/tdfx.4.html
+lib/X11/doc/html/trident.4.html
+lib/X11/doc/html/tseng.4.html
+lib/X11/doc/html/vga.4.html
+lib/X11/doc/html/wacom.4.html
+lib/X11/doc/html/xf86config.1.html
+lib/X11/doc/html/xmkmf.1.html
 lib/X11/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
@@ -40,16 +102,50 @@ lib/X11/etc/xmodmap.std
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
 lib/X11/rgb.txt
-lib/libxf86config.a
+lib/X11/xserver/SecurityPolicy
+lib/modules/codeconv/libARABIC.a
+lib/modules/codeconv/libARMSCII8.a
+lib/modules/codeconv/libBIG5.a
+lib/modules/codeconv/libDOSENCODING.a
+lib/modules/codeconv/libGB2312.a
+lib/modules/codeconv/libGEORGIAN.a
+lib/modules/codeconv/libISO8859_1.a
+lib/modules/codeconv/libISO8859_10.a
+lib/modules/codeconv/libISO8859_11.a
+lib/modules/codeconv/libISO8859_14.a
+lib/modules/codeconv/libISO8859_15.a
+lib/modules/codeconv/libISO8859_2.a
+lib/modules/codeconv/libISO8859_3.a
+lib/modules/codeconv/libISO8859_4.a
+lib/modules/codeconv/libISO8859_5.a
+lib/modules/codeconv/libISO8859_6.a
+lib/modules/codeconv/libISO8859_7.a
+lib/modules/codeconv/libISO8859_8.a
+lib/modules/codeconv/libISO8859_9.a
+lib/modules/codeconv/libJISX0201.a
+lib/modules/codeconv/libJISX0208.a
+lib/modules/codeconv/libJISX0212.a
+lib/modules/codeconv/libKOI8.a
+lib/modules/codeconv/libKSC5601.a
+lib/modules/codeconv/libKSCJOHAB.a
+lib/modules/codeconv/libMULEENCODING.a
+lib/modules/codeconv/libTCVN.a
+lib/modules/codeconv/libVISCII.a
+lib/modules/dri/gamma_dri.so
+lib/modules/dri/i810_dri.so
+lib/modules/dri/mga_dri.so
+lib/modules/dri/r128_dri.so
 lib/modules/drivers/apm_drv.o
 lib/modules/drivers/ati_drv.o
 lib/modules/drivers/chips_drv.o
 lib/modules/drivers/cirrus_alpine.o
 lib/modules/drivers/cirrus_drv.o
 lib/modules/drivers/cirrus_laguna.o
+lib/modules/drivers/cyrix_drv.o
 lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
 lib/modules/drivers/i740_drv.o
+lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
 lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
@@ -64,11 +160,18 @@ lib/modules/drivers/tseng_drv.o
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
+lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
 lib/modules/extensions/libxie.a
+lib/modules/fonts/libbitmap.a
+lib/modules/fonts/libfreetype.a
+lib/modules/fonts/libspeedo.a
+lib/modules/fonts/libtype1.a
+lib/modules/fonts/libxtt.a
+lib/modules/freebsd/libdrm.a
 lib/modules/input/dynapro_drv.o
 lib/modules/input/elo2300_drv.o
 lib/modules/input/elographics_drv.o
@@ -103,8 +206,3 @@ lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 lib/modules/v10002d.uc
 lib/modules/v20002d.uc
-@dirrm lib/modules/drivers
-@dirrm lib/modules/extensions
-@dirrm lib/modules/input
-@cwd /etc
-X11/xserver/SecurityPolicy
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 9c1ae0818a6f..5539850adccc 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -26,8 +26,16 @@ configure () {
 	ExtendedInputDevices=YES
     fi
 
+    # It's good for FreeBSD ports/packages system.
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+    # I want to set this line.
+    # but the probrem is too deep. not yet done.
+    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
     # disable some configs: there are not used this ports
-    for i in BuildFonts \
+    for i in \
+	BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@@ -40,12 +48,14 @@ configure () {
 	XVirtualFramebufferServer \
 	XprtServer \
 	LibHeaders \
+	LibInstall \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
     do \
 	echo "#define $i NO" >> $LOCALDEF
     done
     echo "#define BuildServer YES" >> $LOCALDEF
+    echo "#define LibInstallBuild YES" >> $LOCALDEF
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     cat >> $LOCALDEF <<END
@@ -53,7 +63,8 @@ configure () {
                                 neomagic i740 tdfx \
                                 cirrus tseng trident chips apm \
                                 GlideDriver fbdev \
-                                ati r128 vga XF86ExtraCardDrivers
+                                ati r128 AgpGartDrivers cyrix \
+				vga  XF86OSCardDrivers XF86ExtraCardDrivers
 END
     if [ $ExtendedInputDevices != "YES" ]; then
 	echo "#define XInputDrivers mouse" >> $LOCALDEF
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 70afb90ad126..a189298c07d5 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XVirtualFramebufferServer-4.0
+# New ports collection makefile for:	XFree86XVirtualFramebufferServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	VirtualFramebufferServer
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	installXvfb installXvfb.man
+MANCOMPRESSED=		yes
+MAN1=			Xvfb.1
 
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= installXvfb
-.else
-INSTALL_TARGET= installXvfb installXvfb.man
-MANCOMPRESSED=	yes
-MAN1=		Xvfb.1
-.endif
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536