# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1481843816 -7200
# Node ID c963361d3d542a5ec4f94eb6ff8fae2cdc1547d1
# Parent  792674d977261ca75b29ac58541b41b85091ef36
Initial commit to wok-next (SliTaz v.6 now): update 61 packages (about) according to LFS 7.10

diff -r 792674d97726 -r c963361d3d54 bash/description.txt
--- a/bash/description.txt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bash/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,6 +1,7 @@
 Bash is a shell, or command language interpreter, for the GNU operating system.
-Bash is an sh-compatible shell that incorporates useful features from the Korn 
-shell (ksh) and C shell (csh). It is intended to conform to the IEEE POSIX 
-P1003.2/ISO 9945.2 Shell and Tools standard. It offers functional improvements 
-over sh for both programming and interactive use. In addition, most sh scripts 
+
+Bash is an sh-compatible shell that incorporates useful features from the Korn
+shell (ksh) and C shell (csh). It is intended to conform to the IEEE POSIX
+P1003.2/ISO 9945.2 Shell and Tools standard. It offers functional improvements
+over sh for both programming and interactive use. In addition, most sh scripts
 can be run by Bash without modification.
diff -r 792674d97726 -r c963361d3d54 bash/receipt
--- a/bash/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bash/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,34 +1,34 @@
 # SliTaz package receipt.
 
 PACKAGE="bash"
-VERSION="4.3.42"
+VERSION="4.3.48"
 BASEVERSION="${VERSION%.*}"
-CATEGORY="system-tools"
-SHORT_DESC="The GNU bourne SHell."
+CATEGORY="shells"
+SHORT_DESC="The GNU bourne shell"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://www.gnu.org/software/bash/"
+TAGS="shell"
+
 TARBALL="$PACKAGE-$BASEVERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/bash/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+
 BASHCHECKURL="https://raw.githubusercontent.com/hannob/bashcheck/master/bashcheck"
 BASHCHECK="$(basename $BASHCHECKURL)"
 BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.}); do printf "bash${BASEVERSION/./}-%03d " $i; done)"
 EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES"
-TAGS="shell"
 
-DEPENDS="libtinfo" # readline
-BUILD_DEPENDS="readline bison wget texinfo"
-#configure: WARNING: installed readline library is too old to be linked with bash
-#configure: WARNING: using private bash version
+DEPENDS="readline libtinfo"
+BUILD_DEPENDS="readline texinfo gettext patch"
 
 patch_bash()
 {
-	for i in $BASHPATCHES ; do
-		[ -s "$SOURCES_REPOSITORY/$i" ] || 
+	for i in $BASHPATCHES; do
+		[ -s "$SOURCES_REPOSITORY/$i" ] ||
 			wget -O "$SOURCES_REPOSITORY/$i" \
 			http://ftp.gnu.org/gnu/bash/bash-$BASEVERSION-patches/$i
-		echo "Apply $i ..."
-		patch -p0 < $SOURCES_REPOSITORY/$i
+		echo "Apply $i patch..."
+		patch -p0 -i $SOURCES_REPOSITORY/$i | awk '{print "  * " $0;}'
 	done
 }
 
@@ -45,10 +45,9 @@
 compile_rules()
 {
 	# Patch and then build.
-	cd $src
 	patch_bash
 	# Skip tests that can not run while cross-compiling.
-	cat > config.cache << "EOF"
+	cat > config.cache <<EOF
 ac_cv_func_mmap_fixed_mapped=yes
 ac_cv_func_strcoll_works=yes
 ac_cv_func_working_mktime=yes
@@ -66,27 +65,32 @@
 		$CONFIGURE_ARGS \
 		--cache-file=config.cache \
 		--bindir=/bin \
-		--enable-history --enable-alias  \
-		--disable-nls --without-bash-malloc \
+		--enable-history \
+		--enable-alias  \
+		--disable-nls \
+		--without-bash-malloc \
 		--disable-help-builtin \
 		--with-installed-readline &&
 	make &&
 	# Bash doesn't care about DESTDIR in environnment variable.
 	make DESTDIR=$DESTDIR install
-	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] || 
-		wget --no-check-certificate -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
-	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | tee bashcheck.log
+
+	# Check bash against vulnerabilities
+	[ -s "$SOURCES_REPOSITORY/$BASHCHECK" ] ||
+		wget -O "$SOURCES_REPOSITORY/$BASHCHECK" $BASHCHECKURL
+	echo
+	$DESTDIR/bin/bash $SOURCES_REPOSITORY/$BASHCHECK $DESTDIR/bin/bash | \
+	tee bashcheck.log
+	echo
 	grep Vulnerable bashcheck.log && echo "ERROR: Vulnerable"
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/bin $fs
-	# Config files.
-	#
-	mkdir $fs/etc
-	cp $stuff/example.bashrc $fs/etc/bashrc
+	cook_copy_folders bin
+	# Config files
+	cp -a $stuff/etc $fs
 }
 
 
@@ -97,12 +101,12 @@
 	# Exit function in non-interactive mode (when user can't answer question)
 	! tty -s && return
 
-	echo -n 'Do you want to set Bash to default (y/N) ? : '
+	echo -n 'Do you want to set /bin/bash to default (y/N) ? : '
 	read -t 30 answer
 	[ "$answer" != 'y' ] && return
 
 	echo
-	echo 'Setting bash as default shell for all users'
+	echo 'Setting /bin/bash as default shell for all users'
 	sed -i 's|:/bin/[ckz]*sh$|:/bin/bash|' "$1/etc/passwd"
 
 	echo 'Creating ~/.bashrc file for all users'
@@ -117,7 +121,7 @@
 pre_remove()
 {
 	echo
-	echo 'Setting sh as default shell for all users'
+	echo 'Setting /bin/sh as default shell for all users'
 	sed -i 's|:/bin/bash$|:/bin/sh|' "$1/etc/passwd"
 	[ -f "$1/etc/skel/.bashrc" ] && rm "$1/etc/skel/.bashrc"
 }
diff -r 792674d97726 -r c963361d3d54 bash/stuff/etc/bashrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bash/stuff/etc/bashrc	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,18 @@
+# /etc/bashrc: Bash system wide config file.
+#
+
+if [ "`id -u`" -eq 0 ]; then
+	# Simple prompt
+	#PS1='\u@\h:\w # '
+	
+	# Colored prompt
+	PS1="\[\e[31;1m\]\u@\[\e[32;1m\]\h:\w\[\e[0m\] # "
+else
+	# Simple prompt
+	#PS1='\u@\h:\w $ '
+	
+	# Colored prompt
+	PS1="\[\e[34;1m\]\u@\[\e[32;1m\]\h:\w\[\e[0m\] $ "
+fi
+
+export PS1
diff -r 792674d97726 -r c963361d3d54 bash/stuff/example.bashrc
--- a/bash/stuff/example.bashrc	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# /etc/bashrc: Bash system wide config file.
-#
-
-if [ "`id -u`" -eq 0 ]; then
-	# Simple prompt
-	#PS1='\u@\h:\w # '
-	
-	# Colored prompt
-	PS1="\[\e[31;1m\]\u@\[\e[32;1m\]\h:\w\[\e[0m\] # "
-else
-	# Simple prompt
-	#PS1='\u@\h:\w $ '
-	
-	# Colored prompt
-	PS1="\[\e[34;1m\]\u@\[\e[32;1m\]\h:\w\[\e[0m\] $ "
-fi
-
-export PS1
diff -r 792674d97726 -r c963361d3d54 binutils/receipt
--- a/binutils/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/binutils/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,21 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="binutils"
-VERSION="2.25"
+VERSION="2.27"
 CATEGORY="development"
 SHORT_DESC="GNU assembler, linker and binary utilities."
 MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
+LICENSE="GPL2 LGPL2 GPL3 LGPL3"
 WEB_SITE="http://www.gnu.org/software/binutils/"
-WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-#WGET_URL="http://www.kernel.org/pub/linux/devel/binutils/$TARBALL"
-PROVIDE="libbfd"
 TAGS="assembler linker"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glibc zlib"
-BUILD_DEPENDS="glibc-dev zlib-dev texinfo"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+
+PROVIDE="libbfd"
+DEPENDS="glibc zlib flex"
+BUILD_DEPENDS="glibc-dev zlib-dev texinfo bison flex gettext-tools"
 
 # Handle cross compilation.
 case "$ARCH" in
@@ -28,46 +28,40 @@
 	case "$ARCH" in
 		i?86) ARCH_ARGS="--disable-werror" ;;
 	esac
-	mkdir -p ../binutils-build && cd ../binutils-build
+
+	mkdir build; cd build
+
 	$src/configure \
-		--program-prefix=$TOOLPREFIX \
 		--enable-shared \
 		--disable-initfini-array \
 		--with-bugurl="http://bugs.slitaz.org/" \
 		$CONFIGURE_ARGS $ARCH_ARGS &&
 	make tooldir=/usr &&
-	make tooldir=/usr install &&
-	# This is the default binutils, so create symlinks to the target platform
-	# binutil binaries. Delete duplicate binaries to save space.
-	for binutil in $(ls -1 $DESTDIR/usr/bin | grep "${TOOLPREFIX}") ; do
-		path="$DESTDIR/usr/bin/$(echo "$binutil" | sed "s:$TOOLPREFIX::g")"
-		if [ -e $path ] ; then
-			rm -f $path
-		fi
-		ln -s $binutil $path
+	make tooldir=/usr install
+
+	# Create prefixed version of the tools.
+	cd $install/usr/bin
+	for i in $(ls); do
+		mv $i $TOOLPREFIX$i
+		[ $i == 'strings' ] && continue # skip: Busybox intercept
+		ln -s $TOOLPREFIX$i $i
 	done
+	rm ld.bfd ${TOOLPREFIX}ld.bfd
+	ln -s ld ld.bfd
+	ln -s ${TOOLPREFIX}ld ${TOOLPREFIX}ld.bfd
+
+	# Remove prefix from manpages name
+	for i in $(find $install/usr/share/man/man1 -type f); do
+		mv $i ${i/$TOOLPREFIX/}
+	done
+
+#	# Install libiberty (-liberty flag): dependency described in *.la files
+#	install -o root -g root -m 644 $src/include/libiberty.h $install/usr/include
 }
 
 # 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
