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

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8a43e5b741f96fdda4eb0bc3a32f4f8675e31beb">https://github.com/macports/macports-ports/commit/8a43e5b741f96fdda4eb0bc3a32f4f8675e31beb</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 8a43e5b741f netpbm: Fix location of rgb.txt for tests
</span>8a43e5b741f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8a43e5b741f96fdda4eb0bc3a32f4f8675e31beb
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Dec 22 00:45:09 2024 -0600

<span style='display:block; white-space:pre;color:#404040;'>    netpbm: Fix location of rgb.txt for tests
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Previously, rgb.txt was installed in the destroot directory during the
</span><span style='display:block; white-space:pre;color:#404040;'>    build phase, then tests were run in the test phase using that rgb.txt,
</span><span style='display:block; white-space:pre;color:#404040;'>    then in the destroot phase that rgb.txt was deleted since it would
</span><span style='display:block; white-space:pre;color:#404040;'>    conflict with the one installed by the libnetpbm port.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    MacPorts 2.9.0 broke several of the tests by making the destroot phase a
</span><span style='display:block; white-space:pre;color:#404040;'>    prerequisite for the test phase since now the local rgb.txt would be
</span><span style='display:block; white-space:pre;color:#404040;'>    deleted before the tests were run; see
</span><span style='display:block; white-space:pre;color:#404040;'>    macports/macports-base@ddc26554e6ed49ce8501069b967284739fa6d34e .
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fix this by telling the test phase to use the rgb.txt installed by the
</span><span style='display:block; white-space:pre;color:#404040;'>    libnetpbm port.
</span>---
 graphics/netpbm/Portfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/netpbm/Portfile b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9984ff8198f..186a30c9ffb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/netpbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,6 +208,7 @@ if {${subport} eq ${name}} {
</span>     test.run            yes
     test.target         check
     test.args           ${destroot.destdir} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        RGBDEF=${prefix}/share/netpbm/rgb.txt \
</span>                         resultdir=${workpath}/test \
                         tmpdir=${workpath}/.tmp
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +234,7 @@ if {${subport} eq ${name}} {
</span>     variant x11 description {Build the pamx image viewer} {
         global want_x11
         set want_x11            Y
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_build-append    port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append    path:bin/pkg-config:pkgconfig
</span>         depends_lib-append      port:xorg-libX11
     }
 
</pre><pre style='margin:0'>

</pre>