<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/9a1547b1a7e7514a4687730abf669c21040febba">https://github.com/macports/macports-ports/commit/9a1547b1a7e7514a4687730abf669c21040febba</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 9a1547b  dcmtk: Add jpeg dependency and small patch
</span>9a1547b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9a1547b1a7e7514a4687730abf669c21040febba
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Fri Feb 8 09:17:30 2019 -0600

<span style='display:block; white-space:pre;color:#404040;'>    dcmtk: Add jpeg dependency and small patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    DCMTK uses a generic PACKAGE_VERSION (and friends) macro; rename this
</span><span style='display:block; white-space:pre;color:#404040;'>    to PACKAGE_(...)_DCMTK to be unique.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    revbump since this changes the resulting installation.
</span>---
 graphics/dcmtk/Portfile | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

<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 77007a4..411724e 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;'>@@ -7,7 +7,7 @@ PortGroup               github 1.0
</span> 
 github.setup            DCMTK dcmtk 3.6.4 DCMTK-
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                1
</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;'>@@ -30,8 +30,6 @@ long_description        DCMTK is a collection of libraries and applications    \
</span> 
 homepage                http://dicom.offis.de/dcmtk
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname                DCMTK-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums \
     rmd160  3cec9851ec086d4bbb7087310e0ee087bf013fbb \
     sha256  6ae2dbae581ad5ea799d4c4546c6bad8a1782e7acd06a6497c7fb4f2f4bfee42 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +44,8 @@ conflicts_build         ${name}
</span> 
 depends_lib             port:zlib \
                         port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:tcp_wrappers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:tcp_wrappers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        port:jpeg
</span> 
 configure.args-append   -DDCMTK_WITH_TIFF=OFF \
                         -DDCMTK_WITH_PNG=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +59,18 @@ configure.args-append   -DDCMTK_WITH_TIFF=OFF \
</span>                         -DDCMTK_WITH_WRAP=ON \
                         -DDCMTK_ENABLE_CXX11=OFF
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # DCMTK by default installs headers with PACKAGE_VERSION and friends
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # defined, rather than some more unique name. We'll just change that for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # them...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set replstring \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      {s/[[:<:]](PACKAGE_(VERSION(_SUFFIX|_NUMBER)?|DATE|NAME|STRING))[[:>:]]/\1_DCMTK/g} 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Yes, yes, reinplace etc. There are some files that sed chokes on if I
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # just iterate over all of them. Plus this is much faster.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      "grep --null -lr PACKAGE_ . | xargs -0 sed -i '' -E '${replstring}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-configure {
     # 7921b2e in base creates symlinks, bypassing the github portgroup's move
     # which would be OK, except Doxygen doesn't seem to like being pointed to a
</pre><pre style='margin:0'>

</pre>