-	cp -a $install/usr/lib/*.a $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
-
-	# libiberty.h
-	cp -a $src/include/libiberty.h $fs/usr/include
-
-	# Remove 'strings' (Busybox).
-	#rm $fs/usr/lib/libiberty.a
-	rm $fs/usr/bin/strings $fs/usr/bin/*-strings
-
-	# Remove build directory (cookutils and tazwok path).
-	rm -rf $WOK/$PACKAGE/source/$PACKAGE-build
-	rm -rf $WOK/$PACKAGE/$PACKAGE-build
-
-	chown -R root:root $fs/usr/include/libiberty.h
-	chmod 644 $fs/usr/include/libiberty.h
+	cook_copy_folders bin lib include
+	find $fs -name '*.la' -delete
 }
diff -r 792674d97726 -r c963361d3d54 bzip2-apps/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bzip2-apps/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,10 @@
+This package contains:
+
+  * `bzcmp` - Runs cmp on bzipped files
+  * `bzdiff` - Runs diff on bzipped files
+  * `bzegrep` - Runs egrep on bzipped files
+  * `bzfgrep` - Runs fgrep on bzipped files
+  * `bzgrep` - Runs grep on bzipped files
+  * `bzip2recover` - Tries to recover data from damaged bzipped files
+  * `bzless` - Runs less on bzipped files
+  * `bzmore` - Runs more on bzipped files
diff -r 792674d97726 -r c963361d3d54 bzip2-apps/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bzip2-apps/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,21 @@
+# SliTaz package receipt.
+
+PACKAGE="bzip2-apps"
+VERSION="1.0.6"
+CATEGORY="utilities"
+SHORT_DESC="High-quality data compressor (apps)"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="BSD"
+WEB_SITE="http://www.bzip.org/"
+TAGS="compression archive"
+HOST_ARCH="i486 arm"
+
+WANTED="bzip2"
+DEPENDS="bzlib"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders bin
+	cook_split_rm bzip2
+}
diff -r 792674d97726 -r c963361d3d54 bzip2-dev/receipt
--- a/bzip2-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bzip2-dev/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -8,15 +8,12 @@
 LICENSE="BSD"
 WEB_SITE="http://www.bzip.org/"
 HOST_ARCH="i486 arm"
+
 WANTED="bzip2"
-
 DEPENDS="bzip2"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/include $fs/usr/lib
-	cp $src/*.h $fs/usr/include
-	cp -a $src/*.*a $fs/usr/lib
+	cook_copy_files *.h *.a
 }
-
diff -r 792674d97726 -r c963361d3d54 bzip2/description.txt
--- a/bzip2/description.txt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bzip2/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,4 +1,13 @@
-bzip2 is a freely available, patent free, high-quality data compressor. It 
-typically compresses files to within 10% to 15% of the best available techniques
-(the PPM family of statistical compressors), whilst being around twice as fast 
-at compression and six times faster at decompression.
+bzip2 is a freely available, patent free, high-quality data compressor. It
+typically compresses files to within 10% to 15% of the best available
+techniques (the PPM family of statistical compressors), whilst being around
+twice as fast at compression and six times faster at decompression.
+
+This package contains:
+
+  * `bzip2` - Compresses files using the Burrows-Wheeler block sorting text
+    compression algorithm with Huffman coding; the compression rate is better
+    than that achieved by more conventional compressors using "Lempel-Ziv"
+    algorithms, like gzip
+  * `bunzip2` - Decompresses bzipped files
+  * `bzcat` - Decompresses to standard output
diff -r 792674d97726 -r c963361d3d54 bzip2/receipt
--- a/bzip2/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bzip2/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -6,22 +6,22 @@
 SHORT_DESC="High-quality data compressor."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="BSD"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.bzip.org/"
-WGET_URL="http://www.bzip.org/$VERSION/$TARBALL"
 TAGS="compression archive"
 HOST_ARCH="i486 arm"
 
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="http://www.bzip.org/$VERSION/$TARBALL"
+
 DEPENDS="bzlib"
-BUILD_DEPENDS=""
+SPLIT="bzlib bzip2-apps"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Disable the tests since they won't work on a multi-architecture build
-	cp Makefile Makefile.orig
-	sed -e "/^all:/s/ test//" Makefile.orig > Makefile
-	
+	patch -p1 -i $stuff/bzip2-1.0.6-install_docs-1.patch
+	patch -p1 -i $stuff/bzip2-1.0.6-fix_install.patch
+
 	# No configure script, we must used CC, AR and RANLIB set by cook.
 	case "$ARCH" in
 		arm*)
@@ -32,7 +32,7 @@
 			make clean && make ;;
 	esac
 
-	cook_pick_manpages bzdiff.1 bzgrep.1 bzip2.1 bzmore.1
+	make install
 }
 
 # Just to be sure when cross-compiling.
@@ -44,12 +44,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $src/bzip2-shared $fs/usr/bin/bzip2
-	# Da bunzip2, bzcat and lib symlink.
-	cd $fs/usr/bin
-	ln -s bzip2 bunzip2
-	ln -s bzip2 bzcat
+	cook_copy_files bzip2 bunzip2 bzcat
 }
 
 # Restore Busybox symlinks upon removal
@@ -57,5 +52,4 @@
 {
 	ln -s /bin/busybox /usr/bin/bunzip2
 	ln -s /bin/busybox /usr/bin/bzcat
-	#ln -s /bin/busybox /usr/bin/bzip2
 }
diff -r 792674d97726 -r c963361d3d54 bzip2/stuff/bzip2-1.0.6-fix_install.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bzip2/stuff/bzip2-1.0.6-fix_install.patch	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,138 @@
+--- a/Makefile
++++ b/Makefile
+@@ -24,7 +24,7 @@
+ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+-PREFIX=/usr/local
++PREFIX=/usr
+ DOCDIR=share/doc/$(DISTNAME)
+ 
+ OBJS= blocksort.o  \
+@@ -35,7 +35,7 @@
+       decompress.o \
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover
+ 
+ bzip2: libbz2.a bzip2.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+@@ -70,52 +70,71 @@
+ 	@cat words3
+ 
+ install: bzip2 bzip2recover
+-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
+-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+-	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+-	if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi
+-	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+-	cp -f bzip2 $(PREFIX)/bin/bzip2
+-	cp -f bzip2 $(PREFIX)/bin/bunzip2
+-	cp -f bzip2 $(PREFIX)/bin/bzcat
+-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+-	chmod a+x $(PREFIX)/bin/bzip2
+-	chmod a+x $(PREFIX)/bin/bunzip2
+-	chmod a+x $(PREFIX)/bin/bzcat
+-	chmod a+x $(PREFIX)/bin/bzip2recover
+-	cp -f bzip2.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzip2.1
+-	cp -f bzlib.h $(PREFIX)/include
+-	chmod a+r $(PREFIX)/include/bzlib.h
+-	cp -f libbz2.a $(PREFIX)/lib
+-	chmod a+r $(PREFIX)/lib/libbz2.a
+-	cp -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+-	chmod a+x $(PREFIX)/bin/bzgrep
+-	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+-	chmod a+x $(PREFIX)/bin/bzmore
+-	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+-	chmod a+x $(PREFIX)/bin/bzdiff
+-	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
+-	chmod a+r $(PREFIX)/man/man1/bzgrep.1
+-	chmod a+r $(PREFIX)/man/man1/bzmore.1
+-	chmod a+r $(PREFIX)/man/man1/bzdiff.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
+-	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+-	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+-	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
+-	cp -f manual.html $(PREFIX)/$(DOCDIR)
+-	cp -f manual.pdf $(PREFIX)/$(DOCDIR)
+-	cp -f manual.ps $(PREFIX)/$(DOCDIR)
+-	cp -f bzip2.txt $(PREFIX)/$(DOCDIR)
+-	chmod a+r $(PREFIX)/$(DOCDIR)/manual.html
+-	chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf
+-	chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps
+-	chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt
++	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
++	if ( test ! -d $(DESTDIR)/bin ) ; then mkdir -p $(DESTDIR)/bin ; fi
++	if ( test ! -d $(DESTDIR)/lib ) ; then mkdir -p $(DESTDIR)/lib ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/share/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(DESTDIR)$(PREFIX)/$(DOCDIR); fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
++
++# shared bzip2
++	cp -a bzip2-shared $(DESTDIR)/bin/bzip2
++	chmod a+x $(DESTDIR)/bin/bzip2
++# shared library
++	cp -a libbz2.so* $(DESTDIR)/lib
++	ln -s ../../lib/libbz2.so.1.0 $(DESTDIR)$(PREFIX)/lib/libbz2.so
++# bunzip2
++	ln -s ../../bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
++# bzcat
++	ln -s ../../bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
++# bzdiff
++	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
++# bzcmp
++	ln -s bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
++# bzgrep
++	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
++# bzegrep
++	ln -s bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
++# bzfgrep
++	ln -s bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
++# bzip2recover
++	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
++# bzmore
++	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
++# bzless
++	ln -s bzmore $(DESTDIR)$(PREFIX)/bin/bzless
++# headers
++	cp -f bzlib.h bzlib_private.h $(DESTDIR)$(PREFIX)/include
++	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
++	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib_private.h
++# static library
++	cp -f libbz2.a $(DESTDIR)$(PREFIX)/lib
++	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
++# man pages
++	cp -f bzip2.1 $(DESTDIR)$(PREFIX)/share/man/man1
++	chmod a+r $(DESTDIR)$(PREFIX)/share/man/man1/bzip2.1
++	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/share/man/man1
++	chmod a+r $(DESTDIR)$(PREFIX)/share/man/man1/bzgrep.1
++	chmod a+r $(DESTDIR)$(PREFIX)/share/man/man1/bzmore.1
++	chmod a+r $(DESTDIR)$(PREFIX)/share/man/man1/bzdiff.1
++	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/share/man/man1/bzegrep.1
++	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/share/man/man1/bzfgrep.1
++	echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/share/man/man1/bzless.1
++	echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/share/man/man1/bzcmp.1
++# docs
++	cp -f manual.html $(DESTDIR)$(PREFIX)/$(DOCDIR)
++	cp -f manual.pdf $(DESTDIR)$(PREFIX)/$(DOCDIR)
++	cp -f manual.ps $(DESTDIR)$(PREFIX)/$(DOCDIR)
++	cp -f bzip2.txt $(DESTDIR)$(PREFIX)/$(DOCDIR)
++	chmod a+r $(DESTDIR)$(PREFIX)/$(DOCDIR)/manual.html
++	chmod a+r $(DESTDIR)$(PREFIX)/$(DOCDIR)/manual.pdf
++	chmod a+r $(DESTDIR)$(PREFIX)/$(DOCDIR)/manual.ps
++	chmod a+r $(DESTDIR)$(PREFIX)/$(DOCDIR)/bzip2.txt
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
diff -r 792674d97726 -r c963361d3d54 bzip2/stuff/bzip2-1.0.6-install_docs-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bzip2/stuff/bzip2-1.0.6-install_docs-1.patch	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,42 @@
+Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
+Date:                    2007-01-31
+Initial Package Version: 1.0.4
+Upstream Status:         Not submitted
+Origin:                  Randy McMurchy & Steve Crosby
+Description:             Installs pre-formatted documentation
+
+diff -Naur bzip2-1.0.4.orig/Makefile bzip2-1.0.4/Makefile
+--- bzip2-1.0.4.orig/Makefile	2007-01-03 03:49:21.000000000 +0000
++++ bzip2-1.0.4/Makefile	2007-01-26 20:00:01.000000000 +0000
+@@ -25,7 +25,7 @@
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+-
++DOCDIR=share/doc/$(DISTNAME)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -74,6 +74,7 @@
+ 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
+ 	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
+ 	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
++	if ( test ! -d $(PREFIX)/$(DOCDIR) ) ; then mkdir -p $(PREFIX)/$(DOCDIR); fi
+ 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+ 	cp -f bzip2 $(PREFIX)/bin/bzip2
+ 	cp -f bzip2 $(PREFIX)/bin/bunzip2
+@@ -107,6 +108,14 @@
+ 	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
+ 	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
+ 	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
++	cp -f manual.html $(PREFIX)/$(DOCDIR)
++	cp -f manual.pdf $(PREFIX)/$(DOCDIR)
++	cp -f manual.ps $(PREFIX)/$(DOCDIR)
++	cp -f bzip2.txt $(PREFIX)/$(DOCDIR)
++	chmod a+r $(PREFIX)/$(DOCDIR)/manual.html
++	chmod a+r $(PREFIX)/$(DOCDIR)/manual.pdf
++	chmod a+r $(PREFIX)/$(DOCDIR)/manual.ps
++	chmod a+r $(PREFIX)/$(DOCDIR)/bzip2.txt
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
diff -r 792674d97726 -r c963361d3d54 bzlib/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bzlib/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,4 @@
+This package contains:
+
+  * `libbz2.so` - The library implementing lossless, block-sorting data
+    compression, using the Burrows-Wheeler algorithm
diff -r 792674d97726 -r c963361d3d54 bzlib/receipt
--- a/bzlib/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/bzlib/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -2,20 +2,18 @@
 
 PACKAGE="bzlib"
 VERSION="1.0.6"
-CATEGORY="utilities"
-SHORT_DESC="High-quality data compressor libraries."
+CATEGORY="libs"
+SHORT_DESC="High-quality data compressor (library)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.bzip.org/"
-WANTED="bzip2"
 HOST_ARCH="i486 arm"
 
+WANTED="bzip2"
 DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $src/libbz2.so* $fs/usr/lib
-	ln -s libbz2.so.$VERSION $fs/usr/lib/libbz2.so
+	cook_copy_files *.so*
 }
diff -r 792674d97726 -r c963361d3d54 coreutils-character/receipt
--- a/coreutils-character/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-character/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,18 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/expand
-/usr/bin/tr
-/usr/bin/unexpand
-EOT
+	cook_copy_files expand tr unexpand
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-command/receipt
--- a/coreutils-command/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-command/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,35 +14,16 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir ${mandir/1/8}
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/env
-/usr/bin/kill
-/usr/bin/nice
-/usr/bin/nohup
-/usr/bin/sleep
-/usr/bin/stdbuf
-/usr/bin/timeout
-/usr/libexec/coreutils/libstdbuf.so
-/usr/sbin/chroot
-EOT
-
-	mv $mandir/chroot.* ${mandir/1/8}
+	cook_copy_files env kill nice nohup sleep stdbuf timeout libstdbuf.so chroot
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/kill"     # /usr/bin/kill
-	rm "$1/bin/nice"     # /usr/bin/nice
-	rm "$1/bin/sleep"    # /usr/bin/sleep
+	rm "$1/bin/kill"     # for /usr/bin/kill
+	rm "$1/bin/nice"     # for /usr/bin/nice
+	rm "$1/bin/sleep"    # for /usr/bin/sleep
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-conditions/receipt
--- a/coreutils-conditions/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-conditions/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,20 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/false
-/bin/true
-/usr/bin/[
-/usr/bin/expr
-/usr/bin/test
-EOT
+	cook_copy_files false true [ expr test
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-context-system/receipt
--- a/coreutils-context-system/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-context-system/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,22 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/date
-/bin/uname
-/usr/bin/chcon
-/usr/bin/hostid
-/usr/bin/nproc
-/usr/bin/runcon
-/usr/bin/uptime
-EOT
+	cook_copy_files date uname chcon hostid nproc runcon uptime
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-context-user/receipt
--- a/coreutils-context-user/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-context-user/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,22 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/groups
-/usr/bin/id
-/usr/bin/logname
-/usr/bin/pinky
-/usr/bin/users
-/usr/bin/who
-/usr/bin/whoami
-EOT
+	cook_copy_files groups id logname pinky users who whoami
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-context-working/receipt
--- a/coreutils-context-working/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-context-working/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,26 +14,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/pwd
-/bin/stty
-/usr/bin/printenv
-/usr/bin/tty
-EOT
+	cook_copy_files pwd stty printenv tty
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/printenv" # /usr/bin/printenv
+	rm "$1/bin/printenv" # for /usr/bin/printenv
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-directory/receipt
--- a/coreutils-directory/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-directory/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,19 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/ls
-/usr/bin/dir
-/usr/bin/dircolors
-/usr/bin/vdir
-EOT
+	cook_copy_files ls dir dircolors vdir
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-disk/receipt
--- a/coreutils-disk/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-disk/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,27 +14,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/df
-/bin/sync
-/usr/bin/du
-/usr/bin/stat
-/usr/bin/truncate
-EOT
+	cook_copy_files df sync du stat truncate
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/stat"     # /usr/bin/stat
+	rm "$1/bin/stat"     # for /usr/bin/stat
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-attributes/receipt
--- a/coreutils-file-attributes/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-attributes/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,26 +14,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/chgrp
-/bin/chmod
-/bin/chown
-/usr/bin/touch
-EOT
+	cook_copy_files chgrp chmod chown touch
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/touch"    # /usr/bin/touch
+	rm "$1/bin/touch"    # for /usr/bin/touch
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-format/receipt
--- a/coreutils-file-format/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-format/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,18 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/fmt
-/usr/bin/fold
-/usr/bin/pr
-EOT
+	cook_copy_files fmt fold pr
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-output-full/receipt
--- a/coreutils-file-output-full/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-output-full/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,28 +14,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/cat
-/usr/bin/base32
-/usr/bin/base64
-/usr/bin/nl
-/usr/bin/od
-/usr/bin/tac
-EOT
+	cook_copy_files cat base32 base64 nl od tac
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/base64"   # /usr/bin/base64
+	rm "$1/bin/base64"   # for /usr/bin/base64
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-output-part/receipt
--- a/coreutils-file-output-part/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-output-part/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,19 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/csplit
-/usr/bin/head
-/usr/bin/split
-/usr/bin/tail
-EOT
+	cook_copy_files csplit head split tail
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-sort/receipt
--- a/coreutils-file-sort/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-sort/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,21 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/comm
-/usr/bin/ptx
-/usr/bin/shuf
-/usr/bin/sort
-/usr/bin/tsort
-/usr/bin/uniq
-EOT
+	cook_copy_files comm ptx shuf sort tsort uniq
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-special/receipt
--- a/coreutils-file-special/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-special/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,32 +14,15 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/ln
-/bin/mkdir
-/bin/mknod
-/bin/rmdir
-/usr/bin/link
-/usr/bin/mkfifo
-/usr/bin/mktemp
-/usr/bin/readlink
-/usr/bin/realpath
-/usr/bin/unlink
-EOT
+	cook_copy_files ln mkdir mknod rmdir link mkfifo mktemp readlink realpath \
+		unlink
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/mktemp"   # /usr/bin/mktemp
+	rm "$1/bin/mktemp"   # for /usr/bin/mktemp
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-file-summarize/receipt
--- a/coreutils-file-summarize/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-file-summarize/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,24 +14,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/cksum
-/usr/bin/md5sum
-/usr/bin/sha1sum
-/usr/bin/sha224sum
-/usr/bin/sha256sum
-/usr/bin/sha384sum
-/usr/bin/sha512sum
-/usr/bin/sum
-/usr/bin/wc
-EOT
+	cook_copy_files cksum md5sum sha1sum sha224sum sha256sum sha384sum \
+		sha512sum sum wc
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-line/receipt
--- a/coreutils-line/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-line/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,18 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/cut
-/usr/bin/join
-/usr/bin/paste
-EOT
+	cook_copy_files cut join paste
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-multicall/receipt
--- a/coreutils-multicall/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-multicall/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -12,7 +12,7 @@
 
 SIBLINGS="coreutils"
 DEPENDS="glibc-base acl attr libcap gmp"
-BUILD_DEPENDS="automake xz libcap-dev gmp-dev"
+BUILD_DEPENDS="automake autoconf gettext xz libcap-dev gmp-dev patch"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -21,6 +21,10 @@
 	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
+	msgfmt po/nb.po -o po/nb.gmo
+	msgfmt po/sl.po -o po/sl.gmo
 
 	autoreconf -fi
 
@@ -42,29 +46,26 @@
 	mv  $install/usr/share/man/man1/chroot.1 \
 		$install/usr/share/man/man8/chroot.8
 	sed -i 's|"1"|"8"|' $install/usr/share/man/man8/chroot.8
-
-	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/info $fs/usr/share/locale
+	cook_copy_folders bin sbin libexec
 }
 
 post_install()
 {
 	# Remove Busybox applets in order to not clash with ("/bin", "/sbin",
 	# "/usr/bin" and "/usr/sbin" conflicts with the same filename)
-	rm "$1/bin/base64"   # /usr/bin/base64
-	rm "$1/bin/kill"     # /usr/bin/kill
-	rm "$1/bin/mktemp"   # /usr/bin/mktemp
-	rm "$1/bin/nice"     # /usr/bin/nice
-	rm "$1/bin/printenv" # /usr/bin/printenv
-	rm "$1/bin/sleep"    # /usr/bin/sleep
-	rm "$1/bin/stat"     # /usr/bin/stat
-	rm "$1/bin/touch"    # /usr/bin/touch
+	rm "$1/bin/base64"   # for /usr/bin/base64
+	rm "$1/bin/kill"     # for /usr/bin/kill
+	rm "$1/bin/mktemp"   # for /usr/bin/mktemp
+	rm "$1/bin/nice"     # for /usr/bin/nice
+	rm "$1/bin/printenv" # for /usr/bin/printenv
+	rm "$1/bin/sleep"    # for /usr/bin/sleep
+	rm "$1/bin/stat"     # for /usr/bin/stat
+	rm "$1/bin/touch"    # for /usr/bin/touch
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-numeric/receipt
--- a/coreutils-numeric/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-numeric/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,17 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/factor
-/usr/bin/seq
-EOT
+	cook_copy_files factor seq
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-operations/receipt
--- a/coreutils-operations/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-operations/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,20 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/cp
-/bin/dd
-/bin/mv
-/usr/bin/install
-/usr/bin/shred
-EOT
+	cook_copy_files cp dd mv install shred
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-path/receipt
--- a/coreutils-path/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-path/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,18 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/basename
-/usr/bin/dirname
-/usr/bin/pathchk
-EOT
+	cook_copy_files basename dirname pathchk
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-print/receipt
--- a/coreutils-print/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-print/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,19 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/bin/echo
-/usr/bin/numfmt
-/usr/bin/printf
-/usr/bin/yes
-EOT
+	cook_copy_files echo numfmt printf yes
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils-redirection/receipt
--- a/coreutils-redirection/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils-redirection/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -14,16 +14,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mandir="$fs/usr/share/man/man1"
-	mkdir -p $mandir
-
-	while read i; do
-		mkdir -p $fs$(dirname $i)
-		cp -a $install$i $fs$i
-		find $install -name "$(basename $i).*" -exec cp -a \{\} $mandir \;
-	done <<EOT
-/usr/bin/tee
-EOT
+	cook_copy_files tee
 }
 
 post_remove()
diff -r 792674d97726 -r c963361d3d54 coreutils/receipt
--- a/coreutils/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/coreutils/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -2,11 +2,12 @@
 
 PACKAGE="coreutils"
 VERSION="8.25"
-CATEGORY="system-tools"
+CATEGORY="meta"
 SHORT_DESC="Utilities for using and setting the basic system."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/coreutils/coreutils.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
@@ -18,8 +19,8 @@
 coreutils-file-special coreutils-file-summarize coreutils-line coreutils-\
 numeric coreutils-operations coreutils-path coreutils-print coreutils-\
 redirection"
-DEPENDS="glibc-base acl attr gmp"
-BUILD_DEPENDS="automake xz libcap-dev gmp-dev"
+DEPENDS="glibc-base acl attr gmp $SPLIT"
+BUILD_DEPENDS="automake autoconf gettext xz libcap-dev gmp-dev patch"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -28,6 +29,10 @@
 	patch -Np1 -i $stuff/coreutils-8.25-i18n-2.patch
 	# SliTaz: show extended info touching CPU via uname
 	patch  -p1 -i $stuff/uname.u
+	# SliTaz: fix translations, especially deprecated symbol '\v'
+	patch  -p1 -i $stuff/coreutils-fix-po.patch
+	msgfmt po/nb.po -o po/nb.gmo
+	msgfmt po/sl.po -o po/sl.gmo
 
 	autoreconf -fi
 
@@ -47,38 +52,4 @@
 	mv  $install/usr/share/man/man1/chroot.1 \
 		$install/usr/share/man/man8/chroot.8
 	sed -i 's|"1"|"8"|' $install/usr/share/man/man8/chroot.8
-
-	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
 }
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	# A set of binaries looks intriguing, isn't it?
-	# For what is this package with exactly these binaries?
-
-	mkdir -p $fs/usr/bin $fs/bin
-
-	cd $install/usr/bin
-	cp -a base64 csplit factor fmt join od paste ptx shred shuf split users \
-		groups $fs/usr/bin
-
-	cp -a $install/bin/cp $fs/bin
-}
-
-post_install()
-{
-	# Remove Busybox applet in order to not clash with
-	# /usr/bin/base64 from this package.
-	rm "$1/bin/base64"
-}
-
-post_remove()
-{
-	ln -s      busybox "$1/bin/base64"
-	ln -s      busybox "$1/bin/cp"
-	ln -s /bin/busybox "$1/usr/bin/groups"
-	ln -s /bin/busybox "$1/usr/bin/od"
-	ln -s /bin/busybox "$1/usr/bin/split"
-	ln -s /bin/busybox "$1/usr/bin/users"
-}
diff -r 792674d97726 -r c963361d3d54 coreutils/stuff/coreutils-fix-po.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/coreutils/stuff/coreutils-fix-po.patch	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,84 @@
+--- a/po/nb.po
++++ b/po/nb.po
+@@ -2721,7 +2721,7 @@
+ "A line OFFSET is a required '+' or '-' followed by a positive integer.\n"
+ msgstr ""
+ "\n"
+-"\vMØNSTER må utformes slik:\n"
++"MØNSTER må utformes slik:\n"
+ "  INTEGER            kopier frem til - men ikke inkludert - angitt "
+ "linjenummer\n"
+ "  /REGEXP/[OFFSET]   kopier frem til - men ikke inkludert - en samsvarende "
+@@ -7132,7 +7132,7 @@
+ "Multiple fields/ranges can be separated with commas\n"
+ msgstr ""
+ "\n"
+-"\vFELT støtter feltrekkevidder i cut(1)-stil:\n"
++"FELT støtter feltrekkevidder i cut(1)-stil:\n"
+ "  N    N'te byte, tegn eller felt, talt fra 1\n"
+ "  N-   fra N'te byte, tegn eller felt, til slutten av linja\n"
+ "  N-M  fra N'te til M'te (inklusive) byte, tegn eller felt\n"
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -2641,7 +2641,7 @@
+ #: src/csplit.c:1299
+ #, c-format
+ msgid "invalid conversion specifier in suffix: \\%.3o"
+-msgstr "neveljavno določilo pretvorbe v priponi: \\\\%.3o"
++msgstr "neveljavno določilo pretvorbe v priponi: \\%.3o"
+ 
+ #: src/csplit.c:1304
+ #, c-format
+@@ -6711,7 +6711,7 @@
+ "ločitvena\n"
+ "znaka za ločevanje logičnih strani; če je drugi znak izpuščen, se "
+ "privzame :.\n"
+-"Uporabite \\\\\\\\ za \\\\. SLOG je nekaj od naštetega:\n"
++"Uporabite \\\\ za \\. SLOG je nekaj od naštetega:\n"
+ 
+ #: src/nl.c:211
+ msgid ""
+@@ -7951,8 +7951,8 @@
+ msgstr ""
+ "  -h, --header=ZGLAVJE\n"
+ "                    uporabimo navedeno osredinjeno ZGLAVJE namesto imena\n"
+-"                    datoteke; -h \\\"\\\" izpiše prazno vrstica; ne "
+-"uporabljajte -h\\\"\\\"\n"
++"                    datoteke; -h \"\" izpiše prazno vrstica; ne "
++"uporabljajte -h\"\"\n"
+ "  -i[ZNAK[ŠIRINA]], --output-tabs[=ZNAK[ŠIRINA]]\n"
+ "                    presledke skrčimo v ZNAK (privzeto TAB) do ŠIRINE\n"
+ "                    tabulatorja (privzeto 8)\n"
+@@ -12078,15 +12078,15 @@
+ "MNOŽICE določajo nizi znakov. Večinoma predstavljajo sebe, posebej pa se\n"
+ "tolmačijo naslednja zaporedja:\n"
+ "\n"
+-"  \\\\NNN            znak z osmiško kodo NNN (dolžina 1, 2 ali 3 osmiške "
++"  \\NNN            znak z osmiško kodo NNN (dolžina 1, 2 ali 3 osmiške "
+ "števke)\n"
+-"  \\\\\\\\             obratna poševnica\n"
+-"  \\\\a              zvonček\n"
+-"  \\\\b              pomik za en znak v levo\n"
+-"  \\\\f              skok na novo stran\n"
+-"  \\\\n              skok v novo vrstico\n"
+-"  \\\\r              pomik na levi rob\n"
+-"  \\\\t              vodoravni tabulator\n"
++"  \\\\             obratna poševnica\n"
++"  \\a              zvonček\n"
++"  \\b              pomik za en znak v levo\n"
++"  \\f              skok na novo stran\n"
++"  \\n              skok v novo vrstico\n"
++"  \\r              pomik na levi rob\n"
++"  \\t              vodoravni tabulator\n"
+ 
+ #: src/tr.c:317
+ msgid ""
+@@ -12100,7 +12100,7 @@
+ "  [:cntrl:]       all control characters\n"
+ "  [:digit:]       all digits\n"
+ msgstr ""
+-"  \\\\v              navpični tabulator\n"
++"  \\v              navpični tabulator\n"
+ "  ZNAK1-ZNAK2     naraščajoče zaporedje znakov od ZNAKA1 do ZNAKA2\n"
+ "  [ZNAK1-ZNAK2]   isto kot ZNAK1-ZNAK2, če to uporabljata obe množici\n"
+ "  [ZNAK*]         v MNOŽICI 2; toliko ponovitev ZNAKA kot v MNOŽICI 1\n"
diff -r 792674d97726 -r c963361d3d54 diffutils/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/diffutils/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,11 @@
+The Diffutils package contains programs that show the differences between files
+or directories.
+
+The package contains:
+
+  * `cmp` - Compares two files and reports whether or in which bytes they
+    differ
+  * `diff` - Compares two files or directories and reports which lines in the
+    files differ
+  * `diff3` - Compares three files line by line
+  * `sdiff` - Merges two files and interactively outputs the results
diff -r 792674d97726 -r c963361d3d54 diffutils/receipt
--- a/diffutils/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/diffutils/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,39 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="diffutils"
-VERSION="3.3"
+VERSION="3.5"
 CATEGORY="development"
 SHORT_DESC="Show differences between two files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://www.gnu.org/software/diffutils/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://www.gnu.org/software/diffutils/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS && make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+	cook_copy_folders bin
 }
 
 # Overlap busybox
-pre_install()
-{
-	rm -f "$1/usr/bin/diff"
-	rm -f "$1/usr/bin/cmp"
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/usr/bin/diff"
diff -r 792674d97726 -r c963361d3d54 file/receipt
--- a/file/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/file/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,20 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="file"
-VERSION="5.24"
+VERSION="5.28"
 CATEGORY="system-tools"
 SHORT_DESC="Determines file type using 'magic' numbers"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.darwinsys.com/file/"
-WGET_URL="ftp://ftp.astron.com/pub/file/$TARBALL"
 HOST_ARCH="i486 arm"
 
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="ftp://ftp.astron.com/pub/file/$TARBALL"
+
 DEPENDS="zlib libmagic"
-BUILD_DEPENDS="zlib-dev python"
-
-# Please, update too: libmagic, libmagic-dev, python-magic.
+BUILD_DEPENDS="zlib-dev python setuptools"
+SPLIT="libmagic libmagic-dev python-magic"
 
 # Handle cross compilation. python is installed in a ARM cook env.
 case "$ARCH" in
@@ -24,11 +24,9 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure \
-		--datarootdir=/usr/share \
-		$CONFIGURE_ARGS &&
-	make &&	make install &&
-	cd python &&
+	./configure $CONFIGURE_ARGS && make && make install
+
+	cd python
 	python setup.py build &&
 	python setup.py install --root=$DESTDIR
 }
@@ -36,9 +34,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/misc $fs/usr/share
+	cook_copy_files file magic.mgc
 }
 
 # Be sure it as cross compile.
diff -r 792674d97726 -r c963361d3d54 findutils/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/findutils/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,15 @@
+The Findutils package contains programs to find files. These programs are
+provided to recursively search through a directory tree and to create,
+maintain, and search a database (often faster than the recursive find, but
+unreliable if the database has not been recently updated).
+
+The package contains:
+
+  * `find` - Searches given directory trees for files matching the specified
+    criteria
+  * `locate` - Searches through a database of file names and reports the names
+    that contain a given string or match a given pattern
+  * `updatedb` - Updates the locate database; it scans the entire file system
+    (including other file systems that are currently mounted, unless told not
+    to) and puts every file name it finds into the database
+  * `xargs` - Can be used to apply a given command to a list of files
diff -r 792674d97726 -r c963361d3d54 findutils/receipt
--- a/findutils/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/findutils/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="findutils"
-VERSION="4.4.2"
+VERSION="4.6.0"
 CATEGORY="utilities"
 SHORT_DESC="GNU utilities and tools to find/locate."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://www.gnu.org/software/findutils/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/findutils/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 DEPENDS="glibc-base slitaz-base-files"
@@ -15,33 +16,20 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/findutils \
-		--localstatedir=/var \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+		--localstatedir=/var/lib/locate \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+	cook_copy_folders bin libexec
 }
 
-# Remove Busybox symlink before installing
-pre_install()
-{
-	rm -f "$1/usr/bin/find"
-	rm -f "$1/usr/bin/xargs"
-}
-
+# Restore Busybox symlinks after removing the package
 post_remove()
 {
 	ln -s /bin/busybox /usr/bin/find
diff -r 792674d97726 -r c963361d3d54 gawk/description.txt
--- a/gawk/description.txt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gawk/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,6 +1,14 @@
-If you are like many computer users, you would frequently like to make changes 
-in various text files wherever certain patterns appear, or extract data from 
+If you are like many computer users, you would frequently like to make changes
+in various text files wherever certain patterns appear, or extract data from
 parts of certain lines while discarding the rest. To write a program to do this
-in a language such as C or Pascal is a time-consuming inconvenience that may 
-take many lines of code. The job is easy with awk, especially the GNU 
-implementation: gawk. 
+in a language such as C or Pascal is a time-consuming inconvenience that may
+take many lines of code. The job is easy with awk, especially the GNU
+implementation: gawk.
+
+The package contains:
+
+  * `awk` - A link to gawk
+  * `gawk` - A program for manipulating text files; it is the GNU
+    implementation of awk
+  * `gawk-4.1.3` - A hard link to gawk
+  * `igawk` - Gives gawk the ability to include files
diff -r 792674d97726 -r c963361d3d54 gawk/receipt
--- a/gawk/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gawk/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,18 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="gawk"
-VERSION="4.0.1"
+VERSION="4.1.3"
 CATEGORY="development"
 SHORT_DESC="GNU awk to handle simple data-reformatting."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/gawk/"
-WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+
+DEPENDS="readline"
+BUILD_DEPENDS="readline-dev gettext"
 
 # Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain()
@@ -24,20 +25,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --libexecdir=/usr/lib \
-		$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/share/locale
-	cp -a $install/usr/bin $fs/usr
-	
-	cp -a $install/usr/share/awk $fs/usr/share
-	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
+	cook_copy_folders bin lib awk
 }
 
 # Pre and post install commands for Tazpkg.
diff -r 792674d97726 -r c963361d3d54 gcc-lib-base/receipt
--- a/gcc-lib-base/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gcc-lib-base/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,14 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="gcc-lib-base"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="development"
 SHORT_DESC="GCC base libraries, libgcc_s and libstdc++."
 WEB_SITE="http://gcc.gnu.org/"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+HOST_ARCH="i486 arm"
+
 WANTED="gcc"
-HOST_ARCH="i486 arm"
 
 # Handle multiarch compilation.
 case "$ARCH" in
diff -r 792674d97726 -r c963361d3d54 gcc/receipt
--- a/gcc/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gcc/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="gcc"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://gcc.gnu.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://gcc.gnu.org/"
 WGET_URL="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$TARBALL"
 TAGS="compiler C"
 #HOST_ARCH="i486 arm"
@@ -16,7 +16,7 @@
 # for cookutils that are not used by tazwok/cook-toolchain since it installs
 # and uses its own copy.
 DEPENDS="binutils libgomp libobjc gcc-lib-base mpc-library elfutils"
-BUILD_DEPENDS="mpc-library mpfr-dev gmp-dev elfutils-dev"
+BUILD_DEPENDS="mpc-library mpfr-dev gmp-dev elfutils-dev zlib-dev"
 
 # Handle cross compilation (native i486/ARM gcc)
 case "$ARCH" in
diff -r 792674d97726 -r c963361d3d54 gettext/receipt
--- a/gettext/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gettext/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,20 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="gettext"
-VERSION="0.19.4"
+VERSION="0.19.8.1"
 CATEGORY="development"
 SHORT_DESC="Utilities for the GNU Translation Project."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/gettext/"
+WEB_SITE="https://www.gnu.org/software/gettext/"
+HOST_ARCH="i486 arm"
+
+TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-HOST_ARCH="i486 arm"
 
 # Why deps on glib-dev ??? And glib build depends on gettext anyway...
 DEPENDS="gettext-base libgomp acl-dev gcc-lib-base glib-dev libxml2-dev m4 \
 ncurses gettext-tools"
-BUILD_DEPENDS="acl attr-dev glib-dev libxml2-dev ncurses-dev"
+#BUILD_DEPENDS="acl attr-dev glib-dev libxml2-dev ncurses-dev"
+BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev"
 
 # Handle cross compilation. Glibc-locale are installed in cross chroot.
 case "$ARCH" in
diff -r 792674d97726 -r c963361d3d54 gfortran/receipt
--- a/gfortran/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/gfortran/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,15 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="gfortran"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="development"
 SHORT_DESC="GCC fortran extension."
 WEB_SITE="http://gcc.gnu.org/"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+TAGS="compiler fortran"
+
 DEPENDS="gcc libgfortran"
 WANTED="gcc"
-TAGS="compiler fortran"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 792674d97726 -r c963361d3d54 glibc-base/receipt
--- a/glibc-base/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/glibc-base/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,14 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-base"
-VERSION="2.14.1"
+VERSION="2.24"
 CATEGORY="base-system"
 SHORT_DESC="GNU libc minimal libraries and UTF-8 support for SliTaz."
 WEB_SITE="http://www.gnu.org/software/libc/"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+HOST_ARCH="i486 arm x86_64"
+
 WANTED="glibc"
-HOST_ARCH="i486 arm x86_64"
 
 # Locales include by default, other locales are in: locale-** and glibc-locale
 DEFAULT_LOCALE="en_US en_GB"
@@ -34,22 +35,21 @@
 get_locales()
 {
 	local path=$1
-	for i in $DEFAULT_LOCALE
-	do
+	for i in $DEFAULT_LOCALE; do
 		cp $install/$path/i18n/locales/$i $fs/usr/share/i18n/locales
 	done
 }
 
 genpkg_rules()
 {
-	# Mkdir's.
-	for dir in $(cat $stuff/mkdir.list)
-	do
-		mkdir -p ${fs}$dir
-	done
-
 	case "$ARCH" in
 		arm*)
+			# Mkdir's.
+			for dir in $(cat $stuff/mkdir.list)
+			do
+				mkdir -p ${fs}$dir
+			done
+
 			# Eglibc is cross compiled by cross to have a toolchain so we can
 			# use these files instead of recooking it. ARM use Eglibc
 			echo "Using cross compiled Eglibc..."
@@ -77,6 +77,12 @@
 			touch $fs/etc/ld.so.cache
 			get_locales "usr/share" ;;
 		x86_64)
+			# Mkdir's.
+			for dir in $(cat $stuff/mkdir.list)
+			do
+				mkdir -p ${fs}$dir
+			done
+
 			# EXPERIMENTAL: Glibc is cross compiled by cross to have a
 			# toolchain so we can use these files instead of recooking it.
 			echo "Using cross compiled Glibc..."
@@ -105,13 +111,41 @@
 			sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libc.so
 			sed -i s"|/usr/cross/$ARCH||"g $fs/lib/libpthread.so ;;
 		*)
-			# Copy all files specified in stuff/files.list. We get the files
-			# from glibc package.
-			for file in $(cat $stuff/wanted-files.list)
-			do
-				cp -a ${install}$file ${fs}$file
-			done
-			get_locales "usr/share"
+			cook_copy_files \
+				ld-*.so*            ld.so*            \
+				libanl-*.so*        libanl.so*        \
+				libc-*.so*          libc.so*          \
+				libcrypt-*.so*      libcrypt.so*      \
+				libdl-*.so*         libdl.so*         \
+				libm-*.so*          libm.so*          \
+				libnsl-*.so*        libnsl.so*        \
+				libnss_compat-*.so* libnss_compat.so* \
+				libnss_dns-*.so*    libnss_dns.so*    \
+				libnss_files-*.so*  libnss_files.so*  \
+				libpthread-*.so*    libpthread.so*    \
+				libresolv-*.so*     libresolv.so*     \
+				librt-*.so*         librt.so*         \
+				libthread_db-*.so*  libthread_db.so*  \
+				libutil-*.so*       libutil.so*       \
+				\
+				UNICODE.so gconv-modules ANSI_X3.110.so ISO8859-1.so \
+				ISO8859-15.so UTF-16.so CP1252.so IBM437.so IBM850.so \
+				\
+				i18n iso14651_t1 iso14651_t1_common translit_neutral \
+				translit_combining translit_circle translit_cjk_compat \
+				translit_compat translit_font translit_fraction translit_narrow \
+				translit_small translit_wide \
+				\
+				locale localedef locale.alias UTF-8.gz UTC rpc \
+				$DEFAULT_LOCALE
+
+#			# Copy all files specified in stuff/files.list. We get the files
+#			# from glibc package.
+#			for file in $(cat $stuff/wanted-files.list)
+#			do
+#				cp -a ${install}$file ${fs}$file
+#			done
+#			get_locales "usr/share"
 	esac
 }
 
diff -r 792674d97726 -r c963361d3d54 glibc-dev/receipt
--- a/glibc-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/glibc-dev/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-dev"
-VERSION="2.14.1"
+VERSION="2.24"
 CATEGORY="development"
 SHORT_DESC="The GNU C libraries devel files (Part of SliTaz toolchain)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WANTED="glibc"
 WEB_SITE="http://www.gnu.org/software/libc/"
 
+WANTED="glibc"
 DEPENDS="glibc-base"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -17,26 +17,22 @@
 #
 genpkg_rules()
 {
-    # Mass copy and then remove all files specified in stuff/base-files.list.
-    # We get the files from glibc-base. Locale files are in: glibc-locale.
-    cp -a $install/* $fs
-    
-    # Rm base files.
-    echo -n "Removing all base files..."
-    for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list`
-    do
-    	rm -f ${fs}$file
-    done
-    rm -rf $fs/etc
-    rm -rf $fs/usr/share
-    status
-    
-    # Rm locale.
-    echo -n "Removing all locale files..."
-    for file in `cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list`
-    do
-    	rm -f ${fs}$file
-    done
-    rm -rf $fs/usr/lib/gconv
-    status
+	# Mass copy and then remove all files specified in stuff/base-files.list.
+	# We get the files from glibc-base. Locale files are in: glibc-locale.
+	cp -a $install/* $fs
+
+	action "Removing all glibc-base files..."
+	for file in $(cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list); do
+		rm -f ${fs}$file
+	done
+	rm -rf $fs/etc
+	rm -rf $fs/usr/share
+	status
+
+	action "Removing all glibc-locale files..."
+	for file in $(cat $WOK/glibc-locale/taz/glibc-locale-$VERSION/files.list); do
+		rm -f ${fs}$file
+	done
+	rm -rf $fs/usr/lib/gconv
+	status
 }
diff -r 792674d97726 -r c963361d3d54 glibc-locale/receipt
--- a/glibc-locale/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/glibc-locale/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,45 +1,36 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc-locale"
-VERSION="2.14.1"
+VERSION="2.24"
 CATEGORY="system-tools"
 SHORT_DESC="The GNU C libraries locale files and utilities (see also locale-*)."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/libc/"
 
+WANTED="glibc"
 DEPENDS="glibc-base"
-WANTED="glibc"
-
-LOCALE_PACK="cs de es fr hu id it pt ru sl zh_CN zh_TW"
+BUILD_DEPENDS="slitaz-i18n"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share $fs/usr/lib $fs/usr/bin
-
-	cp -a $install/usr/lib/gconv $fs/usr/lib
-	cp -a $install/usr/share/locale $fs/usr/share
-	cp -a $install/usr/share/i18n $fs/usr/share
-	cp -a $install/usr/share/zoneinfo $fs/usr/share
-
-	# Utilities and tools
-	cp -a $install/usr/bin/iconv $fs/usr/bin
-	cp -a $install/usr/bin/tzselect $fs/usr/bin
+	cook_copy_folders gconv locale i18n
+	cook_copy_files iconv tzselect
 
 	# Rm base files.
-	echo -n "* Removing all base files..."
-	for file in `cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list`
-	do
+	action "* Removing all base files..."
+	for file in $(cat $WOK/glibc-base/taz/glibc-base-$VERSION/files.list); do
 		rm -f ${fs}$file
 	done
 	status
 
 	# Rm files provided by locale-pack.
-	for i in $LOCALE_PACK
-	do
-		echo -n "* Removing locale: $i"
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
+	echo -n "* Removing locale: "
+	for i in $LOCALE_PACK; do
+		echo -n "$i "
 		rm -rf $fs/usr/share/locale/$i
-		status
 	done
+	status
 }
diff -r 792674d97726 -r c963361d3d54 glibc/receipt
--- a/glibc/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/glibc/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,17 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="glibc"
-VERSION="2.14.1"
+VERSION="2.24"
 CATEGORY="meta"
 SHORT_DESC="The GNU C libraries. This package is used to compile the libc."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnu.org/software/libc/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/libc/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 DEPENDS="glibc-base glibc-locale glibc-dev"
-BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp"
+BUILD_DEPENDS="linux-api-headers autoconf bash advancecomp  \
+gawk gettext-tools bison"
 
 # Genpkg order for tazwok.
 COOK_OPT="genpkg=glibc-base:glib-locale:glibc-dev"
@@ -19,19 +21,14 @@
 # Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain()
 {
-	cd $src
-	
-	# Glibc Bug Fixes Patch from LFS
-	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
-	# Glibc Bug Sort Relocatable Objects Patch
-	patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
-	# Fix a bug that prevents Glibc from building with GCC-4.6.2
-	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
-	# GHOST
-	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
-
-	# Build in a separate directory.
-	mkdir ../glibc-build && cd ../glibc-build
+#	# Glibc Bug Fixes Patch from LFS
+#	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
+#	# Glibc Bug Sort Relocatable Objects Patch
+#	patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
+#	# Fix a bug that prevents Glibc from building with GCC-4.6.2
+#	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
+#	# GHOST
+#	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
 
 	# glibc no longer support i386, so use -march=i486 for better compatibility.
 	# If i686 ???
@@ -43,14 +40,22 @@
 			echo "CFLAGS += -O2 -march=$ARCH -mtune=$ARCH" > configparms ;;
 	esac
 
-	{ $src/configure \
-		--host=$HOST_SYSTEM \
-		--build=$($src/scripts/config.guess) \
-		--disable-profile --enable-add-ons \
-		--enable-kernel=2.6.30 --with-headers=/tools/include \
-		libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes &&
-	make -j1 &&
-	make install
+	{
+		# Build in a separate directory.
+		mkdir glibc-build
+		cd    glibc-build
+
+		../configure \
+			--host=$HOST_SYSTEM \
+			--build=$($src/scripts/config.guess) \
+			--disable-profile \
+			--enable-add-ons \
+			--enable-kernel=2.6.32 \
+			--with-headers=/tools/include \
+			libc_cv_forced_unwind=yes \
+			libc_cv_c_cleanup=yes &&
+		make -j1 &&
+		make install
 	} || return 1
 
 	# Link compiler to this new glibc.
@@ -64,49 +69,50 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	# SliTaz is a Busybox based OS, why we so small and fast. Using gawk by
-	# default to build package will not ensure package work with Busybox awk
-	# and so should NOT be use to cook.
-	if [ -x /usr/bin/cook ]; then
-		[ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk
-	fi
+#	# SliTaz is a Busybox based OS, why we so small and fast. Using gawk by
+#	# default to build package will not ensure package work with Busybox awk
+#	# and so should NOT be use to cook.
+#	if [ -x /usr/bin/cook ]; then
+#		[ -d "/var/lib/tazpkg/installed/gawk" ] || tazpkg get-install gawk
+#	fi
 
-	# Make 4.x support...
-	sed -i 's/3\.79/4.* | &/' configure*
-	# Fixes and patches from LFS, Redhat
-	sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl
-	sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
+#	# Make 4.x support...
+#	sed -i 's/3\.79/4.* | &/' configure*
+#	# Fixes and patches from LFS, Redhat
+#	sed -i -e 's/"db1"/& \&\& $name ne "nss_test1"/' scripts/test-installation.pl
+#	sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in
 
-	# Glibc misc Bug Fixes
-	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
-	
-	# Glibc Bug Sort Relocatable Objects Patch
-	#patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
-	
-	# Fix a bug that prevents Glibc from building with GCC-4.6.2
-	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
-	
-	# Revert commit causing issues with crappy DNS servers
-	patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch
-	
-	# re-export RPC interface until libtirpc is ready as a replacement
-	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
-	patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch
-	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
-	patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch
-	# GHOST
-	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
+#	# Glibc misc Bug Fixes
+#	patch -Np1 -i $stuff/glibc-2.14.1-fixes-1.patch
 
-	# Fix a stack imbalance that occurs under some conditions:
-	sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
-		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S \
-		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
+#	# Glibc Bug Sort Relocatable Objects Patch
+#	#patch -Np1 -i $stuff/glibc-2.14.1-sort-1.patch
+
+#	# Fix a bug that prevents Glibc from building with GCC-4.6.2
+#	patch -Np1 -i $stuff/glibc-2.14.1-gcc_fix-1.patch
+
+#	# Revert commit causing issues with crappy DNS servers
+#	patch -Np1 -i $stuff/glibc-2.14-revert-4768ae77.patch
+
+#	# re-export RPC interface until libtirpc is ready as a replacement
+#	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
+#	patch -Np1 -i $stuff/glibc-2.14-reexport-rpc-interface.patch
+#	# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
+#	patch -Np1 -i $stuff/glibc-2.14-reinstall-nis-rpc-headers.patch
+#	# GHOST
+#	patch -Np1 -i $stuff/glibc-2.14.1-CVE-2015-0235.patch
+
+#	# Fix a stack imbalance that occurs under some conditions:
+#	sed -i '195,213 s/PRIVATE_FUTEX/FUTEX_CLOCK_REALTIME/' \
+#		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S \
+#		nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
 
 	# Glibc needs ld.so.conf in the install destdir.
 	mkdir -p $WOK/$PACKAGE/install/etc
-	touch $WOK/$PACKAGE/install/etc/ld.so.conf
-	mkdir ../glibc-build && cd ../glibc-build
-	
+	touch    $WOK/$PACKAGE/install/etc/ld.so.conf
+
+#	mkdir ../glibc-build && cd ../glibc-build
+
 	# Read the INSTALL file in glibc. Also Glibc dont build with -Os flag.
 	# --enale-kernel use latest SliTaz Kernel version. From Glibc INSTALL:
 	# "The higher the VERSION number is, the less compatibility code is
@@ -118,16 +124,24 @@
 		*)
 			echo "CFLAGS += -O2 -march=$ARCH -mtune=$ARCH" > configparms ;;
 	esac
-	{ $src/configure \
-		--disable-profile \
-		--enable-add-ons \
-		--enable-kernel=2.6.30 \
-		--libexecdir=/usr/lib/glibc \
-		--build=$HOST_SYSTEM \
-		--host=$HOST_SYSTEM \
-		--target=$BUILD_SYSTEM &&
-	make -j1 && make install_root=$DESTDIR install
+
+	# Glibc FHS Patch - LFS 7.10
+	patch -p1 -i $stuff/glibc-2.24-fhs-1.patch
+
+	{
+		mkdir build
+		cd    build
+		$src/configure \
+			--disable-profile \
+			--enable-add-ons \
+			--enable-kernel=2.6.32 \
+			--libexecdir=/usr/lib/glibc \
+			--build=$HOST_SYSTEM \
+			--host=$HOST_SYSTEM \
+			--target=$BUILD_SYSTEM &&
+		make -j1 && make install_root=$DESTDIR install
 	} || return 1
+
 	for i in $DESTDIR/usr/share/i18n/charmaps/*.gz ; do
 		advdef -z4 $i
 	done
@@ -150,10 +164,10 @@
 	LOCALE=""
 	mkdir -p $fs/var
 
-	# Remove build directory.
-	rm -rf $WOK/$PACKAGE/source/$PACKAGE-build
-	rm -rf $WOK/$PACKAGE/$PACKAGE-build
+#	# Remove build directory.
+#	rm -rf $WOK/$PACKAGE/source/$PACKAGE-build
+#	rm -rf $WOK/$PACKAGE/$PACKAGE-build
 
 	# check install
-	ls $install/lib/
+	ls $install/lib/ | tr '\n' ' ' | fold -s
 }
diff -r 792674d97726 -r c963361d3d54 glibc/stuff/glibc-2.24-fhs-1.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/glibc/stuff/glibc-2.24-fhs-1.patch	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,72 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-02-11
+Initial Package Version: 2.17
+Upstream Status:         Not Applicable
+Origin:                  Self
+Description:             This patch removes references to /var/db directory which is not part
+                         of FHS and replaces them with more suitable directories in /var
+                         hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.
+
+--- a/Makeconfig	2012-12-25 04:02:13.000000000 +0100
++++ b/Makeconfig	2013-02-11 01:32:32.500667439 +0100
+@@ -250,7 +250,7 @@
+ 
+ # Directory for the database files and Makefile for nss_db.
+ ifndef vardbdir
+-vardbdir = $(localstatedir)/db
++vardbdir = $(localstatedir)/lib/nss_db
+ endif
+ inst_vardbdir = $(install_root)$(vardbdir)
+ 
+--- a/nscd/nscd.h	2012-12-25 04:02:13.000000000 +0100
++++ b/nscd/nscd.h	2013-02-11 01:32:32.500667439 +0100
+@@ -112,11 +112,11 @@
+ 
+ 
+ /* Paths of the file for the persistent storage.  */
+-#define _PATH_NSCD_PASSWD_DB	"/var/db/nscd/passwd"
+-#define _PATH_NSCD_GROUP_DB	"/var/db/nscd/group"
+-#define _PATH_NSCD_HOSTS_DB	"/var/db/nscd/hosts"
+-#define _PATH_NSCD_SERVICES_DB	"/var/db/nscd/services"
+-#define _PATH_NSCD_NETGROUP_DB	"/var/db/nscd/netgroup"
++#define _PATH_NSCD_PASSWD_DB	"/var/cache/nscd/passwd"
++#define _PATH_NSCD_GROUP_DB	"/var/cache/nscd/group"
++#define _PATH_NSCD_HOSTS_DB	"/var/cache/nscd/hosts"
++#define _PATH_NSCD_SERVICES_DB	"/var/cache/nscd/services"
++#define _PATH_NSCD_NETGROUP_DB	"/var/cache/nscd/netgroup"
+ 
+ /* Path used when not using persistent storage.  */
+ #define _PATH_NSCD_XYZ_DB_TMP	"/var/run/nscd/dbXXXXXX"
+--- a/nss/db-Makefile	2012-12-25 04:02:13.000000000 +0100
++++ b/nss/db-Makefile	2013-02-11 01:32:32.500667439 +0100
+@@ -22,7 +22,7 @@
+ 		       /etc/rpc /etc/services /etc/shadow /etc/gshadow \
+ 		       /etc/netgroup)
+ 
+-VAR_DB = /var/db
++VAR_DB = /var/lib/nss_db
+ 
+ AWK = awk
+ MAKEDB = makedb --quiet
+--- a/sysdeps/generic/paths.h	2012-12-25 04:02:13.000000000 +0100
++++ b/sysdeps/generic/paths.h	2013-02-11 01:32:32.500667439 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define	_PATH_DEV	"/dev/"
+ #define	_PATH_TMP	"/tmp/"
+-#define	_PATH_VARDB	"/var/db/"
++#define	_PATH_VARDB	"/var/lib/nss_db/"
+ #define	_PATH_VARRUN	"/var/run/"
+ #define	_PATH_VARTMP	"/var/tmp/"
+ 
+--- a/sysdeps/unix/sysv/linux/paths.h	2012-12-25 04:02:13.000000000 +0100
++++ b/sysdeps/unix/sysv/linux/paths.h	2013-02-11 01:32:32.504000831 +0100
+@@ -68,7 +68,7 @@
+ /* Provide trailing slash, since mostly used for building pathnames. */
+ #define	_PATH_DEV	"/dev/"
+ #define	_PATH_TMP	"/tmp/"
+-#define	_PATH_VARDB	"/var/db/"
++#define	_PATH_VARDB	"/var/lib/nss_db/"
+ #define	_PATH_VARRUN	"/var/run/"
+ #define	_PATH_VARTMP	"/var/tmp/"
+ 
diff -r 792674d97726 -r c963361d3d54 libform/receipt
--- a/libform/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libform"
-VERSION="5.9"
-CATEGORY="development"
-SHORT_DESC="Curses extension for programming forms"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
-
-DEPENDS="ncurses libtinfo"
-WANTED="ncurses"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib
-	cp -a $install/lib/libform.so* $fs/lib
-}
diff -r 792674d97726 -r c963361d3d54 libgfortran/receipt
--- a/libgfortran/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/libgfortran/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,12 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="libgfortran"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="misc"
 SHORT_DESC="GCC fortran runtime."
 WEB_SITE="http://gcc.gnu.org/"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+
 WANTED="gcc"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 792674d97726 -r c963361d3d54 libgomp/receipt
