# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1451049826 -7200
# Node ID 6fab3264ba87b31ca8ad540c3fe6b7524c76a70d
# Parent  df142a9e8a30a3da17aa6f2d01e64246ad521bbf
Finish to remove redundant messages 'Processing * commands...'; KISS get-msttcorefonts; add get-msttcorefonts2

diff -r df142a9e8a30 -r 6fab3264ba87 bzip2/receipt
--- a/bzip2/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/bzip2/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -50,15 +50,6 @@
 	ln -s bzip2 bzcat
 }
 
-# Remove Busybox symlinks before installing
-pre_install()
-{
-	echo "Processing post-install commands..."
-	rm -f $root/usr/bin/bunzip2
-	rm -f $root/usr/bin/bzcat
-	#rm -f $root/usr/bin/bzip2
-}
-
 # Restore Busybox symlinks upon removal
 post_remove()
 {
diff -r df142a9e8a30 -r 6fab3264ba87 caja/receipt
--- a/caja/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/caja/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -21,7 +21,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                           \
+	./autogen.sh                       \
 		--prefix=/usr                  \
 		--libexecdir=/usr/lib/$PACKAGE \
 		--enable-introspection         \
@@ -54,16 +54,3 @@
 	cp -a $install/usr/share/MateConf $fs/usr/share
 	cp -a $install/usr/share/glib-2.0 $fs/usr/share
 }
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{ 
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-character/receipt
--- a/coreutils-character/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-character/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -25,17 +25,6 @@
 	cp -a $install/usr/bin/unexpand $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/usr/bin/tr" "$1/usr/bin/expand" "$1/usr/bin/unexpand"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/usr/bin/tr"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-command/receipt
--- a/coreutils-command/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-command/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -33,19 +33,6 @@
 	cp -a $install/usr/bin/chroot $fs/usr/sbin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/nice" "$1/bin/kill" "$1/bin/sleep"
-	rm -f "$1/usr/bin/env" "$1/usr/bin/nohup" "$1/usr/bin/timeout"
-	rm -f "$1/usr/sbin/chroot"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/nice"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-context-system/receipt
--- a/coreutils-context-system/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-context-system/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -30,18 +30,6 @@
 	cp -a $install/usr/bin/uptime $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/date" "$1/bin/uname"
-	rm -f "$1/usr/bin/hostid" "$1/usr/bin/uptime"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/date"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-context-working/receipt
--- a/coreutils-context-working/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-context-working/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -28,18 +28,6 @@
 	cp -a $install/usr/bin/tty $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/pwd" "$1/bin/stty" "$1/bin/printenv"
-	rm -f "$1/usr/bin/tty"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/pwd"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-directory/receipt
--- a/coreutils-directory/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-directory/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -28,17 +28,6 @@
 	cp -a $install/usr/bin/dircolors $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/ls" "$1/usr/bin/dir" "$1/usr/bin/vdir" "$1/usr/bin/dircolors"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/ls"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-disk/receipt
--- a/coreutils-disk/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-disk/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -29,18 +29,6 @@
 	cp -a $install/usr/bin/truncate $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/df" "$1/bin/stat" "$1/bin/sync"
-	rm -f "$1/usr/bin/du"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/df"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-file-attributes/receipt
--- a/coreutils-file-attributes/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-file-attributes/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -26,17 +26,6 @@
 	cp -a $install/usr/bin/touch $fs/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/chown" "$1/bin/chgrp" "$1/bin/chmod" "$1/bin/touch"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/chown"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-file-sort/receipt
--- a/coreutils-file-sort/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-file-sort/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -24,21 +24,10 @@
 	cp -a $install/usr/bin/shuf $fs/usr/bin
 	cp -a $install/usr/bin/uniq $fs/usr/bin
 	cp -a $install/usr/bin/comm $fs/usr/bin
-	cp -a $install/usr/bin/ptx $fs/usr/bin
+	cp -a $install/usr/bin/ptx  $fs/usr/bin
 	cp -a $install/usr/bin/tsort $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/usr/bin/sort" "$1/usr/bin/uniq" "$1/usr/bin/comm"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/usr/bin/sort"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-file-special/receipt
--- a/coreutils-file-special/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-file-special/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -33,23 +33,12 @@
 	cp -a $install/usr/bin/unlink $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/ln" "$1/bin/mkdir" "$1/bin/mknod" "$1/bin/rmdir"
-	rm -f "$1/usr/bin/mkfifo" "$1/usr/bin/readlink"
-	status
-}
-
 pre_remove()
 {
 	# Need to handle the removal of ln
 	cp -a -fd "$1/bin/ln" "$1/bin/ln-coreutils"
 }
+
 post_remove()
 {
 	# Restore ln
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-file-summarize/receipt
--- a/coreutils-file-summarize/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-file-summarize/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -31,19 +31,6 @@
 	cp -a $install/usr/bin/sha512sum $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/usr/bin/wc" "$1/usr/bin/sum" "$1/usr/bin/cksum" \
-		"$1/usr/bin/md5sum" "$1/usr/bin/sha1sum" \
-		"$1/usr/bin/sha256sum" "$1/usr/bin/sha512sum"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/usr/bin/wc"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-numeric/receipt
--- a/coreutils-numeric/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-numeric/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -24,17 +24,6 @@
 	cp -a $install/usr/bin/seq $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/usr/bin/seq"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/usr/bin/seq"
diff -r df142a9e8a30 -r 6fab3264ba87 coreutils-print/receipt
--- a/coreutils-print/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/coreutils-print/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -27,18 +27,6 @@
 	cp -a $install/usr/bin/yes $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/bin/echo"
-	rm -f "$1/usr/bin/printf" "$1/usr/bin/yes"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox "$1/bin/echo"
diff -r df142a9e8a30 -r 6fab3264ba87 cplay/receipt
--- a/cplay/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/cplay/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -37,9 +37,8 @@
 
 post_install()
 {
-	echo "Processing post-install commands..."
-	echo -n "Modprobing snd-pcm-oss for legacy volume controls..."
+	newline
+	action 'Modprobing snd-pcm-oss for legacy volume controls...'
 	[ "$1" ] || modprobe snd-pcm-oss
 	status
 }
-
diff -r df142a9e8a30 -r 6fab3264ba87 docbook-xml/receipt
--- a/docbook-xml/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/docbook-xml/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A widely used XML scheme for writing documentation and help. (version 4.5)"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="MIT"
-TARBALL="${PACKAGE}-${VERSION}.zip"
+TARBALL="$PACKAGE-$VERSION.zip"
 WEB_SITE="http://www.oasis-open.org/docbook/"
 WGET_URL="http://www.docbook.org/xml/$VERSION/$TARBALL"
 
@@ -15,11 +15,9 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION}
+	mkdir -p $DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION
 	cp -dRf docbook.cat *.dtd ent/ *.mod \
-		$DESTDIR/usr/share/xml/docbook/xml-dtd-${VERSION}
-
+		$DESTDIR/usr/share/xml/docbook/xml-dtd-$VERSION
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -37,262 +35,262 @@
 	else
 		chroot "$1/" xmlcatalog --noout --create /etc/xml/docbook-xml
 	fi
-	echo -n "Processing post-install commands..."
 
 	if [ "$1" ]; then
 		mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null
 		cp /etc/resolv.conf "$1/etc/resolv.conf"
 	fi
-  # V4.1.2
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
-    "/etc//xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.1.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
-    "/etc/xml/docbook-xml"
 
-  # V4.2
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.2" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.2" \
-    "/etc/xml/docbook-xml"
+	# V4.1.2
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \
+		"/etc//xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.1.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.1.2" \
+		"/etc/xml/docbook-xml"
 
-  # V4.3
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.3" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.3" \
-    "/etc/xml/docbook-xml"
+	# V4.2
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.2" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.2" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.2" \
+		"/etc/xml/docbook-xml"
 
-  # V4.4
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.4" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.4" \
-    "/etc/xml/docbook-xml"
+	# V4.3
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.3" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.3" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.3" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.3" \
+		"/etc/xml/docbook-xml"
 
-  # V4.5
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.5//EN" \
-    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    "/etc/xml/docbook-xml"
-  chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/4.5" \
-    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-    "/etc/xml/docbook-xml"
+	# V4.4
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Notations V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.4" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.4" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.4" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.4" \
+		"/etc/xml/docbook-xml"
 
-  if [ -f "$1/etc/xml/catalog" ]; then
-  	chroot "$1/" xmlcatalog --noout /etc/xml/catalog
-  else
-  	chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
-  fi
-  chroot "$1/" xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//ENTITIES DocBook XML" \
-    "file:///etc/xml/docbook-xml" \
-    "/etc/xml/catalog"
-  chroot "$1/" xmlcatalog --noout --add "delegatePublic" \
-    "-//OASIS//DTD DocBook XML" \
-    "file:///etc/xml/docbook-xml" \
-    "/etc/xml/catalog"
-  chroot "$1/" xmlcatalog --noout --add "delegateSystem" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook-xml" \
-    "/etc/xml/catalog"
-  chroot "$1/" xmlcatalog --noout --add "delegateURI" \
-    "http://www.oasis-open.org/docbook/" \
-    "file:///etc/xml/docbook-xml" \
-    "/etc/xml/catalog"
-	if [ "$1" ]; then
+	# V4.5
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML V4.5//EN" \
+		"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "public" \
+		"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5" \
+		"/etc/xml/docbook-xml"
+	chroot "$1/" xmlcatalog --noout --add "rewriteURI" \
+		"http://www.oasis-open.org/docbook/xml/4.5" \
+		"file:///usr/share/xml/docbook/xml-dtd-4.5" \
+		"/etc/xml/docbook-xml"
+
+	if [ -f "$1/etc/xml/catalog" ]; then
+		chroot "$1/" xmlcatalog --noout /etc/xml/catalog
+	else
+		chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
+	fi
+
+	chroot "$1/" xmlcatalog --noout --add "delegatePublic" \
+		"-//OASIS//ENTITIES DocBook XML" \
+		"file:///etc/xml/docbook-xml" \
+		"/etc/xml/catalog"
+	chroot "$1/" xmlcatalog --noout --add "delegatePublic" \
+		"-//OASIS//DTD DocBook XML" \
+		"file:///etc/xml/docbook-xml" \
+		"/etc/xml/catalog"
+	chroot "$1/" xmlcatalog --noout --add "delegateSystem" \
+		"http://www.oasis-open.org/docbook/" \
+		"file:///etc/xml/docbook-xml" \
+		"/etc/xml/catalog"
+	chroot "$1/" xmlcatalog --noout --add "delegateURI" \
+		"http://www.oasis-open.org/docbook/" \
+		"file:///etc/xml/docbook-xml" \
+		"/etc/xml/catalog"
+	if [ -n "$1" ]; then
 		mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null
 	fi
 }
 
-post_remove() 
+post_remove()
 {
 	xmlcatalog --noout --del file:///etc/xml/docbook-xml "$1/etc/xml/catalog"
 }
-
diff -r df142a9e8a30 -r 6fab3264ba87 docbook-xsl/receipt
--- a/docbook-xsl/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/docbook-xsl/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -15,12 +15,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cd $src
 	pkgroot=$fs/usr/share/xml/docbook/stylesheet/$PACKAGE
 	install -dm755 $pkgroot/common
 	install -dm755 $pkgroot/params
 	install  -m755 VERSION $pkgroot
