Added ~sparc-fbsd keyword.

Package-Manager: portage-2.1.2_pre3-r3

15 files changed, 281 insertions, 21 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 4458f44b1600..738d1d90908a 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.33 2006/10/06 17:14:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.34 2006/10/17 10:16:05 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-lib-6.2-sparc64.patch, freebsd-lib-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
   06 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-lib-6.2_beta2.ebuild:
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-sparc64.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-sparc64.patch
new file mode 100644
index 000000000000..0759d4996df0
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-6.2-sparc64.patch
@@ -0,0 +1,106 @@
+FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define.
+gcc only defines __sparc64__ if -mcpu is not used.
+gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD.
+
+This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always
+define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most
+people including NetBSD developers.
+
+The correct solution is to use __sparc__.
+If platform detection is required, or the code is obviously 64 bit then we can
+use the __arch64__ define as well.
+This combination should be supported by all gcc versions:)
+
+diff -ur lib.orig/libc/gen/tls.c lib/libc/gen/tls.c
+--- lib.orig/libc/gen/tls.c	2006-09-02 21:38:13 +0100
++++ lib/libc/gen/tls.c	2006-10-09 18:17:53 +0100
+@@ -61,7 +61,7 @@
+ #if defined(__ia64__) || defined(__alpha__) || defined(__powerpc__)
+ #define TLS_VARIANT_I
+ #endif
+-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
++#if defined(__i386__) || defined(__amd64__) || defined(__sparc__) || \
+     defined(__arm__)
+ #define TLS_VARIANT_II
+ #endif
+diff -ur lib.orig/libc/gmon/gmon.c lib/libc/gmon/gmon.c
+--- lib.orig/libc/gmon/gmon.c	2004-10-16 07:32:43 +0100
++++ lib/libc/gmon/gmon.c	2006-10-09 18:18:12 +0100
+@@ -53,7 +53,7 @@
+ 
+ #include "libc_private.h"
+ 
+-#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
++#if defined(__i386__) || defined(__sparc__) || defined(__amd64__)
+ extern char *minbrk __asm (".minbrk");
+ #else
+ extern char *minbrk __asm ("minbrk");
+diff -ur lib.orig/libc/stdlib/malloc.c lib/libc/stdlib/malloc.c
+--- lib.orig/libc/stdlib/malloc.c	2005-09-18 04:45:24 +0100
++++ lib/libc/stdlib/malloc.c	2006-10-09 18:22:29 +0100
+@@ -55,7 +55,7 @@
+ #       define malloc_pageshift		13U
+ #       define malloc_minsize		16U
+ #   endif
+-#   if defined(__sparc64__)
++#   if defined(__sparc__) && defined(__arch64__)
+ #       define malloc_pageshift		13U
+ #       define malloc_minsize		16U
+ #   endif
+diff -ur lib.orig/libc/xdr/xdr_float.c lib/libc/xdr/xdr_float.c
+--- lib.orig/libc/xdr/xdr_float.c	2004-10-16 07:32:43 +0100
++++ lib/libc/xdr/xdr_float.c	2006-10-09 18:23:17 +0100
+@@ -64,7 +64,7 @@
+ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
+     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
+     defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
+-    defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
++    defined(__arm26__) || defined(__amd64__)
+ #include <machine/endian.h>
+ #define IEEEFP
+ #endif
+diff -ur lib.orig/libc_r/uthread/pthread_private.h lib/libc_r/uthread/pthread_private.h
+--- lib.orig/libc_r/uthread/pthread_private.h	2005-05-31 20:57:23 +0100
++++ lib/libc_r/uthread/pthread_private.h	2006-10-09 18:24:55 +0100
+@@ -144,7 +144,7 @@
+ 	GET_BSP_JB(jb) = (long)(stk);			\
+ } while (0)
+ #define UPD_STACK_JB(jb, stk)	GET_STACK_JB(jb) = (long)(stk)
+-#elif	defined(__sparc64__)
++#elif	defined(__sparc__) && defined(__arch64__)
+ #include <machine/frame.h>
+ 
+ #define	CCFSZ	sizeof (struct frame)
+diff -ur lib.orig/libdisk/disk.c lib/libdisk/disk.c
+--- lib.orig/libdisk/disk.c	2006-05-10 16:26:46 +0100
++++ lib/libdisk/disk.c	2006-10-09 18:26:33 +0100
+@@ -42,7 +42,7 @@
+ 	p_i386
+ #elif defined(__alpha__)
+ 	p_alpha
+-#elif defined(__sparc64__)
++#elif defined(__sparc__) && defined(__arch64__)
+ 	p_sparc64
+ #elif defined(__ia64__)
+ 	p_ia64
+@@ -309,7 +309,7 @@
+ 	if (!d->boot1)
+ 		return -1;
+ 	memcpy(d->boot1, b1, 15 * 512);
+-#elif defined(__sparc64__)
++#elif defined(__sparc__) && defined(__arch64__)
+ 	if (d->boot1 != NULL)
+ 		free(d->boot1);
+ 	d->boot1 = malloc(16 * 512);
+diff -ur lib.orig/msun/src/math.h lib/msun/src/math.h
+--- lib.orig/msun/src/math.h	2005-04-16 22:12:47 +0100
++++ lib/msun/src/math.h	2006-10-09 18:27:09 +0100
+@@ -69,7 +69,7 @@
+ #define	math_errhandling	MATH_ERREXCEPT
+ 
+ /* XXX We need a <machine/math.h>. */
+-#if defined(__ia64__) || defined(__sparc64__)
++#if defined(__ia64__) || defined(__sparc__)
+ #define	FP_FAST_FMA
+ #endif
+ #ifdef __ia64__
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
index 8f9b45913a45..46facdcf9173 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.5 2006/10/06 17:14:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-6.2_beta2.ebuild,v 1.6 2006/10/17 10:16:05 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic toolchain-funcs
 
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="6.0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="atm bluetooth ssl ipv6 kerberos nis gpib build bootstrap"
 
