From nobody Mon Jan 13 18:04:50 2025 X-Original-To: dev-commits-ports-all@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 4YX0XL6h0hz5kcGY; Mon, 13 Jan 2025 18:04:50 +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 4YX0XL3crmz3Js4; Mon, 13 Jan 2025 18:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736791490; 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=q560dg3eB9xrRqvB2VZQWKJRlirrKrC6dzxRl3Cf6No=; b=t2/HOemS0y6I00g6GCCrWgqBpkfDLiWswItuLNXkQXYDCoBFBZKMhIuMDE5rmAk143Y+9q WKnkgdIBvVtUbdh1wEMdC46dxrcJE+Q77etlle6ucHg3CVxzhve9qJ0LOnZJGUy9f92CX8 KV+ihRVZJdsB9cR23eelozrr/7uBhFELUFLFX3KXXWFjtimtp7aDURnvM7UKbkL7RoACwi HE+pFmowCbfrETHxyminMm2AosCGfbq3K+iff8CVSxl7n2u35wWwMqO7LY2W4EPkYYcus/ S3no4OulM5dtjI10Llw6b7PCX4pWpihLTxL+3uKPYgQaDOQHQ/6PbMThtr1CDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736791490; 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=q560dg3eB9xrRqvB2VZQWKJRlirrKrC6dzxRl3Cf6No=; b=MjOw5c1l3VT223SLNcFcyhyXcESEezWx02qev6fFAtLgdWBmP+RHb59F4QIINl9cd2rIQV YieDl+hkWcsihnbxmLH9s7CJL+Gd6wBfHdXlL1NEcG6+nUo2RHjSgrTFRD6B0yoZcK2dQp QS0ydMPsz4uDIOEO3LDQ44maFvhiCVFOuPFdvlJCGyhJ5aqtPUvSxBp2S00z5MgLf0+wCB o2U5n8x7pf+k+zHE51ieTXFz6HXJ++JRW5kaHkU/cjCxbQoLHsuoU78C8y0KAFBQKMUc9B XHPKt4P/Ki9s/u/W402D4pqRYsDxXGkZA3t9uh9+gtKr5b8yqhZ+M2Z7kHXLRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736791490; a=rsa-sha256; cv=none; b=hH4QzR5rcmWJpQ1px70lHwbdJWS75wJOhWnJ6TLCshyBCdfvE/4N27SnDcdcUrR6wBGTfL 2+7mV7uGiuHCib2B8m34U4OnGTdBzSA74Vcmp24ksxMZ2XFWXodDvdCLoDnd2wF/AAJAvN b+QlJ6uqJs2JhUxpBW0YVvjq/dnXnLjDzuCXdzlmUEkTG9zUwHFOMxcepUIaDlxpiLJ6aP jY3mOK7cyDXjN9aB7ITvvHhR2m80ZVXdEjVt0YQBL6nwKcNiqkMimywGdtnfsz5Z4+Hkj+ vm3JYvQtfcXxaBGr+ij8CEyE/QaUNCVsVG75+tzSCIIRvNDfolce1PbwIYsXxQ== 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 4YX0XL2wBSzhRK; Mon, 13 Jan 2025 18:04:50 +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 50DI4oli088758; Mon, 13 Jan 2025 18:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50DI4ox4088755; Mon, 13 Jan 2025 18:04:50 GMT (envelope-from git) Date: Mon, 13 Jan 2025 18:04:50 GMT Message-Id: <202501131804.50DI4ox4088755@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: 31ea756a2476 - main - devel/libkiwix13: Fetch from official site; Enable tests List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 31ea756a24762cf7cbe7c0ccff7003a216d90ebd Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/ports/commit/?id=31ea756a24762cf7cbe7c0ccff7003a216d90ebd commit 31ea756a24762cf7cbe7c0ccff7003a216d90ebd Author: Olivier Certner AuthorDate: 2025-01-13 17:02:08 +0000 Commit: Olivier Certner 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