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.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 03c031106b5bae0523d3c54014ab981049a7547e..6cd472434e79f41e724dda26986e662e099a9e63 100644 (file)
--- 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/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
 -----------------
 
 Exim version 4.88
 -----------------

diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index 92d349d331f79d019992e6e150e57b154f4f6e7b..7c6c0648780e189f0ae71a07eae4e0ee2021212c 100644 (file)
--- 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
 
 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
 HAVE_SA_LEN=YES
 
 # crypt() is in a separate library