Tue May 25 14:49:35 2021 UTC ()
Pullup ticket #6459 - requested by nia
textproc/libxslt: build fix

Revisions pulled up:
- textproc/libxslt/distinfo                                     1.66
- textproc/libxslt/patches/patch-configure                      1.3

---
   Module Name:	pkgsrc
   Committed By:	mcf
   Date:		Mon May 24 04:18:19 UTC 2021

   Modified Files:
   	pkgsrc/textproc/libxslt: distinfo
   Added Files:
   	pkgsrc/textproc/libxslt/patches: patch-configure

   Log Message:
   libxslt: fix libxml2 detection with libxml2 >= 2.9.11

   xml2-config from libxml2 >= 2.9.11 now exits with non-zero status
   for invalid arguments. libxslt called xml2-config with the invalid
   `print` option to probe for its existence, so with new libxml2 it
   now skipped detection via xml2-config entirely causing a build
   failure.

   Apply upstream patch to correct this invalid xml2-config usage.


(bsiegert)
diff -r1.65 -r1.65.12.1 pkgsrc/textproc/libxslt/distinfo
diff -r0 -r1.3.2.2 pkgsrc/textproc/libxslt/patches/patch-configure

cvs diff -r1.65 -r1.65.12.1 pkgsrc/textproc/libxslt/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/libxslt/distinfo 2019/11/06 13:23:45 1.65
+++ pkgsrc/textproc/libxslt/distinfo 2021/05/25 14:49:35 1.65.12.1
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.65 2019/11/06 13:23:45 wiz Exp $ 1$NetBSD: distinfo,v 1.65.12.1 2021/05/25 14:49:35 bsiegert Exp $
2 2
3SHA1 (libxslt-1.1.34.tar.gz) = 5b42a1166a1688207028e4a5e72090828dd2a61e 3SHA1 (libxslt-1.1.34.tar.gz) = 5b42a1166a1688207028e4a5e72090828dd2a61e
4RMD160 (libxslt-1.1.34.tar.gz) = 46a5d1ac1524ad685447cec71c0f8313d727f0af 4RMD160 (libxslt-1.1.34.tar.gz) = 46a5d1ac1524ad685447cec71c0f8313d727f0af
5SHA512 (libxslt-1.1.34.tar.gz) = 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b 5SHA512 (libxslt-1.1.34.tar.gz) = 1516a11ad608b04740674060d2c5d733b88889de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b
6Size (libxslt-1.1.34.tar.gz) = 3552258 bytes 6Size (libxslt-1.1.34.tar.gz) = 3552258 bytes
 7SHA1 (patch-configure) = a63c214c7f5e4c4f89307c18519240372382c2fa
7SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52 8SHA1 (patch-libexslt_date.c) = 40ce3940a93b6a2dc804f62676909d3313e0ea52

File Added: pkgsrc/textproc/libxslt/patches/Attic/patch-configure
$NetBSD: patch-configure,v 1.3.2.2 2021/05/25 14:49:35 bsiegert Exp $

Fix incorrect xml2-config usage.

Upstream: https://gitlab.gnome.org/GNOME/libxslt/-/commit/90c34c8bb90e095a8a8fe8b2ce368bd9ff1837cc

--- configure.orig	Mon May 24 04:04:05 2021
+++ configure
@@ -14860,7 +14860,7 @@ PKG_CONFIG=$_save_PKG_CONFIG
 fi
 
 
-if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs print > /dev/null 2>&1
+if test "x$LIBXML_LIBS" = "x" && ${XML_CONFIG} --libs > /dev/null 2>&1
 then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml libraries >= $LIBXML_REQUIRED_VERSION" >&5
 $as_echo_n "checking for libxml libraries >= $LIBXML_REQUIRED_VERSION... " >&6; }