Update to 0.39.

Feature safe:	yes

4 files changed, 22 insertions, 151 deletions

diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index 0b0bd89f4d2f..de19f62be9b7 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	po4a
-PORTVERSION=	0.32
-PORTREVISION=	2
+PORTVERSION=	0.39
 CATEGORIES=	textproc perl5
-MASTER_SITES=	http://alioth.debian.org/frs/download.php/2108/ GENTOO/distfiles
+MASTER_SITES=	http://alioth.debian.org/frs/download.php/3221/ GENTOO/distfiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Brings gettext translation tools to all kinds of docs
@@ -17,7 +16,9 @@ COMMENT=	Brings gettext translation tools to all kinds of docs
 BUILD_DEPENDS=	p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
 		libtext-wrapi18n-perl>=0.06:${PORTSDIR}/textproc/libtext-wrapi18n-perl \
 		p5-SGMLSpm>=1.03:${PORTSDIR}/textproc/p5-SGMLSpm \
-		p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
+		p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
+		jade>=0:${PORTSDIR}/textproc/jade
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GETTEXT=	yes
 USE_PERL5=	yes
@@ -25,8 +26,13 @@ PERL_MODBUILD=	yes
 
 MANPREFIX=	${PREFIX}
 MAN3PREFIX=	${MANPREFIX}
-MANLANG=	"" ca es fr it pl
 MAN3=		\
+		Locale::Po4a::Debconf.3 \
+		Locale::Po4a::Halibut.3 \
+		Locale::Po4a::Html.3 \
+		Locale::Po4a::NewsDebian.3 \
+		Locale::Po4a::TransTractor.3 \
+		Locale::Po4a::Wml.3 \
  		Locale::Po4a::BibTeX.3 \
  		Locale::Po4a::Chooser.3 \
  		Locale::Po4a::Common.3 \
@@ -37,13 +43,12 @@ MAN3=		\
  		Locale::Po4a::KernelHelp.3 \
  		Locale::Po4a::LaTeX.3 \
  		Locale::Po4a::Man.3 \
- 		Locale::Po4a::Pod.3 \
  		Locale::Po4a::Po.3 \
+ 		Locale::Po4a::Pod.3 \
  		Locale::Po4a::Sgml.3 \
  		Locale::Po4a::TeX.3 \
  		Locale::Po4a::Texinfo.3 \
  		Locale::Po4a::Text.3 \
-		Locale::Po4a::TransTractor.3 \
  		Locale::Po4a::Xhtml.3 \
  		Locale::Po4a::Xml.3
 MAN1=		msguntypot.1 \
@@ -52,7 +57,6 @@ MAN1=		msguntypot.1 \
 		po4a-normalize.1 \
 		po4a-translate.1 \
 		po4a-updatepo.1
-MAN7=		po4a.7
 
 PORT_VERBS=	${PORTNAME} Po4a msguntypot
 
@@ -60,13 +64,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/install_path/s|/locale|/share&|;/my .options/s|-v|-k 0 &|;\
 		s|gzip|${TRUE}|g;s|3pm|3|g;s|1p|1|g' ${WRKSRC}/Build.PL
 
-post-install:
-	@${GZIP_CMD} ${MAN1PREFIX}/man/man1/po4aman-display-po.1
-
-enrich-plist:
-	@${ECHO_CMD} 'man/man1/po4aman-display-po.1${MANEXT}' >> ${PLIST}
-	@for i in ${MANLANG:M[a-z]*};do for n in 1 3 7;do\
-		${ECHO_CMD} "@dirrmtry man/$$i/man$$n" >> ${PLIST};\
-		${ECHO_CMD} "@dirrmtry man/$$i" >> ${PLIST};done;done
-
 .include <bsd.port.mk>