--- a/libgomp/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/libgomp/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,17 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="libgomp"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="development"
 SHORT_DESC="API specification for parallel programming."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
+
 WANTED="gcc"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p  $fs/usr/lib
-    cp -a $install/usr/lib/libgomp.so* $fs/usr/lib
+	mkdir -p  $fs/usr/lib
+	cp -a $install/usr/lib/libgomp.so* $fs/usr/lib
 }
diff -r 792674d97726 -r c963361d3d54 libmagic-dev/receipt
--- a/libmagic-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/libmagic-dev/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,22 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="libmagic-dev"
-VERSION="5.24"
+VERSION="5.28"
 CATEGORY="development"
 SHORT_DESC="File type determination library using 'magic' numbers (development)"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.darwinsys.com/file/"
-WANTED="file"
 HOST_ARCH="i486 arm"
 
+WANTED="file"
 DEPENDS="libmagic"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.la $fs/usr/lib
-	cp -a $install/usr/include $fs/usr
+	cook_copy_files *.h *.la
 }
-
diff -r 792674d97726 -r c963361d3d54 libmagic/receipt
--- a/libmagic/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/libmagic/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,20 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="libmagic"
-VERSION="5.24"
+VERSION="5.28"
 CATEGORY="system-tools"
 SHORT_DESC="File type determination library using 'magic' numbers"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.darwinsys.com/file/"
