CVS commit: pkgsrc/editors

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Sep 16 12:43:14 UTC 2023

Modified Files:
        pkgsrc/editors: Makefile
        pkgsrc/editors/vim: DESCR Makefile
        pkgsrc/editors/vim-gtk2: Makefile
        pkgsrc/editors/vim-gtk3: Makefile
        pkgsrc/editors/vim-lang: DESCR
        pkgsrc/editors/vim-motif: Makefile
        pkgsrc/editors/vim-share: Makefile.common
Removed Files:
        pkgsrc/editors/vim-xaw: DESCR Makefile PLIST

Log Message:
editors/vim-xaw: remove, because upstream removed Athena GUI support

in Vim 8.2.4677 of Sun Apr 3 18:02:37 2022 +0100.


To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 pkgsrc/editors/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/vim/DESCR
cvs rdiff -u -r1.79 -r1.80 pkgsrc/editors/vim/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/editors/vim-gtk2/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/vim-gtk3/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/vim-lang/DESCR
cvs rdiff -u -r1.42 -r1.43 pkgsrc/editors/vim-motif/Makefile
cvs rdiff -u -r1.166 -r1.167 pkgsrc/editors/vim-share/Makefile.common
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/vim-xaw/DESCR
cvs rdiff -u -r1.65 -r0 pkgsrc/editors/vim-xaw/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/vim-xaw/PLIST

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

Modified files:

Index: pkgsrc/editors/Makefile
diff -u pkgsrc/editors/Makefile:1.238 pkgsrc/editors/Makefile:1.239
--- pkgsrc/editors/Makefile:1.238       Wed Aug 30 20:18:52 2023
+++ pkgsrc/editors/Makefile     Sat Sep 16 12:43:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2023/08/30 20:18:52 gdt Exp $
+# $NetBSD: Makefile,v 1.239 2023/09/16 12:43:13 rhialto Exp $
 #
 
 COMMENT=       Text and binary editors
@@ -177,7 +177,6 @@ SUBDIR+=    vim-gtk3
 SUBDIR+=       vim-lang
 SUBDIR+=       vim-motif
 SUBDIR+=       vim-share
-SUBDIR+=       vim-xaw
 SUBDIR+=       wily
 SUBDIR+=       xcoral
 SUBDIR+=       xemacs

Index: pkgsrc/editors/vim/DESCR
diff -u pkgsrc/editors/vim/DESCR:1.3 pkgsrc/editors/vim/DESCR:1.4
--- pkgsrc/editors/vim/DESCR:1.3        Tue Oct 30 22:39:07 2012
+++ pkgsrc/editors/vim/DESCR    Sat Sep 16 12:43:13 2023
@@ -6,5 +6,5 @@ If you are building the package from sou
 features such as a perl or python interpreter which are not enabled by
 default.
 
-This version does not contain a gui. If you want one, look at vim-xaw, vim-gtk,
-vim-gtk2 or vim-motif.
+This version does not contain a gui. If you want one, look at vim-gtk2,
+vim-gtk3 or vim-motif.

Index: pkgsrc/editors/vim/Makefile
diff -u pkgsrc/editors/vim/Makefile:1.79 pkgsrc/editors/vim/Makefile:1.80
--- pkgsrc/editors/vim/Makefile:1.79    Mon Jan 10 20:55:32 2022
+++ pkgsrc/editors/vim/Makefile Sat Sep 16 12:43:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2022/01/10 20:55:32 morr Exp $
+# $NetBSD: Makefile,v 1.80 2023/09/16 12:43:13 rhialto Exp $
 
 PKGNAME=               vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -8,8 +8,7 @@ COMMENT=                Vim editor (vi clone) without 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
 
-CONFLICTS+=            vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=            vim-gtk2-[0-9]* vim-gtk3-[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.104 pkgsrc/editors/vim-gtk2/Makefile:1.105
--- pkgsrc/editors/vim-gtk2/Makefile:1.104      Fri Jun  2 15:30:09 2023
+++ pkgsrc/editors/vim-gtk2/Makefile    Sat Sep 16 12:43:13 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2023/06/02 15:30:09 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2023/09/16 12:43:13 rhialto Exp $
 
 PKGNAME=       vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -10,8 +10,7 @@ PKG_SUPPORTED_OPTIONS+=       gnome
 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
-CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk3-[0-9]* vim-motif-[0-9]*
 
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}
 

