<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128998] trunk/dports/graphics/dcmtk/Portfile</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128998">128998</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-12-02 12:09:46 -0800 (Tue, 02 Dec 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>dcmtk: Move all platforms to snapshot release. Use cmake build; now produces dynamic libraries.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsdcmtkPortfile">trunk/dports/graphics/dcmtk/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsdcmtkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/dcmtk/Portfile (128997 => 128998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/dcmtk/Portfile        2014-12-02 20:00:04 UTC (rev 128997)
+++ trunk/dports/graphics/dcmtk/Portfile        2014-12-02 20:09:46 UTC (rev 128998)
</span><span class="lines">@@ -4,10 +4,15 @@
</span><span class="cx"> PortGroup               muniversal 1.0
</span><span class="cx"> 
</span><span class="cx"> name                    dcmtk
</span><del>-version                 3.6.0
-revision                4
-set unpatched_version   [lindex [split ${version} _] 0]
-set stripped_version    [string map {. &quot;&quot;} ${unpatched_version}]
</del><ins>+PortGroup               cmake 1.0
+
+# 3.6.0 is almost 4 years old, with no 3.6.1 &quot;release&quot; in sight. Moving to
+# snapshot for support of Yosemite as well as numerous bug fixes / updates.
+
+version                 3.6.1_20140617
+revision                0
+#set unpatched_version   [lindex [split ${version} _] 0]
+#set stripped_version    [string map {. &quot;&quot;} ${unpatched_version}]
</ins><span class="cx"> categories              graphics
</span><span class="cx"> platforms               darwin
</span><span class="cx"> license                 {BSD Apache-2}
</span><span class="lines">@@ -28,107 +33,95 @@
</span><span class="cx"> 
</span><span class="cx"> homepage                http://dicom.offis.de/dcmtk
</span><span class="cx"> 
</span><del>-master_sites \
</del><ins>+#Go back to non-snapshots once a new release finally comes...
+#master_sites \
</ins><span class="cx">  ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk${stripped_version}/ \
</span><span class="cx">  http://dicom.offis.de/download/dcmtk/dcmtk${stripped_version}/
</span><ins>+master_sites            http://dicom.offis.de/download/dcmtk/snapshot/ \
+                        http://dicom.offis.de/download/dcmtk/snapshot/old/
</ins><span class="cx"> 
</span><del>-distname                ${name}-${unpatched_version}
</del><ins>+distname                ${name}-${version}
</ins><span class="cx"> 
</span><del>-checksums               md5     19409e039e29a330893caea98715390e \
-                        sha1    469e017cffc56f36e834aa19c8612111f964f757 \
-                        rmd160  ad80a4b6cff9ed275e6153036bdce9e2d912721b
</del><ins>+checksums \
+    rmd160  cdd103fbf3bf526909ae29f854623f634fff6d66 \
+    sha256  c0aab5a3809e20f8b4eae2f181c77a1668d0665e86a590821a59808f45656cdc
</ins><span class="cx"> 
</span><del>-platform darwin {
-    if {${os.major} &gt;= 13} {
-        pre-activate {
-            ui_warn &quot;${subport} uses a pre-release (snapshot) on Mavericks and later.&quot;
-        }
-        version             3.6.1_20140617
-        revision            0
-        distname            ${name}-${version}
-        checksums           rmd160  cdd103fbf3bf526909ae29f854623f634fff6d66 \
-                            sha256  c0aab5a3809e20f8b4eae2f181c77a1668d0665e86a590821a59808f45656cdc
-        master_sites        http://dicom.offis.de/download/dcmtk/snapshot/ \
-                            http://dicom.offis.de/download/dcmtk/snapshot/old/
-    } else {
-        # TODO: This project has buggy C++ which clang rejects
-        compiler.blacklist-append *clang*
-        patchfiles              patch-config-configure.diff
-    }
-}
</del><ins>+compiler.whitelist      clang macports-clang-3.5
+build.target            all
</ins><span class="cx"> 
</span><del>-depends_lib             port:libiconv \
-                        port:zlib
</del><ins>+depends_lib             port:zlib \
+                        port:libiconv \
+                        port:tcp_wrappers \
+                        port:libsndfile
</ins><span class="cx"> 
</span><ins>+configure.args-append   -DDCMTK_WITH_TIFF=OFF \
+                        -DDCMTK_WITH_PNG=OFF \
+                        -DDCMTK_WITH_OPENSSL=OFF \
+                        -DDCMTK_WITH_XML=OFF \
+                        -DDCMTK_WITH_ICONV=ON \
+                        -DDCMTK_WITH_PRIVATE_TAGS=OFF \
+                        -DDCMTK_WITH_DOXYGEN=OFF \
+                        -DBUILD_SHARED_LIBS=ON \
+                        -DDCMTK_WITH_SNDFILE=ON \
+                        -DDCMTK_WITH_WRAP=ON
</ins><span class="cx"> 
</span><del>-# To enable building while previous version is in ${prefix}
-
-post-extract {
-  reinplace &quot;s|\$\(LDFLAGS\) \$\(LIBDIRS\)|\$(LIBDIRS) \$(LDFLAGS)|g&quot; \
-            ${worksrcpath}/dcmdata/apps/Makefile.in \
-            ${worksrcpath}/dcmdata/libsrc/Makefile.in \
-            ${worksrcpath}/dcmdata/tests/Makefile.in \
-            ${worksrcpath}/dcmimage/apps/Makefile.in \
-            ${worksrcpath}/dcmimgle/apps/Makefile.in \
-            ${worksrcpath}/dcmjpeg/apps/Makefile.in \
-            ${worksrcpath}/dcmjpls/apps/Makefile.in \
-            ${worksrcpath}/dcmnet/apps/Makefile.in \
-            ${worksrcpath}/dcmpstat/apps/Makefile.in \
-            ${worksrcpath}/dcmpstat/jni/Makefile.in \
-            ${worksrcpath}/dcmpstat/tests/Makefile.in \
-            ${worksrcpath}/dcmqrdb/apps/Makefile.in \
-            ${worksrcpath}/dcmsign/apps/Makefile.in \
-            ${worksrcpath}/dcmsr/apps/Makefile.in \
-            ${worksrcpath}/dcmsr/tests/Makefile.in \
-            ${worksrcpath}/dcmwlm/apps/Makefile.in \
-            ${worksrcpath}/dcmwlm/tests/Makefile.in \
-            ${worksrcpath}/dcmwlm/wwwapps/Makefile.in \
-            ${worksrcpath}/ofstd/tests/Makefile.in
</del><ins>+variant doc description &quot;Install documentation&quot; {
+    depends_build-append    port:doxygen \
+                            port:graphviz
+    build.target-append     DOXYGEN
+    configure.args-delete   -DDCMTK_WITH_DOXYGEN=OFF
+    configure.args-append   -DDCMTK_WITH_DOXYGEN=ON
+    post-patch {
+        reinplace -E &quot;s/^(HAVE_DOT.*)NO/\\1YES/&quot; doxygen/htmldocs.cfg
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-configure.args-append   --without-libtiff \
-                        --without-libpng \
-                        --without-openssl \
-                        --without-libxml
-
-destroot.target-append  install-lib
-
-use_parallel_build      no
-
</del><span class="cx"> variant private description &quot;Install private tags dictionary&quot; {
</span><del>-  configure.args-append --with-private-tags
</del><ins>+    configure.args-delete   -DDCMTK_WITH_PRIVATE_TAGS=OFF
+    configure.args-append   -DDCMTK_WITH_PRIVATE_TAGS=ON
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-variant doc description &quot;Install html documentation&quot; {
-  destroot.target-delete install-lib
-  destroot.target-append install-all
-  depends_build-append  port:doxygen
-}
-
</del><span class="cx"> variant png description &quot;Enable png support&quot; {
</span><del>-  depends_lib-append    port:libpng
-  configure.args-delete --without-libpng  
</del><ins>+    depends_lib-append      port:libpng
+    configure.args-delete   -DDCMTK_WITH_PNG=OFF
+    configure.args-append   -DDCMTK_WITH_PNG=ON
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant ssl description &quot;Enable openssl support&quot; {
</span><del>-  depends_lib-append    port:openssl
-  configure.args-delete --without-openssl  
</del><ins>+    depends_lib-append      port:openssl
+    configure.args-delete   -DDCMTK_WITH_OPENSSL=OFF
+    configure.args-append   -DDCMTK_WITH_OPENSSL=ON
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant tiff description &quot;Enable tiff support&quot; {
</span><del>-  depends_lib-append    port:tiff
-  configure.args-delete --without-libtiff  
</del><ins>+    depends_lib-append      port:tiff
+    configure.args-delete   -DDCMTK_WITH_TIFF=OFF
+    configure.args-append   -DDCMTK_WITH_TIFF=ON
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> variant xml description &quot;Enable xml support&quot; {
</span><del>-  depends_lib-append    port:libxml2
-  configure.args-delete --without-libxml  
</del><ins>+    depends_lib-append      port:libxml2
+    configure.args-delete   -DDCMTK_WITH_XML=OFF
+    configure.args-append   -DDCMTK_WITH_XML=ON
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> default_variants        +png +ssl +tiff +xml
</span><span class="cx"> 
</span><ins>+if {[variant_isset doc]} {
+    post-destroot {
+        # Don't really want these man pages.
+        system -W ${destroot}${prefix}/share/man/man1 &quot;rm -f *_${distname}_*&quot;
+    }
+    set DOCDIR          file://${prefix}/share/doc/dcmtk/html/index.html
+    notes               &quot;DCMTK documentation available at:\n  ${DOCDIR}&quot;
+}
+
</ins><span class="cx"> destroot.args           docdir=${prefix}/share/doc/${name}
</span><span class="cx"> 
</span><ins>+test.run                yes
+test.cmd                env DYLD_LIBRARY_PATH=${worksrcpath}/lib make
+test.target             -j 1 test
+
</ins><span class="cx"> livecheck.type          regex
</span><span class="cx"> livecheck.regex         {dcmtk\-(\d+(?:\.\d+)*).tar.gz}
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>