CVS commit: pkgsrc/editors

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jun 13 15:49:54 UTC 2026

Modified Files:
        pkgsrc/editors/vim: Makefile
        pkgsrc/editors/vim-gtk2: Makefile
        pkgsrc/editors/vim-gtk3: Makefile
        pkgsrc/editors/vim-motif: Makefile

Log Message:
vim*: add CONFLICT with vim-gtk4


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/editors/vim/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/editors/vim-gtk2/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/editors/vim-gtk3/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/editors/vim-motif/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/vim/Makefile
diff -u pkgsrc/editors/vim/Makefile:1.81 pkgsrc/editors/vim/Makefile:1.82
--- pkgsrc/editors/vim/Makefile:1.81    Tue Apr 28 12:11:52 2026
+++ pkgsrc/editors/vim/Makefile Sat Jun 13 15:49:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2026/04/28 12:11:52 morr Exp $
+# $NetBSD: Makefile,v 1.82 2026/06/13 15:49:54 wiz Exp $
 
 PKGNAME=               vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -8,7 +8,7 @@ COMMENT=                Vim editor (vi clone) without 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
-CONFLICTS+=            vim-gtk2-[0-9]* vim-gtk3-[0-9]* vim-motif-[0-9]*
+CONFLICTS+=            vim-gtk2-[0-9]* vim-gtk3-[0-9]* vim-gtk4-[0-9]* vim-motif-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-gui=no --without-x
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}

Index: pkgsrc/editors/vim-gtk2/Makefile
diff -u pkgsrc/editors/vim-gtk2/Makefile:1.120 pkgsrc/editors/vim-gtk2/Makefile:1.121
--- pkgsrc/editors/vim-gtk2/Makefile:1.120      Tue Jan 27 08:39:22 2026
+++ pkgsrc/editors/vim-gtk2/Makefile    Sat Jun 13 15:49:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2026/01/27 08:39:22 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2026/06/13 15:49:54 wiz Exp $
 
 PKGNAME=       vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
 PKGREVISION=   8
@@ -9,7 +9,7 @@ COMMENT=        Vim editor (vi clone) with X11 
 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
-CONFLICTS+=            vim-[0-9]* vim-gtk3-[0-9]* vim-motif-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk3-[0-9]* vim-gtk4-[0-9]* vim-motif-[0-9]*
 
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}
 CONFIGURE_ARGS+=       --enable-gui=gtk2

Index: pkgsrc/editors/vim-gtk3/Makefile
diff -u pkgsrc/editors/vim-gtk3/Makefile:1.44 pkgsrc/editors/vim-gtk3/Makefile:1.45
--- pkgsrc/editors/vim-gtk3/Makefile:1.44       Thu Jun 11 07:16:55 2026
+++ pkgsrc/editors/vim-gtk3/Makefile    Sat Jun 13 15:49:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2026/06/11 07:16:55 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2026/06/13 15:49:54 wiz Exp $
 
 PKGNAME=       vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
 PKGREVISION=   10
@@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS+=       gnome
 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
-CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-gtk4-[0-9]* vim-motif-[0-9]*
 
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}
 

Index: pkgsrc/editors/vim-motif/Makefile
diff -u pkgsrc/editors/vim-motif/Makefile:1.45 pkgsrc/editors/vim-motif/Makefile:1.46
--- pkgsrc/editors/vim-motif/Makefile:1.45      Thu Feb 29 19:37:26 2024
+++ pkgsrc/editors/vim-motif/Makefile   Sat Jun 13 15:49:54 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2024/02/29 19:37:26 bsiegert Exp $
+# $NetBSD: Makefile,v 1.46 2026/06/13 15:49:54 wiz Exp $
 
 PKGNAME=               vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 PKGREVISION=           1
@@ -8,7 +8,7 @@ COMMENT=                Vim editor (vi clone) with X11
 .include               "../../editors/vim-share/Makefile.common"
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
-CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-gtk3-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-gtk3-[0-9]* vim-gtk4-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-gui=motif
 CONFIGURE_ARGS+=       GUI_INC_LOC=-I${MOTIFBASE:Q}/include