From nobody Wed Nov 24 05:23:01 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 C2DC318AA721; Wed, 24 Nov 2021 05:23:01 +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 4HzTtF383vz3rqQ; Wed, 24 Nov 2021 05:23:01 +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 4BCB624471; Wed, 24 Nov 2021 05:23:01 +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 1AO5N1A2030470; Wed, 24 Nov 2021 05:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO5N1J9030469; Wed, 24 Nov 2021 05:23:01 GMT (envelope-from git) Date: Wed, 24 Nov 2021 05:23:01 GMT Message-Id: <202111240523.1AO5N1J9030469@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 04dcdd1a96de - main - Mk/Uses/emacs.mk: Sort the default FLAVOR to be first in FLAVORS. 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04dcdd1a96de2a3c44d1d94d19d80023496eb81c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637731381; 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=L0ItROgkR5lL37ft9stHWfopttttyGOkk8pr77eDQbo=; b=x45EPGpVMgSGmi+NXjkTzN6WTViggl+1GfI5QYL4/MXHJEs5ncKFsjQtzXnRt94Hke3wTA r1YCK7IKr2MOxATafc9b1M43hrwDZw2Bp5u78yA2cyDVAyDcrYKPzre1Z3QYkfRw+JA2kd 5e0S23Ft1zol2soaHvVDMXcIOJ+UJwkx0pHjwg34mTDC01wjO7PEXisM7jU/shTe8Orfrz ExiXg3P4WVzLrQUIAhweEC/Q3kqbsZJHlEFiJ9PfTuCfaqXCEufdv9R2uMIW4DksX/TRzb JnQQKU4jHrJgF0T+YSH+Flni5Q8XRfra5ajq2eQjZddr9L6ZtyGL+28WW4Aezw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637731381; a=rsa-sha256; cv=none; b=HSCEeZ94ZWhIzt0NUV4PPAhcx1ke3bscIcVNWrbbqC7y+kwD+/CjuSvjbQNne3Zgttkjgp lWhYFvSRUKXj66QmRPiKRMGlQAJaoTz3dKO1+C6oN4IraNcM7Wab/wdjEI88CgcIg1maYZ ZCR0nj66b0dHceSEkB6321wBT0h1DSgoRaB20Q7potgKciy5Faa9yU1CVsm3WlPJzFn7le G5lZOzidNR7iRg1HwtsVBHHcByCDYVRGiEu0kVWO/aTX6eJiGFfZqwz2j48tl29Mpu2rk1 RfpLEdjsu1AlF6KmlVbsW6v6utFVite0bO9kIg5Fis8aQGs6ll+oxiZyyCJaEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=04dcdd1a96de2a3c44d1d94d19d80023496eb81c commit 04dcdd1a96de2a3c44d1d94d19d80023496eb81c Author: Bryan Drewery AuthorDate: 2021-11-24 01:59:27 +0000 Commit: Bryan Drewery CommitDate: 2021-11-24 05:22:58 +0000 Mk/Uses/emacs.mk: Sort the default FLAVOR to be first in FLAVORS. commit 9823f56764e6cf0 has more information. Poudriere expects the default to be always be first or it gets confused. --- Mk/Uses/emacs.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index 6cc2a98dcc13..a51e5ab8dccb 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -80,6 +80,10 @@ _EMACS_RUN_DEP= yes # Only set FLAVORS when... .if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) FLAVORS= full canna nox devel_full devel_nox +# Sort the default to be first +.if defined(EMACS_DEFAULT) +FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} +.endif .for flavor in ${EMACS_FLAVORS_EXCLUDE} FLAVORS:= ${FLAVORS:N${flavor}} .endfor