# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1496870423 -10800
# Node ID 9a17d981d0f78c8be3b10e311ce087802195671f
# Parent  c36fd2641cd672a6828536727e45de5f9c8e61dd
Update base packages, I'll finish yesterday and then rebuild all these from scratch...

diff -r c36fd2641cd6 -r 9a17d981d0f7 acl/receipt
--- a/acl/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/acl/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -21,6 +21,8 @@
 {
 	rm /bin/rpm
 	sed -i -e 's|/@pkg_name@|&-@pkg_version@|' include/builddefs.in
+	sed -i -e "/TABS-1;/a if (x > (TABS-1)) x = (TABS-1);" \
+		libacl/__acl_to_any_text.c
 
 	./configure \
 		--bindir=/bin \
diff -r c36fd2641cd6 -r 9a17d981d0f7 autoconf/receipt
--- a/autoconf/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/autoconf/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="autoconf"
 VERSION="2.69"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="m4 perl"
 BUILD_DEPENDS="m4 perl"
 
 # Rules to configure and make the package.
@@ -23,8 +22,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/autoconf $fs/usr/share
-	rm -f $fs/usr/share/autoconf/INSTALL
+	copy @std @dev
+	DEPENDS="m4 perl"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 autoconf213/receipt
--- a/autoconf213/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/autoconf213/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="autoconf213"
 VERSION="2.13"
@@ -7,16 +7,18 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/autoconf/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftpmirror.gnu.org/autoconf/autoconf-$VERSION.tar.gz"
 
-DEPENDS="m4 perl"
 BUILD_DEPENDS="m4 perl sed"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure --prefix=/usr --program-suffix=-2.13
+	./configure \
+		--prefix=/usr \
+		--program-suffix=-2.13 &&
 	make &&
 	make prefix="$DESTDIR/usr" install
 }
@@ -24,5 +26,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
+	copy @std @dev
+	DEPENDS="m4 perl"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 automake/receipt
--- a/automake/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/automake/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="automake"
 VERSION="1.15"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="autoconf"
 BUILD_DEPENDS="autoconf bison flex gfortran"
 
 # Rules to configure and make the package.
@@ -24,16 +23,11 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	make install
-
-	# Save space by symlinking duplicates
-	cd $install/usr/bin
-	rm aclocal;  find . -name 'aclocal-*'  -exec ln -s \{\} aclocal  \;
-	rm automake; find . -name 'automake-*' -exec ln -s \{\} automake \;
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
-	rm -rf $fs/usr/share/doc $fs/usr/share/info $fs/usr/share/man
+	copy @std @dev
+	DEPENDS="autoconf"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 bc/receipt
--- a/bc/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/bc/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="bc"
 VERSION="1.06.95"
@@ -7,31 +7,26 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnu.org/software/bc/"
-TAGS="calculator"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://alpha.gnu.org/gnu/$PACKAGE/$TARBALL"
 
-DEPENDS="ncurses readline"
 BUILD_DEPENDS="flex readline-dev texinfo"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -Np1 -i $stuff/bc-1.06.95-memory_leak-1.patch
-
 	./configure \
 		--with-readline \
 		$CONFIGURE_ARGS &&
 	make &&
 	make install