-	
+
 	for fn in xml xsl dtd ent; do
 		install -m644 common/*.${fn} $pkgroot/common/
 	done
@@ -40,16 +39,15 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	echo -n "Processing post-install commands..."
-	if [ "$1" ]; then
-		mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null
+	if [ -n "$1" ]; then
+		mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2>/dev/null
 		cp /etc/resolv.conf "$1/etc/resolv.conf"
 	fi
 
 	# Create a /etc/xml/catalog file
 	if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi &&
 	if [ ! -f "$1/etc/xml/catalog" ]; then
-    		chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
+		chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
 	fi &&
 
 	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
@@ -71,13 +69,14 @@
 		"http://docbook.sourceforge.net/release/xsl/current" \
 		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
 	/etc/xml/catalog
-	
+
 	# link nwalsh dir
 	cd "$1/usr/share/xml/docbook/stylesheet"
-		ln -s $PACKAGE nwalsh
-	status
-	if [ "$1" ]; then
+	ln -s $PACKAGE nwalsh
+
+	if [ -n "$1" ]; then
 		mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null
 	fi
+
+	:
 }
-
diff -r df142a9e8a30 -r 6fab3264ba87 engrampa/receipt
--- a/engrampa/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/engrampa/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -18,7 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                           \
+	./autogen.sh                       \
 		--prefix=/usr                  \
 		--libexecdir=/usr/lib/$PACKAGE \
 		--with-gtk=2.0                 \
@@ -35,24 +35,11 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/$PACKAGE/* $fs/usr/share/$PACKAGE
-	
+
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/share/applications/* $fs/usr/share/applications
-	
+
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/share/icons/hicolor/32x32/apps/*.png \
 		$fs/usr/share/pixmaps
 }
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{ 
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 get-flash-plugin/receipt
--- a/get-flash-plugin/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-flash-plugin/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -16,4 +16,3 @@
 	mkdir -p $fs/usr/bin
 	cp $stuff/get-flash-plugin $fs/usr/bin
 }
-
diff -r df142a9e8a30 -r 6fab3264ba87 get-flash-plugin/stuff/get-flash-plugin
--- a/get-flash-plugin/stuff/get-flash-plugin	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-flash-plugin/stuff/get-flash-plugin	Fri Dec 25 15:23:46 2015 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
-[ -f /etc/slitaz/slitaz.conf ] && . /etc/slitaz/slitaz.conf
-[ $INSTALLED ] || INSTALLED=/var/lib/tazpkg/installed
+[ -f '/etc/slitaz/slitaz.conf' ] && . /etc/slitaz/slitaz.conf
+[ -z "$INSTALLED" ] && INSTALLED='/var/lib/tazpkg/installed'
 
 PACKAGE="flash-plugin"
 WEB_SITE="http://www.adobe.com/products/flash/"
@@ -9,23 +9,23 @@
 ROOT="$1"
 [ -d "$ROOT" ] || ROOT=""
 
-if test $(id -u) != 0 ; then
+if [ $(id -u) -ne 0 ]; then
 	echo -e "\nYou must be root to run `basename $0`."
 	echo -e "Please type 'su' and root password to become super-user.\n"
 	exit 0
 fi
 
-if [ -d ${ROOT}${INSTALLED}/$PACKAGE ]; then
-  [ -n "$ROOT" ] && exit 1
-  tazpkg remove $PACKAGE
-  [ -d $INSTALLED/$PACKAGE ] && exit 1
+if [ -d $ROOT$INSTALLED/$PACKAGE ]; then
+	[ -n "$ROOT" ] && exit 1
+	tazpkg remove $PACKAGE
+	[ -d $INSTALLED/$PACKAGE ] && exit 1
 fi
 
 TARBALL="install_flash_player_11_linux.i386.tar.gz"
-URL=http://fpdownload.macromedia.com/get/flashplayer/current/licensing/linux/$TARBALL
-TMP_DIR=/tmp/get-$PACKAGE-$$-$RANDOM
+URL="http://fpdownload.macromedia.com/get/flashplayer/current/licensing/linux/$TARBALL"
+TMP_DIR="$(mktemp -d)"
 CUR_DIR=$(pwd)
-mkdir -p $TMP_DIR && cd $TMP_DIR
+cd $TMP_DIR
 busybox wget -O $TARBALL $URL
 
 if [ ! -f $TARBALL ]; then
@@ -39,18 +39,18 @@
 # Install files
 chmod 755 libflashplayer.so
 chown root.root libflashplayer.so
-dir=$PACKAGE-$VERSION/fs
-mkdir -p $dir/usr/share/flash
-mv libflashplayer.so $dir/usr/share/flash
-mv usr/bin $dir/usr
-mv usr/share/icons $dir/usr/share
-mv usr/share/pixmaps $dir/usr/share
+fs=$PACKAGE-$VERSION/fs
+mkdir -p $fs/usr/share/flash
+mv libflashplayer.so $fs/usr/share/flash
+mv usr/bin $fs/usr
+mv usr/share/icons $fs/usr/share
+mv usr/share/pixmaps $fs/usr/share
 
 # Sanity Check: Reexport firefox libraries if they don't exist
 dir=$PACKAGE-$VERSION/fs/usr/lib
 mkdir -p $dir
 for i in /usr/lib/firefox/*.so ; do
-  	[ -f $i ] && [ -z "`ls /usr/lib/$(basename $i)`" ] && ln -s $i $dir	
+	[ -f $i ] && [ -z "$(ls /usr/lib/$(basename $i))" ] && ln -s $i $dir
 done
 
 # Create pseudo package
@@ -67,24 +67,19 @@
 
 post_install()
 {
-	echo -n "Processing post install commands..."
- 
 	[ -d \$1/usr/lib/mozilla/plugins ] || mkdir -p \$1/usr/lib/mozilla/plugins
 	ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/mozilla/plugins
 	[ -d \$1/opt/google/chrome/plugins ] || mkdir -p \$1/opt/google/chrome/plugins
 	ln -s /usr/share/flash/libflashplayer.so \$1/opt/google/chrome/plugins/libgcflashplayer.so
 	[ -d \$1/usr/lib/opera/plugins ] || mkdir -p \$1/usr/lib/opera/plugins
 	ln -s /usr/share/flash/libflashplayer.so \$1/usr/lib/opera/plugins/libflashplayer.so
-	status
 }
 
 post_remove()
 {
-	echo -n "Processing post remove commands..."
 	rm -f \$1/usr/lib/mozilla/plugins/libflashplayer.so
 	rm -f \$1/opt/google/chrome/plugins/libgcflashplayer.so
 	rm -f \$1/usr/lib/opera/plugins/libflashplayer.so
-	status
 }
 EOT
 
@@ -99,4 +94,4 @@
 
 # Clean
 cd $CUR_DIR
-rm -rf $TMP_DIR
+rm -rf "$TMP_DIR"
diff -r df142a9e8a30 -r 6fab3264ba87 get-java6-jdk/stuff/get-java6-jdk
--- a/get-java6-jdk/stuff/get-java6-jdk	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-java6-jdk/stuff/get-java6-jdk	Fri Dec 25 15:23:46 2015 +0200
@@ -9,39 +9,41 @@
 VERSION="1.6.0_13"
 URL="http://raphaello.univ-fcomte.fr/ftp/java/Jdk"
 TARBALL="jdk-6u13-linux-i586.bin"
-TEMP_DIR="/tmp/$PACKAGE.$$"
+TEMP_DIR="$(mktemp -d)"
 ROOT="$1"
 
 # Check if we are root starting anything
-if test $(id -u) != 0 ; then
-	echo -e "\nYou must be root to run `basename $0`."
+if [ $(id -u) -ne 0 ]; then
+	echo -e "\nYou must be root to run $(basename $0)."
 	echo -e "Please type 'su' and root password to become super-user.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
 # Avoid reinstall
 if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
 	echo -e "\n$PACKAGE package is already installed.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
 # Check if java6-jre is installed 
 if [ -d $ROOT/var/lib/tazpkg/installed/java6-jre ]; then
 	echo -e "\njava6-jre must be uninstalled before install java6-jdk.\n"
+	rm -rf "$TEMP_DIR"
 	exit 2
 fi
 
 
 # Create TEMP_DIR
 CUR_DIR=$(pwd)
-test -d $TEMP_DIR || mkdir $TEMP_DIR
 cd $TEMP_DIR
 
 # Download the file
 test -f $TARBALL || wget $URL/$TARBALL
 if [ ! -f $TARBALL ]; then
 	cd $CUR_DIR
-	rm -rf $TMP_DIR
+	rm -rf "$TMP_DIR"
 	echo "Could not download $TARBALL. Exiting."
 	exit 1
 fi
@@ -79,7 +81,6 @@
 
 post_install()
 {
-	echo -n "Processing post install commands..."
 	cd /usr/lib/firefox*/plugins
 	ln -s /usr/lib/java/jdk\$VERSION/jre/plugin/i386/ns7/libjavaplugin_oji.so
 
@@ -89,7 +90,6 @@
 	ln -s /usr/lib/java/jdk\$VERSION/bin/javac
 	ln -s /usr/lib/java/jdk\$VERSION/bin/javadoc
 	ln -s /usr/lib/java/jdk\$VERSION/bin/javap
-	status
 }
 
 post_remove()
@@ -110,10 +110,4 @@
 
 # Clean
 cd $CUR_DIR
-rm -rf $TEMP_DIR
-
-
-
-
-
-
+rm -rf "$TEMP_DIR"
diff -r df142a9e8a30 -r 6fab3264ba87 get-java6-jre/stuff/get-java6-jre
--- a/get-java6-jre/stuff/get-java6-jre	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-java6-jre/stuff/get-java6-jre	Fri Dec 25 15:23:46 2015 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 # Get and install the SUN Java Runtime Environnement
 #
 # (C) 2007-2012 SliTaz - GNU General Public License v3.
@@ -10,22 +10,24 @@
 SHORT_DESC="SUN Java Runtime."
 DEPENDS="xorg-libXtst"
 TARBALL="jre.bin"
