git: 31ea756a2476 - main - devel/libkiwix13: Fetch from official site; Enable tests

The branch main has been updated by olce:

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

commit 31ea756a24762cf7cbe7c0ccff7003a216d90ebd
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-01-13 17:02:08 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-01-13 18:04:22 +0000

    devel/libkiwix13: Fetch from official site; Enable tests
    
    Fetch from the official site instead of Github.
    
    Also, stop downloading Mustache by hand and rely on devel/mustache.
    
    While here, remove a useless link flag for 'libz.so'.
    
    While here, revise the description.
    
    Sponsored by:   The FreeBSD Foundation
---
 devel/libkiwix13/Makefile | 23 ++++++++++++-----------
 devel/libkiwix13/distinfo |  8 +++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/devel/libkiwix13/Makefile b/devel/libkiwix13/Makefile
index 3620a09e76f1..0bd6d334a848 100644
--- a/devel/libkiwix13/Makefile
+++ b/devel/libkiwix13/Makefile
@@ -2,15 +2,21 @@ PORTNAME=	libkiwix
 DISTVERSION=	13.1.0
 CATEGORIES=	devel
 PKGNAMESUFFIX=	13
+MASTER_SITES=	https://download.kiwix.org/release/libkiwix/
 
 MAINTAINER=	olce.freebsd.ports@certner.fr
-COMMENT=	Common code base for all Kiwix ports, version 13
-WWW=		https://www.kiwix.org/
+COMMENT=	Software library to read and write ZIM files, version 13
+WWW=		https://github.com/kiwix/libkiwix
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	bash:shells/bash
+# 'googletest' dependency is only necessary for Meson's 'test' target, but it
+# must be present as soon as configure time.
+BUILD_DEPENDS=	bash:shells/bash \
+		${LOCALBASE}/include/kainjow/mustache.hpp:devel/mustache \
+		googletest>0:devel/googletest
+
 LIB_DEPENDS=	libzim.so:devel/libzim \
 		libpugixml.so:textproc/pugixml \
 		libaria2.so:www/aria2 \
@@ -21,11 +27,7 @@ LIB_DEPENDS=	libzim.so:devel/libzim \
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
-USES=		compiler:c++17-lang meson pkgconfig python shebangfix
-USE_GITHUB=	yes
-GH_ACCOUNT=	kiwix
-GH_TUPLE=	kiwix:${PORTNAME}:${PORTVERSION}:DEFAULT \
-		kainjow:Mustache:v4.1:mustache
+USES=		compiler:c++17-lang meson pkgconfig python shebangfix tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	libkiwix
@@ -33,9 +35,8 @@ CONFLICTS_INSTALL=	libkiwix
 SHEBANG_FILES=	scripts/format_code.sh
 SHEBANG_REGEX=	./scripts/kiwix.*[^.].
 
-CPPFLAGS+=	-I${WRKSRC_mustache}
-CXXFLAGS+=	-I${WRKSRC_mustache}
-LDFLAGS+=	-lz
+CPPFLAGS+=	-I${LOCALBASE}/include/kainjow
+CXXFLAGS+=	-I${LOCALBASE}/include/kainjow
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} PORTMAJ=${PORTVERSION:C/\..*//}
 
diff --git a/devel/libkiwix13/distinfo b/devel/libkiwix13/distinfo
index 7a1264477c3c..480103fe5852 100644
--- a/devel/libkiwix13/distinfo
+++ b/devel/libkiwix13/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1716196790
-SHA256 (kiwix-libkiwix-13.1.0_GH0.tar.gz) = 04d93f66b939f937df2c941af517966128d4c9872b707f9ed192177fe51364d3
-SIZE (kiwix-libkiwix-13.1.0_GH0.tar.gz) = 1136812
-SHA256 (kainjow-Mustache-v4.1_GH0.tar.gz) = acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167
-SIZE (kainjow-Mustache-v4.1_GH0.tar.gz) = 98905
+TIMESTAMP = 1736788188
+SHA256 (libkiwix-13.1.0.tar.xz) = 1559ded2702105a9ded7f4ff396cea69809018f1d83dfec06ae2c98d4e18cbb5
+SIZE (libkiwix-13.1.0.tar.xz) = 993660