git: 1e244834ad6b - main - textproc/libe-book: Fix build with ICU 76.1 and improve port

From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sat, 18 Jan 2025 17:23:53 UTC
The branch main has been updated by diizzy:

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

commit 1e244834ad6ba96c8227424514674b095c1991f6
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-18 17:14:35 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-18 17:23:17 +0000

    textproc/libe-book: Fix build with ICU 76.1 and improve port
    
    Fix build with ICU and while at it clean up port Makefile
    
    PR:             283574
    Approved by:    portmgr (maintainer timeout, 3+ weeks)
---
 textproc/libe-book/Makefile                 | 21 ++++++++++++---------
 textproc/libe-book/files/patch-configure.ac | 11 +++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index 74447b901a66..68866a8e40a7 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	libe-book
-PORTVERSION=	0.1.3
+DISTVERSION=	0.1.3
 PORTREVISION=	28
 CATEGORIES=	textproc
-MASTER_SITES=	SF/libebook/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	SF/libebook/${PORTNAME}-${DISTVERSION}/
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Library for import of reflowable e-book formats
@@ -15,19 +15,22 @@ LIB_DEPENDS=	libicui18n.so:devel/icu \
 		liblangtag.so:devel/liblangtag \
 		librevenge-0.0.so:textproc/librevenge
 
-OPTIONS_DEFINE=	DOCS
-
+USES=		autoreconf compiler:c++11-lib gmake gnome gperf libtool \
+		localbase pathfix pkgconfig tar:xz
 USE_GNOME=	libxml2
-
-USES=		compiler:c++11-lib gmake gnome gperf libtool pathfix pkgconfig \
-		tar:xz
 USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS=	--disable-werror --disable-tests
-CPPFLAGS+=	-I${LOCALBASE}/include -DBOOST_ERROR_CODE_HEADER_ONLY
 
 PORTDOCS=	*
+
+CPPFLAGS+=	-DBOOST_ERROR_CODE_HEADER_ONLY
+
+CONFIGURE_ARGS=	--disable-werror --disable-tests
+
+OPTIONS_DEFINE=	DOCS
+
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_CONFIGURE_OFF=	--without-docs
 
diff --git a/textproc/libe-book/files/patch-configure.ac b/textproc/libe-book/files/patch-configure.ac
new file mode 100644
index 000000000000..e6f18b6f6ecb
--- /dev/null
+++ b/textproc/libe-book/files/patch-configure.ac
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2025-01-04 19:00:12 UTC
++++ configure.ac
+@@ -127,7 +127,7 @@ AC_SUBST([BOOST_CFLAGS])
+ # ========
+ # Find icu
+ # ========
+-PKG_CHECK_MODULES([ICU], [icu-i18n])
++PKG_CHECK_MODULES([ICU], [icu-i18n icu-uc])
+ AC_SUBST(ICU_CFLAGS)
+ AC_SUBST(ICU_LIBS)
+