CVS commit: pkgsrc/print/zathura

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Oct 27 10:43:43 UTC 2019

Modified Files:
        pkgsrc/print/zathura: Makefile distinfo
        pkgsrc/print/zathura/patches: patch-doc_meson.build

Log Message:
zathura: Fix man page creation


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/zathura/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/zathura/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/zathura/patches/patch-doc_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/zathura/Makefile
diff -u pkgsrc/print/zathura/Makefile:1.30 pkgsrc/print/zathura/Makefile:1.31
--- pkgsrc/print/zathura/Makefile:1.30  Mon Oct 21 21:55:03 2019
+++ pkgsrc/print/zathura/Makefile       Sun Oct 27 10:43:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/10/21 21:55:03 adam Exp $
+# $NetBSD: Makefile,v 1.31 2019/10/27 10:43:43 nia Exp $
 
 DISTNAME=      zathura-0.4.3
 PKGREVISION=   2
@@ -23,6 +23,12 @@ MESON_ARGS+= -D convert-icon=disabled
 
 CFLAGS.SunOS+= -D__EXTENSIONS__
 
+SUBST_CLASSES+=                py
+SUBST_STAGE.py=                pre-configure
+SUBST_MESSAGE.py=      Setting Python version variables.
+SUBST_FILES.py+=       doc/meson.build
+SUBST_VARS.py+=                PYVERSSUFFIX
+
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../graphics/cairo/buildlink3.mk"

Index: pkgsrc/print/zathura/distinfo
diff -u pkgsrc/print/zathura/distinfo:1.8 pkgsrc/print/zathura/distinfo:1.9
--- pkgsrc/print/zathura/distinfo:1.8   Wed Mar  6 17:02:20 2019
+++ pkgsrc/print/zathura/distinfo       Sun Oct 27 10:43:43 2019
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2019/03/06 17:02:20 leot Exp $
+$NetBSD: distinfo,v 1.9 2019/10/27 10:43:43 nia Exp $
 
 SHA1 (zathura-0.4.3.tar.xz) = 6e2cd70d03a9bfef2ef1e788ed7656b32c706def
 RMD160 (zathura-0.4.3.tar.xz) = 1547e4dadc35b784abfb8b09476292ba4b50e280
 SHA512 (zathura-0.4.3.tar.xz) = 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 Size (zathura-0.4.3.tar.xz) = 145796 bytes
-SHA1 (patch-doc_meson.build) = 06205364d55a91e5efb189030e827ddbead63f9e
+SHA1 (patch-doc_meson.build) = f989cd35ef4b1a910470117ccaf734a917e7fc8d
 SHA1 (patch-zathura_database-plain.c) = 95d461d4ac0c14bd61a14ff62b92bd5aee37228e

Index: pkgsrc/print/zathura/patches/patch-doc_meson.build
diff -u pkgsrc/print/zathura/patches/patch-doc_meson.build:1.2 pkgsrc/print/zathura/patches/patch-doc_meson.build:1.3
--- pkgsrc/print/zathura/patches/patch-doc_meson.build:1.2      Wed Mar  6 17:02:20 2019
+++ pkgsrc/print/zathura/patches/patch-doc_meson.build  Sun Oct 27 10:43:43 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-doc_meson.build,v 1.2 2019/03/06 17:02:20 leot Exp $
+$NetBSD: patch-doc_meson.build,v 1.3 2019/10/27 10:43:43 nia Exp $
 
 Also search for versioned sphinx-build-s.
 
@@ -6,7 +6,7 @@ Also search for versioned sphinx-build-s
 +++ doc/meson.build
 @@ -1,4 +1,4 @@
 -sphinx = find_program('sphinx-build', required: get_option('manpages'))
-+sphinx = find_program('sphinx-build', 'sphinx-build2.7', 'sphinx-build3.7', 'sphinx-build3.6', 'sphinx-build3.4', 'sphinx-build3.5', required: get_option('manpages'))
++sphinx = find_program('sphinx-build-@PYVERSSUFFIX@', 'sphinx-build', required: get_option('manpages'))
  if sphinx.found()
    custom_target('man pages',
      command: [