Revert previous; fixed by docbook-xsl-1.79.2nb2.

3 files changed, 11 insertions, 19 deletions

diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index e356671d827..1c62954d766 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2020/03/05 13:19:32 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2020/03/05 14:02:37 schmonz Exp $
 
 DISTNAME=	po4a-0.57
 CATEGORIES=	textproc
@@ -38,11 +38,6 @@ SUBST_MESSAGE.path=	Fix msgmerge command path (not found)
 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"
diff --git a/textproc/po4a/distinfo b/textproc/po4a/distinfo
index c456849b5ae..4e8aa8a87cc 100644
--- a/textproc/po4a/distinfo
+++ b/textproc/po4a/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2020/03/05 13:19:32 schmonz Exp $
+$NetBSD: distinfo,v 1.18 2020/03/05 14:02:37 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) = 1f4266bb14a874c853b00ef31b09884d04a344e5
+SHA1 (patch-Po4aBuilder.pm) = 642d3155c5ebd1d85d70dc3359651c602b17fb56
diff --git a/textproc/po4a/patches/patch-Po4aBuilder.pm b/textproc/po4a/patches/patch-Po4aBuilder.pm
index c26c2ae75a0..51e414564f7 100644
--- a/textproc/po4a/patches/patch-Po4aBuilder.pm
+++ b/textproc/po4a/patches/patch-Po4aBuilder.pm
@@ -1,14 +1,13 @@
-$NetBSD: patch-Po4aBuilder.pm,v 1.3 2020/03/05 13:19:32 schmonz Exp $
+$NetBSD: patch-Po4aBuilder.pm,v 1.4 2020/03/05 14:02:37 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	2019-10-25 10:32:20.000000000 +0000
-+++ Po4aBuilder.pm
-@@ -9,6 +9,8 @@ use File::stat;
+--- 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;
  
  @ISA = qw(Module::Build);
  
@@ -17,7 +16,7 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.3 2020/03/05 13:19:32 schmonz Exp $
  sub ACTION_build {
      my $self = shift;
      $self->depends_on('code');
-@@ -81,7 +83,7 @@ sub ACTION_binpo {
+@@ -104,7 +106,7 @@ sub ACTION_binpo {
          my $lang = fileparse($_, qw{.po});
          unless ($self->up_to_date("po/bin/po4a.pot", $_)) {
              print "XX Sync $_: ";
@@ -26,7 +25,7 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.3 2020/03/05 13:19:32 schmonz Exp $
              # Typically all that changes was a date. I'd
              # prefer not to commit such changes, so detect
              # and ignore them.
-@@ -233,8 +235,6 @@ sub ACTION_man {
+@@ -253,8 +255,6 @@ sub ACTION_man {
          }
          $parser->parse_from_file ($file, $out);
  
@@ -35,13 +34,11 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.3 2020/03/05 13:19:32 schmonz Exp $
      }
  
      # Install the manpages written in XML DocBook
-@@ -244,10 +244,8 @@ sub ACTION_man {
-     foreach $file (@{$self->rscan_dir($manpath, qr{\.xml$})}) {
+@@ -265,9 +265,7 @@ sub ACTION_man {
          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;
      }