Index: head/converters/osm2pgsql/files/patch-CMakeLists.txt
===================================================================
--- head/converters/osm2pgsql/files/patch-CMakeLists.txt	(revision 451614)
+++ head/converters/osm2pgsql/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,9 +0,0 @@
---- CMakeLists.txt.orig	2017-04-13 20:58:25 UTC
-+++ CMakeLists.txt
-@@ -252,5 +252,5 @@ endif()
- #############################################################
- 
- install(TARGETS osm2pgsql DESTINATION bin)
--install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1)
-+install(FILES docs/osm2pgsql.1 DESTINATION man/man1)
- install(FILES default.style empty.style DESTINATION share/osm2pgsql)

Property changes on: head/converters/osm2pgsql/files/patch-CMakeLists.txt
___________________________________________________________________
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/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake
===================================================================
--- head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake	(revision 451614)
+++ head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake	(nonexistent)
@@ -1,13 +0,0 @@
---- cmake/FindOsmium.cmake.orig	2017-04-13 20:58:25 UTC
-+++ cmake/FindOsmium.cmake
-@@ -151,8 +151,8 @@ list(APPEND OSMIUM_LIBRARIES
- #----------------------------------------------------------------------
- # Component 'geos'
- if(Osmium_USE_GEOS)
--    find_path(GEOS_INCLUDE_DIR geos/geom.h)
--    find_library(GEOS_LIBRARY NAMES geos)
-+    find_path(GEOS_INCLUDE_DIR geos35/geos/geom.h)
-+    find_library(GEOS_LIBRARY NAMES geos35)
- 
-     list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY)
-     if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY)

Property changes on: head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake
___________________________________________________________________
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/converters/osm2pgsql/Makefile
===================================================================
--- head/converters/osm2pgsql/Makefile	(revision 451614)
+++ head/converters/osm2pgsql/Makefile	(revision 451615)
@@ -1,46 +1,42 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	osm2pgsql
-PORTVERSION=	0.92.1
-PORTREVISION=	3
+PORTVERSION=	0.94.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
-		libgeos35.so:graphics/geos35 \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2
 
 BROKEN_powerpc64=	fails to compile: node-ram-cache.hpp: cstdint: No such file or directory
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 
 USES=		cmake:outsource lua:53 pgsql
 
 PLIST_FILES=	bin/osm2pgsql \
 		man/man1/osm2pgsql.1.gz
 
 PORTDOCS=	AUTHORS ChangeLog README.md
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|include <geos|&35/geos|' \
-		${WRKSRC}/contrib/libosmium/osmium/geom/geos.hpp \
-		${WRKSRC}/geometry-builder.cpp
+	@${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
 	@${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 451614)
+++ head/converters/osm2pgsql/distinfo	(revision 451615)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492513697
-SHA256 (openstreetmap-osm2pgsql-0.92.1_GH0.tar.gz) = 0912a344aaa38ed4b78f6dcab1a873975adb434dcc31cdd6fec3ec6a30025390
-SIZE (openstreetmap-osm2pgsql-0.92.1_GH0.tar.gz) = 1364504
+TIMESTAMP = 1507552761
+SHA256 (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 9e67e400deca48185313921431884171fb087dfe9e0d21e31857b8b06f20d317
+SIZE (openstreetmap-osm2pgsql-0.94.0_GH0.tar.gz) = 1203310