-TEMP_DIR="/tmp/$PACKAGE.$$"
+TEMP_DIR="$(mktemp -d)"
 ROOT="$1"
 
 URL="$(wget -O - ${WEB_SITE}en/download/manual_v6.jsp | \
        sed '/self-extracting/!d;s/.*href="\([^"]*\).*/\1/;q')"
 
 # Check if we are root starting anything
-if test $(id -u) != 0 ; then
+if [ $(id -u) -ne 0 ]; then
 	echo -e "\nYou must be root to run `basename $0`."
 	echo -e "Please type 'su' and root password to become super-user.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
 # Avoid reinstall
 if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
 	echo -e "\n$PACKAGE package is already installed.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
@@ -33,14 +35,13 @@
 
 # Create TEMP_DIR
 CUR_DIR=$(pwd)
-test -d $TEMP_DIR || mkdir $TEMP_DIR
 cd $TEMP_DIR
 
 # Download the file
 test -f $TARBALL || wget $URL -O $TARBALL
 if [ ! -f $TARBALL ]; then
 	cd $CUR_DIR
-	rm -rf $TEMP_DIR
+	rm -rf "$TEMP_DIR"
 	echo "Could not download $TARBALL. Exiting."
 	exit 1
 fi
@@ -79,13 +80,11 @@
 
 post_install()
 {
-	echo -n "Processing post install commands..."
 	[ -d /usr/lib/mozilla/plugins ] || mkdir -p /usr/lib/mozilla/plugins 
 	ln -s /usr/lib/java/jre\$VERSION/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins
 
 	cd /usr/bin
 	ln -s /usr/lib/java/jre\$VERSION/bin/java 
-	status
 }
 
 post_remove()
@@ -109,4 +108,4 @@
 
 # Clean
 cd $CUR_DIR
-rm -rf $TEMP_DIR
+rm -rf "$TEMP_DIR"
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-msttcorefonts/description.txt	Fri Dec 25 15:23:46 2015 +0200
@@ -0,0 +1,44 @@
+The TrueType core fonts for the web that was once available from
+<http://www.microsoft.com/typography/fontpack/>. The package is constructed so
+that the actual fonts are downloaded from Sourceforge's site at build time.
+Therefore this package technically does not "redistribute" the fonts, it just
+makes it easy to install them on a linux system.
+
+Fonts list:
+
+  * AndaleMono v. 2.0  
+    *Digitized data copyright (C) 1993-1997 The Monotype Corporation. All rights
+    reserved.*
+  * Arial (Regular, Bold, Italic, Bold Italic) v. 2.82  
+    *Typeface (c) The Monotype Corporation plc. Data (c) The Monotype
+    Corporation plc/Type Solutions Inc. 1990-1992. All Rights Reserved*
+  * Arial Black v. 2.35  
+    *Digitized data copyright The Monotype Corporation 1991-1995. All rights
+    reserved. Arial is a trademark of The Monotype Corporation which may be
+    registered in certain jurisdictions.*
+  * Comic Sans MS (Regular, Bold) v. 2.10  
+    *Copyright (c) 1995 Microsoft Corporation. All rights reserved.*
+  * Courier New (Regular, Bold) v. 2.82  
+    *Typeface (c) The Monotype Corporation plc. Data (c) The Monotype
+    Corporation plc/Type Solutions Inc. 1990-1994. All Rights Reserved*
+  * Courier New (Italic, Bold Italic) v. 2.82  
+    *Typeface (c) The Monotype Corporation plc. Data (c) The Monotype
+    Corporation plc/Type Solutions Inc. 1990-1992. All Rights Reserved*
+  * Georgia (Regular, Bold, Italic, Bold Italic) v. 2.05  
+    *Typeface and data copyright 1996 Microsoft Corporation. All Rights
+    Reserved.*
+  * Impact v. 2.35  
+    *Digitized data copyright (C) 1991-1996 The Monotype Corporation. All rights
+    reserved. Impact is a trademark of Stephenson Blake (Holdings) Ltd.*
+  * Tahoma v. 1.00  
+    *Typeface and data copyright 1995 Microsoft Corporation. All Rights
+    Reserved.*
+  * Times New Roman (Regular, Bold, Italic, Bold Italic) v. 2.82  
+    *Typeface (c) The Monotype Corporation plc. Data (c) The Monotype
+    Corporation plc/Type Solutions Inc. 1990-1992. All Rights Reserved*
+  * Trebuchet MS (Regular, Bold, Italic, Bold Italic) v. 1.22  
+    *Copyright (c) 1996 Microsoft Corporation. All rights reserved.*
+  * Verdana (Regular, Bold, Italic, Bold Italic) v. 2.35  
+    *Typeface and data (c) 1996 Microsoft Corporation. All Rights Reserved*
+  * Webdings v. 1.03  
+    *Copyright (c) 1997 Microsoft Corporation. All rights reserved.*
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts/receipt
--- a/get-msttcorefonts/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-msttcorefonts/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -10,9 +10,11 @@
 WEB_SITE="http://sourceforge.net/projects/corefonts"
 TAGS="utilities"
 
+DEPENDS="cabextract"
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/bin
-    cp stuff/get-msttcorefonts $fs/usr/bin
+	mkdir -p $fs/usr/bin
+	cp stuff/$PACKAGE $fs/usr/bin
 }
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts/stuff/get-msttcorefonts
--- a/get-msttcorefonts/stuff/get-msttcorefonts	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-msttcorefonts/stuff/get-msttcorefonts	Fri Dec 25 15:23:46 2015 +0200
@@ -1,168 +1,52 @@
 #!/bin/sh
 
+. /lib/libtaz.sh
+
 PACKAGE="msttcorefonts"
-VERSION="2.0"
+VERSION="3.0"
 CUR_DIR=$(pwd)
-TEMP_DIR=/tmp/$PACKAGE-$VERSION
-ROOT=
+TEMP_DIR="$(mktemp -d)"
+ROOT="$1"
 
 # Check if we are root
-if test $(id -u) != 0 ; then
-    echo -e "\nYou must be root to run `basename $0`."
-    echo -e "Please type 'su' and root password to become super-user.\n"
-    exit 1
-fi
+check_root
 
-# Avoid reinstall
-if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
-    echo -e "\n$PACKAGE package is already installed.\n"
-    exit 1
-fi
+fontdir="$TEMP_DIR/$PACKAGE-$VERSION/fs/usr/share/fonts/truetype/$PACKAGE"
+mkdir -p "$fontdir"
+cd "$fontdir"
 
-# Create a TEMP_DIR
-mkdir -p $TEMP_DIR/downloads
-cd $TEMP_DIR/downloads
-
-# this is the sourceforge mirrorlist as of 2006-04-30. If someone spots changes
-# over at sourcforge, feel free to email me and I'll update the list
-mirrors="easynews+heanet+superb-west+internap+switch+ufpr+surfnet+umn+kent+mesh+superb-east+jaist"
-mirror_count=12
-
-andale32_md5="cbdc2fdd7d2ed0832795e86a8b9ee19a  andale32.exe"
-arial32_md5="9637df0e91703179f0723ec095a36cb5  arial32.exe"
-arialb32_md5="c9089ae0c3b3d0d8c4b0a95979bb9ff0  arialb32.exe"
-comic32_md5="2b30de40bb5e803a0452c7715fc835d1  comic32.exe"
-courie32_md5="4e412c772294403ab62fb2d247d85c60  courie32.exe"
-georgi32_md5="4d90016026e2da447593b41a8d8fa8bd  georgi32.exe"
-impact32_md5="7907c7dd6684e9bade91cff82683d9d7  impact32.exe"
-times32_md5="ed39c8ef91b9fb80f76f702568291bd5  times32.exe"
-trebuc32_md5="0d7ea16cac6261f8513a061fbfcdb2b5  trebuc32.exe"
-webdin32_md5="230a1d13a365b22815f502eb24d9149b  webdin32.exe"
-verdan32_md5="12d2a75f8156e10607be1eaa8e8ef120  verdan32.exe"
-wd97vwr32_md5="efa72d3ed0120a07326ce02f051e9b42  wd97vwr32.exe"
-
-download_files="andale32.exe arial32.exe arialb32.exe comic32.exe courie32.exe georgi32.exe impact32.exe times32.exe trebuc32.exe webdin32.exe verdan32.exe wd97vwr32.exe"
-
-failures=0
-
-set_mirror() {
-	local r m
-	r=`expr $RANDOM % $mirror_count + 1`
-	m=`echo $mirrors |cut -d+ -f$r`
-	mirror="http://${m}.dl.sourceforge.net/sourceforge/corefonts/"
-}
-
-check_file() {
-	matches=no
-	if [ ! -r $1 ]
-	then
-		echo "$1 does not exist"
-		return
-	fi
-	local variable_name=`basename $1 .exe`_md5
-	local stored_checksum
-	eval stored_checksum=\$$variable_name
-	local computed_checksum=`md5sum $1`
-	if [ "$stored_checksum" = "$computed_checksum" ]
-	then
-		matches=yes
-	else
-		rm $1
-		matches=no
-	fi
-}
-
-download() {
-	curl --retry 5 -H Pragma: -R -S -L -o "$2" $1$2
-}
-
-# Download the file
-set_mirror
-
-if [ ! -d /var/lib/tazpkg/installed/curl ]; then
-    tazpkg get-install curl
-fi
-if [ ! -f /usr/bin/curl ]; then
-    cd $CUR_DIR
-    echo "Could not find curl. Exiting."
-    exit
-fi
-
-for f in $download_files
-do
-	check_file $f
-	while [ $matches != yes ]
-	do
-		download $mirror $f
-		check_file $f
-		if [ $matches != yes ]
-		then
-			echo "failed to download $mirror$f"
-			failures=`expr $failures + 1`
-			if [ $failures -gt 5 ]
-			then
-				echo "failed to download too many times."
-				exit
-			fi
-			set_mirror
-		fi
-	done
+for filename in andale arial arialb comic courie georgi impact times trebuc verdan webdin wd97vwr; do
+	busybox wget "http://downloads.sourceforge.net/corefonts/${filename}32.exe"
+	cabextract -L ${filename}32.exe
+	find "$fontdir" -type f -name '*.cab' -exec cabextract -L \{\} \;
+	find "$fontdir" -type f ! -name '*.ttf' -delete
 done
 
-# Extract fonts
-if [ ! -d /var/lib/tazpkg/installed/cabextract ]; then
-    tazpkg get-install cabextract
-fi
-if [ ! -f /usr/bin/cabextract ]; then
-    cd $CUR_DIR
-    echo "Could not find cabextract. Exiting."
-    exit
-fi
-
-cd $TEMP_DIR
-rm -rf cab-contents && mkdir cab-contents
-mkdir -p $PACKAGE-$VERSION/fs/usr/share/fonts/truetype/$PACKAGE/
-
-font_files="andale32.exe arial32.exe arialb32.exe comic32.exe courie32.exe georgi32.exe impact32.exe times32.exe trebuc32.exe webdin32.exe verdan32.exe"
-
-for i in $font_files
-do
-	if [ -f downloads/$i ]
-	then
-		cabextract --lowercase --directory=cab-contents downloads/$i
-	fi
-	mv cab-contents/*.ttf $PACKAGE-$VERSION/fs/usr/share/fonts/truetype/$PACKAGE/
-	rm -f cab-contents/*
-done
-
-cabextract --lowercase --directory=cab-contents downloads/wd97vwr32.exe
-cabextract --lowercase --directory=cab-contents cab-contents/viewer1.cab
-mv cab-contents/*.ttf $PACKAGE-$VERSION/fs/usr/share/fonts/truetype/$PACKAGE/
-rm -f cab-contents/*
-
 cd $TEMP_DIR
 
-cat > $PACKAGE-$VERSION/receipt << EOT
+cat > $PACKAGE-$VERSION/receipt <<EOT
+# SliTaz package receipt.
+
 PACKAGE="$PACKAGE"
 VERSION="$VERSION"
 CATEGORY="non-free"
-SHORT_DESC="TrueType core fonts for the web."
-DEPENDS="fontconfig"
+SHORT_DESC="Microsoft's TrueType core fonts"
+MAINTAINER="rocky@slitaz.org"
+LICENSE="non-free"
 WEB_SITE="http://sourceforge.net/projects/corefonts"
 TAGS="fonts"
 
+DEPENDS="fontconfig"
+
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	local root
-	root=\${1:-/}
-	echo "Processing post-install commands..."
-	chroot \$root/ /usr/bin/fc-cache /usr/share/fonts/truetype/msttcorefonts >/dev/null 2>&1
+	chroot "\$1/" /usr/bin/fc-cache /usr/share/fonts/truetype/$PACKAGE
 }
 EOT
 
 # Pack
-tazpkg pack $PACKAGE-$VERSION
+tazpkg pack $PACKAGE-$VERSION gzip
 
 # Clean to save RAM memory
 rm -rf $PACKAGE-$VERSION
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts2/description.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-msttcorefonts2/description.txt	Fri Dec 25 15:23:46 2015 +0200
@@ -0,0 +1,46 @@
+This installs the TrueType core fonts for the web that were once available from
+<http://www.microsoft.com/typography/fontpack/> prior to 2002, and most recently
+updated in the European Union Expansion Update circa May 2007, still available
+on the Microsoft website. This also installs Microsoft's ClearType fonts, see
+<http://www.microsoft.com/typography/ClearTypeFonts.mspx> for more info.
+
+With this package the actual font cab files are downloaded from a Sourceforge
+project mirror and unpacked at install time. Therefore this package technically
+does not "redistribute" the fonts. The fonts are then added to the core X fonts
+system as well as the Xft font system.
+
+The TrueType core fonts for the web that was once available from
+<http://www.microsoft.com/typography/fontpack/>. The package is constructed so
+that the actual fonts are downloaded from Sourceforge's site at build time.
+Therefore this package technically does not "redistribute" the fonts, it just
+makes it easy to install them on a linux system.
+
+Fonts list:
+
+  * Arial (Regular, Bold, Italic, Bold Italic) v. 3.06  
+    *(c) 2006 The Monotype Corporation. All Rights Reserved.*
+  * Times New Roman (Regular, Bold, Italic, Bold Italic) v. 3.06  
+    *(c) 2006 The Monotype Corporation. All Rights Reserved.*
+  * Trebuchet MS (Regular, Bold, Italic, Bold Italic) v. 5.00  
+    *(c) 2006 Microsoft Corporation. All Rights Reserved.*
+  * Verdana (Regular, Bold, Italic, Bold Italic) v. 5.01  
+    *(c) 2006 Microsoft Corporation. All Rights Reserved.*
+
+Extended fonts:
+
+  * Calibri (Regular, Bold, Italic, Bold Italic) v. 1.02  
+    *(c) 2006 Microsoft Corporation. All Rights Reserved.*
+  * Cambria (Regular, Bold) v. 1.02  
+    *(c) 2006 Microsoft Corporation. All Rights Reserved.*
+  * Cambria (Italic, Bold Italic) v. 1.01  
+    *(c) 2005 Microsoft Corporation. All Rights Reserved.*
+  * Cambria Math v. 1.02  
+    *(c) 2006 Microsoft Corporation. All Rights Reserved.*
+  * Candara (Regular, Bold, Italic, Bold Italic) v. 1.01  
+    *(c) 2005 Microsoft Corporation. All Rights Reserved.*
+  * Consolas (Regular, Bold, Italic, Bold Italic) v. 1.00  
+    *(c) 2005 Microsoft Corporation. All Rights Reserved.*
+  * Constantia (Regular, Bold, Italic, Bold Italic) v. 1.01  
+    *(c) 2005 Microsoft Corporation. All Rights Reserved.*
+  * Corbel (Regular, Bold, Italic, Bold Italic) v. 1.01  
+    *(c) 2005 Microsoft Corporation. All Rights Reserved.*
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts2/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-msttcorefonts2/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -0,0 +1,19 @@
+# SliTaz package receipt.
+
+PACKAGE="get-msttcorefonts2"
+VERSION="1.00"
+CATEGORY="non-free"
+SHORT_DESC="Updated Smart package of Microsoft Core fonts for the Web"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="BSD"
+WEB_SITE="http://sourceforge.net/projects/mscorefonts2"
+TAGS="utilities"
+
+DEPENDS="cabextract"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/bin
+	cp stuff/get-msttcorefonts2 $fs/usr/bin
+}
diff -r df142a9e8a30 -r 6fab3264ba87 get-msttcorefonts2/stuff/get-msttcorefonts2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/get-msttcorefonts2/stuff/get-msttcorefonts2	Fri Dec 25 15:23:46 2015 +0200
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+. /lib/libtaz.sh
+
+PACKAGE="msttcorefonts2"
+VERSION="1.0"
+CUR_DIR=$(pwd)
+TEMP_DIR="$(mktemp -d)"
+ROOT="$1"
+
+# Check if we are root
+check_root
+
+fontdir="$TEMP_DIR/$PACKAGE-$VERSION/fs/usr/share/fonts/truetype/$PACKAGE"
+mkdir -p "$fontdir"
+cd "$fontdir"
+
+for filename in EUupdate.EXE PowerPointViewer.exe; do
+	busybox wget "http://downloads.sourceforge.net/mscorefonts2/$filename"
+	cabextract -L $filename
+	find "$fontdir" -type f -name '*.cab' -exec cabextract -L \{\} \;
+	find "$fontdir" -type f ! \( -name '*.ttf' -o -name '*.ttc' \) -delete
+done
+
+cd $TEMP_DIR
+
+cat > $PACKAGE-$VERSION/receipt <<EOT
+# SliTaz package receipt.
+
+PACKAGE="$PACKAGE"
+VERSION="$VERSION"
+CATEGORY="non-free"
+SHORT_DESC="Updated Microsoft's TrueType core fonts"
+MAINTAINER="al.bobylev@gmail.com"
+LICENSE="non-free"
+WEB_SITE="http://sourceforge.net/projects/mscorefonts2/"
+TAGS="fonts"
+
+DEPENDS="fontconfig"
+
+# Pre and post install commands for Tazpkg.
+post_install()
+{
+	chroot "\$1/" /usr/bin/fc-cache /usr/share/fonts/truetype/$PACKAGE
+}
+EOT
+
+# Pack
+tazpkg pack $PACKAGE-$VERSION gzip
+
+# Clean to save RAM memory
+rm -rf $PACKAGE-$VERSION
+
+# Install pseudo package
+yes y | tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
+
+# Clean
+cd $CUR_DIR
+rm -rf $TEMP_DIR
diff -r df142a9e8a30 -r 6fab3264ba87 get-realplayer/stuff/get-realplayer
--- a/get-realplayer/stuff/get-realplayer	Wed Dec 23 22:04:20 2015 +0100
+++ b/get-realplayer/stuff/get-realplayer	Fri Dec 25 15:23:46 2015 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 
 # Get and install RealPlayer for Linux
 
@@ -6,32 +6,32 @@
 VERSION="11"
 TARBALL="RealPlayer${VERSION}GOLD.bin"
 URL="http://www.real.com/realcom/R?href=http://forms.real.com/real/player/download.html?f=unix/$TARBALL"
-CUR_DIR=$(pwd)
-TEMP_DIR=/tmp/$PACKAGE-$VERSION-$$
+CUR_DIR="$(pwd)"
+TEMP_DIR="$(mktemp -d)"
 ROOT="$1"
 
 # Check if we are root
-if test $(id -u) != 0 ; then
-	echo -e "\nYou must be root to run `basename $0`."
+if [ $(id -u) -ne 0 ]; then
+	echo -e "\nYou must be root to run $(basename $0)."
 	echo -e "Please type 'su' and root password to become super-user.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
 # Avoid reinstall
-if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
+if [ -d "$ROOT/var/lib/tazpkg/installed/$PACKAGE" ]; then
 	echo -e "\n$PACKAGE package is already installed.\n"
+	rm -rf "$TEMP_DIR"
 	exit 1
 fi
 
-# Create a TEMP_DIR
-mkdir $TEMP_DIR
-cd $TEMP_DIR
+cd "$TEMP_DIR"
 
 # Download the file
-wget $URL 
+wget $URL
 if [ ! -f $TARBALL ]; then
 	cd $CUR_DIR
-	rm -rf $TEMP_DIR
+	rm -rf "$TEMP_DIR"
 	echo "Could not download $TARBALL. Exiting."
 	exit 1
 fi
@@ -60,16 +60,12 @@
 
 post_install()
 {
-	echo -n "Processing post install commands..."
 	ln -s /usr/lib/RealPlayer/mozilla/nphelix.so /usr/lib/firefox*/plugins
-	status
 }
 
 post_remove()
 {
-	echo -n "Processing post remove commands..."
 	rm -f /usr/lib/firefox*/plugins/nphelix.so
-	status
 }
 EOT
 
