svn commit: r429443 - head/astro/libosmium
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sun Dec 25 17:19:34 UTC 2016
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 at 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
More information about the svn-ports-head
mailing list