From de607d8627578c8ef79f61aebf6afc8ed3aef266 Mon Sep 17 00:00:00 2001 From: Jean-Marc Zucconi Date: Tue, 15 Feb 2000 23:03:55 +0000 Subject: A better fix to the XF86Setup core dump problem: use /usr/bin/cpp instead of /usr/libexec/cpp in config/cf/FreeBSD.cf (/usr/bin/cpp defines __FreeBSD__ wheras /usr/libexec/cpp does not) Submitted by: Kazutaka YOKOTA --- x11/XFree86-4-libraries/files/patch-c | 9 --------- x11/XFree86-4/files/patch-c | 9 --------- x11/XFree86/files/patch-c | 9 --------- x11/XFree86/files/patch-e | 13 +++++++++++++ 4 files changed, 13 insertions(+), 27 deletions(-) create mode 100644 x11/XFree86/files/patch-e (limited to 'x11') diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c index bf2ed50b82d3..01ac36e89a74 100644 --- a/x11/XFree86-4-libraries/files/patch-c +++ b/x11/XFree86-4-libraries/files/patch-c @@ -1,14 +1,5 @@ --- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig Mon Jan 17 00:34:06 2000 +++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Wed Jan 19 02:51:43 2000 -@@ -15,7 +15,7 @@ - # Mouse configuration routines - # - --set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse } ] -+set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse SysMouse } ] - - set msePatterns [list {tty[0-9A-Za-o]*} cua* *bm *mse* *mouse* \ - ps*x psm* m320 pms* com* gpmdata lms* kdmouse logi msm \ @@ -586,6 +586,9 @@ set mseRes $initres if { $mseRes <= 0 } { diff --git a/x11/XFree86-4/files/patch-c b/x11/XFree86-4/files/patch-c index bf2ed50b82d3..01ac36e89a74 100644 --- a/x11/XFree86-4/files/patch-c +++ b/x11/XFree86-4/files/patch-c @@ -1,14 +1,5 @@ --- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig Mon Jan 17 00:34:06 2000 +++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Wed Jan 19 02:51:43 2000 -@@ -15,7 +15,7 @@ - # Mouse configuration routines - # - --set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse } ] -+set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse SysMouse } ] - - set msePatterns [list {tty[0-9A-Za-o]*} cua* *bm *mse* *mouse* \ - ps*x psm* m320 pms* com* gpmdata lms* kdmouse logi msm \ @@ -586,6 +586,9 @@ set mseRes $initres if { $mseRes <= 0 } { diff --git a/x11/XFree86/files/patch-c b/x11/XFree86/files/patch-c index bf2ed50b82d3..01ac36e89a74 100644 --- a/x11/XFree86/files/patch-c +++ b/x11/XFree86/files/patch-c @@ -1,14 +1,5 @@ --- programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl.orig Mon Jan 17 00:34:06 2000 +++ programs/Xserver/hw/xfree86/XF86Setup/mouse.tcl Wed Jan 19 02:51:43 2000 -@@ -15,7 +15,7 @@ - # Mouse configuration routines - # - --set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse } ] -+set mseTypeList [concat $SupportedMouseTypes { Xqueue OSMouse SysMouse } ] - - set msePatterns [list {tty[0-9A-Za-o]*} cua* *bm *mse* *mouse* \ - ps*x psm* m320 pms* com* gpmdata lms* kdmouse logi msm \ @@ -586,6 +586,9 @@ set mseRes $initres if { $mseRes <= 0 } { diff --git a/x11/XFree86/files/patch-e b/x11/XFree86/files/patch-e new file mode 100644 index 000000000000..c111df47dd0f --- /dev/null +++ b/x11/XFree86/files/patch-e @@ -0,0 +1,13 @@ +--- config/cf/FreeBSD.cf-3.3.6 Sat Feb 12 06:36:11 2000 ++++ config/cf/FreeBSD.cf Tue Feb 15 00:25:54 2000 +@@ -69,7 +69,7 @@ + #define MkdirHierCmd mkdir -p + + #define CcCmd cc +-#define CppCmd /usr/libexec/cpp ++#define CppCmd /usr/bin/cpp + #define PreProcessCmd CppCmd + #define StandardCppDefines -traditional + #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) + + -- cgit v1.2.3