Attachment 177387 Details for Bug 214819 – Osm2pgsql update to latest version, use geos35

[patch] Osm2pgsql update to latest version, use geos35

osm2pgsql.patch (text/plain), 4.30 KB, created by Dmitry Marakasov on 2016-11-25 14:30:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-11-25 14:30:35 UTC

Size: 4.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 426949)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	osm2pgsql
>-PORTVERSION=	0.87.2
>-PORTREVISION=	2
>+PORTVERSION=	0.90.1
> CATEGORIES=	converters geography
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>@@ -13,14 +12,14 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libproj.so:graphics/proj \
>-		libgeos.so:graphics/geos \
>-		libprotobuf-c.so:devel/protobuf-c \
>-		libboost_thread.so:devel/boost-libs
>+		libgeos35.so:graphics/geos35 \
>+		libboost_system.so:devel/boost-libs \
>+		libexpat.so:textproc/expat2
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	openstreetmap
> 
>-USES=		autoreconf gmake libtool lua pgsql
>+USES=		cmake:outsource lua pgsql
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	LUA="${LUA_CMD}" \
> 		LUA_INCLUDE="-I${LUA_INCDIR}" \
>@@ -28,23 +27,21 @@
> 		--without-lockfree # workaround for build error
> USE_GNOME=	libxml2
> 
>-PLIST_FILES=	bin/nodecachefilereader \
>-		bin/osm2pgsql \
>-		man/man1/nodecachefilereader.1.gz \
>+PLIST_FILES=	bin/osm2pgsql \
> 		man/man1/osm2pgsql.1.gz
> 
>-PORTDOCS=	ChangeLog README AUTHORS TODO
>+PORTDOCS=	AUTHORS ChangeLog README.md
> PORTDATA=	*
> 
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/m4/*.m4
>-	@${REINPLACE_CMD} -e 's|AC_MSG_WARN|AC_MSG_ERROR|' ${WRKSRC}/configure.ac
>-	@${REINPLACE_CMD} -e 's|-lstdc++||' ${WRKSRC}/Makefile.am
>+	@${REINPLACE_CMD} -e 's|include <geos|&35/geos|' \
>+		${WRKSRC}/contrib/libosmium/osmium/geom/geos.hpp \
>+		${WRKSRC}/geometry-builder.cpp
> 
> post-install-DOCS-on:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${PORTDOCS}
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
> .endfor
>Index: distinfo
>===================================================================
>--- distinfo	(revision 426949)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = ac78805c7a312462dbade4a907ddb84cdfeeecea888d439c288ec60f6fc1ec76
>-SIZE (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = 2139759
>+TIMESTAMP = 1479906426
>+SHA256 (openstreetmap-osm2pgsql-0.90.1_GH0.tar.gz) = f9ba09714603db251e4a357c1968640c350b0ca5c99712008dadc71c0c3e898b
>+SIZE (openstreetmap-osm2pgsql-0.90.1_GH0.tar.gz) = 1326807
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,9 @@
>+--- CMakeLists.txt.orig	2016-07-17 02:30:16 UTC
>++++ CMakeLists.txt
>+@@ -257,5 +257,5 @@ endif()
>+ #############################################################
>+ 
>+ install(TARGETS osm2pgsql DESTINATION bin)
>+-install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1)
>++install(FILES docs/osm2pgsql.1 DESTINATION man/man1)
>+ install(FILES default.style empty.style 900913.sql DESTINATION share/osm2pgsql)
>
>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-cmake_FindOsmium.cmake
>===================================================================
>--- files/patch-cmake_FindOsmium.cmake	(nonexistent)
>+++ files/patch-cmake_FindOsmium.cmake	(working copy)
>@@ -0,0 +1,13 @@
>+--- cmake/FindOsmium.cmake.orig	2016-07-17 02:30:16 UTC
>++++ cmake/FindOsmium.cmake
>+@@ -151,8 +151,8 @@ list(APPEND OSMIUM_LIBRARIES
>+ #----------------------------------------------------------------------
>+ # Component 'geos'
>+ if(Osmium_USE_GEOS)
>+-    find_path(GEOS_INCLUDE_DIR geos/geom.h)
>+-    find_library(GEOS_LIBRARY NAMES geos)
>++    find_path(GEOS_INCLUDE_DIR geos35/geos/geom.h)
>++    find_library(GEOS_LIBRARY NAMES geos35)
>+ 
>+     list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY)
>+     if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
>
>Property changes on: files/patch-cmake_FindOsmium.cmake
>___________________________________________________________________
>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

Actions: View | Diff

Attachments on bug 214819: 177386 | 177387 | 177390