aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2014-09-11 17:51:14 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2014-09-11 17:51:14 +0000
commitd72fb9d8ed0cb4b867efa30e1f714444d7f12c15 (patch)
treeecca734c920fec61fb85e298ea94ff8ee66fe976
parenta2beb9bdcd0994b542903b1b98d1301d198cc941 (diff)
downloadports-d72fb9d8ed0cb4b867efa30e1f714444d7f12c15.tar.gz
ports-d72fb9d8ed0cb4b867efa30e1f714444d7f12c15.zip
Notes
-rw-r--r--chinese/librime/Makefile6
-rw-r--r--graphics/opencolorio/Makefile9
2 files changed, 11 insertions, 4 deletions
diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index 0bd7a0a0d7b8..637d444ccf3a 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= librime
PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= chinese textproc
MASTER_SITES= GOOGLE_CODE
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} brise-${DATA_VER}.tar.gz
@@ -17,7 +17,7 @@ LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs \
libglog.so:${PORTSDIR}/devel/glog \
libkyotocabinet.so:${PORTSDIR}/databases/kyotocabinet \
libopencc.so:${PORTSDIR}/chinese/opencc \
- libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+ libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
USES= cmake pkgconfig gettext perl5
USE_PERL5= build patch
@@ -30,6 +30,8 @@ PLIST_SUB= VER=${PORTVERSION}
post-patch: .SILENT
${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' '{}' \;
+ ${REINPLACE_CMD} -e 's|yaml-cpp|&03|g' ${WRKSRC}/cmake/FindYamlCpp.cmake \
+ ${WRKSRC}/src/config.cc ${WRKSRC}/src/dict/dict_settings.cc
post-build:
@echo "building rime data."
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 754a4adaa3ce..e1a821984ed8 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opencolorio
PORTVERSION= 1.0.8
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
@@ -39,7 +39,7 @@ CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF
.if ${SLAVE_PORT} == no
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
LIB_DEPENDS= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
- libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+ libyaml-cpp03.so:${PORTSDIR}/devel/yaml-cpp03
USE_PYTHON= yes
USE_LDCONFIG= yes
CMAKE_ARGS+= -DOCIO_BUILD_APPS:BOOL=OFF \
@@ -60,4 +60,9 @@ CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=ON
CMAKE_ARGS+= -DOCIO_BUILD_DOCS:BOOL=OFF
.endif
+post-patch:
+ @${REINPLACE_CMD} -e '/pkg_check_modules/ s|yaml-cpp|&03|' \
+ ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.h
+
.include <bsd.port.mk>