- Fix conflict with utf8cpp by using it as dependency

PR:		215391
Reported by:	jbeich
This commit is contained in:
Dmitry Marakasov 2016-12-25 17:19:32 +00:00
parent dfb7ea9e3f
commit 75c08fe664
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=429443
2 changed files with 8 additions and 7 deletions

View file

@ -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}

View file

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