svn commit: r367958 - in head: chinese/librime graphics/opencolorio

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Sep 11 17:51:14 2014
New Revision: 367958
URL: http://svnweb.freebsd.org/changeset/ports/367958
QAT: https://qat.redports.org/buildarchive/r367958/

Log:
  - Switch graphics/opencolorio and chinese/librime to yaml-cpp03, as they are incompatible with newer version
  
  PR:		192330

Modified:
  head/chinese/librime/Makefile
  head/graphics/opencolorio/Makefile

Modified: head/chinese/librime/Makefile
==============================================================================
--- head/chinese/librime/Makefile	Thu Sep 11 17:49:37 2014	(r367957)
+++ head/chinese/librime/Makefile	Thu Sep 11 17:51:14 2014	(r367958)
@@ -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:${PORTSD
 		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."

Modified: head/graphics/opencolorio/Makefile
==============================================================================
--- head/graphics/opencolorio/Makefile	Thu Sep 11 17:49:37 2014	(r367957)
+++ head/graphics/opencolorio/Makefile	Thu Sep 11 17:51:14 2014	(r367958)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.8
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD at 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>