Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.126
diff -u -r1.126 Makefile
--- Makefile	17 Oct 2002 07:20:03 -0000	1.126
+++ Makefile	4 Dec 2002 23:30:45 -0000
@@ -30,7 +30,8 @@
 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-mga_driver.c
+.for pf in patch-text-mode.c patch-xf86Configure.c patch-xf86config.c \
+	patch-mga_driver.c patch-common_x86.c patch-alp_xaam.c
 EXTRA_PATCHES+=		${.CURDIR}/files/${pf}
 .endfor
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
Index: files/patch-alp_xaam.c
===================================================================
RCS file: files/patch-alp_xaam.c
diff -N files/patch-alp_xaam.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-alp_xaam.c	18 Oct 2002 02:23:04 -0000
@@ -0,0 +1,9 @@
+--- 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"
Index: files/patch-common_x86.c
===================================================================
RCS file: files/patch-common_x86.c
diff -N files/patch-common_x86.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-common_x86.c	4 Dec 2002 05:53:43 -0000
@@ -0,0 +1,32 @@
+--- 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__ */
Index: scripts/configure
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/scripts/configure,v
retrieving revision 1.75
diff -u -r1.75 configure
--- scripts/configure	17 Oct 2002 07:20:03 -0000	1.75
+++ scripts/configure	4 Dec 2002 05:08:41 -0000
@@ -106,7 +106,6 @@
 #endif
 END
 
-    echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF