<!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>[133313] trunk/dports/math/octave-tsa</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/133313">133313</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-02-25 06:57:42 -0800 (Wed, 25 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-tsa: update to 4.2.9; addresses ticket #46650.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkdportsmathoctavetsaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-tsa/Portfile (133312 => 133313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-tsa/Portfile        2015-02-25 14:48:07 UTC (rev 133312)
+++ trunk/dports/math/octave-tsa/Portfile        2015-02-25 14:57:42 UTC (rev 133313)
</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 tsa 4.2.7
</del><ins>+octave.setup tsa 4.2.9
</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,9 @@
</span><span class="cx"> methods for time series analysis.
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><del>-checksums rmd160 f19d0439adadb9121e7deab9f01532d692a64d65 \
- sha256 48c22265ed0962c09ef7c1777628afc5d9a206089c674b7b9727a0c5a545b229
</del><ins>+checksums rmd160 b9293345970b866887a406113ff2e9b8708e3588 \
+ sha256 922f99ad49dc60a0888f5707f10aff1f43e52b47b6b444c90a3eb936cb1c4409
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-src_Makefile.diff
</span><ins>+
+configure.env-append "PREFIX_BIN=${prefix}/bin"
</ins></span></pre></div>
<a id="trunkdportsmathoctavetsafilespatchsrc_Makefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff (133312 => 133313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff        2015-02-25 14:48:07 UTC (rev 133312)
+++ trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff        2015-02-25 14:57:42 UTC (rev 133313)
</span><span class="lines">@@ -1,38 +1,134 @@
</span><del>---- src/Makefile.orig        2014-01-12 14:29:06.000000000 -0600
-+++ src/Makefile        2014-11-28 13:18:52.000000000 -0600
-@@ -41,14 +41,19 @@
</del><ins>+--- src/Makefile.orig        2015-01-25 17:26:10.000000000 -0500
++++ src/Makefile        2015-01-25 17:30:51.000000000 -0500
+@@ -4,125 +4,21 @@
+ # http://pub.ist.ac.at/~schloegl/matlab/tsa/
+ ####################################################
</ins><span class="cx">
</span><del>-
-
</del><ins>+-### modify directories according to your needs
+-
+-# Define non-default octave-version
+-# Octave - global install (e.g. from debian package)
+-# OCTAVE_VERSION=
+-# Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
+-# OCTAVE_VERSION=-3.6.3
+-
+-# 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
+-
</ins><span class="cx"> -CC         = gcc
</span><span class="cx"> -CXX         = g++
</span><del>-+#CC         = gcc
-+#CXX         = g++
- CFLAGS         = -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC
- OCTMEX        = mkoctfile$(OCTAVE_VERSION) --mex
</del><ins>+-CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
+-OCTMEX        = mkoctfile$(OCTAVE_VERSION) --mex
++CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
++MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
++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)"
</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>-+MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
-+OCTMEX        = $(MKOCTFILE) --mex
-+
-+FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
-+INCFLAGS = ${shell $(MKOCTFILE) -p INCFLAGS}
-+INC_CSTDLIB = -include cstdlib
</del><ins>+-
+-PROGS = covm_mex.mex sumskipnan_mex.mex #
++PROGS = covm_mex.mex sumskipnan_mex.mex
</ins><span class="cx">
</span><del>- PROGS = covm_mex.mex sumskipnan_mex.mex #
</del><ins>+ ### per default only the mex-files for octave are built
+-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
+-
+-clean:
+-        -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
++octave: $(PROGS)
</ins><span class="cx">
</span><del>-@@ -88,10 +93,10 @@
</del><ins>++all: octave
+
+ #########################################################
+-
</ins><span class="cx"> #        Octave, MATLAB on Linux
</span><span class="cx"> #########################################################
</span><del>- %.oct: %.cc
</del><ins>+-%.oct: %.cc
</ins><span class="cx"> -        mkoctfile$(OCTAVE_VERSION) "$<"
</span><del>-+        $(MKOCTFILE) $<
</del><span class="cx">
</span><span class="cx"> %.mex: %.cpp
</span><del>--        $(OCTMEX) "$<" -lgomp -llapack -lblas ## Octave
-+        INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) $< $(FLIBS) -lgomp ## Octave
- %.$(MEX_EXT): %.cpp
-         $(MATMEX) "$<" -lgomp -llapack -lblas ## Matlab
-
</del><ins>+         $(OCTMEX) "$<" -llapack -lblas
+-%.$(MEX_EXT): %.cpp
+-        $(MATMEX) "$<" -llapack -lblas
+-
+-
+-#########################################################
+-#        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
+-
+-
+-#########################################################
+-#        MATLAB/WIN64
+-#########################################################
+-
+-## 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
+-        
+-        
+-
</ins></span></pre>
</div>
</div>
</body>
</html>