. update vim/stable to the latest stable version, which is the new 6.0.
. take over as maintainer of vim/stable. jasoni@ OK'ed. . too many new features to resume in this commit; check out http://wwwv.vim.org.
This commit is contained in:
lebel
parent
b01e347d43
commit
3c206acfaf
@ -1,60 +1,74 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2001/08/02 03:10:17 jasoni Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2001/09/27 19:39:14 lebel Exp $
|
||||
|
||||
COMMENT= "vi clone, many additional features"
|
||||
COMMENT= "vi clone, many additional features"
|
||||
|
||||
PKGNAME= vim-5.8.8
|
||||
DISTNAME= vim-5.8
|
||||
V=
|
||||
DISTNAME= vim-6.0${V}
|
||||
PKGNAME= ${DISTNAME}
|
||||
CATEGORIES= editors
|
||||
NEED_VERSION= 1.400
|
||||
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/vim/unix/ \
|
||||
NEED_VERSION= 1.460
|
||||
MASTER_SITES= ftp://ftp.vim.org/pub/vim/unix/ \
|
||||
ftp://ftp.nuxi.com/pub/vim/unix/ \
|
||||
ftp://ftp.home.vim.org/pub/vim/unix/ \
|
||||
ftp://ftp.berlin.de.vim.org/misc/editors/vim/unix/ \
|
||||
ftp://ftp.is.co.za/applications/editors/vim/ \
|
||||
ftp://ftp.progsoc.uts.edu.au/pub/vim/
|
||||
MASTER_SITES0= ${MASTER_SITES:S/unix/patches/}
|
||||
DISTFILES= ${DISTNAME}-src.tar.gz ${DISTNAME}-rt.tar.gz
|
||||
DIST_SUBDIR= vim
|
||||
ftp://ftp.is.co.za/applications/editors/vim/unix/ \
|
||||
ftp://ftp.progsoc.uts.edu.au/pub/vim/unix/
|
||||
DISTFILES= ${DISTNAME}.tar.bz2
|
||||
|
||||
HOMEPAGE= http://www.vim.org/
|
||||
|
||||
MAINTAINER= Jason Ish <jasoni@openbsd.org>
|
||||
|
||||
.for p in 02 03 04 05 06 07 08
|
||||
PATCHFILES+= 5.8.0${p}:0
|
||||
.endfor
|
||||
MAINTAINER= David Lebel <lebel@openbsd.org>
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
FLAVORS= gtk athena motif no_x11
|
||||
MODULES= gettext iconv
|
||||
FLAVORS= huge gtk athena motif no_x11 perl python
|
||||
FLAVOR?= gtk
|
||||
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_ARGS+=--with-tliba="curses"
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+=--with-tlib="curses" --enable-multibyte
|
||||
|
||||
# Internal Compiler Error
|
||||
.if (${MACHINE_ARCH} == "m68k")
|
||||
PATCH_LIST= patch-* sup-m68k
|
||||
.elif (${MACHINE_ARCH} == "vax")
|
||||
PATCH_LIST= patch-* sup-vax
|
||||
SUBST_VARS= V
|
||||
|
||||
.if ${FLAVOR:L:Mhuge}
|
||||
CONFIGURE_ARGS+=--with-features=huge
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L} == "light"
|
||||
FLAVOR=no_x11
|
||||
.if ${FLAVOR:L:Mperl}
|
||||
CONFIGURE_ARGS+=--enable-perlinterp
|
||||
.endif
|
||||
.if ${FLAVOR:L} == "no_x11"
|
||||
|
||||
.if ${FLAVOR:L:Mpython}
|
||||
PYTHON_VER= 2.1
|
||||
CONFIGURE_ARGS+=--enable-pythoninterp \
|
||||
--with-python-config-dir=${LOCALBASE}/lib/python${PYTHON_VER}/config
|
||||
RUN_DEPENDS+= python${PYTHON_VER}::lang/python
|
||||
BUILD_DEPENDS= ${RUN_DEPENDS}
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:L:Mno_x11} && \
|
||||
!${FLAVOR:L:Mgtk} && !${FLAVOR:L:Mmotif} && !${FLAVOR:L:Mathena}
|
||||
CONFIGURE_ARGS+=--disable-gui --without-x
|
||||
.elif ${FLAVOR:L} == "motif" || ${FLAVOR:L} == "lesstif"
|
||||
CONFIGURE_ARGS+=--enable-gui="motif"
|
||||
.elif ${FLAVOR:L:Mmotif} && \
|
||||
!${FLAVOR:L:Mgtk} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena}
|
||||
CONFIGURE_ARGS+=--enable-gui="motif" --with-x --enable-fontset --enable-xim
|
||||
CONFIGURE_ENV+= MOTIFHOME=${X11BASE}
|
||||
USE_MOTIF=any
|
||||
.elif ${FLAVOR:L} == "athena"
|
||||
CONFIGURE_ARGS+=--enable-gui="athena"
|
||||
.elif ${FLAVOR:L} == "gtk"
|
||||
.elif ${FLAVOR:L:Mathena} && \
|
||||
!${FLAVOR:L:Mgtk} && !${FLAVOR:L:Mno_x11} && ${FLAVOR:L:Mmotif}
|
||||
CONFIGURE_ARGS+=--enable-gui="athena" --with-x --enable-fontset --enable-xim
|
||||
.elif ${FLAVOR:L:Mgtk} && \
|
||||
!${FLAVOR:L:Mmotif} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena}
|
||||
LIB_DEPENDS= gtk.1.2::x11/gtk+
|
||||
CONFIGURE_ARGS+=--enable-gui="gtk"
|
||||
CONFIGURE_ARGS+=--enable-gui="gtk" --with-x --enable-fontset --enable-xim
|
||||
.else
|
||||
ERRORS+="Fatal: Conflicting flavor: ${FLAVOR}"
|
||||
.endif
|
||||
|
||||
WRKDIST= ${WRKDIR}/vim60${V}
|
||||
WRKSRC= ${WRKDIST}/src
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,27 +1,3 @@
|
||||
MD5 (vim/5.8.002) = af4ec645a8e9bdf1eb24e6b559918aa5
|
||||
MD5 (vim/5.8.003) = 23cb281597b31ff8d85d303ef9ed8d15
|
||||
MD5 (vim/5.8.004) = cc9b36e05fe093e16010b16b6e000b41
|
||||
MD5 (vim/5.8.005) = 8d18f9012e6e3a608756fcb0a5174afd
|
||||
MD5 (vim/5.8.006) = e60d18ab02dad1b20051b58ce4f50ee7
|
||||
MD5 (vim/5.8.007) = 79064f7fd3be4a5804ffb5e258d39028
|
||||
MD5 (vim/5.8.008) = f5a5884deb37f7a1587fac51bb21fc97
|
||||
MD5 (vim/vim-5.8-rt.tar.gz) = f521c6e5f1b6308da9838a92c0ed5a04
|
||||
MD5 (vim/vim-5.8-src.tar.gz) = 89ab05bb5cd39eeb9e259503436c11ed
|
||||
RMD160 (vim/5.8.002) = 1e38fcb9a25000b0475bbf7b9e46f6d941580181
|
||||
RMD160 (vim/5.8.003) = 764d2fb739f9cfb51a87a7e3dbac1c8815d883f4
|
||||
RMD160 (vim/5.8.004) = 74e34e7e51785fd614a5ec4a8840339a5527da1c
|
||||
RMD160 (vim/5.8.005) = f6999ea51681616894bd08f22599d2be7779f34a
|
||||
RMD160 (vim/5.8.006) = bb78d01d1ea413407f98d8d0ccdaaea4dff25c7c
|
||||
RMD160 (vim/5.8.007) = 4bbfbba0f5ded80c2a6aab863c5fd7f9547da353
|
||||
RMD160 (vim/5.8.008) = fe73d5dd9d6e0941a195ad0322149540739d2ddc
|
||||
RMD160 (vim/vim-5.8-rt.tar.gz) = e022020276cbec77a000a898028870bf43d61b70
|
||||
RMD160 (vim/vim-5.8-src.tar.gz) = 6684b99bdf68f6115dd654c98463af4a07d3b089
|
||||
SHA1 (vim/5.8.002) = 18c90f6e6c930439849a26eae46d1e01a26b0a94
|
||||
SHA1 (vim/5.8.003) = e2c7b0aa163508f2f40d0025abe797b263a8cb7d
|
||||
SHA1 (vim/5.8.004) = cd8502d65fd86eae64b0def36f1e511c3f99aa3e
|
||||
SHA1 (vim/5.8.005) = d556088bc6c354760a1cedd731ecde0f5a93aee3
|
||||
SHA1 (vim/5.8.006) = d22fc7a1c5044435a8ed875338ade19e45869b32
|
||||
SHA1 (vim/5.8.007) = 53453f055bd770aca866f2c35c06cc83144160d0
|
||||
SHA1 (vim/5.8.008) = bd3e6ba61e5ac2bd305e47ca5a92a8de1398e049
|
||||
SHA1 (vim/vim-5.8-rt.tar.gz) = 8dd261f5fecdd1e43a6dd919cc9d8e972870ee52
|
||||
SHA1 (vim/vim-5.8-src.tar.gz) = 36d83481cc2faaae57e0a890c1db4701de32c047
|
||||
MD5 (vim-6.0.tar.bz2) = 9d9ca84d489af6b3f54639dd97af3774
|
||||
RMD160 (vim-6.0.tar.bz2) = bec4b517ef5acdc3d9c48d6112b8497f073fa56d
|
||||
SHA1 (vim-6.0.tar.bz2) = 65f3a54e2d04c20b7ffb0ae59741f97021dac49a
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.1 2001/05/06 07:09:34 jasoni Exp $
|
||||
--- src/Makefile.orig Sat Jun 24 02:28:59 2000
|
||||
+++ src/Makefile Sun May 6 00:09:24 2001
|
||||
@@ -788,16 +788,16 @@ SCRIPTLOC = $(VIMRTLOC)
|
||||
### some sed trickery. (the files are installed into a temporary directory
|
||||
### for building the package, but they eventually end up in /usr/... . This
|
||||
### ensures that the correct path is put into the man page.)
|
||||
-VIMRCENDLOC = $(VIMRCLOC)
|
||||
-#VIMRCENDLOC = /etc
|
||||
-HELPENDLOC = $(HELPSUBLOC)
|
||||
-#HELPENDLOC = /usr/doc/vim
|
||||
-SYNTAXENDLOC = $(SYNSUBLOC)
|
||||
-#SYNTAXENDLOC = /usr/lib/vim/syntax
|
||||
-SCRIPTENDLOC = $(SCRIPTLOC)
|
||||
-#SCRIPTENDLOC = /etc
|
||||
-TUTORENDLOC = $(TUTORSUBLOC)
|
||||
-#TUTORENDLOC = /usr/lib/vim/tutor
|
||||
+#VIMRCENDLOC = $(VIMRCLOC)
|
||||
+VIMRCENDLOC = $(TRUEPREFIX)/share$(VIMDIR)
|
||||
+#HELPENDLOC = $(HELPSUBLOC)
|
||||
+HELPENDLOC = $(TRUEPREFIX)/share$(VIMDIR)$(VIMRTDIR)$(HELPSUBDIR)
|
||||
+#SYNTAXENDLOC = $(SYNSUBLOC)
|
||||
+SYNTAXENDLOC = $(TRUEPREFIX)/share$(VIMDIR)$(VIMRTDIR)$(SYNSUBDIR)
|
||||
+#SCRIPTENDLOC = $(SCRIPTLOC)
|
||||
+SCRIPTENDLOC = $(TRUEPREFIX)/share$(VIMDIR)$(VIMRTDIR)
|
||||
+#TUTORENDLOC = $(TUTORSUBLOC)
|
||||
+TUTORENDLOC = $(TRUEPREFIX)/share$(VIMDIR)$(VIMRTDIR)$(TUTORSUBDIR)
|
||||
|
||||
### Name of the menu file target.
|
||||
SYS_MENU_FILE = $(SCRIPTLOC)/menu.vim
|
||||
@ -1,15 +0,0 @@
|
||||
--- src/Makefile.orig Sun Jan 16 09:03:04 2000
|
||||
+++ src/Makefile Mon Jan 17 10:50:31 2000
|
||||
@@ -1634,6 +1634,12 @@
|
||||
-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
|
||||
$(ALL_CFLAGS)
|
||||
|
||||
+eval.o:
|
||||
+ $(CC) -c -I$(srcdir) $(ALL_CFLAGS) -O1 $<
|
||||
+
|
||||
+tag.o:
|
||||
+ $(CC) -c -I$(srcdir) $(ALL_CFLAGS) -O1 $<
|
||||
+
|
||||
osdef.h: osdef.sh config.h osdef1.h.in osdef2.h.in
|
||||
CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- src/Makefile.orig Sun Jan 16 09:03:04 2000
|
||||
+++ src/Makefile Mon Jan 17 10:50:31 2000
|
||||
@@ -1634,6 +1634,12 @@
|
||||
-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
|
||||
$(ALL_CFLAGS)
|
||||
|
||||
+eval.o:
|
||||
+ $(CC) -c -I$(srcdir) $(ALL_CFLAGS) -O0 $<
|
||||
+
|
||||
+tag.o:
|
||||
+ $(CC) -c -I$(srcdir) $(ALL_CFLAGS) -O1 $<
|
||||
+
|
||||
osdef.h: osdef.sh config.h osdef1.h.in osdef2.h.in
|
||||
CC="$(CC) $(ALL_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
|
||||
|
||||
@ -1,15 +1,24 @@
|
||||
Vim is an almost compatible version of the UNIX text editor vi. Only the 'Q'
|
||||
command is missing (you don't need it).
|
||||
|
||||
Many new features have been added:
|
||||
multiple windows and buffers, multi level undo, command line history,
|
||||
filename completion, selection highlighting, block operations (including
|
||||
column/rectangular blocks), etc.
|
||||
|
||||
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
|
||||
|
||||
Portability to all UNIX platforms, Amiga DOS, MS-DOS, MS-Windows NT, and
|
||||
Archimedes.
|
||||
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.
|
||||
|
||||
This editor is very useful for editing programs and other plain ASCII files.
|
||||
All commands are given with normal keyboard characters, so those who can type
|
||||
with ten fingers can work very fast. Additionally, function keys can be
|
||||
defined by the user, and the mouse can be used.
|
||||
|
||||
Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/NT, Atari MiNT,
|
||||
Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of UNIX.
|
||||
Porting to other systems should not be very difficult.
|
||||
|
||||
Flavors:
|
||||
gtk - build using the Gtk+ toolkit (default);
|
||||
motif - build using the Motif toolkit;
|
||||
athena - build using the Athena toolkit;
|
||||
no_x11 - build without X11 support;
|
||||
perl - build with Perl support;
|
||||
python - build with Python support;
|
||||
huge - build with --with-features=huge.
|
||||
|
||||
WWW: ${HOMEPAGE}
|
||||
|
||||
@ -1,9 +1,16 @@
|
||||
@comment $OpenBSD: PFRAG.no-no_x11,v 1.1.1.1 2001/04/02 15:47:08 espie Exp $
|
||||
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2001/09/27 19:39:14 lebel Exp $
|
||||
bin/eview
|
||||
bin/evim
|
||||
bin/gview
|
||||
bin/gvim
|
||||
bin/gvimdiff
|
||||
bin/rgview
|
||||
bin/rgvim
|
||||
man/man1/eview.1
|
||||
man/man1/evim.1
|
||||
man/man1/gview.1
|
||||
man/man1/gvimdiff.1
|
||||
man/man1/gvim.1
|
||||
man/man1/rgview.1
|
||||
man/man1/rgvim.1
|
||||
share/vim/vim60/gvimrc_example.vim
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user