svn commit: r402502 - in head/math/vtk6: . files

[Montgomery-Smith, Stephen]

On 11/29/2015 03:24 PM, Dmitry Marakasov wrote:
> * Montgomery-Smith, Stephen (stephen at missouri.edu) wrote:
> 
>>>> Author: stephen
>>>> Date: Sat Nov 28 01:59:35 2015
>>>> New Revision: 402502
>>>> URL: https://svnweb.freebsd.org/changeset/ports/402502
>>>>
>>>> Log:
>>>>   - Update to 6.2.0.
>>>
>>> This has broken cad/opencascade. Please always test dependent ports
>>> when updating a library and consider creating .mk file which provides
>>> current vtk version to consumers.
>>
>> My apologies.  Do you want me to revert the update?
> 
> First of all, I want opencascade fixed. This can be as easy as
> bumping vtk version in opencascade, but if it's not and there's
> no easy way to fix opencascade, I guess it'd be better to revert
> the update.
> 

I am copying to Thierry, since he is the maintainer of opencascade.

Can you try the attached patch?  In case the patch doesn't go through
the mail system, the patch is cut and pasted into the email below, but
probably the mail client will probably mangle it.

Index: Makefile
===================================================================
--- Makefile	(revision 402502)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@

 PORTNAME=	opencascade
 PORTVERSION=	6.9.1
+PORTREVISION=	1
 CATEGORIES=	cad science
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -29,7 +30,7 @@
 		adm/templates/custom.sh.in adm/templates/custom.sh.main	\
 		adm/start.tcl draw.sh xcode.sh env.sh custom.sh.in	\
 		gendoc codeblocks.sh
-VTKVER=		6.1
+VTKVER=		6.2

 OPTIONS_DEFINE=	VIS DOCS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl
and gl2ps)
@@ -98,6 +99,10 @@
 	${REINPLACE_CMD} -e
's|tcl8.6|tcl${TCL_VER:C|\.||}|;s|tk8.6|tk${TK_VER:C|\.||}|'	\
 		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
 .endfor
+.for mod in TKIVtk TKIVtkDraw
+	${REINPLACE_CMD} -E 's/(vtk[[:alnum:]]+)\-6.1/\1\-${VTKVER}/'	\
+		${WRKSRC}/adm/cmake/${mod}/CMakeLists.txt
+.endfor
 .for es in env.sh adm/templates/env.sh.in
 	${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
 .endfor
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: opencascade-patch.txt
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20151130/ae44e19d/attachment.txt>