From nobody Wed Nov 24 00:41:01 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 AB69818ABD10; Wed, 24 Nov 2021 00:41:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4HzMcy491Bz3Lh2; Wed, 24 Nov 2021 00:41:06 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637714466; 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=YB0ZKCaFzmfCkVAuDRMw/CSmgiaAfB8TWjpjIOPDMSM=; b=W6nWv6cDwqVNIgPTPaA11Mc2crkSvlhU/FNgLn2ADu89IhsuUujZYZJmyTFGfLyODW8xTr bTzV9Wf7sodCIt0Oq1cLtLv/VOds3aOjFFymUomi8HexERkMx/we5Z5YrIyQmcgp4N3AGu vPui6u6N7w42wu3QSmDuz9jrjBY72RMMRUnx5zxQrdOFZ4mBR5wXdj7cmQ2Hcset4IM7vw rdtVTH66M0KS6rDPpYAx24UbHVOMe8yS3EEdsoDDF2fGH6htMbI+g7kwWNOvThIo+sKGjh KBuferVnLcPLi+ZZPxiwpuXMtz7tFjB/UHuOmGMo+YSHgk1iLA4KrY2oyXOnCA== 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)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 5B7345685; Wed, 24 Nov 2021 00:41:06 +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 AD61114EAA; Tue, 23 Nov 2021 16:41:05 -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 nLHg0O8JFSuW; Tue, 23 Nov 2021 16:41:02 -0800 (PST) Message-ID: DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 977D714EA3 Date: Tue, 23 Nov 2021 16:41:01 -0800 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 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> <9bc93c2c-f664-345e-5566-d9869ab5d5cf@FreeBSD.org> Organization: FreeBSD In-Reply-To: <9bc93c2c-f664-345e-5566-d9869ab5d5cf@FreeBSD.org> 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=1637714466; 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=YB0ZKCaFzmfCkVAuDRMw/CSmgiaAfB8TWjpjIOPDMSM=; b=NVg3G9IUu16EETQS1XBEKs7eeu5frVctozX+3cl19ETutZR2waH7GPGhRBHZU9OT0xzUnn CWVhJegAYKkxGWdtVc0jY+rq7ZRoQ/o1yzn0bVao4S1kjdLljxarzVOFnw5hxf4jWctPPa MXB4e4DmKsIh5B+YtxHV8CWu5wqzCgEzJ5Ej3owr2Aq2rIK49AkSMMTROmyVAJgEaqekmO 0Cz0Q2wXIiUg/cSK4jqAjjukdMwrF++sI13whCPJUe5jU9Ivflf1CIFm8SUixWm0QRitml zGvIUJlSGKGTo4+yq9SUy5v1Spe7WXhCTCZ8U9zyheJgRbTbdSlxmLtbuBmcTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637714466; a=rsa-sha256; cv=none; b=jF501drsufIBEznFdr2K+4yO5PzlBOMdClAPTRjbi6TFK7yFY1gmJvD5Vql/lWJcxCZw4m 6VrqKnxRAbEFI1s69a2EVQtVsnonJ3DE7SNwwfMge25M0F/54z3VH4ndipZAeYnPqxB/xU J85Gsy2htodYIQpCAffzxcgdsl09YeaeS28c/pKFnr8CMb+/ziq+qodLAozj1KnE+y8RzD pIkr2tngTRm+zp+I5vkBzJa8kN8FIkFMZVyqtVmNOM94jqp3WQWbY1jXxlLn5TzDU4ldL9 KDsMK0qp6Al0ouDoOGyKqs2e9+WvhXEhShbqPxzO4cm7v45cGNhOhRE1eqzugA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 11/23/21 4:37 PM, Bryan Drewery wrote: > 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. > > I think we want this so the default FLAVOR is picked up. diff --git textproc/muse/Makefile textproc/muse/Makefile index 8b9bb4c7174d..4389ae789a55 100644 --- textproc/muse/Makefile +++ textproc/muse/Makefile @@ -23,6 +23,8 @@ PORTDOCS= AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 NEWS \ OPTIONS_DEFINE= DOCS +.include + .if ${FLAVOR:Ufull:Mfull} PKGNAMESUFFIX= -emacs .endif -- Regards, Bryan Drewery