Resurrect the 'vim6' port as Vim 6.4 patchlevel 9. (in preparation for Vim 7)

8 files changed, 684 insertions, 0 deletions

diff --git a/editors/vim6/Makefile b/editors/vim6/Makefile
new file mode 100644
index 000000000000..b71d04b1015b
--- /dev/null
+++ b/editors/vim6/Makefile
@@ -0,0 +1,191 @@
+# 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
+PATCHLEVEL=	9
+PORTVERSION=	6.4.${PATCHLEVEL}
+PORTREVISION?=	0
+CATEGORIES?=	editors
+MASTER_SITES=	${MASTER_SITE_VIM}
+DISTNAME=	vim-${PORTVERSION:C/\.[0-9a-z]*$//}
+
+PATCH_SITES=	${MASTER_SITES:S|unix|patches/${PORTVERSION:C/\.[0-9a-z]*$//}|}
+PATCHFILES!=	/usr/bin/jot -s " " -w ${PORTVERSION:C/\.[0-9]*$//}.%03d  \
+			${PATCHLEVEL} 1 ${PATCHLEVEL}
+#	bits to remove
+BADPATCHES=	000 001
+.for p in ${BADPATCHES}
+PATCHFILES:=	${PATCHFILES:N6.4.${p}}
+.endfor
+
+MAINTAINER?=	obrien@FreeBSD.org
+COMMENT?=	Vi "workalike", with many additional features
+
+SLAVEDIRS=	editors/vim-lite
+
+.if defined(PACKAGE_BUILDING) && !defined(LITE)
+WITH_TCL=	yes
+WITH_PERL=	yes
+WITH_PYTHON=	yes
+WITH_CSCOPE=	yes
+.endif
+
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
+DIST_SUBDIR=	vim
+WRKSRC=		${WRKDIR}/vim${PORTVERSION:C/\.[0-9]*$//:S/.//g}/src
+PATCH_DIST_ARGS= -d ${WRKSRC:S/src$//} --batch --forward --quiet -E ${PATCH_DIST_STRIP}
+# consider
+#PATCH_DIST_ARGS=	-t
+MAKE_ARGS+=	CONF_ARGS="--prefix=${PREFIX} --with-tlib=termlib ${CSCOPE_ARG}"
+ALL_TARGET=	#
+_DATADIR=	${DISTNAME:S/-//g:S/.//g}
+DATADIR=	${PREFIX}/share/vim/${_DATADIR}
+PLIST_SUB=	VIM_VER=${_DATADIR}
+MAN1=		evim.1 vim.1 vimdiff.1 vimtutor.1 xxd.1
+MLINKS=		vim.1 rvim.1	vim.1 rview.1
+.if !defined(LITE)
+MLINKS+=	vim.1 gvim.1	vim.1 gview.1	vimdiff.1 gvimdiff.1 \
+		vim.1 rgvim.1	vim.1 rgview.1	evim.1 eview.1
+.endif
+
+WANT_GNOME=	yes
+
+.if defined(WITH_PYTHON)
+USE_PYTHON=	yes
+MAKE_ARGS+=	CONF_OPT_PYTHON="--enable-pythoninterp"
+.endif
+
+.if defined(WITH_RUBY)
+USE_RUBY=	yes
+MAKE_ARGS+=	CONF_OPT_RUBY="--enable-rubyinterp"
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(LITE)
+MAKE_ARGS+=	CONF_OPT_FEAT="--with-features=big"
+I18N=		CONF_OPT_MULTIBYTE="--enable-multibyte --enable-fontset --enable-xim"
+
+.if defined(NO_GUI)
+WITHOUT_X11=	yes
+.endif
+
+.if defined(WITH_CSCOPE)
+RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
+MAKE_ARGS+=	CONF_OPT_CSCOPE="--enable-cscope"
+.endif
+
+.if defined(WITH_PERL)
+USE_PERL5=	yes
+MAKE_ARGS+=	CONF_OPT_PERL="--enable-perlinterp"
+.endif
+
+.if defined(WITH_TCL)
+BUILD_DEPENDS=	tclsh8.4:${PORTSDIR}/lang/tcl84
+LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
+MAKE_ARGS+=	CONF_OPT_TCL="--enable-tclinterp"
+.endif
+
+.if !defined(WITHOUT_X11)
+#	for now default the GUI to the GTK+ one
+#	will be reviewed when the GTK+ 1.{3,4} behemoth is released
+.if !defined(WITH_ATHENA) && !defined(WITH_MOTIF) && !defined(WITH_GNOME) && !defined(WITH_GTK2)
+WITH_GNOME=	gtk12
+.endif
+
+.if defined(WITH_ATHENA)
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=athena" ${I18N}
+.elif defined(WITH_GTK2)
+USE_GNOME=	gtk20
+PKGNAMESUFFIX=	-gtk2
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
+.elif defined(WITH_GNOME)
+.if ${WITH_GNOME:Mgnomelibs}!="" || ${WITH_GNOME}=="yes" || \
+	${WITH_GNOME}=="1"
+USE_GNOME=	gnomelibs gnomeprefix
+PKGNAMESUFFIX=	-gnome
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gnome --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
+.else
+USE_GNOME=	gtk12
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE}" ${I18N}
+MAKE_ARGS+=	X_LIBS="$(X_LIBS) -lXt"
+.endif
+.elif defined(WITH_MOTIF)
+USE_MOTIF=	yes
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=motif --with-motif-lib=\"${MOTIFLIB}\"" MOTIFHOME=${X11BASE} ${I18N}
+.endif
+.else	# WITHOUT_X11
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x" ${I18N}
+.endif	# WITHOUT_X11
+
+.else	# LITE
+PKGNAMESUFFIX=	-lite
+MAKE_ARGS+=	CONF_OPT_GUI="--enable-gui=no --without-x --enable-multibyte"
+MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable-tclinterp --disable-rubyinterp"
+.endif	# LITE
+
+.if exists(${PREFIX}/lib/libiconv.so)
+USE_ICONV=	yes
+.endif
+
+pre-configure:
+	@(cd ${WRKSRC} ; ${MAKE} distclean)
+	@${REINPLACE_CMD} -e ' \
+		s|\$$gtk_config_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
+		s|\$$gtk_config_exec_prefix/bin/gtk-config|\$${GTK_CONFIG}|g; \
+		s|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/auto/configure
+
+#	Clean up junk files to keep them from being installed.
+pre-install:
+	@${RM} -f ${WRKSRC}/../runtime/macros/maze/*.orig
+
+post-install:
+	[ -e ${PREFIX}/bin/gvim ] || (cd ${PREFIX}/bin ; ${LN} -sf vim gvim)
+	#	below needed for `vim-lite' port
+	${TEST} -e ${PREFIX}/bin/rgvim  || (cd ${PREFIX}/bin ; ${LN} -sf vim rgvim)
+	${TEST} -e ${PREFIX}/bin/gview  || (cd ${PREFIX}/bin ; ${LN} -sf vim gview)
+	${TEST} -e ${PREFIX}/bin/rgview || (cd ${PREFIX}/bin ; ${LN} -sf vim rgview)
+	${TEST} -e ${PREFIX}/bin/evim   || (cd ${PREFIX}/bin ; ${LN} -sf vim evim)
+	${TEST} -e ${PREFIX}/bin/eview  || (cd ${PREFIX}/bin ; ${LN} -sf vim eview)
+	${TEST} -e ${PREFIX}/bin/gvimdiff  \
+		|| (cd ${PREFIX}/bin ; ${LN} -sf vim gvimdiff)
+	${INSTALL_DATA} ${FILESDIR}/vietnamese_viscii.vim ${DATADIR}/keymap
+	cd ${PREFIX} ;\
+	    ${FIND} share/vim/${_DATADIR} -type f -o -type l	\
+	    	| ${SORT}					\
+	    	>${WRKDIR}/PLIST.share-vim
+	cd ${PREFIX} ;\
+	    ${FIND} share/vim/${_DATADIR} -type d		\
+	    	| ${SORT} -r | ${SED} -e 's/^/@dirrm /g'	\
+		>>${WRKDIR}/PLIST.share-vim
+	${ECHO_CMD} "r ${TMPPLIST}"			> ${WRKDIR}/ex.script
+	${ECHO_CMD} "/Insert PLIST.share-vim"		>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "d"					>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "r ${WRKDIR}/PLIST.share-vim"	>> ${WRKDIR}/ex.script
+	${ECHO_CMD} "x!"				>> ${WRKDIR}/ex.script
+	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre-share-vim
+	cd ${WRKDIR} ; ex < ex.script
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
+
+cklatest:
+	@-ncftpls \
+	    ftp://ftp.vim.org/pub/vim/patches/${PORTVERSION:C/\.[0-9a-z]*$//}/ \
+		| fgrep ${PORTVERSION:C/[0-9]*$//} | ${TAIL}
+
+find-bad-patches:
+	cd ${DISTDIR} ; egrep -l \
+		'(src/os_win32|src/os_mswin|src/if_ole|src/proto/gui_w32|src/gui_w48|src/gui_mac|src/os_(riscos|cyg|vms))'\
+		vim/${PORTVERSION:C/\.[0-9a-z]*$//}*
+
+.include <bsd.port.post.mk>
diff --git a/editors/vim6/distinfo b/editors/vim6/distinfo
new file mode 100644
index 000000000000..ef7d23554574
--- /dev/null
+++ b/editors/vim6/distinfo
@@ -0,0 +1,27 @@
+MD5 (vim/vim-6.4.tar.bz2) = 774c14d93ce58674b3b2c880edd12d77
+SHA256 (vim/vim-6.4.tar.bz2) = 5141ff8c7ed8ddc769fcf3b2bda386c6255d72163ae6727d8a6031d749be9f95
+SIZE (vim/vim-6.4.tar.bz2) = 3737338
+MD5 (vim/6.4.002) = ac408535c97031cb8351b771c1723dcb
+SHA256 (vim/6.4.002) = c44bdbe513c9dcb87249415171f32b1bb7321663cc8a891220b833376c7eee91
+SIZE (vim/6.4.002) = 7802
+MD5 (vim/6.4.003) = 591a6164c46792f7b41039e979148514
+SHA256 (vim/6.4.003) = 53020fcb1c995f8bb8f97f5d7f15ebb35d64ab3317c669408d8b299f84322290
+SIZE (vim/6.4.003) = 1463
+MD5 (vim/6.4.004) = 89de2693da138c37adfd10fdce957758
+SHA256 (vim/6.4.004) = 90e75fb62818ab6747f5bb8448e5bd6a9f5923af74dcb72ba7c8bef89c43af3d
+SIZE (vim/6.4.004) = 1581
+MD5 (vim/6.4.005) = 362dd6214af5cf5436bd616f148d22f1
+SHA256 (vim/6.4.005) = bfb2965c3859bedda122dc46e2b6c037652aadcc1f30bd9e7ea689def0229f72
+SIZE (vim/6.4.005) = 1577
+MD5 (vim/6.4.006) = 82a1ca21cec39b3624036247f4f40fdc
+SHA256 (vim/6.4.006) = 1fe6be6a4e5378428adb92cf4d783ac3ab52613badf45444b2d01eed0e8cf76b
+SIZE (vim/6.4.006) = 2320
+MD5 (vim/6.4.007) = 253152bc93743b464f08f9f5d831fe52
+SHA256 (vim/6.4.007) = 6888aa7d8d8fc786a07a834676cdf5bf6d0c70777008cd7518b0c5748e9359a8
+SIZE (vim/6.4.007) = 1717
+MD5 (vim/6.4.008) = b4f9997af33d3f857327e4fede95ac3f
+SHA256 (vim/6.4.008) = 14b28c32ad8c2529d7051461c55210d511bd8965a96e9b4295d2788c9fd90c47
+SIZE (vim/6.4.008) = 2199
+MD5 (vim/6.4.009) = 7ccdd6044b9fdd42f544fdb4d179f9e5
+SHA256 (vim/6.4.009) = 15fb7942d7612bf775570e28213af06a182e39ef125e87d1059254652fc2721a
+SIZE (vim/6.4.009) = 2653
diff --git a/editors/vim6/files/patch-01 b/editors/vim6/files/patch-01
new file mode 100644
index 000000000000..b0da2e79e2e4
--- /dev/null
+++ b/editors/vim6/files/patch-01
@@ -0,0 +1,117 @@
+--- Makefile.orig	Sun Jun  1 06:18:29 2003
++++ Makefile	Sat Nov  1 15:39:09 2003
+@@ -256,7 +256,7 @@
+ #DO NOT CHANGE the next line, we need it for configure to find the compiler
+ #instead of using the default from the "make" program.
+ #Use a line further down to change the value for CC.
+-CC=
++#CC=
+ 
+ # Change and use these defines if configure cannot find your Motif stuff.
+ # Unfortunately there is no "standard" location for Motif. {{{
+@@ -288,6 +288,7 @@
+ # of make, will buid Vim.
+ 
+ # CONFIGURE - configure arguments {{{1
++CONF_ARGS = --prefix=$(PREFIX)
+ # You can give a lot of options to configure.
+ # Change this to your desire and do 'make config' afterwards
+ 
+@@ -1794,40 +1795,40 @@
+ installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
+ 
+ $(DEST_BIN)/$(EXTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
++	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EXTARGET)
+ 
+ $(DEST_BIN)/$(VIEWTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET)
++	#cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIEWTARGET)
+ 
+ $(DEST_BIN)/$(GVIMTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMTARGET)
+ 
+ $(DEST_BIN)/$(GVIEWTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIEWTARGET)
+ 
+ $(DEST_BIN)/$(RVIMTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIMTARGET)
+ 
+ $(DEST_BIN)/$(RVIEWTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RVIEWTARGET)
+ 
+ $(DEST_BIN)/$(RGVIMTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIMTARGET)
+ 
+ $(DEST_BIN)/$(RGVIEWTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(RGVIEWTARGET)
+ 
+ $(DEST_BIN)/$(VIMDIFFTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(VIMDIFFTARGET)
+ 
+ $(DEST_BIN)/$(GVIMDIFFTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(GVIMDIFFTARGET)
+ 
+ $(DEST_BIN)/$(EVIMTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIMTARGET)
+ 
+ $(DEST_BIN)/$(EVIEWTARGET):
+-	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET)
++	cd $(DEST_BIN); ln -sf $(VIMTARGET) $(EVIEWTARGET)
+ 
+ # 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.
+@@ -1845,34 +1846,34 @@
+ 			$(DEST_MAN)/$(EVIEWNAME).1
+ 
+ $(DEST_MAN)/$(EXNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(EXNAME).1
++	#cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(EXNAME).1
+ 
+ $(DEST_MAN)/$(VIEWNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(VIEWNAME).1
++	#cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(VIEWNAME).1
+ 
+ $(DEST_MAN)/$(GVIMNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIMNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIMNAME).1
+ 
+ $(DEST_MAN)/$(GVIEWNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(GVIEWNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(GVIEWNAME).1
+ 
+ $(DEST_MAN)/$(RVIMNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIMNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIMNAME).1
+ 
+ $(DEST_MAN)/$(RVIEWNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RVIEWNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RVIEWNAME).1
+ 
+ $(DEST_MAN)/$(RGVIMNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIMNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIMNAME).1
+ 
+ $(DEST_MAN)/$(RGVIEWNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMNAME).1 $(RGVIEWNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMNAME).1 $(RGVIEWNAME).1
+ 
+ $(DEST_MAN)/$(GVIMDIFFNAME).1:
+-	cd $(DEST_MAN); ln -s $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
++	cd $(DEST_MAN); ln -sf $(VIMDIFFNAME).1 $(GVIMDIFFNAME).1
+ 
+ $(DEST_MAN)/$(EVIEWNAME).1:
+-	cd $(DEST_MAN); ln -s $(EVIMNAME).1 $(EVIEWNAME).1
++	cd $(DEST_MAN); ln -sf $(EVIMNAME).1 $(EVIEWNAME).1
+ 
+ uninstall: uninstall_runtime
+ 	-rm -f $(DEST_BIN)/$(VIMTARGET)
diff --git a/editors/vim6/files/patch-configure b/editors/vim6/files/patch-configure
new file mode 100644
index 000000000000..def640982ee2
--- /dev/null
+++ b/editors/vim6/files/patch-configure
@@ -0,0 +1,11 @@
+--- auto/configure.orig	Sat Oct 15 05:55:10 2005
++++ auto/configure	Sun Oct 23 18:13:17 2005
+@@ -2184,7 +2184,7 @@ echo "configure:2177: checking for locat
+ 	    echo "$ac_t""$try/tclConfig.sh" 1>&6
+ 	    . $try/tclConfig.sh
+ 	    	    TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
+-	    	    	    TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\ /\X/' | tr ' ' '\012' | sed -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
++	    	    	    TCL_DEFS=`echo $TCL_DEFS       | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr -d '\012'`
+ 	    break
+ 	  fi
+ 	done
diff --git a/editors/vim6/files/vietnamese_viscii.vim b/editors/vim6/files/vietnamese_viscii.vim
new file mode 100644
index 000000000000..0f6df2de654f
--- /dev/null
+++ b/editors/vim6/files/vietnamese_viscii.vim
@@ -0,0 +1,286 @@
+" $FreeBSD$
+" vim:ts=8
+"
+"   VIQR input
+"
+"	RFC 1456 Vietnamese Standardization Working Group,
+"	Conventions for Encoding the Vietnamese Language
+"	VISCII: VIetnamese Standard Code for Information Interchange
+"	VIQR: VIetnamese Quoted-Readable Specification Revision 1.1",
+"	May 1993.
+"
+set isprint=@,002,005-006,020,025,128-255
+"
+"letter Á
+imap	A'	193
+"letter À
+imap	A`	192
+"letter Ä
+imap	A?	196
+"letter Ã
+imap	A~	195
+"letter €
+imap	A.	128
+"letter Å
+imap	A(	197
+"letter �
+imap	197'	129
+"letter ‚
+imap	197`	130
+"letter 
+imap	197?	002
+"letter 
+imap	197~	005
+"letter ƒ
+imap	197.	131
+"letter Â
+imap	A^	194
+"letter „
+imap	194'	132
+"letter …
+imap	194`	133
+"letter †
+imap	194?	134
+"letter 
+imap	194~	006
+"letter ‡
+imap	194.	135
+"letter Ð
+imap	DD	208
+imap	Dd	208
+"letter É
+imap	E'	201
+"letter È
+imap	E`	200
+"letter Ë
+imap	E?	203
+"letter ˆ
+imap	E~	136
+"letter ‰
+imap	E.	137
+"letter Ê
+imap	E^	202
+"letter Š
+imap	202'	138
+"letter ‹
+imap	202`	139
+"letter Œ
+imap	202?	140
+"letter �
+imap	202~	141
+"letter Ž
+imap	202.	142
+"letter Í
+imap	I'	205
+"letter Ì
+imap	I`	204
+"letter ›
+imap	I?	155
+"letter Î
+imap	I~	206
+"letter ˜
+imap	I.	152
+"letter Ó
+imap	O'	211
+"letter Ò
+imap	O`	210
+"letter ™
+imap	O?	153
+"letter  
+"imap	O~	213  -- bug in encoding  213 --> a.
+imap	O~	160
+"letter š
+imap	O.	154
+"letter Ô
+imap	O^	212
+"letter �
+imap	212'	143
+"letter �
+imap	212`	144
+"letter ‘
+imap	212?	145
+"letter ’
+imap	212~	146
+"letter “
+imap	212.	147
+"letter ´
+imap	O+	180
+"letter •
+imap	180'	149
+"letter –
+imap	180`	150
+"letter —
+imap	180?	151
+"letter ³
+imap	180~	179
+"letter ”
+imap	180.	148
+"letter Ú
+imap	U'	218
+"letter Ù
+imap	U`	217
+"letter œ
+imap	U?	156
+"letter �
+imap	U~	157
+"letter ž
+imap	U.	158
+"letter ¿
+imap	U+	191
+"letter º
+imap	191'	186
+"letter »
+imap	191`	187
+"letter ¼
+imap	191?	188
+"letter ÿ
+imap	191~	255
+"letter ¹
+imap	191.	185
+"letter Ý
+imap	Y'	221
+"letter Ÿ
+imap	Y`	159
+"letter 
+imap	Y?	020
+"letter 
+imap	Y~	025
+"letter 
+imap	Y.	030
+"letter á
+imap	a'	225
+"letter à
+imap	a`	224
+"letter ä
+imap	a?	228
+"letter ã
+imap	a~	227
+"letter Õ
+"imap	a.	160  bug in encoding -- 160 --> O~
+imap	a.	213
+"letter å
+imap	a(	229
+"letter ¡
+imap	229'	161
+"letter ¢
+imap	229`	162
+"letter Æ
+imap	229?	198
+"letter Ç
+imap	229~	199
+"letter £
+imap	229.	163
+"letter â
+imap	a^	226
+"letter ¤
+imap	226'	164
+"letter ¥
+imap	226`	165
+"letter ¦
+imap	226?	166
+"letter ç
+imap	226~	231
+"letter §
+imap	226.	167
+"letter ð
+imap	dd	240
+"letter é
+imap	e'	233
+"letter è
+imap	e`	232
+"letter ë
+imap	e?	235
+"letter ¨
+imap	e~	168
+"letter ©
+imap	e.	169
+"letter ê
+imap	e^	234
+"letter ª
+imap	234'	170
+"letter «
+imap	234`	171
+"letter ¬
+imap	234?	172
+"letter ­
+imap	234~	173
+"letter ®
+imap	234.	174
+"letter í
+imap	i'	237
+"letter ì
+imap	i`	236
+"letter ï
+imap	i?	239
+"letter î
+imap	i~	238
+"letter ¸
+imap	i.	184
+"letter ó
+imap	o'	243
+"letter ò
+imap	o`	242
+"letter ö
+imap	o?	246
+"letter õ
+imap	o~	245
+"letter ÷
+imap	o.	247
+"letter ô
+imap	o^	244
+"letter ¯
+imap	244'	175
+"letter °
+imap	244`	176
+"letter ±
+imap	244?	177
+"letter ²
+imap	244~	178
+"letter µ
+imap	244.	181
+"letter ½
+imap	o+	189
+"letter ¾
+imap	189'	190
+"letter ¶
+imap	189`	182
+"letter ·
+imap	189?	183
+"letter Þ
+imap	189~	222
+"letter þ
+imap	189.	254
+"letter ú
+imap	u'	250
+"letter ù
+imap	u`	249
+"letter ü
+imap	u?	252
+"letter û
+imap	u~	251
+"letter ø
+imap	u.	248
+"letter ß
+imap	u+	223
+"letter Ñ
+imap	223'	209
+"letter ×
+imap	223`	215
+"letter Ø
+imap	223?	216
+"letter æ
+imap	223~	230
+"letter ñ
+imap	223.	241
+"letter ý
+imap	y'	253
+"letter Ï
+imap	y`	207
+"letter Ö
+imap	y?	214
+"letter Û
+imap	y~	219
+"letter Ü
+imap	y.	220
+	"
+	"	END OF VIQR input support
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-message b/editors/vim6/pkg-message
new file mode 100644
index 000000000000..066bbb9cb5ef
--- /dev/null
+++ b/editors/vim6/pkg-message
@@ -0,0 +1,6 @@
+SECURITY NOTE: The VIM software has had several remote vulnerabilities
+discovered within VIM's modeline support.  It allowed remote attackers to
+execute arbitrary code as the user running VIM.  All known problems
+have been fixed, but the FreeBSD Security Team advises that VIM users
+use 'set nomodeline' in ~/.vimrc to avoid the possibility of trojaned
+text files.
diff --git a/editors/vim6/pkg-plist b/editors/vim6/pkg-plist
new file mode 100644
index 000000000000..e0047f3f4545
--- /dev/null
+++ b/editors/vim6/pkg-plist
@@ -0,0 +1,22 @@
+@comment $FreeBSD$
+bin/vim
+bin/vimtutor
+bin/xxd
+@comment bin/ex
+@comment bin/gex
+bin/eview
+bin/evim
+bin/gview
+bin/gvim
+bin/rgview
+bin/rgvim
+bin/rview
+bin/rvim
+bin/vimdiff
+bin/gvimdiff
+@comment bin/view
+@exec mkdir -p %D/share/vim/%%VIM_VER%%/lang
+@comment Insert PLIST.share-vim here
+@comment -=[ begin PLIST.share-vim ]=-
+@comment -=[ end PLIST.share-vim ]=-
+@dirrm share/vim