Add patch-ac to import fixes from newer po4a to make newish perl

not emit warnings and errors for now-deprecated constructs.
Add comments to the existing patch files.
Bump PKGREVISION.

5 files changed, 41 insertions, 7 deletions

diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index a3c7eaf42fb..2ba4f5bcdfb 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2011/08/14 15:14:23 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/11/30 10:13:38 he Exp $
 #
 
 DISTNAME=		po4a-0.23
-PKGREVISION=		7
+PKGREVISION=		8
 CATEGORIES=		textproc
 MASTER_SITES=		http://alioth.debian.org/download.php/1317/
 
diff --git a/textproc/po4a/distinfo b/textproc/po4a/distinfo
index a529c3a6a29..0c192dc9a89 100644
--- a/textproc/po4a/distinfo
+++ b/textproc/po4a/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/06/04 22:10:11 tonnerre Exp $
+$NetBSD: distinfo,v 1.3 2011/11/30 10:13:38 he Exp $
 
 SHA1 (po4a-0.23.tar.gz) = 749a7823c976befc6a84d443ef7225bd41477b59
 RMD160 (po4a-0.23.tar.gz) = 79174c0ed576ac793495be7addb407d919f3daf9
 Size (po4a-0.23.tar.gz) = 736399 bytes
-SHA1 (patch-aa) = 501a5fc0265d06285c13f3501793ad2a92c95081
-SHA1 (patch-ab) = 3c3745e57464e8ed2c5389f2490bbb28d400026d
+SHA1 (patch-aa) = 53d0746c859a6e4b55bdeff4b39e181f129281dc
+SHA1 (patch-ab) = 34295892323d9f86a9789c87aef0201422bea07a
+SHA1 (patch-ac) = e97f3c54bd2f07ead841a58cf90d0e948f7beeab
diff --git a/textproc/po4a/patches/patch-aa b/textproc/po4a/patches/patch-aa
index c74dfd68880..57ccc23f4e9 100644
--- a/textproc/po4a/patches/patch-aa
+++ b/textproc/po4a/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/01/13 18:21:56 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/30 10:13:38 he Exp $
+
+Produce uncompressed man pages.
 
 --- Build.PL.orig	2005-12-09 17:24:46.000000000 +0000
 +++ Build.PL
diff --git a/textproc/po4a/patches/patch-ab b/textproc/po4a/patches/patch-ab
index 4d9aa1c6618..07f74a7d0c2 100644
--- a/textproc/po4a/patches/patch-ab
+++ b/textproc/po4a/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2008/06/04 22:10:11 tonnerre Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/30 10:13:38 he Exp $
+
+Don't use /tmp for temporary files, use . instead.
 
 --- lib/Locale/Po4a/Po.pm.orig	2005-12-09 18:24:46.000000000 +0100
 +++ lib/Locale/Po4a/Po.pm
diff --git a/textproc/po4a/patches/patch-ac b/textproc/po4a/patches/patch-ac
new file mode 100644
index 00000000000..7f86a0c3362
--- /dev/null
+++ b/textproc/po4a/patches/patch-ac
@@ -0,0 +1,29 @@
+$NetBSD: patch-ac,v 1.1 2011/11/30 10:13:38 he Exp $
+
+Import some fixes from newer po4a to make newer perl happy.
+
+--- po4a.orig	2005-12-09 17:24:46.000000000 +0000
++++ po4a
+@@ -420,10 +420,10 @@ sub parse_config_options {
+             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;
+@@ -518,7 +518,7 @@ while (<CONFIG>) {
+ 	my %options;
+ 	if (defined $aliases{$1}) {
+ 	    $document{$main}{'format'} = $aliases{$1}{"module"};
+-	    if (defined %{$aliases{$1}{"options"}}) {
++	    if (defined $aliases{$1}{"options"}) {
+ 		%options = %{$aliases{$1}{"options"}};
+ 	    }
+ 	}