Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1707481088122510"
MIME-Version: 1.0
Date: Fri, 9 Feb 2024 12:18:08 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/textproc/po4a
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20240209121808.768C5FA42@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1707481088122510
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Fri Feb  9 12:18:08 UTC 2024

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

Log Message:
po4a: Various build and test fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/textproc/po4a/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/textproc/po4a/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/po4a/patches/patch-t_Testhelper.pm

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


--_----------=_1707481088122510
Content-Disposition: inline
Content-Length: 4741
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.64 pkgsrc/textproc/po4a/Makefile:1.65
--- pkgsrc/textproc/po4a/Makefile:1.64	Sat Feb  3 18:58:08 2024
+++ pkgsrc/textproc/po4a/Makefile	Fri Feb  9 12:18:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/02/03 18:58:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.65 2024/02/09 12:18:08 jperkin Exp $
 
 DISTNAME=	po4a-0.70
 PKGREVISION=	2
@@ -32,6 +32,7 @@ DEPENDS+=	p5-YAML-Tiny-[0-9]*:../../text
 	${OPSYS} == "Darwin" && empty(OSX_VERSION:M[0-9].*) && empty(OSX_VERSION:M1[0-2].*)
 DEPENDS+=		diffutils-[0-9]*:../../devel/diffutils
 DIFF?=			${PREFIX}/bin/gdiff
+TOOLS_PATH.diff=	${DIFF}
 .else
 DIFF?=			diff
 .endif

Index: pkgsrc/textproc/po4a/distinfo
diff -u pkgsrc/textproc/po4a/distinfo:1.32 pkgsrc/textproc/po4a/distinfo:1.33
--- pkgsrc/textproc/po4a/distinfo:1.32	Sat Feb  3 18:58:08 2024
+++ pkgsrc/textproc/po4a/distinfo	Fri Feb  9 12:18:08 2024
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.32 2024/02/03 18:58:08 schmonz Exp $
+$NetBSD: distinfo,v 1.33 2024/02/09 12:18:08 jperkin 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_Po.pm) = 649b19ed250c663019dfb98723c61e13b47e6512
 SHA1 (patch-msguntypot) = 0f53ba5a0a76021c52becec9f0d31e67c998ae0a
 SHA1 (patch-po4a) = b589f42086f3a6471bba30b13face9e6983797bd
 SHA1 (patch-po4a-updatepo) = 1426fac95251eb8aa0ff6b74e3183e8fce470743
+SHA1 (patch-t_Testhelper.pm) = aba5ef8b4d57348f4a1ec8bb63cd9608cf8caf64

Index: pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm
diff -u pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm:1.3 pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm:1.4
--- pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm:1.3	Mon Jan 29 16:08:20 2024
+++ pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm	Fri Feb  9 12:18:08 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-lib_Locale_Po4a_Po.pm,v 1.3 2024/01/29 16:08:20 adam Exp $
+$NetBSD: patch-lib_Locale_Po4a_Po.pm,v 1.4 2024/02/09 12:18:08 jperkin Exp $
 
 Use a sufficiently capable diff.
 Write to the full physical null device.
@@ -10,7 +10,7 @@ Write to the full physical null device.
  
      if ($checkvalidity) {   # We sometimes need to read a file even if it may be invalid (eg to test whether it's empty)
 -        my $cmd = "msgfmt" . $Config{_exe} . " --check-format --check-domain -o /dev/null \"" . $filename . '"';
-+        my $cmd = "@PREFIX@/bin/msgfmt" . $Config{_exe} . " --check-format --check-domain -o /dev/null \"" . $filename . '"';
++        my $cmd = "@PREFIX@/bin/msgfmt" . $Config{_exe} . " --check-format --check-domain -o @PO4A_DEVNULL@ \"" . $filename . '"';
  
          my $locale = $ENV{'LC_ALL'};
          $ENV{'LC_ALL'} = "C";

Added files:

Index: pkgsrc/textproc/po4a/patches/patch-t_Testhelper.pm
diff -u /dev/null pkgsrc/textproc/po4a/patches/patch-t_Testhelper.pm:1.1
--- /dev/null	Fri Feb  9 12:18:08 2024
+++ pkgsrc/textproc/po4a/patches/patch-t_Testhelper.pm	Fri Feb  9 12:18:08 2024
@@ -0,0 +1,26 @@
+$NetBSD: patch-t_Testhelper.pm,v 1.1 2024/02/09 12:18:08 jperkin Exp $
+
+Use portable chmod arguments.
+
+--- t/Testhelper.pm.orig	2024-02-09 12:09:14.811542170 +0000
++++ t/Testhelper.pm
+@@ -212,8 +212,8 @@ sub run_one_po4aconf {
+         push @setup,    "chmod -r-w-x " . $closed_path;    # Don't even look at the closed path
+         push @teardown, "chmod +r+w+x " . $closed_path;    # Restore permissions
+         push @setup,    "chmod +r+x    $path";             # Look into the path of this test
+-        push @setup,    "chmod -w   -R $path";             # But don't change any file in there
+-        push @teardown, "chmod +w   -R $path";             # Restore permissions
++        push @setup,    "chmod -R -w   $path";             # But don't change any file in there
++        push @teardown, "chmod -R +w   $path";             # Restore permissions
+     }
+ 
+     my $cwd     = cwd();
+@@ -234,7 +234,7 @@ sub run_one_po4aconf {
+     } elsif ( $mode eq 'curdir' ) {
+         $tmppath .= '-cur';
+         push @setup, "cp -r $path/* $tmppath";
+-        push @setup, "chmod +w -R $tmppath" unless $^O eq 'MSWin32';
++        push @setup, "chmod -R +w $tmppath" unless $^O eq 'MSWin32';
+         $run_from = $tmppath;
+     } else {
+         die "Malformed test: mode $mode unknown\n";


--_----------=_1707481088122510--