@@ -90,4 +86,4 @@
 
 # Clean
 cd $CUR_DIR
-rm -rf $TEMP_DIR
+rm -rf "$TEMP_DIR"
diff -r df142a9e8a30 -r 6fab3264ba87 gnome-calculator/receipt
--- a/gnome-calculator/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/gnome-calculator/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -37,15 +37,3 @@
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share/locale
 }
-
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 grep/receipt
--- a/grep/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/grep/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure $CONFIGURE_ARGS && 
+	./configure $CONFIGURE_ARGS &&
 	make && make install
 }
 
@@ -27,34 +27,9 @@
 	cp -a $install/usr/bin $fs/usr
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-post_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	for i in grep egrep fgrep ; do
-		bb="$1$(busybox grep bin/$i$ \
-		   "$1"/var/lib/tazpkg/installed/busybox*/files.list | sed q)"
-		readlink "$bb" 2> /dev/null | grep -q busybox || continue
-		rm -f "$bb"
-		ln -s /usr/bin/$i "$bb"
-	done
-	status
-}
-
 post_remove()
 {
-	for i in grep egrep fgrep ; do
-		bb="$1$(busybox grep bin/$i$ \
-		   "$1"/var/lib/tazpkg/installed/busybox*/files.list | sed q)"
-		rm -f "$bb"
-		ln -s /bin/busybox "$bb"
+	for i in grep egrep fgrep; do
+		ln -sf /bin/busybox "/usr/bin/$bb"
 	done
 }
-
-pre_remove()
-{
-	post_remove
-}
diff -r df142a9e8a30 -r 6fab3264ba87 gvfs-smb/receipt
--- a/gvfs-smb/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/gvfs-smb/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -17,15 +17,3 @@
 {
 	. $WOK/gvfs/stuff/split
 }
-
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 libmateweather/receipt
--- a/libmateweather/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/libmateweather/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -17,7 +17,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                   \
+	./autogen.sh               \
 		--prefix=/usr          \
 		--sysconfdir=/etc      \
 		--localstatedir=/var   \
@@ -34,16 +34,3 @@
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/share $fs/usr
 }
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{ 
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 lighttpd/receipt
--- a/lighttpd/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/lighttpd/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -55,8 +55,7 @@
 
 	# Modules.
 	mkdir -p $fs/usr/lib/lighttpd
-	for module in $BASE_MODULES
-	do
+	for module in $BASE_MODULES; do
 		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
 		echo -n "Copying : mod_${module}.so" && status
 	done
@@ -80,21 +79,21 @@
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
 	# Backup config file.
 	if [ -d "$1/etc/lighttpd" ]; then
 		cp -a "$1/etc/lighttpd" "$1/etc/lighttpd.bak"
 	fi
 }
