From owner-svn-ports-head@freebsd.org Fri Nov 23 05:23:05 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2610113B83B; Fri, 23 Nov 2018 05:23:05 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4871976C90; Fri, 23 Nov 2018 05:23:05 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 28E6E1A3B5; Fri, 23 Nov 2018 05:23:05 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAN5N5f7080732; Fri, 23 Nov 2018 05:23:05 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAN5N50R080731; Fri, 23 Nov 2018 05:23:05 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201811230523.wAN5N50R080731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Fri, 23 Nov 2018 05:23:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485636 - head/math/vtk8 X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/math/vtk8 X-SVN-Commit-Revision: 485636 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4871976C90 X-Spamd-Result: default: False [1.63 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_SHORT(0.51)[0.513,0]; NEURAL_SPAM_MEDIUM(0.72)[0.721,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 05:23:05 -0000 Author: yuri Date: Fri Nov 23 05:23:04 2018 New Revision: 485636 URL: https://svnweb.freebsd.org/changeset/ports/485636 Log: math/vtk8: Remove QT4 option kde4 is set to be deprecated on 2018-12-31 with Qt4 soon to follow. Therefore, simplify the VTK8 port and remove QT4. Modified: head/math/vtk8/Makefile Modified: head/math/vtk8/Makefile ============================================================================== --- head/math/vtk8/Makefile Fri Nov 23 04:41:40 2018 (r485635) +++ head/math/vtk8/Makefile Fri Nov 23 05:23:04 2018 (r485636) @@ -2,7 +2,7 @@ PORTNAME= vtk DISTVERSION= 8.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 8 @@ -39,7 +39,7 @@ DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS OSMESA EXAMPLES +OPTIONS_DEFINE= DESIGNER DOCS OSMESA QT5 EXAMPLES OPTIONS_DEFAULT= MPI QT5 OSMESA_DESC= Use Mesa for off-screen rendering DESIGNER_DESC= Build the Qt Designer plugin @@ -59,18 +59,6 @@ $g_DESC= Build the $g group $w_DESC= $w wrapping .endfor -# Qt radio -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 - -QT4_USES= qt:4 -QT4_USE= QT=corelib,designer,gui_build,gui_run,network_build,network_run,sql_build,sql_run,moc_build,uic_build,qmake_build,rcc_build,opengl,webkit_build,webkit_run -QT4_CMAKE_ON= -DVTK_QT_VERSION:STRING="4" \ - -DVTK_Group_Qt:BOOL=ON - QT5_USES= qt:5 QT5_USE= QT=core,gui,sql,uiplugin,widgets,x11extras,qmake_build,buildtools_build QT5_CMAKE_ON= -DVTK_QT_VERSION:STRING="5" \ @@ -79,6 +67,7 @@ QT5_CMAKE_ON= -DVTK_QT_VERSION:STRING="5" \ DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN DESIGNER_USE= QT=designer +DESIGNER_IMPLIES= QT5 MPI_LIB_DEPENDS= libmpi.so:net/openmpi MPI_CMAKE_ON= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec @@ -128,10 +117,6 @@ CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=OFF .if !${PORT_OPTIONS:MOSMESA} USE_GL= gl glu -.endif - -.if ${PORT_OPTIONS:MDESIGNER} && !${PORT_OPTIONS:MQT5} && !${PORT_OPTIONS:MQT4} -IGNORE= designer requires either QT4 or QT5 .endif post-install: # autoplist: thousands of files, complex dependencies on options