git: f7cc059367c9 - main - audio/xmcd: fix build on armv* / riscv64*

The branch main has been updated by pkubaj:

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

commit f7cc059367c9e2171189f6d12d5b899bf026ded8
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-12-23 22:18:12 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-12-23 22:18:12 +0000

    audio/xmcd: fix build on armv* / riscv64*
---
 audio/xmcd/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 3328c4c8b588..3ab64b356ee8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -9,8 +9,6 @@ MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Motif CD player
 
-BROKEN_armv6=		Fails to install: strip: xmcd/bin-FreeBSD_12-armv6/cda failed: No such file or directory
-BROKEN_armv7=		Fails to install: strip: xmcd/bin-FreeBSD_12-armv7/cda failed: No such file or directory
 BROKEN_mips64=		Fails to compile: many undefined symbols in xorg.cf
 
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
@@ -19,12 +17,12 @@ RUN_DEPENDS+=	lame:audio/lame
 
 USES=		imake motif ncurses xorg
 USE_XORG=	x11 xext xaw xmu xpm xt sm ice
-PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH:S/aarch64/arm64/:C/powerpc64.*/powerpc/} OPSYS=${OPSYS}
+PLIST_SUB+=	RELEASE=${OSREL:R:R} ARCH=${ARCH:S/aarch64/arm64/:C/armv.*/arm/:C/powerpc64.*/powerpc/:C/riscv64.*/riscv/} OPSYS=${OPSYS}
 SUB_FILES=	pkg-message
 
 CFLAGS+=	-D_WANT_SEMUN
 
-LIBBINDIR=	${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/powerpc64.*/powerpc/}
+LIBBINDIR=	${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/armv.*/arm/:C/powerpc64.*/powerpc/:C/riscv64.*/riscv/}
 
 pre-patch:
 	@${CP} ${WRKSRC}/xmcd_d/XMcd.ad ${WRKSRC}/xmcd_d/XMcd.ad.in
@@ -66,7 +64,7 @@ post-install:
 		-e 's:${STAGEDIR}::' \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/discog/discog.html \
 		${STAGEDIR}${PREFIX}/lib/X11/xmcd/config/config.sh \
-		${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/powerpc64.*/powerpc/}/README
+		${STAGEDIR}${PREFIX}/lib/X11/xmcd/bin-${OPSYS}_${OSREL:R:R}-${ARCH:S/aarch64/arm64/:C/armv.*/arm/:C/powerpc64.*/powerpc/:C/riscv64.*/riscv/}/README
 	${FIND} ${STAGEDIR}${PREFIX} -name \*.bak -delete
 	${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete