From bf54eb2deeec9a0c362a9559b43a62434a3fc2a5 Mon Sep 17 00:00:00 2001 From: Phil Pennock Date: Thu, 2 Feb 2017 16:02:40 -0500 Subject: [PATCH] FreeBSD: Perl no longer in /usr/bin from Ports FreeBSD Ports by policy no longer allows symlinks in /usr/bin for things like Perl, so we have to look in /usr/local/bin for it instead. (cherry picked from commit f6ef9370d8ad193be6b0203aa85d52b40779242d) Signed-off-by: Phil Pennock --- doc/doc-txt/ChangeLog | 2 ++ src/OS/Makefile-FreeBSD | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 03c031106..6cd472434 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -79,6 +79,8 @@ PP/03 Bug 2018: For Proxy Protocol and TLS-on-connect, do not over-read and PP/04 Bug 2018: Also handle Proxy Protocol v2 safely. +PP/05 FreeBSD compat: handle that Ports no longer create /usr/bin/perl + Exim version 4.88 ----------------- diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD index 92d349d33..7c6c06487 100644 --- a/src/OS/Makefile-FreeBSD +++ b/src/OS/Makefile-FreeBSD @@ -6,6 +6,10 @@ CHOWN_COMMAND=/usr/sbin/chown STRIP_COMMAND=/usr/bin/strip CHMOD_COMMAND=/bin/chmod +# FreeBSD Ports no longer insert compatibility symlinks into /usr/bin for +# scripting languages which traditionally have had them. +PERL_COMMAND=/usr/local/bin/perl + HAVE_SA_LEN=YES # crypt() is in a separate library -- 2.30.2