From 681877fb30fc1ac2bc9002c8bf56ee0f93e913f6 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Tue, 26 Dec 2000 03:24:38 +0000
Subject: Merge the patches that were added to x11/XFree86 in these several
 months.  This should fix the build on 5-CURRENT and help some video chips. 
 See x11/XFree86's history for details.

Approved by:	Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> (MAINTAINER)
---
 x11-servers/XttXF86srv-common/files/patch-s | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 x11-servers/XttXF86srv-common/files/patch-s

(limited to 'x11-servers/XttXF86srv-common/files/patch-s')

diff --git a/x11-servers/XttXF86srv-common/files/patch-s b/x11-servers/XttXF86srv-common/files/patch-s
new file mode 100644
index 000000000000..3697f7b18ac3
--- /dev/null
+++ b/x11-servers/XttXF86srv-common/files/patch-s
@@ -0,0 +1,21 @@
+--- programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c.ORIG     Mon Nov 27 14:29 :12 2000
++++ programs/Xserver/hw/xfree86/SuperProbe/OS_386BSD.c  Mon Nov 27 14:37:03 2000
+@@ -83,7 +83,17 @@
+ #  endif
+ #  ifdef SYSCONS_SUPPORT
+     /* both, Free and NetBSD have syscons */
+-#   include <machine/console.h>
++#   if defined(__FreeBSD__)
++#    include <osreldate.h>
++#    if __FreeBSD_version >= 410000
++#     include <sys/consio.h>
++#     include <sys/kbio.h>
++#    else
++#     include <machine/console.h>
++#    endif
++#   else 
++#    include <machine/console.h>
++#   endif
+ #  endif
+ # else
+ #  ifdef CODRV_SUPPORT
-- 
cgit v1.2.3