cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to v5.3

Browse Source
This commit is contained in:
jasoni 1998-11-20 08:40:48 +00:00
parent 1df835537d
commit e906670460
9 changed files with 225 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editors/vim/Makefile
View File

@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.3 1998/10/18 05:02:06 marc Exp $
# $OpenBSD: Makefile,v 1.4 1998/11/20 08:40:48 jasoni Exp $
#
DISTNAME= vim-5.1
DISTNAME= vim-5.3
CATEGORIES= editors
#BROKEN= "newer version available"
MAINTAINER= downsj@downsj.com
MAINTAINER= jasoni@openbsd.org
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.nuxi.com/pub/vim/unix/ \
@ -15,10 +13,10 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
ftp://ftp.is.co.za/applications/editors/vim/ \
ftp://ftp.progsoc.uts.edu.au/pub/vim/
PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRIP}
DISTFILES= vim-5.3-src.tar.gz vim-5.3-rt.tar.gz
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAKE_FLAGS= CONF_ARGS=--prefix=${PREFIX} -f
ALL_TARGET= #
.if defined(HAVE_MOTIF)
REQUIRES_MOTIF= yes
@ -30,11 +28,4 @@ MAKE_FLAGS:= CONF_OPT_GUI="--enable-gui=yes" ${MAKE_FLAGS}
pre-build:
@(cd ${WRKSRC}; ${MAKE} distclean)
post-install:
[ -e ${PREFIX}/bin/gvim ] || /bin/ln -s ${PREFIX}/bin/vim ${PREFIX}/bin/gvim
@echo "Vim tools (ctags and xxd) are NOT installed by default."
@echo "You must install them by hand if you want them."
@echo "cd to ${WRKSRC} and type"
@echo "'make installtools'."
.include <bsd.port.mk>

3
editors/vim/files/md5
View File

@ -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

83
editors/vim/patches/patch-a
View File

@ -1,83 +0,0 @@
--- Makefile.orig Wed Feb 18 13:53:04 1998
+++ Makefile Sun Mar 22 14:11:53 1998
@@ -268,6 +268,7 @@
### Extra configure arguments - just put anything here, 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 @@
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)/$(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)

94
editors/vim/patches/patch-aa Normal file
View File

