Date: Sat, 27 Oct 2012 15:24:55 GMT From: Fernando <fernando.apesteguia@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173142: [maintainer update] graphics/opennurbs Message-ID: <201210271524.q9RFOt7J014657@red.freebsd.org> Resent-Message-ID: <201210271530.q9RFU0dd056551@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173142 >Category: ports >Synopsis: [maintainer update] graphics/opennurbs >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 27 15:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Fernando >Release: 9.0-RELEASE >Organization: >Environment: FreeBSD hammer 9.0-RELEASE FreeBSD 9.0-RELEASE #6: Thu Mar 15 21:48:00 CET 2012 root@hammer:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Update Opennurbs to the lates release (20120914) >How-To-Repeat: >Fix: Apply the attached patch. Patch attached with submission follows: diff -ruN /usr/ports/graphics/opennurbs/Makefile opennurbs/Makefile --- /usr/ports/graphics/opennurbs/Makefile 2012-04-02 18:47:38.000000000 +0200 +++ opennurbs/Makefile 2012-10-25 23:39:39.000000000 +0200 @@ -5,10 +5,10 @@ # $FreeBSD: ports/graphics/opennurbs/Makefile,v 1.4 2012/04/02 16:47:38 jgh Exp $ PORTNAME= opennurbs -PORTVERSION= 20111122 +PORTVERSION= 20120914 PORTREVISION= 1 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 +30,7 @@ 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 -ruN /usr/ports/graphics/opennurbs/distinfo opennurbs/distinfo --- /usr/ports/graphics/opennurbs/distinfo 2012-02-18 15:03:46.000000000 +0100 +++ opennurbs/distinfo 2012-10-25 23:20:01.000000000 +0200 @@ -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 -ruN /usr/ports/graphics/opennurbs/files/patch-makefile opennurbs/files/patch-makefile --- /usr/ports/graphics/opennurbs/files/patch-makefile 2012-02-18 15:03:47.000000000 +0100 +++ opennurbs/files/patch-makefile 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/graphics/opennurbs/files/patch-opennurbs-array-defs.h opennurbs/files/patch-opennurbs-array-defs.h --- /usr/ports/graphics/opennurbs/files/patch-opennurbs-array-defs.h 2012-02-18 15:03:47.000000000 +0100 +++ opennurbs/files/patch-opennurbs-array-defs.h 1970-01-01 01:00:00.000000000 +0100 @@ -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 -ruN /usr/ports/graphics/opennurbs/files/patch-opennurbs-memory.c opennurbs/files/patch-opennurbs-memory.c --- /usr/ports/graphics/opennurbs/files/patch-opennurbs-memory.c 1970-01-01 01:00:00.000000000 +0100 +++ opennurbs/files/patch-opennurbs-memory.c 2012-10-25 23:20:01.000000000 +0200 @@ -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 -ruN /usr/ports/graphics/opennurbs/files/patch-opennurbs-system.h opennurbs/files/patch-opennurbs-system.h --- /usr/ports/graphics/opennurbs/files/patch-opennurbs-system.h 2012-02-18 15:03:47.000000000 +0100 +++ opennurbs/files/patch-opennurbs-system.h 2012-10-25 23:20:01.000000000 +0200 @@ -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 -ruN /usr/ports/graphics/opennurbs/pkg-plist opennurbs/pkg-plist --- /usr/ports/graphics/opennurbs/pkg-plist 2012-03-19 15:03:54.000000000 +0100 +++ opennurbs/pkg-plist 2012-10-27 17:25:30.000000000 +0200 @@ -56,7 +56,6 @@ 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_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_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/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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210271524.q9RFOt7J014657>