+
 post_install()
 {
-	echo "Processing post-install commands..."
 	# Restore original config.
 	if [ -d "$1/etc/lighttpd.bak" ]; then
 		rm -rf "$1/etc/lighttpd"
 		mv "$1/etc/lighttpd.bak" "$1/etc/lighttpd"
 	fi
+
 	# Just in case.
 	chown www.www "$1/var/log/$PACKAGE"
 	[ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 ||
diff -r df142a9e8a30 -r 6fab3264ba87 linux-libre/receipt
--- a/linux-libre/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/linux-libre/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -18,7 +18,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	# this is code to help update the kernel version faster
 	#for i in $(grep -l 'WANTED="linux-libre"' $WOK/*/receipt)
 	#do
@@ -42,7 +41,7 @@
 		[ -d "$AUFSDIR" ] && rm -rf $AUFSDIR
 		tazwok get-src aufs --target=$AUFSDIR || { report close-bloc; return 1; }
 	fi
-	
+
 	echo "Copying Aufs files and patches..."
 	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
 	cp -a $AUFSDIR/*.patch $stuff
@@ -90,11 +89,11 @@
 	# Build bzImage without modules first
 	cp -f $stuff/$PACKAGE-$VERSION-slitaz.config .config
 	sed -i 's/CONFIG_MODULES=y/# CONFIG_MODULES is not set/' .config
-	
+
 	# We can't keep every driver in staging 
 	sed -i -e 's/^CONFIG_RTL8192/#&/' \
-	       -e 's/^CONFIG_R8187SE/#&/' \
-	       -e 's/^CONFIG_RT2870/#&/' .config
+		-e 's/^CONFIG_R8187SE/#&/' \
+		-e 's/^CONFIG_RT2870/#&/' .config
 	yes '' | make oldconfig
 	make $MAKEFLAGS bzImage || { report close-bloc; return 1; }
 	[ -d $DESTDIR ] || mkdir -p $DESTDIR
@@ -114,14 +113,14 @@
 	[ -s arch/x86/boot/bzImage ] || { report close-bloc; return 1; }
 	mkdir -p $DESTDIR/boot 2> /dev/null
 	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
-	
+
 	[ ! -x /usr/bin/cook ] && report step "Compressing all modules"
-	
+
 	# Compress all modules.
 	$stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
 	ln System.map System.map-modules
 	ln Module.symvers Module.symvers-modules
-	
+
 	if [ ! -x /usr/bin/cook ]; then
 		report close-bloc
 	fi
@@ -130,54 +129,52 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    local path
-    cp -a $install/boot $fs
-    # Compress all modules.
-    #$stuff/gztazmod.sh $install/lib/modules/$VERSION-slitaz
-    path=$fs/lib/modules/$VERSION-slitaz/kernel
-    mkdir -p $path
-    cp -a $install/lib/modules/$VERSION-slitaz/mo* \
+	local path
+	cp -a $install/boot $fs
+	# Compress all modules.
+	#$stuff/gztazmod.sh $install/lib/modules/$VERSION-slitaz
+	path=$fs/lib/modules/$VERSION-slitaz/kernel
+	mkdir -p $path
+	cp -a $install/lib/modules/$VERSION-slitaz/mo* \
 		$fs/lib/modules/$VERSION-slitaz
-    # Get the base modules
-    export src
-    export _pkg
-    mkdir $WOK/$PACKAGE/tmp
-    $stuff/list_modules.sh \
+	# Get the base modules
+	export src
+	export _pkg
+	mkdir $WOK/$PACKAGE/tmp
+	$stuff/list_modules.sh \
 	$(cat stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
-    while read module; do
-    	dir=$(dirname $module)
-    	[ -d $path/$dir ] || mkdir -p $path/$dir
-        cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
-    done < $WOK/$PACKAGE/tmp/modules.list
-    # Remove unresolved links
-    rm -f $fs/lib/modules/$VERSION-slitaz/build
-    rm -f $fs/lib/modules/$VERSION-slitaz/source
+	while read module; do
+		dir=$(dirname $module)
+		[ -d $path/$dir ] || mkdir -p $path/$dir
+		cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
+	done < $WOK/$PACKAGE/tmp/modules.list
+	# Remove unresolved links
+	rm -f $fs/lib/modules/$VERSION-slitaz/build
+	rm -f $fs/lib/modules/$VERSION-slitaz/source
 
-    # Pack all packages with a kernel module
-    for i in $(cd $WOK; grep -l '^WANTED="linux-libre"' */receipt)
-    do
-	[ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1
-	cook ${i%/receipt}
-    done
-    
-    # Check and echo any module in kernel .config that's not added to 
-    # one of linux-* pkgs
-    export PACKAGE
-	$stuff/check_modules.sh 
+	# Pack all packages with a kernel module
+	for i in $(cd $WOK; grep -l '^WANTED="linux-libre"' */receipt); do
+		[ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1
+		cook ${i%/receipt}
+	done
+
+	# Check and echo any module in kernel .config that's not added to
+	# one of linux-* pkgs
+	export PACKAGE
+	$stuff/check_modules.sh
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-    echo "Processing post-install commands..."
-    chroot "$1/" depmod -a $VERSION-slitaz
-    # GRUB stuff.
-    if [ -f "$1/boot/grub/menu.lst" ]; then
-    	root_dev=`cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1`
-		grub_dev=`cat "$1/boot/grub/menu.lst" | grep "root (" | head -n 1`
+	chroot "$1/" depmod -a $VERSION-slitaz
+	# GRUB stuff.
+	if [ -f "$1/boot/grub/menu.lst" ]; then
+		root_dev=$(cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)
+		grub_dev=$(cat "$1/boot/grub/menu.lst" | grep "root (" | head -n 1)
 		# Add new kernel entry in case of upgrade for installed system.
 		if ! grep -q $PACKAGE-$VERSION-slitaz "$1/boot/grub/menu.lst"; then
-    		cat >> "$1/boot/grub/menu.lst" << EOT
+			cat >> "$1/boot/grub/menu.lst" <<EOT
 
 title SliTaz GNU/Linux (Kernel $VERSION-slitaz)
 $grub_dev
@@ -185,7 +182,7 @@
 EOT
 		fi
 		# Display information message.
-    	cat <<EOT
+		cat <<EOT
 ----
 GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
 
@@ -194,6 +191,6 @@
 kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
 ----
 EOT
-    fi
-    true
+	fi
+	true
 }
diff -r df142a9e8a30 -r 6fab3264ba87 linux64-aufs/receipt
--- a/linux64-aufs/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/linux64-aufs/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -32,15 +32,15 @@
 		-e 's|CONFIG_AUFS_BR_RAMFS =.*|CONFIG_AUFS_BR_RAMFS = y|' \
 		-e 's|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 = y|' \
 		-e 's|CONFIG_AUFS_DEBUG =.*|CONFIG_AUFS_DEBUG =|' config.mk
-		
+
 	# The sed fixes are from gentoo portage build.
 	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
 	sed -i "s:__user::g" include/linux/aufs_type.h
-	
+
 	# Linux 3.2.71 support
 	sed -i 's/d_u.d_child/d_child/' fs/aufs/dcsub.c fs/aufs/hnotify.c
 	sed -i 's/ d_alias/ d_u.d_alias/' fs/aufs/hnotify.c fs/aufs/export.c
-	
+
 	make -j 1 KDIR=/usr/src/linux
 	xz -f fs/aufs/aufs.ko
 }
@@ -59,12 +59,10 @@
 # Post install/remove commands for Tazpkg.
 post_install()
 {
-	echo "Processing post-install commands..."
 	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz64
 }
 
 post_remove()
 {
-	echo "Processing post-remove commands..."
 	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz64
 }
diff -r df142a9e8a30 -r 6fab3264ba87 linux64/receipt
--- a/linux64/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/linux64/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -18,55 +18,53 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    local path
-    install=$install/linux64
-    src=$WOK/$PACKAGE/source/tmp
-    cp -a $install/boot $fs
-    path=$fs/lib/modules/$VERSION-slitaz64/kernel
-    mkdir -p $path
-    cp -a $install/lib/modules/$VERSION-slitaz64/mo* \
+	local path
+	install=$install/linux64
+	src=$WOK/$PACKAGE/source/tmp
+	cp -a $install/boot $fs
+	path=$fs/lib/modules/$VERSION-slitaz64/kernel
+	mkdir -p $path
+	cp -a $install/lib/modules/$VERSION-slitaz64/mo* \
 		$fs/lib/modules/$VERSION-slitaz64
 
-    # Get the base modules
-    export src
-    export install
-    mkdir -p $WOK/$PACKAGE/source/tmp
-    $wanted_stuff/list_modules.sh \
+	# Get the base modules
+	export src
+	export install
+	mkdir -p $WOK/$PACKAGE/source/tmp
+	$wanted_stuff/list_modules.sh \
 	$(cat $stuff/modules64.list) > $WOK/$PACKAGE/source/tmp/modules.list
-    while read module; do
-    	dir=$(dirname $module)
-    	[ -d $path/$dir ] || mkdir -p $path/$dir
-        cp -a $install/lib/modules/$VERSION-slitaz64/kernel/$module $path/$dir
-    done < $WOK/$PACKAGE/source/tmp/modules.list
-    # Remove unresolved links
-    rm -f $fs/lib/modules/$VERSION-slitaz64/build
-    rm -f $fs/lib/modules/$VERSION-slitaz64/source
-    # Cook all packages with a kernel module
-    for i in $(cd $WOK; grep -l 'cook linux64$' */receipt)
-    do
-    	echo cook ${i%/receipt}
-    done
-    # Fixed modules.dep to use right path
-    # saves 100kb of space too
-    sed -i "s|$install||g" $fs/lib/modules/$VERSION-slitaz64/modules.dep
-    sed -i "s|99.98.$VERSION-slitaz|$VERSION-slitaz|g" $fs/lib/modules/$VERSION-slitaz64/modules.dep
-    # Check and echo any module in kernel .config that's not added to 
-    # one of linux-* pkgs
+	while read module; do
+		dir=$(dirname $module)
+		[ -d $path/$dir ] || mkdir -p $path/$dir
+		cp -a $install/lib/modules/$VERSION-slitaz64/kernel/$module $path/$dir
+	done < $WOK/$PACKAGE/source/tmp/modules.list
+	# Remove unresolved links
+	rm -f $fs/lib/modules/$VERSION-slitaz64/build
+	rm -f $fs/lib/modules/$VERSION-slitaz64/source
+	# Cook all packages with a kernel module
+	for i in $(cd $WOK; grep -l 'cook linux64$' */receipt); do
+		echo cook ${i%/receipt}
+	done
+	# Fixed modules.dep to use right path
+	# saves 100kb of space too
+	sed -i "s|$install||g" $fs/lib/modules/$VERSION-slitaz64/modules.dep
+	sed -i "s|99.98.$VERSION-slitaz|$VERSION-slitaz|g" $fs/lib/modules/$VERSION-slitaz64/modules.dep
+	# Check and echo any module in kernel .config that's not added to 
+	# one of linux-* pkgs
 	$wanted_stuff/check_modules.sh 2>&1 | grep -v files.list
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-    echo "Processing post-install commands..."
-    chroot "$root/" depmod -a $VERSION-slitaz64
-    # GRUB stuff.
-    if [ -f "$root/boot/grub/menu.lst" ]; then
-    	root_dev=$(cat $root/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)
+	chroot "$root/" depmod -a $VERSION-slitaz64
+	# GRUB stuff.
+	if [ -f "$root/boot/grub/menu.lst" ]; then
+		root_dev=$(cat $root/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)
 		grub_dev=$(cat $root/boot/grub/menu.lst | grep "root (" | head -n 1)
 		# Add new kernel entry in case of upgrade for installed system.
 		if ! grep -q $PACKAGE-$VERSION-slitaz64 "$1/boot/grub/menu.lst"; then
-    		cat >> "$1/boot/grub/menu.lst" << EOT
+			cat >> "$1/boot/grub/menu.lst" <<EOT
 
 title SliTaz GNU/Linux (Kernel $VERSION-slitaz64)
 $grub_dev
@@ -74,7 +72,7 @@
 EOT
 		fi
 		# Display information message.
-    	cat <<EOT
+		cat <<EOT
 ----
 GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
 
diff -r df142a9e8a30 -r 6fab3264ba87 marco/receipt
--- a/marco/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/marco/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -20,7 +20,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                   \
+	./autogen.sh               \
 		--prefix=/usr          \
 		--sysconfdir=/etc      \
 		--localstatedir=/var   \
@@ -40,15 +40,3 @@
 	cp -a $install/usr/share/themes	$fs/usr/share
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 }
-
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 mate-panel/receipt
--- a/mate-panel/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/mate-panel/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -21,7 +21,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                   \
+	./autogen.sh               \
 		--prefix=/usr          \
 		--sysconfdir=/etc      \
 		--localstatedir=/var   \
@@ -40,20 +40,8 @@
 	cp -a $install/usr/libexec $fs/usr
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	rm -rf $install/usr/share/help
-	
+
 	# Autostart
