update to vim 7.4.900

This commit is contained in:
sthen 2015-10-30 13:00:37 +00:00
parent 981d86d970
commit b9eb1ded34
4 changed files with 27 additions and 34 deletions

View File

@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.143 2015/07/08 16:36:41 sthen Exp $
# $OpenBSD: Makefile,v 1.144 2015/10/30 13:00:37 sthen Exp $
COMMENT-main= vi clone, many additional features
COMMENT-lang= vi clone, NLS subpackage
VERSION= 7.4.769
DISTNAME= vim-${VERSION}
PKGNAME-main= vim-${VERSION}
PKGNAME-lang= vim-lang-${VERSION}
P= vim${VERSION:R:S/.//}
V= 7.4.900
DISTNAME= vim-$V
DISTFILES= vim-$V{v$V}.tar.gz
PKGNAME-main= vim-$V
PKGNAME-lang= vim-lang-$V
P= vim${V:R:S/.//}
CATEGORIES= editors
# Upstream's normal distribution (http://ftp.vim.org/pub/vim/unix/) consists
# of a relatively old tar, plus hundreds of patches, many of which require
# gnu patch. Port is using a distribution produced by the hgtar target below.
MASTER_SITES= http://spacehopper.org/mirrors/
EXTRACT_SUFX= .tar.bz2
MASTER_SITES= https://github.com/vim/vim/archive/
HOMEPAGE= http://www.vim.org/
@ -29,7 +26,7 @@ WANTLIB += c curses
MULTI_PACKAGES= -main -lang
FULLPKGNAME-lang= vim-lang-${VERSION}
FULLPKGNAME-lang= vim-lang-$V
FULLPKGPATH-lang= ${PKGPATH},-lang
FLAVORS= huge gtk2 athena motif no_x11 lua perl python python3 ruby
@ -47,7 +44,7 @@ CONFIGURE_ARGS+= --with-tlib="curses" \
--enable-multibyte \
--enable-cscope
AUTOCONF_VERSION= 2.65
AUTOCONF_VERSION= 2.69
BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS}
.if ${FLAVOR:Mhuge}
@ -175,16 +172,4 @@ post-install:
RUN_DEPENDS+= devel/desktop-file-utils
.endif
# convenience targets
hg:
mkdir -p ${FULLDISTDIR}/hg
cd ${FULLDISTDIR}/hg; [ -d vim ] || hg clone \
https://vim.googlecode.com/hg/ vim
cd ${FULLDISTDIR}/hg/vim; hg pull; hg update
tar:
cd ${FULLDISTDIR}/hg/vim && F=${FULLDISTDIR}/vim-${VERSION:R}.`grep -A2 'Add new patch number' ${FULLDISTDIR}/hg/vim/src/version.c | tail -1 | sed 's/[ ,]//g'`${EXTRACT_SUFX}; hg archive $$F -X ".hg*" && ls -l $$F
hgtar: hg tar
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (vim-7.4.769.tar.bz2) = 7VvFfVtwVaF78PI+pPKOinjSuMSBvdBhau0i9msdSrE=
SIZE (vim-7.4.769.tar.bz2) = 9705508
SHA256 (vim-7.4.900.tar.gz) = qzCGMgwnzR2NxmZW+N5/Mx25G/BIbjowhwL4SDZTwnM=
SIZE (vim-7.4.900.tar.gz) = 12288093

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-runtime_filetype_vim,v 1.8 2015/07/08 16:36:41 sthen Exp $
--- runtime/filetype.vim.orig Sat Jul 4 14:05:14 2015
+++ runtime/filetype.vim Wed Jul 8 16:20:17 2015
$OpenBSD: patch-runtime_filetype_vim,v 1.9 2015/10/30 13:00:37 sthen Exp $
--- runtime/filetype.vim.orig Sun Oct 25 21:42:00 2015
+++ runtime/filetype.vim Fri Oct 30 12:01:29 2015
@@ -71,6 +71,14 @@ func! s:Check_inp()
endif
endfunc
@ -16,7 +16,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1.8 2015/07/08 16:36:41 sthen Exp $
" A-A-P recipe
au BufNewFile,BufRead *.aap setf aap
@@ -624,7 +632,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
@@ -627,7 +635,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
au BufNewFile,BufRead dictd.conf setf dictdconf
" Diff files
@ -25,7 +25,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1.8 2015/07/08 16:36:41 sthen Exp $
" Dircolors
au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS setf dircolors
@@ -1135,7 +1143,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
@@ -1138,7 +1146,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
" Makefile
@ -34,7 +34,7 @@ $OpenBSD: patch-runtime_filetype_vim,v 1.8 2015/07/08 16:36:41 sthen Exp $
" MakeIndex
au BufNewFile,BufRead *.ist,*.mst setf ist
@@ -2313,12 +2321,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
@@ -2322,12 +2330,14 @@ au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim
au BufNewFile,BufRead .viminfo,_viminfo setf viminfo
" Virata Config Script File or Drupal module

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.12 2015/07/08 16:36:41 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.13 2015/10/30 13:00:37 sthen Exp $
@pkgpath ${BASE_PKGPATH}
%%gtk2%%
bin/ex
@ -300,6 +300,7 @@ share/vim/${P}/ftplugin/automake.vim
share/vim/${P}/ftplugin/bdf.vim
share/vim/${P}/ftplugin/bst.vim
share/vim/${P}/ftplugin/btm.vim
share/vim/${P}/ftplugin/bzl.vim
share/vim/${P}/ftplugin/c.vim
share/vim/${P}/ftplugin/calendar.vim
share/vim/${P}/ftplugin/cdrdaoconf.vim
@ -455,6 +456,7 @@ share/vim/${P}/ftplugin/sshconfig.vim
share/vim/${P}/ftplugin/sudoers.vim
share/vim/${P}/ftplugin/svg.vim
share/vim/${P}/ftplugin/sysctl.vim
share/vim/${P}/ftplugin/systemd.vim
share/vim/${P}/ftplugin/systemverilog.vim
share/vim/${P}/ftplugin/tcl.vim
share/vim/${P}/ftplugin/tcsh.vim
@ -496,6 +498,7 @@ share/vim/${P}/indent/automake.vim
share/vim/${P}/indent/awk.vim
share/vim/${P}/indent/bib.vim
share/vim/${P}/indent/bst.vim
share/vim/${P}/indent/bzl.vim
share/vim/${P}/indent/c.vim
share/vim/${P}/indent/cdl.vim
share/vim/${P}/indent/ch.vim
@ -579,9 +582,11 @@ share/vim/${P}/indent/sh.vim
share/vim/${P}/indent/sml.vim
share/vim/${P}/indent/sql.vim
share/vim/${P}/indent/sqlanywhere.vim
share/vim/${P}/indent/systemd.vim
share/vim/${P}/indent/systemverilog.vim
share/vim/${P}/indent/tcl.vim
share/vim/${P}/indent/tcsh.vim
share/vim/${P}/indent/teraterm.vim
share/vim/${P}/indent/tex.vim
share/vim/${P}/indent/tf.vim
share/vim/${P}/indent/tilde.vim
@ -823,6 +828,7 @@ share/vim/${P}/syntax/bindzone.vim
share/vim/${P}/syntax/blank.vim
share/vim/${P}/syntax/bst.vim
share/vim/${P}/syntax/btm.vim
share/vim/${P}/syntax/bzl.vim
share/vim/${P}/syntax/bzr.vim
share/vim/${P}/syntax/c.vim
share/vim/${P}/syntax/cabal.vim
@ -1265,6 +1271,7 @@ share/vim/${P}/syntax/syncolor.vim
share/vim/${P}/syntax/synload.vim
share/vim/${P}/syntax/syntax.vim
share/vim/${P}/syntax/sysctl.vim
share/vim/${P}/syntax/systemd.vim
share/vim/${P}/syntax/systemverilog.vim
share/vim/${P}/syntax/tads.vim
share/vim/${P}/syntax/tags.vim
@ -1277,6 +1284,7 @@ share/vim/${P}/syntax/taskedit.vim
share/vim/${P}/syntax/tasm.vim
share/vim/${P}/syntax/tcl.vim
share/vim/${P}/syntax/tcsh.vim
share/vim/${P}/syntax/teraterm.vim
share/vim/${P}/syntax/terminfo.vim
share/vim/${P}/syntax/tex.vim
share/vim/${P}/syntax/texinfo.vim