Attachment #177387 for bug #214819




# $FreeBSD$

PORTNAME=	osm2pgsql
PORTVERSION=	0.90.1
PORTREVISION=	2
CATEGORIES=	converters geography

MAINTAINER=	amdmi3@FreeBSD.org

LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libproj.so:graphics/proj \
		libgeos35.so:graphics/geos35 \
		libboost_system.so:devel/boost-libs \
		libexpat.so:textproc/expat2

USE_GITHUB=	yes
GH_ACCOUNT=	openstreetmap

USES=		cmake:outsource lua pgsql
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	LUA="${LUA_CMD}" \
		LUA_INCLUDE="-I${LUA_INCDIR}" \

		--without-lockfree # workaround for build error
USE_GNOME=	libxml2

PLIST_FILES=	bin/osm2pgsql \
		bin/osm2pgsql \
		man/man1/nodecachefilereader.1.gz \
		man/man1/osm2pgsql.1.gz

PORTDOCS=	AUTHORS ChangeLog README.md
PORTDATA=	*

OPTIONS_DEFINE=	DOCS

post-patch:
	@${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}
.for f in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
.endfor

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = ac78805c7a312462dbade4a907ddb84cdfeeecea888d439c288ec60f6fc1ec76	1	TIMESTAMP = 1479906426
2	SIZE (openstreetmap-osm2pgsql-0.87.2_GH0.tar.gz) = 2139759	2	SHA256 (openstreetmap-osm2pgsql-0.90.1_GH0.tar.gz) = f9ba09714603db251e4a357c1968640c350b0ca5c99712008dadc71c0c3e898b
		3	SIZE (openstreetmap-osm2pgsql-0.90.1_GH0.tar.gz) = 1326807

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+9 lines)
	1	--- CMakeLists.txt.orig 2016-07-17 02:30:16 UTC
	2	+++ CMakeLists.txt
	3	@@ -257,5 +257,5 @@ endif()
	4	#############################################################
	5
	6	install(TARGETS osm2pgsql DESTINATION bin)
	7	-install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1)
	8	+install(FILES docs/osm2pgsql.1 DESTINATION man/man1)
	9	install(FILES default.style empty.style 900913.sql DESTINATION share/osm2pgsql)




--- 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)

Return to bug 214819

Lines 2-9 Link Here

(-)Makefile (-14 / +11 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= osm2pgsql	4	PORTNAME= osm2pgsql
5	PORTVERSION= 0.87.2	5	PORTVERSION= 0.90.1
6	PORTREVISION= 2
7	CATEGORIES= converters geography	6	CATEGORIES= converters geography
8		7
9	MAINTAINER= amdmi3@FreeBSD.org	8	MAINTAINER= amdmi3@FreeBSD.org
Lines 13-26 Link Here
13	LICENSE_FILE= ${WRKSRC}/COPYING	12	LICENSE_FILE= ${WRKSRC}/COPYING
14		13
15	LIB_DEPENDS= libproj.so:graphics/proj \	14	LIB_DEPENDS= libproj.so:graphics/proj \
16	libgeos.so:graphics/geos \	15	libgeos35.so:graphics/geos35 \
17	libprotobuf-c.so:devel/protobuf-c \	16	libboost_system.so:devel/boost-libs \
18	libboost_thread.so:devel/boost-libs	17	libexpat.so:textproc/expat2
19		18
20	USE_GITHUB= yes	19	USE_GITHUB= yes
21	GH_ACCOUNT= openstreetmap	20	GH_ACCOUNT= openstreetmap
22		21
23	USES= autoreconf gmake libtool lua pgsql	22	USES= cmake:outsource lua pgsql
24	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
25	CONFIGURE_ARGS= LUA="${LUA_CMD}" \	24	CONFIGURE_ARGS= LUA="${LUA_CMD}" \
26	LUA_INCLUDE="-I${LUA_INCDIR}" \	25	LUA_INCLUDE="-I${LUA_INCDIR}" \
Lines 28-50 Link Here
28	--without-lockfree # workaround for build error	27	--without-lockfree # workaround for build error
29	USE_GNOME= libxml2	28	USE_GNOME= libxml2
30		29
31	PLIST_FILES= bin/nodecachefilereader \	30	PLIST_FILES= bin/osm2pgsql \
32	bin/osm2pgsql \
33	man/man1/nodecachefilereader.1.gz \
34	man/man1/osm2pgsql.1.gz	31	man/man1/osm2pgsql.1.gz
35		32
36	PORTDOCS= ChangeLog README AUTHORS TODO	33	PORTDOCS= AUTHORS ChangeLog README.md
37	PORTDATA= *	34	PORTDATA= *
38		35
39	OPTIONS_DEFINE= DOCS	36	OPTIONS_DEFINE= DOCS
40		37
41	post-patch:	38	post-patch:
42	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' ${WRKSRC}/m4/*.m4	39	@${REINPLACE_CMD} -e 's\|include <geos\|&35/geos\|' \
43	@${REINPLACE_CMD} -e 's\|AC_MSG_WARN\|AC_MSG_ERROR\|' ${WRKSRC}/configure.ac	40	${WRKSRC}/contrib/libosmium/osmium/geom/geos.hpp \
44	@${REINPLACE_CMD} -e 's\|-lstdc++\|\|' ${WRKSRC}/Makefile.am	41	${WRKSRC}/geometry-builder.cpp
45		42
46	post-install-DOCS-on:	43	post-install-DOCS-on:
47	${MKDIR} ${STAGEDIR}${DOCSDIR}	44	@${MKDIR} ${STAGEDIR}${DOCSDIR}
48	.for f in ${PORTDOCS}	45	.for f in ${PORTDOCS}
49	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/	46	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/
50	.endfor	47	.endfor

Line 0 Link Here

(-)files/patch-cmake_FindOsmium.cmake (+13 lines)
	1	--- cmake/FindOsmium.cmake.orig 2016-07-17 02:30:16 UTC
	2	+++ cmake/FindOsmium.cmake
	3	@@ -151,8 +151,8 @@ list(APPEND OSMIUM_LIBRARIES
	4	#----------------------------------------------------------------------
	5	# Component 'geos'
	6	if(Osmium_USE_GEOS)
	7	- find_path(GEOS_INCLUDE_DIR geos/geom.h)
	8	- find_library(GEOS_LIBRARY NAMES geos)
	9	+ find_path(GEOS_INCLUDE_DIR geos35/geos/geom.h)
	10	+ find_library(GEOS_LIBRARY NAMES geos35)
	11
	12	list(APPEND OSMIUM_EXTRA_FIND_VARS GEOS_INCLUDE_DIR GEOS_LIBRARY)
	13	if(GEOS_INCLUDE_DIR AND GEOS_LIBRARY)