From nobody Wed Nov 24 00:37:14 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 9DF4418AB2D2; Wed, 24 Nov 2021 00:37:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HzMXb3nxbz3KvW; Wed, 24 Nov 2021 00:37:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637714239; 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: in-reply-to:in-reply-to:references:references; bh=PR+/trjRjQRwws59pmvjjfmoBYSug+DnJZA7wa3bXmM=; b=MRm/vEmydUCCftzBnk5je15s8/wUt7F2rzXTsLzaVB0a0Nke/HhIQR1XsHQedru+m9LLYc 4ol6Swtilbe7+qW0ZEJwlB7D9ultB7Glx3u+auRq3JA/lY/uDxzCwRTy0rDEf0tNajp10W OadPQr7xi7XBv11KZ7BFgdgV47tv5oXoKR3lXIha3QvlyTQIFdRW1hCo6VnaCZ7jK4xXVT 5QB2jd5ZG2fCq+EIbTguu5IRhvSP28N3Inzl7OzTjjALJvjGD/sFi93KMfoaNnVFq9dzkj X+TBDPl/ljd3tyombItxN3lwmYPFzyY21YwIX8VqWdUe7Q5IOBKvXBDE3NWHkA== Received: from mail.xzibition.com (unknown [127.0.1.132]) (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 freefall.freebsd.org (Postfix) with ESMTPS id 5693D552B; Wed, 24 Nov 2021 00:37:19 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 71BFB14E8A; Tue, 23 Nov 2021 16:37:18 -0800 (PST) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id WVRrVsvgRHg2; Tue, 23 Nov 2021 16:37:15 -0800 (PST) Message-ID: <9bc93c2c-f664-345e-5566-d9869ab5d5cf@FreeBSD.org> DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 8106A14E83 Date: Tue, 23 Nov 2021 16:37:14 -0800 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: Re: git: 54913e79322d - main - textproc/muse: fix PKGBASE collision Content-Language: en-US From: Bryan Drewery To: Antoine Brodin , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202111152134.1AFLYkfi008302@gitrepo.freebsd.org> Organization: FreeBSD In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637714239; 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: in-reply-to:in-reply-to:references:references; bh=PR+/trjRjQRwws59pmvjjfmoBYSug+DnJZA7wa3bXmM=; b=Z0hE764yqEut3klXcgL+fnI21e0mh7l2qPF5Ro736xlfvi9+YUiUFhNVWmbTeVVdvYeaZq uD8a5BHr5Db3yDjFmfMxmVkzCilgcZvi8A4Oo/ekNy0espaMTZXWN5EmFqWrt5my/skM9R tAFwd02n1TesKcQtiMpnnGCxM041WIFVfkmlADoBlr0lyaR0QDf/dqEI+ewwsEq67Y5LId 5x2sq3kOecMyDG9foStPYB+n3Q8p3OgWu2DKcWNPv188YVWfR5gcsHWqddiivkdM914rZw eKGcrsYGGsjHOGIPYjFBU/haHoWrr3wYan32Dkd4Z+BxkLJIaOimP7O66RZbeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637714239; a=rsa-sha256; cv=none; b=Rz1tulJfTaBBnTgRAituGMQuu29pRHFgk4gmhQNAViRyIS9xc3JKE3zqB4+FU5qKWSWI2x ZvUU9OIMMKcs5bj2jQ0skgLp7aSfTliQf96ugjq2lFjXEksDYIsBHalqpl0TzizPNYqNQ9 PdwEgFghxNrM9bdzxp1ku4UU/AZhTcmn2QT9caP3U8GlivnCOHJUe3ioK5dAKokh6ZDfK0 BOAPlMcehCCL9Foi3p9OTnC8sY8HixU9MbDDtJAzsAuCEHNOiUD9rxXnZg8CsYcvWhhA4H OgMLUm2oWxVfAe5upvMbVmUY0YgC7F5lzQvD1mt0TNK/jnFWv6RIkMdOHtPw4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 11/23/21 4:33 PM, Bryan Drewery wrote: > On 11/15/21 1:34 PM, Antoine Brodin wrote: >> The branch main has been updated by antoine: >> >> URL: >> https://cgit.FreeBSD.org/ports/commit/?id=54913e79322dd4ac07693a340954d1acc2627061 >> >> >> commit 54913e79322dd4ac07693a340954d1acc2627061 >> Author:     Antoine Brodin >> AuthorDate: 2021-11-15 21:34:16 +0000 >> Commit:     Antoine Brodin >> CommitDate: 2021-11-15 21:34:16 +0000 >> >>      textproc/muse: fix PKGBASE collision >> --- >>   textproc/muse/Makefile | 4 ++++ >>   1 file changed, 4 insertions(+) >> >> diff --git a/textproc/muse/Makefile b/textproc/muse/Makefile >> index 4a348db4e1f6..8b9bb4c7174d 100644 >> --- a/textproc/muse/Makefile >> +++ b/textproc/muse/Makefile >> @@ -23,6 +23,10 @@ PORTDOCS=    AUTHORS ChangeLog ChangeLog.1 >> ChangeLog.2 ChangeLog.3 NEWS \ >>   OPTIONS_DEFINE=    DOCS >> +.if ${FLAVOR:Ufull:Mfull} >> +PKGNAMESUFFIX=    -emacs >> +.endif >> + >>   post-install: >>       @${MKDIR} ${STAGEDIR}${LISPDIR}/contrib >>       (cd ${WRKSRC} && ${COPYTREE_SHARE} contrib  ${STAGEDIR}${LISPDIR}) >> > > Looks to be wrong still. > > # make -V PKGNAME -V FLAVOR > muse-emacs-3.20_19 > nox > ^^ > > # make -V PKGNAME -V FLAVOR FLAVOR=nox > muse-emacs_nox-3.20_19 > nox > # make -V PKGNAME -V FLAVOR FLAVOR=full > muse-emacs-3.20_19 > full > > > The first FLAVOR should really be whatever owns 'muse-emacs'. > Mmm missing context: /etc/make.conf:DEFAULT_VERSIONS+=emacs=nox Ignore my emails for now. Not sure yet why Poudriere does not like this. -- Regards, Bryan Drewery