Attachment 169793 Details for Bug 209137 – Update pgrouting to 2.2.1

[patch] Update pgrouting to 2.2.1

pgrouting-2.2.1.diff (text/plain), 9.64 KB, created by Loïc Bartoletti on 2016-04-28 20:47:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2016-04-28 20:47:57 UTC

Size: 9.64 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 414238)
>+++ Makefile	(working copy)
>@@ -2,9 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pgrouting
>-PORTVERSION=	2.0.0
>-DISTVERSIONPREFIX=	v
>-PORTREVISION=	4
>+PORTVERSION=	2.2.1
> CATEGORIES=	databases geography
> 
> MAINTAINER=	coder@tuxfamily.org
>@@ -12,15 +10,16 @@
> 
> 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
>+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:features cmake pgsql pkgconfig
>+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
>@@ -27,26 +26,12 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36
>-BUILD_DEPENDS+=	clang36:lang/clang36
>-CPP=		clang-cpp36
>-CC=		clang36
>-CXX=		clang++36
>-.endif
>+#.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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 414238)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pgRouting-pgrouting-v2.0.0_GH0.tar.gz) = 606309e8ece04abec062522374b48179c16bddb30dd4c5080b89a4298e8d163b
>-SIZE (pgRouting-pgrouting-v2.0.0_GH0.tar.gz) = 3765933
>+SHA256 (pgRouting-pgrouting-2.2.1-90b9901_GH0.tar.gz) = da3b82fe7b7e83452f79efcd0cc0ce5d7242f211bfb2e3487e7be64efa8f238e
>+SIZE (pgRouting-pgrouting-2.2.1-90b9901_GH0.tar.gz) = 4373799
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,27 @@
>+--- 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
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>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: files/patch-src_trsp_src_GraphDefinition.cpp
>===================================================================
>--- files/patch-src_trsp_src_GraphDefinition.cpp	(nonexistent)
>+++ files/patch-src_trsp_src_GraphDefinition.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/trsp/src/GraphDefinition.cpp.orig	2016-04-28 19:58:27 UTC
>++++ src/trsp/src/GraphDefinition.cpp
>+@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fi
>+ #include <windows.h>
>+ #endif
>+ 
>+-
>++#include <cstdlib>
>+ #include <sstream>
>+ #include "GraphDefinition.h"
>+ 
>
>Property changes on: files/patch-src_trsp_src_GraphDefinition.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: files/patch-src_trsp_src_trsp__core.cpp
>===================================================================
>--- files/patch-src_trsp_src_trsp__core.cpp	(nonexistent)
>+++ files/patch-src_trsp_src_trsp__core.cpp	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/trsp/src/trsp_core.cpp.orig	2016-04-28 19:43:44 UTC
>++++ src/trsp/src/trsp_core.cpp
>+@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fi
>+ #include <windows.h>
>+ #endif
>+ 
>++#include <stdlib.h>
>+ #include <string.h>
>+ #include <sstream>
>+ #include "GraphDefinition.h"
>
>Property changes on: files/patch-src_trsp_src_trsp__core.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: files/patch-src_tsp_src_tsplib.c
>===================================================================
>--- files/patch-src_tsp_src_tsplib.c	(nonexistent)
>+++ files/patch-src_tsp_src_tsplib.c	(working copy)
>@@ -0,0 +1,10 @@
>+--- src/tsp/src/tsplib.c.orig	2016-04-28 19:50:17 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    */
>+ 
>
>Property changes on: files/patch-src_tsp_src_tsplib.c
>___________________________________________________________________
>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: files/patch-src_vrp__basic_src_VRP.h
>===================================================================
>--- files/patch-src_vrp__basic_src_VRP.h	(nonexistent)
>+++ files/patch-src_vrp__basic_src_VRP.h	(working copy)
>@@ -0,0 +1,20 @@
>+--- 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
>
>Property changes on: files/patch-src_vrp__basic_src_VRP.h
>___________________________________________________________________
>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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 414238)
>+++ pkg-plist	(working copy)
>@@ -1,19 +1,8 @@
>-lib/postgresql/librouting.so
>-lib/postgresql/librouting_bd.so
>-lib/postgresql/librouting_dd.so
>-lib/postgresql/librouting_ksp.so
>-lib/postgresql/librouting_tsp.so
>-share/postgresql/contrib/pgrouting-2.0/pgrouting.control
>-share/postgresql/contrib/pgrouting-2.0/pgrouting.sql
>-share/postgresql/contrib/pgrouting-2.0/pgrouting_dd_legacy.sql
>-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
>+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
>+

Flags:

lbartoletti: maintainer-approval+

Actions: View | Diff

Attachments on bug 209137: 169793 | 169817