Index: head/converters/osm2pgsql/Makefile
===================================================================
--- head/converters/osm2pgsql/Makefile	(revision 371657)
+++ head/converters/osm2pgsql/Makefile	(revision 371658)
@@ -1,46 +1,49 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	osm2pgsql
-PORTVERSION=	0.84.0
-PORTREVISION=	5
+PORTVERSION=	0.86.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
 		libgeos.so:${PORTSDIR}/graphics/geos \
 		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
-GH_COMMIT=	237b125
+GH_COMMIT=	b7705f1
 
 USES=		autoreconf gmake libtool lua pgsql tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LUA="${LUA_CMD}" \
 		LUA_INCLUDE="-I${LUA_INCDIR}" \
 		LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}"
 USE_GNOME=	libxml2
 
 PLIST_FILES=	bin/nodecachefilereader \
 		bin/osm2pgsql \
 		man/man1/nodecachefilereader.1.gz \
 		man/man1/osm2pgsql.1.gz
 
 PORTDOCS=	ChangeLog README AUTHORS TODO
 PORTDATA=	*
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/m4/*.m4
+	@${REINPLACE_CMD} -e 's|AC_MSG_WARN|AC_MSG_ERROR|' ${WRKSRC}/configure.ac
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 .include <bsd.port.mk>
Index: head/converters/osm2pgsql/distinfo
===================================================================
--- head/converters/osm2pgsql/distinfo	(revision 371657)
+++ head/converters/osm2pgsql/distinfo	(revision 371658)
@@ -1,2 +1,2 @@
-SHA256 (osm2pgsql-0.84.0.tar.bz2) = 6859716766e7fe5fd139d0c2a73e7b04057fd263a0891430b60ea9dcd6488884
-SIZE (osm2pgsql-0.84.0.tar.bz2) = 1037702
+SHA256 (osm2pgsql-0.86.0.tar.bz2) = 2364d86b415fa1d0524acf907e5baf8f83d3da93d5735bb4b420b3019f48a603
+SIZE (osm2pgsql-0.86.0.tar.bz2) = 2101823