<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00ee6e7f74dec3df556b6e091eeb164908df1c31">https://github.com/macports/macports-ports/commit/00ee6e7f74dec3df556b6e091eeb164908df1c31</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 00ee6e7  strigi: Add build conflict with cppunit
</span>00ee6e7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 00ee6e7f74dec3df556b6e091eeb164908df1c31
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Aug 9 01:56:06 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    strigi: Add build conflict with cppunit
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/54586
</span>---
 devel/strigi/Portfile | 3 +++
 1 file changed, 3 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/strigi/Portfile b/devel/strigi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f16ef7f..f48b808 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/strigi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/strigi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem  1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup       conflicts_build 1.0
</span> PortGroup       kde4 1.1
 
 name            strigi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +41,8 @@ checksums       rmd160  34cbbe98e7a371467b115b18586baf299340d1b8 \
</span> patchfiles      patch-libstreamanalyzer-plugins-endplugins-ffmpegendanalyzer.cpp.diff \
                 patch-strigidaemon-bin-daemon-xesam-xesamsearch.h.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build cppunit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append   -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
                         -DLOG4CXX_INCLUDE_DIR=${prefix}/include/log4cxx \
                         -DICONV_LIBRARIES:FILEPATH=${prefix}/lib/libiconv.dylib
</pre><pre style='margin:0'>

</pre>