Date: Sat, 20 Jun 2009 15:48:58 -0300 (BRT) From: Sylvio Cesar <scjamorim@bsd.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: araujo@FreeBSD.org Subject: ports/135868: [PATCH] science/elmerpost: Fix problem with patch. Message-ID: <20090620184858.482A6F8F08@freecontrib.vida.br> Resent-Message-ID: <200906201940.n5KJe4bj029600@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 135868
>Category: ports
>Synopsis: [PATCH] science/elmerpost: Fix problem with patch.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jun 20 19:40:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Sylvio Cesar
>Release: FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD freecontrib.vida.br 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May 1 08:49:13 UTC
>Description:
- Fix problem in the mark broken with patch
- Changed Makefile
- Take maintainership
Added file(s):
- files/patch-context.cc
- files/patch-file.cc
Port maintainer (araujo@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- elmerpost-5.4.0_5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/science/elmerpost/Makefile,v
retrieving revision 1.21
diff -u -u -r1.21 Makefile
--- Makefile 16 Mar 2009 08:43:58 -0000 1.21
+++ Makefile 20 Jun 2009 19:26:15 -0000
@@ -29,10 +29,11 @@
ALL_TARGET=
USE_FORTRAN= yes
-
-BROKEN= Latest version fails to compile
+USE_C++= yes
.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
Index: files/patch-context.cc
===================================================================
RCS file: files/patch-context.cc
diff -N files/patch-context.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-context.cc 20 Jun 2009 19:26:15 -0000
@@ -0,0 +1,18 @@
+--- 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;
Index: files/patch-file.cc
===================================================================
RCS file: files/patch-file.cc
diff -N files/patch-file.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-file.cc 20 Jun 2009 19:26:15 -0000
@@ -0,0 +1,11 @@
+--- src/camera/file.cc 2007-09-26 08:01:37.000000000 -0300
++++ src/camera/file.cc.mod 2009-06-20 15:21:42.000000000 -0300
+@@ -486,8 +486,6 @@
+ text->r = r;
+ text->g = g;
+ text->b = b;
+- text->string = (char *)malloc( strlen(string)+1 );
+- strncpy( text->string, string, strlen(string)+1 );
+ }
+
+ //
--- elmerpost-5.4.0_5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090620184858.482A6F8F08>