Vim version 6 (beta C).

14 files changed, 1190 insertions, 0 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
new file mode 100644
index 000000000000..115af43a06c5
--- /dev/null
+++ b/editors/vim/Makefile
@@ -0,0 +1,87 @@
+# ex:ts=8
+# Ports collection makefile for:  vim
+# Date created:			  Sat June 29, 1996
+# Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
+#
+# $FreeBSD$
+#
+
+PORTNAME?=	vim
+PORTVERSION=	6.0c
+CATEGORIES=	editors
+MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
+		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
+		ftp://ftp.freesoftware.com/pub/vim/unreleased/unix/ \
+		ftp://ftp.vim.org/pub/vim/unreleased/unix/  \
+		ftp://ftp.is.co.za/applications/editors/unreleased/vim/  \
+		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unreleased/unix/  \
+		ftp://ftp.progsoc.uts.edu.au/pub/vim/unreleased/unix/
+DISTNAME=	vim-${PORTVERSION}
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
+
+#PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
+#.for p in 01
+#PATCHFILES+=	6.0.0${p}
+#.endfor
+
+MAINTAINER=	obrien@FreeBSD.org
+
+Y2K=		http://www.vim.org/y2k.html
+SLAVEDIRS=	editors/vim-lite
+
+.if defined(PACKAGE_BUILDING) && !defined(LITE)
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
+		python:${PORTSDIR}/lang/python
+LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+USE_PERL5=	yes
+.endif
+
+DIST_SUBDIR=	vim
+WRKSRC=		${WRKDIR}/vim${PORTVERSION:S/.//g}/src
+PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
+MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" -f
+ALL_TARGET=	#
+PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
+MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
+
+.if !defined(LITE)
+MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
+
+MAKE_FLAGS:=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
+
+.if defined(HAVE_GTK)
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+CONFIGURE=	GTK_CONFIG="${GTK_CONFIG}"
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
+.elif defined(HAVE_MOTIF)
+REQUIRES_MOTIF=	yes
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE} ${MAKE_FLAGS}
+.else
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
+.endif
+
+.if defined(PACKAGE_BUILDING)
+MAKE_FLAGS:=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" ${MAKE_FLAGS}
+.endif
+
+.else	# LITE
+PLIST=		${WRKDIR}/PLIST.nogui
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=no --without-x" ${MAKE_FLAGS}
+MAKE_FLAGS:=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp" ${MAKE_FLAGS}
+.endif	# LITE
+
+pre-build:
+	@(cd ${WRKSRC}; ${MAKE} distclean)
+	@${SED} -e '/gvi/d' ${PKGDIR}/PLIST > ${WRKDIR}/PLIST.nogui
+
+post-install:
+.if !defined(LITE)
+	[ -e ${PREFIX}/bin/gvim ] || ${LN} -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
+.endif
+	@${RM} -f ${PREFIX}/man/man1/etags.1
+	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
+
+.include <bsd.port.mk>
diff --git a/editors/vim/distinfo b/editors/vim/distinfo
new file mode 100644
index 000000000000..51d810612dd1
--- /dev/null
+++ b/editors/vim/distinfo
@@ -0,0 +1,2 @@
+MD5 (vim/vim-6.0c-src.tar.gz) = 8dab5bfbf275642c62e1599ce7c3425c
+MD5 (vim/vim-6.0c-rt.tar.gz) = c5de036634b9f1504832193e07803e57
diff --git a/editors/vim/files/patch-01 b/editors/vim/files/patch-01
new file mode 100644
index 000000000000..a3ef884ab8ce
--- /dev/null
+++ b/editors/vim/files/patch-01
@@ -0,0 +1,83 @@
+--- Makefile.orig	Sun Jan 16 06:03:04 2000
++++ Makefile	Sat May  6 13:04:12 2000
+@@ -302,6 +302,7 @@
+ 
+ # just an example:
+ #CONF_ARGS = --exec-prefix=/usr
++CONF_ARGS = --prefix=$(PREFIX)
+ 
+ # GUI - For creating Vim with GUI (gvim) (B)
+ # Uncomment this line when you don't want to get the GUI version, although you
+@@ -1444,56 +1445,56 @@
+ installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
+ 
+ $(BINDIR)/$(EXTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
++	#cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ 
+ $(BINDIR)/$(VIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
++	#cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ 
+ $(BINDIR)/$(GVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
+ 
+ $(BINDIR)/$(GVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
+ 
+ $(BINDIR)/$(RVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
+ 
+ $(BINDIR)/$(RVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
+ 
+ $(BINDIR)/$(RGVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
+ 
+ $(BINDIR)/$(RGVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
+ 
+ # create links for the manual pages with various names to vim.	This is only
+ # done when the links (or manpages with the same name) don't exist yet.
+ installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ 
+ $(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(MANSUBDIR)/$(GVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(BINDIR)/$(VIMTARGET)
diff --git a/editors/vim/files/patch-02 b/editors/vim/files/patch-02
new file mode 100644
index 000000000000..06b3acdaf84f
--- /dev/null
+++ b/editors/vim/files/patch-02
@@ -0,0 +1,16 @@
+--- auto/configure.orig	Sun Sep 19 03:59:45 1999
++++ auto/configure	Sun Oct 24 21:47:29 1999
+@@ -2906,11 +2906,11 @@
+ 
+   if test "x$gtk_config_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+-     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
+   fi
+   if test "x$gtk_config_exec_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+-     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
+   fi
+   if test "X$GTK_CONFIG" = "X"; then
+     # Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/editors/vim/pkg-comment b/editors/vim/pkg-comment
new file mode 100644
index 000000000000..06543ff852c3
--- /dev/null
+++ b/editors/vim/pkg-comment
@@ -0,0 +1 @@
+Vi "workalike", with many additional features
diff --git a/editors/vim/pkg-descr b/editors/vim/pkg-descr
new file mode 100644
index 000000000000..67770104fbe3
--- /dev/null
+++ b/editors/vim/pkg-descr
@@ -0,0 +1,24 @@
+Vim is a virtually compatible, extreamly enhanced, version of the UNIX
+text editor vi.
+
+There are a lot of enhancements above Vi: multi level undo, multi-windows
+and buffers, syntax highlighting, command line editing, filename completion,
+on-line help, visual selection, etc..  
+
+Many features above standard vi's have been added:
+    multiple windows and buffers, multi level undo, command line history,
+    filename completion, selection highlighting, block operations (including
+    column/rectangular blocks), syntax highlighting, on-line help, etc.
+	Embeded Perl, Tcl, and Python support.
+	See ":help vi_diff" for a summary of the differences between Vim and Vi.
+
+	An X-windows aware or a full X-windows GUI version can also be built
+	that allows full use of the mouse and pull-down menus
+
+See http://www.vim.org/why.html for a full explanation of Vim's features.
+
+Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
+M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
+
+-- David	(obrien@cs.ucdavis.edu)
+WWW: http://www.vim.org/
diff --git a/editors/vim/pkg-plist b/editors/vim/pkg-plist
new file mode 100644
index 000000000000..e9becbc8a2c7
--- /dev/null
+++ b/editors/vim/pkg-plist
@@ -0,0 +1,382 @@
+@comment $FreeBSD$
+bin/vim
+bin/vimtutor
+bin/ctags
+bin/etags
+bin/xxd
+@comment bin/ex
+@comment bin/gex
+bin/gview
+bin/gvim
+bin/rgview
+bin/rgvim
+bin/rview
+bin/rvim
+@comment bin/view
+share/vim/%%VIM_VER%%/doc/autocmd.txt
+share/vim/%%VIM_VER%%/doc/change.txt
+share/vim/%%VIM_VER%%/doc/cmdline.txt
+share/vim/%%VIM_VER%%/doc/develop.txt
+share/vim/%%VIM_VER%%/doc/digraph.txt
+share/vim/%%VIM_VER%%/doc/editing.txt
+share/vim/%%VIM_VER%%/doc/eval.txt
+share/vim/%%VIM_VER%%/doc/farsi.txt
+share/vim/%%VIM_VER%%/doc/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w32.txt
+share/vim/%%VIM_VER%%/doc/gui_x11.txt
+share/vim/%%VIM_VER%%/doc/hangulin.txt
+share/vim/%%VIM_VER%%/doc/help.txt
+share/vim/%%VIM_VER%%/doc/howto.txt
+share/vim/%%VIM_VER%%/doc/if_cscope.txt
+share/vim/%%VIM_VER%%/doc/if_ole.txt
+share/vim/%%VIM_VER%%/doc/if_perl.txt
+share/vim/%%VIM_VER%%/doc/if_python.txt
+share/vim/%%VIM_VER%%/doc/if_sniff.txt
+share/vim/%%VIM_VER%%/doc/if_tcl.txt
+share/vim/%%VIM_VER%%/doc/index.txt
+share/vim/%%VIM_VER%%/doc/insert.txt
+share/vim/%%VIM_VER%%/doc/intro.txt
+share/vim/%%VIM_VER%%/doc/map.txt
+share/vim/%%VIM_VER%%/doc/message.txt
+share/vim/%%VIM_VER%%/doc/motion.txt
+share/vim/%%VIM_VER%%/doc/multibyte.txt
+share/vim/%%VIM_VER%%/doc/options.txt
+share/vim/%%VIM_VER%%/doc/os_amiga.txt
+share/vim/%%VIM_VER%%/doc/os_beos.txt
+share/vim/%%VIM_VER%%/doc/os_dos.txt
+share/vim/%%VIM_VER%%/doc/os_mac.txt
+share/vim/%%VIM_VER%%/doc/os_mint.txt
+share/vim/%%VIM_VER%%/doc/os_msdos.txt
+share/vim/%%VIM_VER%%/doc/os_os2.txt
+share/vim/%%VIM_VER%%/doc/os_riscos.txt
+share/vim/%%VIM_VER%%/doc/os_unix.txt
+share/vim/%%VIM_VER%%/doc/os_vms.txt
+share/vim/%%VIM_VER%%/doc/os_win32.txt
+share/vim/%%VIM_VER%%/doc/pattern.txt
+share/vim/%%VIM_VER%%/doc/quickfix.txt
+share/vim/%%VIM_VER%%/doc/quotes.txt
+share/vim/%%VIM_VER%%/doc/recover.txt
+share/vim/%%VIM_VER%%/doc/repeat.txt
+share/vim/%%VIM_VER%%/doc/rightleft.txt
+share/vim/%%VIM_VER%%/doc/scroll.txt
+share/vim/%%VIM_VER%%/doc/starting.txt
+share/vim/%%VIM_VER%%/doc/syntax.txt
+share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tagsearch.txt
+share/vim/%%VIM_VER%%/doc/tips.txt
+share/vim/%%VIM_VER%%/doc/todo.txt
+share/vim/%%VIM_VER%%/doc/uganda.txt
+share/vim/%%VIM_VER%%/doc/undo.txt
+share/vim/%%VIM_VER%%/doc/various.txt
+share/vim/%%VIM_VER%%/doc/version4.txt
+share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/vi_diff.txt
+share/vim/%%VIM_VER%%/doc/visual.txt
+share/vim/%%VIM_VER%%/doc/windows.txt
+share/vim/%%VIM_VER%%/doc/tags
+share/vim/%%VIM_VER%%/doc/vim2html.pl
+share/vim/%%VIM_VER%%/syntax/2html.vim
+share/vim/%%VIM_VER%%/syntax/abaqus.vim
+share/vim/%%VIM_VER%%/syntax/abc.vim
+share/vim/%%VIM_VER%%/syntax/abel.vim
+share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/ahdl.vim
+share/vim/%%VIM_VER%%/syntax/amiga.vim
+share/vim/%%VIM_VER%%/syntax/aml.vim
+share/vim/%%VIM_VER%%/syntax/apache.vim
+share/vim/%%VIM_VER%%/syntax/apachestyle.vim
+share/vim/%%VIM_VER%%/syntax/asm.vim
+share/vim/%%VIM_VER%%/syntax/asmh8300.vim
+share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/aspperl.vim
+share/vim/%%VIM_VER%%/syntax/aspvbs.vim
+share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/ave.vim
+share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/basic.vim
+share/vim/%%VIM_VER%%/syntax/bc.vim
+share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/btm.vim
+share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/cf.vim
+share/vim/%%VIM_VER%%/syntax/ch.vim
+share/vim/%%VIM_VER%%/syntax/change.vim
+share/vim/%%VIM_VER%%/syntax/clean.vim
+share/vim/%%VIM_VER%%/syntax/clipper.vim
+share/vim/%%VIM_VER%%/syntax/cobol.vim
+share/vim/%%VIM_VER%%/syntax/colortest.vim
+share/vim/%%VIM_VER%%/syntax/conf.vim
+share/vim/%%VIM_VER%%/syntax/config.vim
+share/vim/%%VIM_VER%%/syntax/cpp.vim
+share/vim/%%VIM_VER%%/syntax/csh.vim
+share/vim/%%VIM_VER%%/syntax/csp.vim
+share/vim/%%VIM_VER%%/syntax/css.vim
+share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/ctrlh.vim
+share/vim/%%VIM_VER%%/syntax/cupl.vim
+share/vim/%%VIM_VER%%/syntax/cuplsim.vim
+share/vim/%%VIM_VER%%/syntax/cvs.vim
+share/vim/%%VIM_VER%%/syntax/cweb.vim
+share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/def.vim
+share/vim/%%VIM_VER%%/syntax/diff.vim
+share/vim/%%VIM_VER%%/syntax/diva.vim
+share/vim/%%VIM_VER%%/syntax/dosbatch.vim
+share/vim/%%VIM_VER%%/syntax/dosini.vim
+share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dtd.vim
+share/vim/%%VIM_VER%%/syntax/eiffel.vim
+share/vim/%%VIM_VER%%/syntax/elf.vim
+share/vim/%%VIM_VER%%/syntax/elmfilt.vim
+share/vim/%%VIM_VER%%/syntax/erlang.vim
+share/vim/%%VIM_VER%%/syntax/esqlc.vim
+share/vim/%%VIM_VER%%/syntax/expect.vim
+share/vim/%%VIM_VER%%/syntax/exports.vim
+share/vim/%%VIM_VER%%/syntax/focexec.vim
+share/vim/%%VIM_VER%%/syntax/form.vim
+share/vim/%%VIM_VER%%/syntax/forth.vim
+share/vim/%%VIM_VER%%/syntax/fortran.vim
+share/vim/%%VIM_VER%%/syntax/fvwm.vim
+share/vim/%%VIM_VER%%/syntax/gdb.vim
+share/vim/%%VIM_VER%%/syntax/gdmo.vim
+share/vim/%%VIM_VER%%/syntax/gedcom.vim
+share/vim/%%VIM_VER%%/syntax/gnuplot.vim
+share/vim/%%VIM_VER%%/syntax/gp.vim
+share/vim/%%VIM_VER%%/syntax/haskell.vim
+share/vim/%%VIM_VER%%/syntax/hb.vim
+share/vim/%%VIM_VER%%/syntax/help.vim
+share/vim/%%VIM_VER%%/syntax/hitest.vim
+share/vim/%%VIM_VER%%/syntax/html.vim
+share/vim/%%VIM_VER%%/syntax/htmlm4.vim
+share/vim/%%VIM_VER%%/syntax/icon.vim
+share/vim/%%VIM_VER%%/syntax/idl.vim
+share/vim/%%VIM_VER%%/syntax/idlang.vim
+share/vim/%%VIM_VER%%/syntax/inform.vim
+share/vim/%%VIM_VER%%/syntax/ishd.vim
+share/vim/%%VIM_VER%%/syntax/ist.vim
+share/vim/%%VIM_VER%%/syntax/java.vim
+share/vim/%%VIM_VER%%/syntax/javacc.vim
+share/vim/%%VIM_VER%%/syntax/javascript.vim
+share/vim/%%VIM_VER%%/syntax/jgraph.vim
+share/vim/%%VIM_VER%%/syntax/jproperties.vim
+share/vim/%%VIM_VER%%/syntax/jsp.vim
+share/vim/%%VIM_VER%%/syntax/kscript.vim
+share/vim/%%VIM_VER%%/syntax/kwt.vim
+share/vim/%%VIM_VER%%/syntax/lace.vim
+share/vim/%%VIM_VER%%/syntax/latte.vim
+share/vim/%%VIM_VER%%/syntax/lex.vim
+share/vim/%%VIM_VER%%/syntax/lhaskell.vim
+share/vim/%%VIM_VER%%/syntax/lilo.vim
+share/vim/%%VIM_VER%%/syntax/lisp.vim
+share/vim/%%VIM_VER%%/syntax/lite.vim
+share/vim/%%VIM_VER%%/syntax/lotos.vim
+share/vim/%%VIM_VER%%/syntax/lout.vim
+share/vim/%%VIM_VER%%/syntax/lss.vim
+share/vim/%%VIM_VER%%/syntax/lua.vim
+share/vim/%%VIM_VER%%/syntax/m4.vim
+share/vim/%%VIM_VER%%/syntax/mail.vim
+share/vim/%%VIM_VER%%/syntax/make.vim
+share/vim/%%VIM_VER%%/syntax/man.vim
+share/vim/%%VIM_VER%%/syntax/manual.vim
+share/vim/%%VIM_VER%%/syntax/maple.vim
+share/vim/%%VIM_VER%%/syntax/masm.vim
+share/vim/%%VIM_VER%%/syntax/master.vim
+share/vim/%%VIM_VER%%/syntax/matlab.vim
+share/vim/%%VIM_VER%%/syntax/mel.vim
+share/vim/%%VIM_VER%%/syntax/mf.vim
+share/vim/%%VIM_VER%%/syntax/mib.vim
+share/vim/%%VIM_VER%%/syntax/model.vim
+share/vim/%%VIM_VER%%/syntax/modsim3.vim
+share/vim/%%VIM_VER%%/syntax/modula2.vim
+share/vim/%%VIM_VER%%/syntax/modula3.vim
+share/vim/%%VIM_VER%%/syntax/mp.vim
+share/vim/%%VIM_VER%%/syntax/msql.vim
+share/vim/%%VIM_VER%%/syntax/muttrc.vim
+share/vim/%%VIM_VER%%/syntax/nasm.vim
+share/vim/%%VIM_VER%%/syntax/nastran.vim
+share/vim/%%VIM_VER%%/syntax/ncf.vim
+share/vim/%%VIM_VER%%/syntax/nosyntax.vim
+share/vim/%%VIM_VER%%/syntax/nroff.vim
+share/vim/%%VIM_VER%%/syntax/objc.vim
+share/vim/%%VIM_VER%%/syntax/ocaml.vim
+share/vim/%%VIM_VER%%/syntax/opl.vim
+share/vim/%%VIM_VER%%/syntax/ora.vim
+share/vim/%%VIM_VER%%/syntax/pascal.vim
+share/vim/%%VIM_VER%%/syntax/pcap.vim
+share/vim/%%VIM_VER%%/syntax/pccts.vim
+share/vim/%%VIM_VER%%/syntax/perl.vim
+share/vim/%%VIM_VER%%/syntax/php3.vim
+share/vim/%%VIM_VER%%/syntax/phtml.vim
+share/vim/%%VIM_VER%%/syntax/pike.vim
+share/vim/%%VIM_VER%%/syntax/pine.vim
+share/vim/%%VIM_VER%%/syntax/plsql.vim
+share/vim/%%VIM_VER%%/syntax/po.vim
+share/vim/%%VIM_VER%%/syntax/pod.vim
+share/vim/%%VIM_VER%%/syntax/postscr.vim
+share/vim/%%VIM_VER%%/syntax/pov.vim
+share/vim/%%VIM_VER%%/syntax/procmail.vim
+share/vim/%%VIM_VER%%/syntax/prolog.vim
+share/vim/%%VIM_VER%%/syntax/ptcap.vim
+share/vim/%%VIM_VER%%/syntax/purifylog.vim
+share/vim/%%VIM_VER%%/syntax/python.vim
+share/vim/%%VIM_VER%%/syntax/radiance.vim
+share/vim/%%VIM_VER%%/syntax/rc.vim
+share/vim/%%VIM_VER%%/syntax/rcslog.vim
+share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/remind.vim
+share/vim/%%VIM_VER%%/syntax/rexx.vim
+share/vim/%%VIM_VER%%/syntax/rpcgen.vim
+share/vim/%%VIM_VER%%/syntax/ruby.vim
+share/vim/%%VIM_VER%%/syntax/samba.vim
+share/vim/%%VIM_VER%%/syntax/sas.vim
+share/vim/%%VIM_VER%%/syntax/sather.vim
+share/vim/%%VIM_VER%%/syntax/scheme.vim
+share/vim/%%VIM_VER%%/syntax/sdl.vim
+share/vim/%%VIM_VER%%/syntax/sed.vim
+share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sgmllnx.vim
+share/vim/%%VIM_VER%%/syntax/sh.vim
+share/vim/%%VIM_VER%%/syntax/sicad.vim
+share/vim/%%VIM_VER%%/syntax/simula.vim
+share/vim/%%VIM_VER%%/syntax/skill.vim
+share/vim/%%VIM_VER%%/syntax/sl.vim
+share/vim/%%VIM_VER%%/syntax/slang.vim
+share/vim/%%VIM_VER%%/syntax/slrnrc.vim
+share/vim/%%VIM_VER%%/syntax/slrnsc.vim
+share/vim/%%VIM_VER%%/syntax/sm.vim
+share/vim/%%VIM_VER%%/syntax/smil.vim
+share/vim/%%VIM_VER%%/syntax/sml.vim
+share/vim/%%VIM_VER%%/syntax/snnsnet.vim
+share/vim/%%VIM_VER%%/syntax/snnspat.vim
+share/vim/%%VIM_VER%%/syntax/snnsres.vim
+share/vim/%%VIM_VER%%/syntax/spec.vim
+share/vim/%%VIM_VER%%/syntax/spice.vim
+share/vim/%%VIM_VER%%/syntax/spup.vim
+share/vim/%%VIM_VER%%/syntax/sql.vim
+share/vim/%%VIM_VER%%/syntax/sqr.vim
+share/vim/%%VIM_VER%%/syntax/squid.vim
+share/vim/%%VIM_VER%%/syntax/st.vim
+share/vim/%%VIM_VER%%/syntax/stp.vim
+share/vim/%%VIM_VER%%/syntax/synload.vim
+share/vim/%%VIM_VER%%/syntax/syntax.vim
+share/vim/%%VIM_VER%%/syntax/tads.vim
+share/vim/%%VIM_VER%%/syntax/tags.vim
+share/vim/%%VIM_VER%%/syntax/tcl.vim
+share/vim/%%VIM_VER%%/syntax/tex.vim
+share/vim/%%VIM_VER%%/syntax/texinfo.vim
+share/vim/%%VIM_VER%%/syntax/tf.vim
+share/vim/%%VIM_VER%%/syntax/tli.vim
+share/vim/%%VIM_VER%%/syntax/tsalt.vim
+share/vim/%%VIM_VER%%/syntax/uil.vim
+share/vim/%%VIM_VER%%/syntax/vb.vim
+share/vim/%%VIM_VER%%/syntax/verilog.vim
+share/vim/%%VIM_VER%%/syntax/vgrindefs.vim
+share/vim/%%VIM_VER%%/syntax/vhdl.vim
+share/vim/%%VIM_VER%%/syntax/vim.vim
+share/vim/%%VIM_VER%%/syntax/viminfo.vim
+share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/web.vim
+share/vim/%%VIM_VER%%/syntax/webmacro.vim
+share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/winbatch.vim
+share/vim/%%VIM_VER%%/syntax/wml.vim
+share/vim/%%VIM_VER%%/syntax/xdefaults.vim
+share/vim/%%VIM_VER%%/syntax/xmath.vim
+share/vim/%%VIM_VER%%/syntax/xml.vim
+share/vim/%%VIM_VER%%/syntax/xpm.vim
+share/vim/%%VIM_VER%%/syntax/xpm2.vim
+share/vim/%%VIM_VER%%/syntax/xs.vim
+share/vim/%%VIM_VER%%/syntax/xxd.vim
+share/vim/%%VIM_VER%%/syntax/yacc.vim
+share/vim/%%VIM_VER%%/syntax/z8a.vim
+share/vim/%%VIM_VER%%/syntax/zsh.vim
+share/vim/%%VIM_VER%%/tutor/README.txt
+share/vim/%%VIM_VER%%/tutor/tutor
+share/vim/%%VIM_VER%%/menu.vim
+share/vim/%%VIM_VER%%/bugreport.vim
+share/vim/%%VIM_VER%%/vimrc_example.vim
+share/vim/%%VIM_VER%%/gvimrc_example.vim
+share/vim/%%VIM_VER%%/filetype.vim
+share/vim/%%VIM_VER%%/ftoff.vim
+share/vim/%%VIM_VER%%/scripts.vim
+share/vim/%%VIM_VER%%/optwin.vim
+share/vim/%%VIM_VER%%/macros/README.txt
+share/vim/%%VIM_VER%%/macros/diffwin.vim
+share/vim/%%VIM_VER%%/macros/dvorak
+share/vim/%%VIM_VER%%/macros/explorer.vim
+share/vim/%%VIM_VER%%/macros/hanoi/poster
+share/vim/%%VIM_VER%%/macros/hanoi/click.me
+share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
+share/vim/%%VIM_VER%%/macros/html
+share/vim/%%VIM_VER%%/macros/justify.vim
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze/README.txt
+share/vim/%%VIM_VER%%/macros/maze/Makefile
+share/vim/%%VIM_VER%%/macros/maze/maze.c
+share/vim/%%VIM_VER%%/macros/maze/maze_5.78
+share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
+share/vim/%%VIM_VER%%/macros/maze/maze_mac
+share/vim/%%VIM_VER%%/macros/maze/poster
+share/vim/%%VIM_VER%%/macros/shellmenu.vim
+share/vim/%%VIM_VER%%/macros/swapmous.vim
+share/vim/%%VIM_VER%%/macros/urm/urm
+share/vim/%%VIM_VER%%/macros/urm/urm.vim
+share/vim/%%VIM_VER%%/macros/urm/examples
+share/vim/%%VIM_VER%%/macros/urm/README.txt
+share/vim/%%VIM_VER%%/syntax/abaqus.vim
+share/vim/%%VIM_VER%%/syntax/apache.vim
+share/vim/%%VIM_VER%%/syntax/aspperl.vim
+share/vim/%%VIM_VER%%/syntax/bc.vim
+share/vim/%%VIM_VER%%/syntax/ch.vim
+share/vim/%%VIM_VER%%/syntax/conf.vim
+share/vim/%%VIM_VER%%/syntax/csp.vim
+share/vim/%%VIM_VER%%/syntax/cvs.vim
+share/vim/%%VIM_VER%%/syntax/form.vim
+share/vim/%%VIM_VER%%/syntax/hb.vim
+share/vim/%%VIM_VER%%/syntax/jproperties.vim
+share/vim/%%VIM_VER%%/syntax/kscript.vim
+share/vim/%%VIM_VER%%/syntax/latte.vim
+share/vim/%%VIM_VER%%/syntax/mel.vim
+share/vim/%%VIM_VER%%/syntax/nastran.vim
+share/vim/%%VIM_VER%%/syntax/ora.vim
+share/vim/%%VIM_VER%%/syntax/ruby.vim
+share/vim/%%VIM_VER%%/syntax/samba.vim
+share/vim/%%VIM_VER%%/syntax/sml.vim
+share/vim/%%VIM_VER%%/syntax/snnsnet.vim
+share/vim/%%VIM_VER%%/syntax/snnspat.vim
+share/vim/%%VIM_VER%%/syntax/snnsres.vim
+share/vim/%%VIM_VER%%/syntax/stp.vim
+share/vim/%%VIM_VER%%/syntax/tli.vim
+share/vim/%%VIM_VER%%/syntax/webmacro.vim
+share/vim/%%VIM_VER%%/syntax/wml.vim
+share/vim/%%VIM_VER%%/tools/README.txt
+share/vim/%%VIM_VER%%/tools/blink.c
+share/vim/%%VIM_VER%%/tools/ccfilter.1
+share/vim/%%VIM_VER%%/tools/ccfilter.c
+share/vim/%%VIM_VER%%/tools/ccfilter_README.txt
+share/vim/%%VIM_VER%%/tools/efm_filter.pl
+share/vim/%%VIM_VER%%/tools/efm_filter.txt
+share/vim/%%VIM_VER%%/tools/gvimdiff
+share/vim/%%VIM_VER%%/tools/mve.awk
+share/vim/%%VIM_VER%%/tools/mve.txt
+share/vim/%%VIM_VER%%/tools/pltags.pl
+share/vim/%%VIM_VER%%/tools/ref
+share/vim/%%VIM_VER%%/tools/shtags.1
+share/vim/%%VIM_VER%%/tools/shtags.pl
+share/vim/%%VIM_VER%%/tools/tcltags
+share/vim/%%VIM_VER%%/tools/vim132
+share/vim/%%VIM_VER%%/tools/vimm
+share/vim/%%VIM_VER%%/tools/vimspell.sh
+share/vim/%%VIM_VER%%/tools/vimspell.txt
+@dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros
+@dirrm share/vim/%%VIM_VER%%/syntax
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%
+@dirrm share/vim
diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
new file mode 100644
index 000000000000..115af43a06c5
--- /dev/null
+++ b/editors/vim6/Makefile
@@ -0,0 +1,87 @@
+# ex:ts=8
+# Ports collection makefile for:  vim
+# Date created:			  Sat June 29, 1996
+# Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
+#
+# $FreeBSD$
+#
+
+PORTNAME?=	vim
+PORTVERSION=	6.0c
+CATEGORIES=	editors
+MASTER_SITES=	ftp://nuxi.ucdavis.edu/pub/vim/unreleased/unix/ \
+		ftp://ftp.nuxi.com/pub/vim/unreleased/unix/ \
+		ftp://ftp.freesoftware.com/pub/vim/unreleased/unix/ \
+		ftp://ftp.vim.org/pub/vim/unreleased/unix/  \
+		ftp://ftp.is.co.za/applications/editors/unreleased/vim/  \
+		ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unreleased/unix/  \
+		ftp://ftp.progsoc.uts.edu.au/pub/vim/unreleased/unix/
+DISTNAME=	vim-${PORTVERSION}
+DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX}
+
+#PATCH_SITES=	${MASTER_SITES:S/unix/patches/}
+#.for p in 01
+#PATCHFILES+=	6.0.0${p}
+#.endfor
+
+MAINTAINER=	obrien@FreeBSD.org
+
+Y2K=		http://www.vim.org/y2k.html
+SLAVEDIRS=	editors/vim-lite
+
+.if defined(PACKAGE_BUILDING) && !defined(LITE)
+BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80 \
+		python:${PORTSDIR}/lang/python
+LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
+RUN_DEPENDS=	python:${PORTSDIR}/lang/python
+USE_PERL5=	yes
+.endif
+
+DIST_SUBDIR=	vim
+WRKSRC=		${WRKDIR}/vim${PORTVERSION:S/.//g}/src
+PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
+MAKE_FLAGS=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib" -f
+ALL_TARGET=	#
+PLIST_SUB=	VIM_VER=${DISTNAME:S/-//:S/.//}
+MAN1=		vim.1 vimtutor.1 xxd.1 ectags.1
+MLINKS=		vim.1 rvim.1  vim.1 rview.1  ectags.1 etags.1
+
+.if !defined(LITE)
+MLINKS+=	vim.1 gvim.1  vim.1 gview.1  vim.1 rgvim.1  vim.1 rgview.1
+
+MAKE_FLAGS:=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
+
+.if defined(HAVE_GTK)
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+CONFIGURE=	GTK_CONFIG="${GTK_CONFIG}"
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
+.elif defined(HAVE_MOTIF)
+REQUIRES_MOTIF=	yes
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\" --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" MOTIFHOME=${X11BASE} ${MAKE_FLAGS}
+.else
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=athena --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
+.endif
+
+.if defined(PACKAGE_BUILDING)
+MAKE_FLAGS:=	CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp --enable-cscope" ${MAKE_FLAGS}
+.endif
+
+.else	# LITE
+PLIST=		${WRKDIR}/PLIST.nogui
+MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=no --without-x" ${MAKE_FLAGS}
+MAKE_FLAGS:=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp" ${MAKE_FLAGS}
+.endif	# LITE
+
+pre-build:
+	@(cd ${WRKSRC}; ${MAKE} distclean)
+	@${SED} -e '/gvi/d' ${PKGDIR}/PLIST > ${WRKDIR}/PLIST.nogui
+
+post-install:
+.if !defined(LITE)
+	[ -e ${PREFIX}/bin/gvim ] || ${LN} -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
+.endif
+	@${RM} -f ${PREFIX}/man/man1/etags.1
+	@${MV} ${PREFIX}/man/man1/ctags.1 ${PREFIX}/man/man1/ectags.1
+
+.include <bsd.port.mk>
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
new file mode 100644
index 000000000000..51d810612dd1
--- /dev/null
+++ b/editors/vim6/distinfo
@@ -0,0 +1,2 @@
+MD5 (vim/vim-6.0c-src.tar.gz) = 8dab5bfbf275642c62e1599ce7c3425c
+MD5 (vim/vim-6.0c-rt.tar.gz) = c5de036634b9f1504832193e07803e57
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
new file mode 100644
index 000000000000..a3ef884ab8ce
--- /dev/null
+++ b/editors/vim6/files/patch-01
@@ -0,0 +1,83 @@
+--- Makefile.orig	Sun Jan 16 06:03:04 2000
++++ Makefile	Sat May  6 13:04:12 2000
+@@ -302,6 +302,7 @@
+ 
+ # just an example:
+ #CONF_ARGS = --exec-prefix=/usr
++CONF_ARGS = --prefix=$(PREFIX)
+ 
+ # GUI - For creating Vim with GUI (gvim) (B)
+ # Uncomment this line when you don't want to get the GUI version, although you
+@@ -1444,56 +1445,56 @@
+ installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET)
+ 
+ $(BINDIR)/$(EXTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
++	#cd $(BINDIR); ln -s $(VIMTARGET) $(EXTARGET)
+ 
+ $(BINDIR)/$(VIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
++	#cd $(BINDIR); ln -s $(VIMTARGET) $(VIEWTARGET)
+ 
+ $(BINDIR)/$(GVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIMTARGET)
+ 
+ $(BINDIR)/$(GVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(GVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(GVIEWTARGET)
+ 
+ $(BINDIR)/$(RVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIMTARGET)
+ 
+ $(BINDIR)/$(RVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RVIEWTARGET)
+ 
+ $(BINDIR)/$(RGVIMTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIMTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIMTARGET)
+ 
+ $(BINDIR)/$(RGVIEWTARGET):
+-	cd $(BINDIR); ln -s $(VIMTARGET) $(RGVIEWTARGET)
++	cd $(BINDIR); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
+ 
+ # create links for the manual pages with various names to vim.	This is only
+ # done when the links (or manpages with the same name) don't exist yet.
+ installhelplinks: $(GUI_MAN_TARGETS) $(MANSUBDIR)/$(EXNAME).1 $(MANSUBDIR)/$(VIEWNAME).1 $(MANSUBDIR)/$(RVIMNAME).1 $(MANSUBDIR)/$(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(EXNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(EXNAME).1
+ 
+ $(MANSUBDIR)/$(VIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(MANSUBDIR)/$(GVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(MANSUBDIR)/$(GVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIMNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(MANSUBDIR)/$(RGVIEWNAME).1:
+-	cd $(MANSUBDIR); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(MANSUBDIR); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(BINDIR)/$(VIMTARGET)
diff --git a/editors/vim6/files/patch-02 b/editors/vim6/files/patch-02
new file mode 100644
index 000000000000..06b3acdaf84f
--- /dev/null
+++ b/editors/vim6/files/patch-02
@@ -0,0 +1,16 @@
+--- auto/configure.orig	Sun Sep 19 03:59:45 1999
++++ auto/configure	Sun Oct 24 21:47:29 1999
+@@ -2906,11 +2906,11 @@
+ 
+   if test "x$gtk_config_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+-     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
+   fi
+   if test "x$gtk_config_exec_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+-     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
+   fi
+   if test "X$GTK_CONFIG" = "X"; then
+     # Extract the first word of "gtk-config", so it can be a program name with args.
diff --git a/editors/vim6/pkg-comment b/editors/vim6/pkg-comment
new file mode 100644
index 000000000000..06543ff852c3
--- /dev/null
+++ b/editors/vim6/pkg-comment
@@ -0,0 +1 @@
+Vi "workalike", with many additional features
diff --git a/editors/vim6/pkg-descr b/editors/vim6/pkg-descr
new file mode 100644
index 000000000000..67770104fbe3
--- /dev/null
+++ b/editors/vim6/pkg-descr
@@ -0,0 +1,24 @@
+Vim is a virtually compatible, extreamly enhanced, version of the UNIX
+text editor vi.
+
+There are a lot of enhancements above Vi: multi level undo, multi-windows
+and buffers, syntax highlighting, command line editing, filename completion,
+on-line help, visual selection, etc..  
+
+Many features above standard vi's have been added:
+    multiple windows and buffers, multi level undo, command line history,
+    filename completion, selection highlighting, block operations (including
+    column/rectangular blocks), syntax highlighting, on-line help, etc.
+	Embeded Perl, Tcl, and Python support.
+	See ":help vi_diff" for a summary of the differences between Vim and Vi.
+
+	An X-windows aware or a full X-windows GUI version can also be built
+	that allows full use of the mouse and pull-down menus
+
+See http://www.vim.org/why.html for a full explanation of Vim's features.
+
+Portability to all UNIX platforms, AmigaOS, Archimedes, Atari MiNT, BeOS,
+M$-DOS, MacOS, OS/2, VMS, WinNT+Win95.
+
+-- David	(obrien@cs.ucdavis.edu)
+WWW: http://www.vim.org/
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
new file mode 100644
index 000000000000..e9becbc8a2c7
--- /dev/null
+++ b/editors/vim6/pkg-plist
@@ -0,0 +1,382 @@
+@comment $FreeBSD$
+bin/vim
+bin/vimtutor
+bin/ctags
+bin/etags
+bin/xxd
+@comment bin/ex
+@comment bin/gex
+bin/gview
+bin/gvim
+bin/rgview
+bin/rgvim
+bin/rview
+bin/rvim
+@comment bin/view
+share/vim/%%VIM_VER%%/doc/autocmd.txt
+share/vim/%%VIM_VER%%/doc/change.txt
+share/vim/%%VIM_VER%%/doc/cmdline.txt
+share/vim/%%VIM_VER%%/doc/develop.txt
+share/vim/%%VIM_VER%%/doc/digraph.txt
+share/vim/%%VIM_VER%%/doc/editing.txt
+share/vim/%%VIM_VER%%/doc/eval.txt
+share/vim/%%VIM_VER%%/doc/farsi.txt
+share/vim/%%VIM_VER%%/doc/gui.txt
+share/vim/%%VIM_VER%%/doc/gui_w32.txt
+share/vim/%%VIM_VER%%/doc/gui_x11.txt
+share/vim/%%VIM_VER%%/doc/hangulin.txt
+share/vim/%%VIM_VER%%/doc/help.txt
+share/vim/%%VIM_VER%%/doc/howto.txt
+share/vim/%%VIM_VER%%/doc/if_cscope.txt
+share/vim/%%VIM_VER%%/doc/if_ole.txt
+share/vim/%%VIM_VER%%/doc/if_perl.txt
+share/vim/%%VIM_VER%%/doc/if_python.txt
+share/vim/%%VIM_VER%%/doc/if_sniff.txt
+share/vim/%%VIM_VER%%/doc/if_tcl.txt
+share/vim/%%VIM_VER%%/doc/index.txt
+share/vim/%%VIM_VER%%/doc/insert.txt
+share/vim/%%VIM_VER%%/doc/intro.txt
+share/vim/%%VIM_VER%%/doc/map.txt
+share/vim/%%VIM_VER%%/doc/message.txt
+share/vim/%%VIM_VER%%/doc/motion.txt
+share/vim/%%VIM_VER%%/doc/multibyte.txt
+share/vim/%%VIM_VER%%/doc/options.txt
+share/vim/%%VIM_VER%%/doc/os_amiga.txt
+share/vim/%%VIM_VER%%/doc/os_beos.txt
+share/vim/%%VIM_VER%%/doc/os_dos.txt
+share/vim/%%VIM_VER%%/doc/os_mac.txt
+share/vim/%%VIM_VER%%/doc/os_mint.txt
+share/vim/%%VIM_VER%%/doc/os_msdos.txt
+share/vim/%%VIM_VER%%/doc/os_os2.txt
+share/vim/%%VIM_VER%%/doc/os_riscos.txt
+share/vim/%%VIM_VER%%/doc/os_unix.txt
+share/vim/%%VIM_VER%%/doc/os_vms.txt
+share/vim/%%VIM_VER%%/doc/os_win32.txt
+share/vim/%%VIM_VER%%/doc/pattern.txt
+share/vim/%%VIM_VER%%/doc/quickfix.txt
+share/vim/%%VIM_VER%%/doc/quotes.txt
+share/vim/%%VIM_VER%%/doc/recover.txt
+share/vim/%%VIM_VER%%/doc/repeat.txt
+share/vim/%%VIM_VER%%/doc/rightleft.txt
+share/vim/%%VIM_VER%%/doc/scroll.txt
+share/vim/%%VIM_VER%%/doc/starting.txt
+share/vim/%%VIM_VER%%/doc/syntax.txt
+share/vim/%%VIM_VER%%/doc/term.txt
+share/vim/%%VIM_VER%%/doc/tagsearch.txt
+share/vim/%%VIM_VER%%/doc/tips.txt
+share/vim/%%VIM_VER%%/doc/todo.txt
+share/vim/%%VIM_VER%%/doc/uganda.txt
+share/vim/%%VIM_VER%%/doc/undo.txt
+share/vim/%%VIM_VER%%/doc/various.txt
+share/vim/%%VIM_VER%%/doc/version4.txt
+share/vim/%%VIM_VER%%/doc/version5.txt
+share/vim/%%VIM_VER%%/doc/vi_diff.txt
+share/vim/%%VIM_VER%%/doc/visual.txt
+share/vim/%%VIM_VER%%/doc/windows.txt
+share/vim/%%VIM_VER%%/doc/tags
+share/vim/%%VIM_VER%%/doc/vim2html.pl
+share/vim/%%VIM_VER%%/syntax/2html.vim
+share/vim/%%VIM_VER%%/syntax/abaqus.vim
+share/vim/%%VIM_VER%%/syntax/abc.vim
+share/vim/%%VIM_VER%%/syntax/abel.vim
+share/vim/%%VIM_VER%%/syntax/ada.vim
+share/vim/%%VIM_VER%%/syntax/ahdl.vim
+share/vim/%%VIM_VER%%/syntax/amiga.vim
+share/vim/%%VIM_VER%%/syntax/aml.vim
+share/vim/%%VIM_VER%%/syntax/apache.vim
+share/vim/%%VIM_VER%%/syntax/apachestyle.vim
+share/vim/%%VIM_VER%%/syntax/asm.vim
+share/vim/%%VIM_VER%%/syntax/asmh8300.vim
+share/vim/%%VIM_VER%%/syntax/asn.vim
+share/vim/%%VIM_VER%%/syntax/aspperl.vim
+share/vim/%%VIM_VER%%/syntax/aspvbs.vim
+share/vim/%%VIM_VER%%/syntax/atlas.vim
+share/vim/%%VIM_VER%%/syntax/ave.vim
+share/vim/%%VIM_VER%%/syntax/awk.vim
+share/vim/%%VIM_VER%%/syntax/basic.vim
+share/vim/%%VIM_VER%%/syntax/bc.vim
+share/vim/%%VIM_VER%%/syntax/bib.vim
+share/vim/%%VIM_VER%%/syntax/btm.vim
+share/vim/%%VIM_VER%%/syntax/c.vim
+share/vim/%%VIM_VER%%/syntax/cf.vim
+share/vim/%%VIM_VER%%/syntax/ch.vim
+share/vim/%%VIM_VER%%/syntax/change.vim
+share/vim/%%VIM_VER%%/syntax/clean.vim
+share/vim/%%VIM_VER%%/syntax/clipper.vim
+share/vim/%%VIM_VER%%/syntax/cobol.vim
+share/vim/%%VIM_VER%%/syntax/colortest.vim
+share/vim/%%VIM_VER%%/syntax/conf.vim
+share/vim/%%VIM_VER%%/syntax/config.vim
+share/vim/%%VIM_VER%%/syntax/cpp.vim
+share/vim/%%VIM_VER%%/syntax/csh.vim
+share/vim/%%VIM_VER%%/syntax/csp.vim
+share/vim/%%VIM_VER%%/syntax/css.vim
+share/vim/%%VIM_VER%%/syntax/cterm.vim
+share/vim/%%VIM_VER%%/syntax/ctrlh.vim
+share/vim/%%VIM_VER%%/syntax/cupl.vim
+share/vim/%%VIM_VER%%/syntax/cuplsim.vim
+share/vim/%%VIM_VER%%/syntax/cvs.vim
+share/vim/%%VIM_VER%%/syntax/cweb.vim
+share/vim/%%VIM_VER%%/syntax/dcl.vim
+share/vim/%%VIM_VER%%/syntax/def.vim
+share/vim/%%VIM_VER%%/syntax/diff.vim
+share/vim/%%VIM_VER%%/syntax/diva.vim
+share/vim/%%VIM_VER%%/syntax/dosbatch.vim
+share/vim/%%VIM_VER%%/syntax/dosini.vim
+share/vim/%%VIM_VER%%/syntax/dracula.vim
+share/vim/%%VIM_VER%%/syntax/dtd.vim
+share/vim/%%VIM_VER%%/syntax/eiffel.vim
+share/vim/%%VIM_VER%%/syntax/elf.vim
+share/vim/%%VIM_VER%%/syntax/elmfilt.vim
+share/vim/%%VIM_VER%%/syntax/erlang.vim
+share/vim/%%VIM_VER%%/syntax/esqlc.vim
+share/vim/%%VIM_VER%%/syntax/expect.vim
+share/vim/%%VIM_VER%%/syntax/exports.vim
+share/vim/%%VIM_VER%%/syntax/focexec.vim
+share/vim/%%VIM_VER%%/syntax/form.vim
+share/vim/%%VIM_VER%%/syntax/forth.vim
+share/vim/%%VIM_VER%%/syntax/fortran.vim
+share/vim/%%VIM_VER%%/syntax/fvwm.vim
+share/vim/%%VIM_VER%%/syntax/gdb.vim
+share/vim/%%VIM_VER%%/syntax/gdmo.vim
+share/vim/%%VIM_VER%%/syntax/gedcom.vim
+share/vim/%%VIM_VER%%/syntax/gnuplot.vim
+share/vim/%%VIM_VER%%/syntax/gp.vim
+share/vim/%%VIM_VER%%/syntax/haskell.vim
+share/vim/%%VIM_VER%%/syntax/hb.vim
+share/vim/%%VIM_VER%%/syntax/help.vim
+share/vim/%%VIM_VER%%/syntax/hitest.vim
+share/vim/%%VIM_VER%%/syntax/html.vim
+share/vim/%%VIM_VER%%/syntax/htmlm4.vim
+share/vim/%%VIM_VER%%/syntax/icon.vim
+share/vim/%%VIM_VER%%/syntax/idl.vim
+share/vim/%%VIM_VER%%/syntax/idlang.vim
+share/vim/%%VIM_VER%%/syntax/inform.vim
+share/vim/%%VIM_VER%%/syntax/ishd.vim
+share/vim/%%VIM_VER%%/syntax/ist.vim
+share/vim/%%VIM_VER%%/syntax/java.vim
+share/vim/%%VIM_VER%%/syntax/javacc.vim
+share/vim/%%VIM_VER%%/syntax/javascript.vim
+share/vim/%%VIM_VER%%/syntax/jgraph.vim
+share/vim/%%VIM_VER%%/syntax/jproperties.vim
+share/vim/%%VIM_VER%%/syntax/jsp.vim
+share/vim/%%VIM_VER%%/syntax/kscript.vim
+share/vim/%%VIM_VER%%/syntax/kwt.vim
+share/vim/%%VIM_VER%%/syntax/lace.vim
+share/vim/%%VIM_VER%%/syntax/latte.vim
+share/vim/%%VIM_VER%%/syntax/lex.vim
+share/vim/%%VIM_VER%%/syntax/lhaskell.vim
+share/vim/%%VIM_VER%%/syntax/lilo.vim
+share/vim/%%VIM_VER%%/syntax/lisp.vim
+share/vim/%%VIM_VER%%/syntax/lite.vim
+share/vim/%%VIM_VER%%/syntax/lotos.vim
+share/vim/%%VIM_VER%%/syntax/lout.vim
+share/vim/%%VIM_VER%%/syntax/lss.vim
+share/vim/%%VIM_VER%%/syntax/lua.vim
+share/vim/%%VIM_VER%%/syntax/m4.vim
+share/vim/%%VIM_VER%%/syntax/mail.vim
+share/vim/%%VIM_VER%%/syntax/make.vim
+share/vim/%%VIM_VER%%/syntax/man.vim
+share/vim/%%VIM_VER%%/syntax/manual.vim
+share/vim/%%VIM_VER%%/syntax/maple.vim
+share/vim/%%VIM_VER%%/syntax/masm.vim
+share/vim/%%VIM_VER%%/syntax/master.vim
+share/vim/%%VIM_VER%%/syntax/matlab.vim
+share/vim/%%VIM_VER%%/syntax/mel.vim
+share/vim/%%VIM_VER%%/syntax/mf.vim
+share/vim/%%VIM_VER%%/syntax/mib.vim
+share/vim/%%VIM_VER%%/syntax/model.vim
+share/vim/%%VIM_VER%%/syntax/modsim3.vim
+share/vim/%%VIM_VER%%/syntax/modula2.vim
+share/vim/%%VIM_VER%%/syntax/modula3.vim
+share/vim/%%VIM_VER%%/syntax/mp.vim
+share/vim/%%VIM_VER%%/syntax/msql.vim
+share/vim/%%VIM_VER%%/syntax/muttrc.vim
+share/vim/%%VIM_VER%%/syntax/nasm.vim
+share/vim/%%VIM_VER%%/syntax/nastran.vim
+share/vim/%%VIM_VER%%/syntax/ncf.vim
+share/vim/%%VIM_VER%%/syntax/nosyntax.vim
+share/vim/%%VIM_VER%%/syntax/nroff.vim
+share/vim/%%VIM_VER%%/syntax/objc.vim
+share/vim/%%VIM_VER%%/syntax/ocaml.vim
+share/vim/%%VIM_VER%%/syntax/opl.vim
+share/vim/%%VIM_VER%%/syntax/ora.vim
+share/vim/%%VIM_VER%%/syntax/pascal.vim
+share/vim/%%VIM_VER%%/syntax/pcap.vim
+share/vim/%%VIM_VER%%/syntax/pccts.vim
+share/vim/%%VIM_VER%%/syntax/perl.vim
+share/vim/%%VIM_VER%%/syntax/php3.vim
+share/vim/%%VIM_VER%%/syntax/phtml.vim
+share/vim/%%VIM_VER%%/syntax/pike.vim
+share/vim/%%VIM_VER%%/syntax/pine.vim
+share/vim/%%VIM_VER%%/syntax/plsql.vim
+share/vim/%%VIM_VER%%/syntax/po.vim
+share/vim/%%VIM_VER%%/syntax/pod.vim
+share/vim/%%VIM_VER%%/syntax/postscr.vim
+share/vim/%%VIM_VER%%/syntax/pov.vim
+share/vim/%%VIM_VER%%/syntax/procmail.vim
+share/vim/%%VIM_VER%%/syntax/prolog.vim
+share/vim/%%VIM_VER%%/syntax/ptcap.vim
+share/vim/%%VIM_VER%%/syntax/purifylog.vim
+share/vim/%%VIM_VER%%/syntax/python.vim
+share/vim/%%VIM_VER%%/syntax/radiance.vim
+share/vim/%%VIM_VER%%/syntax/rc.vim
+share/vim/%%VIM_VER%%/syntax/rcslog.vim
+share/vim/%%VIM_VER%%/syntax/rebol.vim
+share/vim/%%VIM_VER%%/syntax/remind.vim
+share/vim/%%VIM_VER%%/syntax/rexx.vim
+share/vim/%%VIM_VER%%/syntax/rpcgen.vim
+share/vim/%%VIM_VER%%/syntax/ruby.vim
+share/vim/%%VIM_VER%%/syntax/samba.vim
+share/vim/%%VIM_VER%%/syntax/sas.vim
+share/vim/%%VIM_VER%%/syntax/sather.vim
+share/vim/%%VIM_VER%%/syntax/scheme.vim
+share/vim/%%VIM_VER%%/syntax/sdl.vim
+share/vim/%%VIM_VER%%/syntax/sed.vim
+share/vim/%%VIM_VER%%/syntax/sgml.vim
+share/vim/%%VIM_VER%%/syntax/sgmllnx.vim
+share/vim/%%VIM_VER%%/syntax/sh.vim
+share/vim/%%VIM_VER%%/syntax/sicad.vim
+share/vim/%%VIM_VER%%/syntax/simula.vim
+share/vim/%%VIM_VER%%/syntax/skill.vim
+share/vim/%%VIM_VER%%/syntax/sl.vim
+share/vim/%%VIM_VER%%/syntax/slang.vim
+share/vim/%%VIM_VER%%/syntax/slrnrc.vim
+share/vim/%%VIM_VER%%/syntax/slrnsc.vim
+share/vim/%%VIM_VER%%/syntax/sm.vim
+share/vim/%%VIM_VER%%/syntax/smil.vim
+share/vim/%%VIM_VER%%/syntax/sml.vim
+share/vim/%%VIM_VER%%/syntax/snnsnet.vim
+share/vim/%%VIM_VER%%/syntax/snnspat.vim
+share/vim/%%VIM_VER%%/syntax/snnsres.vim
+share/vim/%%VIM_VER%%/syntax/spec.vim
+share/vim/%%VIM_VER%%/syntax/spice.vim
+share/vim/%%VIM_VER%%/syntax/spup.vim
+share/vim/%%VIM_VER%%/syntax/sql.vim
+share/vim/%%VIM_VER%%/syntax/sqr.vim
+share/vim/%%VIM_VER%%/syntax/squid.vim
+share/vim/%%VIM_VER%%/syntax/st.vim
+share/vim/%%VIM_VER%%/syntax/stp.vim
+share/vim/%%VIM_VER%%/syntax/synload.vim
+share/vim/%%VIM_VER%%/syntax/syntax.vim
+share/vim/%%VIM_VER%%/syntax/tads.vim
+share/vim/%%VIM_VER%%/syntax/tags.vim
+share/vim/%%VIM_VER%%/syntax/tcl.vim
+share/vim/%%VIM_VER%%/syntax/tex.vim
+share/vim/%%VIM_VER%%/syntax/texinfo.vim
+share/vim/%%VIM_VER%%/syntax/tf.vim
+share/vim/%%VIM_VER%%/syntax/tli.vim
+share/vim/%%VIM_VER%%/syntax/tsalt.vim
+share/vim/%%VIM_VER%%/syntax/uil.vim
+share/vim/%%VIM_VER%%/syntax/vb.vim
+share/vim/%%VIM_VER%%/syntax/verilog.vim
+share/vim/%%VIM_VER%%/syntax/vgrindefs.vim
+share/vim/%%VIM_VER%%/syntax/vhdl.vim
+share/vim/%%VIM_VER%%/syntax/vim.vim
+share/vim/%%VIM_VER%%/syntax/viminfo.vim
+share/vim/%%VIM_VER%%/syntax/vrml.vim
+share/vim/%%VIM_VER%%/syntax/web.vim
+share/vim/%%VIM_VER%%/syntax/webmacro.vim
+share/vim/%%VIM_VER%%/syntax/whitespace.vim
+share/vim/%%VIM_VER%%/syntax/winbatch.vim
+share/vim/%%VIM_VER%%/syntax/wml.vim
+share/vim/%%VIM_VER%%/syntax/xdefaults.vim
+share/vim/%%VIM_VER%%/syntax/xmath.vim
+share/vim/%%VIM_VER%%/syntax/xml.vim
+share/vim/%%VIM_VER%%/syntax/xpm.vim
+share/vim/%%VIM_VER%%/syntax/xpm2.vim
+share/vim/%%VIM_VER%%/syntax/xs.vim
+share/vim/%%VIM_VER%%/syntax/xxd.vim
+share/vim/%%VIM_VER%%/syntax/yacc.vim
+share/vim/%%VIM_VER%%/syntax/z8a.vim
+share/vim/%%VIM_VER%%/syntax/zsh.vim
+share/vim/%%VIM_VER%%/tutor/README.txt
+share/vim/%%VIM_VER%%/tutor/tutor
+share/vim/%%VIM_VER%%/menu.vim
+share/vim/%%VIM_VER%%/bugreport.vim
+share/vim/%%VIM_VER%%/vimrc_example.vim
+share/vim/%%VIM_VER%%/gvimrc_example.vim
+share/vim/%%VIM_VER%%/filetype.vim
+share/vim/%%VIM_VER%%/ftoff.vim
+share/vim/%%VIM_VER%%/scripts.vim
+share/vim/%%VIM_VER%%/optwin.vim
+share/vim/%%VIM_VER%%/macros/README.txt
+share/vim/%%VIM_VER%%/macros/diffwin.vim
+share/vim/%%VIM_VER%%/macros/dvorak
+share/vim/%%VIM_VER%%/macros/explorer.vim
+share/vim/%%VIM_VER%%/macros/hanoi/poster
+share/vim/%%VIM_VER%%/macros/hanoi/click.me
+share/vim/%%VIM_VER%%/macros/hanoi/hanoi.vim
+share/vim/%%VIM_VER%%/macros/html
+share/vim/%%VIM_VER%%/macros/justify.vim
+share/vim/%%VIM_VER%%/macros/life/click.me
+share/vim/%%VIM_VER%%/macros/life/life.vim
+share/vim/%%VIM_VER%%/macros/maze/README.txt
+share/vim/%%VIM_VER%%/macros/maze/Makefile
+share/vim/%%VIM_VER%%/macros/maze/maze.c
+share/vim/%%VIM_VER%%/macros/maze/maze_5.78
+share/vim/%%VIM_VER%%/macros/maze/mazeansi.c
+share/vim/%%VIM_VER%%/macros/maze/maze_mac
+share/vim/%%VIM_VER%%/macros/maze/poster
+share/vim/%%VIM_VER%%/macros/shellmenu.vim
+share/vim/%%VIM_VER%%/macros/swapmous.vim
+share/vim/%%VIM_VER%%/macros/urm/urm
+share/vim/%%VIM_VER%%/macros/urm/urm.vim
+share/vim/%%VIM_VER%%/macros/urm/examples
+share/vim/%%VIM_VER%%/macros/urm/README.txt
+share/vim/%%VIM_VER%%/syntax/abaqus.vim
+share/vim/%%VIM_VER%%/syntax/apache.vim
+share/vim/%%VIM_VER%%/syntax/aspperl.vim
+share/vim/%%VIM_VER%%/syntax/bc.vim
+share/vim/%%VIM_VER%%/syntax/ch.vim
+share/vim/%%VIM_VER%%/syntax/conf.vim
+share/vim/%%VIM_VER%%/syntax/csp.vim
+share/vim/%%VIM_VER%%/syntax/cvs.vim
+share/vim/%%VIM_VER%%/syntax/form.vim
+share/vim/%%VIM_VER%%/syntax/hb.vim
+share/vim/%%VIM_VER%%/syntax/jproperties.vim
+share/vim/%%VIM_VER%%/syntax/kscript.vim
+share/vim/%%VIM_VER%%/syntax/latte.vim
+share/vim/%%VIM_VER%%/syntax/mel.vim
+share/vim/%%VIM_VER%%/syntax/nastran.vim
+share/vim/%%VIM_VER%%/syntax/ora.vim
+share/vim/%%VIM_VER%%/syntax/ruby.vim
+share/vim/%%VIM_VER%%/syntax/samba.vim
+share/vim/%%VIM_VER%%/syntax/sml.vim
+share/vim/%%VIM_VER%%/syntax/snnsnet.vim
+share/vim/%%VIM_VER%%/syntax/snnspat.vim
+share/vim/%%VIM_VER%%/syntax/snnsres.vim
+share/vim/%%VIM_VER%%/syntax/stp.vim
+share/vim/%%VIM_VER%%/syntax/tli.vim
+share/vim/%%VIM_VER%%/syntax/webmacro.vim
+share/vim/%%VIM_VER%%/syntax/wml.vim
+share/vim/%%VIM_VER%%/tools/README.txt
+share/vim/%%VIM_VER%%/tools/blink.c
+share/vim/%%VIM_VER%%/tools/ccfilter.1
+share/vim/%%VIM_VER%%/tools/ccfilter.c
+share/vim/%%VIM_VER%%/tools/ccfilter_README.txt
+share/vim/%%VIM_VER%%/tools/efm_filter.pl
+share/vim/%%VIM_VER%%/tools/efm_filter.txt
+share/vim/%%VIM_VER%%/tools/gvimdiff
+share/vim/%%VIM_VER%%/tools/mve.awk
+share/vim/%%VIM_VER%%/tools/mve.txt
+share/vim/%%VIM_VER%%/tools/pltags.pl
+share/vim/%%VIM_VER%%/tools/ref
+share/vim/%%VIM_VER%%/tools/shtags.1
+share/vim/%%VIM_VER%%/tools/shtags.pl
+share/vim/%%VIM_VER%%/tools/tcltags
+share/vim/%%VIM_VER%%/tools/vim132
+share/vim/%%VIM_VER%%/tools/vimm
+share/vim/%%VIM_VER%%/tools/vimspell.sh
+share/vim/%%VIM_VER%%/tools/vimspell.txt
+@dirrm share/vim/%%VIM_VER%%/doc
+@dirrm share/vim/%%VIM_VER%%/macros/hanoi
+@dirrm share/vim/%%VIM_VER%%/macros/life
+@dirrm share/vim/%%VIM_VER%%/macros/maze
+@dirrm share/vim/%%VIM_VER%%/macros/urm
+@dirrm share/vim/%%VIM_VER%%/macros
+@dirrm share/vim/%%VIM_VER%%/syntax
+@dirrm share/vim/%%VIM_VER%%/tools
+@dirrm share/vim/%%VIM_VER%%/tutor
+@dirrm share/vim/%%VIM_VER%%
+@dirrm share/vim