From nobody Thu Nov 03 12:09:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N32cS4VN0z4grPd; Thu, 3 Nov 2022 12:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N32cS433Qz3RMH; Thu, 3 Nov 2022 12:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667477368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09hhwhnC/Vt1xP0mqRfCsJWF4qmZf2C+qlz4uBp8PgQ=; b=tM6ujS+qF8kOAHTPq9nInLJe5M1sszI+FKOXi3c7OZ29tQeodWHt+HFfWkOopZJLRVvSdF qvIwvz+tP9c98ZFo1rDomRKFd+yoZBBSQAed4hcstcYaXJgmYuduYk1OpQdw0xsGYcX11i 6ITjVK1aaN9dRawC82NaL3sMFFqyAMy1INnKunGgLp7l9ibUJoAYETh7Q98ig7W5vWHYa+ pC4C/b7GVpLy+YmpnzwUVvzIyC369up0eamsLHBzUZul81ZHxwPBTtaqqIVz45cFxKMYB8 INr+eTTGdLvXzCN2C3u/Lxm7ggHQwHc0xKAwFCdZkfzqGgLuwC9xZVCc6I0BwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N32cS37QfzbVZ; Thu, 3 Nov 2022 12:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A3C9ShC077517; Thu, 3 Nov 2022 12:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A3C9Sb5077515; Thu, 3 Nov 2022 12:09:28 GMT (envelope-from git) Date: Thu, 3 Nov 2022 12:09:28 GMT Message-Id: <202211031209.2A3C9Sb5077515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 78cfe65ee0c8 - main - =?utf-8?Q?converters/osm2pgsql:=20update=201.7.0=20=E2=86=92=201.7.1?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667477368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=09hhwhnC/Vt1xP0mqRfCsJWF4qmZf2C+qlz4uBp8PgQ=; b=BR8nODno455SGE+NSTx12gc24E2LSuz6Qs0mY0uHehldWV80K7xrSiXbbwtKELlATeOmqG SYrdGFR3ckla6syAsCiHMcHDpA1D+QgKf45fXu7R0g6bK2NI+bN3QV0KU+lauGg7hUHSy7 v5TBQ0L1HF6X8ER5I8acd8JUoG7iZm7oCYMXCZ7XdhYh31AwbaTVO5gDbtdUTbBjFMDC7s +e/CGxX5HccvgCCijImrLMHtKO6rh+jxKluGHQUStpSJ6BZ3xpMJ+XApcVOavjZprIUrud pxSZZELhjYoU2WbGe0RucKRxwQeyQ4Y9wUc4hy0L1x7tnWQFed1ler0E4+lsLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667477368; a=rsa-sha256; cv=none; b=tCFoFjy46eo52xQYO1t2ddLlmoqAQeQmrdM0qgXdkZZ7olfzyRIh3pRb4BXDfZBKtfBiq6 RRfVEPry+bDGVJ1ge7CM50B5XIM7iCMZszooXFlpRSv5GImJKSLvplQWoH0NaX7d9qRwxP 3O+XYx3C0aGLKC5C+eqwKmE0IwKqcOVC2rco1DQ2t47EBSTghDALk18VfA9N5KsZe1hihX Pu9k0VVsk/L4TmQJYgjcRClM6m6iMSM3fLDHM5UYvBH2l2Ot1tG9lQjyl3ELFVu/TF27gb XjlVIWPjBsS2+OEFzcszBi3jxWbMP4rvR9LOTGVpSdRIGowVNg9x1KkjyMjv+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54 commit 78cfe65ee0c8b6f73a06b8ca4333b2aa40e15f54 Author: Dmitry Marakasov AuthorDate: 2022-11-02 16:11:20 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-03 12:09:17 +0000 converters/osm2pgsql: update 1.7.0 → 1.7.1 --- converters/osm2pgsql/Makefile | 6 ++- converters/osm2pgsql/distinfo | 6 +-- .../patch-f7b99c16928c09ab4baa4962850af635132f7beb | 50 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 2d75960bee76..76a038d12131 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,10 +1,12 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.7.0 +PORTVERSION= 1.7.1 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org COMMENT= Convert OSM XML data to PostgreSQL database -WWW= https://wiki.openstreetmap.org/wiki/Osm2pgsql +WWW= https://osm2pgsql.org/ \ + https://wiki.openstreetmap.org/wiki/Osm2pgsql \ + https://github.com/openstreetmap/osm2pgsql LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 5c066a03fcfc..0ba3f7cc4b01 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1660665094 -SHA256 (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 0f722baf0f04eda387d934d86228aae07d848993900db6b9e7ab312c91fd84e5 -SIZE (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 2620585 +TIMESTAMP = 1667404495 +SHA256 (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 76c303bfb28440eee546d0f7327565a08d6dac20a915f95dbb4bf21f2e691141 +SIZE (openstreetmap-osm2pgsql-1.7.1_GH0.tar.gz) = 2626690 diff --git a/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb b/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb new file mode 100644 index 000000000000..eb175ff4714e --- /dev/null +++ b/converters/osm2pgsql/files/patch-f7b99c16928c09ab4baa4962850af635132f7beb @@ -0,0 +1,50 @@ +From f7b99c16928c09ab4baa4962850af635132f7beb Mon Sep 17 00:00:00 2001 +From: Sarah Hoffmann +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',