Wed Mar 18 02:25:23 2015 UTC ()
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)


(mef)
diff -r1.23 -r1.24 pkgsrc/textproc/po4a/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/po4a/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm
cvs diff -r1.23 -r1.24 pkgsrc/textproc/po4a/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/po4a/Makefile 2014/12/11 23:17:17 1.23
+++ pkgsrc/textproc/po4a/Makefile 2015/03/18 02:25:23 1.24
@@ -1,30 +1,41 @@ @@ -1,30 +1,41 @@
1# $NetBSD: Makefile,v 1.23 2014/12/11 23:17:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.24 2015/03/18 02:25:23 mef Exp $
2 2
3DISTNAME= po4a-0.45 3DISTNAME= po4a-0.45
4CATEGORIES= textproc 4CATEGORIES= textproc
5MASTER_SITES= https://alioth.debian.org/frs/download.php/file/3942/ 5MASTER_SITES= https://alioth.debian.org/frs/download.php/file/3942/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://po4a.alioth.debian.org/ 8HOMEPAGE= http://po4a.alioth.debian.org/
9COMMENT= Tool for using gettext where it was not intended to be used 9COMMENT= Tool for using gettext where it was not intended to be used
10 10
11DEPENDS+= p5-gettext>=1.01:../../devel/p5-gettext 11DEPENDS+= p5-gettext>=1.01:../../devel/p5-gettext
12DEPENDS+= p5-SGMLS-[0-9]*:../../textproc/p5-SGMLS 12DEPENDS+= p5-SGMLS-[0-9]*:../../textproc/p5-SGMLS
13DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey 13DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey
14DEPENDS+= p5-Text-WrapI18N-[0-9]*:../../textproc/p5-Text-WrapI18N 14DEPENDS+= p5-Text-WrapI18N-[0-9]*:../../textproc/p5-Text-WrapI18N
 15DEPENDS+= p5-CPAN-Meta>=2.141170:../../devel/p5-CPAN-Meta
 16DEPENDS+= p5-PerlIO-utf8_strict-[0-9]*:../../devel/p5-PerlIO-utf8_strict
15 17
16USE_TOOLS+= pkg-config perl:run msgmerge:run msgfmt:run 18USE_TOOLS+= pkg-config perl:run msgmerge:run msgfmt:run
17 19
18PERL5_MODULE_TYPE= Module::Build 20PERL5_MODULE_TYPE= Module::Build
19PERL5_PACKLIST= auto/po4a/.packlist 21PERL5_PACKLIST= auto/po4a/.packlist
 22