-
-	mkdir -p $install/usr/share/applications
-	cp $stuff/bc.desktop $install/usr/share/applications
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files bc dc
+	copy @std
+	TAGS="calculator"
+	DEPENDS="ncurses readline"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 bc/stuff/bc-1.06.95-memory_leak-1.patch
--- a/bc/stuff/bc-1.06.95-memory_leak-1.patch	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org)
-Date: 2014-04-18
-Initial Package Version: 1.06.95
-Origin: Gentoo
-Description: Fixes memory leaks and an uninitialized variable
- 
-diff -Naur bc-1.06.95.orig/bc/bc.y bc-1.06.95/bc/bc.y
---- bc-1.06.95.orig/bc/bc.y	2006-09-04 21:39:31.000000000 -0500
-+++ bc-1.06.95/bc/bc.y	2014-04-09 13:27:04.602661243 -0500
-@@ -569,6 +569,7 @@
- 				    generate (">");
- 				  break;
- 				}
-+			        free($2);	
- 			    }
- 			| expression '+' expression
- 			    {
-diff -Naur bc-1.06.95.orig/bc/storage.c bc-1.06.95/bc/storage.c
---- bc-1.06.95.orig/bc/storage.c	2006-09-04 21:39:31.000000000 -0500
-+++ bc-1.06.95/bc/storage.c	2014-04-09 13:28:11.770763410 -0500
-@@ -99,6 +99,7 @@
-     {
-       f = &functions[indx];
-       f->f_defined = FALSE;
-+      f->f_void = FALSE;
-       f->f_body = (char *) bc_malloc (BC_START_SIZE);
-       f->f_body_size = BC_START_SIZE;
-       f->f_code_size = 0;
-diff -Naur bc-1.06.95.orig/bc/util.c bc-1.06.95/bc/util.c
---- bc-1.06.95.orig/bc/util.c	2006-09-04 21:39:31.000000000 -0500
-+++ bc-1.06.95/bc/util.c	2014-04-09 13:27:39.841190064 -0500
-@@ -602,8 +602,7 @@
-     case FUNCTDEF:
-       if (id->f_name != 0)
- 	{
--	  if (namekind != FUNCT)
--	    free(name);
-+	  free(name);
- 	  /* Check to see if we are redefining a math lib function. */ 
- 	  if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
- 	    id->f_name = next_func++;
diff -r c36fd2641cd6 -r 9a17d981d0f7 bc/stuff/bc.desktop
--- a/bc/stuff/bc.desktop	Wed Jun 07 17:52:40 2017 +0200
+++ b/bc/stuff/bc.desktop	Thu Jun 08 00:20:23 2017 +0300
@@ -10,7 +10,7 @@
 Comment[fr]=Calculatrice en mode texte
 Comment[ru]=Консольный калькулятор
 Comment[zh_CN]=命令行模式的计算器
+Terminal=true
 Exec=bc
-Terminal=true
 Icon=accessories-calculator
 Categories=Utility;Calculator;ConsoleOnly;
diff -r c36fd2641cd6 -r 9a17d981d0f7 bc/stuff/patches/bc-1.06.95-memory_leak-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bc/stuff/patches/bc-1.06.95-memory_leak-1.patch	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,41 @@
+Submitted By: Bruce Dubbs (bdubbs at linuxfromscratch dot org)
+Date: 2014-04-18
+Initial Package Version: 1.06.95
+Origin: Gentoo
+Description: Fixes memory leaks and an uninitialized variable
+ 
+diff -Naur bc-1.06.95.orig/bc/bc.y bc-1.06.95/bc/bc.y
+--- bc-1.06.95.orig/bc/bc.y	2006-09-04 21:39:31.000000000 -0500
++++ bc-1.06.95/bc/bc.y	2014-04-09 13:27:04.602661243 -0500
+@@ -569,6 +569,7 @@
+ 				    generate (">");
+ 				  break;
+ 				}
++			        free($2);	
+ 			    }
+ 			| expression '+' expression
+ 			    {
+diff -Naur bc-1.06.95.orig/bc/storage.c bc-1.06.95/bc/storage.c
+--- bc-1.06.95.orig/bc/storage.c	2006-09-04 21:39:31.000000000 -0500
++++ bc-1.06.95/bc/storage.c	2014-04-09 13:28:11.770763410 -0500
+@@ -99,6 +99,7 @@
+     {
+       f = &functions[indx];
+       f->f_defined = FALSE;
++      f->f_void = FALSE;
+       f->f_body = (char *) bc_malloc (BC_START_SIZE);
+       f->f_body_size = BC_START_SIZE;
+       f->f_code_size = 0;
+diff -Naur bc-1.06.95.orig/bc/util.c bc-1.06.95/bc/util.c
+--- bc-1.06.95.orig/bc/util.c	2006-09-04 21:39:31.000000000 -0500
++++ bc-1.06.95/bc/util.c	2014-04-09 13:27:39.841190064 -0500
+@@ -602,8 +602,7 @@
+     case FUNCTDEF:
+       if (id->f_name != 0)
+ 	{
+-	  if (namekind != FUNCT)
+-	    free(name);
++	  free(name);
+ 	  /* Check to see if we are redefining a math lib function. */ 
+ 	  if (use_math && namekind == FUNCTDEF && id->f_name <= 6)
+ 	    id->f_name = next_func++;
diff -r c36fd2641cd6 -r 9a17d981d0f7 bc/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bc/stuff/patches/series	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,1 @@
+bc-1.06.95-memory_leak-1.patch
diff -r c36fd2641cd6 -r 9a17d981d0f7 binutils/receipt
--- a/binutils/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/binutils/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -14,7 +14,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="glibc-dev zlib-dev texinfo bison flex gettext-tools"
-BUILD_DEPENDS_arm=""
+BUILD_DEPENDS_arm=" "
 SPLIT="libbfd"
 
 # Rules to configure and make the package.
@@ -27,11 +27,11 @@
 	mkdir build; cd build
 
 	$src/configure \
+		--enable-gold \
+		--enable-ld=default \
+		--enable-plugins \
 		--enable-shared \
-		--disable-initfini-array \
-		--with-bugurl="http://bugs.slitaz.org/" \
-		--enable-gold \
-		--enable-plugins \
+		--with-system-zlib \
 		$CONFIGURE_ARGS $ARCH_ARGS &&
 	make tooldir=/usr &&
 	make tooldir=/usr install
diff -r c36fd2641cd6 -r 9a17d981d0f7 bzip2/receipt
--- a/bzip2/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/bzip2/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -47,6 +47,7 @@
 			;;
 		bzlib)
 			copy *.so*
+			DEPENDS=" "
 			CAT="libs|library"
 			;;
 		bzip2-apps)
diff -r c36fd2641cd6 -r 9a17d981d0f7 cookutils/receipt
--- a/cookutils/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/cookutils/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="cookutils"
-VERSION="913"
+VERSION="917"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages builder new generation"
 MAINTAINER="pankso@slitaz.org"
diff -r c36fd2641cd6 -r 9a17d981d0f7 coreutils-multicall/receipt
--- a/coreutils-multicall/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/coreutils-multicall/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="coreutils-multicall"
 VERSION="8.25"
 CATEGORY="system-tools"
-SHORT_DESC="Utilities for using and setting the basic system."
+SHORT_DESC="Utilities for using and setting the basic system"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/coreutils/coreutils.html"
+
 TARBALL="coreutils-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/coreutils/$TARBALL"
 
 SIBLINGS="coreutils"
-DEPENDS="glibc-base acl attr libcap gmp"
 BUILD_DEPENDS="automake autoconf gettext xz libcap-dev gmp-dev patch"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	# LFS: Coreutils Internationalization Fixes Patch
-	patch -Np1 -i $WOK/coreutils/stuff/coreutils-8.25-i18n-2.patch
-	# SliTaz: show extended info touching CPU via uname
-	patch  -p1 -i $WOK/coreutils/stuff/uname.u
-	# SliTaz: fix translations, especially deprecated symbol '\v'
-	patch  -p1 -i $WOK/coreutils/stuff/coreutils-fix-po.patch
+	# Rebuild fixed translations
 	msgfmt po/nb.po -o po/nb.gmo
 	msgfmt po/sl.po -o po/sl.gmo
 
@@ -35,7 +30,10 @@
 	make && make install
 
 	# LFS: Move programs to the locations specified by the FHS
-	mkdir -p $install/bin $install/usr/sbin $install/usr/share/man/man8
+	mkdir -p \
+		$install/bin \
+		$install/usr/sbin \
+		$install/usr/share/man/man8
 	for i in cat chgrp chmod chown cp date dd df echo false ln ls mkdir \
 		mknod mv pwd rm rmdir stty sync true uname; do
 		rm $install/usr/bin/$i
@@ -51,13 +49,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin sbin libexec
+	copy @std
+	DEPENDS="glibc-base acl attr libcap gmp"
 }
 
-post_install()
-{
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
+post_install_coreutils_multicall()
+{
 	rm "$1/bin/base64"   # for /usr/bin/base64
 	rm "$1/bin/kill"     # for /usr/bin/kill
 	rm "$1/bin/mktemp"   # for /usr/bin/mktemp
@@ -67,27 +66,3 @@
 	rm "$1/bin/stat"     # for /usr/bin/stat
 	rm "$1/bin/touch"    # for /usr/bin/touch
 }
-
-post_remove()
-{
-	# Restore all Busybox applets that have been replaced
-
-	# /bin:
-	for i in base64 cat chgrp chmod chown cp date dd df echo false kill ln ls \
-		mkdir mknod mktemp mv nice printenv pwd rm rmdir sleep stat stty sync \
-		touch true uname; do
-		busybox ln -s busybox "$1/bin/$i"
-	done
-
-	# /usr/bin:
-	for i in '[' basename cksum comm cut dirname du env expand expr fold \
-		groups head hostid id install logname md5sum mkfifo nohup od printf \
-		readlink realpath seq sha1sum sha256sum sha512sum sort split sum tac \
-		tail tee test timeout tr tty unexpand uniq uptime users wc who whoami \
-		yes; do
-		busybox ln -s /bin/busybox "$1/usr/bin/$i"
-	done
-
-	# /usr/sbin:
-	busybox ln -s /bin/busybox "$1/usr/sbin/chroot"
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 coreutils-multicall/stuff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreutils-multicall/stuff	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,1 @@
+../coreutils/stuff
\ No newline at end of file
diff -r c36fd2641cd6 -r 9a17d981d0f7 flex/receipt
--- a/flex/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/flex/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,25 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="flex"
-VERSION="2.6.1"
+VERSION="2.6.4"
 CATEGORY="development"
-SHORT_DESC="Flex is a fast lexical analyser generator."
+SHORT_DESC="Flex is a fast lexical analyser generator"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/westes/flex"
 HOST_ARCH="i486 arm"
 
-TARBALL="$PACKAGE-$VERSION.tar.xz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/releases/download/v$VERSION/$TARBALL"
 
-DEPENDS="bison"
 BUILD_DEPENDS="bison gettext help2man indent"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -p1 -i $stuff/flex.patch
-
 	case "$ARCH" in
 		arm*)
 			export ac_cv_func_malloc_0_nonnull=yes
@@ -37,5 +34,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin lib include
+	copy @std @dev
+	DEPENDS="bison"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 gdbm-dev/receipt
--- a/gdbm-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gdbm-dev"
-VERSION="1.12"
-CATEGORY="development"
-SHORT_DESC="GNU database indexing library development files."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="http://www.gnu.org/software/gdbm"
-HOST_ARCH="i486 arm"
-
-WANTED="gdbm"
-DEPENDS="gdbm"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files *.h *.*a
-}
-
diff -r c36fd2641cd6 -r 9a17d981d0f7 gdbm-tools/receipt
--- a/gdbm-tools/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gdbm-tools"
-VERSION="1.12"
-CATEGORY="misc"
-SHORT_DESC="GNU database manager"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL3"
-WEB_SITE="https://www.gnu.org/software/gdbm"
-HOST_ARCH="i486 arm"
-
-WANTED="gdbm"
-DEPENDS="gdbm"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_folders bin
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 gdbm/receipt
--- a/gdbm/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/gdbm/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gdbm"
 VERSION="1.12"
 CATEGORY="misc"
-SHORT_DESC="GNU database indexing library."
+SHORT_DESC="GNU database manager"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gdbm"
@@ -12,9 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="gettext"
-SPLIT="gdbm-tools"
+SPLIT="gdbm-tools gdbm-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -29,5 +28,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files *.so*
+	case $PACKAGE in
+		gdbm)
+			copy *.so*
+			;;
+		gdbm-tools)
+			copy bin/
+			CAT="misc|tools"
+			;;
+		*-dev) copy @dev;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 ghostscript-dev/receipt
--- a/ghostscript-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ghostscript-dev"
-VERSION="9.02"
-CATEGORY="development"
-SHORT_DESC="Ghostscript devel file"
-MAINTAINER="jozee@slitaz.org"
-LICENSE="GPL3"
-WANTED="ghostscript"
-WEB_SITE="http://ghostscript.com/" 
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/include
-	cp -a $install/usr/include $fs/usr
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 gperf/receipt
--- a/gperf/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/gperf/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gperf"
 VERSION="3.0.4"
 CATEGORY="development"
-SHORT_DESC="GNU gperf is a perfect hash function generator."
+SHORT_DESC="GNU gperf is a perfect hash function generator"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gperf/"
@@ -24,5 +24,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
+	copy @std
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 grep/receipt
--- a/grep/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/grep/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="grep"
-VERSION="2.25"
+VERSION="3.0"
 CATEGORY="development"
