Date: Fri, 11 Nov 2022 18:07:22 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ade98c93072b - main - =?utf-8?Q?converters/osm2pgsql:=20update=201.7.1=20=E2=86=92=201.7.2?= Message-ID: <202211111807.2ABI7Mst059837@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ade98c93072bb509be6cf1be84b85c25abe7f1fd commit ade98c93072bb509be6cf1be84b85c25abe7f1fd Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-11-11 16:41:07 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-11-11 18:05:41 +0000 converters/osm2pgsql: update 1.7.1 → 1.7.2 --- converters/osm2pgsql/Makefile | 2 +- converters/osm2pgsql/distinfo | 6 +-- .../patch-f7b99c16928c09ab4baa4962850af635132f7beb | 50 ---------------------- 3 files changed, 4 insertions(+), 54 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 76a038d12131..c22a757be88d 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,5 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.7.1 +PORTVERSION= 1.7.2 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 0ba3f7cc4b01..aefe25f14771 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667404495 -SHA256 (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 76c303bfb28440eee546d0f7327565a08d6dac20a915f95dbb4bf21f2e691141 -SIZE (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 2626690 +TIMESTAMP = 1668181735 +SHA256 (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 +SIZE (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 2627913 diff --git a/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb b/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb deleted file mode 100644 index eb175ff4714e..000000000000 --- a/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb +++ /dev/null @@ -1,50 +0,0 @@ -From f7b99c16928c09ab4baa4962850af635132f7beb Mon Sep 17 00:00:00 2001 -From: Sarah Hoffmann <lonvia@denofr.de> -Date: Sat, 22 Oct 2022 11:52:11 +0200 -Subject: [PATCH] always expect osm2pgsql in same path as osm2pgsql-replication - -Anything else causes issues with the installation process of cmake. ---- - CMakeLists.txt | 3 +-- - scripts/osm2pgsql-replication | 9 +++------ - 2 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fbc8ce06..dea959ed6 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -337,6 +337,5 @@ include(GNUInstallDirs) - if (ENABLE_INSTALL) - install(TARGETS osm2pgsql DESTINATION bin) - install(FILES default.style empty.style DESTINATION share/osm2pgsql) -- install(CODE "set(OSM2PGSQL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR}) -- configure_file(${PROJECT_SOURCE_DIR}/scripts/osm2pgsql-replication ${CMAKE_INSTALL_FULL_BINDIR}/osm2pgsql-replication)") -+ install(PROGRAMS scripts/osm2pgsql-replication DESTINATION bin) - endif() -diff --git a/scripts/osm2pgsql-replication b/scripts/osm2pgsql-replication -index e721da350..0485169c8 100755 ---- scripts/osm2pgsql-replication -+++ scripts/osm2pgsql-replication -@@ -51,10 +51,7 @@ except ImportError: - - LOG = logging.getLogger() - --# Will be replaced when installed via CMake. --INSTALL_PREFIX = '@OSM2PGSQL_BINDIR@/' --if INSTALL_PREFIX.startswith('@'): -- INSTALL_PREFIX = '' -+OSM2PGSQL_PATH = Path(__file__).parent.resolve() / 'osm2pgsql' - - def pretty_format_timedelta(seconds): - minutes = int(seconds/60) -@@ -493,8 +490,8 @@ def get_parser(): - help='File to save changes before they are applied to osm2pgsql.') - cmd.add_argument('--max-diff-size', type=int, default=500, - help='Maximum data to load in MB (default: 500MB)') -- cmd.add_argument('--osm2pgsql-cmd', default=INSTALL_PREFIX + 'osm2pgsql', -- help=f'Path to osm2pgsql command (default: {INSTALL_PREFIX}osm2pgsql)') -+ cmd.add_argument('--osm2pgsql-cmd', default=str(OSM2PGSQL_PATH), -+ help=f'Path to osm2pgsql command (default: {OSM2PGSQL_PATH})') - cmd.add_argument('--once', action='store_true', - help='Run updates only once, even when more data is available.') - cmd.add_argument('--post-processing', metavar='SCRIPT',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211111807.2ABI7Mst059837>