17 files changed, 289 insertions, 459 deletions

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 66f8ab6cc2d5..d553ea2af170 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -12,12 +12,9 @@ SNAPVER=	${SNAPDATE:S/-//g}
 PORTNAME=	gcc-devel
 PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/sourceware/gcc/snapshots/${SNAPDATE}/  \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.ninemoons.com/pub/mirrors/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.yggdrasil.com/mirrors/site/egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
+		${MASTER_SITE_SOURCEWARE}
+MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
 DISTFILES=	gcc-core-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
 		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
@@ -42,11 +39,6 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-##WRKSRC=		${WRKDIR}/gcc-${SNAPVER}
-##CONFIGURE_WRKSRC=	${WRKDIR}/build
-##BUILD_WRKSRC=		${WRKDIR}/build
-##INSTALL_WRKSRC=		${WRKDIR}/build
-##CONFIGURE_SCRIPT=	${WRKSRC}/configure
 EGCS_REV=	3.0
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
@@ -72,18 +64,18 @@ CONFIGURE_ARGS+= --enable-threads=posix
 ALL_TARGET=	bootstrap
 MAN1=		gcpp.1 gg++.1 gg77.1 ggcc.1 ggcov.1
 
+pre-fetch:
+	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${ARCH}-portbld-freebsd${OSREL}"
+
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	    ${PERL} -pi.orig -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" \
 	    ${SRCDIR}/gcc/config/freebsd.h )
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	##@touch ${WRKSRC}/gcc/configure
-	##@touch ${WRKSRC}/gcc/cstamp-h.in
 	@touch ${SRCDIR}/gcc/configure
 	@touch ${SRCDIR}/gcc/cstamp-h.in
 	@${MKDIR} ${CONFIGURE_WRKSRC}
-	#${RM} -rf ${SRCDIR}/libjava
 
 pre-build:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
@@ -92,7 +84,7 @@ pre-install:
 	${MKDIR} ${PREFIX}/info
 
 post-install:
-	@${RM} -f ${PREFIX}/bin/c++
+	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
@@ -106,24 +98,22 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-	${MV} -f ${PREFIX}/bin/gcc ${PREFIX}/bin/ggcc
-	${MV} -f ${PREFIX}/bin/g++ ${PREFIX}/bin/gg++
-	${MV} -f ${PREFIX}/bin/g77 ${PREFIX}/bin/gg77
-	${MV} -f ${PREFIX}/bin/g++filt ${PREFIX}/bin/gg++filt
-	${MV} -f ${PREFIX}/bin/gcov ${PREFIX}/bin/ggcov
+.for file in gcc g++ cpp g++filt gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	-( test -e ${PREFIX}/man/man1/${file}.1 \
+		&& ${MV} -f ${PREFIX}/man/man1/${file}.1 \
+		${PREFIX}/man/man1/g${file}.1 )
+.endfor
+.for file in g77
+	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/g${file}
+	${MV} -f ${PREFIX}/man/man1/${file}.1 ${PREFIX}/man/man1/g${file}.1
+.endfor
 	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
-	${RM} -f ${PREFIX}/bin/${GNU_HOST}-c++
-	${RM} -f ${PREFIX}/bin/cpp
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 	${MV} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}
 	${MV} -f ${PREFIX}/lib/libstdc++.* ${PREFIX}/lib/libsupc++.* ${TARGLIB}
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	${MV} -f ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/ggcc.1
-	${MV} -f ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/gg++.1
-	${MV} -f ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/gg77.1
-	${MV} -f ${PREFIX}/man/man1/cpp.1 ${PREFIX}/man/man1/gcpp.1
-	${MV} -f ${PREFIX}/man/man1/gcov.1 ${PREFIX}/man/man1/ggcov.1
 #.if defined(WANT_SHAREDLIBS)
 #	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 #.endif