X-Git-Url: http://gitweb/?a=blobdiff_plain;f=vim%2FPkgfile;h=6d1df1086b1d8a65d9edaef60fa6c2ea8f5433e0;hb=66448b56d844b2ff0d64c60967f9d18672db2ee9;hp=e202e363a3dd7df1dfaa6b749a675d7f7c3da32c;hpb=6dca1d213a39ee6af51632926e8b7c8914215cd9;p=crossrootfs.git

diff --git a/vim/Pkgfile b/vim/Pkgfile
index e202e36..6d1df10 100644
--- a/vim/Pkgfile
+++ b/vim/Pkgfile
@@ -1,21 +1,36 @@
 # Description: Highly configurable text editor
 # URL: http://www.vim.org/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Ach Maintainer: CRUX ARM System Team
-# Depends on: ncurses
+# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
+# Depends on: ncurses acl
 
 name=vim
-version=7.2.160
+version=7.3.754
 release=1
-source=(ftp://ftp.vim.org/pub/vim/unix/vim-7.2.tar.bz2 \
-        http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-sysroot/patches/$name-${version%.*}-branch_update-11.patch)
+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
+        http://crux.nu/files/distfiles/vim-7.3.660-712.xz
+        http://crux.nu/files/distfiles/vim-7.3.713-754.xz
+        vim-7.3-cross.diff)
 
 build () {
-    cd vim72
-    patch -p1 -i $SRC/$name-${version%.*}-branch_update-11.patch
-    cd src
+  cd vim73/src
 
-    cat > auto/config.cache << EOF
+  unxz -c $SRC/vim-7.3.*.xz | patch -p0 -d $SRC/vim73
+  patch -p2 -i $SRC/vim-7.3-cross.diff
+
+  cat > auto/config.cache << EOF
 vim_cv_getcwd_broken=no
 vim_cv_memmove_handles_overlap=yes
 vim_cv_stat_ignores_slash=no
@@ -24,35 +39,50 @@ 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
-
-    make VIMRTDIR= DESTDIR=$PKG install
-
-    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
+  ./configure --build=$CHOST \
+              --host=$CTARGET \
+              --prefix=/usr \
+              --mandir=/usr/man \
+              --with-vim-name=vim \
+              --without-x \
+              --with-tlib=ncurses \
+              --disable-gui \
+              --enable-multibyte \
+              --disable-gpm \
+              --disable-nls \
+              --cache-file=$SRC/src/auto/config.cache
+
+  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}}
+  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
+
+  ./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
+
+  make VIMRTDIR=
+  make VIMRTDIR=  DESTDIR=$PKG installvimbin
 }