@@ -82,7 +82,8 @@ PATCHES="${FILESDIR}/${PN}-bsdxml.patch
 	${FILESDIR}/${PN}-6.0-binutils-asm.patch
 	${FILESDIR}/${PN}-6.0-ssp.patch
 	${FILESDIR}/${PN}-6.1-csu.patch
-	${FILESDIR}/${PN}-6.2-gcc41.patch"
+	${FILESDIR}/${PN}-6.2-gcc41.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
 
 # Here we disable and remove source which we don't need or want
 # In order:
diff --git a/sys-freebsd/freebsd-libexec/ChangeLog b/sys-freebsd/freebsd-libexec/ChangeLog
index 7212c86ef093..2d9f2dc6a336 100644
--- a/sys-freebsd/freebsd-libexec/ChangeLog
+++ b/sys-freebsd/freebsd-libexec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-libexec
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.13 2006/10/05 09:10:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/ChangeLog,v 1.14 2006/10/17 10:20:18 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-libexec-6.2-sparc64.patch,
+  freebsd-libexec-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
 *freebsd-libexec-6.2_beta2 (05 Oct 2006)
 
diff --git a/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch
new file mode 100644
index 000000000000..3ed300a45863
--- /dev/null
+++ b/sys-freebsd/freebsd-libexec/files/freebsd-libexec-6.2-sparc64.patch
@@ -0,0 +1,34 @@
+FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define.
+gcc only defines __sparc64__ if -mcpu is not used.
+gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD.
+
+This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always
+define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most
+people including NetBSD developers.
+
+The correct solution is to use __sparc__.
+If platform detection is required, or the code is obviously 64 bit then we can
+use the __arch64__ define as well.
+This combination should be supported by all gcc versions:)
+
+diff -ur libexec.orig/rtld-elf/rtld.c libexec/rtld-elf/rtld.c
+--- libexec.orig/rtld-elf/rtld.c	2006-10-10 08:16:56 +0100
++++ libexec/rtld-elf/rtld.c	2006-10-10 08:19:08 +0100
+@@ -2732,7 +2732,7 @@
+ 
+ #endif
+ 
+-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
++#if defined(__i386__) || defined(__amd64__) || defined(__sparc__) || \
+     defined(__arm__)
+ 
+ /*
+@@ -2897,7 +2897,7 @@
+ void
+ free_tls_offset(Obj_Entry *obj)
+ {
+-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
++#if defined(__i386__) || defined(__amd64__) || defined(__sparc__) || \
+     defined(__arm__)
+     /*
+      * If we were the last thing to allocate out of the static TLS
diff --git a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
index 2cd6b4635109..23c1140f2820 100644
--- a/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild,v 1.1 2006/10/05 09:10:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-libexec/freebsd-libexec-6.2_beta2.ebuild,v 1.2 2006/10/17 10:20:18 uberlord Exp $
 
 inherit bsdmk freebsd pam
 
 DESCRIPTION="FreeBSD libexec things"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="pam ssl kerberos ipv6 nis"
 
@@ -45,7 +45,8 @@ src_compile() {
 PATCHES="${FILESDIR}/${PN}-setXid.patch
 	${FILESDIR}/${PN}-5.3_rc1-ypxfr-makefile.patch
 	${FILESDIR}/${PN}-nossp.patch
-	${FILESDIR}/${PN}-6.1-libfallback.patch"
+	${FILESDIR}/${PN}-6.1-libfallback.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
 
 # Remove sendmail, tcp_wrapper and other useless stuff
 REMOVE_SUBDIRS="smrsh mail.local tcpd telnetd rshd rlogind lukemftpd ftpd"
diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 7e44d69b873f..d514d1ae32f7 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.20 2006/10/05 21:14:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.21 2006/10/17 10:24:29 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  freebsd-sbin-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
   05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   freebsd-sbin-6.1.ebuild, freebsd-sbin-6.2_beta2.ebuild:
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild
index dc4710f32937..30b36d677c20 100644
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild,v 1.2 2006/10/05 21:14:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2_beta2.ebuild,v 1.3 2006/10/17 10:24:29 uberlord Exp $
 
 inherit flag-o-matic bsdmk freebsd
 
 DESCRIPTION="FreeBSD sbin utils"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 SLOT="0"
 
 SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog
index 704dbe1f59d5..6847223cbbd7 100644
--- a/sys-freebsd/freebsd-share/ChangeLog
+++ b/sys-freebsd/freebsd-share/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-share
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.15 2006/10/05 09:15:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.16 2006/10/17 10:26:53 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  freebsd-share-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
 *freebsd-share-6.2_beta2 (05 Oct 2006)
 
diff --git a/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild b/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild
index 600e8a824bfd..8ab00a25adbc 100644
--- a/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild,v 1.1 2006/10/05 09:15:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-6.2_beta2.ebuild,v 1.2 2006/10/17 10:26:53 uberlord Exp $
 
 inherit bsdmk freebsd
 
 DESCRIPTION="FreeBSD shared tools/files"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="doc isdn"
 
diff --git a/sys-freebsd/freebsd-ubin/ChangeLog b/sys-freebsd/freebsd-ubin/ChangeLog
index 82ee025a0657..1db525968f1a 100644
--- a/sys-freebsd/freebsd-ubin/ChangeLog
+++ b/sys-freebsd/freebsd-ubin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-ubin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.28 2006/10/09 09:04:16 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/ChangeLog,v 1.29 2006/10/17 10:30:38 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-ubin-6.2-sparc64.patch, freebsd-ubin-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
   09 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
   freebsd-ubin-6.1.ebuild, freebsd-ubin-6.2_beta1.ebuild,
diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-sparc64.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-sparc64.patch
new file mode 100644
index 000000000000..c7a5f839674b
--- /dev/null
+++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.2-sparc64.patch
@@ -0,0 +1,92 @@
+FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define.
+gcc only defines __sparc64__ if -mcpu is not used.
+gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD.
+
+This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always
+define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most
+people including NetBSD developers.
+
+The correct solution is to use __sparc__.
+If platform detection is required, or the code is obviously 64 bit then we can
+use the __arch64__ define as well.
+This combination should be supported by all gcc versions:)
+
+diff -ur usr.bin.orig/getconf/progenv.gperf usr.bin/getconf/progenv.gperf
+--- usr.bin.orig/getconf/progenv.gperf	2005-02-18 21:53:05 +0000
++++ usr.bin/getconf/progenv.gperf	2006-10-10 09:51:19 +0100
+@@ -30,7 +30,7 @@
+  * be updated.  (We cheat here and define the supported environments
+  * statically.)
+  */
+-#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
++#if defined(__alpha__) || (defined(__sparc__) && defined(__arch64)) || defined(__amd64__)
+ #define	have_LP64_OFF64		NULL
+ #endif
+ 
+diff -ur usr.bin.orig/gprof/gprof.h usr.bin/gprof/gprof.h
+--- usr.bin.orig/gprof/gprof.h	2004-10-03 19:22:35 +0100
++++ usr.bin/gprof/gprof.h	2006-10-10 09:50:07 +0100
+@@ -59,7 +59,7 @@
+ #if __powerpc__
+ #   include "powerpc.h"
+ #endif
+-#if __sparc64__
++#if __sparc__ && __arch64__
+ #   include "sparc64.h"
+ #endif
+ 
+diff -ur usr.bin.orig/truss/extern.h usr.bin/truss/extern.h
+--- usr.bin.orig/truss/extern.h	2005-03-27 13:53:25 +0100
++++ usr.bin/truss/extern.h	2006-10-10 09:52:05 +0100
+@@ -54,7 +54,7 @@
+ extern void ia64_syscall_entry(struct trussinfo *, int);
+ extern long ia64_syscall_exit(struct trussinfo *, int);
+ #endif
+-#ifdef __sparc64__
++#if defined(__sparc__) && defined(__arch64__)
+ extern void sparc64_syscall_entry(struct trussinfo *, int);
+ extern long sparc64_syscall_exit(struct trussinfo *, int);
+ #endif
+diff -ur usr.bin.orig/truss/main.c usr.bin/truss/main.c
+--- usr.bin.orig/truss/main.c	2006-06-09 22:08:51 +0100
++++ usr.bin/truss/main.c	2006-10-10 09:53:10 +0100
+@@ -99,7 +99,7 @@
+ #ifdef __ia64__
+ 	{ "FreeBSD ELF64", ia64_syscall_entry, ia64_syscall_exit },
+ #endif
+-#ifdef __sparc64__
++#if defined(__sparc__) && defined(__arch64__)
+ 	{ "FreeBSD ELF64", sparc64_syscall_entry, sparc64_syscall_exit },
+ #endif
+ 	{ 0, 0, 0 },
+diff -ur usr.bin.orig/xlint/common/param.h usr.bin/xlint/common/param.h
+--- usr.bin.orig/xlint/common/param.h	2002-07-19 16:19:23 +0100
++++ usr.bin/xlint/common/param.h	2006-10-10 09:53:59 +0100
+@@ -69,7 +69,7 @@
+ /*
+  * And the sparc64 long double code generation is broken.
+  */
+-#if !defined(__sparc64__)
++#if !(defined(__sparc__) && defined(__arch64__))
+ typedef	long double ldbl_t;
+ #else
+ typedef	double	ldbl_t;
+diff -ur usr.bin.orig/xlint/lint1/param.h usr.bin/xlint/lint1/param.h
+--- usr.bin.orig/xlint/lint1/param.h	2004-05-14 14:44:36 +0100
++++ usr.bin/xlint/lint1/param.h	2006-10-10 09:55:06 +0100
+@@ -83,12 +83,12 @@
+ #elif __powerpc__
+ #define PTRDIFF_IS_LONG		0
+ #define SIZEOF_IS_ULONG		0
++#elif defined(__sparc__) && defined(__arch64__)
++#define PTRDIFF_IS_LONG		1
++#define SIZEOF_IS_ULONG		1
+ #elif __sparc__
+ #define PTRDIFF_IS_LONG		0
+ #define SIZEOF_IS_ULONG		0
+-#elif __sparc64__
+-#define PTRDIFF_IS_LONG		1
+-#define SIZEOF_IS_ULONG		1
+ #elif __vax__
+ #define PTRDIFF_IS_LONG         0
+ #define SIZEOF_IS_ULONG         0
diff --git a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
index 242b6cf15852..9fdd0fd67521 100644
--- a/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.3 2006/10/09 09:04:16 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-ubin/freebsd-ubin-6.2_beta2.ebuild,v 1.4 2006/10/17 10:30:38 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic pam
 
 DESCRIPTION="FreeBSD's base system source for /usr/bin"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="atm bluetooth ssl usb nls ipv6 kerberos nis build"
 
