diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-20 01:16:08 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-20 01:16:08 +0000 |
| commit | d29de0709a16956087718e6a1d07ec4239fa52a4 (patch) | |
| tree | 63cdd1126a2c9106e6c0cb7c430f7f3a61ec36fe /x11/XFree86-4/files/patch-d | |
| parent | An add-on to edit an id3 tag for mpg123-mode (mpg123.el) on Emacsen (diff) | |
Upgrade to 4.0.2
Notes
Notes:
svn path=/head/; revision=36143
Diffstat (limited to 'x11/XFree86-4/files/patch-d')
| -rw-r--r-- | x11/XFree86-4/files/patch-d | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/x11/XFree86-4/files/patch-d b/x11/XFree86-4/files/patch-d index a6f67765d897..ae6defbaa0f1 100644 --- a/x11/XFree86-4/files/patch-d +++ b/x11/XFree86-4/files/patch-d @@ -1,25 +1,17 @@ ---- 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 +--- config/cf/FreeBSD.cf.orig Tue Dec 5 01:45:27 2000 ++++ config/cf/FreeBSD.cf Tue Dec 19 23:08:57 2000 +@@ -210,8 +210,10 @@ -+#ifndef HasAgpGart -+# ifdef i386Architecture -+# if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1) -+# define HasAgpGart YES -+# else -+# define HasAgpGart NO -+# endif -+# else -+# define HasAgpGart NO -+# endif + /* PAM appeared in FreeBSD 3.1 */ + #if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 ) ++#ifndef HasPam + #define HasPam YES + #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 @@ + + /* + * For FreeBSD 2.2.5 and later don't make any assumptions about the version +@@ -371,14 +373,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) |