[138156] trunk/dports/math/octave-nan

30 Jun 2015

Revision: 138156
          https://trac.macports.org/changeset/138156
Author:   michaelld@macports.org
Date:     2015-06-30 11:43:13 -0700 (Tue, 30 Jun 2015)
Log Message:
-----------
octave-nan: update to 2.8.0; addresses ticket #48185.

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	2015-06-30 18:41:19 UTC (rev 138155)
+++ trunk/dports/math/octave-nan/Portfile	2015-06-30 18:43:13 UTC (rev 138156)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        nan 2.7.1
+octave.setup        nan 2.8.0
 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 64dc7bffcbbf9873ae22a8f45ae3dc0ee7c3d15b \
-                    sha256 70093926a9d980810c8e665f8bdd2931a7b9ec0c765326eb193341fb0aa665af
+checksums           rmd160 06e5e8927073407f05f6e412be354e3b9afc9abf \
+                    sha256 ccab738e704fab44aa09ed4b94c6fad523f45c2c73d4492eb776dd1473a24346
 
 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	2015-06-30 18:41:19 UTC (rev 138155)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff	2015-06-30 18:43:13 UTC (rev 138156)
@@ -1,8 +1,24 @@
---- src/Makefile.orig	2015-01-24 09:51:25.000000000 -0600
-+++ src/Makefile	2015-01-24 18:32:57.000000000 -0600
-@@ -12,38 +12,18 @@
+--- 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)
- #OCTAVE_VERSION=-3.8.2
+ # OCTAVE_VERSION=-3.6.3
  
 -# Matlab configuration
 -#MATLABDIR = /usr/local/MATLAB/R2010b
@@ -22,77 +38,112 @@
 -# http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P...
 -# 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 -fPIC 
--OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
-+OCTMEX	= mkoctfile --mex
+ CFLAGS 	= -fopenmp -Wall -Wextra -Wconversion -O2
+ OCTMEX	= $(MKOCTFILE) --mex
  RM      = rm
- 
- ifeq (Linux,$(shell uname))
- CFLAGS      += -fopenmp 
- MEX_OPTION  += -lgomp 
+@@ -41,120 +23,50 @@
+ CFLAGS      += -fPIC
  endif
  
- MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
+-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 = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex 
- 
-@@ -51,28 +31,7 @@
- mex4o octave: $(PROGS)
- 
- 
+-
+-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)
+-
+-
 -### 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)
+-    # 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 the MATLABDIR has been found or defined 
--ifneq (,MATLABDIR)
++ifneq (Darwin,$(shell uname))
++CFLAGS      += -fopenmp
++MEX_OPTION  += -lgomp
+ endif
+ 
++MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
+ 
+-### 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
--
--
++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 mex4m
++all:    octave
  
  clean:
- 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
-@@ -80,15 +39,13 @@
- #$(PROGS): Makefile
+-	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
+-
+-#$(PROGS): Makefile
++	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
  
  #########################################################
 -#	Octave, MATLAB on Linux 
 +#	Octave
  #########################################################
- %.oct: %.cc
- 	mkoctfile$(OCTAVE_VERSION) "$<"
- 
- %.mex: %.cpp
- 	$(OCTMEX) "$<"
++
+ 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) "$<"
  
- svmtrain_mex.mex svmpredict_mex.mex: svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
- 	$(CXX) $(CFLAGS) -c svm.cpp
-@@ -117,46 +74,3 @@
+-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

    

michaelld＠macports.org

tags

participants (1)