Pullup ticket #4778 - requested by taca

mail/fml4: bug fix patch

Revisions pulled up:
- mail/fml4/Makefile                                            1.14
- mail/fml4/distinfo                                            1.6
- mail/fml4/patches/patch-ac                                    1.3
- mail/fml4/patches/patch-ag                                    1.3
- mail/fml4/patches/patch-src_jcode.pl                          1.1

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Jul 20 00:06:18 UTC 2015

   Modified Files:
   	pkgsrc/mail/fml4: Makefile distinfo
   	pkgsrc/mail/fml4/patches: patch-ac patch-ag
   Added Files:
   	pkgsrc/mail/fml4/patches: patch-src_jcode.pl

   Log Message:
   Fix runtime problem with perl 5.22.

   Bump PKGREVISION.

5 files changed, 41 insertions, 11 deletions

diff --git a/mail/fml4/Makefile b/mail/fml4/Makefile
index 205dfdd98df..9048e53b5c8 100644
--- a/mail/fml4/Makefile
+++ b/mail/fml4/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2015/06/24 19:49:56 joerg Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2015/07/22 20:07:53 tron Exp $
 #
 
 DISTNAME=	fml-4.0-stable-20040215
 PKGNAME=	fml4-4.0.3.20040215
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.fml.org/pub/fml/stable/
 
diff --git a/mail/fml4/distinfo b/mail/fml4/distinfo
index 5db56128848..892f6e7d804 100644
--- a/mail/fml4/distinfo
+++ b/mail/fml4/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.5 2015/06/25 07:36:56 joerg Exp $
+$NetBSD: distinfo,v 1.5.2.1 2015/07/22 20:07:53 tron Exp $
 
 SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
 RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
 Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
 SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
 SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
-SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd
+SHA1 (patch-ac) = fa5ffc01319190dadaa5c3deda0425a6fb9fe28a
 SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
 SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
 SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
-SHA1 (patch-ag) = 7b4c0be6de3b7fba18280779ede5c3b217598b32
+SHA1 (patch-ag) = 00c20b043e74e9107a204ee94abef9de870d2b97
+SHA1 (patch-src_jcode.pl) = d850d762e7af4a2f9086f745d20c24ab427ed611
 SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
diff --git a/mail/fml4/patches/patch-ac b/mail/fml4/patches/patch-ac
index e6746c2e07a..b566742b8c8 100644
--- a/mail/fml4/patches/patch-ac
+++ b/mail/fml4/patches/patch-ac
@@ -1,9 +1,10 @@
-$NetBSD: patch-ac,v 1.2 2015/06/24 19:49:56 joerg Exp $
+$NetBSD: patch-ac,v 1.2.2.1 2015/07/22 20:07:53 tron Exp $
 
-- use HOSTNAME as hostname when install.
+- Use HOSTNAME as hostname when install.
 - Stop perl deprecated warnings.
 - honor PREFIX and FML_DATADIR.
 - Add support for DESTDIR.
+- Avoid use of obsolete perl syntax.
 
 --- sbin/makefml.orig	2003-01-26 11:18:01.000000000 +0000
 +++ sbin/makefml
diff --git a/mail/fml4/patches/patch-ag b/mail/fml4/patches/patch-ag
index eaa88192518..9e7b58ecc71 100644
--- a/mail/fml4/patches/patch-ag
+++ b/mail/fml4/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2015/06/25 07:36:56 joerg Exp $
+$NetBSD: patch-ag,v 1.2.2.1 2015/07/22 20:07:53 tron Exp $
 
-Stop perl deprecated warnings.
+Avoid use of obsolete perl syntax.
 
 --- cf/config.orig	2003-01-15 18:07:38.000000000 +0000
 +++ cf/config
@@ -35,8 +35,12 @@ Stop perl deprecated warnings.
  	    $OUT'LOCAL .= "\%$key = (\n"; #';
  	    foreach $key (sort keys(%entry)) {
  		$OUT'LOCAL .= "'$key', '". $entry{$key} ."',\n";#';
-@@ -794,7 +794,7 @@ sub rv'PreScanConfigPH #';
- 	elsif (defined @entry) {
+@@ -791,10 +791,10 @@ sub rv'PreScanConfigPH #';
+ 	if (defined $entry) {
+ 	    eval("$rv'\$$key = 1; undef $rv'\$$key");
+ 	}
+-	elsif (defined @entry) {
++	elsif (@entry) {
  	    eval("$rv'\@$key = 1; undef $rv'\@$key");
  	}
 -	elsif ($key ne "_$package" && $key ne "_DB" && defined %entry) {
diff --git a/mail/fml4/patches/patch-src_jcode.pl b/mail/fml4/patches/patch-src_jcode.pl
new file mode 100644
index 00000000000..5fa68561390
--- /dev/null
+++ b/mail/fml4/patches/patch-src_jcode.pl
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_jcode.pl,v 1.1.2.2 2015/07/22 20:07:53 tron Exp $
+
+Avoid use of obsolete perl syntax.
+
+--- src/jcode.pl.orig	2000-01-05 04:57:47.000000000 +0000
++++ src/jcode.pl
+@@ -676,7 +676,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;
+@@ -685,7 +685,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;
+ }