<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c428369fe630ad427ce564bde887d5880daa09d8">https://github.com/macports/macports-ports/commit/c428369fe630ad427ce564bde887d5880daa09d8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c428369fe630ad427ce564bde887d5880daa09d8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Jun 28 08:59:12 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> dcmtk: avoid conflict with CharLS port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> dcmtk installs its own version of CharLS library.
</span>---
graphics/dcmtk/Portfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/Portfile b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 084ffa2..4fc8c9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup github 1.0
</span>
github.setup DCMTK dcmtk 3.6.4 DCMTK-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> set unpatched_version [lindex [split ${version} _] 0]
set stripped_version [string map {. ""} ${unpatched_version}]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,6 +130,13 @@ if {[variant_isset doc]} {
</span>
destroot.args docdir=${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # avoid conflict with other MacPorts libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {charls} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/lib${lib}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.cmd env DYLD_LIBRARY_PATH=${cmake.build_dir}/lib make
test.target -j 1 test
</pre><pre style='margin:0'>
</pre>