Received: by mail.netbsd.org (Postfix, from userid 605) id 22D0D84D46; Sat, 26 Nov 2022 03:40:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5217584D26 for ; Sat, 26 Nov 2022 03:40:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 99act9oUgn92 for ; Sat, 26 Nov 2022 03:40:21 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A534484CEE for ; Sat, 26 Nov 2022 03:40:21 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 99D7AFA90; Sat, 26 Nov 2022 03:40:21 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669434021162640" MIME-Version: 1.0 Date: Sat, 26 Nov 2022 03:40:21 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/po4a To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20221126034021.99D7AFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669434021162640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Nov 26 03:40:21 UTC 2022 Modified Files: pkgsrc/textproc/po4a: Makefile distinfo Added Files: pkgsrc/textproc/po4a/patches: patch-lib_Locale_Po4a_Text.pm Log Message: Avoid needing additional dependency not yet in pkgsrc (or still-experimental core feature). Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 pkgsrc/textproc/po4a/Makefile cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/po4a/distinfo cvs rdiff -u -r0 -r1.1 \ 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. --_----------=_1669434021162640 Content-Disposition: inline Content-Length: 2902 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/po4a/Makefile diff -u pkgsrc/textproc/po4a/Makefile:1.53 pkgsrc/textproc/po4a/Makefile:1.54 --- pkgsrc/textproc/po4a/Makefile:1.53 Wed Nov 23 16:21:12 2022 +++ pkgsrc/textproc/po4a/Makefile Sat Nov 26 03:40:21 2022 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2022/11/23 16:21:12 adam Exp $ +# $NetBSD: Makefile,v 1.54 2022/11/26 03:40:21 schmonz Exp $ DISTNAME= po4a-0.68 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=mquinson/} GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -11,6 +11,8 @@ 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+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl DEPENDS+= p5-gettext>=1.01:../../devel/p5-gettext DEPENDS+= p5-SGMLS-[0-9]*:../../textproc/p5-SGMLS Index: pkgsrc/textproc/po4a/distinfo diff -u pkgsrc/textproc/po4a/distinfo:1.24 pkgsrc/textproc/po4a/distinfo:1.25 --- pkgsrc/textproc/po4a/distinfo:1.24 Tue Nov 15 08:54:12 2022 +++ pkgsrc/textproc/po4a/distinfo Sat Nov 26 03:40:21 2022 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.24 2022/11/15 08:54:12 adam Exp $ +$NetBSD: distinfo,v 1.25 2022/11/26 03:40:21 schmonz Exp $ BLAKE2s (po4a-0.68.tar.gz) = dd89f385879a4458793781126cfe2c8940f5afabd0e47299673395201a7e41d6 SHA512 (po4a-0.68.tar.gz) = d7c60a3647d8f4265ce6f016d33430c72775ae19eb2efb240532545b08280368fea70db3360131f6537eb7cc72c19299dff4b6f938ac09cbef1b2db1a93d996e Size (po4a-0.68.tar.gz) = 4605485 bytes SHA1 (patch-Po4aBuilder.pm) = 1ce48fe26abeeabbfaddaf4cdb21389cbf18dd4f +SHA1 (patch-lib_Locale_Po4a_Text.pm) = d019287e6c03671da4433689691b5447a665208e 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.1 --- /dev/null Sat Nov 26 03:40:21 2022 +++ pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Text.pm Sat Nov 26 03:40:21 2022 @@ -0,0 +1,30 @@ +$NetBSD: patch-lib_Locale_Po4a_Text.pm,v 1.1 2022/11/26 03:40:21 schmonz Exp $ + +Avoid needing additional dependency not yet in pkgsrc (or +still-experimental core feature). + +--- lib/Locale/Po4a/Text.pm.orig 2022-09-04 14:32:26.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 + +@@ -602,11 +601,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) { --_----------=_1669434021162640--