summaryrefslogtreecommitdiff
path: root/x11-servers/XttXF86srv-common/files/patch-s
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2000-12-26 03:24:38 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2000-12-26 03:24:38 +0000
commit681877fb30fc1ac2bc9002c8bf56ee0f93e913f6 (patch)
treeccc74d19a93cf806244c6e7f61cde11ea4218edc /x11-servers/XttXF86srv-common/files/patch-s
parentModify installation directory and install catalog. (diff)
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)
Diffstat (limited to '')
-rw-r--r--x11-servers/XttXF86srv-common/files/patch-s21
1 files changed, 21 insertions, 0 deletions
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