diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 919ce7931a83..c2fceb195898 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,45 +1,41 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	autogen
 PORTVERSION=	5.18.16
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU/${PORTNAME}/rel${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool designed to simplify the creation and maintenance of programs
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		gmktemp:sysutils/coreutils
 LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 RUN_DEPENDS=	bash:shells/bash
 
 # bin/columns
 CONFLICTS_INSTALL=	columns
 
 USES=		gmake gnome libtool pathfix perl5 pkgconfig shebangfix tar:xz
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		--disable-dependency-tracking \
 		--with-libguile=yes --with-libxml2=yes
 CONFIGURE_ENV=	CONFIG_SHELL=${LOCALBASE}/bin/bash
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
 INFO=		autogen
 
 SHEBANG_FILES=	autoopts/tpl/*.pl
 
-post-patch:
-	@${REINPLACE_CMD} -e '/CFLAGS=/ s| -Wno-format-contains-nul||; /WARN_CFLAGS=/ s| -Werror||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|mktemp --suffix=|g&|' ${WRKSRC}/agen5/mk-stamps.sh ${WRKSRC}/build-aux/run-ag.sh ${WRKSRC}/config/mk-shdefs.in
-
 .include <bsd.port.mk>
diff --git a/devel/autogen/files/patch-agen5-mk-stamps.sh b/devel/autogen/files/patch-agen5-mk-stamps.sh
new file mode 100644
index 000000000000..35a1eb74a9cb
--- /dev/null
+++ b/devel/autogen/files/patch-agen5-mk-stamps.sh
@@ -0,0 +1,11 @@
+--- agen5/mk-stamps.sh.orig	2018-08-04 20:22:34 UTC
++++ agen5/mk-stamps.sh
+@@ -28,7 +28,7 @@
+ #  because some of the rules are complex and we don't want to
+ #  deal with the dual update problem.
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
++STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ stop_tracing=:
+ if (shopt -qo xtrace)
diff --git a/devel/autogen/files/patch-build-aux-run-ag.sh b/devel/autogen/files/patch-build-aux-run-ag.sh
new file mode 100644
index 000000000000..7c31cc72677b
--- /dev/null
+++ b/devel/autogen/files/patch-build-aux-run-ag.sh
@@ -0,0 +1,11 @@
+--- build-aux/run-ag.sh.orig	2018-08-14 23:53:31 UTC
++++ build-aux/run-ag.sh
+@@ -45,7 +45,7 @@ find_exe() {
+   return 0
+ }
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
++STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ VERBOSE=1
+ 
diff --git a/devel/autogen/files/patch-config-mk-shdefs.in b/devel/autogen/files/patch-config-mk-shdefs.in
new file mode 100644
index 000000000000..78a7af1ed17f
--- /dev/null
+++ b/devel/autogen/files/patch-config-mk-shdefs.in
@@ -0,0 +1,11 @@
+--- config/mk-shdefs.in.orig	2018-08-03 21:26:38 UTC
++++ config/mk-shdefs.in
+@@ -130,7 +130,7 @@ configure() {
+ 
+ set -x
+ exec 9>&2
+-tmp=$(mktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
++tmp=$(gmktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
+ exec 2>> $tmp/mk-shdef.log
+ init $0 $1
+ mk_config
diff --git a/devel/autogen/files/patch-configure b/devel/autogen/files/patch-configure
new file mode 100644
index 000000000000..cc9cbba8b8ff
--- /dev/null
+++ b/devel/autogen/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	2018-08-26 17:44:54 UTC
++++ configure
+@@ -18923,8 +18923,8 @@ fi
+ 
+ WARN_CFLAGS=
+ test "X${GCC}" = Xyes && {
+-  CFLAGS="$CFLAGS -Wno-format-contains-nul -fno-strict-aliasing"
+-  WARN_CFLAGS="$CFLAGS "`echo -Wall -Werror -Wcast-align -Wmissing-prototypes \
++  CFLAGS="$CFLAGS -fno-strict-aliasing"
++  WARN_CFLAGS="$CFLAGS "`echo -Wall -Wcast-align -Wmissing-prototypes \
+ 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ 	-Wstrict-aliasing=3 -Wextra -Wno-cast-qual`
+ }