CVS commit: pkgsrc/textproc/po4a

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jun 20 15:30:12 UTC 2023

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

Log Message:
po4a: use a sufficiently capable diff program. Still broken on Solarish.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/textproc/po4a/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/po4a/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.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.57 pkgsrc/textproc/po4a/Makefile:1.58
--- pkgsrc/textproc/po4a/Makefile:1.57  Sat Apr 29 14:31:29 2023
+++ pkgsrc/textproc/po4a/Makefile       Tue Jun 20 15:30:12 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2023/04/29 14:31:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.58 2023/06/20 15:30:12 schmonz Exp $
 
 DISTNAME=      po4a-0.69
 PKGREVISION=   2
@@ -25,7 +25,7 @@ DEPENDS+=     p5-YAML-Tiny-[0-9]*:../../text
 
 .include "options.mk"
 
-USE_TOOLS+=            pkg-config perl:run msgmerge:run msgfmt:run
+USE_TOOLS+=            pkg-config perl:run msgmerge:run msgfmt:run diff:run
 
 PERL5_MODULE_TYPE=     Module::Build
 PERL5_PACKLIST=                auto/po4a/.packlist
@@ -36,6 +36,11 @@ REPLACE_PERL+=               lib/Locale/Po4a/*
 
 MAKE_ENV+=             COLUMNS=76
 
+SUBST_CLASSES+=                tools
+SUBST_FILES.tools=     lib/Locale/Po4a/Po.pm Po4aBuilder.pm
+SUBST_STAGE.tools=     pre-configure
+SUBST_VARS.tools=      DIFF
+
 # work around not to set PATH to msgmerge, please somebody to fix correctly
 SUBST_CLASSES+=                path
 SUBST_FILES.path=      po4a

Index: pkgsrc/textproc/po4a/distinfo
diff -u pkgsrc/textproc/po4a/distinfo:1.26 pkgsrc/textproc/po4a/distinfo:1.27
--- pkgsrc/textproc/po4a/distinfo:1.26  Tue Jan  3 19:08:01 2023
+++ pkgsrc/textproc/po4a/distinfo       Tue Jun 20 15:30:12 2023
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.26 2023/01/03 19:08:01 adam Exp $
+$NetBSD: distinfo,v 1.27 2023/06/20 15:30:12 schmonz Exp $
 
 BLAKE2s (po4a-0.69.tar.gz) = c82a56664a6a9a674b02f1026843d65aea6671c913738f6e1e565d7242dbe96d
 SHA512 (po4a-0.69.tar.gz) = 9cb5eec547ab18d1c3ebdda212b909fc4f5489a74641ba2d7e0a3a1d060f245d23667c16e687c678c5ccc3809c9315d20673266dcc3764172a899caa397238e3
 Size (po4a-0.69.tar.gz) = 4665710 bytes
-SHA1 (patch-Po4aBuilder.pm) = 79d850f4a758771468a1b339fc7bd62ce34cf7ab
+SHA1 (patch-Po4aBuilder.pm) = 4d8a271346f3dae4056f07bb305823a5201da805
+SHA1 (patch-lib_Locale_Po4a_Po.pm) = d6f3bdce23db55b77bfb13a926288636dc248dd7
 SHA1 (patch-lib_Locale_Po4a_Text.pm) = d019287e6c03671da4433689691b5447a665208e

Index: pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm
diff -u pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.8 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.9
--- pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.8       Tue Jan  3 19:08:01 2023
+++ pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm   Tue Jun 20 15:30:12 2023
@@ -1,9 +1,10 @@
-$NetBSD: patch-Po4aBuilder.pm,v 1.8 2023/01/03 19:08:01 adam Exp $
+$NetBSD: patch-Po4aBuilder.pm,v 1.9 2023/06/20 15:30:12 schmonz Exp $
 
 (1) ryoon: remove gzip at initial import
 (2) mef: Add PerlIO::F_UTF8 () macro
 (3) mef: to avoid --previous option is said unknown to msgmerge
     (but sounds strange)
+(4) schmonz: Use a sufficiently capable diff
 
 --- Po4aBuilder.pm.orig        2023-01-01 00:30:43.000000000 +0000
 +++ Po4aBuilder.pm
@@ -16,7 +17,16 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.8 2023
  sub ACTION_build {
      my $self = shift;
      $self->depends_on('code');
-@@ -82,7 +84,7 @@ sub ACTION_binpo {
+@@ -60,7 +62,7 @@ sub ACTION_binpo {
+         chdir "../..";
+       
+         if ( -e "po/bin/po4a.pot") {
+-            $diff = qx(diff -q -I'#:' -I'POT-Creation-Date:' -I'PO-Revision-Date:' po/bin/po4a.pot po/bin/po4a.pot.new);
++            $diff = qx(@DIFF@ -q -I'#:' -I'POT-Creation-Date:' -I'PO-Revision-Date:' po/bin/po4a.pot po/bin/po4a.pot.new);
+             if ( $diff eq "" ) {
+                 unlink "po/bin/po4a.pot.new" || die;
+                 # touch it
+@@ -82,11 +84,11 @@ sub ACTION_binpo {
        if (0) {
          unless ($self->up_to_date("po/bin/po4a.pot", $_)) {
              print "XX Sync $_: ";
@@ -25,6 +35,11 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.8 2023
              # Typically all that changes was a date. I'd
              # prefer not to commit such changes, so detect
              # and ignore them.
+-            $diff = qx(diff -q -I'#:' -I'POT-Creation-Date:' -I'PO-Revision-Date:' $_ $_.new);
++            $diff = qx(@DIFF@ -q -I'#:' -I'POT-Creation-Date:' -I'PO-Revision-Date:' $_ $_.new);
+             if ($diff eq "") {
+                 unlink "$_.new" || die;
+                 # touch it
 @@ -234,8 +236,6 @@ sub ACTION_man {
          }
          $parser->parse_from_file ($file, $out);

Added files:

Index: pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm
diff -u /dev/null pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm:1.1
--- /dev/null   Tue Jun 20 15:30:13 2023
+++ pkgsrc/textproc/po4a/patches/patch-lib_Locale_Po4a_Po.pm    Tue Jun 20 15:30:12 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_Locale_Po4a_Po.pm,v 1.1 2023/06/20 15:30:12 schmonz Exp $
+
+Use a sufficiently capable diff.
+
+--- lib/Locale/Po4a/Po.pm.orig 2023-01-01 00:30:43.000000000 +0000
++++ lib/Locale/Po4a/Po.pm
+@@ -621,7 +621,7 @@ sub move_po_if_needed {
+     my $diff;
+ 
+     if ( -e $old_po ) {
+-        $diff = qx(diff -q -I'^#:' -I'^\"POT-Creation-Date:' -I'^\"PO-Revision-Date:' $old_po $new_po);
++        $diff = qx(@DIFF@ -q -I'^#:' -I'^\"POT-Creation-Date:' -I'^\"PO-Revision-Date:' $old_po $new_po);
+         if ( $diff eq "" ) {
+             unlink $new_po
+               or die wrap_msg( dgettext( "po4a", "Cannot unlink %s: %s." ), $new_po, $! );