From owner-svn-ports-head@freebsd.org Sun Dec 25 17:19:34 2016 Return-Path: Delivered-To: svn-ports-head@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 2DFE3C902E5; Sun, 25 Dec 2016 17:19:34 +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 D7D67213; Sun, 25 Dec 2016 17:19:33 +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 uBPHJXgr019635; Sun, 25 Dec 2016 17:19:33 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBPHJW16019633; Sun, 25 Dec 2016 17:19:32 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201612251719.uBPHJW16019633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 25 Dec 2016 17:19:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429443 - head/astro/libosmium X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Dec 2016 17:19:34 -0000 Author: amdmi3 Date: Sun Dec 25 17:19:32 2016 New Revision: 429443 URL: https://svnweb.freebsd.org/changeset/ports/429443 Log: - Fix conflict with utf8cpp by using it as dependency PR: 215391 Reported by: jbeich Modified: head/astro/libosmium/Makefile head/astro/libosmium/pkg-plist Modified: head/astro/libosmium/Makefile ============================================================================== --- head/astro/libosmium/Makefile Sun Dec 25 17:17:36 2016 (r429442) +++ head/astro/libosmium/Makefile Sun Dec 25 17:19:32 2016 (r429443) @@ -4,6 +4,7 @@ PORTNAME= libosmium PORTVERSION= 2.10.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= astro geography devel MAINTAINER= amdmi3@FreeBSD.org @@ -16,7 +17,9 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ libboost_regex.so:devel/boost-libs \ libgeos.so:graphics/geos \ libexpat.so:textproc/expat2 -BUILD_DEPENDS= sparsehash>=0:devel/sparsehash +BUILD_DEPENDS= sparsehash>=0:devel/sparsehash \ + ${LOCALBASE}/include/utf8.h:devel/utf8cpp +RUN_DEPENDS= ${LOCALBASE}/include/utf8.h:devel/utf8cpp BROKEN_FreeBSD_9= does not build (lack of c++11 support) @@ -29,8 +32,7 @@ CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF # if/when corresponding ports appear in the tree, these will need to # be turned from depends CMAKE_ARGS+= -DINSTALL_GDALCPP:BOOL=ON \ - -DINSTALL_PROTOZERO:BOOL=ON \ - -DINSTALL_UTFCPP:BOOL=ON + -DINSTALL_PROTOZERO:BOOL=ON # though it builds tests, the library itself is header-only NO_ARCH= yes @@ -42,6 +44,9 @@ OPTIONS_DEFAULT= TEST TEST_TEST_TARGET= test TEST_CMAKE_BOOL= BUILD_TESTING +post-extract: + @${RM} -rf ${WRKSRC}/include/utf8* + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/CHANGELOG.md ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} Modified: head/astro/libosmium/pkg-plist ============================================================================== --- head/astro/libosmium/pkg-plist Sun Dec 25 17:17:36 2016 (r429442) +++ head/astro/libosmium/pkg-plist Sun Dec 25 17:19:32 2016 (r429443) @@ -187,7 +187,3 @@ include/protozero/pbf_writer.hpp include/protozero/types.hpp include/protozero/varint.hpp include/protozero/version.hpp -include/utf8.h -include/utf8/checked.h -include/utf8/core.h -include/utf8/unchecked.h