diff options
-rw-r--r-- | editors/vim-gtk/Makefile | 5 | ||||
-rw-r--r-- | editors/vim-gtk2/Makefile | 5 | ||||
-rw-r--r-- | editors/vim-motif/Makefile | 5 | ||||
-rw-r--r-- | editors/vim-share/Makefile | 3 | ||||
-rw-r--r-- | editors/vim-share/distinfo | 3 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-ab | 13 | ||||
-rw-r--r-- | editors/vim-xaw/Makefile | 5 | ||||
-rw-r--r-- | editors/vim/Makefile | 5 |
8 files changed, 32 insertions, 12 deletions
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile index e0dc808ebee..a11d89dfef7 100644 --- a/editors/vim-gtk/Makefile +++ b/editors/vim-gtk/Makefile @@ -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 --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index 3e43902a790..e592d1be9e0 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -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 --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 96c159e95b9..b0e3642b13d 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -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 --git a/editors/vim-share/Makefile b/editors/vim-share/Makefile index c44efd41dd0..b1d36698e80 100644 --- a/editors/vim-share/Makefile +++ b/editors/vim-share/Makefile @@ -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 --git a/editors/vim-share/distinfo b/editors/vim-share/distinfo index c4c8dd67924..665ae652365 100644 --- a/editors/vim-share/distinfo +++ b/editors/vim-share/distinfo @@ -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 @@ SHA1 (vim/6.3.071) = b7939f9b10ced7def3f1bf3d6389d53c740b2149 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 --git a/editors/vim-share/patches/patch-ab b/editors/vim-share/patches/patch-ab new file mode 100644 index 00000000000..89ad3906914 --- /dev/null +++ b/editors/vim-share/patches/patch-ab @@ -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 --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile index 14fe8e9da0a..877825eb109 100644 --- a/editors/vim-xaw/Makefile +++ b/editors/vim-xaw/Makefile @@ -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 --git a/editors/vim/Makefile b/editors/vim/Makefile index 89d18ef145c..e566fbebf04 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -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]* |