Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vim: Bump to 9.1.0951 #25450

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 33 additions & 29 deletions utils/vim/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=vim
PKG_VERSION:=9.0
PKG_VERSION:=9.1.0951
PKG_RELEASE:=1
VIMVER:=90
VIMVER:=91

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix
PKG_HASH:=a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/vim/vim/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=a8252384cd0c018f19e09726adfbbc9973ec9d40feb1bb69848d25fe897f3448
PKG_MAINTAINER:=Marko Ratkaj <[email protected]>
PKG_LICENSE:=Vim
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:vim:vim

PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
PKG_BUILD_PARALLEL:=1

include $(INCLUDE_DIR)/package.mk
Expand All @@ -47,7 +46,6 @@ define Package/vim-full
CONFLICTS:=vim
endef


define Package/vim-fuller
$(call Package/vim/Default)
TITLE+= (Big)
Expand Down Expand Up @@ -83,34 +81,44 @@ define Package/vim/conffiles
endef

define Package/vim/description
Vim is an almost compatible version of the UNIX editor Vi.
(Tiny build)
Vim is an almost compatible version of the UNIX editor Vi.

This package includes tiny version of Vim. For details please visit this link:
https://vimdoc.sourceforge.net/htmldoc/various.html#:ve
endef

define Package/vim-full/description
Vim is an almost compatible version of the UNIX editor Vi.
(Normal build)
Vim is an almost compatible version of the UNIX editor Vi.

This package includes normal version of Vim. For details please visit this link:
https://vimdoc.sourceforge.net/htmldoc/various.html#:ve
endef


define Package/vim-fuller/description
Vim is an almost compatible version of the UNIX editor Vi.
(Big build)
Vim is an almost compatible version of the UNIX editor Vi.

This package includes huge version of Vim. For details please visit this link:
https://vimdoc.sourceforge.net/htmldoc/various.html#:ve
endef

define Package/vim-runtime/description
Vim is an almost compatible version of the UNIX editor Vi.
(Runtime files)
Vim is an almost compatible version of the UNIX editor Vi.

This package includes runtime files for Vim. For details please visit this link:
https://vimdoc.sourceforge.net/htmldoc/various.html#:ve
endef

define Package/vim-help/description
Vim is an almost compatible version of the UNIX editor Vi.
(Help files)
Vim is an almost compatible version of the UNIX editor Vi.

This package includes Vimdoc help files for Vim. For details please visit this link:
https://vimdoc.sourceforge.net/htmldoc/various.html#:ve
endef

define Package/xxd/description
xxd creates a hex dump of a given file or standard input, it can also convert
a hex dump back to its original binary form.
xxd creates a hex dump of a given file or standard input, it can also convert
a hex dump back to its original binary form.
endef

CONFIGURE_ARGS += \
Expand Down Expand Up @@ -180,7 +188,12 @@ define Build/Compile/vim-fuller
endef
endif


define Build/Compile/vim-runtime
$(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" installrtbase
(cd $(PKG_INSTALL_DIR) && tar -cf $(PKG_BUILD_DIR)/docs.tar ./usr/share/vim/vim$(VIMVER)/doc)
rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER)/doc
rm -rf $(PKG_INSTALL_DIR)/usr/man
endef

ifneq ($(CONFIG_PACKAGE_xxd),)
define Build/Compile/xxd
Expand All @@ -189,13 +202,6 @@ define Build/Compile/xxd
endef
endif

define Build/Compile/vim-runtime
$(MAKE) -C $(PKG_BUILD_DIR)/src DESTDIR="$(PKG_INSTALL_DIR)" installrtbase
(cd $(PKG_INSTALL_DIR) && tar -cf $(PKG_BUILD_DIR)/docs.tar ./usr/share/vim/vim$(VIMVER)/doc)
rm -rf $(PKG_INSTALL_DIR)/usr/share/vim/vim$(VIMVER)/doc
rm -rf $(PKG_INSTALL_DIR)/usr/man
endef

define Build/Compile
$(call Build/Compile/vim)
$(call Build/Compile/vim-full)
Expand Down Expand Up @@ -229,8 +235,6 @@ define Package/vim-fuller/install
$(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc
endef



define Package/vim-runtime/install
$(CP) $(PKG_INSTALL_DIR)/* $(1)
rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc
Expand Down
Loading