From owner-svn-ports-head@freebsd.org Mon Jan 15 23:30:35 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82CBCE7ECE0; Mon, 15 Jan 2018 23:30:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5D61075BE2; Mon, 15 Jan 2018 23:30:35 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C77217ED1; Mon, 15 Jan 2018 23:30:34 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0FNUYFC023896; Mon, 15 Jan 2018 23:30:34 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0FNUXWB023887; Mon, 15 Jan 2018 23:30:33 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201801152330.w0FNUXWB023887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 15 Jan 2018 23:30:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459138 - in head/converters: . osm2pgrouting osm2pgrouting/files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/converters: . osm2pgrouting osm2pgrouting/files X-SVN-Commit-Revision: 459138 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jan 2018 23:30:35 -0000 Author: yuri Date: Mon Jan 15 23:30:33 2018 New Revision: 459138 URL: https://svnweb.freebsd.org/changeset/ports/459138 Log: New port: converters/osm2pgrouting: Import OSM data into pgRouting database PR: 221810 Submitted by: lbartoletti Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13882 Added: head/converters/osm2pgrouting/ head/converters/osm2pgrouting/Makefile (contents, props changed) head/converters/osm2pgrouting/distinfo (contents, props changed) head/converters/osm2pgrouting/files/ head/converters/osm2pgrouting/files/patch-CMakeLists.txt (contents, props changed) head/converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h (contents, props changed) head/converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h (contents, props changed) head/converters/osm2pgrouting/pkg-descr (contents, props changed) head/converters/osm2pgrouting/pkg-plist (contents, props changed) Modified: head/converters/Makefile Modified: head/converters/Makefile ============================================================================== --- head/converters/Makefile Mon Jan 15 23:25:18 2018 (r459137) +++ head/converters/Makefile Mon Jan 15 23:30:33 2018 (r459138) @@ -59,6 +59,7 @@ SUBDIR += ocaml-base64 SUBDIR += ocaml-jsonm SUBDIR += osm2mp + SUBDIR += osm2pgrouting SUBDIR += osm2pgsql SUBDIR += p5-Bencode SUBDIR += p5-Boulder Added: head/converters/osm2pgrouting/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/Makefile Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= osm2pgrouting +DISTVERSIONPREFIX= v +DISTVERSION= 2.3.3 +CATEGORIES= converters databases geography + +MAINTAINER= lbartoletti@tuxfamily.org +COMMENT= Import OSM data into pgRouting database + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libexpat.so:textproc/expat2 \ + libpqxx.so:databases/postgresql-libpqxx + +USES= cmake:outsource compiler:c++11-lang pgsql +USE_GITHUB= yes +GH_ACCOUNT= pgRouting +WANT_PGSQL= client + +OPTIONS_DEFINE= DOCS + +PORTDOCS= Readme.md + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/mapconfig.xml|' \ + ${WRKSRC}/src/utilities/prog_options.cpp \ + ${WRKSRC}/Readme.md + +post-install: + @for cf in ${STAGEDIR}${PREFIX}/etc/*.xml; do \ + ${MV} $${cf} $${cf}.sample; \ + done + +.include Added: head/converters/osm2pgrouting/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/distinfo Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,3 @@ +TIMESTAMP = 1513628294 +SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f +SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159 Added: head/converters/osm2pgrouting/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/files/patch-CMakeLists.txt Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,29 @@ +--- CMakeLists.txt.orig 2017-12-18 15:44:24 UTC ++++ CMakeLists.txt +@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting + ) + + INSTALL(TARGETS osm2pgrouting +- RUNTIME DESTINATION "/usr/bin" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" + ) + + if(WIN32) +@@ -114,13 +114,15 @@ if(WIN32) + endif() + + INSTALL(FILES +- "${CMAKE_SOURCE_DIR}/COPYING" + "${CMAKE_SOURCE_DIR}/Readme.md" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting") ++ ++INSTALL(FILES + "${CMAKE_SOURCE_DIR}/mapconfig.xml" + "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml" + "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml" + "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml" +- DESTINATION "${SHARE_DIR}") ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc") + + + #INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} ) Added: head/converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,17 @@ +--- include/parser/ConfigurationParserCallback.h.orig 2017-12-18 15:44:24 UTC ++++ include/parser/ConfigurationParserCallback.h +@@ -22,12 +22,13 @@ + #ifndef SRC_CONFIGURATIONPARSERCALLBACK_H_ + #define SRC_CONFIGURATIONPARSERCALLBACK_H_ + #pragma once +- ++/* + #if __GNUC__ > 4 || \ + (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6)) + #else + #define nullptr NULL + #endif ++*/ + + #include + #include "XMLParser.h" Added: head/converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,18 @@ +--- include/parser/OSMDocumentParserCallback.h.orig 2017-12-18 15:44:24 UTC ++++ include/parser/OSMDocumentParserCallback.h +@@ -22,13 +22,13 @@ + #ifndef SRC_OSMDOCUMENTPARSERCALLBACK_H_ + #define SRC_OSMDOCUMENTPARSERCALLBACK_H_ + #pragma once +- ++/* + #if __GNUC__ > 4 || \ + (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6)) + #else + #define nullptr NULL + #endif +- ++*/ + + #include + #include "./XMLParser.h" Added: head/converters/osm2pgrouting/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/pkg-descr Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,10 @@ +osm2pgrouting tool makes it easy to import OpenStreetMap data and +use it with pgRouting. It creates topology automatically and creates +tables for feature types and road classes. + +Features: +* Uses XML configuration file to select road types and classes to import. +* Creates types and classes tables, which can help to create sophisticated + cost functions. + +WWW: http://pgrouting.org/docs/tools/osm2pgrouting.html Added: head/converters/osm2pgrouting/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/osm2pgrouting/pkg-plist Mon Jan 15 23:30:33 2018 (r459138) @@ -0,0 +1,5 @@ +bin/osm2pgrouting +@sample etc/mapconfig.xml.sample +@sample etc/mapconfig_for_bicycles.xml.sample +@sample etc/mapconfig_for_cars.xml.sample +@sample etc/mapconfig_for_pedestrian.xml.sample