diff --git a/textproc/po4a/distinfo b/textproc/po4a/distinfo
index a728648c16cd..cd65519bf608 100644
--- a/textproc/po4a/distinfo
+++ b/textproc/po4a/distinfo
@@ -1,3 +1,3 @@
-MD5 (po4a-0.32.tar.gz) = d026b224965b50afd9924b61d0df2a06
-SHA256 (po4a-0.32.tar.gz) = aab81329a73ea92b3a46c0a489017cc793b89b4c8beed84210253a35675c533e
-SIZE (po4a-0.32.tar.gz) = 882223
+MD5 (po4a-0.39.tar.gz) = 8ff31a5c6065aa0586ecdb15a1ebb818
+SHA256 (po4a-0.39.tar.gz) = 91f758bc64bd85e20dbee2d39b569a11f1927f06aa6cfdcb86b6c3dfdc823e8e
+SIZE (po4a-0.39.tar.gz) = 1626342
diff --git a/textproc/po4a/files/patch-perl5.10 b/textproc/po4a/files/patch-perl5.10
deleted file mode 100644
index b9bbda459261..000000000000
--- a/textproc/po4a/files/patch-perl5.10
+++ /dev/null
@@ -1,63 +0,0 @@
---- po4a
-+++ po4a
-@@ -440,10 +440,10 @@
-     $opts{"msgmerge-opt"} .= " --previous" if $previous;
- 
-     # options to transmit to the modules
--    %{$opts{"options"}} = (
-+    $opts{"options"} = {
-         "verbose" => $opts{"verbose"},
-         "debug"   => $opts{"debug"}
--    );
-+    };
-     foreach (@options) {
-         if (m/^([^=]*)=(.*)$/) {
-             $opts{"options"}{$1}="$2";
-@@ -498,10 +498,10 @@
-             if (! defined $lang) {
-                 $lang = "global";
-             }
--            if (! defined ${%$options}{$lang}) {
--                ${%$options}{$lang} = $opt;
-+            if (! defined $options->{$lang}) {
-+                $options->{$lang} = $opt;
-             } else {
--                ${%$options}{$lang} .= " $opt";
-+                $options->{$lang} .= " $opt";
-             }
-         } else {
-             last;
-@@ -638,20 +638,20 @@
- 	my %options;
- 	# 1. Use the global options ([opt] ...)
- 	%options = %{$document{''}{'options'}}
--	  if defined %{$document{''}{'options'}};
-+	  if defined $document{''}{'options'};
- 
- 	# 2. Merge the alias options
- 	if (defined $aliases{$1}) {
- 	    $document{$main}{'format'} = $aliases{$1}{"module"};
--	    if (defined %{$aliases{$1}{"options"}}) {
--		%options = %{$aliases{$1}{"options"}};
-+	    if (defined $aliases{$1}{"options"}) {
-+		%options = %{$aliases{$1}{"options"}}; # XXX not a merge, but overwrite
- 	    }
- 	}
- 
- 	# 3. If this file was already specified, reuse the previous
- 	#    options (no merge)
- 	%options = %{$document{$main}{'options'}}
--	  if defined %{$document{$main}{'options'}};
-+	  if defined $document{$main}{'options'};
- 
- 	# 4. Merge the document specific options
- 	# separate the end of the line, which contains options.
-@@ -697,7 +697,7 @@
- 	$o =~ s/.*?\[options\] +//;
- 	parse_config_options("$config_file:$nb",
- 	                     $o,
--	                     \%{$document{''}{"options"}});
-+	                     $document{''}{"options"});
-     } else {
- 	die wrap_ref_mod("$config_file:$nb", "",
- 	    gettext("Unparsable command '%s'."), $cmd);
diff --git a/textproc/po4a/pkg-plist b/textproc/po4a/pkg-plist
index e6f0cd03603a..9e08153ad8b7 100644
--- a/textproc/po4a/pkg-plist
+++ b/textproc/po4a/pkg-plist
@@ -1,20 +1,26 @@
 bin/msguntypot
 bin/po4a
+bin/po4a-build
 bin/po4a-gettextize
 bin/po4a-normalize
 bin/po4a-translate
 bin/po4a-updatepo
 bin/po4aman-display-po
+bin/po4apod-display-po
 %%SITE_PERL%%/Locale/Po4a/BibTeX.pm
 %%SITE_PERL%%/Locale/Po4a/Chooser.pm
 %%SITE_PERL%%/Locale/Po4a/Common.pm
+%%SITE_PERL%%/Locale/Po4a/Debconf.pm
 %%SITE_PERL%%/Locale/Po4a/Dia.pm
 %%SITE_PERL%%/Locale/Po4a/Docbook.pm
 %%SITE_PERL%%/Locale/Po4a/Guide.pm
+%%SITE_PERL%%/Locale/Po4a/Halibut.pm
+%%SITE_PERL%%/Locale/Po4a/Html.pm
 %%SITE_PERL%%/Locale/Po4a/Ini.pm
 %%SITE_PERL%%/Locale/Po4a/KernelHelp.pm
 %%SITE_PERL%%/Locale/Po4a/LaTeX.pm
 %%SITE_PERL%%/Locale/Po4a/Man.pm
+%%SITE_PERL%%/Locale/Po4a/NewsDebian.pm
 %%SITE_PERL%%/Locale/Po4a/Po.pm
 %%SITE_PERL%%/Locale/Po4a/Pod.pm
 %%SITE_PERL%%/Locale/Po4a/Sgml.pm
@@ -22,75 +28,8 @@ bin/po4aman-display-po
 %%SITE_PERL%%/Locale/Po4a/Texinfo.pm
 %%SITE_PERL%%/Locale/Po4a/Text.pm
 %%SITE_PERL%%/Locale/Po4a/TransTractor.pm
+%%SITE_PERL%%/Locale/Po4a/Wml.pm
 %%SITE_PERL%%/Locale/Po4a/Xhtml.pm
 %%SITE_PERL%%/Locale/Po4a/Xml.pm
-share/locale/af/LC_MESSAGES/po4a.mo
-share/locale/ar/LC_MESSAGES/po4a.mo
-share/locale/bn/LC_MESSAGES/po4a.mo
-share/locale/ca/LC_MESSAGES/po4a.mo
-share/locale/cs/LC_MESSAGES/po4a.mo
-share/locale/de/LC_MESSAGES/po4a.mo
-share/locale/eo/LC_MESSAGES/po4a.mo
-share/locale/es/LC_MESSAGES/po4a.mo
-share/locale/et/LC_MESSAGES/po4a.mo
-share/locale/eu/LC_MESSAGES/po4a.mo
-share/locale/fr/LC_MESSAGES/po4a.mo
-share/locale/he/LC_MESSAGES/po4a.mo
-share/locale/hr/LC_MESSAGES/po4a.mo
-share/locale/id/LC_MESSAGES/po4a.mo
-share/locale/it/LC_MESSAGES/po4a.mo
-share/locale/kn/LC_MESSAGES/po4a.mo
-share/locale/ko/LC_MESSAGES/po4a.mo
-share/locale/ku/LC_MESSAGES/po4a.mo
-share/locale/nb/LC_MESSAGES/po4a.mo
-share/locale/nl/LC_MESSAGES/po4a.mo
-share/locale/oc/LC_MESSAGES/po4a.mo
-share/locale/pl/LC_MESSAGES/po4a.mo
-share/locale/pt/LC_MESSAGES/po4a.mo
-share/locale/pt_BR/LC_MESSAGES/po4a.mo
-share/locale/ru/LC_MESSAGES/po4a.mo
-share/locale/sl/LC_MESSAGES/po4a.mo
-share/locale/sv/LC_MESSAGES/po4a.mo
-share/locale/uk/LC_MESSAGES/po4a.mo
-share/locale/uz/LC_MESSAGES/po4a.mo
-share/locale/zh_CN/LC_MESSAGES/po4a.mo
-share/locale/zh_HK/LC_MESSAGES/po4a.mo
 @dirrmtry %%SITE_PERL%%/Locale/Po4a
 @dirrmtry %%SITE_PERL%%/Locale
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-man/man1/po4aman-display-po.1.gz
-@dirrmtry man/ca/man1
-@dirrmtry man/ca
-@dirrmtry man/ca/man3
-@dirrmtry man/ca
-@dirrmtry man/ca/man7
-@dirrmtry man/ca
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry man/es/man3
-@dirrmtry man/es
-@dirrmtry man/es/man7
-@dirrmtry man/es
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/fr/man3
-@dirrmtry man/fr
-@dirrmtry man/fr/man7
-@dirrmtry man/fr
-@dirrmtry man/it/man1
-@dirrmtry man/it
-@dirrmtry man/it/man3
-@dirrmtry man/it
-@dirrmtry man/it/man7
-@dirrmtry man/it
-@dirrmtry man/pl/man1
-@dirrmtry man/pl
-@dirrmtry man/pl/man3
-@dirrmtry man/pl
-@dirrmtry man/pl/man7
-@dirrmtry man/pl