Index: head/ports-mgmt/poudriere/Makefile
===================================================================
--- head/ports-mgmt/poudriere/Makefile	(revision 417319)
+++ head/ports-mgmt/poudriere/Makefile	(revision 417320)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.12
-PORTREVISION=	2
+DISTVERSION=	3.1.13
+PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
 		GH
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Port build and test system
 
 LICENSE=	BSD2CLAUSE
 
 CONFLICTS_INSTALL=	poudriere-devel-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	ZSH QEMU EXAMPLES
 OPTIONS_DEFAULT=ZSH
 OPTIONS_SUB=	yes
 
 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/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/MANIFESTS
 	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* ${STAGEDIR}${PREFIX}/share/${PORTNAME}/MANIFESTS/
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/poudriere/distinfo
===================================================================
--- head/ports-mgmt/poudriere/distinfo	(revision 417319)
+++ head/ports-mgmt/poudriere/distinfo	(revision 417320)
@@ -1,2 +1,3 @@
-SHA256 (freebsd-poudriere-3.1.12_GH0.tar.gz) = 59d29f722427a3ae443dce7f15751df5e1caedfb57759e81f3ef8e5a4fab31bc
-SIZE (freebsd-poudriere-3.1.12_GH0.tar.gz) = 2831391
+TIMESTAMP = 1466612100
+SHA256 (freebsd-poudriere-3.1.13_GH0.tar.gz) = c88fc62b63f095862f1ec7c3406bb3b56d0d835f613f9d55e9ce8967e8d53e21
+SIZE (freebsd-poudriere-3.1.13_GH0.tar.gz) = 2833905
Index: head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh
===================================================================
--- head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh	(revision 417319)
+++ head/ports-mgmt/poudriere/files/patch-src_share_poudriere_include_fs.sh	(revision 417320)
@@ -1,10 +1,15 @@
---- src/share/poudriere/include/fs.sh.orig	2015-11-30 17:25:11 UTC
+--- src/share/poudriere/include/fs.sh.orig	2016-05-18 22:58:28 UTC
 +++ src/share/poudriere/include/fs.sh
-@@ -181,6 +181,6 @@ destroyfs() {
+@@ -191,10 +191,10 @@ destroyfs() {
+ 		zfs destroy -rf ${fs}
  		rmdir ${mnt}
  	else
- 		chflags -R noschg ${mnt}
--		rm -rfx ${mnt}
-+		rm -rf ${mnt}
+-		rm -rfx ${mnt} 2>/dev/null || :
++		rm -rf ${mnt} 2>/dev/null || :
+ 		if [ -d "${mnt}" ]; then
+ 			chflags -R 0 ${mnt}
+-			rm -rfx ${mnt}
++			rm -rf ${mnt}
+ 		fi
  	fi
  }