sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

converters/osm2pgrouting: update to 2.3.6

Browse source 
PR:		228676
Submitted by:	lbartoletti <lbartoletti@tuxfamily.org> (maintainer)
This commit is contained in:
Steve Wills 2019-01-15 14:36:57 +00:00
parent 9c18819e3e
commit c4b2a2e7dc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490380
6 changed files with 20 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
converters/osm2pgrouting/Makefile
View file

@ -2,8 +2,7 @@
PORTNAME= osm2pgrouting
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.3
PORTREVISION= 6
DISTVERSION= 2.3.6
CATEGORIES= converters databases geography
MAINTAINER= lbartoletti@tuxfamily.org
@ -19,6 +18,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
USES= cmake compiler:c++11-lang pgsql
USE_GITHUB= yes
GH_ACCOUNT= pgRouting
WANT_PGSQL= client
OPTIONS_DEFINE= DOCS
@ -26,12 +26,12 @@ OPTIONS_DEFINE= DOCS
PORTDOCS= Readme.md
post-patch:
@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/mapconfig.xml|' \
@${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/${PORTNAME}/mapconfig.xml|' \
${WRKSRC}/src/utilities/prog_options.cpp \
${WRKSRC}/Readme.md
post-install:
@for cf in ${STAGEDIR}${PREFIX}/etc/*.xml; do \
@for cf in ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/*.xml; do \
${MV} $${cf} $${cf}.sample; \
done

6
converters/osm2pgrouting/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1513628294
SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f
SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159
TIMESTAMP = 1547161773
SHA256 (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = c4b1f45ff7a9a184956182e40016fdd9455718821adb25822e2ef8182d2712a6
SIZE (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = 182168

24
converters/osm2pgrouting/files/patch-CMakeLists.txt
View file

@ -1,15 +1,15 @@
--- CMakeLists.txt.orig 2017-12-18 15:44:24 UTC
--- CMakeLists.txt.orig 2019-01-11 07:48:53 UTC
+++ CMakeLists.txt
@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting
)
@@ -8,7 +8,7 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}
endif()
INSTALL(TARGETS osm2pgrouting
- RUNTIME DESTINATION "/usr/bin"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
)
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
+SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting")
if(WIN32)
@@ -114,13 +114,15 @@ if(WIN32)
FIND_PACKAGE(PostgreSQL REQUIRED)
find_package(LibPQXX REQUIRED)
@@ -114,8 +114,10 @@ if(WIN32)
endif()
INSTALL(FILES
@ -21,9 +21,3 @@
"${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} )

17
converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h
View file

@ -1,17 +0,0 @@
--- 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 <string.h>
#include "XMLParser.h"

18
converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h
View file

@ -1,18 +0,0 @@
--- 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 <string.h>
#include "./XMLParser.h"

8
converters/osm2pgrouting/pkg-plist
View file

@ -1,5 +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
@sample %%ETCDIR%%/mapconfig.xml.sample
@sample %%ETCDIR%%/mapconfig_for_bicycles.xml.sample
@sample %%ETCDIR%%/mapconfig_for_cars.xml.sample
@sample %%ETCDIR%%/mapconfig_for_pedestrian.xml.sample