Make way for a new glorious vim package structure

7 files changed, 52 insertions, 392 deletions

diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index bdd97e0a6c7..2963cfd081d 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,40 +1,31 @@
-# $NetBSD: Makefile,v 1.26 1999/11/28 23:50:37 tron Exp $
+# $NetBSD: Makefile,v 1.27 1999/12/21 13:18:05 pooka Exp $
 
-DISTNAME=		vim-5.5
-CATEGORIES=		editors
-MASTER_SITES=		ftp://ftp.vim.org/pub/editors/vim/unix/ \
-			ftp://ftp.nuxi.com/pub/vim/unix/ \
-			ftp://ftp.fu-berlin.de/misc/editors/vim/unix/ \
-			ftp://ftp.medasys-digital-systems.fr/pub/vim/unix/ \
-			ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
-DISTFILES=		${DISTNAME}-src${EXTRACT_SUFX} \
-			${DISTNAME}-rt${EXTRACT_SUFX}
+.include		"../vim-share/Makefile.common"
 
-MAINTAINER=		pooka@iki.fi
-HOMEPAGE=		http://www.vim.org/
+PKGNAME=		vim-${VIM_VERSION}
 
-CONFLICTS=		vim-gtk-*
+DEPENDS+=		vim-share-${VIM_VERSION}:../vim-share
 
-GNU_CONFIGURE=		yes
-USE_X11=		yes
-USE_XAW=		yes
-CONFIGURE_ARGS+=	--enable-gui=athena --with-tlib=ncurses
-CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses' termcap.h
-LDFLAGS+=		-L${LOCALBASE}/lib	# for -lncurses
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFLICTS=		vim-xaw-* vim-gtk-*
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/src
+CONFIGURE_ARGS+=	--disable-gui --with-tlib=ncurses
+CPPFLAGS+=              -I${LOCALBASE}/include  # for ncurses' termcap.h
+LDFLAGS+=               -L${LOCALBASE}/lib      # for -lncurses
+CONFIGURE_ENV+=         CPPFLAGS="${CPPFLAGS}"
+
+ALL_TARGET=		vim
+INSTALL_TARGET=		installvimbin
 
 .include "../../mk/bsd.prefs.mk"
 
 .if (${OPSYS} == "NetBSD")
-DEPENDS=		ncurses-4.2:../../devel/ncurses
+DEPENDS+=               ncurses-4.2:../../devel/ncurses
 .endif
 
-.include "../../mk/bsd.pkg.mk"
+post-install:
+	@${LN} ${PREFIX}/bin/vim ${PREFIX}/bin/ex
+	@${LN} ${PREFIX}/bin/vim ${PREFIX}/bin/view
+	@${LN} ${PREFIX}/bin/vim ${PREFIX}/bin/rvim
+	@${LN} ${PREFIX}/bin/vim ${PREFIX}/bin/rview
 
-.if (${XAW_TYPE} == "standard")
-MAKE_ENV+=		XAW_LIB=Xaw
-.else
-MAKE_ENV+=		XAW_LIB=Xaw3d
-.endif
+.include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim/files/patch-sum b/editors/vim/files/patch-sum
index 678ad070632..905d3354e73 100644
--- a/editors/vim/files/patch-sum
+++ b/editors/vim/files/patch-sum
@@ -1,8 +1,4 @@
-$NetBSD: patch-sum,v 1.7 1999/11/25 20:20:33 tron Exp $
+$NetBSD: patch-sum,v 1.8 1999/12/21 13:18:06 pooka Exp $
 
