diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 6462569e4dd6..048632594720 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,82 +1,82 @@
 # Created by: nork@FreeBSD.org
 
 PORTNAME=	openexr
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.4
 CATEGORIES=	graphics devel
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	High dynamic-range (HDR) image file format
 
 LICENSE=	BSD3CLAUSE
 
 # exact version required to avoid hard-to-debug issues
 LIB_DEPENDS=	libImath-3_0.so.28:math/Imath
 
 USES=		cmake compiler:c++14-lang pathfix pkgconfig
 
 USE_GITHUB=	yes
 GH_TUPLE=	AcademySoftwareFoundation:openexr:v${PORTVERSION}
 
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DCMAKE_DEBUG_POSTFIX=
 CPPFLAGS+=	-I.
 # must be linked with -l{thr|pthread} explicitly
 LDFLAGS+=	-lpthread
 
 PATCH_STRIP=	-p1
 
 _MAJORVER=	3_0
 _VER=		28
-_MINVER=	0
+_MINVER=	1
 _PLVER=		0
 
 PLIST_SUB+=	MAJORVER=${_MAJORVER} \
 		VER=${_VER} \
 		MINVER=${_MINVER} \
 		PLVER=${_PLVER}
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 _DOCSRCDIR1=	${WRKSRC}
 _DOCSRCDIR2=	${WRKSRC}/docs
 _DOC_FILES1=	CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \
 		CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md
 _DOC_FILES2=	*.odt *.pdf
 
 # too many reports about compilation failures, so
 # sanity check we are using the same C++ standard library
 _imath_libcxx=	${COMPILER_FEATURES:Mlib*c++}
 pre-configure:
 	@${READELF} -d ${LOCALBASE}/lib/libImath.so \
 	| ${EGREP} -q '\<NEEDED\>.*\[${_imath_libcxx:C/\+/\\+/g}\.' \
 	|| {	${ECHO_CMD} "*** Your Imath package uses a different C++ standard library than ***" ; \
 		${ECHO_CMD} "*** OpenEXR would. Please recompile and reinstall Imath with the  ***" ; \
 		${ECHO_CMD} "*** same C++ std. library before trying to build OpenEXR.  Abort. ***" ; \
 		exit 1; }
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DOC_FILES1:S|^|${_DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${_DOC_FILES2:S|^|${_DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install-DOCS-off:
 	${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || :
 
 post-install-EXAMPLES-on:
 	${MV} \
 		${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/ ${STAGEDIR}${EXAMPLESDIR}
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || :
 
 post-install-EXAMPLES-off:
 	${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 2>/dev/null || :
 
 do-test:
 	cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.mk>
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 650fb683c38f..27cb6c133901 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1621667416
-SHA256 (openexr-2.2.0-comp_dwa-test-images.tar.xz) = bbb8ff547e9b68f0dfb1e8804a7ad984978c2b15897988399cc68176e99dd63a
-SIZE (openexr-2.2.0-comp_dwa-test-images.tar.xz) = 653768
-SHA256 (AcademySoftwareFoundation-openexr-3.0.3-v3.0.3_GH0.tar.gz) = d3526a3ccdca78a94658d5208e1963e4686181087004edd5bb98290e1fd0f389
-SIZE (AcademySoftwareFoundation-openexr-3.0.3-v3.0.3_GH0.tar.gz) = 25060963
+TIMESTAMP = 1622763697
+SHA256 (AcademySoftwareFoundation-openexr-3.0.4-v3.0.4_GH0.tar.gz) = 64daae95d406fe3f59ee11ad8586d03fe7df2552b9630eac1a4f9152b8015fb9
+SIZE (AcademySoftwareFoundation-openexr-3.0.4-v3.0.4_GH0.tar.gz) = 25059835
diff --git a/graphics/openexr/pkg-plist b/graphics/openexr/pkg-plist
index a2e3bce5e689..c6b28779f1cc 100644
--- a/graphics/openexr/pkg-plist
+++ b/graphics/openexr/pkg-plist
@@ -1,155 +1,155 @@
 bin/exr2aces
 bin/exrenvmap
 bin/exrheader
 bin/exrmakepreview
 bin/exrmaketiled
 bin/exrmultipart
 bin/exrmultiview
 bin/exrstdattr
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexConfig.h
 include/OpenEXR/IexErrnoExc.h
 include/OpenEXR/IexExport.h
 include/OpenEXR/IexForward.h
 include/OpenEXR/IexMacros.h
 include/OpenEXR/IexMathExc.h
 include/OpenEXR/IexMathFloatExc.h
 include/OpenEXR/IexMathIeeeExc.h
 include/OpenEXR/IexNamespace.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmThread.h
 include/OpenEXR/IlmThreadConfig.h
 include/OpenEXR/IlmThreadExport.h
 include/OpenEXR/IlmThreadForward.h
 include/OpenEXR/IlmThreadMutex.h
 include/OpenEXR/IlmThreadNamespace.h
 include/OpenEXR/IlmThreadPool.h
 include/OpenEXR/IlmThreadSemaphore.h
 include/OpenEXR/ImfAcesFile.h
 include/OpenEXR/ImfArray.h
 include/OpenEXR/ImfAttribute.h
 include/OpenEXR/ImfBoxAttribute.h
 include/OpenEXR/ImfCRgbaFile.h
 include/OpenEXR/ImfChannelList.h
 include/OpenEXR/ImfChannelListAttribute.h
 include/OpenEXR/ImfCheckFile.h
 include/OpenEXR/ImfChromaticities.h
 include/OpenEXR/ImfChromaticitiesAttribute.h
 include/OpenEXR/ImfCompositeDeepScanLine.h
 include/OpenEXR/ImfCompression.h
 include/OpenEXR/ImfCompressionAttribute.h
 include/OpenEXR/ImfConvert.h
 include/OpenEXR/ImfDeepCompositing.h
 include/OpenEXR/ImfDeepFrameBuffer.h
 include/OpenEXR/ImfDeepImage.h
 include/OpenEXR/ImfDeepImageChannel.h
 include/OpenEXR/ImfDeepImageIO.h
 include/OpenEXR/ImfDeepImageLevel.h
 include/OpenEXR/ImfDeepImageState.h
 include/OpenEXR/ImfDeepImageStateAttribute.h
 include/OpenEXR/ImfDeepScanLineInputFile.h
 include/OpenEXR/ImfDeepScanLineInputPart.h
 include/OpenEXR/ImfDeepScanLineOutputFile.h
 include/OpenEXR/ImfDeepScanLineOutputPart.h
 include/OpenEXR/ImfDeepTiledInputFile.h
 include/OpenEXR/ImfDeepTiledInputPart.h
 include/OpenEXR/ImfDeepTiledOutputFile.h
 include/OpenEXR/ImfDeepTiledOutputPart.h
 include/OpenEXR/ImfDoubleAttribute.h
 include/OpenEXR/ImfEnvmap.h
 include/OpenEXR/ImfEnvmapAttribute.h
 include/OpenEXR/ImfExport.h
 include/OpenEXR/ImfFlatImage.h
 include/OpenEXR/ImfFlatImageChannel.h
 include/OpenEXR/ImfFlatImageIO.h
 include/OpenEXR/ImfFlatImageLevel.h
 include/OpenEXR/ImfFloatAttribute.h
 include/OpenEXR/ImfFloatVectorAttribute.h
 include/OpenEXR/ImfForward.h
 include/OpenEXR/ImfFrameBuffer.h
 include/OpenEXR/ImfFramesPerSecond.h
 include/OpenEXR/ImfGenericInputFile.h
 include/OpenEXR/ImfGenericOutputFile.h
 include/OpenEXR/ImfHeader.h
 include/OpenEXR/ImfHuf.h
 include/OpenEXR/ImfIDManifest.h
 include/OpenEXR/ImfIDManifestAttribute.h
 include/OpenEXR/ImfIO.h
 include/OpenEXR/ImfImage.h
 include/OpenEXR/ImfImageChannel.h
 include/OpenEXR/ImfImageChannelRenaming.h
 include/OpenEXR/ImfImageDataWindow.h
 include/OpenEXR/ImfImageIO.h
 include/OpenEXR/ImfImageLevel.h
 include/OpenEXR/ImfInputFile.h
 include/OpenEXR/ImfInputPart.h
 include/OpenEXR/ImfInt64.h
 include/OpenEXR/ImfIntAttribute.h
 include/OpenEXR/ImfKeyCode.h
 include/OpenEXR/ImfKeyCodeAttribute.h
 include/OpenEXR/ImfLineOrder.h
 include/OpenEXR/ImfLineOrderAttribute.h
 include/OpenEXR/ImfLut.h
 include/OpenEXR/ImfMatrixAttribute.h
 include/OpenEXR/ImfMultiPartInputFile.h
 include/OpenEXR/ImfMultiPartOutputFile.h
 include/OpenEXR/ImfMultiView.h
 include/OpenEXR/ImfName.h
 include/OpenEXR/ImfNamespace.h
 include/OpenEXR/ImfOpaqueAttribute.h
 include/OpenEXR/ImfOutputFile.h
 include/OpenEXR/ImfOutputPart.h
 include/OpenEXR/ImfPartHelper.h
 include/OpenEXR/ImfPartType.h
 include/OpenEXR/ImfPixelType.h
 include/OpenEXR/ImfPreviewImage.h
 include/OpenEXR/ImfPreviewImageAttribute.h
 include/OpenEXR/ImfRational.h
 include/OpenEXR/ImfRationalAttribute.h
 include/OpenEXR/ImfRgba.h
 include/OpenEXR/ImfRgbaFile.h
 include/OpenEXR/ImfRgbaYca.h
 include/OpenEXR/ImfSampleCountChannel.h
 include/OpenEXR/ImfStandardAttributes.h
 include/OpenEXR/ImfStdIO.h
 include/OpenEXR/ImfStringAttribute.h
 include/OpenEXR/ImfStringVectorAttribute.h
 include/OpenEXR/ImfTestFile.h
 include/OpenEXR/ImfThreading.h
 include/OpenEXR/ImfTileDescription.h
 include/OpenEXR/ImfTileDescriptionAttribute.h
 include/OpenEXR/ImfTiledInputFile.h
 include/OpenEXR/ImfTiledInputPart.h
 include/OpenEXR/ImfTiledOutputFile.h
 include/OpenEXR/ImfTiledOutputPart.h
 include/OpenEXR/ImfTiledRgbaFile.h
 include/OpenEXR/ImfTimeCode.h
 include/OpenEXR/ImfTimeCodeAttribute.h
 include/OpenEXR/ImfUtilExport.h
 include/OpenEXR/ImfVecAttribute.h
 include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
 lib/cmake/OpenEXR/OpenEXRConfig.cmake
 lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
 lib/cmake/OpenEXR/OpenEXRTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OpenEXR/OpenEXRTargets.cmake
 lib/libIex-%%MAJORVER%%.so
 lib/libIex-%%MAJORVER%%.so.%%VER%%
-lib/libIex-%%MAJORVER%%.so.%%VER%%.0.0
+lib/libIex-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%%
 lib/libIex.so
 lib/libIlmThread-%%MAJORVER%%.so
 lib/libIlmThread-%%MAJORVER%%.so.%%VER%%
-lib/libIlmThread-%%MAJORVER%%.so.%%VER%%.0.0
+lib/libIlmThread-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%%
 lib/libIlmThread.so
 lib/libOpenEXR-%%MAJORVER%%.so
 lib/libOpenEXR-%%MAJORVER%%.so.%%VER%%
-lib/libOpenEXR-%%MAJORVER%%.so.%%VER%%.0.0
+lib/libOpenEXR-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%%
 lib/libOpenEXR.so
 lib/libOpenEXRUtil-%%MAJORVER%%.so
 lib/libOpenEXRUtil-%%MAJORVER%%.so.%%VER%%
-lib/libOpenEXRUtil-%%MAJORVER%%.so.%%VER%%.0.0
+lib/libOpenEXRUtil-%%MAJORVER%%.so.%%VER%%.%%MINVER%%.%%PLVER%%
 lib/libOpenEXRUtil.so
 libdata/pkgconfig/OpenEXR.pc