git: 0264ae98404b - 2024Q1 - graphics/openjpeg: Update to 2.5.2

The branch 2024Q1 has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0264ae98404b603870fe0d27bbea64448e6952e1

commit 0264ae98404b603870fe0d27bbea64448e6952e1
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-03-09 13:45:07 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-03-09 17:46:23 +0000

    graphics/openjpeg: Update to 2.5.2
    
    - Update WWW
    - Use USES=pathfix to fix .pc installation
    
    Changes:        https://github.com/uclouvain/openjpeg/releases
                    https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md
                    https://github.com/uclouvain/openjpeg/blob/master/NEWS.md
    Security:       CVE-2021-3575
    (cherry picked from commit 8637d879641bfab94a2d3410ceb1a1b41b6fb047)
---
 graphics/openjpeg/Makefile                   | 25 ++++++++++++++++++-------
 graphics/openjpeg/distinfo                   |  6 +++---
 graphics/openjpeg/files/patch-CMakeLists.txt | 19 -------------------
 graphics/openjpeg/pkg-plist                  |  8 ++++----
 4 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 70ec7052c3c9..514b2e0eb0bd 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	openjpeg
-PORTVERSION=	2.5.0
+PORTVERSION=	2.5.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Open-source JPEG 2000 codec
-WWW=		https://www.openjpeg.org/
+WWW=		https://www.openjpeg.org/ \
+		https://github.com/uclouvain/openjpeg
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,10 +15,21 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-USES=		cmake cpe localbase:ldflags jpeg pkgconfig
-
-CMAKE_OFF=	BUILD_DOC BUILD_JAVA BUILD_JPIP BUILD_JPIP_SERVER BUILD_LUTS_GENERATOR BUILD_TESTING BUILD_THIRDPARTY BUILD_UNIT_TESTS BUILD_VIEWER WITH_ASTYLE
-CMAKE_ON=	BUILD_CODEC BUILD_PKGCONFIG_FILES BUILD_SHARED_LIBS BUILD_STATIC_LIBS
+USES=		cmake cpe localbase:ldflags jpeg pathfix pkgconfig
+
+CMAKE_OFF=	BUILD_DOC \
+		BUILD_JAVA \
+		BUILD_JPIP \
+		BUILD_JPIP_SERVER \
+		BUILD_LUTS_GENERATOR \
+		BUILD_TESTING \
+		BUILD_THIRDPARTY \
+		BUILD_UNIT_TESTS \
+		BUILD_VIEWER \
+		WITH_ASTYLE
+CMAKE_ON=	BUILD_CODEC \
+		BUILD_SHARED_LIBS \
+		BUILD_STATIC_LIBS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R}
diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo
index 72da930c1f67..2cb491883bdb 100644
--- a/graphics/openjpeg/distinfo
+++ b/graphics/openjpeg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653151054
-SHA256 (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a
-SIZE (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 1867111
+TIMESTAMP = 1709390392
+SHA256 (uclouvain-openjpeg-v2.5.2_GH0.tar.gz) = 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a
+SIZE (uclouvain-openjpeg-v2.5.2_GH0.tar.gz) = 1871948
diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt
deleted file mode 100644
index 306d2fed2c30..000000000000
--- a/graphics/openjpeg/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2022-05-13 16:54:29 UTC
-+++ CMakeLists.txt
-@@ -370,14 +370,14 @@ if(BUILD_PKGCONFIG_FILES)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    libdata/pkgconfig )
- #
-   if(BUILD_JPIP)
-   # install in lib and not share (see multi-arch note above)
-   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
-     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
-   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
--    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+    libdata/pkgconfig )
-   endif()
- endif()
- 
diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist
index 0c05f9efebb1..062d6a341527 100644
--- a/graphics/openjpeg/pkg-plist
+++ b/graphics/openjpeg/pkg-plist
@@ -3,12 +3,12 @@ bin/opj_decompress
 bin/opj_dump
 include/openjpeg-%%VER%%/openjpeg.h
 include/openjpeg-%%VER%%/opj_config.h
-include/openjpeg-%%VER%%/opj_stdint.h
+lib/cmake/openjpeg-%%VER%%/OpenJPEGConfig.cmake
+lib/cmake/openjpeg-%%VER%%/OpenJPEGConfigVersion.cmake
+lib/cmake/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/openjpeg-%%VER%%/OpenJPEGTargets.cmake
 lib/libopenjp2.a
 lib/libopenjp2.so
 lib/libopenjp2.so.%%PORTVERSION%%
 lib/libopenjp2.so.7
-lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
-lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
 libdata/pkgconfig/libopenjp2.pc