diff options
author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2001-03-18 03:44:09 +0000 |
---|---|---|
committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2001-03-18 03:44:09 +0000 |
commit | 36c1a709542cfa15dca200b417ffd06d4ded0172 (patch) | |
tree | 6f94cfe287531720785c09768be3b659925a6bc3 /x11 | |
parent | 11c9f3f4f966f3a7c31f4ea4d10ab45f7f271ec6 (diff) | |
download | ports-36c1a709542cfa15dca200b417ffd06d4ded0172.tar.gz ports-36c1a709542cfa15dca200b417ffd06d4ded0172.zip |
Notes
Diffstat (limited to 'x11')
-rw-r--r-- | x11/XFree86-4/files/patch-0 | 11 | ||||
-rw-r--r-- | x11/XFree86-4/files/patch-8 | 12 | ||||
-rw-r--r-- | x11/XFree86-4/files/patch-config_cf_Server_tmpl | 11 | ||||
-rw-r--r-- | x11/XFree86-4/files/patch-q | 12 | ||||
-rw-r--r-- | x11/XFree86-4/files/patch-r | 43 | ||||
-rw-r--r-- | x11/XFree86-4/files/patch-s | 21 |
6 files changed, 0 insertions, 110 deletions
diff --git a/x11/XFree86-4/files/patch-0 b/x11/XFree86-4/files/patch-0 deleted file mode 100644 index 4ae5356320ef..000000000000 --- a/x11/XFree86-4/files/patch-0 +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile~ Wed Mar 22 22:23:30 2000 -+++ Makefile Thu Jan 11 23:40:04 2001 -@@ -8,7 +8,7 @@ - SHELL = /bin/sh - RM = rm -f - MV = mv --WORLDOPTS = -k -+#WORLDOPTS = -k - WIN32WORLDOPTS = -i - TOP = . - CURRENT_DIR = . diff --git a/x11/XFree86-4/files/patch-8 b/x11/XFree86-4/files/patch-8 deleted file mode 100644 index db57387d876a..000000000000 --- a/x11/XFree86-4/files/patch-8 +++ /dev/null @@ -1,12 +0,0 @@ ---- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.old Tue Feb 15 19:36:32 2000 -+++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Tue Feb 15 19:36:37 2000 -@@ -590,6 +590,9 @@ - if { $mseRes <= 0 } { - set mseRes 100 - } -+ if { $mseRes > 200 } { -+ set mseRes 200 -+ } - $w.mouse.resolution.$mseRes invoke - set mseButtons $initbtn - if { $mseButtons < 3 } { diff --git a/x11/XFree86-4/files/patch-config_cf_Server_tmpl b/x11/XFree86-4/files/patch-config_cf_Server_tmpl deleted file mode 100644 index dde9241e3eda..000000000000 --- a/x11/XFree86-4/files/patch-config_cf_Server_tmpl +++ /dev/null @@ -1,11 +0,0 @@ ---- config/cf/Server.tmpl.orig Fri Feb 18 08:23:07 2000 -+++ config/cf/Server.tmpl Sat Oct 28 10:09:07 2000 -@@ -41,7 +41,7 @@ - #ifndef SetUIDServerTarget - #if InstallServerSetUID - #define SetUIDServerTarget(server,subdirs,objects,libs,syslibs) @@\ --ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTUIDFLAGS)) -+ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(INSTBINFLAGS)) - #else - #define SetUIDServerTarget ServerTarget - #endif diff --git a/x11/XFree86-4/files/patch-q b/x11/XFree86-4/files/patch-q deleted file mode 100644 index e008bb3927b3..000000000000 --- a/x11/XFree86-4/files/patch-q +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r3.17 omGeneric.c ---- lib/X11/omGeneric.c 2000/11/28 18:49:52 3.17 -+++ lib/X11/omGeneric.c 2000/12/12 02:19:31 -@@ -1158,7 +1158,7 @@ - } - vrotate_num = font_set->vrotate_num = sub_num; - } else { -- font_set->vrotate = (VRotate)NULL; -+ vrotate = font_set->vrotate = (VRotate)NULL; - } - - ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num, diff --git a/x11/XFree86-4/files/patch-r b/x11/XFree86-4/files/patch-r deleted file mode 100644 index ef144a258fcc..000000000000 --- a/x11/XFree86-4/files/patch-r +++ /dev/null @@ -1,43 +0,0 @@ ---- 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 deleted file mode 100644 index 3697f7b18ac3..000000000000 --- a/x11/XFree86-4/files/patch-s +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 |