svn commit: r490380 - in head/converters/osm2pgrouting: . files
Steve Wills
swills at FreeBSD.org
Tue Jan 15 14:36:58 UTC 2019
Author: swills
Date: Tue Jan 15 14:36:57 2019
New Revision: 490380
URL: https://svnweb.freebsd.org/changeset/ports/490380
Log:
converters/osm2pgrouting: update to 2.3.6
PR: 228676
Submitted by: lbartoletti <lbartoletti at tuxfamily.org> (maintainer)
Deleted:
head/converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h
head/converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h
Modified:
head/converters/osm2pgrouting/Makefile (contents, props changed)
head/converters/osm2pgrouting/distinfo (contents, props changed)
head/converters/osm2pgrouting/files/patch-CMakeLists.txt (contents, props changed)
head/converters/osm2pgrouting/pkg-plist (contents, props changed)
Modified: head/converters/osm2pgrouting/Makefile
==============================================================================
--- head/converters/osm2pgrouting/Makefile Tue Jan 15 14:34:30 2019 (r490379)
+++ head/converters/osm2pgrouting/Makefile Tue Jan 15 14:36:57 2019 (r490380)
@@ -2,8 +2,7 @@
PORTNAME= osm2pgrouting
DISTVERSIONPREFIX= v
-DISTVERSION= 2.3.3
-PORTREVISION= 6
+DISTVERSION= 2.3.6
CATEGORIES= converters databases geography
MAINTAINER= lbartoletti at 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
Modified: head/converters/osm2pgrouting/distinfo
==============================================================================
--- head/converters/osm2pgrouting/distinfo Tue Jan 15 14:34:30 2019 (r490379)
+++ head/converters/osm2pgrouting/distinfo Tue Jan 15 14:36:57 2019 (r490380)
@@ -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
Modified: head/converters/osm2pgrouting/files/patch-CMakeLists.txt
==============================================================================
--- head/converters/osm2pgrouting/files/patch-CMakeLists.txt Tue Jan 15 14:34:30 2019 (r490379)
+++ head/converters/osm2pgrouting/files/patch-CMakeLists.txt Tue Jan 15 14:36:57 2019 (r490380)
@@ -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} )
Modified: head/converters/osm2pgrouting/pkg-plist
==============================================================================
--- head/converters/osm2pgrouting/pkg-plist Tue Jan 15 14:34:30 2019 (r490379)
+++ head/converters/osm2pgrouting/pkg-plist Tue Jan 15 14:36:57 2019 (r490380)
@@ -1,5 +1,5 @@
bin/osm2pgrouting
- at sample etc/mapconfig.xml.sample
- at sample etc/mapconfig_for_bicycles.xml.sample
- at sample etc/mapconfig_for_cars.xml.sample
- at sample etc/mapconfig_for_pedestrian.xml.sample
+ at sample %%ETCDIR%%/mapconfig.xml.sample
+ at sample %%ETCDIR%%/mapconfig_for_bicycles.xml.sample
+ at sample %%ETCDIR%%/mapconfig_for_cars.xml.sample
+ at sample %%ETCDIR%%/mapconfig_for_pedestrian.xml.sample
More information about the svn-ports-head
mailing list