From owner-svn-ports-all@freebsd.org Tue Mar 20 02:19:22 2018 Return-Path: Delivered-To: svn-ports-all@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 89E63F63043; Tue, 20 Mar 2018 02:19:22 +0000 (UTC) (envelope-from stephen@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 35F6374C0D; Tue, 20 Mar 2018 02:19:22 +0000 (UTC) (envelope-from stephen@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 2E02D16B5C; Tue, 20 Mar 2018 02:19:22 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2K2JM37085888; Tue, 20 Mar 2018 02:19:22 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2K2JLrQ085886; Tue, 20 Mar 2018 02:19:21 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201803200219.w2K2JLrQ085886@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Tue, 20 Mar 2018 02:19:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465054 - head/math/vtk6 X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: head/math/vtk6 X-SVN-Commit-Revision: 465054 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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, 20 Mar 2018 02:19:22 -0000 Author: stephen Date: Tue Mar 20 02:19:21 2018 New Revision: 465054 URL: https://svnweb.freebsd.org/changeset/ports/465054 Log: - Fix make install error when compiling with QT5 enabled. PR: ports/226752 Submitted by: otacilio.neto@bsd.com.br Modified: head/math/vtk6/Makefile head/math/vtk6/pkg-plist Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Tue Mar 20 01:31:29 2018 (r465053) +++ head/math/vtk6/Makefile Tue Mar 20 02:19:21 2018 (r465054) @@ -130,6 +130,7 @@ USE_QT4= gui_build gui_run network_build network_run s moc_build uic_build qmake_build rcc_build opengl webkit_build \ webkit_run CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="4" +PLIST_SUB+= QTV="qt4" .endif .if ${PORT_OPTIONS:MQT5} @@ -137,6 +138,7 @@ USE_QT5= gui_build gui_run network_build network_run s qmake_build opengl webkit_build buildtools webkit_run CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \ -DCMAKE_PREFIX_PATH:STRING=${LOCALBASE}/lib/qt5 +PLIST_SUB+= QTV="qt5" .endif .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} Modified: head/math/vtk6/pkg-plist ============================================================================== --- head/math/vtk6/pkg-plist Tue Mar 20 01:31:29 2018 (r465053) +++ head/math/vtk6/pkg-plist Tue Mar 20 02:19:21 2018 (r465054) @@ -825,7 +825,7 @@ %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkGUISupportQtWebkit.cmake %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingQt.cmake %%QT%%lib/cmake/vtk-%%VER2%%/Modules/vtkViewsQt.cmake -%%SHARED%%%%DESIGNER%%lib/qt4/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so +%%SHARED%%%%DESIGNER%%lib/%%QTV%%/plugins/designer/libQVTKWidgetPlugin-%%VER2%%.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelGeometryJava.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkFiltersParallelMPIJava.so %%SHARED%%%%JAVA%%%%MPI%%lib/vtk-%%VER2%%/libvtkIOMPIImageJava.so