From 32d795466d4ec74909dd42861bae065cdc06f93f Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 12 May 2007 20:07:05 +0000 Subject: [PATCH] * updated vim (7.0 -> 7.1) git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21035 10447126-35f2-4685-b0cf-6dd780d3921f --- editors/vim/desc.patch | 35 ----------------------------------- editors/vim/vim.conf | 6 ++++-- editors/vim/vim.desc | 8 ++++---- 3 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 editors/vim/desc.patch diff --git a/editors/vim/desc.patch b/editors/vim/desc.patch deleted file mode 100644 index 61e3f9938..000000000 --- a/editors/vim/desc.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../vim/desc.patch -# Copyright (C) 2007 The OpenSDE Project -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Yet again an update vim .desc rule patch. This options exist a bit longer -though, but I forgot to include them in the patch I submitted upstream for -the 7.0 version ... (there are still some missing, but they are mostly -historical and might be dropped sooner than later). - - - Rene Rebe - ---- vim70/runtime/syntax/desc.vim.orig 2006-07-01 17:23:24.000000000 +0000 -+++ vim70/runtime/syntax/desc.vim 2006-07-01 17:27:39.000000000 +0000 -@@ -14,7 +14,7 @@ - " syntax definitions - - setl iskeyword+=- --syn keyword descFlag DIETLIBC KAFFE JAIL FPIC-QUIRK NO-LIBTOOL-QUIRK AUTOMAKE-QUIRK NO-AS-NEEDED NO-SSP contained -+syn keyword descFlag DIETLIBC KAFFE JAIL NOPARALLEL FPIC-QUIRK LIBTOOL-QUIRK NO-LIBTOOL-FIX AUTOMAKE-QUIRK NO-AS-NEEDED NO-SSP KERNEL INIT LIBC CC CXX F77 KCC contained - syn keyword descLicense Unknown GPL LGPL FDL MIT BSD OpenSource Free-to-use Commercial contained - - " tags diff --git a/editors/vim/vim.conf b/editors/vim/vim.conf index e94a18b83..8459eaad2 100644 --- a/editors/vim/vim.conf +++ b/editors/vim/vim.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../vim/vim.conf -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -15,7 +15,9 @@ # --- SDE-COPYRIGHT-NOTE-END --- # apply the patches defined in the vim.desc -var_append patchfiles ' ' "`match_source_file -p patch`" +for x in $( match_source_file -p patch ); do + var_append patchfiles ' ' "$x" +done vim_postmake() { if [ "$SDECFG_PKG_VIM_TWO_BINARIES" ] ; then diff --git a/editors/vim/vim.desc b/editors/vim/vim.desc index f6f9398ce..5fb149f00 100644 --- a/editors/vim/vim.desc +++ b/editors/vim/vim.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../vim/vim.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -46,8 +46,8 @@ [L] OpenSource [S] Stable -[V] 7.0 +[V] 7.1 [P] X -----5---9 160.800 -[D] 2843875363 vim-7.0.tar.bz2 ftp://ftp.vim.org/pub/vim/unix/ -[D] 2114442587 vim-7.0-fixes-14.patch http://www.linuxfromscratch.org/patches/downloads/vim/ +[D] 4276031384 vim-7.1.tar.bz2 ftp://ftp.vim.org/pub/vim/unix/ +#[D] 2114442587 vim-7.0-fixes-14.patch http://www.linuxfromscratch.org/patches/downloads/vim/