20REPLACE_PERL= scripts/msguntypot po4a po4a-gettextize po4a-normalize 23REPLACE_PERL= scripts/msguntypot po4a po4a-gettextize po4a-normalize
21REPLACE_PERL+= po4a-translate po4a-updatepo 24REPLACE_PERL+= po4a-translate po4a-updatepo
22REPLACE_PERL+= lib/Locale/Po4a/* 25REPLACE_PERL+= lib/Locale/Po4a/*
23 26
24DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 27DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
25 28
26MAKE_ENV+= COLUMNS=76 29MAKE_ENV+= COLUMNS=76
27 30
 31# work around not to set PATH to msgmerge, please somebody to fix correctly
 32SUBST_CLASSES+= path
 33SUBST_FILES.path= po4a
 34SUBST_MESSAGE.path= Fix msgmerge command path (not found)
 35SUBST_STAGE.path= pre-configure
 36SUBST_SED.path= -e 's|\"msgmerge\"|\"${PREFIX}/bin/msgmerge\"|;'
 37
28.include "../../lang/perl5/module.mk" 38.include "../../lang/perl5/module.mk"
29.include "../../textproc/libxslt/buildlink3.mk" 39.include "../../textproc/libxslt/buildlink3.mk"
 40.include "../../devel/gettext-tools/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/po4a/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/po4a/distinfo 2014/12/03 07:08:36 1.5
+++ pkgsrc/textproc/po4a/distinfo 2015/03/18 02:25:23 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2014/12/03 07:08:36 ryoon Exp $ 1$NetBSD: distinfo,v 1.6 2015/03/18 02:25:23 mef Exp $
2 2
3SHA1 (po4a-0.45.tar.gz) = c38c32d96c2a25f3a6cc5d8afb1fbdde362b7c19 3SHA1 (po4a-0.45.tar.gz) = c38c32d96c2a25f3a6cc5d8afb1fbdde362b7c19
4RMD160 (po4a-0.45.tar.gz) = b2cf67d430363181d1cce93c50e9f25edc7db98b 4RMD160 (po4a-0.45.tar.gz) = b2cf67d430363181d1cce93c50e9f25edc7db98b
5Size (po4a-0.45.tar.gz) = 2208959 bytes 5Size (po4a-0.45.tar.gz) = 2208959 bytes
6SHA1 (patch-Po4aBuilder.pm) = 0befcdd33a59a7a46046091436b21ff805af7d00 6SHA1 (patch-Po4aBuilder.pm) = 642d3155c5ebd1d85d70dc3359651c602b17fb56
cvs diff -r1.1 -r1.2 pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm (expand / switch to unified diff)

--- pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm 2014/12/03 07:08:36 1.1
+++ pkgsrc/textproc/po4a/patches/patch-Po4aBuilder.pm 2015/03/18 02:25:23 1.2
@@ -1,23 +1,46 @@ @@ -1,23 +1,46 @@
1$NetBSD: patch-Po4aBuilder.pm,v 1.1 2014/12/03 07:08:36 ryoon Exp $ 1$NetBSD: patch-Po4aBuilder.pm,v 1.2 2015/03/18 02:25:23 mef Exp $
2 2
3--- Po4aBuilder.pm.orig 2013-08-21 20:11:04.000000000 +0000 3(1) ryoon: remove gzip at initial import
4+++ Po4aBuilder.pm 4(2) mef: Add PerlIO::F_UTF8 () macro
5@@ -253,8 +253,6 @@ sub ACTION_man { 5(3) mef: to avoid --previous option is said unknown to msgmerge
 6 (but sounds strange)
 7
 8--- Po4aBuilder.pm.orig 2013-08-22 05:11:04.000000000 +0900
 9+++ Po4aBuilder.pm 2015-03-18 11:10:49.000000000 +0900
 10@@ -8,6 +8,8 @@ use File::stat;
 11
 12 @ISA = qw(Module::Build);
 13
 14+sub PerlIO::F_UTF8 () { 0x00008000 } # from perliol.h
 15+
 16 sub ACTION_build {
 17 my $self = shift;
 18 $self->depends_on('code');
 19@@ -104,7 +106,7 @@ sub ACTION_binpo {
 20 my $lang = fileparse($_, qw{.po});
 21 unless ($self->up_to_date("po/bin/po4a.pot", $_)) {
 22 print "XX Sync $_: ";
 23- system("msgmerge --previous $_ po/bin/po4a.pot -o $_.new") && die;
 24+ system("msgmerge $_ po/bin/po4a.pot -o $_.new") && die;
 25 # Typically all that changes was a date. I'd
 26 # prefer not to commit such changes, so detect
 27 # and ignore them.
 28@@ -253,8 +255,6 @@ sub ACTION_man {
6 } 29 }
7 $parser->parse_from_file ($file, $out); 30 $parser->parse_from_file ($file, $out);
8  31
9- system("gzip -9 -f $out") and die; 32- system("gzip -9 -f $out") and die;
10- unlink "$file" || die; 33- unlink "$file" || die;
11 } 34 }
12  35
13 # Install the manpages written in XML DocBook 36 # Install the manpages written in XML DocBook
14@@ -265,9 +263,7 @@ sub ACTION_man { 37@@ -265,9 +265,7 @@ sub ACTION_man {
15 if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) { 38 if ($file =~ m,(.*/man(.))/([^/]*)\.xml$,) {
16 my ($outdir, $section, $outfile) = ($1, $2, $3); 39 my ($outdir, $section, $outfile) = ($1, $2, $3);
17 system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die; 40 system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
18- system ("gzip -9 -f $outdir/$outfile.$section") and die; 41- system ("gzip -9 -f $outdir/$outfile.$section") and die;
19 } 42 }
20- unlink "$file" || die; 43- unlink "$file" || die;
21 } 44 }
22 } 45 }
23  46