<!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>[138156] trunk/dports/math/octave-nan</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/138156">138156</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-06-30 11:43:13 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-nan: update to 2.8.0; addresses ticket #48185.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavenanPortfile">trunk/dports/math/octave-nan/Portfile</a></li>
<li><a href="#trunkdportsmathoctavenanfilespatchsrc_Makefilediff">trunk/dports/math/octave-nan/files/patch-src_Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavenanPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-nan/Portfile (138155 => 138156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/Portfile 2015-06-30 18:41:19 UTC (rev 138155)
+++ trunk/dports/math/octave-nan/Portfile 2015-06-30 18:43:13 UTC (rev 138156)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup octave 1.0
</span><span class="cx">
</span><del>-octave.setup nan 2.7.1
</del><ins>+octave.setup nan 2.8.0
</ins><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3+
</span><span class="cx"> maintainers gmail.com:mschamschula openmaintainer
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> data with and without missing values.
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-checksums rmd160 64dc7bffcbbf9873ae22a8f45ae3dc0ee7c3d15b \
- sha256 70093926a9d980810c8e665f8bdd2931a7b9ec0c765326eb193341fb0aa665af
</del><ins>+checksums rmd160 06e5e8927073407f05f6e412be354e3b9afc9abf \
+ sha256 ccab738e704fab44aa09ed4b94c6fad523f45c2c73d4492eb776dd1473a24346
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-src_Makefile.diff
</span></span></pre></div>
<a id="trunkdportsmathoctavenanfilespatchsrc_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-nan/files/patch-src_Makefile.diff (138155 => 138156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2015-06-30 18:41:19 UTC (rev 138155)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2015-06-30 18:43:13 UTC (rev 138156)
</span><span class="lines">@@ -1,8 +1,24 @@
</span><del>---- src/Makefile.orig 2015-01-24 09:51:25.000000000 -0600
-+++ src/Makefile 2015-01-24 18:32:57.000000000 -0600
-@@ -12,38 +12,18 @@
</del><ins>+--- src/Makefile.orig 2015-06-24 08:53:57.000000000 -0400
++++ src/Makefile 2015-06-30 13:56:18.000000000 -0400
+@@ -1,38 +1,20 @@
+ ####################################################
+-# Copyright 2010, 2011,2012 Alois Schloegl
+-# This is part of the NaN-toolbox - a statistics and machine learning toolbox for data with and without missing values.
++# Copyright 2010, 2011,2012 Alois Schloegl
++# This is part of the NaN-toolbox - a statistics and machine learning toolbox for data with and without missing values.
+ # http://pub.ist.ac.at/~schloegl/matlab/NaN/
+ ####################################################
+
+-### modify directories according to your needs
++### modify directories according to your needs
+
+-# Define non-default octave-version
++# Define non-default octave-version
+ # Octave - global install (e.g. from debian package)
+-# OCTAVE_VERSION=
++# OCTAVE_VERSION=
</ins><span class="cx"> # Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
</span><del>- #OCTAVE_VERSION=-3.8.2
</del><ins>+ # OCTAVE_VERSION=-3.6.3
</ins><span class="cx">
</span><span class="cx"> -# Matlab configuration
</span><span class="cx"> -#MATLABDIR = /usr/local/MATLAB/R2010b
</span><span class="lines">@@ -22,77 +38,112 @@
</span><span class="cx"> -# http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
</span><span class="cx"> -# Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
</span><span class="cx"> -####################################################
</span><del>--
</del><ins>+-MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
</ins><span class="cx"> -CC = gcc
</span><span class="cx"> -CXX = g++
</span><ins>++MKOCTFILE ?= mkoctfile
</ins><span class="cx"> +#CC = gcc
</span><span class="cx"> +#CXX = g++
</span><del>- CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC
--OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
-+OCTMEX = mkoctfile --mex
</del><ins>+ CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2
+ OCTMEX = $(MKOCTFILE) --mex
</ins><span class="cx"> RM = rm
</span><del>-
- ifeq (Linux,$(shell uname))
- CFLAGS += -fopenmp
- MEX_OPTION += -lgomp
</del><ins>+@@ -41,120 +23,50 @@
+ CFLAGS += -fPIC
</ins><span class="cx"> endif
</span><span class="cx">
</span><del>- MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
</del><ins>+-ifneq (Darwin,$(shell uname))
+-CFLAGS += -fopenmp
+-MEX_OPTION += -lgomp
+-endif
+-
+-MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
</ins><span class="cx"> -MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
</span><del>-
- PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
-
-@@ -51,28 +31,7 @@
- mex4o octave: $(PROGS)
-
-
</del><ins>+-
+-PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
+-
+-### per default only the mex-files for octave are built
+-mex4o octave: $(PROGS)
+-
+-
</ins><span class="cx"> -### Matlab configuration - search for a matlab directory if not defined above
</span><del>--ifndef MATLABDIR
</del><ins>+-ifeq (,$(MATLABDIR))
</ins><span class="cx"> - ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
</span><del>-- # use oldest, typically mex-files a compatible with newer Matlab versions
-- MATLABDIR=/usr/local/MATLAB/$(shell ls -1t /usr/local/MATLAB/ |grep "^R*" |head -1)
-- # alternatively, use latest matlab version
-- #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
</del><ins>+- # use oldest, typically mex-files are compatible with newer Matlab versions
+- MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/ |grep "^R20*" |head -1)
</ins><span class="cx"> - endif
</span><del>--endif
--
--### if the MATLABDIR has been found or defined
--ifneq (,MATLABDIR)
</del><ins>++ifneq (Darwin,$(shell uname))
++CFLAGS += -fopenmp
++MEX_OPTION += -lgomp
+ endif
+
++MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
+
+-### if MATLABDIR has been found or defined
+-ifneq (,$(MATLABDIR))
</ins><span class="cx"> - ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
</span><span class="cx"> - MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
</span><span class="cx"> - mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
</span><span class="cx"> - endif
</span><span class="cx"> -endif
</span><del>--
--
</del><ins>++PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
+
++### per default only the mex-files for octave are built
++octave: $(PROGS)
+
</ins><span class="cx"> -mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
</span><span class="cx"> -mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
</span><span class="cx"> -all: octave win32 win64 mex4m
</span><del>-+all: octave mex4m
</del><ins>++all: octave
</ins><span class="cx">
</span><span class="cx"> clean:
</span><del>- -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
-@@ -80,15 +39,13 @@
- #$(PROGS): Makefile
</del><ins>+- -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
+-
+-#$(PROGS): Makefile
++ -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
</ins><span class="cx">
</span><span class="cx"> #########################################################
</span><span class="cx"> -# Octave, MATLAB on Linux
</span><span class="cx"> +# Octave
</span><span class="cx"> #########################################################
</span><del>- %.oct: %.cc
- mkoctfile$(OCTAVE_VERSION) "$<"
-
- %.mex: %.cpp
- $(OCTMEX) "$<"
</del><ins>++
+ svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
+ env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
+-svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
+- $(MATMEX) "$<" svm.o svm_model_matlab.o
</ins><span class="cx"> -%.$(MEX_EXT): %.cpp
</span><span class="cx"> - $(MATMEX) "$<"
</span><span class="cx">
</span><del>- svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
- $(CXX) $(CFLAGS) -c svm.cpp
-@@ -117,46 +74,3 @@
</del><ins>+-svm_model_octave.o: svm_model_matlab.c
++svm_model_octave.o: svm_model_matlab.c
+ env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
+-svm_model_matlab.o: svm_model_matlab.c
+- $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"
++
++svm_model_matlab.o: svm_model_matlab.c
++ $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"
++
+ svm.o: svm.cpp
+ $(CC) $(CFLAGS) -c svm.cpp
+
+-train.$(MEX_EXT) predict.$(MEX_EXT): train.c tron.o linear.o linear_model_matlab.c
+- $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
+- $(MATMEX) -lblas train.c tron.o linear.o linear_model_matlab.o
+- #$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
+ train.mex predict.mex: train.c tron.o linear.o linear_model_matlab.c
+ env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
++
+ linear.o: linear.cpp
+ $(CXX) $(CFLAGS) -c linear.cpp
++
</ins><span class="cx"> tron.o: tron.cpp tron.h
</span><span class="cx"> $(CXX) $(CFLAGS) -c tron.cpp
</span><span class="cx">
</span><ins>+ %.oct: %.cc
+- mkoctfile$(OCTAVE_VERSION) "$<"
++ $(MKOCTFILE) "$<"
+
+ %.mex: %.cpp
+ $(OCTMEX) "$<"
</ins><span class="cx"> -
</span><span class="cx"> -#########################################################
</span><span class="cx"> -# MATLAB/WIN32
</span></span></pre>
</div>
</div>
</body>
</html>