[arch-commits] Commit in vim/repos (3 files)
Daniel Griffiths
dgriffiths at archlinux.org
Fri Feb 12 20:06:28 UTC 2010
Date: Friday, February 12, 2010 @ 15:06:28
Author: dgriffiths
Revision: 68414
Merged revisions 53870,53965,68412 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/vim/trunk
........
r53870 | andrea | 2009-10-03 12:10:04 -0500 (Sat, 03 Oct 2009) | 1 line
FS#16180
........
r53965 | andrea | 2009-10-04 06:31:38 -0500 (Sun, 04 Oct 2009) | 1 line
FS#16204
........
r68412 | dgriffiths | 2010-02-12 14:04:30 -0600 (Fri, 12 Feb 2010) | 2 lines
FS#1651,16840,17216
........
Modified:
vim/repos/extra-x86_64/ (properties)
vim/repos/extra-x86_64/PKGBUILD
vim/repos/extra-x86_64/vimrc
----------+
PKGBUILD | 14 +++++++++-----
vimrc | 8 ++++----
2 files changed, 13 insertions(+), 9 deletions(-)
Property changes on: vim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /vim/trunk:1-53400
+ /vim/trunk:1-68413
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2010-02-12 20:04:49 UTC (rev 68413)
+++ extra-x86_64/PKGBUILD 2010-02-12 20:06:28 UTC (rev 68414)
@@ -3,16 +3,15 @@
pkgname=vim
_srcver=7.2
-_patchlevel=266
+_patchlevel=359
pkgver=${_srcver}.${_patchlevel}
pkgrel=1
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
arch=(i686 x86_64)
license=('custom:vim')
url="http://www.vim.org"
-depends=('gpm' 'coreutils')
-makedepends=('wget' 'sed' 'grep' 'gettext' 'perl')
-optdepends=('perl: the runtime provides a view useful perl scripts')
+depends=('gpm' 'coreutils' 'perl')
+makedepends=('wget' 'sed' 'grep' 'gettext')
backup=(etc/vimrc)
install=${pkgname}.install
# we need the extra-stuff to get all patches applied smoothly
@@ -22,7 +21,7 @@
fetch_patches.sh fetch_runtime.sh vimrc archlinux.vim)
md5sums=('f0901284b338e448bfd79ccca0041254' '35e04482f07c57221c9a751aaa3b8dac' \
'd8884786979e0e520c112faf2e176f05' '6d7e8d7868e8bfaa9a5880cd9c439320' \
- '45c1c3c6aff7de0d8fc2a9d8cd5cec7d' '29125bedc96f2a58c772ee0455a333bc' \
+ '45c1c3c6aff7de0d8fc2a9d8cd5cec7d' '3f42c68545b5b1afb2e9a5b2731ef063' \
'10353a61aadc3f276692d0e17db1478e')
build()
@@ -32,6 +31,7 @@
. ${srcdir}/fetch_patches.sh
. ${srcdir}/fetch_runtime.sh
get_patches || return 1
+
cd ${srcdir}/${_versiondir}
sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' src/feature.h
sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' src/feature.h
@@ -61,6 +61,10 @@
rm -f evim.1 # this does not make sense in the console version
done
+ # fix FS#17216
+ sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+ ${pkgdir}/usr/share/vim/vim72/filetype.vim
+
_runtimedir="${pkgdir}/usr/share/vim/${_versiondir}/"
update_runtime
cd ${srcdir}/${_versiondir}
Modified: extra-x86_64/vimrc
===================================================================
--- extra-x86_64/vimrc 2010-02-12 20:04:49 UTC (rev 68413)
+++ extra-x86_64/vimrc 2010-02-12 20:06:28 UTC (rev 68414)
@@ -1,5 +1,5 @@
" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
-" /usr/share/vim/vimcurrent/archlinux.vim) and sourced by the call to :runtime
+" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime
" you can find below. If you wish to change any of those settings, you should
" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten
" everytime an upgrade of the vim packages is performed. It is recommended to
@@ -10,7 +10,7 @@
" properly set to work with the Vim-related packages available in Debian.
runtime! archlinux.vim
+" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
+" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
+" and configure vim to your own liking!
-" For more option refer to /usr/share/vim/vimcurrent/vimrc_example.vim or the
-" vim manual
-
More information about the arch-commits
mailing list