Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5DFCD1A921F for ; Tue, 15 Mar 2022 18:27:06 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9EA2C84EA4; Tue, 15 Mar 2022 18:27:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D6CE084D96 for ; Tue, 15 Mar 2022 18:27:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id oHCRPLublpEd for ; Tue, 15 Mar 2022 18:27:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3E31084D8C for ; Tue, 15 Mar 2022 18:27:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 316DFFB24; Tue, 15 Mar 2022 18:27:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1647368824269600" MIME-Version: 1.0 Date: Tue, 15 Mar 2022 18:27:04 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/sysutils To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20220315182704.316DFFB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1647368824269600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Mar 15 18:27:04 UTC 2022 Modified Files: pkgsrc/sysutils/gnome-tracker: Makefile pkgsrc/sysutils/gnome-tracker-miners: Makefile Log Message: gnome-tracker: sync with asciidoc changes To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/gnome-tracker/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/gnome-tracker-miners/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1647368824269600 Content-Disposition: inline Content-Length: 2778 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/gnome-tracker/Makefile diff -u pkgsrc/sysutils/gnome-tracker/Makefile:1.9 pkgsrc/sysutils/gnome-tracker/Makefile:1.10 --- pkgsrc/sysutils/gnome-tracker/Makefile:1.9 Wed Dec 8 16:02:38 2021 +++ pkgsrc/sysutils/gnome-tracker/Makefile Tue Mar 15 18:27:03 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2021/12/08 16:02:38 adam Exp $ +# $NetBSD: Makefile,v 1.10 2022/03/15 18:27:03 nia Exp $ DISTNAME= tracker-3.0.1 PKGNAME= gnome-${DISTNAME} @@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 USE_TOOLS+= pkg-config xgettext -TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc +TOOL_DEPENDS+= asciidoc>=10.1.4:../../textproc/asciidoc TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # xsltproc MESON_ARGS+= -Ddocs=false @@ -30,11 +30,13 @@ MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/out PREFER.sqlite3= pkgsrc # fts5 .endif +.include "../../lang/python/pyversion.mk" + SUBST_CLASSES+= asciidoc SUBST_STAGE.asciidoc= pre-configure SUBST_MESSAGE.asciidoc= Correcting the path to asciidoc files. SUBST_FILES.asciidoc+= docs/manpages/meson.build -SUBST_SED.asciidoc+= -e "s,/etc/asciidoc,${PREFIX}/share/asciidoc,g" +SUBST_SED.asciidoc+= -e "s,/etc/asciidoc,${PREFIX}/${PYSITELIB}/asciidoc/resources/,g" PYTHON_FOR_BUILD_ONLY= tool Index: pkgsrc/sysutils/gnome-tracker-miners/Makefile diff -u pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.17 pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.18 --- pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.17 Wed Dec 8 16:06:30 2021 +++ pkgsrc/sysutils/gnome-tracker-miners/Makefile Tue Mar 15 18:27:04 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2021/12/08 16:06:30 adam Exp $ +# $NetBSD: Makefile,v 1.18 2022/03/15 18:27:04 nia Exp $ DISTNAME= tracker-miners-3.0.1 PKGNAME= gnome-${DISTNAME} @@ -12,7 +12,7 @@ HOMEPAGE= https://wiki.gnome.org/Project COMMENT= Desktop-neutral metadata-based search framework LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 -TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc +TOOL_DEPENDS+= asciidoc>=10.1.4:../../textproc/asciidoc USE_TOOLS+= pkg-config xgettext gdbus-codegen @@ -36,11 +36,13 @@ SUBST_FILES.shabuild+= meson.build SUBST_SED.shabuild+= -e "s,sha256sum,shasum,g" .endif +.include "../../lang/python/pyversion.mk" + SUBST_CLASSES+= asciidoc SUBST_STAGE.asciidoc= pre-configure SUBST_MESSAGE.asciidoc= Correcting the path to asciidoc files. SUBST_FILES.asciidoc+= docs/manpages/meson.build -SUBST_SED.asciidoc+= -e "s,/etc/asciidoc,${PREFIX}/share/asciidoc,g" +SUBST_SED.asciidoc+= -e "s,/etc/asciidoc,${PREFIX}/${PYSITELIB}/asciidoc/resources/,g" CONF_FILES+= ${PREFIX}/share/examples/xdg/autostart/tracker-miner-fs-3.desktop \ ${PKG_SYSCONFDIR}/xdg/autostart/tracker-miner-fs-3.desktop --_----------=_1647368824269600--