# HG changeset patch
# User John Donoghue
# Date 1457364239 18000
# Node ID 6c7d570cd9ff4ad489df9a9055632babaaf12387
# Parent  0727a16b21248620e876a17f7a18235049b1338f
of-nan: update to 3.0.1

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

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

* build_packages.m: update nan version

diff -r 0727a16b2124 -r 6c7d570cd9ff build_packages.m
--- a/build_packages.m	Mon Mar 07 07:44:06 2016 -0500
+++ b/build_packages.m	Mon Mar 07 10:23:59 2016 -0500
@@ -60,7 +60,7 @@
 try_install strings-1.2.0.tar.gz
 try_install ga-0.10.0.tar.gz
 try_install interval-1.4.1.tar.gz
-try_install nan-2.8.1.tar.gz
+try_install nan-3.0.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 0727a16b2124 -r 6c7d570cd9ff src/of-nan-1-cross-fixes.patch
--- a/src/of-nan-1-cross-fixes.patch	Mon Mar 07 07:44:06 2016 -0500
+++ b/src/of-nan-1-cross-fixes.patch	Mon Mar 07 10:23:59 2016 -0500
@@ -1,22 +1,28 @@
 diff -ur NaN.orig/src/Makefile NaN/src/Makefile
---- NaN.orig/src/Makefile	2015-06-30 13:30:25.348544831 -0400
-+++ NaN/src/Makefile	2015-06-30 13:35:18.600346663 -0400
-@@ -31,13 +31,15 @@
+--- NaN.orig/src/Makefile	2016-03-07 08:15:08.086338754 -0500
++++ NaN/src/Makefile	2016-03-07 10:23:34.609405159 -0500
+@@ -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++
+-CC      ?= gcc
+-CXX     ?= g++
 +OCTAVE_CONFIG ?= octave-config
-+CC      = $(shell $(MKOCTFILE) -p CC)
-+CXX     = $(shell $(MKOCTFILE) -p CXX)
- CFLAGS 	= -fopenmp -Wall -Wextra -Wconversion -O2
- OCTMEX	= $(MKOCTFILE) --mex
++CC      ?= $(shell $(MKOCTFILE) -p CC)
++CXX     ?= $(shell $(MKOCTFILE) -p CXX)
+ CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
+ OCTMEX	= $(MKOCTFILE) --mex -lgomp
  RM      = rm
+@@ -41,8 +42,11 @@
+ # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
+ CFLAGS += $(CPPFLAGS)
  
 -ifneq ($(OS),Windows_NT)
-+HOST_TYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE))
-+ifeq (,$(findstring mingw,$(HOST_TYPE)))
++HOSTTYPE := $(shell $(OCTAVE_CONFIG) -p CANONICAL_HOST_TYPE)
++ifeq (,$(findstring mingw,$(HOSTTYPE)))
  CFLAGS      += -fPIC
++else
++OCTMEX	= $(MKOCTFILE) --mex
  endif
  
+ ifneq (Darwin,$(shell uname)) 
diff -r 0727a16b2124 -r 6c7d570cd9ff src/of-nan.mk
--- a/src/of-nan.mk	Mon Mar 07 07:44:06 2016 -0500
+++ b/src/of-nan.mk	Mon Mar 07 10:23:59 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-nan
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.8.1
-$(PKG)_CHECKSUM := ff85eb43a874b5bfb72841a462e3f210358cf29a
+$(PKG)_VERSION  := 3.0.1
+$(PKG)_CHECKSUM := 4fbd03c64374781765c27c1aad4ddbf86bd36b5b
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := NaN
 $(PKG)_FILE     := nan-$($(PKG)_VERSION).tar.gz