wok-6.x rev 9417
Up: vim, vim-tiny and gvim to 7.3, fixed vimrc path, linked libraries and build depends
| author | Manuel Flores Vivas <manuelfloresv@gmail.com> |
|---|---|
| date | Wed Mar 30 01:13:57 2011 +0000 (2011-03-30) |
| parents | b5e282d6944e |
| children | e70cbaee772f |
| files | gvim/receipt vim-tiny/receipt vim/receipt |
line diff
1.1 --- a/gvim/receipt Wed Mar 30 02:13:20 2011 +0200 1.2 +++ b/gvim/receipt Wed Mar 30 01:13:57 2011 +0000 1.3 @@ -1,11 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="gvim" 1.7 -VERSION="7.2" 1.8 +VERSION="7.3" 1.9 CATEGORY="development" 1.10 SHORT_DESC="Advanced text editor, with gtk+ GUI" 1.11 MAINTAINER="erjo@slitaz.org" 1.12 -DEPENDS="ncurses gtk+ xorg-libXt" 1.13 +DEPENDS="ncurses gtk+ xorg-libXt xorg-libXau xorg-libXdmcp" 1.14 SOURCE="vim" 1.15 TARBALL="$SOURCE-$VERSION.tar.bz2" 1.16 WEB_SITE="http://www.vim.org/" 1.17 @@ -17,18 +17,25 @@ 1.18 compile_rules() 1.19 { 1.20 cd $src 1.21 + 1.22 + # define the place for the global vimrc file (set to /etc/vim/vimrc) 1.23 + # (patch from Arch Linux PKGBUILD) 1.24 + sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h 1.25 + # and global gvimrc file (set to /etc/vim/gvimrc) 1.26 + sed -i 's|^.*\(#define SYS_GVIMRC_FILE\).*$|\1 "/etc/vim/gvimrc"|' $src/src/feature.h 1.27 1.28 ./configure --prefix=/usr \ 1.29 --cache-file=$PWD/config.cache \ 1.30 --infodir=/usr/share/info \ 1.31 --with-features=normal \ 1.32 + --with-x=yes \ 1.33 --enable-gui=gtk2 \ 1.34 --enable-multibyte \ 1.35 --disable-motif-check \ 1.36 --disable-athena-check \ 1.37 --mandir=/usr/share/man $CONFIGURE_ARGS && 1.38 1.39 - make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim72 MAKE="make -e" && 1.40 + make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" && 1.41 make DESTDIR=$DESTDIR install 1.42 mkdir -p $DESTDIR/etc/vim 1.43 cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc 1.44 @@ -37,14 +44,42 @@ 1.45 # Rules to gen a SliTaz package suitable for Tazpkg. 1.46 genpkg_rules() 1.47 { 1.48 - mkdir -p -p $fs/usr/share/pixmaps \ 1.49 - -p $fs/usr/share/applications 1.50 + mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications $fs/etc 1.51 1.52 cp -a $_pkg/usr/bin $fs/usr 1.53 cp -a $_pkg/usr/share/vim $fs/usr/share 1.54 cp -a $src/runtime/vim16x16.png $fs/usr/share/pixmaps/gvim.png 1.55 cp -a stuff/gvim.desktop $fs/usr/share/applications 1.56 - rm -f $fs/usr/bin/*vimtutor 1.57 + cp -a $_pkg/etc/vim $fs/etc 1.58 } 1.59 1.60 +post_install() 1.61 +{ 1.62 + local root 1.63 + root=$1 1.64 + echo "Processing post-install commands..." 1.65 + cmd=`readlink $root/bin/vi` 1.66 + if [ ! "$cmd" = "/usr/bin/vim" ]; then 1.67 + echo "" 1.68 + echo "**** Actual VI link : $cmd" 1.69 + echo "" 1.70 + echo -n "Do you want vim for /bin/vi (y/N) ? : "; read anser 1.71 + if [ "$anser" == "y" ]; then 1.72 + echo "" 1.73 + echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." 1.74 + rm $root/bin/vi && ln -sf $root/usr/bin/vim $root/bin/vi 1.75 + status 1.76 + else 1.77 + echo "" 1.78 + echo "Leaving /bin/vi to : $cmd" 1.79 + fi 1.80 + fi 1.81 +} 1.82 1.83 +post_remove() 1.84 +{ 1.85 + # restore previous symlink 1.86 + echo "Processing post-remove commands..." 1.87 + ln -sf /bin/busybox $1/bin/vi 1.88 +} 1.89 +
2.1 --- a/vim-tiny/receipt Wed Mar 30 02:13:20 2011 +0200 2.2 +++ b/vim-tiny/receipt Wed Mar 30 01:13:57 2011 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="vim-tiny" 2.7 -VERSION="7.2" 2.8 +VERSION="7.3" 2.9 CATEGORY="development" 2.10 SHORT_DESC="Advanced text editor with no GUI" 2.11 MAINTAINER="erjo@slitaz.org" 2.12 @@ -10,19 +10,24 @@ 2.13 TARBALL="$SOURCE-$VERSION.tar.bz2" 2.14 WEB_SITE="http://www.vim.org/" 2.15 WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL" 2.16 -CONFIG_FILES="/etc/vimrc.tiny" 2.17 +CONFIG_FILES="/etc/vim/vimrc" 2.18 TAGS="text-editor" 2.19 2.20 # Rules to configure and make the package. 2.21 compile_rules() 2.22 { 2.23 cd $src 2.24 + 2.25 + # define the place for the global vimrc file (set to /etc/vim/vimrc) 2.26 + # (patch from Arch Linux PKGBUILD) 2.27 + sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h 2.28 2.29 ./configure --prefix=/usr \ 2.30 --cache-file=$PWD/config.cache \ 2.31 --infodir=/usr/share/info \ 2.32 --with-features=tiny \ 2.33 - --enable-gui=no \ 2.34 + --with-x=no \ 2.35 + --disable-gui \ 2.36 --enable-multibyte \ 2.37 --with-vim-name=$PACKAGE \ 2.38 --disable-acl \ 2.39 @@ -30,7 +35,7 @@ 2.40 --disable-athena-check \ 2.41 --mandir=/usr/share/man $CONFIGURE_ARGS && 2.42 2.43 - make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/$src MAKE="make -e" && 2.44 + make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" && 2.45 make DESTDIR=$DESTDIR install 2.46 mkdir -p $DESTDIR/etc/vim 2.47 cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc 2.48 @@ -39,10 +44,11 @@ 2.49 # Rules to gen a SliTaz package suitable for Tazpkg. 2.50 genpkg_rules() 2.51 { 2.52 - mkdir -p $fs/usr $fs/usr/share 2.53 + mkdir -p $fs/usr/share $fs/etc 2.54 2.55 cp -a $_pkg/usr/bin $fs/usr 2.56 cp -a $_pkg/usr/share/vim $fs/usr/share 2.57 + cp -a $_pkg/etc/vim $fs/etc 2.58 rm -f $fs/usr/bin/*tutor 2.59 } 2.60
3.1 --- a/vim/receipt Wed Mar 30 02:13:20 2011 +0200 3.2 +++ b/vim/receipt Wed Mar 30 01:13:57 2011 +0000 3.3 @@ -1,7 +1,7 @@ 3.4 # SliTaz package receipt. 3.5 3.6 PACKAGE="vim" 3.7 -VERSION="7.2" 3.8 +VERSION="7.3" 3.9 CATEGORY="development" 3.10 SHORT_DESC="Advanced text editor" 3.11 MAINTAINER="erjo@slitaz.org" 3.12 @@ -16,18 +16,23 @@ 3.13 compile_rules() 3.14 { 3.15 cd $src 3.16 + 3.17 + # define the place for the global vimrc file (set to /etc/vim/vimrc) 3.18 + # (patch from Arch Linux PKGBUILD) 3.19 + sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h 3.20 3.21 ./configure --prefix=/usr \ 3.22 --cache-file=$PWD/config.cache \ 3.23 --infodir=/usr/share/info \ 3.24 --with-features=normal \ 3.25 + --with-x=no \ 3.26 --disable-gui \ 3.27 --enable-multibyte \ 3.28 --disable-motif-check \ 3.29 --disable-athena-check \ 3.30 --mandir=/usr/share/man $CONFIGURE_ARGS && 3.31 3.32 - make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim72 MAKE="make -e" && 3.33 + make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" && 3.34 make DESTDIR=$DESTDIR install 3.35 mkdir -p $DESTDIR/etc/vim 3.36 cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc 3.37 @@ -36,11 +41,11 @@ 3.38 # Rules to gen a SliTaz package suitable for Tazpkg. 3.39 genpkg_rules() 3.40 { 3.41 - mkdir -p $fs/usr $fs/usr/share 3.42 + mkdir -p $fs/usr/share $fs/etc 3.43 3.44 cp -a $_pkg/usr/bin $fs/usr 3.45 cp -a $_pkg/usr/share/vim $fs/usr/share 3.46 - rm -f $fs/usr/bin/*vimtutor 3.47 + cp -a $_pkg/etc/vim $fs/etc 3.48 } 3.49 3.50 post_install()