summaryrefslogtreecommitdiff
path: root/x11/XFree86-4-libraries
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2003-08-23 03:05:24 +0000
committerEric Anholt <anholt@FreeBSD.org>2003-08-23 03:05:24 +0000
commitabb67d14e8c15b4e2b9b5464394cbd731350ab13 (patch)
tree659af105790e88efe6d12d5670d509506b8f1a1c /x11/XFree86-4-libraries
parentUpdate 0.92 (diff)
Remove the disabling of MTRRs on amd64, as MTRR support has been added to
-current. No PORTREVISION bump because the installed base is small enough. Submitted by: peter
Notes
Notes: svn path=/head/; revision=87542
Diffstat (limited to 'x11/XFree86-4-libraries')
-rw-r--r--x11/XFree86-4-libraries/files/patch-FreeBSD.cf19
1 files changed, 4 insertions, 15 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
index b606777cd1dd..a91c704728dd 100644
--- a/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
+++ b/x11/XFree86-4-libraries/files/patch-FreeBSD.cf
@@ -1,5 +1,5 @@
--- config/cf/FreeBSD.cf.orig Tue Jan 14 18:52:12 2003
-+++ config/cf/FreeBSD.cf Tue Jul 15 19:57:04 2003
++++ config/cf/FreeBSD.cf Fri Aug 22 20:02:11 2003
@@ -162,11 +162,11 @@
* ld: warning: libXThrStub.so.6, needed by libX11.so, not found
*/
@@ -25,18 +25,7 @@
#endif
#endif
#ifndef ExtraLibraries
-@@ -209,6 +209,10 @@
- #endif
-
- /* 3.3(?) and later has support for setting MTRRs */
-+#ifdef x86_64Architecture
-+#define HasMTRRSupport NO /* not yet */
-+#endif
-+
- #ifndef HasMTRRSupport
- #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 3)
- #define HasMTRRSupport YES
-@@ -228,21 +232,25 @@
+@@ -228,21 +228,25 @@
#endif
/*
@@ -65,7 +54,7 @@
# define HasX86Support YES
# define HasMMXSupport YES
# define Has3DNowSupport YES
-@@ -455,10 +463,8 @@
+@@ -455,10 +459,8 @@
#ifdef i386Architecture
#define ServerExtraDefines GccGasOption XFree86ServerDefines
#endif
@@ -78,7 +67,7 @@
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#endif
-@@ -482,18 +488,8 @@
+@@ -482,18 +484,8 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif