CVS commit: pkgsrc/sysutils

["Nia Alarie" <nia%netbsd.org@localhost>]

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.

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