Try to fix breakage of non-amd64 platforms introduced by 1.165 and

remove inflamatory comment.

Remove BROKEN from sparc64 and simplify special case handling of
libgcj on ia64 and sparc64.
USE_SIZE is now the default, no need to specify it explicitly.
Remove WANT_THREADS_SUPPORT knob, which should be a no-op by now.

13 files changed, 39 insertions, 169 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 8ff31da6c6b5..2a315db2fd2a 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -33,7 +33,6 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -42,16 +41,12 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
-# fscking Linux & GNU $*!%
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-.if ${ARCH} == sparc64
-BROKEN=	"libgcj is not supported/packaging is broken on this platform"
-WITHOUT_LIBJAVA=	yes
-.endif
-
-.if ${ARCH} == ia64
+.if ${ARCH} == ia64  ||  ${ARCH} == sparc64
 WITHOUT_LIBJAVA=	yes
 .endif
 
@@ -74,11 +69,6 @@ EXTRA_SHLIB=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .endif
-.if defined(WANT_THREADS_SUPPORT)
-CONFIGURE_ARGS+=	--enable-threads
-#	?is this an ObjC only thing?
-CONFIGURE_ARGS+=	--enable-threads=posix
-.endif
 ALL_TARGET=	bootstrap-lean
 PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \