From c7be074b44b5fb9850e60d4352aeb442f2145a37 Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Mon, 2 Mar 2015 18:59:43 +0000 Subject: [PATCH] vim: moved to github Signed-off-by: Luka Perkov SVN-Revision: 44591 --- utils/vim/Makefile | 192 ---------------------- utils/vim/files/vimrc | 12 -- utils/vim/files/vimrc.full | 24 --- utils/vim/patches/001-cross_compile.patch | 38 ----- 4 files changed, 266 deletions(-) delete mode 100644 utils/vim/Makefile delete mode 100644 utils/vim/files/vimrc delete mode 100644 utils/vim/files/vimrc.full delete mode 100644 utils/vim/patches/001-cross_compile.patch diff --git a/utils/vim/Makefile b/utils/vim/Makefile deleted file mode 100644 index 0f7a687f42..0000000000 --- a/utils/vim/Makefile +++ /dev/null @@ -1,192 +0,0 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=vim -PKG_VERSION:=7.3 -PKG_RELEASE:=1 -VIMVER:=73 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.vim.org/pub/vim/unix/ -PKG_MD5SUM:=5b9510a17074e2b37d8bb38ae09edbf2 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER) -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/vim/Default - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libncurses - TITLE:=Vi IMproved - enhanced vi editor - URL:=http://www.vim.org/ - SUBMENU:=Editors -endef - -define Package/vim - $(call Package/vim/Default) - TITLE+= (Tiny) -endef - -define Package/vim-full - $(call Package/vim/Default) - TITLE+= (Normal) -endef - -define Package/vim-runtime - $(call Package/vim/Default) - TITLE+= (runtime files) -endef - -define Package/vim-help - $(call Package/vim/Default) - TITLE+= (help files) -endef - -define Package/xxd - SECTION:=utils - CATEGORY:=Utilities - TITLE:=make a hexdump or do the reverse - URL:=http://www.vim.org/ -endef - -define Package/vim-full/conffiles -/usr/share/vim/vimrc -endef - -define Package/vim/conffiles -/usr/share/vim/vimrc -endef - -define Package/vim/description - Vim is an almost compatible version of the UNIX editor Vi. - (Tiny build) -endef - -define Package/vim-full/description - Vim is an almost compatible version of the UNIX editor Vi. - (Normal build) -endef - -define Package/vim-runtime/description - Vim is an almost compatible version of the UNIX editor Vi. - (Runtime files) -endef - -define Package/vim-help/description - Vim is an almost compatible version of the UNIX editor Vi. - (Help files) -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. -endef - -CONFIGURE_ARGS += \ - --disable-gui \ - --disable-gtktest \ - --disable-xim \ - --without-x \ - --disable-netbeans \ - --disable-cscope \ - --disable-gpm \ - --with-tlib=ncurses - -CONFIGURE_VARS += \ - vim_cv_getcwd_broken=no \ - vim_cv_memmove_handles_overlap=yes \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_tgetent=zero \ - vim_cv_terminfo=yes \ - vim_cv_toupper_broken=no \ - vim_cv_tty_group=root \ - vim_cv_tty_mode=0620 - -ifneq ($(CONFIG_PACKAGE_vim),) -define Build/Compile/vim - $(call Build/Configure/Default, \ - --with-features=tiny \ - --disable-multibyte \ - ) - $(MAKE) -C $(PKG_BUILD_DIR) clean - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" all - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_tiny -endef -endif - -ifneq ($(CONFIG_PACKAGE_vim-full),) -define Build/Compile/vim-full - $(call Build/Configure/Default, \ - --with-features=normal \ - --enable-multibyte \ - ) - $(MAKE) -C $(PKG_BUILD_DIR) clean - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" all - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_BUILD_DIR)/vim_normal -endef -endif - -ifneq ($(CONFIG_PACKAGE_xxd),) -define Build/Compile/xxd - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" all -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) -$(call Build/Compile/vim-runtime) -$(call Build/Compile/xxd) -endef - -define Package/vim/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_tiny $(1)/usr/bin/vim - $(INSTALL_DIR) $(1)/usr/share/vim - $(INSTALL_CONF) ./files/vimrc $(1)/usr/share/vim/ -endef - -define Package/vim-full/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_normal $(1)/usr/bin/vim - $(INSTALL_DIR) $(1)/usr/share/vim - $(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 -endef - -define Package/vim-help/install - tar -C $(1) -xf $(PKG_BUILD_DIR)/docs.tar -endef - -define Package/xxd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xxd/xxd $(1)/usr/bin -endef - -$(eval $(call BuildPackage,vim)) -$(eval $(call BuildPackage,vim-full)) -$(eval $(call BuildPackage,vim-runtime)) -$(eval $(call BuildPackage,vim-help)) -$(eval $(call BuildPackage,xxd)) diff --git a/utils/vim/files/vimrc b/utils/vim/files/vimrc deleted file mode 100644 index 00b952d289..0000000000 --- a/utils/vim/files/vimrc +++ /dev/null @@ -1,12 +0,0 @@ -set showcmd " show (partial) command in status line -set showmatch " show matching brackets -set ignorecase " do case insensitive matching -set incsearch " incremental search -set autowrite " automatically save before commands like :next and :make -set nocompatible " use vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing -set autoindent " always set autoindenting on -set linebreak " don't wrap words by default -set textwidth=0 " don't wrap lines by default -set ruler " show the cursor position all the time - diff --git a/utils/vim/files/vimrc.full b/utils/vim/files/vimrc.full deleted file mode 100644 index 114cf075d0..0000000000 --- a/utils/vim/files/vimrc.full +++ /dev/null @@ -1,24 +0,0 @@ -set showcmd " show (partial) command in status line -set showmatch " show matching brackets -set ignorecase " do case insensitive matching -set incsearch " incremental search -set autowrite " automatically save before commands like :next and :make -set nocompatible " use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing -set autoindent " always set autoindenting on -set linebreak " don't wrap words by default -set textwidth=0 " don't wrap lines by default -set ruler " show the cursor position all the time -if filereadable(expand("$VIMRUNTIME/syntax/synload.vim")) - syntax on -endif -if has("syntax") && &term =~ "xterm" - set t_Co=8 - if has("terminfo") - set t_Sf=[3%p1%dm - set t_Sb=[4%p1%dm - else - set t_Sf=[3%dm - set t_Sb=[4%dm - endif -endif diff --git a/utils/vim/patches/001-cross_compile.patch b/utils/vim/patches/001-cross_compile.patch deleted file mode 100644 index 553dde786b..0000000000 --- a/utils/vim/patches/001-cross_compile.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/src/auto/configure -+++ b/src/auto/configure -@@ -11641,34 +11641,8 @@ _ACEOF - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 - $as_echo_n "checking uint32_t is 32 bits... " >&6; } --if test "$cross_compiling" = yes; then : -- as_fn_error "could not compile program using uint32_t." "$LINENO" 5 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#ifdef HAVE_STDINT_H --# include --#endif --#ifdef HAVE_INTTYPES_H --# include --#endif --main() { -- uint32_t nr1 = (uint32_t)-1; -- uint32_t nr2 = (uint32_t)0xffffffffUL; -- if (sizeof(uint32_t) != 4 || nr1 != 0xffffffffUL || nr2 + 1 != 0) exit(1); -- exit(0); --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: assuming ok" >&5 - $as_echo "ok" >&6; } --else -- as_fn_error "WRONG! uint32_t not defined correctly." "$LINENO" 5 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - - -- 2.30.2