-WANTED="file"
 HOST_ARCH="i486 arm"
 
+WANTED="file"
 DEPENDS="zlib"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cook_copy_files *.so*
 }
diff -r 792674d97726 -r c963361d3d54 libmenu/receipt
--- a/libmenu/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libmenu"
-VERSION="5.9"
-CATEGORY="development"
-SHORT_DESC="Curses extension for programming menus"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
-
-DEPENDS="ncurses libtinfo"
-WANTED="ncurses"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib
-	cp -a $install/lib/libmenu.so* $fs/lib
-}
diff -r 792674d97726 -r c963361d3d54 libobjc/receipt
--- a/libobjc/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/libobjc/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,12 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="libobjc"
-VERSION="4.6.3"
+VERSION="6.2.0"
 CATEGORY="development"
 SHORT_DESC="API for gcc object"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
+
 DEPENDS="gcc-lib-base"
 WANTED="gcc"
 
@@ -16,4 +17,3 @@
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/libobjc.so* $fs/usr/lib
 }
-
diff -r 792674d97726 -r c963361d3d54 libpanel/description.txt
--- a/libpanel/description.txt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-libpanel - panel stack extension for curses
-
-Panels are **curses** windows with the added feature of depth. Panel functions
-allow the use of stacked windows and ensure the proper portions of each window
-and the curses **stdscr** window are hidden or displayed when panels are added,
-moved, modified or removed. The set of currently visible panels is the stack of
-panels. The **stdscr** window is beneath all panels, and is not considered part
-of the stack.
diff -r 792674d97726 -r c963361d3d54 libpanel/receipt
--- a/libpanel/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libpanel"
-VERSION="5.9"
-CATEGORY="development"
-SHORT_DESC="Panel stack extension for curses"
-MAINTAINER="al.bobylev@gmail.com"
-LICENSE="MIT"
-WEB_SITE="http://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
-
-DEPENDS="ncurses libtinfo"
-WANTED="ncurses"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib
-	cp -a $install/lib/libpanel.so* $fs/lib
-}
diff -r 792674d97726 -r c963361d3d54 linux-api-headers/receipt
--- a/linux-api-headers/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/linux-api-headers/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,23 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="linux-api-headers"
-VERSION="3.2.71"
-KBASEVER="${VERSION:0:3}"
+VERSION="4.7.2"
+#KBASEVER="${VERSION:0:3}"
 CATEGORY="development"
 SHORT_DESC="Kernel headers sanitized for use in userspace."
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SOURCE="linux"
-TARBALL="$SOURCE-$KBASEVER.tar.xz"
-WEB_SITE="http://www.kernel.org/"
-WGET_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$TARBALL"
+WEB_SITE="https://www.kernel.org/"
+
+TARBALL="$SOURCE-$VERSION.tar.xz"
+WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL"
+
 PROVIDE="linux-headers linux64-api-headers linux64-headers"
