CVS commit: pkgsrc/textproc/po4a

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Feb  3 05:33:10 UTC 2024

Modified Files:
        pkgsrc/textproc/po4a: Makefile distinfo
Added Files:
        pkgsrc/textproc/po4a/patches: patch-lib_Locale_Po4a_Text.pm

Log Message:
po4a: restore Try-avoiding patch lost in previous.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/textproc/po4a/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/textproc/po4a/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Text.pm

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

Modified files:

Index: pkgsrc/textproc/po4a/Makefile
diff -u pkgsrc/textproc/po4a/Makefile:1.62 pkgsrc/textproc/po4a/Makefile:1.63
--- pkgsrc/textproc/po4a/Makefile:1.62  Mon Jan 29 16:08:20 2024
+++ pkgsrc/textproc/po4a/Makefile       Sat Feb  3 05:33:10 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2024/01/29 16:08:20 adam Exp $
+# $NetBSD: Makefile,v 1.63 2024/02/03 05:33:10 schmonz Exp $
 
 DISTNAME=      po4a-0.70
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mquinson/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -10,7 +11,7 @@ HOMEPAGE=     https://po4a.org/
 COMMENT=       Tool for using gettext where it was not intended to be used
 LICENSE=       gnu-gpl-v2
 
-#DEPENDS+=     /p5-Keyword-Syntax-Try
+#DEPENDS+=     /p5-Syntax-Keyword-Try
 
 DEPENDS+=      docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=      p5-gettext>=1.01:../../devel/p5-gettext

Index: pkgsrc/textproc/po4a/distinfo
diff -u pkgsrc/textproc/po4a/distinfo:1.30 pkgsrc/textproc/po4a/distinfo:1.31
--- pkgsrc/textproc/po4a/distinfo:1.30  Mon Jan 29 16:08:20 2024
+++ pkgsrc/textproc/po4a/distinfo       Sat Feb  3 05:33:10 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.30 2024/01/29 16:08:20 adam Exp $
+$NetBSD: distinfo,v 1.31 2024/02/03 05:33:10 schmonz Exp $
 
 BLAKE2s (po4a-0.70.tar.gz) = 2314f3fdc095f26a3c1b6a5cd96713f9e7b3e3c68af7e2bdc0c98738068691cf
 SHA512 (po4a-0.70.tar.gz) = 8ff546776e9f9bc5d9612c734dbb029d232755950177cbb57c1afc5d3384c663d7fd9939ac63a2044fd55ac11ee4fd0552d90cc1e5ea662539f509b27e038a94
 Size (po4a-0.70.tar.gz) = 3946179 bytes
 SHA1 (patch-Po4aBuilder.pm) = ae2ff848ff6ed4812e0cfcbc867a976973919b52
 SHA1 (patch-lib_Locale_Po4a_Po.pm) = 502e4f4a894db186c7218cbb69633cce62b50b8d
+SHA1 (patch-lib_Locale_Po4a_Text.pm) = 9092c1a316ebc91195d5e1f81dd9ad5a33268122
 SHA1 (patch-msguntypot) = 0f53ba5a0a76021c52becec9f0d31e67c998ae0a
 SHA1 (patch-po4a) = b589f42086f3a6471bba30b13face9e6983797bd
 SHA1 (patch-po4a-updatepo) = 1426fac95251eb8aa0ff6b74e3183e8fce470743

Added files:

Index: pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Text.pm
diff -u /dev/null pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Text.pm:1.3
--- /dev/null   Sat Feb  3 05:33:10 2024
+++ pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Text.pm  Sat Feb  3 05:33:10 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-lib_Locale_Po4a_Text.pm,v 1.3 2024/02/03 05:33:10 schmonz Exp $
+
+Avoid needing additional dependency not yet in pkgsrc (or
+still-experimental core feature).
+
+--- lib/Locale/Po4a/Text.pm.orig       2024-01-28 23:39:44.000000000 +0000
++++ lib/Locale/Po4a/Text.pm
+@@ -58,7 +58,6 @@ use vars qw(@ISA @EXPORT);
+ use Locale::Po4a::TransTractor;
+ use Locale::Po4a::Common;
+ use YAML::Tiny;
+-use Syntax::Keyword::Try;
+ 
+ =head1 OPTIONS ACCEPTED BY THIS MODULE
+ 
+@@ -635,11 +634,10 @@ sub parse_markdown_yaml_front_matter {
+ 
+     my $yamlarray;    # the parsed YFM content
+     my $yamlres;      # containing the parse error, if any
+-    try {
++    eval q{
+         $yamlarray = YAML::Tiny->read_string($yfm);
+-    } catch {
+-        $yamlres = $@;
+-    }
++    };
++    $yamlres = $@ if $@;
+ 
+     if ( defined($yamlres) ) {
+         if ($yfm_lenient) {