From bbea3d0e6de23cf721a09fb2bc5c666aa29c6509 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Wed, 16 Jun 2021 09:00:18 +0000
Subject: [PATCH] sysutils/cbsd: fix packaging on non-x86

popcnttest is only installed on amd64 and i386.
---
 sysutils/cbsd/Makefile  | 6 ++++++
 sysutils/cbsd/pkg-plist | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index e5b5b19bb450..95c9f6b0d8c4 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -30,6 +30,12 @@ CBSD_HOME?=	${PREFIX}/cbsd
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == amd64 || ${ARCH} == i386
+PLIST_SUB=	X86=""
+.else
+PLIST_SUB=	X86="@comment "
+.endif
+
 do-install:
 	@${ECHO} "Installing in ${CBSD_HOME}"
 	${MKDIR} ${STAGEDIR}${CBSD_HOME}
diff --git a/sysutils/cbsd/pkg-plist b/sysutils/cbsd/pkg-plist
index 1d726560c67f..a91ef3b38edf 100644
--- a/sysutils/cbsd/pkg-plist
+++ b/sysutils/cbsd/pkg-plist
@@ -340,7 +340,7 @@ cbsd/misc/fmagic
 cbsd/misc/ipv6range
 cbsd/misc/next-vale-port
 cbsd/misc/nics-list
-cbsd/misc/popcnttest
+%%X86%%cbsd/misc/popcnttest
 cbsd/misc/pwcrypt
 cbsd/misc/resolv
 cbsd/misc/sipcalc