View | Details | Raw Unified | Return to bug 221810 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (+28 lines)
Line 0 Link Here
1 
# Created by: Loïc Bartoletti <lbartoletti@tuxfamily.org>
2 
# $FreeBSD$
3 

            

            

              4
              
PORTNAME=	osm2pgrouting

            

            

              5
              
DISTVERSIONPREFIX=	v

            

            

              6
              
DISTVERSION=	2.2.0

            

            

              7
              
CATEGORIES=	converters databases geography

            

            

              8
              

            

            

              9
              
MAINTAINER=	lbartoletti@tuxfamily.org

            

            

              10
              
COMMENT=	Import OSM data into pgRouting Database

            

            

              11
              

            

            

              12
              
LICENSE=	GPLv2

            

            

              13
              
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

            

            

              14
              

            

            

              15
              
LIB_DEPENDS=	libboost_system.so:devel/boost-libs \

            

            

              16
              
		libexpat.so:textproc/expat2

            

            

              17
              

            

            

              18
              
USE_GITHUB=	yes

            

            

              19
              
USES=		cmake pgsql compiler:c++11-lang

            

            

              20
              
WANT_PGSQL=	client

            

            

              21
              
GH_ACCOUNT=	pgRouting

            

            

              22
              

            

            

              23
              
post-patch:

            

            

              24
              
	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \

            

            

              25
              
		${WRKSRC}/CMakeLists.txt \

            

            

              26
              
		${WRKSRC}/Readme.md \

            

            

              27
              
		${WRKSRC}/src/prog_options.cpp

            

            

              28
              
.include <bsd.port.mk>

            



(-)distinfo
      (+3 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
TIMESTAMP = 1503657843

            

            

              2
              
SHA256 (pgRouting-osm2pgrouting-v2.2.0_GH0.tar.gz) = bdd3095123cf21ee2f56e5cf04b2ea7b781dea629bff909fa45ebc5dbe50f8a6

            

            

              3
              
SIZE (pgRouting-osm2pgrouting-v2.2.0_GH0.tar.gz) = 133563

            



(-)files/patch-CMakeLists.txt
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- CMakeLists.txt.orig	2016-11-04 17:06:42 UTC

            

            

              2
              
+++ CMakeLists.txt

            

            

              3
              
@@ -36,7 +36,7 @@ ADD_EXECUTABLE(osm2pgrouting ${SRC})

            

            

              4
              
 TARGET_LINK_LIBRARIES(osm2pgrouting ${POSTGRESQL_LIBRARIES} ${EXPAT_LIBRARIES} ${Boost_LIBRARIES} )

            

            

              5
              
 

            

            

              6
              
 INSTALL(TARGETS osm2pgrouting

            

            

              7
              
-    RUNTIME DESTINATION "/usr/bin"

            

            

              8
              
+    RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin"

            

            

              9
              
     )

            

            

              10
              
 

            

            

              11
              
 INSTALL(FILES

            



(-)files/patch-src_ConfigurationParserCallback.h
      (+18 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/ConfigurationParserCallback.h.orig	2017-08-25 16:00:38 UTC

            

            

              2
              
+++ src/ConfigurationParserCallback.h

            

            

              3
              
@@ -22,13 +22,13 @@

            

            

              4
              
 #ifndef SRC_CONFIGURATIONPARSERCALLBACK_H_

            

            

              5
              
 #define SRC_CONFIGURATIONPARSERCALLBACK_H_

            

            

              6
              
 #pragma once

            

            

              7
              
-

            

            

              8
              
+/*

            

            

              9
              
 #if __GNUC__ > 4 || \

            

            

              10
              
                     (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))

            

            

              11
              
 #else

            

            

              12
              
 #define nullptr NULL

            

            

              13
              
 #endif

            

            

              14
              
-

            

            

              15
              
+*/

            

            

              16
              
 #include <string.h>

            

            

              17
              
 #include "XMLParser.h"

            

            

              18
              
 

            



(-)files/patch-src_OSMDocumentParserCallback.h
      (+18 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- src/OSMDocumentParserCallback.h.orig	2017-08-25 15:55:09 UTC

            

            

              2
              
+++ src/OSMDocumentParserCallback.h

            

            

              3
              
@@ -22,13 +22,13 @@

            

            

              4
              
 #ifndef SRC_OSMDOCUMENTPARSERCALLBACK_H_

            

            

              5
              
 #define SRC_OSMDOCUMENTPARSERCALLBACK_H_

            

            

              6
              
 #pragma once

            

            

              7
              
-

            

            

              8
              
+/*

            

            

              9
              
 #if __GNUC__ > 4 || \

            

            

              10
              
             (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6))

            

            

              11
              
 #else

            

            

              12
              
 #define nullptr NULL

            

            

              13
              
 #endif

            

            

              14
              
-

            

            

              15
              
+*/

            

            

              16
              
 

            

            

              17
              
 #include <string.h>

            

            

              18
              
 #include "./XMLParser.h"

            



(-)pkg-descr
      (+4 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
Easily import OpenStreetMap data into a pgRouting database using osm2pgrouting t

            

            

              2
              
ool.

            

            

              3
              

            

            

              4
              
WWW: http://pgrouting.org/docs/tools/osm2pgrouting.html

            



(-)pkg-plist
      (+6 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
bin/osm2pgrouting

            

            

              2
              
%%DATADIR%%/COPYING

            

            

              3
              
%%DATADIR%%/Readme.md

            

            

              4
              
%%DATADIR%%/mapconfig.xml

            

            

              5
              
%%DATADIR%%/mapconfig_for_bicycles.xml

            

            

              6
              
%%DATADIR%%/mapconfig_for_cars.xml

            






  

  Return to bug 221810