Update XFree86 ports, including linux_dri, to 4.3.0. Set IGNORE= in dri-devel

for being outdated. Thank you to all the testers and people who submitted patches for this update. Approved by: portmgr
svn path=/head/; revision=77104
2003-03-11 23:38:11 +00:00 · 2003-03-11 23:38:11 +00:00 · 62d3b1c1fc · 2021-03-31 03:12:20 +00:00
commit 62d3b1c1fc
parent e0a1fb1050
138 changed files with 1861 additions and 2679 deletions
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@ -6,16 +6,11 @@
 #

 PORTNAME=	imake
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X430src-1.tgz X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	Imake and other utilities from XFree86
@ -38,18 +33,17 @@ DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 PATCH_DIST_ARGS=	--force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/Imakefile \
-			xc/Makefile \
-			xc/config \
-			xc/include \
-			xc/extras \
-			xc/programs/Xserver/hw/xfree86/xf86Version.h
-MAN1=		imake.1 \
+MAN1=		ccmakedep.1 \
+		cleanlinks.1 \
+		gccmakedep.1 \
+		imake.1 \
 		lndir.1 \
 		makedepend.1 \
 		makeg.1 \
 		makestrs.1 \
+		mergelib.1 \
 		mkdirhier.1 \
+		mkhtmlindex.1 \
 		pswrap.1 \
 		revpath.1 \
 		rman.1 \
@ -57,81 +51,19 @@ MAN1=		imake.1 \
 MANCOMPRESSED=	yes
 SCRIPTS_ENV+=	OSVERSION=${OSVERSION} \
 		HasSecureRPC=${HasSecureRPC} \
-		HasXdmAuth=${HasXdmAuth} \
-		HasPam=${HasPam} \
-		BuildPexExt=${BuildPexExt} \
-		BuildXinerama=${BuildXinerama} \
-		BuildXIE=${BuildXIE} \
 		BuildAoutLibraries=${BuildAoutLibraries} \
-		ForceNormalLib=${ForceNormalLib} \
 		DebuggableLibraries=${DebuggableLibraries} \
-		JoystickSupport=${JoystickSupport} \
 		InstallXdmConfig=${InstallXdmConfig} \
 		InstallXinitConfig=${InstallXinitConfig} \
-		InstallAppDefFiles=${InstallAppDefFiles} \
-		ExtendedInputDevices=${ExtendedInputDevices} \
-		Build75DpiFonts=${Build75DpiFonts}  \
-		Build100DpiFonts=${Build100DpiFonts} \
-		BuildSpeedoFonts=${BuildSpeedoFonts} \
-		BuildType1Fonts=${BuildType1Fonts} \
-		BuildCIDFonts=${BuildCIDFonts} \
-		BuildTTFonts=${BuildTTFonts}
+		InstallAppDefFiles=${InstallAppDefFiles}
 INSTALL_TARGET=	install install.man
-# ---
-# User Config:
-# All variables are the same as Imake config macros.
-# For more details, see ${WRKDIR}/xc/config/cf/README.
-# Following will write to ${PREFIX}/lib/X11/config/xf86site.def,
-# and all of XFree86-4-* ports will use them as default value.
-# Of course, you can override them (at your own risk ;-).
-# Read scripts/configure for more details.
-# ---
+
 HasSecureRPC?=		YES
-HasXdmAuth?=		YES
-HasPam?=		YES
-BuildPexExt?=		YES
-BuildXinerama?=		YES
-BuildXIE?=		YES
 BuildAoutLibraries?=	NO
-ForceNormalLib?=	YES
 DebuggableLibraries?=	NO
-JoystickSupport?=	YES
 InstallXdmConfig?=	YES
 InstallXinitConfig?=	YES
 InstallAppDefFiles?=	YES
-Build75DpiFonts?=	YES
-Build100DpiFonts?=	YES
-BuildSpeedoFonts?=	YES
-BuildType1Fonts?=	YES
-BuildCIDFonts?=		YES
-BuildTTFonts?=		YES
-# ---
-# Undocumented variables:
-# ExtendedInputDevices: if you want to support some extended input device,
-#                       such as wacom tablets, set YES.
-#                       if NO, only mouse device will be supported.
-ExtendedInputDevices?=	YES
-# ---
-# Unconfigurable variables:
-# BuildXF86Setup=NO   : XF86Setup is now broken ;-(
-#
-# BuildFontServer     : if you want to use xfs, then do not install its ports.
-# BuildFonts          : if you don't need fonts, then do not install its ports.
-# BuildCyrillicFonts  : install ${PORTSDIR}/x11-fonts/XFree86-4-fontCyrillic
-# BuildLatin2Fonts    : install ${PORTSDIR}/x11-fonts/XFree86-4-fontLatin2
-#             [Note1] all of loadable modules (such as speedo, type1)
-#                      will be compiled/installed as default.
-#             [Note2] default/traditional X11 fonts are corrected under
-#                     ${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps.
-#
-# XF86CardDrivers     : XFree86-4-* ports try to support many devices.
-# XInputDrivers       : So if you want to config them, edit manualy.
-#
-# NothingOutsideProjectRoot=YES : any ports will not install to /etc/ dir.
-#             This means config files will be installed to ${PREFIX}/lib/X11.
-#             It's a traditional place ;-)
-# InstallXserverSetUID=NO : use Xwrapper.
-# End of XFree86 configrations

 post-install:
 	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@ -1,2 +1,2 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
--- a/devel/imake-4/files/patch-freetype
+++ b/devel/imake-4/files/patch-freetype
@ -1,11 +1,11 @@
--- cf/X11.tmpl.orig	Sat Jun  2 07:21:30 2001
-+++ cf/X11.tmpl	Fri Jun  8 00:44:19 2001
-@@ -2453,7 +2453,7 @@
- FREETYPE2DIR = Freetype2Dir
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
+--- cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
+++ cf/X11.tmpl	Sun Mar  2 21:07:54 2003
+@@ -3029,7 +3029,7 @@
+ #endif /* else BuildFreetype2Library */
+ 
+ #if BuildFreetype2Library || HasFreetype2
 -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
 +FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
 FREETYPE2DEFINES = -DFREETYPE2
 #endif
+ 
--- a/devel/imake-4/files/patch-imake.c
+++ b/devel/imake-4/files/patch-imake.c
@ -0,0 +1,22 @@
+--- imake/imake.c.orig	Tue Dec 17 04:21:38 2002
+++ imake/imake.c	Sat Jan  4 15:57:23 2003
+@@ -1384,6 +1384,19 @@
+ 	  name = &uts_name;
+       }
+ #endif
+# ifdef __FreeBSD__
+       /* Hack for FreeBSD ports "Cross Version" compiling system. */
+       {
+	 char *e;
+	 if ((e = getenv("OSREL")) != NULL && 
+	     strlen(name->sysname) + strlen(e) + 1 < SYS_NMLN) {
+	  strcpy(name->release, e);
+	  strcpy(name->version, name->sysname);
+	  strcat(name->version, " ");
+	  strcat(name->version, e);
+	 }
+       }
+# endif
+ 
+ #  if defined DEFAULT_OS_NAME
+ #   if defined CROSSCOMPILE
--- a/devel/imake-4/files/patch-imake::imake.c
+++ b/devel/imake-4/files/patch-imake::imake.c
@ -1,14 +0,0 @@
-
-$FreeBSD$
-
--- imake/imake.c	2002/05/10 23:41:31	1.1
-+++ imake/imake.c	2002/05/10 23:42:02
-@@ -1161,7 +1161,7 @@
- get_gcc_incdir(FILE *inFile)
- {
-   static char* gcc_path[] = {
-#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__)
-+#if defined(linux) || defined(__OpenBSD__) || defined (__GNU__) || defined(__FreeBSD__)
-     "/usr/bin/cc",	/* for Linux PostIncDir */
- #endif
-     "/usr/local/bin/gcc",
--- a/devel/imake-4/files/patch-xthreads
+++ b/devel/imake-4/files/patch-xthreads
@ -1,25 +0,0 @@
--- cf/FreeBSD.cf.orig	Thu Jun  7 16:25:47 2001
-+++ cf/FreeBSD.cf	Thu Jun  7 16:28:30 2001
-@@ -80,7 +80,6 @@
- /*
-  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-  */
-# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
- /*
-  * FreeBSD has tread-safe api but no getpwnam_r yet.
-  */
-@@ -91,8 +90,12 @@
- # else
- #  define BuildThreadStubLibrary  YES 
- #  define NeedUIThrStubs          YES 
-#  define ThreadsCompileFlags	-pthread
-#  define ThreadsLibraries 	-pthread
-+#  if (OSRelVersion >= 500016)
-+#   define ThreadsLibraries 	-lc_r
-+#  else
-+#   define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+#   define ThreadsLibraries 	-pthread
-+#  endif
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@ -49,6 +49,9 @@ lib/X11/config/cygwin.cf
 lib/X11/config/cygwin.rules
 lib/X11/config/cygwin.tmpl
 lib/X11/config/darwin.cf
+lib/X11/config/darwinLib.rules
+lib/X11/config/darwinLib.tmpl
+lib/X11/config/date.def
 lib/X11/config/fujitsu.cf
 lib/X11/config/generic.cf
 lib/X11/config/gnu.cf
@ -115,13 +118,18 @@ lib/X11/config/xf86.rules
 lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
+lib/X11/doc/html/ccmakedep.1.html
+lib/X11/doc/html/cleanlinks.1.html
+lib/X11/doc/html/gccmakedep.1.html
 lib/X11/doc/html/imake.1.html
 lib/X11/doc/html/lndir.1.html
 lib/X11/doc/html/makedepend.1.html
 lib/X11/doc/html/makeg.1.html
 lib/X11/doc/html/makestrs.1.html
 lib/X11/doc/html/manindex1.html
+lib/X11/doc/html/mergelib.1.html
 lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mkhtmlindex.1.html
 lib/X11/doc/html/pswrap.1.html
 lib/X11/doc/html/revpath.1.html
 lib/X11/doc/html/rman.1.html
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@ -11,144 +11,44 @@ isyes() {
    fi
 }

-configure () {
 rm -f $F

 echo "/*" >> $F
-echo "/* Followins are generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
+echo "/* The following was generated by FreeBSD imake-4/XFree86-4-* ports system." >> $F
 echo " */" >> $F
-if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then
-    echo "#ifndef HasSecureRPC"                 >> $F
-    echo "#define HasSecureRPC $HasSecureRPC" >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$HasXdmAuth != "X" ]; then
-    echo "#ifndef HasXdmAuth"               >> $F
-    echo "#define HasXdmAuth $HasXdmAuth" >> $F
-    echo "#endif"                           >> $F
-fi
-if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then
-    echo "#ifndef HasPam"                       >> $F
-    echo "#define HasPam $HasPam"             >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$BuildPexExt != "X" ]; then
-    echo "#ifndef BuildPexExt"                  >> $F
-    echo "#define BuildPexExt $BuildPexExt"   >> $F
-    echo "#endif"                               >> $F
-fi
-if [ X$BuildXinerama != "X" ]; then
-    echo "#ifndef BuildXinerama"                  >> $F
-    echo "#define BuildXinerama $BuildXinerama" >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$BuildXIE != "X" ]; then
-    echo "#ifndef BuildXIE"                       >> $F
-    echo "#define BuildXIE $BuildXIE"           >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$BuildAoutLibraries != "X" ]; then
-    echo "#ifndef BuildAoutLibraries"             >> $F
-    echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F
-    echo "#endif"                                 >> $F
-fi
-if [ X$ForceNormalLib != "X" ]; then
-    echo "#ifndef ForceNormalLib"                   >> $F
-    echo "#define ForceNormalLib $ForceNormalLib" >> $F
-    echo "#endif"                                   >> $F
-fi
+echo "#ifndef HasSecureRPC"			>> $F
+echo "#define HasSecureRPC $HasSecureRPC"	>> $F
+echo "#endif"					>> $F
+echo "#ifndef BuildAoutLibraries"		>> $F
+echo "#define BuildAoutLibraries $BuildAoutLibraries" >> $F
+echo "#endif"					>> $F
 isyes $DebuggableLibraries
 if [ $ret = YES -a $OSVERSION -ge 400000 ]; then
-    echo "#ifndef DebuggableLibraries"      >> $F
-    echo "#define DebuggableLibraries $ret" >> $F
-    echo "#endif"                           >> $F
+    echo "#ifndef DebuggableLibraries"		>> $F
+    echo "#define DebuggableLibraries $ret"	>> $F
+    echo "#endif"				>> $F
 fi
-if [ X$JoystickSupport != "X" ]; then
-    echo "#ifndef JoystickSupport"                    >> $F
-    echo "#define JoystickSupport $JoystickSupport" >> $F
-    echo "#endif"                                     >> $F
-fi
-if [ X$InstallXdmConfig != "X" ]; then
-    echo "#ifndef InstallXdmConfig"                     >> $F
-    echo "#define InstallXdmConfig $InstallXdmConfig" >> $F
-    echo "#endif"                                       >> $F
-fi
-if [ X$InstallXinitConfig != "X" ]; then
-    echo "#ifndef InstallXinitConfig"                       >> $F
-    echo "#define InstallXinitConfig $InstallXinitConfig" >> $F
-    echo "#endif"                                           >> $F
-fi
-if [ X$InstallAppDefFiles != "X" ]; then
-    echo "#ifndef InstallAppDefFiles"                       >> $F
-    echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F
-    echo "#endif"                                           >> $F
-fi
-if [ X$ExtendedInputDevices = XYES ]; then
-    echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
-				elographics magellan \
-				microtouch mutouch spaceorb summa \
-				wacom void citron"  >> $F
-else
-    echo "#define XInputDrivers mouse" >> $F
-fi
-if [ X$Build75DpiFonts != "X" ]; then
-    echo "#ifndef Build75DpiFonts"                       >> $F
-    echo "#define Build75DpiFonts $Build75DpiFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$Build100DpiFonts != "X" ]; then
-    echo "#ifndef Build100DpiFonts"                       >> $F
-    echo "#define Build100DpiFonts $Build100DpiFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildSpeedoFonts != "X" ]; then
-    echo "#ifndef BuildSpeedoFonts"                       >> $F
-    echo "#define BuildSpeedoFonts $BuildSpeedoFonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildType1Fonts != "X" ]; then
-    echo "#ifndef BuildType1Fonts"                       >> $F
-    echo "#define BuildType1Fonts $BuildType1Fonts"      >> $F
-    echo "#endif"                                        >> $F
-fi
-if [ X$BuildCIDFonts != "X" ]; then
-    echo "#ifndef BuildCIDFonts"                     >> $F
-    echo "#define BuildCIDFonts $BuildCIDFonts"      >> $F
-    echo "#endif"                                    >> $F
-fi
-if [ X$BuildTTFonts != "X" ]; then
-    echo "#ifndef BuildTTFonts"                    >> $F
-    echo "#define BuildTTFonts $BuildTTFonts"      >> $F
-    echo "#endif"                                  >> $F
-fi
-
-echo "#define BuildXF86Setup NO" >> $F
-echo "#define HasFreetype2 YES" >> $F
-echo "#define Freetype2Dir ${LOCALBASE}" >> $F
-cat >> $F <<EOF
-#ifndef XF86CardDrivers
-#ifdef i386Architecture
-#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
-                                neomagic i740 tdfx savage \
-                                cirrus vmware tseng trident chips apm \
-                                GlideDriver fbdev i128 \
-                                ati AgpGartDrivers DevelDrivers ark cyrix \
-				siliconmotion \
-				vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
-#else
-#ifdef AlphaArchitecture
-#define XF86CardDrivers         mga tdfx glint s3virge rendition tga \
-				savage nv DevelDrivers siliconmotion vga \
-				XF86OSCardDrivers XF86ExtraCardDrivers
-#endif
-#endif
-#endif
-EOF
-    # Never install something to outside ${X11BASE}!!
-    echo "#define NothingOutsideProjectRoot YES" >> $F
-}
-
-configure
+echo "#ifndef InstallXdmConfig"			>> $F
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $F
+echo "#endif"					>> $F
+echo "#ifndef InstallXinitConfig"		>> $F
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $F
+echo "#endif"					>> $F
+echo "#ifndef InstallAppDefFiles"		>> $F
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $F
+echo "#endif"					>> $F
+echo "#define HasXdmAuth YES"			>> $F
+echo "#define BuildXF86Setup NO"		>> $F
+echo "#define HasFreetype2 YES"			>> $F
+echo "#define Freetype2Dir ${LOCALBASE}"	>> $F
+echo "#define HasExpat YES"			>> $F
+echo "#define ExpatDir ${LOCALBASE}"		>> $F
+echo "#define HasFontconfig YES"		>> $F
+echo "#define FontconfigDir ${PREFIX}"		>> $F
+echo "#define HasLibpng YES"			>> $F
+echo "#define LibpngDir ${LOCALBASE}"		>> $F
+# Never install something to outside ${X11BASE}
+echo "#define NothingOutsideProjectRoot YES"	>> $F

 cat $F >> ${WRKDIR}/xc/config/cf/xf86site.def

@ -156,5 +56,6 @@ echo "#define ProjectRoot ${PREFIX}" > ${WRKDIR}/xc/config/cf/host.def

 cd ${WRKDIR}/xc
 touch config/cf/version.def
+touch config/cf/date.def
 make Makefile.boot
 make -f xmakefile SUBDIRS="include config" VerifyOS version.def Makefiles includes
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@ -25,6 +25,8 @@ RUN_DEPENDS=	XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server

 WRKSRC=		${WRKDIR}/xc

+IGNORE=		outdated, use updated XFree86 4.3.0 ports
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 MAKE_ENV=	FBSDCFLAGS="${CFLAGS}" FBSDCC="${CC}" FBSDCXX="${CXX}"
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@ -6,15 +6,14 @@
 #

 PORTNAME=	linux_dri
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	graphics linux
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc22/:x \
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
 		http://people.freebsd.org/~anholt/dri/files/:anholt
 DISTFILES=	Xbin.tgz:x \
+		Xmod.tgz:x \
 		linux-libglide.tar.gz:anholt \
-		linux-dri-tools.tar.gz:anholt \
-		linux_dri-${PORTVERSION}.tar.gz:anholt
+		linux-dri-tools.tar.gz:anholt
 DIST_SUBDIR=	linux_dri-${PORTVERSION}

 MAINTAINER=	anholt@freebsd.org
@ -26,20 +25,20 @@ USE_LINUX_PREFIX=	yes

 ONLY_FOR_ARCHS=	i386

