Index: head/databases/pgrouting/Makefile =================================================================== --- head/databases/pgrouting/Makefile (revision 415938) +++ head/databases/pgrouting/Makefile (revision 415939) @@ -1,27 +1,24 @@ # Created by: lbartoletti # $FreeBSD$ PORTNAME= pgrouting -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= databases geography -MAINTAINER= coder@tuxfamily.org +MAINTAINER= lbartoletti@tuxfamily.org COMMENT= Extension to PostGIS to provide geospatial routing functionality LICENSE= GPLv2 LIB_DEPENDS= libboost_system.so:devel/boost-libs\ libCGAL.so:math/cgal \ libgmp.so:math/gmp RUN_DEPENDS= ${LOCALBASE}/share/postgresql/contrib/postgis-2.1/postgis.sql:databases/postgis21 -USES= compiler:c++11-lib cmake pgsql:9.1+ pkgconfig +USES= compiler:c++11-lib cmake localbase pgsql:9.1+ pkgconfig USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= pgRouting -GH_TAGNAME= 190d2b9 - -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +GH_TAGNAME= 8416c60 .include Index: head/databases/pgrouting/distinfo =================================================================== --- head/databases/pgrouting/distinfo (revision 415938) +++ head/databases/pgrouting/distinfo (revision 415939) @@ -1,2 +1,3 @@ -SHA256 (pgRouting-pgrouting-2.2.2-190d2b9_GH0.tar.gz) = 07f316eee18c2d990ec5de8c5825fc402c010a1e0c874f61a72da4b88828a2b0 -SIZE (pgRouting-pgrouting-2.2.2-190d2b9_GH0.tar.gz) = 4372652 +TIMESTAMP = 1463423989 +SHA256 (pgRouting-pgrouting-2.2.3-8416c60_GH0.tar.gz) = 2fdc5f781eaf342222c5b52e12698adb641bde2576908e85a7dc41b8d8ccb540 +SIZE (pgRouting-pgrouting-2.2.3-8416c60_GH0.tar.gz) = 4373034 Index: head/databases/pgrouting/files/patch-CMakeLists.txt =================================================================== --- head/databases/pgrouting/files/patch-CMakeLists.txt (revision 415938) +++ head/databases/pgrouting/files/patch-CMakeLists.txt (revision 415939) @@ -1,27 +1,27 @@ ---- CMakeLists.txt.orig 2016-04-19 16:40:04 UTC +--- 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 Index: head/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp =================================================================== --- head/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp (revision 415938) +++ head/databases/pgrouting/files/patch-src_trsp_src_GraphDefinition.cpp (revision 415939) @@ -1,11 +1,11 @@ ---- src/trsp/src/GraphDefinition.cpp.orig 2016-04-28 19:58:27 UTC +--- src/trsp/src/GraphDefinition.cpp.orig 2016-05-15 23:38:54 UTC +++ src/trsp/src/GraphDefinition.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include #endif - +#include #include #include "GraphDefinition.h" Index: head/databases/pgrouting/files/patch-src_trsp_src_trsp__core.cpp =================================================================== --- head/databases/pgrouting/files/patch-src_trsp_src_trsp__core.cpp (revision 415938) +++ head/databases/pgrouting/files/patch-src_trsp_src_trsp__core.cpp (revision 415939) @@ -1,10 +1,10 @@ ---- src/trsp/src/trsp_core.cpp.orig 2016-04-28 19:43:44 UTC +--- src/trsp/src/trsp_core.cpp.orig 2016-05-15 23:38:54 UTC +++ src/trsp/src/trsp_core.cpp @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include #endif +#include #include #include #include "GraphDefinition.h" Index: head/databases/pgrouting/files/patch-src_tsp_src_tsplib.c =================================================================== --- head/databases/pgrouting/files/patch-src_tsp_src_tsplib.c (revision 415938) +++ head/databases/pgrouting/files/patch-src_tsp_src_tsplib.c (revision 415939) @@ -1,10 +1,10 @@ ---- src/tsp/src/tsplib.c.orig 2016-04-28 19:50:17 UTC +--- 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 //#endif #include +#include #include /* memcpy */ #include /* exp */ Index: head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP.h =================================================================== --- head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP.h (revision 415938) +++ head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP.h (revision 415939) @@ -1,20 +1,20 @@ ---- src/vrp_basic/src/VRP.h.orig 2016-04-19 16:40:04 UTC +--- src/vrp_basic/src/VRP.h.orig 2016-05-15 23:38:54 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 Index: head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp =================================================================== --- head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp (nonexistent) +++ head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp (revision 415939) @@ -0,0 +1,11 @@ +--- 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 + #include "VRP_Solver.h" ++#include ++#include + + #undef PGR_LOGGER_ON + #define PGR_LOGGER_LOC Property changes on: head/databases/pgrouting/files/patch-src_vrp__basic_src_VRP__Solver.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/pgrouting/pkg-plist =================================================================== --- head/databases/pgrouting/pkg-plist (revision 415938) +++ head/databases/pgrouting/pkg-plist (revision 415939) @@ -1,8 +1,9 @@ lib/postgresql/libpgrouting-2.2.so -share/postgresql/extension/pgrouting--2.0.0--2.2.2.sql -share/postgresql/extension/pgrouting--2.0.1--2.2.2.sql -share/postgresql/extension/pgrouting--2.1.0--2.2.2.sql -share/postgresql/extension/pgrouting--2.2.0--2.2.2.sql -share/postgresql/extension/pgrouting--2.2.1--2.2.2.sql -share/postgresql/extension/pgrouting--2.2.2.sql +share/postgresql/extension/pgrouting--2.0.0--2.2.3.sql +share/postgresql/extension/pgrouting--2.0.1--2.2.3.sql +share/postgresql/extension/pgrouting--2.1.0--2.2.3.sql +share/postgresql/extension/pgrouting--2.2.0--2.2.3.sql +share/postgresql/extension/pgrouting--2.2.1--2.2.3.sql +share/postgresql/extension/pgrouting--2.2.2--2.2.3.sql +share/postgresql/extension/pgrouting--2.2.3.sql share/postgresql/extension/pgrouting.control