Attachment #201014 for bug #228676





PORTNAME=	osm2pgrouting
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.6
PORTREVISION=	6
CATEGORIES=	converters databases geography

MAINTAINER=	lbartoletti@tuxfamily.org

USES=		cmake 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/${PORTNAME}/mapconfig.xml|' \
		${WRKSRC}/src/utilities/prog_options.cpp \
		${WRKSRC}/Readme.md

post-install:
	@for cf in ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/*.xml; do \
		${MV} $${cf} $${cf}.sample; \
	done


Lines 1-3 Link Here

(-)converters/osm2pgrouting/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1513628294	1	TIMESTAMP = 1547161773
2	SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f	2	SHA256 (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = c4b1f45ff7a9a184956182e40016fdd9455718821adb25822e2ef8182d2712a6
3	SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159	3	SIZE (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = 182168




--- CMakeLists.txt.orig	2019-01-11 07:48:53 UTC
+++ CMakeLists.txt
@@ -8,7 +8,7 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} 
 endif()
 
 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")
     )
 
 FIND_PACKAGE(PostgreSQL REQUIRED)
 find_package(LibPQXX REQUIRED)
@@ -114,8 +114,10 @@ if(WIN32)
 endif()
 
 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} )




--- 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"




--- 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"

Lines 1-5 Link Here

(-)converters/osm2pgrouting/pkg-plist (-4 / +4 lines)
1	bin/osm2pgrouting	1	bin/osm2pgrouting
2	@sample etc/mapconfig.xml.sample	2	@sample %%ETCDIR%%/mapconfig.xml.sample
3	@sample etc/mapconfig_for_bicycles.xml.sample	3	@sample %%ETCDIR%%/mapconfig_for_bicycles.xml.sample
4	@sample etc/mapconfig_for_cars.xml.sample	4	@sample %%ETCDIR%%/mapconfig_for_cars.xml.sample
5	@sample etc/mapconfig_for_pedestrian.xml.sample	5	@sample %%ETCDIR%%/mapconfig_for_pedestrian.xml.sample

Return to bug 228676

Lines 2-9 Link Here

(-)converters/osm2pgrouting/Makefile (-4 / +4 lines)
2		2
3	PORTNAME= osm2pgrouting	3	PORTNAME= osm2pgrouting
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.3.3	5	DISTVERSION= 2.3.6
6	PORTREVISION= 6
7	CATEGORIES= converters databases geography	6	CATEGORIES= converters databases geography
8		7
9	MAINTAINER= lbartoletti@tuxfamily.org	8	MAINTAINER= lbartoletti@tuxfamily.org
Lines 19-24 LIB_DEPENDS= libboost_system.so:devel/boost-libs \ Link Here
19	USES= cmake compiler:c++11-lang pgsql	18	USES= cmake compiler:c++11-lang pgsql
20	USE_GITHUB= yes	19	USE_GITHUB= yes
21	GH_ACCOUNT= pgRouting	20	GH_ACCOUNT= pgRouting
		21
22	WANT_PGSQL= client	22	WANT_PGSQL= client
23		23
24	OPTIONS_DEFINE= DOCS	24	OPTIONS_DEFINE= DOCS
Lines 26-37 OPTIONS_DEFINE= DOCS Link Here
26	PORTDOCS= Readme.md	26	PORTDOCS= Readme.md
27		27
28	post-patch:	28	post-patch:
29	@${REINPLACE_CMD} -e 's\|/usr/share/osm2pgrouting/mapconfig.xml\|${PREFIX}/etc/mapconfig.xml\|' \	29	@${REINPLACE_CMD} -e 's\|/usr/share/osm2pgrouting/mapconfig.xml\|${PREFIX}/etc/${PORTNAME}/mapconfig.xml\|' \
30	${WRKSRC}/src/utilities/prog_options.cpp \	30	${WRKSRC}/src/utilities/prog_options.cpp \
31	${WRKSRC}/Readme.md	31	${WRKSRC}/Readme.md
32		32
33	post-install:	33	post-install:
34	@for cf in ${STAGEDIR}${PREFIX}/etc/*.xml; do \	34	@for cf in ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/*.xml; do \
35	${MV} $${cf} $${cf}.sample; \	35	${MV} $${cf} $${cf}.sample; \
36	done	36	done
37		37

Lines 1-15 Link Here

(-)converters/osm2pgrouting/files/patch-CMakeLists.txt (-15 / +9 lines)
1	--- CMakeLists.txt.orig 2017-12-18 15:44:24 UTC	1	--- CMakeLists.txt.orig 2019-01-11 07:48:53 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting	3	@@ -8,7 +8,7 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}
4	)	4	endif()
5		5
6	INSTALL(TARGETS osm2pgrouting	6	LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
7	- RUNTIME DESTINATION "/usr/bin"	7	-SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
8	+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"	8	+SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting")
9	)
10		9
11	if(WIN32)	10	FIND_PACKAGE(PostgreSQL REQUIRED)
12	@@ -114,13 +114,15 @@ if(WIN32)	11	find_package(LibPQXX REQUIRED)
		12	@@ -114,8 +114,10 @@ if(WIN32)
13	endif()	13	endif()
14		14
15	INSTALL(FILES	15	INSTALL(FILES
Lines 21-29 Link Here
21	"${CMAKE_SOURCE_DIR}/mapconfig.xml"	21	"${CMAKE_SOURCE_DIR}/mapconfig.xml"
22	"${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"	22	"${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml"
23	"${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"	23	"${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml"
24	"${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml"
25	- DESTINATION "${SHARE_DIR}")
26	+ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc")
27
28
29	#INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )

Removed Link Here

(-)converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h (-17 lines)
1	--- include/parser/ConfigurationParserCallback.h.orig 2017-12-18 15:44:24 UTC
2	+++ include/parser/ConfigurationParserCallback.h
3	@@ -22,12 +22,13 @@
4	#ifndef SRC_CONFIGURATIONPARSERCALLBACK_H_
5	#define SRC_CONFIGURATIONPARSERCALLBACK_H_
6	#pragma once
7	-
8	+/*
9	#if __GNUC__ > 4 \|\| \
10	(__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
11	#else
12	#define nullptr NULL
13	#endif
14	+*/
15
16	#include <string.h>
17	#include "XMLParser.h"

Removed Link Here

(-)converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h (-18 lines)
1	--- include/parser/OSMDocumentParserCallback.h.orig 2017-12-18 15:44:24 UTC
2	+++ include/parser/OSMDocumentParserCallback.h
3	@@ -22,13 +22,13 @@
4	#ifndef SRC_OSMDOCUMENTPARSERCALLBACK_H_
5	#define SRC_OSMDOCUMENTPARSERCALLBACK_H_
6	#pragma once
7	-
8	+/*
9	#if __GNUC__ > 4 \|\| \
10	(__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))
11	#else
12	#define nullptr NULL
13	#endif
14	-
15	+*/
16
17	#include <string.h>
18	#include "./XMLParser.h"