Index: head/devel/autogen/Makefile
===================================================================
--- head/devel/autogen/Makefile	(revision 499394)
+++ head/devel/autogen/Makefile	(revision 499395)
@@ -1,35 +1,44 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	autogen
-PORTVERSION=	5.18.12
-PORTREVISION=	3
+PORTVERSION=	5.18.16
 CATEGORIES=	devel
 MASTER_SITES=	GNU/${PORTNAME}/rel${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tool designed to simplify the creation and maintenance of programs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${RUN_DEPENDS}
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		gmktemp:sysutils/coreutils
 LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 RUN_DEPENDS=	bash:shells/bash
 
 # bin/columns
 CONFLICTS_INSTALL=	columns
 
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share --with-libguile=yes --with-libxml2=yes
+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
-USE_GNOME=	libxml2
+TEST_TARGET=	check
 USE_LDCONFIG=	yes
-USE_PERL5=	build
-USES=		gmake gnome libtool pathfix perl5 pkgconfig shebangfix tar:xz
 
 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>
Index: head/devel/autogen/distinfo
===================================================================
--- head/devel/autogen/distinfo	(revision 499394)
+++ head/devel/autogen/distinfo	(revision 499395)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503166017
-SHA256 (autogen-5.18.12.tar.xz) = be3ba62e883185b6ee8475edae97d7197d701d6b9ad9c3d2df53697110c1bfd8
-SIZE (autogen-5.18.12.tar.xz) = 1018412
+TIMESTAMP = 1555690352
+SHA256 (autogen-5.18.16.tar.xz) = f8a13466b48faa3ba99fe17a069e71c9ab006d9b1cfabe699f8c60a47d5bb49a
+SIZE (autogen-5.18.16.tar.xz) = 1046276
Index: head/devel/autogen/pkg-plist
===================================================================
--- head/devel/autogen/pkg-plist	(revision 499394)
+++ head/devel/autogen/pkg-plist	(revision 499395)
@@ -1,93 +1,91 @@
 bin/autogen
 bin/autoopts-config
 bin/columns
 bin/getdefs
 bin/xml2ag
 include/autoopts/options.h
 include/autoopts/usage-txt.h
 lib/autogen/tpl-config.tlib
 lib/libopts.a
 lib/libopts.so
 lib/libopts.so.25
-lib/libopts.so.25.16.1
+lib/libopts.so.25.17.1
 libdata/pkgconfig/autoopts.pc
 man/man1/autogen.1.gz
 man/man1/autoopts-config.1.gz
 man/man1/columns.1.gz
 man/man1/getdefs.1.gz
 man/man1/xml2ag.1.gz
 man/man3/ao_string_tokenize.3.gz
 man/man3/configFileLoad.3.gz
 man/man3/optionFileLoad.3.gz
 man/man3/optionFindNextValue.3.gz
 man/man3/optionFindValue.3.gz
 man/man3/optionFree.3.gz
 man/man3/optionGetValue.3.gz
 man/man3/optionLoadLine.3.gz
 man/man3/optionMemberList.3.gz
 man/man3/optionNextValue.3.gz
 man/man3/optionOnlyUsage.3.gz
 man/man3/optionPrintVersion.3.gz
 man/man3/optionPrintVersionAndReturn.3.gz
 man/man3/optionProcess.3.gz
 man/man3/optionRestore.3.gz
 man/man3/optionSaveFile.3.gz
 man/man3/optionSaveState.3.gz
 man/man3/optionUnloadNested.3.gz
 man/man3/optionVersion.3.gz
 man/man3/strequate.3.gz
 man/man3/streqvcmp.3.gz
 man/man3/streqvmap.3.gz
 man/man3/strneqvcmp.3.gz
 man/man3/strtransform.3.gz
 share/aclocal/autoopts.m4
 %%DATADIR%%/Mdoc.pm
 %%DATADIR%%/aginfo.tpl
 %%DATADIR%%/aginfo3.tpl
 %%DATADIR%%/agman-cmd.tpl
 %%DATADIR%%/agman-file.tpl
 %%DATADIR%%/agman.tlib
 %%DATADIR%%/agman1.tpl
 %%DATADIR%%/agman3.tpl
 %%DATADIR%%/agmdoc-cmd.tpl
 %%DATADIR%%/agmdoc-file.tpl
 %%DATADIR%%/agpl.lic
 %%DATADIR%%/agtexi-cmd.tpl
 %%DATADIR%%/agtexi-file.tpl
 %%DATADIR%%/autoopts.m4
 %%DATADIR%%/bits.tpl
 %%DATADIR%%/cmd-doc.tlib
-%%DATADIR%%/confmacs.tlib
-%%DATADIR%%/conftest.tpl
 %%DATADIR%%/def2pot.tpl
 %%DATADIR%%/fsm-macro.tlib
 %%DATADIR%%/fsm-trans.tlib
 %%DATADIR%%/fsm.tpl
 %%DATADIR%%/getopt.tpl
 %%DATADIR%%/gpl.lic
 %%DATADIR%%/gplv2.lic
 %%DATADIR%%/lgpl.lic
 %%DATADIR%%/lgplv2.lic
-%%DATADIR%%/libopts-41.1.16.tar.gz
+%%DATADIR%%/libopts-42.1.17.tar.gz
 %%DATADIR%%/liboptschk.m4
 %%DATADIR%%/man2mdoc
 %%DATADIR%%/man2texi
 %%DATADIR%%/mbsd.lic
 %%DATADIR%%/mdoc2man
 %%DATADIR%%/mdoc2texi
 %%DATADIR%%/optcode.tlib
 %%DATADIR%%/opthead.tlib
 %%DATADIR%%/options.tpl
 %%DATADIR%%/optlib.tlib
 %%DATADIR%%/optmain.tlib
 %%DATADIR%%/perlopt.tpl
 %%DATADIR%%/rc-sample.tpl
 %%DATADIR%%/stdoptions.def
 %%DATADIR%%/str2enum.tpl
 %%DATADIR%%/str2init.tlib
 %%DATADIR%%/str2mask.tpl
 %%DATADIR%%/strings.tpl
 %%DATADIR%%/texi2man
 %%DATADIR%%/texi2mdoc
 %%DATADIR%%/tpl-config.tlib
 %%DATADIR%%/usage.tlib