Improve FreeBSD support:

+ properly handle keyboard input;
+ enable linear modes (required for SDL);

- still no mouse yet.

7 files changed, 526 insertions, 20 deletions

diff --git a/graphics/svgalib/Makefile b/graphics/svgalib/Makefile
index 91178218ef19..d1faff83f7ca 100644
--- a/graphics/svgalib/Makefile
+++ b/graphics/svgalib/Makefile
@@ -14,8 +14,9 @@ MAINTAINER=	sobomax@freebsd.org
 
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
+CFLAGS+=	-DDEBUG
 
-ALL_TARGET=	shared
+ALL_TARGET=	shared static
 
 MAN1=		convfont.1 dumpreg.1 fix132x43.1 restorefont.1 		\
 		restorepalette.1 restoretextmode.1 runx.1 		\
@@ -107,5 +108,11 @@ MAN8=		mode3.8
 
 pre-patch:
 	${PERL} -pi -e 's.\x0D..' ${WRKSRC}/utils/gtf/*
+	${MKDIR} ${WRKSRC}/include/linux
+
+post-install:
+	${MKDIR} ${PREFIX}/include/linux
+	cd ${WRKSRC}/include/linux && \
+		${INSTALL_DATA} keyboard.h kd.h ${PREFIX}/include/linux
 
 .include <bsd.port.mk>
diff --git a/graphics/svgalib/files/patch-ah b/graphics/svgalib/files/patch-ah
index ff367158ea2c..42b76da9b23f 100644
--- a/graphics/svgalib/files/patch-ah
+++ b/graphics/svgalib/files/patch-ah
@@ -1,7 +1,6 @@
-diff -druN svgalib-1.4.2.orig/src/keyboard/keyboard.c src/keyboard/keyboard.c
---- svgalib-1.4.2.orig/src/keyboard/keyboard.c	Fri Aug 25 04:39:39 2000
-+++ src/keyboard/keyboard.c	Fri Aug 25 04:39:57 2000
-@@ -28,12 +28,13 @@
+--- src/keyboard/keyboard.c.orig	Sun Jul 18 09:41:15 1999
++++ src/keyboard/keyboard.c	Wed Aug 30 19:04:39 2000
+@@ -28,12 +28,12 @@
  #include <sys/ioctl.h>
  #include <fcntl.h>
  #include <termios.h>
@@ -10,24 +9,22 @@ diff -druN svgalib-1.4.2.orig/src/keyboard/keyboard.c src/keyboard/keyboard.c
  /* linux/keyboard.h defines NR_KEYS and some scancode-like constants, so it */
  /* should also be useful for svgalib programs using the keyboard. It misses */
  /* a few KERNEL ifdefs around kernel data structures though. */
--#include <linux/keyboard.h>
+ #include <linux/keyboard.h>
 -#include <sys/vt.h>
-+/*#include <linux/keyboard.h>*/
-+#define NR_KEYS 128
 +#include <sys/consio.h>
  /* Needed to check uid of keymap files */
  #include <sys/stat.h>
  #include <unistd.h>
-@@ -340,7 +341,7 @@
+@@ -340,7 +340,7 @@
  
      tcsetattr(__svgalib_kbd_fd, TCSAFLUSH, &newkbdtermios);
  
 -    ioctl(__svgalib_kbd_fd, KDSKBMODE, K_MEDIUMRAW);
-+    ioctl(__svgalib_kbd_fd, KDSKBMODE, K_RAW);
++    ioctl(__svgalib_kbd_fd, KDSKBMODE, K_CODE);
  
      keyboard_clearstate();
  
-@@ -578,7 +579,7 @@
+@@ -578,7 +578,7 @@
  	    /* VT switch. */
  	    /* *** what about F11 & F12? */
  	    int j, vt = 0;
@@ -36,7 +33,7 @@ diff -druN svgalib-1.4.2.orig/src/keyboard/keyboard.c src/keyboard/keyboard.c
  	    for (j = 0; j < 12; j++)
  		if (functionkey_state & (1 << j)) {
  		    vt = j + 1;
-@@ -587,9 +588,9 @@
+@@ -587,9 +587,9 @@
  		}
  
  	    /* Do not switch vt's if need not to */
