diff options
| author | Jake Burkholder <jake@FreeBSD.org> | 2003-11-25 08:56:30 +0000 |
|---|---|---|
| committer | Jake Burkholder <jake@FreeBSD.org> | 2003-11-25 08:56:30 +0000 |
| commit | a021c166410a65c24f9f5bb315818811891667a4 (patch) | |
| tree | e9e92e9013af58f8c8cd3f467acd5dfe94937a14 | |
| parent | - Fix build on 5.x (diff) | |
Fix XFree86-4-FontServer build on sparc64.
Requested by: kris
Notes
Notes:
svn path=/head/; revision=94773
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-xfree86.cf | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index b2b73b2d3a6f..f28f91b237e4 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -34,7 +34,7 @@ COMMENT= XFree86-4 X server and related programs patch-bus-Imakefile \ patch-compiler.h patch-os-support_Imakefile patch-bsd_Imakefile \ patch-freebsdPci.c patch-bus_Imakefile patch-xf86Sbus.h patch-loader.c \ - patch-Sbus.c patch-elfloader.c patch-xfree86.cf patch-FreeBSD.cf \ + patch-Sbus.c patch-elfloader.c patch-FreeBSD.cf \ patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c patch-ftfuncs.c EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor diff --git a/x11/XFree86-4-libraries/files/patch-xfree86.cf b/x11/XFree86-4-libraries/files/patch-xfree86.cf index 2bb1d41c83eb..0c1ea9ea816f 100644 --- a/x11/XFree86-4-libraries/files/patch-xfree86.cf +++ b/x11/XFree86-4-libraries/files/patch-xfree86.cf @@ -1,5 +1,14 @@ ---- config/cf/xfree86.cf.orig Tue Mar 4 16:39:46 2003 -+++ config/cf/xfree86.cf Tue Mar 4 16:39:48 2003 +--- config/cf/xfree86.cf.orig Wed Feb 26 15:07:59 2003 ++++ config/cf/xfree86.cf Mon Nov 24 14:44:33 2003 +@@ -481,7 +481,7 @@ + + /* SPARC and UltraSPARC drivers */ + +-#if defined(SparcArchitecture) && \ ++#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ + !defined(LynxOSArchitecture) && \ + !defined(NetBSDArchitecture) && \ + !defined(OpenBSDArchitecture) @@ -1803,6 +1803,8 @@ #ifndef XFree86ConsoleDefines # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) |