adjustments for perl 5.12 (no additional adjustments for perl 5.14 needed)

6 files changed, 123 insertions, 2 deletions

diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index f2adb5bfe5d..073b88096e6 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.31 2011/01/09 19:59:48 spz Exp $
+# $NetBSD: Makefile,v 1.32 2011/10/30 22:03:42 spz Exp $
 
 DISTNAME=	MHonArc-2.6.18
 PKGNAME=	mhonarc-2.6.18
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mhonarc.org/release/MHonArc/tar/
 EXTRACT_SUFX=	.tar.bz2
+PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.mhonarc.org/
diff --git a/mail/mhonarc/distinfo b/mail/mhonarc/distinfo
index dfa0bf5c1b5..ba84db9ee82 100644
--- a/mail/mhonarc/distinfo
+++ b/mail/mhonarc/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.17 2011/01/09 19:59:48 spz Exp $
+$NetBSD: distinfo,v 1.18 2011/10/30 22:03:42 spz Exp $
 
 SHA1 (MHonArc-2.6.18.tar.bz2) = 4990889d13cc3f4a2e1c284c55db5abb64e7072e
 RMD160 (MHonArc-2.6.18.tar.bz2) = 4cf0d8e67050cc573ef81f826938a6c096ff0e93
 Size (MHonArc-2.6.18.tar.bz2) = 1546854 bytes
