git: e5c93d0cadc4 - main - textproc/libqxp: Fix build with ICU 76.1 and improve port

The branch main has been updated by diizzy:

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

commit e5c93d0cadc433bf6be15b1e43fa49f2f534447b
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-18 17:22:05 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-18 17:23:18 +0000

    textproc/libqxp: Fix build with ICU 76.1 and improve port
    
    Fix build with ICU and while at it clean up port Makefile
    
    PR:             283545
---
 textproc/libqxp/Makefile                 | 26 ++++++++++----------------
 textproc/libqxp/files/patch-configure.ac | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/textproc/libqxp/Makefile b/textproc/libqxp/Makefile
index 4ee5a1e93481..05469100d631 100644
--- a/textproc/libqxp/Makefile
+++ b/textproc/libqxp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libqxp
-PORTVERSION=	0.0.0
+DISTVERSION=	0.0.0
 PORTREVISION=	24
 CATEGORIES=	textproc
 MASTER_SITES=	https://dev-www.libreoffice.org/src/${PORTNAME}/
@@ -10,34 +10,28 @@ WWW=		https://wiki.documentfoundation.org/DLP/Libraries/libqxp
 
 LICENSE=	MPL20
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs
 LIB_DEPENDS=	librevenge-0.0.so:textproc/librevenge \
 		libicui18n.so:devel/icu
-		#libicui18n.so:devel/icu \
-		#libicuuc.so:devel/icu \
-		#libicudata.so:devel/icu
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/math/constants/constants.hpp:devel/boost-libs \
-		${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
-		${LOCALBASE}/include/boost/variant.hpp:devel/boost-libs \
-		${LOCALBASE}/include/boost/range/adaptor/reversed.hpp:devel/boost-libs \
-		${LOCALBASE}/include/boost/cstdint.hpp:devel/boost-libs
 
-CONFIGURE_ARGS=	--disable-werror
-CPPFLAGS+=	-I${LOCALBASE}/include
+USES=		autoreconf compiler:c++11-lang libtool localbase pathfix \
+		pkgconfig tar:xz
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-USES=		compiler:c++11-lang libtool pathfix pkgconfig tar:xz
-USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
+
+PORTDOCS=	*
+
+CONFIGURE_ARGS=	--disable-werror
 
 OPTIONS_DEFINE=	DOCS DOXYGEN TEST
-OPTIONS_DEFAULT=
 OPTIONS_SUB=	yes
 
-TEST_TARGET=		check
 TEST_LIB_DEPENDS=	libcppunit.so:devel/cppunit
 TEST_CONFIGURE_ENABLE=	tests
 
-PORTDOCS=		*
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_OFF=	--without-docs
 DOXYGEN_IMPLIES=	DOCS
diff --git a/textproc/libqxp/files/patch-configure.ac b/textproc/libqxp/files/patch-configure.ac
new file mode 100644
index 000000000000..412056403676
--- /dev/null
+++ b/textproc/libqxp/files/patch-configure.ac
@@ -0,0 +1,25 @@
+--- configure.ac.orig	2025-01-04 21:30:40 UTC
++++ configure.ac
+@@ -69,21 +69,7 @@ AC_SUBST([BOOST_CFLAGS])
+ # ========
+ # Find icu
+ # ========
+-AS_IF([test "${ICU_CFLAGS+set}" = set],[
+-	ICU_CFLAGS_overriden=yes],[
+-	ICU_CFLAGS_overriden=no])
+-PKG_CHECK_MODULES([ICU],[icu-i18n],[
+-	AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
+-		ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n --variable=CXXFLAGS`"])
+-	], [
+-	AC_PATH_PROG([ICU_CONFIG],[icu-config])
+-	AC_MSG_CHECKING([ICU installation])
+-	AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
+-		ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
+-		ICU_LIBS=`${ICU_CONFIG} --ldflags`
+-		AC_MSG_RESULT([found])],[
+-		AC_MSG_ERROR([libicu config program icu-config not found])])]
+-)
++PKG_CHECK_MODULES([ICU],[icu-i18n icu-uc])
+ AC_SUBST(ICU_CFLAGS)
+ AC_SUBST(ICU_LIBS)
+