Attachment #159918 for bug #202329

Lines 2-11 Link Here

(-)graphics/opennurbs/Makefile (-2 / +2 lines)
2	# $FreeBSD: head/graphics/opennurbs/Makefile 386312 2015-05-14 10:15:04Z mat $	2	# $FreeBSD: head/graphics/opennurbs/Makefile 386312 2015-05-14 10:15:04Z mat $
3		3
4	PORTNAME= opennurbs	4	PORTNAME= opennurbs
5	PORTVERSION= 20121024	5	PORTVERSION= 20130711
6	PORTREVISION= 3	6	PORTREVISION= 3
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2012-10-24/	8	MASTER_SITES= http://files.na.mcneel.com/opennurbs/5.0/2013-07-11/
9	DISTNAME= ${PORTNAME}_${PORTVERSION}	9	DISTNAME= ${PORTNAME}_${PORTVERSION}
10		10
11	MAINTAINER= fernando.apesteguia@gmail.com	11	MAINTAINER= fernando.apesteguia@gmail.com

Lines 1-2 Link Here

(-)graphics/opennurbs/distinfo (-2 / +2 lines)
1	SHA256 (opennurbs_20121024.zip) = 8788d1c18a02ceeb4fede5cff46fafa9e9423741aa83cb8bcacebc7a53b76744	1	SHA256 (opennurbs_20130711.zip) = 5cb9ff879c94c63145526a188f9ddc8c522f35cd82d8726ad49ed64a63d6e05a
2	SIZE (opennurbs_20121024.zip) = 1781061	2	SIZE (opennurbs_20130711.zip) = 1807257




--- 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
   }
 




--- 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
 #include <string.h>
 #include <math.h>
 #include <stdio.h>




--- opennurbs_system.h.orig	2015-08-14 13:19:05 UTC
+++ opennurbs_system.h
@@ -219,11 +219,7 @@
 
 #include <stdlib.h>
 #include <memory.h>
-#if defined(ON_COMPILER_XCODE)
-#include <malloc/malloc.h>
-#else
-#include <malloc.h>
-#endif
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <stdio.h>

Return to bug 202329

Lines 1-21 Link Here

(-)graphics/opennurbs/files/patch-opennurbs-memory.c (-21 lines)
1	--- opennurbs_memory.c.orig 2012-10-25 18:07:39.000000000 +0200
2	+++ opennurbs_memory.c 2012-10-25 18:08:08.000000000 +0200
3	@@ -14,6 +14,8 @@
4	////////////////////////////////////////////////////////////////
5	*/
6
7	+#include <malloc_np.h>
8	+
9	#include "opennurbs_system.h"
10	#include "opennurbs_defines.h"
11	#include "opennurbs_memory.h"
12	@@ -113,8 +115,7 @@
13	// platform, then report it to the support
14	// contact on http://opennurbs.org and
15	// the code will be added in the next release.
16	- ON_ERROR("onmsize not implemented on this compiler or platform.")
17	- sz = 0;
18	+ sz = malloc_usable_size( (void*)memblock );
19	#endif
20	}
21

Lines 1-14 Link Here

(-)graphics/opennurbs/files/patch-opennurbs-system.h (-14 lines)
1	--- opennurbs_system.h.orig 2012-10-24 23:45:37.000000000 +0200
2	+++ opennurbs_system.h 2012-10-24 23:45:37.000000000 +0200
3	@@ -219,11 +219,6 @@
4
5	#include <stdlib.h>
6	#include <memory.h>
7	-#if defined(ON_COMPILER_XCODE)
8	-#include <malloc/malloc.h>
9	-#else
10	-#include <malloc.h>
11	-#endif
12	#include <string.h>
13	#include <math.h>
14	#include <stdio.h>

Line 0 Link Here

(-)graphics/opennurbs/files/patch-opennurbs__system.h (+15 lines)
	1	--- opennurbs_system.h.orig 2015-08-14 13:19:05 UTC
	2	+++ opennurbs_system.h
	3	@@ -219,11 +219,7 @@
	4
	5	#include <stdlib.h>
	6	#include <memory.h>
	7	-#if defined(ON_COMPILER_XCODE)
	8	-#include <malloc/malloc.h>
	9	-#else
	10	-#include <malloc.h>
	11	-#endif
	12	+#include <stdlib.h>
	13	#include <string.h>
	14	#include <math.h>
	15	#include <stdio.h>

Lines 68-73 Link Here

(-)graphics/opennurbs/pkg-plist (+2 lines)
68	include/openNURBS/opennurbs_objref.h	68	include/openNURBS/opennurbs_objref.h
69	include/openNURBS/opennurbs_offsetsurface.h	69	include/openNURBS/opennurbs_offsetsurface.h
70	include/openNURBS/opennurbs_optimize.h	70	include/openNURBS/opennurbs_optimize.h
		71	include/openNURBS/opennurbs_photogrammetry.h
71	include/openNURBS/opennurbs_plane.h	72	include/openNURBS/opennurbs_plane.h
72	include/openNURBS/opennurbs_planesurface.h	73	include/openNURBS/opennurbs_planesurface.h
73	include/openNURBS/opennurbs_pluginlist.h	74	include/openNURBS/opennurbs_pluginlist.h
Lines 80-85 Link Here
80	include/openNURBS/opennurbs_polyline.h	81	include/openNURBS/opennurbs_polyline.h
81	include/openNURBS/opennurbs_polylinecurve.h	82	include/openNURBS/opennurbs_polylinecurve.h
82	include/openNURBS/opennurbs_qsort_template.h	83	include/openNURBS/opennurbs_qsort_template.h
		84	include/openNURBS/opennurbs_quaternion.h
83	include/openNURBS/opennurbs_rand.h	85	include/openNURBS/opennurbs_rand.h
84	include/openNURBS/opennurbs_rendering.h	86	include/openNURBS/opennurbs_rendering.h
85	include/openNURBS/opennurbs_revsurface.h	87	include/openNURBS/opennurbs_revsurface.h