From 8b81c086f64ac1f194b1cc32b74131bad6489a59 Mon Sep 17 00:00:00 2001
From: Shigeyuki Fukushima <shige@FreeBSD.org>
Date: Tue, 23 Jan 2001 15:28:11 +0000
Subject: Compilation fixes for changes about machine/console.h in 5-current.

---
 japanese/kon2-16dot/files/patch-af | 21 ++++++++++++++++++---
 japanese/kon2-16dot/files/patch-ah | 21 ++++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

(limited to 'japanese/kon2-16dot')

diff --git a/japanese/kon2-16dot/files/patch-af b/japanese/kon2-16dot/files/patch-af
index 2c939e69dd91..95e977f3710e 100644
--- a/japanese/kon2-16dot/files/patch-af
+++ b/japanese/kon2-16dot/files/patch-af
@@ -1,6 +1,21 @@
---- src/term.c.orig	Sat Aug  7 05:07:34 1999
-+++ src/term.c	Sat Aug  7 05:07:39 1999
-@@ -201,11 +201,14 @@
+--- src/term.c.orig	Sat Jan 25 00:03:58 1997
++++ src/term.c	Wed Jan 24 00:08:14 2001
+@@ -33,7 +33,13 @@
+ #include	<termio.h>
+ #elif defined(__FreeBSD__)
+ #include	<termios.h>
+-#include	<machine/console.h>
++#include        <osreldate.h>
++#if __FreeBSD_version >= 410000
++#  include      <sys/consio.h>
++#  include      <sys/kbio.h>
++#else
++#  include      <machine/console.h>
++#endif
+ #define termio termios
+ #endif
+ #include	<signal.h>
+@@ -201,11 +207,14 @@
  	}
  	if (FD_ISSET(0, &readFds)) {
  	    i = read(0, buff, BUFSIZ);
diff --git a/japanese/kon2-16dot/files/patch-ah b/japanese/kon2-16dot/files/patch-ah
index ab1220edde4a..e410e32bf9d9 100644
--- a/japanese/kon2-16dot/files/patch-ah
+++ b/japanese/kon2-16dot/files/patch-ah
@@ -1,6 +1,21 @@
 --- src/display/vga.c.orig	Sun Jan 26 18:05:00 1997
-+++ src/display/vga.c	Mon Jan 31 14:09:55 2000
-@@ -382,7 +382,7 @@
++++ src/display/vga.c	Wed Jan 24 00:05:00 2001
+@@ -47,7 +47,13 @@
+ #elif defined(__FreeBSD__)
+ #include      <vm/vm_param.h>
+ #include      <sys/ioctl.h>
+-#include      <machine/console.h>
++#include      <osreldate.h>
++#if __FreeBSD_version >= 410000
++#  include    <sys/consio.h>
++#  include    <sys/kbio.h>
++#else
++#  include    <machine/console.h>
++#endif
+ vm_size_t page_size;
+ #endif
+ #undef free
+@@ -382,7 +388,7 @@
  /*    if (!code) return;*/
      VgaSetColor(fc);
      if (bc & 0x8) *(vcls - dInfo.glineByte) = 0;
@@ -9,7 +24,7 @@
  	if (*code) {
  	    VgaOutByte(*code);
  	    *gram = *gram;
-@@ -620,7 +620,11 @@
+@@ -620,7 +626,11 @@
  	Perror("ioctl CONSOLE_IO_ENABLE");
  	return FAILURE;
      }
-- 
cgit v1.2.3