update to vim-8.1.1244
This commit is contained in:
sthen
parent
59dc716852
commit
811bab0562
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.187 2019/05/01 22:05:30 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.188 2019/05/02 01:03:11 sthen Exp $
|
||||
|
||||
COMMENT-main= vi clone, many additional features
|
||||
COMMENT-lang= vi clone, NLS subpackage
|
||||
|
||||
V= 8.1.1048
|
||||
V= 8.1.1244
|
||||
GH_ACCOUNT= vim
|
||||
GH_PROJECT= vim
|
||||
GH_TAGNAME= v$V
|
||||
@ -15,8 +15,6 @@ FULLPKGNAME-lang= vim-lang-$T
|
||||
FULLPKGPATH-lang= ${PKGPATH},-lang
|
||||
P= vim${V:R:S/.//}
|
||||
CATEGORIES= editors
|
||||
REVISION-lang= 0
|
||||
REVISION-main= 3
|
||||
|
||||
HOMEPAGE= https://www.vim.org/
|
||||
|
||||
@ -27,7 +25,8 @@ PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += c curses iconv intl m
|
||||
|
||||
LIB_DEPENDS-main= ${LIB_DEPENDS} devel/gettext
|
||||
LIB_DEPENDS-main= ${LIB_DEPENDS} \
|
||||
devel/gettext
|
||||
|
||||
MULTI_PACKAGES= -main -lang
|
||||
|
||||
@ -44,6 +43,7 @@ BUILD_PACKAGES := ${BUILD_PACKAGES:N-lang}
|
||||
.endif
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
USE_GMAKE= Yes
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
ac_cv_lib_elf_main=no
|
||||
@ -63,7 +63,8 @@ MAKE_FLAGS+= STRIP=:
|
||||
MODULES+= lang/lua
|
||||
MODLUA_VERSION= 5.1
|
||||
CONFIGURE_ENV+= vi_cv_path_plain_lua=${MODLUA_BIN}
|
||||
CONFIGURE_ARGS+= --enable-luainterp --with-lua-prefix=${LOCALBASE}
|
||||
CONFIGURE_ARGS+= --enable-luainterp \
|
||||
--with-lua-prefix=${LOCALBASE}
|
||||
LIB_DEPENDS+= ${MODLUA_LIB_DEPENDS}
|
||||
WANTLIB+= ${MODLUA_WANTLIB}
|
||||
.endif
|
||||
@ -76,8 +77,9 @@ WANTLIB+= perl util
|
||||
.if ${FLAVOR:Mpython}
|
||||
MODULES+= lang/python
|
||||
CONFIGURE_ENV+= vi_cv_path_python=${MODPY_BIN}
|
||||
CONFIGURE_ARGS+= --enable-pythoninterp=yes --enable-python3interp=no \
|
||||
--with-python-config-dir=${MODPY_LIBDIR}/config
|
||||
CONFIGURE_ARGS+= --enable-pythoninterp=yes \
|
||||
--enable-python3interp=no \
|
||||
--with-python-config-dir=${MODPY_LIBDIR}/config
|
||||
LIB_DEPENDS+= ${MODPY_LIB_DEPENDS}
|
||||
WANTLIB+= pthread util ${MODPY_WANTLIB}
|
||||
.endif
|
||||
@ -86,8 +88,9 @@ WANTLIB+= pthread util ${MODPY_WANTLIB}
|
||||
MODULES+= lang/python
|
||||
MODPY_MAJOR_VERSION = 3
|
||||
CONFIGURE_ENV+= vi_cv_path_python3=${MODPY_BIN}
|
||||
CONFIGURE_ARGS+= --enable-python3interp=yes --enable-pythoninterp=no \
|
||||
--with-python3-config-dir=${MODPY_LIBDIR}/config-${MODPY_VERSION}m
|
||||
CONFIGURE_ARGS+= --enable-python3interp=yes \
|
||||
--enable-pythoninterp=no \
|
||||
--with-python3-config-dir=${MODPY_LIBDIR}/config-${MODPY_VERSION}m
|
||||
LIB_DEPENDS+= ${MODPY_LIB_DEPENDS}
|
||||
WANTLIB+= pthread util ${MODPY_WANTLIB}
|
||||
.endif
|
||||
@ -102,7 +105,8 @@ ERRORS= "Fatal: You only can select one python flavor"
|
||||
|
||||
.if ${FLAVOR:Mruby}
|
||||
MODULES+= lang/ruby
|
||||
CONFIGURE_ARGS+= --enable-rubyinterp --with-ruby-command=${RUBY}
|
||||
CONFIGURE_ARGS+= --enable-rubyinterp \
|
||||
--with-ruby-command=${RUBY}
|
||||
LIB_DEPENDS+= ${MODRUBY_LIB_DEPENDS}
|
||||
WANTLIB+= ${MODRUBY_WANTLIB}
|
||||
.endif
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (vim-8.1.1048.tar.gz) = mKHiynLJ+t9V4LSTZIY3GYQmeykA2fLS9js/nFBhHWU=
|
||||
SIZE (vim-8.1.1048.tar.gz) = 14072846
|
||||
SHA256 (vim-8.1.1244.tar.gz) = iI4+edN/EKtUGLav+dkfCVJZ6ivVzong5M3njLU0Uks=
|
||||
SIZE (vim-8.1.1244.tar.gz) = 14163686
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
$OpenBSD: patch-runtime_filetype_vim,v 1.17 2019/03/08 01:55:36 sthen Exp $
|
||||
$OpenBSD: patch-runtime_filetype_vim,v 1.18 2019/05/02 01:03:11 sthen Exp $
|
||||
Index: runtime/filetype.vim
|
||||
--- runtime/filetype.vim.orig
|
||||
+++ runtime/filetype.vim
|
||||
@@ -466,7 +466,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
|
||||
@@ -465,7 +465,7 @@ au BufNewFile,BufRead dict.conf,.dictrc setf dictconf
|
||||
au BufNewFile,BufRead dictd.conf setf dictdconf
|
||||
|
||||
" Diff files
|
||||
@ -11,7 +11,7 @@ Index: runtime/filetype.vim
|
||||
au BufNewFile,BufRead *.patch
|
||||
\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
|
||||
\ setf gitsendemail |
|
||||
@@ -935,7 +935,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
|
||||
@@ -932,7 +932,7 @@ au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases
|
||||
au BufNewFile,BufRead .mailcap,mailcap setf mailcap
|
||||
|
||||
" Makefile
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-runtime_gvim_desktop,v 1.2 2018/08/21 16:55:08 sthen Exp $
|
||||
Index: runtime/gvim.desktop
|
||||
--- runtime/gvim.desktop.orig
|
||||
+++ runtime/gvim.desktop
|
||||
@@ -76,11 +76,11 @@ Comment[wa]=Asspougnî des fitchîs tecses
|
||||
Comment[zh_CN]=编辑文本文件
|
||||
Comment[zh_TW]=編輯文字檔
|
||||
TryExec=gvim
|
||||
-Exec=gvim -f %F
|
||||
+Exec=${TRUEPREFIX}/bin/gvim -f %F
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Keywords=Text;editor;
|
||||
-Icon=gvim
|
||||
+Icon=vim
|
||||
Categories=Utility;TextEditor;
|
||||
StartupNotify=true
|
||||
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-lang,v 1.15 2018/08/21 16:55:08 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-lang,v 1.16 2019/05/02 01:03:11 sthen Exp $
|
||||
@conflict vim-<7.4
|
||||
man/da/
|
||||
man/da.ISO8859-1/
|
||||
@ -389,6 +389,10 @@ share/vim/${P}/lang/menu_hu.iso_8859-2.vim
|
||||
share/vim/${P}/lang/menu_hu.utf-8.vim
|
||||
share/vim/${P}/lang/menu_hu_hu.iso_8859-2.vim
|
||||
share/vim/${P}/lang/menu_hu_hu.utf-8.vim
|
||||
share/vim/${P}/lang/menu_is.latin1.vim
|
||||
share/vim/${P}/lang/menu_is.utf-8.vim
|
||||
share/vim/${P}/lang/menu_is_is.latin1.vim
|
||||
share/vim/${P}/lang/menu_is_is.utf-8.vim
|
||||
share/vim/${P}/lang/menu_it.latin1.vim
|
||||
share/vim/${P}/lang/menu_it.utf-8.vim
|
||||
share/vim/${P}/lang/menu_it_it.latin1.vim
|
||||
|
||||
Loading…
Reference in New Issue
Block a user