CVS commit: pkgsrc/geography/osm2pgsql

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sat Jun 10 20:00:42 UTC 2017

Modified Files:
        pkgsrc/geography/osm2pgsql: Makefile PLIST distinfo
Added Files:
        pkgsrc/geography/osm2pgsql/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/geography/osm2pgsql/patches: patch-middle-pgsql.cpp

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/osm2pgsql/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/osm2pgsql/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/geography/osm2pgsql/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/osm2pgsql/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/geography/osm2pgsql/patches/patch-middle-pgsql.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/osm2pgsql/Makefile
diff -u pkgsrc/geography/osm2pgsql/Makefile:1.7 pkgsrc/geography/osm2pgsql/Makefile:1.8
--- pkgsrc/geography/osm2pgsql/Makefile:1.7     Sun Apr 30 01:21:41 2017
+++ pkgsrc/geography/osm2pgsql/Makefile Sat Jun 10 20:00:41 2017
@@ -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/openstreetm
 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}
 
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_DIRS=        ${WRKDIR}/build
+CMAKE_ARG_PATH=        ${WRKSRC}
 
-pre-configure:
-       cd ${WRKSRC} && aclocal && ./autogen.sh
+post-extract:
+       ${RUN} mkdir -p ${WRKDIR}/build
 
-.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"

Index: pkgsrc/geography/osm2pgsql/PLIST
diff -u pkgsrc/geography/osm2pgsql/PLIST:1.1 pkgsrc/geography/osm2pgsql/PLIST:1.2
--- pkgsrc/geography/osm2pgsql/PLIST:1.1        Wed Jun 10 01:48:49 2015
+++ pkgsrc/geography/osm2pgsql/PLIST    Sat Jun 10 20:00:41 2017
@@ -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

Index: pkgsrc/geography/osm2pgsql/distinfo
diff -u pkgsrc/geography/osm2pgsql/distinfo:1.3 pkgsrc/geography/osm2pgsql/distinfo:1.4
--- pkgsrc/geography/osm2pgsql/distinfo:1.3     Tue Nov  3 00:08:43 2015
+++ pkgsrc/geography/osm2pgsql/distinfo Sat Jun 10 20:00:41 2017
@@ -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

Added files:

Index: pkgsrc/geography/osm2pgsql/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/geography/osm2pgsql/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jun 10 20:00:42 2017
+++ pkgsrc/geography/osm2pgsql/patches/patch-CMakeLists.txt     Sat Jun 10 20:00:42 2017
@@ -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)