# HG changeset patch
# User Tomas Zeman <tzeman@volny.cz>
# Date 1222842523 -7200
# Node ID c688ce49611deb71766905ea348c6495dc1fe6e5
# Parent  ad007ca04674952d15396b6802d8c59bd97f0cf6# Parent  66f7514b27bcc28ab2e75e0bc7062873711192b1
Merge branch 'master' of ssh://tzeman@jizera.stika.net/~tzeman/dev/frugalware-patches

Conflicts:
	master/vim.patch

diff -r 66f7514b27bc -r c688ce49611d vim.patch
--- a/vim.patch	Tue Sep 30 22:24:30 2008 +0200
+++ b/vim.patch	Wed Oct 01 08:28:43 2008 +0200
@@ -1,19 +1,28 @@
 vim: cscope
 
 diff --git a/source/apps/vim/FrugalBuild b/source/apps/vim/FrugalBuild
-index 7fc0f07..3b7940c 100644
+index 011e484..9630e1f 100644
 --- a/source/apps/vim/FrugalBuild
 +++ b/source/apps/vim/FrugalBuild
-@@ -36,7 +36,7 @@ build()
- 	Fpatch 7.1.039
+@@ -19,7 +19,7 @@ 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=('76f6a5a97746db06bd4786984a116793a16e3e10' \
++sha1sums=('a4b6641ca528fada71ea77c998a441495ed4984c' \
+           'f7262c7429c42b7c1ef9cf1eaa6aa12292933525' \
+           '50e139d94557b2ca361fed2130af103c47a8d654' \
+           '985911e5902d495897105cdd1570dfe47adfa254' \
+@@ -40,7 +40,7 @@ build()
  	cd src
- 	# first build gvim
--	Fmake --with-x --enable-gui=gtk2 --enable-multibyte
-+	Fmake --with-x --enable-gui=gtk2 --enable-multibyte --enable-cscope
- 	make DESTDIR=$Fdestdir VIMRTDIR= installvimbin
- 	Fmv /usr/bin/vim /usr/bin/gvim
- 	Fln /usr/bin/gvim /usr/bin/gview
-@@ -46,7 +46,7 @@ build()
+ 	if Fuse $USE_GUI; then
+ 		# first build gvim
+-		Fmake --with-x --enable-gui=gtk2 --enable-multibyte
++		Fmake --with-x --enable-gui=gtk2 --enable-multibyte --enable-cscope
+ 		make DESTDIR=$Fdestdir VIMRTDIR= installvimbin
+ 		Fmv /usr/bin/vim /usr/bin/gvim
+ 		Fln /usr/bin/gvim /usr/bin/gview
+@@ -51,7 +51,7 @@ build()
  
  	# now vim
  	Fmake --localstatedir=/var/lib/$pkgname --disable-gpm --with-x=no \