CVS commit: pkgsrc/textproc/po4a

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Mar  5 13:19:32 UTC 2020

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

Log Message:
Avoid xsltproc attempting network fetch.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/textproc/po4a/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/po4a/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.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.37 pkgsrc/textproc/po4a/Makefile:1.38
--- pkgsrc/textproc/po4a/Makefile:1.37  Wed Nov 13 21:23:23 2019
+++ pkgsrc/textproc/po4a/Makefile       Thu Mar  5 13:19:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/11/13 21:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2020/03/05 13:19:32 schmonz Exp $
 
 DISTNAME=      po4a-0.57
 CATEGORIES=    textproc
@@ -38,6 +38,11 @@ SUBST_MESSAGE.path=  Fix msgmerge command
 SUBST_STAGE.path=      pre-configure
 SUBST_SED.path=                -e 's|\"msgmerge\"|\"${PREFIX}/bin/msgmerge\"|;'
 
+SUBST_CLASSES+=                prefix
+SUBST_FILES.prefix=    Po4aBuilder.pm
+SUBST_STAGE.prefix=    pre-configure
+SUBST_VARS.prefix=     PREFIX
+
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/libxslt/buildlink3.mk"

Index: pkgsrc/textproc/po4a/distinfo
diff -u pkgsrc/textproc/po4a/distinfo:1.16 pkgsrc/textproc/po4a/distinfo:1.17
--- pkgsrc/textproc/po4a/distinfo:1.16  Wed Nov 13 21:23:23 2019
+++ pkgsrc/textproc/po4a/distinfo       Thu Mar  5 13:19:32 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2019/11/13 21:23:23 wiz Exp $
+$NetBSD: distinfo,v 1.17 2020/03/05 13:19:32 schmonz Exp $
 
 SHA1 (po4a-0.57.tar.gz) = e04773a3fdf8fa9ab260435e3022da708a76af4d
 RMD160 (po4a-0.57.tar.gz) = 66738abe4e00e31fe4291953b45345ad762e2b9a
 SHA512 (po4a-0.57.tar.gz) = 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 Size (po4a-0.57.tar.gz) = 3079550 bytes
-SHA1 (patch-Po4aBuilder.pm) = 642d3155c5ebd1d85d70dc3359651c602b17fb56
+SHA1 (patch-Po4aBuilder.pm) = 1f4266bb14a874c853b00ef31b09884d04a344e5

Index: pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm
diff -u pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.2 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.3
--- pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm:1.2       Wed Mar 18 02:25:23 2015
+++ pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm   Thu Mar  5 13:19:32 2020
@@ -1,13 +1,14 @@
-$NetBSD: patch-Po4aBuilder.pm,v 1.2 2015/03/18 02:25:23 mef Exp $
+$NetBSD: patch-Po4aBuilder.pm,v 1.3 2020/03/05 13:19:32 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: avoid xsltproc attempting network fetch
 
---- Po4aBuilder.pm.orig        2013-08-22 05:11:04.000000000 +0900
-+++ Po4aBuilder.pm     2015-03-18 11:10:49.000000000 +0900
-@@ -8,6 +8,8 @@ use File::stat;
+--- Po4aBuilder.pm.orig        2019-10-25 10:32:20.000000000 +0000
++++ Po4aBuilder.pm
+@@ -9,6 +9,8 @@ use File::stat;
  
  @ISA = qw(Module::Build);
  
@@ -16,7 +17,7 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.2 2015
  sub ACTION_build {
      my $self = shift;
      $self->depends_on('code');
-@@ -104,7 +106,7 @@ sub ACTION_binpo {
+@@ -81,7 +83,7 @@ sub ACTION_binpo {
          my $lang = fileparse($_, qw{.po});
          unless ($self->up_to_date("po/bin/po4a.pot", $_)) {
              print "XX Sync $_: ";
@@ -25,7 +26,7 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.2 2015
              # Typically all that changes was a date. I'd
              # prefer not to commit such changes, so detect
              # and ignore them.
-@@ -253,8 +255,6 @@ sub ACTION_man {
+@@ -233,8 +235,6 @@ sub ACTION_man {
          }
          $parser->parse_from_file ($file, $out);
  
@@ -34,11 +35,13 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.2 2015
      }
  
      # Install the manpages written in XML DocBook
-@@ -265,9 +265,7 @@ sub ACTION_man {
+@@ -244,10 +244,8 @@ sub ACTION_man {
+     foreach $file (@{$self->rscan_dir($manpath, qr{\.xml$})}) {
          if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
              my ($outdir, $section, $outfile) = ($1, $2, $3);
-             system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+-            system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
 -            system ("gzip -9 -f $outdir/$outfile.$section") and die;
++            system("xsltproc -o $outdir/$outfile.$section --nonet @PREFIX@/share/xsl/docbook/manpages/docbook.xsl $file") and die;
          }
 -        unlink "$file" || die;
      }