26 files changed, 234 insertions, 585 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc35/distinfo
+++ b/lang/gcc35/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index c58555933037..a72dee387e01 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -5,18 +5,16 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-02-11
+SNAPDATE=	2004-02-18
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.0
-PORTREVISION=	1
 PORTREVISION=	${SNAPDATE:S/-//g}
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
 		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-.if !defined(CVS_DATE)
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -24,9 +22,8 @@ DISTFILES=	\
 		gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-objc-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
-.endif
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
@@ -44,6 +41,10 @@ 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
@@ -95,34 +96,6 @@ INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(CVS_DATE)
-NO_CHECKSUM=	yes
-DIST_SUBDIR=	${PKGNAME}
-CVS_CMD?=	cvs -z3 -qR
-CVSROOT=	:pserver:anoncvs@subversions.gnu.org:/cvsroot/gcc
-STAMPFILE=	${DISTDIR}/${DIST_SUBDIR}/.timestamp
-do-fetch:
-	@if [ ! -e ${STAMPFILE} ] || \
-	    [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \
-		${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \
-		cd ${DISTDIR}/${DIST_SUBDIR} ; \
-		unset CVS_RSH CVS_SERVER || ${TRUE} ; \
-		${ECHO_MSG} ">> Attempting to CVS checkout from ${CVSROOT}." ;\
-		if ${CVS_CMD} -d ${CVSROOT} co -D "${CVS_DATE}" gcc ; \
-		then \
-			( ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE} ) ; \
-			exit ; \
-		fi ; \
-		${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}." ; \
-		${ECHO_MSG} ">> Please try again later."; \
-		exit 1; \
-	fi
-
-do-extract:
-	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; ${PAX} -pe -rwt . ${SRCDIR}
-.endif	# CVS_DATE
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
 	    ${SRCDIR}/gcc/version.c
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 52f02ad68b93..e9eff98a9b5c 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040211.tar.bz2) = ea5ff245d1ea2b7187155f40e4aa4161
-SIZE (gcc-core-3.4-20040211.tar.bz2) = 10334372
-MD5 (gcc-g++-3.4-20040211.tar.bz2) = da1a360a7f074bf85adf08e174846f4a
-SIZE (gcc-g++-3.4-20040211.tar.bz2) = 2339349
-MD5 (gcc-g77-3.4-20040211.tar.bz2) = 6382834c5c7acd4aa166dec1b1568398
-SIZE (gcc-g77-3.4-20040211.tar.bz2) = 890549
-MD5 (gcc-java-3.4-20040211.tar.bz2) = 01a08a209a924135e6cd1a0c577ee5bc
-SIZE (gcc-java-3.4-20040211.tar.bz2) = 4543313
-MD5 (gcc-objc-3.4-20040211.tar.bz2) = 7e892c642c41cffe3dd708a0ac8a89e2
-SIZE (gcc-objc-3.4-20040211.tar.bz2) = 148554
-MD5 (gcc-testsuite-3.4-20040211.tar.bz2) = f5c1d05084cf1fca6e6a20ec0f7b7a6a
-SIZE (gcc-testsuite-3.4-20040211.tar.bz2) = 2585494
+MD5 (gcc-core-3.4-20040218.tar.bz2) = b1212019aaf0d7c82632ee9bcaf4c8b1
+SIZE (gcc-core-3.4-20040218.tar.bz2) = 10492236
+MD5 (gcc-g++-3.4-20040218.tar.bz2) = 606929b915f4045e76e965d06ad68d9a
+SIZE (gcc-g++-3.4-20040218.tar.bz2) = 2341243
+MD5 (gcc-g77-3.4-20040218.tar.bz2) = 02509a0b82092679d8aed693ab5838f1
+SIZE (gcc-g77-3.4-20040218.tar.bz2) = 890723
+MD5 (gcc-java-3.4-20040218.tar.bz2) = 6813f69150fc477c9ae21e15af937b05
+SIZE (gcc-java-3.4-20040218.tar.bz2) = 4542909
+MD5 (gcc-objc-3.4-20040218.tar.bz2) = a7ebf3d27aa22adbe5aeac2f6ebbad9b
+SIZE (gcc-objc-3.4-20040218.tar.bz2) = 148650
+MD5 (gcc-testsuite-3.4-20040218.tar.bz2) = 2bd2c9a597ff26c3b38a6aa59f17b0b0
+SIZE (gcc-testsuite-3.4-20040218.tar.bz2) = 2588093