X-Git-Url: http://gitweb/?a=blobdiff_plain;f=vim%2FPkgfile;h=0be0ba7641405ccd2711e391fa7d7dc6db4c1c6c;hb=2c26c989882b1f0d4d843939b4152856c9859013;hp=714c143787ddddea75ddec1fef868cb95f453ac7;hpb=83e7e2d09802b3a99d4eda97a03cad72a1b1039a;p=crossrootfs.git

diff --git a/vim/Pkgfile b/vim/Pkgfile
index 714c143..0be0ba7 100644
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -1,27 +1,18 @@
 # Description: Highly configurable text editor
 # URL: http://www.vim.org/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Arch Maintainer: CRUX-ARM System Team, devel@crux-arm.nu
-# Depends on: ncurses
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: ncurses acl
 
 name=vim
-version=7.2.350
+version=8.0.0095
 release=1
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-${version%.*}.tar.bz2 \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${version%.*}-extra.tar.gz \
-        ftp://ftp.vim.org/pub/vim/extra/vim-${version%.*}-lang.tar.gz \
-        ftp://ftp.vim.org/pub/vim/patches/${version%.*}/7.2.001-100.gz \
-        ftp://ftp.vim.org/pub/vim/patches/${version%.*}/7.2.101-200.gz \
-        ftp://ftp.vim.org/pub/vim/patches/${version%.*}/7.2.201-300.gz \
-        http://crux.nu/files/distfiles/vim-7.2.301-350.xz)
+source=(http://crux.nu/files/distfiles/$name-$version.tar.xz)
 
 build () {
-    cd vim72/src
+  cd $name-$version/src
 
-    gunzip -c $SRC/${version%.*}.*.gz | patch -p0 -d $SRC/vim72
-    unxz -c $SRC/vim-${version%.*}.*.xz | patch -p0 -d $SRC/vim72
-
-    cat > auto/config.cache << EOF
+  cat > auto/config.cache << EOF
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
 vim_cv_stat_ignores_slash=no
@@ -30,35 +21,49 @@ vim_cv_tgent=zero
 vim_cv_toupper_broken=no
 vim_cv_tty_group=world
 ac_cv_sizeof_int=4
+vim_cv_toupper_broken=no
 EOF
 
-    ./configure --build=$CHOST \
-                --host=$CTARGET \
-                --prefix=/usr \
-                --mandir=/usr/man \
-                --with-vim-name=vim \
-                --with-features=normal \
-                --with-x=no \
-                --with-tlib=ncurses \
-                --enable-gui=no \
-                --enable-multibyte \
-                --disable-gtktest \
-                --disable-xim \
-                --disable-netbeans \
-                --disable-gpm \
-                --disable-nls
+  ./configure --build=$CHOST \
+              --host=$CTARGET \
+              --prefix=/usr \
+              --with-vim-name=vim \
+              --with-tlib=ncurses \
+              --without-x \
+              --disable-gui \
+              --enable-multibyte \
+              --disable-gpm \
+              --disable-nls \
+              --cache-file=$SRC/src/auto/config.cache
+
+  make VIMRTDIR=
+  make -j1 VIMRTDIR= DESTDIR=$PKG install
+
+  mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc
+  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/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
 
-    make VIMRTDIR= DESTDIR=$PKG install
+  ./configure --build=$CHOST \
+              --host=$CTARGET \
+              --prefix=/ \
+              --datarootdir=/usr/share \
+              --with-vim-name=vi \
+              --without-x \
+              --with-tlib=ncurses \
+              --disable-gui \
+              --enable-multibyte \
+              --disable-gpm \
+              --disable-nls \
+              --with-features=tiny
 
-    mv $PKG/usr/share/vim/vimrc_example.vim $PKG/usr/share/vim/vimrc
-    rm -rf $PKG/usr/man/man?/vimtutor* $PKG/usr/share/vim/tutor $PKG/usr/share/vim/macros
-    rm $PKG/usr/share/vim/*/README.txt
-    ln -sf vim $PKG/usr/bin/evim
-    ln -sf vim $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
+  make VIMRTDIR=
+  make VIMRTDIR=  DESTDIR=$PKG installvimbin
 }