git: 809fe307f02e - main - security/john: try to fix the port's build on AArch64

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=809fe307f02ed333ae4e3ce3325df958e19c3ab1

commit 809fe307f02ed333ae4e3ce3325df958e19c3ab1
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-10-19 07:48:36 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-10-19 07:48:36 +0000

    security/john: try to fix the port's build on AArch64
    
    In commit 1e6670382fbb, the observed failure on PowerPC had been
    mended in a way that broke AArch64 build.  Robert's investigation
    had shown that <altivec.h> should've been included elsewhere, and
    it actually is, but guarded by `#ifdef __linux__' for some reason.
    
    Alexander explained that at the time the AltiVec support was just
    for two platforms: macOS (first) and Linux (added later).  If the
    guard of `#include <altivec.h>' was needed, then we could probably
    replace the `#ifdef __linux__' with `#ifndef __APPLE__' for the
    same effect on old macOS versions which do not need the #include.
    
    PR:             266732
    Submitted by:   Robert Clausecker
    Discussed with: Solar Designer
---
 security/john/Makefile                   |  2 ++
 security/john/files/patch-src_sboxes-s.c | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/security/john/Makefile b/security/john/Makefile
index 1358642f6165..8822f293079c 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -51,6 +51,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h
 	@${REINPLACE_CMD} -e '/^host_cpu=/s|$$| ; case $$host_cpu in\
 		amd64) host_cpu=x86_64 ;; esac|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,^#ifdef __linux,#ifndef __APPLE,' \
+		${WRKSRC}/DES_bs_b.c
 
 do-install:
 .for b in ${BINARIES}
diff --git a/security/john/files/patch-src_sboxes-s.c b/security/john/files/patch-src_sboxes-s.c
deleted file mode 100644
index b6caba0d866d..000000000000
--- a/security/john/files/patch-src_sboxes-s.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/sboxes-s.c.orig	2021-12-13 00:08:30.419393000 +0100
-+++ src/sboxes-s.c	2021-12-13 00:08:41.847880000 +0100
-@@ -32,6 +32,7 @@
- #define regs 8
- #else
- /* PowerPC with AltiVec, etc. */
-+#include <altivec.h>
- #define regs 32
- #endif
-