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

khindenburg at macports.org khindenburg at macports.org
Mon Mar 16 07:06:06 PDT 2015 

Revision: 133974
          https://trac.macports.org/changeset/133974
Author:   khindenburg at macports.org
Date:     2015-03-16 07:06:06 -0700 (Mon, 16 Mar 2015)
Log Message:
-----------
octave-nan: update to 2.7.1 #46668

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-03-16 13:34:09 UTC (rev 133973)
+++ trunk/dports/math/octave-nan/Portfile	2015-03-16 14:06:06 UTC (rev 133974)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        nan 2.5.9
+octave.setup        nan 2.7.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 cbc3722cf37d967a9496a936cf20117bcd42af36 \
-                    sha256 3259c594117c7b9761c070b7f0438271076e83e9b8623e518ea145a11481196d
+checksums           rmd160 64dc7bffcbbf9873ae22a8f45ae3dc0ee7c3d15b \
+                    sha256 70093926a9d980810c8e665f8bdd2931a7b9ec0c765326eb193341fb0aa665af
 
 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-03-16 13:34:09 UTC (rev 133973)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff	2015-03-16 14:06:06 UTC (rev 133974)
@@ -1,66 +1,138 @@
---- src/Makefile.orig	2014-01-12 13:51:33.000000000 -0600
-+++ src/Makefile	2014-11-27 18:44:06.000000000 -0600
-@@ -31,15 +31,21 @@
- # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; 
- ####################################################
+--- 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 @@
+ # Better alternative: define an OCTAVE_VERSION bash variable (or in .bashrc or .profile)
+ #OCTAVE_VERSION=-3.8.2
  
--CC  	= gcc
--CXX 	= g++
-+#CC  	= gcc
-+#CXX 	= g++
+-# 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 = $(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; 
+-####################################################
+-
+-CC      = gcc
+-CXX     = g++
++#CC      = gcc
++#CXX     = g++
  CFLAGS 	= -fopenmp -Wall -Wextra -Wconversion -O2 -fPIC 
 -OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
-+#OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex
-+MKOCTFILE = mkoctfile$(OCTAVE_VERSION)
-+OCTMEX	= $(MKOCTFILE) --mex
++OCTMEX	= mkoctfile --mex
  RM      = rm
  
- MEX_OPTION  += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
- MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
+ ifeq (Linux,$(shell uname))
+ CFLAGS      += -fopenmp 
+ MEX_OPTION  += -lgomp 
+ endif
  
-+FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
-+INCFLAGS = ${shell $(MKOCTFILE) -p INCFLAGS}
-+INC_CSTDLIB = -include cstdlib
-+
+ 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 
  
- ### per default only the mex-files for octave are built
-@@ -78,18 +84,16 @@
- #	Octave, MATLAB on Linux 
+@@ -51,28 +31,7 @@
+ 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
++all:    octave mex4m
+ 
+ clean:
+ 	-$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex* 
+@@ -80,15 +39,13 @@
+ #$(PROGS): Makefile
+ 
  #########################################################
+-#	Octave, MATLAB on Linux 
++#	Octave
+ #########################################################
  %.oct: %.cc
--	mkoctfile$(OCTAVE_VERSION) $<
-+	INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(MKOCTFILE) $<
+ 	mkoctfile$(OCTAVE_VERSION) "$<"
  
  %.mex: %.cpp
--	$(OCTMEX) $<  -lgomp         ## Octave
+ 	$(OCTMEX) "$<"
 -%.$(MEX_EXT): %.cpp
--	$(MATMEX) $<  -lgomp      ## Matlab
-+	INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) $< $(FLIBS) -lgomp
+-	$(MATMEX) "$<"
  
- svmtrain_mex.mex svmpredict_mex.mex:     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
+ 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
--	#$(CC)  $(CFLAGS) $(INCOCTAVE) -c svm_model_matlab.c
--	env CC=$(CXX) $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.c
--	env CC=$(CXX) $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.c
-+	$(CC)  $(CFLAGS) $(INCFLAGS) -c svm_model_matlab.c
-+	INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmtrain_mex.cpp svm.o svm_model_matlab.o
-+	INCFLAGS="$(INCFLAGS) $(INC_CSTDLIB)" $(OCTMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
+@@ -117,46 +74,3 @@
+ tron.o: tron.cpp tron.h
+ 	$(CXX) $(CFLAGS) -c tron.cpp
  
- svmtrain_mex.$(MEX_EXT) svmpredict_mex.$(MEX_EXT):     svmtrain_mex.cpp svm.h svm.cpp svm_model_matlab.c svmpredict_mex.cpp
- 	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c svm.cpp
-@@ -98,12 +102,12 @@
- 	$(MATMEX) svmpredict_mex.cpp svm.o svm_model_matlab.o
- 
- train.$(MEX_EXT) predict.$(MEX_EXT): train.c linear.h tron.o linear.o linear_model_matlab.c
--	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c 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 linear.h tron.o linear.o linear_model_matlab.c
--	env CC=$(CXX) $(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
-+	$(OCTMEX) -lblas train.c tron.o linear.o linear_model_matlab.c
- 	#env CC=$(CXX) $(OCTMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
- 
- linear.o: linear.cpp linear.h
+-
+-#########################################################
+-#	MATLAB/WIN32
+-#########################################################
+-%.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
+-
+-
+-
+-#########################################################
+-#	MATLAB/WIN64
+-#########################################################
+-
+-## 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
+-	$(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/20150316/82fc8a5e/attachment.html>

More information about the macports-changes mailing list