-MD5 (patch-aa) = caa181ba83b02f273da5df192f32b7b8
-MD5 (patch-ab) = 951d4e8cdc4a7405601c21515c013af8
-MD5 (patch-ac) = e53e72a98abbb723d60c03b8bf1fc55d
-MD5 (patch-ad) = 978580aca00cf8c29148c2fcaa754c64
-MD5 (patch-ae) = 825ca437b006374928bda2501ea3ca1f
-MD5 (patch-af) = d718b63274bac0ff1d02036678cf876c
+MD5 (patch-ab) = e53e72a98abbb723d60c03b8bf1fc55d
+MD5 (patch-ac) = 978580aca00cf8c29148c2fcaa754c64
diff --git a/editors/vim/patches/patch-ab b/editors/vim/patches/patch-ab
index 7d66d1cc025..2a4905972c4 100644
--- a/editors/vim/patches/patch-ab
+++ b/editors/vim/patches/patch-ab
@@ -1,23 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1999/11/22 08:49:15 tron Exp $
+$NetBSD: patch-ab,v 1.5 1999/12/21 13:18:07 pooka Exp $
 
---- ctags/Makefile.in.orig	Thu Sep 16 08:02:20 1999
-+++ ctags/Makefile.in	Sat Nov 20 11:42:47 1999
-@@ -79,14 +79,14 @@
- #
- manext	= 1
- man1dir	= $(mandir)/man1
--CMAN	= $(CTAGS_PROG).$(manext)
--EMAN	= $(ETAGS_PROG).$(manext)
-+CMAN	= vim-$(CTAGS_PROG).$(manext)
-+EMAN	= vim-$(ETAGS_PROG).$(manext)
- 
- #
- # destinations for installed files
- #
--CTAGS_EXEC	= $(CTAGS_PROG)$(SUFFIX)
--ETAGS_EXEC	= $(ETAGS_PROG)$(SUFFIX)
-+CTAGS_EXEC	= vim-$(CTAGS_PROG)
-+ETAGS_EXEC	= vim-$(ETAGS_PROG)
- DEST_CTAGS	= $(bindir)/$(CTAGS_EXEC)
- DEST_ETAGS	= $(bindir)/$(ETAGS_EXEC)
- DEST_CMAN	= $(man1dir)/$(CMAN)
+--- config.mk.in.orig	Sat Jun 20 15:22:37 1998
++++ config.mk.in	Sun Jan 10 23:22:48 1999
+@@ -14,7 +14,7 @@
+ @SET_MAKE@
+ CC		= @CC@
+ DEFS		= @DEFS@
+-CFLAGS		= @CFLAGS@
++CFLAGS		= @CFLAGS@ @CPPFLAGS@
+ srcdir		= @srcdir@
+ VPATH		= @srcdir@
+ LDFLAGS		= @LDFLAGS@
diff --git a/editors/vim/patches/patch-ac b/editors/vim/patches/patch-ac
index 11b0850db31..90987647e71 100644
--- a/editors/vim/patches/patch-ac
+++ b/editors/vim/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 1999/01/10 22:29:39 tron Exp $
+$NetBSD: patch-ac,v 1.2 1999/12/21 13:18:07 pooka Exp $
 
---- config.mk.in.orig	Sat Jun 20 15:22:37 1998
-+++ config.mk.in	Sun Jan 10 23:22:48 1999
-@@ -14,7 +14,7 @@
- @SET_MAKE@
- CC		= @CC@
- DEFS		= @DEFS@
--CFLAGS		= @CFLAGS@
-+CFLAGS		= @CFLAGS@ @CPPFLAGS@
- srcdir		= @srcdir@
- VPATH		= @srcdir@
- LDFLAGS		= @LDFLAGS@
+--- feature.h.orig	Sat Aug 21 14:08:09 1999
++++ feature.h	Sat Nov 20 11:45:33 1999
+@@ -346,7 +346,7 @@
+  *			(used only with NO_BUILTIN_TCAPS not defined).
+  */
+ #ifdef HAVE_TGETENT
+-/* #define NO_BUILTIN_TCAPS */
++#define NO_BUILTIN_TCAPS
+ #endif
+ 
+ #ifndef NO_BUILTIN_TCAPS
diff --git a/editors/vim/pkg/COMMENT b/editors/vim/pkg/COMMENT
index bea6e762514..472b071f465 100644
--- a/editors/vim/pkg/COMMENT
+++ b/editors/vim/pkg/COMMENT
@@ -1 +1 @@
-almost compatible Vi editor with optional X11 GUI
+vim editor without gui
diff --git a/editors/vim/pkg/DESCR b/editors/vim/pkg/DESCR
index 9b27212d3de..dd213cbb267 100644
--- a/editors/vim/pkg/DESCR
+++ b/editors/vim/pkg/DESCR
@@ -1,8 +1,10 @@
 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.  There is also a
