Update to release 20120914

PR:		ports/173142
Submitted by:	Fernando <fernando.apesteguia@gmail.com> (maintainer)
Feature safe:	yes

7 files changed, 38 insertions, 76 deletions

diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index 6268b65de4c8..d61261a2144a 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	opennurbs
-# Date created:                		Aug 17 2011
-# Whom:                        		Fernando Apesteguia <fernando.apesteguia@gmail.com>
-#
+# Created by: Fernando Apesteguia <fernando.apesteguia@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	opennurbs
-PORTVERSION=	20111122
-PORTREVISION=	1
+PORTVERSION=	20120914
 CATEGORIES=	graphics
-MASTER_SITES=	http://files.na.mcneel.com/opennurbs/5.0/2011-11-22/
+MASTER_SITES=	http://files.na.mcneel.com/opennurbs/5.0/2012-09-14/
 MASTER_SITE_SUBDIR=${PORTNAME}_${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
@@ -30,7 +26,7 @@ pre-build:
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/libopenNURBS.a ${PREFIX}/lib
 	@${MKDIR} ${EXAMPLESDIR}
-.for i in brep dump read roundtrip userdata write
+.for i in brep read roundtrip userdata write
 	@${INSTALL_PROGRAM} ${WRKSRC}/example_${i}/example_${i} ${EXAMPLESDIR}
 .endfor
 	@${MKDIR} ${PREFIX}/include/openNURBS/zlib
diff --git a/graphics/opennurbs/distinfo b/graphics/opennurbs/distinfo
index 5d8987f34a94..026aa166d082 100644
--- a/graphics/opennurbs/distinfo
+++ b/graphics/opennurbs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opennurbs_20111122.zip) = 510f2a035c27b461d96aaef3fb51c25a49abcc0815af64d8250b668c27210bc5
-SIZE (opennurbs_20111122.zip) = 1766806
+SHA256 (opennurbs_20120914.zip) = eb26c799fe065c7420ae3bcb27557ac67b12dad739d5e782240d862f196e69e6
+SIZE (opennurbs_20120914.zip) = 1780660
diff --git a/graphics/opennurbs/files/patch-makefile b/graphics/opennurbs/files/patch-makefile
deleted file mode 100644
index 54f06eede56f..000000000000
--- a/graphics/opennurbs/files/patch-makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- makefile.orig	2012-01-20 20:19:57.000000000 +0100
-+++ makefile	2012-01-20 20:19:57.000000000 +0100
-@@ -446,7 +446,6 @@
-       example_write/example_write.o \
-       example_dump/example_dump.o \
-       example_brep/example_brep.o \
--      example_fileit/example_fileit.o \
-       example_userdata/example_ud.o \
-       example_userdata/example_userdata.o \
-       example_roundtrip/example_roundtrip.o
-@@ -455,7 +454,6 @@
-       example_write/example_write \
-       example_dump/example_dump \
-       example_brep/example_brep \
--      example_fileit/example_fileit \
-       example_roundtrip/example_roundtrip \
-       example_userdata/example_userdata
- 
-@@ -491,8 +489,6 @@
- example_brep/example_brep : example_brep/example_brep.o $(OPENNURBS_LIB_FILE)
- 	$(LINK) $(LINKFLAGS) example_brep/example_brep.o -L. -l$(OPENNURBS_LIB_NAME) -lm -o $@
- 
--example_fileit/example_fileit : example_fileit/example_fileit.o $(OPENNURBS_LIB_FILE)
--	$(LINK) $(LINKFLAGS) example_fileit/example_fileit.o -L. -l$(OPENNURBS_LIB_NAME) -lm -o $@
- 
- example_dump/example_dump : example_dump/example_dump.o
- 	$(LINK) $(LINKFLAGS) example_dump/example_dump.o -L. -l$(OPENNURBS_LIB_NAME) -lm -o $@
diff --git a/graphics/opennurbs/files/patch-opennurbs-array-defs.h b/graphics/opennurbs/files/patch-opennurbs-array-defs.h
deleted file mode 100644
index 0243ef8a8243..000000000000
--- a/graphics/opennurbs/files/patch-opennurbs-array-defs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- opennurbs_array_defs.h.orig	2012-01-20 20:18:46.000000000 +0100
-+++ opennurbs_array_defs.h	2012-01-20 20:18:20.000000000 +0100
-@@ -1459,7 +1459,7 @@
- #else
-   // for lamer 64 bit compilers
-   return found ? ((int)((((ON__UINT64)found) - ((ON__UINT64)m_a))/sizeof(T))) : -1;
--#endif#endif
-+#endif
- }
- 
- template <class T>
-@@ -1476,7 +1476,7 @@
- #else
-   // for lamer 64 bit compilers
-   return found ? ((int)((((ON__UINT64)found) - ((ON__UINT64)m_a))/sizeof(T))) : -1;
--#endif#endif
-+#endif
- }
- 
- template <class T>
diff --git a/graphics/opennurbs/files/patch-opennurbs-memory.c b/graphics/opennurbs/files/patch-opennurbs-memory.c
new file mode 100644
index 000000000000..72e31bdf9b41
--- /dev/null
+++ b/graphics/opennurbs/files/patch-opennurbs-memory.c
@@ -0,0 +1,21 @@
+--- opennurbs_memory.c.orig	2012-10-25 18:07:39.000000000 +0200
++++ opennurbs_memory.c	2012-10-25 18:08:08.000000000 +0200
+@@ -14,6 +14,8 @@
+ ////////////////////////////////////////////////////////////////
+ */
+ 
++#include <malloc_np.h>
++
+ #include "opennurbs_system.h"
+ #include "opennurbs_defines.h"
+ #include "opennurbs_memory.h"
+@@ -113,8 +115,7 @@
+     // platform, then report it to the support
+     // contact on http://opennurbs.org and
+     // the code will be added in the next release.
+-    ON_ERROR("onmsize not implemented on this compiler or platform.")
+-    sz = 0;
++    sz = malloc_usable_size( (void*)memblock );
+ #endif
+   }
+ 
diff --git a/graphics/opennurbs/files/patch-opennurbs-system.h b/graphics/opennurbs/files/patch-opennurbs-system.h
index ec6c3b4e986b..e6e7f35809cf 100644
--- a/graphics/opennurbs/files/patch-opennurbs-system.h
+++ b/graphics/opennurbs/files/patch-opennurbs-system.h
@@ -1,18 +1,14 @@
---- opennurbs_system.h.orig	2012-01-20 20:28:51.000000000 +0100
-+++ opennurbs_system.h	2012-01-20 20:28:32.000000000 +0100
-@@ -217,7 +217,6 @@
- #if defined(ON_COMPILER_XCODE)
- #include <malloc/malloc.h>
- #else
+--- opennurbs_system.h.orig	2012-10-24 23:45:37.000000000 +0200
++++ opennurbs_system.h	2012-10-24 23:45:37.000000000 +0200
+@@ -219,11 +219,6 @@
+ 
+ #include <stdlib.h>
+ #include <memory.h>
+-#if defined(ON_COMPILER_XCODE)
+-#include <malloc/malloc.h>
+-#else
 -#include <malloc.h>
