Attachment #193914 for bug #228676

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2		2
3	PORTNAME= osm2pgrouting	3	PORTNAME= osm2pgrouting
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.3.3	5	DISTVERSION= 2.3.5
6	PORTREVISION= 2
7	CATEGORIES= converters databases geography	6	CATEGORIES= converters databases geography
8		7
9	MAINTAINER= lbartoletti@tuxfamily.org	8	MAINTAINER= lbartoletti@tuxfamily.org

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1513628294	1	TIMESTAMP = 1527941203
2	SHA256 (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = ea58d3b2dd0164cf85dfa66044ce1ea2af3080bee2c16ad6f115aa84aa23ba0f	2	SHA256 (pgRouting-osm2pgrouting-v2.3.5_GH0.tar.gz) = 1d26a92d771d83f044f481989c8c422a0e1579d53d08387c367c9efd1ae605f7
3	SIZE (pgRouting-osm2pgrouting-v2.3.3_GH0.tar.gz) = 181159	3	SIZE (pgRouting-osm2pgrouting-v2.3.5_GH0.tar.gz) = 182153




--- 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} )




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

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

Return to bug 228676

Lines 1-29 Link Here

(-)files/patch-CMakeLists.txt (-29 lines)
1	--- CMakeLists.txt.orig 2017-12-18 15:44:24 UTC
2	+++ CMakeLists.txt
3	@@ -106,7 +106,7 @@ TARGET_LINK_LIBRARIES(osm2pgrouting
4	)
5
6	INSTALL(TARGETS osm2pgrouting
7	- RUNTIME DESTINATION "/usr/bin"
8	+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
9	)
10
11	if(WIN32)
12	@@ -114,13 +114,15 @@ if(WIN32)
13	endif()
14
15	INSTALL(FILES
16	- "${CMAKE_SOURCE_DIR}/COPYING"
17	"${CMAKE_SOURCE_DIR}/Readme.md"
18	+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting")
19	+
20	+INSTALL(FILES
21	"${CMAKE_SOURCE_DIR}/mapconfig.xml"
22	"${CMAKE_SOURCE_DIR}/mapconfig_for_cars.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} )

Lines 1-17 Link Here

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

Lines 1-18 Link Here

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