Re: git: 54913e79322d - main - textproc/muse: fix PKGBASE collision

From: Bryan Drewery <bdrewery_at_FreeBSD.org>
Date: Wed, 24 Nov 2021 00:37:14 UTC 
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 <antoine@FreeBSD.org>
>> AuthorDate: 2021-11-15 21:34:16 +0000
>> Commit:     Antoine Brodin <antoine@FreeBSD.org>
>> 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