From 4ea2dd34c1d5b626440b0d87c31449f77d1d7178 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Tue, 31 Dec 2013 02:19:59 +0000
Subject: [PATCH] Add temporary workaround for hang during sanity check

---
 ports-mgmt/poudriere-devel/Makefile           |  3 +--
 .../patch-src__share__poudriere__common.sh    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh

diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index 66fe0612fd98..b85944740cad 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	poudriere
 PORTVERSION=	3.0.99.20131230
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://fossil.etoilebsd.net/poudriere/tarball/ \
 		LOCAL/bdrewery/${PORTNAME}/
@@ -17,8 +18,6 @@ FSL_CHKIN=	ae87e905f3
 
 OPTIONS_DEFINE=	ZSH
 
-FORBIDDEN=	sanity check issue being fixed
-
 CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USES=		uidfix
diff --git a/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh b/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh
new file mode 100644
index 000000000000..18e574f84663
--- /dev/null
+++ b/ports-mgmt/poudriere-devel/files/patch-src__share__poudriere__common.sh
@@ -0,0 +1,25 @@
+--- ./src/share/poudriere/common.sh.orig	2013-12-30 15:33:59.000000000 -0600
++++ ./src/share/poudriere/common.sh	2013-12-30 20:19:11.627128632 -0600
+@@ -2996,6 +2996,7 @@
+ 
+ parallel_run() {
+ 	local cmd="$1"
++	local ret=0
+ 	shift 1
+ 
+ 	if [ ${NBPARALLEL} -eq ${PARALLEL_JOBS} ]; then
+@@ -3008,11 +3009,13 @@
+ 	_SHOULD_REAP=$((_SHOULD_REAP + 1))
+ 	if [ ${_SHOULD_REAP} -eq 16 ]; then
+ 		_SHOULD_REAP=0
+-		_reap_children || return $?
++		_reap_children || ret=$?
+ 	fi
+ 
+ 	PARALLEL_CHILD=1 parallel_exec $cmd "$@" &
+ 	PARALLEL_PIDS="${PARALLEL_PIDS} $! "
++
++	return ${ret}
+ }
+ 
+ find_all_pool_references() {