-SHORT_DESC="GNU Global Regular Expression Print."
+SHORT_DESC="GNU Global Regular Expression Print"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/grep/"
@@ -11,25 +11,20 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="pcre"
 BUILD_DEPENDS="pcre-dev perl gettext"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure $CONFIGURE_ARGS &&
+	./configure \
+		--bindir=/bin \
+		$CONFIGURE_ARGS &&
 	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
+	copy @std
+	DEPENDS="pcre"
 }
-
-post_remove()
-{
-	for i in grep egrep fgrep; do
-		ln -sf busybox "$1/bin/$i"
-	done
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 gzip-full/receipt
--- a/gzip-full/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gzip-full"
-VERSION="1.8"
-CATEGORY="system-tools"
-SHORT_DESC="GNU compression utilities"
-MAINTAINER="erjo@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="http://www.gnu.org/software/gzip/"
-
-WANTED="gzip"
-DEPENDS="gzip"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_folders bin
-	cook_split_rm gzip
-}
-
-pre_install()
-{
-	# Removing Busybox uncompress and zcat applets
-	# as we have /usr/bin/uncompress and /usr/bin/zcat in this package
-	rm -f "$1/bin/uncompress" "$1/bin/zcat"
-}
-
-post_remove()
-{
-	ln -s busybox "$1/bin/uncompress"
-	ln -s busybox "$1/bin/zcat"
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 gzip/description.gzip-full.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gzip/description.gzip-full.txt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,17 @@
+  * `gunzip` - decompresses gzipped files
+  * `gzexe` - creates self-decompressing executable files
+  * `gzip` - compresses the given files using Lempel-Ziv (LZ77) coding
+  * `uncompress` - decompresses compressed files
+  * `zcat` - decompresses the given gzipped files to standard output
+  * `zcmp` - runs `cmp` on gzipped files
+  * `zdiff` - runs `diff` on gzipped files
+  * `zegrep` - runs `egrep` on gzipped files
+  * `zfgrep` - runs `fgrep` on gzipped files
+  * `zforce` - forces a `.gz` extension on all given files that are gzipped
+    files, so that `gzip` will not compress them again; this can be useful when
+    file names were truncated during a file transfer
+  * `zgrep` - runs `grep` on gzipped files
+  * `zless` - runs `less` on gzipped files
+  * `zmore` - runs `more` on gzipped files
+  * `znew` - re-compresses files from `compress` format to `gzip` format -
+    `.Z` to `.gz`
diff -r c36fd2641cd6 -r 9a17d981d0f7 gzip/description.gzip.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gzip/description.gzip.txt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,3 @@
+  * `gunzip` - decompresses gzipped files
+  * `gzip` - compresses the given files using Lempel-Ziv (LZ77) coding
+  * `zgrep` - runs `grep` on gzipped files
diff -r c36fd2641cd6 -r 9a17d981d0f7 gzip/receipt
--- a/gzip/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/gzip/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gzip"
 VERSION="1.8"
 CATEGORY="system-tools"
-SHORT_DESC="GNU compression utilities (gzip and gunzip)"
+SHORT_DESC="GNU compression utilities"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gzip/"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="glibc-base"
 BUILD_DEPENDS="glibc-dev"
 SPLIT="gzip-full"
 
@@ -19,23 +18,37 @@
 compile_rules()
 {
 	./configure $CONFIGURE_ARGS && make && make install
+
+	mkdir -p $install/bin
+	mv -v $install/usr/bin/gzip $install/bin
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files gzip gunzip zgrep
+	case $PACKAGE in
+		gzip)
+			copy gzip gunzip zgrep
+			;;
+		gzip-full)
+			copy bin/
+			remove_already_packed
+			CAT="system-tools|full set"
+			DEPENDS="gzip"
+			;;
+	esac
 }
 
-pre_install()
+# Removing Busybox gunzip applet
+# as we have /usr/bin/gunzip in this package
+pre_install_gzip()
 {
-	# Removing Busybox gzip and gunzip applets
-	# as we have /usr/bin/gzip and /usr/bin/gunzip in this package
 	rm -f "$1/bin/gzip" "$1/bin/gunzip"
 }
 
-post_remove()
+# Removing Busybox uncompress and zcat applets
+# as we have /usr/bin/uncompress and /usr/bin/zcat in this package
+pre_install_gzip_full()
 {
-	ln -s busybox "$1/bin/gzip"
-	ln -s busybox "$1/bin/gunzip"
+	rm -f "$1/bin/uncompress" "$1/bin/zcat"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 iana-etc/receipt
--- a/iana-etc/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/iana-etc/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iana-etc"
 VERSION="2.30"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://anduin.linuxfromscratch.org/LFS/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="gawk"
 
 # Rules to configure and make the package.
@@ -23,5 +22,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
+	copy @std
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 inetutils/receipt
--- a/inetutils/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/inetutils/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="inetutils"
 VERSION="1.9.4"
@@ -11,9 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="readline"
-BUILD_DEPENDS=""
-
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -39,5 +36,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin sbin
+	copy @std
+	DEPENDS="readline"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 intltool/receipt
--- a/intltool/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/intltool/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="intltool"
 VERSION="0.51.0"
 CATEGORY="development"
-SHORT_DESC="Translation tools (PO, XML)."
+SHORT_DESC="Internationalization tool"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://freedesktop.org/wiki/Software/intltool/"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://launchpad.net/intltool/trunk/$VERSION/+download/$TARBALL"
 
-DEPENDS="perl perl-xml-parser gettext"
 BUILD_DEPENDS="perl perl-xml-parser wget"
 
 # Rules to configure and make the package.
@@ -29,5 +28,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin aclocal intltool
+	copy @std
+	DEPENDS="perl-xml-parser gettext"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 iproute2/receipt
--- a/iproute2/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/iproute2/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,24 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iproute2"
-VERSION="4.7.0"
+VERSION="4.9.0"
 CATEGORY="network"
-SHORT_DESC="utilites for networking and traffic control"
+SHORT_DESC="Utilites for networking and traffic control"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-TAGS="network route"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/net/$PACKAGE/$TARBALL"
 
-DEPENDS="iptables db"
 BUILD_DEPENDS="bison flex iptables-dev db-dev libmnl-dev elfutils-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	./configure /usr/include $CONFIGURE_ARGS &&
+	sed -i 's|tc-skbmod\.8||' $src/man/man8/Makefile &&
 	make &&
 	make DOCDIR=/usr/share/doc/$PACKAGE-$VERSION DESTDIR=$DESTDIR install
 }
@@ -26,10 +25,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/bin
-	cp -a $install/usr $fs/
-	cp -a $install/etc $fs/
-	cp -a $install/var $fs/
-	cp -a $install/sbin $fs/
-	ln $fs/sbin/ip $fs/sbin/ss /$fs/bin/
+	copy @std
+	TAGS="network route"
+	DEPENDS="iptables db"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 iptables-dev/receipt
--- a/iptables-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="iptables-dev"
-VERSION="1.4.21"
-CATEGORY="development"
-SHORT_DESC="Packet filtering framework (Firewall) - dev files"
-WEB_SITE="http://www.netfilter.org/"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WANTED="iptables"
-
-DEPENDS="pkg-config iptables"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	EXTRAVERSION=_${kvers}
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 iptables/receipt
--- a/iptables/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/iptables/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,29 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iptables"
-VERSION="1.4.21"
+VERSION="1.6.1"
+EXTRAVERSION=_$kvers
 CATEGORY="security"
-SHORT_DESC="Packet filtering framework (Firewall)."
+SHORT_DESC="Packet filtering framework (Firewall)"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.netfilter.org/projects/iptables/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.netfilter.org/"
-WGET_URL="http://www.netfilter.org/projects/iptables/files/$TARBALL"
-TAGS="firewall"
+WGET_URL="${WEB_SITE}files/$TARBALL"
+TARBALL_SHA1="b2592490ca7a6c2cd0f069e167a4337c86acdf91"
 
-DEPENDS="linux-netfilter"
-BUILD_DEPENDS="linux-module-headers"
+BUILD_DEPENDS="linux-module-headers libmnl-dev libnftnl-dev"
+SPLIT="iptables-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	# Set the right Kernel path to compile.
 	KERNEL_PATH="/usr/src/linux"
 	./configure \
-		--prefix=/usr \
 		--libexecdir=/usr/lib/iptables \
-		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$DESTDIR install
 }
