Index: head/ports-mgmt/poudriere-devel/Makefile
===================================================================
--- head/ports-mgmt/poudriere-devel/Makefile	(revision 434183)
+++ head/ports-mgmt/poudriere-devel/Makefile	(revision 434184)
@@ -1,44 +1,44 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
 DISTVERSION=	3.1.99.20160624
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_TAGNAME=	3.0-1677-g146fc3f
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	ZSH QEMU EXAMPLES
 OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
 RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
 QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
 	    ${STAGEDIR}${DATADIR}/MANIFESTS
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils
===================================================================
--- head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils	(nonexistent)
+++ head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils	(revision 434184)
@@ -0,0 +1,29 @@
+commit 58b0c214d76525e53745133cd3de56eda5379934
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Fri Aug 26 14:23:39 2016 -0700
+
+    For arm64 copy the latest aarch64-binutils ld into the jail at startup.
+    
+    This will work like the qemu installation done at startup, and not require
+    messing with the jail creation/update or snapshots.
+
+diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh
+index 4261243..8e0c8cf 100755
+--- src/share/poudriere/common.sh
++++ src/share/poudriere/common.sh
+@@ -1795,6 +1795,15 @@ jail_start() {
+ 		mkdir -p "${tomnt}${EMULATOR%/*}"
+ 		cp -f "${EMULATOR}" "${tomnt}${EMULATOR}"
+ 	fi
++	# Handle special ARM64 needs
++	if [ "${arch#*.}" = "aarch64" ] && ! [ -f "${tomnt}/usr/bin/ld" ]; then
++		if [ -f /usr/local/aarch64-freebsd/bin/ld ]; then
++			cp -f /usr/local/aarch64-freebsd/bin/ld \
++			    "${tomnt}/usr/bin/ld"
++		else
++			err 1 "Arm64 requires aarch64-binutils to be installed."
++		fi
++	 fi
+ 
+ 	if [ -d "${CCACHE_DIR:-/nonexistent}" ]; then
+ 		cat >> "${tomnt}/etc/make.conf" <<-EOF

Property changes on: head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property