Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e9ecfc60f55a421655afdfe2e8c80e67efc0cad2

commit e9ecfc60f55a421655afdfe2e8c80e67efc0cad2
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Oct 7 18:26:07 2010 +0200

vim-7.3-1-i686

- version bump
- clean up frugalware.diff: give up supporting fpm|fdb files as bz2 ones
as they might be xz-compressed as well

diff --git a/source/apps/vim/FrugalBuild b/source/apps/vim/FrugalBuild
index 1a038ba..5a4a03e 100644
--- a/source/apps/vim/FrugalBuild
+++ b/source/apps/vim/FrugalBuild
@@ -4,12 +4,11 @@
USE_GUI=${USE_GUI:-"y"}

pkgname=vim
-pkgver=7.2
-pkgrel=3
+pkgver=7.3
+pkgrel=1
pkgdesc="VIM - Vi IMproved console"
url="http://www.vim.org";
depends=('ncurses')
-makedepends=('gpm>=1.20.5-2')
groups=('apps')
options=('scriptlet')
archs=('i686' 'x86_64' 'ppc')
@@ -18,16 +17,17 @@ up2date="lynx -dump $url/sources.php|grep bz2$|sed 
's/.*-\(.*\)\.t.*/\1/;q'"
source=(ftp://ftp.vim.org/pub/vim/unix/$pkgname-$pkgver.tar.bz2 \
gvim.xpm README.Frugalware \
vim-vimrc.diff frugalware.diff)
-sha1sums=('a4b6641ca528fada71ea77c998a441495ed4984c' \
+sha1sums=('46faa96c5fab639899b1c655c23d8755b62f036f' \
'f7262c7429c42b7c1ef9cf1eaa6aa12292933525' \
'50e139d94557b2ca361fed2130af103c47a8d654' \
'985911e5902d495897105cdd1570dfe47adfa254' \
-          '95dfc37b411419f85774e143252d380d94804569')
+          '2a13f115db21d458a03c60e90945ef026eb24ca2')

