git: bc9951864fb5 - main - textproc/expat2: Update to 2.6.0

The branch main has been updated by diizzy:

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

commit bc9951864fb597be6ff47c03b4338f9eb6b62caf
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2024-02-18 15:03:41 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2024-02-18 16:16:12 +0000

    textproc/expat2: Update to 2.6.0
    
    Fixes CVE-2023-52425 and CVE-2023-52426
    
    Changelog:
    https://github.com/libexpat/libexpat/blob/R_2_6_0/expat/Changes
    
    References:
    https://www.cve.org/CVERecord?id=CVE-2023-52425
    https://www.cve.org/CVERecord?id=CVE-2023-52426
    
    PR:             276946
    Approved by:    desktop (tcberner)
    Exp-run by:     antoine
---
 textproc/expat2/Makefile  | 19 ++++++++++---------
 textproc/expat2/distinfo  |  6 +++---
 textproc/expat2/pkg-plist |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 156aca9d89f7..d92aa400b4ef 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	expat
-DISTVERSION=	2.5.0
-PORTREVISION=	1
+DISTVERSION=	2.6.0
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/libexpat/libexpat/releases/download/R_${DISTVERSION:S|.|_|g}/
 
@@ -14,13 +13,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cpe libtool pathfix python:test tar:xz
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 CPE_VENDOR=	libexpat_project
 CPE_PRODUCT=	libexpat
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--without-docbook --without-examples
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+PLIST_SUB=	EXPAT_VERSION=${DISTVERSION}
+
+CONFIGURE_ARGS=	--without-docbook \
+		--without-examples
 
 OPTIONS_DEFINE=	DOCS STATIC TEST
 OPTIONS_SUB=	yes
@@ -30,11 +34,8 @@ STATIC_CONFIGURE_ENABLE=	static
 TEST_USES=	shebangfix
 SHEBANG_FILES=	test-driver-wrapper.sh tests/udiffer.py tests/xmltest.sh
 TEST_CONFIGURE_WITH=	tests
-TEST_TARGET=	check
-
-PLIST_SUB=	EXPAT_VERSION=${DISTVERSION}
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/xmlwf.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${MV} ${STAGEDIR}${PREFIX}/man/man1/xmlwf.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/textproc/expat2/distinfo b/textproc/expat2/distinfo
index cd8da41602b6..a327a4968e58 100644
--- a/textproc/expat2/distinfo
+++ b/textproc/expat2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1666915409
-SHA256 (expat-2.5.0.tar.xz) = ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
-SIZE (expat-2.5.0.tar.xz) = 460560
+TIMESTAMP = 1707521431
+SHA256 (expat-2.6.0.tar.xz) = cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
+SIZE (expat-2.6.0.tar.xz) = 483448
diff --git a/textproc/expat2/pkg-plist b/textproc/expat2/pkg-plist
index 45cf1bf6afef..a5867271900f 100644
--- a/textproc/expat2/pkg-plist
+++ b/textproc/expat2/pkg-plist
@@ -9,7 +9,7 @@ lib/cmake/expat-%%EXPAT_VERSION%%/expat.cmake
 %%STATIC%%lib/libexpat.a
 lib/libexpat.so
 lib/libexpat.so.1
-lib/libexpat.so.1.8.10
+lib/libexpat.so.1.9.0
 libdata/pkgconfig/expat.pc
 share/man/man1/xmlwf.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS