Date: Sat, 16 Mar 2019 17:25:15 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495916 - head/math/vtk6 Message-ID: <201903161725.x2GHPF6W025386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Mar 16 17:25:15 2019 New Revision: 495916 URL: https://svnweb.freebsd.org/changeset/ports/495916 Log: math/vtk6: remove QT4 option (Qt4 deprecation) Approved by: portmgr (implicit) Modified: head/math/vtk6/Makefile Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Sat Mar 16 17:08:40 2019 (r495915) +++ head/math/vtk6/Makefile Sat Mar 16 17:25:15 2019 (r495916) @@ -3,7 +3,7 @@ PORTNAME= vtk PORTVERSION= 6.2.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 6 @@ -36,7 +36,7 @@ DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS OSMESA EXAMPLES SHARED +OPTIONS_DEFINE= DESIGNER DOCS OSMESA EXAMPLES SHARED QT5 OPTIONS_DEFAULT=PYTHON SHARED #OPTIONS_DEFAULT=MPI Qt JAVA PYTHON TCLTK DESIGNER OSMESA_DESC= Use Mesa for off-screen rendering @@ -57,11 +57,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 CMAKE_ARGS+= -DVTK_INSTALL_LIBRARY_DIR=lib/vtk-${VTK_SHORT_VER} \ @@ -125,18 +120,6 @@ PLIST_SUB+= MPI="" PLIST_SUB+= MPI="@comment " .endif -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -USES+= qt:4 -USE_QT= 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 -CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="4" -PLIST_SUB+= QTV="qt4" -.endif - .if ${PORT_OPTIONS:MQT5} USES+= qt:5 USE_QT= gui_build gui_run network_build network_run sql_build sql_run \ @@ -146,7 +129,7 @@ CMAKE_ARGS+= -DVTK_QT_VERSION:STRING="5" \ PLIST_SUB+= QTV="qt5" .endif -.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} +.if ${PORT_OPTIONS:MQT5} CMAKE_ARGS+= -DVTK_Group_Qt:BOOL=ON PLIST_SUB+= QT="" .else @@ -157,10 +140,8 @@ CMAKE_ARGS+= -DVTK_Group_Qt:BOOL=OFF .if ${PORT_OPTIONS:MDESIGNER} .if ${PORT_OPTIONS:MQT5} USE_QT+= designer -.elif ${PORT_OPTIONS:MQT4} -USE_QT+= designer .else -IGNORE= designer requires either QT4 or QT5 +IGNORE= designer requires QT5 .endif PLIST_SUB+= DESIGNER="" CMAKE_ARGS+= -DQT_DESIGNER_PLUGIN:BOOL=ON
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903161725.x2GHPF6W025386>