<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/508a16373b11c97741666166b73bb13d269d3210">https://github.com/macports/macports-ports/commit/508a16373b11c97741666166b73bb13d269d3210</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 508a163  poppler: restore build conflict with current installed poppler
</span>508a163 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 508a16373b11c97741666166b73bb13d269d3210
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Aug 27 08:52:52 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    poppler: restore build conflict with current installed poppler
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Reverts: https://github.com/macports/macports-ports/commit/18c09e26c90050596ad6c20e7c181de06c03e917
</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/58574
</span>---
 graphics/poppler/Portfile | 4 ++++
 1 file changed, 4 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/poppler/Portfile b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25339d8..fd111db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/poppler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,6 +119,10 @@ if {${subport} ne ${name}} {
</span>                 ${destroot}${prefix}/lib/pkgconfig/poppler-splash.pc \
                 ${destroot}${prefix}/lib/pkgconfig/poppler.pc
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # generation of Poppler-0.18.gir fails if previous version of poppler is active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # appropriate for main poppler port only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    conflicts_build ${name}
</span> }
 
 livecheck.type      regex
</pre><pre style='margin:0'>

</pre>