diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 1998-09-03 11:35:12 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 1998-09-03 11:35:12 +0000 |
commit | 22ab2b8f0635e2dcf717423d5fed5f9936ebe9a4 (patch) | |
tree | 62f7a343d151ed70e7b6a39c3a54d82f64ac6fb7 /editors/vim5 | |
parent | egcs 1.1 HAS BEEN RELEASED!! (diff) |
upgrade to version 5.3
Notes
Notes:
svn path=/head/; revision=12994
Diffstat (limited to 'editors/vim5')
-rw-r--r-- | editors/vim5/Makefile | 23 | ||||
-rw-r--r-- | editors/vim5/distinfo | 3 | ||||
-rw-r--r-- | editors/vim5/files/patch-01 | 50 | ||||
-rw-r--r-- | editors/vim5/files/patch-02 | 25 | ||||
-rw-r--r-- | editors/vim5/pkg-plist | 38 |
5 files changed, 82 insertions, 57 deletions
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile index 452e28cc7544..2c302251ef03 100644 --- a/editors/vim5/Makefile +++ b/editors/vim5/Makefile @@ -4,26 +4,36 @@ # Date created: Sat June 29, 1996 # Whom: David O'Brien (obrien@cs.ucdavis.edu) # -# $Id: Makefile,v 1.23 1998/03/22 22:13:58 obrien Exp $ +# $Id: Makefile,v 1.37 1998/09/03 11:29:35 obrien Exp $ # -DISTNAME= vim-5.1 +DISTNAME= vim-5.3 CATEGORIES= editors MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \ ftp://ftp.nuxi.com/pub/vim/unix/ \ - ftp://ftp.oce.nl/pub/vim/unix/ \ + ftp://ftp.oce.nl/pub/misc/vim/unix/ \ ftp://ftp.prz.tu-berlin.de/pub/unix/editors/vim/unix/ \ ftp://ftp.is.co.za/applications/editors/vim/ \ ftp://ftp.progsoc.uts.edu.au/pub/vim/ +DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} ${DISTNAME}-rt${EXTRACT_SUFX} MAINTAINER= obrien@FreeBSD.org +.if defined(BATCH) +USE_PERL5= yes +BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80 \ + python:${PORTSDIR}/lang/python +LIB_DEPENDS= tcl80\\.1\\.2:${PORTSDIR}/lang/tcl80 +RUN_DEPENDS= python:${PORTSDIR}/lang/python +.endif + WRKSRC= ${WRKDIR}/${DISTNAME}/src PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP} -MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f +MAKE_FLAGS= CONF_ARGS="--prefix=${PREFIX} --enable-max-features" -f ALL_TARGET= # MAN1= vim.1 xxd.1 ctags.1 + .if defined(HAVE_MOTIF) REQUIRES_MOTIF= yes MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif" MOTIFHOME=${X11BASE} ${MAKE_FLAGS} @@ -31,11 +41,16 @@ MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=motif" MOTIFHOME=${X11BASE} ${MAKE_FLAGS MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=yes" ${MAKE_FLAGS} .endif +.if defined(BATCH) +MAKE_FLAGS:= CONF_OPT_PERL="--enable-perlinterp --enable-pythoninterp --enable-tclinterp" ${MAKE_FLAGS} +.endif + pre-build: @(cd ${WRKSRC}; ${MAKE} distclean) post-install: [ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim + @${RM} -f ${PREFIX}/man/man1/etags.1 @/bin/ln -sf ${PREFIX}/man/man1/ctags.1.gz ${PREFIX}/man/man1/etags.1.gz .include <bsd.port.mk> diff --git a/editors/vim5/distinfo b/editors/vim5/distinfo index 57982829bf9e..d816d9eabd91 100644 --- a/editors/vim5/distinfo +++ b/editors/vim5/distinfo @@ -1 +1,2 @@ -MD5 (vim-5.1.tar.gz) = 62b9c9023dcc49c37859d133d6647edd +MD5 (vim-5.3-src.tar.gz) = d919bc16480599014adbcdfd19268d35 +MD5 (vim-5.3-rt.tar.gz) = 90c168f16bc87ac9d430d8137c55136f diff --git a/editors/vim5/files/patch-01 b/editors/vim5/files/patch-01 index d06b2450c97f..012c17dd8c42 100644 --- a/editors/vim5/files/patch-01 +++ b/editors/vim5/files/patch-01 @@ -1,14 +1,14 @@ ---- Makefile.orig Wed Feb 18 13:53:04 1998 -+++ Makefile Sun Mar 22 14:11:53 1998 -@@ -268,6 +268,7 @@ +--- Makefile.orig Sun Aug 16 12:24:56 1998 ++++ Makefile Mon Aug 17 12:08:56 1998 +@@ -257,6 +257,7 @@ - ### Extra configure arguments - just put anything here, just an example + # just an example: #CONF_ARGS = --exec-prefix=/usr +CONF_ARGS = --prefix=$(PREFIX) - ### For creating a plain Vim without any X11 related fancies use this one: - ### (otherwise Vim configure will try to include xterm titlebar access) -@@ -1066,56 +1067,56 @@ + # GUI - For creating Vim with GUI (gvim) + # Uncomment the first line when you don't want to get the GUI version, +@@ -1167,28 +1168,28 @@ installlinks: $(GUI_TARGETS) $(BINDIR)/$(EXTARGET) $(BINDIR)/$(VIEWTARGET) $(BINDIR)/$(RVIMTARGET) $(BINDIR)/$(RVIEWTARGET) $(BINDIR)/$(EXTARGET): @@ -45,39 +45,3 @@ # 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)/$(EXTARGET).1 $(MANSUBDIR)/$(VIEWTARGET).1 $(MANSUBDIR)/$(RVIMTARGET).1 $(MANSUBDIR)/$(RVIEWTARGET).1 - - $(MANSUBDIR)/$(EXTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(EXTARGET).1 - - $(MANSUBDIR)/$(VIEWTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(VIEWTARGET).1 - - $(MANSUBDIR)/$(GVIMTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIMTARGET).1 - - $(MANSUBDIR)/$(GVIEWTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(GVIEWTARGET).1 - - $(MANSUBDIR)/$(RVIMTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIMTARGET).1 - - $(MANSUBDIR)/$(RVIEWTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RVIEWTARGET).1 - - $(MANSUBDIR)/$(RGVIMTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIMTARGET).1 - - $(MANSUBDIR)/$(RGVIEWTARGET).1: -- cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1 -+# cd $(MANSUBDIR); ln -s $(VIMTARGET).1 $(RGVIEWTARGET).1 - - uninstall: - -rm -f $(BINDIR)/$(VIMTARGET)$(SUFFIX) diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02 index 9bbbd708d835..1e4d4ddf502c 100644 --- a/editors/vim5/files/patch-02 +++ b/editors/vim5/files/patch-02 @@ -1,11 +1,20 @@ ---- configure.orig Tue Jan 20 12:15:36 1998 -+++ configure Tue Jan 27 02:39:35 1998 -@@ -2273,7 +2273,7 @@ +--- configure.orig Thu Aug 13 12:59:48 1998 ++++ configure Mon Aug 17 12:12:16 1998 +@@ -1253,7 +1253,7 @@ + if test "$enable_tclinterp" = "yes"; then + + # Extract the first word of "tclsh", so it can be a program name with args. +-set dummy tclsh; ac_word=$2 ++set dummy tclsh8.0; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 + echo "configure:1259: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then +@@ -2495,7 +2495,7 @@ gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$GUI_INC_LOC" | sed s/include/lib/` /local/Motif*/lib /local/lib/Motif* /usr/local/Motif*/lib /usr/local/lib/Motif* /usr/Motif*/lib /usr/lib/Motif* /usr/local/lib /usr/local/X11*/lib /usr/lib /usr/X11*/lib /usr/lib/X11* /usr/dt/lib $MOTIFHOME/lib $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do -- if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.sl"; then -+ if test -f "$try/libXm.a" -o -f "$try/libXm.so" -o -f "$try/libXm.so.0" -o -f "$try/libXm.so.0.1" -o -f "$try/libXm.sl"; then - GUI_LIB_LOC=$try - fi - done +- for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.sl; do ++ for libtry in "$try"/libXm.a "$try"/libXm.so* "$try"/libXm.so.0 "$try"/libXm.so.0.1 "$try"/libXm.sl; do + if test -f "$libtry"; then + GUI_LIB_LOC=$try + fi diff --git a/editors/vim5/pkg-plist b/editors/vim5/pkg-plist index 055dc8b0329d..6b677d31dd3f 100644 --- a/editors/vim5/pkg-plist +++ b/editors/vim5/pkg-plist @@ -24,9 +24,11 @@ share/vim/doc/gui_x11.txt share/vim/doc/gui_w32.txt share/vim/doc/help.txt share/vim/doc/howto.txt +share/vim/doc/if_cscope.txt share/vim/doc/if_ole.txt share/vim/doc/if_perl.txt share/vim/doc/if_python.txt +share/vim/doc/if_tcl.txt share/vim/doc/index.txt share/vim/doc/insert.txt share/vim/doc/intro.txt @@ -35,16 +37,18 @@ share/vim/doc/message.txt share/vim/doc/motion.txt share/vim/doc/options.txt share/vim/doc/os_amiga.txt -share/vim/doc/os_archi.txt share/vim/doc/os_beos.txt share/vim/doc/os_dos.txt share/vim/doc/os_mac.txt share/vim/doc/os_mint.txt share/vim/doc/os_msdos.txt share/vim/doc/os_os2.txt +share/vim/doc/os_riscos.txt share/vim/doc/os_unix.txt +share/vim/doc/os_vms.txt share/vim/doc/os_win32.txt share/vim/doc/pattern.txt +share/vim/doc/quotes.txt share/vim/doc/quickfix.txt share/vim/doc/recover.txt share/vim/doc/repeat.txt @@ -55,6 +59,7 @@ share/vim/doc/syntax.txt share/vim/doc/tagsearch.txt share/vim/doc/term.txt share/vim/doc/tips.txt +share/vim/doc/todo.txt share/vim/doc/uganda.txt share/vim/doc/undo.txt share/vim/doc/various.txt @@ -70,6 +75,7 @@ share/vim/macros/hanoi/click.me share/vim/macros/hanoi/hanoi.mac share/vim/macros/hanoi/poster share/vim/macros/html +share/vim/macros/justify.vim share/vim/macros/life/click.me share/vim/macros/life/life.mac share/vim/macros/maze/Makefile @@ -90,6 +96,7 @@ share/vim/syntax/2html.vim share/vim/syntax/ada.vim share/vim/syntax/amiga.vim share/vim/syntax/asm.vim +share/vim/syntax/asmselect.vim share/vim/syntax/asn.vim share/vim/syntax/asmh8300.vim share/vim/syntax/atlas.vim @@ -98,22 +105,26 @@ share/vim/syntax/basic.vim share/vim/syntax/bib.vim share/vim/syntax/c.vim share/vim/syntax/clean.vim +share/vim/syntax/clipper.vim share/vim/syntax/cobol.vim share/vim/syntax/colortest.vim share/vim/syntax/cpp.vim share/vim/syntax/csh.vim share/vim/syntax/css.vim share/vim/syntax/cterm.vim +share/vim/syntax/dcl.vim share/vim/syntax/diff.vim share/vim/syntax/dosbatch.vim share/vim/syntax/dosini.vim share/vim/syntax/dracula.vim +share/vim/syntax/dtd.vim share/vim/syntax/eiffel.vim share/vim/syntax/elmfilt.vim share/vim/syntax/exports.vim share/vim/syntax/expect.vim share/vim/syntax/esqlc.vim share/vim/syntax/fortran.vim +share/vim/syntax/fvwm.vim share/vim/syntax/gp.vim share/vim/syntax/help.vim share/vim/syntax/hitest.vim @@ -123,57 +134,82 @@ share/vim/syntax/inform.vim share/vim/syntax/java.vim share/vim/syntax/javacc.vim share/vim/syntax/javascript.vim +share/vim/syntax/jgraph.vim share/vim/syntax/lace.vim share/vim/syntax/lex.vim +share/vim/syntax/lilo.vim share/vim/syntax/lisp.vim +share/vim/syntax/lite.vim +share/vim/syntax/lotos.vim share/vim/syntax/lss.vim share/vim/syntax/mail.vim share/vim/syntax/make.vim +share/vim/syntax/man.vim share/vim/syntax/maple.vim share/vim/syntax/matlab.vim +share/vim/syntax/mf.vim share/vim/syntax/mib.vim share/vim/syntax/model.vim share/vim/syntax/modula2.vim +share/vim/syntax/mp.vim +share/vim/syntax/msql.vim share/vim/syntax/muttrc.vim +share/vim/syntax/nasm.vim share/vim/syntax/nosyntax.vim +share/vim/syntax/nroff.vim share/vim/syntax/objc.vim +share/vim/syntax/ocaml.vim share/vim/syntax/pascal.vim share/vim/syntax/pcap.vim share/vim/syntax/perl.vim +share/vim/syntax/php3.vim +share/vim/syntax/phtml.vim +share/vim/syntax/pmfile.vim share/vim/syntax/pike.vim +share/vim/syntax/po.vim share/vim/syntax/pod.vim share/vim/syntax/postscr.vim share/vim/syntax/pov.vim share/vim/syntax/procmail.vim share/vim/syntax/prolog.vim +share/vim/syntax/purifylog.vim share/vim/syntax/python.vim share/vim/syntax/rc.vim share/vim/syntax/rexx.vim share/vim/syntax/sather.vim +share/vim/syntax/scheme.vim share/vim/syntax/scripts.vim share/vim/syntax/sdl.vim +share/vim/syntax/sgml.vim share/vim/syntax/sh.vim +share/vim/syntax/sicad.vim share/vim/syntax/simula.vim share/vim/syntax/skill.vim share/vim/syntax/slang.vim share/vim/syntax/slrnrc.vim share/vim/syntax/slrnsc.vim share/vim/syntax/sm.vim +share/vim/syntax/spec.vim share/vim/syntax/sql.vim share/vim/syntax/st.vim share/vim/syntax/syntax.vim share/vim/syntax/tags.vim share/vim/syntax/tcl.vim share/vim/syntax/tex.vim +share/vim/syntax/tf.vim share/vim/syntax/tsalt.vim share/vim/syntax/uil.vim share/vim/syntax/verilog.vim share/vim/syntax/vgrindefs.vim share/vim/syntax/vhdl.vim +share/vim/syntax/whitespace.vim share/vim/syntax/vim.vim share/vim/syntax/viminfo.vim +share/vim/syntax/xdefaults.vim share/vim/syntax/vrml.vim share/vim/syntax/xmath.vim +share/vim/syntax/xpm.vim +share/vim/syntax/xml.vim share/vim/syntax/yacc.vim share/vim/syntax/zsh.vim share/vim/bugreport.vim |