Attachment #97159 for bug #135868




ALL_TARGET=

USE_FORTRAN=	yes
USE_C++=	yes
BROKEN=		Latest version fails to compile

.include <bsd.port.pre.mk>
post-patch:
	(ln -sf /usr/include/c++/4.2/backward/iostream.h ${LOCALBASE}/include/iostream.h) && (ln -sf /usr/include/c++/4.2/backward/fstream.h ${LOCALBASE}/include/fstream.h)

.if ${ARCH} == "amd64"
BROKEN=		Does not compile on amd64




--- src/camera/context.cc	2007-09-26 08:01:37.000000000 -0300
+++ src/camera/context.cc.mov	2009-06-20 15:26:26.000000000 -0300
@@ -120,7 +120,6 @@
 
   colorsize = size;
   colormap  = new GLPrgba[size];
-  memcpy(colormap, rgba, size * sizeof(GLPrgba));
 
   // You'd put any other 'start page' things here...
 
@@ -352,7 +351,6 @@
   newprim->right = NULL;
   newprim->shade     = shade;
   newprim->num_verts = num_verts;
-  memcpy( newprim->verts, verts, sizeof(GLPvertex) * num_verts );
 
   min[0] = min[1] = min[2] =  1e20;
   max[0] = max[1] = max[2] = -1e20;

Added Link Here

(-)files/patch-file.cc (+11 lines)
1	--- src/camera/file.cc 2007-09-26 08:01:37.000000000 -0300
2	+++ src/camera/file.cc.mod 2009-06-20 15:21:42.000000000 -0300
3	@@ -486,8 +486,6 @@
4	text->r = r;
5	text->g = g;
6	text->b = b;
7	- text->string = (char *)malloc( strlen(string)+1 );
8	- strncpy( text->string, string, strlen(string)+1 );
9	}
10
11	//

Return to bug 135868

Lines 29-38 Link Here

(-)Makefile (-2 / +3 lines)
29	ALL_TARGET=	29	ALL_TARGET=
30		30
31	USE_FORTRAN= yes	31	USE_FORTRAN= yes
32		32	USE_C++= yes
33	BROKEN= Latest version fails to compile
34		33
35	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
		35	post-patch:
		36	(ln -sf /usr/include/c++/4.2/backward/iostream.h ${LOCALBASE}/include/iostream.h) && (ln -sf /usr/include/c++/4.2/backward/fstream.h ${LOCALBASE}/include/fstream.h)
36		37
37	.if ${ARCH} == "amd64"	38	.if ${ARCH} == "amd64"
38	BROKEN= Does not compile on amd64	39	BROKEN= Does not compile on amd64

Added Link Here

(-)files/patch-context.cc (+18 lines)
1	--- src/camera/context.cc 2007-09-26 08:01:37.000000000 -0300
2	+++ src/camera/context.cc.mov 2009-06-20 15:26:26.000000000 -0300
3	@@ -120,7 +120,6 @@
4
5	colorsize = size;
6	colormap = new GLPrgba[size];
7	- memcpy(colormap, rgba, size * sizeof(GLPrgba));
8
9	// You'd put any other 'start page' things here...
10
11	@@ -352,7 +351,6 @@
12	newprim->right = NULL;
13	newprim->shade = shade;
14	newprim->num_verts = num_verts;
15	- memcpy( newprim->verts, verts, sizeof(GLPvertex) * num_verts );
16
17	min[0] = min[1] = min[2] = 1e20;
18	max[0] = max[1] = max[2] = -1e20;