From 466f5ce9d82007deac59d2a735d2c759b0303b7e Mon Sep 17 00:00:00 2001
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 29 Oct 2014 00:04:50 +0000
Subject: - Update to 0.86.0 - Clarify LICENSE - Add LICENSE_FILE - Optionize
 DOCS - Turn configure warnings into errors to notice problems faster (such as
 failure of previous version to properly detect protobuf-c)

---
 converters/osm2pgsql/Makefile | 11 +++++++----
 converters/osm2pgsql/distinfo |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'converters')

diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index e9a164b37dd6..bfcb0ef76446 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	osm2pgsql
-PORTVERSION=	0.84.0
-PORTREVISION=	5
+PORTVERSION=	0.86.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Convert OSM XML data to PostgreSQL database
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
 		libgeos.so:${PORTSDIR}/graphics/geos \
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libproj.so:${PORTSDIR}/graphics/proj \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
-GH_COMMIT=	237b125
+GH_COMMIT=	b7705f1
 
 USES=		autoreconf gmake libtool lua pgsql tar:bzip2
 GNU_CONFIGURE=	yes
@@ -34,8 +34,11 @@ PLIST_FILES=	bin/nodecachefilereader \
 PORTDOCS=	ChangeLog README AUTHORS TODO
 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
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index 055de17f64f4..0553e9d05a5a 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (osm2pgsql-0.84.0.tar.bz2) = 6859716766e7fe5fd139d0c2a73e7b04057fd263a0891430b60ea9dcd6488884
-SIZE (osm2pgsql-0.84.0.tar.bz2) = 1037702
+SHA256 (osm2pgsql-0.86.0.tar.bz2) = 2364d86b415fa1d0524acf907e5baf8f83d3da93d5735bb4b420b3019f48a603
+SIZE (osm2pgsql-0.86.0.tar.bz2) = 2101823
-- 
cgit v1.2.3