Update osm2pgsql to 0.92.1

Release 0.92.1
	This fixes two important bugs which impacted relations with
	excessive members and consuming updates with the multi backend

Release 0.92.0, a new stable branch
	Major changes since 0.90.0 are

	- PostgreSQL 9.1 + PostGIS 2.0 or later are now required, which has
	  allowed performance improvements and cleanups
	- EPSG 3857 is now default. You can get the old behavior by manually
	  specifying 900913
	- Invlid geometries are re-checked for validity after buffering, instead
	  of assuming GEOS returns a valid geom

	Other changes are
	- A new option to change the max bbox size at which polygons will expire
	  all the tiles in them, not just the boundary
	- Behavior fixes for C transforms and tables with no columns
	- More numeric datatypes are allowed for table columns in C tagtransforms
	- Lua is now required by default
	- Code fixes, particularly replacement of C memory management

5 files changed, 30 insertions, 45 deletions

diff --git a/geography/osm2pgsql/Makefile b/geography/osm2pgsql/Makefile
index 324a5209731..1145ded2a14 100644
--- a/geography/osm2pgsql/Makefile
+++ b/geography/osm2pgsql/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2017/04/30 01:21:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2017/06/10 20:00:41 wiedi Exp $
 
-DISTNAME=	osm2pgsql-0.88.1
-PKGREVISION=	5
+DISTNAME=	osm2pgsql-0.92.1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
@@ -11,29 +10,21 @@ HOMEPAGE=	https://github.com/openstreetmap/osm2pgsql/
 COMMENT=	OpenStreetMap data to PostgreSQL converter
 LICENSE=	gnu-gpl-v2
 
+WRKSRC=		${WRKDIR}/osm2pgsql-${PKGVERSION_NOREV}
+USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake autoconf aclocal automake
-GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
-CONFIGURE_ARGS+=	--with-bzip2=${BUILDLINK_PREFIX.bzip2}
-CONFIGURE_ARGS+=	--with-proj=${BUILDLINK_PREFIX.proj}
-CONFIGURE_ARGS+=	--with-protobuf-c=${BUILDLINK_PREFIX.protobuf-c}
-CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_DIRS=	${WRKDIR}/build
+CMAKE_ARG_PATH=	${WRKSRC}
 
-.include "../../mk/bsd.prefs.mk"
+post-extract:
+	${RUN} mkdir -p ${WRKDIR}/build
 
-pre-configure:
-	cd ${WRKSRC} && aclocal && ./autogen.sh
-
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
-.include "../../devel/protobuf-c/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/osm2pgsql/PLIST b/geography/osm2pgsql/PLIST
index 70332c4189c..c514e62dd59 100644
--- a/geography/osm2pgsql/PLIST
+++ b/geography/osm2pgsql/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2015/06/10 01:48:49 wiedi Exp $
-bin/nodecachefilereader
+@comment $NetBSD: PLIST,v 1.2 2017/06/10 20:00:41 wiedi Exp $
 bin/osm2pgsql
-man/man1/nodecachefilereader.1
 man/man1/osm2pgsql.1
-share/osm2pgsql/900913.sql
 share/osm2pgsql/default.style
+share/osm2pgsql/empty.style
diff --git a/geography/osm2pgsql/distinfo b/geography/osm2pgsql/distinfo
index 70870f95d80..f2abeed3e04 100644
--- a/geography/osm2pgsql/distinfo
+++ b/geography/osm2pgsql/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 00:08:43 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/06/10 20:00:41 wiedi Exp $
 
-SHA1 (osm2pgsql-0.88.1.tar.gz) = 8dcdb563de23a641c94855b50bf020c799b6a869
-RMD160 (osm2pgsql-0.88.1.tar.gz) = 8d8ce268e00a015112ec3385dd93b7160032da83
-SHA512 (osm2pgsql-0.88.1.tar.gz) = fe98afdeab9fa966bacc1b5886dc10494f2d58e0c8d26be1c732e782b583c1285689506c412d16b70cdd5b3e4146204f52201283ef54a0746fcf99f76cbe1fd5
-Size (osm2pgsql-0.88.1.tar.gz) = 2140606 bytes
-SHA1 (patch-middle-pgsql.cpp) = 71146a00bdfd486ae0b7ed74566270b4671175b7
+SHA1 (osm2pgsql-0.92.1.tar.gz) = d41e562fe8ef8cc95edd369d6a65a87c200775ec
+RMD160 (osm2pgsql-0.92.1.tar.gz) = 78d3b6a1bde7b6c6de280a999b01245e4d1f17f9
+SHA512 (osm2pgsql-0.92.1.tar.gz) = 92cda662a633600d89ba7c3f902c446450236f22a971a976da3b35d7c867bd6c2447f088685a962b5a3ba9b3071a41c24349f053e329004546012b0c0552fbf5
+Size (osm2pgsql-0.92.1.tar.gz) = 1364504 bytes
+SHA1 (patch-CMakeLists.txt) = a33fcf5b935c515a82817fe233a9d9bb6b9e7372
diff --git a/geography/osm2pgsql/patches/patch-CMakeLists.txt b/geography/osm2pgsql/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..3d8748dd96e
--- /dev/null
+++ b/geography/osm2pgsql/patches/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2017/06/10 20:00:42 wiedi Exp $
+
+fix man path
+
+--- CMakeLists.txt.orig	2017-04-13 20:58:25.000000000 +0000
++++ 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 ${CMAKE_INSTALL_MANDIR}/man1)
+ install(FILES default.style empty.style DESTINATION share/osm2pgsql)
diff --git a/geography/osm2pgsql/patches/patch-middle-pgsql.cpp b/geography/osm2pgsql/patches/patch-middle-pgsql.cpp
deleted file mode 100644
index 3234719d683..00000000000
--- a/geography/osm2pgsql/patches/patch-middle-pgsql.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-middle-pgsql.cpp,v 1.1 2015/06/10 01:48:49 wiedi Exp $
-
-Need alloca.h on SunOS
-
---- middle-pgsql.cpp.orig	2015-04-30 04:15:07.000000000 +0000
-+++ middle-pgsql.cpp
-@@ -33,6 +33,10 @@ using namespace std;
- #define alloca _alloca
- #endif
- 
-+#if defined(__sun)
-+#include <alloca.h>
-+#endif
-+
- #include <libpq-fe.h>
- 
- #include "osmtypes.hpp"