diff --git a/graphics/ospray/Makefile b/graphics/ospray/Makefile
index 63d261571411..560b2350d102 100644
--- a/graphics/ospray/Makefile
+++ b/graphics/ospray/Makefile
@@ -1,38 +1,44 @@
 PORTNAME=	ospray
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.0
-PORTREVISION=	1
+DISTVERSION=	2.9.0
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Ray tracing based rendering engine for high-fidelity visualization
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	ispc:devel/ispc
 LIB_DEPENDS=	libbenchmark.so:devel/benchmark \
 		libembree3.so:graphics/embree \
 		libglfw.so:graphics/glfw \
 		libopenvkl.so:graphics/openvkl \
 		librkcommon.so:devel/rkcommon \
 		libtbb.so:devel/onetbb
 
-USES=		cmake:testing gl pkgconfig readline qt:5
+USES=		cmake:testing compiler:c++11-lang gl pkgconfig readline qt:5
 USE_GITHUB=	yes
 USE_GL=		gl glu
 USE_QT=		core gui opengl qmake_build
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-CMAKE_OFF=	OSPRAY_APPS_TESTING
-CMAKE_TESTING_ON=	OSPRAY_APPS_TESTING
+CMAKE_OFF=	OSPRAY_ENABLE_APPS_TESTING
+CMAKE_TESTING_ON=	OSPRAY_ENABLE_APPS_TESTING
+
+OPTIONS_DEFINE=		APPS
+OPTIONS_DEFAULT=	APPS
+OPTIONS_SUB=		yes
+
+APPS_DESC=		Build apps
+APPS_CMAKE_BOOL=	OSPRAY_ENABLE_APPS
 
 post-patch: # replace alloca.h includes
 	@${FIND} ${WRKSRC} -name "*.c*" -a -exec ${GREP} "#include <alloca\\.h>" {} \; -a -exec ${REINPLACE_CMD} -e "s|#include <alloca\\.h>|#include <stdlib.h>|" {} \; > /dev/null
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc/OSPRay
 
 .include <bsd.port.mk>
diff --git a/graphics/ospray/distinfo b/graphics/ospray/distinfo
index 97dcbb0b1cec..3f448230989f 100644
--- a/graphics/ospray/distinfo
+++ b/graphics/ospray/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1637719708
-SHA256 (ospray-ospray-v2.8.0_GH0.tar.gz) = 2dabc75446a0e2e970952d325f930853a51a9b4d1868c8135f05552a4ae04d39
-SIZE (ospray-ospray-v2.8.0_GH0.tar.gz) = 1735344
+TIMESTAMP = 1645071340
+SHA256 (ospray-ospray-v2.9.0_GH0.tar.gz) = 0145e09c3618fb8152a32d5f5cff819eb065d90975ee4e35400d2db9eb9f6398
+SIZE (ospray-ospray-v2.9.0_GH0.tar.gz) = 1799001
diff --git a/graphics/ospray/pkg-message b/graphics/ospray/pkg-message
new file mode 100644
index 000000000000..4a3eb6363bac
--- /dev/null
+++ b/graphics/ospray/pkg-message
@@ -0,0 +1,10 @@
+[
+{ type: install
+  message: <<EOM
+You installed OSPRay: A ray-tracing engine.
+
+Due to the limitation of OpenVKL OSPRay requires
+CPU to have SSE4.2 support or higher.
+EOM
+}
+]
diff --git a/graphics/ospray/pkg-plist b/graphics/ospray/pkg-plist
index c4ea3843a01f..9877b4c5a568 100644
--- a/graphics/ospray/pkg-plist
+++ b/graphics/ospray/pkg-plist
@@ -1,323 +1,62 @@
-bin/ospBenchmark
-bin/ospExamples
-bin/ospTutorial
-bin/ospTutorialAsync
-bin/ospTutorialCpp
+%%APPS%%bin/ospBenchmark
+%%APPS%%bin/ospExamples
+%%APPS%%bin/ospTutorial
+%%APPS%%bin/ospTutorialAsync
+%%APPS%%bin/ospTutorialCpp
 include/ospray/OSPEnums.h
 include/ospray/SDK/OSPConfig.h
 include/ospray/SDK/api/Device.h