+SHA1 (patch-lib_mhamain.pl) = d0257ba20bd0625d17ccf47795377e3467e2b24c
+SHA1 (patch-lib_mhopt.pl) = bf6ba47810dfa58318887ae936b3de2f32bd934d
+SHA1 (patch-lib_mhtxthtml.pl) = bfd6420fd9e0ffdbf1f781441f8c1b8b71ef94e7
+SHA1 (patch-lib_readmail.pl) = acd2aede2dbc533abe409fbfa381332697065cbe
diff --git a/mail/mhonarc/patches/patch-lib_mhamain.pl b/mail/mhonarc/patches/patch-lib_mhamain.pl
new file mode 100644
index 00000000000..44a3ed4ccb3
--- /dev/null
+++ b/mail/mhonarc/patches/patch-lib_mhamain.pl
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_mhamain.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
+
+--- lib/mhamain.pl.orig	2011-01-09 16:18:35.000000000 +0000
++++ lib/mhamain.pl
+@@ -1561,7 +1561,7 @@ sub signal_catch {
+ ##	Create Index2MsgId if not defined
+ ##
+ sub defineIndex2MsgId {
+-    if (!defined(%Index2MsgId)) {
++    if (!%Index2MsgId) {
+ 	foreach (keys %MsgId) {
+ 	    $Index2MsgId{$MsgId{$_}} = $_;
+ 	}
diff --git a/mail/mhonarc/patches/patch-lib_mhopt.pl b/mail/mhonarc/patches/patch-lib_mhopt.pl
new file mode 100644
index 00000000000..f77d67bb51d
--- /dev/null
+++ b/mail/mhonarc/patches/patch-lib_mhopt.pl
@@ -0,0 +1,13 @@
+$NetBSD: patch-lib_mhopt.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
+
+--- lib/mhopt.pl.orig	2011-01-09 05:13:14.000000000 +0000
++++ lib/mhopt.pl
+@@ -864,7 +864,7 @@ sub update_data_1_to_2 {
+ ##
+ sub update_data_2_1_to_later {
+     # we can preserve filter arguments
+-    if (defined(%main::MIMEFiltersArgs)) {
++    if (%main::MIMEFiltersArgs) {
+ 	warn qq/         preserving MIMEARGS...\n/;
+ 	%readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs;
+ 	$IsDefault{'MIMEARGS'} = 0;
diff --git a/mail/mhonarc/patches/patch-lib_mhtxthtml.pl b/mail/mhonarc/patches/patch-lib_mhtxthtml.pl
new file mode 100644
index 00000000000..f243a46fbc5
--- /dev/null
+++ b/mail/mhonarc/patches/patch-lib_mhtxthtml.pl
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_mhtxthtml.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
+
+--- lib/mhtxthtml.pl.orig	2011-01-09 16:12:14.000000000 +0000
++++ lib/mhtxthtml.pl
+@@ -152,7 +152,8 @@ sub filter {
+     my $subdir   = $args =~ /\bsubdir\b/i;
+     my $norelate = $args =~ /\bdisablerelated\b/i;
+     my $atdir    = $subdir ? $mhonarc::MsgPrefix.$mhonarc::MHAmsgnum : "";
+-    my $tmp, $i;
++    my $tmp;
++    my $i;
+ 
+     my $charset = $fields->{'x-mha-charset'};
+     my($charcnv, $real_charset_name) =
diff --git a/mail/mhonarc/patches/patch-lib_readmail.pl b/mail/mhonarc/patches/patch-lib_readmail.pl
new file mode 100644
index 00000000000..7e5696c7a79
--- /dev/null
+++ b/mail/mhonarc/patches/patch-lib_readmail.pl
@@ -0,0 +1,76 @@
+$NetBSD: patch-lib_readmail.pl,v 1.1 2011/10/30 22:03:42 spz Exp $
+
+--- lib/readmail.pl.orig	2011-01-09 05:13:14.000000000 +0000
++++ lib/readmail.pl
+@@ -117,9 +117,9 @@ $DecodeHeader	= 0;
+ ##  set to true.
+ 
+ %MIMEDecoders			= ()
+-    unless defined(%MIMEDecoders);
++    unless %MIMEDecoders;
+ %MIMEDecodersSrc		= ()
+-    unless defined(%MIMEDecodersSrc);
++    unless %MIMEDecodersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMECharSetConverters is the associative array for storing functions
+@@ -153,9 +153,9 @@ $DecodeHeader	= 0;
+ ##  string.
+ 
+ %MIMECharSetConverters			= ()
+-    unless defined(%MIMECharSetConverters);
++    unless %MIMECharSetConverters;
+ %MIMECharSetConvertersSrc		= ()
+-    unless defined(%MIMECharSetConvertersSrc);
++    unless %MIMECharSetConvertersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEFilters is the associative array for storing functions that
+@@ -180,9 +180,9 @@ $DecodeHeader	= 0;
+ ##  that all functions are defined before invoking MAILread_body.
+ 
+ %MIMEFilters	= ()
+-    unless defined(%MIMEFilters);
++    unless %MIMEFilters;
+ %MIMEFiltersSrc	= ()
+-    unless defined(%MIMEFiltersSrc);
++    unless %MIMEFiltersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEFiltersArgs is the associative array for storing any optional
+@@ -196,7 +196,7 @@ $DecodeHeader	= 0;
+ ##  listed for a function if both are applicable.
+ 
+ %MIMEFiltersArgs	= ()
+-    unless defined(%MIMEFiltersArgs);
++    unless %MIMEFiltersArgs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEExcs is the associative array listing which data types
+@@ -206,7 +206,7 @@ $DecodeHeader	= 0;
+ ##	Values => <should evaluate to a true expression>
+ 
+ %MIMEExcs			= ()
+-    unless defined(%MIMEExcs);
++    unless %MIMEExcs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEIncs is the associative array listing which data types
+@@ -220,7 +220,7 @@ $DecodeHeader	= 0;
+ ##  be used to only allow a well-defined set of content-types.
+ 
+ %MIMEIncs			= ()
+-    unless defined(%MIMEIncs);
++    unless %MIMEIncs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMECharsetAliases is a mapping of charset names to charset names.
+@@ -231,7 +231,7 @@ $DecodeHeader	= 0;
+ ##	Values => real charset name
+ ##
+ %MIMECharsetAliases = ()
+-    unless defined(%MIMECharsetAliases);
++    unless %MIMECharsetAliases;
+ 
+ ##---------------------------------------------------------------------------
+ ##	Text entity-related variables