-        mkdir -p $fs/etc/xdg/autostart/
+	mkdir -p $fs/etc/xdg/autostart/
 	cp -a $install/usr/share/applications/* $fs/etc/xdg/autostart/
 }
-
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 mate-system-monitor/receipt
--- a/mate-system-monitor/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/mate-system-monitor/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -18,7 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./autogen.sh                           \
+	./autogen.sh                       \
 		--prefix=/usr                  \
 		--libexecdir=/usr/lib/$PACKAGE \
 		--with-gtk=2.0                 \
@@ -34,16 +34,3 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/glib-2.0 $fs/usr/share
 }
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove()
-{ 
-	echo "Processing post-remove commands..."
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff -r df142a9e8a30 -r 6fab3264ba87 mk-livestatus/receipt
--- a/mk-livestatus/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/mk-livestatus/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -16,7 +16,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure &&
 	make && make -j1 install
 }
@@ -31,9 +30,8 @@
 
 post_install()
 {
-	echo "Processing post-install commands..."
 	# Modify nagios config
-	cat <<EOT>> "$1/etc/nagios/nagios.cfg"
+	cat >> "$1/etc/nagios/nagios.cfg" <<EOT
 broker_module=/usr/lib/mk-livestatus/livestatus.o /var/lib/nagios/rw/live
 event_broker_options=-1
 EOT
diff -r df142a9e8a30 -r 6fab3264ba87 mpd/receipt
--- a/mpd/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/mpd/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -14,12 +14,12 @@
 DEPENDS="libid3tag libmad libogg libvorbis libsamplerate flac alsa-lib \
 audiofile faad2 lame sqlite libcurl glib libcrypto libwrap"
 BUILD_DEPENDS="alsa-lib-dev zlib-dev libid3tag-dev libsamplerate-dev \
-libmad-dev libogg-dev libvorbis-dev flac-dev audiofile-dev faad2-dev 
+libmad-dev libogg-dev libvorbis-dev flac-dev audiofile-dev faad2-dev \
 glib-dev lame-dev libwrap-dev curl-dev"
 
 # Handle SliTaz arch
 case "$SLITAZ_ARCH" in
-	arm) 
+	arm)
 		DEPENDS="alsa-lib zlib glib lame libmad libsamplerate libwrap \
 libogg libvorbis" ;;
 esac
@@ -34,7 +34,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i 's/<stdbool.h>/&\n#include <stdio.h>/' src/decoder_api.h
 	./configure \
 		--disable-jack \
@@ -60,10 +59,9 @@
 
 post_install()
 {
-	echo "Processing post-install commands..." 
-
+	newline
 	# Drop root priviledges and enable pid file
-	echo -n "Enabling mpd.conf..."
+	action 'Enabling mpd.conf...'
 	cd $root/etc
 	sed -i 's/#music_directory/music_directory/; \
 	s/#playlist_directory/playlist_directory/; \
@@ -72,9 +70,9 @@
 	s/#user				"nobody"/user				"tux"/; \
 	s/#bind_to_address		"any"/bind_to_address			"localhost"/' mpd.conf 
 	status
-	
+
 	# Make mpd directories and files
-	echo -n "Enabling mpd files and directories..."
+	action 'Enabling mpd files and directories...'
 	mkdir $root/etc/skel/music
 	mkdir -p $root/etc/skel/.mpd/playlists
 	touch $root/etc/skel/.mpd/mpd.log
@@ -82,4 +80,3 @@
 	cp -f $root/etc/mpd.conf /etc/skel/.mpd
 	status
 }
-	
diff -r df142a9e8a30 -r 6fab3264ba87 ndiswrapper-driver/receipt
--- a/ndiswrapper-driver/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/ndiswrapper-driver/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -27,21 +27,9 @@
 {
 	EXTRAVERSION=_${kvers}
 	mkdir -p $fs/usr/sbin $fs/sbin $fs/lib/modules/${kvers}-slitaz/kernel/misc
-	
-	# Install utilities	
+
+	# Install utilities
 	install -o root -m 0755 $src/utils/loadndisdriver $fs/sbin/
 	install -o root -m 0644 $src/driver/ndiswrapper.ko.xz \
 		$fs/lib/modules/${kvers}-slitaz/kernel/misc/ndiswrapper.ko.xz
 }
-
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
-}
diff -r df142a9e8a30 -r 6fab3264ba87 nginx-extras/receipt
--- a/nginx-extras/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/nginx-extras/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -20,9 +20,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		--conf-path=/etc/nginx/nginx.conf \
 		--pid-path=/var/run/nginx.pid \
 		--lock-path=/var/lock/nginx.lock \
@@ -60,47 +59,49 @@
 	make &&
 	make DESTDIR=$DESTDIR install
 
-		# not yet available - perftools dep lib
-		#--with-google_perftools_module \
+	# not yet available - perftools dep lib
+	#--with-google_perftools_module \
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
 genpkg_rules()
 {
-        cp -a $install/* $fs/
-        rm -rf $fs/usr/html
-        cp -a stuff/* $fs
-        sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
+	cp -a $install/* $fs/
+	rm -rf $fs/usr/html
+	cp -a stuff/* $fs
+	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
 }
 
 # Pre and post install commands for Tazpkg.
 # We stop the server by default in case of upgarde.
 pre_install()
 {
-        echo "Processing pre-install commands..."
-        [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
-        # Backup config file.
-        if [ -d "$1/$CONFIG_FILES" ]; then
+	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
+	# Backup config file.
+	if [ -d "$1/$CONFIG_FILES" ]; then
 		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
-        fi
+	fi
 }
+
 post_install()
 {
-        echo "Processing post-install commands..."
-        mkdir -p /var/spool/nginx
-        # Restore original config.
-        if [ -d "$1/$CONFIG_FILES.bak" ]; then
+	mkdir -p /var/spool/nginx
+
+	# Restore original config.
+	if [ -d "$1/$CONFIG_FILES.bak" ]; then
 		rm -rf "$1/$CONFIG_FILES"
 		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
-        fi
-        # Just in case.
-        chown www.www "$1/var/log/$PACKAGE"
-        if [ -z "$1" ]; then
-		for i in apache lighttpd ; do
+	fi
+
+	# Just in case.
+	chown www.www "$1/var/log/$PACKAGE"
+	if [ -z "$1" ]; then
+		for i in apache lighttpd; do
 			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
 		done
 		/etc/init.d/$PACKAGE start
-        fi
-        true
+	fi
+
+	:
 }
diff -r df142a9e8a30 -r 6fab3264ba87 nvidia-96xx/receipt
--- a/nvidia-96xx/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/nvidia-96xx/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -26,7 +26,7 @@
 	make SYSSRC="/usr/src/linux" module 2>&1 | sed s'/ERROR:/error:/' &&
 	xz nvidia.ko
 }
-	
+
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
@@ -34,8 +34,8 @@
 
 	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE
 	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/video
-	mkdir -p $fs/usr/share/doc/$PACKAGE 
-	
+	mkdir -p $fs/usr/share/doc/$PACKAGE
+
 	# Compress and install module
 	cp $src/usr/src/nv/nvidia.ko.xz \
 	$fs/lib/modules/$kvers-slitaz/kernel/drivers/video/
@@ -53,55 +53,43 @@
 	cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11	
 
 	# Links
-	for i in `find $fs -iname *.so*`; do
-		ln -s `basename $i` `dirname $i`/`basename ${i/so.${VERSION}/so/}`
-		ln -s `basename $i` `dirname $i`/`basename ${i/so.${VERSION}/so.1/}`
+	for i in $(find $fs -iname *.so*); do
+		ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so/})
+		ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so.1/})
 	done
 }
 
 pre_install()
 {
-	echo ""
-	echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2"
-	echo "================================================================================"
-	echo "You are installing a package with proprietary license."
-	echo "You must accept the license."
-    echo "================================================================================"
-    echo ""
+	title 'PROPRIETARY LICENSE'
+	echo 'You are installing a package with proprietary license.'
+	echo 'You must accept the license.'
+	footer
 }
 
 post_install()
 {
-	echo "Processing post-install commands..."
+	newline
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 
 	# correct .desktop file file
 	sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop"
 	sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop"
 
-	echo ""
-	echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2"
-	echo "================================================================================"
+	title 'NVIDIA LICENSE INFORMATION'
 	echo "For installing this package, you have to accept the $PACKAGE license."
-	echo "The license is stored in /usr/share/licenses/$PACKAGE "    
+	echo "The license is stored in /usr/share/licenses/$PACKAGE "
 	echo -n "Would you like to read the license (y/N) : "; read anser
-	if [ "$anser" = "y" ]; then
-		cat /usr/share/licenses/"$PACKAGE"/LICENSE | more	
-		echo "" 		
+	if [ "$anser" == 'y' ]; then
+		more /usr/share/licenses/"$PACKAGE"/LICENSE
+		echo
 	fi
-	echo "================================================================================"
+	separator
 	echo -n "Do you accept the license (y/N) : "; read anser
-	if [ "$anser" = "N" ]; then
-		echo "You did not accept the license, Removing the pkg."	
-		tazpkg remove "$PACKAGE"		
+	if [ "$anser" == 'N' ]; then
+		echo "You did not accept the license, Removing the pkg."
+		tazpkg remove "$PACKAGE"
 	fi
-
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	depmod -a
 }
 
 TAZBB_NO_INSTALL="because this is not hardware neutral"
diff -r df142a9e8a30 -r 6fab3264ba87 ocsinventory-agent/receipt
--- a/ocsinventory-agent/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/ocsinventory-agent/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -20,9 +20,7 @@
 {
 	cp $stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
 	cp $stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
-	
-	cd $src
-	
+
 	# don't run postinstall script
 	rm -f run-postinst
 	for p in $stuff/ocsinventory-agent-1.1.2.1.u
@@ -31,7 +29,7 @@
 		patch -p1 -i $p || return 1
 		touch done.$(basename $p)
 	done
-	perl Makefile.PL 
+	perl Makefile.PL
 	rm -f run-postinst
 	make && make DESTDIR=$DESTDIR install
 }
@@ -42,13 +40,12 @@
 	mkdir -p $fs/usr \
 		$fs/etc/ocsinventory-agent \
 		$fs/var/lib/ocsinventory-agent
-		
+
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 }
 
 post_install(){
-	echo "Processing post-install commands..."
 	cat > "$1/etc/ocsinventory-agent/ocsinventory-agent.cfg" <<EOT
 basevardir=/var/lib/ocsinventory-agent
 server=http://localhost/ocsinventory
@@ -60,4 +57,3 @@
 		touch "$1/var/lib/dpkg/status"
 	fi
 }
-
diff -r df142a9e8a30 -r 6fab3264ba87 partimage-pam/receipt
--- a/partimage-pam/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/partimage-pam/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -20,10 +20,13 @@
 {
 	sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h
 	sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp
-	./configure --prefix=/usr --enable-pam \
-	 --sysconfdir=/etc \
-	 --infodir=/usr/share/info \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		--enable-pam \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -40,28 +43,28 @@
 
 post_install()
 {
-	echo "Processing post install commands..."
+	newline
 	echo "Adding user/group partimag..."
 	chroot "$1/" adduser -S -H -D partimag
 
 	echo "Setting permissions for config files"
 	chmod 0600 "$1"/etc/partimaged/*
 	chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/*	
-	
-	echo " Creating image files directory"
+
+	echo "Creating image files directory"
 	chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged"
-	
+
 	echo ""
 	echo -e "\nTo starts $SOURCE server you can run :\n"
-   	echo "/etc/init.d/partimaged start"
-   	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
+	echo "/etc/init.d/partimaged start"
+	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
 }
 
 post_remove()
 {
 	chroot "$1/" deluser partimag
 	chroot "$1/" delgroup partimag
-	
+
 	if [ -f "$1/etc/paritimaged" ]; then
 		rm -rf "$1/etc/partimaged"
 	fi
diff -r df142a9e8a30 -r 6fab3264ba87 partimage/receipt
--- a/partimage/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/partimage/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -15,13 +15,14 @@
 
 # Rules to configure and make the package.
 compile_rules()
-{	
+{
 	sed -i 's/gzFile \*m_gzImageFile/gzFile m_gzImageFile/' src/client/imagefile.h
 	sed -i 's/(gzFile \*) gzdopen/gzdopen/' src/client/imagefile.cpp
-	./configure --prefix=/usr \
-	 --sysconfdir=/etc \
-	 --infodir=/usr/share/info \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
@@ -38,28 +39,28 @@
 
 post_install()
 {
-	echo "Processing post install commands..."
+	echo
 	echo "Adding user/group partimag..."
 	chroot "$1/" adduser -S -H -D partimag
 
 	echo "Setting permissions for config files"
 	chmod 0600 "$1"/etc/partimaged/*
 	chroot "$1/" chown partimag.partimag "$1"/etc/partimaged/*	
-	
-	echo " Creating image files directory"
+
+	echo "Creating image files directory"
 	chroot "$1/" install -g partimag -o partimag -m 0755 -d "$1/var/lib/partimaged"
-	
+
 	echo ""
 	echo -e "\nTo starts $PACKAGE server you can run :\n"
-   	echo "/etc/init.d/partimaged start"
-   	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
+	echo "/etc/init.d/partimaged start"
+	echo -e "Or add partimaged to RUN_DAEMONS in /etc/rcS.conf\n"
 }
 
 post_remove()
 {
 	chroot "$1/" deluser partimag
 	chroot "$1/" delgroup partimag
-	
+
 	if [ -f "$1/etc/paritimaged" ]; then
 		rm -rf "$1/etc/partimaged"
 	fi
diff -r df142a9e8a30 -r 6fab3264ba87 perl-core/receipt
--- a/perl-core/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/perl-core/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -25,6 +25,5 @@
 #
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	rm -f "$1/usr/bin/perl"
 }
diff -r df142a9e8a30 -r 6fab3264ba87 perl-thread/receipt
--- a/perl-thread/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/perl-thread/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -36,6 +36,5 @@
 #
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	rm -f "$1/usr/bin/perl"
 }
diff -r df142a9e8a30 -r 6fab3264ba87 perl/receipt
--- a/perl/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/perl/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -66,6 +66,5 @@
 #
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	rm -f "$1/usr/bin/perl"
 }
diff -r df142a9e8a30 -r 6fab3264ba87 rpm4/receipt
--- a/rpm4/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/rpm4/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -22,14 +22,14 @@
 {
 	cd $src
 	CPPFLAGS="$CPPFLAGS -I/usr/include/nspr -I/usr/include/nss" ./configure \
-	--prefix=/usr  \
-	 --infodir=/usr/share/info \
-	 --with-selinux=no \
-	 --with-lua=no \
-	 --with-dmalloc=no \
-	 --with-efence=no \
-	 --with-external-db \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS &&
+		--prefix=/usr  \
+		--infodir=/usr/share/info \
+		--with-selinux=no \
+		--with-lua=no \
+		--with-dmalloc=no \
+		--with-efence=no \
+		--with-external-db \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
 }
@@ -37,7 +37,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin \
+	mkdir -p \
+		$fs/usr/bin \
 		$fs/usr/lib \
 		$fs/var/lib/rpm \
 		$fs/usr/src/redhat/SOURCES \
@@ -45,7 +46,7 @@
 		$fs/usr/src/redhat/RPMS \
 		$fs/usr/src/redhat/SPECS \
 		$fs/usr/src/redhat/SRPMS
-		
+
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/bin/* $fs/usr/bin
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
@@ -54,26 +55,25 @@
 
 post_install()
 {
-	echo "Processing post install commands..."
-	cmd=`readlink $root/bin/rpm`
-    if [ ! "$cmd" = "/usr/bin/rpm" ]; then
-        echo ""
-        echo "**** Actual RPM link : $cmd"
-        echo ""
-        echo -n "Do you want rpm  for /bin/rpm (Y/n) ? : "; read -t 30 anser
-        if [ "$anser" != "n" ]; then
-            echo ""
-            echo -n "Removing rpm link to make a new one pointing on /usr/bin/rpm..."
-            rm $root/bin/rpm && ln -sf $root/usr/bin/rpm $root/bin/rpm
-            status
-        else
-            echo ""
-            echo "Leaving /bin/rpm to : $cmd"
-        fi
-    fi
-                
-    # Building rpm database.
-	$root/usr/bin/rpm --initdb --quiet
+	cmd=$(readlink $root/bin/rpm)
+	if [ "$cmd" != '/usr/bin/rpm' ]; then
+		echo ''
+		echo "**** Actual RPM link : $cmd"
+		echo ''
+		echo -n 'Do you want rpm for /bin/rpm (Y/n) ? : '; read -t 30 anser
+		if [ "$anser" != 'n' ]; then
+			echo ''
+			action 'Removing rpm link to make a new one pointing on /usr/bin/rpm...'
+			rm $root/bin/rpm && ln -sf $root/usr/bin/rpm $root/bin/rpm
+			status
+		else
+			echo ''
+			echo "Leaving /bin/rpm to : $cmd"
+		fi
+	fi
+
+	# Building rpm database.
+	$1/usr/bin/rpm --initdb --quiet
 }
 
 pre_remove()
@@ -85,10 +85,10 @@
 
 post_remove()
 {
-	echo "Processing post remove commands..."
 	cmd=$(readlink "$1/bin/rpm")
-    	if [ ! "$cmd" = "/bin/rpm" ]; then
-		echo -n "Restore applets from busybox..."
+	if [ "$cmd" != '/bin/rpm' ]; then
+		newline
+		action 'Restore applets from busybox...'
 		ln -sf /bin/busybox "$1/bin/rpm"
 		ln -sf /bin/busybox "$1/usr/bin/rpm2cpio"
 		status
diff -r df142a9e8a30 -r 6fab3264ba87 scim/receipt
--- a/scim/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/scim/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -15,47 +15,49 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd $src
-    while read file; do
-        [ -f done.$file ] && continue
-        echo "Apply $file..."
-        patch -p1 < $stuff/$file || return 1
-        touch done.$file
-    done <<EOT
+	while read file; do
+		[ -f done.$file ] && continue
+		echo "Apply $file..."
+		patch -p1 -i $stuff/$file || return 1
+		touch done.$file
+	done <<EOT
 scim-glibc-2.10.patch
 EOT
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --with-x \
-        --with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
-        --mandir=/usr/share/man \
-        --infodir=/usr/share/info \
-        $CONFIGURE_ARGS 2>&1 | grep -v po/POTFILES &&
-    make $MAKEFLAGS &&
-    make DESTDIR=$DESTDIR install
+
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-x \
+		--with-gtk-im-module-dir=$(ls -d /usr/lib/gtk-2*/2*/immodules/) \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		$CONFIGURE_ARGS 2>&1 | grep -v po/POTFILES &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/share/pixmaps
-    cp -a $install/etc $fs/
-    cp -a $install/usr/bin $fs/usr
-    cp -a $install/usr/lib $fs/usr
-    cp -a $install/usr/share/scim $fs/usr/share
-    cp $install/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
-    find $fs/usr/lib -name '*.la' -exec rm {} \;
-    find $fs/usr/lib -name '*.a' -exec rm {} \;
-    rm -rf $fs/usr/lib/pkgconfig
-    chmod +x $fs/usr/bin/scim-setup
+	mkdir -p $fs/usr/share/pixmaps
+	cp -a $install/etc $fs/
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
+	cp -a $install/usr/share/scim $fs/usr/share
+	cp $install/usr/share/pixmaps/scim-setup.png $fs/usr/share/pixmaps
+	find $fs/usr/lib -name '*.la' -exec rm {} \;
+	find $fs/usr/lib -name '*.a' -exec rm {} \;
+	rm -rf $fs/usr/lib/pkgconfig
+	chmod +x $fs/usr/bin/scim-setup
 }
 
 post_install()
 {
-    echo "Processing post-install commands..."
-    echo -n "Updating gtk.immodules... "
-    chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
-    echo "done."
+	newline
+	action 'Updating gtk.immodules... '
+	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
+	status
+
 cat <<EOT
 In order to start scim and use chinese after boot time,
 add the following code to your autostart.sh(openbox):
@@ -73,5 +75,5 @@
 
 post_remove()
 {
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	/usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
 }
diff -r df142a9e8a30 -r 6fab3264ba87 snort-mysql/receipt
--- a/snort-mysql/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/snort-mysql/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -10,7 +10,8 @@
 WEB_SITE="http://www.snort.org/"
 WGET_URL="http://www.snort.org/downloads/1207"
 DEPENDS="pcre libdnet libdaq libmysqlclient"
-BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev wget zlib-dev mysql-dev flex"
+BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev wget zlib-dev \
+mysql-dev flex"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -30,23 +31,23 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib \
+	mkdir -p \
+		$fs/usr/lib \
 		$fs/etc/snort/rules \
 		$fs/usr/share/snort/schemas \
-		$fs/var/log/snort 
-		
+		$fs/var/log/snort
+
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/snort_dynamic* $fs/usr/lib
-	
+
 	cp -a $src/etc/*.conf* $fs/etc/snort
 	cp -a $src/etc/*.map $fs/etc/snort
 	cp -a $src/schemas/create_mysql  $fs/usr/share/snort/schemas
-	
+
 	# Remove unwanted files
 	rm -f $fs/usr/lib/*/*.*a
 }
 
