From nobody Tue Mar 15 11:50:44 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 56E171A14F01; Tue, 15 Mar 2022 11:50:46 +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 4KHsDP41zlz3LRg; Tue, 15 Mar 2022 11:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647345046; 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=IMtpmgC1nCpM/B9+AUO/NOukdVOeL2XeW3t56k6FdRY=; b=ddadCHF61UIXJfnDy7J9bY6atDtBC4nDhodGoems7WOMf7gUE0lb6bki0AogPWZ8317VgT ic4mJzSIEOoMkOJ8rYRIvuTKLo4i0u08+XfUaBsBHplKY59snriaVVpBeqbPnllUzTVrW7 jDMF4scW1xpeQnFA+Nv7JnWcQpdBCIr9hi3l51HsqYbKb4HotksqCcnr08H7HIXxYfYx9a 3o854gAVF263KikcvFhLL7eLCdg3Cwt9GThqbbt20j6tRMpFS7X26lAPmhPixTKxLlnm9n NLKJs++Gbts/NlX77eGsS3WurLcGVO7Yh/sDPE9o0qH2Kg7GM4hHNUMmy93a9A== 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 84D8F20BE5; Tue, 15 Mar 2022 11:50:44 +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 22FBoiiv059194; Tue, 15 Mar 2022 11:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FBoiuI059193; Tue, 15 Mar 2022 11:50:44 GMT (envelope-from git) Date: Tue, 15 Mar 2022 11:50:44 GMT Message-Id: <202203151150.22FBoiuI059193@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: 526e37bd3320 - main - =?utf-8?Q?converters/osm2pgsql: update 1.5.1 =E2=86=92 1.6.0?= 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: 526e37bd3320fd720c728bb3e2749a1cfddaa69b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647345046; 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=IMtpmgC1nCpM/B9+AUO/NOukdVOeL2XeW3t56k6FdRY=; b=H5WwUukXtm3myjwlnvn4X9Uuhw9jK0QqinHuEWFzHqR0iGEh6ko6g1IFi4e3qoOoRcegaM bs0WWchVjVEoTpPaCExszPSlTJFEb7ogN56JZlHrypn6hbGq1Fiqvj446T69BCwP+8YT5A oxAbhRaK3dXcgDXyDgRqEnCLLK/Zadh2ap26Y90ihFQnEWPkHBQv/c5tSq1eYMK3Z4T1nu HXY/0Uj9xlXIggpeeAgS+m0g+pZii1pnpr1wSuO9RxGd9uKCK21kwg5qaCVNmZPJxby/G0 bBLPpjIG6inu5HIb4Yo5XpzcWLczY7WHMSoRNDtAQ15aWg2geC9JwueLSWKYgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647345046; a=rsa-sha256; cv=none; b=dj7z7Nr3633M+dF+Kvxa2B7BmvuI9Qf0PgTZDVndVZIFjZalDF6gHc2pIlGp2EL2WNYB7H 61uXysYA1ARUJq1omOtGaHdcL2ILim+Ylw/VjKtg5Mz4BxQPr6QSaC+CGtnOaVk36BhXyR aALXNkon54WrduesAaewtvpiOr1HjHdltm6GcPSjH2L34CqrWPt5mWT1m+CGCzDiG/togm 3i+4eraYaGZkStEjMR7l4AzmFSEP6OQFqdWBs6CtwoAaQHNUgGbrvbSCoHjiCqZ34UDIm6 2+ZNB4LrwcD5h/V36qrPsxltLfnFwviMnNBgQDGNUqVR6BrNxZPF4vvTBKhs5g== 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=526e37bd3320fd720c728bb3e2749a1cfddaa69b commit 526e37bd3320fd720c728bb3e2749a1cfddaa69b Author: Dmitry Marakasov AuthorDate: 2022-03-14 19:27:59 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-15 11:50:06 +0000 converters/osm2pgsql: update 1.5.1 → 1.6.0 - Switch to latest lua - Tweak depends --- converters/osm2pgsql/Makefile | 18 +++++++++--------- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-src_output-flex.cpp | 11 +++++++++++ converters/osm2pgsql/pkg-plist | 4 ++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 6ffd8439a343..a74df657dc95 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,5 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.5.1 +PORTVERSION= 1.6.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -10,24 +10,23 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libproj.so:graphics/proj \ libboost_system.so:devel/boost-libs \ - libexpat.so:textproc/expat2 \ - libfmt.so:devel/libfmt + libexpat.so:textproc/expat2 BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ - ${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson + ${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson \ + ${LOCALBASE}/include/fmt/core.h:devel/libfmt USE_GITHUB= yes GH_ACCOUNT= openstreetmap -USES= cmake compiler:c++14-lang pgsql +USES= cmake compiler:c++14-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 - -PLIST_FILES= bin/osm2pgsql \ - share/man/man1/osm2pgsql.1.gz +CMAKE_ARGS= LUA_EXE="${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * @@ -37,7 +36,8 @@ OPTIONS_DEFINE= DOCS LUAJIT TEST LUAJIT_DESC= Build with LuaJIT support LUAJIT_CMAKE_BOOL= WITH_LUAJIT LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUAJIT_USES_OFF= lua:53 +LUAJIT_USES= lua:54:build # just for running tests in fact +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" diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 80bb88b7ea0d..1e8a7e16d8ce 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629133137 -SHA256 (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e -SIZE (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 2577801 +TIMESTAMP = 1647270699 +SHA256 (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 +SIZE (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 2592649 diff --git a/converters/osm2pgsql/files/patch-src_output-flex.cpp b/converters/osm2pgsql/files/patch-src_output-flex.cpp new file mode 100644 index 000000000000..c170668f2a34 --- /dev/null +++ b/converters/osm2pgsql/files/patch-src_output-flex.cpp @@ -0,0 +1,11 @@ +--- 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); diff --git a/converters/osm2pgsql/pkg-plist b/converters/osm2pgsql/pkg-plist new file mode 100644 index 000000000000..040cb3369780 --- /dev/null +++ b/converters/osm2pgsql/pkg-plist @@ -0,0 +1,4 @@ +bin/osm2pgsql +bin/osm2pgsql-replication +share/man/man1/osm2pgsql.1.gz +share/man/man1/osm2pgsql-replication.1.gz