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

[larryv at macports.org]

Revision: 128836
          https://trac.macports.org/changeset/128836
Author:   larryv at macports.org
Date:     2014-11-27 17:53:35 -0800 (Thu, 27 Nov 2014)
Log Message:
-----------
octave-nan: Update to 2.5.9 (#46035)

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

Removed Paths:
-------------
    trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff

Modified: trunk/dports/math/octave-nan/Portfile
===================================================================
--- trunk/dports/math/octave-nan/Portfile	2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/Portfile	2014-11-28 01:53:35 UTC (rev 128836)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 PortGroup           octave 1.0
 
-octave.setup        nan 2.5.5
+octave.setup        nan 2.5.9
 platforms           darwin
 license             GPL-3+
 maintainers         nomaintainer
@@ -12,8 +12,7 @@
                     data with and without missing values.
 long_description    ${description}
 
-checksums           rmd160 9ebae4103080376b5d7f0f2eec27ff797e709c31 \
-                    sha256 1c8d03a8bb797bffed7ec1fe40c5b876fdc8e18e5d9c13093a24c68a5f9adeff
+checksums           rmd160 cbc3722cf37d967a9496a936cf20117bcd42af36 \
+                    sha256 3259c594117c7b9761c070b7f0438271076e83e9b8623e518ea145a11481196d
 
-patchfiles          patch-src_Makefile.diff \
-                    patch-src_xptopen.cpp.diff
+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	2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/files/patch-src_Makefile.diff	2014-11-28 01:53:35 UTC (rev 128836)
@@ -1,6 +1,6 @@
---- src/Makefile.orig	2013-11-16 12:10:11.000000000 -0500
-+++ src/Makefile	2013-11-16 13:32:54.000000000 -0500
-@@ -28,15 +28,20 @@
+--- 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; 
  ####################################################
  
@@ -10,11 +10,12 @@
 +#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
  RM      = rm
  
- MEX_OPTION  += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
+ MEX_OPTION  += -lgomp CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
  MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
  
 +FLIBS = ${shell $(MKOCTFILE) -p FLIBS}
@@ -23,8 +24,8 @@
 +
  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 
  
- mex4o octave: $(PROGS)
-@@ -58,18 +63,16 @@
+ ### per default only the mex-files for octave are built
+@@ -78,18 +84,16 @@
  #	Octave, MATLAB on Linux 
  #########################################################
  %.oct: %.cc
@@ -48,7 +49,7 @@
  
  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
-@@ -78,12 +81,12 @@
+@@ -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

Deleted: trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff
===================================================================
--- trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff	2014-11-28 01:49:07 UTC (rev 128835)
+++ trunk/dports/math/octave-nan/files/patch-src_xptopen.cpp.diff	2014-11-28 01:53:35 UTC (rev 128836)
@@ -1,18 +0,0 @@
---- src/xptopen.cpp.orig	2013-11-16 13:29:34.000000000 -0500
-+++ src/xptopen.cpp	2013-11-16 13:29:49.000000000 -0500
-@@ -83,12 +83,10 @@
- #define __BYTE_ORDER __LITTLE_ENDIAN
- #endif
- 
--#if (defined(BSD) && (BSD >= 199103))
- #include <machine/endian.h>
--#define __BIG_ENDIAN _BIG_ENDIAN
--#define __LITTLE_ENDIAN _LITTLE_ENDIAN
--#define __BYTE_ORDER _BYTE_ORDER
--#endif
-+#define __BIG_ENDIAN BIG_ENDIAN
-+#define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#define __BYTE_ORDER BYTE_ORDER
- 
- #ifndef _BYTESWAP_H
- /* define our own version - needed for Max OS X*/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141127/c4d5e018/attachment.html>