X-Git-Url: http://gitweb/?a=blobdiff_plain;f=vim%2FPkgfile;h=30e72b654e1f7645b7dc3f6dc6a425d0f65ff486;hb=432fdeca5126a5dcfda4c1e3f4d0df8868950d2c;hp=b691eb07c41b6b25bb940d901e154f8a879fc446;hpb=93b71f3bf7bc7497b96cd4629e4d2eb2f2654c4e;p=crossrootfs.git

diff --git a/vim/Pkgfile b/vim/Pkgfile
index b691eb0..30e72b6 100644
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -2,21 +2,15 @@
 # URL: http://www.vim.org/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
-# Depends on: ncurses
+# Depends on: ncurses acl
 
 name=vim
-version=7.3.102
+version=7.4.316
 release=1
-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
-        vim-7.3-cross.diff)
+source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)
 
 build () {
-  cd vim73/src
-
-  patch -p2 -i $SRC/vim-7.3-cross.diff
-  unxz -c $SRC/vim-7.3.*.xz | patch -p0 -d $SRC/vim73
+  cd $name-$version/src
 
   cat > auto/config.cache << EOF
 vim_cv_getcwd_broken=no
@@ -35,19 +29,16 @@ EOF
               --prefix=/usr \
               --mandir=/usr/man \
               --with-vim-name=vim \
-              --with-features=normal \
-              --with-x=no \
+              --without-x \
               --with-tlib=ncurses \
-              --enable-gui=no \
+              --disable-gui \
               --enable-multibyte \
-              --disable-gtktest \
-              --disable-xim \
-              --disable-netbeans \
               --disable-gpm \
               --disable-nls \
               --cache-file=$SRC/src/auto/config.cache
 
-  make VIMRTDIR= DESTDIR=$PKG install
+  make VIMRTDIR=
+  make VIMRTDIR= DESTDIR=$PKG installvimbin installruntime installlinks
 
   mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc
   rm -r $PKG/usr/{man/man?/vimtutor*,share/vim/{tutor,macros}}
@@ -64,14 +55,16 @@ 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= DESTDIR=$PKG installvimbin
+  make VIMRTDIR=
+  make VIMRTDIR=  DESTDIR=$PKG installvimbin
 }