-include/ospray/SDK/api/ISPCDevice.h
-include/ospray/SDK/api/ISPCDevice_ispc.h
-include/ospray/SDK/camera/Camera.h
-include/ospray/SDK/camera/Camera.ih
-include/ospray/SDK/camera/Camera_ispc.h
-include/ospray/SDK/camera/OrthographicCamera.h
-include/ospray/SDK/camera/OrthographicCamera_ispc.h
-include/ospray/SDK/camera/PanoramicCamera.h
-include/ospray/SDK/camera/PanoramicCamera_ispc.h
-include/ospray/SDK/camera/PerspectiveCamera.h
-include/ospray/SDK/camera/PerspectiveCamera_ispc.h
-include/ospray/SDK/camera/registration.h
-include/ospray/SDK/common/Clipping.ih
-include/ospray/SDK/common/Data.h
-include/ospray/SDK/common/Data.ih
-include/ospray/SDK/common/DifferentialGeometry.ih
-include/ospray/SDK/common/FilterIntersect.ih
-include/ospray/SDK/common/Future.h
-include/ospray/SDK/common/Group.h
-include/ospray/SDK/common/Group.ih
-include/ospray/SDK/common/Group_ispc.h
 include/ospray/SDK/common/ISPCMessages.h
-include/ospray/SDK/common/Instance.h
-include/ospray/SDK/common/Instance.ih
-include/ospray/SDK/common/Instance_ispc.h
-include/ospray/SDK/common/Intersect.ih
 include/ospray/SDK/common/Library.h
-include/ospray/SDK/common/Managed.h
-include/ospray/SDK/common/MotionTransform.h
-include/ospray/SDK/common/MotionTransform.ih
 include/ospray/SDK/common/OSPCommon.h
-include/ospray/SDK/common/OSPCommon.ih
-include/ospray/SDK/common/OSPCommon_ispc.h
-include/ospray/SDK/common/Ray.ih
 include/ospray/SDK/common/Util.h
