From nobody Tue Jan 31 16:13:19 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 4P5qpl6jSQz3bPjk; Tue, 31 Jan 2023 16:13:19 +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 4P5qpl5QnBz42gM; Tue, 31 Jan 2023 16:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675181599; 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=VyBwLn9TQ/WmzU079QHxFXfAZZOHZNSslxRlqekPiew=; b=MnOYU/G+fJV4pQzGM9g4Y/yG9ZBNzVxwuVhXOaL/ULnCv2TyxZsQ6PZrxrlkhPSXdExnxu 31TN6hkLreMqg/eKAbMdyLNdmAUs42RpsOeJYgk82rxShAODwqTiNhXkYThw8/0R+pGqgH BsX14DzLdSSkd3qCenY/IcLkJiCu7GIL3jAt2KYZCcEL/8fd72ypPv42OhoC8WIgOZm+Ub PyNYCYx+BdCjuk8qtBt8CbWAK5gN9piHGE+V6k3nAIuYCrV51oxrgq/mpyod1InUO2W3xy gmCum2LnOrOmGetlu+dH9TuaKqgM7aKvQDsmCAESiEB0YN+thuoxEE0PQtrhsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675181599; 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=VyBwLn9TQ/WmzU079QHxFXfAZZOHZNSslxRlqekPiew=; b=Y2Tfu+i4OKCJmq8NThGB6MpGdEwkbhXSIohrBJ6/BVP6ggpwYMFpxSDoibLchona/tdsTQ N1/iDb5+4Evq5Bp1tfF4ShRFfY1D9yjB2ylr27L9EDWQ6WZxMa2WZMKsR7WR3IAGlm5VLu DeBunkfZgmz+Nvpurd5zoulb3ocPpMjNVve0wuM/pkooxU28p8fzUHHSYZK2JSJChPZ+Gb QZIUlHtXauO9ROC72jf3BUhe2i/N9mag8/v4GTKto/69o7NaOM/WtYdRInviasI9v/9Q7O gWpWSVnwh0tuSYB+mX2zb5f/FlgFw7Vx65TxGTuFhoPwvXiUjHm2ZmdX9oF2xQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675181599; a=rsa-sha256; cv=none; b=DB1zaLHcRRds0ibA4aH0x72BciN5FyuNCGv6iX2BXC9SMD/r8rvBGbnCoK0jszw9R4K+Gk qgz+AuGMkdtwPinVrnH3ma38ux2bSIi3VejW+hdHBmuzQss2CCRLY+oPO0gEBuRGjrLxgx XofzWJA82LR6ZE39oAFzBgHtINjUaJzEIVvC94IS0rv6Sbm6TR9m/P88+dBj3FbsZ9KfD8 d3RnkSsDsLWCd6GjK/3QLt0LdbE8RW/jbKkkoRAgES+oiMwN67vkqxpww7WFGttYlX60tc eWwDg4eftXlbHUnBCahuM4NQLcdJlOXyhts/y07RNrDHOAQltvxNVTiudPLxfw== 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 4P5qpl4X4hzvjq; Tue, 31 Jan 2023 16:13:19 +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 30VGDJ89096687; Tue, 31 Jan 2023 16:13:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30VGDJNJ096686; Tue, 31 Jan 2023 16:13:19 GMT (envelope-from git) Date: Tue, 31 Jan 2023 16:13:19 GMT Message-Id: <202301311613.30VGDJNJ096686@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: 516b8d8c0193 - main - =?utf-8?Q?converters/osm2pgsql:=20update=201.7.2=20=E2=86=92=201.8.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: 516b8d8c01936125610f01ffa2390dad574c058f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=516b8d8c01936125610f01ffa2390dad574c058f commit 516b8d8c01936125610f01ffa2390dad574c058f Author: Dmitry Marakasov AuthorDate: 2023-01-30 14:45:14 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-31 16:12:51 +0000 converters/osm2pgsql: update 1.7.2 → 1.8.0 - Rapidjson dependency is no longer needed - Switch to USES=luajit --- converters/osm2pgsql/Makefile | 12 ++++-------- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 9c11d65179dc..ee88fbdbee33 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.7.2 -PORTREVISION= 3 +PORTVERSION= 1.8.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -16,8 +15,7 @@ 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/rapidjson/stringbuffer.h:devel/rapidjson + ${LOCALBASE}/include/protozero/version.hpp:devel/protozero USE_GITHUB= yes GH_ACCOUNT= openstreetmap @@ -26,8 +24,7 @@ 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_RAPIDJSON + EXTERNAL_PROTOZERO # EXTERNAL_FMT # XXX: does not build with libfmt 9.x from ports, so use bundled version until upstream fixes CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" @@ -38,8 +35,7 @@ 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= lua:54:build # just for running tests in fact +LUAJIT_USES= luajit lua:54:build # lua is needed just for running tests LUAJIT_USES_OFF= lua:54 TEST_CMAKE_BOOL= BUILD_TESTS TEST_TEST_TARGET= test diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index aefe25f14771..b1ccb6a123cc 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668181735 -SHA256 (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 94c72ceb3c401c816499339f8765c62efbf40685a798dcdf9a4bf7dbedf6c7a5 -SIZE (openstreetmap-osm2pgsql-1.7.2_GH0.tar.gz) = 2627913 +TIMESTAMP = 1675081473 +SHA256 (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = b266b50f46fe4d1caddab61d26b39f10ea33b896ec23b8b3e294be4666e7b927 +SIZE (openstreetmap-osm2pgsql-1.8.0_GH0.tar.gz) = 2544929 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt index d94e7ed7a4b7..85ffb9b888f4 100644 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ b/converters/osm2pgsql/files/patch-CMakeLists.txt @@ -13,8 +13,8 @@ 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} ${RAPIDJSON_INCLUDE_DIR}) -+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}) +-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)