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

[Max Brazhnikov]

On Tue, 18 Mar 2014 09:26:05 +0000Tue Mar 18 09:26:05 2014 Pietro Cerutti wrote:
> Author: gahr
> Date: Tue Mar 18 09:26:05 2014
> New Revision: 348527
> URL: http://svnweb.freebsd.org/changeset/ports/348527
> QAT: https://qat.redports.org/buildarchive/r348527/
> 
> Log:
>   - Update to 6.1.0
>   - Support Qt5
>   - Install Tcl wrapping files in a saner location
> 
> Added:
>   head/math/vtk6/files/patch-Examples-GUI-Qt-GraphicsView_CMakeLists.txt   (contents, props changed)
>   head/math/vtk6/files/patch-Wrapping-Tcl_CMakeLists.txt   (contents, props changed)
> Deleted:
>   head/math/vtk6/files/patch-IO-LSDyna-private_LSDynaFamily.cxx
>   head/math/vtk6/files/patch-Wrapping-Python_CMakeLists.txt
> Modified:
>   head/math/vtk6/Makefile
>   head/math/vtk6/distinfo
>   head/math/vtk6/files/patch-GUISupport-Qt_CMakeLists.txt
>   head/math/vtk6/pkg-plist
> 
> Modified: head/math/vtk6/Makefile
> ==============================================================================
> --- head/math/vtk6/Makefile	Tue Mar 18 09:16:50 2014	(r348526)
> +++ head/math/vtk6/Makefile	Tue Mar 18 09:26:05 2014	(r348527)
> @@ -2,21 +2,30 @@
>  # $FreeBSD$
>  
>  PORTNAME=	vtk
> -PORTVERSION=	6.0.0
> +PORTVERSION=	6.1.0
>  CATEGORIES=	math graphics
>  MASTER_SITES=	http://www.vtk.org/files/release/${VTK_SHORT_VER}/
>  PKGNAMESUFFIX=	6
> +DISTNAME=	${PORTNAME:U}-${PORTVERSION}
>  
>  MAINTAINER=	gahr at FreeBSD.org
>  COMMENT=	The Visualization Toolkit
>  
>  LICENSE=	BSD3CLAUSE
>  
> +LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
> +    		libpng.so:${PORTSDIR}/graphics/png \
> +		libjpeg.so:${PORTSDIR}/graphics/jpeg \
> +		libfreetype.so:${PORTSDIR}/print/freetype2 \
> +		libexpat.so:${PORTSDIR}/textproc/expat2
> +
>  #
>  # TODO
>  # * Python wrap
>  # * VTK Groups
>  
> +UNIQUENAME=	${PKGBASE}
> +
>  CONFLICTS=	vtk-4*
>  USE_GL=		gl
>  USE_LDCONFIG=	${PREFIX}/lib/vtk-${VTK_SHORT_VER}
> @@ -27,16 +36,21 @@ CXXFLAGS+=	-I${LOCALBASE}/include
>  VTK_SHORT_VER=	${PORTVERSION:R}
>  PLIST_SUB+=	VER2=${VTK_SHORT_VER}
>  
> -WRKSRC=		${WRKDIR}/VTK${PORTVERSION}
>  DOCSDIR=	${PREFIX}/share/doc/vtk-${VTK_SHORT_VER}
> +DATADIR=	${PREFIX}/share/vtk-${VTK_SHORT_VER}
>  
>  #VTK_GROUPS=	Imaging MPI Qt Rendering StandAlone Views
> -VTK_GROUPS=	MPI Qt
> +VTK_GROUPS=	MPI
>  VTK_WRAPS=	Java TclTk # Python
>  OPTIONS_GROUP=	Groups Wrapping
>  OPTIONS_GROUP_Groups=${VTK_GROUPS}
>  OPTIONS_GROUP_Wrapping=${VTK_WRAPS}
>  OPTIONS_DEFINE=	Designer DOCS
> +OPTIONS_RADIO=	Qt
> +OPTIONS_RADIO_Qt=	Qt4 Qt5
> +Qt_DESC=	Qt GUI support
> +Qt4_DESC=	Qt 4 toolkit support
> +Qt5_DESC=	Qt 5 toolkit support
>  #OPTIONS_DEFAULT=MPI Qt Java Python TclTk Designer

It seems you forgot to add Qt5 or Qt4 to OPTIONS_DEFAULT.

Considering that vtk6 is a toolkit, it might be useful to have
slave port for qt5 (or qt4) instead of options.

btw, lib/cmake/vtk-%%VER2%%/VTKTargets-release.cmake in pkg-plist
should be replaced with lib/cmake/vtk-%%VER2%%/VTKTargets-%%CMAKE_BUILD_TYPE%%.cmake
or mark the port broken for WITH_DEBUG :)

Max