[140284] trunk/dports/math/octave-tsa

[michaelld at macports.org]

Revision: 140284
          https://trac.macports.org/changeset/140284
Author:   michaelld at macports.org
Date:     2015-09-16 08:03:55 -0700 (Wed, 16 Sep 2015)
Log Message:
-----------
octave-tsa: update to 4.3.2.

Modified Paths:
--------------
    trunk/dports/math/octave-tsa/Portfile
    trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff

Modified: trunk/dports/math/octave-tsa/Portfile
===================================================================
--- trunk/dports/math/octave-tsa/Portfile	2015-09-16 15:01:42 UTC (rev 140283)
+++ trunk/dports/math/octave-tsa/Portfile	2015-09-16 15:03:55 UTC (rev 140284)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        tsa 4.2.9
+octave.setup        tsa 4.3.2
 platforms           darwin
 license             GPL-3+
 maintainers         gmail.com:mschamschula openmaintainer
@@ -12,8 +12,8 @@
                     methods for time series analysis.
 long_description    ${description}
 
-checksums           rmd160  b9293345970b866887a406113ff2e9b8708e3588 \
-                    sha256  922f99ad49dc60a0888f5707f10aff1f43e52b47b6b444c90a3eb936cb1c4409
+checksums           rmd160 221568bba94f96dcdbea66c32666899617a41393 \
+                    sha256 a8a2eedb9f1880a5c847442e33893996e2cf2face529be89463de2ff2c9ae930
 
 patchfiles          patch-src_Makefile.diff
 

Modified: trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff	2015-09-16 15:01:42 UTC (rev 140283)
+++ trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff	2015-09-16 15:03:55 UTC (rev 140284)
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -4,123 +4,22 @@
  # http://pub.ist.ac.at/~schloegl/matlab/tsa/
  ####################################################
  
@@ -39,11 +39,10 @@
 -W32_LIBS += $(LDLIBS_W32)libblas.a
 -W64_LIBS += $(LDLIBS_W64)libblas.a
 -
--CC  	= gcc
--CXX 	= g++
--CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC 
--OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
-+CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC
+-CC  	?= gcc
+-CXX 	?= g++
+ CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC 
+-OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex -lgomp
 +MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
 +OCTMEX	= $(MKOCTFILE) --mex
  RM      = rm
@@ -57,24 +56,21 @@
 -MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
 -
 -PROGS = covm_mex.mex sumskipnan_mex.mex #
-+PROGS = covm_mex.mex sumskipnan_mex.mex
- 
- ### per default only the mex-files for octave are built
+-
+-### 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
+-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 -1t /usr/local/MATLAB/  |grep "^R*" |head -1)
--    # alternatively, use latest matlab version
--    #MATLABDIR=$(shell ls -dt1 /usr/local/MATLAB/R* |head -1)
+-    MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R*" |head -1)
 -  endif
 -endif
 -
--### if the MATLABDIR has been found or defined 
--ifneq (,MATLABDIR)
+-### 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))
@@ -85,20 +81,23 @@
 -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* 
++PROGS = covm_mex.mex sumskipnan_mex.mex
++
 +octave: $(PROGS)
- 
++
 +all:    octave
  
+ clean:
+ 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
+ 
+-
  #########################################################
 -
  #	Octave, MATLAB on Linux 
  #########################################################
 -%.oct: %.cc
 -	mkoctfile$(OCTAVE_VERSION) "$<"
- 
+-
  %.mex: %.cpp
  	$(OCTMEX) "$<" -llapack -lblas
 -%.$(MEX_EXT): %.cpp
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150916/92ab9a2b/attachment-0001.html>