Update to the 20040702 snapshot. Optimize that SNAPDATE variable away on

the way and use ${ECHO_MSG} instead of ${ECHO} [1].

Spotted by:	eik [1]

26 files changed, 208 insertions, 221 deletions

diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc35/distinfo
+++ b/lang/gcc35/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index e6ba233c9e93..fe9b5307c71f 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -5,11 +5,10 @@
 #
 # $FreeBSD$
 #
-SNAPDATE=	2004-06-11
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.1
-PORTREVISION=	${SNAPDATE:S/-//g}
+PORTREVISION=	20040702
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC} \
@@ -110,9 +109,9 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO} "Consider running 'make check' before 'make install', especially
-	@${ECHO} "if you have not performed this build on -STABLE or -CURRENT."
-	@${ECHO} "This assumes that you have the dejagnu port installed."
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
+	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 7bc88ed2ded3..09da4f5c5f3c 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20040611.tar.bz2) = 50a59f7fdfbdb0c8e4b0dc634eb1d379
-SIZE (gcc-core-3.4-20040611.tar.bz2) = 10899972
-MD5 (gcc-g++-3.4-20040611.tar.bz2) = 796f087230adcc103fed03af6c27a878
-SIZE (gcc-g++-3.4-20040611.tar.bz2) = 2405500
-MD5 (gcc-g77-3.4-20040611.tar.bz2) = 73fe381d434a5d1fc96922ee24bfa561
-SIZE (gcc-g77-3.4-20040611.tar.bz2) = 891210
-MD5 (gcc-java-3.4-20040611.tar.bz2) = a8690e0ee50aeacb9f9e24534080a463
-SIZE (gcc-java-3.4-20040611.tar.bz2) = 4547828
-MD5 (gcc-objc-3.4-20040611.tar.bz2) = 9c32a58edbe93d2575f403182965c38c
-SIZE (gcc-objc-3.4-20040611.tar.bz2) = 148632
-MD5 (gcc-testsuite-3.4-20040611.tar.bz2) = 3ff05aa9b3330da3b37b4d109ec04d67
-SIZE (gcc-testsuite-3.4-20040611.tar.bz2) = 2603195
+MD5 (gcc-core-3.4-20040702.tar.bz2) = cb65928e7dbcecdf3ff75ca23aae7d4d
+SIZE (gcc-core-3.4-20040702.tar.bz2) = 10901864
+MD5 (gcc-g++-3.4-20040702.tar.bz2) = 96366eba03854c70369785ed2b83d615
+SIZE (gcc-g++-3.4-20040702.tar.bz2) = 2406710
+MD5 (gcc-g77-3.4-20040702.tar.bz2) = db8040e340a4d25b5c680e609d4bd140
+SIZE (gcc-g77-3.4-20040702.tar.bz2) = 891075
+MD5 (gcc-java-3.4-20040702.tar.bz2) = 11acf1d942d5f12b2798f65eb63ab80e
+SIZE (gcc-java-3.4-20040702.tar.bz2) = 4548449
+MD5 (gcc-objc-3.4-20040702.tar.bz2) = c6e8046aa215325328e42349432f8c8c
+SIZE (gcc-objc-3.4-20040702.tar.bz2) = 148697
+MD5 (gcc-testsuite-3.4-20040702.tar.bz2) = 9415078d3992506c8ec0db769e0ec5de
+SIZE (gcc-testsuite-3.4-20040702.tar.bz2) = 2604141