[Buildroot] [PATCH 1/2] Vim: don't use "extra" archive

[Buildroot] [PATCH 1/2] Vim: don't use "extra" archive

[Markus Heidelberg]

- removed vim-extra, it's not necessary, the extra-patches are left out anyway
- corrected typo, so that the Config.in option for selection of the runtime
  files does what it is intended to


diff --git a/package/editors/vim/patches b/package/editors/vim/patches
index 81acab5..856a8db 100644
--- a/package/editors/vim/patches
+++ b/package/editors/vim/patches
@@ -112,7 +112,7 @@
 122
 123
 125
-126
+126ne
 127
 130
 131
diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk
index 5815b2b..a7d27d3 100644
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -5,30 +5,24 @@
 #############################################################
 VIM_VERSION:=7.1
 VIM_SOURCE:=vim-$(VIM_VERSION).tar.bz2
-VIM_EXTRA:=vim-$(VIM_VERSION)-extra.tar.gz
 VIM_SITE:=ftp://ftp.vim.org/pub/vim
 VIM_SOURCE_SITE:=$(VIM_SITE)/unix
-VIM_EXTRA_SITE:=$(VIM_SITE)/extra
 VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
 VIM_DIR:=$(BUILD_DIR)/vim71
-VIM_PATCHES:=$(shell cat package/editors/vim/patches | sed -s 's:\([0-9]\{3\}\):$(DL_DIR)/vim/$(VIM_VERSION).\1:')
+VIM_PATCHES:=$(shell cat package/editors/vim/patches | sed -s 's:\(.\+\):$(DL_DIR)/vim/$(VIM_VERSION).\1:')
 VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
 
 $(DL_DIR)/$(VIM_SOURCE):
 	$(WGET) -P $(DL_DIR) $(VIM_SOURCE_SITE)/$(VIM_SOURCE)
 
-$(DL_DIR)/$(VIM_EXTRA):
-	$(WGET) -P $(DL_DIR) $(VIM_EXTRA_SITE)/$(VIM_EXTRA)
-
 $(DL_DIR)/vim/%:
 	$(WGET) -P $(DL_DIR)/vim/ $(VIM_PATCH_SITE)/$*
 
-vim-source: $(DL_DIR)/$(VIM_SOURCE) $(DL_DIR)/$(VIM_EXTRA) $(VIM_PATCHES)
+vim-source: $(DL_DIR)/$(VIM_SOURCE) $(VIM_PATCHES)
 
 $(VIM_DIR)/.unpacked: $(DL_DIR)/$(VIM_SOURCE)
 	$(BZCAT) $(DL_DIR)/$(VIM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(ZCAT) $(DL_DIR)/$(VIM_EXTRA) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	touch $@
 
 $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
@@ -36,7 +30,7 @@ $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
 		echo "Patching with $$i"; \
 		cd $(VIM_DIR); \
 		patch -p0 < $$i) \
-    done;
+	done
 	toolchain/patch-kernel.sh $(VIM_DIR) package/editors/vim/ \*.patch
 	touch $@
 
@@ -79,7 +73,7 @@ $(TARGET_DIR)/usr/bin/vim: $(VIM_DIR)/.build
 		make DESTDIR=$(TARGET_DIR) installvimbin; \
 		make DESTDIR=$(TARGET_DIR) installlinks; \
 	)
-ifeq ($(R2_PACKAGE_VIM_RUNTIME),y)
+ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
 	(cd $(VIM_DIR)/src; \
 		make DESTDIR=$(TARGET_DIR) installrtbase; \
 		make DESTDIR=$(TARGET_DIR) installmacros; \

[Buildroot] [PATCH 2/2] Vim: bump to 7.1.330

[Markus Heidelberg]

The original mail is still being held for approval, because the size was too
big for the 40k limit. I've packed the patch and send it as attachment, now it
should fit despite base64:

That's probably the last patch for Vim 7.1, currently Vim 7.2 is in beta phase.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Bump-Vim-patches-up-to-330.diff.bz2
Type: application/x-bzip2
Size: 27230 bytes
Desc: not available
Url : http://busybox.net/lists/buildroot/attachments/20080724/6d66a809/attachment-0001.bin 

[Buildroot] [PATCH 2b/2] Vim: bump to 7.1.295

[Markus Heidelberg]

Hi,

what about the following Vim patches, I sent on 23./24.07.?
[PATCH 1/2] Vim: don't use "extra" archive
[PATCH 2/2] Vim: bump to 7.1.330

I'm unsure about the file packages/editors/vim/configure.patch. What's its
purpose?  <VIM>/src/auto/configure is created by autoconf 2.61, the original by
2.59. I don't think this patch is needed.

I created a new patch that only updates Vim up to 7.1.295. An update to
configure.patch is not necessary, it applies with offset and fuzz. 7.1.296
introduces selinux support and needs an update of configure.patch.

By the way Vim-7.2 has been released yesterday, configure is created by
autoconf 2.62. Is configure.patch still needed, if it ever was?

But I wonder whether there really exist users of Vim in Buildroot. Who uses it
without runtime files because of the error that PATCH 1/2 fixes?



diff --git a/package/editors/vim/patches b/package/editors/vim/patches
index 856a8db..7161e2e 100644
--- a/package/editors/vim/patches
+++ b/package/editors/vim/patches
@@ -231,3 +231,40 @@
 250
 251
 252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+276
+277
+279
+281
+284
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295