@@ -55,7 +55,8 @@ PATCHES="${FILESDIR}/${PN}-6.0-bsdcmp.patch
 	${FILESDIR}/${PN}-lint-stdarg.patch
 	${FILESDIR}/${PN}-6.0-kdump-ioctl.patch
 	${FILESDIR}/${PN}-6.1-gcc41.patch
-	${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch"
+	${FILESDIR}/${PN}-6.2-rpcgen-gcc4.1.patch
+	${FILESDIR}/${PN}-6.2-sparc64.patch"
 
 # Here we remove some sources we don't need because they are already
 # provided by portage's packages or similar. In order:
diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index 02189353354f..dd515b8dc753 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.24 2006/10/12 14:59:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.25 2006/10/17 10:33:31 uberlord Exp $
+
+  17 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  freebsd-usbin-6.2_beta2.ebuild:
+  Added ~sparc-fbsd keyword.
 
   12 Oct 2006; Roy Marples <uberlord@gentoo.org> files/powerd.confd:
   Don't annoy laptop users too much, default powerd to maximum in AC_MODE.
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
index 512f93515bdf..39a23cc01398 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.3 2006/10/05 22:14:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.4 2006/10/17 10:33:31 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
 DESCRIPTION="FreeBSD /usr/sbin tools"
 SLOT="0"
-KEYWORDS="~x86-fbsd"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
 
 IUSE="atm bluetooth tcpd ssl usb ipv6 acpi ipfilter isdn pam ssl radius
 	 minimal ipsec nis pam suid nat radius build"