From aa1e1733541c120432b95a7aa7f489fd54e9d0c3 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 20 Apr 2015 17:19:24 +0000
Subject: Fix with Perl 5.21.1+.

"defined(@array)" and "defined(%hash)" are now fatal errors
    These have been deprecated since v5.6.1 and have raised deprecation
    warnings since v5.16.

With hat:	perl@
Sponsored by:	Absolight
---
 mail/bsmtp/files/patch-configure | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/bsmtp/files/patch-configure b/mail/bsmtp/files/patch-configure
index 22b7e859c2d8..e13f668979f6 100644
--- a/mail/bsmtp/files/patch-configure
+++ b/mail/bsmtp/files/patch-configure
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- configure.orig	2013-11-01 19:55:42.000000000 +0100
-+++ configure	2013-11-01 19:55:42.000000000 +0100
+--- configure.orig	2015-04-20 17:10:57 UTC
++++ configure
 @@ -41,6 +41,11 @@ if ($#ARGV == 0) {
    "batcher",
    "batcher.c",
@@ -15,6 +12,24 @@ $FreeBSD$
    "bsmtp.m4.8.9",
    "bsmtp.m4.8.8",
    "bsmtp.m4.8.7",
+@@ -146,7 +151,7 @@ if (! $redo) {
+           }
+         }
+       } elsif ($macro eq "\@DAEMONUID\@") {
+-        if (! defined @getpwnam) {
++        if (! @getpwnam) {
+           if (! defined $value{'@DAEMONUSER@'}) {
+             die "\@DAEMONUSER\@ must be defined before \@DAEMONUID\@\n";
+           }
+@@ -158,7 +163,7 @@ if (! $redo) {
+         ($name, $_, $uid, $_, $_, $_, $_, $_, $_) = @getpwnam;
+         $default[$i] = $uid;
+       } elsif ($macro eq "\@DAEMONGID\@") {
+-        if (! defined @getpwnam) {
++        if (! @getpwnam) {
+           if (! defined $value{'@DAEMONUSER@'}) {
+             die "\@DAEMONUSER\@ must be defined before \@DAEMONUID\@\n";
+           }
 @@ -198,6 +203,16 @@ if (! $redo) {
  	    $default[$i] = '8.8';
  	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) {
-- 
cgit v1.2.3