graphics/ilmbase: graphics/openexr: update to v2.5.0

ChangeLog:
- https://github.com/AcademySoftwareFoundation/openexr/releases/tag/v2.5.0

* Bump PORTREVISION of all consumers except py-openimageio (BROKEN).

* cad/PrusaSlicer:
    LIB_DEPENDS: remove version from libHalf.so
    BUILD_DEPENDS+=qt5-buildtools as package (needed on bare metal builds)
    USE_GL+=gl
    USES+=pkgconfig (needed to find libHalf)

4 files changed, 35 insertions, 52 deletions

diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index e78c789ab403..f7c389163a13 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openexr
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.5.0
 CATEGORIES=	graphics devel
 MASTER_SITES=	LOCAL/mandree/:test
 DISTFILES=	${PORTNAME}-2.2.0-comp_dwa-test-images.tar.xz:test
@@ -14,49 +13,47 @@ COMMENT=	High dynamic-range (HDR) image file format
 LICENSE=	BSD3CLAUSE
 
 # exact version required to avoid hard-to-debug issues
-LIB_DEPENDS=	libImath-2_4.so.24:graphics/ilmbase
+LIB_DEPENDS=	libImath-2_5.so.24:graphics/ilmbase
 
 USES=		cmake compiler:c++14-lang libtool pathfix pkgconfig
-USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_TUPLE=	AcademySoftwareFoundation:openexr:v${PORTVERSION}
 
+USE_LDCONFIG=	yes
 CPPFLAGS+=	-I. -I../IlmImf
 # must be linked with -l{thr|pthread} explicitly
 LDFLAGS+=	-lpthread
 
+WRKSRC_SUBDIR=	OpenEXR
+
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-DOCSRCDIR1=	${WRKSRC:H}/
-DOC_FILES1=	CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \
-		CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md
-
-DOCSRCDIR2=	${WRKSRC}/doc
-DOC_FILES2=	*.odt *.pdf
-
-OPTIONS_DEFINE=		DOCS EXAMPLES
-
-WRKSRC_SUBDIR=	OpenEXR
-
+OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
+_DOCSRCDIR1=	${WRKSRC:H}/
+_DOCSRCDIR2=	${WRKSRC}/doc
+_DOC_FILES1=	CHANGES.md CONTRIBUTING.md GOVERNANCE.md LICENSE.md SECURITY.md \
+		CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md
+_DOC_FILES2=	*.odt *.pdf
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == powerpc
 USE_GCC=	yes
 .endif
 
-MAJORVER=	2_4
+MAJORVER=	2_5
 VER=		24
 
-PLIST_SUB+=	MAJORVER=${MAJORVER}
-PLIST_SUB+=	VER=${VER}
+PLIST_SUB+=	MAJORVER=${MAJORVER} \
+		VER=${VER}
 
 # too many reports about compilation failures, so
 # sanity check we are using the same C++ standard library
-_ilm_libcxx=${COMPILER_FEATURES:Mlib*c++}
+_ilm_libcxx=	${COMPILER_FEATURES:Mlib*c++}
 pre-configure:
 	@${READELF} -d ${LOCALBASE}/lib/libImath.so \
 	| ${EGREP} -q '\<NEEDED\>.*\[${_ilm_libcxx:C/\+/\\+/g}\.' \
@@ -70,26 +67,26 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/libIlmImf-${MAJORVER}.so.${VER} \
 		${STAGEDIR}${PREFIX}/lib/libIlmImfUtil-${MAJORVER}.so.${VER}
 
-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 || :
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || :
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${_DOC_FILES1:S|^|${_DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${_DOC_FILES2:S|^|${_DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/[a-df-zA-Z]* ${STAGEDIR}${DOCSDIR}
 
-post-install-DOCS-off:
-	${RM} ${STAGEDIR}${DOCSDIR:H}/OpenEXR/*.pdf
-	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME} 2>/dev/null || :
+post-install-EXAMPLES-off:
+	${RM} -R ${STAGEDIR}${PREFIX}/share/doc/OpenEXR/examples/
+	@${RMDIR} ${STAGEDIR}${PREFIX}/share/doc/OpenEXR 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 || :
 
-regression-test check test:
+do-test:
 	cd ${BUILD_WRKSRC} && ctest -j ${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.post.mk>
diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo
index 5cd474f75fc5..ef8fbdf041c4 100644
--- a/graphics/openexr/distinfo
+++ b/graphics/openexr/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1581526765
+TIMESTAMP = 1588893608
 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-2.4.1-v2.4.1_GH0.tar.gz) = 3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1
-SIZE (AcademySoftwareFoundation-openexr-2.4.1-v2.4.1_GH0.tar.gz) = 26809861
+SHA256 (AcademySoftwareFoundation-openexr-2.5.0-v2.5.0_GH0.tar.gz) = ea1d786806045682461df1882dd36667d868bb7b41bb5307f8b87ff314328bcb
+SIZE (AcademySoftwareFoundation-openexr-2.5.0-v2.5.0_GH0.tar.gz) = 27522236
diff --git a/graphics/openexr/files/patch-config_CMakeLists.txt b/graphics/openexr/files/patch-config_CMakeLists.txt
deleted file mode 100644
index 5d0e087d07dc..000000000000
--- a/graphics/openexr/files/patch-config_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/CMakeLists.txt.orig	2019-12-28 20:44:23 UTC
-+++ config/CMakeLists.txt
-@@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
-   # use a helper function to avoid variable pollution, but pretty simple
-   function(openexr_pkg_config_help pcinfile)
-     set(prefix ${CMAKE_INSTALL_PREFIX})
--    set(exec_prefix ${CMAKE_INSTALL_BINDIR})
--    set(libdir ${CMAKE_INSTALL_LIBDIR})
--    set(includedir ${CMAKE_INSTALL_INCLUDEDIR})
-+    set(exec_prefix "\${prefix}")
-+    set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-+    set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
-     set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX})
-     if(TARGET Threads::Threads)
-       # hrm, can't use properties as they end up as generator expressions
diff --git a/graphics/openexr/pkg-plist b/graphics/openexr/pkg-plist
index 48cd51b084ac..ceabbe17ac09 100644
--- a/graphics/openexr/pkg-plist
+++ b/graphics/openexr/pkg-plist
@@ -110,9 +110,10 @@ include/OpenEXR/ImfVersion.h
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
-lib/cmake/OpenEXR/OpenEXRConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/OpenEXR/OpenEXRConfig.cmake
 lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
+lib/cmake/OpenEXR/OpenEXRTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/OpenEXR/OpenEXRTargets.cmake
 lib/libIlmImf-%%MAJORVER%%.so
 lib/libIlmImf-%%MAJORVER%%.so.%%VER%%
 lib/libIlmImf-%%MAJORVER%%.so.%%VER%%.0.0