X-Git-Url: http://gitweb/?a=blobdiff_plain;f=vim%2FPkgfile;h=0be0ba7641405ccd2711e391fa7d7dc6db4c1c6c;hb=409d70d3a79af22e7342f5e34094a9584ac4f34e;hp=6298a83a5a86caac20261afd25bf3f896cee3351;hpb=f106a764059310b75a9883ec2d638e6083a03f05;p=crossrootfs.git

diff --git a/vim/Pkgfile b/vim/Pkgfile
index 6298a83..0be0ba7 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.154
+version=8.0.0095
 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
-        http://crux.nu/files/distfiles/vim-7.3.103-154.xz
-        vim-7.3-cross.diff)
+source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)
 
 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
+  cd $name-$version/src
 
   cat > auto/config.cache << EOF
 vim_cv_getcwd_broken=no
@@ -33,44 +27,41 @@ EOF
   ./configure --build=$CHOST \
               --host=$CTARGET \
               --prefix=/usr \
-              --mandir=/usr/man \
               --with-vim-name=vim \
-              --without-x \
               --with-tlib=ncurses \
+              --without-x \
               --disable-gui \
-              --disable-gtktest \
-              --disable-xim \
-              --disable-netbeans \
               --enable-multibyte \
               --disable-gpm \
               --disable-nls \
               --cache-file=$SRC/src/auto/config.cache
 
   make VIMRTDIR=
-  make VIMRTDIR= DESTDIR=$PKG installvimbin installruntime installlinks
+  make -j1 VIMRTDIR= DESTDIR=$PKG install
 
   mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc
-  rm -r $PKG/usr/{man/man?/vimtutor*,share/vim/{tutor,macros}}
+  rm -r $PKG/usr/{share/man/man?/vimtutor*,share/vim/{tutor,macros}}
   rm $PKG/usr/share/vim/*/README.txt
   ln -sf vim $PKG/usr/bin/evim
   ln -sf /bin/vi $PKG/usr/bin/vi
-  ln -sf vim.1.gz $PKG/usr/man/man1/ex.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/vi.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/rvim.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/view.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/rview.1.gz
-  ln -sf vim.1.gz $PKG/usr/man/man1/gvim.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/ex.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/vi.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/rvim.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/view.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/rview.1.gz
+  ln -sf vim.1.gz $PKG/usr/share/man/man1/gvim.1.gz
 
   ./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=