+BUILD_DEPENDS="bash libtinfo"
 
-BUILD_DEPENDS="bash wget"
-
-[ "$KBASEVER" != "$VERSION" ] && 
-PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" &&
-EXTRA_SOURCE_FILES="$(basename $PATCH)"
+#[ "$KBASEVER" != "$VERSION" ] &&
+#PATCH="$(dirname $WGET_URL)/patch-$VERSION.xz" &&
+#EXTRA_SOURCE_FILES="$(basename $PATCH)"
 
 # Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain()
@@ -32,14 +33,14 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	
-	if [ "$KBASEVER" != "$VERSION" ]; then
-		[ -s $SRC/$(basename $PATCH) ] ||
-		wget --no-check-certificate $PATCH -O $SRC/$(basename $PATCH)
-		xzcat $SRC/$(basename $PATCH) | patch -Np1
-		touch done.patch-$VERSION
-	fi
+#	cd $src
+#	
+#	if [ "$KBASEVER" != "$VERSION" ]; then
+#		[ -s $SRC/$(basename $PATCH) ] ||
+#		wget --no-check-certificate $PATCH -O $SRC/$(basename $PATCH)
+#		xzcat $SRC/$(basename $PATCH) | patch -Np1
+#		touch done.patch-$VERSION
+#	fi
 
 	make mrproper &&
 	make headers_check &&