@@ -31,9 +30,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	EXTRAVERSION=_${kvers}
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/sbin        $fs/usr
-	cp -a $install/usr/lib/lib*    $fs/usr/lib
-	cp -a $install/usr/lib/xtables $fs/usr/lib
+	case $PACKAGE in
+		iptables)
+			copy @std
+			DEPENDS="linux-netfilter"
+			TAGS="firewall"
+			;;
+		*-dev)
+			copy @dev
+			;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 jbig2dec-dev/receipt
--- a/jbig2dec-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="jbig2dec-dev"
-VERSION="0.11"
-CATEGORY="development"
-SHORT_DESC="devel files for jbig2dec"
-MAINTAINER="slaxemulator@gmail.com"
-LICENSE="GPL3"
-WEB_SITE="http://jbig2dec.sourceforge.net/"
-WANTED="jbig2dec"
-HOST_ARCH="i486 arm"
-
-DEPENDS="jbig2dec"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-}
-
diff -r c36fd2641cd6 -r 9a17d981d0f7 jbig2dec/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jbig2dec/description.txt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,4 @@
+JBIG2 is a compression format for lossless and lossy encoding of scanned
+monochrome documents at moderately high resolution. It is very efficient in
+that domain, claiming 100:1 compression. jbig2dec is a decoder-only
+implementation of the format.
diff -r c36fd2641cd6 -r 9a17d981d0f7 jbig2dec/receipt
--- a/jbig2dec/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/jbig2dec/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="jbig2dec"
 VERSION="0.11"
@@ -6,25 +6,26 @@
 SHORT_DESC="Decoder implementation of the JBIG2 image compressiong format"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://jbig2dec.sourceforge.net/"
-WGET_URL="http://ghostscript.com/~giles/jbig2/$PACKAGE/$TARBALL"
+WEB_SITE="https://sourceforge.net/projects/jbig2dec/"
 HOST_ARCH="i486 arm"
 
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
 BUILD_DEPENDS="libpng-dev"
+SPLIT="jbig2dec-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+	./configure $CONFIGURE_ARGS && make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	case $PACKAGE in
+		jbig2dec) copy @std;;
+		*-dev) copy @dev;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd-base/receipt
--- a/kbd-base/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="kbd-base"
-VERSION="2.0.3"
-CATEGORY="base-system"
-SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://kbd-project.org/"
-HOST_ARCH="i486 arm"
-
-WANTED="kbd"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files loadkeys setfont \
-		\
-		be-latin1.map* fr-latin1.map* dvorak.map* dvorak-r.map* dvorak-l.map* \
-		br-abnt2.map* cf.map* cz-lat2.map* dk-latin1.map* es.map* fi.map* \
-		gr.map* gr-pc.map* it.map* is-latin1.map* jp106.map* nl2.map* \
-		no-latin1.map* pl2.map* pt-latin1.map* ru.map* se-lat6.map* \
-		tr_q-latin5.map* trq.map* uk.map* us-acentos.map* us.map* croat.map* \
-		de_CH-latin1.map* de-latin1.map* fr_CH-latin1.map* hu.map* \
-		sg-latin1.map* slovene.map* \
-		\
-		azerty-layout.inc compose.inc euro1.inc euro1.map.gz euro2.map.gz \
-		linux-keys-bare.inc linux-with-alt-and-altgr.inc \
-		linux-with-two-alt-keys.inc qwerty-layout.inc qwertz-layout.inc \
-		compose.latin1
-	rm -rf $fs/usr/share/kbd/keymaps/i386/olpc
-
-	# X11 keyboard aliases
-	ln -s croat.map.gz $fs/usr/share/kbd/keymaps/i386/qwertz/hr.map.gz
-}
-
-# Make sure it will run on host or no keyboard support...
-testsuite()
-{
-	readelf -h $install/usr/bin/loadkeys
-	readelf -h $install/usr/bin/setfont
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd-busybox/receipt
--- a/kbd-busybox/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="kbd-busybox"
-VERSION="2.0.3"
-CATEGORY="base-system"
-SHORT_DESC="Keyboard mapping definitions for busybox."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL2"
-WEB_SITE="http://www.slitaz.org/"
-
-WANTED="kbd-base"
-BUILD_DEPENDS="kbd-base busybox"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $fs/usr/share/kmap
-
-	for i in $(find /usr/share/kbd/keymaps/i386 -name '*.map.gz' | grep -v 'include'); do
-		echo $i
-		loadkeys -ub $i > $fs/usr/share/kmap/$(basename $i .map.gz).kmap
-	done
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd-vlock/receipt
--- a/kbd-vlock/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="kbd-vlock"
-VERSION="2.0.3"
-CATEGORY="system-tools"
-SHORT_DESC="vlock - Virtual Console lock program"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL2"
-WEB_SITE="http://kbd-project.org/"
-TAGS="console"
-
-WANTED="kbd"
-DEPENDS="pam"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files vlock
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd/receipt
--- a/kbd/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/kbd/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,31 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="kbd"
-VERSION="2.0.3"
+VERSION="2.0.4"
 CATEGORY="system-tools"
 SHORT_DESC="Keyboard mapping definitions and tools"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://kbd-project.org/"
-TAGS="keyboard"
 HOST_ARCH="i486 arm"
 
 TARBALL="kbd-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
 
-DEPENDS="kbd-base"
-BUILD_DEPENDS="check-dev bison flex gettext patch pam-dev"
-SPLIT="kbd-base kbd-busybox kbd-vlock"
-
-# Handle cross compilation.
-case "$ARCH" in
-	arm) BUILD_DEPENDS="flex check-dev" ;;
-esac
+BUILD_DEPENDS="check-dev bison flex gettext patch pam-dev busybox"
+BUILD_DEPENDS_arm="flex check-dev"
+SPLIT="kbd-base kbd-vlock kbd-busybox kbd"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	patch -Np1 -i $stuff/kbd-2.0.3-backspace-1.patch
 	sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure
 	sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in
 
