Update to the 20040308 snapshot of GCC 3.3.4.

- Work around breakage due to the renaming of x86_64 to amd64 (which still
  has not been addressed upstream).
- 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.

2 files changed, 17 insertions, 23 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 792e85df5d9d..4fc134987376 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-16
+SNAPDATE=	2004-03-08
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.4
@@ -41,7 +41,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
@@ -49,15 +48,15 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-BROKEN= "Configure broken due to renaming this architecture from x86_84."
-.endif
-
 .if ${ARCH} == sparc64
 BROKEN=	"libgcj is not supported/packaging is broken on this platform"
 .endif
 
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
+.endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
@@ -78,11 +77,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
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index 75f55ebb1a6e..80ddea5bea11 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.3-20040216.tar.bz2) = 12365bb5d725a790d6707c4dc1f42479
-SIZE (gcc-core-3.3-20040216.tar.bz2) = 9890478
-MD5 (gcc-g++-3.3-20040216.tar.bz2) = 0959427a1cbd0fe82a815ec650c6708e
-SIZE (gcc-g++-3.3-20040216.tar.bz2) = 2005883
-MD5 (gcc-g77-3.3-20040216.tar.bz2) = 5001c3ba53cc1992f99290222c1b8efc
-SIZE (gcc-g77-3.3-20040216.tar.bz2) = 904503
-MD5 (gcc-java-3.3-20040216.tar.bz2) = aff2dfdb5d9e914b3b7c95a50be57bb6
-SIZE (gcc-java-3.3-20040216.tar.bz2) = 3445663
-MD5 (gcc-objc-3.3-20040216.tar.bz2) = 6025099da99ea22b81fe10a774f61b90
-SIZE (gcc-objc-3.3-20040216.tar.bz2) = 141196
-MD5 (gcc-testsuite-3.3-20040216.tar.bz2) = 334834f5fb163e61a9a720bfca186902
-SIZE (gcc-testsuite-3.3-20040216.tar.bz2) = 1078807
+MD5 (gcc-core-3.3-20040308.tar.bz2) = c26dc4cb129188d2118c199a85a7a22a
+SIZE (gcc-core-3.3-20040308.tar.bz2) = 9899267
+MD5 (gcc-g++-3.3-20040308.tar.bz2) = 0a8f702d507c6e48fc6b836fbfcb2c1f
+SIZE (gcc-g++-3.3-20040308.tar.bz2) = 2006689
+MD5 (gcc-g77-3.3-20040308.tar.bz2) = 542bfbdc2a46ac99810ad14d79463e80
+SIZE (gcc-g77-3.3-20040308.tar.bz2) = 905490
+MD5 (gcc-java-3.3-20040308.tar.bz2) = 635f1c139d6384a4c53f00957f3d32ae
+SIZE (gcc-java-3.3-20040308.tar.bz2) = 3445673
+MD5 (gcc-objc-3.3-20040308.tar.bz2) = 88b68b9b6f2094b0b0f8b07819a575e5
+SIZE (gcc-objc-3.3-20040308.tar.bz2) = 141101
+MD5 (gcc-testsuite-3.3-20040308.tar.bz2) = 755efa611810e0392606407e5f200aab
+SIZE (gcc-testsuite-3.3-20040308.tar.bz2) = 1079147