Stop warning with perl 5.12.

Bump PKGREVISION.

7 files changed, 63 insertions, 6 deletions

diff --git a/converters/jcode-perl/Makefile b/converters/jcode-perl/Makefile
index 491bcd414c7..75525f6e829 100644
--- a/converters/jcode-perl/Makefile
+++ b/converters/jcode-perl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2010/08/21 16:32:48 seb Exp $
+# $NetBSD: Makefile,v 1.6 2010/09/06 12:18:19 taca Exp $
 
 DISTNAME=	jcode.pl-2.13
 PKGNAME=	${DISTNAME:S/jcode.pl/jcode-perl/}
-PKGREVISION=	2
+PKGREVISION=	3
 SVR4_PKGNAME=	jcopl
 CATEGORIES=	japanese converters perl5
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
diff --git a/converters/jcode-perl/distinfo b/converters/jcode-perl/distinfo
index dcef34a30e3..b1f935e4136 100644
--- a/converters/jcode-perl/distinfo
+++ b/converters/jcode-perl/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2007/05/29 01:06:36 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2010/09/06 12:18:19 taca Exp $
 
 SHA1 (jcode.pl-2.13) = a123c07e86addb950cb3d9b7128cff03aba12c60
 RMD160 (jcode.pl-2.13) = 413572cf7f5e4d809c4c6b43475548b289396dd2
 Size (jcode.pl-2.13) = 21093 bytes
+SHA1 (patch-aa) = b4a1adb91ef40c3ba62265312af824bb7fcb0582
diff --git a/converters/jcode-perl/patches/patch-aa b/converters/jcode-perl/patches/patch-aa
new file mode 100644
index 00000000000..c67cd0e36e9
--- /dev/null
+++ b/converters/jcode-perl/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2010/09/06 12:18:19 taca Exp $
+
+Fix for perl 5.12.
+
+--- jcode.pl-2.13.orig	2010-09-02 02:42:04.000000000 +0000
++++ jcode.pl-2.13
+@@ -681,7 +681,7 @@ sub __z2h_jis {
+ 
+ sub z2h_euc {
+     local(*s, $n) = @_;
+-    &init_z2h_euc unless defined %z2h_euc;
++    &init_z2h_euc unless %z2h_euc;
+     $s =~ s/($re_euc_c|$re_euc_kana)/
+ 	$z2h_euc{$1} ? ($n++, $z2h_euc{$1}) : $1
+     /geo;
+@@ -690,7 +690,7 @@ sub z2h_euc {
+ 
+ sub z2h_sjis {
+     local(*s, $n) = @_;
+-    &init_z2h_sjis unless defined %z2h_sjis;
++    &init_z2h_sjis unless %z2h_sjis;
+     $s =~ s/($re_sjis_c)/$z2h_sjis{$1} ? ($n++, $z2h_sjis{$1}) : $1/geo;
+     $n;
+ }
diff --git a/mail/im/Makefile b/mail/im/Makefile
index 7acfb7ff7a2..6405cae5993 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2010/08/21 16:35:00 seb Exp $
+# $NetBSD: Makefile,v 1.5 2010/09/06 12:19:45 taca Exp $
 
 DISTNAME=	im-150
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://tats.haun.org/im/
 
diff --git a/mail/im/distinfo b/mail/im/distinfo
index a71914fb728..49256c32877 100644
--- a/mail/im/distinfo
+++ b/mail/im/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/02/19 11:53:43 obache Exp $
+$NetBSD: distinfo,v 1.3 2010/09/06 12:19:45 taca Exp $
 
 SHA1 (im-150.tar.gz) = 4f6ec70d52fffc6c4a44831ebed6ac8e33a769d0
 RMD160 (im-150.tar.gz) = 057142296747b8b2629e8d8265a221f703e7b27a
 Size (im-150.tar.gz) = 267337 bytes
 SHA1 (patch-aa) = 71bb1bed56be580c30f291360e7320a85a818087
+SHA1 (patch-ab) = 132c0026941cc48a24f49cf77b4dd0b25599a2e6
+SHA1 (patch-ac) = d66a6ea0e23865cc8d6dfb25a6472bd3ad48be68
diff --git a/mail/im/patches/patch-ab b/mail/im/patches/patch-ab
new file mode 100644
index 00000000000..0af33d60e0f
--- /dev/null
+++ b/mail/im/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/09/06 12:19:45 taca Exp $
+
+Fix for perl-5.12.
+
+--- IM/Config.pm.in.orig	2010-02-14 15:52:20.000000000 +0000
++++ IM/Config.pm.in
+@@ -487,7 +487,7 @@ sub set_selector($;$) {
+ 
+     foreach $s (split(',', $selector)) { ### xxx lc
+ 	next if ($s eq 'default');
+-	unless (defined(%{$s})) {
++	unless (%{$s}) {
+ 	    im_err("no 'case $s' in config file.\n");
+ 	    return -1;
+ 	} else {
diff --git a/mail/im/patches/patch-ac b/mail/im/patches/patch-ac
new file mode 100644
index 00000000000..c249d26e956
--- /dev/null
+++ b/mail/im/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2010/09/06 12:19:45 taca Exp $
+
+Fix for perl-5.12.
+
+--- IM/Scan.pm.orig	2010-02-14 15:52:20.000000000 +0000
++++ IM/Scan.pm
+@@ -509,7 +509,7 @@ sub friendly_addr($$) {
+     my($a, $f, $p);
+     while (($a, $addr, $f) = &fetch_addr($addr, 1), $a ne '') {
+ 	$a =~ s/\/[^@]*//;
+-	if (defined(%petnames) && $petnames{lc($a)}) {
++	if (%petnames && $petnames{lc($a)}) {
+ 	    $p = $petnames{lc($a)};
+ 	} elsif (!$need_addr && $f) {
+ 	    $p = &mime_decode_string($f);