diff --git a/graphics/svgalib/files/patch-an b/graphics/svgalib/files/patch-an
index 63f854440971..af9b1c89ee71 100644
--- a/graphics/svgalib/files/patch-an
+++ b/graphics/svgalib/files/patch-an
@@ -1,19 +1,29 @@
-diff -druN svgalib-1.4.2.orig/src/vgamisc.c src/vgamisc.c
---- svgalib-1.4.2.orig/src/vgamisc.c	Fri Aug 25 04:39:39 2000
-+++ src/vgamisc.c	Fri Aug 25 04:39:57 2000
-@@ -73,12 +73,12 @@
+--- src/vgamisc.c.orig	Tue Jul 27 19:36:19 1999
++++ src/vgamisc.c	Wed Aug 30 17:58:13 2000
+@@ -73,8 +73,8 @@
      return __svgalib_graph_mem;
  }
  
 -#include <syscall.h>
 -#include <linux/kernel.h>
-+#include <sys/syscall.h>
-+/*#include <linux/kernel.h>*/
++#include <sys/types.h>
++#include <sys/sysctl.h>
  
  int __svgalib_physmem(void)
  {
--#ifdef __alpha__
-+#if defined(__alpha__) || defined(__FreeBSD__)
+@@ -82,10 +82,11 @@
      printf("__svgalib_physmem: are you sure you wanna do this??\n");
      return -1;
  #else
+-    struct sysinfo si;
+-    si.totalram = 0;
+-    syscall(SYS_sysinfo, &si);
+-    return si.totalram;
++    int mem;
++    int smem;
++    smem = sizeof(mem);
++    sysctlbyname("hw.physmem", &mem, &smem, NULL, 0);
++    return mem;
+ #endif
+ }
+ 
diff --git a/graphics/svgalib/files/patch-av b/graphics/svgalib/files/patch-av
new file mode 100644
index 000000000000..010542baf6fc
--- /dev/null
+++ b/graphics/svgalib/files/patch-av
@@ -0,0 +1,433 @@
+--- include/linux/keyboard.h.orig	Fri Aug 25 22:09:01 2000
++++ include/linux/keyboard.h	Fri Aug 25 23:56:06 2000
+@@ -0,0 +1,430 @@
++#ifndef __LINUX_KEYBOARD_H
++#define __LINUX_KEYBOARD_H
++
++#define KG_SHIFT	0
++#define KG_CTRL		2
++#define KG_ALT		3
++#define KG_ALTGR	1
++#define KG_SHIFTL	4
++#define KG_SHIFTR	5
++#define KG_CTRLL	6
++#define KG_CTRLR	7
++#define KG_CAPSSHIFT	8
++
++#define NR_SHIFT	9
++
++#define NR_KEYS		NUM_KEYS 	/* WAS: 128 */
++#define MAX_NR_KEYMAPS	NUM_STATES	/* WAS: 256 */
++/* This means 64Kb if all keymaps are allocated. Only the superuser
++	may increase the number of keymaps beyond MAX_NR_OF_USER_KEYMAPS. */
++#define MAX_NR_OF_USER_KEYMAPS 256 	/* should be at least 7 */
++
++#ifdef __KERNEL__
++extern const int NR_TYPES;
++extern const int max_vals[];
++extern unsigned short *key_maps[MAX_NR_KEYMAPS];
++extern unsigned short plain_map[NR_KEYS];
++extern struct wait_queue * keypress_wait;
++extern unsigned char keyboard_type;
++#endif
++
++#define MAX_NR_FUNC	256	/* max nr of strings assigned to keys */
++
++#define KT_LATIN	0	/* we depend on this being zero */
++#define KT_LETTER	11	/* symbol that can be acted upon by CapsLock */
++#define KT_FN		1
++#define KT_SPEC		2
++#define KT_PAD		3
++#define KT_DEAD		4
++#define KT_CONS		5
++#define KT_CUR		6
++#define KT_SHIFT	7
++#define KT_META		8
++#define KT_ASCII	9
++#define KT_LOCK		10
++#define KT_SLOCK	12
++
++#define K(t,v)		(((t)<<8)|(v))
++#define KTYP(x)		((x) >> 8)
++#define KVAL(x)		((x) & 0xff)
++
++#define K_F1		K(KT_FN,0)
++#define K_F2		K(KT_FN,1)
++#define K_F3		K(KT_FN,2)
++#define K_F4		K(KT_FN,3)
++#define K_F5		K(KT_FN,4)
++#define K_F6		K(KT_FN,5)
++#define K_F7		K(KT_FN,6)
++#define K_F8		K(KT_FN,7)
++#define K_F9		K(KT_FN,8)
++#define K_F10		K(KT_FN,9)
++#define K_F11		K(KT_FN,10)
++#define K_F12		K(KT_FN,11)
++#define K_F13		K(KT_FN,12)
++#define K_F14		K(KT_FN,13)
++#define K_F15		K(KT_FN,14)
++#define K_F16		K(KT_FN,15)
++#define K_F17		K(KT_FN,16)
++#define K_F18		K(KT_FN,17)
++#define K_F19		K(KT_FN,18)
++#define K_F20		K(KT_FN,19)
++#define K_FIND		K(KT_FN,20)
++#define K_INSERT	K(KT_FN,21)
++#define K_REMOVE	K(KT_FN,22)
++#define K_SELECT	K(KT_FN,23)
++#define K_PGUP		K(KT_FN,24) /* PGUP is a synonym for PRIOR */
++#define K_PGDN		K(KT_FN,25) /* PGDN is a synonym for NEXT */
++#define K_MACRO	 	K(KT_FN,26)
++#define K_HELP		K(KT_FN,27)
++#define K_DO		K(KT_FN,28)
++#define K_PAUSE	 	K(KT_FN,29)
++#define K_F21		K(KT_FN,30)
++#define K_F22		K(KT_FN,31)
++#define K_F23		K(KT_FN,32)
++#define K_F24		K(KT_FN,33)
++#define K_F25		K(KT_FN,34)
++#define K_F26		K(KT_FN,35)
++#define K_F27		K(KT_FN,36)
++#define K_F28		K(KT_FN,37)
++#define K_F29		K(KT_FN,38)
++#define K_F30		K(KT_FN,39)
++#define K_F31		K(KT_FN,40)
++#define K_F32		K(KT_FN,41)
++#define K_F33		K(KT_FN,42)
++#define K_F34		K(KT_FN,43)
++#define K_F35		K(KT_FN,44)
++#define K_F36		K(KT_FN,45)
++#define K_F37		K(KT_FN,46)
++#define K_F38		K(KT_FN,47)
++#define K_F39		K(KT_FN,48)
++#define K_F40		K(KT_FN,49)
++#define K_F41		K(KT_FN,50)
++#define K_F42		K(KT_FN,51)
++#define K_F43		K(KT_FN,52)
++#define K_F44		K(KT_FN,53)
++#define K_F45		K(KT_FN,54)
++#define K_F46		K(KT_FN,55)
++#define K_F47		K(KT_FN,56)
++#define K_F48		K(KT_FN,57)
++#define K_F49		K(KT_FN,58)
++#define K_F50		K(KT_FN,59)
++#define K_F51		K(KT_FN,60)
++#define K_F52		K(KT_FN,61)
++#define K_F53		K(KT_FN,62)
++#define K_F54		K(KT_FN,63)
++#define K_F55		K(KT_FN,64)
++#define K_F56		K(KT_FN,65)
++#define K_F57		K(KT_FN,66)
++#define K_F58		K(KT_FN,67)
++#define K_F59		K(KT_FN,68)
++#define K_F60		K(KT_FN,69)
++#define K_F61		K(KT_FN,70)
++#define K_F62		K(KT_FN,71)
++#define K_F63		K(KT_FN,72)
++#define K_F64		K(KT_FN,73)
++#define K_F65		K(KT_FN,74)
++#define K_F66		K(KT_FN,75)
++#define K_F67		K(KT_FN,76)
++#define K_F68		K(KT_FN,77)
++#define K_F69		K(KT_FN,78)
++#define K_F70		K(KT_FN,79)
++#define K_F71		K(KT_FN,80)
++#define K_F72		K(KT_FN,81)
++#define K_F73		K(KT_FN,82)
++#define K_F74		K(KT_FN,83)
++#define K_F75		K(KT_FN,84)
++#define K_F76		K(KT_FN,85)
++#define K_F77		K(KT_FN,86)
++#define K_F78		K(KT_FN,87)
++#define K_F79		K(KT_FN,88)
++#define K_F80		K(KT_FN,89)
++#define K_F81		K(KT_FN,90)
++#define K_F82		K(KT_FN,91)
++#define K_F83		K(KT_FN,92)
++#define K_F84		K(KT_FN,93)
++#define K_F85		K(KT_FN,94)
++#define K_F86		K(KT_FN,95)
++#define K_F87		K(KT_FN,96)
++#define K_F88		K(KT_FN,97)
++#define K_F89		K(KT_FN,98)
++#define K_F90		K(KT_FN,99)
++#define K_F91		K(KT_FN,100)
++#define K_F92		K(KT_FN,101)
++#define K_F93		K(KT_FN,102)
++#define K_F94		K(KT_FN,103)
++#define K_F95		K(KT_FN,104)
++#define K_F96		K(KT_FN,105)
++#define K_F97		K(KT_FN,106)
++#define K_F98		K(KT_FN,107)
++#define K_F99		K(KT_FN,108)
++#define K_F100		K(KT_FN,109)
++#define K_F101		K(KT_FN,110)
++#define K_F102		K(KT_FN,111)
++#define K_F103		K(KT_FN,112)
++#define K_F104		K(KT_FN,113)
++#define K_F105		K(KT_FN,114)
++#define K_F106		K(KT_FN,115)
++#define K_F107		K(KT_FN,116)
++#define K_F108		K(KT_FN,117)
++#define K_F109		K(KT_FN,118)
++#define K_F110		K(KT_FN,119)
++#define K_F111		K(KT_FN,120)
++#define K_F112		K(KT_FN,121)
++#define K_F113		K(KT_FN,122)
++#define K_F114		K(KT_FN,123)
++#define K_F115		K(KT_FN,124)
++#define K_F116		K(KT_FN,125)
++#define K_F117		K(KT_FN,126)
++#define K_F118		K(KT_FN,127)
++#define K_F119		K(KT_FN,128)
++#define K_F120		K(KT_FN,129)
++#define K_F121		K(KT_FN,130)
++#define K_F122		K(KT_FN,131)
++#define K_F123		K(KT_FN,132)
++#define K_F124		K(KT_FN,133)
++#define K_F125		K(KT_FN,134)
++#define K_F126		K(KT_FN,135)
++#define K_F127		K(KT_FN,136)
++#define K_F128		K(KT_FN,137)
++#define K_F129		K(KT_FN,138)
++#define K_F130		K(KT_FN,139)
++#define K_F131		K(KT_FN,140)
++#define K_F132		K(KT_FN,141)
++#define K_F133		K(KT_FN,142)
++#define K_F134		K(KT_FN,143)
++#define K_F135		K(KT_FN,144)
++#define K_F136		K(KT_FN,145)
++#define K_F137		K(KT_FN,146)
++#define K_F138		K(KT_FN,147)
++#define K_F139		K(KT_FN,148)
++#define K_F140		K(KT_FN,149)
++#define K_F141		K(KT_FN,150)
++#define K_F142		K(KT_FN,151)
++#define K_F143		K(KT_FN,152)
++#define K_F144		K(KT_FN,153)
++#define K_F145		K(KT_FN,154)
++#define K_F146		K(KT_FN,155)
++#define K_F147		K(KT_FN,156)
++#define K_F148		K(KT_FN,157)
++#define K_F149		K(KT_FN,158)
++#define K_F150		K(KT_FN,159)
++#define K_F151		K(KT_FN,160)
++#define K_F152		K(KT_FN,161)
++#define K_F153		K(KT_FN,162)
++#define K_F154		K(KT_FN,163)
++#define K_F155		K(KT_FN,164)
++#define K_F156		K(KT_FN,165)
++#define K_F157		K(KT_FN,166)
++#define K_F158		K(KT_FN,167)
++#define K_F159		K(KT_FN,168)
++#define K_F160		K(KT_FN,169)
++#define K_F161		K(KT_FN,170)
++#define K_F162		K(KT_FN,171)
++#define K_F163		K(KT_FN,172)
++#define K_F164		K(KT_FN,173)
++#define K_F165		K(KT_FN,174)
++#define K_F166		K(KT_FN,175)
++#define K_F167		K(KT_FN,176)
++#define K_F168		K(KT_FN,177)
++#define K_F169		K(KT_FN,178)
++#define K_F170		K(KT_FN,179)
++#define K_F171		K(KT_FN,180)
++#define K_F172		K(KT_FN,181)
++#define K_F173		K(KT_FN,182)
++#define K_F174		K(KT_FN,183)
++#define K_F175		K(KT_FN,184)
++#define K_F176		K(KT_FN,185)
++#define K_F177		K(KT_FN,186)
++#define K_F178		K(KT_FN,187)
++#define K_F179		K(KT_FN,188)
++#define K_F180		K(KT_FN,189)
++#define K_F181		K(KT_FN,190)
++#define K_F182		K(KT_FN,191)
++#define K_F183		K(KT_FN,192)
++#define K_F184		K(KT_FN,193)
++#define K_F185		K(KT_FN,194)
++#define K_F186		K(KT_FN,195)
++#define K_F187		K(KT_FN,196)
++#define K_F188		K(KT_FN,197)
++#define K_F189		K(KT_FN,198)
++#define K_F190		K(KT_FN,199)
++#define K_F191		K(KT_FN,200)
++#define K_F192		K(KT_FN,201)
++#define K_F193		K(KT_FN,202)
++#define K_F194		K(KT_FN,203)
++#define K_F195		K(KT_FN,204)
++#define K_F196		K(KT_FN,205)
++#define K_F197		K(KT_FN,206)
++#define K_F198		K(KT_FN,207)
++#define K_F199		K(KT_FN,208)
++#define K_F200		K(KT_FN,209)
++#define K_F201		K(KT_FN,210)
++#define K_F202		K(KT_FN,211)
++#define K_F203		K(KT_FN,212)
++#define K_F204		K(KT_FN,213)
++#define K_F205		K(KT_FN,214)
++#define K_F206		K(KT_FN,215)
++#define K_F207		K(KT_FN,216)
++#define K_F208		K(KT_FN,217)
++#define K_F209		K(KT_FN,218)
++#define K_F210		K(KT_FN,219)
++#define K_F211		K(KT_FN,220)
++#define K_F212		K(KT_FN,221)
++#define K_F213		K(KT_FN,222)
++#define K_F214		K(KT_FN,223)
++#define K_F215		K(KT_FN,224)
++#define K_F216		K(KT_FN,225)
++#define K_F217		K(KT_FN,226)
++#define K_F218		K(KT_FN,227)
++#define K_F219		K(KT_FN,228)
++#define K_F220		K(KT_FN,229)
++#define K_F221		K(KT_FN,230)
++#define K_F222		K(KT_FN,231)
++#define K_F223		K(KT_FN,232)
++#define K_F224		K(KT_FN,233)
++#define K_F225		K(KT_FN,234)
++#define K_F226		K(KT_FN,235)
++#define K_F227		K(KT_FN,236)
++#define K_F228		K(KT_FN,237)
++#define K_F229		K(KT_FN,238)
++#define K_F230		K(KT_FN,239)
++#define K_F231		K(KT_FN,240)
++#define K_F232		K(KT_FN,241)
++#define K_F233		K(KT_FN,242)
++#define K_F234		K(KT_FN,243)
++#define K_F235		K(KT_FN,244)
++#define K_F236		K(KT_FN,245)
++#define K_F237		K(KT_FN,246)
++#define K_F238		K(KT_FN,247)
++#define K_F239		K(KT_FN,248)
++#define K_F240		K(KT_FN,249)
++#define K_F241		K(KT_FN,250)
++#define K_F242		K(KT_FN,251)
++#define K_F243		K(KT_FN,252)
++#define K_F244		K(KT_FN,253)
++#define K_F245		K(KT_FN,254)
++#define K_UNDO		K(KT_FN,255)
++
++
++#define K_HOLE		K(KT_SPEC,0)
++#define K_ENTER		K(KT_SPEC,1)
++#define K_SH_REGS	K(KT_SPEC,2)
++#define K_SH_MEM	K(KT_SPEC,3)
++#define K_SH_STAT	K(KT_SPEC,4)
++#define K_BREAK		K(KT_SPEC,5)
++#define K_CONS		K(KT_SPEC,6)
++#define K_CAPS		K(KT_SPEC,7)
++#define K_NUM		K(KT_SPEC,8)
++#define K_HOLD		K(KT_SPEC,9)
++#define K_SCROLLFORW	K(KT_SPEC,10)
++#define K_SCROLLBACK	K(KT_SPEC,11)
++#define K_BOOT		K(KT_SPEC,12)
++#define K_CAPSON	K(KT_SPEC,13)
++#define K_COMPOSE	K(KT_SPEC,14)
++#define K_SAK		K(KT_SPEC,15)
++#define K_DECRCONSOLE	K(KT_SPEC,16)
++#define K_INCRCONSOLE	K(KT_SPEC,17)
++#define K_SPAWNCONSOLE	K(KT_SPEC,18)
++#define K_BARENUMLOCK	K(KT_SPEC,19)
++
++#define K_ALLOCATED	K(KT_SPEC,126) /* dynamically allocated keymap */
++#define K_NOSUCHMAP	K(KT_SPEC,127) /* returned by KDGKBENT */
++
++#define K_P0		K(KT_PAD,0)
++#define K_P1		K(KT_PAD,1)
++#define K_P2		K(KT_PAD,2)
++#define K_P3		K(KT_PAD,3)
++#define K_P4		K(KT_PAD,4)
++#define K_P5		K(KT_PAD,5)
++#define K_P6		K(KT_PAD,6)
++#define K_P7		K(KT_PAD,7)
++#define K_P8		K(KT_PAD,8)
++#define K_P9		K(KT_PAD,9)
++#define K_PPLUS		K(KT_PAD,10)	/* key-pad plus */
++#define K_PMINUS	K(KT_PAD,11)	/* key-pad minus */
++#define K_PSTAR		K(KT_PAD,12)	/* key-pad asterisk (star) */
++#define K_PSLASH	K(KT_PAD,13)	/* key-pad slash */
++#define K_PENTER	K(KT_PAD,14)	/* key-pad enter */
++#define K_PCOMMA	K(KT_PAD,15)	/* key-pad comma: kludge... */
++#define K_PDOT		K(KT_PAD,16)	/* key-pad dot (period): kludge... */
++#define K_PPLUSMINUS	K(KT_PAD,17)	/* key-pad plus/minus */
++#define K_PPARENL	K(KT_PAD,18)	/* key-pad left parenthesis */
++#define K_PPARENR	K(KT_PAD,19)	/* key-pad right parenthesis */
++
++#define NR_PAD		20
++
++#define K_DGRAVE	K(KT_DEAD,0)
++#define K_DACUTE	K(KT_DEAD,1)
++#define K_DCIRCM	K(KT_DEAD,2)
++#define K_DTILDE	K(KT_DEAD,3)
++#define K_DDIERE	K(KT_DEAD,4)
++#define K_DCEDIL	K(KT_DEAD,5)
++
++#define NR_DEAD		6
++
++#define K_DOWN		K(KT_CUR,0)
++#define K_LEFT		K(KT_CUR,1)
++#define K_RIGHT		K(KT_CUR,2)
++#define K_UP		K(KT_CUR,3)
++
++#define K_SHIFT		K(KT_SHIFT,KG_SHIFT)
++#define K_CTRL		K(KT_SHIFT,KG_CTRL)
++#define K_ALT		K(KT_SHIFT,KG_ALT)
++#define K_ALTGR		K(KT_SHIFT,KG_ALTGR)
++#define K_SHIFTL	K(KT_SHIFT,KG_SHIFTL)
++#define K_SHIFTR	K(KT_SHIFT,KG_SHIFTR)
++#define K_CTRLL	 	K(KT_SHIFT,KG_CTRLL)
++#define K_CTRLR	 	K(KT_SHIFT,KG_CTRLR)
++#define K_CAPSSHIFT	K(KT_SHIFT,KG_CAPSSHIFT)
++
++#define K_ASC0		K(KT_ASCII,0)
++#define K_ASC1		K(KT_ASCII,1)
++#define K_ASC2		K(KT_ASCII,2)
++#define K_ASC3		K(KT_ASCII,3)
++#define K_ASC4		K(KT_ASCII,4)
++#define K_ASC5		K(KT_ASCII,5)
++#define K_ASC6		K(KT_ASCII,6)
++#define K_ASC7		K(KT_ASCII,7)
++#define K_ASC8		K(KT_ASCII,8)
++#define K_ASC9		K(KT_ASCII,9)
++#define K_HEX0		K(KT_ASCII,10)
++#define K_HEX1		K(KT_ASCII,11)
++#define K_HEX2		K(KT_ASCII,12)
++#define K_HEX3		K(KT_ASCII,13)
++#define K_HEX4		K(KT_ASCII,14)
++#define K_HEX5		K(KT_ASCII,15)
++#define K_HEX6		K(KT_ASCII,16)
++#define K_HEX7		K(KT_ASCII,17)
++#define K_HEX8		K(KT_ASCII,18)
++#define K_HEX9		K(KT_ASCII,19)
++#define K_HEXa		K(KT_ASCII,20)
++#define K_HEXb		K(KT_ASCII,21)
++#define K_HEXc		K(KT_ASCII,22)
++#define K_HEXd		K(KT_ASCII,23)
++#define K_HEXe		K(KT_ASCII,24)
++#define K_HEXf		K(KT_ASCII,25)
++
++#define NR_ASCII	26
++
++#define K_SHIFTLOCK	K(KT_LOCK,KG_SHIFT)
++#define K_CTRLLOCK	K(KT_LOCK,KG_CTRL)
++#define K_ALTLOCK	K(KT_LOCK,KG_ALT)
++#define K_ALTGRLOCK	K(KT_LOCK,KG_ALTGR)
++#define K_SHIFTLLOCK	K(KT_LOCK,KG_SHIFTL)
++#define K_SHIFTRLOCK	K(KT_LOCK,KG_SHIFTR)
++#define K_CTRLLLOCK	K(KT_LOCK,KG_CTRLL)
++#define K_CTRLRLOCK	K(KT_LOCK,KG_CTRLR)
++
++#define K_SHIFT_SLOCK	K(KT_SLOCK,KG_SHIFT)
++#define K_CTRL_SLOCK	K(KT_SLOCK,KG_CTRL)
++#define K_ALT_SLOCK	K(KT_SLOCK,KG_ALT)
++#define K_ALTGR_SLOCK	K(KT_SLOCK,KG_ALTGR)
++#define K_SHIFTL_SLOCK	K(KT_SLOCK,KG_SHIFTL)
++#define K_SHIFTR_SLOCK	K(KT_SLOCK,KG_SHIFTR)
++#define K_CTRLL_SLOCK	K(KT_SLOCK,KG_CTRLL)
++#define K_CTRLR_SLOCK	K(KT_SLOCK,KG_CTRLR)
++
++#define NR_LOCK		8
++
++#define MAX_DIACR	256
++#endif
diff --git a/graphics/svgalib/files/patch-aw b/graphics/svgalib/files/patch-aw
new file mode 100644
index 000000000000..8e3a13d43522
--- /dev/null
+++ b/graphics/svgalib/files/patch-aw
@@ -0,0 +1,5 @@
+--- /dev/null	Fri Aug 25 22:02:50 2000
++++ include/linux/kd.h	Fri Aug 25 22:05:02 2000
+@@ -0,0 +1,2 @@
++#include <sys/consio.h>
++#include <sys/kbio.h>
diff --git a/graphics/svgalib/files/patch-ax b/graphics/svgalib/files/patch-ax
new file mode 100644
index 000000000000..e76e5e17838c
--- /dev/null
+++ b/graphics/svgalib/files/patch-ax
@@ -0,0 +1,51 @@
+--- src/keyboard/vgakeyboard.h	2000/08/30 16:11:47	1.1
++++ src/keyboard/vgakeyboard.h	2000/08/30 16:26:15
+@@ -120,28 +120,28 @@
+ #define SCANCODE_F11			87
+ #define SCANCODE_F12			88
+ 
+-#define SCANCODE_KEYPADENTER		96
+-#define SCANCODE_RIGHTCONTROL		97
+-#define SCANCODE_CONTROL		97
+-#define SCANCODE_KEYPADDIVIDE		98
+-#define SCANCODE_PRINTSCREEN		99
+-#define SCANCODE_RIGHTALT		100
+-#define SCANCODE_BREAK			101	/* Beware: is 119     */
+-#define SCANCODE_BREAK_ALTERNATIVE	119	/* on some keyboards! */
++#define SCANCODE_KEYPADENTER		89
++#define SCANCODE_RIGHTCONTROL		90
++#define SCANCODE_CONTROL		107
++#define SCANCODE_KEYPADDIVIDE		91
++#define SCANCODE_PRINTSCREEN		92
++#define SCANCODE_RIGHTALT		93
++#define SCANCODE_BREAK			104	/* Beware: is 119     */
++#define SCANCODE_BREAK_ALTERNATIVE	104	/* on some keyboards! */
+ 
+-#define SCANCODE_HOME			102
+-#define SCANCODE_CURSORBLOCKUP		103	/* Cursor key block */
+-#define SCANCODE_PAGEUP			104
+-#define SCANCODE_CURSORBLOCKLEFT	105	/* Cursor key block */
+-#define SCANCODE_CURSORBLOCKRIGHT	106	/* Cursor key block */
+-#define SCANCODE_END			107
+-#define SCANCODE_CURSORBLOCKDOWN	108	/* Cursor key block */
+-#define SCANCODE_PAGEDOWN		109
+-#define SCANCODE_INSERT			110
+-#define SCANCODE_REMOVE			111
++#define SCANCODE_HOME			94
++#define SCANCODE_CURSORBLOCKUP		95	/* Cursor key block */
++#define SCANCODE_PAGEUP			96
++#define SCANCODE_CURSORBLOCKLEFT	97	/* Cursor key block */
++#define SCANCODE_CURSORBLOCKRIGHT	98	/* Cursor key block */
++#define SCANCODE_END			99
++#define SCANCODE_CURSORBLOCKDOWN	100	/* Cursor key block */
++#define SCANCODE_PAGEDOWN		101
++#define SCANCODE_INSERT			102
++#define SCANCODE_REMOVE			103
+ 
+-#define SCANCODE_RIGHTWIN		126
+-#define SCANCODE_LEFTWIN		125
++#define SCANCODE_RIGHTWIN		106
++#define SCANCODE_LEFTWIN		105
+ 
+ #define KEY_EVENTRELEASE 0
+ #define KEY_EVENTPRESS 1
diff --git a/graphics/svgalib/pkg-plist b/graphics/svgalib/pkg-plist
index 42f245468ccb..e7d15779bb99 100644
--- a/graphics/svgalib/pkg-plist
+++ b/graphics/svgalib/pkg-plist
@@ -9,6 +9,8 @@ etc/vga/dvorak-us.keymap
 etc/vga/libvga.config
 etc/vga/libvga.et4000
 etc/vga/null.keymap
+include/linux/kd.h
+include/linux/keyboard.h
 include/vga.h
 include/vgagl.h
 include/vgajoystick.h
@@ -20,4 +22,5 @@ lib/libvga.so.1
 lib/libvgagl.a
 lib/libvgagl.so
 lib/libvgagl.so.1
+@dirrm include/linux
 @dirrm etc/vga