vim: updated to 7.3.154 and aligned with upstream. Also updated cross patch

diff --git a/vim/.md5sum b/vim/.md5sum
index 7af9c635e182c7bf3e3fa081e998d445a4103e24..61d959cc713770e7f33f03d1720433cd25a192c5 100644 (file)
--- a/vim/.md5sum
+++ b/vim/.md5sum
@@ -1,5 +1,14 @@
-b517866de8a3c3a224c48e7ccc5bc0a3  vim-7.3-cross.diff
+22791e40a0572e73eb09c9f185ecf6d2  vim-7.3-cross.diff
 8a37f055666a095059a11cd4f3551b62  vim-7.3.001-050.xz
 19ed55574b327b62eda0375121c6f1c1  vim-7.3.051-102.xz
 ad27623207bb17d6accf1ba2d9f0b301  vim-7.3.103-154.xz
+225deb98aa81f7817398884a997de4e3  vim-7.3.155-198.xz
+ac39ba760ec1318424c73601d6a38467  vim-7.3.199-260.xz
+c640a1147b6824c902c56f0d512ac5d8  vim-7.3.261-303.xz
+8fca251214c3f64c5e314a34999d4178  vim-7.3.304-353.xz
+0569f542588bdff085cf4c2a913e84f1  vim-7.3.354-401.xz
+820bb5a8bc11642a350c28e723751e60  vim-7.3.402-470.xz
+bd739c11c478b7ee352467d6caed871d  vim-7.3.471-515.xz
+a48bc97d01078fa6b396dc79f9916fa1  vim-7.3.516-600.xz
+c4608d5814f016a9d67fe2f13ab036fb  vim-7.3.601-659.xz
 5b9510a17074e2b37d8bb38ae09edbf2  vim-7.3.tar.bz2

diff --git a/vim/Pkgfile b/vim/Pkgfile
index 6298a83a5a86caac20261afd25bf3f896cee3351..7707a5128f587f955c83146d55e7116f1b8cbb2a 100644 (file)
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -11,10 +11,20 @@ source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2
         http://crux.nu/files/distfiles/vim-7.3.001-050.xz
         http://crux.nu/files/distfiles/vim-7.3.051-102.xz
         http://crux.nu/files/distfiles/vim-7.3.103-154.xz
+        http://crux.nu/files/distfiles/vim-7.3.155-198.xz
+        http://crux.nu/files/distfiles/vim-7.3.199-260.xz
+        http://crux.nu/files/distfiles/vim-7.3.261-303.xz
+        http://crux.nu/files/distfiles/vim-7.3.304-353.xz
+        http://crux.nu/files/distfiles/vim-7.3.354-401.xz
+        http://crux.nu/files/distfiles/vim-7.3.402-470.xz
+        http://crux.nu/files/distfiles/vim-7.3.471-515.xz
+        http://crux.nu/files/distfiles/vim-7.3.516-600.xz
+        http://crux.nu/files/distfiles/vim-7.3.601-659.xz
         vim-7.3-cross.diff)
 
 build () {
   cd vim73/src
+
   unxz -c $SRC/vim-7.3.*.xz | patch -p0 -d $SRC/vim73
   patch -p2 -i $SRC/vim-7.3-cross.diff
 
@@ -38,9 +48,6 @@ EOF
               --without-x \
               --with-tlib=ncurses \
               --disable-gui \
-              --disable-gtktest \
-              --disable-xim \
-              --disable-netbeans \
               --enable-multibyte \
               --disable-gpm \
               --disable-nls \
@@ -64,13 +71,14 @@ EOF
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/ \
+              --datarootdir=/usr/share \
               --with-vim-name=vi \
-              --with-x=no \
-              --enable-gui=no \
+              --without-x \
+              --with-tlib=ncurses \
+              --disable-gui \
               --enable-multibyte \
               --disable-gpm \
               --disable-nls \
-              --with-tlib=ncurses \
               --with-features=tiny
 
   make VIMRTDIR=

diff --git a/vim/vim-7.3-cross.diff b/vim/vim-7.3-cross.diff
index c1927dcc89637391f17ccde4b74890c5f91952e3..e2e33c166b312fb26e152838e69d86dbf720b7a1 100644 (file)
--- a/vim/vim-7.3-cross.diff
+++ b/vim/vim-7.3-cross.diff
@@ -1,17 +1,5 @@
 --- a/src/auto/configure
 +++ b/src/auto/configure
-@@ -11641,10 +11641,7 @@ _ACEOF
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
- $as_echo_n "checking uint32_t is 32 bits... " >&6; }
--if test "$cross_compiling" = yes; then :
--  as_fn_error "could not compile program using uint32_t." "$LINENO" 5
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #ifdef HAVE_STDINT_H
 @@ -11660,7 +11657,7 @@ main() {
    exit(0);
  }
@@ -21,12 +9,3 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
  $as_echo "ok" >&6; }
  else
-@@ -11668,8 +11665,6 @@ else
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
- 
- 
- bcopy_test_prog='