CVS commit: pkgsrc/sysutils/xentools418

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Nov 23 18:51:19 UTC 2024

Modified Files:
        pkgsrc/sysutils/xentools418: distinfo
Added Files:
        pkgsrc/sysutils/xentools418/patches: patch-docs_configure

Log Message:
sysutils/xentools418: Fix build when pandoc is installed

xentools418 does not TOOLS_DEPEND on pandoc, but it looks for it and
finds an installed copy.  This breaks the build because of some latex
issue, and would if it succeeded likely install more files, changing
the binary package.  Therefore, treat usage of a
non-manifestly-depended-on tool as a bug and patch it out.  The patch
is kludgy because configure.ac doesn't support the normal approaches.

With this, package builds on NetBSD 10 amd64 with pandoc present.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/xentools418/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/xentools418/patches/patch-docs_configure

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

Modified files:

Index: pkgsrc/sysutils/xentools418/distinfo
diff -u pkgsrc/sysutils/xentools418/distinfo:1.4 pkgsrc/sysutils/xentools418/distinfo:1.5
--- pkgsrc/sysutils/xentools418/distinfo:1.4    Tue Sep 10 12:40:14 2024
+++ pkgsrc/sysutils/xentools418/distinfo        Sat Nov 23 18:51:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2024/09/10 12:40:14 bouyer Exp $
+$NetBSD: distinfo,v 1.5 2024/11/23 18:51:19 gdt Exp $
 
 BLAKE2s (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = 82256e7e5d45980590a6493e17a4e133ff63fa28f00aff1963db96371e702448
 SHA512 (xen418/ipxe-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz) = e1c11e37f53aab0cc6a3ceaace0b8417f07009b1f20ff8572320895fef24f1a796ade041094a024eb24c988b9bed404c556a1fdde809bba89fb49f0e0ff45a57
@@ -18,6 +18,7 @@ Size (xen418/xen-bd51e57.tar.gz) = 68394
 SHA1 (patch-.._seabios-rel-1.16.2_src_string.c) = a8861860e63fb38dee3ebca1fce7f470ec7ff000
 SHA1 (patch-Config.mk) = f2c5d83d4738db706e980fbbd0ae889477d87c7d
 SHA1 (patch-configure) = d52bd51ae234ffd0796b0d3c2453e5e5931c9b63
+SHA1 (patch-docs_configure) = 356bd2a67e9717bc7edc62562f46935f0ac5b0de
 SHA1 (patch-docs_man_xl.1.pod.in) = 280a3717b9f15578d90f85392249ef97844b6765
 SHA1 (patch-docs_man_xl.cfg.5.pod.in) = 5970961552f29c4536a884161a208a27a20dccf4
 SHA1 (patch-docs_man_xlcpupool.cfg.5.pod) = ab3a2529cd10458948557fd7ab032e80df8b1d81

Added files:

Index: pkgsrc/sysutils/xentools418/patches/patch-docs_configure
diff -u /dev/null pkgsrc/sysutils/xentools418/patches/patch-docs_configure:1.1
--- /dev/null   Sat Nov 23 18:51:19 2024
+++ pkgsrc/sysutils/xentools418/patches/patch-docs_configure    Sat Nov 23 18:51:19 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-docs_configure,v 1.1 2024/11/23 18:51:19 gdt Exp $
+
+Don't try to find pandoc because if it happens to be installed:
+  - the build fails because of some latex footnote issue
+  - it is not declared as a dependency and therefore should be
+    "--without-pandoc" but I can't come up with a CONFIGURE_ARGS
+    incantation that works
+
+--- docs/configure.orig        2024-08-14 13:45:06.000000000 +0000
++++ docs/configure
+@@ -2260,7 +2260,8 @@ IFS=$as_save_IFS
+   ;;
+ esac
+ fi
+-PANDOC=$ac_cv_path_PANDOC
++# Don't ever find pandoc.
++PANDOC=
+ if test -n "$PANDOC"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANDOC" >&5
+ $as_echo "$PANDOC" >&6; }