[1] Quiet some prolific debug output in cirrus driver.

[2] Stop SIGILLs when running GL clients on systems with SSE but no
    CPU_ENABLE_SSE in the kernel.
[3] Fix imake complaints after XFree86-4-libraries patch to stop libXThrStub
    build on post-500043 -current.

PR:		[1] 38590
Approved by:	portmgr

8 files changed, 88 insertions, 6 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index f1a26e3fe5f7..66cca0215674 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -30,7 +30,8 @@ USE_IMAKE=		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-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} \
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c b/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c
new file mode 100644
index 000000000000..b819e10fc8e8
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-alp_xaam.c
@@ -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"
diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c b/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c
new file mode 100644
index 000000000000..9e584c20ac75
--- /dev/null
+++ b/x11-servers/XFree86-4-Server-snap/files/patch-common_x86.c
@@ -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__ */
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 7cd0e774b0d5..c6a337bedb1e 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -106,7 +106,6 @@ configure () {
 #endif
 END
 
-    echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index f1a26e3fe5f7..66cca0215674 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -30,7 +30,8 @@ USE_IMAKE=		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-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} \
diff --git a/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c b/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c
new file mode 100644
index 000000000000..b819e10fc8e8
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-alp_xaam.c
@@ -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"
diff --git a/x11-servers/XFree86-4-Server/files/patch-common_x86.c b/x11-servers/XFree86-4-Server/files/patch-common_x86.c
new file mode 100644
index 000000000000..9e584c20ac75
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-common_x86.c
@@ -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__ */
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 7cd0e774b0d5..c6a337bedb1e 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -106,7 +106,6 @@ configure () {
 #endif
 END
 
-    echo "#define BuildThreadStubLibrary YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXxserv YES" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF