From nobody Thu Sep 19 20:27:15 2024 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 4X8nBC1qVbz5XLh9; Thu, 19 Sep 2024 20:27:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X8nBC1NBYz4fVD; Thu, 19 Sep 2024 20:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726777635; 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=BJ0Kd3TBn0oR6dMYpg2xYhtzYepvkbVCvH7GP2qbh1A=; b=riv3H8U4mnRLRny+H6DZblpoqszC4zcEwj/QWsD2Z/9EP88p01JIAZfl9wGSWr4s+ZZSQ/ XGmeLvIDZusm75f08PNAzzx6WnQAXZhKwZasp+23OF5TmDw9LILzzcXputHpLHBOLpqjS2 sNp06/JqQihVo/PlYBujI73Pq52AX4QSzm+iuXD70Rtzz6F0ybCTnHHIf/xqs4rgz2Vvu9 XXcvk0yG3xQLY8B3l11cd4CZcia3muEe6Le4Q45yrSbCgZIFkz/T9ALrlqQfFckKweKm8l VvOij1mEZLSwixyxB+P44O5Y1bbZX7ZaiF7swAkwFiVqspfbl9h+6/8IcO9waQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726777635; a=rsa-sha256; cv=none; b=gGJQGNX73sy59EpyhacKFZBS9d8opfyhp/ZzuGWuM/CKzfGL6z1gysh+pnwjamYWDaWsRp av51I8nhudVeEZbr0NNeHGf8tNvgNL0fJ6lYMjlpXSB97M3Ds5Myoe0/5m/Vf8cVMw11CZ PbKOr0lp62zCpJ8wEAZq1Bv21OCTyn/WvmCEH+fXeOYTGjrOgmqK0ZEYx0eqyROweDO+S+ qr4aVw3FsWtmriasoUEsTuRm6COZKE/wF414hzHs2Kb33880vRkMVg8k0Ao9z6jZooLIZo ktYa1KVXwnP/MLL7sKqYU/7A0M+6Ef/guCY/LjJjbZoeBTY4QSODQUdYRBby/A== 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=1726777635; 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=BJ0Kd3TBn0oR6dMYpg2xYhtzYepvkbVCvH7GP2qbh1A=; b=LC7RO63VExlxTIce+MKEvAcfB0Cm5TMGEwGx5BIhJ/y0TBnR5aSUFyo51MSNr6hES4NaH9 EqTdOWuxi7UPWn7xen9Nsp+LfXBsELYssCQA4+NIaqWMTg7hF6NcxjCHjUTphuwO0hBlU6 FbgqPAjTPZvABzEH5Jc5M90p1MsTy2zzdR0vQ5RNZZbbTOtmGD1CREzIrnfCNakNljIrTj /hzyQeYVN6b3xIHG2BEs0v9S/eCCpQjtASK5Au6nJDEnUG42j+O38KxsWzU28CyMcgOouB 2CK2xKnF2cje1JHYNCAE9Yp18SgAcKJoJT+3YEjSnguP0vNtxJh6jWbrJN57uQ== 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 4X8nBC0ztczL8T; Thu, 19 Sep 2024 20:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48JKRFqn053614; Thu, 19 Sep 2024 20:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JKRFEw053611; Thu, 19 Sep 2024 20:27:15 GMT (envelope-from git) Date: Thu, 19 Sep 2024 20:27:15 GMT Message-Id: <202409192027.48JKRFEw053611@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: 9188e28a24f3 - main - converters/osm2pgsql: update 1.11.0 =?utf-8?Q?=E2=86=92?= 2.0.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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 9188e28a24f3badd1cb872ddd46c2fdeac90b608 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9188e28a24f3badd1cb872ddd46c2fdeac90b608 commit 9188e28a24f3badd1cb872ddd46c2fdeac90b608 Author: Dmitry Marakasov AuthorDate: 2024-09-19 20:20:40 +0000 Commit: Dmitry Marakasov CommitDate: 2024-09-19 20:22:20 +0000 converters/osm2pgsql: update 1.11.0 → 2.0.0 --- converters/osm2pgsql/Makefile | 7 +++---- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 22 +++++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 8d0253f6c20b..478b01eaf2e9 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.11.0 -PORTREVISION= 2 +PORTVERSION= 2.0.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -16,12 +15,12 @@ NOT_FOR_ARCHS= armv7 i386 powerpc NOT_FOR_ARCHS_REASON= needs a 64 bit architecture LIB_DEPENDS= libproj.so:graphics/proj \ - libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 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/CLI/Version.hpp:devel/cli11 \ + ${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs USES= cmake compiler:c++17-lang pgsql python:run shebangfix USE_GITHUB= yes diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index d9f27f95afc8..a43023cf98cc 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709050981 -SHA256 (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 6b46313813b816f15ce906c04cd4108bbb05362740e0a1a8889055f4e25977d2 -SIZE (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 2722008 +TIMESTAMP = 1726776348 +SHA256 (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 +SIZE (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 2712209 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt index 0e047aebe443..a51af717ff99 100644 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ b/converters/osm2pgsql/files/patch-CMakeLists.txt @@ -1,18 +1,18 @@ ---- CMakeLists.txt.orig 2023-11-07 15:25:19 UTC +--- CMakeLists.txt.orig 2024-09-19 13:10:47 UTC +++ CMakeLists.txt -@@ -28,6 +28,7 @@ endif() +@@ -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 gen" OFF) - option(WITH_LUA "Build with Lua support" ON) ++option(BUILD_GEN "Build osm2pgsql-gen" OFF) option(WITH_LUAJIT "Build with LuaJIT support" OFF) + option(WITH_PROJ "Build with Projection support" ON) -@@ -289,7 +290,6 @@ if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFO +@@ -253,7 +254,6 @@ else() + message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.") else() - if (WITH_LUA) - 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 + 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