From owner-svn-ports-all@freebsd.org Tue Feb 7 13:16:19 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 17E8CCD4927; Tue, 7 Feb 2017 13:16:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CCCEC1D49; Tue, 7 Feb 2017 13:16:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v17DGHNx076476; Tue, 7 Feb 2017 13:16:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v17DGHKt076472; Tue, 7 Feb 2017 13:16:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702071316.v17DGHKt076472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 7 Feb 2017 13:16:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433549 - in head/converters/osm2pgsql: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Feb 2017 13:16:19 -0000 Author: amdmi3 Date: Tue Feb 7 13:16:17 2017 New Revision: 433549 URL: https://svnweb.freebsd.org/changeset/ports/433549 Log: - Update to 0.92.0 and unbreak by switching geos dependency to graphics/geos35 PR: 214819, 216338 Added: head/converters/osm2pgsql/files/ head/converters/osm2pgsql/files/patch-CMakeLists.txt (contents, props changed) head/converters/osm2pgsql/files/patch-cmake_FindOsmium.cmake (contents, props changed) Modified: head/converters/osm2pgsql/Makefile head/converters/osm2pgsql/distinfo Modified: head/converters/osm2pgsql/Makefile ============================================================================== --- head/converters/osm2pgsql/Makefile Tue Feb 7 13:13:39 2017 (r433548) +++ head/converters/osm2pgsql/Makefile Tue Feb 7 13:16:17 2017 (r433549) @@ -2,51 +2,40 @@ # $FreeBSD$ PORTNAME= osm2pgsql -PORTVERSION= 0.87.2 -PORTREVISION= 3 +PORTVERSION= 0.92.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org COMMENT= Convert OSM XML data to PostgreSQL database -BROKEN= Last update of graphics/geos broke compatibility - LICENSE= GPLv2+ 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 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= LUA="${LUA_CMD}" \ - LUA_INCLUDE="-I${LUA_INCDIR}" \ - LUA_LIB="-L${LUA_LIBDIR} -llua-${LUA_VER}" \ - --without-lockfree # workaround for build error -USE_GNOME= libxml2 - -PLIST_FILES= bin/nodecachefilereader \ - bin/osm2pgsql \ - man/man1/nodecachefilereader.1.gz \ +USES= cmake:outsource lua:53 pgsql + +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