20 files changed, 393 insertions, 292 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index bdd991ca87c6..e8f947dcb132 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=	FontServer
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
+
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -19,14 +23,10 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR}
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
 ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET= 	FreeBSDPortsInstall FreeBSDPortsInstall.man
-MANCOMPRESSED=		yes
+INSTALL_TARGET= 	FreeBSDPortsInstall installXserver.man
 MAN1=			Xserver.1 xfs.1
 
 do-configure:
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist
index fcdecd61a492..ced5ee87b536 100644
--- a/x11-servers/XFree86-4-FontServer/pkg-plist
+++ b/x11-servers/XFree86-4-FontServer/pkg-plist
@@ -1,4 +1,2 @@
 bin/xfs
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html
 lib/X11/fs/config
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 82cf3788e8aa..9d013751cee1 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=	NestServer
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
+
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -19,13 +23,10 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR}
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+MAKE_ENV=		MAN_INSTALL_TARGET=installXnest.man
 ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET= 	installXnest installXnest.man
+INSTALL_TARGET= 	installXnest installXserver.man
 MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
 
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist
index f29c7ea2030a..eff754d76af6 100644
--- a/x11-servers/XFree86-4-NestServer/pkg-plist
+++ b/x11-servers/XFree86-4-NestServer/pkg-plist
@@ -1,3 +1 @@
 bin/Xnest
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index ac706d919f10..d7a448684043 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=	PrintServer
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
+
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -19,14 +23,10 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR}
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+MAKE_ENV=		MAN_INSTALL_TARGET=NOOP
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET= 	installXprt
-MAN1=			Xserver.1
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-PrintServer/pkg-plist b/x11-servers/XFree86-4-PrintServer/pkg-plist
index d44beac9a918..0646e79271d4 100644
--- a/x11-servers/XFree86-4-PrintServer/pkg-plist
+++ b/x11-servers/XFree86-4-PrintServer/pkg-plist
@@ -1,3 +1 @@
 bin/Xprt
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 2096859cccab..6e425c0e7244 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -6,47 +6,38 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-RUN_DEPENDS=	Xwrapper:${PORTSDIR}/x11/wrapper
+MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR} \
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth} \
+			HasSecureRPC=${HasSecureRPC} \
+			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices}
+MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
 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
+			pcitweak.1 \
+			scanpci.1 \
+			xf86config.1
 MAN3=			XF86VidMode.3 \
 			XF86VidModeDeleteModeLine.3 \
 			XF86VidModeGetAllModeLines.3 \
@@ -60,50 +51,82 @@ MAN3=			XF86VidMode.3 \
 			XF86VidModeSetViewPort.3 \
 			XF86VidModeSwitchMode.3 \
 			XF86VidModeSwitchToMode.3
-MAN4=			apm.4 \
-			ati.4 \
-			chips.4 \
-			cirrus.4 \
-			cyrix.4 \
-			dynapro.4 \
-			elographics.4 \
-			fbdev.4 \
+MAN4=			mga.4 \
+			tdfx.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 \
+			rendition.4 \
+			savage.4 \
+			nv.4 \
+			siliconmotion.4 \
 			vga.4 \
-			wacom.4
+			keyboard.4 \
+			mouse.4
 MAN5= 			XF86Config.5
 
-# User Config:
-# If you want to disabe Extended input devices (such as wacom tablets),
-# Set following as NO. or type make ExtendefInputDevices=NO
-ExtendedInputDevices?=	YES
+# XFree86 User Config:
+# ---
+# Name          Default		Meaning
+# ----------------------------------------------------------------------------
+# HasXdmAuth	YES		support XDM-AUTHORIZATION-1.
+# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
+# HasPam	YES		support PAM (require FreeBSD-3.1 or later)
+# ExtendedInputDevices	YES	support extended input devices
+HasXdmAuth?=		DEFAULT
+HasSecureRPC?=		DEFAULT
+HasPam?=		DEFAULT
+ExtendedInputDevices?=	DEFAULT
+.if !exists(/sys) && !exists(/usr/src/sys)
+BuildXF86DRI=		NO
+PLIST_SUB+=	DRI="@comment "
+.else
+PLIST_SUB+=	DRI=""
+.endif
+
+.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES
+PLIST_SUB+=	XIE:=""
+MAN4+=		citron.4 \
+		dynapro.4 \
+		elographics.4 \
+		microtouch.4 \
+		mutouch.4 \
+		wacom.4 \
+		void.4
+.else
+PLIST_SUB+=	XIE:="@comment "
+.endif
 
