From nobody Wed Nov 24 00:33:07 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 16AF318A7D51; Wed, 24 Nov 2021 00:33:18 +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 4HzMRx6nPmz3HhZ; Wed, 24 Nov 2021 00:33:17 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637713998; 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=T7CTYcJOC0APGNBG0XrP97aLIRdXgiIte7QjX76cImk=; b=fxrkrL3EFtQ/EGrKIIXpz3M/ESdH3oVliWOAMG8eAlKeFlC0NLFyr8x5qGWjY6XEagy3Xz qFNSj4a1iJCZ1NI+5Zcn9baDoEytLqO7Mpw2U90EPjUmV65vQU1e0yD3Dyi3v+w4u+/VEf 1gRDbNysHZiaJVbSYnR9y8xqVC74MWdlgMOco7oBUNYqBLQruTVd3tyR0bccAHtgVXFJcb +0mg9nc1YE56Oz9F+owUAY07iTvUX8ctKNtKVcMnVpJ2oZvDkfoOSI3qHJfsocsuqdv59A gVQhOHx3N9cmRrmjvwlTM+o/3qo2EAEwuUPRTyAip6bjbu7bDiLP06zBfDnSyw== 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 C1898549C; Wed, 24 Nov 2021 00:33:17 +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 2621614E61; Tue, 23 Nov 2021 16:33:17 -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 tOBlVxV-uzEE; Tue, 23 Nov 2021 16:33:14 -0800 (PST) Message-ID: DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 2C07214E58 Date: Tue, 23 Nov 2021 16:33:07 -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 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> From: Bryan Drewery Organization: FreeBSD In-Reply-To: <202111152134.1AFLYkfi008302@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637713998; 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=T7CTYcJOC0APGNBG0XrP97aLIRdXgiIte7QjX76cImk=; b=G5YW0Rvw3hBwaCgrboSGY/zhmS8LFEoGHB5WguweVSTNDnx+9Gw7QHTp+IOTBCBTrHewCF GkYKPVMkjbKF2M1Dt3kUh7VWtK1spC/xOkVDek0GDM34jbsqNWEvWjc5Lo9KkEVQNzvngw +Pj1l6HlUEF9i+tWYRlhrxUGu1Z2tH8tLfjQpGL3J8ekSYJtO0wcMsZ41zTAVOXqjo67kD 73SGp6v8mkM3Rv68EPFgmMv/l1/w3/ZULJcznA1AYQe1IBeXxaL2TKaRaBAVlgAVjFiNfy AIN5k6z1RhEoQCc8/Mk0Q+0vAd9i0xTr1/NBMUCu+nvZkLnhRlB0spz4i3Szlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637713998; a=rsa-sha256; cv=none; b=NsMJIKyejZ9MYZskzQ9TKka+DYE1wa1lO1ROUcehurh0aEky9+WEWuRIh31AHHzdz2AK72 QKWxpIsxk99k/QJx0qPL9D+yBD0t1YsOcWceVVMMJ9ttCXGAO5vWkmt6lLkTYaJhWKT27/ /k5PaC4HsD7XxEWpD88WcPJM/y+m4DrQU2lQKkN6ozIYt1vtkzLjRrrEDWwN8BnI0GxSy9 lE63Xj47YsN+lx/35xBDYbO3Guy9pvHR7gXZ4CeLb07ZxhI35Ngbz4k9isYgwMVWDnz5vz V+RidkMIqI7LhS6kj9UpaOwOHWdmMGQQhxKtqQ3LIKsfkKApFEieh2TClPd0/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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'. -- Regards, Bryan Drewery