From owner-dev-commits-ports-main@freebsd.org Sun Jun 6 06:28:04 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 388A8657C99; Sun, 6 Jun 2021 06:28:04 +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 4FyRQD12Rvz3jPQ; Sun, 6 Jun 2021 06:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0B6AD1EB65; Sun, 6 Jun 2021 06:28:04 +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 1566S3dK009232; Sun, 6 Jun 2021 06:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1566S348009231; Sun, 6 Jun 2021 06:28:03 GMT (envelope-from git) Date: Sun, 6 Jun 2021 06:28:03 GMT Message-Id: <202106060628.1566S348009231@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?B?TG/Dr2MgQmFydG9sZXR0aQ==?= Subject: git: 7b972a701bc4 - main - converters/osm2pgrouting: Update to 2.3.8 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b972a701bc4535f6457b96e4a75e199e090c466 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2021 06:28:04 -0000 The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b972a701bc4535f6457b96e4a75e199e090c466 commit 7b972a701bc4535f6457b96e4a75e199e090c466 Author: Loïc Bartoletti AuthorDate: 2021-06-06 06:09:54 +0000 Commit: Loïc Bartoletti CommitDate: 2021-06-06 06:09:54 +0000 converters/osm2pgrouting: Update to 2.3.8 Changes: - https://github.com/pgRouting/osm2pgrouting/releases/tag/v2.3.8 --- converters/osm2pgrouting/Makefile | 2 +- converters/osm2pgrouting/distinfo | 6 ++-- .../osm2pgrouting/files/patch-CMakeLists.txt | 32 ++++------------------ .../patch-src_osm__elements_osm2pgrouting.cpp | 11 -------- 4 files changed, 10 insertions(+), 41 deletions(-) diff --git a/converters/osm2pgrouting/Makefile b/converters/osm2pgrouting/Makefile index 63b38db9d8e5..cad9e563cb9a 100644 --- a/converters/osm2pgrouting/Makefile +++ b/converters/osm2pgrouting/Makefile @@ -1,6 +1,6 @@ PORTNAME= osm2pgrouting DISTVERSIONPREFIX= v -DISTVERSION= 2.3.7 +DISTVERSION= 2.3.8 CATEGORIES= converters databases geography MAINTAINER= lbartoletti@FreeBSD.org diff --git a/converters/osm2pgrouting/distinfo b/converters/osm2pgrouting/distinfo index 35bd7c03a19d..a2c802ccd55e 100644 --- a/converters/osm2pgrouting/distinfo +++ b/converters/osm2pgrouting/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612377637 -SHA256 (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = afbe3ff74c9b9b7b1350362fc839e1466335d57f84941af19b5a663fd58aba0c -SIZE (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = 185875 +TIMESTAMP = 1622957337 +SHA256 (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = e3a58bcacf0c8811e0dcf3cf3791a4a7cc5ea2a901276133eacf227b30fd8355 +SIZE (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = 187051 diff --git a/converters/osm2pgrouting/files/patch-CMakeLists.txt b/converters/osm2pgrouting/files/patch-CMakeLists.txt index b4fab2a0f483..36b7e13b5684 100644 --- a/converters/osm2pgrouting/files/patch-CMakeLists.txt +++ b/converters/osm2pgrouting/files/patch-CMakeLists.txt @@ -1,36 +1,16 @@ ---- CMakeLists.txt.orig 2021-02-04 06:38:35 UTC +--- CMakeLists.txt.orig 2021-06-06 05:46:00 UTC +++ CMakeLists.txt -@@ -8,7 +8,8 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} - endif() +@@ -9,7 +9,8 @@ endif() + PROJECT(osm2pgrouting) LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting") +SET(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting") +SET(ETC_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting") - FIND_PACKAGE(PostgreSQL REQUIRED) - find_package(LibPQXX REQUIRED) -@@ -37,6 +38,7 @@ include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) - CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) - CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) -+CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION) - message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}! -@@ -50,7 +52,10 @@ else() - message(STATUS "Unknown compiler minimum version for ${CMAKE_CXX_COMPILER_ID}") - endif() - --if(COMPILER_SUPPORTS_CXX14) -+if(COMPILER_SUPPORTS_CXX17) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") -+ message(STATUS "Using -std=c++17.") -+elseif(COMPILER_SUPPORTS_CXX14) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - message(STATUS "Using -std=c++14.") - elseif(COMPILER_SUPPORTS_CXX11) -@@ -114,14 +119,15 @@ if(WIN32) + find_package(PostgreSQL REQUIRED) + find_package(PQXX REQUIRED) +@@ -92,14 +93,15 @@ if(WIN32) endif() INSTALL(FILES diff --git a/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp b/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp deleted file mode 100644 index bb451145328f..000000000000 --- a/converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/osm_elements/osm2pgrouting.cpp.orig 2020-08-20 05:44:56 UTC -+++ src/osm_elements/osm2pgrouting.cpp -@@ -140,7 +140,7 @@ int main(int argc, char* argv[]) { - cout << "Can't open database" << endl; - return 1; - } -- C.disconnect (); -+ C.close (); - }catch (const std::exception &e){ - cerr << e.what() << std::endl; - return 1;