svn commit: r380384 - head/converters/osm2pgsql

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Mar  3 16:46:18 2015
New Revision: 380384
URL: https://svnweb.freebsd.org/changeset/ports/380384
QAT: https://qat.redports.org/buildarchive/r380384/

Log:
  - Update to 0.87.2

Modified:
  head/converters/osm2pgsql/Makefile
  head/converters/osm2pgsql/distinfo

Modified: head/converters/osm2pgsql/Makefile
==============================================================================
--- head/converters/osm2pgsql/Makefile	Tue Mar  3 16:35:33 2015	(r380383)
+++ head/converters/osm2pgsql/Makefile	Tue Mar  3 16:46:18 2015	(r380384)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	osm2pgsql
-PORTVERSION=	0.86.0
-PORTREVISION=	1
+PORTVERSION=	0.87.2
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3 at FreeBSD.org
@@ -14,17 +13,19 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
 		libgeos.so:${PORTSDIR}/graphics/geos \
-		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
+		libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c \
+		libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
-GH_COMMIT=	b7705f1
+GH_COMMIT=	51f54b6
 
 USES=		autoreconf gmake libtool lua pgsql tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	LUA="${LUA_CMD}" \
 		LUA_INCLUDE="-I${LUA_INCDIR}" \
-		LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}"
+		LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}" \
+		--without-lockfree # workaround for build error
 USE_GNOME=	libxml2
 
 PLIST_FILES=	bin/nodecachefilereader \
@@ -40,6 +41,7 @@ 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/converters/osm2pgsql/distinfo
==============================================================================
--- head/converters/osm2pgsql/distinfo	Tue Mar  3 16:35:33 2015	(r380383)
+++ head/converters/osm2pgsql/distinfo	Tue Mar  3 16:46:18 2015	(r380384)
@@ -1,2 +1,2 @@
-SHA256 (osm2pgsql-0.86.0.tar.bz2) = 2364d86b415fa1d0524acf907e5baf8f83d3da93d5735bb4b420b3019f48a603
-SIZE (osm2pgsql-0.86.0.tar.bz2) = 2101823
+SHA256 (osm2pgsql-0.87.2.tar.bz2) = 2ce5b8e3a23e7e8cce2901492e673bb034fc0cc044311526b3676699daac5008
+SIZE (osm2pgsql-0.87.2.tar.bz2) = 2139847