Index: head/ports-mgmt/poudriere/files/patch-Makefile.am
===================================================================
--- head/ports-mgmt/poudriere/files/patch-Makefile.am	(revision 442100)
+++ head/ports-mgmt/poudriere/files/patch-Makefile.am	(nonexistent)
@@ -1,37 +0,0 @@
-commit 7772e88ac1976ed60f4c233136c9246e3a99016e
-Author: Bryan Drewery <bryan@shatow.net>
-Date:   Fri May 12 09:26:06 2017 -0700
-
-    Use C99 to build sh as head does.
-    
-    This fixes the build for Sparc64 with GCC 4.2.1.
-    
-    Reported by:    linimon, jhibbits
-    Fixes #468
-
-diff --git Makefile.am Makefile.am
-index 2e7f8960..7bab2d8d 100644
---- Makefile.am
-+++ Makefile.am
-@@ -146,7 +146,7 @@ rm_SOURCES=		src/libexec/poudriere/rm/rm.c
- timeout_SOURCES=	src/libexec/poudriere/timeout/timeout.c
- timestamp_SOURCES=	src/libexec/poudriere/timestamp/timestamp.c
- tsort_SOURCES=		src/libexec/poudriere/tsort/tsort.c
--sh_CFLAGS=		-DSHELL -DNO_HISTORY \
-+sh_CFLAGS=		-DSHELL -DNO_HISTORY -std=gnu99 \
- 			-include $(top_srcdir)/external/sh_compat/compat.h \
- 			-I$(top_srcdir)/src \
- 			-I$(top_srcdir)/external/sh
-diff --git Makefile.in Makefile.in
-index 1987d11d..d32d502b 100644
---- Makefile.in
-+++ Makefile.in
-@@ -600,7 +600,7 @@ rm_SOURCES = src/libexec/poudriere/rm/rm.c
- timeout_SOURCES = src/libexec/poudriere/timeout/timeout.c
- timestamp_SOURCES = src/libexec/poudriere/timestamp/timestamp.c
- tsort_SOURCES = src/libexec/poudriere/tsort/tsort.c
--sh_CFLAGS = -DSHELL -DNO_HISTORY -include \
-+sh_CFLAGS = -DSHELL -DNO_HISTORY -std=gnu99 -include \
- 	$(top_srcdir)/external/sh_compat/compat.h -I$(top_srcdir)/src \
- 	-I$(top_srcdir)/external/sh -I$(top_srcdir)/src/poudriere-sh \
- 	-I$(top_builddir)/src/poudriere-sh

Property changes on: head/ports-mgmt/poudriere/files/patch-Makefile.am
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/ports-mgmt/poudriere/Makefile
===================================================================
--- head/ports-mgmt/poudriere/Makefile	(revision 442100)
+++ head/ports-mgmt/poudriere/Makefile	(revision 442101)
@@ -1,59 +1,59 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.17
-PORTREVISION=	1
+DISTVERSION=	3.1.18
+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
 
 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
 
 .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
 
 pre-install:
 	${REINPLACE_CMD} \
 	    -e "s,^\(POUDRIERE_VERSION\)=.*,\1='${PKGVERSION}'," \
 	    ${WRKSRC}/src/bin/poudriere
 
 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/distinfo
===================================================================
--- head/ports-mgmt/poudriere/distinfo	(revision 442100)
+++ head/ports-mgmt/poudriere/distinfo	(revision 442101)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490635252
-SHA256 (freebsd-poudriere-3.1.17_GH0.tar.gz) = c96e0208f955a778368a8a7176c0d085a4cec0fa488eb69224f13dcc5f343867
-SIZE (freebsd-poudriere-3.1.17_GH0.tar.gz) = 2859323
+TIMESTAMP = 1496161776
+SHA256 (freebsd-poudriere-3.1.18_GH0.tar.gz) = 95687aa92b1c3716b6cfd73d109c21b175db98167cab5af8fe83507beb3fd99a
+SIZE (freebsd-poudriere-3.1.18_GH0.tar.gz) = 2860326