[146111] trunk/dports/math/octave-nan
michaelld at macports.org
michaelld at macports.org
Sat Feb 27 18:57:19 PST 2016
Revision: 146111
https://trac.macports.org/changeset/146111
Author: michaelld at macports.org
Date: 2016-02-27 18:57:19 -0800 (Sat, 27 Feb 2016)
Log Message:
-----------
octave-nan: update to 3.0.1; addresses ticket #50730.
Modified Paths:
--------------
trunk/dports/math/octave-nan/Portfile
trunk/dports/math/octave-nan/files/patch-src_Makefile.diff
Modified: trunk/dports/math/octave-nan/Portfile
===================================================================
--- trunk/dports/math/octave-nan/Portfile 2016-02-27 23:30:40 UTC (rev 146110)
+++ trunk/dports/math/octave-nan/Portfile 2016-02-28 02:57:19 UTC (rev 146111)
@@ -4,7 +4,7 @@
PortSystem 1.0
PortGroup octave 1.0
-octave.setup nan 2.8.1
+octave.setup nan 3.0.1
platforms darwin
license GPL-3+
maintainers gmail.com:mschamschula openmaintainer
@@ -12,7 +12,7 @@
data with and without missing values.
long_description ${description}
-checksums rmd160 56740bad8e19f0b07111fdd09e4687d947313306 \
- sha256 50459aa55e16d84c08e248029a338ab3aee1aeb4ad23f3f7783ba5627ee5d23c
+checksums rmd160 b7c777b4d62d4e5770999f18adb6680aba5f91df \
+ sha256 4295b3a60efdfcf6a2d58429fd7e18b8caa44d2612e62a6ec992a735bd617cab
patchfiles patch-src_Makefile.diff
Modified: trunk/dports/math/octave-nan/files/patch-src_Makefile.diff
===================================================================
--- trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2016-02-27 23:30:40 UTC (rev 146110)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff 2016-02-28 02:57:19 UTC (rev 146111)
@@ -1,83 +1,76 @@
---- src/Makefile.orig 2015-06-24 08:53:57.000000000 -0400
-+++ src/Makefile 2015-06-30 13:56:18.000000000 -0400
-@@ -1,38 +1,20 @@
- ####################################################
--# Copyright 2010, 2011,2012 Alois Schloegl
--# This is part of the NaN-toolbox - a statistics and machine learning toolbox for data with and without missing values.
-+# Copyright 2010, 2011,2012 Alois Schloegl
-+# This is part of the NaN-toolbox - a statistics and machine learning toolbox for data with and without missing values.
- # http://pub.ist.ac.at/~schloegl/matlab/NaN/
- ####################################################
-
--### modify directories according to your needs
-+### modify directories according to your needs
-
--# Define non-default octave-version
-+# Define non-default octave-version
- # Octave - global install (e.g. from debian package)
--# OCTAVE_VERSION=
-+# OCTAVE_VERSION=
- # Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
+--- 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
+ # Matlab configuration
-#MATLABDIR = /usr/local/MATLAB/R2010b
--# comment the following line if you use MATLAB on 32-bit operating system
++# 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/
++# 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
++# 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/
++# 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;
--####################################################
--MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
--CC = gcc
--CXX = g++
-+MKOCTFILE ?= mkoctfile
-+#CC = gcc
-+#CXX = g++
- CFLAGS = -fopenmp -Wall -Wextra -Wconversion -O2
- OCTMEX = $(MKOCTFILE) --mex
++# 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;
+@@ -34,7 +34,7 @@
+ CC ?= gcc
+ CXX ?= g++
+ CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
+-OCTMEX = $(MKOCTFILE) --mex -lgomp
++OCTMEX = $(MKOCTFILE) --mex
RM = rm
-@@ -41,120 +23,50 @@
+
+ # Support Debian Hardening flags
+@@ -45,13 +45,13 @@
CFLAGS += -fPIC
endif
-ifneq (Darwin,$(shell uname))
-CFLAGS += -fopenmp
-MEX_OPTION += -lgomp
+-MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
-endif
--
--MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
++# 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)
--
--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
--
--### per default only the mex-files for octave are built
--mex4o octave: $(PROGS)
--
--
++# 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
-+ifneq (Darwin,$(shell uname))
-+CFLAGS += -fopenmp
-+MEX_OPTION += -lgomp
- endif
-
-+MEX_OPTION += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
-
+-endif
+-
+-
-### if MATLABDIR has been found or defined
-ifneq (,$(MATLABDIR))
- ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
@@ -85,69 +78,45 @@
- mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
- endif
-endif
-+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
-
-+### per default only the mex-files for octave are built
-+octave: $(PROGS)
-
+-
+-
-mexw32 win32: $(patsubst %.mex, %.mexw32, $(PROGS))
-mexw64 win64: $(patsubst %.mex, %.mexw64, $(PROGS))
-all: octave win32 win64 mex4m
-+all: octave
-
- clean:
+-
+-clean:
- -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
--
--#$(PROGS): Makefile
-+ -$(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*
+ #$(PROGS): Makefile
+
+@@ -123,22 +123,22 @@
#########################################################
--# Octave, MATLAB on Linux
-+# Octave
+ # MATLAB/WIN32
#########################################################
-+
- svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
- env CC=$(CXX) $(OCTMEX) "$<" svm.o svm_model_octave.o
--svm%_mex.$(MEX_EXT): svm%_mex.cpp svm.o svm_model_matlab.o
-- $(MATMEX) "$<" svm.o svm_model_matlab.o
--%.$(MEX_EXT): %.cpp
-- $(MATMEX) "$<"
-
--svm_model_octave.o: svm_model_matlab.c
-+svm_model_octave.o: svm_model_matlab.c
- env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
--svm_model_matlab.o: svm_model_matlab.c
-- $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"
-+
-+svm_model_matlab.o: svm_model_matlab.c
-+ $(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"
-+
- svm.o: svm.cpp
- $(CC) $(CFLAGS) -c svm.cpp
-
--train.$(MEX_EXT) predict.$(MEX_EXT): train.c tron.o linear.o 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 tron.o linear.o linear_model_matlab.c
- env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
-+
- linear.o: linear.cpp
- $(CXX) $(CFLAGS) -c linear.cpp
-+
- tron.o: tron.cpp tron.h
- $(CXX) $(CFLAGS) -c tron.cpp
-
- %.oct: %.cc
-- mkoctfile$(OCTAVE_VERSION) "$<"
-+ $(MKOCTFILE) "$<"
-
- %.mex: %.cpp
- $(OCTMEX) "$<"
--
--#########################################################
--# MATLAB/WIN32
--#########################################################
-%.obj: %.cpp
- $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
-%.obj: %.c
@@ -164,13 +133,29 @@
-%.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
++# %.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
@@ -187,3 +172,19 @@
-%.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
++#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160227/02173a2a/attachment.html>
More information about the macports-changes
mailing list