- Merge freetype2 patches from xorg-server (kinda pointless since it looks

  like this port will never be updated again...)


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7532 df743ca5-7f9a-e211-a948-0013205c9059

25 files changed, 1871 insertions, 0 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
new file mode 100644
index 000000000..38907d90f
--- /dev/null
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -0,0 +1,194 @@
+# New ports collection makefile for:    xorg-server
+# Date created:		7 May 2004
+# Whom:			anholt@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	xorg-server
+PORTVERSION=	6.8.99.903
+PORTREVISION=	1
+CATEGORIES=	x11-servers
+MASTER_SITES=	http://xorg.freedesktop.org/snapshots/
+DISTNAME=	xorg-x11-${PORTVERSION}
+
+MAINTAINER=	x11@FreeBSD.org
+COMMENT=	X.Org X server development snapshot and related programs
+
+USE_BZIP2=	yes
+.if !defined(WITH_MODULAR)
+USE_XLIB=	yes
+.else
+LIB_PC_DEPENDS=	${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
+		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+		GL.1:${PORTSDIR}/x11/libGL
+BUILD_DEPENDS=	${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
+		${LIB_PC_DEPENDS}
+RUN_DEPENDS=	${LIB_PC_DEPENDS}
+.endif
+
+CONFLICTS=	XFree86-Server-* xorg-server-6.[79].* xorg-server-6.8.[012]*
+
+SCRIPTS_ENV=	WITH_DEBUG="${WITH_DEBUG}"
+MAN1=		Xorg.1 \
+		getconfig.1 \
+		gtf.1 \
+		kbd_mode.1 \
+		pcitweak.1 \
+		xorgcfg.1 \
+		xorgconfig.1
+MAN4=		citron.4x \
+		dmc.4x \
+		dynapro.4x \
+		elographics.4x \
+		fbdevhw.4x \
+		fpit.4x \
+		glint.4x \
+		js_x.4x \
+		kbd.4x \
+		keyboard.4x \
+		mga.4x \
+		microtouch.4x \
+		mouse.4x \
+		mutouch.4x \
+		palmax.4x \
+		penmount.4x \
+		r128.4x \
+		radeon.4x \
+		tdfx.4x \
+		tek4957.4x \
+		vga.4x \
+		void.4x \
+		wacom.4x
+MAN5=		getconfig.5 \
+		xorg.conf.5
+
+XBUILD_DIRS=	lib/font programs/Xserver
+XINCLUDE_DIRS=	lib/xtrans
+XMAN_DIRS=	programs/Xserver
+LATEST_LINK=	${PORTNAME}-snap
+
+NOT_FOR_ARCHS=	ia64
+.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
+	distribution. See The X Window System and Virtual Consoles chapter\
+	of FAQ for more information
+.endif
+
+.if ${ARCH} == alpha
+PLIST_SUB+=	ALPHA_NA="@comment "
+.else
+PLIST_SUB+=	ALPHA_NA=""
+.endif
+
+.if ${ARCH} == ia64
+PLIST_SUB+=	IA64_NA="@comment "
+.else
+PLIST_SUB+=	IA64_NA=""
+.endif
+
+.if ${ARCH} == powerpc
+PLIST_SUB+=	PPC_NA="@comment "
+MAN4+=		nv.4x
+.else
+PLIST_SUB+=	PPC_NA=""
+.endif
+
+.if ${ARCH} == sparc64
+BROKEN=		Does not compile on sparc64
+PLIST_SUB+=	SPARC64=""
+PLIST_SUB+=	SPARC64_NA="@comment "
+MAN4+=		apm.4x \
+		chips.4x \
+		cirrus.4x \
+		i128.4x \
+		i740.4x \
+		i810.4x \
+		imstt.4x \
+		neomagic.4x \
+		newport.4x \
+		nv.4x \
+		rendition.4x \
+		s3virge.4x \
+		savage.4x \
+		siliconmotion.4x \
+		sunbw2.4x \
+		suncg14.4x \
+		suncg3.4x \
+		suncg6.4x \
+		sunffb.4x \
+		sunleo.4x \
+		suntcx.4x \
+		trident.4x \
+		vmware.4x
+.else
+PLIST_SUB+=	SPARC64="@comment "
+PLIST_SUB+=	SPARC64_NA=""
+.endif
+
+.if ${ARCH} != powerpc && ${ARCH} != sparc64
+MAN4+=		cirrus.4x \
+		nv.4x \
+		rendition.4x \
+		s3virge.4x \
+		savage.4x \
+		siliconmotion.4x
+.endif
+
+.if ${ARCH} != powerpc && ${ARCH} != alpha
+MAN4+=		vesa.4x
+.endif
+
+.if ${ARCH} == i386
+PLIST_SUB+=	I386=""
+MAN1+=		scanpci.1
+MAN4+=		i740.4x \
+		imstt.4x \
+		newport.4x \
+		nsc.4x \
+		via.4x
+.else
+PLIST_SUB+=	I386="@comment "
+.endif
+
+.if ${ARCH} == amd64 || ${ARCH} == i386
+PLIST_SUB+=	AMD64_I386=""
+MAN4+=		apm.4x \
+		chips.4x \
+		cyrix.4x \
+		i128.4x \
+		i810.4x \
+		neomagic.4x \
+		sis.4x \
+		trident.4x \
+		tseng.4x \
+		vmware.4x
+.else
+PLIST_SUB+=	AMD64_I386="@comment "
+.endif
+
+pre-everything::
+	@${ECHO_MSG} "This X Server installs with development DRI DDX drivers.  These drivers are"
+	@${ECHO_MSG} "considered insecure by their authors and may allow privilege escalation by"
+	@${ECHO_MSG} "local X clients with DRI privileges."
+	@${ECHO_MSG} ""
+
+.if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
+pre-everything::
+	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
+	@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"
+	@${ECHO_MSG} "port before handling them normally.  If you are concerned about the security"
+	@${ECHO_MSG} "of this, but still want to run an X Server (for example using xdm/kdm/gdm,"
+	@${ECHO_MSG} "which will still run the server as root), you can cancel the build and set"
+	@${ECHO_MSG} "NO_SUID_XSERVER=YES in /etc/make.conf."
+
+SCRIPTS_ENV+=	SUID_XSERVER=YES
+.else
+SCRIPTS_ENV+=	SUID_XSERVER=NO
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc
new file mode 100644
index 000000000..97d8db3bd
--- /dev/null
+++ b/x11-servers/xorg-server-snap/Makefile.inc
@@ -0,0 +1,94 @@
+# 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}
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+MTREE_FILE=	${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
+
+USE_IMAKE=	YES
+.if defined(XMAN_DIRS)
+XFREE86_HTML_MAN?=	yes
+.else
+XFREE86_HTML_MAN?=	no
+.endif
+SCRIPTS_ENV+=	CC="${CC}" \
+		CXX="${CXX}" \
+		CFLAGS="${CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_CFLAGS="${PTHREAD_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 \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
+
+SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-atimobility \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-pc98kbd \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-radeon_driver.c \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c
+
+.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
+.endif
+
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
new file mode 100644
index 000000000..84dded21b
--- /dev/null
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/xorg-x11-6.8.99.903.tar.bz2) = c4d8be6e2149906d99bb96f84ae972b4
+SHA256 (xorg/xorg-x11-6.8.99.903.tar.bz2) = 0d95e3301564cce9a391105bb86b8ac6dc562d23b9c7b932364478f6c685be0b
+SIZE (xorg/xorg-x11-6.8.99.903.tar.bz2) = 45768494
diff --git a/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
new file mode 100644
index 000000000..10079de6e
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist
@@ -0,0 +1,524 @@
+# $FreeBSD: ports/x11-servers/xorg-server-snap/files/BSD.x11-xorg.dist,v 1.3 2005/05/04 01:28:30 anholt Exp $
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    bin
+    ..
+    etc
+        rc.d
+        ..
+    ..
+    include
+        X11
+            PEX5
+            ..
+            Xft
+            ..
+            bitmaps
+            ..
+            pixmaps
+            ..
+        ..
+        bitmaps
+        ..
+        freetype2
+            freetype
+                cache
+                ..
+                config
+                ..
+                internal
+                ..
+            ..
+        ..
+    ..
+    info
+    ..
+    lib
+        X11
+            XF86Setup
+                pics
+                ..
+                scripts
+                ..
+                tcllib
+                ..
+            ..
+            app-defaults
+            ..
+            etc
+            ..
+            fonts
+                local
+                ..
+            ..
+            lbxproxy
+            ..
+            xserver
+            ..
+        ..
+        aout
+        ..
+        modules
+            codeconv
+            ..
+            dri
+            ..
+        ..
+    ..
+    libdata
+        pkgconfig
+        ..
+    ..
+    libexec
+    ..
+    man
+/set uname=man
+        cat1
+        ..
+        cat2
+        ..
+        cat3
+        ..
+        cat4
+        ..
+        cat5
+        ..
+        cat6
+        ..
+        cat7
+        ..
+        cat8
+        ..
+        cat9
+        ..
+        catl
+        ..
+        catn
+        ..
+        ja              uname=root
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+/set uname=root
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        man1
+        ..
+        man2
+        ..
+        man3
+        ..
+        man4
+        ..
+        man5
+        ..
+        man6
+        ..
+        man7
+        ..
+        man8
+        ..
+        man9
+        ..
+        manl
+        ..
+        mann
+        ..
+    ..
+    share
+        aclocal
+        ..
+        doc
+            ja
+            ..
+        ..
+        examples
+        ..
+        locale
+            af
+                LC_MESSAGES
+                ..
+            ..
+            am
+                LC_MESSAGES
+                ..
+            ..
+            ar
+                LC_MESSAGES
+                ..
+            ..
+            az
+                LC_MESSAGES
+                ..
+            ..
+            be
+                LC_MESSAGES
+                ..
+            ..
+            bg
+                LC_MESSAGES
+                ..
+            ..
+            bn
+                LC_MESSAGES
+                ..
+            ..
+            bs
+                LC_MESSAGES
+                ..
+            ..
+            ca
+                LC_MESSAGES
+                ..
+            ..
+            cs
+                LC_MESSAGES
+                ..
+            ..
+            cy
+                LC_MESSAGES
+                ..
+            ..
+            da
+                LC_MESSAGES
+                ..
+            ..
+            de
+                LC_MESSAGES
+                ..
+            ..
+            de_AT
+                LC_MESSAGES
+                ..
+            ..
+            el
+                LC_MESSAGES
+                ..
+            ..
+            en
+                LC_MESSAGES
+                ..
+            ..
+            en_AU
+                LC_MESSAGES
+                ..
+            ..
+            en_CA
+                LC_MESSAGES
+                ..
+            ..
+            en_GB
+                LC_MESSAGES
+                ..
+            ..
+            eo
+                LC_MESSAGES
+                ..
+            ..
+            es
+                LC_MESSAGES
+                ..
+            ..
+            es_ES
+                LC_MESSAGES
+                ..
+            ..
+            es_MX
+                LC_MESSAGES
+                ..
+            ..
+            et
+                LC_MESSAGES
+                ..
+            ..
+            eu
+                LC_MESSAGES
+                ..
+            ..
+            fa
+                LC_MESSAGES
+                ..
+            ..
+            fa_IR
+                LC_MESSAGES
+                ..
+            ..
+            fi
+                LC_MESSAGES
+                ..
+            ..
+            fr
+                LC_MESSAGES
+                ..
+            ..
+            fr_FR
+                LC_MESSAGES
+                ..
+            ..
+            ga
+                LC_MESSAGES
+                ..
+            ..
+            gl
+                LC_MESSAGES
+                ..
+            ..
+            gu
+                LC_MESSAGES
+                ..
+            ..
+            he
+                LC_MESSAGES
+                ..
+            ..
+            hi
+                LC_MESSAGES
+                ..
+            ..
+            hr
+                LC_MESSAGES
+                ..
+            ..
+            hu
+                LC_MESSAGES
+                ..
+            ..
+            id
+                LC_MESSAGES
+                ..
+            ..
+            is
+                LC_MESSAGES
+                ..
+            ..
+            it
+                LC_MESSAGES
+                ..
+            ..
+            ja
+                LC_MESSAGES
+                ..
+            ..
+            ka
+                LC_MESSAGES
+                ..
+            ..
+            kn
+                LC_MESSAGES
+                ..
+            ..
+            ko
+                LC_MESSAGES
+                ..
+            ..
+            li
+                LC_MESSAGES
+                ..
+            ..
+            lt
+                LC_MESSAGES
+                ..
+            ..
+            lv
+                LC_MESSAGES
+                ..
+            ..
+            mk
+                LC_MESSAGES
+                ..
+            ..
+            ml
+                LC_MESSAGES
+                ..
+            ..
+            mn
+                LC_MESSAGES
+                ..
+            ..
+            ms
+                LC_MESSAGES
+                ..
+            ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
+            nb
+                LC_MESSAGES
+                ..
+            ..
+            ne
+                LC_MESSAGES
+                ..
+            ..
+            nl
+                LC_MESSAGES
+                ..
+            ..
+            nn
+                LC_MESSAGES
+                ..
+            ..
+            no
+                LC_MESSAGES
+                ..
+            ..
+            or
+                LC_MESSAGES
+                ..
+            ..
+            pa
+                LC_MESSAGES
+                ..
+            ..
+            pl
+                LC_MESSAGES
+                ..
+            ..
+            pt
+                LC_MESSAGES
+                ..
+            ..
+            pt_BR
+                LC_MESSAGES
+                ..
+            ..
+            pt_PT
+                LC_MESSAGES
+                ..
+            ..
+            ro
+                LC_MESSAGES
+                ..
+            ..
+            ru
+                LC_MESSAGES
+                ..
+            ..
+            sk
+                LC_MESSAGES
+                ..
+            ..
+            sl
+                LC_MESSAGES
+                ..
+            ..
+            sq
+                LC_MESSAGES
+                ..
+            ..
+            sr
+                LC_MESSAGES
+                ..
+            ..
+            sr@Latn
+                LC_MESSAGES
+                ..
+            ..
+            sv
+                LC_MESSAGES
+                ..
+            ..
+            ta
+                LC_MESSAGES
+                ..
+            ..
+            tg
+                LC_MESSAGES
+                ..
+            ..
+            th
+                LC_MESSAGES
+                ..
+            ..
+            tk
+                LC_MESSAGES
+                ..
+            ..
+            tr
+                LC_MESSAGES
+                ..
+            ..
+            uk
+                LC_MESSAGES
+                ..
+            ..
+            uz
+                LC_MESSAGES
+                ..
+            ..
+            wa
+                LC_MESSAGES
+                ..
+            ..
+            vi
+                LC_MESSAGES
+                ..
+            ..
+            zh
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN.GB2312
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW.Big5
+                LC_MESSAGES
+                ..
+            ..
+        ..
+    ..
+..
diff --git a/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
new file mode 100644
index 000000000..e7c983833
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-FreeBSD.cf
@@ -0,0 +1,90 @@
+--- config/cf/FreeBSD.cf.orig	Tue May  3 21:14:57 2005
++++ config/cf/FreeBSD.cf	Mon May  9 15:21:48 2005
+@@ -78,6 +78,7 @@
+ #define HasIssetugid		YES
+ #define HasPoll			YES
+ #endif
++#define BuildHtmlManPages	NO
+ 
+ #if OSMajorVersion >= 4
+ #define HasGetIfAddrs		YES
+@@ -116,15 +117,14 @@
+ # endif
+ # if (OSRelVersion < 500043)
+ #  define NeedUIThrStubs	YES
+-# endif
+-# if (OSRelVersion >= 502102)
+-#  define ThreadsLibraries	-lpthread
+-# elif (OSRelVersion >= 500016)
+-#  define ThreadsLibraries	-lc_r
++#  define BuildThreadStubLibrary	YES
++#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
++#  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+ # else
+-#  define ThreadsLibraries	-pthread
++#  define BuildThreadStubLibrary	NO
+ # endif
+-# define SystemMTDefines	-D_THREAD_SAFE
++# define ThreadsLibraries	FreeBSDPTHREAD_LIBS
++# define SystemMTDefines	FreeBSDPTHREAD_CFLAGS
+ #endif
+ 
+ /* This fixes linking C programs against libGLU on FreeBSD 3.x */
+@@ -172,12 +172,14 @@
+ #endif
+ #endif
+ 
+-#ifndef CcCmd
+-#define CcCmd			cc
+-#endif
+-#ifndef CplusplusCmd
+-#define CplusplusCmd		c++
++#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11)
++#define CcCmd			$(CLIENTENVSETUP) FreeBSDCC
++#define CplusplusCmd		$(CLIENTENVSETUP) FreeBSDCXX
++#else
++#define CcCmd			FreeBSDCC
++#define CplusplusCmd		FreeBSDCXX
+ #endif
++
+ #define CppCmd			/usr/bin/cpp
+ #define PreProcessCmd		CppCmd
+ #define StandardCppOptions	-traditional
+@@ -338,7 +340,7 @@
+ #ifndef LibraryRpathLoadFlags
+ # if UseRpath
+ #  if UseElfFormat
+-#   define LibraryRpathLoadFlags	-rpath $(USRLIBDIRPATH)
++#   define LibraryRpathLoadFlags	-Wl,-rpath $(USRLIBDIRPATH)
+ #  else
+ #   define LibraryRpathLoadFlags	-R $(USRLIBDIRPATH)
+ #  endif
+@@ -446,7 +448,6 @@
+ #ifdef PpcArchitecture
+ #define XF86INT10_BUILD		X86INT10_STUB
+ #endif
+-
+ #define StandardDefines	-DCSRG_BASED
+ 
+ #if OSMajorVersion > 1
+@@ -467,18 +468,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-snap/files/patch-Imake.rules b/x11-servers/xorg-server-snap/files/patch-Imake.rules
new file mode 100644
index 000000000..deea1cb88
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-Imake.tmpl b/x11-servers/xorg-server-snap/files/patch-Imake.tmpl
new file mode 100644
index 000000000..526e2e5de
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-Library.tmpl b/x11-servers/xorg-server-snap/files/patch-Library.tmpl
new file mode 100644
index 000000000..e94aae3bf
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Library.tmpl
@@ -0,0 +1,21 @@
+--- config/cf/Library.tmpl.orig	Mon May 24 12:06:57 2004
++++ config/cf/Library.tmpl	Fri Sep 10 21:46:00 2004
+@@ -389,7 +389,7 @@
+  */
+ 
+ #ifndef MakeStringsDependency
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ #  define MakeStringsDependency						@@\
+ MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
+ NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
+@@ -399,7 +399,8 @@
+ 									@@\
+ includes:: HostProgramTargetName($(MAKESTRS))
+ # else
+-#  define MakeStringsDependency  /**/
++#  define MakeStringsDependency						@@\
++MAKESTRS = makestrs
+ # endif
+ #endif
+ 
diff --git a/x11-servers/xorg-server-snap/files/patch-X11.rules b/x11-servers/xorg-server-snap/files/patch-X11.rules
new file mode 100644
index 000000000..052e96012
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-X11.rules
@@ -0,0 +1,17 @@
+--- config/cf/X11.rules.orig	Sun May 30 12:49:38 2004
++++ config/cf/X11.rules	Sun May 30 12:50:02 2004
+@@ -23,6 +23,14 @@
+ # define UseInstalledX11	YES
+ #endif
+ 
++#ifndef UseInstalledPrograms
++# define UseInstalledPrograms	NO
++#endif
++
++#ifndef UseInstalledClients
++# define UseInstalledClients	NO
++#endif
++
+ #ifndef ImportX11
+ # ifdef UseImports
+ #  define ImportX11		YES
diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl
new file mode 100644
index 000000000..c27d14d8e
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-X11.tmpl
@@ -0,0 +1,79 @@
+--- X11.tmpl.orig	Fri Sep  3 09:18:18 2004
++++ config/cf/X11.tmpl	Wed Dec 29 13:42:37 2004
+@@ -616,7 +616,7 @@
+ #define BuildXft1Library	BuildRenderLibrary
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig		BuildXftLibrary
++#define UseFontconfig		(BuildXftLibrary || BuildXft1Library)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
+@@ -773,6 +773,9 @@
+ #ifndef ThreadedProject
+ #define ThreadedProject ThreadedX
+ #endif
++#ifndef BuildThreadStubLibrary
++#define BuildThreadStubLibrary	NO
++#endif
+ #ifndef NeedUIThrStubs
+ #define NeedUIThrStubs		NO
+ #endif
+@@ -1606,7 +1609,7 @@
+ #endif
+ 
+ #ifndef PsWrap
+-# ifndef UseInstalled
++# if !defined(UseInstalled) && !defined(UseInstalledPrograms)
+ #  define PsWrap $(PSWRAPSRC)/pswrap
+ # else
+ #  define PsWrap pswrap
+@@ -1683,7 +1686,7 @@
+ 
+      INSTAPPFLAGS = $(INSTDATFLAGS)	/* XXX - this should go away - XXX */
+ 
+-#if UseInstalledX11
++#if UseInstalledX11 || UseInstalledClients
+               RGB = $(XBINDIR)/rgb
+             FONTC = $(XBINDIR)/bdftopcf
+       MKFONTSCALE = $(XBINDIR)/mkfontscale
+@@ -1843,6 +1846,39 @@
+       DEPXLIBONLY = $(DEPXONLYLIB)
+          XLIBONLY = $(XONLYLIB)
+      LINTXONLYLIB = $(LINTXONLY)
++
++#if BuildThreadStubLibrary
++#ifndef SharedLibXThrStub
++#define SharedLibXThrStub	YES
++#endif
++#ifndef NormalLibXThrStub
++#define NormalLibXThrStub	NO
++#endif
++#ifndef DebugLibXThrStub
++#define DebugLibXThrStub	NO
++#endif
++#ifndef ProfileLibXThrStub
++#define ProfileLibXThrStub	NO
++#endif
++   XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub
++#if SharedLibXThrStub
++#ifndef SharedXThrStubRev
++#define SharedXThrStubRev 6.1
++#endif
++SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev)
++#else
++ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir)
++#endif
++#else
++#undef  SharedLibXThrStub
++#define SharedLibXThrStub	NO
++#undef  NormalLibXThrStub
++#define NormalLibXThrStub	NO
++#undef  DebugLibXThrStub
++#define DebugLibXThrStub	NO
++#undef  ProfileLibXThrStub
++#define ProfileLibXThrStub	NO
++#endif
+ 
+ #if BuildScreenSaverLibrary
+ #ifndef SharedLibXss
diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile
new file mode 100644
index 000000000..5dab87bd4
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile
@@ -0,0 +1,8 @@
+--- programs/Xserver/Imakefile.orig	Sat May 29 14:12:45 2004
++++ programs/Xserver/Imakefile	Sat May 29 14:12:16 2004
+@@ -1095,5 +1095,3 @@
+ 
+ DEFAULTFONTPATH = DefaultFontPath
+ EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
+-
+-InstallManPage(Xserver,$(MANDIR))
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
new file mode 100644
index 000000000..68e18f831
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.c
@@ -0,0 +1,231 @@
+--- lib/font/FreeType/ftfuncs.c.orig	2005-10-23 19:32:05.000000000 +0100
++++ lib/font/FreeType/ftfuncs.c	2006-06-01 23:21:34.000000000 +0100
+@@ -54,10 +54,7 @@
+ #include FT_TYPE1_TABLES_H
+ #include FT_XFREE86_H
+ #include FT_BBOX_H
+-#include FT_INTERNAL_TRUETYPE_TYPES_H
+ #include FT_TRUETYPE_TAGS_H
+-#include FT_INTERNAL_SFNT_H
+-#include FT_INTERNAL_STREAM_H
+ /*
+  *  If you want to use FT_Outline_Get_CBox instead of 
+  *  FT_Outline_Get_BBox, define here.
+@@ -123,6 +120,46 @@
+ };
+ 
+ 
++/* read 2-byte value from a SFNT table */
++static FT_UShort
++sfnt_get_ushort( FT_Face     face,
++                 FT_ULong    table_tag,
++                 FT_ULong    table_offset )
++{
++  FT_Byte    buff[2];
++  FT_ULong   len = sizeof(buff);
++  FT_UShort  result = 0;
++
++  if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len ) );
++    result = (FT_UShort)( (buff[0] << 8) | buff[1] );
++
++  return result;
++}
++
++#define  sfnt_get_short(f,t,o)  ((FT_Short)sfnt_get_ushort((f),(t),(o)))
++
++
++#if 0
++static FT_ULong
++sfnt_get_ulong( FT_Face   face,
++                FT_ULong  table_tag,
++                FT_ULong  table_offset )
++{
++  FT_Byte    buff[4];
++  FT_ULong   len = sizeof(buff);
++  FT_UShort  result = 0;
++
++  if  ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, &len );
++    result = ((FT_ULong)buff[0] << 24) | ((FT_ULong)buff[1] << 16) |
++             ((FT_ULong)buff[2] << 8)  |  (FT_ULong)buff[3];
++
++  return result;
++}
++#endif
++
++
++
++
+ static int ftypeInitP = 0;      /* is the engine initialised? */
+ FT_Library ftypeLibrary;
+ 
+@@ -211,6 +248,10 @@
+         if(maxp && maxp->maxContours == 0)
+             face->bitmap = 1;
+     }
++
++    face->num_hmetrics = (FT_UInt) sfnt_get_ushort( face->face,
++                                                    TTAG_hhea, 34 );
++
+     /* Insert face in hashtable and return it */
+     face->next = faceTable[bucket];
+     faceTable[bucket] = face;
+@@ -462,6 +503,29 @@
+     }
+ 
+     if( FT_IS_SFNT( face->face ) ) {
++#if 1
++        FT_F26Dot6  tt_char_width, tt_char_height, tt_dim_x, tt_dim_y;
++        FT_UInt     nn;
++
++        instance->strike_index=0xFFFFU;
++
++	tt_char_width  = (int)(trans->scale*(1<<6) + 0.5);
++	tt_char_height = (int)(trans->scale*(1<<6) + 0.5);
++
++        tt_dim_x = ( ( tt_char_width  * trans->xres + (36+32*72) ) / 72 ) & -64;
++        tt_dim_y = ( ( tt_char_height * trans->yres + (36+32*72) ) / 72 ) & -64;
++
++        for ( nn = 0; nn < face->face->num_fixed_sizes; nn++ )
++        {
++          FT_Bitmap_Size*  sz = &face->face->available_sizes[nn];
++
++          if ( tt_dim_x == sz->x_ppem && tt_dim_y == sz->y_ppem )
++          {
++            instance->strike_index = nn;
++            break;
++          }
++        }
++#else
+ 	/* See Set_Char_Sizes() in ttdriver.c */
+ 	FT_Error err;
+ 	TT_Face tt_face;
+@@ -486,6 +550,7 @@
+ 	sfnt   = (SFNT_Service)tt_face->sfnt;
+ 	err = sfnt->set_sbit_strike(tt_face,tt_x_ppem,tt_y_ppem,&instance->strike_index);
+ 	if ( err ) instance->strike_index=0xFFFFU;
++#endif
+     }
+ 
+     /* maintain a linked list of instances */
+@@ -803,31 +868,36 @@
+  * parse the htmx field in TrueType font.
+  */
+ 
+-/* from src/truetype/ttgload.c */
+ static void
+-tt_get_metrics( TT_HoriHeader*  header,
++tt_get_metrics( FT_Face         face,
+ 		FT_UInt         idx,
++		FT_UInt         num_hmetrics,
+ 		FT_Short*       bearing,
+ 		FT_UShort*      advance )
+-/*  Copyright 1996-2001, 2002 by                      */
+-/*  David Turner, Robert Wilhelm, and Werner Lemberg. */
+ {
+-    TT_LongMetrics  longs_m;
+-    FT_UShort       k = header->number_Of_HMetrics;
++   /* read the metrics directly from the horizontal header, we
++    * parse the SFNT table directly through the standard FreeType API.
++    * this works with any version of the library and doesn't need to
++    * peek at its internals. Maybe a bit less
++    */
++    FT_UInt    count = num_hmetrics;
+ 
+-    if ( k == 0 ) {
+-	*bearing = *advance = 0;
+-	return;
++    if ( count == 0 )
++    {
++      *advance = 0;
++      *bearing = 0;
+     }
++    else if ( idx < count )
++    {
++      FT_ULong  offset = idx*4;
+ 
+-    if ( idx < (FT_UInt)k ) {
+-	longs_m  = (TT_LongMetrics )header->long_metrics + idx;
+-	*bearing = longs_m->bearing;
+-	*advance = longs_m->advance;
++      *advance = sfnt_get_ushort( face, TTAG_hmtx, offset );
++      *bearing = sfnt_get_short ( face, TTAG_hmtx, offset+2 );
+     }
+-    else {
+-	*bearing = ((TT_ShortMetrics*)header->short_metrics)[idx - k];
+-	*advance = ((TT_LongMetrics )header->long_metrics)[k - 1].advance;
++    else
++    {
++      *advance = sfnt_get_ushort( face, TTAG_hmtx, (count-1)*4 );
++      *bearing = sfnt_get_short ( face, TTAG_hmtx, (count+idx)*2 );
+     }
+ }
+ 
+@@ -835,6 +905,7 @@
+ ft_get_very_lazy_bbox( FT_UInt index,
+ 		       FT_Face face,
+ 		       FT_Size size,
++		       FT_UInt  num_hmetrics,
+ 		       double slant,
+ 		       FT_Matrix *matrix,
+ 		       FT_BBox *bbox,
+@@ -842,14 +913,13 @@
+ 		       FT_Long *vertAdvance)
+ {
+     if ( FT_IS_SFNT( face ) ) {
+-	TT_Face   ttface = (TT_Face)face;
+ 	FT_Size_Metrics *smetrics = &size->metrics;
+ 	FT_Short  leftBearing = 0;
+ 	FT_UShort advance = 0;
+ 	FT_Vector p0, p1, p2, p3;
+ 
+ 	/* horizontal */
+-	tt_get_metrics(&ttface->horizontal, index,
++	tt_get_metrics( face, num_hmetrics, index,
+ 		       &leftBearing, &advance);
+ 
+ #if 0
+@@ -910,7 +980,27 @@
+ 		    FT_UShort glyph_index, FT_Glyph_Metrics *metrics_return,
+ 		    int *sbitchk_incomplete_but_exist )
+ {
+-#if (FREETYPE_VERSION >= 2001008)
++#if 1
++    if ( strike_index != 0xFFFFU && ft_face->available_sizes != 0)
++    {
++      FT_Error         error;
++      FT_Bitmap_Size*  sz = &ft_face->available_sizes[strike_index];
++
++      error = FT_Set_Pixel_Sizes( ft_face, sz->x_ppem/64, sz->y_ppem/64 );
++      if ( !error )
++      {
++        error = FT_Load_Glyph( ft_face, glyph_index, FT_LOAD_SBITS_ONLY );
++        if ( !error )
++        {
++          if ( metrics_return != NULL )
++            *metrics_return = ft_face->glyph->metrics;
++
++          return 0;
++        }
++      }
++    }
++    return -1;
++#elif (FREETYPE_VERSION >= 2001008)
+     SFNT_Service       sfnt;
+     TT_Face            face;
+     FT_Error           error;
+@@ -1043,6 +1133,7 @@
+ 	    if( bitmap_metrics == NULL ) {
+ 		if ( sbitchk_incomplete_but_exist==0 && (instance->ttcap.flags & TTCAP_IS_VERY_LAZY) ) {
+ 		    if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
++		                               face->num_hmetrics,
+ 					       instance->ttcap.vl_slant,
+ 					       &instance->transformation.matrix,
+ 					       &bbox, &outline_hori_advance, 
+@@ -1221,6 +1312,7 @@
+ 	if( is_outline == 1 ){
+ 	    if( correct ){
+ 		if( ft_get_very_lazy_bbox( idx, face->face, instance->size, 
++		                           face->num_hmetrics,
+ 					   instance->ttcap.vl_slant,
+ 					   &instance->transformation.matrix,
+ 					   &bbox, &outline_hori_advance, 
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
new file mode 100644
index 000000000..925263c00
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftfuncs.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-bj,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftfuncs.h.orig	2005-07-07 15:59:47.000000000 +0100
++++ lib/font/FreeType/ftfuncs.h	2006-06-01 23:21:39.000000000 +0100
+@@ -47,6 +47,7 @@
+     char *filename;
+     FT_Face face;
+     int bitmap;
++    FT_UInt num_hmetrics;
+     struct _FTInstance *instances;
+     struct _FTInstance *active_instance;
+     struct _FTFace *next;       /* link to next face in bucket */
diff --git a/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
new file mode 100644
index 000000000..df7c97dce
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-font-FreeType-ftsystem.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-bk,v 1.3 2006/06/01 22:44:09 tron Exp $
+
+--- lib/font/FreeType/ftsystem.c.orig	2005-07-09 07:36:10.000000000 +0100
++++ lib/font/FreeType/ftsystem.c	2006-06-01 23:21:53.000000000 +0100
+@@ -35,7 +35,6 @@
+ #endif
+ #include <ft2build.h>
+ #include FT_CONFIG_CONFIG_H
+-#include FT_INTERNAL_DEBUG_H
+ #include FT_SYSTEM_H
+ #include FT_ERRORS_H
+ #include FT_TYPES_H
diff --git a/x11-servers/xorg-server-snap/files/patch-os-Imakefile b/x11-servers/xorg-server-snap/files/patch-os-Imakefile
new file mode 100644
index 000000000..bbedacae7
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-os-Imakefile
@@ -0,0 +1,12 @@
+--- programs/Xserver/os/Imakefile.orig	Wed Mar 23 11:58:45 2005
++++ programs/Xserver/os/Imakefile	Sun Apr 17 08:32:03 2005
+@@ -131,7 +131,8 @@
+ 		  $(RANDOM_DEFINES) $(BUGMSG) $(XTRANS_FAILDEFINES)
+        INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+ 		  -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
+-		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes
++		  -I$(TOP)/lib/Xau -I../lbx -I../Xprint Krb5Includes \
++		  -I$(INCROOT)/X11
+  DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
+ 		  $(TRANS_INCLUDES) $(CONNECTION_FLAGS) $(GETPEER_DEFINES) \
+ 		  DependDefines
diff --git a/x11-servers/xorg-server-snap/files/patch-sparc64kbd b/x11-servers/xorg-server-snap/files/patch-sparc64kbd
new file mode 100644
index 000000000..d4854adf9
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-sparc64kbd
@@ -0,0 +1,22 @@
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Wed Feb 23 23:28:28 2005
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Thu Feb 24 00:12:20 2005
+@@ -571,6 +571,19 @@
+      }
+   }
+ 
++#if defined(__sparc__) && defined(__FreeBSD__)
++  /*
++   * Taken from xf86Events.c:
++   * I really don't know what's wrong here, but passing the real
++   * scanCode offsets by one from XKB's point of view.
++   *
++   * (ecd@skynet.be, 980405)
++   */
++  if (pKbd->sunKbd) {
++    scanCode--;
++  }
++#endif
++
+ #ifndef TERMINATE_FALLBACK
+ #define TERMINATE_FALLBACK 1
+ #endif
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86.tmpl b/x11-servers/xorg-server-snap/files/patch-xf86.tmpl
new file mode 100644
index 000000000..3bf0b443d
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
new file mode 100644
index 000000000..bdd5bc51c
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
@@ -0,0 +1,76 @@
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sun Sep 26 04:17:42 2004
++++ programs/Xserver/hw/xfree86/common/xf86Events.c	Sun Sep 26 04:17:25 2004
+@@ -448,7 +448,7 @@
+ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
+   static Bool first_time = TRUE;
+ #endif
+-#if defined(__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   static int  kbdSun = -1;
+ #endif
+   /* Disable any keyboard processing while in suspend */
+@@ -464,7 +464,7 @@
+   }
+ #endif
+ 
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   if (kbdSun == -1) {
+     if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+ 	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
+@@ -474,7 +474,7 @@
+   }
+   if (kbdSun)
+     goto special;
+-#endif /* __sparc__ && __linux__ */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef __linux__
+   if (xf86Info.kbdCustomKeycodes) {
+@@ -525,6 +525,7 @@
+     } else
+ #endif /* i386 && SVR4 */
+     {
++      if (!xf86IsPc98()) {
+       switch (scanCode) {
+       case 0x59:        scanCode = KEY_0x59; break;
+       case 0x5a:        scanCode = KEY_0x5A; break;
+@@ -555,6 +556,7 @@
+       case 0x75:        scanCode = KEY_0x75; break;
+       case 0x76:        scanCode = KEY_0x76; break;
+       }
++      }  /*  end if (!xf86IsPc98())  */
+     }
+   }
+ 
+@@ -636,10 +638,12 @@
+    * they need to get the same key code as the base key on the same
+    * physical keyboard key.
+    */
++  if (!xf86IsPc98()) {
+   if (scanCode == KEY_SysReqest)
+     scanCode = KEY_Print;
+   else if (scanCode == KEY_Break)
+     scanCode = KEY_Pause;
++  }
+ #endif
+   
+   /*
+@@ -676,7 +680,7 @@
+     }
+   }
+ #endif
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ special:
+   if (kbdSun) {
+     switch (scanCode) {
+@@ -710,7 +714,7 @@
+      */
+     scanCode--;
+   }
+-#endif /* defined (__sparc__) && defined(__linux__) */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef XKB
+   if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile
new file mode 100644
index 000000000..5728d915f
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-xf86cfg-Imakefile
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	Sat Sep 11 15:11:04 2004
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	Sat Sep 11 15:11:07 2004
+@@ -25,6 +25,8 @@
+ SNPRINTFOBJS = snprintf.o
+ #endif
+ 
++XAWLIB = -lXaw
++
+ SRCS	=\
+ 	accessx.c\
+ 	card-cfg.c\
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86sym.c b/x11-servers/xorg-server-snap/files/patch-xf86sym.c
new file mode 100644
index 000000000..1372be144
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-xorgconf.cpp b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
new file mode 100644
index 000000000..e21fac8d8
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-xorgconf.cpp
@@ -0,0 +1,14 @@
+--- programs/Xserver/hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
++++ programs/Xserver/hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
+@@ -624,3 +624,11 @@
+     InputDevice "Keyboard1" "CoreKeyboard"
+ EndSection
+ 
++ 
++XCOMM  Two experimental extensions are available -- Composite and XEVIE.  Uncomment
++XCOMM  the section below to enable Composite.  Many extensions can also be disabled
++XCOMM  in this manner.
++
++XCOMM Section "Extensions"
++XCOMM 	Option "Composite" "Enable"
++XCOMM EndSection
diff --git a/x11-servers/xorg-server-snap/pkg-descr b/x11-servers/xorg-server-snap/pkg-descr
new file mode 100644
index 000000000..f95969b82
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
new file mode 100644
index 000000000..4e743e9ba
--- /dev/null
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -0,0 +1,212 @@
+bin/X
+bin/Xorg
+bin/getconfig
+bin/getconfig.pl
+bin/gtf
+%%SPARC64_NA%%%%PPC_NA%%bin/inb
+%%SPARC64_NA%%%%PPC_NA%%bin/inl
+%%SPARC64_NA%%%%PPC_NA%%bin/inw
+%%SPARC64_NA%%%%PPC_NA%%bin/ioport
+bin/kbd_mode
+bin/mmapr
+bin/mmapw
+%%SPARC64_NA%%%%PPC_NA%%bin/outb
+%%SPARC64_NA%%%%PPC_NA%%bin/outl
+%%SPARC64_NA%%%%PPC_NA%%bin/outw
+bin/pcitweak
+%%I386%%bin/scanpci
+bin/xorgcfg
+bin/xorgconfig
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
+lib/X11/Cards
+lib/X11/Options
+lib/X11/app-defaults/XOrgCfg
+lib/X11/doc/BUILD
+lib/X11/doc/BugReport
+lib/X11/doc/DESIGN
+lib/X11/doc/Install
+lib/X11/doc/LICENSE
+lib/X11/doc/OS2.Notes
+lib/X11/doc/README
+lib/X11/doc/README.DECtga
+lib/X11/doc/README.Darwin
+lib/X11/doc/README.I128
+lib/X11/doc/README.LynxOS
+lib/X11/doc/README.NetBSD
+lib/X11/doc/README.OpenBSD
+lib/X11/doc/README.SCO
+lib/X11/doc/README.SiS
+lib/X11/doc/README.Solaris
+lib/X11/doc/README.XKB-Config
+lib/X11/doc/README.XKB-Enhancing
+lib/X11/doc/README.apm
+lib/X11/doc/README.ati
+lib/X11/doc/README.chips
+lib/X11/doc/README.cyrix
+lib/X11/doc/README.dps
+lib/X11/doc/README.fonts
+lib/X11/doc/README.i740
+lib/X11/doc/README.i810
+lib/X11/doc/README.mouse
+lib/X11/doc/README.newport
+lib/X11/doc/README.r128
+lib/X11/doc/README.rapidaccess
+lib/X11/doc/README.rendition
+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/xorg.conf.eg
+lib/X11/xserver/SecurityPolicy
+%%ALPHA_NA%%lib/modules/drivers/apm_drv.so
+%%ALPHA_NA%%lib/modules/drivers/ark_drv.so
+lib/modules/drivers/ati_drv.so
+lib/modules/drivers/atimisc_drv.so
+%%ALPHA_NA%%lib/modules/drivers/chips_drv.so
+%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
+%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
+%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
+%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
+lib/modules/drivers/dummy_drv.so
+lib/modules/drivers/glint_drv.so
+%%ALPHA_NA%%lib/modules/drivers/i128_drv.so
+%%I386%%lib/modules/drivers/i740_drv.so
+%%SPARC64%%lib/modules/drivers/i740_drv.so
+%%ALPHA_NA%%lib/modules/drivers/i810_drv.so
+%%I386%%lib/modules/drivers/imstt_drv.so
+%%SPARC64%%lib/modules/drivers/imstt_drv.so
+lib/modules/drivers/mga_drv.so
+%%ALPHA_NA%%lib/modules/drivers/neomagic_drv.so
+%%I386%%lib/modules/drivers/newport_drv.so
+%%SPARC64%%lib/modules/drivers/newport_drv.so
+%%I386%%lib/modules/drivers/nsc_drv.so
+lib/modules/drivers/nv_drv.so
+lib/modules/drivers/r128_drv.so
+lib/modules/drivers/radeon_drv.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
+lib/modules/drivers/riva128.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
+%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
+%%IA64_NA%%lib/modules/drivers/savage_drv.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
+%%AMD64_I386%%lib/modules/drivers/sis_drv.so
+%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
+%%SPARC64%%lib/modules/drivers/suncg14_drv.so
+%%SPARC64%%lib/modules/drivers/suncg3_drv.so
+%%SPARC64%%lib/modules/drivers/suncg6_drv.so
+%%SPARC64%%lib/modules/drivers/sunffb_drv.so
+%%SPARC64%%lib/modules/drivers/sunleo_drv.so
+%%SPARC64%%lib/modules/drivers/suntcx_drv.so
+lib/modules/drivers/tdfx_drv.so
+%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
+%%ALPHA_NA%%lib/modules/drivers/trident_drv.so
+%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
+%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
+lib/modules/drivers/vga_drv.so
+%%I386%%lib/modules/drivers/via_drv.so
+%%ALPHA_NA%%lib/modules/drivers/vmware_drv.so
+lib/modules/extensions/libGLcore.so
+lib/modules/extensions/libdbe.so
+lib/modules/extensions/libdri.so
+lib/modules/extensions/libextmod.so
+lib/modules/extensions/libglx.so
+lib/modules/extensions/librecord.so
+lib/modules/extensions/libxtrap.so
+lib/modules/fonts/libbitmap.so
+lib/modules/fonts/libfreetype.so
+lib/modules/fonts/libtype1.so
+lib/modules/freebsd/libdrm.so
+lib/modules/input/acecad_drv.so
+lib/modules/input/calcomp_drv.so
+lib/modules/input/citron_drv.so
+lib/modules/input/digitaledge_drv.so
+lib/modules/input/dmc_drv.so
+lib/modules/input/dynapro_drv.so
+lib/modules/input/elographics_drv.so
+lib/modules/input/fpit_drv.so
+lib/modules/input/hyperpen_drv.so
+lib/modules/input/js_x_drv.so
+lib/modules/input/kbd_drv.so
+lib/modules/input/keyboard_drv.so
+lib/modules/input/magellan_drv.so
+lib/modules/input/microtouch_drv.so
+lib/modules/input/mouse_drv.so
+lib/modules/input/mutouch_drv.so
+lib/modules/input/palmax_drv.so
+lib/modules/input/penmount_drv.so
+lib/modules/input/spaceorb_drv.so
+lib/modules/input/summa_drv.so
+lib/modules/input/tek4957_drv.so
+lib/modules/input/void_drv.so
+lib/modules/input/wacom_drv.so
+%%ALPHA_NA%%lib/modules/libafb.so
+lib/modules/libcfb.so
+lib/modules/libcfb16.so
+%%SPARC64%%lib/modules/libcfb24.so
+lib/modules/libcfb32.so
+lib/modules/libddc.so
+lib/modules/libexa.so
+lib/modules/libfb.so
+lib/modules/libi2c.so
+lib/modules/libint10.so
+lib/modules/liblayer.so
+lib/modules/libmfb.so
+lib/modules/libpcidata.so
+lib/modules/librac.so
+lib/modules/libramdac.so
+lib/modules/libscanpci.so
+lib/modules/libshadow.so
+lib/modules/libshadowfb.so
+lib/modules/libvbe.so
+lib/modules/libvgahw.so
+lib/modules/libxaa.so
+lib/modules/libxf1bpp.so
+lib/modules/libxf4bpp.so
+lib/modules/libxf8_16bpp.so
+lib/modules/libxf8_32bpp.so
+%%SPARC64%%lib/modules/libxf8_32wid.so
+lib/modules/multimedia/bt829_drv.so
+lib/modules/multimedia/fi1236_drv.so
+lib/modules/multimedia/msp3430_drv.so
+lib/modules/multimedia/tda8425_drv.so
+lib/modules/multimedia/tda9850_drv.so
+lib/modules/multimedia/tda9885_drv.so
+lib/modules/multimedia/theatre200_drv.so
+lib/modules/multimedia/theatre_detect_drv.so
+lib/modules/multimedia/theatre_drv.so
+lib/modules/multimedia/uda1380_drv.so
+%%PPC_NA%%lib/modules/v10002d.uc
+%%PPC_NA%%lib/modules/v20002d.uc
+@dirrm lib/modules/multimedia
+@dirrm lib/modules/internal
+@dirrm lib/modules/input
+@dirrm lib/modules/freebsd
+@dirrm lib/modules/fonts
+@dirrm lib/modules/extensions
+@dirrm lib/modules/drivers
+@dirrm lib/X11/getconfig
+@dirrmtry include/X11/pixmaps
+@dirrmtry lib/X11/doc
+@dirrmtry lib/X11/etc
+@dirrmtry lib/X11/xserver
+@dirrmtry lib/modules
diff --git a/x11-servers/xorg-server-snap/scripts/configure b/x11-servers/xorg-server-snap/scripts/configure
new file mode 100644
index 000000000..e210b56ac
--- /dev/null
+++ b/x11-servers/xorg-server-snap/scripts/configure
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+LOCALDEF=$WRKDIR/.config
+
+rm -f $LOCALDEF
+echo "#define InstallXserverSetUID ${SUID_XSERVER}" >> $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 BuildXprint NO"			>> $LOCALDEF
+echo "#define BuildLibraries NO"		>> $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 BuildDevelDRIDrivers YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
+echo "#define DriverManDir \$(MANSOURCEPATH)4"	>> $LOCALDEF
+echo "#define DriverManSuffix 4x"		>> $LOCALDEF
+echo "#define MiscManDir \$(MANSOURCEPATH)7"	>> $LOCALDEF
+echo "#define MiscManSuffix 7x"			>> $LOCALDEF
+
+if [ X$WITH_DEBUG != X ]; then
+	export CFLAGS="-g $CFLAGS"
+	echo "#define InstPgmFlags"		>> $LOCALDEF
+	echo "#define MakeDllModules YES"	>> $LOCALDEF
+fi
+
+sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server-snap/scripts/configure.gen b/x11-servers/xorg-server-snap/scripts/configure.gen
new file mode 100644
index 000000000..ee7e1d88a
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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}