-
 # Post install commands
 post_install()
 {
@@ -54,43 +55,43 @@
 	local db_pass=snort
 	local db_schema=/usr/share/snort/create_mysql
 
-	echo "Processing post install commands..."
+	newline
 
 	# addgroup snort if needed
-    if ! grep -q snort "$1/etc/group"; then
-        echo -n "Adding group Snort..."
-        chroot "$1/" /bin/addgroup snort
-        status
-    fi
-    # adduser snort if needed
-    if ! grep -q 'snort:' "$1/etc/passwd"; then
-        echo -n "Adding user Snort..."
-        chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
-            -g "Snort Daemon user" -H -D -S -G snort snort
-        status
-    fi
+	if ! grep -q snort "$1/etc/group"; then
+		action 'Adding group snort...'
+		chroot "$1/" /bin/addgroup snort
+		status
+	fi
+	# adduser snort if needed
+	if ! grep -q 'snort:' "$1/etc/passwd"; then
+		action 'Adding user snort...'
+		chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
+			-g "Snort Daemon user" -H -D -S -G snort snort
+		status
+	fi
 	chroot "$1/" chown snort.snort /var/log/snort 
 
 	# Create database
-        if [ -z "$1" ]; then
-                if ( ! mysqladmin -s ping > /dev/null ); then
-                        echo "Starting MySQL server"
-                        ( /etc/init.d/mysql start ; status  ) || exit
-                        sleep 4 #let the mysql daemon start
-                fi
-                if ( ! mysql -u root -Be 'show databases' | grep -q $db_name ); then
-                        echo -n "Create $db_name database"
-                        mysql -Be "create database $db_name" ; 
-                        # We suppose that user does not exist.
-                        # It may be false.
-                        echo  -n "Create user $db_user with password $db_pass"
-                        mysql -Be "grant all privileges on glpi.* to $db_user@'localhost'
-                                identified by '$db_pass'" ; status
-                        # At last create the database for package
-                        echo -n "Create $db_name database schema."
-                        mysql -u $db_user -p${db_pass} $db_name < $db_schema ; status
-
-                fi
-
-        fi
+	if [ -z "$1" ]; then
+		if ( ! mysqladmin -s ping > /dev/null ); then
+			echo 'Starting MySQL server'
+			( /etc/init.d/mysql start ; status  ) || exit
+			sleep 4 #let the mysql daemon start
+		fi
+		if ( ! mysql -u root -Be 'show databases' | grep -q $db_name ); then
+			action 'Create $db_name database'
+			mysql -Be "create database $db_name"
+			status
+			# We suppose that user does not exist.
+			# It may be false.
+			action 'Create user $db_user with password $db_pass'
+			mysql -Be "grant all privileges on glpi.* to $db_user@'localhost' identified by '$db_pass'"
+			status
+			# At last create the database for package
+			action 'Create $db_name database schema.'
+			mysql -u $db_user -p${db_pass} $db_name < $db_schema
+			status
+		fi
+	fi
 }