-#.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-#pre-everything:
-#	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-#.endif
+.if defined(BuildXF86DRI) && ${BuildXF86DRI} == NO
+pre-fetch:
+	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
+.endif
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
+.include <bsd.port.pre.mk>
+.if ${ARCH} == i386
+PLIST_SUB+=	I386:=""
+MAN4+=		apm.4 \
+		chips.4 \
+		cirrus.4 \
+		cyrix.4 \
+		fbdev.4 \
+		fbdevhw.4 \
+		i128.4 \
+		i740.4 \
+		i810.4 \
+		neomagic.4 \
+		r128.4 \
+		sis.4 \
+		trident.4 \
+		tseng.4 \
+		vesa.4
+.else
+PLIST_SUB+=	I386:="@comment "
+.endif
+
 post-install:
-	[ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X )
-	${CHMOD} a-s ${PREFIX}/bin/XFree86
+	strip ${PREFIX}/bin/XFree86
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 7f9f241ba469..e2d10250b3e6 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -1,10 +1,10 @@
 bin/SuperProbe
 bin/X
 bin/XFree86
+%%XIE:%%bin/joycal
 bin/kbd_mode
 bin/pcitweak
 bin/scanpci
-bin/showrgb
 bin/xf86config
 lib/X11/Cards
 lib/X11/XF86Config.98
@@ -18,33 +18,31 @@ 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
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
+%%I386:%%lib/X11/doc/README.I128
+%%I386:%%lib/X11/doc/README.SiS
+%%I386:%%lib/X11/doc/README.apm
+%%I386:%%lib/X11/doc/README.ati
+%%I386:%%lib/X11/doc/README.chips
+%%I386:%%lib/X11/doc/README.cyrix
 lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
+%%I386:%%lib/X11/doc/README.i740
+%%I386:%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-lib/X11/doc/README.r128
+%%I386:%%lib/X11/doc/README.newport
+%%I386:%%lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
-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/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
-lib/X11/rgb.txt
 lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
@@ -74,36 +72,44 @@ 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
+%%DRI%%lib/modules/dri/gamma_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
+%%DRI%%lib/modules/dri/mga_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
+%%I386:%%lib/modules/drivers/apm_drv.o
+%%I386:%%lib/modules/drivers/ark_drv.o
+%%I386:%%lib/modules/drivers/ati_drv.o
+%%I386:%%lib/modules/drivers/atimisc_drv.o
+%%I386:%%lib/modules/drivers/chips_drv.o
+%%I386:%%lib/modules/drivers/cirrus_alpine.o
+%%I386:%%lib/modules/drivers/cirrus_drv.o
+%%I386:%%lib/modules/drivers/cirrus_laguna.o
+%%I386:%%lib/modules/drivers/cyrix_drv.o
+%%I386:%%lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
-lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
+%%I386:%%lib/modules/drivers/i128_drv.o
+%%I386:%%lib/modules/drivers/i740_drv.o
+%%I386:%%lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
-lib/modules/drivers/neomagic_drv.o
+%%I386:%%lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/radeon_drv.o
 lib/modules/drivers/rendition_drv.o
 lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/sis_drv.o
+lib/modules/drivers/savage_drv.o
+lib/modules/drivers/siliconmotion_drv.o
+%%I386:%%lib/modules/drivers/sis_drv.o
 lib/modules/drivers/tdfx_drv.o
 lib/modules/drivers/tga_drv.o
-lib/modules/drivers/trident_drv.o
-lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/trident_drv.o
+%%I386:%%lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/vesa_drv.o
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
+%%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
@@ -114,16 +120,21 @@ 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
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
+%%DRI%%lib/modules/freebsd/libdrm.a
+%%XIE:%%lib/modules/input/citron_drv.o
+%%XIE:%%lib/modules/input/digitaledge_drv.o
+%%XIE:%%lib/modules/input/dynapro_drv.o
+%%XIE:%%lib/modules/input/elo2300_drv.o
+%%XIE:%%lib/modules/input/elographics_drv.o
+%%XIE:%%lib/modules/input/joystick_drv.o
+%%XIE:%%lib/modules/input/magellan_drv.o
+%%XIE:%%lib/modules/input/microtouch_drv.o
 lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/wacom_drv.o
