From nobody Wed Nov 08 18:31:38 2023 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 4SQYZg1qjnz50nYg; Wed, 8 Nov 2023 18:31:39 +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 4SQYZg1C6nz3VdY; Wed, 8 Nov 2023 18:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699468299; 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=MBxm/DCOQ7gVSJ+gHZnG5qWeehlTWXo0sY+7jBxPOB4=; b=NLXe2E0CobeA2O1kTNAcpMqyUgBKmfLehrT0/e7zVQ3zdiBIa8XHqWjbylSIWmpVBMMkAK fZ4lQP0/gQG+c+ovDzVVrTwtdvXidwvDayaK5AyJE1xXCSYSIYE4Ck0vpMA2ZwOPcOTfYC HynOqOV7aWKjtLXS147kcL8WYPIqPJ0K1ACJMqjnbCcEs3Oki58Omn/Ro88QY/BXN9jEfL stKGeyRhFJtkkoo3XeWV0/sr06L1yZEKMPNbTpRasInOZ5lqglfMzKOvfuqs44H6YDyTkk /yZgqiBYk6KXFUeF/CFPqsEoLJhVH/lX0wsOSf9VgjS/dxzpwQlfuJj/n2RADQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699468299; 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=MBxm/DCOQ7gVSJ+gHZnG5qWeehlTWXo0sY+7jBxPOB4=; b=GOkGXme/AAbCzjCo+/sv9eKhYvXiGLQ6KmI87a7GWvpC0ZfjMFcfOrwfaK8yL3P1iZiHDM iY02qKMmUWzYYxj+eWsvyMZjDlz95MXhWUZ3oyzL7qj2+R8CaDyrkiO4AyBo4lXCqWlt1b N/3M3dEf9bQxIQnKmhAnNaTHalJpIHnbcOOhl05Tmw4Wyf6Yjn0+Oyizlm8EONeDd0SMgx E26rTZo3SXI2lvwzUUBH/cUb6nOTzBYu9XLupkedWXUgwB8aVvSxzFH4z46B9b57MBbFNu 0mCs/4xTUIfC6eSVDAagiZt6BDLTa81t34RWxIWgFY6ucWnQfTX254lZbFNtbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699468299; a=rsa-sha256; cv=none; b=wD99SgaOY1c65f5gU1P8qPJtqVjOGR7t3bVwqsxT5NVUyNvfOF4qOl2y3n9aoDrI4FnAYF yRdFhzmvpGXVp+APHvV7g8R+2FE/5IfNf4GJX0EUlIhv9olV8+zSW1HvAPDSTJKsoi8dv7 1KDrcYAsi9buFpzG9H+9BFX4M443+f8Ra/6kMieUB6/g7S0RBieTORmdXoh0W+28gGU3Xz nt2c4sLcFckliFSbWEGx+OxrPDCIDzsz5iVTX7dD+Wx7fPeu00tRX9j5RvIQT+GxBgSVqW HyELkjn7Po1JvevHd0Lw0oZ+GmnZpqmWDVjWtfoK8vwCV/09YZvLxBM+m4AUFw== 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 4SQYZg09YKzk3k; Wed, 8 Nov 2023 18:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A8IVcDl059774; Wed, 8 Nov 2023 18:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8IVcQ9059771; Wed, 8 Nov 2023 18:31:38 GMT (envelope-from git) Date: Wed, 8 Nov 2023 18:31:38 GMT Message-Id: <202311081831.3A8IVcQ9059771@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: 82b6b39e700e - main - converters/osm2pgsql: update 1.9.2 =?utf-8?Q?=E2=86=92?= 1.10.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: 82b6b39e700ed5dd04873d4397f9760727384d2d Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=82b6b39e700ed5dd04873d4397f9760727384d2d commit 82b6b39e700ed5dd04873d4397f9760727384d2d Author: Dmitry Marakasov AuthorDate: 2023-11-07 18:46:06 +0000 Commit: Dmitry Marakasov CommitDate: 2023-11-08 18:31:09 +0000 converters/osm2pgsql: update 1.9.2 → 1.10.0 --- converters/osm2pgsql/Makefile | 17 +++++++------ converters/osm2pgsql/distinfo | 6 ++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 32 ++++++++++++------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 545840c08d89..fbb44e85d7fa 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTVERSION= 1.10.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -12,6 +11,9 @@ WWW= https://osm2pgsql.org/ \ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +NOT_FOR_ARCHS= i386 +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 @@ -19,10 +21,9 @@ BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json +USES= cmake compiler:c++17-lang pgsql python:run shebangfix USE_GITHUB= yes GH_ACCOUNT= openstreetmap - -USES= cmake compiler:c++17-lang pgsql python:run shebangfix SHEBANG_FILES= scripts/osm2pgsql-replication CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Git \ EXTERNAL_LIBOSMIUM \ @@ -34,6 +35,7 @@ PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * OPTIONS_DEFINE= DOCS LUAJIT TEST # GEN (utility built with this option is not installed) +OPTIONS_DEFAULT=GEN LUAJIT_DESC= Build with LuaJIT support LUAJIT_CMAKE_BOOL= WITH_LUAJIT @@ -45,14 +47,15 @@ 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 -#GEN_BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg +#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 - @${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|CImg),no&,' \ + @${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \ ${WRKSRC}/CMakeLists.txt post-install-DOCS-on: diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index a774ca8c7ab2..438317a122a6 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1694017795 -SHA256 (openstreetmap-osm2pgsql-1.9.2_GH0.tar.gz) = dc30a3ad9a27f944e4169be9a8e07ee09711901536ddc8fcf4a292bd3aec51d9 -SIZE (openstreetmap-osm2pgsql-1.9.2_GH0.tar.gz) = 2598971 +TIMESTAMP = 1699378317 +SHA256 (openstreetmap-osm2pgsql-1.10.0_GH0.tar.gz) = 33849d8edacbca5ab5492fed32ac954de14f92ab6b3028c03ef88bb7ab596d20 +SIZE (openstreetmap-osm2pgsql-1.10.0_GH0.tar.gz) = 2599615 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt index 85ffb9b888f4..0e047aebe443 100644 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ b/converters/osm2pgsql/files/patch-CMakeLists.txt @@ -1,20 +1,18 @@ ---- CMakeLists.txt.orig 2022-11-10 19:15:49 UTC +--- CMakeLists.txt.orig 2023-11-07 15:25:19 UTC +++ CMakeLists.txt -@@ -173,7 +173,7 @@ if (NOT EXTERNAL_PROTOZERO) - endif() +@@ -28,6 +28,7 @@ endif() - if (NOT EXTERNAL_FMT) -- set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include") -+ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include") - endif() + 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(WITH_LUAJIT "Build with LuaJIT support" OFF) - if (NOT EXTERNAL_RAPIDJSON) -@@ -183,7 +183,7 @@ endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}) - - find_package(Osmium 2.17.3 REQUIRED COMPONENTS io) --include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR}) -+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR}) - - if (WITH_LUA) - if (WITH_LUAJIT) +@@ -289,7 +290,6 @@ if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFO + 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