-include/ospray/SDK/common/VolumeIntervals.ih
-include/ospray/SDK/common/World.h
-include/ospray/SDK/common/World.ih
-include/ospray/SDK/common/World_ispc.h
-include/ospray/SDK/fb/FrameBuffer.h
-include/ospray/SDK/fb/FrameBuffer.ih
-include/ospray/SDK/fb/FrameBufferView.h
-include/ospray/SDK/fb/FrameBufferView.ih
-include/ospray/SDK/fb/FrameBuffer_ispc.h
-include/ospray/SDK/fb/ImageOp.h
-include/ospray/SDK/fb/LocalFB.h
-include/ospray/SDK/fb/LocalFB.ih
-include/ospray/SDK/fb/LocalFB_ispc.h
-include/ospray/SDK/fb/Tile.h
-include/ospray/SDK/fb/Tile.ih
-include/ospray/SDK/fb/TileError.h
-include/ospray/SDK/fb/frame_ops/Blur.h
-include/ospray/SDK/fb/frame_ops/Debug.h
-include/ospray/SDK/fb/frame_ops/Depth.h
-include/ospray/SDK/fb/frame_ops/SSAO.h
-include/ospray/SDK/fb/frame_ops/SSAO_ispc.h
-include/ospray/SDK/fb/registration.h
-include/ospray/SDK/fb/tile_ops/SaveTiles.h
-include/ospray/SDK/fb/tile_ops/ToneMapper.h
-include/ospray/SDK/fb/tile_ops/ToneMapper_ispc.h
-include/ospray/SDK/geometry/Boxes.h
-include/ospray/SDK/geometry/Boxes_ispc.h
-include/ospray/SDK/geometry/Curves.h
-include/ospray/SDK/geometry/Curves_ispc.h
-include/ospray/SDK/geometry/GeometricModel.h
-include/ospray/SDK/geometry/GeometricModel.ih
-include/ospray/SDK/geometry/GeometricModel_ispc.h
-include/ospray/SDK/geometry/Geometry.h
-include/ospray/SDK/geometry/Geometry.ih
-include/ospray/SDK/geometry/Geometry_ispc.h
-include/ospray/SDK/geometry/Isosurfaces.h
-include/ospray/SDK/geometry/Isosurfaces_ispc.h
-include/ospray/SDK/geometry/Mesh.h
-include/ospray/SDK/geometry/Mesh_ispc.h
-include/ospray/SDK/geometry/Planes.h
-include/ospray/SDK/geometry/Planes_ispc.h
-include/ospray/SDK/geometry/Spheres.h
-include/ospray/SDK/geometry/Spheres_ispc.h
-include/ospray/SDK/geometry/Subdivision.h
-include/ospray/SDK/geometry/Subdivision_ispc.h
-include/ospray/SDK/geometry/registration.h
-include/ospray/SDK/lights/AmbientLight.h
-include/ospray/SDK/lights/AmbientLight_ispc.h
-include/ospray/SDK/lights/CylinderCapSolidAngleTable.ih
-include/ospray/SDK/lights/CylinderLight.h
-include/ospray/SDK/lights/CylinderLight_ispc.h
-include/ospray/SDK/lights/DirectionalLight.h
-include/ospray/SDK/lights/DirectionalLight_ispc.h
-include/ospray/SDK/lights/HDRILight.h
-include/ospray/SDK/lights/HDRILight_ispc.h
-include/ospray/SDK/lights/Light.h
-include/ospray/SDK/lights/Light.ih
-include/ospray/SDK/lights/Light_ispc.h
-include/ospray/SDK/lights/PointLight.h
-include/ospray/SDK/lights/PointLight_ispc.h
-include/ospray/SDK/lights/QuadLight.h
-include/ospray/SDK/lights/QuadLight_ispc.h
-include/ospray/SDK/lights/SphericalQuadSampling.ih
-include/ospray/SDK/lights/SpotLight.h
-include/ospray/SDK/lights/SpotLight_ispc.h
-include/ospray/SDK/lights/SunSkyLight.h
-include/ospray/SDK/lights/registration.h
-include/ospray/SDK/lights/sky_model/color_info.h
-include/ospray/SDK/lights/sky_model/sky_model.h
-include/ospray/SDK/lights/sky_model/sky_model_data_ciexyz.h
-include/ospray/SDK/lights/sky_model/sky_model_data_rgb.h
-include/ospray/SDK/lights/sky_model/sky_model_data_spectral.h
-include/ospray/SDK/math/AffineSpace.ih
-include/ospray/SDK/math/Distribution1D.ih
-include/ospray/SDK/math/Distribution1D_ispc.h
-include/ospray/SDK/math/Distribution2D.ih
-include/ospray/SDK/math/Distribution2D_ispc.h
-include/ospray/SDK/math/LinearSpace.ih
-include/ospray/SDK/math/halton.ih
-include/ospray/SDK/math/halton_ispc.h
-include/ospray/SDK/math/interpolation.ih
-include/ospray/SDK/math/random.ih
-include/ospray/SDK/math/sampling.ih
-include/ospray/SDK/math/sobol.ih
-include/ospray/SDK/math/sobol_ispc.h
-include/ospray/SDK/math/spectrum.h
-include/ospray/SDK/math/spectrum.ih
-include/ospray/SDK/math/spectrum_ispc.h
-include/ospray/SDK/pf/LUTPixelFilter.ih
-include/ospray/SDK/pf/LUTPixelFilter_ispc.h
-include/ospray/SDK/pf/PixelFilter.h
-include/ospray/SDK/pf/PixelFilter.ih
-include/ospray/SDK/pf/PixelFilter_ispc.h
-include/ospray/SDK/render/LoadBalancer.h
-include/ospray/SDK/render/Material.h
-include/ospray/SDK/render/Material.ih
-include/ospray/SDK/render/MaterialType.ih
-include/ospray/SDK/render/RenderTask.h
-include/ospray/SDK/render/Renderer.h
-include/ospray/SDK/render/Renderer.ih
-include/ospray/SDK/render/Renderer_ispc.h
-include/ospray/SDK/render/ao/AORenderer.h
-include/ospray/SDK/render/ao/AORenderer.ih
-include/ospray/SDK/render/ao/AORenderer_ispc.h
-include/ospray/SDK/render/ao/surfaces.ih
-include/ospray/SDK/render/ao/surfaces_ispc.h
-include/ospray/SDK/render/ao/volumes.ih
-include/ospray/SDK/render/ao/volumes_ispc.h
-include/ospray/SDK/render/bsdfs/BSDF.ih
-include/ospray/SDK/render/bsdfs/BeckmannDistribution.ih
-include/ospray/SDK/render/bsdfs/Conductor.ih
-include/ospray/SDK/render/bsdfs/Dielectric.ih
-include/ospray/SDK/render/bsdfs/DielectricLayer.ih
-include/ospray/SDK/render/bsdfs/Fresnel.ih
-include/ospray/SDK/render/bsdfs/GGXDistribution.ih
-include/ospray/SDK/render/bsdfs/Lambert.ih
-include/ospray/SDK/render/bsdfs/LambertTransmission.ih
-include/ospray/SDK/render/bsdfs/MicrofacetAlbedo.ih
-include/ospray/SDK/render/bsdfs/MicrofacetAlbedoTables.ih
-include/ospray/SDK/render/bsdfs/MicrofacetAlbedoTables_ispc.h
-include/ospray/SDK/render/bsdfs/MicrofacetConductor.ih
-include/ospray/SDK/render/bsdfs/MicrofacetDielectric.ih
-include/ospray/SDK/render/bsdfs/MicrofacetDielectricLayer.ih
-include/ospray/SDK/render/bsdfs/MicrofacetDistribution.ih
-include/ospray/SDK/render/bsdfs/MicrofacetSheenLayer.ih
-include/ospray/SDK/render/bsdfs/Minneart.ih
-include/ospray/SDK/render/bsdfs/MultiBSDF.ih
-include/ospray/SDK/render/bsdfs/Optics.ih
-include/ospray/SDK/render/bsdfs/OrenNayar.ih
-include/ospray/SDK/render/bsdfs/PowerCosineDistribution.ih
-include/ospray/SDK/render/bsdfs/Reflection.ih
-include/ospray/SDK/render/bsdfs/RobustDielectric.ih
-include/ospray/SDK/render/bsdfs/RobustThinDielectric.ih
-include/ospray/SDK/render/bsdfs/Scale.ih
-include/ospray/SDK/render/bsdfs/ShadingContext.ih
-include/ospray/SDK/render/bsdfs/SheenDistribution.ih
-include/ospray/SDK/render/bsdfs/Specular.ih
-include/ospray/SDK/render/bsdfs/ThinDielectric.ih
-include/ospray/SDK/render/bsdfs/ThinMicrofacetDielectric.ih
-include/ospray/SDK/render/bsdfs/Transmission.ih
-include/ospray/SDK/render/bsdfs/Velvety.ih
-include/ospray/SDK/render/debug/DebugRenderer.h
-include/ospray/SDK/render/debug/DebugRendererType.h
-include/ospray/SDK/render/debug/DebugRenderer_ispc.h
-include/ospray/SDK/render/materials/Alloy.h
-include/ospray/SDK/render/materials/Alloy_ispc.h
-include/ospray/SDK/render/materials/CarPaint.h
-include/ospray/SDK/render/materials/CarPaint_ispc.h
-include/ospray/SDK/render/materials/Glass.h
-include/ospray/SDK/render/materials/Glass_ispc.h
-include/ospray/SDK/render/materials/Luminous.h
-include/ospray/SDK/render/materials/Luminous_ispc.h
-include/ospray/SDK/render/materials/Material.ih
-include/ospray/SDK/render/materials/Material_ispc.h
-include/ospray/SDK/render/materials/Medium.ih
-include/ospray/SDK/render/materials/Metal.h
-include/ospray/SDK/render/materials/Metal_ispc.h
-include/ospray/SDK/render/materials/MetallicPaint.h
-include/ospray/SDK/render/materials/MetallicPaint_ispc.h
-include/ospray/SDK/render/materials/Mix.h
-include/ospray/SDK/render/materials/Mix_ispc.h
-include/ospray/SDK/render/materials/OBJ.h
-include/ospray/SDK/render/materials/OBJ.ih
-include/ospray/SDK/render/materials/OBJ_ispc.h
-include/ospray/SDK/render/materials/Plastic.h
-include/ospray/SDK/render/materials/Plastic_ispc.h
-include/ospray/SDK/render/materials/Principled.h
-include/ospray/SDK/render/materials/Principled_ispc.h
-include/ospray/SDK/render/materials/ThinGlass.h
-include/ospray/SDK/render/materials/ThinGlass_ispc.h
-include/ospray/SDK/render/materials/Velvet.h
-include/ospray/SDK/render/materials/Velvet_ispc.h
-include/ospray/SDK/render/pathtracer/GeometryLight.ih
-include/ospray/SDK/render/pathtracer/GeometryLight_ispc.h
-include/ospray/SDK/render/pathtracer/NextEventEstimation.ih
-include/ospray/SDK/render/pathtracer/NextEventEstimation_ispc.h
-include/ospray/SDK/render/pathtracer/PathSampler.ih
-include/ospray/SDK/render/pathtracer/PathSampler_ispc.h
-include/ospray/SDK/render/pathtracer/PathStructs.ih
-include/ospray/SDK/render/pathtracer/PathTracer.h
-include/ospray/SDK/render/pathtracer/PathTracer.ih
-include/ospray/SDK/render/pathtracer/PathTracerDefines.ih
-include/ospray/SDK/render/pathtracer/PathTracerUtil.ih
-include/ospray/SDK/render/pathtracer/PathTracer_ispc.h
-include/ospray/SDK/render/pathtracer/Scattering.ih
-include/ospray/SDK/render/pathtracer/ShadowCatcher.ih
-include/ospray/SDK/render/pathtracer/ShadowCatcher_ispc.h
-include/ospray/SDK/render/pathtracer/TransparentShadow.ih
-include/ospray/SDK/render/pathtracer/TransparentShadow_ispc.h
-include/ospray/SDK/render/pathtracer/VirtualLight.ih
-include/ospray/SDK/render/pathtracer/VirtualLight_ispc.h
-include/ospray/SDK/render/pathtracer/volumes/HenyeyGreenstein.ih
-include/ospray/SDK/render/pathtracer/volumes/VolumeSampler.ih
-include/ospray/SDK/render/pathtracer/volumes/VolumeSampler_ispc.h
-include/ospray/SDK/render/registration.h
-include/ospray/SDK/render/scivis/SciVis.h
-include/ospray/SDK/render/scivis/SciVis.ih
-include/ospray/SDK/render/scivis/SciVis_ispc.h
-include/ospray/SDK/render/scivis/lightAlpha_ispc.h
-include/ospray/SDK/render/scivis/surfaces.ih
-include/ospray/SDK/render/scivis/surfaces_ispc.h
-include/ospray/SDK/render/scivis/volumes.ih
-include/ospray/SDK/render/scivis/volumes_ispc.h
-include/ospray/SDK/render/shaders/Flakes.ih
-include/ospray/SDK/render/shaders/Noise.ih
-include/ospray/SDK/render/util.h
-include/ospray/SDK/render/util.ih
-include/ospray/SDK/render/util_ispc.h
-include/ospray/SDK/texture/Texture.h
-include/ospray/SDK/texture/Texture2D.h
-include/ospray/SDK/texture/Texture2D.ih
-include/ospray/SDK/texture/Texture2D_ispc.h
-include/ospray/SDK/texture/TextureParam.ih
-include/ospray/SDK/texture/TextureParam_ispc.h
-include/ospray/SDK/texture/TextureVolume.h
-include/ospray/SDK/texture/TextureVolume_ispc.h
-include/ospray/SDK/texture/registration.h
-include/ospray/SDK/volume/Volume.h
-include/ospray/SDK/volume/Volume.ih
-include/ospray/SDK/volume/Volume_ispc.h
-include/ospray/SDK/volume/VolumetricModel.h
-include/ospray/SDK/volume/VolumetricModel.ih
-include/ospray/SDK/volume/VolumetricModel_ispc.h
-include/ospray/SDK/volume/transferFunction/LinearTransferFunction.h
-include/ospray/SDK/volume/transferFunction/LinearTransferFunction.ih
-include/ospray/SDK/volume/transferFunction/LinearTransferFunction_ispc.h
-include/ospray/SDK/volume/transferFunction/TransferFunction.h
-include/ospray/SDK/volume/transferFunction/TransferFunction.ih
-include/ospray/SDK/volume/transferFunction/TransferFunction_ispc.h
-include/ospray/SDK/volume/transferFunction/registration.h
 include/ospray/ospray.h
 include/ospray/ospray_cpp.h
 include/ospray/ospray_cpp/Camera.h
 include/ospray/ospray_cpp/Data.h
 include/ospray/ospray_cpp/Device.h
 include/ospray/ospray_cpp/FrameBuffer.h
 include/ospray/ospray_cpp/Future.h
 include/ospray/ospray_cpp/GeometricModel.h
 include/ospray/ospray_cpp/Geometry.h
 include/ospray/ospray_cpp/Group.h
 include/ospray/ospray_cpp/ImageOperation.h
 include/ospray/ospray_cpp/Instance.h
 include/ospray/ospray_cpp/Light.h
 include/ospray/ospray_cpp/ManagedObject.h
 include/ospray/ospray_cpp/Material.h
 include/ospray/ospray_cpp/Renderer.h
 include/ospray/ospray_cpp/Texture.h
 include/ospray/ospray_cpp/Traits.h
 include/ospray/ospray_cpp/TransferFunction.h
 include/ospray/ospray_cpp/Volume.h
 include/ospray/ospray_cpp/VolumetricModel.h
 include/ospray/ospray_cpp/World.h
 include/ospray/ospray_cpp/ext/glm.h
 include/ospray/ospray_cpp/ext/rkcommon.h