if Fuse $USE_GUI; then
subpkgs=('gvim')
subdescs=("VIM - Vi IMproved console (GTK version)")
-       subdepends=("vim=$pkgver gpm>=1.20.5-2 gtk+2>=2.20.0-2")
+       subdepends=("gpm>=1.20.5-2 gtk+2>=2.20.0-2")
+       subrodepends=("vim=$pkgver")
subgroups=('xapps')
subarchs=('i686 x86_64 ppc')
fi
diff --git a/source/apps/vim/frugalware.diff b/source/apps/vim/frugalware.diff
index 86269559..46a7ad6 100644
--- a/source/apps/vim/frugalware.diff
+++ b/source/apps/vim/frugalware.diff
@@ -1,57 +1,6 @@
-diff -Naur vim72.orig/runtime/autoload/tar.vim vim72/runtime/autoload/tar.vim
---- vim72.orig/runtime/autoload/tar.vim        2008-08-09 16:14:58.000000000 
+0200
-+++ vim72/runtime/autoload/tar.vim     2008-08-15 01:59:31.000000000 +0200
-@@ -139,7 +139,7 @@
-   elseif tarfile =~# '\.lrp'
- "   call Decho("2: exe silent r! cat -- ".s:Escape(tarfile,1)."|gzip -d -c 
-|".g:tar_cmd." -".g:tar_browseoptions." - ")
-    exe "silent r! cat -- ".s:Escape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." 
-".g:tar_browseoptions." - "
--  elseif tarfile =~# '\.bz2$'
-+  elseif tarfile =~# '\.\(bz2\|fpm\|fdb\)$'
- "   call Decho("3: exe silent r! bzip2 -d -c -- ".s:Escape(tarfile,1)." | 
".g:tar_cmd." -".g:tar_browseoptions." - ")
-    exe "silent r! bzip2 -d -c -- ".s:Escape(tarfile,1)." | ".g:tar_cmd." 
-".g:tar_browseoptions." - "
-   else
-@@ -239,7 +239,7 @@
-   if      fname =~ '\.gz$'  && executable("zcat")
-    let decmp= "|zcat"
-    let doro = 1
--  elseif  fname =~ '\.bz2$' && executable("bzcat")
-+  elseif tarfile =~# '\.\(bz2\|fpm\|fdb\)$' && executable("bzcat")
-    let decmp= "|bzcat"
-    let doro = 1
-   else
-@@ -261,7 +261,7 @@
-   elseif tarfile =~# '\.lrp$'
- "   call Decho("6: exe silent r! cat ".s:Escape(tarfile,1)." | gzip -d -c - | 
".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.s:Escape(fname,1).decmp)
-    exe "silent r! cat -- ".s:Escape(tarfile,1)." | gzip -d -c - | 
".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.s:Escape(fname,1).decmp
--  elseif tarfile =~# '\.bz2$'
-+  elseif tarfile =~# '\.\(bz2\|fpm\|fdb\)$'
- "   call Decho("7: exe silent r! bzip2 -d -c ".s:Escape(tarfile,1)."| 
".g:tar_cmd." -".g:tar_readoptions." - ".tar_secure.s:Escape(fname,1).decmp)
-    exe "silent r! bzip2 -d -c -- ".s:Escape(tarfile,1)."| ".g:tar_cmd." 
-".g:tar_readoptions." - ".tar_secure.s:Escape(fname,1).decmp
-   else
-@@ -366,9 +366,9 @@
-    let compress= "gzip -- ".s:Escape(tarfile,0)
-    let tgz     = 1
- "   call Decho("compress<".compress.">")
--  elseif tarfile =~# '\.bz2'
-+  elseif tarfile =~# '\.\(bz2\|fpm\|fdb\)$'
-    call system("bzip2 -d -- ".s:Escape(tarfile,0))
--   let tarfile = substitute(tarfile,'\.bz2','','e')
-+   let tarfile = substitute(tarfile,'\.\(bz2\|fpm\|fdb\)$','','e')
-    let compress= "bzip2 -- ".s:Escape(tarfile,0)
- "   call Decho("compress<".compress.">")
-   endif
diff -Naur vim71.orig/runtime/filetype.vim vim71/runtime/filetype.vim
--- vim71.orig/runtime/filetype.vim     2007-05-10 17:14:37.000000000 +0200
+++ vim71/runtime/filetype.vim  2007-09-11 23:31:04.000000000 +0200
-@@ -34,7 +34,7 @@
- " Pattern used to match file names which should not be inspected.
- " Currently finds compressed files.
- if !exists("g:ft_ignore_pat")
--  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
-+  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|fpm\|fdb\|zip\|tgz\)$'
- endif
-
- " Function used for patterns that end in a star: don't set the filetype if the
@@ -1726,6 +1726,11 @@
setf hog
endfunc
@@ -64,18 +13,6 @@ diff -Naur vim71.orig/runtime/filetype.vim 
vim71/runtime/filetype.vim

" Spec (Linux RPM)
au BufNewFile,BufRead *.spec                    setf spec
-diff -Naur vim71.orig/runtime/plugin/tarPlugin.vim 
vim71/runtime/plugin/tarPlugin.vim
---- vim71.orig/runtime/plugin/tarPlugin.vim    2006-09-29 22:04:39.000000000 
+0200
-+++ vim71/runtime/plugin/tarPlugin.vim 2007-09-11 23:26:22.000000000 +0200
-@@ -37,6 +37,8 @@
-   au BufReadCmd   *.tar               call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tar.gz    call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tar.bz2   call tar#Browse(expand("<amatch>"))
-+  au BufReadCmd   *.fpm               call tar#Browse(expand("<amatch>"))
-+  au BufReadCmd   *.fdb               call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tar.Z     call tar#Browse(expand("<amatch>"))
-   au BufReadCmd   *.tgz               call tar#Browse(expand("<amatch>"))
- augroup END
diff -Naur vim71.orig/runtime/syntax/sh.vim vim71/runtime/syntax/sh.vim
--- vim71.orig/runtime/syntax/sh.vim    2007-05-07 22:12:00.000000000 +0200
+++ vim71/runtime/syntax/sh.vim 2007-09-11 23:46:48.000000000 +0200
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to