Attachment #169793 for bug #209137




# $FreeBSD$

PORTNAME=	pgrouting
PORTVERSION=	2.2.1
DISTVERSIONPREFIX=	v
PORTREVISION=	4
CATEGORIES=	databases geography

MAINTAINER=	coder@tuxfamily.org


LICENSE=	GPLv2

LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs\
		libCGAL.so:${PORTSDIR}/math/cgal \
		libgmp.so:${PORTSDIR}/math/gmp
RUN_DEPENDS=	${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:${PORTSDIR}/databases/postgis21

USES=		compiler:c++11-lib cmake pgsql:9.1+ pkgconfig
USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	pgRouting
GH_TAGNAME=	90b9901

CFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib


.include <bsd.port.pre.mk>

#.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
#BUILD_DEPENDS+=	clang36:${PORTSDIR}/lang/clang36
#CPP=		clang-cpp36
#CC=		clang36
#CXX=		clang++36
#CXXFLAGS+=	-std=c++11
#.endif

.if ${PGSQL_VER} >= 9.1
PLIST_SUB+=	OLDPG="@comment " NEWPG=""


post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension
.for f in pgrouting--2.0.0.sql pgrouting.control pgrouting_dd_legacy.sql \
	pgrouting--2.0.0.sql.in pgrouting.sql pgrouting_legacy.sql
	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/share/postgresql/extension/
.endfor

.else
PLIST_SUB+=	OLDPG="" NEWPG="@comment "
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (pgRouting-pgrouting-v2.0.0_GH0.tar.gz) = 606309e8ece04abec062522374b48179c16bddb30dd4c5080b89a4298e8d163b	1	SHA256 (pgRouting-pgrouting-2.2.1-90b9901_GH0.tar.gz) = da3b82fe7b7e83452f79efcd0cc0ce5d7242f211bfb2e3487e7be64efa8f238e
2	SIZE (pgRouting-pgrouting-v2.0.0_GH0.tar.gz) = 3765933	2	SIZE (pgRouting-pgrouting-2.2.1-90b9901_GH0.tar.gz) = 4373799




--- CMakeLists.txt.orig	2016-04-19 16:40:04 UTC
+++ CMakeLists.txt
@@ -224,20 +224,20 @@ if(APPLE)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -frounding-math -Wno-deprecated")
   else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -std=c++0x -g -Wno-deprecated")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -std=c++11 -g -Wno-deprecated")
   endif()
 
 elseif(UNIX) # UNIX system variable include UNIX like system(i.e. APPLE and CYGWIN)
     #set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -std=gnu99 -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10  -Wmissing-prototypes -frounding-math")
-    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10 -Wextra  -frounding-math -Wno-deprecated")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10 -Wextra  -frounding-math -Wno-deprecated")
 
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fPIC -O2 -g  -frounding-math")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -std=c++0x -frounding-math -Wno-deprecated")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -std=c++11 -frounding-math -Wno-deprecated")
 
 elseif(WIN32)
     # currently, support MinGW only
     set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -O2  -frounding-math")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2  -std=c++0x -frounding-math -Wno-deprecated")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2  -std=c++11 -frounding-math -Wno-deprecated")
 endif()
 
 # List variable to collect module SQL file names

Line 0 Link Here

(-)files/patch-src_trsp_src_GraphDefinition.cpp (+11 lines)
	1	--- src/trsp/src/GraphDefinition.cpp.orig 2016-04-28 19:58:27 UTC
	2	+++ src/trsp/src/GraphDefinition.cpp
	3	@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fi
	4	#include <windows.h>
	5	#endif
	6
	7	-
	8	+#include <cstdlib>
	9	#include <sstream>
	10	#include "GraphDefinition.h"
	11

Line 0 Link Here

(-)files/patch-src_trsp_src_trsp__core.cpp (+10 lines)
	1	--- src/trsp/src/trsp_core.cpp.orig 2016-04-28 19:43:44 UTC
	2	+++ src/trsp/src/trsp_core.cpp
	3	@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fi
	4	#include <windows.h>
	5	#endif
	6
	7	+#include <stdlib.h>
	8	#include <string.h>
	9	#include <sstream>
	10	#include "GraphDefinition.h"

Line 0 Link Here

(-)files/patch-src_tsp_src_tsplib.c (+10 lines)
	1	--- src/tsp/src/tsplib.c.orig 2016-04-28 19:50:17 UTC
	2	+++ src/tsp/src/tsplib.c
	3	@@ -85,6 +85,7 @@ THE SOFTWARE.
	4	//#include <winsock2.h>
	5	//#endif
	6	#include <postgres.h>
	7	+#include <stdlib.h>
	8	#include <string.h> /* memcpy */
	9	#include <math.h> /* exp */
	10




