wok-next diff gvim/receipt @ rev 21017

Some maintenance
author Aleksej Bobylev <al.bobylev@gmail.com>
date Tue Oct 16 16:46:05 2018 +0300 (2018-10-16)
parents d958fec46c9f
children d5aab818505e
line diff
     1.1 --- a/gvim/receipt	Tue Jul 10 20:08:05 2018 +0300
     1.2 +++ b/gvim/receipt	Tue Oct 16 16:46:05 2018 +0300
     1.3 @@ -1,9 +1,9 @@
     1.4 -# SliTaz package receipt.
     1.5 +# SliTaz package receipt v2.
     1.6  
     1.7  PACKAGE="gvim"
     1.8  VERSION="7.3"
     1.9  CATEGORY="editors"
    1.10 -SHORT_DESC="Advanced text editor, with gtk+ GUI"
    1.11 +SHORT_DESC="Advanced text editor with GTK+ GUI"
    1.12  MAINTAINER="erjo@slitaz.org"
    1.13  LICENSE="other"
    1.14  WEB_SITE="http://www.vim.org/"
    1.15 @@ -12,15 +12,10 @@
    1.16  SOURCE="vim"
    1.17  TARBALL="$SOURCE-$VERSION.tar.bz2"
    1.18  WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
    1.19 -CONFIG_FILES="/etc/vim/vimrc"
    1.20 -TAGS="text-editor"
    1.21  
    1.22 -DEPENDS="ncurses gtk+ xorg-libXt xorg-libXau xorg-libXdmcp"
    1.23 -BUILD_DEPENDS="gtk+-dev"
    1.24 +BUILD_DEPENDS="gtk2-dev"
    1.25  
    1.26 -# Rules to configure and make the package.
    1.27 -compile_rules()
    1.28 -{
    1.29 +compile_rules() {
    1.30  	# define the place for the global vimrc file (set to /etc/vim/vimrc)
    1.31  	# (patch from Arch Linux PKGBUILD)
    1.32  	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
    1.33 @@ -39,16 +34,17 @@
    1.34  		--disable-athena-check \
    1.35  		--mandir=/usr/share/man \
    1.36  		$CONFIGURE_ARGS &&
    1.37 +	make \
    1.38 +		VIMRCLOC=/etc/vim \
    1.39 +		VIMRUNTIMEDIR=/usr/share/vim/vim73 \
    1.40 +		MAKE="make -e" &&
    1.41 +	make DESTDIR=$DESTDIR install || return 1
    1.42  
    1.43 -	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
    1.44 -	make DESTDIR=$DESTDIR install
    1.45  	mkdir -p $DESTDIR/etc/vim
    1.46  	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
    1.47  }
    1.48  
    1.49 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.50 -genpkg_rules()
    1.51 -{
    1.52 +genpkg_rules() {
    1.53  	mkdir -p $fs/usr/share/icons/hicolor/16x16/apps $fs/usr/share/applications $fs/etc
    1.54  
    1.55  	cp -a $install/usr/bin $fs/usr
    1.56 @@ -56,10 +52,12 @@
    1.57  	cp -a $src/runtime/vim16x16.png $fs/usr/share/icons/hicolor/16x16/apps/gvim.png
    1.58  	cp -a stuff/gvim.desktop $fs/usr/share/applications
    1.59  	cp -a $install/etc/vim $fs/etc
    1.60 +	DEPENDS="ncurses gtk2 xorg-libXt xorg-libXau xorg-libXdmcp"
    1.61 +	CONFIG_FILES="/etc/vim/vimrc"
    1.62 +	TAGS="text-editor"
    1.63  }
    1.64  
    1.65 -post_install()
    1.66 -{
    1.67 +post_install() {
    1.68  	cmd=$(readlink "$1/bin/vi")
    1.69  	if [ ! "$cmd" == '/usr/bin/vim' ]; then
    1.70  		echo ""
    1.71 @@ -78,8 +76,7 @@
    1.72  	fi
    1.73  }
    1.74  
    1.75 -post_remove()
    1.76 -{
    1.77 +post_remove() {
    1.78  	# restore previous symlink
    1.79  	ln -sf busybox "$1/bin/vi"
    1.80  }