Attachment #175251 for bug #213066

View | Details | Raw Unified | Return to bug 213066
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pgrouting	4	PORTNAME= pgrouting
5	PORTVERSION= 2.2.4	5	PORTVERSION= 2.3.0
6	DISTVERSIONPREFIX= ${PORTNAME}-	6	DISTVERSIONPREFIX= ${PORTNAME}-
7	CATEGORIES= databases geography	7	CATEGORIES= databases geography
8		8

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470845051	1	TIMESTAMP = 1474949998
2	SHA256 (pgRouting-pgrouting-pgrouting-2.2.4_GH0.tar.gz) = 34ccf2b1acd076ad7da92c0692a114d0b607b84771fdfd4e131246ef2c66bf84	2	SHA256 (pgRouting-pgrouting-pgrouting-2.3.0_GH0.tar.gz) = cadeed30bfc57f6e77bc48a10301b26e5d71d8e86f366ed60ab5b0eaa0c45662
3	SIZE (pgRouting-pgrouting-pgrouting-2.2.4_GH0.tar.gz) = 4374276	3	SIZE (pgRouting-pgrouting-pgrouting-2.3.0_GH0.tar.gz) = 6546737




--- CMakeLists.txt.orig	2016-05-15 23:38:54 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

Lines 1-11 Link Here

(-)files/patch-src_trsp_src_GraphDefinition.cpp (-11 lines)
1	--- src/trsp/src/GraphDefinition.cpp.orig 2016-05-15 23:38:54 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

Lines 1-10 Link Here

(-)files/patch-src_trsp_src_trsp__core.cpp (-10 lines)
1	--- src/trsp/src/trsp_core.cpp.orig 2016-05-15 23:38:54 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"

Lines 1-10 Link Here

(-)files/patch-src_tsp_src_tsplib.c (-10 lines)
1	--- src/tsp/src/tsplib.c.orig 2016-05-15 23:38:54 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

Lines 1-11 Link Here

(-)files/patch-src_vrp__basic_src_VRP__Solver.cpp (-11 lines)
1	--- src/vrp_basic/src/VRP_Solver.cpp.orig 2016-05-16 20:28:00 UTC
2	+++ src/vrp_basic/src/VRP_Solver.cpp
3	@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fi
4
5	#include <algorithm>
6	#include "VRP_Solver.h"
7	+#include <cstdlib>
8	+#include <cmath>
9
10	#undef PGR_LOGGER_ON
11	#define PGR_LOGGER_LOC

Lines 1-10 Link Here

(-)pkg-plist (-9 / +10 lines)
1	lib/postgresql/libpgrouting-2.2.so	1	lib/postgresql/libpgrouting-2.3.so
2	share/postgresql/extension/pgrouting--2.0.0--2.2.4.sql	2	share/postgresql/extension/pgrouting--2.0.0--2.3.0.sql
3	share/postgresql/extension/pgrouting--2.0.1--2.2.4.sql	3	share/postgresql/extension/pgrouting--2.0.1--2.3.0.sql
4	share/postgresql/extension/pgrouting--2.1.0--2.2.4.sql	4	share/postgresql/extension/pgrouting--2.1.0--2.3.0.sql
5	share/postgresql/extension/pgrouting--2.2.0--2.2.4.sql	5	share/postgresql/extension/pgrouting--2.2.0--2.3.0.sql
6	share/postgresql/extension/pgrouting--2.2.1--2.2.4.sql	6	share/postgresql/extension/pgrouting--2.2.1--2.3.0.sql
7	share/postgresql/extension/pgrouting--2.2.2--2.2.4.sql	7	share/postgresql/extension/pgrouting--2.2.2--2.3.0.sql
8	share/postgresql/extension/pgrouting--2.2.3--2.2.4.sql	8	share/postgresql/extension/pgrouting--2.2.3--2.3.0.sql
9	share/postgresql/extension/pgrouting--2.2.4.sql	9	share/postgresql/extension/pgrouting--2.2.4--2.3.0.sql
		10	share/postgresql/extension/pgrouting--2.3.0.sql
10	share/postgresql/extension/pgrouting.control	11	share/postgresql/extension/pgrouting.control

Return to bug 213066

Lines 1-27 Link Here

(-)files/patch-CMakeLists.txt (-27 lines)
1	--- CMakeLists.txt.orig 2016-05-15 23:38:54 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