@@ -45,14 +38,66 @@
 	mkdir -p $install/usr/share/doc/kbd-$VERSION
 	cp -R docs/doc/* $install/usr/share/doc/kbd-$VERSION
 
-	# Cook packages before "kbd" packaging to properly work cook_split_rm()
-	cook kbd-base  >/dev/null 2>&1
-	cook kbd-vlock >/dev/null 2>&1
+	# X11 keyboard aliases
+	ln -s croat.map.gz $install/usr/share/kbd/keymaps/i386/qwertz/hr.map.gz
+
+	# .kmap files for busybox
+	mkdir -p $install/usr/share/kmap
+	for i in $(find $install/usr/share/kbd/keymaps/i386 -name '*.map.gz' | grep -v 'include'); do
+		j=$(basename $i .map.gz)
+		echo $j
+		$install/usr/bin/loadkeys -ub $i > $install/usr/share/kmap/$j.kmap
+	done
+}
+
+# Make sure it will run on host or no keyboard support...
+testsuite()
+{
+	readelf -h $install/usr/bin/loadkeys
+	readelf -h $install/usr/bin/setfont
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin kbd
-	cook_split_rm kbd-base kbd-vlock
+	case $PACKAGE in
+		kbd-base)
+			copy loadkeys setfont \
+			\
+			be-latin1.map*    fr-latin1.map*  dvorak.map*       dvorak-r.map*  \
+			dvorak-l.map*     br-abnt2.map*   cf.map*           cz-lat2.map*   \
+			dk-latin1.map*    es.map*         fi.map*           gr.map*        \
+			gr-pc.map*        it.map*         is-latin1.map*    jp106.map*     \
+			nl2.map*          no-latin1.map*  pl2.map*          pt-latin1.map* \
+			ru.map*           se-lat6.map*    tr_q-latin5.map*  trq.map*       \
+			uk.map*           us-acentos.map* us.map*           croat.map*     \
+			de_CH-latin1.map* de-latin1.map*  fr_CH-latin1.map* hu.map*        \
+			sg-latin1.map*    slovene.map*    hr.map* \
+			\
+			azerty-layout.inc compose.inc euro1.inc euro1.map.gz euro2.map.gz \
+			linux-keys-bare.inc linux-with-alt-and-altgr.inc \
+			linux-with-two-alt-keys.inc qwerty-layout.inc qwertz-layout.inc \
+			compose.latin1
+			rm -rf $fs/usr/share/kbd/keymaps/i386/olpc
+			DEPENDS=" "
+			CAT="base-system|loadkeys and setfont utilities"
+			;;
+		kbd-vlock)
+			copy vlock
+			CAT="system-tools|vlock - Virtual Console lock program"
+			DEPENDS="pam"
+			TAGS="console"
+			;;
+		kbd-busybox)
+			copy *.kmap
+			DEPENDS="busybox"
+			CAT="base-system|mappings for busybox"
+			;;
+		kbd)
+			copy bin/ kbd/
+			remove_already_packed
+			DEPENDS="kbd-base"
+			TAGS="keyboard"
+			;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd/stuff/kbd-2.0.3-backspace-1.patch
--- a/kbd/stuff/kbd-2.0.3-backspace-1.patch	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-Submitted By: Matt Burgess
-Date: 2008-12-06
-Initial Package Version: 1.15
-Upstream Status: Not submitted, possibly incomplete
-Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
-Makes the Backspace key send character code 127, and Delete send a well known
-escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
-
-Original patch for 1.12 by Alexander Patrakov.
-Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
-ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
-Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
-
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
-@@ -43,7 +43,7 @@
- 		keycode  11 = three		numbersign
- 		keycode  12 = two		at
- 		keycode  13 = one		exclam
--		keycode  14 = BackSpace		Delete
-+		keycode  14 = Delete		Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
---- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
-@@ -43,7 +43,7 @@
- 		keycode  11 = slash		question
- 		keycode  12 = bracketleft	braceleft
- 		keycode  13 = bracketright	braceright
--		keycode  14 = BackSpace		Delete
-+		keycode  14 = Delete		Delete
- ! --------------------------------------------------------------------------
- ! Row 3
- ! --------------------------------------------------------------------------
-diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
---- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
-@@ -51,7 +51,7 @@
- 	alt     keycode  12 = Meta_minus      
- keycode  13 = minus            underscore      
- 	alt     keycode  13 = Meta_equal      
--keycode  14 = BackSpace           Delete          
-+keycode  14 = Delete           Delete          
- 	alt     keycode  14 = Meta_Delete     
- keycode  15 = Tab              Meta_Tab             
- 	alt     keycode  15 = Meta_Tab        
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
-@@ -205,7 +205,7 @@
- #	edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode  14 = \
--	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
-+	      Delete	       Delete		Delete		 Delete	     \
- 	      Delete	       Delete		Delete		 Delete	     \
- 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
- 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
-@@ -506,7 +506,7 @@
- 
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete	       F111		Delete		 F111	   \
-+keycode 111 = Remove	       F111		Remove		 F111	   \
- 	      Remove	       Remove		Remove		 Remove	    \
- 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
- 	      Boot	       Boot		Boot		 Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
-@@ -204,7 +204,7 @@
- #	edit this if you want the key above <Enter> to delete symbols above
- # cursor, not before.
- keycode  14 = \
--	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
-+	      Delete	       Delete		Delete		 Delete	     \
- 	      Delete	       Delete		Delete		 Delete	     \
- 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
- 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
-@@ -505,7 +505,7 @@
- 
- # Edit this if you want strict VT100 emulation.
- string F111 = "\033[3$"
--keycode 111 = Delete	       F111		Delete		 F111	   \
-+keycode 111 = Remove	       F111		Remove		 F111	   \
- 	      Remove	       Remove		Remove		 Remove	    \
- 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
- 	      Boot	       Boot		Boot		 Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
-@@ -3,7 +3,7 @@
- # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no>
- include "linux-with-alt-and-altgr"
- 	plain keycode  83 = KP_Comma
--	plain keycode 111 = Delete		# "Remove" originally, weird...
-+	plain keycode 111 = Remove
- strings as usual
- 
- 	keycode   1 = Escape
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
-@@ -143,8 +143,8 @@
- 
- # The keycode "0xFF" is too dangerous for many programs (including emacs).
- # So let it be bracket instead of Hard Sign.
--# altgr		keycode  27 = 	+0xDF
--# altgr	shift 	keycode  27 = 	+0xFF
-+altgr		keycode  27 = 	+0xDF
-+altgr	shift 	keycode  27 = 	+0xFF
- 	control	keycode  27 =	Control_bracketright
- altgr	control	keycode  27 =	Control_bracketright
- 	alt	keycode  27 =	Meta_bracketright
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
-@@ -46,7 +46,7 @@
- 	alt	keycode  12 =	Meta_minus
- 		keycode  13 =	equal	plus		equal	plus
- 	alt	keycode  13 =	Meta_equal
--		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
-+		keycode  14 =	Delete Delete	Delete Delete
- 	alt	keycode  14 =	Meta_Delete
- 		keycode  15 =	Tab	Tab		Tab	Tab	
- 	alt	keycode  15 =	Meta_Tab	
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
-@@ -39,7 +39,7 @@
- 	alt	keycode  12 =	Meta_minus
- 		keycode  13 =	equal	plus		equal	plus
- 	alt	keycode  13 =	Meta_equal
--		keycode  14 =	BackSpace
-+		keycode  14 =	Delete
- 	alt	keycode  14 =	Meta_Delete
- 		keycode  15 =	Tab
- 	alt	keycode  15 =	Meta_Tab	
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
-@@ -89,8 +89,8 @@
- altgr	alt     keycode  13 =    Meta_equal
- 	shift alt keycode  13 = 	Meta_plus
- altgr	shift alt keycode  13 = 	Meta_plus
--		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
--#		keycode  14 = 	Delete  Delete  Delete  Delete
-+#		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
-+		keycode  14 = 	Delete  Delete  Delete  Delete
- 	alt	keycode  14 =	Meta_Delete
- altgr	alt     keycode  14 = 	Meta_Delete
- 		keycode  15 =	Tab	Tab		Tab	Tab	
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
-@@ -42,7 +42,7 @@
- 	alt	keycode  12 =	Meta_minus
- 		keycode  13 =	equal	plus		equal	plus
- 	alt	keycode  13 =	Meta_equal
--		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
-+		keycode  14 =	Delete Delete	Delete Delete
- 	alt	keycode  14 =	Meta_Delete
- 		keycode  15 =	Tab	Tab		Tab	Tab	
- 	alt	keycode  15 =	Meta_Tab	
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
-@@ -345,7 +345,7 @@
- 	keycode 109 = Next	Scroll_Forward
- 	keycode 110 = Insert
- 
--	keycode 111 = Delete		# "Remove" originally, weird...
-+	keycode 111 = Remove
- control alt	keycode 111 = Boot
- control altgr	keycode 111 = Boot
- 
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
-@@ -374,6 +374,6 @@
- 	keycode 109 = Next	Scroll_Forward
- 	keycode 110 = Insert
- 
--	keycode 111 = Delete		# "Remove" originally, weird...
-+	keycode 111 = Remove
- control alt	keycode 111 = Boot
- control altgr	keycode 111 = Boot
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
-@@ -49,7 +49,7 @@
- 	alt     keycode  12 = Meta_minus
- keycode  13 = minus            underscore
- 	alt     keycode  13 = Meta_equal
--keycode  14 = BackSpace           Delete
-+keycode  14 = Delete           Delete
- 	alt     keycode  14 = Meta_Delete
- keycode  15 = Tab              Meta_Tab
- 	alt     keycode  15 = Meta_Tab
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
-@@ -249,7 +249,7 @@
- 	shift ctrll ctrlr keycode  13 = plus
- 	alt ctrll ctrlr keycode  13 = Meta_equal
- 	shift alt ctrll ctrlr keycode  13 = Meta_plus
--keycode  14 = BackSpace           Delete          
-+keycode  14 = Delete           Delete          
- 	control	keycode  14 = BackSpace       
- 	alt	keycode  14 = Meta_Delete     
- 	ctrlr	keycode  14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
-@@ -250,7 +250,7 @@
- 	shift ctrll ctrlr keycode  13 = plus
- 	alt ctrll ctrlr keycode  13 = Meta_equal
- 	shift alt ctrll ctrlr keycode  13 = Meta_plus
--keycode  14 = BackSpace           Delete          
-+keycode  14 = Delete           Delete          
- 	control	keycode  14 = BackSpace       
- 	alt	keycode  14 = Meta_Delete     
- 	ctrlr	keycode  14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
-@@ -260,7 +260,7 @@
- 	shift ctrll ctrlr keycode  13 = plus
- 	alt ctrll ctrlr keycode  13 = Meta_equal
- 	shift alt ctrll ctrlr keycode  13 = Meta_plus
--keycode  14 = BackSpace           Delete          
-+keycode  14 = Delete           Delete          
- 	control	keycode  14 = BackSpace       
- 	alt	keycode  14 = Meta_Delete     
- 	ctrlr	keycode  14 = BackSpace
-diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
---- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
-+++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
-@@ -260,7 +260,7 @@
- 	shift ctrll ctrlr keycode  13 = plus
- 	alt ctrll ctrlr keycode  13 = Meta_equal
- 	shift alt ctrll ctrlr keycode  13 = Meta_plus
--keycode  14 = BackSpace           Delete          
-+keycode  14 = Delete           Delete          
- 	control	keycode  14 = BackSpace       
- 	alt	keycode  14 = Meta_Delete     
- 	ctrlr	keycode  14 = BackSpace
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd/stuff/patches/kbd-2.0.4-backspace-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kbd/stuff/patches/kbd-2.0.4-backspace-1.patch	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,250 @@
+Submitted By: Matt Burgess
+Date: 2008-12-06
+Initial Package Version: 1.15
+Upstream Status: Not submitted, possibly incomplete
+Description: Makes Backspace and Delete keys consistent in all i386 keymaps.
+Makes the Backspace key send character code 127, and Delete send a well known
+escape sequence. Obsoletes the /etc/kbd/bs-sends-del file for i386.
+
+Original patch for 1.12 by Alexander Patrakov.
+Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
+ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
+Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
+
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = three		numbersign
+ 		keycode  12 = two		at
+ 		keycode  13 = one		exclam
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map
+--- kbd-1.15.orig/data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
+@@ -43,7 +43,7 @@
+ 		keycode  11 = slash		question
+ 		keycode  12 = bracketleft	braceleft
+ 		keycode  13 = bracketright	braceright
+-		keycode  14 = BackSpace		Delete
++		keycode  14 = Delete		Delete
+ ! --------------------------------------------------------------------------
+ ! Row 3
+ ! --------------------------------------------------------------------------
+diff -Naur kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
+@@ -51,7 +51,7 @@
+ 	alt     keycode  12 = Meta_minus      
+ keycode  13 = minus            underscore      
+ 	alt     keycode  13 = Meta_equal      
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	alt     keycode  14 = Meta_Delete     
+ keycode  15 = Tab              Meta_Tab             
+ 	alt     keycode  15 = Meta_Tab        
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
+@@ -205,7 +205,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -506,7 +506,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map kbd-1.15/data/keymaps/i386/qwerty/lt.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
+@@ -204,7 +204,7 @@
+ #	edit this if you want the key above <Enter> to delete symbols above
+ # cursor, not before.
+ keycode  14 = \
+-	      BackSpace	       BackSpace	BackSpace	 BackSpace  \
++	      Delete	       Delete		Delete		 Delete	     \
+ 	      Delete	       Delete		Delete		 Delete	     \
+ 	      Meta_BackSpace   Meta_BackSpace	Meta_BackSpace Meta_BackSpace \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete  
+@@ -505,7 +505,7 @@
+ 
+ # Edit this if you want strict VT100 emulation.
+ string F111 = "\033[3$"
+-keycode 111 = Delete	       F111		Delete		 F111	   \
++keycode 111 = Remove	       F111		Remove		 F111	   \
+ 	      Remove	       Remove		Remove		 Remove	    \
+ 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
+ 	      Boot	       Boot		Boot		 Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
+@@ -3,7 +3,7 @@
+ # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no>
+ include "linux-with-alt-and-altgr"
+ 	plain keycode  83 = KP_Comma
+-	plain keycode 111 = Delete		# "Remove" originally, weird...
++	plain keycode 111 = Remove
+ strings as usual
+ 
+ 	keycode   1 = Escape
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map kbd-1.15/data/keymaps/i386/qwerty/ru1.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
+@@ -143,8 +143,8 @@
+ 
+ # The keycode "0xFF" is too dangerous for many programs (including emacs).
+ # So let it be bracket instead of Hard Sign.
+-# altgr		keycode  27 = 	+0xDF
+-# altgr	shift 	keycode  27 = 	+0xFF
++altgr		keycode  27 = 	+0xDF
++altgr	shift 	keycode  27 = 	+0xFF
+ 	control	keycode  27 =	Control_bracketright
+ altgr	control	keycode  27 =	Control_bracketright
+ 	alt	keycode  27 =	Meta_bracketright
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map kbd-1.15/data/keymaps/i386/qwerty/ru2.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
+@@ -46,7 +46,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
+@@ -39,7 +39,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace
++		keycode  14 =	Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
+@@ -89,8 +89,8 @@
+ altgr	alt     keycode  13 =    Meta_equal
+ 	shift alt keycode  13 = 	Meta_plus
+ altgr	shift alt keycode  13 = 	Meta_plus
+-		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
+-#		keycode  14 = 	Delete  Delete  Delete  Delete
++#		keycode  14 = 	BackSpace  BackSpace  BackSpace  BackSpace
++		keycode  14 = 	Delete  Delete  Delete  Delete
+ 	alt	keycode  14 =	Meta_Delete
+ altgr	alt     keycode  14 = 	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map kbd-1.15/data/keymaps/i386/qwerty/ru_win.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
+@@ -42,7 +42,7 @@
+ 	alt	keycode  12 =	Meta_minus
+ 		keycode  13 =	equal	plus		equal	plus
+ 	alt	keycode  13 =	Meta_equal
+-		keycode  14 =	BackSpace BackSpace	BackSpace BackSpace
++		keycode  14 =	Delete Delete	Delete Delete
+ 	alt	keycode  14 =	Meta_Delete
+ 		keycode  15 =	Tab	Tab		Tab	Tab	
+ 	alt	keycode  15 =	Meta_Tab	
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
+@@ -345,7 +345,7 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+ 
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
+@@ -374,6 +374,6 @@
+ 	keycode 109 = Next	Scroll_Forward
+ 	keycode 110 = Insert
+ 
+-	keycode 111 = Delete		# "Remove" originally, weird...
++	keycode 111 = Remove
+ control alt	keycode 111 = Boot
+ control altgr	keycode 111 = Boot
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
+@@ -49,7 +49,7 @@
+ 	alt     keycode  12 = Meta_minus
+ keycode  13 = minus            underscore
+ 	alt     keycode  13 = Meta_equal
+-keycode  14 = BackSpace           Delete
++keycode  14 = Delete           Delete
+ 	alt     keycode  14 = Meta_Delete
+ keycode  15 = Tab              Meta_Tab
+ 	alt     keycode  15 = Meta_Tab
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map kbd-1.15/data/keymaps/i386/qwerty/ua.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
+@@ -249,7 +249,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
+@@ -250,7 +250,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
+diff -Naur kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map
+--- kbd-1.15.orig/data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
++++ kbd-1.15/data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
+@@ -260,7 +260,7 @@
+ 	shift ctrll ctrlr keycode  13 = plus
+ 	alt ctrll ctrlr keycode  13 = Meta_equal
+ 	shift alt ctrll ctrlr keycode  13 = Meta_plus
+-keycode  14 = BackSpace           Delete          
++keycode  14 = Delete           Delete          
+ 	control	keycode  14 = BackSpace       
+ 	alt	keycode  14 = Meta_Delete     
+ 	ctrlr	keycode  14 = BackSpace
diff -r c36fd2641cd6 -r 9a17d981d0f7 kbd/stuff/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kbd/stuff/patches/series	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,1 @@
+kbd-2.0.4-backspace-1.patch
diff -r c36fd2641cd6 -r 9a17d981d0f7 kmod-dev/receipt
--- a/kmod-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="kmod-dev"
-VERSION="23"
-CATEGORY="development"
-SHORT_DESC="Kmod devel files."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-WANTED="kmod"
-WEB_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/"
-HOST_ARCH="i486 arm"
-
-DEPENDS="kmod liblzma-dev pkg-config"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib $fs/usr/lib
-	cp -a $install/usr/lib/*.*a $fs/usr/lib
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 less/receipt
--- a/less/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/less/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="less"
 VERSION="481"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="ncurses pcre"
 BUILD_DEPENDS="ncurses-dev pcre-dev"
 
 # Rules to configure and make the package.
@@ -27,10 +26,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
+	copy @std
+	DEPENDS="ncurses pcre"
 }
-
-post_remove()
-{
-	ln -s /bin/busybox "$1/usr/bin/less"
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 libcap-dev/receipt
--- a/libcap-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libcap-dev"
-VERSION="2.25"
-CATEGORY="development"
-SHORT_DESC="Support for getting/setting POSIX.1e capabilities."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-WEB_SITE="http://sites.google.com/site/fullycapable/"
-HOST_ARCH="i486 arm"
-
-WANTED="libcap"
-DEPENDS="libcap"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files *.h *.pc
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 libcap/receipt
--- a/libcap/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/libcap/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libcap"
 VERSION="2.25"
 CATEGORY="system-tools"
-SHORT_DESC="Support for getting/setting POSIX.1e capabilities."
+SHORT_DESC="Support for getting/setting POSIX.1e capabilities"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://sites.google.com/site/fullycapable/"
@@ -12,12 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$TARBALL"
 
-DEPENDS="attr"
-BUILD_DEPENDS="gperf pam-dev attr-dev"
+BUILD_DEPENDS="gperf pam-dev attr-dev perl"
+BUILD_DEPENDS_arm="gperf pam-dev attr-dev"
+SPLIT="libcap-dev"
 
 # Handle cross compilation.
 case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS perl"  ;;
 	arm*) ARCH_ARGS="CC=$HOST_SYSTEM-gcc BUILD_CC=gcc" ;;
 esac
 
@@ -39,6 +39,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders sbin
-	cook_copy_files *.so*
+	case $PACKAGE in
+		libcap)
+			copy @std
+			DEPENDS="attr"
+			;;
+		*-dev) copy @dev;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 libmnl-dev/receipt
--- a/libmnl-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# Slitaz package receipt.
-
-PACKAGE="libmnl-dev"
-VERSION="1.0.4"
-CATEGORY="development"
-SHORT_DESC="A minimalistic user-space library oriented to Netlink developers."
-MAINTAINER="samuel_trassare@yahoo.com"
-LICENSE="LGPL2.1"
-WEB_SITE="http://www.netfilter.org/projects/libmnl/"
-
-WANTED="libmnl"
-DEPENDS="libmnl pkg-config"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files *.h *.la *.pc
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 libmnl/receipt
--- a/libmnl/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/libmnl/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,16 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libmnl"
 VERSION="1.0.4"
-CATEGORY="network"
-SHORT_DESC="A minimalistic user-space library oriented to Netlink developers."
-MAINTAINER="samuel_trassare@yahoo.com"
+CATEGORY="development"
+SHORT_DESC="Minimalistic Netlink communication library"
+MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.netfilter.org/projects/libmnl/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}files/$TARBALL"
 
+SPLIT="libmnl-dev"
+
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -20,5 +22,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files *.so*
+	case $PACKAGE in
+		libmnl) copy @std;;
+		*-dev) copy @dev;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 libnftnl/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libnftnl/description.txt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,4 @@
+libnftnl is a userspace library providing a low-level netlink programming
+interface (API) to the in-kernel nf_tables subsystem. The library libnftnl has
+been previously known as libnftables. This library is currently used by
+nftables.
diff -r c36fd2641cd6 -r 9a17d981d0f7 libnftnl/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libnftnl/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,37 @@
+# SliTaz package receipt v2.
+
+PACKAGE="libnftnl"
+VERSION="1.0.7"
+CATEGORY="development"
+SHORT_DESC="Low-level netlink API"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="LGPL2.1"
+WEB_SITE="http://www.iptables.org/projects/libnftnl/"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="${WEB_SITE}files/$TARBALL"
+TARBALL_SHA1="381b2b3cbb3fad186cb3f57bbf32d70f0b3c3c8e"
+
+BUILD_DEPENDS="libmnl-dev"
+SPLIT="libnftnl-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+	./configure $CONFIGURE_ARGS && make && make install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	case $PACKAGE in
+		libnftnl)
+			copy @std
+			DEPENDS="libmnl"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="libnftnl libmnl-dev"
+			;;
+	esac
+}
diff -r c36fd2641cd6 -r 9a17d981d0f7 libtool/receipt
--- a/libtool/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/libtool/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="libtool"
 VERSION="2.4.6"
@@ -12,15 +12,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libltdl automake autoconf"
 BUILD_DEPENDS="automake autoconf gfortran"
+BUILD_DEPENDS_arm=" "
 SPLIT="libltdl"
 
-# Handle cross compilation.
-case "$ARCH" in
-	arm) BUILD_DEPENDS="" ;;
-esac
-
 # Rules to configure and make the package.
 compile_rules()
 {
@@ -30,6 +25,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin include aclocal libtool
-	cook_copy_files *.*a
+	case $PACKAGE in
+		libtool)
+			copy bin/ include/ aclocal/ libtool/ *.*a
+			DEPENDS="libltdl automake autoconf"
+			;;
+		libltdl)
+			copy *.so*
+			CAT="system-tools|library"
+			;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 linux-api-headers/receipt
--- a/linux-api-headers/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/linux-api-headers/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="linux-api-headers"
-VERSION="4.9.4"
+VERSION="4.9.30"
 KBASEVER="4.9"
 CATEGORY="development"
-SHORT_DESC="Kernel headers sanitized for use in userspace."
+SHORT_DESC="Kernel headers sanitized for use in userspace"
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.kernel.org/"
@@ -40,12 +40,12 @@
 	make mrproper &&
 	make headers_check &&
 	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install
+
+	find $install \( -name .install -o -name ..install.cmd \) -delete
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $install/usr/include $fs/usr
-	find $fs -name .install -or -name ..install.cmd -delete
+	copy @dev
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 make/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/description.txt	Thu Jun 08 00:20:23 2017 +0300
@@ -0,0 +1,2 @@
+  * `make` - automatically determines which pieces of a package need to be
+    (re)compiled and then issues the relevant commands
diff -r c36fd2641cd6 -r 9a17d981d0f7 make/receipt
--- a/make/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/make/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="make"
 VERSION="4.2.1"
 CATEGORY="development"
-SHORT_DESC="GNU Make to generate executables and other files from source."
+SHORT_DESC="GNU Make to generate executables and other files from source"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/make/"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="glibc-base"
 BUILD_DEPENDS="gettext"
 
 # Rules to configure and make the package.
@@ -24,5 +23,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files make
+	copy @std
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 make/stuff/bug30612.patch
--- a/make/stuff/bug30612.patch	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612/main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612/main.c	2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612/read.c
---- make-3.82-orig/read.c	2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612/read.c	2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,11 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
-+
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
\ No newline at end of file
diff -r c36fd2641cd6 -r 9a17d981d0f7 make/stuff/bug30723.patch
--- a/make/stuff/bug30723.patch	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723/main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723/main.c	2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
\ No newline at end of file
diff -r c36fd2641cd6 -r 9a17d981d0f7 man-pages/receipt
--- a/man-pages/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/man-pages/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,12 +1,13 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="man-pages"
-VERSION="4.07"
+VERSION="4.09"
 CATEGORY="doc"
 SHORT_DESC="Linux manual pages"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="unknown"
 WEB_SITE="https://www.kernel.org/doc/man-pages/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/docs/man-pages/$TARBALL"
 
@@ -19,5 +20,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
+	copy man/
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 perl-core/receipt
--- a/perl-core/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="perl-core"
-VERSION="5.24.0"
-CATEGORY="development"
-SHORT_DESC="Minimal Perl interpreter."
-MAINTAINER="erjo@slitaz.org"
-LICENSE="GPL"
-SOURCE="perl"
-WANTED="perl"
-WEB_SITE="http://www.perl.org/"
-
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/perl${VERSION} $fs/usr/bin/
-	cd $fs/usr/bin
-	ln -s perl${VERSION} perl
-}
-
-# Pre install commands for Tazpkg.
-# Remove perl link to microperl if any.
-#
-pre_install()
-{
-	rm -f "$1/usr/bin/perl"
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 perl-xml-parser/receipt
--- a/perl-xml-parser/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/perl-xml-parser/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-xml-parser"
 VERSION="2.44"
@@ -12,7 +12,6 @@
 TARBALL="XML-Parser-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$TARBALL"
 
-DEPENDS="perl-libwww-perl expat"
 BUILD_DEPENDS="$DEPENDS expat-dev"
 
 # Rules to configure and make the package.
@@ -28,4 +27,5 @@
 genpkg_rules()
 {
 	copy @std
+	DEPENDS="perl-libwww-perl expat"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 perl/receipt
--- a/perl/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/perl/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl"
-VERSION="5.24.0"
+VERSION="5.24.1"
 CATEGORY="development"
-SHORT_DESC="Full Perl interpreter and modules."
+SHORT_DESC="Perl interpreter and modules"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://www.perl.org/"
@@ -11,9 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.cpan.org/src/5.0/$TARBALL"
 
-DEPENDS="zlib bzlib gdbm"
 BUILD_DEPENDS="zlib-dev bzip2-dev less gdbm-dev"
-PROVIDE="microperl"
+SPLIT="perl-core perl-dev"
 SIBLINGS="microperl"
 
 # Rules to compile & install the temporary toolchain.
@@ -49,17 +48,24 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin lib
-
-	# Save space for duplicates
-	rm $fs/usr/bin/perl
-	ln -s perl$VERSION $fs/usr/bin/perl
+	case $PACKAGE in
+		perl)
+			copy @std
+			find $fs \( -name perl -o -name perl$VERSION -o -name libperl.so \) -delete
+			DEPENDS="bzlib gdbm zlib perl-core"
+			PROVIDE="microperl"
+			;;
+		perl-core)
+			# perl binary depends on libperl.so
+			copy perl perl$VERSION libperl.so
+			DEPENDS="glibc-base"
+			CAT="development|minimal interpreter"
+			;;
+		*-dev) copy @dev;;
+	esac
 }
 
-# Pre install commands for Tazpkg.
 # Remove perl link to microperl if any.
-#
-pre_install()
-{
+pre_install_perl_core() {
 	rm -f "$1/usr/bin/perl"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 pkg-config/receipt
--- a/pkg-config/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/pkg-config/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pkg-config"
 VERSION="0.29.1"
 CATEGORY="development"
-SHORT_DESC="Free desktop packages manager."
+SHORT_DESC="Free desktop packages manager"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/pkg-config/"
@@ -12,20 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://pkg-config.freedesktop.org/releases/$TARBALL"
 
-DEPENDS="glibc-base"
 BUILD_DEPENDS="gcc libtool perl"
-
-# Handle cross compilation.
-case "$ARCH" in
-	arm) BUILD_DEPENDS="" ;;
-esac
+BUILD_DEPENDS_arm=" "
 
 # Rules to configure and make the package.
 compile_rules()
 {
-#	patch -p1 < $stuff/autoconf-2.66.patch
-#	sed -i 's/\$(LN) pkg-config\$(EXEEXT) \$(host_tool)/echo \1/' Makefile*
-
 	case "$ARCH" in
 		arm)
 			./configure \
@@ -54,5 +46,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_files *pkg-config *.m4
+	copy @std @dev
+	DEPENDS="glibc-base"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 pkg-config/stuff/autoconf-2.66.patch
--- a/pkg-config/stuff/autoconf-2.66.patch	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4
---- pkg-config-0.25-old//pkg.m4	2009-12-07 06:39:02.000000000 +1000
-+++ pkg-config-0.25/pkg.m4	2010-07-15 14:44:37.466942978 +1000
-@@ -135,7 +135,7 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--_PKG_TEXT])dnl
-+_PKG_TEXT])[]dnl
-         ])
- elif test $pkg_failed = untried; then
-      	AC_MSG_RESULT([no])
diff -r c36fd2641cd6 -r 9a17d981d0f7 procps-ng-dev/receipt
--- a/procps-ng-dev/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="procps-ng-dev"
-VERSION="3.3.12"
-CATEGORY="development"
-SHORT_DESC="Programs for monitoring processes (development files)"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="GPL2 LGPL2"
-WEB_SITE="https://gitlab.com/procps-ng/procps"
-
-WANTED="procps-ng"
-DEPENDS="procps-ng"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cook_copy_files *.h *.la *.pc
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 procps-ng/receipt
--- a/procps-ng/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/procps-ng/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="procps-ng"
 VERSION="3.3.12"
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gettext-base ncurses"
 BUILD_DEPENDS="gettext ncurses-dev"
+SPLIT="procps-ng-dev"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -35,6 +35,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin sbin
-	cook_copy_files *.so*
+	case $PACKAGE in
+		procps-ng)
+			copy @std
+			DEPENDS="gettext-base ncurses"
+			;;
+		*-dev) copy @dev;;
+	esac
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 psmisc/receipt
--- a/psmisc/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/psmisc/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="psmisc"
 VERSION="22.21"
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/psmisc/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="gettext ncurses-dev"
 
 # Rules to configure and make the package.
@@ -27,5 +26,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 sed/receipt
--- a/sed/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/sed/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sed"
 VERSION="4.4"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="acl"
 BUILD_DEPENDS="acl-dev gettext texinfo"
 
 # Rules to configure and make the package.
@@ -32,4 +31,5 @@
 genpkg_rules()
 {
 	copy @std
+	DEPENDS="acl"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 shadow/receipt
--- a/shadow/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/shadow/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,7 +1,7 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="shadow"
-VERSION="4.2.1"
+VERSION="4.5"
 CATEGORY="system-tools"
 SHORT_DESC="Programs for handling passwords in a secure way"
 MAINTAINER="al.bobylev@gmail.com"
@@ -9,7 +9,7 @@
 WEB_SITE="http://pkg-shadow.alioth.debian.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="${WEB_SITE}releases/$TARBALL"
+WGET_URL="https://github.com/shadow-maint/shadow/releases/download/$VERSION/$TARBALL"
 
 DEPENDS="acl attr"
 BUILD_DEPENDS="acl-dev attr-dev gettext"
@@ -17,8 +17,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
-		-e 's@/var/spool/mail@/var/mail@' etc/login.defs
+	sed -i -e 's|#ENCRYPT_METHOD DES|ENCRYPT_METHOD SHA512|' \
+		-e 's|/var/spool/mail|/var/mail|' etc/login.defs
 	sed -i 's|bash|sh|' etc/useradd
 
 	./configure \
@@ -32,5 +32,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin sbin etc
+	copy @std
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 slitaz-boot-scripts/receipt
--- a/slitaz-boot-scripts/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/slitaz-boot-scripts/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-boot-scripts"
-VERSION="437"
+VERSION="440"
 CATEGORY="base-system"
 SHORT_DESC="Provide all the initialisation scripts used at boot time."
 MAINTAINER="pankso@slitaz.org"
diff -r c36fd2641cd6 -r 9a17d981d0f7 tar/receipt
--- a/tar/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/tar/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,19 +1,17 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tar"
 VERSION="1.29"
 CATEGORY="utilities"
-SHORT_DESC="GNU tar archiving tools."
+SHORT_DESC="GNU tar archiving tools"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/tar/"
-TAGS="archive compression"
 HOST_ARCH="i486 arm"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="acl attr"
 BUILD_DEPENDS="acl-dev gettext texinfo"
 
 # Rules to configure and make the package.
@@ -24,16 +22,13 @@
 		--bindir=/bin \
 		$CONFIGURE_ARGS &&
 	make && make install &&
-	make -C doc install-html docdir=/usr/share/doc/tar-1.29
+	make -C doc install-html docdir=/usr/share/doc/tar-$VERSION
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin libexec
+	copy @std
+	DEPENDS="acl attr"
+	TAGS="archive compression"
 }
-
-post_remove()
-{
-	ln -s busybox "$1/bin/tar"
-}
diff -r c36fd2641cd6 -r 9a17d981d0f7 texinfo/receipt
--- a/texinfo/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/texinfo/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -1,29 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="texinfo"
-VERSION="6.1"
+VERSION="6.3"
 CATEGORY="development"
-SHORT_DESC="GNU documentation tools."
+SHORT_DESC="GNU documentation tools"
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/texinfo/"
-TAGS="documentation"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="perl"
-BUILD_DEPENDS="perl ncurses-dev gettext"
+BUILD_DEPENDS="perl-dev ncurses-dev gettext"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure \
+		--disable-static \
+		$CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cook_copy_folders bin texinfo
-	find $fs/usr/lib -name '*a' -delete
+	copy @std
+	DEPENDS="perl"
+	TAGS="documentation"
 }
diff -r c36fd2641cd6 -r 9a17d981d0f7 xz/receipt
--- a/xz/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/xz/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -40,8 +40,7 @@
 {
 	case $PACKAGE in
 		xz)
-			copy bin/
-			rm -r $fs/usr/bin
+			copy ^/bin/
 			DEPENDS="liblzma"
 			;;
 		xz-tools)
diff -r c36fd2641cd6 -r 9a17d981d0f7 zlib/receipt
--- a/zlib/receipt	Wed Jun 07 17:52:40 2017 +0200
+++ b/zlib/receipt	Thu Jun 08 00:20:23 2017 +0300
@@ -17,12 +17,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-#	case "$ARCH" in
-#		i486)
-#			# work around gcc bug; see https://bugs.archlinux.org/task/20647
-#			export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" ;;
-#	esac
-
 	./configure \
 		--prefix=/usr &&
 	make && make install