Index: head/ports-mgmt/poudriere-devel/Makefile
===================================================================
--- head/ports-mgmt/poudriere-devel/Makefile	(revision 462559)
+++ head/ports-mgmt/poudriere-devel/Makefile	(revision 462560)
@@ -1,68 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
 DISTVERSION=	3.2.99.20180202
-PORTREVISION=	3
+PORTREVISION=	4
 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.2.4-149-g9c388299
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
 OPTIONS_DEFINE=	CERTS DIALOG4PORTS EXAMPLES QEMU ZSH
 OPTIONS_DEFAULT=CERTS DIALOG4PORTS ZSH
 OPTIONS_SUB=	yes
 
 CERTS_DESC=		Install checksum and SSL certificates for jail creation
 CERTS_RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
 CERTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
 DIALOG4PORTS_DESC=	Install dialog4ports for options command
 DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
 
 QEMU_DESC=	Add qemu-user-static for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 .include <bsd.port.options.mk>
 
 # rm -x support came in 10.0.  A bundled rm is used if not supported in base.
 # While <10 is technically not supported in the Ports Tree, Poudriere
 # detects this and it being a package build tool it should still be
 # supported as a user may be installing this to build packages for upgrading
 # their system to a supported release.
 .if ${OSVERSION} < 1000000
 PLIST_SUB+=	RM=""
 .else
 PLIST_SUB+=	RM="@comment "
 .endif
 
 post-patch:
 	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
 	    ${WRKSRC}/poudriere
 	${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.*
 
 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-src--share--poudriere--html.sh
===================================================================
--- head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh	(revision 462559)
+++ head/ports-mgmt/poudriere-devel/files/patch-src--share--poudriere--html.sh	(revision 462560)
@@ -1,33 +1,37 @@
 commit 8f9fdcc9691dcb6ab3619bbced22beb108bfcbb1
 Author: Bryan Drewery <bryan@shatow.net>
 Date:   Sat Feb 3 16:39:51 2018 -0800
 
     HTML: Hide harmless shared lock failures
 
-diff --git src/share/poudriere/include/html.sh src/share/poudriere/include/html.sh
-index c56cb6520..98bcd84f4 100644
---- src/share/poudriere/include/html.sh
+commit 129a3b0bfde6bf77982ebece039aaa745ead8b2a
+Author: Bryan Drewery <bryan@shatow.net>
+Date:   Sat Feb 3 17:58:53 2018 -0800
+
+    HTML: Only wait for shared locks for 2 seconds each
+
+--- src/share/poudriere/include/html.sh.orig	2018-02-22 05:50:35 UTC
 +++ src/share/poudriere/include/html.sh
 @@ -78,11 +78,11 @@ html_json_main() {
  build_all_json() {
  	critical_start
  	build_json
 -	if slock_acquire "json_jail_${MASTERNAME}"; then
-+	if slock_acquire "json_jail_${MASTERNAME}" 2>/dev/null; then
++	if slock_acquire "json_jail_${MASTERNAME}" 2 2>/dev/null; then
  		build_jail_json
  		slock_release "json_jail_${MASTERNAME}"
  	fi
 -	if slock_acquire "json_top"; then
-+	if slock_acquire "json_top" 2>/dev/null; then
++	if slock_acquire "json_top" 2 2>/dev/null; then
  		build_top_json
  		slock_release "json_top"
  	fi
 @@ -173,7 +173,7 @@ install_html_files() {
  	local base="$2"
  	local dest="$3"
  
 -	slock_acquire html_base || return 0
-+	slock_acquire html_base 2>/dev/null || return 0
++	slock_acquire html_base 2>/dev/null 2 || return 0
  
  	# Update the base copy
  	mkdir -p "${base}"