CVS commit: pkgsrc/mail/fml4

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Mon Sep 12 15:46:07 UTC 2016

Modified Files:
        pkgsrc/mail/fml4: Makefile distinfo
        pkgsrc/mail/fml4/patches: patch-ac

Log Message:
One more fix for newer perl happy.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/fml4/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/fml4/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/fml4/patches/patch-ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/fml4/Makefile
diff -u pkgsrc/mail/fml4/Makefile:1.15 pkgsrc/mail/fml4/Makefile:1.16
--- pkgsrc/mail/fml4/Makefile:1.15      Wed Jun  8 19:23:55 2016
+++ pkgsrc/mail/fml4/Makefile   Mon Sep 12 15:46:07 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2016/06/08 19:23:55 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/09/12 15:46:07 taca Exp $
 #
 
 DISTNAME=      fml-4.0-stable-20040215
 PKGNAME=       fml4-4.0.3.20040215
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.fml.org/pub/fml/stable/
 

Index: pkgsrc/mail/fml4/distinfo
diff -u pkgsrc/mail/fml4/distinfo:1.7 pkgsrc/mail/fml4/distinfo:1.8
--- pkgsrc/mail/fml4/distinfo:1.7       Tue Nov  3 23:27:06 2015
+++ pkgsrc/mail/fml4/distinfo   Mon Sep 12 15:46:07 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:27:06 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/09/12 15:46:07 taca Exp $
 
 SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
 RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
@@ -6,7 +6,7 @@ SHA512 (fml-4.0-stable-20040215.tar.gz) 
 Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
 SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
 SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
-SHA1 (patch-ac) = fa5ffc01319190dadaa5c3deda0425a6fb9fe28a
+SHA1 (patch-ac) = 7ac9892e9e7649585a3fcafce32ff876e3217b75
 SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
 SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
 SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65

Index: pkgsrc/mail/fml4/patches/patch-ac
diff -u pkgsrc/mail/fml4/patches/patch-ac:1.3 pkgsrc/mail/fml4/patches/patch-ac:1.4
--- pkgsrc/mail/fml4/patches/patch-ac:1.3       Mon Jul 20 00:06:18 2015
+++ pkgsrc/mail/fml4/patches/patch-ac   Mon Sep 12 15:46:07 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2015/07/20 00:06:18 taca Exp $
+$NetBSD: patch-ac,v 1.4 2016/09/12 15:46:07 taca Exp $
 
 - Use HOSTNAME as hostname when install.
 - Stop perl deprecated warnings.
@@ -479,6 +479,15 @@ $NetBSD: patch-ac,v 1.3 2015/07/20 00:06
                 ($dumpPackages || $key !~ /::$/)
                 && ($key !~ /^_</ || $dumpDBFiles)
                 && !($package eq "dumpvar" && $key eq "stab")
+@@ -7112,7 +7125,7 @@ sub EvalMenu
+     for (split(/\n/, $MAP{$menu})) {
+       if (/^\s*(\S+)\s*(.*)\s*$/) {
+           $MAP{$menu, $1} = $2;
+-          $MAP{$menu, $1} =~ s/\$config{\'_ML_\'}/$config{'_ML_'}/g;
++          $MAP{$menu, $1} =~ s/\$config\{\'_ML_\'\}/$config{'_ML_'}/g;
+       }
+     }
+ }
 @@ -7319,31 +7332,25 @@ sub SetUpCGIadmin
  
      &ResetVariables;