[103356] trunk/dports/science/KlustaKwik
larryv at macports.org
larryv at macports.org
Fri Feb 22 12:18:51 PST 2013
Revision: 103356
https://trac.macports.org/changeset/103356
Author: larryv at macports.org
Date: 2013-02-22 12:18:51 -0800 (Fri, 22 Feb 2013)
Log Message:
-----------
maskedKlustaKwik: New subport of Klustakwik (#38146).
KlustaKwik: Make openmaintainer; rename patch; mark as not installing libs.
Modified Paths:
--------------
trunk/dports/science/KlustaKwik/Portfile
Added Paths:
-----------
trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff
trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff
Removed Paths:
-------------
trunk/dports/science/KlustaKwik/files/patch-makefile.diff
Modified: trunk/dports/science/KlustaKwik/Portfile
===================================================================
--- 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)
@@ -3,12 +3,10 @@
PortSystem 1.0
name KlustaKwik
-version 2.0.1
-revision 1
categories science
platforms darwin
license GPL-2
-maintainers gmail.com:FlorianFranzen
+maintainers gmail.com:FlorianFranzen openmaintainer
description A program for automatic clustering of continuous \
data into a mixture of Gaussians.
@@ -20,20 +18,66 @@
sort of data.
homepage http://sourceforge.net/projects/klustakwik/
-master_sites sourceforge:project/klustakwik/klustakwik/
use_bzip2 yes
-checksums rmd160 d9eff4ddbda85cfd4258eee64756955473ea1613 \
- sha256 a5ccaba9fd9383591023d03bcedf339de462f9dbd540b424c873b6648172cf7a
-patchfiles patch-makefile.diff
+patchfiles patch-${subport}-makefile.diff
use_configure no
variant universal {}
-build.target
-build.args CXX=${configure.cxx} \
+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} \
CXXFLAGS="[get_canonical_archflags cxx]"
+}
-destroot {
- xinstall ${worksrcpath}/KlustaKwik ${destroot}${prefix}/bin
+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 "Enable CPU-specific optimizations" {
+ # Blacklist compilers that do not support "-march=native".
+ 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="[get_canonical_archflags cxx]" \
+ LDFLAGS="[get_canonical_archflags ld]"
}
Copied: trunk/dports/science/KlustaKwik/files/patch-KlustaKwik-makefile.diff (from rev 103328, trunk/dports/science/KlustaKwik/files/patch-makefile.diff)
===================================================================
--- 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)
@@ -0,0 +1,6 @@
+--- 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
Deleted: trunk/dports/science/KlustaKwik/files/patch-makefile.diff
===================================================================
--- 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)
@@ -1,6 +0,0 @@
---- 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
Added: trunk/dports/science/KlustaKwik/files/patch-maskedKlustaKwik-makefile.diff
===================================================================
--- 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)
@@ -0,0 +1,52 @@
+--- 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) $<
++ $(CXX) $(CFLAGS) $<
+
+ linalg.o: linalg.cpp linalg.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
+
+ log.o: log.cpp log.h parameters.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
+
+ klustakwik.o: klustakwik.cpp klustakwik.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
+
+ parameters.o: parameters.cpp parameters.h log.h util.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
+
+ precomputations.o: precomputations.cpp klustakwik.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
+
+ util.o: util.cpp util.h
+- $(CC) $(CFLAGS) $<
++ $(CXX) $(CFLAGS) $<
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130222/ebf59dc1/attachment.html>
More information about the macports-changes
mailing list