From nobody Wed Jun 10 19:19:59 2026 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 4gbFwH43KDz6h3LL for ; Wed, 10 Jun 2026 19:19:59 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbFwH2bF9z46bJ for ; Wed, 10 Jun 2026 19:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781119199; 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=hspk8TYozutz1qotikMb9Gx1WGqvdlstuWQ81N4Iyl4=; b=Tx9HoScwwzaPE9QCmVJU3KTMrQk8kXJ7wrdtfLIMSc/r7rXtGrEHH1Sy4QZCkeS6/hwtl5 8FEkTaFV37zQnQJcG8V4IDLhsPKgWlrey67nCgphs9DCfXVuSEfZBE3rlVfuzCSTdBthnf 5ju/9vwl8IK2t3r8w3G4re3saQ0mzw6WBud5kb3YEb4gGZdvxcqTbmokHHpxMKbG9ng2Mz UmkD0pteVP662PMKJ85duusVmds6CbFKLoeIMeCIEAMAhXKuUqCG9e/lOBjsCSX7DXqW++ ziLUiV4YXRdKjqCwpYHEYNJl/eA9KptS2xKU8zbgYgTJHgn7Kgr3V3jgOSVvyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781119199; a=rsa-sha256; cv=none; b=Txuwd+Gc0j1010GWVq4E7yX81qVJkYJmbAj0by7n07xJ94eSJ4fJRQ4LtZDvVFQ8wJSrYe T+mKlCkoRnbZFks6MOcczDNhPIXr+frFLl1Xdgyanvlhv4kCqs9LkPiZB8NGmbQicu93xp vXt5i/M7kWo7WTh8qgt8oTgPk7CxGkdaJcLWZFwDGeKm0epDeHozOPFh+bluRX7vPxq9cN GLUuGqDeRkig4ereHCi/JraItYCCv15Pde0SyE1UqGiJG6tXAF8qgK6vqaQYtShWEcwDTp OPZWlj49/pbL/NX82eKuOJYqp/xsBrB7kqfbbtNUPXPozHewVZzrz+NB5EdjJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781119199; 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=hspk8TYozutz1qotikMb9Gx1WGqvdlstuWQ81N4Iyl4=; b=TQWAq+2Q5XVg+Nx2heeqFkNeQ7VB/RSagL4IRke596ydGRKNIVe2v5WRyuEdN8/l1dhk9P J1yJUEx9GrMgznpSc6XWtiY0pQcPBnrFxXvo8qYea3aLUiAtkVX3+los5yRyx6/PBjJ01B xiM73KvfFh9AHTRL2BUvUNw48QfHccbh/tS2T7cQPsqQoyQcwgATPVmrXEDU1waak8yCan VTx8jj74CNX4RqYUYe4M8bo2vi1dAsPhuZNzmWvhdTSEb394pxx9sjx3Uqpr7nPGRC+FDe Jz0KZ18+wm5hxaYYnA7aPteNBugH59DwlH5wBQnvDYzFNPt/aq79ZRdphyyyZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbFwH1yP5z3Hc for ; Wed, 10 Jun 2026 19:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4717f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 19:19:59 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: e8c971ed6c69 - main - converters/osm2pgsql: update 2=?utf-8?Q?=2E2.0 =E2=86=92?= 2.3.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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: e8c971ed6c69b8c929fe6adcd381f542624e1ca1 Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 19:19:59 +0000 Message-Id: <6a29b8df.4717f.22a92a72@gitrepo.freebsd.org> The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8c971ed6c69b8c929fe6adcd381f542624e1ca1 commit e8c971ed6c69b8c929fe6adcd381f542624e1ca1 Author: Dmitry Marakasov AuthorDate: 2026-06-10 18:42:10 +0000 Commit: Dmitry Marakasov CommitDate: 2026-06-10 19:19:39 +0000 converters/osm2pgsql: update 2.2.0 → 2.3.0 --- converters/osm2pgsql/Makefile | 22 ++++++++++++---------- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 18 ------------------ converters/osm2pgsql/pkg-plist | 4 ++++ 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 36c93d954768..ce8ba21c27d1 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 2.2.0 -PORTREVISION= 2 +PORTVERSION= 2.3.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -21,7 +20,8 @@ BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \ ${LOCALBASE}/include/CLI/Version.hpp:devel/cli11 \ - ${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs + ${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs \ + ${LOCALBASE}/include/fmt/format.h:devel/libfmt USES= cmake compiler:c++17-lang pgsql python:run shebangfix USE_GITHUB= yes @@ -30,15 +30,16 @@ SHEBANG_FILES= scripts/osm2pgsql-replication CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ EXTERNAL_LIBOSMIUM \ EXTERNAL_PROTOZERO \ - EXTERNAL_CLI11 -# EXTERNAL_FMT # XXX: does not build with libfmt from ports, so use bundled version until upstream fixes + EXTERNAL_CLI11 \ + EXTERNAL_FMT CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * -OPTIONS_DEFINE= DOCS LUAJIT TEST # GEN (utility built with this option is not installed) +OPTIONS_DEFINE= DOCS LUAJIT TEST GEN OPTIONS_DEFAULT=GEN +OPTIONS_SUB= yes LUAJIT_DESC= Build with LuaJIT support LUAJIT_CMAKE_BOOL= WITH_LUAJIT @@ -49,15 +50,16 @@ 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} -#GEN_DESC= Build experimental osm2pgsql-gen data generalization utility -#GEN_LIB_DEPENDS= libpotrace.so:graphics/libpotrace \ - #libopencv_core.so:graphics/opencv +GEN_DESC= Build experimental osm2pgsql-gen data generalization utility +GEN_LIB_DEPENDS= libpotrace.so:graphics/libpotrace \ + libopencv_core.so:graphics/opencv #GEN_CMAKE_BOOL= BUILD_GEN post-patch: @${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \ ${WRKSRC}/CMakeLists.txt -# for post-patch-GEN-off: when GEN option is implemented + +post-patch-GEN-off: @${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \ ${WRKSRC}/CMakeLists.txt diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 83797661408e..566ab40abb56 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1758190034 -SHA256 (openstreetmap-osm2pgsql-2.2.0_GH0.tar.gz) = 567dad078f8a66d6d706ac1876b5251b688109d16974909d89ce2056d6e9f258 -SIZE (openstreetmap-osm2pgsql-2.2.0_GH0.tar.gz) = 2729137 +TIMESTAMP = 1781115368 +SHA256 (openstreetmap-osm2pgsql-2.3.0_GH0.tar.gz) = 334c19fd58140e48216ec842fd63d7a978c7a2aea034858c2a62f32ad9e94c06 +SIZE (openstreetmap-osm2pgsql-2.3.0_GH0.tar.gz) = 2854813 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt deleted file mode 100644 index a51af717ff99..000000000000 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- CMakeLists.txt.orig 2024-09-19 13:10:47 UTC -+++ CMakeLists.txt -@@ -28,6 +28,7 @@ option(BUILD_COVERAGE "Build with coverage" OFF) - - option(BUILD_TESTS "Build test suite" OFF) - option(BUILD_COVERAGE "Build with coverage" OFF) -+option(BUILD_GEN "Build osm2pgsql-gen" OFF) - option(WITH_LUAJIT "Build with LuaJIT support" OFF) - option(WITH_PROJ "Build with Projection support" ON) - -@@ -253,7 +254,6 @@ else() - message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.") - else() - message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.") -- set(BUILD_GEN 1) - include_directories(SYSTEM ${POTRACE_INCLUDE_DIR}) - add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp - src/gen/canvas.cpp diff --git a/converters/osm2pgsql/pkg-plist b/converters/osm2pgsql/pkg-plist index 040cb3369780..abd60b0f6576 100644 --- a/converters/osm2pgsql/pkg-plist +++ b/converters/osm2pgsql/pkg-plist @@ -1,4 +1,8 @@ +%%GEN%%bin/osm2pgsql-gen bin/osm2pgsql +bin/osm2pgsql-expire bin/osm2pgsql-replication share/man/man1/osm2pgsql.1.gz +%%GEN%%share/man/man1/osm2pgsql-gen.1.gz share/man/man1/osm2pgsql-replication.1.gz +share/man/man1/osm2pgsql-test-style.1.gz