From nobody Mon Jan 13 18:04:49 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YX0XK6Ycpz5kbyr; Mon, 13 Jan 2025 18:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YX0XK3fVmz3Jy2; Mon, 13 Jan 2025 18:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736791489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Xkq0ALqeWaRJPwrxv6irFn3xvpNO1OaAZRvmg7nVNk=; b=DCqtp1h10Toqdoi+zgJM4rYsBCFnIGtdrom6Omf5ilUGoAG4fYCG8CrYogWSNRNdxm3Gam 7EBFlAgrYqUSMoGJWpUeYm1YmZHZDXqN9QVtkprsJO+tqJohNIpeNOudXBAFr2mSnF+DYx XI6WVQfTxPfxuCmth46PLY929Pql867LkLC6UjlTp5NXCRH7HFT4jLC/UpsmzcA9jAbFFZ 04lOhFVokH+gohApte3/NPpxRR70IC6xbsWFKfmWdWD0uBD6w66AgfksMSxyp782cG8QNU jek71nVaXXloRc7r8AXmsSyUXT7a3GW3vbyZNuSuAgq/KsdUi4ix69MJ12Ut0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736791489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Xkq0ALqeWaRJPwrxv6irFn3xvpNO1OaAZRvmg7nVNk=; b=a5ITeZj/vb2ip5jDUPy/FW7QFyq3Ve9CQV9awwR8X+BpU8eyUs3NVE3OJ6bGrBDGxoWpM/ zsavkGG1g1kRb+WcoDphEyLYKMskAhW6BP2mh3jd0BGE//myCGaJa+nzn/MccLif4Jo6dA AWq0N4IfUKGRwYZ+ivnJTI2WzC3BhHTHTqiZSGR/9M+Fxuar42Q/o3b3XyJcnMOQOSyuMG GcCcS5ZQd1TRl3dxjcMmiiPuRUj7Lruf0yC4GS4BS2LSPMHEi62/7d9lwQpezCPUuRnWmL zDD0/or6UcXFfXVTO/+eprag5j3JvmZuNDLFFBbEjvxMcQCRe+5/hK6UwvKJrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736791489; a=rsa-sha256; cv=none; b=ujMOfnZ3a7bn+243ojQVKHVVaszVp4SGjKRG7tRh/pKrvRMOQl4kqRxvbTGa48THNPuEVv aVyvJo9y5grVzTnBgbG9FxBGP4pFceLKep0yZjjsK66gWaX7Hsc2wc7eazrkKo4JzmNAuN cWATyYiaGv6OksxEYlr3elsVjl2uvuseGOFMXxH8JgQXr1+bIhOudi0pY/T//80o4ksxpB jsXqmUmOjlqjHy9alAPkj+ZyI5Q0ZBNpbIEI98rpJWaxbSpQopFnsMUp2B7oodTTAoBqyX TQ4w5Y6NG0m3f9BeWQB9ptwfJl3WZbfUaMGyJSo+NLeuA+mK7ivI3AmCquMF2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YX0XK2FT7zgbr; Mon, 13 Jan 2025 18:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50DI4nZN088694; Mon, 13 Jan 2025 18:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DI4nXL088691; Mon, 13 Jan 2025 18:04:49 GMT (envelope-from git) Date: Mon, 13 Jan 2025 18:04:49 GMT Message-Id: <202501131804.50DI4nXL088691@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Certner Subject: git: 66ad62270065 - main - devel/libkiwix: Fetch from official site; Enable tests List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66ad62270065459982b0455e8357c635548b82c7 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=66ad62270065459982b0455e8357c635548b82c7 commit 66ad62270065459982b0455e8357c635548b82c7 Author: Olivier Certner AuthorDate: 2025-01-13 15:58:20 +0000 Commit: Olivier Certner CommitDate: 2025-01-13 18:04:22 +0000 devel/libkiwix: 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/libkiwix/Makefile | 23 ++++++++++++----------- devel/libkiwix/distinfo | 8 +++----- devel/libkiwix/pkg-descr | 6 +++--- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/devel/libkiwix/Makefile b/devel/libkiwix/Makefile index b842c0fc406f..466a94bd8d5a 100644 --- a/devel/libkiwix/Makefile +++ b/devel/libkiwix/Makefile @@ -1,15 +1,21 @@ PORTNAME= libkiwix DISTVERSION= 14.0.0 CATEGORIES= devel +MASTER_SITES= https://download.kiwix.org/release/libkiwix/ MAINTAINER= olce.freebsd.ports@certner.fr -COMMENT= Common code base for all Kiwix ports -WWW= https://www.kiwix.org/ +COMMENT= Software library to read and write ZIM files +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 \ @@ -20,11 +26,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= libkiwix13 @@ -32,9 +34,8 @@ CONFLICTS_INSTALL= libkiwix13 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/libkiwix/distinfo b/devel/libkiwix/distinfo index 38996a83e9f7..dd3e12eee001 100644 --- a/devel/libkiwix/distinfo +++ b/devel/libkiwix/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1736502491 -SHA256 (kiwix-libkiwix-14.0.0_GH0.tar.gz) = dae329ebc08ff510daa50b42de71366bf063813e29bf1c09cc49335d90f32094 -SIZE (kiwix-libkiwix-14.0.0_GH0.tar.gz) = 1149884 -SHA256 (kainjow-Mustache-v4.1_GH0.tar.gz) = acd66359feb4318b421f9574cfc5a511133a77d916d0b13c7caa3783c0bfe167 -SIZE (kainjow-Mustache-v4.1_GH0.tar.gz) = 98905 +TIMESTAMP = 1736786938 +SHA256 (libkiwix-14.0.0.tar.xz) = fbdc64d37efd17f3f195725441b5239c8aaf01797af86415dc4f889f499210dc +SIZE (libkiwix-14.0.0.tar.xz) = 1003564 diff --git a/devel/libkiwix/pkg-descr b/devel/libkiwix/pkg-descr index bd84147decbf..7ead8d1e5228 100644 --- a/devel/libkiwix/pkg-descr +++ b/devel/libkiwix/pkg-descr @@ -1,5 +1,5 @@ -Kiwix is an offline reader for web content archived in ZIM format. It is +Kiwix is an offline reader for web content archived in ZIM format. It is particularly tailored towards Wikipedia and other wikis. -The Kiwix library contains the code shared by Kiwix ports on all supported -platforms. +Libkiwix provides the Kiwix software suite core. It contains the code shared by +all Kiwix ports.