Fix build problems (thanks joerg for the report)

 - Add Two DEPENDS
   p5-CPAN-Meta>=2.141170
   p5-PerlIO-utf8_strict-[0-9]*
 - Fix strange issue msgmerge PATH not found problem (by SUBST)
 - Another strange --previous option is said unknown by msgmerge
   (with patch-Po4aBuilder.pm)

3 files changed, 42 insertions, 8 deletions

diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index fa553aadeed..5c2e62ed312 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/12/11 23:17:17 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2015/03/18 02:25:23 mef Exp $
 
 DISTNAME=		po4a-0.45
 CATEGORIES=		textproc
@@ -12,11 +12,14 @@ DEPENDS+=		p5-gettext>=1.01:../../devel/p5-gettext
 DEPENDS+=		p5-SGMLS-[0-9]*:../../textproc/p5-SGMLS
 DEPENDS+=		p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
 DEPENDS+=		p5-Text-WrapI18N-[0-9]*:../../textproc/p5-Text-WrapI18N
+DEPENDS+=		p5-CPAN-Meta>=2.141170:../../devel/p5-CPAN-Meta
+DEPENDS+=		p5-PerlIO-utf8_strict-[0-9]*:../../devel/p5-PerlIO-utf8_strict
 
 USE_TOOLS+=		pkg-config perl:run msgmerge:run msgfmt:run
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/po4a/.packlist
+
 REPLACE_PERL=		scripts/msguntypot po4a po4a-gettextize po4a-normalize
 REPLACE_PERL+=		po4a-translate po4a-updatepo
 REPLACE_PERL+=		lib/Locale/Po4a/*
@@ -25,6 +28,14 @@ DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 MAKE_ENV+=		COLUMNS=76
 
+# work around not to set PATH to msgmerge, please somebody to fix correctly
+SUBST_CLASSES+=		path
+SUBST_FILES.path=	po4a
+SUBST_MESSAGE.path=	Fix msgmerge command path (not found)
+SUBST_STAGE.path=	pre-configure
+SUBST_SED.path=		-e 's|\"msgmerge\"|\"${PREFIX}/bin/msgmerge\"|;'
+
 .include "../../lang/perl5/module.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/po4a/distinfo b/textproc/po4a/distinfo
index df693b201c5..08ffb955d9d 100644
--- a/textproc/po4a/distinfo
+++ b/textproc/po4a/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2014/12/03 07:08:36 ryoon Exp $
+$NetBSD: distinfo,v 1.6 2015/03/18 02:25:23 mef Exp $
 
 SHA1 (po4a-0.45.tar.gz) = c38c32d96c2a25f3a6cc5d8afb1fbdde362b7c19
 RMD160 (po4a-0.45.tar.gz) = b2cf67d430363181d1cce93c50e9f25edc7db98b
 Size (po4a-0.45.tar.gz) = 2208959 bytes
-SHA1 (patch-Po4aBuilder.pm) = 0befcdd33a59a7a46046091436b21ff805af7d00
+SHA1 (patch-Po4aBuilder.pm) = 642d3155c5ebd1d85d70dc3359651c602b17fb56
diff --git a/textproc/po4a/patches/patch-Po4aBuilder.pm b/textproc/po4a/patches/patch-Po4aBuilder.pm
index ac2c318373d..c9b5af2c6ea 100644
--- a/textproc/po4a/patches/patch-Po4aBuilder.pm
+++ b/textproc/po4a/patches/patch-Po4aBuilder.pm
@@ -1,8 +1,31 @@
-$NetBSD: patch-Po4aBuilder.pm,v 1.1 2014/12/03 07:08:36 ryoon Exp $
+$NetBSD: patch-Po4aBuilder.pm,v 1.2 2015/03/18 02:25:23 mef Exp $
 
---- Po4aBuilder.pm.orig	2013-08-21 20:11:04.000000000 +0000
-+++ Po4aBuilder.pm
-@@ -253,8 +253,6 @@ sub ACTION_man {
+(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)
+
+--- 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);
+ 
++sub PerlIO::F_UTF8 () { 0x00008000 } # from perliol.h
++
+ sub ACTION_build {
+     my $self = shift;
+     $self->depends_on('code');
+@@ -104,7 +106,7 @@ sub ACTION_binpo {
+         my $lang = fileparse($_, qw{.po});
+         unless ($self->up_to_date("po/bin/po4a.pot", $_)) {
+             print "XX Sync $_: ";
+-            system("msgmerge --previous $_ po/bin/po4a.pot -o $_.new") && die;
++            system("msgmerge $_ po/bin/po4a.pot -o $_.new") && die;
+             # 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 {
          }
          $parser->parse_from_file ($file, $out);
  
@@ -11,7 +34,7 @@ $NetBSD: patch-Po4aBuilder.pm,v 1.1 2014/12/03 07:08:36 ryoon Exp $
      }
  
      # Install the manpages written in XML DocBook
-@@ -265,9 +263,7 @@ sub ACTION_man {
+@@ -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;