wok-next rev 19582

Up: eudev, man-db (added), vim. Extra up: ncurses, tk, python, cacerts.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Dec 30 02:04:27 2016 +0200 (2016-12-30)
parents f7d9f142f79d
children 119e586fb823
files cacerts/receipt eudev-dev/receipt eudev/receipt man-db/description.txt man-db/receipt ncurses/receipt python-dev/receipt python-idle/stuff/python-idle.desktop python/receipt python/stuff/applications/python.desktop tk-dev/receipt tk/receipt vim-tiny/receipt vim/receipt
line diff
     1.1 --- a/cacerts/receipt	Thu Dec 29 07:31:53 2016 +0200
     1.2 +++ b/cacerts/receipt	Fri Dec 30 02:04:27 2016 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cacerts"
     1.7 -VERSION="20161124"
     1.8 +VERSION="20161227"
     1.9  CATEGORY="security"
    1.10  SHORT_DESC="Certificate Authority Certificates"
    1.11  MAINTAINER="al.bobylev@gmail.com"
     2.1 --- a/eudev-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
     2.2 +++ b/eudev-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
     2.3 @@ -1,24 +1,20 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="eudev-dev"
     2.7 -VERSION="1.9"
     2.8 +VERSION="3.2"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="Eudev devel file (libudev)."
    2.11 +SHORT_DESC="Programs for dynamic creation of device nodes (development files)"
    2.12  MAINTAINER="tcg.thegamer@gmail.com"
    2.13  LICENSE="GPL2"
    2.14 -WANTED="eudev"
    2.15 -WEB_SITE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
    2.16 +WEB_SITE="http://dev.gentoo.org/~blueness/eudev/"
    2.17  HOST_ARCH="i486 arm"
    2.18  PROVIDE="udev-dev"
    2.19  
    2.20 +WANTED="eudev"
    2.21  DEPENDS="eudev pkg-config"
    2.22  
    2.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.24  genpkg_rules()
    2.25  {
    2.26 -	mkdir -p $fs/lib $fs/usr/lib/pkgconfig $fs/usr/include
    2.27 -	cp -a $install/lib/libudev*a $fs/lib
    2.28 -	cp -a $install/lib/pkgconfig/libudev.pc $fs/usr/lib/pkgconfig
    2.29 -	cp -a $install/usr/share/pkgconfig/* $fs/usr/lib/pkgconfig
    2.30 -	cp -a $install/usr/include/libudev.h $fs/usr/include
    2.31 +	cook_copy_files *.h *.la *.pc
    2.32  }
     3.1 --- a/eudev/receipt	Thu Dec 29 07:31:53 2016 +0200
     3.2 +++ b/eudev/receipt	Fri Dec 30 02:04:27 2016 +0200
     3.3 @@ -1,35 +1,44 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="eudev"
     3.7 -VERSION="1.9"
     3.8 +VERSION="3.2"
     3.9  CATEGORY="base-system"
    3.10 -SHORT_DESC="Fork of udev to avoid depending on systemd"
    3.11 +SHORT_DESC="Programs for dynamic creation of device nodes"
    3.12  MAINTAINER="tcg.thegamer@gmail.com"
    3.13  LICENSE="GPL2"
    3.14 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.15 -WEB_SITE="http://dev.gentoo.org/~blueness/eudev"
    3.16 -WGET_URL="${WEB_SITE}/${TARBALL}"
    3.17 +WEB_SITE="http://dev.gentoo.org/~blueness/eudev/"
    3.18  PROVIDE="udev"
    3.19  
    3.20 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.21 +WGET_URL="${WEB_SITE}$TARBALL"
    3.22 +
    3.23  DEPENDS="dbus util-linux-blkid pciids usbids acl kmod"
    3.24 -BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev \
    3.25 -dbus-dev gperf pkg-config acl-dev"
    3.26 +BUILD_DEPENDS="gobject-introspection-dev util-linux-blkid-dev gperf"
    3.27  
    3.28  # Rules to configure and make the package.
    3.29  compile_rules()
    3.30  {
    3.31 +	sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl
    3.32 +	cat > config.cache <<"EOF"
    3.33 +HAVE_BLKID=1
    3.34 +BLKID_LIBS="-lblkid"
    3.35 +BLKID_CFLAGS="-I/tools/include"
    3.36 +EOF
    3.37 +
    3.38  	./configure \
    3.39 +		--bindir=/sbin \
    3.40 +		--sbindir=/sbin \
    3.41 +		--libdir=/usr/lib \
    3.42  		--sysconfdir=/etc \
    3.43 -		--exec-prefix="" \
    3.44 -		--with-rootprefix="" \
    3.45 -		--disable-manpages \
    3.46 -		--disable-introspection \
    3.47 -		--disable-keymap \
    3.48 -		--enable-floppy \
    3.49 -		--enable-rule-generator \
    3.50 +		--libexecdir=/lib \
    3.51 +		--with-rootprefix= \
    3.52 +		--with-rootlibdir=/lib \
    3.53 +		--enable-manpages \
    3.54 +		--disable-static \
    3.55 +		--config-cache \
    3.56  		$CONFIGURE_ARGS &&
    3.57  	make &&
    3.58 -	make DESTDIR=$DESTDIR install
    3.59 +	make install
    3.60  }
    3.61  
    3.62  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.63 @@ -39,7 +48,7 @@
    3.64  
    3.65  	cp -a $install/sbin $fs
    3.66  	cp -a $install/etc $fs
    3.67 -	cp -a $install/lib/libgudev*so* $fs/lib
    3.68 +	cp -a $install/lib/libudev.so* $fs/lib
    3.69  	cp -a $install/lib/udev $fs/lib
    3.70  
    3.71  	# Copy rules files to udev conf dir
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/man-db/description.txt	Fri Dec 30 02:04:27 2016 +0200
     4.3 @@ -0,0 +1,23 @@
     4.4 +`man-db` is an implementation of the standard Unix documentation system
     4.5 +accessed using the `man` command. It uses a Berkeley DB database in place of
     4.6 +the traditional flat-text whatis databases. `man-db` is used by several
     4.7 +popular GNU/Linux distributions.
     4.8 +
     4.9 +Package contents:
    4.10 +
    4.11 +  * `accessdb` - Dumps the `whatis` database contents in human-readable form
    4.12 +  * `apropos` - Searches the `whatis` database and displays the short
    4.13 +    descriptions of system commands that contain a given string
    4.14 +  * `catman` - Creates or updates the pre-formatted manual pages
    4.15 +  * `lexgrog` - Displays one-line summary information about a given manual
    4.16 +    page
    4.17 +  * `man` - Formats and displays the requested manual page
    4.18 +  * `mandb` - Creates or updates the `whatis` database
    4.19 +  * `manpath` - Displays the contents of $MANPATH or (if $MANPATH is not set)
    4.20 +    a suitable search path based on the settings in man.conf and the user's
    4.21 +    environment
    4.22 +  * `whatis` - Searches the whatis database and displays the short
    4.23 +    descriptions of system commands that contain the given keyword as a
    4.24 +    separate word
    4.25 +  * `libman` - Contains run-time support for man
    4.26 +  * `libmandb` - Contains run-time support for man
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/man-db/receipt	Fri Dec 30 02:04:27 2016 +0200
     5.3 @@ -0,0 +1,39 @@
     5.4 +# SliTaz package receipt.
     5.5 +
     5.6 +PACKAGE="man-db"
     5.7 +VERSION="2.7.5"
     5.8 +CATEGORY="system-tools"
     5.9 +SHORT_DESC="The on-line manual database"
    5.10 +MAINTAINER="al.bobylev@gmail.com"
    5.11 +LICENSE="GPL2"
    5.12 +WEB_SITE="http://www.nongnu.org/man-db/"
    5.13 +
    5.14 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    5.15 +WGET_URL="http://download.savannah.gnu.org/releases/man-db/$TARBALL"
    5.16 +
    5.17 +DEPENDS="gdbm libpipeline zlib"
    5.18 +BUILD_DEPENDS="groff bzip2-dev xz-dev gettext libpipeline-dev gdbm-dev \
    5.19 +zlib-dev"
    5.20 +
    5.21 +# Rules to configure and make the package.
    5.22 +compile_rules()
    5.23 +{
    5.24 +	./configure \
    5.25 +		--docdir=/usr/share/doc/$PACKAGE-$VERSION \
    5.26 +		--sysconfdir=/etc \
    5.27 +		--disable-setuid \
    5.28 +		--with-browser=/usr/bin/lynx \
    5.29 +		--with-vgrind=/usr/bin/vgrind \
    5.30 +		--with-grap=/usr/bin/grap \
    5.31 +		$CONFIGURE_ARGS &&
    5.32 +	make && make install
    5.33 +
    5.34 +	sed -i "s:man root:root root:g" $install/usr/lib/tmpfiles.d/man-db.conf
    5.35 +}
    5.36 +
    5.37 +# Rules to gen a SliTaz package suitable for Tazpkg.
    5.38 +genpkg_rules()
    5.39 +{
    5.40 +	cook_copy_folders bin libexec sbin
    5.41 +	cook_copy_files *.conf *.so*
    5.42 +}
     6.1 --- a/ncurses/receipt	Thu Dec 29 07:31:53 2016 +0200
     6.2 +++ b/ncurses/receipt	Fri Dec 30 02:04:27 2016 +0200
     6.3 @@ -12,7 +12,6 @@
     6.4  WGET_URL="http://ftp.gnu.org/gnu/ncurses/$TARBALL"
     6.5  HOST_ARCH="i486 arm"
     6.6  
     6.7 -DEPENDS=""
     6.8  BUILD_DEPENDS="flex"
     6.9  SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra \
    6.10  ncurses-dev"
     7.1 --- a/python-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
     7.2 +++ b/python-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
     7.3 @@ -6,11 +6,10 @@
     7.4  SHORT_DESC="The Python programming language devel files."
     7.5  MAINTAINER="pankso@slitaz.org"
     7.6  LICENSE="PSL"
     7.7 -WANTED="python"
     7.8 -SOURCE="Python"
     7.9  WEB_SITE="http://www.python.org/"
    7.10  HOST_ARCH="i486 arm"
    7.11  
    7.12 +WANTED="python"
    7.13  DEPENDS="python"
    7.14  
    7.15  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.16 @@ -24,4 +23,3 @@
    7.17  	python_version=${VERSION:0:3}
    7.18  	rm $fs/usr/include/${WANTED}$python_version/pyconfig.h
    7.19  }
    7.20 -
     8.1 --- a/python-idle/stuff/python-idle.desktop	Thu Dec 29 07:31:53 2016 +0200
     8.2 +++ b/python-idle/stuff/python-idle.desktop	Fri Dec 30 02:04:27 2016 +0200
     8.3 @@ -1,8 +1,6 @@
     8.4  [Desktop Entry]
     8.5 -Encoding=UTF-8
     8.6 +Type=Application
     8.7  Name=Python IDLE
     8.8 -Terminal=false
     8.9  Exec=idle
    8.10  Icon=python
    8.11 -Type=Application
    8.12  Categories=Development;
     9.1 --- a/python/receipt	Thu Dec 29 07:31:53 2016 +0200
     9.2 +++ b/python/receipt	Fri Dec 30 02:04:27 2016 +0200
     9.3 @@ -6,16 +6,17 @@
     9.4  SHORT_DESC="The Python programming language."
     9.5  MAINTAINER="pankso@slitaz.org"
     9.6  LICENSE="PSL"
     9.7 -SOURCE="Python"
     9.8 -TARBALL="$SOURCE-$VERSION.tar.bz2"
     9.9  WEB_SITE="http://www.python.org/"
    9.10 -WGET_URL="https://www.python.org/ftp/python/$VERSION/$TARBALL"
    9.11  HOST_ARCH="i486 arm"
    9.12 +COOKOPTS="!menus"
    9.13  
    9.14 -RELATED="python-dev python-idle" # version must match
    9.15 -DEPENDS="openssl bzlib readline sqlite zlib ncursesw gdbm libffi"
    9.16 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    9.17 +WGET_URL="https://www.python.org/ftp/python/$VERSION/Python-$VERSION.tar.bz2"
    9.18 +
    9.19 +DEPENDS="openssl bzlib readline sqlite zlib ncurses gdbm libffi"
    9.20  BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite-dev zlib-dev \
    9.21 -ncursesw-dev tcl-dev tk-dev db-dev gdbm-dev wget libffi-dev"
    9.22 +ncurses-dev tcl-dev tk-dev db-dev gdbm-dev libffi-dev"
    9.23 +SPLIT="python-idle"
    9.24  
    9.25  # Rules to configure and make the package.
    9.26  compile_rules()
    9.27 @@ -39,7 +40,7 @@
    9.28  			./configure CC=gcc \
    9.29  				--disable-ipv6 \
    9.30  				--build=i486-slitaz-linux \
    9.31 -				--host=${BUILD_SYSTEM} && 
    9.32 +				--host=${BUILD_SYSTEM} &&
    9.33  			make python Parser/pgen &&
    9.34  			mv python hostpython &&
    9.35  			mv Parser/pgen Parser/hostpgen || exit 1
    9.36 @@ -68,14 +69,18 @@
    9.37  				CROSS_COMPILE_TARGET=yes \
    9.38  				HOSTARCH=${HOST_SYSTEM} \
    9.39  				BUILDARCH=${BUILD_SYSTEM} || exit 1
    9.40 -			make DESTDIR=$DESTDIR install || exit 1 ;;
    9.41 +			make DESTDIR=$DESTDIR install || exit 1
    9.42 +			;;
    9.43  		i?86)
    9.44  			./configure \
    9.45  				--enable-shared \
    9.46  				--build=${HOST_SYSTEM} \
    9.47  				--host=${HOST_SYSTEM} &&
    9.48 -				make &&	make DESTDIR=$DESTDIR install ;;
    9.49 +				make && make DESTDIR=$DESTDIR install
    9.50 +			;;
    9.51  	esac
    9.52 +
    9.53 +	cp -a $stuff/applications $install/usr/share
    9.54  }
    9.55  
    9.56  # Rules to gen a SliTaz package suitable for Tazpkg.
    10.1 --- a/python/stuff/applications/python.desktop	Thu Dec 29 07:31:53 2016 +0200
    10.2 +++ b/python/stuff/applications/python.desktop	Fri Dec 30 02:04:27 2016 +0200
    10.3 @@ -4,6 +4,7 @@
    10.4  Name[fr]=Interpreteur Python
    10.5  Name[pt]=Interpretador Python
    10.6  Name[pt_BR]=Interpretador Python
    10.7 +Name[ru]=Интерпретатор Python
    10.8  Terminal=false
    10.9  Exec=terminal -e python
   10.10  Icon=python
    11.1 --- a/tk-dev/receipt	Thu Dec 29 07:31:53 2016 +0200
    11.2 +++ b/tk-dev/receipt	Fri Dec 30 02:04:27 2016 +0200
    11.3 @@ -6,12 +6,11 @@
    11.4  SHORT_DESC="The TCL gui toolkit dev files"
    11.5  MAINTAINER="erjo@slitaz.org"
    11.6  LICENSE="BSD"
    11.7 -SOURCE="tk"
    11.8  WEB_SITE="http://tcl.sourceforge.net/"
    11.9 -WANTED="tk"
   11.10  HOST_ARCH="i486 arm"
   11.11  
   11.12 -DEPENDS="tcl tk"
   11.13 +WANTED="tk"
   11.14 +DEPENDS="tcl tk xorg-libX11-dev"
   11.15  
   11.16  # Rules to gen a SliTaz package suitable for Tazpkg.
   11.17  genpkg_rules()
    12.1 --- a/tk/receipt	Thu Dec 29 07:31:53 2016 +0200
    12.2 +++ b/tk/receipt	Fri Dec 30 02:04:27 2016 +0200
    12.3 @@ -6,12 +6,13 @@
    12.4  SHORT_DESC="The TCL gui toolkit"
    12.5  MAINTAINER="erjo@slitaz.org"
    12.6  LICENSE="BSD"
    12.7 -TARBALL="${PACKAGE}${VERSION}-src.tar.gz"
    12.8  WEB_SITE="http://tcl.sourceforge.net/"
    12.9 -WGET_URL="$SF_MIRROR/tcl/$TARBALL"
   12.10  TAGS="programming language"
   12.11  HOST_ARCH="i486 arm"
   12.12  
   12.13 +TARBALL="$PACKAGE$VERSION-src.tar.gz"
   12.14 +WGET_URL="$SF_MIRROR/tcl/$TARBALL"
   12.15 +
   12.16  DEPENDS="tcl expat fontconfig freetype xorg-libX11 xorg-libXau xorg-libXdmcp \
   12.17  xorg-libXft xorg-libXrender zlib xorg-libXss"
   12.18  BUILD_DEPENDS="tcl-dev xorg-libX11-dev"
    13.1 --- a/vim-tiny/receipt	Thu Dec 29 07:31:53 2016 +0200
    13.2 +++ b/vim-tiny/receipt	Fri Dec 30 02:04:27 2016 +0200
    13.3 @@ -1,76 +1,67 @@
    13.4  # SliTaz package receipt.
    13.5  
    13.6  PACKAGE="vim-tiny"
    13.7 -VERSION="7.3"
    13.8 +VERSION="7.4"
    13.9  CATEGORY="editors"
   13.10  SHORT_DESC="Advanced text editor with no GUI"
   13.11  MAINTAINER="erjo@slitaz.org"
   13.12  LICENSE="other"
   13.13 -SOURCE="vim"
   13.14 -TARBALL="$SOURCE-$VERSION.tar.bz2"
   13.15  WEB_SITE="http://www.vim.org/"
   13.16 -WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
   13.17  CONFIG_FILES="/etc/vim/vimrc"
   13.18  TAGS="text-editor"
   13.19  
   13.20 +TARBALL="vim-$VERSION.tar.bz2"
   13.21 +WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
   13.22 +
   13.23  DEPENDS="ncurses"
   13.24  BUILD_DEPENDS="ncurses-dev"
   13.25  
   13.26  # Rules to configure and make the package.
   13.27  compile_rules()
   13.28  {
   13.29 -	export LDFLAGS="$LDFLAGS -ltinfo"
   13.30 -
   13.31 -	# define the place for the global vimrc file (set to /etc/vim/vimrc)
   13.32 -	# (patch from Arch Linux PKGBUILD)
   13.33 -	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
   13.34 +	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
   13.35  
   13.36  	./configure --prefix=/usr \
   13.37 -		--cache-file=$PWD/config.cache \
   13.38 -		--infodir=/usr/share/info \
   13.39  		--with-features=tiny \
   13.40 -		--with-x=no \
   13.41 +		--without-x \
   13.42  		--disable-gui \
   13.43  		--enable-multibyte \
   13.44  		--with-vim-name=$PACKAGE \
   13.45  		--disable-acl \
   13.46 -		--disable-motif-check \
   13.47 -		--disable-athena-check \
   13.48 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
   13.49 +		$CONFIGURE_ARGS &&
   13.50 +	make && make install
   13.51  
   13.52 -	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
   13.53 -	make DESTDIR=$DESTDIR install
   13.54  	mkdir -p $DESTDIR/etc/vim
   13.55  	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
   13.56 +
   13.57 +	mkdir -p $install/usr/share/doc
   13.58 +	mv $install/usr/share/vim/vim*/doc $install/usr/share/doc/$PACKAGE-$VERSION
   13.59  }
   13.60  
   13.61  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.62  genpkg_rules()
   13.63  {
   13.64 -	mkdir -p $fs/usr/share $fs/etc
   13.65 -
   13.66 -	cp -a $install/usr/bin $fs/usr
   13.67 -	cp -a $install/usr/share/vim $fs/usr/share
   13.68 -	cp -a $install/etc/vim $fs/etc
   13.69 -	rm -f $fs/usr/bin/*tutor
   13.70 +	cook_copy_folders etc bin vim
   13.71 +	rm -f  $fs/usr/bin/*tutor
   13.72 +	rm -rf $fs/usr/share/vim/vim*/tutor
   13.73  }
   13.74  
   13.75  post_install()
   13.76  {
   13.77  	cmd=$(readlink "$1/bin/vi")
   13.78  	if [ "$cmd" != '/usr/bin/vim' ]; then
   13.79 -		echo ''
   13.80 +		echo
   13.81  		echo "**** Actual VI link : $cmd"
   13.82 -		echo ''
   13.83 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
   13.84 +		echo
   13.85 +		echo -n 'Do you want vim  for /bin/vi (y/N)? : '; read -t 30 anser
   13.86  		if [ "$anser" == 'y' ]; then
   13.87 -			echo ''
   13.88 +			echo
   13.89  			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
   13.90  			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
   13.91  			status
   13.92  		else
   13.93 -			echo ''
   13.94 -			echo "Leaving /bin/vi to : $cmd"
   13.95 +			echo
   13.96 +			echo "Leaving /bin/vi to $cmd"
   13.97  		fi
   13.98  	fi
   13.99  }
    14.1 --- a/vim/receipt	Thu Dec 29 07:31:53 2016 +0200
    14.2 +++ b/vim/receipt	Fri Dec 30 02:04:27 2016 +0200
    14.3 @@ -1,72 +1,63 @@
    14.4  # SliTaz package receipt.
    14.5  
    14.6  PACKAGE="vim"
    14.7 -VERSION="7.3"
    14.8 +VERSION="7.4"
    14.9  CATEGORY="editors"
   14.10  SHORT_DESC="Advanced text editor"
   14.11  MAINTAINER="erjo@slitaz.org"
   14.12  LICENSE="other"
   14.13 -TARBALL="$PACKAGE-$VERSION.tar.bz2"
   14.14  WEB_SITE="http://www.vim.org/"
   14.15 -WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
   14.16  CONFIG_FILES="/etc/vim/vimrc"
   14.17  TAGS="text-editor"
   14.18  
   14.19 -DEPENDS="ncurses acl diffutils"
   14.20 -BUILD_DEPENDS="ncurses-dev acl-dev diffutils"
   14.21 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
   14.22 +WGET_URL="ftp://ftp.vim.org/pub/vim/unix/$TARBALL"
   14.23 +
   14.24 +DEPENDS="ncurses acl attr diffutils"
   14.25 +# python may be removed after "ncursesw problem" solved
   14.26 +BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext"
   14.27 +SIBLINGS="vim-tiny"
   14.28  
   14.29  # Rules to configure and make the package.
   14.30  compile_rules()
   14.31  {
   14.32 -	export LDFLAGS="$LDFLAGS -ltinfo"
   14.33 -
   14.34 -	# define the place for the global vimrc file (set to /etc/vim/vimrc)
   14.35 -	# (patch from Arch Linux PKGBUILD)
   14.36 -	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
   14.37 +	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
   14.38  
   14.39  	./configure \
   14.40 -		--prefix=/usr \
   14.41 -		--cache-file=$PWD/config.cache \
   14.42 -		--infodir=/usr/share/info \
   14.43 -		--with-features=normal \
   14.44 -		--with-x=no \
   14.45 +		--without-x \
   14.46  		--disable-gui \
   14.47  		--enable-multibyte \
   14.48 -		--disable-motif-check \
   14.49 -		--disable-athena-check \
   14.50 -		--mandir=/usr/share/man $CONFIGURE_ARGS &&
   14.51 +		$CONFIGURE_ARGS &&
   14.52 +	make && make install
   14.53  
   14.54 -	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
   14.55 -	make DESTDIR=$DESTDIR install
   14.56 -	mkdir -p $DESTDIR/etc/vim
   14.57 -	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
   14.58 +	mkdir -p $install/etc/vim
   14.59 +	cp -a $src/runtime/vimrc_example.vim $install/etc/vim/vimrc
   14.60 +
   14.61 +	mkdir -p $install/usr/share/doc
   14.62 +	ln -s ../vim/vim*/doc $install/usr/share/doc/vim-$VERSION
   14.63  }
   14.64  
   14.65  # Rules to gen a SliTaz package suitable for Tazpkg.
   14.66  genpkg_rules()
   14.67  {
   14.68 -	mkdir -p $fs/usr/share $fs/etc
   14.69 -	
   14.70 -	cp -a $install/usr/bin $fs/usr
   14.71 -	cp -a $install/usr/share/vim $fs/usr/share
   14.72 -	cp -a $install/etc/vim $fs/etc
   14.73 +	cook_copy_folders etc bin vim
   14.74  }
   14.75  
   14.76  post_install()
   14.77  {
   14.78  	cmd=$(readlink "$1/bin/vi")
   14.79  	if [ "$cmd" != '/usr/bin/vim' ]; then
   14.80 -		echo ''
   14.81 +		echo
   14.82  		echo "**** Actual VI link : $cmd"
   14.83 -		echo ''
   14.84 -		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
   14.85 +		echo
   14.86 +		echo -n 'Do you want vim for /bin/vi (y/N)? : '; read -t 30 anser
   14.87  		if [ "$anser" == 'y' ]; then
   14.88 -			echo ''
   14.89 +			echo
   14.90  			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
   14.91  			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
   14.92  			status
   14.93  		else
   14.94 -			echo ''
   14.95 +			echo
   14.96  			echo "Leaving /bin/vi to : $cmd"
   14.97  		fi
   14.98  	fi
   14.99 @@ -74,6 +65,5 @@
  14.100  
  14.101  post_remove()
  14.102  {
  14.103 -	# restore previous symlink
  14.104  	ln -sf /bin/busybox "$1/bin/vi"
  14.105  }