Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -704,6 +704,8 @@
     SUBDIR += fpc-zlib
     SUBDIR += fpp
     SUBDIR += frama-c
+    SUBDIR += freebsd-gcc6
+    SUBDIR += freebsd-xtoolchain-gcc6
     SUBDIR += frink
     SUBDIR += fsmtrie
     SUBDIR += fstrcmp
Index: devel/freebsd-gcc6/Makefile
===================================================================
--- devel/freebsd-gcc6/Makefile
+++ devel/freebsd-gcc6/Makefile
@@ -1,14 +1,14 @@
-# $FreeBSD: head/devel/powerpc64-gcc/Makefile 515276 2019-10-23 17:44:28Z jhb $
+# $FreeBSD: head/devel/freebsd-gcc6/Makefile 515276 2019-10-23 17:44:28Z jhb $
 
 PORTNAME=	gcc
 PORTVERSION=	6.4.0
-PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
-PKGNAMEPREFIX?=	powerpc64-
+PKGNAMEPREFIX=	${TARGETARCH}-
+PKGNAMESUFFIX=	${SUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Cross GNU Compiler Collection for ${PKGNAMEPREFIX:C/-//g}
+COMMENT=	Cross GNU Compiler Collection for ${TARGETARCH}
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
@@ -19,22 +19,28 @@
 BUILD_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 RUN_DEPENDS=	${BU_PREFIX}-as:devel/${PKGNAMEPREFIX}binutils
 
+CONFLICTS=	${TARGETARCH}-gcc
+
 USES=	gmake iconv libtool tar:xz makeinfo compiler:c++11-lang
-PLIST_SUB=	TARGETARCH=${PKGNAMEPREFIX:C/-//g} \
-		OPSYS=${OPSYS:tl} \
+PLIST_SUB=	OPSYS=${OPSYS:tl} \
+		SUFFIX=${SUFFIX} \
 		GCC_TARGET=${GCC_TARGET} \
 		GCC_VERSION=${PORTVERSION}
 
-TARGETARCH=	${PKGNAMEPREFIX:C/-//g}
+FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc64 sparc64
+TARGETARCH=	${FLAVOR}
 
-GCC_TARGET=	${PKGNAMEPREFIX:S/amd64/x86_64/}unknown-${OPSYS:tl}${OSREL}
-BU_PREFIX?=	${GCC_TARGET}
+GCC_TARGET=	${FLAVOR:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
+SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
+BU_PREFIX=	${GCC_TARGET}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
 		--enable-initfini-array \
+		--program-prefix=${GCC_TARGET}- \
+		--program-suffix=${SUFFIX} \
 		--without-headers \
 		--with-gmp=${LOCALBASE} \
 		--with-pkgversion="FreeBSD Ports Collection for ${PKGNAMEPREFIX:C/-//g}" \
@@ -67,30 +73,58 @@
 . endif
 .endif
 
+# Disable LTO on aarch64 since we force aarch64-binutils to
+# use STATIC
+.if ${TARGETARCH} == "aarch64"
+CONFIGURE_ARGS+= --disable-lto
+PLIST_SUB+=	LTO="@comment "
+.else
+PLIST_SUB+=	LTO=""
+.endif
+
 .if ${ARCH} == "aarch64"
 PLIST_SUB+=	PLUGINS="@comment plugin does not build"
 .else
 PLIST_SUB+=	PLUGINS=""
 .endif
 
+.if ${TARGETARCH} == "aarch64"
+PLIST_SUB+=	ARM=""
+PLIST_SUB+=	AARCH64=""
+.else
+PLIST_SUB+=	ARM="@comment "
+PLIST_SUB+=	AARCH64="@comment "
+.endif
+.if ${TARGETARCH} == "amd64" || ${TARGETARCH} == "i386"
+PLIST_SUB+=	I386="" \
+		FLOAT_H="@comment "
+.else
+PLIST_SUB+=	I386="@comment " \
+		FLOAT_H=""
+.endif
+.if ${TARGETARCH} == "amd64"
+PLIST_SUB+=	AMD64=""
+.else
+PLIST_SUB+=	AMD64="@comment "
+.endif
+.if ${TARGETARCH:Mmips*}
+PLIST_SUB+=	MIPS=""
+.else
+PLIST_SUB+=	MIPS="@comment "
+.endif
+.if ${TARGETARCH:Mpowerpc*}
+PLIST_SUB+=	POWERPC=""
+.else
+PLIST_SUB+=	POWERPC="@comment "
+.endif
+.if ${TARGETARCH} == "sparc64"
+PLIST_SUB+=	SPARC64=""
+.else
+PLIST_SUB+=	SPARC64="@comment "
+.endif
+
 post-install:
-.for f in cpp gcov gcov-dump gcov-tool
-	@if [ -f ${STAGEDIR}${PREFIX}/bin/$f ] ; then \
-		${MV} ${STAGEDIR}${PREFIX}/bin/$f  \
-		    ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-$f ; \
-	fi
-.endfor
-.for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool
-	@if [ ! -f ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ] ; then \
-		if [ -f ${STAGEDIR}${PREFIX}/man/man1/$f.1 ] ; then \
-			${CP} ${STAGEDIR}${PREFIX}/man/man1/$f.1  \
-			    ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ; \
-		fi \
-	fi
-	@${RM} ${STAGEDIR}${PREFIX}/bin/$f
-	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1
-	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz
-.endfor
+	@${RM} ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-${GCC_TARGET}-*
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
 	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
 	@${RM} -r ${STAGEDIR}${PREFIX}/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
Index: devel/freebsd-gcc6/pkg-plist
===================================================================
--- devel/freebsd-gcc6/pkg-plist
+++ devel/freebsd-gcc6/pkg-plist
@@ -1,25 +1,86 @@
-bin/%%GCC_TARGET%%-c++
-bin/%%GCC_TARGET%%-cpp
-bin/%%GCC_TARGET%%-g++
-bin/%%GCC_TARGET%%-gcc
+bin/%%GCC_TARGET%%-c++%%SUFFIX%%
+bin/%%GCC_TARGET%%-cpp%%SUFFIX%%
+bin/%%GCC_TARGET%%-g++%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcc%%SUFFIX%%
 bin/%%GCC_TARGET%%-gcc-%%GCC_VERSION%%
-bin/%%GCC_TARGET%%-gcc-ar
-bin/%%GCC_TARGET%%-gcc-nm
-bin/%%GCC_TARGET%%-gcc-ranlib
-bin/%%GCC_TARGET%%-gcov
-bin/%%GCC_TARGET%%-gcov-dump
-bin/%%GCC_TARGET%%-gcov-tool
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
+bin/%%GCC_TARGET%%-gcc-ar%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcc-nm%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcc-ranlib%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcov%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcov-dump%%SUFFIX%%
+bin/%%GCC_TARGET%%-gcov-tool%%SUFFIX%%
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/adxintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/altivec.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ammintrin.h
+%%ARM%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_acle.h
+%%ARM%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/arm_neon.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx2intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512bwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512cdintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512dqintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512erintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512fintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmaintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512ifmavlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512pfintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmiintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vbmivlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlbwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vldqintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avx512vlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/avxintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmi2intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmiintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/bmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clflushoptintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clwbintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/clzerointrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cpuid.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/cross-stdarg.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/emmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/f16cintrin.h
+%%FLOAT_H%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/float.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fma4intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fmaintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/fxsrintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/htmxlintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ia32intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/immintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/iso646.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
+%%MIPS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/loongson.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lwpintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/lzcntintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm3dnow.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mm_malloc.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/mwaitxintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/nmmintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/paired.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pkuintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/pmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/popcntintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppc-asm.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/ppu_intrinsics.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/prfchwintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rdseedintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/rtmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/shaintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/si2vmx.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/smmintrin.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spe.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/spu2vmx.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tbmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/wmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/x86intrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xmmintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xopintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavecintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsaveoptintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xsavesintrin.h
+%%I386%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/xtestintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdalign.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdarg.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdatomic.h
@@ -31,7 +92,8 @@
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/stdnoreturn.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/tgmath.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/varargs.h
-lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
+%%POWERPC%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/vec_types.h
+%%SPARC64%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/include/visintrin.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixinc_list
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/gsyslimits.h
 lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/include/README
@@ -88,21 +150,54 @@
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/collect2.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/conditions.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-arches.def
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-cores.def
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-elf.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-%%OPSYS%%.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-fusion-pairs.def
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-opts.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-protos.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64-tuning-flags.def
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/aarch64.h
+%%AARCH64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/aarch64/biarchlp64.h
+%%ARM%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/arm/aarch-common-protos.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
+%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-spec.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%-stdint.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/%%OPSYS%%.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/dbxelf.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/elfos.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/att.h
+%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/biarch64.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%.h
+%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/%%OPSYS%%64.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-opts.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386-protos.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/i386.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/stringop.def
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/unix.h
+%%AMD64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-64.h
+%%I386%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/i386/x86-tune.def
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/initfini-array.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
-%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/elf.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/%%OPSYS%%.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-opts.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips-protos.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/mips/mips.h
+%%MIPS%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/vxworks-dummy.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/default64.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/%%OPSYS%%64.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/option-defaults.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-builtin.def
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-cpus.def
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-opts.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000-protos.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/rs6000.h
+%%POWERPC%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/rs6000/sysv4.h
+%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/%%OPSYS%%.h
+%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-opts.h
+%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc-protos.h
+%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sparc.h
+%%SPARC64%%%%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/config/sparc/sysv4.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/configargs.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/context.h
 %%PLUGINS%%lib/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/include/convert.h
@@ -420,15 +515,15 @@
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/fixincl
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkheaders
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/install-tools/mkinstalldirs
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
+%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
+%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0
+%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so.0.0.0
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper
-libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
+%%LTO%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
 %%PLUGINS%%libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
-man/man1/%%GCC_TARGET%%-cpp.1.gz
-man/man1/%%GCC_TARGET%%-g++.1.gz
-man/man1/%%GCC_TARGET%%-gcc.1.gz
-man/man1/%%GCC_TARGET%%-gcov.1.gz
-man/man1/%%GCC_TARGET%%-gcov-dump.1.gz
-man/man1/%%GCC_TARGET%%-gcov-tool.1.gz
+man/man1/%%GCC_TARGET%%-cpp%%SUFFIX%%.1.gz
+man/man1/%%GCC_TARGET%%-g++%%SUFFIX%%.1.gz
+man/man1/%%GCC_TARGET%%-gcc%%SUFFIX%%.1.gz
+man/man1/%%GCC_TARGET%%-gcov%%SUFFIX%%.1.gz
+man/man1/%%GCC_TARGET%%-gcov-dump%%SUFFIX%%.1.gz
+man/man1/%%GCC_TARGET%%-gcov-tool%%SUFFIX%%.1.gz
Index: devel/freebsd-xtoolchain-gcc6/Makefile
===================================================================
--- devel/freebsd-xtoolchain-gcc6/Makefile
+++ devel/freebsd-xtoolchain-gcc6/Makefile
@@ -1,45 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	xtoolchain
-PORTVERSION=	0.4
-PORTREVISION=	1
+PORTVERSION=	1
 CATEGORIES=	devel
 MASTER_SITES=	# none
 DISTFILES=	# none
-PKGNAMEPREFIX?=	powerpc64-
-PKGNAMESUFFIX?=	-gcc
+PKGNAMEPREFIX=	${FLAVOR}-
+PKGNAMESUFFIX=	-gcc6
 
 MAINTAINER?=	bapt@FreeBSD.org
 COMMENT=	Pre seeded toolchain to cross build FreeBSD base
 
 NO_BUILD=	yes
 
-.if ${PKGNAMEPREFIX} == "amd64-"
-TOOLCHAIN_PREFIX=	x86_64-
-.else
-TOOLCHAIN_PREFIX=	${PKGNAMEPREFIX}
-.endif
-XCC?=		${TOOLCHAIN_PREFIX}unknown-${OPSYS:tl}${OSREL}-gcc
-XCXX?=		${TOOLCHAIN_PREFIX}unknown-${OPSYS:tl}${OSREL}-g++
-XCPP?=		${TOOLCHAIN_PREFIX}unknown-${OPSYS:tl}${OSREL}-cpp
-X_COMPILER_TYPE?=	${PKGNAMESUFFIX:C/-//g}
+FLAVORS=	aarch64 amd64 i386 mips mips64 powerpc64 sparc64
 
-RUN_DEPENDS?=	${XCC}:devel/${PKGNAMEPREFIX}${X_COMPILER_TYPE}
+GCC_TARGET=	${FLAVOR:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
 
+RUN_DEPENDS?=	${GCC_TARGET}${PKGNAMESUFFIX}:devel/freebsd${PKGNAMESUFFIX}@${FLAVOR}
+
 SUB_FILES=	xtoolchain.mk
-SUB_LIST=	TARGETARCH=${TOOLCHAIN_PREFIX:C/-//g} \
-		OPSYS=${OPSYS:tl} \
-		OSREL=${OSREL} \
-		XCC=${XCC} \
-		XCXX=${XCXX} \
-		XCPP=${XCPP} \
-		X_COMPILER_TYPE=${X_COMPILER_TYPE}
+SUB_LIST=	GCC_TARGET=${GCC_TARGET}
 
-PLIST_FILES=	share/toolchains/${PKGNAMEPREFIX}${X_COMPILER_TYPE}.mk
+PLIST_FILES=	share/toolchains/${FLAVOR}${PKGNAMESUFFIX}.mk
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	@${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
-		${STAGEDIR}${PREFIX}/share/toolchains/${PKGNAMEPREFIX}${X_COMPILER_TYPE}.mk
+		${STAGEDIR}${PREFIX}/share/toolchains/${FLAVOR}${PKGNAMESUFFIX}.mk
 
 .include <bsd.port.mk>
Index: devel/freebsd-xtoolchain-gcc6/files/xtoolchain.mk.in
===================================================================
--- devel/freebsd-xtoolchain-gcc6/files/xtoolchain.mk.in
+++ devel/freebsd-xtoolchain-gcc6/files/xtoolchain.mk.in
@@ -1,5 +1,5 @@
-XCC=%%LOCALBASE%%/bin/%%XCC%%
-XCXX=%%LOCALBASE%%/bin/%%XCXX%%
-XCPP=%%LOCALBASE%%/bin/%%XCPP%%
-CROSS_BINUTILS_PREFIX=%%LOCALBASE%%/%%TARGETARCH%%-unknown-%%OPSYS%%%%OSREL%%/bin/
-X_COMPILER_TYPE=%%X_COMPILER_TYPE%%
+XCC=%%LOCALBASE%%/bin/%%GCC_TARGET%%-gcc6
+XCXX=%%LOCALBASE%%/bin/%%GCC_TARGET%%-g++6
+XCPP=%%LOCALBASE%%/bin/%%GCC_TARGET%%-cpp6
+CROSS_BINUTILS_PREFIX=%%LOCALBASE%%/%%GCC_TARGET%%/bin/
+X_COMPILER_TYPE=gcc