git: 620f205539a4 - main - editors/vim: Flavorize and update to 8.2.3394

[Adam Weinberger]

On Thu, Sep 2, 2021 at 12:56 AM Alexey Dokuchaev <danfe at freebsd.org> wrote:

> On Thu, Sep 02, 2021 at 06:46:35AM +0000, Adam Weinberger wrote:
> > commit 620f205539a43fd8da97750d33eebdfc1e133330
> >
> >     editors/vim: Flavorize and update to 8.2.3394
> >
> >     This commit completely rewires the vim ports. It includes the
> following:
> >
> >     * `vim' is now a TUI-only package. It is what the `vim-console' port
> >       was.
> >
> >     * `vim-gtk3' includes the TUI binary (vim) and a GTk3-backed GUI. It
> is
> >       what the `vim' port was.
> >
> >     * Each GUI toolkit has a separate package. There is vim-gtk3, -gtk2,
> >       -motif, -athena, and -x11.
>
> Neat!
>
> > +# Flavors {{{1
>
> Are these `{{{1' kind of markers for easy search+jump, or they have some
> deeper meaning?
>

They're vim fold markers. Normally I wouldn't add them to a Makefile, but
it seemed appropriately meta here. If you `:set foldmethod=marker', it'll
collapse everything. `za' to toggle a fold.

> +# FLAVORS are used to build various Vim GUIs. The default flavor (`vim')
> is
> > +# console-only.
> > +FLAVORS=     console athena gtk2 gtk3 motif x11 tiny
> > +
> > +# GUI flavors
> > +.if ${FLAVOR:U} == console
> > +GUI=         no
> > +PLIST_SUB+=  GUI="@comment " DESKTOP="@comment "
> > +CONFLICTS_INSTALL=   vim-athena vim-gtk2 vim-gtk3 vim-motif vim-tiny
> vim-x11
>
> Hmm, perhaps CONFLICTS_INSTALL=${FLAVORS:N${FLAVOR}:S/^/vim-/} would be
> less error-prone?
>

Yeah, the Makefile definitely looks cleaner with those lines out.

# Adam


-- 
Adam Weinberger
adamw at adamw.org // adamw at FreeBSD.org
https://www.adamw.org