From owner-svn-ports-all@FreeBSD.ORG Wed Mar 19 07:36:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 682C5ABD; Wed, 19 Mar 2014 07:36:39 +0000 (UTC) Received: from mail.issp.ac.ru (mail.issp.ac.ru [77.236.34.3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 00FB3FF3; Wed, 19 Mar 2014 07:36:38 +0000 (UTC) Received: from mercury.issp.ac.ru [77.236.34.155:13127] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id s2J7aYnp025936 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Wed, 19 Mar 2014 11:36:34 +0400 (MSK) From: Max Brazhnikov To: gahr@freebsd.org Subject: Re: svn commit: r348527 - in head/math/vtk6: . files Date: Wed, 19 Mar 2014 07:36:34 +0000 Message-ID: <2018241.NfHesBR58t@mercury.ph.man.ac.uk> User-Agent: KMail/4.12.3 (FreeBSD/9.2-STABLE; KDE/4.12.3; amd64; ; ) In-Reply-To: <20140318132711.GC64859@gahrfit.gahr.ch> References: <201403180926.s2I9Q52f058593@svn.freebsd.org> <10817105.x4IFJEMSOC@mercury.ph.man.ac.uk> <20140318132711.GC64859@gahrfit.gahr.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="ISO-8859-1" Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Mar 2014 07:36:39 -0000 On Tue, 18 Mar 2014 14:27:12 +0100 Pietro Cerutti wrote: > On 2014-Mar-18, 11:48, Max Brazhnikov wrote: > > 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@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. > > I'm not sure I want to do that. Why would you? Ah, sorry, I thought either Qt4 or Qt5 required, but it's not the case. > > Considering that vtk6 is a toolkit, it might be useful to have > > slave port for qt5 (or qt4) instead of options. > > Again, why? To allow other ports depend on different flavours. However, I don't any port that uses vtk6, so there is no demand for that right now. > > 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 :) > > Fixed in r348542, thanks! Thanks for quick fix, Max