<!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>[128836] 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/128836">128836</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-11-27 17:53:35 -0800 (Thu, 27 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-nan: Update to 2.5.9 (#46035)</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>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavenanfilespatchsrc_xptopencppdiff">trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.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 (128835 => 128836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/Portfile 2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/Portfile 2014-11-28 01:53:35 UTC (rev 128836)
</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.5.5
</del><ins>+octave.setup nan 2.5.9
</ins><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3+
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -12,8 +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 9ebae4103080376b5d7f0f2eec27ff797e709c31 \
- sha256 1c8d03a8bb797bffed7ec1fe40c5b876fdc8e18e5d9c13093a24c68a5f9adeff
</del><ins>+checksums rmd160 cbc3722cf37d967a9496a936cf20117bcd42af36 \
+ sha256 3259c594117c7b9761c070b7f0438271076e83e9b8623e518ea145a11481196d
</ins><span class="cx">
</span><del>-patchfiles patch-src_Makefile.diff \
- patch-src_xptopen.cpp.diff
</del><ins>+patchfiles patch-src_Makefile.diff
</ins></span></pre></div>
<a id="trunkdportsmathoctavenanfilespatchsrc_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-nan/files/patch-src_Makefile.diff (128835 => 128836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2014-11-28 01:53:35 UTC (rev 128836)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- src/Makefile.orig 2013-11-16 12:10:11.000000000 -0500
-+++ src/Makefile 2013-11-16 13:32:54.000000000 -0500
-@@ -28,15 +28,20 @@
</del><ins>+--- src/Makefile.orig 2014-01-12 13:51:33.000000000 -0600
++++ src/Makefile 2014-11-27 18:44:06.000000000 -0600
+@@ -31,15 +31,21 @@
</ins><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><span class="cx">
</span><span class="lines">@@ -10,11 +10,12 @@
</span><span class="cx"> +#CXX = g++
</span><span class="cx"> CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC
</span><span class="cx"> -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
</span><ins>++#OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
</ins><span class="cx"> +MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
</span><span class="cx"> +OCTMEX = $(MKOCTFILE) --mex
</span><span class="cx"> RM = rm
</span><span class="cx">
</span><del>- MEX_OPTION += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
</del><ins>+ MEX_OPTION += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
</ins><span class="cx"> MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
</span><span class="cx">
</span><span class="cx"> +FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
</span><span class="lines">@@ -23,8 +24,8 @@
</span><span class="cx"> +
</span><span class="cx"> 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
</span><span class="cx">
</span><del>- mex4o octave: $(PROGS)
-@@ -58,18 +63,16 @@
</del><ins>+ ### per default only the mex-files for octave are built
+@@ -78,18 +84,16 @@
</ins><span class="cx"> # Octave, MATLAB on Linux
</span><span class="cx"> #########################################################
</span><span class="cx"> %.oct: %.cc
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
</span><span class="cx"> $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
</span><del>-@@ -78,12 +81,12 @@
</del><ins>+@@ -98,12 +102,12 @@
</ins><span class="cx"> $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
</span><span class="cx">
</span><span class="cx"> train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c
</span></span></pre></div>
<a id="trunkdportsmathoctavenanfilespatchsrc_xptopencppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff (128835 => 128836)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff 2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff 2014-11-28 01:53:35 UTC (rev 128836)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- src/xptopen.cpp.orig 2013-11-16 13:29:34.000000000 -0500
-+++ src/xptopen.cpp 2013-11-16 13:29:49.000000000 -0500
-@@ -83,12 +83,10 @@
- #define __BYTE_ORDER __LITTLE_ENDIAN
- #endif
-
--#if (defined(BSD) && (BSD >= 199103))
- #include <machine/endian.h>
--#define __BIG_ENDIAN _BIG_ENDIAN
--#define __LITTLE_ENDIAN _LITTLE_ENDIAN
--#define __BYTE_ORDER _BYTE_ORDER
--#endif
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#define __BYTE_ORDER BYTE_ORDER
-
- #ifndef _BYTESWAP_H
- /* define our own version - needed for Max OS X*/
</del></span></pre>
</div>
</div>
</body>
</html>