diff -r 792674d97726 -r c963361d3d54 ncurses-dev/receipt
--- a/ncurses-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/ncurses-dev/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,24 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-dev"
-VERSION="5.9"
+VERSION="6.0"
 CATEGORY="development"
-SHORT_DESC="Devel files for the ncurses library."
+SHORT_DESC="Library of functions to manage display on terminals (development files)"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WANTED="ncurses"
-WEB_SITE="http://invisible-island.net/ncurses/"
+WEB_SITE="https://www.gnu.org/software/ncurses/"
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncursesw-dev ncurses libtinfo"
+WANTED="ncurses"
+DEPENDS="ncurses ncurses-extra ncurses-libform ncurses-libmenu ncurses-libpanel"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
-	cp -a $install/lib/*.a $fs/lib
-	# Use include file from ncursesw-dev
-	#cp -a $install/usr/include $fs/usr
-	cp $install/usr/bin/ncurses5-config $fs/usr/bin
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cook_copy_files ncursesw6-config *.h *.a *.pc
 }
diff -r 792674d97726 -r c963361d3d54 ncurses-extra/receipt
--- a/ncurses-extra/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/ncurses-extra/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,30 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-extra"
-VERSION="5.9"
+VERSION="6.0"
 CATEGORY="base-system"
 SHORT_DESC="Extra files for the ncurses library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://invisible-island.net/ncurses/"
+HOST_ARCH="i486 arm"
+
 WANTED="ncurses"
-WEB_SITE="http://invisible-island.net/ncurses/"
-
 DEPENDS="ncurses"
+BUILD_DEPENDS="ncurses-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share
-	# Binaries are provided by ncursesw-extra, we use UTF-8 by default.
-	#cp -a $install/usr/bin $fs/usr
-	#chmod 755 $fs/usr/bin/*
-	cp -a $install/usr/share/terminfo $fs/usr/share
-	# Remove already provided by other packages
-	#rm -f $fs/usr/bin/ncurses5-config
-	[ -d $WOK/ncurses-common/taz ] || tazwok genpkg ncurses-common
-	for i in $(cd $fs ; find -type f); do
-		[ -f $WOK/ncurses-common/taz/ncurses-common-$VERSION/fs/$i ] || continue
-		rm -f $fs/$i
-		rmdir $(dirname $fs/$i) 2> /dev/null
-	done
+	cook_copy_folders bin terminfo
+
+	# Split ncurses package
+	cook_split_rm ncurses ncurses-dev
 }
diff -r 792674d97726 -r c963361d3d54 ncurses-libform/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncurses-libform/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="ncurses-libform"
+VERSION="6.0"
+CATEGORY="libs"
+SHORT_DESC="Curses extension for programming forms"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/"
+HOST_ARCH="i486 arm"
+
+DEPENDS="ncurses libtinfo"
+WANTED="ncurses"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libformw.so*
+}
diff -r 792674d97726 -r c963361d3d54 ncurses-libmenu/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncurses-libmenu/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="ncurses-libmenu"
+VERSION="6.0"
+CATEGORY="libs"
+SHORT_DESC="Curses extension for programming menus"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/"
+HOST_ARCH="i486 arm"
+
+DEPENDS="ncurses libtinfo"
+WANTED="ncurses"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libmenuw.so*
+}
diff -r 792674d97726 -r c963361d3d54 ncurses-libpanel/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncurses-libpanel/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,8 @@
+libpanel - panel stack extension for curses
+
+Panels are **curses** windows with the added feature of depth. Panel functions
+allow the use of stacked windows and ensure the proper portions of each window
+and the curses **stdscr** window are hidden or displayed when panels are added,
+moved, modified or removed. The set of currently visible panels is the stack of
+panels. The **stdscr** window is beneath all panels, and is not considered part
+of the stack.
diff -r 792674d97726 -r c963361d3d54 ncurses-libpanel/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncurses-libpanel/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="ncurses-libpanel"
+VERSION="6.0"
+CATEGORY="libs"
+SHORT_DESC="Panel stack extension for curses"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/"
+HOST_ARCH="i486 arm"
+
+DEPENDS="ncurses libtinfo"
+WANTED="ncurses"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_files libpanelw.so*
+}
diff -r 792674d97726 -r c963361d3d54 ncurses-man/receipt
--- a/ncurses-man/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ncurses-man"
-VERSION="5.9"
-CATEGORY="development"
-SHORT_DESC="Manual pages for the ncurses library."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="MIT"
-WANTED="ncurses"
-WEB_SITE="http://invisible-island.net/ncurses/"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/man $fs/usr/share
-}
diff -r 792674d97726 -r c963361d3d54 ncurses/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ncurses/description.txt	Fri Dec 16 01:16:56 2016 +0200
@@ -0,0 +1,9 @@
+The ncurses library routines are a terminal-independent method of updating
+character screens with reasonable optimization.
+
+This package contains:
+
+  * `tset` (and `reset`) - terminal initialization utility
+  * `clear` - clears the terminal's screen
+  * `libncursesw.so` - shared library for terminal handling
+  * tabset and terminfo for common terminals
diff -r 792674d97726 -r c963361d3d54 ncurses/receipt
--- a/ncurses/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/ncurses/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,48 +1,47 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses"
-VERSION="5.9"
+VERSION="6.0"
 CATEGORY="base-system"
 SHORT_DESC="Library of functions to manage display on terminals."
 MAINTAINER="pankso@slitaz.org"
+LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-LICENSE="MIT"
-WEB_SITE="http://invisible-island.net/ncurses/"
-WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
+WGET_URL="http://ftp.gnu.org/gnu/ncurses/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncurses-common libtinfo libtic"
-BUILD_DEPENDS=""
-SPLIT="ncurses-common ncurses-extra ncurses-dev ncurses-man libform libmenu \
-libpanel libtic libtinfo"
+DEPENDS=""
+BUILD_DEPENDS="flex"
+SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra"
+
+case "$ARCH" in
+	arm) BUILD_DEPENDS="" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
-	# when cross compiling we can't use the freshly cooked binary. See cook log:
-	#
-	#** Building terminfo database, please wait...
-	#Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo
-	#
-	if [ ! -d "/var/lib/tazpkg/installed/ncursesw-extra" ]; then
-		echo "Installing: ncursesw-extra"
-		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
-	fi
-	cd $src
-	mkdir -p $DESTDIR/usr/lib/terminfo
-	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
-		include/Makefile.in
+#	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
+#	# when cross compiling we can't use the freshly cooked binary. See cook log:
+#	#
+#	#** Building terminfo database, please wait...
+#	#Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo
+#	#
+#	if [ ! -d "/var/lib/tazpkg/installed/ncursesw-extra" ]; then
+#		echo "Installing: ncursesw-extra"
+#		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
+#	fi
+
 	./configure \
-		--libdir=/lib \
-		--sysconfdir=/etc \
 		--with-shared \
 		--without-debug \
 		--without-ada \
+		--enable-widec \
 		--with-build-cc="gcc -D_GNU_SOURCE" \
-		--with-termlib \
-		--with-ticlib \
 		--enable-pc-files \
+		--with-pkg-config-libdir=/usr/lib/pkgconfig \
 		$CONFIGURE_ARGS &&
 	make && make install
 }
@@ -50,6 +49,20 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/lib
-    cp -a $install/lib/libncurses.so* $fs/lib
+	# binaries and library
+	cook_copy_files clear tset reset libncursesw.so*
+
+	# tabset
+	cook_copy_folders tabset
+
+	# terminfo
+	cook_copy_files ansi linux rxvt vt100 vt102* xterm xterm-256color \
+		xterm-color xterm-new xterm-vt220
 }
+
+post_remove()
+{
+	# restore Busybox applet links
+	ln -s /bin/busybox $root/usr/bin/clear
+	ln -s /bin/busybox $root/usr/bin/reset
+}
diff -r 792674d97726 -r c963361d3d54 ncursesw-dev/receipt
--- a/ncursesw-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ncursesw-dev"
-VERSION="5.9"
-CATEGORY="development"
-SHORT_DESC="Devel files for the ncursesw library."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-WANTED="ncursesw"
-WEB_SITE="http://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
-
-DEPENDS="ncursesw"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
-	cp -a $install/lib/*.a $fs/lib
-	# Include files are from the same source than ncuses-dev and work
-	# nicely for both.
-	cp -a $install/usr/include $fs/usr
-	cp $install/usr/bin/ncursesw5-config $fs/usr/bin
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-}
diff -r 792674d97726 -r c963361d3d54 ncursesw-extra/receipt
--- a/ncursesw-extra/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ncursesw-extra"
-VERSION="5.9"
-CATEGORY="base-system"
-SHORT_DESC="Extra files for the ncursesw library."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="MIT"
-WANTED="ncursesw"
-DEPENDS="ncursesw ncurses-extra"
-WEB_SITE="http://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	chmod 755 $fs/usr/bin/*
-	# Remove tools already provided by other packages
-	rm -f $fs/usr/bin/ncursesw5-config
-	rm -f $fs/usr/bin/clear
-	rm -f $fs/usr/bin/tset
-	rm -f $fs/usr/bin/reset
-}
diff -r 792674d97726 -r c963361d3d54 ncursesw/receipt
--- a/ncursesw/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="ncursesw"
-VERSION="5.9"
-SOURCE="ncurses"
-CATEGORY="base-system"
-SHORT_DESC="Library of functions to manage display on terminals."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://invisible-island.net/ncurses/"
-WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
-HOST_ARCH="i486 arm"
-
-DEPENDS="ncurses-common"
-BUILD_DEPENDS="gcc"
-
-case "$ARCH" in
-	arm) BUILD_DEPENDS="" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
-	# when cross compiling we can't use the freshly cooked binary. See cook log:
-	#
-	#** Building terminfo database, please wait...
-	#Running /usr/bin/tic to install /home/slitaz/wok/ncurses/install/usr/share/terminfo
-	#
-	if [ ! -d "/var/lib/tazpkg/installed/ncursesw-extra" ]; then
-		echo "Installing: ncursesw-extra"
-		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
-	fi
-	cd $src
-	mkdir -p $DESTDIR/usr/lib/terminfo
-	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
-		include/Makefile.in
-	./configure \
-		--libdir=/lib \
-		--sysconfdir=/etc \
-		--with-shared \
-		--without-debug \
-		--without-ada \
-		--enable-widec \
-		--with-build-cc="gcc -D_GNU_SOURCE" \
-		--enable-pc-files \
-		$CONFIGURE_ARGS &&
-	make && make install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib $fs/usr/bin
-
-	# Libs.
-	cp -a $install/lib/libncursesw.so* $fs/lib
-
-	# Base progs.
-	cp $install/usr/bin/clear $fs/usr/bin
-	cp $install/usr/bin/tset $fs/usr/bin
-	cp $install/usr/bin/reset $fs/usr/bin
-}
-
-# Overlap busybox
-pre_install()
-{
-	rm -f $root/usr/bin/clear
-	rm -f $root/usr/bin/reset
-}
-
-post_remove()
-{
-	ln -s /bin/busybox $root/usr/bin/clear
-	ln -s /bin/busybox $root/usr/bin/reset
-}
diff -r 792674d97726 -r c963361d3d54 python-magic/receipt
--- a/python-magic/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/python-magic/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,20 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="python-magic"
-VERSION="5.24"
+VERSION="5.28"
 CATEGORY="development"
 SHORT_DESC="File type determination library using 'magic' numbers (Python bindings)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.darwinsys.com/file/"
+
 WANTED="file"
-
 DEPENDS="file python"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/python* $fs/usr/lib
+	cook_copy_folders python*
 }
-
diff -r 792674d97726 -r c963361d3d54 readline-dev/receipt
--- a/readline-dev/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/readline-dev/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -3,18 +3,16 @@
 PACKAGE="readline-dev"
 VERSION="6.3"
 CATEGORY="development"
-SHORT_DESC="GNU readline devel files."
+SHORT_DESC="The GNU Readline Library (development files)"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
-WANTED="readline"
 WEB_SITE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 HOST_ARCH="i486 arm"
 
+WANTED="readline"
+
 # 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
+	cook_copy_files *.h *.a
 }
-
diff -r 792674d97726 -r c963361d3d54 readline/receipt
--- a/readline/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/readline/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -6,13 +6,14 @@
 SHORT_DESC="GNU readline."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS=""
-BUILD_DEPENDS="ncursesw-dev"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+
+DEPENDS="ncurses"
+BUILD_DEPENDS="ncurses-dev flex"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -20,17 +21,20 @@
 	case "$ARCH" in
 		arm*) export bash_cv_wcwidth_broken=true ;;
 	esac
-	cd $src
+
 	patch -Np1 -i $stuff/readline-6.3-upstream_fixes-3.patch
 	sed -i '/(MV)/d' Makefile*
-	./configure $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+
+	./configure \
+		--enable-multibyte \
+		--with-curses \
+		$CONFIGURE_ARGS &&
+	make SHLIB_LIBS=-lncursesw &&
+	make DESTDIR=$install install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+	cook_copy_files *.so*
 }
-
diff -r 792674d97726 -r c963361d3d54 slitaz-toolchain/receipt
--- a/slitaz-toolchain/receipt	Wed Dec 14 21:23:06 2016 +0100
+++ b/slitaz-toolchain/receipt	Fri Dec 16 01:16:56 2016 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slitaz-toolchain"
-VERSION="5.0"
+VERSION="6.0"
 CATEGORY="meta"
 SHORT_DESC="SliTaz meta package to rebuild or install current toolchain."
 MAINTAINER="pankso@slitaz.org"
@@ -76,17 +76,17 @@
 	gcc -v 2>> $tmplog
 
 	# All packages cooked got ther own log so we dont keep them.
-	separator >> $tmplog && echo "" >> $tmplog
-	mv -f $tmplog $LOGS/$PACKAGE.log 
+	separator >> $tmplog; echo "" >> $tmplog
+	mv -f $tmplog $LOGS/$PACKAGE.log
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	binutils=$(grep ^VERSION $WOK/binutils/receipt | cut -d '"' -f 2)
-	linux=$(grep ^VERSION $WOK/linux/receipt | cut -d '"' -f 2)
-	gcc=$(grep ^VERSION $WOK/gcc/receipt | cut -d '"' -f 2)
-	glibc=$(grep ^VERSION $WOK/glibc/receipt | cut -d '"' -f 2)
+	   linux=$(grep ^VERSION $WOK/linux-api-headers/receipt | cut -d '"' -f 2)
+	     gcc=$(grep ^VERSION $WOK/gcc/receipt      | cut -d '"' -f 2)
+	   glibc=$(grep ^VERSION $WOK/glibc/receipt    | cut -d '"' -f 2)
 	
 	mkdir -p $fs/usr/share/doc/slitaz
 	cat > $fs/usr/share/doc/slitaz/toolchain.txt << EOT
@@ -100,10 +100,10 @@
 
 Packages:
 
-    * Binutils $binutils
-    * Linux API headers $linux
-    * GCC $gcc
-    * Glibc $glibc
+  * Binutils $binutils
+  * Linux API headers $linux
+  * GCC $gcc
+  * Glibc $glibc
 
 Toolchain documentation: http://doc.slitaz.org/en:cookbook:toolchain