aboutsummaryrefslogtreecommitdiffstats
path: root/main/vim
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-19 07:52:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-19 07:52:02 +0000
commitd3f816a8ec886319da5121b020a0d65f94649dd0 (patch)
tree5437ad0bc535b3d172a38a220da535f2fbdb201d /main/vim
parent7f48f3b8acb8aa99d72d45b4b16b304b946b1202 (diff)
downloadaports-d3f816a8ec886319da5121b020a0d65f94649dd0.tar.bz2
aports-d3f816a8ec886319da5121b020a0d65f94649dd0.tar.xz
main/vim: upgrade to 7.3.692 and add support for gcc-4.7
Diffstat (limited to 'main/vim')
-rw-r--r--main/vim/APKBUILD61
-rw-r--r--main/vim/vim-gcc47.patch13
2 files changed, 58 insertions, 16 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 9a8dc2b995..e719033cd0 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vim
-pkgver=7.3.661
+pkgver=7.3.692
_srcver=${pkgver%.*}
_patchver=${pkgver##*.}
pkgrel=0
@@ -12,33 +12,30 @@ depends=
makedepends="ncurses-dev lua-dev"
subpackages="$pkgname-doc"
-# use "abuild patchlist >> APKBUILD" to generate the list of patches
-source="ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2
- vimrc
- "
-
+patches="vim-gcc47.patch"
# generate url's to patches. note: no forks allowed!
_i=1
_pad="00"
while [ $_i -le $_patchver ]; do
[ $_i -ge 10 ] && _pad="0"
[ $_i -ge 100 ] && _pad=
- source="$source http://ftp.vim.org/pub/vim/patches/$_srcver/$_srcver.$_pad$_i"
+ patches="$patches http://ftp.vim.org/pub/vim/patches/$_srcver/$_srcver.$_pad$_i"
_i=$(( $_i + 1))
done
+source="ftp://ftp.vim.org/pub/vim/unix/vim-${_srcver}.tar.bz2
+ $patches
+ vimrc
+ "
_builddir="$srcdir"/${pkgname}${_srcver/./}
prepare() {
local i
cd "$_builddir"
+ msg "$patches"
- for i in $source ; do
- case $i in
- *.patch|$_srcver.[0-9]*)
- msg "Applying $i"
- patch -p0 < $i || return 1
- ;;
- esac
+ for i in $patches ; do
+ msg "Applying $i"
+ patch -p0 -i "$srcdir"/${i##*/} || return 1
done
# Read vimrc from /etc/vim
@@ -63,7 +60,7 @@ package() {
}
md5sums="5b9510a17074e2b37d8bb38ae09edbf2 vim-7.3.tar.bz2
-97aecde2ab504e543a96bec84b3b5638 vimrc
+a2e71b09d38921d43d2a552d4f0bd1aa vim-gcc47.patch
aa5582d8289b43255f45d4bb6f62e140 7.3.001
2949cbdfe86f533c487fd144c5935c7a 7.3.002
9059db41cf3a468935745242cb9c0514 7.3.003
@@ -724,4 +721,36 @@ e396c1b0455699a5767d568f6e42b30b 7.3.657
fe1c21dd1e8d7ef6479b1e3491e60b92 7.3.658
01a2677308db295311003872c176f907 7.3.659
2c6411e804089d4b8e7740701365143f 7.3.660
-4c407322041b0d2be237704cc0ce1e79 7.3.661"
+4c407322041b0d2be237704cc0ce1e79 7.3.661
+a1c125774e82a6dd3a62ac85cc6e25ae 7.3.662
+53a8658df813bcf9ff4b296b5ca075f3 7.3.663
+8d53a150a50dd1af9f7c2d2715482b57 7.3.664
+cb6e506a26884804afc49ddac08aa040 7.3.665
+ddb827b7e4d0f4e77b591eaabef42499 7.3.666
+6d116c937bb0f74dde0d61bf76fc209d 7.3.667
+1f000a3231eaed8b7f857d8f55c2b798 7.3.668
+f8d544b185a2bec049c16958fa8821c0 7.3.669
+15b268096d901016abb6dbdad8d9dd2a 7.3.670
+456fd9d031b995c14f9bb21945e83c79 7.3.671
+ee940b5d7fec05c2eaaac0f3ab4ae7f5 7.3.672
+90947aa4094e2944bc27923b186d6943 7.3.673
+5f20b8c5b6986fc26e344381e5ad0977 7.3.674
+18194e59371649d3930f55ca05200e29 7.3.675
+3abe3fc89eb54cdbfa7d08557987cc8b 7.3.676
+9b6243de57af010b3e57d90a7e69a075 7.3.677
+012fc6d1489e1c6be73952697c180038 7.3.678
+1acd608501c119734085f5b69205a797 7.3.679
+ef2d29e8f48447fb3597f2aca40dc4ed 7.3.680
+277c37e4a3c8b263be0f33cbbe6986b1 7.3.681
+009a08f90a4514bcdc0ad19940b91af9 7.3.682
+73125bf6fca5aef494c4c4a27cf9d84c 7.3.683
+d0133c338d5841f1f8818e38e286a518 7.3.684
+37080ef3e4ff09e7f7de092849af68f0 7.3.685
+a7208adeeaa0e20a20b4db55274b19a2 7.3.686
+29a87e724798d68b58351051232f321a 7.3.687
+92777d7e1b029576e0066973fdce0563 7.3.688
+54199fe735f735613e9c6308387f1e31 7.3.689
+42033c6c57e7656ab3d44b8585a260e3 7.3.690
+c4dbe0ca1ac4017686e8dc4027ed056d 7.3.691
+58e3cb2304e79be3d9767189dbb21f49 7.3.692
+97aecde2ab504e543a96bec84b3b5638 vimrc"
diff --git a/main/vim/vim-gcc47.patch b/main/vim/vim-gcc47.patch
new file mode 100644
index 0000000000..4d15c4e30c
--- /dev/null
+++ b/main/vim/vim-gcc47.patch
@@ -0,0 +1,13 @@
+*** runtime/compiler/gcc.vim 2012-06-07 04:42:38.000000000 +0400
+--- runtime/compiler/gcc.vim 2012-06-20 18:30:57.298165106 +0400
+***************
+*** 16,21 ****
+--- 16,23 ----
+ \%*[^\"]\"%f\"%*\\D%l:\ %m,
+ \\"%f\"%*\\D%l:%c:\ %m,
+ \\"%f\"%*\\D%l:\ %m,
++ \%-G%f:%l:%c:\ note:\ each\ undeclared\ identifier\ is\ reported\ only\ once
++ \\ for\ each\ function\ it\ appears\ in,
+ \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once,
+ \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.),
+ \%f:%l:%c:\ %trror:\ %m,