diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-08-25 10:35:22 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-08-25 10:35:22 +0000 |
| commit | 036dd8c105cb7f94338b4e5d80f68f6e2f33b49d (patch) | |
| tree | 6204e84f9bdea3944eb76a398968a1cfcd18bec6 /x11/XFree86-4-libraries/files/patch-d | |
| parent | Upgrade the upgrade kits to include /etc/mtree/BSD.x11-4.dist. Bump versions (diff) | |
Update to 4.0.1. Remove libraries from -clients. Try to extract
only what each port needs. Other miscellaneous bug fixes.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=31962
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-d')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-d | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 6be66663dfb1..a6f67765d897 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,6 +1,25 @@ ---- config/cf/FreeBSD.cf.orig Thu Feb 17 18:09:43 2000 -+++ config/cf/FreeBSD.cf Sat Mar 18 19:42:06 2000 -@@ -336,14 +336,14 @@ +--- config/cf/FreeBSD.cf.orig Sat Jun 24 21:15:53 2000 ++++ config/cf/FreeBSD.cf Tue Aug 1 15:19:44 2000 +@@ -135,6 +135,18 @@ + #endif + #endif + ++#ifndef HasAgpGart ++# ifdef i386Architecture ++# if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1) ++# define HasAgpGart YES ++# else ++# define HasAgpGart NO ++# endif ++# else ++# define HasAgpGart NO ++# endif ++#endif ++ + /* + * This doesn't work the way it does on every other system. On FreeBSD it's + * only a "hint, not a demand", whatever that means. Note that this is not +@@ -356,14 +368,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) @@ -17,14 +36,3 @@ #endif #ifndef PreIncDir -@@ -463,8 +463,9 @@ - /* - * A hack to work around an optimisation problem with the compiler on - * FreeBSD 4.0-current in late 1999/early 2000. -+ * (and FreeBSD 5.0-current in early 2000) - */ --#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0 -+#if (OSMajorVersion == 4 || OSMajorVersion == 5) - #define FreeBSDGccOptBug - #endif - |