--- src/vrp_basic/src/VRP.h.orig	2016-04-19 16:40:04 UTC
+++ src/vrp_basic/src/VRP.h
@@ -70,7 +70,7 @@ typedef struct vrp_result_element
 
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
 #endif
 
 int find_vrp_solution(vrp_vehicles_t *vehicles, size_t vehicle_count, 
@@ -80,7 +80,7 @@ int find_vrp_solution(vrp_vehicles_t *ve
 					  vrp_result_element_t **result, size_t *result_count, char **err_msg);
 
 #ifdef __cplusplus
-extern "C"
+}
 #endif
 
 #endif




lib/postgresql/libpgrouting-2.2.so
share/postgresql/extension/pgrouting--2.0.0--2.2.1.sql
share/postgresql/extension/pgrouting--2.0.1--2.2.1.sql
share/postgresql/extension/pgrouting--2.1.0--2.2.1.sql
share/postgresql/extension/pgrouting--2.2.0--2.2.1.sql
share/postgresql/extension/pgrouting--2.2.1.sql
share/postgresql/extension/pgrouting.control

share/postgresql/contrib/pgrouting-2.0/pgrouting_legacy.sql
%%OLDPG%%share/postgresql/pgrouting--2.0.0.sql
%%OLDPG%%share/postgresql/pgrouting.control
%%OLDPG%%share/postgresql/pgrouting_dd_legacy.sql
%%OLDPG%%share/postgresql/pgrouting_legacy.sql
%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql
%%NEWPG%%share/postgresql/extension/pgrouting.control
%%NEWPG%%share/postgresql/extension/pgrouting_dd_legacy.sql
%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql.in
%%NEWPG%%share/postgresql/extension/pgrouting.sql
%%NEWPG%%share/postgresql/extension/pgrouting_legacy.sql

Return to bug 209137

Lines 2-10 Link Here

