<!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>[103356] trunk/dports/science/KlustaKwik</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/103356">103356</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2013-02-22 12:18:51 -0800 (Fri, 22 Feb 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>maskedKlustaKwik: New subport of Klustakwik (#38146).

KlustaKwik: Make openmaintainer; rename patch; mark as not installing libs.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceKlustaKwikPortfile">trunk/dports/science/KlustaKwik/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceKlustaKwikfilespatchKlustaKwikmakefilediff">trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff</a></li>
<li><a href="#trunkdportsscienceKlustaKwikfilespatchmaskedKlustaKwikmakefilediff">trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceKlustaKwikfilespatchmakefilediff">trunk/dports/science/KlustaKwik/files/patch-makefile.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceKlustaKwikPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/KlustaKwik/Portfile (103355 => 103356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/KlustaKwik/Portfile        2013-02-22 20:09:40 UTC (rev 103355)
+++ trunk/dports/science/KlustaKwik/Portfile        2013-02-22 20:18:51 UTC (rev 103356)
</span><span class="lines">@@ -3,12 +3,10 @@
</span><span class="cx"> PortSystem              1.0
</span><span class="cx"> 
</span><span class="cx"> name                    KlustaKwik
</span><del>-version                 2.0.1
-revision                1
</del><span class="cx"> categories              science
</span><span class="cx"> platforms               darwin
</span><span class="cx"> license                 GPL-2
</span><del>-maintainers             gmail.com:FlorianFranzen
</del><ins>+maintainers             gmail.com:FlorianFranzen openmaintainer
</ins><span class="cx"> 
</span><span class="cx"> description             A program for automatic clustering of continuous \
</span><span class="cx">                         data into a mixture of Gaussians.
</span><span class="lines">@@ -20,20 +18,66 @@
</span><span class="cx">                         sort of data.
</span><span class="cx"> homepage                http://sourceforge.net/projects/klustakwik/
</span><span class="cx"> 
</span><del>-master_sites            sourceforge:project/klustakwik/klustakwik/
</del><span class="cx"> use_bzip2               yes
</span><del>-checksums               rmd160  d9eff4ddbda85cfd4258eee64756955473ea1613 \
-                        sha256  a5ccaba9fd9383591023d03bcedf339de462f9dbd540b424c873b6648172cf7a
</del><span class="cx"> 
</span><del>-patchfiles              patch-makefile.diff
</del><ins>+patchfiles              patch-${subport}-makefile.diff
</ins><span class="cx"> 
</span><span class="cx"> use_configure           no
</span><span class="cx"> variant universal {}
</span><span class="cx"> 
</span><del>-build.target
-build.args              CXX=${configure.cxx} \
</del><ins>+installs_libs           no
+destroot {
+    xinstall ${worksrcpath}/${name} ${destroot}${prefix}/bin
+}
+
+if {${name} == ${subport}} {
+    version             2.0.1
+    revision            1
+    conflicts           maskedKlustaKwik
+
+    master_sites        sourceforge:project/klustakwik/klustakwik/
+    checksums           rmd160  d9eff4ddbda85cfd4258eee64756955473ea1613 \
+                        sha256  a5ccaba9fd9383591023d03bcedf339de462f9dbd540b424c873b6648172cf7a
+
+    build.target
+    build.args          CXX=${configure.cxx} \
</ins><span class="cx">                         CXXFLAGS=&quot;[get_canonical_archflags cxx]&quot;
</span><ins>+}
</ins><span class="cx"> 
</span><del>-destroot {
-    xinstall ${worksrcpath}/KlustaKwik ${destroot}${prefix}/bin
</del><ins>+subport maskedKlustaKwik {
+    version             3.0.2
+    conflicts           KlustaKwik
+
+    long_description    ${long_description} This is the new masked \
+                        version of KlustaKwik, designed for large dense \
+                        electrode arrays.
+
+    master_sites        sourceforge:project/klustakwik/maskedKlustaKwik/
+    # Distfile decompresses to a tar file with no extension. Seriously.
+    extract.suffix      .bz2
+    checksums           rmd160  1d723b72ed17c285a160856c4f3131c1f3451896 \
+                        sha256  acdd9a71675d2c0b64809d7f67118eebdb42df1eddfc170b9a00fc8a37dac5b6
+
+    worksrcdir          MKK_sourceforge
+
+    variant native description &quot;Enable CPU-specific optimizations&quot; {
+        # Blacklist compilers that do not support &quot;-march=native&quot;.
+        compiler.blacklist  macports-llvm-gcc-4.2 llvm-gcc-4.2 \
+                            apple-gcc-4.2 apple-gcc-4.0 \
+                            gcc-4.2 gcc-4.0 gcc-3.3
+
+        # Use MacPorts' clang if fallback compiler is unsupported.
+        # TODO: Remove when base fallback lists are updated (2.2?).
+        if {[regexp {llvm-gcc|apple-gcc|^gcc} ${configure.compiler}]} {
+            configure.compiler              macports-clang-3.2
+            depends_build-append            port:clang-3.2
+            depends_skip_archcheck-append   clang-3.2
+        }
+
+        build.target        native
+    }
+
+    build.args          CXX=${configure.cxx} \
+                        CXXFLAGS=&quot;[get_canonical_archflags cxx]&quot; \
+                        LDFLAGS=&quot;[get_canonical_archflags ld]&quot;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsscienceKlustaKwikfilespatchKlustaKwikmakefiledifffromrev103328trunkdportsscienceKlustaKwikfilespatchmakefilediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff (from rev 103328, trunk/dports/science/KlustaKwik/files/patch-makefile.diff) (0 => 103356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff                                (rev 0)
+++ trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff        2013-02-22 20:18:51 UTC (rev 103356)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+--- makefile.orig        2005-09-08 12:38:42.000000000 -0400
++++ makefile        2013-02-21 23:39:57.000000000 -0500
+@@ -1,2 +1,2 @@
+ KlustaKwik: KlustaKwik.C
+-        g++ -g -O -o KlustaKwik KlustaKwik.C  param.c -lm
++        $(CXX) -g -O $(CXXFLAGS) -o KlustaKwik KlustaKwik.C  param.c -lm
</ins></span></pre></div>
<a id="trunkdportsscienceKlustaKwikfilespatchmakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/KlustaKwik/files/patch-makefile.diff (103355 => 103356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/KlustaKwik/files/patch-makefile.diff        2013-02-22 20:09:40 UTC (rev 103355)
+++ trunk/dports/science/KlustaKwik/files/patch-makefile.diff        2013-02-22 20:18:51 UTC (rev 103356)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>---- makefile.orig        2005-09-08 12:38:42.000000000 -0400
-+++ makefile        2013-02-21 23:39:57.000000000 -0500
-@@ -1,2 +1,2 @@
- KlustaKwik: KlustaKwik.C
--        g++ -g -O -o KlustaKwik KlustaKwik.C  param.c -lm
-+        $(CXX) -g -O $(CXXFLAGS) -o KlustaKwik KlustaKwik.C  param.c -lm
</del></span></pre></div>
<a id="trunkdportsscienceKlustaKwikfilespatchmaskedKlustaKwikmakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff (0 => 103356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff                                (rev 0)
+++ trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff        2013-02-22 20:18:51 UTC (rev 103356)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+--- makefile.orig        2012-07-04 11:39:30.000000000 -0400
++++ makefile        2013-02-21 23:24:22.000000000 -0500
+@@ -7,8 +7,8 @@
+ CC = g++
+ DEBUG = -g
+ OPTIMISATIONS = -O3 -ffast-math
+-CFLAGS = -Wall -c -Wno-write-strings $(OPTIMISATIONS)
+-LFLAGS = -Wall
++CFLAGS = -Wall -c -Wno-write-strings $(OPTIMISATIONS) $(CXXFLAGS)
++LFLAGS = -Wall $(LDFLAGS)

+ all: executable

+@@ -24,7 +24,7 @@
+ .PHONY: all debug native executable clean

+ executable: $(OBJS)
+-        $(CC) $(LFLAGS) $(OBJS) -o $(PROGRAM)
++        $(CXX) $(LFLAGS) $(OBJS) -o $(PROGRAM)

+ clean:
+         \rm *.o $(PROGRAM)
+@@ -38,22 +38,22 @@
+ util.h: numerics.h

+ io.o: io.cpp klustakwik.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;

+ linalg.o: linalg.cpp linalg.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;

+ log.o: log.cpp log.h parameters.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;

+ klustakwik.o: klustakwik.cpp klustakwik.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;
+         
+ parameters.o: parameters.cpp parameters.h log.h util.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;

+ precomputations.o: precomputations.cpp klustakwik.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;

+ util.o: util.cpp util.h
+-        $(CC) $(CFLAGS) $&lt;
++        $(CXX) $(CFLAGS) $&lt;
</ins></span></pre>
</div>
</div>

</body>
</html>