Index: pkgsrc/editors/vim-gtk3/Makefile
diff -u pkgsrc/editors/vim-gtk3/Makefile:1.29 pkgsrc/editors/vim-gtk3/Makefile:1.30
--- pkgsrc/editors/vim-gtk3/Makefile:1.29       Fri Jun  2 15:30:10 2023
+++ pkgsrc/editors/vim-gtk3/Makefile    Sat Sep 16 12:43:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/06/02 15:30:10 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2023/09/16 12:43:14 rhialto Exp $
 
 PKGNAME=       vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -10,8 +10,7 @@ PKG_SUPPORTED_OPTIONS+=       gnome
 
 
 DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../../editors/vim-share
-CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}
 

Index: pkgsrc/editors/vim-lang/DESCR
diff -u pkgsrc/editors/vim-lang/DESCR:1.2 pkgsrc/editors/vim-lang/DESCR:1.3
--- pkgsrc/editors/vim-lang/DESCR:1.2   Tue Oct 30 22:39:07 2012
+++ pkgsrc/editors/vim-lang/DESCR       Sat Sep 16 12:43:14 2023
@@ -3,5 +3,5 @@ have been added: multi level undo, synta
 on-line help, filename completion, block operations, etc.
 
 This package is only a shared data-package for the `actual' vim packages.
-You also have to install one of vim, vim-xaw, vim-gtk, vim-gtk2 or vim-motif
+You also have to install one of vim, vim-gtk2, vim-gtk3 or vim-motif
 to get a working editor.

Index: pkgsrc/editors/vim-motif/Makefile
diff -u pkgsrc/editors/vim-motif/Makefile:1.42 pkgsrc/editors/vim-motif/Makefile:1.43
--- pkgsrc/editors/vim-motif/Makefile:1.42      Wed Jul 27 15:13:10 2022
+++ pkgsrc/editors/vim-motif/Makefile   Sat Sep 16 12:43:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2022/07/27 15:13:10 khorben Exp $
+# $NetBSD: Makefile,v 1.43 2023/09/16 12:43:14 rhialto Exp $
 
 PKGNAME=               vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 
@@ -7,8 +7,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-gtk-[0-9]* vim-gtk2-[0-9]*
-CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
+CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-gtk3-[0-9]*
 
 CONFIGURE_ARGS+=       --enable-gui=motif
 CONFIGURE_ARGS+=       --with-tlib=${BUILDLINK_LIBNAME.termcap}

Index: pkgsrc/editors/vim-share/Makefile.common
diff -u pkgsrc/editors/vim-share/Makefile.common:1.166 pkgsrc/editors/vim-share/Makefile.common:1.167
--- pkgsrc/editors/vim-share/Makefile.common:1.166      Fri Nov 26 12:05:32 2021
+++ pkgsrc/editors/vim-share/Makefile.common    Sat Sep 16 12:43:14 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.166 2021/11/26 12:05:32 wiz Exp $
+# $NetBSD: Makefile.common,v 1.167 2023/09/16 12:43:14 rhialto Exp $
 # used by editors/vim/Makefile
 # used by editors/vim-gtk2/Makefile
 # used by editors/vim-gtk3/Makefile
 # used by editors/vim-lang/Makefile
 # used by editors/vim-motif/Makefile
-# used by editors/vim-xaw/Makefile
 
 .include "../../editors/vim-share/version.mk"
 
@@ -23,8 +22,6 @@ MAINTAINER=           morr%NetBSD.org@localhost
 HOMEPAGE=              https://www.vim.org/
 LICENSE=               vim-license OR gnu-gpl-v2
 
-CONFLICTS+=            vim-kde-[0-9]*
-
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=         yes
 USE_LANGUAGES+=                c99