Mon Sep 12 15:46:07 2016 UTC ()
One more fix for newer perl happy.

Bump PKGREVISION.


(taca)
diff -r1.15 -r1.16 pkgsrc/mail/fml4/Makefile
diff -r1.7 -r1.8 pkgsrc/mail/fml4/distinfo
diff -r1.3 -r1.4 pkgsrc/mail/fml4/patches/patch-ac
cvs diff -r1.15 -r1.16 pkgsrc/mail/fml4/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/fml4/Makefile 2016/06/08 19:23:55 1.15
+++ pkgsrc/mail/fml4/Makefile 2016/09/12 15:46:07 1.16
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.15 2016/06/08 19:23:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2016/09/12 15:46:07 taca Exp $
2# 2#
3 3
4DISTNAME= fml-4.0-stable-20040215 4DISTNAME= fml-4.0-stable-20040215
5PKGNAME= fml4-4.0.3.20040215 5PKGNAME= fml4-4.0.3.20040215
6PKGREVISION= 10 6PKGREVISION= 11
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ftp://ftp.fml.org/pub/fml/stable/ 8MASTER_SITES= ftp://ftp.fml.org/pub/fml/stable/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fml.org/software/fml4/index-e.html 11HOMEPAGE= http://www.fml.org/software/fml4/index-e.html
12COMMENT= FML mailing list server 12COMMENT= FML mailing list server
13LICENSE= gnu-gpl-v2 OR artistic 13LICENSE= gnu-gpl-v2 OR artistic
14 14
15DEPENDS+= p5-Perl4-CoreLibs>=0.003:../../devel/p5-Perl4-CoreLibs 15DEPENDS+= p5-Perl4-CoreLibs>=0.003:../../devel/p5-Perl4-CoreLibs
16 16
17PLIST_SRC= ${PKGDIR}/PLIST 17PLIST_SRC= ${PKGDIR}/PLIST
18FML_DIR= fml 18FML_DIR= fml
19 19
cvs diff -r1.7 -r1.8 pkgsrc/mail/fml4/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/fml4/distinfo 2015/11/03 23:27:06 1.7
+++ pkgsrc/mail/fml4/distinfo 2016/09/12 15:46:07 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.7 2015/11/03 23:27:06 agc Exp $ 1$NetBSD: distinfo,v 1.8 2016/09/12 15:46:07 taca Exp $
2 2
3SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491 3SHA1 (fml-4.0-stable-20040215.tar.gz) = b7f958deacc50a0173928b7c43df52b5869d9491
4RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391 4RMD160 (fml-4.0-stable-20040215.tar.gz) = 40eb43d2631a5e6d6769b8cfdf35e4a980ff0391
5SHA512 (fml-4.0-stable-20040215.tar.gz) = 4e0d08812a893909873abbf378aaf24e3ddb7ed69405167f1fbbc83c2b3668945bbaaf1679ddcb7fb517a28ac66205f2e3976926a4d583e4f2fc3bae927c2358 5SHA512 (fml-4.0-stable-20040215.tar.gz) = 4e0d08812a893909873abbf378aaf24e3ddb7ed69405167f1fbbc83c2b3668945bbaaf1679ddcb7fb517a28ac66205f2e3976926a4d583e4f2fc3bae927c2358
6Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes 6Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
7SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae 7SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
8SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457 8SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
9SHA1 (patch-ac) = fa5ffc01319190dadaa5c3deda0425a6fb9fe28a 9SHA1 (patch-ac) = 7ac9892e9e7649585a3fcafce32ff876e3217b75
10SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf 10SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
11SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565 11SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
12SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65 12SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
13SHA1 (patch-ag) = 00c20b043e74e9107a204ee94abef9de870d2b97 13SHA1 (patch-ag) = 00c20b043e74e9107a204ee94abef9de870d2b97
14SHA1 (patch-src_jcode.pl) = d850d762e7af4a2f9086f745d20c24ab427ed611 14SHA1 (patch-src_jcode.pl) = d850d762e7af4a2f9086f745d20c24ab427ed611
15SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44 15SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
cvs diff -r1.3 -r1.4 pkgsrc/mail/fml4/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/mail/fml4/patches/patch-ac 2015/07/20 00:06:18 1.3
+++ pkgsrc/mail/fml4/patches/patch-ac 2016/09/12 15:46:07 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ac,v 1.3 2015/07/20 00:06:18 taca Exp $ 1$NetBSD: patch-ac,v 1.4 2016/09/12 15:46:07 taca Exp $
2 2
3- Use HOSTNAME as hostname when install. 3- Use HOSTNAME as hostname when install.
4- Stop perl deprecated warnings. 4- Stop perl deprecated warnings.
5- honor PREFIX and FML_DATADIR. 5- honor PREFIX and FML_DATADIR.
6- Add support for DESTDIR. 6- Add support for DESTDIR.
7- Avoid use of obsolete perl syntax. 7- Avoid use of obsolete perl syntax.
8 8
9--- sbin/makefml.orig 2003-01-26 11:18:01.000000000 +0000 9--- sbin/makefml.orig 2003-01-26 11:18:01.000000000 +0000
10+++ sbin/makefml 10+++ sbin/makefml
11@@ -192,6 +192,11 @@ sub InitMakeFml 11@@ -192,6 +192,11 @@ sub InitMakeFml
12  12
13 { # DNS AutoConfigure to set FQDN and DOMAINNAME;  13 { # DNS AutoConfigure to set FQDN and DOMAINNAME;
14 local(@n, $hostname, $list); 14 local(@n, $hostname, $list);
@@ -469,26 +469,35 @@ $NetBSD: patch-ac,v 1.3 2015/07/20 00:06 @@ -469,26 +469,35 @@ $NetBSD: patch-ac,v 1.3 2015/07/20 00:06
469  469
470 if ((($] !~ /5\.\d\d\d/) &&  470 if ((($] !~ /5\.\d\d\d/) &&
471- $key ne "_$package" && $key ne "_DB" && defined %entry 471- $key ne "_$package" && $key ne "_DB" && defined %entry
472+ $key ne "_$package" && $key ne "_DB" && %entry 472+ $key ne "_$package" && $key ne "_DB" && %entry
473 ) 473 )
474 || 474 ||
475 (($] =~ /5\.\d\d\d/) &&  475 (($] =~ /5\.\d\d\d/) &&
476 $key ne "$package::" && $key ne "DB::" &&  476 $key ne "$package::" && $key ne "DB::" &&
477- (defined %entry) &&  477- (defined %entry) &&
478+ %entry &&  478+ %entry &&
479 ($dumpPackages || $key !~ /::$/) 479 ($dumpPackages || $key !~ /::$/)
480 && ($key !~ /^_</ || $dumpDBFiles) 480 && ($key !~ /^_</ || $dumpDBFiles)
481 && !($package eq "dumpvar" && $key eq "stab") 481 && !($package eq "dumpvar" && $key eq "stab")
 482@@ -7112,7 +7125,7 @@ sub EvalMenu
 483 for (split(/\n/, $MAP{$menu})) {
 484 if (/^\s*(\S+)\s*(.*)\s*$/) {
 485 $MAP{$menu, $1} = $2;
 486- $MAP{$menu, $1} =~ s/\$config{\'_ML_\'}/$config{'_ML_'}/g;
 487+ $MAP{$menu, $1} =~ s/\$config\{\'_ML_\'\}/$config{'_ML_'}/g;
 488 }
 489 }
 490 }
482@@ -7319,31 +7332,25 @@ sub SetUpCGIadmin 491@@ -7319,31 +7332,25 @@ sub SetUpCGIadmin
483  492
484 &ResetVariables; 493 &ResetVariables;
485  494
486- # ignore cgi examles in upgrade 495- # ignore cgi examles in upgrade
487- if (-f $CGI_CONFIG) { 496- if (-f $CGI_CONFIG) {
488- return; 497- return;
489- } 498- }
490- elsif ($mode eq 'install') { 499- elsif ($mode eq 'install') {
491- $SSL_REQUIRE_SSL = 'SSLRequireSSL'; 500- $SSL_REQUIRE_SSL = 'SSLRequireSSL';
492- } 501- }
493+ $SSL_REQUIRE_SSL = 'SSLRequireSSL'; 502+ $SSL_REQUIRE_SSL = 'SSLRequireSSL';
494  503