svn commit: r495894 - head/graphics/osg

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 15:56:53 2019
New Revision: 495894
URL: https://svnweb.freebsd.org/changeset/ports/495894

Log:
  graphics/osg: remove QT4 option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/graphics/osg/Makefile
  head/graphics/osg/pkg-plist

Modified: head/graphics/osg/Makefile
==============================================================================
--- head/graphics/osg/Makefile	Sat Mar 16 15:53:23 2019	(r495893)
+++ head/graphics/osg/Makefile	Sat Mar 16 15:56:53 2019	(r495894)
@@ -4,7 +4,7 @@
 PORTNAME=	osg
 PORTVERSION=	3.4.1
 DISTVERSIONPREFIX=	OpenSceneGraph-
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3 at FreeBSD.org
@@ -39,10 +39,8 @@ PLIST_SUB=	OSG_VERSION=${PORTVERSION} \
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \
-		JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \
+		JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \
 		SVG VNC XINE XRANDR
-OPTIONS_RADIO=	QT
-OPTIONS_RADIO_QT=QT4 QT5
 OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR
 
 GDAL_DESC=	GDAL support
@@ -50,7 +48,6 @@ GTA_DESC=	GTA file format support
 INVENTOR_DESC=	SGI OpenInventor support
 LIBLAS_DESC=	liblas support
 NVTT_DESC=	Use NVidia texture tools
-QT_DESC=	QT toolkit support
 SDL_DESC=	Use SDL (joystick support in present3d)
 VNC_DESC=	LibVNCServer support
 
@@ -101,11 +98,6 @@ PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-g
 PDF_USE=		gnome=cairo
 PDF_VARS=		FORCE_REQUIRE+=Poppler-glib
 PDF_VARS_OFF=		FORCE_IGNORE+=Poppler-glib
-QT4_USES=		qt:4
-QT4_USE=		qt=corelib,gui,moc_build,opengl,qmake_build,rcc_build,uic_build
-QT4_CMAKE_ON=		-DDESIRED_QT_VERSION=4
-QT4_VARS=		FORCE_REQUIRE+=Qt4
-QT4_VARS_OFF=		FORCE_IGNORE+=Qt4
 QT5_USE=		qt:5
 QT5_USE=		qt=buildtools_build,core,gui,opengl,qmake_build,webkit
 QT5_CMAKE_ON=		-DDESIRED_QT_VERSION=5
@@ -137,17 +129,12 @@ FORCE_REQUIRE=	Threads OpenGL X11 JPEG PNG TIFF ZLIB		
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5}
+.if ${PORT_OPTIONS:MQT5}
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=ON
 PLIST_SUB+=		QT=""
 .else
 CMAKE_ARGS+=		-DOSG_USE_QT:BOOL=OFF
 PLIST_SUB+=		QT="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
 .endif
 
 post-patch:

Modified: head/graphics/osg/pkg-plist
==============================================================================
--- head/graphics/osg/pkg-plist	Sat Mar 16 15:53:23 2019	(r495893)
+++ head/graphics/osg/pkg-plist	Sat Mar 16 15:56:53 2019	(r495894)
@@ -738,7 +738,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so
-%%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so
 lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so