VIM 7.0 Beta

vim-share/ALTERNATIVES

@@ -0,0 +1,3 @@
+bin/ex @PREFIX@/bin/vim -e
+bin/vi @PREFIX@/bin/vim
+bin/view @PREFIX@/bin/vim -R

vim-share/DESCR

@@ -0,0 +1,7 @@
+Vim is an almost compatible version of the UNIX editor Vi.  Many new features
+have been added: multi level undo, syntax highlighting, command line history,
+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, or vim-gtk to get a working
+editor.

vim-share/Makefile

@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/05/06 15:41:27 marttikuparinen Exp $
+
+PKGNAME=		vim-share-${VIM_VERSION}.${VIM_PATCHLEVEL}
+#PKGREVISION=		1
+
+COMMENT=		Data files for the vim editor (vi clone)
+
+.include		"Makefile.common"
+
+CONFIGURE_ARGS+=	--disable-gui
+
+BUILD_TARGET=		vim
+INSTALL_TARGET=		installruntime installmacros installtutor installtools
+USE_TOOLS+=		awk
+INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} TOOLS_AWK=${TOOLS_AWK:Q}
+
+PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR:Q}
+
+.include "../../mk/bsd.pkg.mk"

vim-share/Makefile.common

@@ -0,0 +1,47 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+.include "../../wip/vim-share/version.mk"
+
+DISTNAME=		vim-7.0f
+CATEGORIES=		editors
+MASTER_SITES=		ftp://ftp.vim.org/pub/vim/unstable/unix/
+DIST_SUBDIR=		vim
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		martti@NetBSD.org
+HOMEPAGE=		http://www.vim.org/
+
+CONFLICTS+=		vim-kde-[0-9]*
+
+WRKSRC=			${WRKDIR}/${VIM_SUBDIR}/src
+GNU_CONFIGURE=		yes
+
+.include "../../mk/bsd.prefs.mk"
+
+# See "configure --help" extra options. These might affect the installed
+# files (and PLIST might not include all files) so use at your own risk!
+CONFIGURE_ARGS+=	${VIM_EXTRA_OPTS}
+CONFIGURE_ARGS+=	--enable-multibyte
+
+PATCH_ARGS=		-d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \
+				-E ${PATCH_STRIP}
+PATCH_DIST_ARGS=	-d ${WRKDIR:Q}/${VIM_SUBDIR:Q} --forward --quiet \
+				-E ${PATCH_DIST_STRIP}
+PATCHDIR?=		${.CURDIR}/../../wip/vim-share/patches
+DISTINFO_FILE?=		${.CURDIR}/../../wip/vim-share/distinfo
+
+.if empty(PKGNAME:Mvim-share*)
+ALTERNATIVES_SRC=	${.CURDIR:Q}/../../wip/vim-share/ALTERNATIVES
+.else
+ALTERNATIVES_SRC=
+.endif
+
+PKG_SUPPORTED_OPTIONS+=	cscope
+PKG_OPTIONS_VAR=	PKG_OPTIONS.vim
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcscope)
+DEPENDS+=		cscope-[0-9]*:../../devel/cscope
+CONFIGURE_ARGS+=	--enable-cscope
+.endif

vim-share/distinfo

@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+SHA1 (vim/vim-7.0f.tar.bz2) = dba37854a149306eaff6ed9f12188cb145d3590b
+RMD160 (vim/vim-7.0f.tar.bz2) = 1c89e3d2a2fb816de4f30e11a6500604425022b6
+Size (vim/vim-7.0f.tar.bz2) = 6630456 bytes
+SHA1 (patch-aa) = ac360834654d67911f6090121713d494f2487124
+SHA1 (patch-ab) = 1ee4f14cb6c73743704d2dd2631cb3ca48f0303e
+SHA1 (patch-ad) = 737e963493397bdbcc649e919cd641ba264afd79
+SHA1 (patch-zb) = d52bdc3b77c30c804e78c2c6a4182fad8096c9f0

vim-share/patches/patch-aa

@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+--- src/auto/configure.orig	2006-04-16 13:51:42.000000000 +0300
++++ src/auto/configure	2006-04-17 05:56:11.000000000 +0300
+@@ -7976,7 +7976,7 @@
+ 
+ 
+ if test -z "$SKIP_MOTIF"; then
+-  gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX"
++  gui_XXX="${BUILDLINK_DIR}/include"
+     GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
+ 
+   echo "$as_me:$LINENO: checking for location of Motif GUI includes" >&5

vim-share/patches/patch-ab

