Date: Thu, 2 Sep 2021 07:30:21 GMT From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fc10d4ef3039 - main - editors/vim: Define CONFLICTS_INSTALL and PKGNAMESUFFIX in just one place Message-ID: <202109020730.1827ULPx095436@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc10d4ef30393c37f6a82841f77076a8fbfc4661 commit fc10d4ef30393c37f6a82841f77076a8fbfc4661 Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2021-09-02 07:27:25 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> CommitDate: 2021-09-02 07:30:13 +0000 editors/vim: Define CONFLICTS_INSTALL and PKGNAMESUFFIX in just one place Suggested by: danfe --- editors/vim/Makefile | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/editors/vim/Makefile b/editors/vim/Makefile index 5ee67ee2e4a9..b811d18014f8 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -38,30 +38,30 @@ VIM_VER= ${PORTNAME}${PORTVERSION:R:S|.||g} # FLAVORS are used to build various Vim GUIs. The default flavor (`vim') is # console-only. FLAVORS= console athena gtk2 gtk3 motif x11 tiny +# Register conflicts with all other flavors +CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:S/^/vim-/} + +.for f in ${FLAVORS:Nconsole} +${f}_PKGNAMESUFFIX= -${f} +.endfor # 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 .elif ${FLAVOR:U} == tiny -PKGNAMESUFFIX= -tiny GUI= no PLIST= ${.CURDIR}/pkg-plist-tiny -CONFLICTS_INSTALL= vim-athena vim-console vim-gtk2 vim-gtk3 vim-motif vim-x11 .elif ${FLAVOR:U} == athena -PKGNAMESUFFIX= -athena GUI= athena CONFIGURE_ARGS+=--enable-xim --enable-fontset PLIST_SUB+= GUI="" DESKTOP="@comment " USES+= xorg USE_XORG+= ice sm x11 xaw xmu xpm xt -CONFLICTS_INSTALL= vim-console vim-gtk2 vim-gtk3 vim-motif vim-tiny vim-x11 .elif ${FLAVOR:U} == gtk2 -PKGNAMESUFFIX= -gtk2 GUI= gtk2 INSTALLS_ICONS= yes CONFIGURE_ARGS+=--enable-xim --enable-fontset @@ -69,10 +69,8 @@ PLIST_SUB+= GUI="" DESKTOP="" USES+= desktop-file-utils gnome xorg USE_GNOME= gdkpixbuf2 gtk20 USE_XORG= ice sm x11 xpm xt -CONFLICTS_INSTALL= vim-athena vim-console vim-gtk3 vim-motif vim-tiny vim-x11 .elif ${FLAVOR:U} == gtk3 -PKGNAMESUFFIX= -gtk3 GUI= gtk3 INSTALLS_ICONS= yes CONFIGURE_ARGS+=--enable-xim --enable-fontset @@ -80,26 +78,21 @@ PLIST_SUB+= GUI="" DESKTOP="" USES+= desktop-file-utils gnome xorg USE_GNOME= cairo gdkpixbuf2 gtk30 USE_XORG= ice sm x11 xpm xt -CONFLICTS_INSTALL= vim-athena vim-console vim-gtk2 vim-motif vim-tiny vim-x11 .elif ${FLAVOR:U} == motif -PKGNAMESUFFIX= -motif GUI= motif CONFIGURE_ARGS+=--enable-xim --enable-fontset --with-motif=lib="${MOTIFLIB}" CONFIGURE_ENV+= MOTIFHOME=${LOCALBASE} PLIST_SUB+= GUI="" DESKTOP="@comment " USES+= motif xorg USE_XORG= ice sm x11 xmu xt -CONFLICTS_INSTALL= vim-athena vim-console vim-gtk2 vim-gtk3 vim-tiny vim-x11 .elif ${FLAVOR:U} == x11 -PKGNAMESUFFIX= -x11 GUI= no CONFIGURE_ARGS+=--enable-xim --enable-fontset --with-x PLIST_SUB+= GUI="@comment " DESKTOP="@comment " USES+= xorg USE_XORG= ice sm x11 xt -CONFLICTS_INSTALL= vim-athena vim-console vim-gtk2 vim-gtk3 vim-motif vim-tiny .endif # Options {{{1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109020730.1827ULPx095436>