-include/ospray/ospray_testing/builders/Builder.h
-include/ospray/ospray_testing/builders/Noise.h
-include/ospray/ospray_testing/detail/ospray_testing.inl
-include/ospray/ospray_testing/ospray_testing.h
-include/ospray/ospray_testing/ospray_testing_export.h
+%%APPS%%include/ospray/ospray_testing/builders/Builder.h
+%%APPS%%include/ospray/ospray_testing/builders/Noise.h
+%%APPS%%include/ospray/ospray_testing/detail/ospray_testing.inl
+%%APPS%%include/ospray/ospray_testing/ospray_testing.h
+%%APPS%%include/ospray/ospray_testing/ospray_testing_export.h
 include/ospray/ospray_util.h
 include/ospray/version.h
 lib/cmake/ospray-%%VERSION%%/ispc.cmake
 lib/cmake/ospray-%%VERSION%%/osprayConfig.cmake
 lib/cmake/ospray-%%VERSION%%/osprayConfigVersion.cmake
 lib/cmake/ospray-%%VERSION%%/osprayUse.cmake
 lib/cmake/ospray-%%VERSION%%/ospray_Exports-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/ospray-%%VERSION%%/ospray_Exports.cmake
 lib/cmake/ospray-%%VERSION%%/ospray_macros.cmake
 lib/libospray.so
 lib/libospray.so.2
 lib/libospray.so.%%VERSION%%
-lib/libospray_imgui.so
-lib/libospray_imgui.so.2
-lib/libospray_imgui.so.%%VERSION%%
-lib/libospray_module_ispc.so
-lib/libospray_module_ispc.so.2
-lib/libospray_module_ispc.so.%%VERSION%%
-lib/libospray_testing.so
-lib/libospray_testing.so.2
-lib/libospray_testing.so.%%VERSION%%
+%%APPS%%lib/libospray_imgui.so
+%%APPS%%lib/libospray_imgui.so.2
+%%APPS%%lib/libospray_imgui.so.%%VERSION%%
+lib/libospray_module_cpu.so
+lib/libospray_module_cpu.so.2
+lib/libospray_module_cpu.so.%%VERSION%%
+%%APPS%%lib/libospray_testing.so
+%%APPS%%lib/libospray_testing.so.2
+%%APPS%%lib/libospray_testing.so.%%VERSION%%