<!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>[149191] trunk/dports/math</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/149191">149191</a></dd>
<dt>Author</dt> <dd>mps@macports.org</dd>
<dt>Date</dt> <dd>2016-06-04 16:33:59 -0700 (Sat, 04 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-nan, octave-tsa: simplify patch files: no functional change.</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>
<li><a href="#trunkdportsmathoctavetsaPortfile">trunk/dports/math/octave-tsa/Portfile</a></li>
<li><a href="#trunkdportsmathoctavetsafilespatchsrc_Makefilediff">trunk/dports/math/octave-tsa/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 (149190 => 149191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/Portfile 2016-06-04 23:17:33 UTC (rev 149190)
+++ trunk/dports/math/octave-nan/Portfile 2016-06-04 23:33:59 UTC (rev 149191)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> octave.setup nan 3.0.1
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3+
</span><del>-maintainers gmail.com:mschamschula openmaintainer
</del><ins>+maintainers mps openmaintainer
</ins><span class="cx"> description A statistics and machine learning toolbox for \
</span><span class="cx"> data with and without missing values.
</span><span class="cx"> long_description ${description}
</span></span></pre></div>
<a id="trunkdportsmathoctavenanfilespatchsrc_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-nan/files/patch-src_Makefile.diff (149190 => 149191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2016-06-04 23:17:33 UTC (rev 149190)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2016-06-04 23:33:59 UTC (rev 149191)
</span><span class="lines">@@ -1,34 +1,5 @@
</span><del>---- src/Makefile.orig 2016-02-15 15:43:42.000000000 -0500
-+++ src/Makefile 2016-02-25 21:14:01.000000000 -0500
-@@ -13,19 +13,19 @@
- # OCTAVE_VERSION=-3.6.3
-
- # Matlab configuration
--#MATLABDIR = /usr/local/MATLAB/R2010b
-+# MATLABDIR = /usr/local/MATLAB/R2010b
- # comment the following line if you use MATLAB on 32-bit operating system
--MEX_OPTION += -largeArrayDims
--
-+# 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-
-+# 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/
-+# 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
-+# 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;
</del><ins>+--- src/Makefile.orig 2016-02-26 09:09:14.000000000 -0600
++++ src/Makefile 2016-06-04 18:21:45.000000000 -0500
</ins><span class="cx"> @@ -34,7 +34,7 @@
</span><span class="cx"> CC ?= gcc
</span><span class="cx"> CXX ?= g++
</span><span class="lines">@@ -38,153 +9,12 @@
</span><span class="cx"> RM = rm
</span><span class="cx">
</span><span class="cx"> # Support Debian Hardening flags
</span><del>-@@ -45,13 +45,13 @@
- CFLAGS += -fPIC
- endif
</del><ins>+@@ -79,7 +79,7 @@
</ins><span class="cx">
</span><del>--ifneq (Darwin,$(shell uname))
--CFLAGS += -fopenmp
--MEX_OPTION += -lgomp
--MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
--endif
-+# ifneq (Darwin,$(shell uname))
-+# CFLAGS += -fopenmp
-+# MEX_OPTION += -lgomp
-+# MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
-+# endif
-
--MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
-+# MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
-
- 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
-
-@@ -59,30 +59,30 @@
- mex4o octave: $(PROGS)
-
-
--### Matlab configuration - search for a matlab directory if not defined above
--ifeq (,$(MATLABDIR))
-- ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
-- # 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)
-- endif
--endif
--
--
--### if 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))
</del><ins>+ mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
+ mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
</ins><span class="cx"> -all: octave win32 win64 mex4m
</span><del>--
--clean:
-- -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
-+# Matlab configuration - search for a matlab directory if not defined above
-+# ifeq (,$(MATLABDIR))
-+# ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
-+# 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)
-+# endif
-+# endif
-+#
-+#
-+# if 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
-+#
-+# clean:
-+# -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
</del><ins>++all: mex4o
</ins><span class="cx">
</span><del>- #$(PROGS): Makefile
-
-@@ -123,22 +123,22 @@
- #########################################################
- # 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
--
-+# %.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
-+#
-
-
- #########################################################
-@@ -146,19 +146,19 @@
- #########################################################
-
- ## 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
--
-+# %.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
-+#
</del><ins>+ clean:
+ -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
</ins></span></pre></div>
<a id="trunkdportsmathoctavetsaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-tsa/Portfile (149190 => 149191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-tsa/Portfile 2016-06-04 23:17:33 UTC (rev 149190)
+++ trunk/dports/math/octave-tsa/Portfile 2016-06-04 23:33:59 UTC (rev 149191)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> octave.setup tsa 4.4.1
</span><span class="cx"> platforms darwin
</span><span class="cx"> license GPL-3+
</span><del>-maintainers gmail.com:mschamschula openmaintainer
</del><ins>+maintainers mps openmaintainer
</ins><span class="cx"> description Stochastic concepts and maximum entropy \
</span><span class="cx"> methods for time series analysis.
</span><span class="cx"> long_description ${description}
</span></span></pre></div>
<a id="trunkdportsmathoctavetsafilespatchsrc_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff (149190 => 149191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff 2016-06-04 23:17:33 UTC (rev 149190)
+++ trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff 2016-06-04 23:33:59 UTC (rev 149191)
</span><span class="lines">@@ -1,186 +1,20 @@
</span><span class="cx"> --- src/Makefile.orig 2016-02-26 09:09:55.000000000 -0600
</span><del>-+++ src/Makefile 2016-02-29 11:33:07.000000000 -0600
-@@ -15,74 +15,74 @@
- # 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 = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
--W64MAT_INC = -I$(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;
--####################################################
--W32MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS))/include/
--W64MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS64))/include/
--LDLIBS_W32 = $(subst /usr/bin/,/usr/,$(CROSS))/lib/
--LDLIBS_W64 = $(subst /usr/bin/,/usr/,$(CROSS64))/lib/
--W32_LIBS = $(LDLIBS_W32)liblapack.a
--W64_LIBS = $(LDLIBS_W64)liblapack.a
--W32_LIBS += $(LDLIBS_W32)libblas.a
--W64_LIBS += $(LDLIBS_W64)libblas.a
--
--CC ?= gcc
--CXX ?= g++
-+# 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 = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
-+# W64MAT_INC = -I$(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;
-+# ####################################################
-+# W32MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS))/include/
-+# W64MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS64))/include/
-+# LDLIBS_W32 = $(subst /usr/bin/,/usr/,$(CROSS))/lib/
-+# LDLIBS_W64 = $(subst /usr/bin/,/usr/,$(CROSS64))/lib/
-+# W32_LIBS = $(LDLIBS_W32)liblapack.a
-+# W64_LIBS = $(LDLIBS_W64)liblapack.a
-+# W32_LIBS += $(LDLIBS_W32)libblas.a
-+# W64_LIBS += $(LDLIBS_W64)libblas.a
-+#
-+# CC ?= gcc
-+# CXX ?= g++
</del><ins>++++ src/Makefile 2016-06-04 18:28:33.000000000 -0500
+@@ -42,7 +42,7 @@
+ CC ?= gcc
+ CXX ?= g++
</ins><span class="cx"> CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC
</span><span class="cx"> -OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
</span><span class="cx"> +OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
</span><span class="cx"> RM = rm
</span><span class="cx">
</span><span class="cx"> # Support Debian Hardening flags
</span><del>- # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
--CFLAGS += $(CPPFLAGS)
--
--ifneq (Darwin,$(shell uname))
--CFLAGS += -fopenmp
--MEX_OPTION += -lgomp
--endif
--
--MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
--MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
--
--PROGS = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
--
-+# CFLAGS += $(CPPFLAGS)
-+#
-+# ifneq (Darwin,$(shell uname))
-+# CFLAGS += -fopenmp
-+# MEX_OPTION += -lgomp
-+# endif
-+#
-+# MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
-+# MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
-+#
-+# PROGS = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
-+#
- ### per default only the mex-files for octave are built
- mex4o octave: $(PROGS)
</del><ins>+@@ -82,7 +82,7 @@
</ins><span class="cx">
</span><del>-
- ### Matlab configuration - search for a matlab directory if not defined above
--ifeq (,$(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 -1rt /usr/local/MATLAB/ |grep "^R*" |head -1)
-- endif
--endif
--
--### if 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))
</del><ins>+ mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
+ mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
</ins><span class="cx"> -all: octave win32 win64 mex4m
</span><del>-+# ifeq (,$(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 -1rt /usr/local/MATLAB/ |grep "^R*" |head -1)
-+# endif
-+# endif
-+#
-+# ### if 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
</del><ins>++all: mex4o
</ins><span class="cx">
</span><span class="cx"> clean:
</span><span class="cx"> -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
</span><del>-@@ -93,7 +93,7 @@
- # Octave, MATLAB on Linux
- #########################################################
- %.oct: %.cc
-- mkoctfile$(OCTAVE_VERSION) "$<"
-+ mkoctfile "$<"
-
- %.mex: %.cpp
- $(OCTMEX) "$<" -llapack -lblas
-@@ -104,13 +104,13 @@
- #########################################################
- # MATLAB/WIN32
- #########################################################
--%.obj: %.cpp
-- $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
--%.obj: %.c
-- $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
--
--%.mexw32: %.obj
-- $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
-+# %.obj: %.cpp
-+# $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
-+# %.obj: %.c
-+# $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
-+#
-+# %.mexw32: %.obj
-+# $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
-
-
- #########################################################
-@@ -118,13 +118,13 @@
- #########################################################
-
- ## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
--%.o64: %.cpp
-- $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
--%.o64: %.c
-- $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
--
--%.mexw64: %.o64
-- $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
-+# %.o64: %.cpp
-+# $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
-+# %.o64: %.c
-+# $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
-+#
-+# %.mexw64: %.o64
-+# $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
-
-
-
</del></span></pre>
</div>
</div>
</body>
</html>