Date: Tue, 23 Nov 2021 16:33:07 -0800 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Antoine Brodin <antoine@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 54913e79322d - main - textproc/muse: fix PKGBASE collision Message-ID: <b5612c24-ffb1-ee98-786f-44da8cd7fd94@FreeBSD.org> In-Reply-To: <202111152134.1AFLYkfi008302@gitrepo.freebsd.org> References: <202111152134.1AFLYkfi008302@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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'. -- Regards, Bryan Drewery
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b5612c24-ffb1-ee98-786f-44da8cd7fd94>