- #endif
+-#endif
  #include <string.h>
  #include <math.h>
-@@ -299,7 +298,6 @@
- /* 16-bit wide character ("UNICODE") */
- 
- #if !defined(_WCHAR_T)
--typedef unsigned short wchar_t;
- #endif
- 
- #define _WCHAR_T_DEFINED
+ #include <stdio.h>
diff --git a/graphics/opennurbs/pkg-plist b/graphics/opennurbs/pkg-plist
index 3065aab7db70..26e1d951cafd 100644
--- a/graphics/opennurbs/pkg-plist
+++ b/graphics/opennurbs/pkg-plist
@@ -56,7 +56,6 @@ include/openNURBS/opennurbs_linestyle.h
 include/openNURBS/opennurbs_linetype.h
 include/openNURBS/opennurbs_lookup.h
 include/openNURBS/opennurbs_mapchan.h
-include/openNURBS/opennurbs_massprop.h
 include/openNURBS/opennurbs_material.h
 include/openNURBS/opennurbs_math.h
 include/openNURBS/opennurbs_matrix.h
@@ -81,7 +80,6 @@ include/openNURBS/opennurbs_polyedgecurve.h
 include/openNURBS/opennurbs_polyline.h
 include/openNURBS/opennurbs_polylinecurve.h
 include/openNURBS/opennurbs_qsort_template.h
-include/openNURBS/opennurbs_quaternion.h
 include/openNURBS/opennurbs_rand.h
 include/openNURBS/opennurbs_rendering.h
 include/openNURBS/opennurbs_revsurface.h
@@ -102,7 +100,6 @@ include/openNURBS/opennurbs_uuid.h
 include/openNURBS/opennurbs_version.h
 include/openNURBS/opennurbs_viewport.h
 include/openNURBS/opennurbs_workspace.h
-include/openNURBS/opennurbs_x.h
 include/openNURBS/opennurbs_xform.h
 include/openNURBS/opennurbs_zlib.h
 include/openNURBS/zlib/crc32.h
@@ -117,7 +114,6 @@ include/openNURBS/zlib/zlib.h
 include/openNURBS/zlib/zutil.h
 lib/libopenNURBS.a
 libexec/openNURBS/example_brep
-libexec/openNURBS/example_dump
 libexec/openNURBS/example_read
 libexec/openNURBS/example_roundtrip
 libexec/openNURBS/example_userdata