Fix the build on -current.

Do not compile with 'make -k'.

x11/XFree86/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION=	3.3.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -32,6 +32,7 @@ INSTALL_TARGET+=	install.linkkit
 DIST_SUBDIR=	xc
 SCRIPTS_ENV=	OSVERSION=${OSVERSION} MACHINE=${MACHINE} \
 		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ARGS=	WORLDOPTS=
 # can't use USE_X_PREFIX here -- it will cause a circular dependency
 PREFIX=		${X11BASE}
 MTREE_FILE=	/etc/mtree/BSD.x11.dist

x11/XFree86/files/patch-y

@@ -0,0 +1,18 @@
+--- lib/font/Type1/spaces.c.orig	Tue Apr  2 03:37:02 2002
++++ lib/font/Type1/spaces.c	Tue Apr  2 03:57:38 2002
+@@ -38,6 +38,7 @@
+ :h3.Include Files
+ */
+ /* $XFree86: xc/lib/font/Type1/spaces.c,v 3.0.6.2 1998/10/04 15:22:56 hohndel Exp $ */
++#include "X11/Xos.h"
+ #include "objects.h"
+ #include "spaces.h"
+ #include "paths.h"
+@@ -45,7 +46,6 @@
+ #include "fonts.h"
+ #include "arith.h"
+ #include "trig.h"
+-#include "X11/Xos.h"
+ 
+ static void FindFfcn();
+ static void FindIfcn();

x11/XFree86/files/patch-z

@@ -0,0 +1,16 @@
+--- programs/Xserver/include/misc.h.orig	Tue Apr  2 04:43:50 2002
++++ programs/Xserver/include/misc.h	Tue Apr  2 04:44:43 2002
+@@ -158,11 +158,11 @@
+ 
+ #define min(a, b) (((a) < (b)) ? (a) : (b))
+ #define max(a, b) (((a) > (b)) ? (a) : (b))
+-#if !defined(AMOEBA) && !defined(__EMX__)
++#if !defined(AMOEBA) && !defined(__EMX__) && !defined(__FreeBSD__)
+ #ifndef abs
+ #define abs(a) ((a) > 0 ? (a) : -(a))
+ #endif
+-#else /* AMOEBA || __EMX__ */
++#else /* AMOEBA || __EMX__ || __FreeBSD__ */
+ /* abs() is a function, not a macro; include the file declaring
+  * it in case we haven't done that yet.
+  */