Thu Jun 25 07:36:56 2015 UTC ()
Fix one more defined(@) issue.


(joerg)
diff -r1.4 -r1.5 pkgsrc/mail/fml4/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/fml4/patches/patch-ag
cvs diff -r1.4 -r1.5 pkgsrc/mail/fml4/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/fml4/distinfo 2015/06/24 19:49:56 1.4
+++ pkgsrc/mail/fml4/distinfo 2015/06/25 07:36:56 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.4 2015/06/24 19:49:56 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2015/06/25 07:36:56 joerg 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
5Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes 5Size (fml-4.0-stable-20040215.tar.gz) = 2906052 bytes
6SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae 6SHA1 (patch-aa) = 91c0544e2969b3e4537a485d1f7a92ab5bf72bae
7SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457 7SHA1 (patch-ab) = d8f8ef2085d9ad30331924c89958aaeddb89b457
8SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd 8SHA1 (patch-ac) = 75f5a3da8a17d29a81d7912e7ba0721277ded0fd
9SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf 9SHA1 (patch-ad) = 17e5d1d97e5a085b8b5da67e00730ce92b959fbf
10SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565 10SHA1 (patch-ae) = 467a8bacfb0a6d41ceb1d8f52fc4bfc0ae2fc565
11SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65 11SHA1 (patch-af) = 9e7fa7c70b4f3353a5c33d0ded2eeae86d9a5c65
12SHA1 (patch-ag) = 5a7a8a3d32e1a290e29cefa67aec584c21206d0c 12SHA1 (patch-ag) = 7b4c0be6de3b7fba18280779ede5c3b217598b32
13SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44 13SHA1 (patch-src_libkernsubr.pl) = c9d4e57b12fddb3045f47b27926c67cfe32c0d44
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/fml4/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/fml4/patches/patch-ag 2010/12/23 16:55:02 1.1.1.1
+++ pkgsrc/mail/fml4/patches/patch-ag 2015/06/25 07:36:56 1.2
@@ -1,32 +1,41 @@ @@ -1,32 +1,41 @@
1$NetBSD: patch-ag,v 1.1.1.1 2010/12/23 16:55:02 taca Exp $ 1$NetBSD: patch-ag,v 1.2 2015/06/25 07:36:56 joerg Exp $
2 2
3Stop perl deprecated warnings. 3Stop perl deprecated warnings.
4 4
5--- cf/config.orig 2003-01-15 18:07:38.000000000 +0000 5--- cf/config.orig 2003-01-15 18:07:38.000000000 +0000
6+++ cf/config 6+++ cf/config
7@@ -657,10 +657,10 @@ sub main'reverse 7@@ -657,10 +657,10 @@ sub main'reverse
8 if (defined $entry) { 8 if (defined $entry) {
9 print STDERR "GO \$\t$key\n"; 9 print STDERR "GO \$\t$key\n";
10 } 10 }
11- elsif (defined @entry) { 11- elsif (defined @entry) {
12+ elsif (@entry) { 12+ elsif (@entry) {
13 print STDERR "GO \@\t$key\n"; 13 print STDERR "GO \@\t$key\n";
14 } 14 }
15- elsif (defined %entry) { 15- elsif (defined %entry) {
16+ elsif (%entry) { 16+ elsif (%entry) {
17 print STDERR "GO \%\t$key\n"; 17 print STDERR "GO \%\t$key\n";
18 } 18 }
19 elsif (defined &entry) { 19 elsif (defined &entry) {
 20@@ -703,7 +703,7 @@ sub main'reverse
 21 next;
 22 }
 23
 24- if (defined @entry) {
 25+ if (@entry) {
 26 undef $num;
 27 $OUT'LOCAL .= "\@$key = (";
 28 foreach (@entry) {
20@@ -718,7 +718,7 @@ sub main'reverse 29@@ -718,7 +718,7 @@ sub main'reverse
21 # Is there an associative array that isn't the one 30 # Is there an associative array that isn't the one
22 # we're currently iterating through? 31 # we're currently iterating through?
23  32
24- if ($key ne "_$package" && defined %entry) { 33- if ($key ne "_$package" && defined %entry) {
25+ if ($key ne "_$package" && %entry) { 34+ if ($key ne "_$package" && %entry) {
26 $OUT'LOCAL .= "\%$key = (\n"; #'; 35 $OUT'LOCAL .= "\%$key = (\n"; #';
27 foreach $key (sort keys(%entry)) { 36 foreach $key (sort keys(%entry)) {
28 $OUT'LOCAL .= "'$key', '". $entry{$key} ."',\n";#'; 37 $OUT'LOCAL .= "'$key', '". $entry{$key} ."',\n";#';
29@@ -794,7 +794,7 @@ sub rv'PreScanConfigPH #'; 38@@ -794,7 +794,7 @@ sub rv'PreScanConfigPH #';
30 elsif (defined @entry) { 39 elsif (defined @entry) {
31 eval("$rv'\@$key = 1; undef $rv'\@$key"); 40 eval("$rv'\@$key = 1; undef $rv'\@$key");
32 } 41 }