<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f4bbe69b73d95d6e9c76199337ca55cb81a9f6cf">https://github.com/macports/macports-ports/commit/f4bbe69b73d95d6e9c76199337ca55cb81a9f6cf</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 f4bbe69  poppler: really fix self-build conflict
</span>f4bbe69 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f4bbe69b73d95d6e9c76199337ca55cb81a9f6cf
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jun 10 17:05:28 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    poppler: really fix self-build conflict
</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 | 5 +++++
 1 file changed, 5 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 46c2e71..fa8edc9 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;'>@@ -47,6 +47,11 @@ depends_lib-append  port:bzip2 \
</span>                     port:tiff \
                     port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove top-level paths, such that internal headers and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libraries are used instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-delete -I${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.ldflags-append -liconv
 gobject_introspection yes
 
</pre><pre style='margin:0'>

</pre>