[146132] trunk/dports/math/octave-tsa
michaelld at macports.org
michaelld at macports.org
Mon Feb 29 10:04:20 PST 2016
Revision: 146132
https://trac.macports.org/changeset/146132
Author: michaelld at macports.org
Date: 2016-02-29 10:04:20 -0800 (Mon, 29 Feb 2016)
Log Message:
-----------
octave-tsa: update to 4.4.1; addresses ticket #50746.
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 2016-02-29 17:44:03 UTC (rev 146131)
+++ trunk/dports/math/octave-tsa/Portfile 2016-02-29 18:04:20 UTC (rev 146132)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup octave 1.0
-octave.setup tsa 4.3.3
+octave.setup tsa 4.4.1
platforms darwin
license GPL-3+
maintainers gmail.com:mschamschula openmaintainer
@@ -12,8 +12,8 @@
methods for time series analysis.
long_description ${description}
-checksums rmd160 e56696528eea259eb822980f1b40251069c734ca \
- sha256 76f100d53706aa2185357ecfbf84fe8b1d367f3304775ca524fb4cda6b02ebc0
+checksums rmd160 5297ad5396f8a93c66e08cf9e916c2125fbf0662 \
+ sha256 d4d0053cd73b2633e24e80a61bb0b413c99b39a24b8f0daf8364843d1a47780d
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 2016-02-29 17:44:03 UTC (rev 146131)
+++ trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff 2016-02-29 18:04:20 UTC (rev 146132)
@@ -1,20 +1,9 @@
---- src/Makefile.orig 2015-01-25 17:26:10.000000000 -0500
-+++ src/Makefile 2015-01-25 17:30:51.000000000 -0500
-@@ -4,123 +4,22 @@
- # http://pub.ist.ac.at/~schloegl/matlab/tsa/
- ####################################################
-
--### 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
+--- src/Makefile.orig 2016-02-26 09:09:55.000000000 -0600
++++ 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/
@@ -41,12 +30,41 @@
-
-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++
CFLAGS = -Wall -Wextra -Wconversion -O2 -fPIC
-OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
-+MKOCTFILE = $(PREFIX_BIN)/mkoctfile -v
-+OCTMEX = $(MKOCTFILE) --mex
++OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex
RM = rm
+ # Support Debian Hardening flags
+ # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
+-CFLAGS += $(CPPFLAGS)
+-
-ifneq (Darwin,$(shell uname))
-CFLAGS += -fopenmp
-MEX_OPTION += -lgomp
@@ -55,13 +73,25 @@
-MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
-MATMEX = $(MATLABDIR)/bin/mex $(MEX_OPTION)
-
--PROGS = covm_mex.mex sumskipnan_mex.mex #
+-PROGS = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
-
--### per default only the mex-files for octave are built
--mex4o octave: $(PROGS)
--
--
--### Matlab configuration - search for a matlab directory if not defined above
++# 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)
+
+
+ ### 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
@@ -81,32 +111,41 @@
-mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
-mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
-all: octave win32 win64 mex4m
-+PROGS = covm_mex.mex sumskipnan_mex.mex
-+
-+octave: $(PROGS)
-+
++# 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
clean:
-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
-
--
- #########################################################
--
+@@ -93,7 +93,7 @@
# Octave, MATLAB on Linux
#########################################################
--%.oct: %.cc
+ %.oct: %.cc
- mkoctfile$(OCTAVE_VERSION) "$<"
--
++ mkoctfile "$<"
+
%.mex: %.cpp
$(OCTMEX) "$<" -llapack -lblas
--%.$(MEX_EXT): %.cpp
-- $(MATMEX) "$<" -llapack -lblas
--
--
--#########################################################
--# MATLAB/WIN32
--#########################################################
+@@ -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
@@ -114,13 +153,20 @@
-
-%.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
++# %.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
@@ -128,6 +174,13 @@
-
-%.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
+
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160229/fdf241e0/attachment.html>
More information about the macports-changes
mailing list