diff options
| author | jmz <jmz@FreeBSD.org> | 2000-11-28 02:44:58 +0000 |
|---|---|---|
| committer | jmz <jmz@FreeBSD.org> | 2000-11-28 02:44:58 +0000 |
| commit | 6420c5c5691119c123b6311874f5b5d2438a5a7d (patch) | |
| tree | e09964349b130f7a0a66161c9815419f4e28cfcd /x11/XFree86-4 | |
| parent | 51191c877c8262a431b631638a40ab15ca63b9be (diff) | |
| download | FreeBSD-ports-6420c5c5691119c123b6311874f5b5d2438a5a7d.zip FreeBSD-ports-6420c5c5691119c123b6311874f5b5d2438a5a7d.tar.gz | |
Fix compilation problems caused by recent changes in machine/console.h and
machine/mouse.h
Submitted by: taguchi@tohoku.iij.ad.jp
Diffstat (limited to 'x11/XFree86-4')
| -rw-r--r-- | x11/XFree86-4/files/patch-r | 43 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-s | 21 |
2 files changed, 64 insertions, 0 deletions
diff --git a/x11/XFree86-4/files/patch-r b/x11/XFree86-4/files/patch-r new file mode 100644 index 0000000..ef144a2 --- /dev/null +++ b/x11/XFree86-4/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-4/files/patch-s b/x11/XFree86-4/files/patch-s new file mode 100644 index 0000000..3697f7b --- /dev/null +++ b/x11/XFree86-4/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 |
