Index: user/gjb/thermite/10-i386-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/10-i386-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/10-i386-GENERIC-snap.conf	(revision 335329)
@@ -1,20 +1,22 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="10"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="i386"
 TARGET_ARCH="i386"
 CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
 WITH_VMIMAGES=1
 WITH_COMPRESSED_VMIMAGES=1
 XZ_THREADS="10"
 WITH_CLOUDWARE=
Index: user/gjb/thermite/10-ia64-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/10-ia64-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/10-ia64-GENERIC-snap.conf	(revision 335329)
@@ -1,14 +1,16 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="10"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="ia64"
 TARGET_ARCH="ia64"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
Index: user/gjb/thermite/10-powerpc-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/10-powerpc-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/10-powerpc-GENERIC-snap.conf	(revision 335329)
@@ -1,15 +1,18 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="10"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="powerpc"
 TARGET_ARCH="powerpc"
-WORLD_FLAGS="-j10"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Index: user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf
===================================================================
--- user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf	(revision 335328)
+++ user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf	(revision 335329)
@@ -1,16 +1,19 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="10"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
-KERNEL="GENERIC64"
 TARGET="powerpc"
 TARGET_ARCH="powerpc64"
-WORLD_FLAGS="-j10"
+KERNEL="GENERIC64"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Index: user/gjb/thermite/10-sparc64-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/10-sparc64-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/10-sparc64-GENERIC-snap.conf	(revision 335329)
@@ -1,14 +1,16 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="10"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="sparc64"
 TARGET_ARCH="sparc64"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
Index: user/gjb/thermite/11-aarch64-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/11-aarch64-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/11-aarch64-GENERIC-snap.conf	(revision 335329)
@@ -1,33 +1,19 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="arm64"
 TARGET_ARCH="aarch64"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
-NOPORTS=
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
 WITH_VMIMAGES=1
 WITH_COMPRESSED_VMIMAGES=1
-
-buildenv_setup() {
-	if [ ! -d ${CHROOTDIR}/usr/ports/devel/aarch64-binutils ]; then
-		chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
-			/usr/sbin/pkg bootstrap -y
-		chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
-			/usr/sbin/pkg install -y devel/aarch64-binutils
-	else
-		chroot ${CHROOTDIR} env BATCH=1 \
-			make -C /usr/ports/devel/aarch64-binutils \
-			all install clean
-	fi
-	return 0
-}
-
Index: user/gjb/thermite/11-i386-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/11-i386-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/11-i386-GENERIC-snap.conf	(revision 335329)
@@ -1,20 +1,22 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="i386"
 TARGET_ARCH="i386"
 CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
 
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
 WITH_VMIMAGES=1
 WITH_COMPRESSED_VMIMAGES=1
 XZ_THREADS="10"
 WITH_CLOUDWARE=
Index: user/gjb/thermite/11-powerpc-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/11-powerpc-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/11-powerpc-GENERIC-snap.conf	(revision 335329)
@@ -1,15 +1,18 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="powerpc"
 TARGET_ARCH="powerpc"
-WORLD_FLAGS="-j10"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Index: user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf
===================================================================
--- user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf	(revision 335328)
+++ user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf	(revision 335329)
@@ -1,16 +1,19 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="powerpc"
 TARGET_ARCH="powerpc64"
 KERNEL="GENERIC64"
-WORLD_FLAGS="-j10"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"
Index: user/gjb/thermite/11-sparc64-GENERIC-snap.conf
===================================================================
--- user/gjb/thermite/11-sparc64-GENERIC-snap.conf	(revision 335328)
+++ user/gjb/thermite/11-sparc64-GENERIC-snap.conf	(revision 335329)
@@ -1,14 +1,18 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 BUILDBRANCH="11"
 
 . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf"
 
 TARGET="sparc64"
 TARGET_ARCH="sparc64"
 
 __CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}"
 CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}"
+
+. ${srcdir}/${TARGET}/${TARGET_ARCH}.conf
+
+WORLD_FLAGS="-j10"