From nobody Fri Nov 11 18:07:22 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 4N869k4nVLz4dW7p; Fri, 11 Nov 2022 18:07:22 +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 4N869k4Fr7z3m8x; Fri, 11 Nov 2022 18:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668190042; 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=u1JuKw5wbdARNrO1gY8e8AFnDpvh3ukq97QeGDkbSZI=; b=wZ1f0lGPHsL5a/jUS/kt+4KiJWY5SIQA3xFGvbPjxk5cGlWSR2XBu9cVwv5UNP61H/vvFV BDXpEB9PFnFpYDhtRg0rP5ObI0eMGroVVqmLu7qDJCiiqgFgDfDCDNbIW0jots1umppuzP vMX3glouXxvmDz2RHBQjbyq7VCf5g5DaGtAhHMWDziWmPZWzic0jZce9kdys2ziVfoHHfg rG5BJiprkflswDqrM3Z2rFznY/QcioK/cJ08+65E/Kkf3pirBpCRfvfK2znUbFoQiYgZss KwKlSb1wAwCyzShcxtczKvu45SaaoEeN7vpAAwyGVjMuV4Q3xxUAyYDEDcU2Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668190042; 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=u1JuKw5wbdARNrO1gY8e8AFnDpvh3ukq97QeGDkbSZI=; b=SuFzF6SdC1WGvPfP51sdmBARNhMC1xeffMUorE69sWBZkrS0bpXbNPpR+RhczKcMZ/2EKz NMIaUZc6DhNN6PyuX8Zid5d7GQn3qOAit+kZab7uOCDv2FuEQPTzerDyTYutZZp07ka4hg 6LAVxe6KVUzuMs/ViRTl8IM1ePsblTkyJHA2GjGSYYVX2MlYIUWalWlewB2w6mxQPYEX6C faXsQE5FxL5ckRvFoa/hBZM4BHNsCVU6Anj+kVZuUrsakapjerjPYtANymo+XE5Lo6ch3L 32DMTAHIQFuPvgStmIx7P+mL3cAMgFNAVFCWDaJhObcX8YJ+2WQzjW+H2qYSxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668190042; a=rsa-sha256; cv=none; b=WQIizLakQrjHz0kEBnm7JL7252NzoV1z4sqK1Yi8Fq6zZmWXB9MCVT1T8JElyp1ovwSYz4 e9S2EOmTmpYiTNdMVisb1f1hJsBL0BN+z9gEd48pEejSpxgofn0/Tp7C5egWUlvP4pYMZw 1scjdCA78BkNtWDQX/G7eeEbQeZFbxadGm0RFteif7ps6SRLhsvtmoLRqa9Vc8+8ZeOu2A YZ3293bXMJpTfW6TZQ1alAxOUG7TB5e4mtxZGMc48lSNsJ2yk/idBWxPN3VmhKu1H8p4tI 84G8L+vt0HfxV/0LTBc/yIV+wd4X/kVb4WQDfwJZkve1UPjoBRQBcealON2Q+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N869k3JwQzsDj; Fri, 11 Nov 2022 18:07:22 +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 2ABI7MRY059838; Fri, 11 Nov 2022 18:07:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABI7Mst059837; Fri, 11 Nov 2022 18:07:22 GMT (envelope-from git) Date: Fri, 11 Nov 2022 18:07:22 GMT Message-Id: <202211111807.2ABI7Mst059837@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: ade98c93072b - main - =?utf-8?Q?converters/osm2pgsql:=20update=201.7.1=20=E2=86=92=201.7.2?= 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: ade98c93072bb509be6cf1be84b85c25abe7f1fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=ade98c93072bb509be6cf1be84b85c25abe7f1fd commit ade98c93072bb509be6cf1be84b85c25abe7f1fd Author: Dmitry Marakasov AuthorDate: 2022-11-11 16:41:07 +0000 Commit: Dmitry Marakasov 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 -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',