Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1619024204155130"
MIME-Version: 1.0
Date: Wed, 21 Apr 2021 16:56:44 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/geography/osm2pgsql
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20210421165644.C1084FA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1619024204155130
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Wed Apr 21 16:56:44 UTC 2021

Modified Files:
	pkgsrc/geography/osm2pgsql: Makefile distinfo

Log Message:
geography/osm2pgsql: Update to 1.3.0

Upstream changes:

1.3.0:

This release introduces the new "flex" output. It allows a more flexible
definition of output tables and columns. It also adds a second stage of
processing which makes it possible to get information from relations to
their members, allowing, for instance, to render tags from bicycle route
relations on their member ways. The "flex" output is configured through
Lua scripts.

The flex output is currently still marked as experimental, because it is new
and we want to collect feedback from the community before finalizing the API.
But it already works well and users are encouraged to try it out. Some new
features are only or will only be available in the flex output and we expect
that it will replace the other outputs in the long term.

Some features have been marked as deprecated:

    The "multi" output will be removed in a future version of osm2pgsql. If you
    are using the multi output, switch to the flex output now and tell us if
    you have any problems.
    When the input file uses negative OSM object IDs a warning is now generated.
    Negative IDs never worked correctly for all use cases. Future versions of
    osm2pgsql will not allow negative IDs at all. Use "osmium renumber"
    to get rid of the negative IDs.
    Input files that are not ordered generate a warning. Future versions of
    osm2pgsql will not work any more with unordered files. If you have unordered
    files use "osmium sort" to order them.

Further changes:

    The multi output now looks for lua script relative to the style.json file.
    This is a breaking change. Users might have to change the file names of
    their lua scripts in the style files.
    Use the fmt library for formatting strings now instead of a mixture of
    boost::format and hand-written mechanisms. A version of fmt is included
    in the contrib directory.
    Make PROJ library optional. If the proj library cannot be found by cmake,
    do not offer the option to use arbitrary projections. Only WGS84 and
    WebMercator are supported then.
    Don't use ST_GeoHash for ordering tables by geometry on Postgis >= 2.4.
    Instead use the default ordering which works better now.
    Fix: Always print correct relations count and more correct count per seconds
    when showing processing stats.
    Fix: If a function run in the thread pool throws an exception, this exception
    was never "collected", it was silently ignored. This meant that some errors,
    especially in communication with the database, were not detected correctly.
    The dependency management, the part of the code which tracks which changes
    in the OSM data trigger which changes in the outputs, was reorganized
    making in much cleaner and removing the last remnants of code written to
    support "old style" multipolygons.
    Tests have been moved to the Catch framework, extended and the regression
    tests have been reorganised, so they can run independently of each other.
    A lot of code was cleaned up, modernized, made more robust, and sometimes
    removed.

1.2.2:

This release only updates the bundled version of libosmium. The new
version 2.15.6 fixes an issue where complicated multipolygons make
osm2pgsql hang.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/geography/osm2pgsql/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/osm2pgsql/distinfo

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


--_----------=_1619024204155130
Content-Disposition: inline
Content-Length: 2068
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/geography/osm2pgsql/Makefile
diff -u pkgsrc/geography/osm2pgsql/Makefile:1.29 pkgsrc/geography/osm2pgsql/Makefile:1.30
--- pkgsrc/geography/osm2pgsql/Makefile:1.29	Wed Apr 21 13:24:45 2021
+++ pkgsrc/geography/osm2pgsql/Makefile	Wed Apr 21 16:56:44 2021
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2021/04/21 13:24:45 adam Exp $
+# $NetBSD: Makefile,v 1.30 2021/04/21 16:56:44 gdt Exp $
 
-DISTNAME=	osm2pgsql-1.2.1
-PKGREVISION=	7
+DISTNAME=	osm2pgsql-1.3.0
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openstreetmap/}
 GITHUB_TAG=	${PKGVERSION_NOREV}
@@ -21,6 +20,9 @@ post-extract:
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	${WRKSRC}
 
+CMAKE_ARGS+=	-DBUILD_TESTS=ON
+TEST_TARGET=	test
+
 .include "../../geography/proj/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"

Index: pkgsrc/geography/osm2pgsql/distinfo
diff -u pkgsrc/geography/osm2pgsql/distinfo:1.7 pkgsrc/geography/osm2pgsql/distinfo:1.8
--- pkgsrc/geography/osm2pgsql/distinfo:1.7	Fri Mar 13 13:08:51 2020
+++ pkgsrc/geography/osm2pgsql/distinfo	Wed Apr 21 16:56:44 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2020/03/13 13:08:51 gdt Exp $
+$NetBSD: distinfo,v 1.8 2021/04/21 16:56:44 gdt Exp $
 
-SHA1 (osm2pgsql-1.2.1.tar.gz) = d377626dd2298a6480f4b7a0854251117484e764
-RMD160 (osm2pgsql-1.2.1.tar.gz) = f01d4dd899c4116e77f75b5b8b8fa01090de531a
-SHA512 (osm2pgsql-1.2.1.tar.gz) = 72d15a4f40561313c2cf1b1abe55d363136e44407d127b5195a7f95f4408350b5ee577596664c7d6b2d82b5017363bd024589342a8b3aba4ce2bc6dfbc4415ab
-Size (osm2pgsql-1.2.1.tar.gz) = 1223420 bytes
+SHA1 (osm2pgsql-1.3.0.tar.gz) = 784ad8adb94a3bf47618148d4a82c0d41d48176e
+RMD160 (osm2pgsql-1.3.0.tar.gz) = ece9e29ce715aced56656e304a610f886c530969
+SHA512 (osm2pgsql-1.3.0.tar.gz) = e643f3a1987ead36763c96d34b5dd7e170273b77a521106c21311dc7b01d2b34470b2e00e3214050f2cbdd3d89703a1827ee6c35928ed77cc7f35fc4e20331f3
+Size (osm2pgsql-1.3.0.tar.gz) = 2460451 bytes
 SHA1 (patch-CMakeLists.txt) = a33fcf5b935c515a82817fe233a9d9bb6b9e7372


--_----------=_1619024204155130--