diff -r df142a9e8a30 -r 6fab3264ba87 spl/receipt
--- a/spl/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/spl/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -16,7 +16,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--with-linux=/usr/src/linux \
@@ -33,16 +32,3 @@
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/lib $fs
 }
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
-}
-
-post_remove()
-{
-	echo "Processing post-remove commands..."
-	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
-}
diff -r df142a9e8a30 -r 6fab3264ba87 sudo-pam/receipt
--- a/sudo-pam/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/sudo-pam/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -18,7 +18,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--sysconfdir=/etc \
 		--with-pam \
@@ -42,7 +41,6 @@
 
 pre_install()
 {
-	echo "Processing pre-install commands..."
 	if [ -f "$1/etc/sudoers.bak" ]; then
 		cp "$1/etc/sudoers" "$1/etc/sudoers.bak"
 	fi
@@ -50,7 +48,6 @@
 
 post_install()
 {
-	echo "Processing post-install commands..."
 	if [ -f "$1/etc/sudoers.bak" ]; then
 		rm -f "$1/etc/sudoers"
 		mv "$1/etc/sudoers.bak" "$1/etc/sudoers"
@@ -58,9 +55,9 @@
 		chown root.root "$1/etc/sudoers"
 		chmod 0440 "$1/etc/sudoers"
 	fi
-}                        
+}
 
 pre_remove()
 {
-	tazpkg get-install  ${PACKAGE%-pam}
+	tazpkg get-install ${PACKAGE%-pam}
 }
diff -r df142a9e8a30 -r 6fab3264ba87 transmission/receipt
--- a/transmission/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/transmission/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -20,7 +20,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	touch third-party/miniupnp/VERSION
 	CFLAGS="$CFLAGS -fdata-sections -ffunction-sections \
 	-Wl,--gc-sections"
@@ -47,11 +46,4 @@
 {
 	rm -f "$1/usr/bin/transmission-gtk"
 	rm -f "$1/usr/share/applications/${PACKAGE}-gtk.desktop"
-	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }
-
-post_remove()
-{
-        echo "Processing post-remove commands..."
-        chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}        
diff -r df142a9e8a30 -r 6fab3264ba87 ttf-bitstream-vera/receipt
--- a/ttf-bitstream-vera/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/ttf-bitstream-vera/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -15,15 +15,14 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share/fonts/truetype/ttf-bitstream-vera	
-    cp -a $src/*.ttf $fs/usr/share/fonts/truetype/ttf-bitstream-vera
-    rm $fs/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMoB*
-    rm $fs/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMoIt*
+	mkdir -p $fs/usr/share/fonts/truetype/ttf-bitstream-vera
+	cp -a $src/*.ttf $fs/usr/share/fonts/truetype/ttf-bitstream-vera
+	rm $fs/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMoB*
+	rm $fs/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMoIt*
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-  echo "Processing post-install commands..."
-  chroot "$1/" /usr/bin/fc-cache
+	chroot "$1/" /usr/bin/fc-cache
 }
diff -r df142a9e8a30 -r 6fab3264ba87 vim-tiny/receipt
--- a/vim-tiny/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/vim-tiny/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -24,20 +24,20 @@
 	# define the place for the global vimrc file (set to /etc/vim/vimrc)
 	# (patch from Arch Linux PKGBUILD)
 	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
-	
+
 	./configure --prefix=/usr \
-	 --cache-file=$PWD/config.cache \
-	 --infodir=/usr/share/info \
-	 --with-features=tiny \
-	 --with-x=no \
-	 --disable-gui \
-         --enable-multibyte \
-	 --with-vim-name=$PACKAGE \
-	 --disable-acl \
-	 --disable-motif-check \
-	 --disable-athena-check \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
-	 
+		--cache-file=$PWD/config.cache \
+		--infodir=/usr/share/info \
+		--with-features=tiny \
+		--with-x=no \
+		--disable-gui \
+		--enable-multibyte \
+		--with-vim-name=$PACKAGE \
+		--disable-acl \
+		--disable-motif-check \
+		--disable-athena-check \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
 	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
 	make DESTDIR=$DESTDIR install
 	mkdir -p $DESTDIR/etc/vim
@@ -48,7 +48,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share $fs/etc
-	
+
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/vim $fs/usr/share
 	cp -a $install/etc/vim $fs/etc
@@ -57,28 +57,26 @@
 
 post_install()
 {
-    echo "Processing post-install commands..."
-    cmd=$(readlink "$1/bin/vi")
-    if [ ! "$cmd" = "/usr/bin/vim" ]; then
-        echo ""
-        echo "**** Actual VI link : $cmd"
-        echo ""
-        echo -n "Do you want vim  for /bin/vi (y/N) ? : "; read -t 30 anser
-        if [ "$anser" == "y" ]; then
-            echo ""
-            echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..."
-            rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
-            status
-        else
-            echo ""
-            echo "Leaving /bin/vi to : $cmd"
-        fi
-    fi
+	cmd=$(readlink "$1/bin/vi")
+	if [ "$cmd" != '/usr/bin/vim' ]; then
+		echo ''
+		echo "**** Actual VI link : $cmd"
+		echo ''
+		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		if [ "$anser" == 'y' ]; then
+			echo ''
+			action 'Removing vi link to make a new one pointing on /usr/bin/vim...'
+			rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi"
+			status
+		else
+			echo ''
+			echo "Leaving /bin/vi to : $cmd"
+		fi
+	fi
 }
 
 post_remove()
 {
 	# restore previous symlink
-	echo "Processing post-remove commands..."
 	ln -sf /bin/busybox "$1/bin/vi"
 }
diff -r df142a9e8a30 -r 6fab3264ba87 vim/receipt
--- a/vim/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/vim/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -23,18 +23,19 @@
 	# define the place for the global vimrc file (set to /etc/vim/vimrc)
 	# (patch from Arch Linux PKGBUILD)
 	sed -i 's|^.*\(#define SYS_VIMRC_FILE\).*$|\1 "/etc/vim/vimrc"|' $src/src/feature.h
-	
-	./configure --prefix=/usr \
-	 --cache-file=$PWD/config.cache \
-	 --infodir=/usr/share/info \
-	 --with-features=normal \
-	 --with-x=no \
-	 --disable-gui \
- 	 --enable-multibyte \
-	 --disable-motif-check \
-	 --disable-athena-check \
-	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
-	 
+
+	./configure \
+		--prefix=/usr \
+		--cache-file=$PWD/config.cache \
+		--infodir=/usr/share/info \
+		--with-features=normal \
+		--with-x=no \
+		--disable-gui \
+		--enable-multibyte \
+		--disable-motif-check \
+		--disable-athena-check \
+		--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
 	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/vim73 MAKE="make -e" &&
 	make DESTDIR=$DESTDIR install
 	mkdir -p $DESTDIR/etc/vim
@@ -53,28 +54,26 @@
 
 post_install()
 {
-    echo "Processing post-install commands..."
-    cmd=$(readlink "$1/bin/vi")
-    if [ ! "$cmd" = "/usr/bin/vim" ]; then
-        echo ""
-        echo "**** Actual VI link : $cmd"
-        echo ""
-        echo -n "Do you want vim  for /bin/vi (y/N) ? : "; read -t 30 anser
-        if [ "$anser" == "y" ]; then
-            echo ""
-            echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..."
-            rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
-            status
-        else
-            echo ""
-            echo "Leaving /bin/vi to : $cmd"
-        fi
-    fi
+	cmd=$(readlink "$1/bin/vi")
+	if [ "$cmd" != '/usr/bin/vim' ]; then
+		echo ''
+		echo "**** Actual VI link : $cmd"
+		echo ''
+		echo -n 'Do you want vim  for /bin/vi (y/N) ? : '; read -t 30 anser
+		if [ "$anser" == 'y' ]; then
+			echo ''
+			echo -n 'Removing vi link to make a new one pointing on /usr/bin/vim...'
+			rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi"
+			status
+		else
+			echo ''
+			echo "Leaving /bin/vi to : $cmd"
+		fi
+	fi
 }
 
 post_remove()
 {
 	# restore previous symlink
-	echo "Processing post-remove commands..."
 	ln -sf /bin/busybox "$1/bin/vi"
 }
diff -r df142a9e8a30 -r 6fab3264ba87 which/receipt
--- a/which/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/which/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -31,18 +30,7 @@
 	cp -a $install/usr/bin $fs/usr
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	echo "Processing pre-install commands..."
-	echo -n "Removing all Busybox replaced utils... "
-	rm -f "$1/usr/bin/which"
-	status
-}
-
 post_remove()
 {
 	ln -s /bin/busybox /usr/bin/which
-}
\ No newline at end of file
+}
diff -r df142a9e8a30 -r 6fab3264ba87 xz/receipt
--- a/xz/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/xz/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -19,7 +19,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--enable-dynamic=yes \
 		--enable-small \
@@ -32,25 +31,4 @@
 {
 	mkdir -p $fs/usr/bin $fs/usr/lib
 	cp -a $install/usr/bin/xz $fs/usr/bin
-	#cp $stuff/lzma $fs/usr/bin
-	#ln -s lzma $fs/usr/bin/unlzma
-	#ln -s lzma $fs/usr/bin/lzcat
 }
-
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-#pre_install()
-#{
-#	echo "Processing pre-install commands..."
-#	echo -n "Removing all Busybox replaced utils... "
-#	rm -f "$1/usr/bin/unlzma"
-#	rm -f "$1/usr/bin/lzcat"
-#	status
-#}
-
-#post_remove()
-#{
-#	ln -s /bin/busybox "$1/usr/bin/unlzma"
-#	ln -s /bin/busybox "$1/usr/bin/lzcat"
-#}
diff -r df142a9e8a30 -r 6fab3264ba87 zsh/receipt
--- a/zsh/receipt	Wed Dec 23 22:04:20 2015 +0100
+++ b/zsh/receipt	Fri Dec 25 15:23:46 2015 +0200
@@ -28,14 +28,14 @@
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
-{	
+{
 	cp -a $install/bin $fs
 
 	# Config files.
-	#
+
 	mkdir $fs/etc
 	cp $stuff/example.zshrc $fs/etc/zshrc
-	
+
 	#no way around this... gen_package will not automatically copy these
 	mkdir -p $fs/usr/share/zsh
 	cp -r $install/usr/share/zsh/functions $fs/usr/share/zsh
@@ -48,21 +48,20 @@
 #
 post_install()
 {
-	echo "Processing post-install commands..."
 	sh=$(readlink "$1/bin/sh")
-	if [ ! "$sh" = "/bin/zsh" ]; then
-		echo ""
+	if [ "$sh" != '/bin/zsh' ]; then
+		echo ''
 		echo "**** Actual SH link : $sh"
-		echo ""
-		echo -n "Do you want Zsh for /bin/sh (y/N) ? : "
+		echo ''
+		echo -n 'Do you want Zsh for /bin/sh (y/N) ? : '
 		read -t 30 answer < /dev/tty
-		if [ "$answer" == "y" ]; then
-			echo ""
-			echo -n "Removing sh link to make a new one pointing on /bin/zsh..."
+		if [ "$answer" == 'y' ]; then
+			echo ''
+			action 'Removing sh link to make a new one pointing on /bin/zsh...'
 			rm "$1/bin/sh" && ln -s /bin/zsh "$1/bin/sh"
 			status
 		else
-			echo ""
+			echo ''
 			echo "Leaving /bin/sh to : $sh"
 		fi
 	fi
@@ -71,9 +70,6 @@
 # Restore a valid sh link if needed.
 pre_remove()
 {
-        sh=$(readlink "$1/bin/sh")
-        if [ ! "$sh" = "busybox" ]; then
-                rm "$1/bin/sh" &&
-                ln -s /bin/busybox "$1/bin/sh"
-        fi
+	sh=$(readlink "$1/bin/sh")
+	[ "$sh" != 'busybox' ] && ln -sf /bin/busybox "$1/bin/sh"
 }