(-)Makefile (-29 / +14 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pgrouting	4	PORTNAME= pgrouting
5	PORTVERSION= 2.0.0	5	PORTVERSION= 2.2.1
6	DISTVERSIONPREFIX= v
7	PORTREVISION= 4
8	CATEGORIES= databases geography	6	CATEGORIES= databases geography
9		7
10	MAINTAINER= coder@tuxfamily.org	8	MAINTAINER= coder@tuxfamily.org
Lines 12-26 Link Here
12		10
13	LICENSE= GPLv2	11	LICENSE= GPLv2
14		12
15	LIB_DEPENDS= libboost_system.so:devel/boost-libs\	13	LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs\
16	libCGAL.so:math/cgal \	14	libCGAL.so:${PORTSDIR}/math/cgal \
17	libgmp.so:math/gmp	15	libgmp.so:${PORTSDIR}/math/gmp
18	RUN_DEPENDS= ${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:databases/postgis21	16	RUN_DEPENDS= ${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:${PORTSDIR}/databases/postgis21
19		17
20	USES= compiler:features cmake pgsql pkgconfig	18	USES= compiler:c++11-lib cmake pgsql:9.1+ pkgconfig
21	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
22	USE_GITHUB= yes	20	USE_GITHUB= yes
23	GH_ACCOUNT= pgRouting	21	GH_ACCOUNT= pgRouting
		22	GH_TAGNAME= 90b9901
24		23
25	CFLAGS+= -I${LOCALBASE}/include	24	CFLAGS+= -I${LOCALBASE}/include
26	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
Lines 27-52 Link Here
27		26
28	.include <bsd.port.pre.mk>	27	.include <bsd.port.pre.mk>
29		28
30	.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36	29	#.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
31	BUILD_DEPENDS+= clang36:lang/clang36	30	#BUILD_DEPENDS+= clang36:${PORTSDIR}/lang/clang36
32	CPP= clang-cpp36	31	#CPP= clang-cpp36
33	CC= clang36	32	#CC= clang36
34	CXX= clang++36	33	#CXX= clang++36
35	.endif	34	#CXXFLAGS+= -std=c++11
		35	#.endif
36		36
37	.if ${PGSQL_VER} >= 9.1
38	PLIST_SUB+= OLDPG="@comment " NEWPG=""
39
40
41	post-install:
42	@${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension
43	.for f in pgrouting--2.0.0.sql pgrouting.control pgrouting_dd_legacy.sql \
44	pgrouting--2.0.0.sql.in pgrouting.sql pgrouting_legacy.sql
45	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/share/postgresql/extension/
46	.endfor
47
48	.else
49	PLIST_SUB+= OLDPG="" NEWPG="@comment "
50	.endif
51
52	.include <bsd.port.post.mk>	37	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+27 lines)
	1	--- CMakeLists.txt.orig 2016-04-19 16:40:04 UTC
	2	+++ CMakeLists.txt
	3	@@ -224,20 +224,20 @@ if(APPLE)
	4	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
	5	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -frounding-math -Wno-deprecated")
	6	else()
	7	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -std=c++0x -g -Wno-deprecated")
	8	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -std=c++11 -g -Wno-deprecated")
	9	endif()
	10
	11	elseif(UNIX) # UNIX system variable include UNIX like system(i.e. APPLE and CYGWIN)
	12	#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10 -Wmissing-prototypes -frounding-math")
	13	- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10 -Wextra -frounding-math -Wno-deprecated")
	14	+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -O2 -g -Wall -Wconversion -pedantic -fmax-errors=10 -Wextra -frounding-math -Wno-deprecated")
	15
	16	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -O2 -g -frounding-math")
	17	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -std=c++0x -frounding-math -Wno-deprecated")
	18	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 -g -std=c++11 -frounding-math -Wno-deprecated")
	19
	20	elseif(WIN32)
	21	# currently, support MinGW only
	22	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -frounding-math")
	23	- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++0x -frounding-math -Wno-deprecated")
	24	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -std=c++11 -frounding-math -Wno-deprecated")
	25	endif()
	26
	27	# List variable to collect module SQL file names

Line 0 Link Here

(-)files/patch-src_vrp__basic_src_VRP.h (+20 lines)
	1	--- src/vrp_basic/src/VRP.h.orig 2016-04-19 16:40:04 UTC
	2	+++ src/vrp_basic/src/VRP.h
	3	@@ -70,7 +70,7 @@ typedef struct vrp_result_element
	4
	5
	6	#ifdef __cplusplus
	7	-extern "C"
	8	+extern "C" {
	9	#endif
	10
	11	int find_vrp_solution(vrp_vehicles_t *vehicles, size_t vehicle_count,
	12	@@ -80,7 +80,7 @@ int find_vrp_solution(vrp_vehicles_t *ve
	13	vrp_result_element_t *result, size_t result_count, char **err_msg);
	14
	15	#ifdef __cplusplus
	16	-extern "C"
	17	+}
	18	#endif
	19
	20	#endif

Lines 1-19 Link Here

(-)pkg-plist (-19 / +8 lines)
1	lib/postgresql/librouting.so	1	lib/postgresql/libpgrouting-2.2.so
2	lib/postgresql/librouting_bd.so	2	share/postgresql/extension/pgrouting--2.0.0--2.2.1.sql
3	lib/postgresql/librouting_dd.so	3	share/postgresql/extension/pgrouting--2.0.1--2.2.1.sql
4	lib/postgresql/librouting_ksp.so	4	share/postgresql/extension/pgrouting--2.1.0--2.2.1.sql
5	lib/postgresql/librouting_tsp.so	5	share/postgresql/extension/pgrouting--2.2.0--2.2.1.sql
6	share/postgresql/contrib/pgrouting-2.0/pgrouting.control	6	share/postgresql/extension/pgrouting--2.2.1.sql
7	share/postgresql/contrib/pgrouting-2.0/pgrouting.sql	7	share/postgresql/extension/pgrouting.control
8	share/postgresql/contrib/pgrouting-2.0/pgrouting_dd_legacy.sql	8
9	share/postgresql/contrib/pgrouting-2.0/pgrouting_legacy.sql
10	%%OLDPG%%share/postgresql/pgrouting--2.0.0.sql
11	%%OLDPG%%share/postgresql/pgrouting.control
12	%%OLDPG%%share/postgresql/pgrouting_dd_legacy.sql
13	%%OLDPG%%share/postgresql/pgrouting_legacy.sql
14	%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql
15	%%NEWPG%%share/postgresql/extension/pgrouting.control
16	%%NEWPG%%share/postgresql/extension/pgrouting_dd_legacy.sql
17	%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql.in
18	%%NEWPG%%share/postgresql/extension/pgrouting.sql
19	%%NEWPG%%share/postgresql/extension/pgrouting_legacy.sql