@ -0,0 +1,94 @@
$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:33 agc Exp $
--- configure.orig Tue Apr 7 08:05:44 1998
+++ configure Tue Apr 21 23:38:17 1998
@@ -9,7 +9,7 @@
# Defaults:
ac_help=
-ac_default_prefix=/usr/local
+ac_default_prefix=${prefix}
# Any additions from configure.in:
ac_help="$ac_help
--enable-perlinterp Include Perl interpreter."
@@ -1327,25 +1327,25 @@
/usr/include/X11R5 \
/usr/include/X11R4 \
\
- /usr/local/X11/include \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
+ ${prefix}/X11/include \
+ ${prefix}/X11R6/include \
+ ${prefix}/X11R5/include \
+ ${prefix}/X11R4/include \
\
- /usr/local/include/X11 \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
+ ${prefix}/include/X11 \
+ ${prefix}/include/X11R6 \
+ ${prefix}/include/X11R5 \
+ ${prefix}/include/X11R4 \
\
/usr/X386/include \
/usr/x386/include \
/usr/XFree86/include/X11 \
\
/usr/include \
- /usr/local/include \
+ ${prefix}/include \
/usr/unsupported/include \
/usr/athena/include \
- /usr/local/x11r5/include \
+ ${prefix}/x11r5/include \
/usr/lpp/Xamples/include \
\
/usr/openwin/include \
@@ -1402,25 +1402,25 @@
/usr/lib/X11R5 \
/usr/lib/X11R4 \
\
- /usr/local/X11/lib \
- /usr/local/X11R6/lib \
- /usr/local/X11R5/lib \
- /usr/local/X11R4/lib \
+ ${prefix}/X11/lib \
+ ${prefix}/X11R6/lib \
+ ${prefix}/X11R5/lib \
+ ${prefix}/X11R4/lib \
\
- /usr/local/lib/X11 \
- /usr/local/lib/X11R6 \
- /usr/local/lib/X11R5 \
- /usr/local/lib/X11R4 \
+ ${prefix}/lib/X11 \
+ ${prefix}/lib/X11R6 \
+ ${prefix}/lib/X11R5 \
+ ${prefix}/lib/X11R4 \
\
/usr/X386/lib \
/usr/x386/lib \
/usr/XFree86/lib/X11 \
\
/usr/lib \
- /usr/local/lib \
+ ${prefix}/lib \
/usr/unsupported/lib \
/usr/athena/lib \
- /usr/local/x11r5/lib \
+ ${prefix}/x11r5/lib \
/usr/lpp/Xamples/lib \
/lib/usr/lib/X11 \
\
@@ -2280,7 +2280,7 @@
if test -z "$SKIP_MOTIF"; then
- gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* /usr/local/Motif*/include /usr/local/include/Motif* /usr/include/Motif* /usr/Motif*/include /usr/local/include /usr/local/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
+ gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` /local/Motif*/include /local/include/Motif* ${prefix}/Motif*/include ${prefix}/include/Motif* /usr/include/Motif* /usr/Motif*/include ${prefix}/include ${prefix}/X11*/include /usr/include /usr/X11*/include /usr/include/X11* /usr/dt/include $MOTIFHOME/include $GUI_INC_LOC"
echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
echo "configure:2286: checking for location of Motif GUI includes" >&5
GUI_INC_LOC=

23
editors/vim/patches/patch-ab Normal file
View File

@ -0,0 +1,23 @@
$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:33 agc Exp $
--- ctags/Makefile.in.orig Sat Jan 17 07:39:03 1998
+++ ctags/Makefile.in Thu Feb 19 22:22:20 1998
@@ -72,14 +72,14 @@
#
manext = 1
man1dir = $(mandir)/man1
-CMAN = $(CTAGS).$(manext)
-EMAN = $(ETAGS).$(manext)
+CMAN = vim-$(CTAGS).$(manext)
+EMAN = vim-$(ETAGS).$(manext)
#
# destinations for installed files
#
-CTAGS_EXEC = $(CTAGS)$(SUFFIX)
-ETAGS_EXEC = $(ETAGS)$(SUFFIX)
+CTAGS_EXEC = vim-$(CTAGS)
+ETAGS_EXEC = vim-$(ETAGS)
DEST_CTAGS = $(bindir)/$(CTAGS_EXEC)
DEST_ETAGS = $(bindir)/$(ETAGS_EXEC)
DEST_CMAN = $(man1dir)/$(CMAN)

11
editors/vim/patches/patch-b
View File

@ -1,11 +0,0 @@
--- configure.orig Tue Jan 20 12:15:36 1998
+++ configure Tue Jan 27 02:39:35 1998
@@ -2273,7 +2273,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

11
editors/vim/patches/patch-c
View File

@ -1,11 +0,0 @@
--- ctags/Makefile.in.orig Wed Feb 25 21:32:11 1998
+++ ctags/Makefile.in Sun Mar 22 14:13:27 1998
@@ -135,7 +135,7 @@
- $(INSTALL_DATA) $(MANPAGE) $@ && chmod 644 $@
$(DEST_EMAN): $(DEST_CMAN)
- - cd $(man1dir) && $(SLINK) $(CMAN) $(EMAN)
+# - cd $(man1dir) && $(SLINK) $(CMAN) $(EMAN)
#
# rules for uninstalling

12
editors/vim/patches/patch-d
View File

@ -1,12 +0,0 @@
--- Makefile.old Tue Jun 9 00:24:20 1998
+++ Makefile Tue Jun 9 00:24:34 1998
@@ -1041,7 +1041,8 @@
# If you want to keep an older version, rename it before running "make
# install".
#
-install: installvim installtools
+#install: installvim installtools
+install: installvim
installvim: installvimbin installvimhelp installlinks installhelplinks installmacros

158
editors/vim/pkg/PLIST
View File

@ -1,20 +1,30 @@
bin/vim
@comment bin/ctags
@comment bin/xxd
@comment bin/etags
@comment bin/ex
@comment bin/gex
@comment $NetBSD: PLIST,v 1.6 1998/09/01 09:33:42 agc Exp $
bin/vim-ctags
bin/vim-etags
bin/ex
bin/gview
bin/gvim
bin/rgview
bin/rgvim
bin/rview
bin/rvim
@comment bin/view
@comment man/man1/ctags.1.gz
@comment man/man1/etags.1.gz
bin/rview
bin/view
bin/vim
bin/xxd
man/man1/vim-ctags.1
man/man1/vim-etags.1
man/man1/ex.1
man/man1/gview.1
man/man1/gvim.1
man/man1/rgview.1
man/man1/rgvim.1
man/man1/rview.1
man/man1/rvim.1
man/man1/view.1
man/man1/vim.1
@comment man/man1/xxd.1.gz
man/man1/xxd.1
share/vim/menu.vim
share/vim/bugreport.vim
share/vim/doc/autocmd.txt
share/vim/doc/change.txt
share/vim/doc/cmdline.txt
@ -23,8 +33,8 @@ share/vim/doc/editing.txt
share/vim/doc/eval.txt
share/vim/doc/farsi.txt
share/vim/doc/gui.txt
share/vim/doc/gui_x11.txt
share/vim/doc/gui_w32.txt
share/vim/doc/gui_x11.txt
share/vim/doc/help.txt
share/vim/doc/howto.txt
share/vim/doc/if_ole.txt
@ -38,7 +48,6 @@ 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
@ -67,37 +76,20 @@ share/vim/doc/vi_diff.txt
share/vim/doc/visual.txt
share/vim/doc/windows.txt
share/vim/doc/tags
share/vim/macros/README.txt
share/vim/macros/dvorak
share/vim/macros/hanoi/click.me
share/vim/macros/hanoi/hanoi.mac
share/vim/macros/hanoi/poster
share/vim/macros/html
share/vim/macros/life/click.me
share/vim/macros/life/life.mac
share/vim/macros/maze/Makefile
share/vim/macros/maze/README.txt
share/vim/macros/maze/maze.c
share/vim/macros/maze/maze_5.78
share/vim/macros/maze/maze_mac
share/vim/macros/maze/mazeansi.c
share/vim/macros/maze/poster
share/vim/macros/rot13.vim
share/vim/macros/shellmenu.vim
share/vim/macros/swapmous.vim
share/vim/macros/urm/README.txt
share/vim/macros/urm/examples
share/vim/macros/urm/urm
share/vim/macros/urm/urm.mac
share/vim/doc/if_cscope.txt
share/vim/doc/if_tcl.txt
share/vim/doc/os_riscos.txt
share/vim/doc/os_vms.txt
share/vim/doc/quotes.txt
share/vim/doc/todo.txt
share/vim/syntax/2html.vim
share/vim/syntax/ada.vim
share/vim/syntax/amiga.vim
share/vim/syntax/asm.vim
share/vim/syntax/asn.vim
share/vim/syntax/asmh8300.vim
share/vim/syntax/asn.vim
share/vim/syntax/atlas.vim
share/vim/syntax/awk.vim
share/vim/syntax/basic.vim
share/vim/syntax/bib.vim
share/vim/syntax/c.vim
share/vim/syntax/clean.vim
@ -105,17 +97,16 @@ 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/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/expect.vim
share/vim/syntax/fortran.vim
share/vim/syntax/gp.vim
share/vim/syntax/help.vim
@ -126,7 +117,6 @@ share/vim/syntax/inform.vim
share/vim/syntax/java.vim
share/vim/syntax/javacc.vim
share/vim/syntax/javascript.vim
share/vim/syntax/lace.vim
share/vim/syntax/lex.vim
share/vim/syntax/lisp.vim
share/vim/syntax/lss.vim
@ -140,10 +130,11 @@ share/vim/syntax/modula2.vim
share/vim/syntax/muttrc.vim
share/vim/syntax/nosyntax.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/pike.vim
share/vim/syntax/pmfile.vim
share/vim/syntax/pod.vim
share/vim/syntax/postscr.vim
share/vim/syntax/pov.vim
@ -151,21 +142,14 @@ share/vim/syntax/procmail.vim
share/vim/syntax/prolog.vim
share/vim/syntax/python.vim
share/vim/syntax/rc.vim
share/vim/syntax/rexx.vim
share/vim/syntax/sather.vim
share/vim/syntax/scripts.vim
share/vim/syntax/sdl.vim
share/vim/syntax/sh.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/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/tsalt.vim
@ -179,13 +163,73 @@ share/vim/syntax/vrml.vim
share/vim/syntax/xmath.vim
share/vim/syntax/yacc.vim
share/vim/syntax/zsh.vim
share/vim/bugreport.vim
share/vim/menu.vim
@dirrm share/vim/doc
@dirrm share/vim/macros/hanoi
@dirrm share/vim/macros/life
@dirrm share/vim/macros/maze
@dirrm share/vim/macros/urm
@dirrm share/vim/macros
share/vim/syntax/basic.vim
share/vim/syntax/css.vim
share/vim/syntax/exports.vim
share/vim/syntax/lace.vim
share/vim/syntax/pcap.vim
share/vim/syntax/rexx.vim
share/vim/syntax/sdl.vim
share/vim/syntax/simula.vim
share/vim/syntax/skill.vim
share/vim/syntax/slrnrc.vim
share/vim/syntax/slrnsc.vim
share/vim/syntax/tags.vim
share/vim/syntax/asmselect.vim
share/vim/syntax/clipper.vim
share/vim/syntax/dcl.vim
share/vim/syntax/fvwm.vim
share/vim/syntax/jgraph.vim
share/vim/syntax/lilo.vim
share/vim/syntax/lite.vim
share/vim/syntax/lotos.vim
share/vim/syntax/man.vim
share/vim/syntax/mf.vim
share/vim/syntax/mp.vim
share/vim/syntax/msql.vim
share/vim/syntax/nasm.vim
share/vim/syntax/nroff.vim
share/vim/syntax/php3.vim
share/vim/syntax/phtml.vim
share/vim/syntax/po.vim
share/vim/syntax/purifylog.vim
share/vim/syntax/scheme.vim
share/vim/syntax/sgml.vim
share/vim/syntax/sicad.vim
share/vim/syntax/spec.vim
share/vim/syntax/tf.vim
share/vim/syntax/whitespace.vim
share/vim/syntax/xdefaults.vim
share/vim/syntax/xml.vim
share/vim/syntax/xpm.vim
share/vim/macros/README.txt
share/vim/macros/dvorak
share/vim/macros/hanoi/poster
share/vim/macros/hanoi/click.me
share/vim/macros/hanoi/hanoi.mac
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/README.txt
share/vim/macros/maze/Makefile
share/vim/macros/maze/maze.c
share/vim/macros/maze/maze_5.78
share/vim/macros/maze/mazeansi.c
share/vim/macros/maze/maze_mac
share/vim/macros/maze/poster
share/vim/macros/rot13.vim
share/vim/macros/shellmenu.vim
share/vim/macros/swapmous.vim
share/vim/macros/urm/urm
share/vim/macros/urm/urm.mac
share/vim/macros/urm/examples
share/vim/macros/urm/README.txt
@dirrm share/vim/syntax
@dirrm share/vim/macros/urm
@dirrm share/vim/macros/maze
@dirrm share/vim/macros/life
@dirrm share/vim/macros/hanoi
@dirrm share/vim/macros
@dirrm share/vim/doc
@dirrm share/vim