From owner-svn-ports-all@FreeBSD.ORG Tue Mar 18 11:48:51 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 5D4AE18B; Tue, 18 Mar 2014 11:48:51 +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 CDDF52B7; Tue, 18 Mar 2014 11:48:50 +0000 (UTC) Received: from mercury.issp.ac.ru [77.236.34.155:9978] (HELO/EHLO mercury.ph.man.ac.uk, authenticated with LOGIN) by mail.issp.ac.ru with ESMTP/inet id s2IBmlbm050014 (using TLSv1/SSLv3, with cipher DHE-RSA-AES256-SHA (256 bits), verified NO) Tue, 18 Mar 2014 15:48:47 +0400 (MSK) From: Max Brazhnikov To: Pietro Cerutti Subject: Re: svn commit: r348527 - in head/math/vtk6: . files Date: Tue, 18 Mar 2014 11:48:47 +0000 Message-ID: <10817105.x4IFJEMSOC@mercury.ph.man.ac.uk> User-Agent: KMail/4.12.3 (FreeBSD/9.2-STABLE; KDE/4.12.3; amd64; ; ) In-Reply-To: <201403180926.s2I9Q52f058593@svn.freebsd.org> References: <201403180926.s2I9Q52f058593@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" 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: Tue, 18 Mar 2014 11:48:51 -0000 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. 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