New port: xorg-server taken from X.org release 6.7.0.

Tested only on x86 so far due to problems installing dependencies on build
cluster.  Based on XFree86-4-Server originally, but I decided the history
wasn't worth keeping that much as a lot has been changed.

22 files changed, 889 insertions, 0 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
new file mode 100644
index 000000000000..e69a403a086b
--- /dev/null
+++ b/x11-servers/xorg-server/Makefile
@@ -0,0 +1,118 @@
+# New ports collection makefile for:    xorg-server
+# Date created:		7 May 2004
+# Whom:			anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	server
+PORTVERSION=	6.7.0
+CATEGORIES=	x11-servers
+MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
+PKGNAMEPREFIX=	xorg-
+DISTFILES=	X11R6.7.0-src1.tar.gz \
+		X11R6.7.0-src3.tar.gz
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org X server and related programs
+
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
+		${X11BASE}/libdata/pkgconfig/xau:${PORTSDIR}/x11/libXau
+BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
+
+CONFLICTS=	XFree86-Server-*
+
+SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
+MAN1=		Xorg.1 \
+		Xserver.1 \
+		getconfig.1 \
+		gtf.1 \
+		kbd_mode.1 \
+		pcitweak.1 \
+		scanpci.1
+MAN4=		citron.4 \
+		dynapro.4 \
+		elographics.4 \
+		fbdevhw.4 \
+		kbd.4 \
+		keyboard.4 \
+		microtouch.4 \
+		mouse.4 \
+		mutouch.4 \
+		nv.4 \
+		r128.4 \
+		radeon.4 \
+		void.4 \
+		wacom.4
+MAN5=		xorg.conf.5
+PKGMESSAGE=	${WRKDIR}/.pkg-message
+
+XBUILD_DIRS=	lib/font programs/Xserver
+XINCLUDE_DIRS=	lib/xtrans
+XMAN_DIRS=	programs/Xserver
+
+NOT_FOR_ARCHS=	ia64
+.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386 || ${ARCH} == alpha
+RUN_DEPENDS+=	${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
+.endif
+
+.if ${ARCH} == ia64
+PLIST_SUB+=	IA64_NA="@comment "
+.else
+PLIST_SUB+=	IA64_NA=""
+.endif
+
+.if ${ARCH} == sparc64
+PLIST_SUB+=	SPARC64=""
+PLIST_SUB+=	SPARC64_NA="@comment "
+MAN4+=		sunffb.4
+.else
+PLIST_SUB+=	SPARC64="@comment "
+PLIST_SUB+=	SPARC64_NA=""
+MAN4+=		glint.4 \
+		mga.4 \
+		rendition.4 \
+		s3virge.4 \
+		savage.4 \
+		siliconmotion.4 \
+		sis.4 \
+		tdfx.4 \
+		vga.4
+.endif
+
+.if ${ARCH} == i386
+PLIST_SUB+=	I386=""
+MAN1+=		scanpci.1
+MAN4+=		apm.4 \
+		chips.4 \
+		cirrus.4 \
+		cyrix.4 \
+		i128.4 \
+		i740.4 \
+		i810.4 \
+		neomagic.4 \
+		nsc.4 \
+		trident.4 \
+		tseng.4 \
+		vesa.4 \
+		vmware.4
+.else
+PLIST_SUB+=	I386="@comment "
+.endif
+
+post-build:
+	@${RM} -f ${PKGMESSAGE}
+	@${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE}
+
+post-install::
+	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
+	@if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \
+	${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
+	fi;
+
+.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
new file mode 100644
index 000000000000..b396e22303bf
--- /dev/null
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -0,0 +1,71 @@
+# Include before bsd.port.pre.mk for XFree86-4 ports which share 
+# XFree86-4-libraries's patches.
+# The purpose of this file is to reduce the duplicated code among the XFree86-4
+# ports which each do only part of a standard XFree86 build.
+#
+# XBUILD_DIRS is the group of directories under ${WRKSRC} that will 
+#   be built in.
+# XINCLUDE_DIRS is the group of directories under ${WRKSRC} that need
+#   to be Makefilesed or included in besides XBUILD_DIRS
+# XINSTALL_DIRS is the group of directories which will have 
+#   their install targets run.
+# XMAN_DIRS is the group of directories which will have 
+#   their install.man targets run.
+
+DIST_SUBDIR?=	xorg
+WRKSRC?=	${WRKDIR}/xc
+USE_X_PREFIX?=	no
+PREFIX?=	${X11BASE}
+
+USE_IMAKE=	YES
+XFREE86_HTML_MAN?=	yes
+SCRIPTS_ENV+=	CC="${CC}" \
+		CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" \
+
+XINSTALL_DIRS?=	${XBUILD_DIRS}
+_XINCLUDE_DIRS=	include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
+
+CF_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl
+
+.if !target(do-configure)
+do-configure:
+	@cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
+	@cp ${X11BASE}/lib/X11/config/date.def ${WRKSRC}/config/cf
+	@cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot
+	@for dir in ${_XINCLUDE_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${WRKSRC}/config/imake/imake \
+			-DTOPDIR=${WRKSRC} -DCURDIR=$${dir} -I${WRKSRC}/config/cf; \
+	done
+	@for dir in ${_XINCLUDE_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefiles; \
+	done
+	@for dir in ${_XINCLUDE_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} includes; \
+	done
+	@for dir in include ${XBUILD_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} depend; \
+	done
+.endif
+
+.if !target(do-build)
+do-build:
+	@for dir in ${XBUILD_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} all; \
+	done
+.endif
+
+.if !target(do-install)
+do-install:
+	@for dir in ${XINSTALL_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install; \
+	done
+	@for dir in ${XMAN_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man; \
+	done
+	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
+.endif
+
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
new file mode 100644
index 000000000000..971093cb9d9e
--- /dev/null
+++ b/x11-servers/xorg-server/distinfo
@@ -0,0 +1,8 @@
+MD5 (xorg/X11R6.7.0-src1.tar.gz) = 22465263bae7a2e9f5ad77e172cf1ab5
+SIZE (xorg/X11R6.7.0-src1.tar.gz) = 30039655
+MD5 (xorg/X11R6.7.0-src2.tar.gz) = 6ef4e8f7647a28f080c10ea1bcf01f79
+SIZE (xorg/X11R6.7.0-src2.tar.gz) = 5739983
+MD5 (xorg/X11R6.7.0-src3.tar.gz) = 4c7144786522bbce383b21ace72bf669
+SIZE (xorg/X11R6.7.0-src3.tar.gz) = 10855793
+MD5 (xorg/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
+SIZE (xorg/Wraphelp2.gz) = 3376
diff --git a/x11-servers/xorg-server/files/patch-FreeBSD.cf b/x11-servers/xorg-server/files/patch-FreeBSD.cf
new file mode 100644
index 000000000000..f154dc607424
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-FreeBSD.cf
@@ -0,0 +1,89 @@
+--- config/cf/FreeBSD.cf.orig	Fri Apr  2 13:47:10 2004
++++ config/cf/FreeBSD.cf	Fri May  7 17:32:47 2004
+@@ -109,7 +109,7 @@
+ # endif
+ # define HasPosixThreads	YES
+ # define ThreadedX		YES
+-# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
++# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
+ /*
+  * FreeBSD has tread-safe api but no getpwnam_r yet.
+  */
+@@ -119,9 +119,8 @@
+ # else
+ #  define MTSafeAPIDefines	-DXUSE_MTSAFE_API
+ # endif
+-# if HasLibPthread
+-#  define ThreadsLibraries	-lpthread
+-# else
++# define ThreadsLibraries	FreeBSDPTHREAD_LIBS
++# if !HasLibPthread
+ #  if OSRelVersion >= 500043
+ #   define BuildThreadStubLibrary  NO
+ #   define NeedUIThrStubs          NO
+@@ -130,10 +129,7 @@
+ #   define NeedUIThrStubs          YES
+ #  endif
+ #  if (OSRelVersion >= 500016)
+-#   define ThreadsLibraries	-lc_r
+ #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
+-#  else
+-#   define ThreadsLibraries	-pthread
+ #  endif
+ #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
+ #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+@@ -192,11 +188,11 @@
+  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
+  */
+ #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
+-# define CcCmd			$(CLIENTENVSETUP) cc
+-# define CplusplusCmd		$(CLIENTENVSETUP) c++
++# define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
++# define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
+ #else
+-# define CcCmd			cc
+-# define CplusplusCmd		c++
++# define CcCmd			FreeBSDCC
++# define CplusplusCmd		FreeBSDCXX
+ #endif
+ 
+ #define CppCmd			/usr/bin/cpp
+@@ -359,7 +355,7 @@
+ #ifndef LibraryRpathLoadFlags
+ # if UseRpath
+ #  if UseElfFormat
+-#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
++#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
+ #  else
+ #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
+ #  endif
+@@ -426,6 +422,8 @@
+ #if defined(AlphaArchitecture) || defined(Sparc64Architecture) || \
+ 	defined(ia64Architecture) || defined(AMD64Architecture)
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#define AsVISOption            -Av9a
++#define AsOutputArchSize      64
+ #endif
+ #ifdef Sparc64Architecture
+ #define AsVISOption		-Av9a
+@@ -452,18 +450,8 @@
+ #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
+ #endif
+ 
+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
+-#ifndef DefaultGcc2i386Opt
+-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
++#define DefaultGcc2i386Opt
++#define OptimizedCDebugFlags FreeBSDCFLAGS
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
diff --git a/x11-servers/xorg-server/files/patch-Imake.rules b/x11-servers/xorg-server/files/patch-Imake.rules
new file mode 100644
index 000000000000..deea1cb886a6
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Imake.rules
@@ -0,0 +1,67 @@
+--- config/cf/Imake.rules.orig	Mon Dec  9 15:00:42 2002
++++ config/cf/Imake.rules	Mon Oct 13 17:04:19 2003
+@@ -1406,7 +1406,7 @@
+  * this Imakefile is within the source tree.
+  */
+ #ifndef RmanDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanDependency() /**/
+ #else
+ #define RmanDependency() 						@@\
+@@ -1421,7 +1421,7 @@
+ #endif /* RmanDependency */
+ 
+ #ifndef RmanCmdDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define RmanCmdDependency	/**/
+ #else
+ #define RmanCmdDependency	ProgramTargetName($(RMAN))
+@@ -1874,7 +1874,7 @@
+  * this Imakefile is within the source tree.
+  */
+ #ifndef DependDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define DependDependency() /**/
+ #else
+ #define DependDependency() 						@@\
+@@ -1969,7 +1969,7 @@
+  * within the source tree.
+  */
+ #ifndef ImakeDependency
+-#ifdef UseInstalled
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
+ #define ImakeDependency(target) /**/
+ #else
+ #define ImakeDependency(target)						@@\
+@@ -2066,11 +2066,18 @@
+  * ProjectUnsharedLibReferences - variables for unshared libraries
+  */
+ #ifndef ProjectUnsharedLibReferences
++#if defined(UseInstalledLibraries)
++#define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
++Concat3(DEP,varname,LIB) = 						@@\
++Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
++LintLibReferences(varname,libname,libsource)
++#else
+ #define ProjectUnsharedLibReferences(varname,libname,libsource,buildlibdir)	@@\
+ Concat3(DEP,varname,LIB) = _UseCat($(USRLIBDIR)/,buildlibdir/,LibraryTargetName(libname))	@@\
+ Concat(varname,LIB) = LoaderLibPrefix Concat(-l,libname)		@@\
+ LintLibReferences(varname,libname,libsource)
+ #endif
++#endif
+ 
+  /*
+  * ProjectUnsharedFontLibReferences - unshared font libraries
+@@ -3126,6 +3133,9 @@
+ 
+ #ifdef UseInstalled
+ #define ImakeSubCmdHelper $(IMAKE_CMD)
++#elif defined(UseInstalledPrograms)
++#define ImakeSubCmdHelper $(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
++			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
+ #else
+ #define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKEPREFIX)$(IRULESRC) \
+ 			  $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server/files/patch-Imake.tmpl b/x11-servers/xorg-server/files/patch-Imake.tmpl
new file mode 100644
index 000000000000..526e2e5de8a8
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Imake.tmpl
@@ -0,0 +1,75 @@
+--- config/cf/Imake.tmpl.orig	Mon Dec  9 19:20:41 2002
++++ config/cf/Imake.tmpl	Thu Jan  2 14:34:20 2003
+@@ -237,7 +237,8 @@
+ 
+ #ifndef RmanCmd
+ #if BuildRman
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define RmanCmd rman
+ #else
+ #define RmanCmd $(TOP)/config/util/rman
+@@ -1348,7 +1349,8 @@
+ #define LoaderLibPrefix /**/
+ #endif
+ #ifndef ImakeCmd
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define ImakeCmd imake
+ #else
+ #define ImakeCmd $(IMAKESRC)/imake
+@@ -1359,19 +1361,22 @@
+ #endif
+ #ifndef DependCmd
+ #if UseGccMakeDepend
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define DependCmd gccmakedep
+ #else
+ #define DependCmd $(DEPENDSRC)/gccmakedep
+ #endif
+ #elif UseCCMakeDepend
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define DependCmd ccmakedep
+ #else
+ #define DependCmd $(DEPENDSRC)/ccmakedep
+ #endif
+ #else
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define DependCmd makedepend
+ #else
+ #define DependCmd $(DEPENDSRC)/makedepend
+@@ -1398,21 +1403,23 @@
+ #ifndef ExportListCmd
+ # ifndef ExportListGenSource
+ #  define ExportListCmd		/**/
+-# elif !defined(UseInstalled)
++# elif !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ #  define ExportListCmd		$(CONFIGSRC)/util/exportlistgen
+ # else
+ #  define ExportListCmd		exportlistgen
+ # endif
+ #endif
+ #ifndef MkdirHierCmd
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define MkdirHierCmd mkdirhier
+ #else
+ #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
+ #endif
+ #endif
+ #ifndef RevPathCmd
+-#ifdef UseInstalled		/* assume BINDIR in path */
++#if defined(UseInstalled) || defined(UseInstalledPrograms)
++/* assume BINDIR in path */
+ #define RevPathCmd revpath
+ #else
+ #define RevPathCmd $(CONFIGSRC)/util/revpath
diff --git a/x11-servers/xorg-server/files/patch-kernel-Imakefile b/x11-servers/xorg-server/files/patch-kernel-Imakefile
new file mode 100644
index 000000000000..ab5ca0b01406
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-kernel-Imakefile
@@ -0,0 +1,18 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig	Sun May  9 21:27:57 2004
++++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile	Sun May  9 21:28:16 2004
+@@ -20,6 +20,7 @@
+ 	@echo 'Use "make -f Makefile.bsd" to manually build the modules'
+ #endif
+ 
++#if 0
+ SRCS_DRM = \
+ 	drm.h \
+ 	drmP.h \
+@@ -130,6 +131,7 @@
+ InstallNamedNonExec(radeon/Makefile,Makefile,$(DRMSRCDIR)/radeon)
+ InstallNamedNonExec(sis/Makefile,Makefile,$(DRMSRCDIR)/sis)
+ InstallNamedNonExec(tdfx/Makefile,Makefile,$(DRMSRCDIR)/tdfx)
++#endif /* 0 */
+ 
+ LinkSourceFile(drm.h,$(XF86OSSRC)/shared/drm/kernel)
+ LinkSourceFile(drm_sarea.h,$(XF86OSSRC)/shared/drm/kernel)
diff --git a/x11-servers/xorg-server/files/patch-linux.cf b/x11-servers/xorg-server/files/patch-linux.cf
new file mode 100644
index 000000000000..4d6ff268910b
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-linux.cf
@@ -0,0 +1,11 @@
+--- config/cf/linux.cf.orig	Fri May  7 15:51:10 2004
++++ config/cf/linux.cf	Fri May  7 15:51:17 2004
+@@ -747,7 +747,7 @@
+ #endif
+ 
+ #ifndef XF86OSCardDrivers
+-# define XF86OSCardDrivers	v4l
++# define XF86OSCardDrivers	fbdev v4l
+ #endif
+ 
+ #ifndef OSXInputDrivers
diff --git a/x11-servers/xorg-server/files/patch-loadmod.c b/x11-servers/xorg-server/files/patch-loadmod.c
new file mode 100644
index 000000000000..ea1c4862bfe4
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-loadmod.c
@@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/loader/loadmod.c.orig	Fri May  7 18:46:10 2004
++++ programs/Xserver/hw/xfree86/loader/loadmod.c	Fri May  7 18:46:12 2004
+@@ -62,7 +62,6 @@
+ #include "xf86Xinput.h"
+ #endif
+ #include "loader.h"
+-#include "xf86Optrec.h"
+ 
+ #include <sys/types.h>
+ #include <regex.h>
diff --git a/x11-servers/xorg-server/files/patch-man-Imakefile b/x11-servers/xorg-server/files/patch-man-Imakefile
new file mode 100644
index 000000000000..182741ccc44c
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-man-Imakefile
@@ -0,0 +1,12 @@
+--- programs/Xserver/hw/xfree86/doc/man/Imakefile.orig	Sat May  8 23:04:29 2004
++++ programs/Xserver/hw/xfree86/doc/man/Imakefile	Sat May  8 23:04:33 2004
+@@ -15,7 +15,9 @@
+ 
+ #endif
+ 
++#if 0
+ InstallManPageLong(XF86VM,$(MANDIR),XF86VidMode)
+ #if ExpandManNames
+ InstallManPageAliases(XF86VidMode,$(MANDIR),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine XF86VidModeSetClientVersion XF86VidModeGetDotClocks XF86VidModeGetGamma XF86VidModeSetGamma XF86VidModeSetGammaRamp XF86VidModeGetGammaRamp XF86VidModeGetGammaRampSize XF86VidModeGetPermissions)
++#endif
+ #endif
diff --git a/x11-servers/xorg-server/files/patch-os-Imakefile b/x11-servers/xorg-server/files/patch-os-Imakefile
new file mode 100644
index 000000000000..5251895774ad
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-os-Imakefile
@@ -0,0 +1,11 @@
+--- programs/Xserver/os/Imakefile.orig	Sat May  8 18:00:52 2004
++++ programs/Xserver/os/Imakefile	Sat May  8 18:01:08 2004
+@@ -132,7 +132,7 @@
+ 		  $(RANDOM_DEFINES)
+        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+ 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
+-		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes
++		  -I$(TOP)/lib/Xau -I../lbx Krb5Includes -I$(INCROOT)/X11
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+ 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
+        LINTLIBS = ../dix/llib-ldix.ln
diff --git a/x11-servers/xorg-server/files/patch-savage-pci-id b/x11-servers/xorg-server/files/patch-savage-pci-id
new file mode 100644
index 000000000000..f7396543d878
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-savage-pci-id
@@ -0,0 +1,87 @@
+--- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes	2003-01-08 04:28:57.000000000 -0500
++++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h	2003-01-08 05:28:02.000000000 -0500
+@@ -457,21 +457,34 @@
+ #define PCI_CHIP_TRIO64V2_DXGX		0x8901
+ #define PCI_CHIP_PLATO_PX		0x8902
+ #define PCI_CHIP_Trio3D			0x8904
+-#define PCI_CHIP_Trio3D_2X		0x8A13
+ #define PCI_CHIP_VIRGE_DXGX		0x8A01
+ #define PCI_CHIP_VIRGE_GX2		0x8A10
++#define PCI_CHIP_Trio3D_2X		0x8A13
+ #define PCI_CHIP_SAVAGE3D		0x8A20
+ #define PCI_CHIP_SAVAGE3D_MV		0x8A21
+ #define PCI_CHIP_SAVAGE4		0x8A22
+-#define PCI_CHIP_VIRGE_MX		0x8C01
+-#define PCI_CHIP_VIRGE_MXPLUS		0x8C01
+-#define PCI_CHIP_VIRGE_MXP		0x8C03
+ #define PCI_CHIP_PROSAVAGE_PM		0x8A25
+ #define PCI_CHIP_PROSAVAGE_KM		0x8A26
++#define PCI_CHIP_VIRGE_MX		0x8C01
++#define PCI_CHIP_VIRGE_MXPLUS		0x8C02
++#define PCI_CHIP_VIRGE_MXP		0x8C03
+ #define PCI_CHIP_SAVAGE_MX_MV		0x8C10
+ #define PCI_CHIP_SAVAGE_MX		0x8C11
+ #define PCI_CHIP_SAVAGE_IX_MV		0x8C12
+ #define PCI_CHIP_SAVAGE_IX		0x8C13
++#define PCI_CHIP_SUPSAV_MX128		0x8C22
++#define PCI_CHIP_SUPSAV_MX64		0x8C24
++#define PCI_CHIP_SUPSAV_MX64C		0x8C26
++#define PCI_CHIP_SUPSAV_IX128SDR	0x8C2A
++#define PCI_CHIP_SUPSAV_IX128DDR	0x8C2B
++#define PCI_CHIP_SUPSAV_IX64SDR		0x8C2C
++#define PCI_CHIP_SUPSAV_IX64DDR		0x8C2D
++#define PCI_CHIP_SUPSAV_IXCSDR		0x8C2E
++#define PCI_CHIP_SUPSAV_IXCDDR		0x8C2F
++#define PCI_CHIP_S3TWISTER_P		0x8D01
++#define PCI_CHIP_S3TWISTER_K		0x8D02
++#define PCI_CHIP_PROSAVAGE_DDR		0x8D03
++#define PCI_CHIP_PROSAVAGE_DDRK		0x8D04
+ #define PCI_CHIP_SAVAGE2000		0x9102
+ 
+ /* ARK Logic */
+--- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes	2003-01-08 05:31:06.000000000 -0500
++++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h	2003-01-08 05:31:25.000000000 -0500
+@@ -3,30 +3,6 @@
+ #ifndef _SAVAGE_REGS_H
+ #define _SAVAGE_REGS_H
+ 
+-/* These are here until xf86PciInfo.h is updated. */
+-
+-#ifndef PCI_CHIP_S3TWISTER_P
+-#define PCI_CHIP_S3TWISTER_P	0x8d01
+-#endif
+-#ifndef PCI_CHIP_S3TWISTER_K
+-#define PCI_CHIP_S3TWISTER_K	0x8d02
+-#endif
+-#ifndef PCI_CHIP_SUPSAV_MX128
+-#define PCI_CHIP_SUPSAV_MX128		0x8c22
+-#define PCI_CHIP_SUPSAV_MX64		0x8c24
+-#define PCI_CHIP_SUPSAV_MX64C		0x8c26
+-#define PCI_CHIP_SUPSAV_IX128SDR	0x8c2a
+-#define PCI_CHIP_SUPSAV_IX128DDR	0x8c2b
+-#define PCI_CHIP_SUPSAV_IX64SDR		0x8c2c
+-#define PCI_CHIP_SUPSAV_IX64DDR		0x8c2d
+-#define PCI_CHIP_SUPSAV_IXCSDR		0x8c2e
+-#define PCI_CHIP_SUPSAV_IXCDDR		0x8c2f
+-#endif
+-#ifndef PCI_CHIP_PROSAVAGE_DDR
+-#define PCI_CHIP_PROSAVAGE_DDR	0x8d03
+-#define PCI_CHIP_PROSAVAGE_DDRK	0x8d04
+-#endif
+-
+ #define S3_SAVAGE3D_SERIES(chip)  ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
+ 
+ #define S3_SAVAGE4_SERIES(chip)   ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE))
+--- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes	2003-01-08 06:28:59.000000000 -0500
++++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	2003-01-08 06:33:02.000000000 -0500
+@@ -123,8 +123,8 @@
+     { PCI_CHIP_SAVAGE_IX,	"Savage/IX" },
+     { PCI_CHIP_PROSAVAGE_PM,	"ProSavage PM133" },
+     { PCI_CHIP_PROSAVAGE_KM,	"ProSavage KM133" },
+-    { PCI_CHIP_S3TWISTER_P,	"ProSavage PN133" },
+-    { PCI_CHIP_S3TWISTER_K,	"ProSavage KN133" },
++    { PCI_CHIP_S3TWISTER_P,	"Twister PN133" },
++    { PCI_CHIP_S3TWISTER_K,	"Twister KN133" },
+     { PCI_CHIP_SUPSAV_MX128,	"SuperSavage/MX 128" },
+     { PCI_CHIP_SUPSAV_MX64,	"SuperSavage/MX 64" },
+     { PCI_CHIP_SUPSAV_MX64C,	"SuperSavage/MX 64C" },
diff --git a/x11-servers/xorg-server/files/patch-xf86.tmpl b/x11-servers/xorg-server/files/patch-xf86.tmpl
new file mode 100644
index 000000000000..3bf0b443d5f8
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xf86.tmpl
@@ -0,0 +1,12 @@
+--- config/cf/xf86.tmpl.orig	Tue Dec 17 04:21:38 2002
++++ config/cf/xf86.tmpl	Thu Jan  2 14:10:44 2003
+@@ -19,6 +19,9 @@
+ #ifdef UseInstalled
+        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \
+ 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
++#elif UseInstalledPrograms
++       IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
++		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
+ #else
+        IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \
+ 		   $(IMAKE_DEFINES) $(IMAKE_WARNINGS)
diff --git a/x11-servers/xorg-server/files/patch-xf86sym.c b/x11-servers/xorg-server/files/patch-xf86sym.c
new file mode 100644
index 000000000000..1372be144354
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xf86sym.c
@@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/loader/xf86sym.c.orig	Fri May  7 18:51:51 2004
++++ programs/Xserver/hw/xfree86/loader/xf86sym.c	Fri May  7 18:52:02 2004
+@@ -63,7 +63,6 @@
+ #include "xf86.h"
+ #include "xf86Resources.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Parser.h"
+ #include "xf86Config.h"
+ #ifdef XINPUT
+ # include "xf86Xinput.h"
diff --git a/x11-servers/xorg-server/files/patch-xkbout.c b/x11-servers/xorg-server/files/patch-xkbout.c
new file mode 100644
index 000000000000..963e881d86f7
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xkbout.c
@@ -0,0 +1,10 @@
+--- lib/xkbfile/xkbout.c.orig		Fri May  7 18:05:29 2004
++++ lib/xkbfile/xkbout.c		Fri May  7 18:05:29 2004
+@@ -54,7 +54,6 @@
+ #include "XKBsrv.h"
+ 
+ #include <X11/extensions/XKBgeom.h>
+-#include "extensions/XKBfile.h"
+ 
+ #endif
+ 
diff --git a/x11-servers/xorg-server/files/patch-xorg.cf b/x11-servers/xorg-server/files/patch-xorg.cf
new file mode 100644
index 000000000000..b1c5d758c83c
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xorg.cf
@@ -0,0 +1,11 @@
+--- config/cf/xorg.cf.orig	Sun May  9 21:05:27 2004
++++ config/cf/xorg.cf	Sun May  9 21:05:28 2004
+@@ -388,7 +388,7 @@
+ 				GlideDriver i128 NscDriver \
+ 				ati i810 AgpGartDrivers DevelDrivers ark \
+ 				cyrix siliconmotion via \
+-				fbdev vesa vga \
++				vesa vga \
+ 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
+ 
diff --git a/x11-servers/xorg-server/pkg-descr b/x11-servers/xorg-server/pkg-descr
new file mode 100644
index 000000000000..f95969b8294d
--- /dev/null
+++ b/x11-servers/xorg-server/pkg-descr
@@ -0,0 +1,6 @@
+This package contains the X.Org X server and some associated programs.
+
+WWW: http://www.freedesktop.org/Software/xorg
+
+- Eric Anholt
+anholt@FreeBSD.org
diff --git a/x11-servers/xorg-server/pkg-message b/x11-servers/xorg-server/pkg-message
new file mode 100644
index 000000000000..ea2e24612085
--- /dev/null
+++ b/x11-servers/xorg-server/pkg-message
@@ -0,0 +1,5 @@
+************************************************************************
+* To improve security, the X server is installed without an SUID bit.  *
+* This is suitable for use with xdm, but not with a startx script.     *
+* If you need to use a startx script, install the x11/wrapper package. *
+************************************************************************
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
new file mode 100644
index 000000000000..81e2f2ef0506
--- /dev/null
+++ b/x11-servers/xorg-server/pkg-plist
@@ -0,0 +1,183 @@
+bin/X
+bin/Xorg
+bin/getconfig
+bin/getconfig.pl
+bin/gtf
+%%SPARC64_NA%%bin/inb
+%%SPARC64_NA%%bin/inl
+%%SPARC64_NA%%bin/inw
+%%SPARC64_NA%%bin/ioport
+bin/kbd_mode
+bin/mmapr
+bin/mmapw
+%%SPARC64_NA%%bin/outb
+%%SPARC64_NA%%bin/outl
+%%SPARC64_NA%%bin/outw
+bin/pcitweak
+%%I386%%bin/scanpci
+lib/X11/Options
+lib/X11/XF86Config.98
+lib/X11/XF86Config.eg
+lib/X11/doc/BUILD
+lib/X11/doc/BugReport
+lib/X11/doc/DESIGN
+lib/X11/doc/Install
+lib/X11/doc/LICENSE
+lib/X11/doc/README
+lib/X11/doc/README.DECtga
+%%I386%%lib/X11/doc/README.I128
+%%I386%%lib/X11/doc/README.SiS
+lib/X11/doc/README.XKB-Config
+lib/X11/doc/README.XKB-Enhancing
+%%I386%%lib/X11/doc/README.apm
+lib/X11/doc/README.ati
+%%I386%%lib/X11/doc/README.chips
+%%I386%%lib/X11/doc/README.cyrix
+lib/X11/doc/README.dps
+lib/X11/doc/README.fonts
+%%I386%%lib/X11/doc/README.i740
+%%I386%%lib/X11/doc/README.i810
+lib/X11/doc/README.mouse
+%%I386%%lib/X11/doc/README.newport
+lib/X11/doc/README.r128
+lib/X11/doc/README.rapidaccess
+%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.rendition
+%%SPARC64_NA%%%%IA64_NA%%lib/X11/doc/README.s3virge
+lib/X11/doc/RELNOTES
+lib/X11/doc/Versions
+lib/X11/doc/VideoBoard98
+lib/X11/etc/Xinstall.sh
+lib/X11/etc/xmodmap.std
+lib/X11/getconfig/cfg.sample
+lib/X11/getconfig/xorg.cfg
+lib/X11/xserver/SecurityPolicy
+lib/modules/codeconv/libARABIC.a
+lib/modules/codeconv/libARMSCII8.a
+lib/modules/codeconv/libBIG5.a
+lib/modules/codeconv/libBIG5HKSCS.a
+lib/modules/codeconv/libDOSENCODING.a
+lib/modules/codeconv/libGB18030.a
+lib/modules/codeconv/libGB2312.a
+lib/modules/codeconv/libGBK.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_13.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
+%%I386%%lib/modules/drivers/apm_drv.o
+%%I386%%lib/modules/drivers/ark_drv.o
+lib/modules/drivers/ati_drv.o
+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
+lib/modules/drivers/dummy_drv.o
+%%SPARC64_NA%%lib/modules/drivers/glint_drv.o
+%%I386%%lib/modules/drivers/i128_drv.o
+%%I386%%lib/modules/drivers/i740_drv.o
+%%I386%%lib/modules/drivers/i810_drv.o
+%%SPARC64_NA%%lib/modules/drivers/mga_drv.o
+%%I386%%lib/modules/drivers/neomagic_drv.o
+%%I386%%lib/modules/drivers/nsc_drv.o
+lib/modules/drivers/nv_drv.o
+lib/modules/drivers/r128_drv.o
+lib/modules/drivers/radeon_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.o
+lib/modules/drivers/riva128.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/siliconmotion_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/sis_drv.o
+%%SPARC64%%lib/modules/drivers/sunffb_drv.o
+%%SPARC64_NA%%lib/modules/drivers/tdfx_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/tga_drv.o
+%%I386%%lib/modules/drivers/trident_drv.o
+%%I386%%lib/modules/drivers/tseng_drv.o
+%%I386%%lib/modules/drivers/vesa_drv.o
+%%SPARC64_NA%%lib/modules/drivers/vga_drv.o
+lib/modules/drivers/via_drv.o
+%%I386%%lib/modules/drivers/vmware_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/librecord.a
+lib/modules/extensions/libxtrap.a
+lib/modules/fonts/libbitmap.a
+lib/modules/fonts/libfreetype.so
+lib/modules/fonts/libspeedo.a
+lib/modules/fonts/libtype1.a
+lib/modules/fonts/libxtt.a
+lib/modules/freebsd/libdrm.a
+lib/modules/input/acecad_drv.o
+lib/modules/input/calcomp_drv.o
+lib/modules/input/citron_drv.o
+lib/modules/input/digitaledge_drv.o
+lib/modules/input/dmc_drv.o
+lib/modules/input/dynapro_drv.o
+lib/modules/input/elographics_drv.o
+lib/modules/input/fpit_drv.o
+lib/modules/input/hyperpen_drv.o
+lib/modules/input/js_x_drv.o
+lib/modules/input/kbd_drv.o
+lib/modules/input/magellan_drv.o
+lib/modules/input/microtouch_drv.o
+lib/modules/input/mouse_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/palmax_drv.o
+lib/modules/input/penmount_drv.o
+lib/modules/input/spaceorb_drv.o
+lib/modules/input/summa_drv.o
+lib/modules/input/tek4957_drv.o
+lib/modules/input/void_drv.o
+lib/modules/input/wacom_drv.o
+%%I386%%lib/modules/libafb.a
+lib/modules/libcfb.a
+lib/modules/libcfb16.a
+lib/modules/libcfb24.a
+lib/modules/libcfb32.a
+lib/modules/libddc.a
+lib/modules/libfb.a
+lib/modules/libi2c.a
+lib/modules/libint10.a
+lib/modules/liblayer.a
+lib/modules/libmfb.a
+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
+lib/modules/libxaa.a
+lib/modules/libxf1bpp.a
+lib/modules/libxf24_32bpp.a
+lib/modules/libxf4bpp.a
+lib/modules/libxf8_16bpp.a
+lib/modules/libxf8_32bpp.a
+%%SPARC64_NA%%lib/modules/v10002d.uc
+%%SPARC64_NA%%lib/modules/v20002d.uc
diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure
new file mode 100644
index 000000000000..408ce89092cf
--- /dev/null
+++ b/x11-servers/xorg-server/scripts/configure
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+LOCALDEF=$WRKDIR/.config
+
+rm -f $LOCALDEF
+echo "#define InstallXserverSetUID NO"		>> $LOCALDEF
+echo "#define JoystickSupport NO"		>> $LOCALDEF
+echo "#define BuildLBX NO"			>> $LOCALDEF
+echo "#define XnestServer NO"			>> $LOCALDEF
+echo "#define BuildFontServer NO"		>> $LOCALDEF
+echo "#define XVirtualFramebufferServer NO"	>> $LOCALDEF
+echo "#define XprtServer NO"			>> $LOCALDEF
+echo "#define LibInstall NO"			>> $LOCALDEF
+echo "#define ForceNormalLib NO"		>> $LOCALDEF
+echo "#define XTrueTypeInstallCConvHeaders NO"	>> $LOCALDEF
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define LibInstallBuild YES"		>> $LOCALDEF
+echo "#define ModInstall YES"			>> $LOCALDEF
+echo "#define XF86Server NO"			>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+#XXX echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
+
+if [ X$WITH_DEBUG != X ]; then
+	export CFLAGS="-g $CFLAGS"
+	echo "#define InstPgmFlags"		>> $LOCALDEF
+fi
+
+sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server/scripts/configure.gen b/x11-servers/xorg-server/scripts/configure.gen
new file mode 100644
index 000000000000..ee7e1d88add8
--- /dev/null
+++ b/x11-servers/xorg-server/scripts/configure.gen
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+# This script takes some of the system's imake configuration files and munges
+# them to be used in the X.Org build, and allows port configuration located in
+# $LOCALDEF to be included in the generated host.def
+
+SYSSITE=$PREFIX/lib/X11/config/xf86site.def
+BUILDSITE=$WRKDIR/xc/config/cf/xorgsite.def
+SYSHOST=$PREFIX/lib/X11/config/host.def
+LOCALDEF=$WRKDIR/.config
+BUILDHOST=$WRKDIR/xc/config/cf/host.def
+
+# Append system xf86site.def to build's xorgsite.def.
+rm -f $BUILDSITE
+cp -f $SYSSITE $BUILDSITE
+
+# Use system host.def as initial config file, setting ProjectRoot appropriately.
+rm -f $BUILDHOST
+grep -v '#define.*ProjectRoot' $SYSHOST			>> $BUILDHOST
+echo "#define ProjectRoot $PREFIX"			>> $BUILDHOST
+
+# Add in defines that all ports will want.
+echo "#define NothingOutsideProjectRoot YES"		>> $BUILDHOST
+echo "#define FreeBSDCC	${CC}"				>> $BUILDHOST
+echo "#define FreeBSDCXX ${CXX}"			>> $BUILDHOST
+echo "#define FreeBSDPTHREAD_LIBS ${PTHREAD_LIBS}"	>> $BUILDHOST
+echo "#define FreeBSDPTHREAD_CFLAGS ${PTHREAD_CFLAGS}"	>> $BUILDHOST
+echo "#define FreeBSDCFLAGS ${CFLAGS}"			>> $BUILDHOST
+
+cat ${LOCALDEF} >> ${BUILDHOST}
diff --git a/x11-servers/xorg-server/scripts/configure.gen.pre b/x11-servers/xorg-server/scripts/configure.gen.pre
new file mode 100644
index 000000000000..ed93fea53d93
--- /dev/null
+++ b/x11-servers/xorg-server/scripts/configure.gen.pre
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# This script does the following:
+# (1) cp xf86site.def, installed by imake-4 port,
+#       to ${WRKDIR}/xc/config/cf.
+#     this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using 
+#     host.def as a base.
+
+ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
+DESTDEF=$WRKDIR/xc/config/cf/xorgsite.def
+ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
+LOCALDEF=$WRKDIR/.config
+HOSTDEF=$WRKDIR/xc/config/cf/host.def