- Update pgrouting to 2.3.0

PR:		213066
Submitted by:	lbartoletti@tuxfamily.org (maintainer)

8 files changed, 19 insertions, 66 deletions

diff --git a/databases/pgrouting/Makefile b/databases/pgrouting/Makefile
index 615da39b3bc0..968b14473fa2 100644
--- a/databases/pgrouting/Makefile
+++ b/databases/pgrouting/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pgrouting
-PORTVERSION=	2.2.4
+PORTVERSION=	2.3.0
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	databases geography
 
diff --git a/databases/pgrouting/distinfo b/databases/pgrouting/distinfo
index f8c991d45778..a8f8ad06bf2d 100644
--- a/databases/pgrouting/distinfo
+++ b/databases/pgrouting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470845051
-SHA256 (pgRouting-pgrouting-pgrouting-2.2.4_GH0.tar.gz) = 34ccf2b1acd076ad7da92c0692a114d0b607b84771fdfd4e131246ef2c66bf84
-SIZE (pgRouting-pgrouting-pgrouting-2.2.4_GH0.tar.gz) = 4374276
+TIMESTAMP = 1474949998
+SHA256 (pgRouting-pgrouting-pgrouting-2.3.0_GH0.tar.gz) = cadeed30bfc57f6e77bc48a10301b26e5d71d8e86f366ed60ab5b0eaa0c45662
+SIZE (pgRouting-pgrouting-pgrouting-2.3.0_GH0.tar.gz) = 6546737
diff --git a/databases/pgrouting/files/patch-CMakeLists.txt b/databases/pgrouting/files/patch-CMakeLists.txt
deleted file mode 100644
index be76908ae4e1..000000000000
--- a/databases/pgrouting/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
diff --git a/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp b/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp
index b17b14f229b4..f21bc60fd757 100644
--- a/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp
+++ b/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp
@@ -1,7 +1,7 @@
---- src/trsp/src/GraphDefinition.cpp.orig	2016-05-15 23:38:54 UTC
+--- src/trsp/src/GraphDefinition.cpp.orig	2016-09-26 14:22:29 UTC
 +++ src/trsp/src/GraphDefinition.cpp
-@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include <windows.h>
+@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+ #undef max
  #endif
  
 -
diff --git a/databases/pgrouting/files/patch-src_trsp_src_trsp__core.cpp b/databases/pgrouting/files/patch-src_trsp_src_trsp__driver.cpp
index c6a2fd935107..9e8091d31857 100644
--- a/databases/pgrouting/files/patch-src_trsp_src_trsp__core.cpp
+++ b/databases/pgrouting/files/patch-src_trsp_src_trsp__driver.cpp
@@ -1,5 +1,5 @@
---- src/trsp/src/trsp_core.cpp.orig	2016-05-15 23:38:54 UTC
-+++ src/trsp/src/trsp_core.cpp
+--- src/trsp/src/trsp_driver.cpp.orig	2016-09-26 14:22:29 UTC
++++ src/trsp/src/trsp_driver.cpp
 @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fi
  #include <windows.h>
  #endif
diff --git a/databases/pgrouting/files/patch-src_tsp_src_tsplib.c b/databases/pgrouting/files/patch-src_tsp_src_tsplib.c
deleted file mode 100644
index 7df2248938d7..000000000000
--- a/databases/pgrouting/files/patch-src_tsp_src_tsplib.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tsp/src/tsplib.c.orig	2016-05-15 23:38:54 UTC
-+++ src/tsp/src/tsplib.c
-@@ -85,6 +85,7 @@ THE SOFTWARE.
- //#include <winsock2.h>
- //#endif
- #include <postgres.h>
-+#include <stdlib.h>
- #include <string.h>    /* memcpy */
- #include <math.h>      /* exp    */
- 
diff --git a/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp b/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp
deleted file mode 100644
index d801ec34b217..000000000000
--- a/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/vrp_basic/src/VRP_Solver.cpp.orig	2016-05-16 20:28:00 UTC
-+++ src/vrp_basic/src/VRP_Solver.cpp
-@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fi
- 
- #include <algorithm>
- #include "VRP_Solver.h"
-+#include <cstdlib>
-+#include <cmath>
- 
- #undef PGR_LOGGER_ON
- #define PGR_LOGGER_LOC
diff --git a/databases/pgrouting/pkg-plist b/databases/pgrouting/pkg-plist
index bb362ad05409..87321f38a696 100644
--- a/databases/pgrouting/pkg-plist
+++ b/databases/pgrouting/pkg-plist
@@ -1,10 +1,11 @@
-lib/postgresql/libpgrouting-2.2.so
-share/postgresql/extension/pgrouting--2.0.0--2.2.4.sql
-share/postgresql/extension/pgrouting--2.0.1--2.2.4.sql
-share/postgresql/extension/pgrouting--2.1.0--2.2.4.sql
-share/postgresql/extension/pgrouting--2.2.0--2.2.4.sql
-share/postgresql/extension/pgrouting--2.2.1--2.2.4.sql
-share/postgresql/extension/pgrouting--2.2.2--2.2.4.sql
-share/postgresql/extension/pgrouting--2.2.3--2.2.4.sql
-share/postgresql/extension/pgrouting--2.2.4.sql
+lib/postgresql/libpgrouting-2.3.so
+share/postgresql/extension/pgrouting--2.0.0--2.3.0.sql
+share/postgresql/extension/pgrouting--2.0.1--2.3.0.sql
+share/postgresql/extension/pgrouting--2.1.0--2.3.0.sql
+share/postgresql/extension/pgrouting--2.2.0--2.3.0.sql
+share/postgresql/extension/pgrouting--2.2.1--2.3.0.sql
+share/postgresql/extension/pgrouting--2.2.2--2.3.0.sql
+share/postgresql/extension/pgrouting--2.2.3--2.3.0.sql
+share/postgresql/extension/pgrouting--2.2.4--2.3.0.sql
+share/postgresql/extension/pgrouting--2.3.0.sql
 share/postgresql/extension/pgrouting.control