diff options
-rw-r--r-- | editors/vim-gtk/files/patch-sum | 8 | ||||
-rw-r--r-- | editors/vim-gtk/patches/patch-aa | 10 | ||||
-rw-r--r-- | editors/vim-share/Makefile.common | 15 | ||||
-rw-r--r-- | editors/vim-share/files/md5 | 6 | ||||
-rw-r--r-- | editors/vim-share/files/patch-sum | 7 | ||||
-rw-r--r-- | editors/vim-share/patches.common/patch-za (renamed from editors/vim-gtk/patches/patch-ab) | 2 | ||||
-rw-r--r-- | editors/vim-share/patches.common/patch-zb (renamed from editors/vim-gtk/patches/patch-ac) | 8 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-ab | 67 | ||||
-rw-r--r-- | editors/vim-share/patches/patch-ac | 12 | ||||
-rw-r--r-- | editors/vim-share/pkg/PLIST | 488 | ||||
-rw-r--r-- | editors/vim-xaw/files/patch-sum | 8 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-aa | 10 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-ab | 13 | ||||
-rw-r--r-- | editors/vim-xaw/patches/patch-ac | 13 | ||||
-rw-r--r-- | editors/vim/Makefile | 12 | ||||
-rw-r--r-- | editors/vim/files/patch-sum | 6 |
16 files changed, 309 insertions, 376 deletions
diff --git a/editors/vim-gtk/files/patch-sum b/editors/vim-gtk/files/patch-sum index 698631bb963..617017a9a50 100644 --- a/editors/vim-gtk/files/patch-sum +++ b/editors/vim-gtk/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.3 1999/12/21 13:18:15 pooka Exp $ +$NetBSD: patch-sum,v 1.4 2000/01/17 17:36:35 pooka Exp $ -MD5 (patch-aa) = caa181ba83b02f273da5df192f32b7b8 -MD5 (patch-ab) = e53e72a98abbb723d60c03b8bf1fc55d -MD5 (patch-ac) = 978580aca00cf8c29148c2fcaa754c64 +MD5 (patch-aa) = 97cd1d6e7839e794826a32d477314554 +MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d +MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd diff --git a/editors/vim-gtk/patches/patch-aa b/editors/vim-gtk/patches/patch-aa index bbd2f21fdf4..5dff694e7f6 100644 --- a/editors/vim-gtk/patches/patch-aa +++ b/editors/vim-gtk/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 1999/12/21 13:18:15 pooka Exp $ +$NetBSD: patch-aa,v 1.4 2000/01/17 17:36:36 pooka Exp $ ---- configure.orig Sun Sep 19 13:59:45 1999 -+++ configure Sat Nov 20 11:40:23 1999 -@@ -1813,6 +1813,7 @@ +--- configure.orig Sat Jan 15 14:16:29 2000 ++++ configure Mon Jan 17 15:19:08 2000 +@@ -1748,6 +1748,7 @@ # Look for the header file in a standard set of common directories. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in \ @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 1999/12/21 13:18:15 pooka Exp $ /usr/X11/include \ /usr/X11R6/include \ /usr/X11R5/include \ -@@ -1888,6 +1889,7 @@ +@@ -1823,6 +1824,7 @@ # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index 1e3b65360b3..1042fd8b7b5 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 1999/12/21 13:20:32 pooka Exp $ +# $NetBSD: Makefile.common,v 1.2 2000/01/17 17:36:31 pooka Exp $ -VIM_VERSION= 5.5 +VIM_VERSION= 5.6 DISTNAME= vim-${VIM_VERSION} CATEGORIES= editors @@ -10,10 +10,17 @@ MASTER_SITES= ftp://ftp.vim.org/pub/editors/vim/unix/ \ ftp://ftp.twics.co.jp/pub/vim/unix DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} -MAINTAINER= pooka@iki.fi +MAINTAINER= pooka@netbsd.org HOMEPAGE= http://www.vim.org GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME}/src -MD5_FILE= "${.CURDIR}/../vim-share/files/md5" +MD5_FILE= ${.CURDIR}/../vim-share/files/md5 +PATCHDIR= ${WRKDIR}/.patches + +pre-patch: + @${MKDIR} ${WRKDIR}/.patches + @${CP} ${.CURDIR}/../vim-share/patches.common/patch* ${WRKDIR}/.patches + @if [ -d ${.CURDIR}/patches ] ; then \ + ${CP} ${.CURDIR}/patches/patch* ${WRKDIR}/.patches ; fi diff --git a/editors/vim-share/files/md5 b/editors/vim-share/files/md5 index b14fbc6a0f0..c7b75963622 100644 --- a/editors/vim-share/files/md5 +++ b/editors/vim-share/files/md5 @@ -1,4 +1,4 @@ -$NetBSD: md5,v 1.1.1.1 1999/12/21 13:20:33 pooka Exp $ +$NetBSD: md5,v 1.2 2000/01/17 17:36:32 pooka Exp $ -MD5 (vim-5.5-src.tar.gz) = c3014937c2b9f4ea471a8274715e846c -MD5 (vim-5.5-rt.tar.gz) = 26d122c71bb413b59b019e730cd563a6 +MD5 (vim-5.6-src.tar.gz) = 80d0f9948e86db01d024419735b62e85 +MD5 (vim-5.6-rt.tar.gz) = ce439bd4f37acc27cb2b2d20ef7164bc diff --git a/editors/vim-share/files/patch-sum b/editors/vim-share/files/patch-sum index b10f409daf5..3ac9e183ead 100644 --- a/editors/vim-share/files/patch-sum +++ b/editors/vim-share/files/patch-sum @@ -1,5 +1,6 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/12/21 13:20:33 pooka Exp $ +$NetBSD: patch-sum,v 1.2 2000/01/17 17:36:32 pooka Exp $ MD5 (patch-aa) = 951d4e8cdc4a7405601c21515c013af8 -MD5 (patch-ab) = 825ca437b006374928bda2501ea3ca1f -MD5 (patch-ac) = ab3cff62f120f2dc6e96bb203439e54b +MD5 (patch-ac) = 5df1fe0e56b832356d05b35ed1a08046 +MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d +MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd diff --git a/editors/vim-gtk/patches/patch-ab b/editors/vim-share/patches.common/patch-za index bfcf8bc0840..f19f68db71c 100644 --- a/editors/vim-gtk/patches/patch-ab +++ b/editors/vim-share/patches.common/patch-za @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 1999/12/21 13:18:16 pooka Exp $ +$NetBSD: patch-za,v 1.1 2000/01/17 17:36:34 pooka Exp $ --- config.mk.in.orig Sat Jun 20 15:22:37 1998 +++ config.mk.in Sun Jan 10 23:22:48 1999 diff --git a/editors/vim-gtk/patches/patch-ac b/editors/vim-share/patches.common/patch-zb index 82b71b29e2e..8eee11e43e7 100644 --- a/editors/vim-gtk/patches/patch-ac +++ b/editors/vim-share/patches.common/patch-zb @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.3 1999/12/21 13:18:16 pooka Exp $ +$NetBSD: patch-zb,v 1.1 2000/01/17 17:36:34 pooka Exp $ ---- feature.h.orig Sat Aug 21 14:08:09 1999 -+++ feature.h Sat Nov 20 11:45:33 1999 -@@ -346,7 +346,7 @@ +--- feature.h.orig Sun Jan 9 20:59:08 2000 ++++ feature.h Mon Jan 17 18:41:34 2000 +@@ -349,7 +349,7 @@ * (used only with NO_BUILTIN_TCAPS not defined). */ #ifdef HAVE_TGETENT diff --git a/editors/vim-share/patches/patch-ab b/editors/vim-share/patches/patch-ab deleted file mode 100644 index 0fc5c19ba81..00000000000 --- a/editors/vim-share/patches/patch-ab +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/12/21 13:20:33 pooka Exp $ - ---- ../runtime/syntax/sql.vim.orig Fri Jul 9 11:31:44 1999 -+++ ../runtime/syntax/sql.vim Tue Jul 13 10:36:01 1999 -@@ -1,7 +1,7 @@ - " Vim syntax file --" Language: SQL (Oracle 7) -+" Language: SQL, PL/SQL (Oracle 8i) - " Maintainer: Paul Moore <gustav@morpheus.demon.co.uk> --" Last change: 1997 April 20 -+" Last change: 1999 March 18 - - " Remove any old syntax stuff hanging around - syn clear -@@ -10,34 +10,34 @@ syn case ignore - - " The SQL reserved words, defined as keywords. - --syn keyword sqlSpecial null -+syn keyword sqlSpecial false null true - --syn keyword sqlKeyword access add as asc by check cluster column --syn keyword sqlKeyword compress connect current decimal default --syn keyword sqlKeyword desc else exclusive file for from group --syn keyword sqlKeyword having identified immediate increment index --syn keyword sqlKeyword initial into is level maxextents mode modify -+syn keyword sqlKeyword access add as asc begin by check cluster column -+syn keyword sqlKeyword compress connect current cursor decimal default desc -+syn keyword sqlKeyword else elsif end exception exclusive file for from -+syn keyword sqlKeyword function group having identified if immediate increment -+syn keyword sqlKeyword index initial into is level loop maxextents mode modify - syn keyword sqlKeyword nocompress nowait of offline on online start - syn keyword sqlKeyword successful synonym table then to trigger uid - syn keyword sqlKeyword unique user validate values view whenever --syn keyword sqlKeyword where with option order pctfree privileges --syn keyword sqlKeyword public resource row rowlabel rownum rows --syn keyword sqlKeyword session share size smallint -+syn keyword sqlKeyword where with option order pctfree privileges procedure -+syn keyword sqlKeyword public resource return row rowlabel rownum rows -+syn keyword sqlKeyword session share size smallint type using - - syn keyword sqlOperator not and or - syn keyword sqlOperator in any some all between exists - syn keyword sqlOperator like escape --syn keyword sqlOperator union intersect minus --syn keyword sqlOperator prior distinct --syn keyword sqlOperator sysdate -- --syn keyword sqlStatement alter analyze audit comment commit create --syn keyword sqlStatement delete drop explain grant insert lock noaudit --syn keyword sqlStatement rename revoke rollback savepoint select set -+syn keyword sqlOperator union intersect minus -+syn keyword sqlOperator prior distinct -+syn keyword sqlOperator sysdate out -+ -+syn keyword sqlStatement alter analyze audit comment commit create -+syn keyword sqlStatement delete drop execute explain grant insert lock noaudit -+syn keyword sqlStatement rename revoke rollback savepoint select set - syn keyword sqlStatement truncate update - --syn keyword sqlType char character date long raw mlslabel number --syn keyword sqlType rowid varchar varchar2 float integer -+syn keyword sqlType boolean char character date float integer long -+syn keyword sqlType mlslabel number raw rowid varchar varchar2 varray - - " Strings and characters: - syn region sqlString start=+"+ skip=+\\\\\|\\"+ end=+"+ diff --git a/editors/vim-share/patches/patch-ac b/editors/vim-share/patches/patch-ac index a49df22fd8f..15fc383b437 100644 --- a/editors/vim-share/patches/patch-ac +++ b/editors/vim-share/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/12/21 13:20:33 pooka Exp $ +$NetBSD: patch-ac,v 1.2 2000/01/17 17:36:33 pooka Exp $ ---- Makefile.orig Sun Sep 19 14:27:33 1999 -+++ Makefile Mon Dec 20 20:14:59 1999 -@@ -721,7 +721,7 @@ +--- Makefile.orig Sun Jan 16 16:03:04 2000 ++++ Makefile Mon Jan 17 13:35:17 2000 +@@ -737,7 +737,7 @@ ### might not work when they are changed!) VIMDIR = /vim - VIMRTDIR = /vim55 + VIMRTDIR = /vim56 -HELPSUBDIR = /doc +HELPSUBDIR = /../../doc/vim SYNSUBDIR = /syntax MACROSUBDIR = /macros TOOLSSUBDIR = /tools -@@ -1330,6 +1330,7 @@ +@@ -1349,6 +1349,7 @@ # install the help files; first adjust the contents for the location installvimhelp: $(HELPSOURCE)/vim.1 $(MANSUBDIR) $(VIMLOC) $(VIMRTLOC) $(HELPSUBLOC) $(SYNSUBLOC) $(TUTORSUBLOC) diff --git a/editors/vim-share/pkg/PLIST b/editors/vim-share/pkg/PLIST index cfaddbaa659..9416dfbc262 100644 --- a/editors/vim-share/pkg/PLIST +++ b/editors/vim-share/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/12/21 13:20:34 pooka Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/01/17 17:36:34 pooka Exp $ bin/vimtutor bin/vim-ctags bin/vim-etags @@ -74,239 +74,257 @@ 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 +share/vim/vim56/syntax/2html.vim +share/vim/vim56/syntax/z8a.vim +share/vim/vim56/syntax/yacc.vim +share/vim/vim56/syntax/xxd.vim +share/vim/vim56/syntax/xs.vim +share/vim/vim56/syntax/xpm.vim +share/vim/vim56/syntax/xml.vim +share/vim/vim56/syntax/xmath.vim +share/vim/vim56/syntax/xdefaults.vim +share/vim/vim56/syntax/winbatch.vim +share/vim/vim56/syntax/whitespace.vim +share/vim/vim56/syntax/web.vim +share/vim/vim56/syntax/vrml.vim +share/vim/vim56/syntax/viminfo.vim +share/vim/vim56/syntax/vim.vim +share/vim/vim56/syntax/vhdl.vim +share/vim/vim56/syntax/vgrindefs.vim +share/vim/vim56/syntax/verilog.vim +share/vim/vim56/syntax/vb.vim +share/vim/vim56/syntax/uil.vim +share/vim/vim56/syntax/tsalt.vim +share/vim/vim56/syntax/tf.vim +share/vim/vim56/syntax/tex.vim +share/vim/vim56/syntax/tcl.vim +share/vim/vim56/syntax/tags.vim +share/vim/vim56/syntax/syntax.vim +share/vim/vim56/syntax/synload.vim +share/vim/vim56/syntax/st.vim +share/vim/vim56/syntax/squid.vim +share/vim/vim56/syntax/sql.vim +share/vim/vim56/syntax/spup.vim +share/vim/vim56/syntax/spice.vim +share/vim/vim56/syntax/spec.vim +share/vim/vim56/syntax/smil.vim +share/vim/vim56/syntax/sm.vim +share/vim/vim56/syntax/slrnsc.vim +share/vim/vim56/syntax/slrnrc.vim +share/vim/vim56/syntax/slang.vim +share/vim/vim56/syntax/sl.vim +share/vim/vim56/syntax/skill.vim +share/vim/vim56/syntax/simula.vim +share/vim/vim56/syntax/sicad.vim +share/vim/vim56/syntax/sh.vim +share/vim/vim56/syntax/sgmllnx.vim +share/vim/vim56/syntax/sgml.vim +share/vim/vim56/syntax/sed.vim +share/vim/vim56/syntax/sdl.vim +share/vim/vim56/syntax/scheme.vim +share/vim/vim56/syntax/sather.vim +share/vim/vim56/syntax/sas.vim +share/vim/vim56/syntax/rpcgen.vim +share/vim/vim56/syntax/rexx.vim +share/vim/vim56/syntax/rebol.vim +share/vim/vim56/syntax/rc.vim +share/vim/vim56/syntax/radiance.vim +share/vim/vim56/syntax/python.vim +share/vim/vim56/syntax/purifylog.vim +share/vim/vim56/syntax/ptcap.vim +share/vim/vim56/syntax/prolog.vim +share/vim/vim56/syntax/procmail.vim +share/vim/vim56/syntax/pov.vim +share/vim/vim56/syntax/postscr.vim +share/vim/vim56/syntax/pod.vim +share/vim/vim56/syntax/po.vim +share/vim/vim56/syntax/plsql.vim +share/vim/vim56/syntax/pine.vim +share/vim/vim56/syntax/pike.vim +share/vim/vim56/syntax/phtml.vim +share/vim/vim56/syntax/php3.vim +share/vim/vim56/syntax/perl.vim +share/vim/vim56/syntax/pccts.vim +share/vim/vim56/syntax/pcap.vim +share/vim/vim56/syntax/pascal.vim +share/vim/vim56/syntax/opl.vim +share/vim/vim56/syntax/ocaml.vim +share/vim/vim56/syntax/objc.vim +share/vim/vim56/syntax/nroff.vim +share/vim/vim56/syntax/nosyntax.vim +share/vim/vim56/syntax/ncf.vim +share/vim/vim56/syntax/nasm.vim +share/vim/vim56/syntax/muttrc.vim +share/vim/vim56/syntax/msql.vim +share/vim/vim56/syntax/mp.vim +share/vim/vim56/syntax/modula3.vim +share/vim/vim56/syntax/modula2.vim +share/vim/vim56/syntax/modsim3.vim +share/vim/vim56/syntax/model.vim +share/vim/vim56/syntax/mib.vim +share/vim/vim56/syntax/mf.vim +share/vim/vim56/syntax/matlab.vim +share/vim/vim56/syntax/master.vim +share/vim/vim56/syntax/masm.vim +share/vim/vim56/syntax/maple.vim +share/vim/vim56/syntax/manual.vim +share/vim/vim56/syntax/man.vim +share/vim/vim56/syntax/make.vim +share/vim/vim56/syntax/mail.vim +share/vim/vim56/syntax/m4.vim +share/vim/vim56/syntax/lua.vim +share/vim/vim56/syntax/lss.vim +share/vim/vim56/syntax/lout.vim +share/vim/vim56/syntax/lotos.vim +share/vim/vim56/syntax/lite.vim +share/vim/vim56/syntax/lisp.vim +share/vim/vim56/syntax/lilo.vim +share/vim/vim56/syntax/lex.vim +share/vim/vim56/syntax/lhaskell.vim +share/vim/vim56/syntax/lace.vim +share/vim/vim56/syntax/kwt.vim +share/vim/vim56/syntax/jgraph.vim +share/vim/vim56/syntax/javascript.vim +share/vim/vim56/syntax/javacc.vim +share/vim/vim56/syntax/java.vim +share/vim/vim56/syntax/ishd.vim +share/vim/vim56/syntax/inform.vim +share/vim/vim56/syntax/idlang.vim +share/vim/vim56/syntax/idl.vim +share/vim/vim56/syntax/htmlm4.vim +share/vim/vim56/syntax/html.vim +share/vim/vim56/syntax/hitest.vim +share/vim/vim56/syntax/help.vim +share/vim/vim56/syntax/haskell.vim +share/vim/vim56/syntax/gp.vim +share/vim/vim56/syntax/gnuplot.vim +share/vim/vim56/syntax/gdmo.vim +share/vim/vim56/syntax/gdb.vim +share/vim/vim56/syntax/fvwm.vim +share/vim/vim56/syntax/fortran.vim +share/vim/vim56/syntax/forth.vim +share/vim/vim56/syntax/focexec.vim +share/vim/vim56/syntax/exports.vim +share/vim/vim56/syntax/expect.vim +share/vim/vim56/syntax/esqlc.vim +share/vim/vim56/syntax/elmfilt.vim +share/vim/vim56/syntax/elf.vim +share/vim/vim56/syntax/eiffel.vim +share/vim/vim56/syntax/dtd.vim +share/vim/vim56/syntax/dracula.vim +share/vim/vim56/syntax/dosini.vim +share/vim/vim56/syntax/dosbatch.vim +share/vim/vim56/syntax/diva.vim +share/vim/vim56/syntax/diff.vim +share/vim/vim56/syntax/def.vim +share/vim/vim56/syntax/dcl.vim +share/vim/vim56/syntax/cweb.vim +share/vim/vim56/syntax/cterm.vim +share/vim/vim56/syntax/css.vim +share/vim/vim56/syntax/csh.vim +share/vim/vim56/syntax/cpp.vim +share/vim/vim56/syntax/config.vim +share/vim/vim56/syntax/colortest.vim +share/vim/vim56/syntax/cobol.vim +share/vim/vim56/syntax/clipper.vim +share/vim/vim56/syntax/clean.vim +share/vim/vim56/syntax/change.vim +share/vim/vim56/syntax/c.vim +share/vim/vim56/syntax/btm.vim +share/vim/vim56/syntax/bib.vim +share/vim/vim56/syntax/basic.vim +share/vim/vim56/syntax/awk.vim +share/vim/vim56/syntax/ave.vim +share/vim/vim56/syntax/atlas.vim +share/vim/vim56/syntax/aspvbs.vim +share/vim/vim56/syntax/asn.vim +share/vim/vim56/syntax/asmh8300.vim +share/vim/vim56/syntax/asm.vim +share/vim/vim56/syntax/amiga.vim +share/vim/vim56/syntax/ahdl.vim +share/vim/vim56/syntax/ada.vim +share/vim/vim56/syntax/abc.vim +share/vim/vim56/syntax/zsh.vim +share/vim/vim56/syntax/xpm2.vim +share/vim/vim56/syntax/texinfo.vim +share/vim/vim56/syntax/tads.vim +share/vim/vim56/syntax/sqr.vim +share/vim/vim56/syntax/remind.vim +share/vim/vim56/syntax/rcslog.vim +share/vim/vim56/syntax/jsp.vim +share/vim/vim56/syntax/ist.vim +share/vim/vim56/syntax/icon.vim +share/vim/vim56/syntax/gedcom.vim +share/vim/vim56/syntax/erlang.vim +share/vim/vim56/syntax/cuplsim.vim +share/vim/vim56/syntax/cupl.vim +share/vim/vim56/syntax/ctrlh.vim +share/vim/vim56/syntax/cf.vim +share/vim/vim56/syntax/apachestyle.vim +share/vim/vim56/syntax/aml.vim +share/vim/vim56/syntax/abel.vim +share/vim/vim56/tutor/tutor +share/vim/vim56/tutor/README.txt +share/vim/vim56/menu.vim +share/vim/vim56/bugreport.vim +share/vim/vim56/vimrc_example.vim +share/vim/vim56/gvimrc_example.vim +share/vim/vim56/filetype.vim +share/vim/vim56/ftoff.vim +share/vim/vim56/scripts.vim +share/vim/vim56/optwin.vim +share/vim/vim56/macros/hanoi/poster +share/vim/vim56/macros/hanoi/click.me +share/vim/vim56/macros/hanoi/hanoi.vim +share/vim/vim56/macros/maze/maze_5.78 +share/vim/vim56/macros/maze/Makefile +share/vim/vim56/macros/maze/maze.c +share/vim/vim56/macros/maze/README.txt +share/vim/vim56/macros/maze/mazeansi.c +share/vim/vim56/macros/maze/maze_mac +share/vim/vim56/macros/maze/poster +share/vim/vim56/macros/life/click.me +share/vim/vim56/macros/life/life.vim +share/vim/vim56/macros/urm/urm +share/vim/vim56/macros/urm/urm.vim +share/vim/vim56/macros/urm/examples +share/vim/vim56/macros/urm/README.txt +share/vim/vim56/macros/html +share/vim/vim56/macros/dvorak +share/vim/vim56/macros/diffwin.vim +share/vim/vim56/macros/README.txt +share/vim/vim56/macros/swapmous.vim +share/vim/vim56/macros/shellmenu.vim +share/vim/vim56/macros/justify.vim +share/vim/vim56/tools/README.txt +share/vim/vim56/tools/vimspell.sh +share/vim/vim56/tools/vimm +share/vim/vim56/tools/vim132 +share/vim/vim56/tools/tcltags +share/vim/vim56/tools/shtags.pl +share/vim/vim56/tools/shtags.1 +share/vim/vim56/tools/ref +share/vim/vim56/tools/pltags.pl +share/vim/vim56/tools/mve.txt +share/vim/vim56/tools/mve.awk +share/vim/vim56/tools/gvimdiff +share/vim/vim56/tools/efm_filter.txt +share/vim/vim56/tools/efm_filter.pl +share/vim/vim56/tools/ccfilter_README.txt +share/vim/vim56/tools/ccfilter.c +share/vim/vim56/tools/ccfilter.1 +share/vim/vim56/tools/blink.c +share/vim/vim56/tools/vimspell.txt +@exec ln -fs ../../doc/vim %D/share/vim/vim56/doc +@unexec rm -f %D/share/vim/vim56/doc +@dirrm share/vim/vim56/tools +@dirrm share/vim/vim56/tutor +@dirrm share/vim/vim56/syntax +@dirrm share/vim/vim56/macros/urm +@dirrm share/vim/vim56/macros/maze +@dirrm share/vim/vim56/macros/life +@dirrm share/vim/vim56/macros/hanoi +@dirrm share/vim/vim56/macros +@dirrm share/vim/vim56 @dirrm share/doc/vim @dirrm share/vim diff --git a/editors/vim-xaw/files/patch-sum b/editors/vim-xaw/files/patch-sum index 5605d8e8488..e3660656a93 100644 --- a/editors/vim-xaw/files/patch-sum +++ b/editors/vim-xaw/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/12/21 13:26:29 pooka Exp $ +$NetBSD: patch-sum,v 1.2 2000/01/17 17:36:37 pooka Exp $ -MD5 (patch-aa) = caa181ba83b02f273da5df192f32b7b8 -MD5 (patch-ab) = e53e72a98abbb723d60c03b8bf1fc55d -MD5 (patch-ac) = 978580aca00cf8c29148c2fcaa754c64 +MD5 (patch-aa) = 97cd1d6e7839e794826a32d477314554 MD5 (patch-ad) = 7f99381d2ab5c53db6df89ee1e4151b8 +MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d +MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd diff --git a/editors/vim-xaw/patches/patch-aa b/editors/vim-xaw/patches/patch-aa index f760056bf9e..5b4e5d9068f 100644 --- a/editors/vim-xaw/patches/patch-aa +++ b/editors/vim-xaw/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/12/21 13:26:29 pooka Exp $ +$NetBSD: patch-aa,v 1.2 2000/01/17 17:36:37 pooka Exp $ ---- configure.orig Sun Sep 19 13:59:45 1999 -+++ configure Sat Nov 20 11:40:23 1999 -@@ -1813,6 +1813,7 @@ +--- configure.orig Sat Jan 15 14:16:29 2000 ++++ configure Mon Jan 17 15:19:08 2000 +@@ -1748,6 +1748,7 @@ # Look for the header file in a standard set of common directories. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in \ @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/12/21 13:26:29 pooka Exp $ /usr/X11/include \ /usr/X11R6/include \ /usr/X11R5/include \ -@@ -1888,6 +1889,7 @@ +@@ -1823,6 +1824,7 @@ # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ diff --git a/editors/vim-xaw/patches/patch-ab b/editors/vim-xaw/patches/patch-ab deleted file mode 100644 index 5aa8abfe90c..00000000000 --- a/editors/vim-xaw/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/12/21 13:26:29 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@ diff --git a/editors/vim-xaw/patches/patch-ac b/editors/vim-xaw/patches/patch-ac deleted file mode 100644 index 0f53f078196..00000000000 --- a/editors/vim-xaw/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/12/21 13:26:29 pooka Exp $ - ---- 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/Makefile b/editors/vim/Makefile index 1d55462276d..47543be2d5a 100644 --- a/editors/vim/Makefile +++ b/editors/vim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2000/01/15 18:46:27 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2000/01/17 17:36:35 pooka Exp $ .include "../vim-share/Makefile.common" @@ -8,7 +8,7 @@ DEPENDS+= vim-share-${VIM_VERSION}:../vim-share CONFLICTS= vim-xaw-* vim-gtk-* -CONFIGURE_ARGS+= --disable-gui --with-tlib=ncurses +CONFIGURE_ARGS+= --enable-gui=no --without-x --with-tlib=ncurses CPPFLAGS+= -I${LOCALBASE}/include # for ncurses' termcap.h LDFLAGS+= -L${LOCALBASE}/lib # for -lncurses CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" @@ -23,9 +23,9 @@ DEPENDS+= ncurses>=4.2:../../devel/ncurses .endif post-install: - @${LN} -fs vim ${PREFIX}/bin/ex - @${LN} -fs vim ${PREFIX}/bin/view - @${LN} -fs vim ${PREFIX}/bin/rvim - @${LN} -fs vim ${PREFIX}/bin/rview + ${LN} -fs vim ${PREFIX}/bin/ex + ${LN} -fs vim ${PREFIX}/bin/view + ${LN} -fs vim ${PREFIX}/bin/rvim + ${LN} -fs vim ${PREFIX}/bin/rview .include "../../mk/bsd.pkg.mk" diff --git a/editors/vim/files/patch-sum b/editors/vim/files/patch-sum index 905d3354e73..7cf88a08943 100644 --- a/editors/vim/files/patch-sum +++ b/editors/vim/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.8 1999/12/21 13:18:06 pooka Exp $ +$NetBSD: patch-sum,v 1.9 2000/01/17 17:36:35 pooka Exp $ -MD5 (patch-ab) = e53e72a98abbb723d60c03b8bf1fc55d -MD5 (patch-ac) = 978580aca00cf8c29148c2fcaa754c64 +MD5 (patch-za) = e53e72a98abbb723d60c03b8bf1fc55d +MD5 (patch-zb) = 221296b5d4e7413473f9cc4098a611fd |