-MODULELIST=	gamma_dri.so i810_dri.so mga_dri.so r128_dri.so \
-		radeon_dri.so sis_dri.so tdfx_dri.so
+MODULELIST=	gamma_dri.so i810_dri.so i830_dri.so mga_dri.so r128_dri.so \
+		r200_dri.so radeon_dri.so tdfx_dri.so
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 STRIP=

 do-install:
 	${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri
-	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so.1 ${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1 ${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so.1.2 ${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1.3 ${PREFIX}/usr/X11R6/lib
 .for i in ${MODULELIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/dri/${i} \
 		${PREFIX}/usr/X11R6/lib/modules/dri
 .endfor
-	#The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
+#	The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
 	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib
 	${INSTALL_PROGRAM} ${WRKDIR}/linux-libglide/libglide3-v5.so.0 ${PREFIX}/usr/X11R6/lib
 	${LN} -sf libglide3-v3.so.0 ${PREFIX}/usr/X11R6/lib/libglide3-v3.so
--- a/graphics/linux_dri/distinfo
+++ b/graphics/linux_dri/distinfo
@ -1,4 +1,4 @@
-MD5 (linux_dri-4.2.0/Xbin.tgz) = 91cae2fe84c8e5bf3d06a8c0cd8fd41d
-MD5 (linux_dri-4.2.0/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
-MD5 (linux_dri-4.2.0/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
-MD5 (linux_dri-4.2.0/linux_dri-4.2.0.tar.gz) = 601f9cc61e02168723c34bb97d3ac2e9
+MD5 (linux_dri-4.3.0/Xbin.tgz) = d3ed6afd605a10bbbc6dd6a8de88091e
+MD5 (linux_dri-4.3.0/Xmod.tgz) = e229aa71aec95c041c40563231396200
+MD5 (linux_dri-4.3.0/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
+MD5 (linux_dri-4.3.0/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
--- a/graphics/linux_dri/pkg-plist
+++ b/graphics/linux_dri/pkg-plist
@ -1,7 +1,9 @@
 usr/X11R6/bin/gears
 usr/X11R6/bin/glxinfo
 usr/X11R6/lib/libGL.so.1
+usr/X11R6/lib/libGL.so.1.2
 usr/X11R6/lib/libGLU.so.1
+usr/X11R6/lib/libGLU.so.1.3
 usr/X11R6/lib/libglide3.so.3
 usr/X11R6/lib/libglide3-v3.so
 usr/X11R6/lib/libglide3-v3.so.0
@ -11,10 +13,11 @@ usr/X11R6/lib/libglut.so.3.7.0
 usr/X11R6/lib/libglut.so.3
 usr/X11R6/lib/modules/dri/gamma_dri.so
 usr/X11R6/lib/modules/dri/i810_dri.so
+usr/X11R6/lib/modules/dri/i830_dri.so
 usr/X11R6/lib/modules/dri/mga_dri.so
 usr/X11R6/lib/modules/dri/r128_dri.so
 usr/X11R6/lib/modules/dri/radeon_dri.so
-usr/X11R6/lib/modules/dri/sis_dri.so
+usr/X11R6/lib/modules/dri/r200_dri.so
 usr/X11R6/lib/modules/dri/tdfx_dri.so
@exec mkdir -p usr/X11R6/lib/modules/dri
@dirrm usr/X11R6/lib/modules/dri
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	font100dpi
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 bitmap 100 dpi fonts

-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/100dpi

 do-configure:
--- a/x11-fonts/XFree86-4-font100dpi/distinfo
+++ b/x11-fonts/XFree86-4-font100dpi/distinfo
@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	font75dpi
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 bitmap 75 dpi fonts

-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/75dpi

 do-configure:
--- a/x11-fonts/XFree86-4-font75dpi/distinfo
+++ b/x11-fonts/XFree86-4-font75dpi/distinfo
@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@ -6,34 +6,25 @@
 #

 PORTNAME=	fontCyrillic
-PORTVERSION=	4.2.0
-PORTREVISION=   4
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
-MASTER_SITES=   ${MASTER_SITE_XFREE:S/$/:x/} \
-		http://koi8.pp.ru/dist/:xrus
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=      X${PORTVERSION:S/.//g}src-2.tgz:x \
-		xrus-2.3.1-xf4-bdf.tgz:xrus
+DISTFILES=	X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Cyrillic Fonts
+COMMENT=	XFree86-4 Cyrillic fonts

-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_ONLY=           X${PORTVERSION:S/.//g}src-2.tgz
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/cyrillic

-post-extract:
-	cd ${WRKSRC} && \
-	    ${TAR} zxf ${DISTDIR}/${DIST_SUBDIR}/xrus-2.3.1-xf4-bdf.tgz
-
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
--- a/x11-fonts/XFree86-4-fontCyrillic/distinfo
+++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo
@ -1,2 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/xrus-2.3.1-xf4-bdf.tgz) = af43b304e206217d43f97f5c1b8ccb9e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@ -6,25 +6,24 @@
 #

 PORTNAME=	fontDefaultBitmaps
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz X430src-1.tgz
+EXTRACT_ONLY=	X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 default bitmap fonts

-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc

 post-extract:
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
@ -1,2 +1,2 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@ -1,8 +1,10 @@
 lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/10x20-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/10x20-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-4.pcf.gz
@ -17,11 +19,27 @@ lib/X11/fonts/misc/12x24.pcf.gz
 lib/X11/fonts/misc/12x24rk.pcf.gz
 lib/X11/fonts/misc/18x18ja.pcf.gz
 lib/X11/fonts/misc/18x18ko.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-14.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-16.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/4x6-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/4x6-KOI8-R.pcf.gz
+lib/X11/fonts/misc/4x6.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/5x7-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/5x7-ISO8859-4.pcf.gz
@ -36,6 +54,7 @@ lib/X11/fonts/misc/5x8-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/5x8-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/5x8-ISO8859-4.pcf.gz
@ -50,6 +69,7 @@ lib/X11/fonts/misc/6x10-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x10-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x10-ISO8859-4.pcf.gz
@ -64,6 +84,7 @@ lib/X11/fonts/misc/6x12-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x12-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x12-ISO8859-4.pcf.gz
@ -75,9 +96,11 @@ lib/X11/fonts/misc/6x12-KOI8-R.pcf.gz
 lib/X11/fonts/misc/6x12.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz
@ -92,6 +115,7 @@ lib/X11/fonts/misc/6x13B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13B-ISO8859-4.pcf.gz
@ -105,6 +129,7 @@ lib/X11/fonts/misc/6x13O-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x13O-ISO8859-4.pcf.gz
@ -117,6 +142,7 @@ lib/X11/fonts/misc/6x9-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x9-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/6x9-ISO8859-4.pcf.gz
@ -128,9 +154,11 @@ lib/X11/fonts/misc/6x9-KOI8-R.pcf.gz
 lib/X11/fonts/misc/6x9.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz
@ -142,9 +170,11 @@ lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz
 lib/X11/fonts/misc/7x13.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13B-ISO8859-4.pcf.gz
@ -155,9 +185,11 @@ lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/7x13B.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x13O-ISO8859-4.pcf.gz
@ -167,9 +199,11 @@ lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/7x13O.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x14-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x14-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x14-ISO8859-4.pcf.gz
@ -182,9 +216,11 @@ lib/X11/fonts/misc/7x14-KOI8-R.pcf.gz
 lib/X11/fonts/misc/7x14.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x14B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x14B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/7x14B-ISO8859-4.pcf.gz
@ -198,6 +234,7 @@ lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz
@ -212,6 +249,7 @@ lib/X11/fonts/misc/8x13B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13B-ISO8859-4.pcf.gz
@ -225,6 +263,7 @@ lib/X11/fonts/misc/8x13O-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/8x13O-ISO8859-4.pcf.gz
@ -236,9 +275,11 @@ lib/X11/fonts/misc/8x16.pcf.gz
 lib/X11/fonts/misc/8x16rk.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x15-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x15-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x15-ISO8859-4.pcf.gz
@ -250,9 +291,11 @@ lib/X11/fonts/misc/9x15-KOI8-R.pcf.gz
 lib/X11/fonts/misc/9x15.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x15B-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x15B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x15B-ISO8859-4.pcf.gz
@ -263,9 +306,11 @@ lib/X11/fonts/misc/9x15B-ISO8859-9.pcf.gz
 lib/X11/fonts/misc/9x15B.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/9x18-ISO8859-11.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x18-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x18-ISO8859-4.pcf.gz
@ -280,6 +325,7 @@ lib/X11/fonts/misc/9x18B-ISO8859-10.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-13.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-14.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/9x18B-ISO8859-16.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-2.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-3.pcf.gz
 lib/X11/fonts/misc/9x18B-ISO8859-4.pcf.gz
@ -305,6 +351,20 @@ lib/X11/fonts/misc/clR5x10.pcf.gz
 lib/X11/fonts/misc/clR5x6.pcf.gz
 lib/X11/fonts/misc/clR5x8.pcf.gz
 lib/X11/fonts/misc/clR6x10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-14.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-16.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/clR6x12-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/clR6x12-KOI8-R.pcf.gz
 lib/X11/fonts/misc/clR6x12.pcf.gz
 lib/X11/fonts/misc/clR6x13.pcf.gz
 lib/X11/fonts/misc/clR6x6.pcf.gz
@ -326,6 +386,8 @@ lib/X11/fonts/misc/cu-devnag12.pcf.gz
 lib/X11/fonts/misc/cu-lig12.pcf.gz
 lib/X11/fonts/misc/cu-pua12.pcf.gz
 lib/X11/fonts/misc/cu12.pcf.gz
+lib/X11/fonts/misc/cuarabic12.pcf.gz
+lib/X11/fonts/misc/cudevnag12.pcf.gz
 lib/X11/fonts/misc/cursor.pcf.gz
 lib/X11/fonts/misc/deccurs.pcf.gz
 lib/X11/fonts/misc/decsess.pcf.gz
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@ -6,23 +6,23 @@
 #

 PORTNAME=	fontEncodings
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITE_SUBDIR=	4.3.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 font encoding files

-BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts/encodings
 WRKSRC=			${WRKDIR}/xc/fonts/encodings

 do-configure:
--- a/x11-fonts/XFree86-4-fontEncodings/distinfo
+++ b/x11-fonts/XFree86-4-fontEncodings/distinfo
@ -1 +1 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
--- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist
+++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
@ -1,8 +1,8 @@
 lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 lib/X11/fonts/encodings/adobe-standard.enc.gz
 lib/X11/fonts/encodings/adobe-symbol.enc.gz
-lib/X11/fonts/encodings/dec-special.enc
 lib/X11/fonts/encodings/armscii-8.enc
+lib/X11/fonts/encodings/dec-special.enc
 lib/X11/fonts/encodings/encodings.dir
 lib/X11/fonts/encodings/ibm-cp437.enc
 lib/X11/fonts/encodings/ibm-cp850.enc
@ -30,6 +30,7 @@ lib/X11/fonts/encodings/microsoft-cp1255.enc
 lib/X11/fonts/encodings/microsoft-cp1256.enc
 lib/X11/fonts/encodings/microsoft-cp1257.enc
 lib/X11/fonts/encodings/microsoft-cp1258.enc
+lib/X11/fonts/encodings/microsoft-win3.1.enc
 lib/X11/fonts/encodings/mulearabic-0.enc
 lib/X11/fonts/encodings/mulearabic-1.enc
 lib/X11/fonts/encodings/mulearabic-2.enc
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	fontScalable
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-2.tgz
+DISTFILES=	X430src-4.tgz X430src-5.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Scalable font files
+COMMENT=	XFree86-4 scalable fonts

-BUILD_DEPENDS=	ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
 WRKSRC=			${WRKDIR}/xc/fonts

 # XFree86 User Config:
@ -68,7 +67,6 @@ PLIST_SUB+=	TT:="@comment "
 TT:=	-DBuildTTFonts=NO
 .endif

-
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 imake -DUseInstalled ${PROJECTROOT} -I${PREFIX}/lib/X11/config \
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@ -1 +1,2 @@
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
+MD5 (xc/X430src-5.tgz) = 4dbdbe9a85c8f7f98dd0ee015a3c7b4f
--- a/x11-fonts/XFree86-4-fontScalable/pkg-plist
+++ b/x11-fonts/XFree86-4-fontScalable/pkg-plist
@ -1,7 +1,5 @@
 %%CID:%%lib/X11/fonts/CID/fonts.dir
 %%CID:%%lib/X11/fonts/CID/fonts.scale
-lib/X11/fonts/PEX/Roman.phont
-lib/X11/fonts/PEX/Roman_M.phont
 %%SPEEDO:%%lib/X11/fonts/Speedo/encodings.dir
 %%SPEEDO:%%lib/X11/fonts/Speedo/font0419.spd
 %%SPEEDO:%%lib/X11/fonts/Speedo/font0582.spd
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@ -6,17 +6,17 @@
 #

 PORTNAME=	FontServer
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Font Server
+COMMENT=	XFree86-4 font server

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
@ -28,9 +28,8 @@ SCRIPTS_ENV=		CC="${CC}" \
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 xfs.1
 XBUILD_DIRS=		programs/xfs
-XINCLUDE_DIRS=		lib/xtrans programs/Xserver 
+XINCLUDE_DIRS=		lib/xtrans programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver programs/xfs

-
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@ -1,2 +1,3 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,25 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    if [ X$InstallFSConfig = "X" ]; then
-	InstallFSConfig=YES
-    fi
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
-
-    # I want to set this line.
-    # but the probrem is too deep. not yet done.
-    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
-
-    # disable some configs: there are not used this ports
-    for i in BuildFonts \
+# disable some options
+for i in BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@ -49,27 +38,28 @@ configure () {
 	LibHeaders \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define BuildFontServer YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
-    echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define BuildFontServer YES"		>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+if [ X$InstallFSConfig = "X" ]; then
+	InstallFSConfig=YES
+fi
+echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
+echo "#define FreeBSDBuildXfs YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define FreeBSDCC ${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	NestServer
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Xnest server
+COMMENT=	XFree86-4 nested X server

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,18 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    if [ X$InstallFSConfig = "X" ]; then
-	InstallFSConfig=YES
-    fi
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # disable some configs: there are not used this ports
-    for i in BuildFonts \
+# disable some options
+for i in BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@ -42,25 +38,23 @@ configure () {
 	LibHeaders \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define XnestServer YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define XnestServer YES"			>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	PrintServer
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 print Server
+COMMENT=	XFree86-4 print server

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
--- a/x11-servers/XFree86-4-PrintServer/scripts/configure
+++ b/x11-servers/XFree86-4-PrintServer/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,18 +13,17 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    if [ X$InstallFSConfig = "X" ]; then
-	InstallFSConfig=YES
-    fi
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # disable some configs: there are not used this ports
-    for i in BuildFonts \
+# disable some options
+for i in BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@ -42,25 +38,23 @@ configure () {
 	LibHeaders \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define XprtServer YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define XprtServer YES"			>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define FreeBSDCC ${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-Server
+# New ports collection makefile for:    XFree86-Server
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@ -6,48 +6,42 @@
 #

 PORTNAME=	Server
-PORTVERSION=	4.2.1
-PORTREVISION=	7
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz \
-			patch-nvchips.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
+INSTALLS_SHLIB=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
-	patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \
-	patch-alp_xaam.c
-EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
+.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h
+EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
-			HasSecureRPC=${HasSecureRPC} \
-			HasPam=${HasPam} \
-			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			HasGlide3=${HasGlide3} \
-			HaveMatroxHal=${HaveMatroxHal} \
+			WITH_DEBUG="${WITH_DEBUG}" \
 			CC="${CC}" \
 			CXX="${CXX}" \
 			CFLAGS="${CFLAGS}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
+			gtf.1 \
 			kbd_mode.1 \
 			pcitweak.1 \
 			xf86cfg.1 \
@ -55,29 +49,45 @@ MAN1=			XFree86.1 \
 MAN3=			XF86VidMode.3 \
 			XF86VidModeDeleteModeLine.3 \
 			XF86VidModeGetAllModeLines.3 \
+			XF86VidModeGetDotClocks.3 \
+			XF86VidModeGetGamma.3 \
+			XF86VidModeGetGammaRamp.3 \
+			XF86VidModeGetGammaRampSize.3 \
 			XF86VidModeGetModeLine.3 \
 			XF86VidModeGetMonitor.3 \
+			XF86VidModeGetPermissions.3 \
 			XF86VidModeGetViewPort.3 \
 			XF86VidModeLockModeSwitch.3 \
 			XF86VidModeModModeLine.3 \
 			XF86VidModeQueryExtension.3 \
 			XF86VidModeQueryVersion.3 \
+			XF86VidModeSetClientVersion.3 \
+			XF86VidModeSetGamma.3 \
+			XF86VidModeSetGammaRamp.3 \
 			XF86VidModeSetViewPort.3 \
 			XF86VidModeSwitchMode.3 \
 			XF86VidModeSwitchToMode.3 \
 			XF86VidModeValidateModeLine.3
-MAN4=			mga.4 \
-			tdfx.4 \
+MAN4=			citron.4 \
+			dynapro.4 \
+			elographics.4 \
 			glint.4 \
-			s3virge.4 \
+			kbd.4 \
+			keyboard.4 \
+			mga.4 \
+			microtouch.4 \
+			mouse.4 \
+			mutouch.4 \
+			nv.4 \
 			r128.4 \
 			rendition.4 \
+			s3virge.4 \
 			savage.4 \
-			nv.4 \
 			siliconmotion.4 \
+			tdfx.4 \
 			vga.4 \
-			keyboard.4 \
-			mouse.4
+			void.4 \
+			wacom.4
 MAN5=			XF86Config.5
 PKGMESSAGE=		${WRKDIR}/.pkg-message
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
@ -87,36 +97,16 @@ XINSTALL_MAN_DIRS=	programs/Xserver

 .include <bsd.port.pre.mk>

-# XFree86 User Config:
-# ---
-# Name          Default		Meaning
-# ----------------------------------------------------------------------------
-# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
-# HasPam	YES		support PAM (require FreeBSD-3.1 or later)
-# ExtendedInputDevices	YES	support extended input devices
-HasSecureRPC?=		DEFAULT
-HasPam?=		DEFAULT
-ExtendedInputDevices?=	DEFAULT
-
-.if ${ARCH} == i386
+.if ${ARCH} == i386 ||  ${ARCH} == alpha
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
-DISTFILES+=		freebsd-glide3headers.tar.gz:local
-HasGlide3=		YES
-XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/GL
+XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
 XINSTALL_DIRS+=		lib/GL/mesa/src/drv
-post-extract::
-	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
-		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
-pre-fetch::
-	@${ECHO_MSG} "DRI only built on i386"
 BuildXF86DRI=		NO
-HasGlide3=		NO
 PLIST_SUB+=		DRI="@comment "
 .endif # i386

-# Some things are not applicable if this machine is an alpha
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
@ -124,14 +114,24 @@ PLIST_SUB+=	ALPHA_NA=""
 MAN1+=		scanpci.1
 .endif

+.if ${ARCH} == alpha
+PLIST_SUB+=	IA64_NA="@comment "
+.else
+PLIST_SUB+=	IA64_NA=""
+.endif
+
+.if ${ARCH} == sparc64
+PLIST_SUB+=	SPARC64_NA="@comment "
+.else
+PLIST_SUB+=	SPARC64_NA=""
+.endif
+
 .if ${ARCH} == i386
-PLIST_SUB+=	I386:=""
+PLIST_SUB+=	I386=""
 MAN4+=		apm.4 \
 		chips.4 \
 		cirrus.4 \
 		cyrix.4 \
-		fbdev.4 \
-		fbdevhw.4 \
 		i128.4 \
 		i740.4 \
 		i810.4 \
@ -142,51 +142,7 @@ MAN4+=		apm.4 \
 		vesa.4 \
 		vmware.4
 .else
-PLIST_SUB+=	I386:="@comment "
-.endif
-
-.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES
-PLIST_SUB+=	XIE:=""
-MAN4+=		citron.4 \
-		dynapro.4 \
-		elographics.4 \
-		microtouch.4 \
-		mutouch.4 \
-		wacom.4 \
-		void.4
-.else
-PLIST_SUB+=	XIE:="@comment "
-.endif
-
-.if ${ARCH} == i386
-.if !defined(WITH_MATROX_GXX_DRIVER)
-HaveMatroxHal=		NO
-PLIST_SUB+=		MATROX="@comment "
-pre-fetch::
-	@${ECHO_MSG} "********************************************************"
-	@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to include Matrox's extra"
-	@${ECHO_MSG} "\"HALLIB\" binary driver"
-	@${ECHO_MSG} "********************************************************"
-.else
-NO_PACKAGE=	"Matrox drivers may not be distributed"
-RESTRICTED=	"Matrox drivers may not be distributed."
-HaveMatroxHal=		YES
-MGA_DRIVER_VERSION=	2.0
-MASTER_SITES+=		ftp://ftp.matrox.com/pub/mga/archive/linux/2002/:mga
-DISTFILES+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz:mga
-EXTRACT_ONLY+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz
-RESTRICTED_FILES=	mgadrivers-${MGA_DRIVER_VERSION}-src.tgz
-PLIST_SUB+=		MATROX=""
-post-extract::
-	${MV} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/HALlib/* \
-		${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/HALlib/
-post-install::
-	${INSTALL_DATA} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/README_HALLIB \
-		${PREFIX}/lib/X11/doc/README.mga_HALLIB
-.endif	# !WITH_MATROX_GXX_DRIVER
-.else
-HaveMatroxHal=		NO
-PLIST_SUB+=		MATROX="@comment "
+PLIST_SUB+=	I386="@comment "
 .endif

 post-extract::
@ -199,11 +155,9 @@ post-build:

 post-install::
 	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
-	strip ${PREFIX}/bin/XFree86
 	@if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \
-	ln -sf Xwrapper-4 ${PREFIX}/bin/X; \
+	${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
 	fi;
-	

 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@ -1,6 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
-MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9
--- a/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-Pci.h
@ -0,0 +1,13 @@
+--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig	Tue Mar  4 16:42:16 2003
+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Tue Mar  4 16:42:21 2003
+@@ -230,6 +230,10 @@
+ #  define ARCH_PCI_INIT linuxPciInit
+ #  define INCLUDE_XF86_MAP_PCI_MEM
+ #  define INCLUDE_XF86_NO_DOMAIN
+# elif defined(FreeBSD)
+#  define ARCH_PCI_INIT freebsdPciInit
+#  define INCLUDE_XF86_MAP_PCI_MEM
+#  define INCLUDE_XF86_NO_DOMAIN
+ # endif
+ # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
+ #elif defined(__i386__)
--- a/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c
@ -1,9 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c.orig	Thu Oct 17 19:22:24 2002
-+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c	Thu Oct 17 19:22:31 2002
-@@ -1,5 +1,5 @@
- /* (c) Itai Nahshon */
-#define DEBUG
-+
- /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
- 
- #include "xf86.h"
--- a/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-alpha_video.c
@ -0,0 +1,35 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig	Tue Oct 29 15:19:13 2002
+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	Tue Mar  4 16:28:04 2003
+@@ -33,7 +33,10 @@
+ #include <sys/param.h>
+ #ifndef __NetBSD__
+ #  include <sys/sysctl.h>
+-# else
+#  ifdef __FreeBSD__
+#     include <machine/sysarch.h>
+#  endif
+#else
+ #  include <machine/sysarch.h>
+ #endif
+ #include "xf86Axp.h"
+@@ -51,6 +54,8 @@
+ #define MAP_FAILED ((caddr_t)-1)
+ #endif
+ 
+axpDevice bsdGetAXP(void);
+
+ #ifndef __NetBSD__
+ extern unsigned long dense_base(void);
+ 
+@@ -260,10 +265,10 @@
+ #endif /* __OpenBSD__ */
+ 	   
+            xf86ErrorF("\tlinear framebuffer access unavailable\n");
+#endif
+ 	}
+ 	useDevMem = FALSE;
+ 	return;
+-#endif
+ }
+ 
+ void
--- a/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-i810_driver.c
@ -1,11 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig	Sat Jan 11 21:08:42 2003
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	Sat Jan 11 21:08:49 2003
-@@ -177,7 +177,7 @@
-    "XAACachePlanarMonoStipple",
-    "XAACreateInfoRec",
-    "XAADestroyInfoRec",
-   "XAAFillSolidRects"
-+   "XAAFillSolidRects",
-    "XAAInit",
-    "XAAOverlayFBfuncs",
-    "XAAScreenIndex",
--- a/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-mga_driver.c
@ -1,10 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig	Thu Sep 19 00:12:42 2002
-+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c	Thu Sep 19 00:13:56 2002
-@@ -2745,6 +2745,7 @@
- 	    case PCI_CHIP_MGAG200:
- 	    case PCI_CHIP_MGAG200_PCI:
- 	    case PCI_CHIP_MGAG400:	      
-+	    case PCI_CHIP_MGAG550:	      
- 	      if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
- 		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
- 			  pMga->FbCursorOffset >> 10);
--- a/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-r128_driver.c
@ -1,18 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig	Sat Jan 11 05:45:34 2003
-+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	Sat Jan 11 05:45:41 2003
-@@ -277,6 +277,7 @@
-     "drmAgpUnbind",
-     "drmAgpVendorId",
-     "drmAvailable",
-+    "drmFreeBufs",
-     "drmFreeVersion",
-     "drmGetVersion",
-     "drmMap",
-@@ -287,6 +288,7 @@
-     "drmR128ResetCCE",
-     "drmR128StartCCE",
-     "drmR128StopCCE",
-+    "drmR128TextureBlit",
-     "drmR128WaitForIdleCCE",
-     "drmR128FlushIndirectBuffer",
-     "drmScatterGatherAlloc",
--- a/x11-servers/XFree86-4-Server-snap/files/patch-savage-pci-id
+++ b/x11-servers/XFree86-4-Server-snap/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" },
--- a/x11-servers/XFree86-4-Server-snap/files/patch-text-mode.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-text-mode.c
@ -1,11 +0,0 @@
--- programs/Xserver/hw/xfree86/xf86cfg/text-mode.c.orig	Wed Oct 31 14:50:30 2001
-+++ programs/Xserver/hw/xfree86/xf86cfg/text-mode.c	Fri Jun  7 15:47:18 2002
-@@ -498,6 +498,8 @@
-     if (str == NULL)
- #ifdef WSCONS_SUPPORT
- 	str = "/dev/wsmouse";
-+#elif defined(__FreeBSD__)
-+	str = "/dev/sysmouse";
- #else
- 	str = "/dev/mouse";
- #endif
--- a/x11-servers/XFree86-4-Server-snap/files/patch-xf86Configure.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-xf86Configure.c
@ -1,12 +0,0 @@
--- programs/Xserver/hw/xfree86/common/xf86Configure.c.orig	Sat Jun  8 18:48:54 2002
-+++ programs/Xserver/hw/xfree86/common/xf86Configure.c	Sat Jun  8 18:50:09 2002
-@@ -79,6 +79,9 @@
- #elif defined(__QNXNTO__)
- static char *DFLT_MOUSE_PROTO = "OSMouse";
- static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0";
-+#elif defined(__FreeBSD__)
-+static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
-+static char *DFLT_MOUSE_PROTO = "MouseSystems";
- #else
- static char *DFLT_MOUSE_DEV = "/dev/mouse";
- static char *DFLT_MOUSE_PROTO = "auto";
--- a/x11-servers/XFree86-4-Server-snap/files/patch-xf86config.c
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-xf86config.c
@ -1,37 +0,0 @@
--- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig	Sat Oct 27 20:34:09 2001
-+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c	Sat Jun  8 11:35:18 2002
-@@ -382,7 +382,7 @@
- 
- static char *mousetype_name[] = {
- 	"Microsoft compatible (2-button protocol)",
-	"Mouse Systems (3-button protocol)",
-+	"Mouse Systems (3-button protocol) & FreeBSD moused protocol",
- 	"Bus Mouse",
- 	"PS/2 Mouse",
- 	"Logitech Mouse (serial, old type, Logitech protocol)",
-@@ -401,6 +401,9 @@
- #ifdef WSCONS_SUPPORT
- "On systems with wscons, the default is /dev/wsmouse.\n"
- #endif
-+#ifdef __FreeBSD__
-+"On FreeBSD, the default is /dev/sysmouse.\n"
-+#endif
- "\n";
- 
- static char *mousecomment_text =
-@@ -544,10 +547,12 @@
- 	printf("Mouse device: ");
- 	getstring(s);
- 	if (strlen(s) == 0)
-#ifndef WSCONS_SUPPORT
-		config_pointerdevice = "/dev/mouse";
-#else
-+#ifdef WSCONS_SUPPORT
- 		config_pointerdevice = "/dev/wsmouse";
-+#elif defined(__FreeBSD__)
-+		config_pointerdevice = "/dev/sysmouse";
-+#else
-+		config_pointerdevice = "/dev/mouse";
- #endif
- 	else {
- 		config_pointerdevice = Malloc(strlen(s) + 1);
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@ -1,7 +1,16 @@
 bin/X
 bin/XFree86
-%%XIE:%%bin/joycal
+bin/gtf
+bin/inb
+bin/inl
+bin/inw
+bin/ioport
 bin/kbd_mode
+bin/mmapr
+bin/mmapw
+bin/outb
+bin/outl
+bin/outw
 bin/pcitweak
 %%ALPHA_NA%%bin/scanpci
 bin/xf86cfg
@ -23,11 +32,11 @@ include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
-lib/X11/app-defaults/XF86Cfg
 lib/X11/Cards
 lib/X11/Options
 lib/X11/XF86Config.98
 lib/X11/XF86Config.eg
+lib/X11/app-defaults/XF86Cfg
 lib/X11/doc/BUILD
 lib/X11/doc/BugReport
 lib/X11/doc/DESIGN
@ -38,23 +47,24 @@ lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
 lib/X11/doc/README.DRIcomp
-%%I386:%%lib/X11/doc/README.I128
-%%I386:%%lib/X11/doc/README.SiS
-%%I386:%%lib/X11/doc/README.apm
+%%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
+%%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
-%%MATROX%%lib/X11/doc/README.mga_HALLIB
+%%I386%%lib/X11/doc/README.i740
+%%I386%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-%%I386:%%lib/X11/doc/README.newport
-%%I386:%%lib/X11/doc/README.r128
+%%I386%%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
+%%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/ServersOnly
 lib/X11/doc/Status
@ -65,6 +75,9 @@ lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/xserver/SecurityPolicy
+lib/libXfont.a
+lib/libXfont.so
+lib/libXfont.so.1
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
 lib/modules/codeconv/libBIG5.a
@ -96,54 +109,51 @@ lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
 %%DRI%%lib/modules/dri/gamma_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i810_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i830_dri.so
 %%DRI%%lib/modules/dri/mga_dri.so
 %%DRI%%lib/modules/dri/radeon_dri.so
+%%DRI%%lib/modules/dri/r200_dri.so
 %%DRI%%lib/modules/dri/r128_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
 %%DRI%%lib/modules/dri/tdfx_dri.so
-%%I386:%%lib/modules/drivers/apm_drv.o
-%%I386:%%lib/modules/drivers/ark_drv.o
+%%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
-%%I386:%%lib/modules/drivers/fbdev_drv.o
-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
-lib/modules/drivers/mga_drv.o
-%%MATROX%%lib/modules/drivers/mga_hal_drv.o
-%%I386:%%lib/modules/drivers/neomagic_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
+%%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
-lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/s3_drv.o
-lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/savage_drv.o
-lib/modules/drivers/siliconmotion_drv.o
-%%I386:%%lib/modules/drivers/sis_drv.o
-lib/modules/drivers/tdfx_drv.o
-lib/modules/drivers/tga_drv.o
-%%I386:%%lib/modules/drivers/trident_drv.o
-%%I386:%%lib/modules/drivers/tseng_drv.o
-%%I386:%%lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-%%I386:%%lib/modules/drivers/vmware_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.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
+%%I386%%lib/modules/drivers/sis_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
+%%I386%%lib/modules/drivers/vmware_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
 %%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
-lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
-lib/modules/extensions/libxie.a
 lib/modules/extensions/libxtrap.a
 lib/modules/fonts/libbitmap.a
 lib/modules/fonts/libfreetype.a
@ -151,20 +161,20 @@ lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
 %%DRI%%lib/modules/freebsd/libdrm.a
-%%XIE:%%lib/modules/input/citron_drv.o
-%%XIE:%%lib/modules/input/digitaledge_drv.o
-%%XIE:%%lib/modules/input/dynapro_drv.o
-%%XIE:%%lib/modules/input/elo2300_drv.o
-%%XIE:%%lib/modules/input/elographics_drv.o
-%%XIE:%%lib/modules/input/joystick_drv.o
-%%XIE:%%lib/modules/input/magellan_drv.o
-%%XIE:%%lib/modules/input/microtouch_drv.o
+lib/modules/input/citron_drv.o
+lib/modules/input/digitaledge_drv.o
+lib/modules/input/dynapro_drv.o
+lib/modules/input/elo2300_drv.o
+lib/modules/input/elographics_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
-%%XIE:%%lib/modules/input/mutouch_drv.o
-%%XIE:%%lib/modules/input/spaceorb_drv.o
-%%XIE:%%lib/modules/input/summa_drv.o
-%%XIE:%%lib/modules/input/void_drv.o
-%%XIE:%%lib/modules/input/wacom_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/spaceorb_drv.o
+lib/modules/input/summa_drv.o
+lib/modules/input/void_drv.o
+lib/modules/input/wacom_drv.o
 %%ALPHA_NA%%lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,45 +13,29 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # Now, we can use this configuration.
-    # Thanks, Trevor Johnson <trevor@jpj.net>
-    echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# Now, we can use this configuration.
+# Thanks, Trevor Johnson <trevor@jpj.net>
+echo "#define InstallXserverSetUID NO"		>> $LOCALDEF

-    # User Config.
-    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
-	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
-    fi
-    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
-	echo "#define HasPam $HasPam" >> $LOCALDEF
-    fi
-    if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then
-	echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
-				elographics magellan \
-				microtouch mutouch spaceorb summa \
-				wacom void citron" >> $LOCALDEF
-        echo "#define JoystickSupport YES" >> $LOCALDEF
-    else
-	echo "#define XInputDrivers mouse" >> $LOCALDEF	
-    fi
-    echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
-    echo "#define BuildXF86DRM NO" >> $LOCALDEF
-    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
-    echo "#define Glide3IncDir glide3" >> $LOCALDEF
+echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \
+			elographics magellan \
+			microtouch mutouch spaceorb summa \
+			wacom void citron"	>> $LOCALDEF
+echo "#define BuildXF86DRI ${BuildXF86DRI}"	>> $LOCALDEF
+echo "#define BuildXF86DRM NO"			>> $LOCALDEF
+echo "#define HasGlide3 YES"			>> $LOCALDEF

-    # Matrox driver support
-    echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF
-
-    # disable some configs: there are not used this ports
-    for i in \
+# disable some options
+for i in \
 	BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
@ -62,6 +43,7 @@ configure () {
 	BuildType1Fonts \
 	BuildCIDFonts \
 	BuildCyrillicFonts \
+	JoystickSupport \
 	XnestServer \
 	BuildFontServer \
 	XVirtualFramebufferServer \
@ -70,52 +52,55 @@ configure () {
 	LibInstall \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define LibInstallBuild YES" >> $LOCALDEF
-    echo "#define ModInstall YES" >> $LOCALDEF
-    echo "#define XF86Server YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # More of the i386 drivers could probably move to XF86CardDrivers.
-    # Is fbdev driver useful to us?
-    # GlideDriver was left out because we have no Glide2 package.
-    cat >> $LOCALDEF <<END
-#ifndef XF86CardDrivers
-#ifdef i386Architecture
-#define ArchSpecificDrivers	apm ark chips cirrus cyrix fbdev i740 \
-				i128 i810 neomagic sis trident tseng \
-				vesa vmware
-#define DriDrivers		gamma tdfx mga i810 i830 r128 radeon sis
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define LibInstallBuild YES"		>> $LOCALDEF
+echo "#define ModInstall YES"			>> $LOCALDEF
+echo "#define XF86Server YES"			>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
+echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+
+echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+if [ X$WITH_DEBUG != X ]; then
+	echo "#define FreeBSDCFLAGS -g ${CFLAGS}" >> $LOCALDEF
+	echo "#define InstPgmFlags"		>> $LOCALDEF
+else
+	echo "#define FreeBSDCFLAGS ${CFLAGS}"	>> $LOCALDEF
+fi
+
+# We need to test cards on these architectures and see what can be added 
+# to the other architectures.
+cat >> $LOCALDEF <<END
+#if defined(i386Architecture)
+# define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
+				neomagic i740 tdfx savage \
+				cirrus vmware tseng trident chips apm \
+				i128 nsc ati i810 ark cyrix siliconmotion \
+				vesa vga
+#elif defined(ia64Architecture)
+# define XF86CardDrivers	mga nv tdfx glint ati vga
 #elif defined(AlphaArchitecture)
-#define ArchSpecificDrivers
-#define DriDrivers		gamma tdfx mga r128 radeon
-#endif
-#define XF86CardDrivers		ati glint mga nv rendition s3 s3virge \
-				savage siliconmotion tdfx tga vga \
-				ArchSpecificDrivers DevelDrivers \
-				XF86OSCardDrivers XF86ExtraCardDrivers
+# define XF86CardDrivers	mga glint nv tga s3 s3virge rendition \
+				tdfx savage cirrus ati siliconmotion vga
+#elif defined(Sparc64Architecture)
+# define XF86CardDrivers	nv ati sunffb
 #endif
 END

-    echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
+echo "#define FreeBSDBuildXxserv YES"		>> $LOCALDEF

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-Server
+# New ports collection makefile for:    XFree86-Server
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@ -6,48 +6,42 @@
 #

 PORTNAME=	Server
-PORTVERSION=	4.2.1
-PORTREVISION=	7
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz \
-			patch-nvchips.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
 COMMENT=	XFree86-4 X server and related programs

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
+INSTALLS_SHLIB=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
-.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
-	patch-i810_driver.c patch-mga_driver.c patch-r128_driver.c \
-	patch-alp_xaam.c
-EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
+.for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h
+EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
-			HasSecureRPC=${HasSecureRPC} \
-			HasPam=${HasPam} \
-			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
-			HasGlide3=${HasGlide3} \
-			HaveMatroxHal=${HaveMatroxHal} \
+			WITH_DEBUG="${WITH_DEBUG}" \
 			CC="${CC}" \
 			CXX="${CXX}" \
 			CFLAGS="${CFLAGS}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
+			gtf.1 \
 			kbd_mode.1 \
 			pcitweak.1 \
 			xf86cfg.1 \
@ -55,29 +49,45 @@ MAN1=			XFree86.1 \
 MAN3=			XF86VidMode.3 \
 			XF86VidModeDeleteModeLine.3 \
 			XF86VidModeGetAllModeLines.3 \
+			XF86VidModeGetDotClocks.3 \
+			XF86VidModeGetGamma.3 \
+			XF86VidModeGetGammaRamp.3 \
+			XF86VidModeGetGammaRampSize.3 \
 			XF86VidModeGetModeLine.3 \
 			XF86VidModeGetMonitor.3 \
+			XF86VidModeGetPermissions.3 \
 			XF86VidModeGetViewPort.3 \
 			XF86VidModeLockModeSwitch.3 \
 			XF86VidModeModModeLine.3 \
 			XF86VidModeQueryExtension.3 \
 			XF86VidModeQueryVersion.3 \
+			XF86VidModeSetClientVersion.3 \
+			XF86VidModeSetGamma.3 \
+			XF86VidModeSetGammaRamp.3 \
 			XF86VidModeSetViewPort.3 \
 			XF86VidModeSwitchMode.3 \
 			XF86VidModeSwitchToMode.3 \
 			XF86VidModeValidateModeLine.3
-MAN4=			mga.4 \
-			tdfx.4 \
+MAN4=			citron.4 \
+			dynapro.4 \
+			elographics.4 \
 			glint.4 \
-			s3virge.4 \
+			kbd.4 \
+			keyboard.4 \
+			mga.4 \
+			microtouch.4 \
+			mouse.4 \
+			mutouch.4 \
+			nv.4 \
 			r128.4 \
 			rendition.4 \
+			s3virge.4 \
 			savage.4 \
-			nv.4 \
 			siliconmotion.4 \
+			tdfx.4 \
 			vga.4 \
-			keyboard.4 \
-			mouse.4
+			void.4 \
+			wacom.4
 MAN5=			XF86Config.5
 PKGMESSAGE=		${WRKDIR}/.pkg-message
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
@ -87,36 +97,16 @@ XINSTALL_MAN_DIRS=	programs/Xserver

 .include <bsd.port.pre.mk>

-# XFree86 User Config:
-# ---
-# Name          Default		Meaning
-# ----------------------------------------------------------------------------
-# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
-# HasPam	YES		support PAM (require FreeBSD-3.1 or later)
-# ExtendedInputDevices	YES	support extended input devices
-HasSecureRPC?=		DEFAULT
-HasPam?=		DEFAULT
-ExtendedInputDevices?=	DEFAULT
-
-.if ${ARCH} == i386
+.if ${ARCH} == i386 ||  ${ARCH} == alpha
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
-DISTFILES+=		freebsd-glide3headers.tar.gz:local
-HasGlide3=		YES
-XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/GL
+XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
 XINSTALL_DIRS+=		lib/GL/mesa/src/drv
-post-extract::
-	@(cd ${WRKSRC}/lib/GL/mesa/src/drv/tdfx/ ; \
-		tar xfpz ${DISTDIR}/${DIST_SUBDIR}/freebsd-glide3headers.tar.gz)
 .else
-pre-fetch::
-	@${ECHO_MSG} "DRI only built on i386"
 BuildXF86DRI=		NO
-HasGlide3=		NO
 PLIST_SUB+=		DRI="@comment "
 .endif # i386

-# Some things are not applicable if this machine is an alpha
 .if ${ARCH} == alpha
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
@ -124,14 +114,24 @@ PLIST_SUB+=	ALPHA_NA=""
 MAN1+=		scanpci.1
 .endif

+.if ${ARCH} == alpha
+PLIST_SUB+=	IA64_NA="@comment "
+.else
+PLIST_SUB+=	IA64_NA=""
+.endif
+
+.if ${ARCH} == sparc64
+PLIST_SUB+=	SPARC64_NA="@comment "
+.else
+PLIST_SUB+=	SPARC64_NA=""
+.endif
+
 .if ${ARCH} == i386
-PLIST_SUB+=	I386:=""
+PLIST_SUB+=	I386=""
 MAN4+=		apm.4 \
 		chips.4 \
 		cirrus.4 \
 		cyrix.4 \
-		fbdev.4 \
-		fbdevhw.4 \
 		i128.4 \
 		i740.4 \
 		i810.4 \
@ -142,51 +142,7 @@ MAN4+=		apm.4 \
 		vesa.4 \
 		vmware.4
 .else
-PLIST_SUB+=	I386:="@comment "
-.endif
-
-.if ${ExtendedInputDevices} == DEFAULT || ${ExtendedInputDevices} == YES
-PLIST_SUB+=	XIE:=""
-MAN4+=		citron.4 \
-		dynapro.4 \
-		elographics.4 \
-		microtouch.4 \
-		mutouch.4 \
-		wacom.4 \
-		void.4
-.else
-PLIST_SUB+=	XIE:="@comment "
-.endif
-
-.if ${ARCH} == i386
-.if !defined(WITH_MATROX_GXX_DRIVER)
-HaveMatroxHal=		NO
-PLIST_SUB+=		MATROX="@comment "
-pre-fetch::
-	@${ECHO_MSG} "********************************************************"
-	@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to include Matrox's extra"
-	@${ECHO_MSG} "\"HALLIB\" binary driver"
-	@${ECHO_MSG} "********************************************************"
-.else
-NO_PACKAGE=	"Matrox drivers may not be distributed"
-RESTRICTED=	"Matrox drivers may not be distributed."
-HaveMatroxHal=		YES
-MGA_DRIVER_VERSION=	2.0
-MASTER_SITES+=		ftp://ftp.matrox.com/pub/mga/archive/linux/2002/:mga
-DISTFILES+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz:mga
-EXTRACT_ONLY+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz
-RESTRICTED_FILES=	mgadrivers-${MGA_DRIVER_VERSION}-src.tgz
-PLIST_SUB+=		MATROX=""
-post-extract::
-	${MV} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/HALlib/* \
-		${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/HALlib/
-post-install::
-	${INSTALL_DATA} ${WRKDIR}/mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src/README_HALLIB \
-		${PREFIX}/lib/X11/doc/README.mga_HALLIB
-.endif	# !WITH_MATROX_GXX_DRIVER
-.else
-HaveMatroxHal=		NO
-PLIST_SUB+=		MATROX="@comment "
+PLIST_SUB+=	I386="@comment "
 .endif

 post-extract::
@ -199,11 +155,9 @@ post-build:

 post-install::
 	@${SED} -e s,/usr/X11R6,${PREFIX}, ${PKGMESSAGE}
-	strip ${PREFIX}/bin/XFree86
 	@if [ -f ${PREFIX}/bin/Xwrapper-4 ] ; then \
-	ln -sf Xwrapper-4 ${PREFIX}/bin/X; \
+	${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \
 	fi;
-	

 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.post.mk>
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@ -1,6 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
-MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9
--- a/x11-servers/XFree86-4-Server/files/patch-Pci.h
+++ b/x11-servers/XFree86-4-Server/files/patch-Pci.h
@ -0,0 +1,13 @@
+--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig	Tue Mar  4 16:42:16 2003
+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h	Tue Mar  4 16:42:21 2003
+@@ -230,6 +230,10 @@
+ #  define ARCH_PCI_INIT linuxPciInit
+ #  define INCLUDE_XF86_MAP_PCI_MEM
+ #  define INCLUDE_XF86_NO_DOMAIN
+# elif defined(FreeBSD)
+#  define ARCH_PCI_INIT freebsdPciInit
+#  define INCLUDE_XF86_MAP_PCI_MEM
+#  define INCLUDE_XF86_NO_DOMAIN
+ # endif
+ # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
+ #elif defined(__i386__)
--- a/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c
+++ b/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c
@ -1,9 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c.orig	Thu Oct 17 19:22:24 2002
-+++ programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c	Thu Oct 17 19:22:31 2002
-@@ -1,5 +1,5 @@
- /* (c) Itai Nahshon */
-#define DEBUG
-+
- /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaam.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */
- 
- #include "xf86.h"
--- a/x11-servers/XFree86-4-Server/files/patch-alpha_video.c
+++ b/x11-servers/XFree86-4-Server/files/patch-alpha_video.c
@ -0,0 +1,35 @@
+--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig	Tue Oct 29 15:19:13 2002
+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	Tue Mar  4 16:28:04 2003
+@@ -33,7 +33,10 @@
+ #include <sys/param.h>
+ #ifndef __NetBSD__
+ #  include <sys/sysctl.h>
+-# else
+#  ifdef __FreeBSD__
+#     include <machine/sysarch.h>
+#  endif
+#else
+ #  include <machine/sysarch.h>
+ #endif
+ #include "xf86Axp.h"
+@@ -51,6 +54,8 @@
+ #define MAP_FAILED ((caddr_t)-1)
+ #endif
+ 
+axpDevice bsdGetAXP(void);
+
+ #ifndef __NetBSD__
+ extern unsigned long dense_base(void);
+ 
+@@ -260,10 +265,10 @@
+ #endif /* __OpenBSD__ */
+ 	   
+            xf86ErrorF("\tlinear framebuffer access unavailable\n");
+#endif
+ 	}
+ 	useDevMem = FALSE;
+ 	return;
+-#endif
+ }
+ 
+ void
--- a/x11-servers/XFree86-4-Server/files/patch-i810_driver.c
+++ b/x11-servers/XFree86-4-Server/files/patch-i810_driver.c
@ -1,11 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig	Sat Jan 11 21:08:42 2003
-+++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	Sat Jan 11 21:08:49 2003
-@@ -177,7 +177,7 @@
-    "XAACachePlanarMonoStipple",
-    "XAACreateInfoRec",
-    "XAADestroyInfoRec",
-   "XAAFillSolidRects"
-+   "XAAFillSolidRects",
-    "XAAInit",
-    "XAAOverlayFBfuncs",
-    "XAAScreenIndex",
--- a/x11-servers/XFree86-4-Server/files/patch-mga_driver.c
+++ b/x11-servers/XFree86-4-Server/files/patch-mga_driver.c
@ -1,10 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c.orig	Thu Sep 19 00:12:42 2002
-+++ programs/Xserver/hw/xfree86/drivers/mga/mga_driver.c	Thu Sep 19 00:13:56 2002
-@@ -2745,6 +2745,7 @@
- 	    case PCI_CHIP_MGAG200:
- 	    case PCI_CHIP_MGAG200_PCI:
- 	    case PCI_CHIP_MGAG400:	      
-+	    case PCI_CHIP_MGAG550:	      
- 	      if(pMga->SecondCrtc == FALSE && pMga->HWCursor == TRUE) {
- 		outMGAdac(MGA1064_CURSOR_BASE_ADR_LOW, 
- 			  pMga->FbCursorOffset >> 10);
--- a/x11-servers/XFree86-4-Server/files/patch-r128_driver.c
+++ b/x11-servers/XFree86-4-Server/files/patch-r128_driver.c
@ -1,18 +0,0 @@
--- programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c.orig	Sat Jan 11 05:45:34 2003
-+++ programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	Sat Jan 11 05:45:41 2003
-@@ -277,6 +277,7 @@
-     "drmAgpUnbind",
-     "drmAgpVendorId",
-     "drmAvailable",
-+    "drmFreeBufs",
-     "drmFreeVersion",
-     "drmGetVersion",
-     "drmMap",
-@@ -287,6 +288,7 @@
-     "drmR128ResetCCE",
-     "drmR128StartCCE",
-     "drmR128StopCCE",
-+    "drmR128TextureBlit",
-     "drmR128WaitForIdleCCE",
-     "drmR128FlushIndirectBuffer",
-     "drmScatterGatherAlloc",
--- a/x11-servers/XFree86-4-Server/files/patch-savage-pci-id
+++ b/x11-servers/XFree86-4-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" },
--- a/x11-servers/XFree86-4-Server/files/patch-text-mode.c
+++ b/x11-servers/XFree86-4-Server/files/patch-text-mode.c
@ -1,11 +0,0 @@
--- programs/Xserver/hw/xfree86/xf86cfg/text-mode.c.orig	Wed Oct 31 14:50:30 2001
-+++ programs/Xserver/hw/xfree86/xf86cfg/text-mode.c	Fri Jun  7 15:47:18 2002
-@@ -498,6 +498,8 @@
-     if (str == NULL)
- #ifdef WSCONS_SUPPORT
- 	str = "/dev/wsmouse";
-+#elif defined(__FreeBSD__)
-+	str = "/dev/sysmouse";
- #else
- 	str = "/dev/mouse";
- #endif
--- a/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c
+++ b/x11-servers/XFree86-4-Server/files/patch-xf86Configure.c
@ -1,12 +0,0 @@
--- programs/Xserver/hw/xfree86/common/xf86Configure.c.orig	Sat Jun  8 18:48:54 2002
-+++ programs/Xserver/hw/xfree86/common/xf86Configure.c	Sat Jun  8 18:50:09 2002
-@@ -79,6 +79,9 @@
- #elif defined(__QNXNTO__)
- static char *DFLT_MOUSE_PROTO = "OSMouse";
- static char *DFLT_MOUSE_DEV = "/dev/devi/mouse0";
-+#elif defined(__FreeBSD__)
-+static char *DFLT_MOUSE_DEV = "/dev/sysmouse";
-+static char *DFLT_MOUSE_PROTO = "MouseSystems";
- #else
- static char *DFLT_MOUSE_DEV = "/dev/mouse";
- static char *DFLT_MOUSE_PROTO = "auto";
--- a/x11-servers/XFree86-4-Server/files/patch-xf86config.c
+++ b/x11-servers/XFree86-4-Server/files/patch-xf86config.c
@ -1,37 +0,0 @@
--- programs/Xserver/hw/xfree86/xf86config/xf86config.c.orig	Sat Oct 27 20:34:09 2001
-+++ programs/Xserver/hw/xfree86/xf86config/xf86config.c	Sat Jun  8 11:35:18 2002
-@@ -382,7 +382,7 @@
- 
- static char *mousetype_name[] = {
- 	"Microsoft compatible (2-button protocol)",
-	"Mouse Systems (3-button protocol)",
-+	"Mouse Systems (3-button protocol) & FreeBSD moused protocol",
- 	"Bus Mouse",
- 	"PS/2 Mouse",
- 	"Logitech Mouse (serial, old type, Logitech protocol)",
-@@ -401,6 +401,9 @@
- #ifdef WSCONS_SUPPORT
- "On systems with wscons, the default is /dev/wsmouse.\n"
- #endif
-+#ifdef __FreeBSD__
-+"On FreeBSD, the default is /dev/sysmouse.\n"
-+#endif
- "\n";
- 
- static char *mousecomment_text =
-@@ -544,10 +547,12 @@
- 	printf("Mouse device: ");
- 	getstring(s);
- 	if (strlen(s) == 0)
-#ifndef WSCONS_SUPPORT
-		config_pointerdevice = "/dev/mouse";
-#else
-+#ifdef WSCONS_SUPPORT
- 		config_pointerdevice = "/dev/wsmouse";
-+#elif defined(__FreeBSD__)
-+		config_pointerdevice = "/dev/sysmouse";
-+#else
-+		config_pointerdevice = "/dev/mouse";
- #endif
- 	else {
- 		config_pointerdevice = Malloc(strlen(s) + 1);
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@ -1,7 +1,16 @@
 bin/X
 bin/XFree86
-%%XIE:%%bin/joycal
+bin/gtf
+bin/inb
+bin/inl
+bin/inw
+bin/ioport
 bin/kbd_mode
+bin/mmapr
+bin/mmapw
+bin/outb
+bin/outl
+bin/outw
 bin/pcitweak
 %%ALPHA_NA%%bin/scanpci
 bin/xf86cfg
@ -23,11 +32,11 @@ include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
-lib/X11/app-defaults/XF86Cfg
 lib/X11/Cards
 lib/X11/Options
 lib/X11/XF86Config.98
 lib/X11/XF86Config.eg
+lib/X11/app-defaults/XF86Cfg
 lib/X11/doc/BUILD
 lib/X11/doc/BugReport
 lib/X11/doc/DESIGN
@ -38,23 +47,24 @@ lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
 lib/X11/doc/README.DRI
 lib/X11/doc/README.DRIcomp
-%%I386:%%lib/X11/doc/README.I128
-%%I386:%%lib/X11/doc/README.SiS
-%%I386:%%lib/X11/doc/README.apm
+%%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
+%%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
-%%MATROX%%lib/X11/doc/README.mga_HALLIB
+%%I386%%lib/X11/doc/README.i740
+%%I386%%lib/X11/doc/README.i810
 lib/X11/doc/README.mouse
-%%I386:%%lib/X11/doc/README.newport
-%%I386:%%lib/X11/doc/README.r128
+%%I386%%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
+%%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/ServersOnly
 lib/X11/doc/Status
@ -65,6 +75,9 @@ lib/X11/etc/sun.termcap
 lib/X11/etc/sun.terminfo
 lib/X11/etc/xmodmap.std
 lib/X11/xserver/SecurityPolicy
+lib/libXfont.a
+lib/libXfont.so
+lib/libXfont.so.1
 lib/modules/codeconv/libARABIC.a
 lib/modules/codeconv/libARMSCII8.a
 lib/modules/codeconv/libBIG5.a
@ -96,54 +109,51 @@ lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
 %%DRI%%lib/modules/dri/gamma_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i810_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/i830_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i810_dri.so
+%%I386%%%%DRI%%lib/modules/dri/i830_dri.so
 %%DRI%%lib/modules/dri/mga_dri.so
 %%DRI%%lib/modules/dri/radeon_dri.so
+%%DRI%%lib/modules/dri/r200_dri.so
 %%DRI%%lib/modules/dri/r128_dri.so
-%%I386:%%%%DRI%%lib/modules/dri/sis_dri.so
 %%DRI%%lib/modules/dri/tdfx_dri.so
-%%I386:%%lib/modules/drivers/apm_drv.o
-%%I386:%%lib/modules/drivers/ark_drv.o
+%%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
-%%I386:%%lib/modules/drivers/fbdev_drv.o
-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
-lib/modules/drivers/mga_drv.o
-%%MATROX%%lib/modules/drivers/mga_hal_drv.o
-%%I386:%%lib/modules/drivers/neomagic_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
+%%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
-lib/modules/drivers/rendition_drv.o
-lib/modules/drivers/s3_drv.o
-lib/modules/drivers/s3virge_drv.o
-lib/modules/drivers/savage_drv.o
-lib/modules/drivers/siliconmotion_drv.o
-%%I386:%%lib/modules/drivers/sis_drv.o
-lib/modules/drivers/tdfx_drv.o
-lib/modules/drivers/tga_drv.o
-%%I386:%%lib/modules/drivers/trident_drv.o
-%%I386:%%lib/modules/drivers/tseng_drv.o
-%%I386:%%lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-%%I386:%%lib/modules/drivers/vmware_drv.o
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/rendition_drv.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
+%%I386%%lib/modules/drivers/sis_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
+%%I386%%lib/modules/drivers/vmware_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdbe.a
 %%DRI%%lib/modules/extensions/libdri.a
 lib/modules/extensions/libextmod.a
 lib/modules/extensions/libglx.a
-lib/modules/extensions/libpex5.a
 lib/modules/extensions/librecord.a
-lib/modules/extensions/libxie.a
 lib/modules/extensions/libxtrap.a
 lib/modules/fonts/libbitmap.a
 lib/modules/fonts/libfreetype.a
@ -151,20 +161,20 @@ lib/modules/fonts/libspeedo.a
 lib/modules/fonts/libtype1.a
 lib/modules/fonts/libxtt.a
 %%DRI%%lib/modules/freebsd/libdrm.a
-%%XIE:%%lib/modules/input/citron_drv.o
-%%XIE:%%lib/modules/input/digitaledge_drv.o
-%%XIE:%%lib/modules/input/dynapro_drv.o
-%%XIE:%%lib/modules/input/elo2300_drv.o
-%%XIE:%%lib/modules/input/elographics_drv.o
-%%XIE:%%lib/modules/input/joystick_drv.o
-%%XIE:%%lib/modules/input/magellan_drv.o
-%%XIE:%%lib/modules/input/microtouch_drv.o
+lib/modules/input/citron_drv.o
+lib/modules/input/digitaledge_drv.o
+lib/modules/input/dynapro_drv.o
+lib/modules/input/elo2300_drv.o
+lib/modules/input/elographics_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
-%%XIE:%%lib/modules/input/mutouch_drv.o
-%%XIE:%%lib/modules/input/spaceorb_drv.o
-%%XIE:%%lib/modules/input/summa_drv.o
-%%XIE:%%lib/modules/input/void_drv.o
-%%XIE:%%lib/modules/input/wacom_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/spaceorb_drv.o
+lib/modules/input/summa_drv.o
+lib/modules/input/void_drv.o
+lib/modules/input/wacom_drv.o
 %%ALPHA_NA%%lib/modules/libafb.a
 lib/modules/libcfb.a
 lib/modules/libcfb16.a
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,45 +13,29 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # Now, we can use this configuration.
-    # Thanks, Trevor Johnson <trevor@jpj.net>
-    echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# Now, we can use this configuration.
+# Thanks, Trevor Johnson <trevor@jpj.net>
+echo "#define InstallXserverSetUID NO"		>> $LOCALDEF

-    # User Config.
-    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
-	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
-    fi
-    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
-	echo "#define HasPam $HasPam" >> $LOCALDEF
-    fi
-    if [ X$ExtendedInputDevices = XDEFAULT -o X$ExtendedInputDevices = XYES ]; then
-	echo "#define XInputDrivers mouse digitaledge dynapro elo2300 \
-				elographics magellan \
-				microtouch mutouch spaceorb summa \
-				wacom void citron" >> $LOCALDEF
-        echo "#define JoystickSupport YES" >> $LOCALDEF
-    else
-	echo "#define XInputDrivers mouse" >> $LOCALDEF	
-    fi
-    echo "#define BuildXF86DRI ${BuildXF86DRI}" >> $LOCALDEF
-    echo "#define BuildXF86DRM NO" >> $LOCALDEF
-    echo "#define HasGlide3 ${HasGlide3}" >> $LOCALDEF
-    echo "#define Glide3IncDir glide3" >> $LOCALDEF
+echo "#define XInputDrivers mouse keyboard digitaledge dynapro elo2300 \
+			elographics magellan \
+			microtouch mutouch spaceorb summa \
+			wacom void citron"	>> $LOCALDEF
+echo "#define BuildXF86DRI ${BuildXF86DRI}"	>> $LOCALDEF
+echo "#define BuildXF86DRM NO"			>> $LOCALDEF
+echo "#define HasGlide3 YES"			>> $LOCALDEF

-    # Matrox driver support
-    echo "#define HaveMatroxHal $HaveMatroxHal" >> $LOCALDEF
-
-    # disable some configs: there are not used this ports
-    for i in \
+# disable some options
+for i in \
 	BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
@ -62,6 +43,7 @@ configure () {
 	BuildType1Fonts \
 	BuildCIDFonts \
 	BuildCyrillicFonts \
+	JoystickSupport \
 	XnestServer \
 	BuildFontServer \
 	XVirtualFramebufferServer \
@ -70,52 +52,55 @@ configure () {
 	LibInstall \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define LibInstallBuild YES" >> $LOCALDEF
-    echo "#define ModInstall YES" >> $LOCALDEF
-    echo "#define XF86Server YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # More of the i386 drivers could probably move to XF86CardDrivers.
-    # Is fbdev driver useful to us?
-    # GlideDriver was left out because we have no Glide2 package.
-    cat >> $LOCALDEF <<END
-#ifndef XF86CardDrivers
-#ifdef i386Architecture
-#define ArchSpecificDrivers	apm ark chips cirrus cyrix fbdev i740 \
-				i128 i810 neomagic sis trident tseng \
-				vesa vmware
-#define DriDrivers		gamma tdfx mga i810 i830 r128 radeon sis
+echo "#define BuildServer YES"			>> $LOCALDEF
+echo "#define LibInstallBuild YES"		>> $LOCALDEF
+echo "#define ModInstall YES"			>> $LOCALDEF
+echo "#define XF86Server YES"			>> $LOCALDEF
+echo "#define BuildServersOnly YES"		>> $LOCALDEF
+echo "#define BuildGLXLibrary YES"		>> $LOCALDEF
+echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+
+echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+if [ X$WITH_DEBUG != X ]; then
+	echo "#define FreeBSDCFLAGS -g ${CFLAGS}" >> $LOCALDEF
+	echo "#define InstPgmFlags"		>> $LOCALDEF
+else
+	echo "#define FreeBSDCFLAGS ${CFLAGS}"	>> $LOCALDEF
+fi
+
+# We need to test cards on these architectures and see what can be added 
+# to the other architectures.
+cat >> $LOCALDEF <<END
+#if defined(i386Architecture)
+# define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
+				neomagic i740 tdfx savage \
+				cirrus vmware tseng trident chips apm \
+				i128 nsc ati i810 ark cyrix siliconmotion \
+				vesa vga
+#elif defined(ia64Architecture)
+# define XF86CardDrivers	mga nv tdfx glint ati vga
 #elif defined(AlphaArchitecture)
-#define ArchSpecificDrivers
-#define DriDrivers		gamma tdfx mga r128 radeon
-#endif
-#define XF86CardDrivers		ati glint mga nv rendition s3 s3virge \
-				savage siliconmotion tdfx tga vga \
-				ArchSpecificDrivers DevelDrivers \
-				XF86OSCardDrivers XF86ExtraCardDrivers
+# define XF86CardDrivers	mga glint nv tga s3 s3virge rendition \
+				tdfx savage cirrus ati siliconmotion vga
+#elif defined(Sparc64Architecture)
+# define XF86CardDrivers	nv ati sunffb
 #endif
 END

-    echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
+echo "#define FreeBSDBuildXxserv YES"		>> $LOCALDEF

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@ -6,24 +6,23 @@
 #

 PORTNAME=	VirtualFramebufferServer
-PORTVERSION=	4.2.1
-PORTREVISION=	1
+PORTVERSION=	4.3.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Virtual Framebuffer Server
+COMMENT=	XFree86-4 virtual framebuffer server

 RUN_DEPENDS=	${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps

--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,18 +13,18 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF

-    if [ X$InstallFSConfig = "X" ]; then
-	InstallFSConfig=YES
-    fi
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF		>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"			>> $LOCALDEF

-    # disable some configs: there are not used this ports
-    for i in BuildFonts \
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF
+
+# disable some options
+for i in BuildFonts \
 	Build75DpiFonts \
 	Build100DpiFonts \
 	BuildSpeedoFonts \
@ -42,26 +39,24 @@ configure () {
 	LibHeaders \
 	ForceNormalLib \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define BuildServer YES" >> $LOCALDEF
-    echo "#define XVirtualFramebufferServer YES" >> $LOCALDEF
-    echo "#define BuildServersOnly YES" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"				>> $LOCALDEF
+done

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define BuildServer YES"				>> $LOCALDEF
+echo "#define XVirtualFramebufferServer YES"		>> $LOCALDEF
+echo "#define BuildServersOnly YES"			>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
+echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
+echo "#define FreeBSDCC ${CC}"				>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"			>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"			>> $LOCALDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@ -6,24 +6,22 @@
 #

 PORTNAME=	clients
-PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTVERSION=	4.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.2.0
+MASTER_SITE_SUBDIR=	4.3.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz X420src-2.tgz
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+DISTFILES=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz \
+		X430src-4.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Client environments
+COMMENT=	XFree86-4 client programs and related files

 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \
+		Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
+		png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft

 XFREE86_VERSION=	4
@ -34,8 +32,6 @@ PATCHDIR=		${.CURDIR}/../XFree86-4-libraries/files
 SCRIPTS_ENV=		InstallXdmConfig=${InstallXdmConfig} \
 			InstallXinitConfig=${InstallXinitConfig} \
 			InstallAppDefFiles=${InstallAppDefFiles} \
-			HasSecureRPC=${HasSecureRPC} \
-			HasPam=${HasPam} \
 			CC="${CC}" \
 			CXX="${CXX}" \
 			CFLAGS="${CFLAGS}"
@ -61,20 +57,6 @@ XINSTALL_MAN_DIRS=	programs
 InstallXdmConfig?=	DEFAULT
 InstallXinitConfig?=	DEFAULT
 InstallAppDefFiles?=	DEFAULT
-HasSecureRPC?=		DEFAULT
-HasPam?=		DEFAULT
-
-post-extract:
-	( cd ${WRKDIR} && \
-	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
-	    | ${TAR} -xf - xc/fonts/util )
-
-post-patch:
-	cd ${WRKSRC}/nls; \
-	for i in Compose XI18N_OBJS XLC_LOCALE; do \
-		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
-	done

 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@ -22,6 +22,7 @@ MAN1=	Xmark.1 \
 	makepsres.1 \
 	mkcfm.1 \
 	mkfontdir.1 \
+	mkfontscale.1 \
 	oclock.1 \
 	proxymngr.1 \
 	resize.1 \
@ -46,6 +47,7 @@ MAN1=	Xmark.1 \
 	xclock.1 \
 	xcmsdb.1 \
 	xconsole.1 \
+	xcursorgen.1 \
 	xcutsel.1 \
 	xditview.1 \
 	xdm.1 \
@ -61,7 +63,6 @@ MAN1=	Xmark.1 \
 	xgamma.1 \
 	xgc.1 \
 	xhost.1 \
-	xieperf.1 \
 	xinit.1 \
 	xkbcomp.1 \
 	xkbevd.1 \
@ -79,6 +80,7 @@ MAN1=	Xmark.1 \
 	xmodmap.1 \
 	xon.1 \
 	xprop.1 \
+	xrandr.1 \
 	xrdb.1 \
 	xrefresh.1 \
 	xset.1 \
@ -88,12 +90,6 @@ MAN1=	Xmark.1 \
 	xsm.1 \
 	xstdcmap.1 \
 	xterm.1 \
-	xvidtune.1 \
-	xvinfo.1 \
-	xwd.1 \
-	xwininfo.1 \
-	xwud.1 \
-	xrandr.1 \
 	xtrap.1 \
 	xtrapchar.1 \
 	xtrapin.1 \
@ -101,4 +97,9 @@ MAN1=	Xmark.1 \
 	xtrapout.1 \
 	xtrapproto.1 \
 	xtrapreset.1 \
-	xtrapstats.1
+	xtrapstats.1 \
+	xvidtune.1 \
+	xvinfo.1 \
+	xwd.1 \
+	xwininfo.1 \
+	xwud.1
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@ -2,7 +2,7 @@ bin/Xmark
 bin/appres
 bin/atobm
 bin/bdftopcf
-bin/bdftruncate.pl
+bin/bdftruncate
 bin/beforelight
 bin/bitmap
 bin/bmtoa
@ -23,6 +23,7 @@ bin/luit
 bin/makepsres
 bin/mkcfm
 bin/mkfontdir
+bin/mkfontscale
 bin/oclock
 bin/proxymngr
 bin/resize
@ -37,7 +38,7 @@ bin/startx
 bin/sxpm
 bin/texteroids
 bin/twm
-bin/ucs2any.pl
+bin/ucs2any
 bin/uxterm
 bin/viewres
 bin/x11perf
@ -49,6 +50,7 @@ bin/xclipboard
 bin/xclock
 bin/xcmsdb
 bin/xconsole
+bin/xcursorgen
 bin/xcutsel
 bin/xditview
 bin/xdm
@ -64,7 +66,6 @@ bin/xfwp
 bin/xgamma
 bin/xgc
 bin/xhost
-bin/xieperf
 bin/xinit
 bin/xkbbell
 bin/xkbcomp
@ -154,11 +155,18 @@ lib/X11/app-defaults/Xgc
 lib/X11/app-defaults/Xmag
 lib/X11/app-defaults/Xman
 lib/X11/app-defaults/Xmessage
+lib/X11/app-defaults/Xmessage-color
 lib/X11/app-defaults/Xmh
 lib/X11/app-defaults/Xvidtune
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
 lib/X11/fonts/util/map-ISO8859-1
+lib/X11/fonts/util/map-ISO8859-10
+lib/X11/fonts/util/map-ISO8859-11
+lib/X11/fonts/util/map-ISO8859-13
+lib/X11/fonts/util/map-ISO8859-14
+lib/X11/fonts/util/map-ISO8859-15
+lib/X11/fonts/util/map-ISO8859-16
 lib/X11/fonts/util/map-ISO8859-2
 lib/X11/fonts/util/map-ISO8859-3
 lib/X11/fonts/util/map-ISO8859-4
@ -166,18 +174,169 @@ lib/X11/fonts/util/map-ISO8859-5
 lib/X11/fonts/util/map-ISO8859-7
 lib/X11/fonts/util/map-ISO8859-8
 lib/X11/fonts/util/map-ISO8859-9
-lib/X11/fonts/util/map-ISO8859-10
-lib/X11/fonts/util/map-ISO8859-13
-lib/X11/fonts/util/map-ISO8859-14
-lib/X11/fonts/util/map-ISO8859-15
 lib/X11/fonts/util/map-JISX0201.1976-0
 lib/X11/fonts/util/map-KOI8-R
+lib/X11/icons/default/index.theme
+lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/handhelds/cursors/X_cursor
+lib/X11/icons/handhelds/cursors/arrow
+lib/X11/icons/handhelds/cursors/based_arrow_down
+lib/X11/icons/handhelds/cursors/based_arrow_up
+lib/X11/icons/handhelds/cursors/bottom_left_corner
+lib/X11/icons/handhelds/cursors/bottom_right_corner
+lib/X11/icons/handhelds/cursors/bottom_side
+lib/X11/icons/handhelds/cursors/bottom_tee
+lib/X11/icons/handhelds/cursors/center_ptr
+lib/X11/icons/handhelds/cursors/circle
+lib/X11/icons/handhelds/cursors/cross
+lib/X11/icons/handhelds/cursors/cross_reverse
+lib/X11/icons/handhelds/cursors/crosshair
+lib/X11/icons/handhelds/cursors/dot
+lib/X11/icons/handhelds/cursors/dotbox
+lib/X11/icons/handhelds/cursors/double_arrow
+lib/X11/icons/handhelds/cursors/draft_large
+lib/X11/icons/handhelds/cursors/draft_small
+lib/X11/icons/handhelds/cursors/draped_box
+lib/X11/icons/handhelds/cursors/fleur
+lib/X11/icons/handhelds/cursors/gumby
+lib/X11/icons/handhelds/cursors/hand2
+lib/X11/icons/handhelds/cursors/left_ptr
+lib/X11/icons/handhelds/cursors/left_ptr_watch
+lib/X11/icons/handhelds/cursors/left_side
+lib/X11/icons/handhelds/cursors/left_tee
+lib/X11/icons/handhelds/cursors/ll_angle
+lib/X11/icons/handhelds/cursors/pencil
+lib/X11/icons/handhelds/cursors/plus
+lib/X11/icons/handhelds/cursors/right_ptr
+lib/X11/icons/handhelds/cursors/right_side
+lib/X11/icons/handhelds/cursors/right_tee
+lib/X11/icons/handhelds/cursors/sb_h_double_arrow
+lib/X11/icons/handhelds/cursors/sb_right_arrow
+lib/X11/icons/handhelds/cursors/sb_up_arrow
+lib/X11/icons/handhelds/cursors/sb_v_double_arrow
+lib/X11/icons/handhelds/cursors/shuttle
+lib/X11/icons/handhelds/cursors/tcross
+lib/X11/icons/handhelds/cursors/top_left_arrow
+lib/X11/icons/handhelds/cursors/top_left_corner
+lib/X11/icons/handhelds/cursors/top_right_corner
+lib/X11/icons/handhelds/cursors/top_side
+lib/X11/icons/handhelds/cursors/top_tee
+lib/X11/icons/handhelds/cursors/watch
+lib/X11/icons/handhelds/cursors/xterm
+lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/redglass/cursors/X_cursor
+lib/X11/icons/redglass/cursors/arrow
+lib/X11/icons/redglass/cursors/based_arrow_down
+lib/X11/icons/redglass/cursors/based_arrow_up
+lib/X11/icons/redglass/cursors/bottom_left_corner
+lib/X11/icons/redglass/cursors/bottom_right_corner
+lib/X11/icons/redglass/cursors/bottom_side
+lib/X11/icons/redglass/cursors/bottom_tee
+lib/X11/icons/redglass/cursors/center_ptr
+lib/X11/icons/redglass/cursors/circle
+lib/X11/icons/redglass/cursors/cross
+lib/X11/icons/redglass/cursors/cross_reverse
+lib/X11/icons/redglass/cursors/crosshair
+lib/X11/icons/redglass/cursors/dot
+lib/X11/icons/redglass/cursors/dotbox
+lib/X11/icons/redglass/cursors/double_arrow
+lib/X11/icons/redglass/cursors/draft_large
+lib/X11/icons/redglass/cursors/draft_small
+lib/X11/icons/redglass/cursors/draped_box
+lib/X11/icons/redglass/cursors/fleur
+lib/X11/icons/redglass/cursors/gumby
+lib/X11/icons/redglass/cursors/hand2
+lib/X11/icons/redglass/cursors/left_ptr
+lib/X11/icons/redglass/cursors/left_ptr_watch
+lib/X11/icons/redglass/cursors/left_side
+lib/X11/icons/redglass/cursors/left_tee
+lib/X11/icons/redglass/cursors/ll_angle
+lib/X11/icons/redglass/cursors/pencil
+lib/X11/icons/redglass/cursors/plus
+lib/X11/icons/redglass/cursors/right_ptr
+lib/X11/icons/redglass/cursors/right_side
+lib/X11/icons/redglass/cursors/right_tee
+lib/X11/icons/redglass/cursors/sb_h_double_arrow
+lib/X11/icons/redglass/cursors/sb_right_arrow
+lib/X11/icons/redglass/cursors/sb_up_arrow
+lib/X11/icons/redglass/cursors/sb_v_double_arrow
+lib/X11/icons/redglass/cursors/shuttle
+lib/X11/icons/redglass/cursors/tcross
+lib/X11/icons/redglass/cursors/top_left_arrow
+lib/X11/icons/redglass/cursors/top_left_corner
+lib/X11/icons/redglass/cursors/top_right_corner
+lib/X11/icons/redglass/cursors/top_side
+lib/X11/icons/redglass/cursors/top_tee
+lib/X11/icons/redglass/cursors/watch
+lib/X11/icons/redglass/cursors/xterm
+lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+lib/X11/icons/whiteglass/cursors/X_cursor
+lib/X11/icons/whiteglass/cursors/arrow
+lib/X11/icons/whiteglass/cursors/base_arrow_down
+lib/X11/icons/whiteglass/cursors/base_arrow_up
+lib/X11/icons/whiteglass/cursors/boat
+lib/X11/icons/whiteglass/cursors/bottom_left_corner
+lib/X11/icons/whiteglass/cursors/bottom_right_corner
+lib/X11/icons/whiteglass/cursors/bottom_side
+lib/X11/icons/whiteglass/cursors/bottom_tee
+lib/X11/icons/whiteglass/cursors/center_ptr
+lib/X11/icons/whiteglass/cursors/circle
+lib/X11/icons/whiteglass/cursors/cross
+lib/X11/icons/whiteglass/cursors/cross_reverse
+lib/X11/icons/whiteglass/cursors/crosshair
+lib/X11/icons/whiteglass/cursors/dot
+lib/X11/icons/whiteglass/cursors/dot_box_mask
+lib/X11/icons/whiteglass/cursors/double_arrow
+lib/X11/icons/whiteglass/cursors/draft_large
+lib/X11/icons/whiteglass/cursors/draft_small
+lib/X11/icons/whiteglass/cursors/draped_box
+lib/X11/icons/whiteglass/cursors/exchange
+lib/X11/icons/whiteglass/cursors/fleur
+lib/X11/icons/whiteglass/cursors/gumby
+lib/X11/icons/whiteglass/cursors/hand1
+lib/X11/icons/whiteglass/cursors/hand2
+lib/X11/icons/whiteglass/cursors/left_ptr
+lib/X11/icons/whiteglass/cursors/left_ptr_watch
+lib/X11/icons/whiteglass/cursors/left_side
+lib/X11/icons/whiteglass/cursors/left_tee
+lib/X11/icons/whiteglass/cursors/ll_angle
+lib/X11/icons/whiteglass/cursors/lr_angle
+lib/X11/icons/whiteglass/cursors/pencil
+lib/X11/icons/whiteglass/cursors/pirate
+lib/X11/icons/whiteglass/cursors/plus
+lib/X11/icons/whiteglass/cursors/question_arrow
+lib/X11/icons/whiteglass/cursors/right_ptr
+lib/X11/icons/whiteglass/cursors/right_side
+lib/X11/icons/whiteglass/cursors/right_tee
+lib/X11/icons/whiteglass/cursors/sailboat
+lib/X11/icons/whiteglass/cursors/sb_down_arrow
+lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
+lib/X11/icons/whiteglass/cursors/sb_left_arrow
+lib/X11/icons/whiteglass/cursors/sb_right_arrow
+lib/X11/icons/whiteglass/cursors/sb_up_arrow
+lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
+lib/X11/icons/whiteglass/cursors/shuttle
+lib/X11/icons/whiteglass/cursors/sizing
+lib/X11/icons/whiteglass/cursors/target
+lib/X11/icons/whiteglass/cursors/tcross
+lib/X11/icons/whiteglass/cursors/top_left_arrow
+lib/X11/icons/whiteglass/cursors/top_left_corner
+lib/X11/icons/whiteglass/cursors/top_right_corner
+lib/X11/icons/whiteglass/cursors/top_side
+lib/X11/icons/whiteglass/cursors/top_tee
+lib/X11/icons/whiteglass/cursors/trek
+lib/X11/icons/whiteglass/cursors/ul_angle
+lib/X11/icons/whiteglass/cursors/ur_angle
+lib/X11/icons/whiteglass/cursors/watch
+lib/X11/icons/whiteglass/cursors/xterm
 lib/X11/lbxproxy/AtomControl
 lib/X11/proxymngr/pmconfig
 lib/X11/rgb.txt
 lib/X11/rstart/commands/@List
 lib/X11/rstart/commands/ListContexts
 lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
 lib/X11/rstart/commands/x11r6/@List
 lib/X11/rstart/commands/x11r6/LoadMonitor
 lib/X11/rstart/commands/x11r6/Terminal
@ -204,9 +363,28 @@ lib/X11/xdm/chooser
 lib/X11/xdm/pixmaps/XFree86.xpm
 lib/X11/xdm/pixmaps/XFree86bw.xpm
 lib/X11/xdm/xdm-config
-lib/X11/xedit/lisp/fun.lsp
+lib/X11/xedit/lisp/indent.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.lsp
+lib/X11/xedit/lisp/progmodes/lisp.lsp
+lib/X11/xedit/lisp/progmodes/make.lsp
+lib/X11/xedit/lisp/progmodes/man.lsp
+lib/X11/xedit/lisp/progmodes/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/xedit.lsp
 lib/X11/xinit/xinitrc
+lib/X11/xkb/README
+lib/X11/xkb/README.config
+lib/X11/xkb/README.enhancing
 lib/X11/xkb/compat.dir
+lib/X11/xkb/compat/README
 lib/X11/xkb/compat/accessx
 lib/X11/xkb/compat/basic
 lib/X11/xkb/compat/complete
@ -221,9 +399,11 @@ lib/X11/xkb/compat/mousekeys
 lib/X11/xkb/compat/norepeat
 lib/X11/xkb/compat/pc
 lib/X11/xkb/compat/pc98
+lib/X11/xkb/compat/xfree86
 lib/X11/xkb/compat/xtest
 lib/X11/xkb/compiled/README
 lib/X11/xkb/geometry.dir
+lib/X11/xkb/geometry/README
 lib/X11/xkb/geometry/amiga
 lib/X11/xkb/geometry/ataritt
 lib/X11/xkb/geometry/dell
@ -247,6 +427,8 @@ lib/X11/xkb/geometry/sony
 lib/X11/xkb/geometry/sun
 lib/X11/xkb/geometry/winbook
 lib/X11/xkb/keycodes.dir
+lib/X11/xkb/keycodes/README
+lib/X11/xkb/keycodes/aliases
 lib/X11/xkb/keycodes/amiga
 lib/X11/xkb/keycodes/ataritt
 lib/X11/xkb/keycodes/digital/lk
@ -264,6 +446,7 @@ lib/X11/xkb/keycodes/sun
 lib/X11/xkb/keycodes/xfree86
 lib/X11/xkb/keycodes/xfree98
 lib/X11/xkb/keymap.dir
+lib/X11/xkb/keymap/README
 lib/X11/xkb/keymap/amiga
 lib/X11/xkb/keymap/ataritt
 lib/X11/xkb/keymap/digital/us
@ -308,6 +491,7 @@ lib/X11/xkb/keymap/sun/uk
 lib/X11/xkb/keymap/sun/us
 lib/X11/xkb/keymap/xfree86
 lib/X11/xkb/keymap/xfree98
+lib/X11/xkb/rules/README
 lib/X11/xkb/rules/sgi
 lib/X11/xkb/rules/sgi.lst
 lib/X11/xkb/rules/sun
@ -315,24 +499,34 @@ lib/X11/xkb/rules/sun.lst
 lib/X11/xkb/rules/xfree86
 lib/X11/xkb/rules/xfree86-it.lst
 lib/X11/xkb/rules/xfree86.lst
+lib/X11/xkb/rules/xfree86.xml
 lib/X11/xkb/semantics/basic
 lib/X11/xkb/semantics/complete
 lib/X11/xkb/semantics/default
 lib/X11/xkb/semantics/xtest
 lib/X11/xkb/symbols.dir
+lib/X11/xkb/symbols/README
+lib/X11/xkb/symbols/al
+lib/X11/xkb/symbols/altwin
 lib/X11/xkb/symbols/am
+lib/X11/xkb/symbols/ar
 lib/X11/xkb/symbols/az
 lib/X11/xkb/symbols/be
+lib/X11/xkb/symbols/ben
 lib/X11/xkb/symbols/bg
 lib/X11/xkb/symbols/br
+lib/X11/xkb/symbols/bs
 lib/X11/xkb/symbols/by
 lib/X11/xkb/symbols/ca
 lib/X11/xkb/symbols/ca_enhanced
+lib/X11/xkb/symbols/compose
 lib/X11/xkb/symbols/ctrl
 lib/X11/xkb/symbols/cz
 lib/X11/xkb/symbols/cz_qwerty
+lib/X11/xkb/symbols/czsk
 lib/X11/xkb/symbols/de
 lib/X11/xkb/symbols/de_CH
+lib/X11/xkb/symbols/dev
 lib/X11/xkb/symbols/digital/lk
 lib/X11/xkb/symbols/digital/pc
 lib/X11/xkb/symbols/digital/us
@ -349,19 +543,31 @@ lib/X11/xkb/symbols/fr_CH
 lib/X11/xkb/symbols/fujitsu/jp
 lib/X11/xkb/symbols/fujitsu/us
 lib/X11/xkb/symbols/gb
+lib/X11/xkb/symbols/ge_la
+lib/X11/xkb/symbols/ge_ru
 lib/X11/xkb/symbols/group
+lib/X11/xkb/symbols/guj
+lib/X11/xkb/symbols/gur
 lib/X11/xkb/symbols/hp/us
 lib/X11/xkb/symbols/hr
 lib/X11/xkb/symbols/hu
 lib/X11/xkb/symbols/hu_US
+lib/X11/xkb/symbols/hu_qwerty
+lib/X11/xkb/symbols/ie
 lib/X11/xkb/symbols/il
 lib/X11/xkb/symbols/il_phonetic
 lib/X11/xkb/symbols/inet
+lib/X11/xkb/symbols/ir
 lib/X11/xkb/symbols/is
 lib/X11/xkb/symbols/iso9995-3
 lib/X11/xkb/symbols/it
+lib/X11/xkb/symbols/iu
 lib/X11/xkb/symbols/jp
+lib/X11/xkb/symbols/kan
 lib/X11/xkb/symbols/keypad
+lib/X11/xkb/symbols/la
+lib/X11/xkb/symbols/level3
+lib/X11/xkb/symbols/lo
 lib/X11/xkb/symbols/lock
 lib/X11/xkb/symbols/lt
 lib/X11/xkb/symbols/lt_std
@ -381,74 +587,135 @@ lib/X11/xkb/symbols/macintosh/pt
 lib/X11/xkb/symbols/macintosh/se
 lib/X11/xkb/symbols/macintosh/us
 lib/X11/xkb/symbols/mk
+lib/X11/xkb/symbols/ml
+lib/X11/xkb/symbols/mm
+lib/X11/xkb/symbols/mt
+lib/X11/xkb/symbols/mt_us
 lib/X11/xkb/symbols/nec/jp
+lib/X11/xkb/symbols/nl
 lib/X11/xkb/symbols/no
+lib/X11/xkb/symbols/ogham
+lib/X11/xkb/symbols/ori
+lib/X11/xkb/symbols/pc/al
+lib/X11/xkb/symbols/pc/am
+lib/X11/xkb/symbols/pc/ar
+lib/X11/xkb/symbols/pc/be
+lib/X11/xkb/symbols/pc/ben
+lib/X11/xkb/symbols/pc/bg
+lib/X11/xkb/symbols/pc/br
+lib/X11/xkb/symbols/pc/by
+lib/X11/xkb/symbols/pc/cz
+lib/X11/xkb/symbols/pc/cz_qwerty
+lib/X11/xkb/symbols/pc/de
+lib/X11/xkb/symbols/pc/dev
+lib/X11/xkb/symbols/pc/dk
+lib/X11/xkb/symbols/pc/dvorak
+lib/X11/xkb/symbols/pc/ee
+lib/X11/xkb/symbols/pc/el
+lib/X11/xkb/symbols/pc/en_US
+lib/X11/xkb/symbols/pc/es
+lib/X11/xkb/symbols/pc/fi
+lib/X11/xkb/symbols/pc/fr
+lib/X11/xkb/symbols/pc/fr-latin9
+lib/X11/xkb/symbols/pc/gb
+lib/X11/xkb/symbols/pc/ge_la
+lib/X11/xkb/symbols/pc/ge_ru
+lib/X11/xkb/symbols/pc/guj
+lib/X11/xkb/symbols/pc/gur
+lib/X11/xkb/symbols/pc/hr
+lib/X11/xkb/symbols/pc/ie
+lib/X11/xkb/symbols/pc/il
+lib/X11/xkb/symbols/pc/il_phonetic
+lib/X11/xkb/symbols/pc/ir
+lib/X11/xkb/symbols/pc/is
+lib/X11/xkb/symbols/pc/it
+lib/X11/xkb/symbols/pc/iu
+lib/X11/xkb/symbols/pc/kan
+lib/X11/xkb/symbols/pc/la
+lib/X11/xkb/symbols/pc/latin
+lib/X11/xkb/symbols/pc/lo
+lib/X11/xkb/symbols/pc/lt
+lib/X11/xkb/symbols/pc/lv
+lib/X11/xkb/symbols/pc/mk
+lib/X11/xkb/symbols/pc/ml
+lib/X11/xkb/symbols/pc/mm
+lib/X11/xkb/symbols/pc/mt
+lib/X11/xkb/symbols/pc/mt_us
+lib/X11/xkb/symbols/pc/nl
+lib/X11/xkb/symbols/pc/no
+lib/X11/xkb/symbols/pc/ogham
+lib/X11/xkb/symbols/pc/ori
+lib/X11/xkb/symbols/pc/pc
+lib/X11/xkb/symbols/pc/pl
+lib/X11/xkb/symbols/pc/pl2
+lib/X11/xkb/symbols/pc/pt
+lib/X11/xkb/symbols/pc/ro
+lib/X11/xkb/symbols/pc/ru
+lib/X11/xkb/symbols/pc/sapmi
+lib/X11/xkb/symbols/pc/se
+lib/X11/xkb/symbols/pc/si
+lib/X11/xkb/symbols/pc/sk
+lib/X11/xkb/symbols/pc/sk_qwerty
+lib/X11/xkb/symbols/pc/sr
+lib/X11/xkb/symbols/pc/syr
+lib/X11/xkb/symbols/pc/syr_phonetic
+lib/X11/xkb/symbols/pc/tel
+lib/X11/xkb/symbols/pc/th
+lib/X11/xkb/symbols/pc/tj
+lib/X11/xkb/symbols/pc/tml
+lib/X11/xkb/symbols/pc/tr
+lib/X11/xkb/symbols/pc/ua
+lib/X11/xkb/symbols/pc/us
+lib/X11/xkb/symbols/pc/yu
 lib/X11/xkb/symbols/pc104
 lib/X11/xkb/symbols/pl
+lib/X11/xkb/symbols/pl2
 lib/X11/xkb/symbols/pt
 lib/X11/xkb/symbols/ralt
 lib/X11/xkb/symbols/ro
 lib/X11/xkb/symbols/ru
+lib/X11/xkb/symbols/ru_yawerty
+lib/X11/xkb/symbols/sapmi
 lib/X11/xkb/symbols/se
+lib/X11/xkb/symbols/se_FI
+lib/X11/xkb/symbols/se_NO
+lib/X11/xkb/symbols/se_SE
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/si
 lib/X11/xkb/symbols/sk
 lib/X11/xkb/symbols/sk_qwerty
 lib/X11/xkb/symbols/sony/us
 lib/X11/xkb/symbols/sr
+lib/X11/xkb/symbols/srvr_ctrl
 lib/X11/xkb/symbols/sun/se
 lib/X11/xkb/symbols/sun/us
+lib/X11/xkb/symbols/syr
+lib/X11/xkb/symbols/syr_phonetic
+lib/X11/xkb/symbols/tel
 lib/X11/xkb/symbols/th
+lib/X11/xkb/symbols/tj
+lib/X11/xkb/symbols/tml
 lib/X11/xkb/symbols/tr
+lib/X11/xkb/symbols/tr_f
 lib/X11/xkb/symbols/ua
 lib/X11/xkb/symbols/us
+lib/X11/xkb/symbols/us_group2
 lib/X11/xkb/symbols/us_group3
 lib/X11/xkb/symbols/us_intl
 lib/X11/xkb/symbols/vn
 lib/X11/xkb/symbols/xfree68/amiga
 lib/X11/xkb/symbols/xfree68/ataritt
+lib/X11/xkb/symbols/yu
 lib/X11/xkb/types.dir
+lib/X11/xkb/types/README
 lib/X11/xkb/types/basic
-lib/X11/xkb/types/cancel
+lib/X11/xkb/types/caps
 lib/X11/xkb/types/complete
 lib/X11/xkb/types/default
 lib/X11/xkb/types/extra
 lib/X11/xkb/types/iso9995
 lib/X11/xkb/types/mousekeys
-lib/X11/xkb/types/nocancel
 lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
 lib/X11/xsm/system.xsm
-@unexec rm -f %D/lib/X11/rstart/commands/x
-@unexec rm -f %D/lib/X11/rstart/commands/x11
-lib/X11/xkb/symbols/al
-lib/X11/xkb/symbols/altwin
-lib/X11/xkb/symbols/ar
-lib/X11/xkb/symbols/ben
-lib/X11/xkb/symbols/compose
-lib/X11/xkb/symbols/czsk
-lib/X11/xkb/symbols/dev
-lib/X11/xkb/symbols/ge_la
-lib/X11/xkb/symbols/ge_ru
-lib/X11/xkb/symbols/guj
-lib/X11/xkb/symbols/gur
-lib/X11/xkb/symbols/ir
-lib/X11/xkb/symbols/iu
-lib/X11/xkb/symbols/la
-lib/X11/xkb/symbols/level3
-lib/X11/xkb/symbols/mm
-lib/X11/xkb/symbols/mt
-lib/X11/xkb/symbols/mt_us
-lib/X11/xkb/symbols/nl
-lib/X11/xkb/symbols/pl2
-lib/X11/xkb/symbols/ru_yawerty
-lib/X11/xkb/symbols/sapmi
-lib/X11/xkb/symbols/se_FI
-lib/X11/xkb/symbols/se_NO
-lib/X11/xkb/symbols/se_SE
-lib/X11/xkb/symbols/tj
-lib/X11/xkb/symbols/tml
-lib/X11/xkb/symbols/tr_f
-lib/X11/xkb/symbols/us_group2
-lib/X11/xkb/symbols/yu
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@ -1,14 +1,11 @@
 #!/bin/sh

 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     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/xf86site.def
@ -16,38 +13,28 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def

-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF

-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
-    echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF

-    # User Config.
-    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
-	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
-    fi
-    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
-	echo "#define HasPam $HasPam" >> $LOCALDEF
-    fi
-    if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
-	echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
-    fi
-    if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
-	echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
-    fi
-    if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
-	echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
-    fi
-    if [ ! -d /sys -a ! -d /usr/src/sys ]; then
-        echo "#define BuildXF86DRI NO" >> $LOCALDEF
-    fi
+# User Config.
+if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
+fi
+if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
+fi
+if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
+fi

-    # disable some configs: there are not used this ports
-    for i in \
+# disable some options
+for i in \
 	InstallFSConfig \
 	BuildServer \
 	BuildFontServer \
@ -59,34 +46,33 @@ configure () {
 	BuildCIDFonts \
 	BuildCyrillicFonts \
 	BuildLatin2Fonts \
+	BuildPlugin \
 	LibHeaders \
-        LibInstall \
+	LibInstall \
 	ForceNormalLib \
 	ModInstall \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define LibInstallBuild  YES" >> $LOCALDEF
-    echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
-    echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
-    echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
-    echo "#define DontUseLibPathVar YES" >> $LOCALDEF
-    echo "#define PreloadSetup" >> $LOCALDEF
-    echo "#define BuildPlugin NO" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done

-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF

-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+echo "#define LibInstallBuild  YES"		>> $LOCALDEF
+echo "#define FreeBSDBuildXlib NO"		>> $LOCALDEF
+echo "#define FreeBSDBuildXbin YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
+echo "#define DontUseLibPathVar YES"		>> $LOCALDEF
+echo "#define PreloadSetup"			>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF

-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@ -6,30 +6,22 @@
 #

 PORTNAME=	documents
-PORTVERSION=	4.2.0
+PORTVERSION=	4.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-2.tgz X${PORTVERSION:S/.//g}src-3.tgz
+DISTFILES=	X430src-1.tgz \
+		X430src-6.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Document Files
+COMMENT=	XFree86-4 documentation

 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
-WRKSRC=			${WRKDIR}/xc/doc
-DEFFILE=		${PREFIX}/lib/X11/config/FreeBSD.ports.def
-INSTALL_TARGET=		install install.man
-
-post-extract:
-	(cd ${WRKDIR} && \
-	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-1.tgz \
-		${EXTRACT_AFTER_ARGS} xc/doc)
+WRKSRC=			${WRKDIR}/xc/doc/specs

 do-configure:
 	(cd ${WRKSRC} ; \
@ -39,7 +31,7 @@ do-configure:
 	 ${ECHO_CMD} "#define InstallHardcopyDocs YES" >> host.def ; \
 	 ${ECHO_CMD} "#define FreeBSDBuildXdoc YES" >> host.def ; \
 	 imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \
-		-DTOPDIR=.. -DCURDIR=.; \
+		-DTOPDIR=../.. -DCURDIR=.; \
 	 ${MAKE} Makefiles ; \
 	 ${MAKE} includes ; \
 	 ${MAKE} depend)
--- a/x11/XFree86-4-documents/distinfo
+++ b/x11/XFree86-4-documents/distinfo
@ -1,3 +1,3 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/X420src-3.tgz) = 560899e175a02ab592185b69756f539e
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-6.tgz) = 163d9864e1353a4a9f992cb3843c240f
+MD5 (xc/X430src-7.tgz) = e002e70f24098ca4f62fabd1c2809ed1
--- a/x11/XFree86-4-documents/files/patch-01
+++ b/x11/XFree86-4-documents/files/patch-01
@ -1,14 +0,0 @@
--- Imakefile.orig	Fri Dec 15 04:24:23 2000
-+++ Imakefile	Wed Dec 20 16:22:14 2000
-@@ -16,7 +16,11 @@
- HARDCOPYDIR = hardcopy
- #endif
- 
-+#if defined(FreeBSDBuildXdoc) || FreeBSDBuildXdoc
-+SUBDIRS = $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR)
-+#else
- SUBDIRS = man $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR)
-+#endif
- 
- all::
- 
--- a/x11/XFree86-4-documents/files/patch-04
+++ b/x11/XFree86-4-documents/files/patch-04
@ -1,5 +1,5 @@
--- specs/Imakefile.orig	Thu Jan 17 03:36:00 2002
-+++ specs/Imakefile	Mon Jan 21 03:13:38 2002
+--- Imakefile.orig	Wed Jan 16 10:36:00 2002
+++ Imakefile	Mon Mar  3 17:35:16 2003
@@ -13,7 +13,7 @@
 #else
 SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE /*PEX5*/ PM Render SM X11 XDMCP \
--- a/x11/XFree86-4-documents/pkg-plist
+++ b/x11/XFree86-4-documents/pkg-plist
@ -1,15 +1,12 @@
 lib/X11/doc/DPMS.TXT
 lib/X11/doc/DPMSLib.TXT
 lib/X11/doc/ICElib.TXT
-lib/X11/doc/INSTALL-X.org.TXT
 lib/X11/doc/LocaleDB.TXT
 lib/X11/doc/PM_spec.TXT
 lib/X11/doc/PostScript/DPMS.PS
 lib/X11/doc/PostScript/DPMSLib.PS
 lib/X11/doc/PostScript/ICElib.PS
-lib/X11/doc/PostScript/INSTALL-X.org.PS
 lib/X11/doc/PostScript/LocaleDB.PS
-lib/X11/doc/PostScript/RELNOTES-X.org.PS
 lib/X11/doc/PostScript/SMlib.PS
 lib/X11/doc/PostScript/XIMTransport.PS
 lib/X11/doc/PostScript/XiLib.PS
@ -49,7 +46,6 @@ lib/X11/doc/PostScript/xmu.PS
 lib/X11/doc/PostScript/xsmp.PS
 lib/X11/doc/PostScript/xtest.PS
 lib/X11/doc/PostScript/xtestlib.PS
-lib/X11/doc/RELNOTES-X.org.TXT
 lib/X11/doc/SMlib.TXT
 lib/X11/doc/XIMTransport.TXT
 lib/X11/doc/XiLib.TXT
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@ -6,27 +6,27 @@
 #

 PORTNAME=	libraries
-PORTVERSION=	4.2.1
-PORTREVISION=	7
+PORTVERSION=	4.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	4.2.0/:x \
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz:x \
+DISTFILES=	X430src-1.tgz:x \
+		X430src-2.tgz:x \
+		X430src-3.tgz:x \
 		Wraphelp2.gz:local
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+EXTRACT_ONLY=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz

 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 include/(shared) library kit
+COMMENT=	XFree86-4 libraries and headers

-BUILD_DEPENDS=	${X11BASE}/lib/X11/config/version.def:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS=	${X11BASE}/lib/X11/config/date.def:${PORTSDIR}/devel/imake-4
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	mkhtmlindex:${PORTSDIR}/devel/imake-4

 XFREE86_VERSION=	4
@ -37,51 +37,22 @@ MTREE_FILE=		/etc/mtree/BSD.x11-4.dist
 INSTALLS_SHLIB=		yes
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
-SCRIPTS_ENV=		HasSecureRPC=${HasSecureRPC} \
-			BuildPexExt=${BuildPexExt} \
-			BuildXinerama=${BuildXinerama} \
-			BuildXIE=${BuildXIE} \
-			BuildAoutLibraries=${BuildAoutLibraries} \
-			ForceNormalLib=${ForceNormalLib} \
-			DebuggableLibraries=${DebuggableLibraries} \
+SCRIPTS_ENV=		DebuggableLibraries=${DebuggableLibraries} \
 			CC="${CC}" \
 			CXX="${CXX}" \
 			CFLAGS="${CFLAGS}"
-MAKE_ENV=		PKGNAMEPREFIX=${PKGNAMEPREFIX} \
-			PORTNAME=${PORTNAME} \
-			PORTVERSION=${PORTVERSION}
-MAN1=			libxrx.1
-MAN3=			Xaw.3
+MAN3=			Xaw.3 Xcursor.3 Xrandr.3
 XBUILD_DIRS=		lib nls programs/Xserver/include \
-			programs/Xserver/hw/xfree86/parser \
-			programs/xrx
+			programs/Xserver/hw/xfree86/parser
 XINCLUDE_DIRS=		programs/proxymngr
 XINSTALL_DIRS=		include lib nls programs/Xserver/include \
-			programs/xrx/plugin \
 			programs/Xserver/hw/xfree86/parser
 XINSTALL_MAN_DIRS=	${XINSTALL_DIRS}

 # XFree86 User Config:
-# ---
-# Name          Default		Meaning
-# ----------------------------------------------------------------------------
-# HasSecureRPC	YES		build with SecureRPC (require FreeBSD-3 or later)
-# BuildPexExt	YES		build PEX extension
-# BuildXinerama	YES		build Xinerama extension
-# BuildXIE	YES		build XIE extension
-# BuildAoutLibraries  NO	build with old Aout libs.
-# ForceNormalLib      YES	build with static libs.
 # DebuggableLibraries NO	build with debug libs (require FreeBSD-4 or later)
 # ----------------------------------------------------------------------------
-# DEFAULT means ports will use values which set by ${PORTSDIR}/devel/imake-4
-#
-HasSecureRPC?=		DEFAULT
-BuildPexExt?=		DEFAULT
-BuildXinerama?=		DEFAULT
-BuildXIE?=		DEFAULT
-BuildAoutLibraries?=	DEFAULT
-ForceNormalLib?=	DEFAULT
-DebuggableLibraries?=	DEFAULT
+DebuggableLibraries?=	NO
 # End of XFree86 User Config

 .ifdef USE_XLIB
@ -110,17 +81,12 @@ post-extract:

 post-patch:
 	${CP} ${MASTERDIR}/files/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
-	cd ${WRKSRC}/nls; \
-	for i in Compose XI18N_OBJS XLC_LOCALE; do \
-		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
-	done

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \
 		${PREFIX}/include/X11/PM
 	${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \
 		${PREFIX}/include/X11/PM
-	@${MKHTMLINDEX} ${X11BASE}/lib/X11/doc/html

 .include "Makefile.inc"
 .include <bsd.port.post.mk>
--- a/x11/XFree86-4-libraries/Makefile.inc
+++ b/x11/XFree86-4-libraries/Makefile.inc
@ -13,9 +13,12 @@ MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}"
 _XBUILD_DIRS=	include ${XBUILD_DIRS}
 XINSTALL_DIRS?=	${XBUILD_DIRS}
 _XINCLUDE_DIRS=	${_XBUILD_DIRS} ${XINCLUDE_DIRS}
+XFREE86_HTML_MAN?= no

 .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
 	
@ -50,3 +53,7 @@ do-install:
 	@cd ${WRKSRC}/${i} && ${SETENV} ${MAKE_ENV} ${MAKE} install.man
 .endfor
 .endif
+.if ${XFREE86_HTML_MAN:L} == yes
+	@${MKHTMLINDEX} ${PREFIX}/lib/X11/doc/html
+.endif
+
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
--- a/x11/XFree86-4-libraries/files/patch-2
+++ b/x11/XFree86-4-libraries/files/patch-2
@ -1,35 +0,0 @@
--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig	Sun Jul 26 01:56:34 1998
-+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c	Mon Apr  8 14:32:01 2002
-@@ -29,7 +29,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-#include <machine/joystick.h>
-+#include <sys/joystick.h>
- #include <fcntl.h>
- 
- #ifdef XFree86LOADER
-@@ -56,6 +56,7 @@
-   int   changed = 0;
-   int   timeinmicros;
-   struct joystick	js;
-+  extern int errno;
-   
- #ifdef DEBUG
-   ErrorF("xf86JoystickOn: %s\n", name);
-@@ -96,7 +97,6 @@
-   if (*centerY < 0) {
-     *centerY = js.y;
-     xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
-    }
-   }
- 
-   return status;
-@@ -173,6 +173,7 @@
- }
- 
- #ifdef XFree86LOADER
-+#define MAGIC_DONE 1
- /*
-  * Entry point for XFree86 Loader
-  */
--- a/x11/XFree86-4-libraries/files/patch-DRI
+++ b/x11/XFree86-4-libraries/files/patch-DRI
@ -1,50 +0,0 @@
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile.orig	Thu Dec 13 09:24:52 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/tdfx/Makefile	Sat Jan 19 21:35:22 2002
-@@ -5,6 +5,7 @@
- SRCS=	tdfx_drv.c
- SRCS+=	device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS+=	${DEBUG_FLAGS} -I. -I.. 
-+KMODDIR = ${X11BASE}/lib/X11/kernel
- 
- @:
- 	ln -sf /sys @
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile.orig	Thu Dec 13 09:24:49 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/gamma/Makefile	Sat Jan 19 21:37:05 2002
-@@ -5,6 +5,7 @@
- SRCS    = gamma_drv.c gamma_dma.c
- SRCS   += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR=	${X11BASE}/lib/X11/kernel
- 
- @:
- 	ln -sf /sys @
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile.orig	Thu Dec 13 09:24:49 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/Makefile	Sat Jan 19 21:36:20 2002
-@@ -5,6 +5,7 @@
- SRCS=		mga_drv.c mga_state.c mga_warp.c mga_dma.c
- SRCS+=	device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS+=	${DEBUG_FLAGS} -I. -I..
-+KMODDIR=	${X11BASE}/lib/X11/kernel
- 
- @:
- 	ln -sf /sys @
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile.orig	Thu Dec 13 09:24:50 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/r128/Makefile	Mon Jan 21 10:17:46 2002
-@@ -5,6 +5,7 @@
- SRCS    = r128_cce.c r128_drv.c r128_state.c
- SRCS   += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR=	${X11BASE}/lib/X11/kernel
- 
- @:
- 	ln -sf /sys @
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile.orig	Thu Dec 13 09:24:51 2001
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/radeon/Makefile	Mon Jan 21 10:17:21 2002
-@@ -5,6 +5,7 @@
- SRCS    = radeon_cp.c radeon_drv.c radeon_state.c
- SRCS   += device_if.h bus_if.h pci_if.h opt_drm_linux.h
- CFLAGS += ${DEBUG_FLAGS} -I. -I..
-+KMODDIR=	${X11BASE}/lib/X11/kernel
- 
- @:
- 	ln -sf /sys @
--- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
+++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
@ -0,0 +1,77 @@
+--- config/cf/FreeBSD.cf.orig	Tue Jan 14 18:52:12 2003
+++ config/cf/FreeBSD.cf	Tue Mar  4 16:36:20 2003
+@@ -162,11 +162,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
+@@ -177,7 +177,7 @@
+ #if defined(UseInstalled)
+ #define DefaultCCOptions	/**/
+ #else
+-#define DefaultCCOptions	-ansi -pedantic -Dasm=__asm GccWarningOptions
+#define DefaultCCOptions	-ansi -Dasm=__asm GccWarningOptions
+ #endif
+ #endif
+ #ifndef ExtraLibraries
+@@ -228,13 +228,17 @@
+ #endif
+ 
+ /*
+- * 4.1/i386 and 5.0/i386 have the AGP driver.
+ * 4.1/i386 and 5.0/i386,alpha,ia64 have the AGP driver.
+  */
+ #ifndef HasAgpGart
+ #if defined(i386Architecture) && \
+ 	(OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1))
+ #define HasAgpGart		YES
+ #endif
+#if (defined(AlphaArchitecture) || defined(ia64Architecture)) && \
+	(OSMajorVersion >= 5)
+#define HasAgpGart		YES
+#endif
+ #endif
+ 
+ /*
+@@ -461,6 +465,9 @@
+ #ifdef Sparc64Architecture
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #endif
+#ifdef ia64Architecture
+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+#endif
+ 
+ #define StandardDefines	-DCSRG_BASED
+ 
+@@ -482,18 +489,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
+-#endif
+-#endif
+-
+-#ifdef i386Architecture
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
+-#else
+-# define OptimizedCDebugFlags -O
+-#endif
+#define DefaultGcc2i386Opt
+#define OptimizedCDebugFlags FreeBSDCFLAGS
+ 
+ #ifndef PreIncDir
+ # define PreIncDir	/usr/include
--- a/x11/XFree86-4-libraries/files/patch-Imake.cf
+++ b/x11/XFree86-4-libraries/files/patch-Imake.cf
@ -1,12 +1,12 @@
--- config/cf/Imake.cf.orig	Wed Sep 18 18:17:14 2002
-+++ config/cf/Imake.cf	Wed Sep 18 18:17:44 2002
-@@ -221,6 +221,10 @@
- #  define AlphaArchitecture
- #  undef __alpha__
+--- config/cf/Imake.cf.orig	Tue Mar  4 16:38:16 2003
+++ config/cf/Imake.cf	Tue Mar  4 16:38:18 2003
+@@ -232,6 +232,10 @@
+ #  define Sparc64Architecture
+ #  undef __sparc64__
 # endif
-+# ifdef __sparc64__
-+#  define Sparc64Architecture
-+#  undef __sparc64__
+# ifdef __ia64__
+#  define ia64Architecture
+#  undef __ia64__
 +# endif
 #endif /* __FreeBSD__ */
 
--- a/x11/XFree86-4-libraries/files/patch-Imake.rules
+++ b/x11/XFree86-4-libraries/files/patch-Imake.rules
@ -0,0 +1,48 @@
+--- config/cf/Imake.rules.orig	Thu Jan  2 14:43:27 2003
+++ config/cf/Imake.rules	Thu Jan  2 14:49:12 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)						@@\
+@@ -3126,6 +3126,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)
--- a/x11/XFree86-4-libraries/files/patch-Imake.tmpl
+++ b/x11/XFree86-4-libraries/files/patch-Imake.tmpl
@ -1,47 +1,52 @@
--- config/cf/Imake.tmpl.orig	Wed Oct 16 20:56:39 2002
-+++ config/cf/Imake.tmpl	Wed Oct 16 21:52:31 2002
-@@ -220,7 +220,7 @@
+--- 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 */
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+/* assume BINDIR in path */
 #define RmanCmd rman
 #else
 #define RmanCmd $(TOP)/config/util/rman
-@@ -1282,7 +1282,7 @@
+@@ -1348,7 +1349,8 @@
 #define LoaderLibPrefix /**/
 #endif
 #ifndef ImakeCmd
 -#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)	/* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+/* assume BINDIR in path */
 #define ImakeCmd imake
 #else
 #define ImakeCmd $(IMAKESRC)/imake
-@@ -1290,19 +1290,19 @@
+@@ -1359,19 +1361,22 @@
 #endif
 #ifndef DependCmd
 #if UseGccMakeDepend
 -#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)	/* 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 */
+#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 */
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+/* assume BINDIR in path */
 #define DependCmd makedepend
 #else
 #define DependCmd $(DEPENDSRC)/makedepend
-@@ -1329,21 +1329,21 @@
+@@ -1398,21 +1403,23 @@
 #ifndef ExportListCmd
 # ifndef ExportListGenSource
 #  define ExportListCmd		/**/
@ -54,7 +59,8 @@
 #endif
 #ifndef MkdirHierCmd
 -#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)	/* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+/* assume BINDIR in path */
 #define MkdirHierCmd mkdirhier
 #else
 #define MkdirHierCmd $(SHELL) $(CONFIGSRC)/util/mkdirhier.sh
@ -62,7 +68,8 @@
 #endif
 #ifndef RevPathCmd
 -#ifdef UseInstalled		/* assume BINDIR in path */
-+#if defined(UseInstalled) || defined(UseInstalledPrograms)	/* assume BINDIR in path */
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+/* assume BINDIR in path */
 #define RevPathCmd revpath
 #else
 #define RevPathCmd $(CONFIGSRC)/util/revpath
--- a/x11/XFree86-4-libraries/files/patch-UIThrStubs.c
+++ b/x11/XFree86-4-libraries/files/patch-UIThrStubs.c
@ -1,32 +0,0 @@
--- lib/XThrStub/UIThrStubs.c.old	Mon Nov 19 06:13:26 2001
-+++ lib/XThrStub/UIThrStubs.c	Tue Jun  4 11:39:19 2002
-@@ -99,6 +99,21 @@
- #else
- #include <pthread.h>
- typedef pthread_t xthread_t;
-+#if __GNUC__ >= 3
-+xthread_t pthread_self()    __attribute__ ((weak, alias ("_Xthr_self_stub_")));
-+int pthread_mutex_init()    __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_lock()    __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_mutex_unlock()  __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_init()     __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_destroy()  __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_wait()     __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_signal()   __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_cond_broadcast() __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_key_create()    __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+void *pthread_getspecific()  __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+int pthread_setspecific()   __attribute__ ((weak, alias ("_Xthr_zero_stub_")));
-+#else	/* __GNUC__ */
- #pragma weak pthread_self = _Xthr_self_stub_
- #pragma weak pthread_mutex_init = _Xthr_zero_stub_
- #pragma weak pthread_mutex_destroy = _Xthr_zero_stub_
-@@ -113,6 +128,7 @@
- #pragma weak pthread_key_create = _Xthr_zero_stub_
- #pragma weak pthread_getspecific = _Xthr_zero_stub_
- #pragma weak pthread_setspecific = _Xthr_zero_stub_
-+#endif	/* __GNUC__ */
- #if defined(_DECTHREADS_) || defined(linux)
- #pragma weak pthread_equal = _Xthr_equal_stub_	/* See Xthreads.h! */
- int
--- a/x11/XFree86-4-libraries/files/patch-X11.tmpl
+++ b/x11/XFree86-4-libraries/files/patch-X11.tmpl
@ -0,0 +1,38 @@
+--- config/cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
+++ config/cf/X11.tmpl	Sun Mar  2 21:13:31 2003
+@@ -575,7 +575,7 @@
+ #define BuildXft1Library	BuildRenderLibrary
+ #endif
+ #ifndef UseFontconfig
+-#define UseFontconfig		BuildXftLibrary
+#define UseFontconfig		(BuildXftLibrary || BuildXft1Library)
+ #endif
+ #ifndef BuildFontconfigLibrary
+ #define BuildFontconfigLibrary	(UseFontconfig && !HasFontconfig)
+@@ -1497,7 +1497,14 @@
+ #endif
+ 
+ #ifndef PsWrap
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+#define PsWrap pswrap
+#define PsWrapDependency /**/
+#else
+ #define PsWrap $(PSWRAPSRC)/pswrap
+#define PsWrapDependency HostProgramTargetName($(PSWRAP))
+#endif
+         PSWRAP = PsWrap
+ #endif
+ 
+ #ifndef ResourceConfigurationManagement 
+@@ -3028,7 +3035,10 @@
+ 
+ #endif /* else BuildFreetype2Library */
+ 
+-#if BuildFreetype2Library || HasFreetype2
+#if HasFreetype2
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
+FREETYPE2DEFINES = -DFREETYPE2
+#elif BuildFreetype2Library
+ FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
+ FREETYPE2DEFINES = -DFREETYPE2
+ #endif
--- a/x11/XFree86-4-libraries/files/patch-XTT
+++ b/x11/XFree86-4-libraries/files/patch-XTT
@ -1,48 +0,0 @@
--- extras/X-TrueType/xttfuncs.c.old	2000/09/26 15:56:41	1.8
-+++ extras/X-TrueType/xttfuncs.c	2001/02/18 04:08:33
-@@ -565,8 +565,9 @@
- 
-     /*
-      * Check invalid char index.
-+     * c = 0 is the default glyph for undefined glyphs in TTF.
-      */
-    if ( c <= 0 ) {
-+    if ( c < 0 ) {
-         charInfo = &nocharinfo;
-         goto next;
-     }
-@@ -769,8 +770,9 @@
- 
-     /*
-      * Check invalid char index.
-+     * c = 0 is the default glyph for undefined glyphs in TTF.
-      */
-    if ( c <= 0 ) {
-+    if ( c < 0 ) {
-         charInfo = &nocharinfo;
-         goto next;
-     }
-@@ -934,14 +936,19 @@
-                   c1 <= pFont->info.lastRow  &&
-                   c2 >= pFont->info.firstCol &&
-                   c2 <= pFont->info.lastCol)) {
-                *glyphs++ = &nocharinfo;
-+		/* 
-+		 * &nocharinfo will show garbage, just set c1 to 0. 
-+		 * The default glyph for undefined glphy will be used.
-+		 */
-+                /* *glyphs++ = &nocharinfo; */
-                 dprintf((stderr, "invalid code\n"));
-+		c1 = 0;
-             } else {
-                 c1 = ft->codeConverterInfo.ptrCodeConverter(c1<<8|c2);
-+	    }
-                 dprintf((stderr, "%04x\n", c1));
-                 *glyphs++ = get_glyph(ft, TT_Char_Index(ft->charmap, c1),
-                                       spacing);
-            }
-         }
-         break;
-     }
-
-
--- a/x11/XFree86-4-libraries/files/patch-XlcDL.c
+++ b/x11/XFree86-4-libraries/files/patch-XlcDL.c
@ -1,15 +0,0 @@
--- lib/X11/XlcDL.c.orig	Sun Dec  1 23:17:32 2002
-+++ lib/X11/XlcDL.c	Sun Dec  1 23:17:11 2002
-@@ -60,7 +60,12 @@
- #define	_MACH64_NAME		"sparcv9"
- #define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
- #else  /* !defined(__sparcv9) */
-+#if defined(__ia64__)
-+#define _MACH64_NAME		"ia64"
-+#define _MACH64_NAME_LEN        (sizeof (_MACH64_NAME) - 1)
-+#else  /* !defined(__ia64__) */
- #error "Unknown architecture"
-+#endif /* defined(__ia64__) */
- #endif /* defined(__sparcv9) */
- #endif /* _LP64 */
- 
--- a/x11/XFree86-4-libraries/files/patch-bsdLib.rules
+++ b/x11/XFree86-4-libraries/files/patch-bsdLib.rules
@ -1,37 +0,0 @@
--- config/cf/bsdLib.rules.orig	Wed Jul 10 17:25:29 2002
-+++ config/cf/bsdLib.rules	Wed Jul 10 17:25:32 2002
-@@ -306,6 +306,34 @@
- 
- #endif /* SharedDepLibraryTarget */
- 
-+/*
-+ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
-+ */
-+#ifndef SharedDepCplusplusLibraryTarget
-+#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
-+AllTarget(Concat(lib,libname.so.rev))					@@\
-+									@@\
-+Concat(lib,libname.so.rev):  deplist					@@\
-+	$(RM) $@~							@@\
-+	@SONAME=`echo $@ | sed 's/\.[^\.]*$$//'`; set -x; \		@@\
-+		(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS) BaseShLibReqs); \ @@\
-+		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
-+		LinkBuildSonameLibrary($$SONAME)			@@\
-+	$(RM) $@							@@\
-+	$(MV) $@~ $@							@@\
-+	$(RM) Concat(lib,libname.so)					@@\
-+	$(LN) $@ Concat(lib,libname.so)					@@\
-+	LinkBuildLibrary($@)						@@\
-+	LinkBuildLibrary(Concat(lib,libname.so))			@@\
-+									@@\
-+clean::									@@\
-+	@SONAME=`echo Concat(lib,libname.so.rev) | sed 's/\.[^\.]*$$//'`; \ @@\
-+	set -x; $(RM) $$SONAME						@@\
-+	$(RM) Concat(lib,libname.so)					@@\
-+	$(RM) Concat(lib,libname.so.rev)
-+
-+#endif /* SharedDepLibraryTarget */
-+
- #ifndef SharedDepModuleTarget
- #define SharedDepModuleTarget(name,deps,solist)				@@\
- AllTarget(name)								@@\
--- a/x11/XFree86-4-libraries/files/patch-common_x86.c
+++ b/x11/XFree86-4-libraries/files/patch-common_x86.c
@ -1,32 +0,0 @@
--- extras/Mesa/src/X86/common_x86.c.orig	Fri Aug 17 11:40:11 2001
-+++ extras/Mesa/src/X86/common_x86.c	Tue Dec  3 21:51:31 2002
-@@ -38,6 +38,10 @@
- #if defined(USE_KATMAI_ASM) && defined(__linux__)
- #include <signal.h>
- #endif
-+#if defined(USE_KATMAI_ASM) && defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
- 
- #include "context.h"
- #include "common_x86_asm.h"
-@@ -213,8 +217,17 @@
-    message( "Cannot test OS support for SSE, disabling to be safe.\n" );
-    gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
- #endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
-+#elif defined(__FreeBSD__)
-+   {
-+      int ret, enabled;
-+      size_t len;
-+      len = sizeof(enabled);
-+      ret = sysctlbyname("hw.instruction_sse", &enabled, &len, NULL, 0);
-+      if (ret || !enabled)
-+         gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-+   }
- #else
-   /* Do nothing on non-Linux platforms for now.
-+   /* Do nothing on other platforms for now.
-     */
-    message( "Not testing OS support for SSE, leaving enabled.\n" );
- #endif /* __linux__ */
--- a/x11/XFree86-4-libraries/files/patch-d
+++ b/x11/XFree86-4-libraries/files/patch-d
@ -1,142 +0,0 @@
--- config/cf/FreeBSD.cf.orig	Fri Nov  1 14:06:38 2002
-+++ config/cf/FreeBSD.cf	Fri Nov  1 14:15:57 2002
-@@ -43,11 +43,15 @@
- #define GccUsesGas		YES
- #define UseGas			YES
- #define GnuCpp			YES
-+#define HasPoll			YES
- #define HasNdbm			YES
- #define HasPutenv		YES
- #define HasSnprintf		YES
- #define HasBSD44Sockets 	YES
- #define HasDlopen		YES
-+#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) || (OSRelVersion >= 500012)
-+#define HasSetProcTitle		YES
-+#endif
- #ifndef HasLibCrypt
- # define HasLibCrypt		YES
- #endif
-@@ -74,18 +78,14 @@
-  * Multi-thread safe libs 
-  */	
- /* 2.2.7 and later has libc_r (POSIX threads) */
-#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
-    OSMajorVersion >= 3
-+#if (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7) || \
-+    (OSMajorVersion >= 3) && !defined(Sparc64Architecture)
- # ifndef HasLibPthread
- #  define HasLibPthread		NO
- # endif
- # define HasPosixThreads	YES
- # define ThreadedX		YES
- /*
- * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
- */
-# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-/*
-  * FreeBSD has tread-safe api but no getpwnam_r yet.
-  */
- # define HasThreadSafeAPI	YES
-@@ -93,10 +93,19 @@
- # if HasLibPthread
- #  define ThreadsLibraries	-lpthread
- # else
-#  define BuildThreadStubLibrary  YES 
-#  define NeedUIThrStubs          YES 
-#  define ThreadsCompileFlags	-pthread
-#  define ThreadsLibraries 	-pthread
-+#  if OSRelVersion >= 500043
-+#   define BuildThreadStubLibrary  NO
-+#   define NeedUIThrStubs          NO
-+#  else
-+#   define BuildThreadStubLibrary  YES
-+#   define NeedUIThrStubs          YES
-+#  endif
-+#  define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+#  if (OSRelVersion >= 500016)
-+#   define ThreadsLibraries	-lc_r
-+#  else
-+#   define ThreadsLibraries	-pthread
-+#  endif
- #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
- # endif
-@@ -149,11 +158,11 @@
-  *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
-  */
- #if BuildThreadStubLibrary && !UseInstalled
-# 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
-@@ -224,6 +233,20 @@
- #endif
- #endif
- 
-+/* Katmai (SSE) and 3DNow will be autodetected, so binutils is the only 
-+ * requirement for enabling this.  By 4.2 they were all supported.
-+ */
-+#ifdef i386Architecture &&  \
-+	(OSMajorVersion >= 5) || (OSMajorVersion == 4 && OSMinorVersion >= 2))
-+# define HasMMXSupport		YES
-+# define Has3DNowSupport	YES
-+# define HasKatmaiSupport	YES
-+#else
-+# define HasMMXSupport		NO
-+# define Has3DNowSupport	NO
-+# define HasKatmaiSupport	NO
-+#endif
-+
- /* 
-  * This doesn't work the way it does on every other system. On FreeBSD it's
-  * only a "hint, not a demand", whatever that means. Note that this is not 
-@@ -428,6 +451,9 @@
- #ifdef AlphaArchitecture
- #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
- #endif
-+#ifdef Sparc64Architecture
-+#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
-+#endif
- 
- #define StandardDefines	-DCSRG_BASED
- 
-@@ -449,18 +475,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
-#endif
-#endif
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O
-#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags FreeBSDCFLAGS
- 
- #ifndef PreIncDir
- # define PreIncDir	/usr/include
-@@ -513,6 +529,10 @@
-  
- #ifndef PamLibraries
- #define PamLibraries		-lpam DlLibrary
-+#endif
-+
-+#ifndef SharedLibXdmGreet
-+# define SharedLibXdmGreet		NO
- #endif
- 
- /*
--- a/x11/XFree86-4-libraries/files/patch-decode.c
+++ b/x11/XFree86-4-libraries/files/patch-decode.c
@ -1,35 +0,0 @@
--- extras/x86emu/src/x86emu/decode.c.orig	Sat Jan  6 20:19:03 2001
-+++ extras/x86emu/src/x86emu/decode.c	Mon May 20 02:02:34 2002
-@@ -734,6 +734,10 @@
- {
- 	unsigned offset;
- 
-+	if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+		u32* rp = decode_rm_long_register(rm);
-+		return (*rp);
-+	}
- 	switch (rm) {
-       case 0:
- 		DECODE_PRINTF("[BX+SI]");
-@@ -782,6 +786,10 @@
- 	int rm)
- {
- 	int displacement = (s8)fetch_byte_imm();
-+	if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+		u32* rp = decode_rm_long_register(rm);
-+		return (*rp + displacement);
-+	}
- 	switch (rm) {
-       case 0:
- 		DECODE_PRINTF2("%d[BX+SI]", displacement);
-@@ -830,6 +838,10 @@
- 	int rm)
- {
- 	unsigned displacement = (u16)fetch_word_imm();
-+	if (M.x86.mode & SYSMODE_PREFIX_ADDR) {
-+		u32* rp = decode_rm_long_register(rm);
-+		return (*rp + displacement);
-+	}
- 	switch (rm) {
-       case 0:
- 		DECODE_PRINTF2("%04x[BX+SI]", displacement);
--- a/x11/XFree86-4-libraries/files/patch-do_text.c
+++ b/x11/XFree86-4-libraries/files/patch-do_text.c
@ -1,17 +0,0 @@
--- programs/x11perf/do_text.c.orig	Wed Feb 19 07:39:37 2003
-+++ programs/x11perf/do_text.c	Wed Feb 19 07:39:39 2003
-@@ -421,14 +421,6 @@
- 	       p->font);
- 	return 0;
-     }
-
-    if (aafont->core)
-    {
-	printf ("FreeType font '%s' not available, benchmark omitted\n",
-		p->font);
-	XftFontClose (xp->d, aafont);
-	return 0;
-    }
-     
-     aadraw = XftDrawCreate (xp->d, xp->w, 
- 			    DefaultVisual (xp->d, DefaultScreen (xp->d)), 
--- a/x11/XFree86-4-libraries/files/patch-dps
+++ b/x11/XFree86-4-libraries/files/patch-dps
@ -1,5 +1,5 @@
--- lib/dps/Imakefile.orig	Sat Apr  7 12:41:50 2001
-+++ lib/dps/Imakefile	Tue Sep  3 22:37:23 2002
+--- lib/dps/Imakefile.orig	Tue Dec 31 13:15:41 2002
+++ lib/dps/Imakefile	Fri Jan 10 21:24:35 2003
@@ -29,7 +29,6 @@
             SED = sed
             AWK = awk
@ -8,31 +8,31 @@
 
 COMMONOBJECTFILES = \
 	dpsclient.o\
-@@ -195,7 +194,7 @@
+@@ -201,7 +200,7 @@
 
- includes :: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
+ includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
 
-$(DPSOPSCFILES) $(PSOPSCFILES): ProgramTargetName($(PSWRAP))
-+$(DPSOPSCFILES) $(PSOPSCFILES) : PsWrapDependency
+-$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
+$(DPSOPSCFILES) $(PSOPSCFILES): PsWrapDependency
 
 SRCS = \
 	${COMMONSOURCEFILES} \
-@@ -218,16 +217,11 @@
+@@ -224,16 +223,11 @@
 
 .SUFFIXES: .psw .h
 
-.psw.c : ProgramTargetName($(PSWRAP))
+-.psw.c : HostProgramTargetName($(PSWRAP))
 +.psw.c : PsWrapDependency
 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
 
-.psw.h : ProgramTargetName($(PSWRAP))
+-.psw.h : HostProgramTargetName($(PSWRAP))
 +.psw.h : PsWrapDependency
 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
 -
-ProgramTargetName($(PSWRAP)):
+-HostProgramTargetName($(PSWRAP)):
 -	@echo "checking $@ over in $(PSWRAPSRC) first..."; \
 -	cd $(PSWRAPSRC) && $(MAKE); \
 -	echo "okay, continuing in $(CURRENT_DIR)"
 
- HEADERS = psops.h dpsops.h
- 
+ includes :: $(HEADERS)
+ depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
--- a/x11/XFree86-4-libraries/files/patch-dri-Imakefile
+++ b/x11/XFree86-4-libraries/files/patch-dri-Imakefile
@ -0,0 +1,11 @@
+--- programs/Xserver/GL/dri/Imakefile.orig	Mon Mar  3 20:21:30 2003
+++ programs/Xserver/GL/dri/Imakefile	Mon Mar  3 20:21:31 2003
+@@ -13,7 +13,7 @@
+ 
+      INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \
+ 		-I$(EXTINCSRC) \
+-		-I$(XF86OSSRC) -I$(XF86COMSRC) \
+		-I$(XF86OSSRC) -I$(XF86OSSRC)/bus -I$(XF86COMSRC) \
+ 		-I../include -I../glx -I$(LIBSRC)/GL/include \
+ 		-I$(SERVERSRC)/mi -I$(FONTINCSRC)
+       DEFINES = $(GLX_DEFINES)
--- a/x11/XFree86-4-libraries/files/patch-drilx11
+++ b/x11/XFree86-4-libraries/files/patch-drilx11
@ -1,99 +0,0 @@
--- lib/GL/mesa/src/drv/ffb/Imakefile.orig	Sat Jun  8 16:02:28 2002
-+++ lib/GL/mesa/src/drv/ffb/Imakefile	Sat Jun  8 16:02:29 2002
-@@ -38,7 +38,7 @@
- 	 SRCS = $(FFBSRCS)
- 	 OBJS = $(FFBOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/gamma/Imakefile.orig	Sat Jun  8 16:01:51 2002
-+++ lib/GL/mesa/src/drv/gamma/Imakefile	Sat Jun  8 16:01:53 2002
-@@ -46,7 +46,7 @@
-          OBJS = $(LOWOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(GAMMAOBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/i810/Imakefile.orig	Sat Jun  8 16:00:38 2002
-+++ lib/GL/mesa/src/drv/i810/Imakefile	Sat Jun  8 16:01:32 2002
-@@ -46,7 +46,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/i830/Imakefile.orig	Sat Jun  8 16:00:43 2002
-+++ lib/GL/mesa/src/drv/i830/Imakefile	Sat Jun  8 16:01:31 2002
-@@ -46,7 +46,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I830OBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/mga/Imakefile.orig	Sat Jun  8 16:00:31 2002
-+++ lib/GL/mesa/src/drv/mga/Imakefile	Sat Jun  8 16:01:29 2002
-@@ -47,7 +47,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/r128/Imakefile.orig	Sat Jun  8 16:00:24 2002
-+++ lib/GL/mesa/src/drv/r128/Imakefile	Sat Jun  8 16:01:34 2002
-@@ -47,7 +47,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/radeon/Imakefile.orig	Sat Jun  8 15:59:52 2002
-+++ lib/GL/mesa/src/drv/radeon/Imakefile	Sat Jun  8 15:59:54 2002
-@@ -47,7 +47,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/sis/Imakefile.orig	Sat Jun  8 16:02:40 2002
-+++ lib/GL/mesa/src/drv/sis/Imakefile	Sat Jun  8 16:02:45 2002
-@@ -53,7 +53,7 @@
-          OBJS = $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(SISOBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- lib/GL/mesa/src/drv/tdfx/Imakefile.orig	Sat Jun  8 16:00:17 2002
-+++ lib/GL/mesa/src/drv/tdfx/Imakefile	Sat Jun  8 16:01:12 2002
-@@ -47,7 +47,7 @@
-          OBJS = $(LOOBJS) $(DRIOBJS) $(DRMOBJS) $(COREMESAOBJS) \
- 		$(MESA_ASM_OBJS) $(TDFXOBJS) $(HIOBJS)
- 
-REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB)
-+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB)
- 
- #include <Library.tmpl>
- 
--- a/x11/XFree86-4-libraries/files/patch-drmclean
+++ b/x11/XFree86-4-libraries/files/patch-drmclean
@ -1,17 +0,0 @@
--- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile.orig	Tue Mar 19 17:35:44 2002
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile	Tue Mar 19 17:35:50 2002
-@@ -11,10 +11,11 @@
- 
- install::
- 	$(MAKE) -f Makefile.bsd install
-+	
-+clean::
-+	$(MAKE) -f Makefile.bsd clean
-+
- #else
- all::
- 	@echo 'Use "make -f Makefile.bsd" to manually build the modules'
- #endif
-
-clean::
-	$(MAKE) -f Makefile.bsd clean
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@ -1,69 +1,6 @@
--- nls/compose.dir.orig	Wed Nov 21 23:29:11 2001
-+++ nls/compose.dir	Wed Jul 17 15:05:38 2002
-@@ -62,6 +62,7 @@
- iso8859-1/Compose:		en_TT.ISO8859-1
- iso8859-1/Compose:		en_UK.ISO8859-1
- iso8859-1/Compose:		en_US.ISO8859-1
-+iso8859-15/Compose:		en_US.ISO8859-15
- iso8859-1/Compose:		en_ZA.ISO8859-1
- iso8859-3/Compose:		eo_XX.ISO8859-3
- iso8859-1/Compose:		es_AR.ISO8859-1
-@@ -211,7 +212,7 @@
- zh_CN/Compose:			zh_CN.GB2312
- zh_CN.gbk/Compose:		zh_CN.GBK
- zh_TW.big5/Compose:		zh_TW.big5
-zh_TW.big5/Compose:		zh_TW.Big5
-+zh_TW.Big5/Compose:		zh_TW.Big5
- zh_TW/Compose:			zh_TW.eucTW
- XCOMM
- XCOMM
--- nls/locale.alias.orig	Thu Dec 20 06:29:40 2001
-+++ nls/locale.alias	Sat Jan 19 22:22:20 2002
-@@ -637,18 +637,18 @@
- yi_US.MICROSOFT-CP1255:				yi_US.CP1255
- zh:						zh_CN.eucCN
- zh_CN:						zh_CN.eucCN
-zh_CN.Big5:					zh_TW.big5
-+zh_CN.Big5:					zh_TW.Big5
- zh_CN.EUC:					zh_CN.eucCN
- zh_CN.GB2312:					zh_CN.eucCN
- zh_CN.GBK:					zh_CN.gbk
-zh_CN.big5:					zh_TW.big5
-+zh_CN.big5:					zh_TW.Big5
- zh_CN.euc:					zh_CN.eucCN
- zh_CN.gb2312:					zh_CN.eucCN
- zh_HK:						zh_HK.big5
- zh_HK.Big5:					zh_HK.big5
- zh_HK.Big5HKSCS:				zh_HK.big5hkscs
-zh_TW:						zh_TW.big5
-zh_TW.Big5:					zh_TW.big5
-+zh_TW:						zh_TW.Big5
-+zh_TW.Big5:					zh_TW.Big5
- zh_TW.EUC:					zh_TW.eucTW
- 
- XCOMM The following locale names are used in SCO 3.0
--- nls/locale.dir.orig	Wed Jan  9 17:14:16 2002
-+++ nls/locale.dir	Wed Jul 17 15:06:35 2002
-@@ -68,6 +68,7 @@
- iso8859-1/XLC_LOCALE:			en_TT.ISO8859-1
- iso8859-1/XLC_LOCALE:			en_UK.ISO8859-1
- iso8859-1/XLC_LOCALE:			en_US.ISO8859-1
-+iso8859-15/XLC_LOCALE:			en_US.ISO8859-15
- iso8859-1/XLC_LOCALE:			en_ZA.ISO8859-1
- iso8859-3/XLC_LOCALE:			eo_EO.ISO8859-3
- iso8859-3/XLC_LOCALE:			eo_XX.ISO8859-3
-@@ -216,7 +217,7 @@
- zh_CN.gbk/XLC_LOCALE:			zh_CN.gbk
- zh_HK.big5/XLC_LOCALE:			zh_HK.big5
- zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.big5hkscs
-zh_TW.big5/XLC_LOCALE:			zh_TW.big5
-+zh_TW.Big5/XLC_LOCALE:			zh_TW.Big5
- zh_TW/XLC_LOCALE:			zh_TW.eucTW
- XCOMM Note: The UTF-8 locales don't work correctly yet. Work in progress.
- en_US.UTF-8/XLC_LOCALE:			af_ZA.UTF-8
--- nls/Compose/Imakefile.orig	Sun Nov 24 15:54:38 2002
-+++ nls/Compose/Imakefile	Sun Nov 24 15:55:37 2002
-@@ -64,11 +64,12 @@
+--- nls/Compose/Imakefile.orig	Mon Jun  3 22:19:43 2002
+++ nls/Compose/Imakefile	Sat Jan 11 01:00:46 2003
+@@ -54,6 +54,7 @@
 ComposeTarget(koi8-r)
 ComposeTarget(koi8-u)
 ComposeTarget(koi8-c)
@ -71,31 +8,3 @@
 ComposeTarget(mulelao-1)
 ComposeTarget(vi_VN.tcvn)
 ComposeTarget(vi_VN.viscii)
- ComposeTarget(zh_CN)
- ComposeTarget(zh_CN.gbk)
- ComposeTarget(zh_TW)
-ComposeTarget(zh_TW.big5)
-+ComposeTarget(zh_TW.Big5)
- 
--- nls/XI18N_OBJS/Imakefile.orig	Fri Nov 16 09:52:31 2001
-+++ nls/XI18N_OBJS/Imakefile	Sun Jan 20 01:08:44 2002
-@@ -57,7 +57,7 @@
- XI18NTarget(zh_CN.gbk)
- XI18NTarget(zh_HK.big5hkscs)
- XI18NTarget(zh_TW)
-XI18NTarget(zh_TW.big5)
-+XI18NTarget(zh_TW.Big5)
- XI18NTarget(th_TH)
- XI18NTarget(en_US.UTF-8)
- #ifdef UXPArchitecture
--- nls/XLC_LOCALE/Imakefile.orig	Fri Nov  2 08:35:28 2001
-+++ nls/XLC_LOCALE/Imakefile	Sat Jan 19 22:19:27 2002
-@@ -89,7 +89,7 @@
- LTarget(zh_HK.big5)
- LTarget(zh_HK.big5hkscs)
- LTarget(zh_TW)
-LTarget(zh_TW.big5)
-+LTarget(zh_TW.Big5)
- LTarget(th_TH)
- LTarget(en_US.UTF-8)
- #ifdef UXPArchitecture
--- a/Show More
+++ b/Show More