Attachment #187188 for bug #221810




# Created by: Loïc Bartoletti <lbartoletti@tuxfamily.org>
# $FreeBSD$

PORTNAME=	osm2pgrouting
DISTVERSIONPREFIX=	v
DISTVERSION=	2.3.1
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

USE_GITHUB=	yes
USES=		cmake pgsql compiler:c++11-lang
WANT_PGSQL=	client
GH_ACCOUNT=	pgRouting

post-patch:
	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
		${WRKSRC}/CMakeLists.txt \
		${WRKSRC}/Readme.md \
		${WRKSRC}/src/utilities/prog_options.cpp
.include <bsd.port.mk>
native
FreeBSD=%H
text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/distinfo (+6 lines)
	1	TIMESTAMP = 1508051085
	2	SHA256 (pgRouting-osm2pgrouting-v2.3.1_GH0.tar.gz) = a5923636a275c12b8bc7835e12028690a58f69e27d8adf3059387c2f42edf535
	3	SIZE (pgRouting-osm2pgrouting-v2.3.1_GH0.tar.gz) = 163986
	4	yes
	5	native
	6	text/plain




--- CMakeLists.txt.orig	2016-11-04 17:06:42 UTC
+++ CMakeLists.txt
@@ -36,7 +36,7 @@ ADD_EXECUTABLE(osm2pgrouting ${SRC})
 TARGET_LINK_LIBRARIES(osm2pgrouting ${POSTGRESQL_LIBRARIES} ${EXPAT_LIBRARIES} ${Boost_LIBRARIES} )
 
 INSTALL(TARGETS osm2pgrouting
-    RUNTIME DESTINATION "/usr/bin"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
     )
 
 INSTALL(FILES
yes
native
text/plain




--- include/parser/ConfigurationParserCallback.h.orig	2017-10-15 07:23:03 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"
yes
native
text/plain




--- include/parser/OSMDocumentParserCallback.h.orig	2017-10-15 07:23:50 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"
yes
native
text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/pkg-descr (+7 lines)
	1	Easily import OpenStreetMap data into a pgRouting database using osm2pgrouting t
	2	ool.
	3
	4	WWW: http://pgrouting.org/docs/tools/osm2pgrouting.html
	5	yes
	6	native
	7	text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/pkg-plist (+10 lines)
	1	bin/osm2pgrouting
	2	%%DATADIR%%/COPYING
	3	%%DATADIR%%/Readme.md
	4	%%DATADIR%%/mapconfig.xml
	5	%%DATADIR%%/mapconfig_for_bicycles.xml
	6	%%DATADIR%%/mapconfig_for_cars.xml
	7	%%DATADIR%%/mapconfig_for_pedestrian.xml
	8	yes
	9	native
	10	text/plain

Return to bug 221810

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/Makefile (+32 lines)
	1	# Created by: Loïc Bartoletti <lbartoletti@tuxfamily.org>
	2	# $FreeBSD$
	3
	4	PORTNAME= osm2pgrouting
	5	DISTVERSIONPREFIX= v
	6	DISTVERSION= 2.3.1
	7	CATEGORIES= converters databases geography
	8
	9	MAINTAINER= lbartoletti@tuxfamily.org
	10	COMMENT= Import OSM data into pgRouting Database
	11
	12	LICENSE= GPLv2
	13	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
	14
	15	LIB_DEPENDS= libboost_system.so:devel/boost-libs \
	16	libexpat.so:textproc/expat2 \
	17	libpqxx.so:databases/postgresql-libpqxx
	18
	19	USE_GITHUB= yes
	20	USES= cmake pgsql compiler:c++11-lang
	21	WANT_PGSQL= client
	22	GH_ACCOUNT= pgRouting
	23
	24	post-patch:
	25	@${REINPLACE_CMD} -e 's\|/usr/share\|${LOCALBASE}/share\|g' \
	26	${WRKSRC}/CMakeLists.txt \
	27	${WRKSRC}/Readme.md \
	28	${WRKSRC}/src/utilities/prog_options.cpp
	29	.include <bsd.port.mk>
	30	native
	31	FreeBSD=%H
	32	text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/files/patch-CMakeLists.txt (+14 lines)
	1	--- CMakeLists.txt.orig 2016-11-04 17:06:42 UTC
	2	+++ CMakeLists.txt
	3	@@ -36,7 +36,7 @@ ADD_EXECUTABLE(osm2pgrouting ${SRC})
	4	TARGET_LINK_LIBRARIES(osm2pgrouting ${POSTGRESQL_LIBRARIES} ${EXPAT_LIBRARIES} ${Boost_LIBRARIES} )
	5
	6	INSTALL(TARGETS osm2pgrouting
	7	- RUNTIME DESTINATION "/usr/bin"
	8	+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"
	9	)
	10
	11	INSTALL(FILES
	12	yes
	13	native
	14	text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/files/patch-include_parser_ConfigurationParserCallback.h (+20 lines)
	1	--- include/parser/ConfigurationParserCallback.h.orig 2017-10-15 07:23:03 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"
	18	yes
	19	native
	20	text/plain

Line 0 Link Here

(-)/usr/local/poudriere/ports/default/converters/osm2pgrouting/files/patch-include_parser_OSMDocumentParserCallback.h (+21 lines)
	1	--- include/parser/OSMDocumentParserCallback.h.orig 2017-10-15 07:23:50 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"
	19	yes
	20	native
	21	text/plain