<!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>[133974] 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/133974">133974</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-03-16 07:06:06 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-nan: update to 2.7.1 #46668</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 (133973 => 133974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/Portfile 2015-03-16 13:34:09 UTC (rev 133973)
+++ trunk/dports/math/octave-nan/Portfile 2015-03-16 14:06:06 UTC (rev 133974)
</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.9
</del><ins>+octave.setup nan 2.7.1
</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 cbc3722cf37d967a9496a936cf20117bcd42af36 \
- sha256 3259c594117c7b9761c070b7f0438271076e83e9b8623e518ea145a11481196d
</del><ins>+checksums rmd160 64dc7bffcbbf9873ae22a8f45ae3dc0ee7c3d15b \
+ sha256 70093926a9d980810c8e665f8bdd2931a7b9ec0c765326eb193341fb0aa665af
</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 (133973 => 133974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2015-03-16 13:34:09 UTC (rev 133973)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2015-03-16 14:06:06 UTC (rev 133974)
</span><span class="lines">@@ -1,66 +1,138 @@
</span><del>---- 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 @@
- # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
- ####################################################
</del><ins>+--- 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 @@
+ # Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
+ #OCTAVE_VERSION=-3.8.2
</ins><span class="cx">
</span><del>--CC = gcc
--CXX = g++
-+#CC = gcc
-+#CXX = g++
</del><ins>+-# Matlab configuration
+-#MATLABDIR = /usr/local/MATLAB/R2010b
+-# comment the following line if you use MATLAB on 32-bit operating system
+-MEX_OPTION += -largeArrayDims
+-
+-# Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
+-CROSS = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static-
+-CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static-
+-# include directory for Win32-Matlab include
+-W32MAT_INC = $(HOME)/bin/win32/Matlab/R2010b/extern/include/
+-W64MAT_INC = $(HOME)/bin/win64/Matlab/R2010b/extern/include/
+-# path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/
+-GNUMEX = $(HOME)/bin/win32/gnumex
+-GNUMEX64 = $(HOME)/bin/win64/gnumex
+-# building gnumex64 was difficult, these hints were quite useful:
+-# http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
+-# Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
+-####################################################
+-
+-CC = gcc
+-CXX = g++
++#CC = gcc
++#CXX = g++
</ins><span class="cx"> CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC
</span><span class="cx"> -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
</span><del>-+#OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
-+MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
-+OCTMEX = $(MKOCTFILE) --mex
</del><ins>++OCTMEX = mkoctfile --mex
</ins><span class="cx"> RM = rm
</span><span class="cx">
</span><del>- MEX_OPTION += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
- MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
</del><ins>+ ifeq (Linux,$(shell uname))
+ CFLAGS += -fopenmp
+ MEX_OPTION += -lgomp
+ endif
</ins><span class="cx">
</span><del>-+FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
-+INCFLAGS = ${shell $(MKOCTFILE) -p INCFLAGS}
-+INC_CSTDLIB = -include cstdlib
-+
</del><ins>+ MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
+-MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
+
</ins><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>- ### per default only the mex-files for octave are built
-@@ -78,18 +84,16 @@
- # Octave, MATLAB on Linux
</del><ins>+@@ -51,28 +31,7 @@
+ mex4o octave: $(PROGS)
+
+
+-### Matlab configuration - search for a matlab directory if not defined above
+-ifndef MATLABDIR
+- ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
+- # 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)
+- endif
+-endif
+-
+-### if the MATLABDIR has been found or defined
+-ifneq (,MATLABDIR)
+- ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
+- MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
+- mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
+- endif
+-endif
+-
+-
+-mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
+-mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
+-all: octave win32 win64 mex4m
++all: octave mex4m
+
+ clean:
+ -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
+@@ -80,15 +39,13 @@
+ #$(PROGS): Makefile
+
</ins><span class="cx"> #########################################################
</span><ins>+-# Octave, MATLAB on Linux
++# Octave
+ #########################################################
</ins><span class="cx"> %.oct: %.cc
</span><del>-- mkoctfile$(OCTAVE_VERSION) $<
-+ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(MKOCTFILE) $<
</del><ins>+ mkoctfile$(OCTAVE_VERSION) "$<"
</ins><span class="cx">
</span><span class="cx"> %.mex: %.cpp
</span><del>-- $(OCTMEX) $< -lgomp ## Octave
</del><ins>+ $(OCTMEX) "$<"
</ins><span class="cx"> -%.$(MEX_EXT): %.cpp
</span><del>-- $(MATMEX) $< -lgomp ## Matlab
-+ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) $< $(FLIBS) -lgomp
</del><ins>+- $(MATMEX) "$<"
</ins><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
</del><ins>+ svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
</ins><span class="cx"> $(CXX) $(CFLAGS) -c svm.cpp
</span><del>-- #$(CC) $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c
-- env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.c
-- env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.c
-+ $(CC) $(CFLAGS) $(INCFLAGS) -c svm_model_matlab.c
-+ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
-+ INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
</del><ins>+@@ -117,46 +74,3 @@
+ tron.o: tron.cpp tron.h
+ $(CXX) $(CFLAGS) -c tron.cpp
</ins><span class="cx">
</span><del>- svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT): svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
- $(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
-@@ -98,12 +102,12 @@
- $(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
-
- train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c
-- $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c 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 linear.h tron.o linear.o linear_model_matlab.c
-- env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
-+ $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
- #env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
-
- linear.o: linear.cpp linear.h
</del><ins>+-
+-#########################################################
+-# MATLAB/WIN32
+-#########################################################
+-%.obj: %.cpp
+- $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
+-%.obj: %.c
+- $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
+-
+-train.mexw32 predict.mexw32: train.obj linear.obj linear_model_matlab.obj tron.obj
+- $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" linear_model_matlab.obj linear.obj tron.obj -llibmx -llibmex -llibmat -lcholmod -lblas
+-
+-svmpredict_mex.mexw32 : svmpredict_mex.obj svm.obj svm_model_matlab.obj
+- $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
+-svmtrain_mex.mexw32 : svmtrain_mex.obj svm.obj svm_model_matlab.obj
+- $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
+-
+-%.mexw32: %.obj
+- $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
+-
+-
+-
+-#########################################################
+-# MATLAB/WIN64
+-#########################################################
+-
+-## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
+-%.o64: %.cpp
+- $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
+-%.o64: %.c
+- $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
+-
+-train.mexw64 predict.mexw64: train.o64 linear.o64 linear_model_matlab.o64 tron.o64
+- $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" linear_model_matlab.o64 linear.o64 tron.o64 -llibmx -llibmex -llibmat -lcholmod -lblas
+-
+-svmpredict_mex.mexw64 : svmpredict_mex.o64 svm.o64 svm_model_matlab.o64
+- $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
+-svmtrain_mex.mexw64 : svmtrain_mex.o64 svm.o64 svm_model_matlab.o64
+- $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
+-
+-%.mexw64: %.o64
+- $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
+-
</ins></span></pre>
</div>
</div>
</body>
</html>