4 files changed, 46 insertions, 6 deletions

diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 53beecc618a9..afc36b49b2d0 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -94,6 +94,13 @@ PLIST_SUB+=	OSMESA:="@comment "
 PLIST_SUB+=	OSMESA:=""
 .endif
 
+# sparc64 doesn't have a working libc_r yet.
+.if ${MACHINE_ARCH} == "sparc64"
+PLIST_SUB+=	XTHRSTUB:="@comment "
+.else
+PLIST_SUB+=	XTHRSTUB:=""
+.endif
+
 post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
diff --git a/x11/XFree86-4-libraries/files/patch-Imake.cf b/x11/XFree86-4-libraries/files/patch-Imake.cf
new file mode 100644
index 000000000000..1942b79f26a2
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-Imake.cf
@@ -0,0 +1,13 @@
+--- config/cf/Imake.cf.orig	Wed Sep 18 18:17:14 2002
++++ config/cf/Imake.cf	Wed Sep 18 18:17:44 2002
+@@ -221,6 +221,10 @@
+ #  define AlphaArchitecture
+ #  undef __alpha__
+ # endif
++# ifdef __sparc64__
++#  define Sparc64Architecture
++#  undef __sparc64__
++# endif
+ #endif /* __FreeBSD__ */
+ 
+ #ifdef AMOEBA
diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d
index 9e5ec4a37408..b6d06c824c3a 100644
--- a/x11/XFree86-4-libraries/files/patch-d
+++ b/x11/XFree86-4-libraries/files/patch-d
@@ -1,5 +1,5 @@
---- config/cf/FreeBSD.cf.orig	Tue Sep 17 19:33:33 2002
-+++ config/cf/FreeBSD.cf	Tue Sep 17 20:47:11 2002
+--- config/cf/FreeBSD.cf.orig	Wed Sep 18 18:18:59 2002
++++ config/cf/FreeBSD.cf	Wed Sep 18 18:19:36 2002
 @@ -43,11 +43,15 @@
  #define GccUsesGas		YES
  #define UseGas			YES
@@ -16,7 +16,17 @@
  #ifndef HasLibCrypt
  # define HasLibCrypt		YES
  #endif
-@@ -82,10 +86,6 @@
+@@ -74,18 +78,14 @@
+  * Multi-thread safe libs 
+  */	
+ /* 2.2.7 and later has libc_r (POSIX threads) */
+-#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
+-    OSMajorVersion >= 3
++#if (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7) || \
++    (OSMajorVersion >= 3) && !defined(Sparc64Architecture)
+ # ifndef HasLibPthread
+ #  define HasLibPthread		NO
+ # endif
  # define HasPosixThreads	YES
  # define ThreadedX		YES
  /*
@@ -79,7 +89,17 @@
  /* 
   * 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 
-@@ -448,14 +466,14 @@
+@@ -424,6 +442,9 @@
+ #ifdef AlphaArchitecture
+ #define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
+ #endif
++#ifdef Sparc64Architecture
++#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
++#endif
+ 
+ #define StandardDefines	-DCSRG_BASED
+ 
+@@ -448,14 +469,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)
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 5fd20bdf3d02..d07629b00b36 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -536,8 +536,8 @@ lib/libX11.so.6
 lib/libXIE.a
 lib/libXIE.so
 lib/libXIE.so.6
-lib/libXThrStub.so
-lib/libXThrStub.so.6
+%%XTHRSTUB:%%lib/libXThrStub.so
+%%XTHRSTUB:%%lib/libXThrStub.so.6
 lib/libXTrap.a
 lib/libXTrap.so
 lib/libXTrap.so.6