From nobody Thu Dec 23 08:35:15 2021 X-Original-To: dev-commits-ports-branches@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 2A427190A568; Thu, 23 Dec 2021 08:35:16 +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 4JKNmg4SDyz3J4m; Thu, 23 Dec 2021 08:35:15 +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 78BE25727; Thu, 23 Dec 2021 08:35:15 +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 1BN8ZF78097415; Thu, 23 Dec 2021 08:35:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BN8ZFYc097414; Thu, 23 Dec 2021 08:35:15 GMT (envelope-from git) Date: Thu, 23 Dec 2021 08:35:15 GMT Message-Id: <202112230835.1BN8ZFYc097414@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Gleb Popov Subject: git: afaa20a0dca2 - 2021Q4 - x11-wm/enlightenment: Enable build of armv{6,7}. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: afaa20a0dca20e911866488d285783a4e757dced Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640248515; 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=4uJgQk2J0LfAeaQUiSzrM+cl7cQ7w6yA9RbkpmOlKPE=; b=OoeJSheu0W9VKoKu+5MJ9KNfS8yV9l6tguA3fpBUCKFEouN6l1zHe7eM8PF+ZsJOMK2z/f AXOfogZrl2R736L2egqXNloC5Ht8ur8ndPoflfw+Tm4z64bKyFK8v4iaTo84IA8/Br5s8P mgYmt6gHIoPVf0981og0KcOCRGR6GNpbAGHhDRoTSkc4J1ndnKa4665Vva6DGcYjbVVkGn Cf44TOpB4sWSILyt11SG3goS+H8uEZMKec89B+kYhROmhN5vcZOfr9htq2ygZDj9iTt0d4 4v0meaKakolo5/vWEc6qsseCBLDcR7e/y7Pg//Bhp7IuFopKtqXBWNQNG0N/xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640248515; a=rsa-sha256; cv=none; b=sq9dBBvFtmi0Qkb8hkbOsoptXjhMkrFOZSduk3mSXUJvEGsw3eOLZ6QMDo9OqkUqVl1q4T 8QYwcMhGCPYrfJKe26rUSTzdZ4YoDdUNjU93cSelyhQTq2fd3I8MOT+F6DQ0YkLpaWS/2K mKLr9ESe0+CJDnqDVay0HrXp5xM2U1aoG42IdDvBH0Vomo3Bca7gvDD4HobZWmyoZTB/fY bG8/4qR/J4fUQP0jzaQ144FQ/hRomw7rCbFFwJvmgnbmKWTJnLZ+apy6romXsBtoxMCDff eCM5XO+6Ez1Ba0eQdnYF/e5GnKA/zBt4ns+3H1LjySfYYjFYOFzCkEg/pKJGnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=afaa20a0dca20e911866488d285783a4e757dced commit afaa20a0dca20e911866488d285783a4e757dced Author: Robert Clausecker AuthorDate: 2021-12-23 08:27:11 +0000 Commit: Gleb Popov CommitDate: 2021-12-23 08:35:07 +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 (cherry picked from commit db6a71f02193b7021526f17b687719133c5c1672) --- 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 6a6144d5df2d..df744a7429ea 100644 --- a/x11-wm/enlightenment/Makefile +++ b/x11-wm/enlightenment/Makefile @@ -38,21 +38,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}