Index: head/devel/freebsd-gcc6/Makefile
===================================================================
--- head/devel/freebsd-gcc6/Makefile
+++ head/devel/freebsd-gcc6/Makefile
@@ -4,7 +4,7 @@
 PORTVERSION=	6.5.0
 PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
+MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
@@ -14,19 +14,20 @@
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
+		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
-		objdump:devel/binutils
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH}
 
 FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc64 sparc64
 TARGETARCH=	${FLAVOR}
 
+USES=		compiler:c++11-lang gmake iconv libtool makeinfo tar:xz
+
 CONFLICTS=	${TARGETARCH}-gcc
 
-USES=	gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
@@ -124,8 +125,8 @@
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
-	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
+	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
Index: head/devel/freebsd-gcc6/pkg-descr
===================================================================
--- head/devel/freebsd-gcc6/pkg-descr
+++ head/devel/freebsd-gcc6/pkg-descr
@@ -1,3 +1,4 @@
-GCC, the GNU Compiler Collection supporting C and C++ for targetting crossbuilding.
+GCC, the GNU Compiler Collection, supporting C and C++ for building the
+FreeBSD base system.
 
 WWW: http://gcc.gnu.org/
Index: head/devel/freebsd-gcc9/Makefile
===================================================================
--- head/devel/freebsd-gcc9/Makefile
+++ head/devel/freebsd-gcc9/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	gcc
 PORTVERSION=	9.3.0
 CATEGORIES=	devel
-MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
+MASTER_SITES=	GCC
 PKGNAMEPREFIX=	${TARGETARCH}-
 PKGNAMESUFFIX=	${SUFFIX}
 
@@ -13,17 +13,18 @@
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
+BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
+		objdump:devel/binutils
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr \
 		libmpc.so:math/mpc
-BUILD_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH} \
-		objdump:devel/binutils
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/binutils@${TARGETARCH}
 
 FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc powerpc64 riscv64 sparc64
 TARGETARCH=	${FLAVOR}
 
-USES=	gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
+USES=		compiler:c++11-lang gmake iconv libtool makeinfo tar:xz
+
 PLIST_SUB=	OPSYS=${OPSYS:tl} \
 		SUFFIX=${SUFFIX} \
 		TARGETARCH=${TARGETARCH} \
@@ -131,8 +132,8 @@
 	# Conflicts with sys/x86/include/float.h
 	${RM} ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include/float.h
 .endif
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
-	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
+	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 		${STAGEDIR}${PREFIX}/share/toolchains/${TARGETARCH}-gcc${SUFFIX}.mk
 
 .include <bsd.port.post.mk>
Index: head/devel/freebsd-gcc9/pkg-descr
===================================================================
--- head/devel/freebsd-gcc9/pkg-descr
+++ head/devel/freebsd-gcc9/pkg-descr
@@ -1,3 +1,4 @@
-GCC, the GNU Compiler Collection supporting C and C++ for targetting crossbuilding.
+GCC, the GNU Compiler Collection, supporting C and C++ for building the
+FreeBSD base system.
 
 WWW: http://gcc.gnu.org/