From nobody Thu Dec 23 22:20:22 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 75F041907DC4; Thu, 23 Dec 2021 22:20:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JKl4l3t6Dz4sBR; Thu, 23 Dec 2021 22:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0076D18B23; Thu, 23 Dec 2021 22:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BNMKMDw000439; Thu, 23 Dec 2021 22:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BNMKMv7000438; Thu, 23 Dec 2021 22:20:22 GMT (envelope-from git) Date: Thu, 23 Dec 2021 22:20:22 GMT Message-Id: <202112232220.1BNMKMv7000438@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f7cc059367c9 - main - audio/xmcd: fix build on armv* / riscv64* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7cc059367c9e2171189f6d12d5b899bf026ded8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640298024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWulYIP4ZsVA4DTrMOBLVOanVEv/JXIB3RukcC6nv+g=; b=quhcPb8MFm0FIle3f4fQx0kbrzpxBnWGanYaCC0vLotUimCEK1RJgC/iOPKnh3ii72jnvg bwKveohrbiknFx0QsL3B0vxc9onFsv0RNNhHAB0c3P+jnqkSbZ77XqsXGscSljlgJbIWbQ vyUOrVSee0m9S28KPSNJiuh9BI545xQTpwDA/yQJdsnCDWDg/acZjfoGcGiAIIBv/aH980 uf4FUjXQVEUDEYMe4+wCtdeRaLLjDhIMYVR/dRpT/5D9uovF0QtqS5Ng3+GaCyCHYdiwLx hqbAqiQSJChQcoBfYpF94s8/cOotd/zcRQR4SAUU5JpuSUyvzW6TYfN5GAhxaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640298024; a=rsa-sha256; cv=none; b=S8P9ChUG5p4eR9CAlwJLMPhg3TExxxH5kNosPB7VFm2Glg4RmIpJ5Bn8b7VjUL4L+nJhFm 8bdlPcZkvoW0CQW2OsGSA+BfoOZLvUmH3zRs/j/pPX81VCMpBrCuiXUnMNSHc+gG3KXsk2 u4bXAHr2Yjs1rNG5++rKgPXUNCL010j/KTnWI+K0BjeCEde6FrhvixiXcuOGGdV0U3Sx70 fohQoUqyAUMuvAy2tc1a2mDtt2/GX3g4hgYWf4Z9EpznYbR0WwItaRfF+HvWFXjJ0kceGE cPK/5w7dky2IdC4/iIXAQt2A4k5IFAFS1mPaAiyJ7y7RgBjlkY4wgs8bl5cKgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7cc059367c9e2171189f6d12d5b899bf026ded8 commit f7cc059367c9e2171189f6d12d5b899bf026ded8 Author: Piotr Kubaj AuthorDate: 2021-12-23 22:18:12 +0000 Commit: Piotr Kubaj 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