[pkgsrc/trunk]: pkgsrc/editors Apply patch to recognize NetBSD specific files...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b25afdcd095
branches:  trunk
changeset: 494637:7b25afdcd095
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu May 26 20:09:35 2005 +0000

description:
Apply patch to recognize NetBSD specific filesystems in fstab.  Provided
by Geert Hendrickx in tech-pkg@.

Bump PKGREVISION to 1 (and adjust DEPENDS lines in vim* to allow revisions).

diffstat:

 editors/vim-gtk/Makefile           |   5 +++--
 editors/vim-gtk2/Makefile          |   5 +++--
 editors/vim-motif/Makefile         |   5 +++--
 editors/vim-share/Makefile         |   3 ++-
 editors/vim-share/distinfo         |   3 ++-
 editors/vim-share/patches/patch-ab |  13 +++++++++++++
 editors/vim-xaw/Makefile           |   5 +++--
 editors/vim/Makefile               |   5 +++--
 8 files changed, 32 insertions(+), 12 deletions(-)

diffs (140 lines):

diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-gtk/Makefile
--- a/editors/vim-gtk/Makefile  Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-gtk/Makefile  Thu May 26 20:09:35 2005 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.46 2005/03/15 09:07:29 martti Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 COMMENT=               Vim editor (vi clone) with X11 GTK+ GUI
 
 .include               "../vim-share/Makefile.common"
 
-DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
+DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-gtk2/Makefile
--- a/editors/vim-gtk2/Makefile Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-gtk2/Makefile Thu May 26 20:09:35 2005 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2005/03/15 09:07:29 martti Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 COMMENT=               Vim editor (vi clone) with X11 GTK2 GUI
 
 .include               "../vim-share/Makefile.common"
 
-DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
+DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-motif/Makefile
--- a/editors/vim-motif/Makefile        Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-motif/Makefile        Thu May 26 20:09:35 2005 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2005/03/15 09:07:29 martti Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 COMMENT=               Vim editor (vi clone) with X11 Motif GUI
 
 .include               "../vim-share/Makefile.common"
 
-DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
+DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*
 
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-share/Makefile
--- a/editors/vim-share/Makefile        Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-share/Makefile        Thu May 26 20:09:35 2005 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/01/25 13:48:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 COMMENT=               Data files for the vim editor (vi clone)
 
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-share/distinfo
--- a/editors/vim-share/distinfo        Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-share/distinfo        Thu May 26 20:09:35 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2005/05/16 13:39:04 martti Exp $
+$NetBSD: distinfo,v 1.34 2005/05/26 20:09:35 jmmv Exp $
 
 SHA1 (vim/vim-6.3.tar.bz2) = 76f663277140d314ecfafecb0307e832bdbbaf06
 RMD160 (vim/vim-6.3.tar.bz2) = 321c59d62f6fce99396be33875ec5a7d84944525
@@ -187,5 +187,6 @@
 RMD160 (vim/6.3.071) = 77eebeb49892a2595ebd87e532a524bf0ce1f112
 Size (vim/6.3.071) = 1722 bytes
 SHA1 (patch-aa) = 226983cd130c91de83f46baa38d18b243bd029c8
+SHA1 (patch-ab) = 2f748490348d0bc39a005bd7cbb784fd4709da75
 SHA1 (patch-ad) = 305b3f9cd2837482362c0176b8e2025ffb0eb254
 SHA1 (patch-zb) = 3966ea9713cbf5d26072592443080c1884f48e75
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-share/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/vim-share/patches/patch-ab        Thu May 26 20:09:35 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2005/05/26 20:09:35 jmmv Exp $
+
+--- runtime/syntax/fstab.vim.orig     2005-05-21 16:05:10.000000000 +0200
++++ runtime/syntax/fstab.vim  2005-05-21 16:10:27.000000000 +0200
+@@ -32,7 +32,7 @@
+ " Type
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeError
+ syn match fsTypeError /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext3 fdesc hfs hpfs iso9660 kernfs linprocfs mfs minix msdos ncpfs nfs ntfs nwfs null portal proc 
procfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
++syn keyword fsTypeKeyword contained adfs ados affs auto autofs cd9660 coda cramfs devfs devpts efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 kernfs lfs linprocfs mfs minix msdos ncpfs 
nfs ntfs nwfs null overlay portal proc procfs ptyfs qnx4 reiserfs romfs smbfs std sysv swap tmpfs udf ufs umap umsdos union vfat xfs
+ 
+ " Options
+ " -------
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim-xaw/Makefile
--- a/editors/vim-xaw/Makefile  Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim-xaw/Makefile  Thu May 26 20:09:35 2005 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2005/03/15 09:07:29 martti Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 .include               "../vim-share/Makefile.common"
 
 COMMENT=               Vim editor (vi clone) with X11 Athena GUI
 
-DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
+DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
 CONFLICTS+=            vim-[0-9]* vim-gtk-[0-9]* vim-gtk2-[0-9]*
 CONFLICTS+=            vim-motif-[0-9]* vim-kde-[0-9]*
 
diff -r 7f8c7f0f7509 -r 7b25afdcd095 editors/vim/Makefile
--- a/editors/vim/Makefile      Thu May 26 19:17:37 2005 +0000
+++ b/editors/vim/Makefile      Thu May 26 20:09:35 2005 +0000
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.59 2005/03/15 09:07:29 martti Exp $
+# $NetBSD: Makefile,v 1.60 2005/05/26 20:09:35 jmmv Exp $
 
 PKGNAME=               vim-${VIM_VERSION}.${VIM_PATCHLEVEL}
+PKGREVISION=           1
 
 COMMENT=               Vim editor (vi clone) without GUI
 
 .include               "../vim-share/Makefile.common"
 
-DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}:../vim-share
+DEPENDS+=              vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}{,nb*}:../vim-share
 
 CONFLICTS+=            vim-gtk-[0-9]* vim-gtk2-[0-9]* vim-motif-[0-9]*
 CONFLICTS+=            vim-xaw-[0-9]* vim-kde-[0-9]*