@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+--- runtime/syntax/fstab.vim.orig	2006-04-16 19:01:27.000000000 +0300
++++ runtime/syntax/fstab.vim	2006-05-06 14:20:57.000000000 +0300
+@@ -36,7 +36,7 @@
+ " Type
+ syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+ syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+-syn keyword fsTypeKeyword contained adfs affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext3 fdesc hfs hpfs iso9660 jffs jffs2 jfs kernfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs ovlfs portal proc procfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
++syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
+ 
+ " Options
+ " -------
+@@ -48,7 +48,7 @@
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
+ syn match fsOptionsGeneral /_netdev/
+ 
+ " Options: adfs
+@@ -101,6 +101,9 @@
+ syn match fsOptionsKeywords contained /\<\%(dir\|file\|\)_umask=/ nextgroup=fsOptionsNumberOctal
+ syn match fsOptionsKeywords contained /\<\%(session\|part\)=/ nextgroup=fsOptionsNumber
+ 
++" Options: ffs
++syn keyword fsOptionsKeyWords contained softdep
++
+ " Options: hpfs
+ syn match fsOptionsKeywords contained /\<case=/ nextgroup=fsOptionsHpfsCase
+ syn keyword fsOptionsHpfsCase contained lower asis

vim-share/patches/patch-ad

@@ -0,0 +1,62 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+--- src/Makefile.orig	2006-04-24 18:16:14.000000000 +0300
++++ src/Makefile	2006-05-06 15:19:16.000000000 +0300
+@@ -1131,26 +1131,31 @@
+ ### Athena GUI
+ ### Use Xaw3d to make the menus look a little bit nicer
+ #XAW_LIB = -lXaw3d
+-XAW_LIB = -lXaw
++#XAW_LIB = -lXaw
+ 
+ ### When using Xaw3d, uncomment/comment the following lines to also get the
+ ### scrollbars from Xaw3d.
+-#ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
+-#ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+-#			objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
+-#ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
+-#		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
+-#		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.if defined(XAW_LIB)
++.if (${XAW_LIB} != "Xaw")
++ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c gui_at_fs.c
++ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
++			objects/pty.o objects/gui_beval.o objects/gui_at_fs.o
++ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO) \
++		    -Dvim_scrollbarWidgetClass=scrollbarWidgetClass \
++		    -Dvim_XawScrollbarSetThumb=XawScrollbarSetThumb
++.else
+ ATHENA_SRC	= gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
+ 			gui_at_sb.c gui_at_fs.c
+ ATHENA_OBJ	= objects/gui.o objects/gui_athena.o objects/gui_x11.o \
+ 			objects/pty.o objects/gui_beval.o \
+ 			objects/gui_at_sb.o objects/gui_at_fs.o
+ ATHENA_DEFS	= -DFEAT_GUI_ATHENA $(NARROW_PROTO)
++.endif # Xaw
++.endif # defined(XAW_LIB)
+ 
+ ATHENA_IPATH	= $(GUI_INC_LOC)
+ ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
+-ATHENA_LIBS1	= $(XAW_LIB)
++ATHENA_LIBS1	= $(LIBXAW)
+ ATHENA_LIBS2	= -lXt
+ ATHENA_INSTALL  = install_normal
+ ATHENA_TARGETS	= installglinks
+@@ -1770,7 +1775,7 @@
+ 	-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
+ 	@echo generating help tags
+ # Generate the help tags with ":helptags" to handle all languages.
+-	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags
++	-@cd $(HELPSOURCE); $(MAKE) VIMEXE=../../src/$(VIMTARGET) vimtags
+ 	cd $(HELPSOURCE); \
+ 		files=`ls *.txt tags`; \
+ 		files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \
+@@ -1894,7 +1899,7 @@
+ 	-chmod $(FILEMOD) $(DEST_TOOLS)/*
+ # replace the path in some tools
+ 	perlpath=`./which.sh perl` && sed -e "s+/usr/bin/perl+$$perlpath+" $(TOOLSSOURCE)/efm_perl.pl >$(DEST_TOOLS)/efm_perl.pl
+-	awkpath=`./which.sh nawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
++	awkpath=$(TOOLS_AWK) && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+ 		awkpath=`./which.sh gawk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; if test -z "$$awkpath"; then \
+ 		awkpath=`./which.sh awk` && sed -e "s+/usr/bin/nawk+$$awkpath+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk; fi; fi
+ 	-chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*`

vim-share/patches/patch-zb

@@ -0,0 +1,13 @@
+$NetBSD: patch-zb,v 1.1.1.1 2006/05/06 15:41:28 marttikuparinen Exp $
+
+--- src/feature.h.orig	2006-04-06 11:01:52.000000000 +0300
++++ src/feature.h	2006-04-17 06:02:54.000000000 +0300
+@@ -548,7 +548,7 @@
+  *			(used only with NO_BUILTIN_TCAPS not defined).
+  */
+ #ifdef HAVE_TGETENT
+-/* #define NO_BUILTIN_TCAPS */
++#define NO_BUILTIN_TCAPS
+ #endif
+ 
+ #if !defined(NO_BUILTIN_TCAPS) && !defined(FEAT_GUI_W16)

vim-share/version.mk

@@ -0,0 +1,5 @@
+# $NetBSD: version.mk,v 1.1.1.1 2006/05/06 15:41:27 marttikuparinen Exp $
+
+VIM_VERSION=		7.0f
+VIM_PATCHLEVEL=		0
+VIM_SUBDIR=		vim70f