Compilation fixes for changes in machine/console.h and machine/mouse.h in

-current. patch-r and patch-s come from the XFRee86-4 port, another patch is
required here for scanpci.c (patch-q, submitted by Donald J. Maddox
<dmaddox@sc.rr.com>)

3 files changed, 85 insertions, 0 deletions

diff --git a/x11/XFree86/files/patch-q b/x11/XFree86/files/patch-q
new file mode 100644
index 000000000000..66937ce3de9a
--- /dev/null
+++ b/x11/XFree86/files/patch-q
@@ -0,0 +1,21 @@
+--- programs/Xserver/hw/xfree86/etc/scanpci.c.orig	Fri Dec  3 04:43:47 1999
++++ programs/Xserver/hw/xfree86/etc/scanpci.c	Mon Dec  4 14:14:39 2000
+@@ -101,7 +101,17 @@
+ #endif
+ #if defined(__FreeBSD__) || defined(__386BSD__)
+ #include <sys/file.h>
+-#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
+ #ifndef GCCUSESGAS
+ #define GCCUSESGAS
+ #endif
diff --git a/x11/XFree86/files/patch-r b/x11/XFree86/files/patch-r
new file mode 100644
index 000000000000..ef144a258fcc
--- /dev/null
+++ b/x11/XFree86/files/patch-r
@@ -0,0 +1,43 @@
+--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.ORIG    Mon Nov 27 13:29 :06 2000
++++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Mon Nov 27 14:26:21 2000
+@@ -461,11 +461,21 @@
+ #   endif
+ #   ifdef SYSCONS_SUPPORT
+ #    define COMPAT_SYSCONS
+-#    if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#    if defined(__NetBSD__) || defined(__OpenBSD__)
+ #     include <machine/console.h>
+ #    else
+-#     include <sys/console.h>
+-#    endif /* __FreeBSD__ || __NetBSD__ || defined(__OpenBSD__) */
++#     if defined(__FreeBSD__)
++#        include <osreldate.h>
++#        if __FreeBSD_version >= 410000
++#          include <sys/consio.h>
++#          include <sys/kbio.h>
++#        else
++#          include <machine/console.h>
++#        endif /* FreeBSD 4.1 RELEASE or lator */
++#     else
++#      include <sys/console.h>
++#     endif
++#    endif
+ #   endif /* SYSCONS_SUPPORT */
+ #   if defined(PCVT_SUPPORT)
+ #    if !defined(SYSCONS_SUPPORT)
+@@ -496,8 +506,13 @@
+ #    include <dev/wscons/wsconsio.h>
+ #   endif /* WSCONS_SUPPORT */
+ #   if defined(__FreeBSD__)
+-#    undef MOUSE_GETINFO
+-#    include <machine/mouse.h>
++#    include <osreldate.h>
++#    if __FreeBSD_version >= 500013
++#     include <sys/mouse.h>
++#    else
++#     undef MOUSE_GETINFO
++#     include <machine/mouse.h>
++#    endif
+ #   endif
+     /* Include these definitions in case ioctl_pc.h didn't get included */
+ #   ifndef CONSOLE_X_MODE_ON
diff --git a/x11/XFree86/files/patch-s b/x11/XFree86/files/patch-s
new file mode 100644
index 000000000000..3697f7b18ac3
--- /dev/null
+++ b/x11/XFree86/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