+%%XIE:%%lib/modules/input/mutouch_drv.o
+%%XIE:%%lib/modules/input/spaceorb_drv.o
+%%XIE:%%lib/modules/input/summa_drv.o
+%%XIE:%%lib/modules/input/void_drv.o
+%%XIE:%%lib/modules/input/wacom_drv.o
 lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
@@ -138,6 +149,7 @@ lib/modules/libpcidata.a
 lib/modules/librac.a
 lib/modules/libramdac.a
 lib/modules/libscanpci.a
+lib/modules/libshadow.a
 lib/modules/libshadowfb.a
 lib/modules/libvbe.a
 lib/modules/libvgahw.a
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index baf9551c37dd..8d71e1620f56 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -22,10 +22,6 @@ configure () {
     grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
     echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
 
-    if [ X$ExtendedInputDevices = "X" ]; then
-	ExtendedInputDevices=YES
-    fi
-
     # It's good for FreeBSD ports/packages system.
     echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
 
@@ -33,6 +29,26 @@ configure () {
     # Thanks, Trevor Johnson <trevor@jpj.net>
     echo "#define InstallXserverSetUID NO" >> $LOCALDEF
 
+    # User Config.
+    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
+	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
+    fi
+    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
+	echo "#define HasPam $HasPam" >> $LOCALDEF
+    fi
+    if [ ! -d /sys -a ! -d /usr/src/sys ]; then
+	echo "#define BuildXF86DRI NO" >> $LOCALDEF
+    fi
+    if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then
+	echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
+				elographics magellan \
+				microtouch mutouch spaceorb summa \
+				wacom void citron" >> $LOCALDEF
+        echo "#define JoystickSupport YES" >> $LOCALDEF
+    else
+	echo "#define XInputDrivers mouse" >> $LOCALDEF	
+    fi
+
     # disable some configs: there are not used this ports
     for i in \
 	BuildFonts \
@@ -56,32 +72,29 @@ configure () {
     done
     echo "#define BuildServer YES" >> $LOCALDEF
     echo "#define LibInstallBuild YES" >> $LOCALDEF
+    echo "#define ModInstall YES" >> $LOCALDEF
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     cat >> $LOCALDEF <<END
+#ifndef XF86CardDrivers
 #ifdef i386Architecture
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx \
+                                neomagic i740 tdfx savage \
                                 cirrus tseng trident chips apm \
-                                GlideDriver fbdev \
-                                ati r128 AgpGartDrivers cyrix \
-				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+                                GlideDriver fbdev i128 \
+                                ati AgpGartDrivers DevelDrivers ark cyrix \
+				siliconmotion \
+				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
 #else
-#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx \
-                                cirrus tseng trident chips apm \
-                                GlideDriver fbdev \
-                                ati r128 cyrix \
-				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+#ifdef AlphaArchitecture
+#define XF86CardDrivers         mga tdfx glint s3virge rendition tga \
+				savage nv DevelDrivers siliconmotion vga \
+				XF86OSCardDrivers XF86xtraCardDrivers
+#endif
+#endif
 #endif
 END
-    if [ $ExtendedInputDevices != "YES" ]; then
-	echo "#define XInputDrivers mouse" >> $LOCALDEF
-    else
-	echo "#define XInputDrivers mouse dynapro elo2300 elographics \
-	    magellan microtouch \
-	    mutouch spaceorb wacom"  >> $LOCALDEF
-    fi
+    echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
     # Check Wraphelp.c
@@ -104,6 +117,9 @@ END
 	grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
 	echo "#define HasXdmAuth NO" >> $DESTDEF
     else
+	if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
+	    echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
+        fi
 	cp -f $ORIGDEF $DESTDEF
     fi
 
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 2096859cccab..6e425c0e7244 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -6,47 +6,38 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
 
-MAINTAINER=	taguchi@tohoku.iij.ad.jp
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
-RUN_DEPENDS=	Xwrapper:${PORTSDIR}/x11/wrapper
+MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR} \
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
+SCRIPTS_ENV=		HasXdmAuth=${HasXdmAuth} \
+			HasSecureRPC=${HasSecureRPC} \
+			HasPam=${HasPam} \
 			ExtendedInputDevices=${ExtendedInputDevices}
+MAKE_ENV=		MAN_INSTALL_TARGET=FreeBSDPortsInstall.man
 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
+			pcitweak.1 \
+			scanpci.1 \
+			xf86config.1
 MAN3=			XF86VidMode.3 \
 			XF86VidModeDeleteModeLine.3 \
 			XF86VidModeGetAllModeLines.3 \
@@ -60,50 +51,82 @@ MAN3=			XF86VidMode.3 \
 			XF86VidModeSetViewPort.3 \
 			XF86VidModeSwitchMode.3 \
 			XF86VidModeSwitchToMode.3
-MAN4=			apm.4 \
-			ati.4 \
-			chips.4 \
-			cirrus.4 \
-			cyrix.4 \
-			dynapro.4 \
-			elographics.4 \
-			fbdev.4 \
+MAN4=			mga.4 \
+			tdfx.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 \
+			rendition.4 \
+			savage.4 \
+			nv.4 \
+			siliconmotion.4 \
 			vga.4 \
-			wacom.4
+			keyboard.4 \
+			mouse.4
 MAN5= 			XF86Config.5
 
-# User Config:
-# If you want to disabe Extended input devices (such as wacom tablets),
-# Set following as NO. or type make ExtendefInputDevices=NO
-ExtendedInputDevices?=	YES
+# XFree86 User Config:
+# ---
+# Name          Default		Meaning
+# ----------------------------------------------------------------------------
+# HasXdmAuth	YES		support XDM-AUTHORIZATION-1.
+# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
+# HasPam	YES		support PAM (require FreeBSD-3.1 or later)
+# ExtendedInputDevices	YES	support extended input devices
+HasXdmAuth?=		DEFAULT
+HasSecureRPC?=		DEFAULT
+HasPam?=		DEFAULT
+ExtendedInputDevices?=	DEFAULT
+.if !exists(/sys) && !exists(/usr/src/sys)
+BuildXF86DRI=		NO
+PLIST_SUB+=	DRI="@comment "
+.else
+PLIST_SUB+=	DRI=""
+.endif
+
+.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES
+PLIST_SUB+=	XIE:=""
+MAN4+=		citron.4 \
+		dynapro.4 \
+		elographics.4 \
+		microtouch.4 \
+		mutouch.4 \
+		wacom.4 \
+		void.4
+.else
+PLIST_SUB+=	XIE:="@comment "
+.endif
 
-#.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-#pre-everything:
-#	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-#.endif
+.if defined(BuildXF86DRI) && ${BuildXF86DRI} == NO
+pre-fetch:
+	@${ECHO_MSG} "DRI would not build: kernel source required in /sys."
+.endif
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
+.include <bsd.port.pre.mk>
+.if ${ARCH} == i386
+PLIST_SUB+=	I386:=""
+MAN4+=		apm.4 \
+		chips.4 \
+		cirrus.4 \
+		cyrix.4 \
+		fbdev.4 \
+		fbdevhw.4 \
+		i128.4 \
+		i740.4 \
+		i810.4 \
+		neomagic.4 \
+		r128.4 \
+		sis.4 \
+		trident.4 \
+		tseng.4 \
+		vesa.4
+.else
+PLIST_SUB+=	I386:="@comment "
+.endif
+
 post-install:
-	[ -x ${PREFIX}/bin/Xwrapper ] && ( cd ${PREFIX}/bin ; ${LN} -sf Xwrapper X )
-	${CHMOD} a-s ${PREFIX}/bin/XFree86
+	strip ${PREFIX}/bin/XFree86
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 7f9f241ba469..e2d10250b3e6 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -1,10 +1,10 @@
 bin/SuperProbe
 bin/X
 bin/XFree86
+%%XIE:%%bin/joycal
 bin/kbd_mode
 bin/pcitweak
 bin/scanpci
-bin/showrgb
 bin/xf86config
 lib/X11/Cards
 lib/X11/XF86Config.98
@@ -18,33 +18,31 @@ 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
-lib/X11/doc/README.chips
-lib/X11/doc/README.cyrix
+%%I386:%%lib/X11/doc/README.I128
+%%I386:%%lib/X11/doc/README.SiS
+%%I386:%%lib/X11/doc/README.apm
+%%I386:%%lib/X11/doc/README.ati
+%%I386:%%lib/X11/doc/README.chips
+%%I386:%%lib/X11/doc/README.cyrix
 lib/X11/doc/README.fonts
-lib/X11/doc/README.i740
-lib/X11/doc/README.i810
+%%I386:%%lib/X11/doc/README.i740
+%%I386:%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-lib/X11/doc/README.r128
+%%I386:%%lib/X11/doc/README.newport
+%%I386:%%lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.s3virge
 lib/X11/doc/RELNOTES
 lib/X11/doc/ServersOnly
 lib/X11/doc/Status
+lib/X11/doc/Versions
 lib/X11/doc/VideoBoard98
-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/etc/Xinstall.sh
 lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
-lib/X11/rgb.txt
 lib/X11/xserver/SecurityPolicy
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
@@ -74,36 +72,44 @@ 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
+%%DRI%%lib/modules/dri/gamma_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
+%%DRI%%lib/modules/dri/mga_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/r128_dri.so
+%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
+%%I386:%%lib/modules/drivers/apm_drv.o
+%%I386:%%lib/modules/drivers/ark_drv.o
+%%I386:%%lib/modules/drivers/ati_drv.o
+%%I386:%%lib/modules/drivers/atimisc_drv.o
+%%I386:%%lib/modules/drivers/chips_drv.o
+%%I386:%%lib/modules/drivers/cirrus_alpine.o
+%%I386:%%lib/modules/drivers/cirrus_drv.o
+%%I386:%%lib/modules/drivers/cirrus_laguna.o
+%%I386:%%lib/modules/drivers/cyrix_drv.o
+%%I386:%%lib/modules/drivers/fbdev_drv.o
 lib/modules/drivers/glint_drv.o
-lib/modules/drivers/i740_drv.o
-lib/modules/drivers/i810_drv.o
+%%I386:%%lib/modules/drivers/i128_drv.o
+%%I386:%%lib/modules/drivers/i740_drv.o
+%%I386:%%lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
-lib/modules/drivers/neomagic_drv.o
+%%I386:%%lib/modules/drivers/neomagic_drv.o
 lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/r128_drv.o
+%%I386:%%lib/modules/drivers/radeon_drv.o
 lib/modules/drivers/rendition_drv.o
 lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/sis_drv.o
+lib/modules/drivers/savage_drv.o
+lib/modules/drivers/siliconmotion_drv.o
+%%I386:%%lib/modules/drivers/sis_drv.o
 lib/modules/drivers/tdfx_drv.o
 lib/modules/drivers/tga_drv.o
-lib/modules/drivers/trident_drv.o
-lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/trident_drv.o
+%%I386:%%lib/modules/drivers/tseng_drv.o
+%%I386:%%lib/modules/drivers/vesa_drv.o
 lib/modules/drivers/vga_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
+%%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
 lib/modules/extensions/libpex5.a
@@ -114,16 +120,21 @@ 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
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
+%%DRI%%lib/modules/freebsd/libdrm.a
+%%XIE:%%lib/modules/input/citron_drv.o
+%%XIE:%%lib/modules/input/digitaledge_drv.o
+%%XIE:%%lib/modules/input/dynapro_drv.o
+%%XIE:%%lib/modules/input/elo2300_drv.o
+%%XIE:%%lib/modules/input/elographics_drv.o
+%%XIE:%%lib/modules/input/joystick_drv.o
+%%XIE:%%lib/modules/input/magellan_drv.o
+%%XIE:%%lib/modules/input/microtouch_drv.o
 lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/wacom_drv.o
+%%XIE:%%lib/modules/input/mutouch_drv.o
+%%XIE:%%lib/modules/input/spaceorb_drv.o
+%%XIE:%%lib/modules/input/summa_drv.o
+%%XIE:%%lib/modules/input/void_drv.o
+%%XIE:%%lib/modules/input/wacom_drv.o
 lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
@@ -138,6 +149,7 @@ lib/modules/libpcidata.a
 lib/modules/librac.a
 lib/modules/libramdac.a
 lib/modules/libscanpci.a
+lib/modules/libshadow.a
 lib/modules/libshadowfb.a
 lib/modules/libvbe.a
 lib/modules/libvgahw.a
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index baf9551c37dd..8d71e1620f56 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -22,10 +22,6 @@ configure () {
     grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
     echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
 
-    if [ X$ExtendedInputDevices = "X" ]; then
-	ExtendedInputDevices=YES
-    fi
-
     # It's good for FreeBSD ports/packages system.
     echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
 
@@ -33,6 +29,26 @@ configure () {
     # Thanks, Trevor Johnson <trevor@jpj.net>
     echo "#define InstallXserverSetUID NO" >> $LOCALDEF
 
+    # User Config.
+    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
+	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
+    fi
+    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
+	echo "#define HasPam $HasPam" >> $LOCALDEF
+    fi
+    if [ ! -d /sys -a ! -d /usr/src/sys ]; then
+	echo "#define BuildXF86DRI NO" >> $LOCALDEF
+    fi
+    if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then
+	echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
+				elographics magellan \
+				microtouch mutouch spaceorb summa \
+				wacom void citron" >> $LOCALDEF
+        echo "#define JoystickSupport YES" >> $LOCALDEF
+    else
+	echo "#define XInputDrivers mouse" >> $LOCALDEF	
+    fi
+
     # disable some configs: there are not used this ports
     for i in \
 	BuildFonts \
@@ -56,32 +72,29 @@ configure () {
     done
     echo "#define BuildServer YES" >> $LOCALDEF
     echo "#define LibInstallBuild YES" >> $LOCALDEF
+    echo "#define ModInstall YES" >> $LOCALDEF
     echo "#define XF86Server YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     cat >> $LOCALDEF <<END
+#ifndef XF86CardDrivers
 #ifdef i386Architecture
 #define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx \
+                                neomagic i740 tdfx savage \
                                 cirrus tseng trident chips apm \
-                                GlideDriver fbdev \
-                                ati r128 AgpGartDrivers cyrix \
-				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+                                GlideDriver fbdev i128 \
+                                ati AgpGartDrivers DevelDrivers ark cyrix \
+				siliconmotion \
+				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
 #else
-#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx \
-                                cirrus tseng trident chips apm \
-                                GlideDriver fbdev \
-                                ati r128 cyrix \
-				vga  XF86OSCardDrivers XF86ExtraCardDrivers
+#ifdef AlphaArchitecture
+#define XF86CardDrivers         mga tdfx glint s3virge rendition tga \
+				savage nv DevelDrivers siliconmotion vga \
+				XF86OSCardDrivers XF86xtraCardDrivers
+#endif
+#endif
 #endif
 END
-    if [ $ExtendedInputDevices != "YES" ]; then
-	echo "#define XInputDrivers mouse" >> $LOCALDEF
-    else
-	echo "#define XInputDrivers mouse dynapro elo2300 elographics \
-	    magellan microtouch \
-	    mutouch spaceorb wacom"  >> $LOCALDEF
-    fi
+    echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
     # Check Wraphelp.c
@@ -104,6 +117,9 @@ END
 	grep -v '#define.*HasXdmAuth' $ORIGDEF >> $DESTDEF
 	echo "#define HasXdmAuth NO" >> $DESTDEF
     else
+	if [ X$HasXdmAuth != XDEFAULT -a X$HasXdmAuth != X ]; then
+	    echo "#define HasXdmAuth $HasXdmAuth" >> $LOCALDEF
+        fi
 	cp -f $ORIGDEF $DESTDEF
     fi
 
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index f2ad3f856a91..99cf5368d5ae 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -6,12 +6,16 @@
 #
 
 PORTNAME=	VirtualFramebufferServer
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.3
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X401src-1.tgz
+DISTFILES=	X402src-1.tgz
+
+PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
+PATCHFILES=	4.0.2-4.0.3.diff.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -19,14 +23,10 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/files
-SCRIPTS_ENV+=		PREFIX=${PREFIX} \
-			X11BASE=${X11BASE} \
-			WRKDIR=${WRKDIR} \
-			DISTDIR=${DISTDIR}
+PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 ALL_TARGET=		FreeBSDPortsBuild
-INSTALL_TARGET= 	installXvfb installXvfb.man
-MANCOMPRESSED=		yes
+INSTALL_TARGET= 	installXvfb installXserver.man
+MAKE_ENV=		MAN_INSTALL_TARGET=installXvfb.man
 MAN1=			Xserver.1 Xvfb.1
 
 do-configure:
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index e9125a5f32c4..073d54832d2d 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1 +1,2 @@
-MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
index 0187e20ffad8..e2d161bbca7f 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
@@ -1,3 +1 @@
 bin/Xvfb
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html