From 77e0ffe440472ff9654ae3b3c55d6eb2dfe1e4bb Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Tue, 13 Oct 2020 12:40:42 +0000
Subject: [PATCH] security/nss: fix build on powerpc64le

Change if condition to also catch anything after 64 (e.g. "le", as in powerpc64le). Currently ARCH needs to end with 64.

While here, disable VSX option for powerpc64le. All powerpc64le systems are VSX-compatible anyway.
---
 security/nss/Makefile                        | 3 +--
 security/nss/files/patch-coreconf_FreeBSD.mk | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/security/nss/Makefile b/security/nss/Makefile
index c81930733409..2b83d879a140 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -47,7 +47,6 @@ INSTALL_BINS=	certutil cmsutil crlutil derdump makepqg \
 OPTIONS_DEFINE=	DEBUG
 OPTIONS_DEFINE_powerpc=		VSX
 OPTIONS_DEFINE_powerpc64=	VSX
-OPTIONS_DEFINE_powerpc64le=	VSX
 
 VSX_CFLAGS=	-DUSE_PPC_CRYPTO
 VSX_DESC=	Use VSX optimized routines (POWER8 or newer)
@@ -61,7 +60,7 @@ BINS=		${DIST}/${OPSYS}${OSREL}_OPT.OBJ
 BINS=		${DIST}/${OPSYS}${OSREL}_DBG.OBJ
 .endif
 
-.if ${ARCH:Mpowerpc64*} || ${ARCH} == powerpc
+.if ${ARCH} == powerpc64 || ${ARCH} == powerpc
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}${PPC_ABI:tl}-lib_freebl_scripts_gen.sh
 USES+=		compiler:c++11-lang # -mcrypto -mvsx
 .if ! ${PORT_OPTIONS:MVSX}
diff --git a/security/nss/files/patch-coreconf_FreeBSD.mk b/security/nss/files/patch-coreconf_FreeBSD.mk
index 16badb8b7caf..73ddd22aeb81 100644
--- a/security/nss/files/patch-coreconf_FreeBSD.mk
+++ b/security/nss/files/patch-coreconf_FreeBSD.mk
@@ -24,7 +24,7 @@
 +CPU_ARCH		= ppc
 +endif
  
-+ifneq (,$(filter %64, $(OS_TEST)))
++ifneq (,$(findstring 64,$(OS_TEST)))
 +USE_64			= 1
 +endif
 +