From nobody Thu Dec 23 08:34:10 2021 X-Original-To: dev-commits-ports-all@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 0656A190A1D3; Thu, 23 Dec 2021 08:34:11 +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 4JKNlQ5FGkz3HtZ; Thu, 23 Dec 2021 08:34:10 +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 9486055BA; Thu, 23 Dec 2021 08:34:10 +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 1BN8YAXc097078; Thu, 23 Dec 2021 08:34:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BN8YAZK097077; Thu, 23 Dec 2021 08:34:10 GMT (envelope-from git) Date: Thu, 23 Dec 2021 08:34:10 GMT Message-Id: <202112230834.1BN8YAZK097077@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: db6a71f02193 - main - x11-wm/enlightenment: Enable build of armv{6,7}. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db6a71f02193b7021526f17b687719133c5c1672 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640248450; 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=LrFBCm75ddyewrHb28Ab8y7cpLrIeQcx73f5wKZBCe0=; b=vsPWzWIDJZEKHIN1CrKCxW63OHBPFv5pdLFkfZCElhMQaH3WnwDXI7nOrsukxCuq+lW9sX ktVQ3hYUDlosQOhHw25UYnJKlQDLX6Z4LIgPpF4QKeol6M/Mnenjtbs2IqE/iRHtmeLfF+ l6/4hv+sSvI3VPFPRB2yk0Q6B+k8IQqYoO7yuevean2P94cExYBbR16HesVWQK3c36bWIH lL9pdeJVo947LIrDq90IKxPit4lPpj9FccH8po4+jx7xo4psgxpszhHu6dJw6WzT7U+ZGN nq9rhhxisgeoT0bmLPDp2agKzY23LcOiVXMkCO56n6tkIWVPcudFmwtIgQ4JnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640248450; a=rsa-sha256; cv=none; b=X860BW7KTktdcjASDRMDc+4ruoGH4G1Qigm4HHAkmFn2Y28mhMLFXtyHC/WkmpG73DQLF/ LBfMqlTr3/FalpTjmNnLpWWtT3KnzP0yqB+PqbkTzzhxii8MdxGLdXnHXUAwmJ1psxCpim BGDLc8neCCIdTxo9/p4hTSLT0ka9mekqqxlUO9Qw2Fewm+xE2/rjzxdGBm1TwNaMhkGzin DqV/KNqSKc56EfroA+BuJ3BVdTyeLS11M00v1aiHqqBZ8tQPkz1TImMoa8AKtWNrWEny5O urt5cegZA4/jnT4lLf5bLp5gJT38M+kxiY40QpV4JFJ5qqwe8fmRRPfd9jNRWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=db6a71f02193b7021526f17b687719133c5c1672 commit db6a71f02193b7021526f17b687719133c5c1672 Author: Robert Clausecker AuthorDate: 2021-12-23 08:27:11 +0000 Commit: Gleb Popov CommitDate: 2021-12-23 08:33:50 +0000 x11-wm/enlightenment: Enable build of armv{6,7}. While there, turn a bunch of `.else .if` blocks into `.elif`s. PR: 260543 Reported by: Peter TKATCHENKO --- x11-wm/enlightenment/Makefile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile index a8647896b8a6..7fa9f49d0886 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -36,21 +36,17 @@ NLS_MESON_TRUE= nls CURRENT_ARCH= ${ARCH} .if ${CURRENT_ARCH} == amd64 ENLIGHTENMENT_ARCH= ${OPSYS:tl}-x86_64 -.else -.if ${CURRENT_ARCH} == i386 +.elif ${CURRENT_ARCH} == i386 ENLIGHTENMENT_ARCH= ${OPSYS:tl}-x86 -.else -.if ${CURRENT_ARCH:Mpowerpc64*} +.elif ${CURRENT_ARCH:Mpowerpc64*} ENLIGHTENMENT_ARCH= ${OPSYS:tl}-ppc64 -.else -.if ${CURRENT_ARCH} == powerpc +.elif ${CURRENT_ARCH} == powerpc ENLIGHTENMENT_ARCH= ${OPSYS:tl}-ppc +.elif ${CURRENT_ARCH:Marmv?} +ENLIGHTENMENT_ARCH= ${OPSYS:tl}-arm .else ENLIGHTENMENT_ARCH= ${OPSYS:tl}-${CURRENT_ARCH} .endif -.endif -.endif -.endif ENLIGHTENMENT_VERSION= 0.24.2 PLIST_SUB= ENLIGHTENMENT_ARCH=${ENLIGHTENMENT_ARCH}-${ENLIGHTENMENT_VERSION}