From nobody Tue Aug 30 18:56:11 2022 X-Original-To: dev-commits-ports-main@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 4MHGjm07W5z4b6Ld; Tue, 30 Aug 2022 18:56:12 +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 4MHGjl6fQqz3NpN; Tue, 30 Aug 2022 18:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661885771; 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=1RkYyUaZ6RconVbDiTz0ltdfMop5NavGKJaiCwjCKDA=; b=aN1lxkyWMNK5ckTK2VBdc1MxvsKqaeiY79dvQ1wkYCGBPf7ViLJ0ufLuGVwXt52643kOEy FumI8JSM0FlsmlYc/NIeUEYmnEUtwumzqQ4ky7Zlg/XcE2vjzG+7yevDM2K7pYAa+OH/8T AfgLqfSpMM28xrGAlOfnbq3xIyU/jdSf159xlvN4LC3HUbRYlaqBcM+6o0TrTxGe1wLY4p jOLZVQa0GLXUpRdn2ky0BY4lrqrvSOacKUvAGfV2OaLGLQtDoq11oU5LObCGX/JrI7vb9y RCLTF9eEjsbhSscH6xH6os3/O8I5hEo1zKXc6K0Y7Uv3eyclKUUC5cLhhC/oag== 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 4MHGjl5WbVzsDQ; Tue, 30 Aug 2022 18:56:11 +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 27UIuBA7036531; Tue, 30 Aug 2022 18:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27UIuBJF036530; Tue, 30 Aug 2022 18:56:11 GMT (envelope-from git) Date: Tue, 30 Aug 2022 18:56:11 GMT Message-Id: <202208301856.27UIuBJF036530@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: 0fe8ef97235a - main - =?utf-8?Q?converters/osm2pgsql:=20update=201.6.0=20=E2=86=92=201.7.0?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 0fe8ef97235a68478c5625f580dfc0ebecce6a69 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661885771; 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=1RkYyUaZ6RconVbDiTz0ltdfMop5NavGKJaiCwjCKDA=; b=Ukqo+1ysm8VJz07ZRBBg3UTjIn9Qvsk++pH5A0J6NZ95hOxjlKKAbb0zR3F6C0tFxJxaU3 gKiiRsFJsfpB4Hyfq+kp9ffT6ssi1jpbF0Hlp+os5YKEBzqXWhyblk7SX5slhuXu7P/VRb HbmYyjKpeq0eKd5D7g6XKAG3McTxaE/QwefO1MYOoIOan7RRRGYkBFM7LOwR0JsiD8OnOz moEPocM2HllhURQ7H2RbN6mCEAaHS2D8kjoHhwr7+b4SeKHZzz+Ywc4SPKftlzqal0tBUg q0R94ldSxR39wB8ZH+zBi4Q0/Pft99haMuPEexWO1zlacRfeAXM9NtJPzq7s6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661885771; a=rsa-sha256; cv=none; b=sznjnRGIRtx4+r9a58hbD52rH2JNC02mVDsDV95ujrz1Ec6QZjkZajJzsTxPlHH/ClbMIs ZUO+g/+h9b+Ma83S0Ay9pLXiPVwH1OEOnNqa/dgzOmcS+ZVyPV1YS99/yjzgGOe6hrLp/p 8YRQs+HX5oveLJeJpAw6rq1bT7uTO+3JlNl/G03U9oYpPoDgCUGQgmS2URFC+s3yrA1O1f BqO5Z0eVz8GQCHa2xmH4KQstM5lQnMOZyfirIgi+alZJqwbW88J3arCG2gcG0BR+h15Cvy MMyhAikMV1rK2x/yWTIbMkonyPMgUGVz6JjENNh/Z/sxP3u1F8XlP4QDhyAm2A== 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=0fe8ef97235a68478c5625f580dfc0ebecce6a69 commit 0fe8ef97235a68478c5625f580dfc0ebecce6a69 Author: Dmitry Marakasov AuthorDate: 2022-08-30 16:28:16 +0000 Commit: Dmitry Marakasov CommitDate: 2022-08-30 18:55:07 +0000 converters/osm2pgsql: update 1.6.0 → 1.7.0 --- converters/osm2pgsql/Makefile | 9 +++++---- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-src_output-flex.cpp | 11 ----------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index c41e4b3be4fe..41473ae1127d 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTVERSION= 1.7.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -20,14 +19,14 @@ BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ USE_GITHUB= yes GH_ACCOUNT= openstreetmap -USES= cmake compiler:c++14-lang pgsql python:run shebangfix +USES= cmake compiler:c++17-lang pgsql python:run shebangfix SHEBANG_FILES= scripts/osm2pgsql-replication CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ EXTERNAL_LIBOSMIUM \ EXTERNAL_PROTOZERO \ EXTERNAL_FMT \ EXTERNAL_RAPIDJSON -CMAKE_ARGS= LUA_EXE="${LUA_CMD}" +CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * @@ -42,6 +41,8 @@ LUAJIT_USES_OFF= lua:54 TEST_CMAKE_BOOL= BUILD_TESTS TEST_TEST_TARGET= test TEST_CMAKE_ON= -DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure" +TEST_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} +TEST_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \ diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 1e8a7e16d8ce..5c066a03fcfc 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647270699 -SHA256 (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 -SIZE (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 2592649 +TIMESTAMP = 1660665094 +SHA256 (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 0f722baf0f04eda387d934d86228aae07d848993900db6b9e7ab312c91fd84e5 +SIZE (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 2620585 diff --git a/converters/osm2pgsql/files/patch-src_output-flex.cpp b/converters/osm2pgsql/files/patch-src_output-flex.cpp deleted file mode 100644 index c170668f2a34..000000000000 --- a/converters/osm2pgsql/files/patch-src_output-flex.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/output-flex.cpp.orig 2022-01-24 15:04:03 UTC -+++ src/output-flex.cpp -@@ -636,7 +636,7 @@ void output_flex_t::write_column( - } - } else { - throw std::runtime_error{ -- "Column type {} not implemented."_format(column.type())}; -+ "Column type {} not implemented."_format(static_cast(column.type()))}; - } - - lua_pop(lua_state(), 1);