# HG changeset patch
# User John D
# Date 1484169158 18000
# Node ID 33045d291c2bf5a6c704466dd554413dc15c0509
# Parent  8e9b2a147e2a12baff73f5bfa203ba8ee9510236
of-nan: update v3.1.1

* build_packages.m: update nan version

* dist-files.mk; removed of-nan-1-cross-fixes.patch

* src/of-nan.mk: update version, checksum

* src/of-nan-1-cross-fixes.patch: removed

diff -r 8e9b2a147e2a -r 33045d291c2b build_packages.m
--- a/build_packages.m	Wed Jan 11 16:12:35 2017 -0500
+++ b/build_packages.m	Wed Jan 11 16:12:38 2017 -0500
@@ -66,7 +66,7 @@
   try_install strings-1.2.0.tar.gz
   try_install ga-0.10.0.tar.gz
   try_install interval-2.0.0.tar.gz
-  try_install nan-3.0.3.tar.gz
+  try_install nan-3.1.1.tar.gz
   try_install ocs-0.1.5.tar.gz
   try_install mapping-1.2.1.tar.gz
   try_install tisean-0.2.3.tar.gz
diff -r 8e9b2a147e2a -r 33045d291c2b dist-files.mk
--- a/dist-files.mk	Wed Jan 11 16:12:35 2017 -0500
+++ b/dist-files.mk	Wed Jan 11 16:12:38 2017 -0500
@@ -473,7 +473,6 @@
   of-mapping.mk \
   of-miscellaneous-1-fixes.patch \
   of-miscellaneous.mk \
-  of-nan-1-cross-fixes.patch \
   of-nan.mk \
   of-netcdf.mk \
   of-nurbs-1-fixes.patch \
diff -r 8e9b2a147e2a -r 33045d291c2b src/of-nan-1-cross-fixes.patch
--- a/src/of-nan-1-cross-fixes.patch	Wed Jan 11 16:12:35 2017 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff -ur nan-3.0.2.orig/src/Makefile nan-3.0.2/src/Makefile
---- nan-3.0.2.orig/src/Makefile	2016-08-03 10:30:35.433478948 -0400
-+++ nan-3.0.2/src/Makefile	2016-08-03 10:42:48.629174523 -0400
-@@ -31,8 +31,9 @@
- # 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++
-+OCTAVE_CONFIG ?= octave-config
-+CC      ?= $(shell $(MKOCTFILE) -p CC)
-+CXX     ?= $(shell $(MKOCTFILE) -p CXX)
- CFLAGS += -Wall -Wextra -Wconversion -O2
- OCTMEX	= $(MKOCTFILE) --mex
- RM      = rm
-@@ -41,9 +42,10 @@
- # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
- CFLAGS += $(CPPFLAGS)
- 
--ifeq ($(OS),Windows_NT)
-+HOSTTYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
-+ifneq (,$(findstring mingw,$(HOSTTYPE)))
-   # CC need to be defined on Windows, see also http://savannah.gnu.org/bugs/?47559
--  CC = gcc
-+  CC = $(shell $(MKOCTFILE) -p CC)
- else ifeq (Darwin,$(shell uname))
-   # no OpenMP on MacOSX, neither for Matlab nor Octave
- else
-@@ -93,14 +95,14 @@
- #	Octave, MATLAB on Linux 
- #########################################################
- svm%_mex.mex: svm%_mex.cpp svm.o svm_model_octave.o
--	env CC=$(CXX) $(OCTMEX) "$<" 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 
--	env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
-+	env CC="$(CC)" $(MKOCTFILE) -o "$@" -c "$<"
- svm_model_matlab.o: svm_model_matlab.c 
- 	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"  
- svm.o: svm.cpp
-@@ -111,7 +113,7 @@
- 	$(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
-+	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
diff -r 8e9b2a147e2a -r 33045d291c2b src/of-nan.mk
--- a/src/of-nan.mk	Wed Jan 11 16:12:35 2017 -0500
+++ b/src/of-nan.mk	Wed Jan 11 16:12:38 2017 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-nan
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.0.3
-$(PKG)_CHECKSUM := 0ffe44d958d2198ead13aed02a232e56ce089349
+$(PKG)_VERSION  := 3.1.1
+$(PKG)_CHECKSUM := a380f711cbdd43f8a805a8e1935d794c4f59c949
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := nan-$($(PKG)_VERSION)
 $(PKG)_FILE     := nan-$($(PKG)_VERSION).tar.gz