<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ca3b81308145cd49280ceed72b22e5222b58bbfb">https://github.com/macports/macports-ports/commit/ca3b81308145cd49280ceed72b22e5222b58bbfb</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 ca3b8130814 poppler: reconcile with poppler-devel
</span>ca3b8130814 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ca3b81308145cd49280ceed72b22e5222b58bbfb
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 6 17:43:38 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    poppler: reconcile with poppler-devel
</span>---
 graphics/poppler/Portfile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

<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 62dfedf4fa4..4cdb28eff6a 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;'>@@ -6,10 +6,11 @@ PortGroup           cmake 1.1
</span> PortGroup           legacysupport 1.1
 
 name                poppler
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts           poppler-devel xpdf-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name         poppler
</span> version             22.04.0
 revision            0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts           xpdf-tools
</span> license             GPL-2+
 maintainers         {devans @dbevans} {mascguy @mascguy} openmaintainer
 categories          graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,6 +23,9 @@ long_description    {*}${description}
</span> master_sites        ${homepage} \
                     gentoo
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir         ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_xz              yes
 
 checksums           rmd160  e1af1049b6bc221f21260b86b551abccf3efd375 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +108,7 @@ variant boost description "Use Boost when building the Splash graphics backend"
</span> }
 default_variants-append +boost
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport poppler-qt5 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-qt5 {
</span>     PortGroup qt5 1.0
 
     qt5.min_version         5.5.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +128,7 @@ subport poppler-qt5 {
</span> if {${subport} ne ${name}} {
     depends_extract-append  port:git
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:${name}
</span> 
     post-extract {
         system -W ${workpath} "${prefix}/bin/git clone --depth=1 https://anongit.freedesktop.org/git/poppler/test"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,4 +157,4 @@ if {${subport} ne ${name}} {
</span> 
 livecheck.type      regex
 livecheck.url       ${homepage}releases.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex     "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span></pre><pre style='margin:0'>

</pre>