-Graphical User Interface (GUI) available.  See doc/vi_diff.txt.
+on-line help, filename completion, block operations, etc. See doc/vi_diff.txt.
 
 If you are building the package from source you may want to enable some 
 features such as a perl or python interpreter which are not enabled by 
 default.
+
+This version does not contain a gui. If you want one, look at vim-xaw or
+vim-gtk.
diff --git a/editors/vim/pkg/PLIST b/editors/vim/pkg/PLIST
index 668f380bf98..0d07aecb255 100644
--- a/editors/vim/pkg/PLIST
+++ b/editors/vim/pkg/PLIST
@@ -1,325 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 1999/11/22 08:49:16 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 1999/12/21 13:18:12 pooka Exp $
 bin/vim
-bin/gvim
-bin/gview
-bin/rgvim
-bin/rgview
 bin/ex
 bin/view
 bin/rvim
 bin/rview
-bin/vimtutor
-bin/vim-ctags
-bin/vim-etags
-bin/xxd
-man/man1/vim.1
-man/man1/vimtutor.1
-man/man1/gvim.1
-man/man1/gview.1
-man/man1/rgvim.1
-man/man1/rgview.1
-man/man1/ex.1
-man/man1/view.1
-man/man1/rvim.1
-man/man1/rview.1
-man/man1/vim-ctags.1
-man/man1/vim-etags.1
-man/man1/xxd.1
-share/doc/vim/autocmd.txt
-share/doc/vim/windows.txt
-share/doc/vim/visual.txt
-share/doc/vim/vi_diff.txt
-share/doc/vim/version5.txt
-share/doc/vim/version4.txt
-share/doc/vim/various.txt
-share/doc/vim/undo.txt
-share/doc/vim/uganda.txt
-share/doc/vim/todo.txt
-share/doc/vim/tips.txt
-share/doc/vim/term.txt
-share/doc/vim/tagsearch.txt
-share/doc/vim/syntax.txt
-share/doc/vim/starting.txt
-share/doc/vim/scroll.txt
-share/doc/vim/rightleft.txt
-share/doc/vim/repeat.txt
-share/doc/vim/recover.txt
-share/doc/vim/quotes.txt
-share/doc/vim/quickfix.txt
-share/doc/vim/pattern.txt
-share/doc/vim/os_win32.txt
-share/doc/vim/os_vms.txt
-share/doc/vim/os_unix.txt
-share/doc/vim/os_riscos.txt
-share/doc/vim/os_os2.txt
-share/doc/vim/os_msdos.txt
-share/doc/vim/os_mint.txt
-share/doc/vim/os_mac.txt
-share/doc/vim/os_dos.txt
-share/doc/vim/os_beos.txt
-share/doc/vim/os_amiga.txt
-share/doc/vim/options.txt
-share/doc/vim/multibyte.txt
-share/doc/vim/motion.txt
-share/doc/vim/message.txt
-share/doc/vim/map.txt
-share/doc/vim/intro.txt
-share/doc/vim/insert.txt
-share/doc/vim/index.txt
-share/doc/vim/if_tcl.txt
-share/doc/vim/if_sniff.txt
-share/doc/vim/if_python.txt
-share/doc/vim/if_perl.txt
-share/doc/vim/if_ole.txt
-share/doc/vim/if_cscope.txt
-share/doc/vim/howto.txt
-share/doc/vim/help.txt
-share/doc/vim/hangulin.txt
-share/doc/vim/gui_x11.txt
-share/doc/vim/gui_w32.txt
-share/doc/vim/gui.txt
-share/doc/vim/farsi.txt
-share/doc/vim/eval.txt
-share/doc/vim/editing.txt
-share/doc/vim/digraph.txt
-share/doc/vim/develop.txt
-share/doc/vim/cmdline.txt
-share/doc/vim/change.txt
-share/doc/vim/tags
-share/doc/vim/vim2html.pl
-share/vim/vim55/syntax/2html.vim
-share/vim/vim55/syntax/z8a.vim
-share/vim/vim55/syntax/yacc.vim
-share/vim/vim55/syntax/xxd.vim
-share/vim/vim55/syntax/xs.vim
-share/vim/vim55/syntax/xpm.vim
-share/vim/vim55/syntax/xml.vim
-share/vim/vim55/syntax/xmath.vim
-share/vim/vim55/syntax/xdefaults.vim
-share/vim/vim55/syntax/winbatch.vim
-share/vim/vim55/syntax/whitespace.vim
-share/vim/vim55/syntax/web.vim
-share/vim/vim55/syntax/vrml.vim
-share/vim/vim55/syntax/viminfo.vim
-share/vim/vim55/syntax/vim.vim
-share/vim/vim55/syntax/vhdl.vim
-share/vim/vim55/syntax/vgrindefs.vim
-share/vim/vim55/syntax/verilog.vim
-share/vim/vim55/syntax/vb.vim
-share/vim/vim55/syntax/uil.vim
-share/vim/vim55/syntax/tsalt.vim
-share/vim/vim55/syntax/tf.vim
-share/vim/vim55/syntax/tex.vim
-share/vim/vim55/syntax/tcl.vim
-share/vim/vim55/syntax/tags.vim
-share/vim/vim55/syntax/syntax.vim
-share/vim/vim55/syntax/synload.vim
-share/vim/vim55/syntax/st.vim
-share/vim/vim55/syntax/squid.vim
-share/vim/vim55/syntax/sql.vim
-share/vim/vim55/syntax/spup.vim
-share/vim/vim55/syntax/spice.vim
-share/vim/vim55/syntax/spec.vim
-share/vim/vim55/syntax/smil.vim
-share/vim/vim55/syntax/sm.vim
-share/vim/vim55/syntax/slrnsc.vim
-share/vim/vim55/syntax/slrnrc.vim
-share/vim/vim55/syntax/slang.vim
-share/vim/vim55/syntax/sl.vim
-share/vim/vim55/syntax/skill.vim
-share/vim/vim55/syntax/simula.vim
-share/vim/vim55/syntax/sicad.vim
-share/vim/vim55/syntax/sh.vim
-share/vim/vim55/syntax/sgmllnx.vim
-share/vim/vim55/syntax/sgml.vim
-share/vim/vim55/syntax/sed.vim
-share/vim/vim55/syntax/sdl.vim
-share/vim/vim55/syntax/scheme.vim
-share/vim/vim55/syntax/sather.vim
-share/vim/vim55/syntax/sas.vim
-share/vim/vim55/syntax/rpcgen.vim
-share/vim/vim55/syntax/rexx.vim
-share/vim/vim55/syntax/rebol.vim
-share/vim/vim55/syntax/rc.vim
-share/vim/vim55/syntax/radiance.vim
-share/vim/vim55/syntax/python.vim
-share/vim/vim55/syntax/purifylog.vim
-share/vim/vim55/syntax/ptcap.vim
-share/vim/vim55/syntax/prolog.vim
-share/vim/vim55/syntax/procmail.vim
-share/vim/vim55/syntax/pov.vim
-share/vim/vim55/syntax/postscr.vim
-share/vim/vim55/syntax/pod.vim
-share/vim/vim55/syntax/po.vim
-share/vim/vim55/syntax/plsql.vim
-share/vim/vim55/syntax/pine.vim
-share/vim/vim55/syntax/pike.vim
-share/vim/vim55/syntax/phtml.vim
-share/vim/vim55/syntax/php3.vim
-share/vim/vim55/syntax/perl.vim
-share/vim/vim55/syntax/pccts.vim
-share/vim/vim55/syntax/pcap.vim
-share/vim/vim55/syntax/pascal.vim
-share/vim/vim55/syntax/opl.vim
-share/vim/vim55/syntax/ocaml.vim
-share/vim/vim55/syntax/objc.vim
-share/vim/vim55/syntax/nroff.vim
-share/vim/vim55/syntax/nosyntax.vim
-share/vim/vim55/syntax/ncf.vim
-share/vim/vim55/syntax/nasm.vim
-share/vim/vim55/syntax/muttrc.vim
-share/vim/vim55/syntax/msql.vim
-share/vim/vim55/syntax/mp.vim
-share/vim/vim55/syntax/modula3.vim
-share/vim/vim55/syntax/modula2.vim
-share/vim/vim55/syntax/modsim3.vim
-share/vim/vim55/syntax/model.vim
-share/vim/vim55/syntax/mib.vim
-share/vim/vim55/syntax/mf.vim
-share/vim/vim55/syntax/matlab.vim
-share/vim/vim55/syntax/master.vim
-share/vim/vim55/syntax/masm.vim
-share/vim/vim55/syntax/maple.vim
-share/vim/vim55/syntax/manual.vim
-share/vim/vim55/syntax/man.vim
-share/vim/vim55/syntax/make.vim
-share/vim/vim55/syntax/mail.vim
-share/vim/vim55/syntax/m4.vim
-share/vim/vim55/syntax/lua.vim
-share/vim/vim55/syntax/lss.vim
-share/vim/vim55/syntax/lout.vim
-share/vim/vim55/syntax/lotos.vim
-share/vim/vim55/syntax/lite.vim
-share/vim/vim55/syntax/lisp.vim
-share/vim/vim55/syntax/lilo.vim
-share/vim/vim55/syntax/lex.vim
-share/vim/vim55/syntax/lhaskell.vim
-share/vim/vim55/syntax/lace.vim
-share/vim/vim55/syntax/kwt.vim
-share/vim/vim55/syntax/jgraph.vim
-share/vim/vim55/syntax/javascript.vim
-share/vim/vim55/syntax/javacc.vim
-share/vim/vim55/syntax/java.vim
-share/vim/vim55/syntax/ishd.vim
-share/vim/vim55/syntax/inform.vim
-share/vim/vim55/syntax/idlang.vim
-share/vim/vim55/syntax/idl.vim
-share/vim/vim55/syntax/htmlm4.vim
-share/vim/vim55/syntax/html.vim
-share/vim/vim55/syntax/hitest.vim
-share/vim/vim55/syntax/help.vim
-share/vim/vim55/syntax/haskell.vim
-share/vim/vim55/syntax/gp.vim
-share/vim/vim55/syntax/gnuplot.vim
-share/vim/vim55/syntax/gdmo.vim
-share/vim/vim55/syntax/gdb.vim
-share/vim/vim55/syntax/fvwm.vim
-share/vim/vim55/syntax/fortran.vim
-share/vim/vim55/syntax/forth.vim
-share/vim/vim55/syntax/focexec.vim
-share/vim/vim55/syntax/exports.vim
-share/vim/vim55/syntax/expect.vim
-share/vim/vim55/syntax/esqlc.vim
-share/vim/vim55/syntax/elmfilt.vim
-share/vim/vim55/syntax/elf.vim
-share/vim/vim55/syntax/eiffel.vim
-share/vim/vim55/syntax/dtd.vim
-share/vim/vim55/syntax/dracula.vim
-share/vim/vim55/syntax/dosini.vim
-share/vim/vim55/syntax/dosbatch.vim
-share/vim/vim55/syntax/diva.vim
-share/vim/vim55/syntax/diff.vim
-share/vim/vim55/syntax/def.vim
-share/vim/vim55/syntax/dcl.vim
-share/vim/vim55/syntax/cweb.vim
-share/vim/vim55/syntax/cterm.vim
-share/vim/vim55/syntax/css.vim
-share/vim/vim55/syntax/csh.vim
-share/vim/vim55/syntax/cpp.vim
-share/vim/vim55/syntax/config.vim
-share/vim/vim55/syntax/colortest.vim
-share/vim/vim55/syntax/cobol.vim
-share/vim/vim55/syntax/clipper.vim
-share/vim/vim55/syntax/clean.vim
-share/vim/vim55/syntax/change.vim
-share/vim/vim55/syntax/c.vim
-share/vim/vim55/syntax/btm.vim
-share/vim/vim55/syntax/bib.vim
-share/vim/vim55/syntax/basic.vim
-share/vim/vim55/syntax/awk.vim
-share/vim/vim55/syntax/ave.vim
-share/vim/vim55/syntax/atlas.vim
-share/vim/vim55/syntax/aspvbs.vim
-share/vim/vim55/syntax/asn.vim
-share/vim/vim55/syntax/asmh8300.vim
-share/vim/vim55/syntax/asm.vim
-share/vim/vim55/syntax/amiga.vim
-share/vim/vim55/syntax/ahdl.vim
-share/vim/vim55/syntax/ada.vim
-share/vim/vim55/syntax/abc.vim
-share/vim/vim55/syntax/zsh.vim
-share/vim/vim55/tutor/tutor
-share/vim/vim55/tutor/README.txt
-share/vim/vim55/menu.vim
-share/vim/vim55/bugreport.vim
-share/vim/vim55/vimrc_example.vim
-share/vim/vim55/gvimrc_example.vim
-share/vim/vim55/filetype.vim
-share/vim/vim55/ftoff.vim
-share/vim/vim55/scripts.vim
-share/vim/vim55/optwin.vim
-share/vim/vim55/macros/hanoi/poster
-share/vim/vim55/macros/hanoi/click.me
-share/vim/vim55/macros/hanoi/hanoi.vim
-share/vim/vim55/macros/maze/maze_5.78
-share/vim/vim55/macros/maze/Makefile
-share/vim/vim55/macros/maze/maze.c
-share/vim/vim55/macros/maze/README.txt
-share/vim/vim55/macros/maze/mazeansi.c
-share/vim/vim55/macros/maze/maze_mac
-share/vim/vim55/macros/maze/poster
-share/vim/vim55/macros/life/click.me
-share/vim/vim55/macros/life/life.vim
-share/vim/vim55/macros/urm/urm
-share/vim/vim55/macros/urm/urm.vim
-share/vim/vim55/macros/urm/examples
-share/vim/vim55/macros/urm/README.txt
-share/vim/vim55/macros/html
-share/vim/vim55/macros/dvorak
-share/vim/vim55/macros/diffwin.vim
-share/vim/vim55/macros/README.txt
-share/vim/vim55/macros/swapmous.vim
-share/vim/vim55/macros/shellmenu.vim
-share/vim/vim55/macros/justify.vim
-share/vim/vim55/tools/README.txt
-share/vim/vim55/tools/vimspell.sh
-share/vim/vim55/tools/vimm
-share/vim/vim55/tools/vim132
-share/vim/vim55/tools/tcltags
-share/vim/vim55/tools/shtags.pl
-share/vim/vim55/tools/shtags.1
-share/vim/vim55/tools/ref
-share/vim/vim55/tools/pltags.pl
-share/vim/vim55/tools/mve.txt
-share/vim/vim55/tools/mve.awk
-share/vim/vim55/tools/gvimdiff
-share/vim/vim55/tools/efm_filter.txt
-share/vim/vim55/tools/efm_filter.pl
-share/vim/vim55/tools/ccfilter_README.txt
-share/vim/vim55/tools/ccfilter.c
-share/vim/vim55/tools/ccfilter.1
-share/vim/vim55/tools/blink.c
-share/vim/vim55/tools/vimspell.txt
-@exec ln -fs ../../doc/vim %D/share/vim/vim55/doc
-@unexec rm -f %D/share/vim/vim55/doc
-@dirrm share/vim/vim55/tools
-@dirrm share/vim/vim55/tutor
-@dirrm share/vim/vim55/syntax
-@dirrm share/vim/vim55/macros/urm
-@dirrm share/vim/vim55/macros/maze
-@dirrm share/vim/vim55/macros/life
-@dirrm share/vim/vim55/macros/hanoi
-@dirrm share/vim/vim55/macros
-@dirrm share/vim/vim55
-@dirrm share/vim
-@dirrm share/doc/vim