# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1541160908 -7200
# Node ID d5aab818505efdff501fb4442bdeefc3e7bf05cb
# Parent  ad29ddfee1c944c280fac3b7c90a7adefc78ca20
Cleaning is almost finished... I should proceed to upgrades.

diff -r ad29ddfee1c9 -r d5aab818505e 0install/receipt
--- a/0install/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/0install/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 # Can't build newer OCaml based version 2.13
 
 compile_rules() {
-	python -B setup.py install --root=$DESTDIR || return 1
+	python -B setup.py install --root=$install || return 1
 
 	# move man pages into a right place
 	mv $install/usr/man $install/usr/share
diff -r ad29ddfee1c9 -r d5aab818505e 8086tiny/.icon.png
Binary file 8086tiny/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e 915resolution/receipt
--- a/915resolution/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/915resolution/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.3"
 CATEGORY="system-tools"
 SHORT_DESC="Intel video BIOS hack to support certain resolutions"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://915resolution.mango-lang.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e LibreOffice/.icon.png
Binary file LibreOffice/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e LibreOffice/receipt
--- a/LibreOffice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/LibreOffice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL2"
 WEB_SITE="https://www.libreoffice.org/"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="libreoffice"
 
 case $ARCH in
@@ -18,9 +17,9 @@
 TARBALL="LibreOffice_${VERSION}_Linux_${lo_arch2}_deb.tar.gz"
 WGET_URL="http://download.documentfoundation.org/libreoffice/stable/$VERSION/deb/$lo_arch/$TARBALL"
 
-SPLIT="LibreOffice-langpack-de LibreOffice-langpack-es LibreOffice-langpack-fr \
-LibreOffice-langpack-it LibreOffice-langpack-pt-BR LibreOffice-langpack-ru \
-LibreOffice LibreOffice-extra"
+SPLIT="$PACKAGE-langpack-de $PACKAGE-langpack-es $PACKAGE-langpack-fr \
+$PACKAGE-langpack-it $PACKAGE-langpack-pt-BR $PACKAGE-langpack-ru \
+$PACKAGE $PACKAGE-extra"
 
 sizes() { du -chs ${1:-$fs} | awk 'END{print $1}'; }
 
diff -r ad29ddfee1c9 -r d5aab818505e QtWeb/.icon.png
Binary file QtWeb/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e QtWeb/receipt
--- a/QtWeb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/QtWeb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -2,88 +2,68 @@
 
 PACKAGE="QtWeb"
 COMMIT="5ba3e1c0cf22fba7bdfc97f14727843c11c9d556"
-VERSION=${COMMIT:0:4}
+VERSION=${COMMIT:0:4}	# FIXME
 CATEGORY="network"
 SHORT_DESC="Customizable Qt4 WebKit browser with opera-like gestures"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="http://qtweb.googlecode.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 #WGET_URL="https://github.com/magist3r/$PACKAGE/archive/fffaddce36.tar.gz"
 WGET_URL="https://github.com/RomanChebotarev/$PACKAGE/archive/$COMMIT.tar.gz"
-TAGS="web-browser"
 
-DEPENDS="qt5 cacerts"
 BUILD_DEPENDS="qmake qt5-dev qtwebkit mesa-dev xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	sed -i 's/static/shared/' QtWeb.pro
 	sed -i 's/QTPLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs qico//' QtWeb.pro
 	sed -i 's|http://www.qtweb.net/")|file:/usr/share/webhome/index.html")|g' \
 	settings.cpp browsermainwindow.cpp tabwidget.cpp
-	
-	# sed -i 's/* 0.9;/* ;/' browsermainwindow.cpp
+
+	# sed -i 's|* 0.9;|* ;|' browsermainwindow.cpp
 	sed 's|<QPrint|<QtPrintSupport/QPrint|' -i browsermainwindow.cpp savepdf.cpp
 
 	export CXXFLAGS="$CXXFLAGS -std=gnu++98"
 
-	# Save profile to ~./config ; ~/.local/share/data instead of /tmp:
+	# Save profile to ~./config; ~/.local/share/data instead of /tmp:
 	sed -i 's/unins000.exe/QtWeb/' browserapplication.cpp
-	
+
 	RTOOLBAR="./data/defaultbookmarks.xbel"
 	sed -i '33d' $RTOOLBAR
 	sed -i 33i\ '<bookmark href="http://tazpanel:82/">' $RTOOLBAR
 	sed -i 's/NTFS Disk Tools/WebkitVideo/' $RTOOLBAR
 	sed -i "15,29d" $RTOOLBAR
-	
-	qmake && sed -i 's|-O2|'"$CFLAGS"'|g' Makefile && make $MAKEFLAGS
+
+	qmake &&
+	sed -i 's|-O2|'"$CFLAGS"'|g' Makefile &&
+	make $MAKEFLAGS || return 1
+
 	mkdir -p $install
 	install $src/src/$PACKAGE $install/$PACKAGE
 	rm -rf  $src/src/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/share/applications
+genpkg_rules() {
+	mkdir -p $fs/usr/bin
 	cp -f $install/* $fs/usr/bin
-	cd $fs/usr/share/applications
-	cat>'QtWeb.desktop' << EOT
-[Desktop Entry]
-Type=Application
-Name=QtWeb
-Exec=/usr/bin/QtWeb
-Icon=browser
-Categories=Network;WebBrowser;
-EOT
-
+	install -Dm644 $stuff/qtweb.desktop $fs/usr/share/applications/QtWeb.desktop
+	install -Dm644 $stuff/QtWeb\ Internet\ Browser.conf \
+		$fs/etc/skel/.config/QtWeb.NET/QtWeb\ Internet\ Browser.conf
+	DEPENDS="qt5 cacerts"
+	TAGS="web-browser"
 }
 
-post_install()
-{
-	cd "$1/tmp" ; cat>'QtWeb Internet Browser.conf' << EOT
-[MainWindow]
-downloadAudioVideo=true
-style=Cleanlooks
-home=file:/usr/share/webhome/index.html
-ToolbarSize=80%
-ShowTabbarWhenOneTab=true
-[AddressBar]
-showGoHome=true
-showAppStyle=false
-showPrivacyMode=false
-showPreferences=true
-showCompatibility=false
-showDisableJavascript=true
-EOT
+post_install() {
+	for i in $(ls "$1/home" 2>/dev/null); do
+		[ -f "$1/home/$i/.config/QtWeb.NET/QtWeb Internet Browser.conf" ] &&
+			continue
 
-	for i in $(ls "$1/home" 2> /dev/null); do
-		[ -f "$1/home/$i/.config/QtWeb.NET/QtWeb Internet Browser.conf" ] && continue
 		mkdir -p "$1/home/$i/.config/QtWeb.NET"
-		cp "$1/tmp/QtWeb Internet Browser.conf" "$1/home/$i/.config/QtWeb.NET"
-		chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config/QtWeb.NET"
+		cp "$1/etc/skel/.config/QtWeb.NET/QtWeb Internet Browser.conf" \
+			"$1/home/$i/.config/QtWeb.NET"
+		chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") \
+			"/home/$i/.config/QtWeb.NET"
 	done
 }
diff -r ad29ddfee1c9 -r d5aab818505e QtWeb/stuff/QtWeb Internet Browser.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QtWeb/stuff/QtWeb Internet Browser.conf	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,13 @@
+[MainWindow]
+downloadAudioVideo=true
+style=Cleanlooks
+home=file:/usr/share/webhome/index.html
+ToolbarSize=80%
+ShowTabbarWhenOneTab=true
+[AddressBar]
+showGoHome=true
+showAppStyle=false
+showPrivacyMode=false
+showPreferences=true
+showCompatibility=false
+showDisableJavascript=true
diff -r ad29ddfee1c9 -r d5aab818505e QtWeb/stuff/qtweb.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/QtWeb/stuff/qtweb.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=QtWeb
+Exec=/usr/bin/QtWeb
+Icon=browser
+Categories=Network;WebBrowser;
diff -r ad29ddfee1c9 -r d5aab818505e R/.icon.png
Binary file R/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e R/receipt
--- a/R/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/R/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.4.2"
 CATEGORY="office"
 SHORT_DESC="Free software environment for statistical computing and graphics"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.r-project.org/"
 REPOLOGY="r"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="automake gfortran readline-dev xorg-imake icu-dev \
 xorg-libX11-dev xorg-libICE-dev xorg-libXt-dev xorg-libXmu-dev cairo-dev \
 pango-dev tcl-dev tk-dev zlib-dev pcre-dev curl-dev libjpeg-turbo-dev libpaper"
-SPLIT="R-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export R_BROWSER="midori"
diff -r ad29ddfee1c9 -r d5aab818505e aalib/receipt
--- a/aalib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aalib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4rc5"
 CATEGORY="multimedia"
 SHORT_DESC="A portable ASCII art graphic library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://aa-project.sourceforge.net/aalib/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/aalib.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/aa-project/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev xorg-libXt-dev xorg-libX11-dev"
-SPLIT="aalib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e aaphoto/receipt
--- a/aaphoto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aaphoto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.45"
 CATEGORY="graphics"
 SHORT_DESC="Automatic photo adjusting"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://log69.com/aaphoto_en.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e abiword/.icon.png
Binary file abiword/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e abiword/receipt
--- a/abiword/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/abiword/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="3.0.2"
 CATEGORY="office"
 SHORT_DESC="Light and speed word processing application"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.abisource.com/"
+WEB_SITE="https://www.abisource.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.abisource.com/downloads/abiword/$VERSION/source/$TARBALL"
@@ -16,9 +16,9 @@
 BUILD_DEPENDS="gtk3-dev python-pygobject-dev gobject-introspection-dev \
 fribidi-dev libglade-dev popt-dev libxml2-dev libart_lgpl-dev \
 libgsf-dev enchant-dev wv-dev libcroco-dev boost-dev librsvg-dev gtk-doc \
-bison goffice-dev  intltool gettext xorg-dev zlib-dev libjpeg-turbo-dev"
+bison goffice-dev intltool gettext-dev xorg-dev zlib-dev libjpeg-turbo-dev"
 # libgnomeprint-dev libgnomeprintui-dev libgnomecanvas-dev
-SPLIT="abiword-plugins abiword abiword-dev"
+SPLIT="$PACKAGE-plugins $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|glib/gmacros.h|glib.h|' goffice-bits/goffice/app/goffice-app.h
@@ -34,10 +34,10 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cd plugins
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e accessx/receipt
--- a/accessx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/accessx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	sed -i 's|$(CC) $(OPTS) ax.C|$(CC) $(LDFLAGS) $(OPTS) ax.C|' Makefile
 
 	make \
-		OPTS="${CXXFLAGS}" \
+		OPTS="$CXXFLAGS" \
 		XLIBDIR="-L/usr/lib" \
 		LLIBS="$(pkg-config --libs xext) $(pkg-config --libs x11)" \
 	|| return 1
diff -r ad29ddfee1c9 -r d5aab818505e acct/receipt
--- a/acct/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/acct/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.6.2"
 CATEGORY="utilities"
 SHORT_DESC="Utilities that report data about users logged on GNU/Linux"
-MAINTAINER="hackdorte@sapo.pt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://savannah.gnu.org/projects/acct/"
 
@@ -15,7 +15,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e acl/receipt
--- a/acl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/acl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.53"
 CATEGORY="system-tools"
 SHORT_DESC="Commands for manipulating POSIX Access Control Lists"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1 GPL2"
 WEB_SITE="http://savannah.nongnu.org/projects/acl/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/acl.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.savannah.gnu.org/releases/acl/$TARBALL"
 
-BUILD_DEPENDS="attr-dev bash libtool gettext"
-SPLIT="acl-dev"
+BUILD_DEPENDS="attr-dev bash libtool gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	rm /bin/rpm 2>/dev/null
@@ -25,7 +25,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/lib
 	mv -v $install/usr/lib/libacl.so.* $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e acme/receipt
--- a/acme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/acme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,6 +8,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/meonwax/acme"
+REPOLOGY="acme-crossassembler"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/meonwax/acme/archive/$COMMIT.tar.gz"
diff -r ad29ddfee1c9 -r d5aab818505e acpid/.icon.png
Binary file acpid/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e acpid/receipt
--- a/acpid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/acpid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.30"
 CATEGORY="system-tools"
 SHORT_DESC="The ACPI event daemon with netlink"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/acpid2/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/acpid.html"
diff -r ad29ddfee1c9 -r d5aab818505e adeskbar/receipt
--- a/adeskbar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/adeskbar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.3"
 CATEGORY="system-tools"
 SHORT_DESC="ADesk Bar - application launcher for Openbox"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://launchpad.net/adeskbar"
 
diff -r ad29ddfee1c9 -r d5aab818505e adminer/.icon.png
Binary file adminer/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e adobe-air-sdk/.icon.png
Binary file adobe-air-sdk/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e adobe-air-sdk/receipt
--- a/adobe-air-sdk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/adobe-air-sdk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Adobe Air Software Development Kit and Runtime Environment"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
-WEB_SITE="http://get.adobe.com/air"
+WEB_SITE="https://get.adobe.com/air/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://airdownload.adobe.com/air/lin/download/$VERSION/AdobeAIRSDK.tbz2"
diff -r ad29ddfee1c9 -r d5aab818505e advancecomp/receipt
--- a/advancecomp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/advancecomp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,13 +8,12 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.advancemame.it/comp-readme"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.gz"
 WGET_URL="$GITHUB/amadvance/advancecomp/tarball/${COMMIT:-v$VERSION}"
 
 BUILD_DEPENDS="automake zlib-dev"
-SPLIT="advancecomp advancecomp-static:static"
+SPLIT="$PACKAGE-static:static"
 
 compile_rules() {
 	./autogen.sh &&
@@ -28,7 +27,8 @@
 			./configure $CONFIGURE_ARGS;;
 	esac &&
 
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e adwaita-icon-theme/.icon.png
Binary file adwaita-icon-theme/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e aescrypt/.icon.png
Binary file aescrypt/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e aescrypt/receipt
--- a/aescrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aescrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="aescrypt"
 VERSION="3.13"
 CATEGORY="security"
-SHORT_DESC="AES Crypt is a file encryption software"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="File encryption software"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.aescrypt.com/"
 
diff -r ad29ddfee1c9 -r d5aab818505e afio/receipt
--- a/afio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/afio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.1"
 CATEGORY="system-tools"
 SHORT_DESC="Archiver program for Linux/UNIX"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://members.chello.nl/~k.holtman/afio.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e aiksaurus/.icon.png
Binary file aiksaurus/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e aiksaurus/receipt
--- a/aiksaurus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aiksaurus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.1"
 CATEGORY="system-tools"
 SHORT_DESC="A cross-platform, open-source thesaurus"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://aiksaurus.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev patch expat-dev xorg-libXau-dev glib-dev"
-SPLIT="aiksaurus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e aircrack-ng-oui/receipt
--- a/aircrack-ng-oui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aircrack-ng-oui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20180930"
 CATEGORY="misc"
 SHORT_DESC="Archive of oui.txt file for airdump-ng"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://standards.ieee.org/products-services/regauth/oui/index.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e aircrack-ng/.icon.png
Binary file aircrack-ng/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e airgeddon/.icon.png
Binary file airgeddon/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e airoscript-ng/.icon.png
Binary file airoscript-ng/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e airoscript-ng/receipt
--- a/airoscript-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/airoscript-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2rc3"
 CATEGORY="network"
 SHORT_DESC="Airoscript ng"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 #WEB_SITE="https://code.google.com/archive/p/airoscript/"
 WEB_SITE="http://airoscript.aircrack-ng.org/"
@@ -19,18 +19,18 @@
 	sed -i '/install-desktop \\/ d' Makefile-Linux
 
 	make -j1 \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		prefix=usr \
-		picdir=$DESTDIR/usr/share/pixmaps/ \
-		appdir=$DESTDIR/usr/share/applications/ \
-		etcdir=$DESTDIR/etc/$PACKAGE \
+		picdir=$install/usr/share/pixmaps/ \
+		appdir=$install/usr/share/applications/ \
+		etcdir=$install/etc/$PACKAGE \
 		install || return 1
 
 	# Patch config - replace "usr/local" by "usr"
-	sed -i 's/usr\/local/usr/g' $DESTDIR/etc/$PACKAGE/airoscript-ng_advanced.conf
+	sed -i 's/usr\/local/usr/g' $install/etc/$PACKAGE/airoscript-ng_advanced.conf
 
 	# Patch executable to find config files
-	sed -i 's/etc\//etc\/airoscript-ng\//g' $DESTDIR/usr/sbin/$PACKAGE
+	sed -i 's/etc\//etc\/airoscript-ng\//g' $install/usr/sbin/$PACKAGE
 
 	cook_pick_manpages $src/src/airoscript-ng.1
 }
diff -r ad29ddfee1c9 -r d5aab818505e airpwn/receipt
--- a/airpwn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/airpwn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4"
 CATEGORY="network"
 SHORT_DESC="A tool for generic packet injection on an 802.11 network"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://airpwn.sourceforge.net/"
 
@@ -27,7 +27,7 @@
 	automake --add-missing
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e airsnort/receipt
--- a/airsnort/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/airsnort/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.7e"
 CATEGORY="network"
 SHORT_DESC="A wireless LAN (WLAN) tool which recovers encryption keys"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://airsnort.shmoo.com/"
 
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e airstrike/.icon.png
Binary file airstrike/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e airstrike/receipt
--- a/airstrike/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/airstrike/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="pre6a"
 CATEGORY="games"
 SHORT_DESC="Incredibly addictive 2D dogfight game"
-MAINTAINER="arca2@hotmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://icculus.org/airstrike/"
 
diff -r ad29ddfee1c9 -r d5aab818505e ajaxterm/receipt
--- a/ajaxterm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ajaxterm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,31 @@
 PACKAGE="ajaxterm"
 VERSION="0.10"
 CATEGORY="network"
-SHORT_DESC="Login terminal for the web."
+SHORT_DESC="Login terminal for the web"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain LGPL"
 WEB_SITE="http://antony.lesuisse.org/software/ajaxterm/"
+
 SOURCE="Ajaxterm"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}files/$TARBALL"
-TAGS="web application"
 
-DEPENDS="python"
-SUGGESTED="apache lighttpd-ssl lighttpd-modules"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cook_pick_manpages $src/ajaxterm.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/ajaxterm
 	cp -a $src/*.py $src/*.js $src/*.css $src/*.html $fs/usr/share/ajaxterm
 	cp -a $stuff/* $fs/
 	chown -R root:root $fs
 	find $fs -type f -name '*.py' -exec chmod a+x \{\} \;
+	DEPENDS="python"
+	SUGGESTED="apache lighttpd-ssl lighttpd-modules"
+	TAGS="web application"
 }
 
-post_install()
-{
+post_install() {
 	grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || sed -i \
 	  's/RUN_DAEMONS="/RUN_DAEMONS="ajaxterm /' "$1/etc/rcS.conf"
 	# Configure lighttpd server
@@ -76,16 +71,21 @@
 		fi
 	fi
 	[ -z "$1" ] && /etc/init.d/ajaxterm start
+
 	[ ! -f "$1/usr/lib/lighttpd/mod_proxy.so" -a \
 	  ! -f "$1/etc/apache/httpd.conf" ] &&
 	  [ -z "$quiet" ] && cat <<EOT
---------
-You should install either lighttpd
-# tazpkg get-install lighttpd-ssl ; tazpkg get-install lighttpd-modules
-or apache
-# tazpkg get-install apache
-and reconfigure
-# tazpkg reconfigure ajaxterm
---------
+
+	.---------------------------------------.
+	| You should install either lighttpd:   |
+	| # tazpkg get-install lighttpd-ssl     |
+	| # tazpkg get-install lighttpd-modules |
+	|                                       |
+	| or apache:                            |
+	| # tazpkg get-install apache           |
+	|                                       |
+	| and reconfigure:                      |
+	| # tazpkg reconfigure ajaxterm         |
+	'---------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e alarm-clock-applet/receipt
--- a/alarm-clock-applet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alarm-clock-applet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="alarm-clock-applet"
 VERSION="0.3.4"
 CATEGORY="x-window"
-SHORT_DESC="Alarm Clock is a fully-featured alarm clock for panel"
+SHORT_DESC="Fully-featured alarm clock for panel"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://alarm-clock.pseudoberries.com/"
diff -r ad29ddfee1c9 -r d5aab818505e alarm-clock/receipt
--- a/alarm-clock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alarm-clock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.3"
 CATEGORY="utilities"
 SHORT_DESC="Simple GTK alarm clock"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 # There's no more website for it. Using wayback machine...
 WEB_SITE="https://web.archive.org/web/20100209072308/http://www.alarm-clock.pl/"
diff -r ad29ddfee1c9 -r d5aab818505e aldo/receipt
--- a/aldo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aldo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="aldo"
 VERSION="0.7.7"
 CATEGORY="misc"
-SHORT_DESC="Morse code learning tool."
+SHORT_DESC="Morse code learning tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.nongnu.org/aldo/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-DEPENDS="libao"
 BUILD_DEPENDS="libao-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libao"
 }
diff -r ad29ddfee1c9 -r d5aab818505e alien/receipt
--- a/alien/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alien/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 compile_rules() {
 	perl Makefile.PL &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	find $install -type f -exec chmod u+w '{}' \;
 }
diff -r ad29ddfee1c9 -r d5aab818505e alpine/.icon.png
Binary file alpine/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e alpine/receipt
--- a/alpine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alpine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,8 @@
 TARBALL="$PACKAGE-$HASH.tar.gz"
 WGET_URL="http://repo.or.cz/alpine.git/snapshot/$HASH.tar.gz"
 
-BUILD_DEPENDS="openssl-dev pam-dev ncurses-dev gfortran gettext hunspell-dev"
+BUILD_DEPENDS="openssl-dev pam-dev ncurses-dev gfortran gettext-dev \
+hunspell-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e alsa-firmware/receipt
--- a/alsa-firmware/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-firmware/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,16 @@
 SHORT_DESC="Sound cards firmware"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-firmware.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/firmware/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e alsa-lib/receipt
--- a/alsa-lib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-lib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.1.6"
 CATEGORY="multimedia"
 SHORT_DESC="ALSA sound libraries"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-lib.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/lib/$TARBALL"
 
-SPLIT="alsa-lib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e alsa-oss/receipt
--- a/alsa-oss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-oss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="ALSA OSS compatibility library"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-oss.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/oss-lib/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev"
-SPLIT="alsa-oss-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e alsa-plugins/receipt
--- a/alsa-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.1.6"
 CATEGORY="multimedia"
 SHORT_DESC="ALSA sound system additionnal plugins"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-plugins.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
diff -r ad29ddfee1c9 -r d5aab818505e alsa-tools/receipt
--- a/alsa-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,24 @@
 VERSION="1.1.6"
 CATEGORY="meta"
 SHORT_DESC="ALSA sound system advanced tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-tools.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/tools/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev gtk2-dev fltk-dev autoconf automake gtk3-dev"
-at='alsa-tools'
 # skip qlo10k1: it requre old Qt
 # skip hdajacksensetest: sysfs-pin-configs.h: No such file or directory
 SPLIT="\
-$at-as10k1      $at-echomixer      $at-envy24control $at-hda-verb \
-$at-hdajack     $at-hdsp           $at-hwmixvolume   $at-ld10k1 \
-$at-ld10k1-dev  $at-mixartloader   $at-pcxhrloader   $at-rmedigicontrol \
-$at-sb16_csp    $at-seq            $at-sscape_ctl    $at-us428control \
-$at-usx2yloader $at-vxloader"
+$PACKAGE-as10k1       $PACKAGE-echomixer   $PACKAGE-envy24control \
+$PACKAGE-hda-verb     $PACKAGE-hdajack     $PACKAGE-hdsp \
+$PACKAGE-hwmixvolume  $PACKAGE-ld10k1      $PACKAGE-ld10k1-dev \
+$PACKAGE-mixartloader $PACKAGE-pcxhrloader $PACKAGE-rmedigicontrol \
+$PACKAGE-sb16_csp     $PACKAGE-seq         $PACKAGE-sscape_ctl \
+$PACKAGE-us428control $PACKAGE-usx2yloader $PACKAGE-vxloader"
 #COOKOPTS="!menus"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e alsa-utils/receipt
--- a/alsa-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsa-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.1.6"
 CATEGORY="multimedia"
 SHORT_DESC="Command line utilities for the ALSA project"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.alsa-project.org/"
+WEB_SITE="http://www.alsa-project.org/main/index.php/Main_Page"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/alsa-utils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/utils/$TARBALL"
 
-BUILD_DEPENDS="alsa-lib-dev ncurses-dev gettext eudev-dev"
-SPLIT="alsa-utils-test alsa-info alsa-utils"
+BUILD_DEPENDS="alsa-lib-dev ncurses-dev gettext-dev eudev-dev"
+SPLIT="$PACKAGE-test alsa-info $PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e alsaplayer/receipt
--- a/alsaplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alsaplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="ece53f6"
 CATEGORY="multimedia"
 SHORT_DESC="ALSA GTK+ PCM audio player"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://alsaplayer.sourceforge.net/" # http://www.alsaplayer.org/
 
diff -r ad29ddfee1c9 -r d5aab818505e alure/receipt
--- a/alure/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/alure/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake openal-dev   libsndfile-dev libvorbis-dev mpg123-dev \
 fluidsynth-dev"
-SPLIT="alure-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e amiwm/.icon.png
Binary file amiwm/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e amsn/.icon.png
Binary file amsn/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e amsn/receipt
--- a/amsn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/amsn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.98.9"
 CATEGORY="network"
 SHORT_DESC="Alvaro's Messenger"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://amsn-project.net/"
+WEB_SITE="http://www.amsn-project.net/"
 
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -24,7 +24,7 @@
 		--with-tcl=/usr/lib \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	fix symlinks
 
diff -r ad29ddfee1c9 -r d5aab818505e amule/receipt
--- a/amule/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/amule/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.3.2"
 CATEGORY="network"
 SHORT_DESC="An eMule-like client for the eD2k and Kademlia networks"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.amule.org/"
 
 TARBALL="aMule-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev perl wxWidgets-dev libupnp-dev cryptopp gettext"
+BUILD_DEPENDS="zlib-dev perl wxWidgets-dev libupnp-dev cryptopp gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e androguard/.icon.png
Binary file androguard/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e androguard/receipt
--- a/androguard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/androguard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,8 @@
 BUILD_DEPENDS="python"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e android-build-tools/.icon.png
Binary file android-build-tools/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e android-build-tools/receipt
--- a/android-build-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/android-build-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,23 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="android-build-tools"
-VERSION="r19.0.3"
+VERSION="19.0.3"
 CATEGORY="development"
-SHORT_DESC="Build-Tools for Google Android SDK (aapt, aidl, dexdump, etc)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Build-Tools for Google Android SDK (aapt, aidl, dexdump, etc.)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="custom"
-SOURCE="build-tools"
-TARBALL="${SOURCE}_${VERSION}-linux.zip"
 WEB_SITE="https://developer.android.com/"
-WGET_URL="http://dl-ssl.google.com/android/repository/$TARBALL"
 HOST_ARCH="i486"
 
-DEPENDS="android-sdk"
+SOURCE="build-tools"
+TARBALL="${SOURCE}_r$VERSION-linux.zip"
+WGET_URL="http://dl-ssl.google.com/android/repository/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}/opt/android-sdk/${SOURCE}
-	cp -a ${src} ${fs}/opt/android-sdk/${SOURCE}/${VERSION#r}
-	chmod -R +Xr ${fs}/opt/android-sdk/${SOURCE}
+
+genpkg_rules() {
+	mkdir -p $fs/opt/android-sdk/$SOURCE
+	cp -a $src $fs/opt/android-sdk/$SOURCE/$VERSION
+	chmod -R +Xr $fs/opt/android-sdk/$SOURCE
+	DEPENDS="android-sdk"
 }
diff -r ad29ddfee1c9 -r d5aab818505e android-platform-tools/.icon.png
Binary file android-platform-tools/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e android-platform-tools/receipt
--- a/android-platform-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/android-platform-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,24 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="android-platform-tools"
-VERSION="r19.0.1"
+VERSION="19.0.1"
 CATEGORY="development"
-SHORT_DESC="Platform-Tools for Google Android SDK (adb and fastboot)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Platform-Tools for Google Android SDK (adb and fastboot)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="custom"
-SOURCE="platform-tools"
-TARBALL="${SOURCE}_${VERSION}-linux.zip"
 WEB_SITE="https://developer.android.com/"
-WGET_URL="http://dl-ssl.google.com/android/repository/$TARBALL"
 HOST_ARCH="i486"
 
-DEPENDS="android-sdk"
+SOURCE="platform-tools"
+TARBALL="${SOURCE}_r$VERSION-linux.zip"
+WGET_URL="http://dl-ssl.google.com/android/repository/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}/opt/android-sdk
-	cp -a ${src} ${fs}/opt/android-sdk/${SOURCE}
-	chmod -R +Xr ${fs}/opt/android-sdk/${SOURCE}
+genpkg_rules() {
+	mkdir -p $fs/opt/android-sdk
+	cp -a $src $fs/opt/android-sdk/$SOURCE
+	chmod -R +Xr $fs/opt/android-sdk/$SOURCE
+	DEPENDS="android-sdk"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e android-sdk/.icon.png
Binary file android-sdk/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e android-sdk/receipt
--- a/android-sdk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/android-sdk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="android-sdk"
-VERSION="r22.6.2"
+VERSION="22.6.2"
 CATEGORY="development"
-SHORT_DESC="Google Android SDK."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Google Android SDK"
+MAINTAINER="devel@slitaz.org"
 LICENSE="custom"
-TARBALL="${PACKAGE}_${VERSION}-linux.tgz"
 WEB_SITE="https://developer.android.com/"
-WGET_URL="http://dl.google.com/android/$TARBALL"
 HOST_ARCH="i486"
 
-DEPENDS="java-jre"
+TARBALL="${PACKAGE}_r$VERSION-linux.tgz"
+WGET_URL="http://dl.google.com/android/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}/opt ${fs}/usr/bin ${fs}/usr/share/pixmaps
-	cp -a ${src} ${fs}/opt/${PACKAGE}
-	rm -f ${fs}/opt/${PACKAGE}/tools/*64-*
-	chmod -R o=g ${fs}/opt/${PACKAGE}
+genpkg_rules() {
+	mkdir -p $fs/opt $fs/usr/bin $fs/usr/share/pixmaps
+	cp -a $src $fs/opt/$PACKAGE
+	rm -f $fs/opt/$PACKAGE/tools/*64-*
+	chmod -R o=g $fs/opt/$PACKAGE
 	# TazDroid
-	cp -a ${stuff}/tazdroid ${fs}/usr/bin
-	cp ${stuff}/android.png ${fs}/usr/share/pixmaps
+	cp -a $stuff/tazdroid $fs/usr/bin
+	cp $stuff/android.png $fs/usr/share/pixmaps
+	DEPENDS="java-jre"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ansible/.icon.png
Binary file ansible/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e ansible/receipt
--- a/ansible/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ansible/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,26 @@
 PACKAGE="ansible"
 VERSION="1.5.3"
 CATEGORY="network"
-SHORT_DESC="a radically simple configuration-management engine."
+SHORT_DESC="Radically simple configuration-management engine"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.ansible.com/home"
+WEB_SITE="https://www.ansible.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/ansible/ansible/archive/v$VERSION.tar.gz"
-CONFIG_FILES="/etc/ansible"
 
-DEPENDS="python python-jinja2 python-pyyaml ssh"
-BUILD_DEPENDS="wget python"
+BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install || return 1
 
 	cook_pick_manpages $src/docs/man/man1/*.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/ansible
 	cp -a $install/* $fs
+	DEPENDS="python python-jinja2 python-pyyaml ssh"
+	CONFIG_FILES="/etc/ansible"
 }
diff -r ad29ddfee1c9 -r d5aab818505e antimicro/.icon.png
Binary file antimicro/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e antimicro/receipt
--- a/antimicro/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/antimicro/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	qmake INSTALL_PREFIX=/usr &&
 	make &&
 	make updateqm &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e antinat/.icon.png
Binary file antinat/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e antinat/receipt
--- a/antinat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/antinat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://www.malsmith.net/download/?obj=antinat/$VERSION/antinat-source.tar.bz2"
 
 BUILD_DEPENDS="gfortran expat-dev pam-dev"
-SPLIT="libantinat antinat antinat-dev antinat-pam:pam antinat-pam-dev:pam"
+SPLIT="libantinat $PACKAGE $PACKAGE-dev $PACKAGE-pam:pam $PACKAGE-pam-dev:pam"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e antiword/receipt
--- a/antiword/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/antiword/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 compile_rules() {
 	make &&
 	make \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		GLOBAL_INSTALL_DIR=/usr/bin \
 		global_install || return 1
 
diff -r ad29ddfee1c9 -r d5aab818505e apache-ant/.icon.png
Binary file apache-ant/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apache-ant/receipt
--- a/apache-ant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apache-ant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.4"
 CATEGORY="development"
 SHORT_DESC="A Java-based build tool"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://ant.apache.org/"
 
@@ -14,17 +14,13 @@
 compile_rules() {
 	# The only binaries that would built are Java binaries (not native binaries)
 	# Thus, to help with bootstrapping, use the binary ant release
-	mkdir -p $DESTDIR/usr/bin
-	cp -f $src/bin/*.pl $DESTDIR/usr/bin
-	cp -f $src/bin/*.py $DESTDIR/usr/bin
-	cp -f $src/bin/ant $DESTDIR/usr/bin
-	cp -f $src/bin/antRun $DESTDIR/usr/bin
+	mkdir -p $install/usr/bin
+	cp bin/*.pl bin/*.py bin/ant bin/antRun $install/usr/bin
 
-	cp -a $src/etc $DESTDIR
+	cp -a $src/etc $install
 
-	mkdir -p $DESTDIR/usr/lib
-	cp -f $src/lib/*.jar $DESTDIR/usr/lib
-	cp -f $src/lib/*.pom $DESTDIR/usr/lib
+	mkdir -p $install/usr/lib
+	cp lib/*.jar lib/*.pom $install/usr/lib
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e apache-mod-perl/.icon.png
Binary file apache-mod-perl/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apache-mod-perl/receipt
--- a/apache-mod-perl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apache-mod-perl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.10"
 CATEGORY="network"
 SHORT_DESC="PERL module for Apache"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://perl.apache.org/"
 REPOLOGY="apmod:perl"
@@ -14,14 +14,14 @@
 WGET_URL="http://apache.ip-connect.vn.ua/perl/$TARBALL"
 
 BUILD_DEPENDS="gdbm-dev apache-dev apr-dev apr-util-dev apache perl-dev"
-SPLIT="apache-mod-perl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	perl Makefile.PL \
 		MP_APXS=/usr/bin/apxs \
 		MP_APR_CONFIG=/usr/bin/apr-1-config
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	find $install -type f -exec chmod u+w '{}' \;
 }
diff -r ad29ddfee1c9 -r d5aab818505e apache-mod-wsgi/receipt
--- a/apache-mod-wsgi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apache-mod-wsgi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.6.4"
 CATEGORY="network"
 SHORT_DESC="Python WSGI adapter module for Apache"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache2"
 WEB_SITE="https://github.com/GrahamDumpleton/mod_wsgi"
 REPOLOGY="apmod:wsgi"
diff -r ad29ddfee1c9 -r d5aab818505e apache/.icon.png
Binary file apache/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apache/receipt
--- a/apache/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apache/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="apr-util-dev apr-dev openssl-dev sed expat-dev zlib-dev \
 util-linux-uuid-dev openldap-dev bash pcre-dev"
-SPLIT="apache-dev apache-doc apache"
+SPLIT="$PACKAGE-dev $PACKAGE-doc $PACKAGE"
 
 compile_rules() {
 	grep -q Slitaz config.layout || \
@@ -27,7 +27,8 @@
 		--enable-ssl \
 		--enable-layout=Slitaz \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install || return 1
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/apache $install/etc/init.d/apache
 
@@ -81,7 +82,7 @@
 # We stop the server by default in case of upgarde.
 pre_install_apache() {
 	[ -n "$1" ] ||
-	for i in httpd lighttpd ngnix cherokee $PACKAGE ; do
+	for i in httpd lighttpd ngnix cherokee $PACKAGE; do
 		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
 	done
 }
@@ -93,14 +94,18 @@
 
 	# Just in case.
 	chown www.www "$1/var/log/$PACKAGE"
-	ping -c 2 $(hostname) > /dev/null 2>&1 || 
+
+	ping -c 2 $(hostname) >/dev/null 2>&1 ||
 		sed -i "s/localhost/$(hostname) localhost/" "$1/etc/hosts"
+
 	sed -i -e "s/^#\(LoadModule.*slotmem_shm.*\)$/\1/" \
-	    -e "s/.*ServerName www.example.*/ServerName ${hostname:-slitaz}/" \
+		-e "s/.*ServerName www.example.*/ServerName ${hostname:-slitaz}/" \
 		$1/etc/apache/httpd.conf $1/etc/apache/extra/httpd-ssl.conf
+
 	grep -qs Apache $1/var/www/index.html &&
 	sed -i 's|^LighTTPD.*|&\nApache configs      : /etc/apache|' \
 		$1/var/www/index.html
+
 	[ -s "$1/etc/ssl/apache/apache.pem" ] ||
 	openssl req -new -x509 -keyout "$1/etc/ssl/apache/apache.pem" \
 		-out "$1/etc/ssl/apache/apache.pem" -days 3650 -nodes <<EOT
@@ -112,8 +117,9 @@
 ${hostname:-slitaz}
 
 EOT
+
 	[ -z "$quiet" ] && echo # Start new line
-	( cd "$1/$INSTALLED/" ; grep -l /etc/apache/conf.d/ */receipt ) | \
+	( cd "$1/$INSTALLED/"; grep -l /etc/apache/conf.d/ */receipt ) | \
 	while read file; do
 		pkg=$(dirname $file)
 		[ "$pkg" = "$PACKAGE" ] && continue
diff -r ad29ddfee1c9 -r d5aab818505e apcupsd/.icon.png
Binary file apcupsd/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apcupsd/receipt
--- a/apcupsd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apcupsd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,10 @@
 
 compile_rules() {
 	sed -i 's/src platforms doc/src platforms/' Makefile
-	SHUTDOWN=/sbin/poweroff ac_cv_func_setpgrp_void=yes ./configure \
+
+	SHUTDOWN=/sbin/poweroff \
+	ac_cv_func_setpgrp_void=yes \
+	./configure \
 		--enable-usb \
 		--disable-snmp \
 		--disable-net \
@@ -27,7 +30,8 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	cook_pick_manpages $src/doc/*.5 $src/doc/*.8
 }
diff -r ad29ddfee1c9 -r d5aab818505e appdata-tools/receipt
--- a/appdata-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/appdata-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="appdata-tools"
 VERSION="0.1.8"
 CATEGORY="utilities"
-SHORT_DESC="AppData is a subset of AppStream"
+SHORT_DESC="Subset of AppStream"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://people.freedesktop.org/~hughsient/appdata/"
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e appstream-glib/receipt
--- a/appstream-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/appstream-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="meson ninja util-linux-uuid-dev glib-dev libarchive-dev \
 libsoup-dev json-glib-dev gdk-pixbuf-dev gtk3-dev yaml-dev gperf \
-gobject-introspection-dev gettext libxslt docbook-xsl"
+gobject-introspection-dev gettext-dev libxslt docbook-xsl"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e apr-util/.icon.png
Binary file apr-util/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apr-util/receipt
--- a/apr-util/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apr-util/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.1"
 CATEGORY="development"
 SHORT_DESC="APR Library Utilities"
-MAINTAINER="lehswe@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://apr.apache.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/apr-util.html"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="apr-dev openssl-dev gdbm-dev postgresql-dev sqlite3-dev \
 unixODBC-dev expat-dev mysql-dev openldap-dev"
 SPLIT="apr-dbd-mysql apr-dbd-odbc apr-dbd-pgsql apr-dbd-sqlite apr-crypto \
-apr-dbm-gdbm apr-ldap apr-util-dev"
+apr-dbm-gdbm apr-ldap $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e apr/.icon.png
Binary file apr/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e apr/receipt
--- a/apr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/apr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.5"
 CATEGORY="misc"
 SHORT_DESC="Apache Portable Runtime Library"
-MAINTAINER="lehswe@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://apr.apache.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/apr.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://archive.apache.org/dist/apr/$TARBALL"
 
 BUILD_DEPENDS="util-linux-uuid-dev"
-SPLIT="apr-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e aqualung/receipt
--- a/aqualung/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aqualung/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,14 +5,14 @@
 COMMIT="beec3d9"
 CATEGORY="multimedia"
 SHORT_DESC="Advanced music player"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://aqualung.jeremyevans.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/jeremyevans/aqualung/archive/${COMMIT:-$VERSION}.tar.gz"
 
-BUILD_DEPENDS="automake gettext libxml2-dev glib-dev gtk2-dev   alsa-lib-dev \
+BUILD_DEPENDS="automake gettext-dev libxml2-dev glib-dev gtk2-dev alsa-lib-dev \
 flac-dev lame-dev libmodplug-dev libsndfile-dev libogg-dev speex-dev \
 libvorbis-dev libsamplerate-dev libcdio-dev libcdio-paranoia-dev libcddb-dev \
 lua-dev"
diff -r ad29ddfee1c9 -r d5aab818505e ardour/.icon.png
Binary file ardour/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e ardour/receipt
--- a/ardour/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ardour/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.12.0"
 CATEGORY="multimedia"
 SHORT_DESC="A multichannel hard disk recorder and digital audio workstation"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ardour.org/"
 
@@ -15,7 +15,7 @@
 alsa-lib-dev glib-dev glibmm-dev libsndfile-dev curl-dev libarchive-dev \
 liblo-dev taglib-dev vamp-plugin-sdk-dev rubberband-dev eudev-dev fftw-dev \
 aubio-dev cppunit-dev libusb-dev jack-dev pangomm-dev liblrdf-dev lv2 serd-dev \
-sord-dev sratom lilv gtkmm-dev dbus-dev readline-dev gettext"
+sord-dev sratom lilv gtkmm-dev dbus-dev readline-dev gettext-dev"
 
 compile_rules() {
 #	fix math
@@ -39,7 +39,7 @@
 		$install/usr/share/applications/ardour.desktop
 	for size in 16 22 32 48 256 512; do
 		install -vDm644 gtk2_ardour/resources/Ardour-icon_${size}px.png \
-			$install/usr/share/icons/hicolor/${size}x${size}/apps/ardour${VERSION%%.*}.png
+			$install/usr/share/icons/hicolor/${size}x$size/apps/ardour${VERSION%%.*}.png
 	done
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e argon2/receipt
--- a/argon2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/argon2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/P-H-C/phc-winner-argon2/archive/$VERSION/$TARBALL"
 
-SPLIT="argon2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Make pkg-config file
diff -r ad29ddfee1c9 -r d5aab818505e ari-py/receipt
--- a/ari-py/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ari-py/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ari-py"
 VERSION="0.1.3"
 CATEGORY="development"
-SHORT_DESC="Library for accessing the Asterisk REST Interface."
+SHORT_DESC="Library for accessing the Asterisk REST Interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/asterisk/ari-py"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/asterisk/ari-py"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-DEPENDS="python"
-SUGGESTED="asterisk"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
+	SUGGESTED="asterisk"
 }
diff -r ad29ddfee1c9 -r d5aab818505e aria2/receipt
--- a/aria2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aria2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/aria2/aria2/releases/download/release-$VERSION/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev gettext libxml2-dev gnutls-dev gmp-dev nettle-dev"
+BUILD_DEPENDS="zlib-dev gettext-dev libxml2-dev gnutls-dev gmp-dev nettle-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e ario/receipt
--- a/ario/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ario/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.6"
 CATEGORY="multimedia"
 SHORT_DESC="GTK client for MPD"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ario-player.sourceforge.net/index.php?en"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/ario-player/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk3-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool gtk3-dev \
 libxml2-dev curl-dev libmpdclient-dev taglib-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e arj/receipt
--- a/arj/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/arj/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -25,8 +25,8 @@
 	./configure $CONFIGURE_ARGS
 	cd ..
 	make prepare &&
-	make -j 1 &&
-	make DESTDIR=$DESTDIR install
+	make -j1 &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e arora/.icon.png
Binary file arora/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e arora/receipt
--- a/arora/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/arora/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,26 +7,22 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://arora.googlecode.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/files/$TARBALL"
-TAGS="web-browser"
 
 BUILD_DEPENDS="Qt4-dev qmake libsqlite3"
-DEPENDS="libQtGui libQtWebkit libQtDBus libQtXml libQtScript"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	qmake PREFIX="/usr/" &&
 	make $MAKEFLAGS &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 	find $install -type f -name '*.desktop' -exec chmod a-x \{\} \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp $src/arora $fs/usr/bin
+	DEPENDS="libQtGui libQtWebkit libQtDBus libQtXml libQtScript"
+	TAGS="web-browser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e arpack-ng/receipt
--- a/arpack-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/arpack-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/opencollab/arpack-ng/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool gfortran lapack"
-SPLIT="arpack-ng-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap &&
diff -r ad29ddfee1c9 -r d5aab818505e arping/receipt
--- a/arping/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/arping/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.19"
 CATEGORY="network"
 SHORT_DESC="ARP ping utility"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.habets.pp.se/synscan/programs.php?prog=arping"
 
diff -r ad29ddfee1c9 -r d5aab818505e arpwatch/receipt
--- a/arpwatch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/arpwatch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1a15"
 CATEGORY="network"
 SHORT_DESC="arpwatch and arpsnmp network monitoring tools"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="ftp://ftp.ee.lbl.gov/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -13,24 +13,21 @@
 DEPENDS="libpcap"
 BUILD_DEPENDS="libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|ARPDIR = $(prefix)/arpwatch|ARPDIR = /var/lib/arpwatch|' Makefile.in
 	sed -i 's|-o bin -g bin||' Makefile.in
+	install -dm755 $install/usr/sbin
+
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	install -d -m 755 $DESTDIR/usr/sbin
 	make install
-	
+
 	#~ SENDMAIL=/usr/sbin/sendmail
 
 	cook_pick_manpages $src/*.8
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 	install -d -m 0755 $fs/var/lib/arpwatch
diff -r ad29ddfee1c9 -r d5aab818505e asciidoc/receipt
--- a/asciidoc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asciidoc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.6.10"
 CATEGORY="system-tools"
 SHORT_DESC="Text based document generation"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://asciidoc.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/asciidoc.html"
diff -r ad29ddfee1c9 -r d5aab818505e asciiquarium/receipt
--- a/asciiquarium/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asciiquarium/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,7 @@
 LICENSE="GPL2"
 WEB_SITE="https://robobunny.com/projects/asciiquarium/html/"
 
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="https://robobunny.com/projects/asciiquarium/$TARBALL"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e asleap/receipt
--- a/asleap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asleap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="asleap"
 VERSION="2.2"
 CATEGORY="network"
-SHORT_DESC="Actively recover LEAP/PPTP passwords."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Actively recover LEAP/PPTP passwords"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="openssl libpcap"
-BUILD_DEPENDS="openssl-dev libpcap-dev"
+WEB_SITE="http://www.willhackforsushi.com/?page_id=41"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://www.willhackforsushi.com/?page_id=41"
 WGET_URL="http://www.willhackforsushi.com/code/$PACKAGE/$VERSION/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make
-	install -D asleap $DESTDIR/usr/bin/asleap
-	install -D genkeys $DESTDIR/usr/bin/genkeys
+BUILD_DEPENDS="openssl-dev libpcap-dev"
+
+compile_rules() {
+	make || return 1
+	install -Dm755 asleap  $install/usr/bin/asleap
+	install -Dm755 genkeys $install/usr/bin/genkeys
 
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl libpcap"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e aspell/receipt
--- a/aspell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aspell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/aspell/$TARBALL"
 
-BUILD_DEPENDS="perl gettext ncurses-dev"
-SPLIT="aspell-dev"
+BUILD_DEPENDS="perl gettext-dev ncurses-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# fix some problems identified by gcc7:
diff -r ad29ddfee1c9 -r d5aab818505e assaultcube/receipt
--- a/assaultcube/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/assaultcube/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.2.0.2"
 CATEGORY="games"
 SHORT_DESC="A realistic team oriented multiplayer FPS based on the Cube engine"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
-WEB_SITE="http://assault.cubers.net/"
+WEB_SITE="https://assault.cubers.net/"
 
 TARBALL="AssaultCube_v$VERSION.tar.bz2"
 WGET_URL="https://github.com/assaultcube/AC/releases/download/v$VERSION/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e asterisk-googletranslate/receipt
--- a/asterisk-googletranslate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk-googletranslate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,17 @@
 VERSION="0.2"
 CATEGORY="misc"
 SHORT_DESC="Text translation for Asterisk"
-WEB_SITE="http://zaf.github.io/asterisk-googletranslate/"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://zaf.github.io/asterisk-googletranslate/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/downloads/zaf/$PACKAGE/$TARBALL"
 
-DEPENDS="asterisk perl-libwww-perl perl-json perl-io-socket-ssl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/var/lib/asterisk/agi-bin
 	cp -a $src/cli/googletranslate-cli.pl $fs/usr/bin
 	ln -s googletranslate-cli.pl $fs/usr/bin/googletranslate
-	cp -a $src/googletranslate.agi $fs/var/lib/asterisk/agi-bin/	
+	cp -a $src/googletranslate.agi $fs/var/lib/asterisk/agi-bin/
+	DEPENDS="asterisk perl-libwww-perl perl-json perl-io-socket-ssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e asterisk-googletts/receipt
--- a/asterisk-googletts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk-googletts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,17 @@
 VERSION="0.6"
 CATEGORY="misc"
 SHORT_DESC="Text to speech for asterisk using Google Translate"
-WEB_SITE="http://zaf.github.io/asterisk-googletts/"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://zaf.github.io/asterisk-googletts/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/downloads/zaf/$PACKAGE/$TARBALL"
 
-DEPENDS="asterisk perl sox mpg123"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/var/lib/asterisk/agi-bin
 	cp -a $src/cli/googletts-cli.pl $fs/usr/bin
 	ln -s googletts-cli.pl $fs/usr/bin/googletts
-	cp -a $src/googletts.agi $fs/var/lib/asterisk/agi-bin/	
+	cp -a $src/googletts.agi $fs/var/lib/asterisk/agi-bin/
+	DEPENDS="asterisk perl sox mpg123"
 }
diff -r ad29ddfee1c9 -r d5aab818505e asterisk-sound-fr/receipt
--- a/asterisk-sound-fr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk-sound-fr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="asterisk-sound-fr"
 VERSION="1.4.16"
 CATEGORY="misc"
-SHORT_DESC="Open Source PBX and telephony toolkit sound files (fr)."
+SHORT_DESC="Open Source PBX and telephony toolkit sound files (fr)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CCPL"
 WEB_SITE="http://www.asterisk.org/"
@@ -12,27 +12,22 @@
 TARBALL="asterisk-core-sounds-fr-gsm-$VERSION.tar.gz"
 WGET_URL="http://downloads.asterisk.org/pub/telephony/sounds/releases/$TARBALL"
 
-DEPENDS="asterisk"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	if [ ! -d $DESTDIR/var ]; then
+compile_rules() {
+	if [ ! -d $install/var ]; then
 		cd $src || return 1
 		lang=${PACKAGE#asterisk-sound-}
-		mkdir -p $DESTDIR/var/lib/asterisk/sounds/$lang
-		mv * $DESTDIR/var/lib/asterisk/sounds/$lang
-		cd $DESTDIR/var/lib/asterisk/sounds/$lang
-		for i in */ ; do
+		mkdir -p $install/var/lib/asterisk/sounds/$lang
+		mv * $install/var/lib/asterisk/sounds/$lang
+		cd $install/var/lib/asterisk/sounds/$lang
+		for i in */; do
 			mkdir ../$i
 			ln -s ../$lang/$i ../$i$lang
 		done
 	fi
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	chown -R root:root $fs
+	DEPENDS="asterisk"
 }
diff -r ad29ddfee1c9 -r d5aab818505e asterisk-sound/receipt
--- a/asterisk-sound/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk-sound/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,13 @@
 TARBALL="asterisk-core-sounds-en-gsm-$VERSION.tar.gz"
 WGET_URL="http://downloads.asterisk.org/pub/telephony/sounds/releases/$TARBALL"
 
-DEPENDS="asterisk"
-
 compile_rules() {
-	[ ! -d $DESTDIR/var ] &&
-	cd $src &&
-	mkdir -p $DESTDIR/var/lib/asterisk/sounds &&
-	mv * $DESTDIR/var/lib/asterisk/sounds
+	mkdir -p $install/var/lib/asterisk/sounds &&
+	mv * $install/var/lib/asterisk/sounds
 }
 
 genpkg_rules() {
 	cp -a $install/* $fs
 	chown -R root:root $fs
+	DEPENDS="asterisk"
 }
diff -r ad29ddfee1c9 -r d5aab818505e asterisk-speech-recog/receipt
--- a/asterisk-speech-recog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk-speech-recog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,17 @@
 VERSION="0.6-beta1"
 CATEGORY="misc"
 SHORT_DESC="Speech recognition for Asterisk"
-WEB_SITE="http://zaf.github.io/asterisk-speech-recog/"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://zaf.github.io/asterisk-speech-recog/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/zaf/$PACKAGE/archive/v$VERSION.tar.gz"
 
-DEPENDS="asterisk perl-libwww-perl perl-json perl-io-socket-ssl flac"
-BUILD_DEPENDS="wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/var/lib/asterisk/agi-bin
 	cp -a $src/samples/speech-recog-cli.pl $fs/usr/bin
 	ln -s speech-recog-cli.pl $fs/usr/bin/speech-recog
-	cp -a $src/speech-recog.agi $fs/var/lib/asterisk/agi-bin/	
+	cp -a $src/speech-recog.agi $fs/var/lib/asterisk/agi-bin/
+	DEPENDS="asterisk perl-libwww-perl perl-json perl-io-socket-ssl flac"
 }
diff -r ad29ddfee1c9 -r d5aab818505e asterisk/.icon.png
Binary file asterisk/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e asterisk/receipt
--- a/asterisk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asterisk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,10 +21,8 @@
 libsdl-image-dev net-snmp iksemel libical-dev curl-dev libcap-dev iksemel-dev \
 jack-dev radiusclient-ng-dev radiusclient-ng \
 libvorbis-dev speex-dev"
-SPLIT="asterisk-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-#
 # Graphical configuration: 'make menuconfig' or 'make gmenuconfig'
 #
 compile_rules() {
@@ -48,18 +46,18 @@
 	cp $stuff/rfc3951.txt codecs/ilbc
 	[ -f codecs/ilbc/iLBC_define.h ] || ( cd codecs/ilbc &&
 		awk -f $stuff/extract-cfile.awk rfc3951.txt > /dev/null )
-	mkdir -p $DESTDIR/usr/bin
+	mkdir -p $install/usr/bin
 #	export CXXFLAGS="$CXXFLAGS -fPIC"
 	./configure \
 		--without-pwlib \
 		--with-dahdi=$WOK/dahdi/$(ls $WOK/dahdi/taz) \
 		--with-tonezone \
 		$CONFIGURE_ARGS &&
-	make -j 1 2>&1 | grep -v pjproject &&
-	make -j 1 DESTDIR=$DESTDIR install &&
-	make -j 1 DESTDIR=$DESTDIR samples &&
+	make -j1 2>&1 | grep -v pjproject &&
+	make -j1 DESTDIR=$install install &&
+	make -j1 DESTDIR=$install samples &&
 	cd contrib/utils &&
-	gcc rawplayer.c -o $DESTDIR/usr/bin/rawplayer
+	gcc rawplayer.c -o $install/usr/bin/rawplayer
 }
 
 genpkg_rules() {
@@ -87,41 +85,39 @@
 	esac
 }
 
-# Rules to configure package
-setup_rules()
-{
+setup_rules() {
 	case "$2" in
-	mysql_host)
-		sed -i "s|^hostname=.*|hostname=$3|" "$1/etc/asterisk/cdr_mysql.conf"
-		sed -i "s|^dbhost=.*|dbhost=$3|" "$1/etc/asterisk/res_mysql.conf"
-		;;
-	mysql_user)
-		sed -i "s|^user=.*|user=$3|" "$1/etc/asterisk/cdr_mysql.conf"
-		sed -i "s|^dbuser=.*|dbuser=$3|" "$1/etc/asterisk/res_mysql.conf"
-		;;
-	mysql_password)
-		sed -i "s|^password=.*|password=$3|" "$1/etc/asterisk/cdr_mysql.conf"
-		sed -i "s|^dbpass=.*|dbpass=$3|" "$1/etc/asterisk/res_mysql.conf"
-		;;
-	mysql_database)
-		sed -i "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_mysql.conf" \
-						 "$1/etc/asterisk/cdr_mysql.conf"
-		;;
-	pgsql_host)
-		sed -i "s|^hostname=.*|hostname=$3|" "$1/etc/asterisk/cdr_pgsql.conf"
-		sed -i "s|^dbhost=.*|dbhost=$3|" "$1/etc/asterisk/res_pgsql.conf"
-		;;
-	pgsql_user)
-		sed -i "s|^user=.*|user=$3|" "$1/etc/asterisk/cdr_pgsql.conf"
-		sed -i "s|^dbuser=.*|dbuser=$3|" "$1/etc/asterisk/res_pgsql.conf"
-		;;
-	pgsql_password)
-		sed -i "s|^password=.*|password=$3|" "$1/etc/asterisk/cdr_pgsql.conf"
-		sed -i "s|^dbpass=.*|dbpass=$3|" "$1/etc/asterisk/res_pgsql.conf"
-		;;
-	pgsql_database)
-		sed -i "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_pgsql.conf" \
-						 "$1/etc/asterisk/cdr_pgsql.conf"
+		mysql_host)
+			sed "s|^hostname=.*|hostname=$3|" -i "$1/etc/asterisk/cdr_mysql.conf"
+			sed "s|^dbhost=.*|dbhost=$3|"     -i "$1/etc/asterisk/res_mysql.conf"
+			;;
+		mysql_user)
+			sed "s|^user=.*|user=$3|"     -i "$1/etc/asterisk/cdr_mysql.conf"
+			sed "s|^dbuser=.*|dbuser=$3|" -i "$1/etc/asterisk/res_mysql.conf"
+			;;
+		mysql_password)
+			sed "s|^password=.*|password=$3|" -i "$1/etc/asterisk/cdr_mysql.conf"
+			sed "s|^dbpass=.*|dbpass=$3|"     -i "$1/etc/asterisk/res_mysql.conf"
+			;;
+		mysql_database)
+			sed "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_mysql.conf" \
+				-i "$1/etc/asterisk/cdr_mysql.conf"
+			;;
+		pgsql_host)
+			sed "s|^hostname=.*|hostname=$3|" -i "$1/etc/asterisk/cdr_pgsql.conf"
+			sed "s|^dbhost=.*|dbhost=$3|"     -i "$1/etc/asterisk/res_pgsql.conf"
+			;;
+		pgsql_user)
+			sed "s|^user=.*|user=$3|"     -i "$1/etc/asterisk/cdr_pgsql.conf"
+			sed "s|^dbuser=.*|dbuser=$3|" -i "$1/etc/asterisk/res_pgsql.conf"
+			;;
+		pgsql_password)
+			sed "s|^password=.*|password=$3|" -i "$1/etc/asterisk/cdr_pgsql.conf"
+			sed "s|^dbpass=.*|dbpass=$3|"     -i "$1/etc/asterisk/res_pgsql.conf"
+			;;
+		pgsql_database)
+			sed "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_pgsql.conf" \
+				-i "$1/etc/asterisk/cdr_pgsql.conf"
 		;;
 	*)	cat <<EOT
 mysql_host	hostname or ip of mysql server
diff -r ad29ddfee1c9 -r d5aab818505e astromenace/receipt
--- a/astromenace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/astromenace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.3.2"
 CATEGORY="games"
 SHORT_DESC="Hardcore 3D space shooter with spaceship upgrade possibilities"
-MAINTAINER="hackdorte@sapo.pt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="https://www.viewizard.com/"
+WEB_SITE="https://viewizard.com/"
 
 TARBALL="$PACKAGE-src-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/openastromenace/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e asunder/receipt
--- a/asunder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/asunder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.9.3"
 CATEGORY="multimedia"
 SHORT_DESC="GTK CD ripper and encoder"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://littlesvr.ca/asunder/"
 
@@ -19,7 +19,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e at-spi2-core/receipt
--- a/at-spi2-core/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/at-spi2-core/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja dbus-dev glib-dev xorg-libX11-dev xorg-libXtst-dev \
-gobject-introspection-dev gettext"
+gobject-introspection-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e at/receipt
--- a/at/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/at/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Schedule commands to be executed once"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://packages.debian.org/lenny/at"
+WEB_SITE="https://packages.debian.org/lenny/at"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/at.html"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.gz"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/a/at/$TARBALL"
 
 BUILD_DEPENDS="automake bison flex ssmtp"
@@ -32,7 +32,7 @@
 		$CONFIGURE_ARGS &&
 	make -j1 &&
 	make -j1 \
-		IROOT=$DESTDIR \
+		IROOT=$install \
 		docdir=/usr/share/doc/$PACKAGE-$VERSION \
 		atdocdir=/usr/share/doc/$PACKAGE-$VERSION \
 		install || return 1
diff -r ad29ddfee1c9 -r d5aab818505e aterm/.icon.png
Binary file aterm/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e aterm/receipt
--- a/aterm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aterm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="aterm"
 VERSION="1.0.1"
 CATEGORY="misc"
-SHORT_DESC="terminal emulator"
+SHORT_DESC="Terminal emulator"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://aterm.sourceforge.net"
+WEB_SITE="http://www.afterstep.org/aterm.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/aterm/$TARBALL"
-TAGS="terminal"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-libSM-dev xorg-libXext-dev xorg-libXt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	case "$ARCH" in
-	arm*)
-		export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH
-	esac
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11"
+	TAGS="terminal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e atftp/receipt
--- a/atftp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atftp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Advanced Trivial File Transport Protocol"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://freshmeat.net/projects/atftp/"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/atftp/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.openwrt.org/sources/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e atk/receipt
--- a/atk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.30.0"
 CATEGORY="x-window"
 SHORT_DESC="Accessibility toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/atk/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/atk.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext"
-SPLIT="atk-dev"
+BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e atkmm/receipt
--- a/atkmm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atkmm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.2"
 CATEGORY="x-window"
 SHORT_DESC="C++ interface for the ATK accessibility toolkit library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/atkmm/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/atkmm.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="atk-dev glibmm-dev"
-SPLIT="atkmm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|atkmm-$VERSION|" doc/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e atm-tools/receipt
--- a/atm-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atm-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/linux-atm/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="atm-tools-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e atomix/receipt
--- a/atomix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atomix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja gtk3-dev libgnome-games-support-dev gettext"
+BUILD_DEPENDS="meson ninja gtk3-dev libgnome-games-support-dev gettext-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e atril/receipt
--- a/atril/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/atril/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,9 @@
 BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev libsecret-dev \
 caja-dev gobject-introspection-dev poppler-dev libspectre-dev tiff-dev \
 djvulibre-dev webkit2gtk-dev itstool xorg-libSM-dev"
-SPLIT="atril-caja atril-comics atril-djvu atril-epub atril-pdf atril-psd \
-atril-tiff atril atril-dev"
+SPLIT="\
+$PACKAGE-caja $PACKAGE-comics $PACKAGE-djvu $PACKAGE-epub $PACKAGE-pdf \
+$PACKAGE-psd  $PACKAGE-tiff   $PACKAGE      $PACKAGE-dev"
 
 case $ARCH in
 	x86_64)
diff -r ad29ddfee1c9 -r d5aab818505e attica/receipt
--- a/attica/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/attica/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,23 +4,24 @@
 VERSION="0.4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Qt library that implements the Open Collaboration Services API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.kde.org/"
+WEB_SITE="https://www.kde.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.kde.org/pub/kde/stable/attica/$TARBALL"
 
 BUILD_DEPENDS="cmake qmake Qt4-dev"
-SPLIT="attica-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir -p build && cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e attr/receipt
--- a/attr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/attr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.48"
 CATEGORY="system-tools"
 SHORT_DESC="Commands for manipulating filesystem extended attributes"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://savannah.nongnu.org/projects/attr"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/attr.html"
@@ -12,9 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.savannah.gnu.org/releases/attr/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
-BUILD_DEPENDS="autoconf automake m4 libtool gettext coreutils-operations"
-SPLIT="attr-dev"
+BUILD_DEPENDS="autoconf automake m4 libtool gettext-dev coreutils-operations"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	rm /bin/rpm >/dev/null
@@ -25,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/lib
 	mv $install/usr/lib/libattr.so.* $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e aubio/receipt
--- a/aubio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aubio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.7"
 CATEGORY="multimedia"
 SHORT_DESC="A collection of tools for music analysis"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://aubio.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e audacious-plugins/.icon.png
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious-plugins/.icon.png	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,1 @@
+../audacious/.icon.png
\ No newline at end of file
diff -r ad29ddfee1c9 -r d5aab818505e audacious-plugins/receipt
--- a/audacious-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/audacious-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://distfiles.audacious-media-player.org/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk2-dev gettext audacious-dev libcdio-dev \
+BUILD_DEPENDS="glib-dev gtk2-dev gettext-dev audacious-dev libcdio-dev \
 libcdio-paranoia-dev libcddb-dev flac-dev libogg-dev libvorbis-dev \
 fluidsynth-dev mpg123-dev faad2-dev wavpack-dev libsndfile-dev libmodplug-dev \
 libsamplerate-dev alsa-lib-dev jack-dev pulseaudio-dev neon-dev libmms-dev \
@@ -19,9 +19,9 @@
 xorg-libXrender-dev xorg-libXcomposite-dev ffmpeg-dev qt5-dev mesa-dev \
 audacious-qt-dev"
 SPLIT="audacious-skins \
-audacious-plugins        audacious-plugins-extra \
-audacious-plugins-qt:qt  audacious-plugins-qt-extra:qt \
-audacious-plugins-common audacious-plugins-common-extra"
+$PACKAGE        $PACKAGE-extra \
+$PACKAGE-qt:qt  $PACKAGE-qt-extra:qt \
+$PACKAGE-common $PACKAGE-common-extra"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e audacious/.icon.png
Binary file audacious/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e audacious/receipt
--- a/audacious/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/audacious/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://distfiles.audacious-media-player.org/$TARBALL"
 
-BUILD_DEPENDS="glib-dev qt5-dev gettext gtk2-dev"
-SPLIT="audacious audacious-qt:qt audacious-common \
-audacious-dev audacious-qt-dev:qt"
+BUILD_DEPENDS="glib-dev qt5-dev gettext-dev gtk2-dev"
+SPLIT="$PACKAGE-qt:qt $PACKAGE-common $PACKAGE-dev $PACKAGE-qt-dev:qt"
 COOKOPTS="!menus"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e audacity/receipt
--- a/audacity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/audacity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="wxWidgets-dev ffmpeg-dev libvorbis-dev libmad-dev flac-dev \
 libsndfile-dev lame-dev alsa-lib-dev portaudio-dev cmake expat-dev \
-gettext-tools"
+gettext"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e audiofile/receipt
--- a/audiofile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/audiofile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://audiofile.68k.org/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev flac-dev"
-SPLIT="audiofile-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|-1 <<|-1U <<|' libaudiofile/modules/SimpleModule.h
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e audit/receipt
--- a/audit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/audit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}$TARBALL"
 
 BUILD_DEPENDS="python-dev openldap-dev coreutils-file-format swig"
-SPLIT="audit-python audit audit-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e aufs-utils/receipt
--- a/aufs-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aufs-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20180705"
 CATEGORY="system-tools"
 SHORT_DESC="The aufs utils"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://aufs.sourceforge.net/"
 REPOLOGY="aufs-util"
@@ -20,7 +20,7 @@
 	KERNEL_VERSION=$(. $WOK/linux/receipt; echo $VERSION)
 
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e aufs/receipt
--- a/aufs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aufs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,9 @@
 EXTRAVERSION="_$kvers"
 CATEGORY="base-system"
 SHORT_DESC="The Linux Kernel ${VERSION%-*} aufs module"
-MAINTAINER="godane@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://aufs.sourceforge.net/"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sfjro/aufs4-standalone/archive/$COMMIT.tar.gz"
@@ -45,11 +44,11 @@
 	sed -i.orig "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
 	sed -i.orig "s:__user::g" include/uapi/linux/aufs_type.h
 
-	make -j 1 KDIR=/usr/src/linux || return 1
+	make -j1 KDIR=/usr/src/linux || return 1
 	xz -f fs/aufs/aufs.ko
 
 	install -Dm0644 fs/aufs/aufs.ko.xz \
-		$install/lib/modules/${kvers}-slitaz/kernel/fs/aufs/aufs.ko.xz
+		$install/lib/modules/$kvers-slitaz/kernel/fs/aufs/aufs.ko.xz
 	install -Dm0644 include/uapi/linux/aufs_type.h \
 		$install/usr/include/uapi/linux/aufs_type.h
 }
diff -r ad29ddfee1c9 -r d5aab818505e augeas/.icon.png
Binary file augeas/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e augeas/receipt
--- a/augeas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/augeas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.augeas.net/$TARBALL"
 
 BUILD_DEPENDS="readline-dev libxml2-dev"
-SPLIT="augeas-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e aurorials-theme/receipt
--- a/aurorials-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/aurorials-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,17 +6,14 @@
 SHORT_DESC="Aurorials theme for GTK2, Openbox, SLiM, and wallparer"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://holkfoor.deviantart.com/art/Aurorials-pack-themes-382752941"
+WEB_SITE="https://www.deviantart.com/holkfoor/art/Aurorials-pack-themes-382752941"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://dl.dropboxusercontent.com/s/urt40kxaladwpeu/Aurorials_GTK2_Openbox_Slim_Wallpaper.tar.bz2"
-TAGS="holkfoor openbox slim wallpaper"
 
-DEPENDS="gtk2-engine-murrine openbox slim"
 BUILD_DEPENDS="imagemagick"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	A=Aurorials
 	s=$install/usr/share/slim/themes
 	t=$install/usr/share/themes
@@ -40,14 +37,13 @@
 	ln -s ../slim/themes/$A/background.jpg $i/$A.jpg
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk2-engine-murrine openbox slim"
+	TAGS="holkfoor openbox slim wallpaper"
 }
 
-post_install()
-{
+post_install() {
 	# Set GTK+ Theme
 	for i in $1/etc/xdg/lxsession/*/desktop.conf \
 		$1/home/*/.config/lxsession/*/desktop.conf; do
diff -r ad29ddfee1c9 -r d5aab818505e autoconf/receipt
--- a/autoconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/autoconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.69"
 CATEGORY="development"
 SHORT_DESC="A GNU tool for automatically configuring source code"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnu.org/software/autoconf/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/autoconf.html"
@@ -15,7 +15,9 @@
 BUILD_DEPENDS="m4 perl"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e autofs/receipt
--- a/autofs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/autofs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Linux automounter"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://www.kernel.org/pub/linux/daemons/autofs/v5"
+WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/daemons/autofs/v5/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
@@ -20,7 +20,7 @@
 		--with-libtirpc \
 		$CONFIGURE_ARGS &&
 	make autofsconfdir=/etc &&
-	make autofsconfdir=/etc DESTDIR=$DESTDIR install || return 1
+	make autofsconfdir=/etc DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/etc/init.d/autofs $install/etc/init.d/autofs
 	install -Dm644 $stuff/etc/auto.master   $install/etc/auto.master
diff -r ad29ddfee1c9 -r d5aab818505e automake/receipt
--- a/automake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/automake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,11 +4,10 @@
 VERSION="1.16.1"
 CATEGORY="development"
 SHORT_DESC="A GNU tool for automatically creating Makefiles"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnu.org/software/automake/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/automake.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
@@ -16,7 +15,9 @@
 BUILD_DEPENDS="autoconf bison flex gfortran"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e automoc4/receipt
--- a/automoc4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/automoc4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="automoc4"
 VERSION="0.9.88"
 CATEGORY="x-window"
-SHORT_DESC="CMake automatic MOC Generation."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="CMake automatic MOC Generation"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.kde.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.kde.org/"
 WGET_URL="ftp://ftp.kde.org/pub/kde/stable/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="cmake libQtCore gcc-lib-base"
 BUILD_DEPENDS="cmake qmake Qt4-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr &&
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="cmake libQtCore gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e avatar-factory/.icon.png
Binary file avatar-factory/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e avfs/receipt
--- a/avfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/avfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/avf/$TARBALL"
 
 BUILD_DEPENDS="gfortran fuse2-dev xz-dev"
-SPLIT="avfs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e avidemux/.icon.png
Binary file avidemux/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e avidemux/receipt
--- a/avidemux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/avidemux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,21 @@
 PACKAGE="avidemux"
 VERSION="2.7.0"
 CATEGORY="multimedia"
-SHORT_DESC="free video editor"
+SHORT_DESC="Free video editor"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://fixounet.free.fr/$PACKAGE"
+WEB_SITE="http://fixounet.free.fr/avidemux/"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="video movie editor avi mpeg mp4"
 
-DEPENDS="alsa-lib libxml2 xorg-libXv cairo libxslt libvpx libvorbis qt5-base \
-opencore-amr lame faac faad2 libsamplerate xvidcore x264"
 BUILD_DEPENDS="tar coreutils-file-special coreutils-file-format cmake yasm \
-gettext xorg-libXv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
+gettext-dev xorg-libXv-dev libxml2-dev libvorbis-dev lame-dev xvidcore-dev \
 opencore-amr-dev x264-dev faac-dev faad2-dev libsamplerate-dev alsa-lib-dev \
 libxslt-dev libvpx-dev bash qt5-dev xorg-dev zlib-dev mesa-dev sqlite3-dev \
-glu-dev fribidi-dev "
+glu-dev fribidi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5|' bootStrap.bash
 	sed -ri 's|(Name=).*|\1avidemux (Qt)|' avidemux2.desktop
 	sed -ri 's|(Exec=).*|\1avidemux3_qt5|' avidemux2.desktop
@@ -29,20 +25,21 @@
 	sed 's|$EXTRA_CMAKE_DEFS|& -DVAPOURSYNTH=false -DFAAD=false -DFRIBIDI=false |' -i bootStrap.bash
 	bash bootStrap.bash --with-core --with-cli --with-plugins 2>/dev/null
 	for i in Cli Core PluginsCLI PluginsCommon Qt5 PluginsQt5; do
-		( make -C build${i} DESTDIR="$DESTDIR" install 2>/dev/null) | \
+		( make -C build$i DESTDIR="$install" install 2>/dev/null) | \
 			egrep -v 'No package|ld returned 1 exit status'
 	done
-	mkdir -p $DESTDIR/usr/share/pixmaps $DESTDIR/usr/share/applications
-	cp $src/avidemux_icon.png $DESTDIR/usr/share/pixmaps/avidemux.png
-	cp $src/avidemux2.desktop $DESTDIR/usr/share/applications
+	mkdir -p $install/usr/share/pixmaps $install/usr/share/applications
+	cp $src/avidemux_icon.png $install/usr/share/pixmaps/avidemux.png
+	cp $src/avidemux2.desktop $install/usr/share/applications
 
 	cook_pick_manpages $src/man/avidemux.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	DEPENDS="alsa-lib libxml2 xorg-libXv cairo libxslt libvpx libvorbis \
+	qt5-base opencore-amr lame faac faad2 libsamplerate xvidcore x264"
+	TAGS="video movie editor avi mpeg mp4"
 }
diff -r ad29ddfee1c9 -r d5aab818505e awesome/receipt
--- a/awesome/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awesome/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.2"
 CATEGORY="x-window"
 SHORT_DESC="Highly configurable framework window manager"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://awesomewm.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e awf/receipt
--- a/awf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,6 +7,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
 WEB_SITE="http://doc.cat-v.org/henry_spencer/awf/"
+REPOLOGY="awf-formatter"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://doc.cat-v.org/henry_spencer/awf/awf.tar.gz"
@@ -22,5 +23,4 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS=""
 }
diff -r ad29ddfee1c9 -r d5aab818505e awn-extras/receipt
--- a/awn-extras/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awn-extras/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-${COMMIT:-$VERSION}.tar.gz"
 WGET_URL="https://github.com/p12tic/awn-extras/archive/${COMMIT:-v$VERSION}.tar.gz"
 
-BUILD_DEPENDS="intltool automake gettext libtool glib-dev awn-dev libgtop-dev \
-libwnck2-dev xorg-libXcomposite-dev libnotify-dev vte-gtk2-dev gconf-dev \
-notify-python-dev vala dbus-dev"
+BUILD_DEPENDS="intltool automake gettext-dev libtool glib-dev awn-dev \
+libgtop-dev libwnck2-dev xorg-libXcomposite-dev libnotify-dev vte-gtk2-dev \
+gconf-dev notify-python-dev vala dbus-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e awn/receipt
--- a/awn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="dbdccc0"
 CATEGORY="x-window"
 SHORT_DESC="Dock-like bar which sits at the bottom of the screen"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/p12tic/awn"
 REPOLOGY="avant-window-navigator"
@@ -16,7 +16,7 @@
 BUILD_DEPENDS="intltool gtk-doc libtool automake python-dev gtk2-dev \
 python-pycairo-dev python-pygtk-dev vala python-pyxdg glibmm-dev libdesktop-agnostic-dev \
 gtkmm-dev dbus-glib-dev xorg-libXcomposite-dev libwnck2-dev libgtop-dev"
-SPLIT="awn-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e awstats-hotspot/receipt
--- a/awstats-hotspot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awstats-hotspot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,24 +6,20 @@
 SHORT_DESC="Squid Log file analyzer configuration"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="squid awstats"
 WEB_SITE="http://www.slitaz.org/"
-TAGS="log analysis"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp $stuff/* $fs/usr/bin
+	DEPENDS="squid awstats"
+	TAGS="log analysis"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" /usr/bin/loghotspot.sh --install
 }
 
-post_remove()
-{
+post_remove() {
 	cd "$1/"
 	grep -l loghotspot.sh etc/awstats/*.conf | xargs rm -f
 	cd - > /dev/null
diff -r ad29ddfee1c9 -r d5aab818505e awstats/.icon.png
Binary file awstats/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e awstats/receipt
--- a/awstats/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/awstats/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="7.0"
 CATEGORY="network"
 SHORT_DESC="Log file analyzer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://awstats.sourceforge.net/"
+WEB_SITE="https://awstats.sourceforge.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e axel/receipt
--- a/axel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/axel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.16.1"
 CATEGORY="network"
 SHORT_DESC="Download accelerator"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/axel-download-accelerator/axel"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/axel-download-accelerator/axel/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="openssl-dev gettext"
+BUILD_DEPENDS="openssl-dev gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e ayttm/.icon.png
Binary file ayttm/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e ayttm/receipt
--- a/ayttm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ayttm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev zlib-dev audiofile-dev xorg-xcb-util-dev openssl10-dev \
-flex enchant-dev xorg-libXpm-dev libtool gettext"
+flex enchant-dev xorg-libXpm-dev libtool gettext-dev"
 
 compile_rules() {
 	# remove -lfl
diff -r ad29ddfee1c9 -r d5aab818505e azdrawing/.icon.png
Binary file azdrawing/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e azdrawing/receipt
--- a/azdrawing/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/azdrawing/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,16 +16,13 @@
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev libjpeg-turbo-dev \
 xorg-libXext-dev xorg-libXi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i "s|/usr/local|$DESTDIR/usr|; s|\$(MACRO) ||" Makefile
+compile_rules() {
+	sed -i "s|/usr/local|$install/usr|; s|\$(MACRO) ||" Makefile
 
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e azpainter1/.icon.png
Binary file azpainter1/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e azpainter1/receipt
--- a/azpainter1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/azpainter1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="azpainter1"
 VERSION="1.0.7"
@@ -11,21 +11,18 @@
 TARBALL="azpainter-$VERSION.tar.bz2"
 WGET_URL="http://rwthaachen.dl.osdn.jp/azpainter/64397/$TARBALL"
 
-DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
-xorg-libXft xorg-libXi zlib"
 BUILD_DEPENDS="libjpeg-turbo-dev freetype-dev xorg-libX11-dev xorg-libXext-dev \
 xorg-libXi-dev xorg-libXft-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i "s|/usr/local|$DESTDIR/usr|; s|gtk|echo &|;s|\$(MACRO) ||" Makefile
+compile_rules() {
+	sed -i "s|/usr/local|$install/usr|; s|gtk|echo &|;s|\$(MACRO) ||" Makefile
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="fontconfig freetype libjpeg-turbo xorg-libX11 xorg-libXext \
+	xorg-libXft xorg-libXi zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e b43-fwcutter/receipt
--- a/b43-fwcutter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/b43-fwcutter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,21 @@
 VERSION="019"
 CATEGORY="utilities"
 SHORT_DESC="Utility for extracting Broadcom 43xx firmware"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://wireless.kernel.org/en/users/Drivers/b43"
+WEB_SITE="https://wireless.wiki.kernel.org/en/users/Drivers/b43"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://bues.ch/b43/fwcutter/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
-	mkdir -p $install/usr/bin
-	cp -a b43-fwcutter $install/usr/bin
+compile_rules() {
+	make &&
+	install -Dm755 b43-fwcutter $install/usr/bin/b43-fwcutter || return 1
 
 	cook_pick_manpages *.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	TAGS="wireless"
 }
diff -r ad29ddfee1c9 -r d5aab818505e babl/receipt
--- a/babl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/babl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.56"
 CATEGORY="system-tools"
 SHORT_DESC="Pixel format translation library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="http://gegl.org/babl/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/babl.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.gimp.org/pub/babl/${VERSION%.*}/$TARBALL"
 
-SPLIT="babl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e backintime/receipt
--- a/backintime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/backintime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-${VERSION}_src.tar.gz"
 WGET_URL="http://backintime.le-web.org/download/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python rsync meld perl gettext-tools" # python-glade2 python-gnome2
+BUILD_DEPENDS="python rsync meld perl gettext" # python-glade2 python-gnome2
 
 compile_rules() {
 	cd $src/common
@@ -21,7 +21,7 @@
 		--sysconfdir=/etc \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e backup-manager/receipt
--- a/backup-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/backup-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="backup-manager"
 VERSION=0.7.13
 CATEGORY="network"
-SHORT_DESC="A really simple to use backup tool."
+SHORT_DESC="A really simple to use backup tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/sukria/Backup-Manager"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/sukria/Backup-Manager"
 WGET_URL="$WEB_SITE/archive/$GITHASH.tar.gz"
-CONFIG_FILES="/etc/backup-manager.conf"
-TAGS="backup"
 
-DEPENDS="bash perl"
-BUILD_DEPENDS="gettext coreutils-operations perl"
-SUGGESTED="ssh rsync mysql postgresql"
+BUILD_DEPENDS="gettext-dev coreutils-operations perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+compile_rules() {
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir $fs/etc
 	cp -a $install/* $fs/
 	cp $fs/usr/share/backup-manager/backup-manager.conf.tpl $fs/etc/backup-manager.conf
 	rm -r $fs/usr/share/man
+	DEPENDS="bash perl"
+	SUGGESTED="ssh rsync mysql postgresql"
+	CONFIG_FILES="/etc/backup-manager.conf"
+	TAGS="backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e backuppc/receipt
--- a/backuppc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/backuppc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,39 +20,43 @@
 bzip2 openssh perl-libwww-perl"
 BUILD_DEPENDS="par2 perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/etc/apache/conf.d
+compile_rules() {
+	mkdir -p $install/etc/apache/conf.d
 	grep -q share/BackupPC/doc configure.pl ||
 	sed -i -e 's|/doc|/share/BackupPC/doc|' \
 		-e 's|bin doc|bin share/BackupPC/doc|' \
 		configure.pl
-	perl configure.pl --batch --dest-dir=$DESTDIR --install-dir=/usr \
-		--data-dir=/var/lib/BackupPC --config-dir=/etc/BackupPC \
-		--log-dir=/var/log/BackupPC --backuppc-user=www \
-		--hostname=localhost --html-dir=/usr/share/BackupPC/www \
+
+	perl configure.pl \
+		--batch \
+		--dest-dir=$install \
+		--install-dir=/usr \
+		--data-dir=/var/lib/BackupPC \
+		--config-dir=/etc/BackupPC \
+		--log-dir=/var/log/BackupPC \
+		--backuppc-user=www \
+		--hostname=localhost \
+		--html-dir=/usr/share/BackupPC/www \
 		--html-dir-url=/BackupPC/img \
-		--cgi-dir=/usr/share/BackupPC/cgi &&
-	cp httpd/BackupPC.conf $DESTDIR/etc/apache/conf.d
+		--cgi-dir=/usr/share/BackupPC/cgi \
+		&&
+	cp httpd/BackupPC.conf $install/etc/apache/conf.d
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	cp -a $stuff/* $fs
-	sed -i -e "s/''http/'http/;s/min''/min'/" \
-	       -e 's/-E -N -d/-E -d/' \
-	       -e "s/^\\\$Conf{CgiAdminUsers}.*/\$Conf{CgiAdminUsers} = 'root';/" \
-	       -e 's|sshPath -q -x|sshPath -o UserKnownHostsFile=/etc/BackupPC/.ssh/known_hosts -i /etc/BackupPC/.ssh/id_rsa -q -x|' \
-		$fs/etc/BackupPC/config.pl
+	sed \
+		-e "s/''http/'http/;s/min''/min'/" \
+		-e 's/-E -N -d/-E -d/' \
+		-e "s/^\\\$Conf{CgiAdminUsers}.*/\$Conf{CgiAdminUsers} = 'root';/" \
+		-e 's|sshPath -q -x|sshPath -o UserKnownHostsFile=/etc/BackupPC/.ssh/known_hosts -i /etc/BackupPC/.ssh/id_rsa -q -x|' \
+		-i $fs/etc/BackupPC/config.pl
 	chown www.www $fs/etc/BackupPC/config.pl
 	chmod 755 $fs/etc $fs/var $fs/var/*
 }
 
-post_install()
-{
+post_install() {
 	grep -qs backuppc "$1/etc/rcS.conf" ||
 	sed -i 's/^RUN_DAEMONS="/RUN_DAEMONS="backuppc /' "$1/etc/rcS.conf"
 	loc=$LANG
@@ -71,13 +75,19 @@
 		/etc/init.d/backuppc start
 		/etc/init.d/apache start
 	fi
-	cat <<EOT
 
-Now you should :
-- append /etc/BackupPC/.ssh/id_rsa.pub to every unix client /root/.ssh/authorized_keys file
-- update \$Conf{CgiAdminUsers} in /etc/BackupPC/config.pl 
-- enable web access with 'htpasswd -c root /etc/BackupPC/BackupPC.users'
-- update passwords in /etc/BackupPC/*.sh
-- ... and maybe jail /var/lib/BackupPC into a xfs/noatime for ext4 users.
+	[ -n "$quiet" ] || cat <<"EOT"
+
+	.-------------------------------------------------------------.
+	| Now you should:                                             |
+	| - append /etc/BackupPC/.ssh/id_rsa.pub to every unix client |
+	|   /root/.ssh/authorized_keys file                           |
+	| - update $Conf{CgiAdminUsers} in /etc/BackupPC/config.pl    |
+	| - enable web access with                                    |
+	|   'htpasswd -c root /etc/BackupPC/BackupPC.users'           |
+	| - update passwords in /etc/BackupPC/*.sh                    |
+	| - ... and maybe jail /var/lib/BackupPC into a xfs/noatime   |
+	|   for ext4 users.                                           |
+	'-------------------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e barcode/receipt
--- a/barcode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/barcode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.gnu.org/gnu/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext libpaper-dev"
+BUILD_DEPENDS="gettext-dev libpaper-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e barnyard2/receipt
--- a/barnyard2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/barnyard2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.9"
 CATEGORY="system-tools"
 SHORT_DESC="Output spool reader for Snort"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.securixlive.com/barnyard2/"
+WEB_SITE="https://github.com/firnsy/barnyard2"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.securixlive.com/download/barnyard2/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e bash/receipt
--- a/bash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 BASEVERSION="${VERSION%.*}"
 CATEGORY="shells"
 SHORT_DESC="The GNU bourne shell"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/bash/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/bash.html"
@@ -18,8 +18,8 @@
 BASHPATCHES="$(for i in $(seq 1 ${VERSION##*.p}); do printf "bash${BASEVERSION/./}-%03d " $i; done)"
 EXTRA_SOURCE_FILES="$BASHCHECK $BASHPATCHES"
 
-BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext patch"
-SPLIT="bash-dev"
+BUILD_DEPENDS="ncurses-dev readline-dev texinfo gettext-dev patch"
+SPLIT="$PACKAGE-dev"
 
 patch_bash() {
 	for i in $BASHPATCHES; do
@@ -31,12 +31,12 @@
 	done
 }
 
-# Rules to compile & install the temporary toolchain.
 cook_tmp_toolchain() {
 	cd $src
 	patch_bash
 	./configure --without-bash-malloc &&
-	make && make install
+	make &&
+	make install
 }
 
 compile_rules() {
@@ -71,7 +71,7 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	# Bash doesn't care about DESTDIR in environnment variable.
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Config files
 	cp -a $stuff/etc $install
@@ -81,7 +81,7 @@
 	[ -s "$SRC/$BASHCHECK" ] ||
 		wget -O "$SRC/$BASHCHECK" $BASHCHECKURL
 	echo
-	$DESTDIR/bin/bash $SRC/$BASHCHECK $DESTDIR/bin/bash | \
+	$install/bin/bash $SRC/$BASHCHECK $install/bin/bash | \
 	tee bashcheck.log
 	echo
 	grep Vulnerable bashcheck.log && echo "ERROR: Vulnerable"
diff -r ad29ddfee1c9 -r d5aab818505e bastet/receipt
--- a/bastet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bastet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="1b3e692"
 CATEGORY="games"
 SHORT_DESC="Bastard tetris clone"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://fph.altervista.org/prog/bastet.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e bc/receipt
--- a/bc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,12 +3,11 @@
 PACKAGE="bc"
 VERSION="1.07.1"
 CATEGORY="utilities"
-SHORT_DESC="Bc is a cmdline calculator"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Commandline calculator"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnu.org/software/bc/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/bc.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e bcrypt/receipt
--- a/bcrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bcrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,24 @@
 VERSION="1.1"
 CATEGORY="security"
 SHORT_DESC="File encryption utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://bcrypt.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://bcrypt.sourceforge.net/${TARBALL}"
-TAGS="encrypt"
+WGET_URL="http://bcrypt.sourceforge.net/$TARBALL"
 
-DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make &&
+	install -Dm755 bcrypt $install/usr/bin/bcrypt || return 1
 
 	cook_pick_manpages bcrypt.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/bcrypt $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib"
+	TAGS="encrypt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e beaver/receipt
--- a/beaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/beaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.1"
 CATEGORY="text"
 SHORT_DESC="Simple and very light advanced text editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://beaver-editor.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/beaver-editor/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev"
-SPLIT="beaver-plugins"
+SPLIT="$PACKAGE-plugins"
 
 compile_rules() {
 	sed -i 's|dir/po/\*\.po|& 2>/dev/null|' configure
diff -r ad29ddfee1c9 -r d5aab818505e beecrypt/receipt
--- a/beecrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/beecrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.2.1"
 CATEGORY="security"
 SHORT_DESC="BeeCrypt Cryptography Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://beecrypt.sourceforge.net/"
 
@@ -13,7 +13,7 @@
 TARBALL_SHA256="286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d"
 
 BUILD_DEPENDS="python-dev"
-SPLIT="beecrypt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e beep/receipt
--- a/beep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/beep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="beep"
 VERSION="1.3"
 CATEGORY="system-tools"
-SHORT_DESC="Advanced pc-speaker beeper."
+SHORT_DESC="Advanced PC-speaker beeper"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.johnath.com/beep/README"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.johnath.com/beep/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make || return 1
 
+	install -Dm755 beep $install/usr/bin/beep
 	cook_pick_manpages beep.1.gz
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/beep $fs/usr/bin
+genpkg_rules() {
+	copy @std
 }
 
-post_remove()
-{
+post_remove() {
 	ln -s /bin/busybox "$1/usr/bin/beep"
 }
diff -r ad29ddfee1c9 -r d5aab818505e beneath-a-steel-sky/receipt
--- a/beneath-a-steel-sky/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/beneath-a-steel-sky/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="beneath-a-steel-sky"
 VERSION="1.2"
 CATEGORY="games"
-SHORT_DESC="Beneath A Steel Sky is a 2D point-and-click science fiction thriller"
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="2D point-and-click science fiction thriller"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://revolution.co.uk/games/beneath-a-steel-sky/"
 
diff -r ad29ddfee1c9 -r d5aab818505e billardgl/receipt
--- a/billardgl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/billardgl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,31 @@
 PACKAGE="billardgl"
 VERSION="1.75"
 CATEGORY="games"
-SHORT_DESC="OpenGL billard game."
+SHORT_DESC="OpenGL billard game"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/billardgl/"
+
 SOURCE="BillardGL"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/billardgl/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="glu freeglut"
-BUILD_DEPENDS="glu xorg-libXmu-dev xorg-libXi-dev mesa-dev \
-glu-dev freeglut-dev"
+BUILD_DEPENDS="glu xorg-libXmu-dev xorg-libXi-dev mesa-dev glu-dev freeglut-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	sed -i 's/stream.h/stream/' bmp.cpp
 	grep -q namespace bmp.cpp ||
 	sed -i 's/"bmp.h"/"bmp.h"\nusing namespace std;/' bmp.cpp
 	make || return 1
-	mkdir -p $DESTDIR/usr/share/BillardGL  $DESTDIR/usr/games
-	cp $src/src/BillardGL $DESTDIR/usr/games
-	cp -R $src/src/Texturen $DESTDIR/usr/share/BillardGL
-	cp -R $src/src/lang $DESTDIR/usr/share/BillardGL
-	cp -R $src/src/README $DESTDIR/usr/share/BillardGL
+	mkdir -p $install/usr/share/BillardGL  $install/usr/games
+	cp $src/src/BillardGL $install/usr/games
+	cp -R $src/src/Texturen $install/usr/share/BillardGL
+	cp -R $src/src/lang $install/usr/share/BillardGL
+	cp -R $src/src/README $install/usr/share/BillardGL
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="glu freeglut"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e bin86/receipt
--- a/bin86/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bin86/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.16.21"
 CATEGORY="development"
 SHORT_DESC="A complete 8086 assembler and loader"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.debath.co.uk/"
 HOST_ARCH="i486"
@@ -13,9 +13,13 @@
 WGET_URL="http://v3.sk/~lkundrak/dev86/$TARBALL"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1
+	mkdir -p $install/usr/bin $install/usr/share/man/man1
+
 	make PREFIX=/usr &&
-	make PREFIX=$DESTDIR/usr MANDIR=$DESTDIR/usr/share/man/man1 install
+	make \
+		PREFIX=$install/usr \
+		MANDIR=$install/usr/share/man/man1 \
+		install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bind/receipt
--- a/bind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,10 @@
 WGET_URL="http://ftp.isc.org/isc/bind9/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="libtool libcap-dev openssl-dev perl krb5-dev readline-dev"
-SPLIT="bind-client libbind bind-dev"
+SPLIT="$PACKAGE-client libbind $PACKAGE-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/etc/bind
+	mkdir -p $install/etc/bind
 
 	./configure \
 		--sysconfdir=/etc/bind \
@@ -27,10 +27,10 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	LD_LIBRARY_PATH=$DESTDIR/usr/lib \
-	$DESTDIR/usr/bin/dig ns . @a.root-servers.net. > $DESTDIR/etc/bind/db.root
+	LD_LIBRARY_PATH=$install/usr/lib \
+	$install/usr/bin/dig ns . @a.root-servers.net. > $install/etc/bind/db.root
 
 	cp -a $stuff/etc $install
 	chown -R root:root $install/etc
diff -r ad29ddfee1c9 -r d5aab818505e binutils/receipt
--- a/binutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/binutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.29"
 CATEGORY="development"
 SHORT_DESC="GNU assembler, linker and binary utilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2 GPL3 LGPL3"
 WEB_SITE="http://www.gnu.org/software/binutils/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/binutils.html"
@@ -12,15 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
-BUILD_DEPENDS="glibc-dev zlib-dev texinfo bison flex gettext-tools"
-SPLIT="libbfd binutils"
+BUILD_DEPENDS="glibc-dev zlib-dev texinfo bison flex gettext"
+SPLIT="libbfd $PACKAGE"
 
 compile_rules() {
 	mkdir build
 	cd    build
 
-	$src/configure \
+	./configure \
 		--enable-gold \
 		--enable-ld=default \
 		--enable-plugins \
diff -r ad29ddfee1c9 -r d5aab818505e bird/receipt
--- a/bird/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bird/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Internet routing daemon"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://bird.network.cz"
+WEB_SITE="https://bird.network.cz/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://bird.network.cz/pub/$PACKAGE/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bison/receipt
--- a/bison/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bison/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.5"
 CATEGORY="development"
 SHORT_DESC="GNU parser generator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/bison/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/bison.html"
@@ -12,10 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="m4 perl libxslt gettext"
+BUILD_DEPENDS="m4 perl libxslt gettext-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bittorrent/receipt
--- a/bittorrent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bittorrent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="bittorrent"
-SOURCE="BitTorrent"
 VERSION="5.2.2"
 CATEGORY="network"
-SHORT_DESC="A tool for distributing files. Each new downloader add new upload capacity."
+SHORT_DESC="A tool for distributing files. Each new downloader add new upload capacity"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
+WEB_SITE="https://www.bittorrent.com/"
+
+SOURCE="BitTorrent"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="https://www.bittorrent.com/"
 WGET_URL="http://distro.ibiblio.org/sourcemage/mirror/fallback/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python python-twisted"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e blackbox/receipt
--- a/blackbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/blackbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bleachbit/receipt
--- a/bleachbit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bleachbit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,11 +12,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.bleachbit.org/$TARBALL"
 
-BUILD_DEPENDS="python gettext-tools"
+BUILD_DEPENDS="python gettext"
 
 compile_rules() {
 	make -C po local &&
-	make prefix=/usr DESTDIR=$DESTDIR install
+	make prefix=/usr DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e blender/receipt
--- a/blender/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/blender/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.75a"
 CATEGORY="graphics"
 SHORT_DESC="3D content creation suite"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://www.blender.org/"
+WEB_SITE="https://www.blender.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.blender.org/source/$TARBALL"
 
 BUILD_DEPENDS="cmake xorg-libXmu ilmbase-dev yasm coreutils-file-format \
-gettext mesa-dev freeglut-dev librsvg-dev openexr-dev tiff-dev openal-dev \
+gettext-dev mesa-dev freeglut-dev librsvg-dev openexr-dev tiff-dev openal-dev \
 glu libsdl-dev python3-dev libsamplerate-dev ffmpeg-dev lcms-dev openjpeg-dev \
 boost-dev boost-math boost-math-tr1 boost-filesystem \
 glu-dev glew-dev xorg-libXi-dev"
@@ -37,8 +37,8 @@
 		-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python${p3v}m &&
 	# build
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install &&
-	python3 -m compileall "$DESTDIR/usr/share/blender" || return 1
+	make DESTDIR=$install install &&
+	python3 -m compileall "$install/usr/share/blender" || return 1
 
 	mv -f $install/usr/bin/blender $install/usr/bin/blender-bin
 	cp -a $stuff/blender $install/usr/bin/
diff -r ad29ddfee1c9 -r d5aab818505e blktrace/receipt
--- a/blktrace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/blktrace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="blktrace"
 VERSION="1.0.5"
 CATEGORY="system-tools"
-SHORT_DESC="Block layer IO tracing."
+SHORT_DESC="Block layer IO tracing"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://brick.kernel.dk/snaps"
+WEB_SITE="http://brick.kernel.dk/snaps/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="libaio"
 BUILD_DEPENDS="libaio-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' Makefile
 
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/usr/share
 	mv $install/usr/man $install/usr/share
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libaio"
 }
diff -r ad29ddfee1c9 -r d5aab818505e blogotext/receipt
--- a/blogotext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/blogotext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="blogotext"
 VERSION="2.0.0.0"
 CATEGORY="network"
-SHORT_DESC="Simple blog engine."
+SHORT_DESC="Simple blog engine"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://lehollandaisvolant.net/blogotext"
+WEB_SITE="https://github.com/BlogoText/blogotext"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-URL="$WEB_SITE/archives/$TARBALL"
+URL="$WEB_SITE/archives/$TARBALL" # FIXME
 
-DEPENDS="php-gd"
+compile_rules() {
+	[ -s "$SRC/$TARBALL" ] || wget -O "$SRC/$TARBALL" $URL
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	[ -s "$SRC/$TARBALL" ] || wget -O "$SRC/$TARBALL" $URL
-	mkdir -p $DESTDIR/var/www 2>/dev/null
-	cd $DESTDIR/var/www
+	mkdir -p $install/var/www 2>/dev/null
+	cd $install/var/www
 	unzip "$SRC/$TARBALL"
-	chown -R 80.80 $DESTDIR/var/www/blogotext
+	chown -R 80.80 $install/var/www/blogotext
+	find $install -type f -exec chmod a-x '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
-	find $fs -type f -exec chmod a-x \{\} \;
+	DEPENDS="php-gd"
 }
diff -r ad29ddfee1c9 -r d5aab818505e bluefish/receipt
--- a/bluefish/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bluefish/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="2.2.8"
 CATEGORY="development"
 SHORT_DESC="A powerful editor"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://bluefish.openoffice.nl/index.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://www.bennewitz.com/bluefish/stable/source/${TARBALL}"
+WGET_URL="http://www.bennewitz.com/bluefish/stable/source/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev pcre-dev intltool libxml2-dev expat-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e blueman/receipt
--- a/blueman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/blueman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.10"
 CATEGORY="system-tools"
 SHORT_DESC="Easy to use GTK+ Bluetooth Manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/blueman-project/blueman"
 
diff -r ad29ddfee1c9 -r d5aab818505e bluez/receipt
--- a/bluez/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bluez/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.48"
 CATEGORY="system-tools"
 SHORT_DESC="Bluetooth protocol stack"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.bluez.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/bluez.html"
@@ -14,7 +14,7 @@
 
 #BUILD_DEPENDS="alsa-lib-dev dbus-dev glib-dev libusb-dev libusb-compat"
 BUILD_DEPENDS="glib-dev dbus-dev eudev-dev libical-dev readline-dev"
-SPLIT="bluez-tools bluez-tools-experimental bluez bluez-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-tools-experimental $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e bmon/receipt
--- a/bmon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bmon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="bmon"
 VERSION="4.0"
 CATEGORY="network"
-SHORT_DESC="bandwidth monitor and rate estimator"
+SHORT_DESC="Bandwidth monitor and rate estimator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/tgraf/bmon"
@@ -17,7 +17,7 @@
 	./autogen.sh
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc/
 	mv $install/usr/share/doc/bmon/examples/bmon.conf $install/etc/
diff -r ad29ddfee1c9 -r d5aab818505e bmpanel2/receipt
--- a/bmpanel2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bmpanel2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1pre1"
 CATEGORY="misc"
 SHORT_DESC="Nice NETWM-compatible panel for X11"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/nsf/bmpanel2"
 
@@ -12,11 +12,11 @@
 WGET_URL="https://github.com/nsf/bmpanel2/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake xorg-libX11-dev cairo-dev pango-dev"
-SPLIT="bmpanel2-themes bmpanel2cfg"
+SPLIT="$PACKAGE-themes bmpanel2cfg"
 
 compile_rules() {
 	# fix "with" statement for python 2.5
-	sed -i "s/import sys, os/from __future__ import with_statement \nimport sys, os /" extra/py/${PACKAGE}.py
+	sed -i "s/import sys, os/from __future__ import with_statement \nimport sys, os /" extra/py/$PACKAGE.py
 
 	mkdir build; cd build
 	cmake \
diff -r ad29ddfee1c9 -r d5aab818505e bogofilter/receipt
--- a/bogofilter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bogofilter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.4"
 CATEGORY="network"
 SHORT_DESC="Mail filter that classifies mail as spam or ham"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 GPL3"
 WEB_SITE="http://bogofilter.sourceforge.net/"
 
@@ -19,7 +19,7 @@
 		--sysconfdir=/etc/bogofilter \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod +x $install/usr/bin/bf_*
 }
diff -r ad29ddfee1c9 -r d5aab818505e boinc/receipt
--- a/boinc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/boinc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,16 +5,16 @@
 SVN_TAG="6_10_58"
 CATEGORY="network"
 SHORT_DESC="Open-source software for volunteer computing and grid computing"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://boinc.berkeley.edu/"
+WEB_SITE="https://boinc.berkeley.edu/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="svn|http://boinc.berkeley.edu/svn/tags/boinc_core_release_${SVN_TAG}"
 
 BUILD_DEPENDS="subversion openssl-dev autoconf automake curl-dev libidn-dev \
 wxWidgets28-dev libnotify-dev sqlite3-dev file"
-SPLIT="boinc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/AC_PROG_CPP/&\nAC_PROG_OBJCXX/' configure.ac
@@ -54,7 +54,7 @@
 post_install_boinc() {
 	echo
 	# Check if boinc user already exists
-	if grep -q ^${BOINCUSER}: "$1/etc/passwd"; then
+	if grep -q "^$BOINCUSER:" "$1/etc/passwd"; then
 		chroot "$1/" adduser -g "BOINC User" -h /var/lib/boinc -s /bin/bash -S -H -D boinc
 	else
 		# In case boinc was previously installed:
diff -r ad29ddfee1c9 -r d5aab818505e boost/receipt
--- a/boost/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/boost/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.68.0"
 CATEGORY="meta"
 SHORT_DESC="Boost C++ libraries"
-MAINTAINER="chadi.elahmad@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.boost.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/boost.html"
@@ -15,13 +15,18 @@
 TARBALL_SHA256="7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"
 
 BUILD_DEPENDS="icu-dev zlib-dev bzip2-dev python-dev"
-b="boost"
-SPLIT="$b-atomic $b-chrono $b-container $b-context $b-contract $b-coroutine \
-$b-date-time $b-fiber $b-filesystem $b-graph $b-iostreams $b-locale $b-log \
-$b-math $b-math-tr1 $b-prg-exec-monitor $b-program-options $b-python $b-random \
-$b-regex $b-serialization $b-signals $b-stacktrace $b-system $b-thread \
-$b-timer $b-type-erasure $b-unit-test-framework $b-wave $b-wserialization \
-$b-dev"
+SPLIT="\
+$PACKAGE-atomic              $PACKAGE-chrono          $PACKAGE-container \
+$PACKAGE-context             $PACKAGE-contract        $PACKAGE-coroutine \
+$PACKAGE-date-time           $PACKAGE-fiber           $PACKAGE-filesystem \
+$PACKAGE-graph               $PACKAGE-iostreams       $PACKAGE-locale \
+$PACKAGE-log                 $PACKAGE-math            $PACKAGE-math-tr1 \
+$PACKAGE-prg-exec-monitor    $PACKAGE-program-options $PACKAGE-python \
+$PACKAGE-random              $PACKAGE-regex           $PACKAGE-serialization \
+$PACKAGE-signals             $PACKAGE-stacktrace      $PACKAGE-system \
+$PACKAGE-thread              $PACKAGE-timer           $PACKAGE-type-erasure \
+$PACKAGE-unit-test-framework $PACKAGE-wave            $PACKAGE-wserialization \
+$PACKAGE-dev"
 
 # About splitting: there's complex relationships between header files.
 # Previously, for example, the /usr/include/boost/chrono/* files were packed
@@ -54,6 +59,7 @@
 }
 
 genpkg_rules() {
+	b="boost"
 	DEPENDS=" "
 	case $PACKAGE in
 		boost)					DEPENDS="$b-date-time $b-iostreams $b-regex $b-serialization $b-system $b-thread";;
diff -r ad29ddfee1c9 -r d5aab818505e bootchart/receipt
--- a/bootchart/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bootchart/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="bootchart"
 VERSION="0.9"
 CATEGORY="misc"
-SHORT_DESC="boot process performance analyzer (add init=/sbin/bootchartd to boot options)"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Boot process performance analyzer (add init=/sbin/bootchartd to boot options)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.bootchart.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -13,10 +13,8 @@
 
 SUGGESTED="pybootchartgui"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/sbin $fs/etc 
+genpkg_rules() {
+	mkdir -p $fs/sbin $fs/etc
 	cp -a $src/script/bootchartd $fs/sbin/bootchartd
 	cp -a $src/script/bootchartd.conf $fs/etc
 	sed -i "s/SAMPLE_PERIOD=0.2/SAMPLE_PERIOD=1/" $fs/etc/bootchartd.conf
@@ -25,8 +23,7 @@
 	chown -R root:root $fs
 }
 
-post_install()
-{
+post_install() {
 	KERNEL_VERSION=$(uname -r | cut -d- -f1)
 	MENU="$1/boot/grub/menu.lst"
 	if [ -f "$MENU" ]; then
diff -r ad29ddfee1c9 -r d5aab818505e boxbackup/receipt
--- a/boxbackup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/boxbackup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.12"
 CATEGORY="meta"
 SHORT_DESC="BoxBackup on-line backup system"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.boxbackup.org/"
 
@@ -14,7 +14,7 @@
 WGET_URL="https://github.com/boxbackup/boxbackup/archive/$TARBALL"
 
 BUILD_DEPENDS="automake zlib-dev libedit-dev db-dev openssl-dev libxslt"
-SPLIT="boxbackup-client boxbackup-server"
+SPLIT="$PACKAGE-client $PACKAGE-server"
 
 compile_rules() {
 	./bootstrap
@@ -119,7 +119,7 @@
 }
 
 post_install_boxbackup_server() {
-	HOSTNAME=$(ifconfig | awk -F ":" '/cast/ {print substr($2,0, index($2," ")-1) }')
+	HOSTNAME=$(ifconfig | awk -F ":" '/cast/ {print substr($2,0, index($2," ")-1) }')	#'MC
 	CONF_DIR="/etc/boxbackup"
 	DATA_DIR="/var/lib/bbstored"
 	CA_DIR="${CONF_DIR}/ca"
@@ -191,16 +191,16 @@
 		# Sign the server certificate
 		action "Sign the server certificate..."
 		chroot "$1/" openssl x509 -req -sha1 -extensions usr_crt \
-			-in $CONF_DIR/$BBUSER/${HOSTNAME}-csr.pem \
+			-in $CONF_DIR/$BBUSER/$HOSTNAME-csr.pem \
 			-CA $CA_DIR/roots/serverCA.pem \
 			-CAkey $CA_DIR/keys/serverRootKey.pem \
-			-out $CA_DIR/servers/${HOSTNAME}-cert.pem \
+			-out $CA_DIR/servers/$HOSTNAME-cert.pem \
 			-days 5000 2>1 > /dev/null
 		status
 
 		# Preparing the server certificates
 		action "Installing server certificate..."
-		cp -a "$1$CA_DIR/servers/${HOSTNAME}-cert.pem" "$1$CONF_DIR/$BBUSER"
+		cp -a "$1$CA_DIR/servers/$HOSTNAME-cert.pem" "$1$CONF_DIR/$BBUSER"
 		status
 		action "Installing client certificate..."
 		cp -a "$1$CA_DIR/roots/clientCA.pem" "$1$CONF_DIR/$BBUSER"
diff -r ad29ddfee1c9 -r d5aab818505e bozohttpd/receipt
--- a/bozohttpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bozohttpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="bozohttpd"
 VERSION="20111118"
 CATEGORY="network"
-SHORT_DESC="Small and secure http version 1.1 server"
-MAINTAINER="milka@konstelacioj.info"
+SHORT_DESC="Small and secure HTTP/1.1 server"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.eterna.com.au/$PACKAGE/"
+WEB_SITE="http://www.eterna.com.au/bozohttpd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.eterna.com.au/$PACKAGE/$TARBALL"
-TAGS="http server lightweight CGI ipv6 ssl"
-PROVIDE="lighttpd"
 
-DEPENDS="openssl"
 BUILD_DEPENDS="openssl-dev"
-SUGGESTED="haserl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make -f Makefile.boot all
+compile_rules() {
+	make -f Makefile.boot all || return 1
 
+	install -Dm755 bozohttpd $install/usr/bin/bozohttpd
 	cook_pick_manpages bozohttpd.8
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/bozohttpd $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl"
+	PROVIDE="lighttpd"
+	SUGGESTED="haserl"
+	TAGS="http server lightweight CGI ipv6 ssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e bridge-utils/receipt
--- a/bridge-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bridge-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6"
 CATEGORY="system-tools"
 SHORT_DESC="IEEE 802.1d ethernet bridging"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/utils/net/bridge-utils/"
 
diff -r ad29ddfee1c9 -r d5aab818505e brisk-menu/receipt
--- a/brisk-menu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/brisk-menu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/solus-project/brisk-menu/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="meson ninja gtk3-dev mate-panel-dev mate-menus-dev \
-libnotify-dev gettext"
+libnotify-dev gettext-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e broadcom-wl/receipt
--- a/broadcom-wl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/broadcom-wl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,42 +4,38 @@
 VERSION="6_30_223_271"
 EXTRAVERSION="_$kvers"
 CATEGORY="network"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Broadcom 802.11abg Linux STA Networking Drivers"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
-SHORT_DESC="Broadcom 802.11abg Linux STA Networking Drivers"
-WEB_SITE="http://www.broadcom.com/support/802.11/linux_sta.php"
+WEB_SITE="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure"
+
 TARBALL="hybrid-v35-nodebug-pcoem-$VERSION.tar.gz"
 WGET_URL="https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/$TARBALL"
-TAGS="wireless wifi driver"
 
-DEPENDS="linux"
 BUILD_DEPENDS="linux-module-headers xz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/IEEE80211_BAND_/NL80211_BAND_/g' src/wl/sys/wl_cfg80211_hybrid.c
 	sed -i 's/rdtscl(cycles)/cycles = (u32)rdtsc()/' src/shared/linux_osl.c # for kernel > 4.3.0
-	KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
+
+	KBUILD_NOPEDANTIC=1 \
+	make -C /usr/src/linux M=$(pwd)
 	xz wl.ko
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless
+genpkg_rules() {
+	mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/drivers/net/wireless
 	# Compress and install module
 	install -o root -m 0644 $src/wl.ko.xz \
-		$fs/lib/modules/${kvers}-slitaz/kernel/drivers/net/wireless/wl.ko.xz
+		$fs/lib/modules/$kvers-slitaz/kernel/drivers/net/wireless/wl.ko.xz
+	DEPENDS="linux"
+	TAGS="wireless wifi driver"
 }
 
-# Post install/remove commands for Tazpkg.
-post_install()
-{
+post_install() {
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
-post_remove()
-{
+post_remove() {
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r ad29ddfee1c9 -r d5aab818505e brotli/receipt
--- a/brotli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/brotli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/google/brotli/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake"
-SPLIT="brotli-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e brscan/receipt
--- a/brscan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/brscan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Brother Scanner driver for SANE"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://solutions.brother.com/linux/sol/printer/linux/sane_drivers.html"
+WEB_SITE="http://solutions.brother.com/linux/sol/printer/linux/sane_drivers.html" # FIXME 404
 HOST_ARCH="i486"
 
 TARBALL="brscan-src-$VERSION.tar.gz"
@@ -31,8 +31,8 @@
 	make -j1 &&
 	{
 		cd ..
-		mkdir -p $DESTDIR
-		cp -a brscan $DESTDIR
+		mkdir -p $install
+		cp -a brscan $install
 	}
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e btanks/receipt
--- a/btanks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/btanks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.9.8083"
 CATEGORY="games"
 SHORT_DESC="A fast 2d tank arcade game with multiplayer and split-screen modes"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://btanks.sourceforge.net/"
+WEB_SITE="http://btanks.sourceforge.net/blog/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -43,7 +43,7 @@
 	chmod +x $fs/usr/bin/btanks
 	chmod +x $fs/usr/bin/bted
 
-	ln -s /usr/bin/btanks-bin $fs/usr/share/btanks/btanks && \
+	ln -s /usr/bin/btanks-bin $fs/usr/share/btanks/btanks &&
 	ln -s /usr/bin/bted-bin $fs/usr/share/btanks/bted || return 1
 
 	# game data
diff -r ad29ddfee1c9 -r d5aab818505e btmgr/receipt
--- a/btmgr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/btmgr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -31,7 +31,7 @@
 }
 
 post_install() {
-	cat <<EOT
+	[ -n "$quiet" ] || cat <<EOT
 
 	.-------------------------------------.
 	| You can create boot floppy with:    |
diff -r ad29ddfee1c9 -r d5aab818505e btrfs-progs/receipt
--- a/btrfs-progs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/btrfs-progs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="libcomerr util-linux-uuid-dev e2fsprogs e2fsprogs-dev zlib-dev \
 acl-dev util-linux-blkid-dev lzo-dev" #autoconf automake"
-SPLIT="btrfs-mkfs btrfs-progs btrfs-libs btrfs-dev"
+SPLIT="btrfs-mkfs $PACKAGE btrfs-libs btrfs-dev"
 
 compile_rules() {
 	sed -i '1,106 s/\.gz//g' Documentation/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e buffer/receipt
--- a/buffer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/buffer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="buffer"
 VERSION="1.19"
 CATEGORY="system-tools"
-SHORT_DESC="GPL disaster recovery solution."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="GPL disaster recovery solution"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mondorescue.org/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="ftp://ftp.mondorescue.org/src/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+compile_rules() {
+	make || return 1
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+	install -Dm755 buffer $install/usr/bin/buffer
 
 	cp buffer.man buffer.1
 	cook_pick_manpages buffer.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	
-	cp -a $src/buffer  $fs/usr/bin
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e buildbot-slave/receipt
--- a/buildbot-slave/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/buildbot-slave/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,24 @@
 PACKAGE="buildbot-slave"
 VERSION="0.8.5"
 CATEGORY="development"
-SHORT_DESC="Tool to automate the compile/test cycle of code source (slave part)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Tool to automate the compile/test cycle of code source (slave part)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://buildbot.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://buildbot.googlecode.com/files/$TARBALL"
-TAGS="python buildtools"
 
-DEPENDS="python python-twisted"
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install || return 1
 
 	cook_pick_manpages docs/buildslave.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python python-twisted"
+	TAGS="python buildtools"
 }
diff -r ad29ddfee1c9 -r d5aab818505e buildbot/receipt
--- a/buildbot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/buildbot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="buildbot"
 VERSION="0.8.5"
 CATEGORY="development"
-SHORT_DESC="Tool to automate the compile/test cycle of code source."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Tool to automate the compile/test cycle of code source"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://buildbot.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://buildbot.googlecode.com/files/$TARBALL"
-TAGS="python buildtools"
 
-DEPENDS="python python-twisted"
 BUILD_DEPENDS="python python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install || return 1
 
 	cook_pick_manpages docs/buildbot.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/man
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-twisted"
+	TAGS="python buildtools"
 }
diff -r ad29ddfee1c9 -r d5aab818505e buildroot/receipt
--- a/buildroot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/buildroot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Tools to build toolchains and root filesystems with uClibc"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.buildroot.org/"
+WEB_SITE="https://buildroot.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
@@ -20,7 +20,7 @@
 	copy @std @dev
 	DEPENDS="slitaz-toolchain ncurses-dev ncurses wget ncurses-extra tar bash \
 	bzip2 perl python unzip rsync bc patch"
-	SUGGESTED="subversion bzr git elfkickers ccache bison flex gettext \
+	SUGGESTED="subversion bzr git elfkickers ccache bison flex gettext-dev \
 	texinfo"
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e bullet/receipt
--- a/bullet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bullet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.87"
 CATEGORY="graphics"
 SHORT_DESC="3D Real-Time Multiphysics Library"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
-WEB_SITE="http://bulletphysics.org"
+WEB_SITE="https://pybullet.org/wordpress/"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://bullet.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="cmake mesa-dev freeglut-dev glu-dev python-dev"
-SPLIT="bullet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -24,7 +24,7 @@
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
 	make $MAKEFLAGS &&
-	make install DESTDIR=$install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e burp/receipt
--- a/burp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/burp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="KISS BackUp and Restore Program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://burp.grke.net/"
+WEB_SITE="https://burp.grke.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -19,7 +19,7 @@
 		--sbindir=/usr/sbin \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e busybox-httpd-ctrl/receipt
--- a/busybox-httpd-ctrl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/busybox-httpd-ctrl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="busybox-httpd-ctrl"
 VERSION="1.0"
 CATEGORY="network"
-SHORT_DESC="Add menu entry to control the Busybox Httpd Web Server."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Add menu entry to control the Busybox Httpd Web Server"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.busybox.net/"
-TAGS="busybox control web server"
+WEB_SITE="https://busybox.net/"
 
-DEPENDS="busybox"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp -a $stuff/usr $install
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
+	DEPENDS="busybox"
+	TAGS="busybox control web server"
 }
diff -r ad29ddfee1c9 -r d5aab818505e busybox-slish/receipt
--- a/busybox-slish/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/busybox-slish/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 SOURCE="busybox"
 CATEGORY="base-system"
 SHORT_DESC="Busybox for SlisH basic chroot"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.busybox.net/"
+WEB_SITE="https://busybox.net/"
 
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="http://www.busybox.net/downloads/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e busybox/receipt
--- a/busybox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/busybox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,28 +11,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
-BUILD_DEPENDS_arm="bzip2"
-BUILD_DEPENDS="patch bzip2 gettext perl pam-dev libtirpc-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc
+BUILD_DEPENDS="patch bzip2 gettext-dev perl pam-dev libtirpc-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc
 case "$ARCH" in
-	arm*)   SPLIT='';;
-	x86_64) SPLIT="busybox busybox-pam:pam";;
-	*)      SPLIT="busybox busybox-pam:pam ssfs-busybox:ssfs" # busybox-boot:boot busybox-static:static
+	x86_64) SPLIT="$PACKAGE-pam:pam";;
+	*)      SPLIT="$PACKAGE-pam:pam ssfs-busybox:ssfs" # $PACKAGE-boot:boot $PACKAGE-static:static
 	        ;;
 esac
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			echo "cook: CROSS_COMPILE=$CROSS_COMPILE"
-			cp $stuff/arm/$PACKAGE.config .config
-			make oldconfig &&
-			make && make install || return 1
-			chmod 4755 $src/_install/bin/busybox
-			return 0
-			;;
-	esac
-
-	# Next both for i?86 and x86_64 native compilation
 	export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libtirpc)"
 	case "$SET" in
 		'')
@@ -166,7 +152,6 @@
 	readelf -h $WOK/busybox/install/bin/busybox
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules() {
 	case $PACKAGE in
 		busybox)
@@ -298,7 +283,7 @@
 
 # We can't remove this package!
 pre_remove_busybox() {
-	exit 1
+	return 1
 }
 
 pre_remove_busybox_pam() {
diff -r ad29ddfee1c9 -r d5aab818505e bvi/receipt
--- a/bvi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bvi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,38 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="bvi"
 VERSION="1.4.0"
 CATEGORY="development"
-SHORT_DESC="Binary VIsual (hex editor) based on the vi texteditor."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Binary VIsual (hex editor) based on the vi texteditor"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://bvi.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
-WEB_SITE="http://bvi.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="binary development editor hex vi"
-
-DEPENDS="ncurses"
 
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man \
-    --with-ncurses \
-    $CONFIGURE_ARGS &&
-    make $MAKEFLAGS &&
-    make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-ncurses \
+		$CONFIGURE_ARGS &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules(){
-
-  mkdir -p $fs/usr/bin
-  cp -a $install/usr/bin/* $fs/usr/bin
-
-  mkdir -p $fs/usr/share
-  cp -a $install/usr/share/* $fs/usr/share
-
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
+	TAGS="binary development editor hex vi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e bygfoot/receipt
--- a/bygfoot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bygfoot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.1"
 CATEGORY="games"
 SHORT_DESC="Manage your own football (soccer) team in a league season"
-MAINTAINER="ben@seawolfsanctuary.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.bygfoot.com/"
 
@@ -25,7 +25,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bzflag/receipt
--- a/bzflag/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bzflag/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.4.0"
 CATEGORY="games"
 SHORT_DESC="A multiplayer 3D tank battle game"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://bzflag.org"
+WEB_SITE="https://www.bzflag.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e bzip2/receipt
--- a/bzip2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bzip2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="utilities"
 SHORT_DESC="A program and library for data compression"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://web.archive.org/web/20180801004107/http://www.bzip.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/bzip2.html"
@@ -15,22 +15,15 @@
 WGET_URL="https://fossies.org/linux/misc/bzip2-1.0.6.tar.gz"
 TARBALL_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
 
-SPLIT="bzlib bzip2-apps bzip2-dev"
+SPLIT="bzlib $PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			# No configure script, we must used CC, AR and RANLIB set by cook.
-			make -f Makefile-libbz2_so CC=$CC AR=$AR RANLIB=$RANLIB &&
-			make clean && make CC=$CC AR=$AR RANLIB=$RANLIB ;;
-		*)
-			# add large-file support
-			sed -i 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' ./Makefile-libbz2_so
+	# add large-file support
+	sed -i 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' ./Makefile-libbz2_so
 
-			make -f Makefile-libbz2_so &&
-			make clean && make ;;
-	esac &&
-
+	make -f Makefile-libbz2_so &&
+	make clean &&
+	make &&
 	make install || return 1
 
 	rm $install/usr/bin/bunzip2 $install/usr/bin/bzcat
@@ -55,12 +48,12 @@
 			DEPENDS=" "
 			CAT="libs|library"
 			;;
-		bzip2-apps)
+		*-apps)
 			copy bin/ @rm
 			DEPENDS="bzlib"
 			CAT="utilities|apps"
 			;;
-		bzip2-dev)
+		*-dev)
 			copy @dev
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e bzr/receipt
--- a/bzr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bzr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="latest"
 CATEGORY="development"
 SHORT_DESC="Friendly distributed version control system"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pypi.org/project/bzr/"
 
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	pip install --no-compile --root=$DESTDIR bzr || return 1
+	pip install --no-compile --root=$install bzr || return 1
 
 	mkdir $install/usr/share/
 	mv $install/usr/man $install/usr/share/
diff -r ad29ddfee1c9 -r d5aab818505e bzrtools/receipt
--- a/bzrtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/bzrtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.6.0"
 CATEGORY="development"
 SHORT_DESC="Useful collection of utilities (all plugins, right now) for bazaar"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://bazaar-vcs.org/BzrTools"
+WEB_SITE="http://wiki.bazaar.canonical.com/BzrTools"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/$PACKAGE/stable/$VERSION/+download/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e c-ares/receipt
--- a/c-ares/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/c-ares/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://c-ares.haxx.se/download/$TARBALL"
 
-SPLIT="c-ares-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS=${CFLAGS/-D_GLIBCXX_USE_C99_MATH=1/}
@@ -23,7 +23,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e c-client/receipt
--- a/c-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/c-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -24,11 +24,11 @@
 	make slx
 
 	mkdir -p \
-		$DESTDIR/usr/include/c-client \
-		$DESTDIR/usr/lib
+		$install/usr/include/c-client \
+		$install/usr/lib
 	cp src/c-client/*.h c-client/linkage.h c-client/osdep.h c-client/env_unix.h \
-		$DESTDIR/usr/include/c-client
-	cp c-client/c-client.a $DESTDIR/usr/lib
+		$install/usr/include/c-client
+	cp c-client/c-client.a $install/usr/lib
 
 	chown -R root:root $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e c-icap/receipt
--- a/c-icap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/c-icap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.5"
 CATEGORY="network"
 SHORT_DESC="Implementation of an ICAP server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://c-icap.sourceforge.net/"
 
@@ -52,13 +52,13 @@
 
 	[ -n "$quiet" ] || cat <<EOF
 
-	.-----------------------------------------------.
-	| To start c-icap server you can run:           |
-	|                                               |
-	|    /etc/init.d/c-icapd start                  |
-	|                                               |
-	|Or add c-icapd to RUN_DAEMONS in /etc/rcS.conf |
-	'-----------------------------------------------'
+	.------------------------------------------------.
+	| To start c-icap server you can run:            |
+	|                                                |
+	|    /etc/init.d/c-icapd start                   |
+	|                                                |
+	| or add c-icapd to RUN_DAEMONS in /etc/rcS.conf |
+	'------------------------------------------------'
 EOF
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e cabextract/receipt
--- a/cabextract/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cabextract/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.7"
 CATEGORY="utilities"
 SHORT_DESC="Extracting Microsoft cabinet files"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.cabextract.org.uk/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kyz/libmspack/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="automake gettext"
+BUILD_DEPENDS="automake gettext-dev"
 
 compile_rules() {
 	cd cabextract
diff -r ad29ddfee1c9 -r d5aab818505e cadaver/receipt
--- a/cadaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cadaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://ponce.cc/slackware/sources/repo/$TARBALL"
 
 BUILD_DEPENDS="readline-dev neon-dev zlib-dev acl-dev openssl-dev \
-libproxy-dev expat-dev libxml2-dev gettext"
+libproxy-dev expat-dev libxml2-dev gettext-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e cairo-clock/receipt
--- a/cairo-clock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairo-clock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.4"
 CATEGORY="x-window"
 SHORT_DESC="Nice analog clock displaying the system time"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20120101103112/http://macslow.thepimp.net:80/?page_id=23"
 
@@ -13,7 +13,7 @@
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/c/$PACKAGE/${PACKAGE}_$VERSION.orig.tar.gz"
 
 BUILD_DEPENDS="intltool glib-dev gtk2-dev cairo-dev libglade-dev librsvg-dev"
-SPLIT="cairo-clock-themes cairo-clock"
+SPLIT="$PACKAGE-themes $PACKAGE"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e cairo-compmgr/receipt
--- a/cairo-compmgr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairo-compmgr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="xorg-libXcomposite-dev xorg-libXdamage-dev xorg-libXext-dev \
 xorg-libXi-dev xorg-libSM-dev cairo-dev xorg-pixman-dev gtk2-dev vala \
 xorg-libICE-dev xorg-libX11-dev util-linux-uuid-dev intltool"
-SPLIT="cairo-compmgr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# make needed pkg-config file
diff -r ad29ddfee1c9 -r d5aab818505e cairo-dock-plugins/receipt
--- a/cairo-dock-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairo-dock-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="cairo-dock-plug-ins-$VERSION.tar.gz"
 WGET_URL="https://github.com/Cairo-Dock/cairo-dock-plug-ins/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="cmake cairo-dock-dev gettext libdbusmenu-gtk3-dev \
+BUILD_DEPENDS="cmake cairo-dock-dev gettext-dev libdbusmenu-gtk3-dev \
 libindicator-gtk3-dev  upower-dev alsa-lib-dev libical-dev python3 ruby \
 ruby-stdlib mono vala pulseaudio-dev fftw-dev libxklavier-dev libetpan-dev \
 libzeitgeist-dev libexif-dev lm-sensors-dev vte-dev "
diff -r ad29ddfee1c9 -r d5aab818505e cairo-dock/receipt
--- a/cairo-dock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairo-dock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake glib-dev cairo-dev librsvg-dev dbus-dev dbus-glib-dev \
 libxml2-dev mesa-dev glu-dev curl-dev xorg-libXtst-dev xorg-libXcomposite-dev \
-xorg-libXrandr-dev gtk3-dev gettext"
+xorg-libXrandr-dev gtk3-dev gettext-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cairo/receipt
--- a/cairo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.14.12"
 CATEGORY="x-window"
 SHORT_DESC="2D graphics library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL LGPL2.1"
 WEB_SITE="https://www.cairographics.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/cairo.html"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="zlib-dev xorg-libX11-dev xorg-libXext-dev xorg-libICE-dev \
 xorg-libXrender-dev xorg-libxcb-dev libpng16-dev freetype-dev fontconfig-dev \
 libspectre-dev poppler-dev librsvg-dev gtk2-dev xorg-pixman-dev"
-SPLIT="cairo cairo-tools cairo-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 # use --nogl to disable building cairo-gl* packages
 if [ -z "$nogl" ]; then
@@ -40,7 +40,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cairomm/receipt
--- a/cairomm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cairomm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.12.2"
 CATEGORY="x-window"
 SHORT_DESC="C++ interface to Cairo"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.cairographics.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/cairomm.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://cairographics.org/releases/$TARBALL"
 
 BUILD_DEPENDS="cairo-dev libsigc++-dev"
-SPLIT="cairomm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|cairomm-$VERSION|" docs/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e caja-dropbox/receipt
--- a/caja-dropbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/caja-dropbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://pub.mate-desktop.org/releases/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="mate-common caja-dev python-pygtk-dev python-docutils"
-SPLIT="caja-dropbox-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e caja-extensions/receipt
--- a/caja-extensions/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/caja-extensions/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common gtk-doc caja-dev mate-desktop-dev dbus-glib-dev \
 glib-dev gupnp-dev"
-SPLIT="caja-extensions-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e caja/receipt
--- a/caja/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/caja/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev mate-desktop-dev \
 pango-dev gtk3-dev libnotify-dev libexif-dev exempi-dev xorg-libSM-dev"
-SPLIT="caja-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cantarell-fonts/receipt
--- a/cantarell-fonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cantarell-fonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/cantarell-fonts/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="meson ninja gettext itstool appstream-glib-dev"
+BUILD_DEPENDS="meson ninja gettext-dev itstool appstream-glib-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e caps/receipt
--- a/caps/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/caps/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,7 @@
 LICENSE="GPL3"
 WEB_SITE="http://quitte.de/dsp/caps.html"
 
-TARBALL="${PACKAGE}_${VERSION}.tar.bz2"
+TARBALL="${PACKAGE}_$VERSION.tar.bz2"
 WGET_URL="http://quitte.de/dsp/$TARBALL"
 
 BUILD_DEPENDS="python"
diff -r ad29ddfee1c9 -r d5aab818505e catfish/receipt
--- a/catfish/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/catfish/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="catfish"
 VERSION="0.3.2"
 CATEGORY="utilities"
-SHORT_DESC="Catfish is a versatile file searching tool"
+SHORT_DESC="Versatile file searching tool"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://www.twotoasts.de/index.php/catfish/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://twotoasts.de/index.php/catfish/"
 WGET_URL="http://twotoasts.de/media/$PACKAGE/$TARBALL"
 
-DEPENDS="python-pygtk python-pyxdg findutils"
-BUILD_DEPENDS="python-pygtk-dev libglade-dev python-pyxdg gettext"
+BUILD_DEPENDS="python-pygtk-dev libglade-dev python-pyxdg gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure --prefix=/usr &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/catfish
 	cat > $fs/usr/bin/catfish << EOT
 #!/bin/sh
@@ -61,4 +57,5 @@
 	for ext in glade svg; do
 		find $fs -type f -name '*.'$ext -exec chmod 644 {} \;
 	done
+	DEPENDS="python-pygtk python-pyxdg findutils"
 }
diff -r ad29ddfee1c9 -r d5aab818505e catpoint/receipt
--- a/catpoint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/catpoint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 SHORT_DESC="Simple presenting software"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://git.r-36.net/catpoint/"
+WEB_SITE="http://r-36.net/scm/catpoint/log.html"
 
 TARBALL="$PACKAGE-$HASH.tar.bz2"
 WGET_URL="http://git.r-36.net/catpoint/snapshot/$TARBALL"
@@ -18,7 +18,7 @@
 	sed -i 's|/usr/local|/usr|' config.mk
 
 	make &&
-	make install &&
+	make install || return 1
 
 	cook_pick_docs README.md showoff
 }
diff -r ad29ddfee1c9 -r d5aab818505e cbrpager/receipt
--- a/cbrpager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cbrpager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,28 +7,25 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://jcoppens.com/soft/cbrpager/index.en.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libgnome-keyring libgnomeui p7zip-full rar unzip"
-BUILD_DEPENDS="gettext libgnomeui-dev libgnome-dev libbonoboui-dev \
+BUILD_DEPENDS="gettext-dev libgnomeui-dev libgnome-dev libbonoboui-dev \
 libgnomecanvas-dev libgnome-keyring-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		$CONFIGURE_ARGS \
-		LDFLAGS="$(pkg-config --libs libgnomeui-2.0 gtk+-2.0)" && \
-	make && \
+		LDFLAGS="$(pkg-config --libs libgnomeui-2.0 gtk+-2.0)" &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	# add Russian translation
 	mkdir -p $fs/usr/share/locale/ru/LC_MESSAGES
 	msgfmt $stuff/ru.po -o $fs/usr/share/locale/ru/LC_MESSAGES/cbrpager.mo
+	DEPENDS="libgnome-keyring libgnomeui p7zip-full rar unzip"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cc65/receipt
--- a/cc65/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cc65/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cc65"
 VERSION="2.13.3"
 CATEGORY="development"
-SHORT_DESC="Cross development package for 65(C)02 systems."
+SHORT_DESC="Cross development package for 65(C)02 systems"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.cc65.org/"
+
 TARBALL="$PACKAGE-sources-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.musoftware.de/pub/uz/$PACKAGE/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr
+compile_rules() {
+	mkdir -p $install/usr
 	sed -i "s|/usr/local|/usr|" make/gcc.mak
-	make -j 1 -f  make/gcc.mak
-	sed -i "s|/usr|$DESTDIR/usr|" make/gcc.mak
-	make -j 1 -f  make/gcc.mak install
+	make -j1 -f  make/gcc.mak
+	sed -i "s|/usr|$install/usr|" make/gcc.mak
+	make -j1 -f  make/gcc.mak install
 
 	cook_pick_manpages packages/debian/*.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e ccache/receipt
--- a/ccache/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ccache/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.4.3"
 CATEGORY="development"
 SHORT_DESC="Compiler cache"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://ccache.samba.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e ccd2iso/receipt
--- a/ccd2iso/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ccd2iso/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ccd2iso"
 VERSION="0.3"
 CATEGORY="misc"
-SHORT_DESC="CloneCD image (.img) to ISO image file converter."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="CloneCD image (.img) to ISO image file converter"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="bchunk"
+WEB_SITE="https://sourceforge.net/projects/ccd2iso/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/ccd2iso/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="convert img iso"
 
-DEPENDS="glibc-base"
 BUILD_DEPENDS="glibc-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-  ./configure --prefix=/usr \
-    $CONFIGURE_ARGS &&
-    make $MAKEFLAGS &&
-    make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure --prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp -a $install/usr/bin/* $fs/usr/bin
+genpkg_rules() {
+	mkdir -p $fs/usr/bin
+	cp -a $install/usr/bin/* $fs/usr/bin
+	DEPENDS="glibc-base"
+	SUGGESTED="bchunk"
+	TAGS="convert img iso"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ccid/receipt
--- a/ccid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ccid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,8 +20,8 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR -C src install_ccidtwin || return 1
+	make DESTDIR=$install install &&
+	make DESTDIR=$install -C src install_ccidtwin || return 1
 
 	mkdir -p \
 		$install/etc/udev/rules.d/ \
diff -r ad29ddfee1c9 -r d5aab818505e cclcfox/receipt
--- a/cclcfox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cclcfox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,29 @@
 PACKAGE="cclcfox"
 VERSION="0.7.0"
 CATEGORY="development"
-SHORT_DESC="server gui for libccls"
+SHORT_DESC="Server GUI for libccls"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://ccl.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://ccl.sourceforge.net"
-WGET_URL="http://nchc.dl.sourceforge.net/project/ccl/cclcfox/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/ccl/$TARBALL"
 
-DEPENDS="libcclc fox14"
 BUILD_DEPENDS="libcclc-dev fox14-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libcclc fox14"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cclfox/receipt
--- a/cclfox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cclfox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="cclfox"
 VERSION="0.7.0"
 CATEGORY="development"
-SHORT_DESC="server gui for libccls"
+SHORT_DESC="Server GUI for libccls"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://ccl.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://ccl.sourceforge.net"
-WGET_URL="http://nchc.dl.sourceforge.net/project/ccl/cclfox/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/ccl/$TARBALL"
 
-DEPENDS="libccls fox14 glib"
 BUILD_DEPENDS="libccls-dev fox14-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libccls fox14 glib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cd-discid/receipt
--- a/cd-discid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cd-discid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cd-discid"
 VERSION="1.1"
 CATEGORY="multimedia"
 SHORT_DESC="Utility to get CDDB discid information from a CD-ROM disc"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linukz.org/cd-discid.shtml"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://linukz.org/download/$TARBALL"
-TAGS="audio CD CDDB"
 
-DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="audio CD CDDB"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e cdf/receipt
--- a/cdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,24 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cdf"
 VERSION="0.2"
 COMMIT="22dfb29"
 CATEGORY="system-tools"
-SHORT_DESC="Colorized df (color schemes)."
+SHORT_DESC="Colorized df (color schemes)"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/novel/cdf"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/novel/cdf"
 WGET_URL="https://github.com/novel/cdf/archive/$COMMIT.tar.gz"
-TAGS="color schemes"
 
-DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-
+compile_rules() {
 	# Fix typos
 	sed -i 's/filesyitems/filesystems/' src/main.c
 
@@ -27,12 +21,11 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="color schemes"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cdparanoia-III/receipt
--- a/cdparanoia-III/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cdparanoia-III/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="10.2"
 CATEGORY="multimedia"
 SHORT_DESC="An audio extraction tool for sampling CDs"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.xiph.org/paranoia/"
 REPOLOGY="cdparanoia"
@@ -12,20 +12,18 @@
 TARBALL="$PACKAGE-$VERSION.src.tgz"
 WGET_URL="http://downloads.xiph.org/releases/cdparanoia/$TARBALL"
 
-SPLIT="cdparanoia-III-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Use $DESTDIR
+compile_rules() {
+	# Use DESTDIR
 	sed -i 's|\$([A-Z]*DIR)|$(DESTDIR)&|' Makefile.in
 
-	./configure $CONFIGURE_ARGS && make -j1 && make install
+	./configure $CONFIGURE_ARGS &&
+	make -j1 &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		cdparanoia-III) copy @std;;
 		*-dev) copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e cdrdao/receipt
--- a/cdrdao/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cdrdao/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.4"
 CATEGORY="multimedia"
 SHORT_DESC="Records audio/data CD-Rs using TOC files"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/cdrdao/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gconf lame-dev libvorbis-dev libmad-dev libao-dev"
 # libsigc++-dev gtkmm-dev libgnomeuimm-dev
-SPLIT="cdrdao-utils"
+SPLIT="$PACKAGE-utils"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e cdrkit/receipt
--- a/cdrkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cdrkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="cdrkit"
 VERSION="1.1.11"
 CATEGORY="utilities"
-SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Wodim for recording/blanking CDs/DVDs and genisoimage for ISO"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.cdrkit.org/"
 
@@ -13,7 +13,7 @@
 EXTRA_SOURCE_FILES="cdrkit-1.1.9-efi-boot.patch"
 
 BUILD_DEPENDS="cmake libcap-dev zlib-dev bzip2-dev attr-dev"
-SPLIT="cdrkit cdrkit-audio cdrkit-isoinfo readom"
+SPLIT="$PACKAGE-audio $PACKAGE-isoinfo readom"
 
 compile_rules() {
 	sed -i -e '/USE_MAGIC/d' -e '/(MAGICLIBS magic)/d' \
@@ -21,7 +21,9 @@
 	[ -s $SRC/cdrkit-1.1.9-efi-boot.patch ] ||
 		wget -P $SRC https://github.com/NixOS/nixpkgs/raw/master/pkgs/tools/cd-dvd/cdrkit/cdrkit-1.1.9-efi-boot.patch
 	patch -p1 < $SRC/cdrkit-1.1.9-efi-boot.patch
-	make PREFIX=/usr && make install PREFIX=/usr
+
+	make PREFIX=/usr &&
+	make PREFIX=/usr install
 }
 
 genpkg_rules() {
@@ -30,7 +32,7 @@
 			DEPENDS="libcap zlib bzlib attr"
 			mkdir -p $fs/usr/bin
 			cp $install/usr/bin/genisoimage $fs/usr/bin
-			cp $install/usr/bin/wodim $fs/usr/bin	
+			cp $install/usr/bin/wodim $fs/usr/bin
 			# Make symlinks for cdrtools compatibility
 			cd $fs/usr/bin
 			ln -s wodim cdrecord
diff -r ad29ddfee1c9 -r d5aab818505e celestia/receipt
--- a/celestia/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/celestia/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.6.1"
 CATEGORY="games"
 SHORT_DESC="Real-time 3D Space Simulation"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://celestia.space/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext mesa-dev glu-dev gtk2-dev gtkglext-dev \
-lua5.1-dev libjpeg-turbo-dev   libtheora-dev"
+BUILD_DEPENDS="automake libtool gettext-dev mesa-dev glu-dev gtk2-dev \
+gtkglext-dev lua5.1-dev libjpeg-turbo-dev   libtheora-dev"
 
 compile_rules() {
 	sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.in
@@ -30,7 +30,7 @@
 	fix libtool &&
 	make &&
 	make \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		MKDIR_P='mkdir -p' \
 		install
 }
diff -r ad29ddfee1c9 -r d5aab818505e cellwriter/receipt
--- a/cellwriter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cellwriter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.6"
 CATEGORY="x-window"
 SHORT_DESC="A grid-entry handwriting input panel"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/risujin/cellwriter/"
 
diff -r ad29ddfee1c9 -r d5aab818505e centerim/receipt
--- a/centerim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/centerim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,17 @@
 SHORT_DESC="Console mode IM"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.centerim.org"
+WEB_SITE="http://www.centerim.org/index.php/Main_Page"
 
 TARBALL="centerim5-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/download/cim5/$TARBALL"
+WGET_URL="http://www.centerim.org/download/cim5/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev curl-dev openssl-dev libidn-dev libgpg-error-dev \
 gpgme-dev libpurple-dev libsigc++-dev libxml2-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr
+	mkdir -p $install/usr
+
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make install
diff -r ad29ddfee1c9 -r d5aab818505e cgal/receipt
--- a/cgal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cgal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,43 +1,35 @@
 # SliTaz package receipt v2.
 
 PACKAGE="cgal"
-SOURCE="CGAL"
 VERSION="4.11"
 CATEGORY="misc"
-SHORT_DESC="Computational Geometry Algorithms Library."
+SHORT_DESC="Computational Geometry Algorithms Library"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3 LGPL3"
-TARBALL="$SOURCE-$VERSION.tar.xz"
 WEB_SITE="https://www.cgal.org/"
+
+TARBALL="CGAL-$VERSION.tar.xz"
 WGET_URL="https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake boost-dev gmp-dev mpfr-dev boost-thread"
-SPLIT="cgal cgal-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .
-	make
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	cgal)
-		DEPENDS="boost-thread boost-system gcc-lib-base"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		;;
-	cgal-dev)
-		CAT="development|Computational Geometry Algorithms Library, development files."
-		DEPENDS="cgal"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/CGAL $fs/usr/lib
+		cgal)
+			copy @std
+			DEPENDS="boost-thread boost-system gcc-lib-base"
+			;;
+		*-dev)
+			copy @dev
 		;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e cgames/receipt
--- a/cgames/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cgames/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,42 +1,38 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cgames"
 VERSION="2.2"
 CATEGORY="games"
-SHORT_DESC="Games for the Linux Console."
+SHORT_DESC="Games for the Linux Console"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.muppetlabs.com/~breadbox/software/cgames.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.muppetlabs.com/~breadbox/pub/software/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i	-e 's|install -.*\$|&(destdir)/$|' \
-		-e "s|^prefix|destdir = $DESTDIR\\n&|" \
+		-e "s|^prefix|destdir = $install\\n&|" \
 		-e 's/g games/g root/' */Makefile.in
 	sed -i 's/.* getline(.*/#define getline mygetline\n&/' */fileread.h
-	./configure --prefix=/usr \
-	--mandir=/usr/share/man \
-	--datadir=/usr/share \
-	--disable-mouse \
-	--with-ncurses \
-	$CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--datadir=/usr/share \
+		--disable-mouse \
+		--with-ncurses \
+		$CONFIGURE_ARGS &&
 	make &&
-	make install
+	make install || return 1
+
+	find $install -type f -name '*.txt' -exec chmod a-x '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/games $fs/usr
-	cp -a $install/usr/share/cblocks $fs/usr/share
-	cp -a $install/usr/share/csokoban $fs/usr/share
-
-	find $fs -type f -name '*.txt' -exec chmod a-x \{\} \;
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cgdb/receipt
--- a/cgdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cgdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.0"
 CATEGORY="development"
 SHORT_DESC="Curses interface for GDB"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://cgdb.github.io/"
 
diff -r ad29ddfee1c9 -r d5aab818505e cgoban/receipt
--- a/cgoban/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cgoban/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="cgoban"
 VERSION="1.9.14"
 CATEGORY="games"
-SHORT_DESC="Large set of go-related services for Unix and X11."
+SHORT_DESC="Large set of go-related services for Unix and X11"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -14,21 +14,17 @@
 DEPENDS="gtk2"
 BUILD_DEPENDS="gtk2-dev xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/applications
 	cp -a $install/usr/bin/cgoban $fs/usr/bin
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e check/receipt
--- a/check/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/check/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.12.0"
 CATEGORY="system-tools"
 SHORT_DESC="A unit testing framework for C"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://libcheck.github.io/check/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter05/check.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libcheck/check/releases/download/$VERSION/$TARBALL"
 
-SPLIT="check-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e chemtool/receipt
--- a/chemtool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chemtool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.6.14"
 CATEGORY="graphics"
 SHORT_DESC="Drawing chemical structures"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="gettext gtk2-dev xorg-libX11-dev xorg-libICE-dev"
+BUILD_DEPENDS="gettext-dev gtk2-dev xorg-libX11-dev xorg-libICE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cherokee/receipt
--- a/cherokee/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cherokee/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.103.d021376"
 CATEGORY="network"
 SHORT_DESC="Cherokee Web Server"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://cherokee-project.com/"
 
@@ -12,8 +12,8 @@
 WGET_URL="https://github.com/cherokee/webserver/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="pcre-dev cyrus-sasl-dev openssl10-dev openldap-dev python-dev \
-pam-dev libmysqlclient ffmpeg-dev gettext autoconf automake libtool"
-SPLIT="cherokee cherokee-dev cherokee-doc"
+pam-dev libmysqlclient ffmpeg-dev gettext-dev autoconf automake libtool"
+SPLIT="$PACKAGE-dev $PACKAGE-doc"
 
 compile_rules() {
 	# Use subdirectory for logs
@@ -40,7 +40,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 pam.d_cherokee $install/etc/pam.d/cherokee
 	chown -R www:www $install/var/lib/cherokee/graphs
diff -r ad29ddfee1c9 -r d5aab818505e cherrytree/receipt
--- a/cherrytree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cherrytree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.giuspen.com/software/$TARBALL"
 
-BUILD_DEPENDS="python desktop-file-utils pygtksourceview-dev gettext"
+BUILD_DEPENDS="python desktop-file-utils pygtksourceview-dev gettext-dev"
 
 compile_rules() {
 	python -B setup.py install --root=$install
diff -r ad29ddfee1c9 -r d5aab818505e chess3d/receipt
--- a/chess3d/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chess3d/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -35,7 +35,7 @@
 			done
 			for j in w b; do
 				for k in pawn rook knight1 knight2 bishop qeen king; do
-					wget -P img ${WEB_SITE}img/${i}_${j}$k.gif || return 1
+					wget -P img ${WEB_SITE}img/${i}_$j$k.gif || return 1
 				done
 			done
 		done
diff -r ad29ddfee1c9 -r d5aab818505e chillispot/receipt
--- a/chillispot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chillispot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Captive portal or wireless LAN access point controller"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.chillispot.info/"
+WEB_SITE="http://www.chillispot.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="${WEB_SITE}download/$TARBALL"
+WGET_URL="http://www.chillispot.info/download/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
 
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/doc/chilli.conf $install/etc/chilli.conf
 	install -Dm755 $stuff/chilli        $install/etc/init.d/chilli
diff -r ad29ddfee1c9 -r d5aab818505e chkexploit/receipt
--- a/chkexploit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chkexploit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,14 @@
 PACKAGE="chkexploit"
 VERSION="1.13"
 CATEGORY="security"
-SHORT_DESC="Check the system for vulnerabilities to some publicly available exploits."
+SHORT_DESC="Check the system for vulnerabilities to some publicly available exploits"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.chkrootkit.org/"
 WGET_URL="ftp://ftp.pangeia.com.br/pub/seg/pac/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/chkrootkit
 	cp $src/chkexploit $fs/usr/share/chkrootkit
 }
diff -r ad29ddfee1c9 -r d5aab818505e chmlib/receipt
--- a/chmlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chmlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.jedrea.com/chmlib/$TARBALL"
 
-SPLIT="chmlib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e chntpw/receipt
--- a/chntpw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chntpw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="chntpw"
 VERSION="140201"
 CATEGORY="security"
 SHORT_DESC="Offline NT Password and Registry editor"
-MAINTAINER="db_slitaz@m4x.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
+WEB_SITE="http://pogostick.net/~pnh/ntpasswd/"
+
 TARBALL="$PACKAGE-source-$VERSION.zip"
-WEB_SITE="http://pogostick.net/~pnh/ntpasswd/"
 WGET_URL="http://pogostick.net/~pnh/ntpasswd/$TARBALL"
 
-DEPENDS="openssl"
 BUILD_DEPENDS="openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make
+compile_rules() {
+	make || return 1
+
+	install -Dm755 chntpw $install/usr/bin/chntpw
+	install -Dm755 reged  $install/usr/bin/reged
+	install -Dm755 cpnt   $install/usr/bin/cpnt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/chntpw $src/reged $src/cpnt $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e chocolate-doom/receipt
--- a/chocolate-doom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chocolate-doom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,16 @@
 SHORT_DESC="Doom source port as close as possible to vanilla Doom"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="https://www.chocolate-doom.org/wiki/index.php/Chocolate_Doom"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libsdl libsdl-mixer libsdl-net libsamplerate"
 BUILD_DEPENDS="libsdl-mixer-dev  libsdl-net-dev libsdl-dev libsamplerate-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
+
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -23,12 +23,12 @@
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS || return 1
 
-	mkdir -p $install/usr/bin $install/usr/share/games/doom
-	cp $src/src/chocolate-doom $install/usr/bin
+	install -Dm755 src/chocolate-doom $install/usr/bin/chocolate-doom
 
 	cook_pick_manpages man/*.5 man/*.6
 }
 
 genpkg_rules() {
 	copy @std
+	DEPENDS="libsdl libsdl-mixer libsdl-net libsamplerate"
 }
diff -r ad29ddfee1c9 -r d5aab818505e chrpath/receipt
--- a/chrpath/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/chrpath/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.16"
 CATEGORY="misc"
 SHORT_DESC="Change or delete the rpath or runpath in ELF files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://alioth-archive.debian.org/releases/chrpath/chrpath/"
 
diff -r ad29ddfee1c9 -r d5aab818505e cifs-utils/receipt
--- a/cifs-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cifs-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.samba.org/pub/linux-cifs/$PACKAGE/$TARBALL"
 
-SPLIT="cifs-utils-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -19,7 +19,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	cook_pick_manpages *.1
 }
diff -r ad29ddfee1c9 -r d5aab818505e cinepaint-stable/receipt
--- a/cinepaint-stable/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cinepaint-stable/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-4"
 CATEGORY="graphics"
 SHORT_DESC="For painting and retouching bitmap frames of films"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT GPL LGPL"
 WEB_SITE="http://www.cinepaint.org/"
 REPOLOGY="cinepaint"
@@ -12,7 +12,7 @@
 TARBALL="cinepaint-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/cinepaint/$TARBALL"
 
-BUILD_DEPENDS="patch gtk2-dev gettext tiff-dev openexr-dev ilmbase-dev \
+BUILD_DEPENDS="patch gtk2-dev gettext-dev tiff-dev openexr-dev ilmbase-dev \
 libjpeg-turbo-dev zlib-dev libpng16-dev lcms-dev xorg-libXmu-dev fltk-dev \
 python"
 SPLIT="$PACKAGE-dev"
diff -r ad29ddfee1c9 -r d5aab818505e cinepaint/receipt
--- a/cinepaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cinepaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,17 @@
 VERSION="1.3"
 CATEGORY="graphics"
 SHORT_DESC="For painting and retouching bitmap frames of films"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT GPL LGPL"
 WEB_SITE="http://www.cinepaint.org/"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special gettext \
-xorg-xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev mesa-dev \
-ilmbase-dev xorg-libXpm-dev gtk2-dev libpng16-dev bash automake autoconf libtool \
-python-dev glu-dev xorg-libXmu-dev xorg-libXext-dev" # libpng12-dev
+BUILD_DEPENDS="python coreutils-file-summarize coreutils-file-special \
+gettext-dev xorg-xorgproto util-linux-uuid-dev lcms-dev openexr-dev fltk-dev \
+mesa-dev ilmbase-dev xorg-libXpm-dev gtk2-dev libpng16-dev bash automake \
+autoconf libtool python-dev glu-dev xorg-libXmu-dev xorg-libXext-dev" # libpng12-dev
 
 compile_rules() {
 	sh ./autogen.sh
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e clamav/receipt
--- a/clamav/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clamav/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,13 +13,13 @@
 
 BUILD_DEPENDS="zlib-dev gmp gmp-dev bzip2-dev ncurses-dev bash \
 libxml2-dev openssl-dev"
-SPLIT="clamav-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	grep -rl 'alignof(' * | xargs sed -i 's|alignof(|alignof_(|'
 	grep -rl 'alignof<' * | xargs sed -i 's|alignof<|alignof_<|'
 	grep -rl '__alignof_' * | xargs sed -i 's|__alignof_|__alignof|'
-	sed -i 's|make_pair<.*>|make_pair|' libclamav/c++/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp 
+	sed -i 's|make_pair<.*>|make_pair|' libclamav/c++/llvm/lib/ExecutionEngine/JIT/JITDebugRegisterer.cpp
 	sed -i 's|~0|~0U|g' libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp \
 			libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
 
@@ -33,7 +33,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -78,7 +78,7 @@
 	status
 
 	# adduser clamav if needed
-	if ! grep -q "${user}:" "$1/etc/passwd"; then
+	if ! grep -q "$user:" "$1/etc/passwd"; then
 		action 'Adding user/group $user...'
 		chroot "$1/" addgroup -S $group
 		chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user
@@ -86,7 +86,7 @@
 	fi
 
 	# Enable daily.cvd updates (sometimes needed for new version)
-	#chown -R ${user}:${group} "$1/var/lib/clamav"
+	#chown -R $user:$group "$1/var/lib/clamav"
 
 	# Fix perms
 	chroot "$1/" chown -R $user.$group /var/log/clamav \
diff -r ad29ddfee1c9 -r d5aab818505e clamtk/receipt
--- a/clamtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clamtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="clamtk"
 VERSION="4.36"
 CATEGORY="network"
-SHORT_DESC="ClamTk is a GUI front-end for ClamAV using gtk2-perl"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="GUI front-end for ClamAV using gtk2-perl"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://clamtk.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e clang/receipt
--- a/clang/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clang/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://releases.llvm.org/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake llvm-dev z3-dev"
-SPLIT="clang-libs clang-analyzer clang clang-dev"
+SPLIT="$PACKAGE-libs $PACKAGE-analyzer $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -29,7 +29,7 @@
 		.. &&
 	make clang-tblgen &&
 	make &&
-	make DESTDIR="$install" install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -50,7 +50,6 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS=""
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e claws-mail/receipt
--- a/claws-mail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/claws-mail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,27 @@
 VERSION="3.15.1"
 CATEGORY="mail"
 SHORT_DESC="Claws Mail email client"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.claws-mail.org/index.php"
+WEB_SITE="https://www.claws-mail.org/index.php"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.claws-mail.org/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext xorg-libSM-dev glib-dev gnutls-dev gtk2-dev enchant-dev \
-startup-notification-dev dbus-dev dbus-glib-dev openldap-dev librsvg-dev \
-libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev libarchive-dev \
-libical-dev poppler-dev gpgme-dev python-dev python-pygtk-dev libcanberra-dev \
-ytnef-dev libnotify-dev perl-dev lcms2-dev xorg-xcb-util-dev"
-cm='claws-mail'
+BUILD_DEPENDS="gettext-dev xorg-libSM-dev glib-dev gnutls-dev gtk2-dev \
+enchant-dev startup-notification-dev dbus-dev dbus-glib-dev openldap-dev \
+librsvg-dev libetpan-dev curl-dev expat-dev webkitgtk-dev libsoup-dev \
+libarchive-dev libical-dev poppler-dev gpgme-dev python-dev python-pygtk-dev \
+libcanberra-dev ytnef-dev libnotify-dev perl-dev lcms2-dev xorg-xcb-util-dev"
 SPLIT="\
-$cm-acpinotifier $cm-addresskeeper $cm-archive   $cm-attachwarner \
-$cm-attremover   $cm-bsfilter      $cm-clamd     $cm-fancy \
-$cm-fetchinfo    $cm-libravatar    $cm-mailmbox  $cm-managesieve \
-$cm-newmail      $cm-notification  $cm-pdfviewer $cm-perl \
-$cm-plugins      $cm-python        $cm-rssyl     $cm-spam_report \
-$cm-tnefparse    $cm-vcalendar     $cm-extras    $cm-dev"
+$PACKAGE-acpinotifier $PACKAGE-addresskeeper $PACKAGE-archive \
+$PACKAGE-attachwarner $PACKAGE-attremover    $PACKAGE-bsfilter \
+$PACKAGE-clamd        $PACKAGE-fancy         $PACKAGE-fetchinfo \
+$PACKAGE-libravatar   $PACKAGE-mailmbox      $PACKAGE-managesieve \
+$PACKAGE-newmail      $PACKAGE-notification  $PACKAGE-pdfviewer \
+$PACKAGE-perl         $PACKAGE-plugins       $PACKAGE-python \
+$PACKAGE-rssyl        $PACKAGE-spam_report   $PACKAGE-tnefparse \
+$PACKAGE-vcalendar    $PACKAGE-extras        $PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/^Actions=/d' claws-mail.desktop # sdft can't work with actions
diff -r ad29ddfee1c9 -r d5aab818505e cld2/receipt
--- a/cld2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cld2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/CLD2Owners/cld2/archive/$COMMIT.tar.gz"
 
-SPLIT="cld2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd internal
diff -r ad29ddfee1c9 -r d5aab818505e clearlooks-colors/receipt
--- a/clearlooks-colors/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clearlooks-colors/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,18 +6,16 @@
 SHORT_DESC="Clearlooks Colors contains eight GTK Clearlooks themes"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://gnome-look.org/content/show.php/Clearlooks-Colors?content=75417"
+WEB_SITE="https://www.gnome-look.org/content/show.php/Clearlooks-Colors?content=75417"
+
 TARBALL="75417-Clearlooks-Colors.tar.gz"
 WGET_URL="http://www.gnome-look.org/CONTENT/content-files/$TARBALL"
 
-DEPENDS="gtk-clearlooks"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	T=$fs/usr/share/themes
 	mkdir -p $T
 	cp -a $src/Clearlooks* $T
 	rm -rf $T/*Metacity
 	chown -R root:root $fs
+	DEPENDS="gtk-clearlooks"
 }
diff -r ad29ddfee1c9 -r d5aab818505e clearlooks-compact/receipt
--- a/clearlooks-compact/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clearlooks-compact/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,16 +7,14 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://martin.ankerl.com/2007/11/04/clearlooks-compact-gnome-theme/"
+
 TARBALL="ClearlooksCompact-$VERSION.tar.bz2"
 WGET_URL="http://martin.ankerl.com/files/$TARBALL"
 
-DEPENDS="gtk-clearlooks"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	CC=$fs/usr/share/themes/ClearlooksCompact
 	mkdir -p $CC $CC/gtk-2.0
-	install -m644 -oroot -groot $src/index.theme $CC
-	install -m644 -oroot -groot $src/gtk-2.0/gtkrc $CC/gtk-2.0
+	install -m644 $src/index.theme $CC
+	install -m644 $src/gtk-2.0/gtkrc $CC/gtk-2.0
+	DEPENDS="gtk-clearlooks"
 }
diff -r ad29ddfee1c9 -r d5aab818505e clearlooks/receipt
--- a/clearlooks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clearlooks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.2"
 CATEGORY="x-window"
 SHORT_DESC="Clearlooks GTK+ theme"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://clearlooks.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e clementine/receipt
--- a/clementine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clementine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,39 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="clementine"
 VERSION="0a59257"
 CATEGORY="multimedia"
-SHORT_DESC="Clementine is a multiplatform music player"
-MAINTAINER="shevtsov.anton@gmail.com"
+SHORT_DESC="Multiplatform music player"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.clementine-player.org/"
+WEB_SITE="https://www.clementine-player.org/"
 REPOLOGY="clementine-player"
 
 WEB_SITE_2="https://github.com/clementine-player/Clementine/tree/qt5"
 TARBALL="Clementine-$VERSION.tar.gz"
 WGET_URL="https://github.com/clementine-player/Clementine/archive/$VERSION.tar.gz"
 
-DEPENDS="ffmpeg fftw glew gst0-plugins-base libmtp protobuf taglib qt5-base libcdio qjson "
-# libgpod qca 
+# libgpod qca
 BUILD_DEPENDS="cmake qt5-dev mesa-dev xorg-dev glu-dev \
 glw-dev openssl-dev lame-dev taglib-dev dbus-dev libcurl \
 libplist-dev libusb-dev libmtp-dev libcdio-dev libcdio-utils \
 gstreamer1-dev gst1-plugins-base-dev gst1-plugins-good-dev \
-boost-dev gettext  automake autoconf glib-dev dbus-glib-dev fftw-dev \
-glew-dev json-glib json-glib-dev qjson-dev sqlite3-dev protobuf-dev  "
+boost-dev gettext-dev  automake autoconf glib-dev dbus-glib-dev fftw-dev \
+glew-dev json-glib-dev qjson-dev sqlite3-dev protobuf-dev"
 
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd $src/build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-Wno-dev ../ &&
+		-Wno-dev \
+		.. &&
 	make &&
 	make install
 }
 
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="ffmpeg fftw glew gst0-plugins-base libmtp protobuf taglib qt5-base \
+	libcdio qjson"
 }
diff -r ad29ddfee1c9 -r d5aab818505e clex/receipt
--- a/clex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.6.patch9"
 CATEGORY="system-tools"
 SHORT_DESC="Text mode file manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.clex.sk/"
 
diff -r ad29ddfee1c9 -r d5aab818505e clicfs/receipt
--- a/clicfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clicfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e clipit/receipt
--- a/clipit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clipit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/CristianHenzel/ClipIt/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext intltool automake glib-dev gtk2-dev"
+BUILD_DEPENDS="gettext-dev intltool automake glib-dev gtk2-dev"
 
 compile_rules() {
 	# fix subcategory for cascade menu
diff -r ad29ddfee1c9 -r d5aab818505e clisp/receipt
--- a/clisp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clisp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/gnu-clisp/clisp/-/archive/clisp-$VERSION/clisp-clisp-$VERSION.tar.bz2"
 
-BUILD_DEPENDS="libunistring-dev gettext libffcall readline-dev libsigsegv-dev"
+BUILD_DEPENDS="libunistring-dev gettext-dev libffcall readline-dev libsigsegv-dev"
 
 compile_rules() {
 	FORCE_UNSAFE_CONFIGURE=1 \
diff -r ad29ddfee1c9 -r d5aab818505e clonezilla/receipt
--- a/clonezilla/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clonezilla/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="3.3.10"
 CATEGORY="misc"
 SHORT_DESC="The Free and Open Source Software for Disk Imaging and Cloning"
-MAINTAINER="shann@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://clonezilla.org/"
+WEB_SITE="https://clonezilla.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://free.nchc.org.tw/drbl-core/src/stable/$TARBALL"
@@ -14,7 +14,7 @@
 compile_rules() {
 	sed -i "s/SHELL/#SHELL/" Makefile
 
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cloudvpn/receipt
--- a/cloudvpn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cloudvpn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,29 @@
 PACKAGE="cloudvpn"
 VERSION="1.99.8"
 CATEGORY="network"
-SHORT_DESC="Mesh-networked Virtual Private Network."
+SHORT_DESC="Mesh-networked Virtual Private Network"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://freshmeat.sourceforge.net/projects/cloudvpn"
 #WEB_SITE="https://github.com/exaexa/cloudvpn"
+
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://dev.e-x-a.org/attachments/download/1/$TARBALL" # FIXME
-TAGS="vpn tunnel"
 
 BUILD_DEPENDS="gnutls-dev zlib-dev automake libgcrypt-dev"
-DEPENDS="gcc-lib-base gnutls zlib libtasn1"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/"poll.h"/&\n#include <unistd.h>/' common/poll.cpp
+
 	./autogen.sh
-	./configure \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="gcc-lib-base gnutls zlib libtasn1"
+	TAGS="vpn tunnel"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e clucene/receipt
--- a/clucene/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clucene/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.3.4"
 CATEGORY="system-tools"
 SHORT_DESC="CLucene - a C++ search engine"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL Apache"
 WEB_SITE="https://sourceforge.net/projects/clucene/"
 
@@ -12,24 +12,21 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake zlib-dev"
-SPLIT="clucene-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build &&
-	cd    build &&
+compile_rules() {
+	mkdir build
+	cd    build
 
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_CONTRIBS_LIB=ON .. &&
+		-DBUILD_CONTRIBS_LIB=ON \
+		.. &&
 	make &&
 	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		clucene) copy @std; TAGS="text indexing";;
 		*-dev)   copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e clutter-gst/receipt
--- a/clutter-gst/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clutter-gst/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="clutter-dev cogl-dev glib-dev gstreamer1-dev \
 gst1-plugins-base-dev libgudev-dev"
-SPLIT="clutter-gst-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e clutter-gtk/receipt
--- a/clutter-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clutter-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,22 @@
 VERSION="1.8.4"
 CATEGORY="x-window"
 SHORT_DESC="GTK+ libraries for Clutter"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://clutter-project.org/"
+WEB_SITE="https://blogs.gnome.org/clutter/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/clutter-gtk.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="clutter-dev gtk3-dev gettext gobject-introspection-dev"
-SPLIT="clutter-gtk-dev"
+BUILD_DEPENDS="clutter-dev gtk3-dev gettext-dev gobject-introspection-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e clutter/receipt
--- a/clutter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/clutter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.26.2"
 CATEGORY="x-window"
 SHORT_DESC="Animated graphical user interfaces library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/clutter/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/clutter.html"
@@ -13,8 +13,8 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev cogl-dev atk-dev json-glib-dev \
-gobject-introspection-dev gettext pango-dev"
-SPLIT="clutter-dev"
+gobject-introspection-dev gettext-dev pango-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cmake/receipt
--- a/cmake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cmake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.12.2"
 CATEGORY="development"
 SHORT_DESC="Cross-platform build system generator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://cmake.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/cmake.html"
@@ -27,7 +27,7 @@
 		--no-system-librhash \
 		--docdir=/share/doc/$PACKAGE-$VERSION &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cmark-gfm/receipt
--- a/cmark-gfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cmark-gfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Github fork of CommonMark parsing and rendering program in C"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
-WEB_SITE="https://github.com/github/cmark"
+WEB_SITE="https://github.com/github/cmark-gfm"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/github/cmark/archive/$VERSION.tar.gz"
diff -r ad29ddfee1c9 -r d5aab818505e cmatrix/receipt
--- a/cmatrix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cmatrix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="cmatrix"
 VERSION="1.2a"
 CATEGORY="misc"
-SHORT_DESC="Matrix screensaver."
+SHORT_DESC="Matrix screensaver"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.asty.org/cmatrix"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.asty.org/cmatrix/"
 WGET_URL="http://www.asty.org/cmatrix/dist/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cndrvcups-common/receipt
--- a/cndrvcups-common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cndrvcups-common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,37 +4,37 @@
 VERSION="1.80"
 CATEGORY="system-tools"
 SHORT_DESC="Canon URF2 driver with support for LBP, iR and MF series printers"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://www.canon.com.au/pps/colour/imagepress_c1_drivers.aspx"
+WEB_SITE="http://www.canon.com.au/pps/colour/imagepress_c1_drivers.aspx" # FIXME 404
 
 TARBALL="ufr2linuxv180.zip"
 WGET_URL="http://www.service.canon.com.au/drivers/files/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake cairo-dev gtk2-dev cups-dev libtool"
-SPLIT="cndrvcups-common-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	[ -d cndrvcups-common-$VERSION ] || tar xzf Sources/cndrvcups-common-${VERSION}-1.tar.gz
+	[ -d cndrvcups-common-$VERSION ] || tar xzf Sources/cndrvcups-common-$VERSION-1.tar.gz
 
 	cd $src/cndrvcups-common-$VERSION/buftool
 	./autogen.sh --prefix=/usr $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR LIBDIR=/usr/lib install || return 1
+	make DESTDIR=$install LIBDIR=/usr/lib install || return 1
 
 	cd $src/cndrvcups-common-$VERSION/cpca
 	./autogen.sh --prefix=/usr $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR LIBDIR=$DESTDIR/usr/lib install || return 1
+	make DESTDIR=$install LIBDIR=$install/usr/lib install || return 1
 
 	cd $src/cndrvcups-common-$VERSION/cngplp
 	./autogen.sh --prefix=/usr $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cd $src/cndrvcups-common-$VERSION/c3plmod_ipc
 	make &&
-	cp -a $src/cndrvcups-common-$VERSION $DESTDIR
+	cp -a $src/cndrvcups-common-$VERSION $install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cocoalib/receipt
--- a/cocoalib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cocoalib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,7 @@
 PACKAGE="cocoalib"
 VERSION="0.9952"
 CATEGORY="misc"
-SHORT_DESC="CoCoALib is a GPL C++ library for doing Computations in \
-Commutative Algebra"
+SHORT_DESC="GPL C++ library for doing Computations in Commutative Algebra"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://cocoa.dima.unige.it/cocoalib/"
diff -r ad29ddfee1c9 -r d5aab818505e codeblocks/receipt
--- a/codeblocks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/codeblocks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="10.05"
 CATEGORY="development"
 SHORT_DESC="An open source, cross platform, free C++ IDE"
-MAINTAINER="stefanossofroniou542@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.codeblocks.org/"
 
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cogl/receipt
--- a/cogl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cogl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,9 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev mesa-dev xorg-libXcomposite-dev xorg-libXrandr-dev \
-gdk-pixbuf-dev gettext cairo-dev pango-dev gobject-introspection-dev \
+gdk-pixbuf-dev gettext-dev cairo-dev pango-dev gobject-introspection-dev \
 xorg-libxshmfence-dev expat-dev"
-SPLIT="cogl cogl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/^#if COGL/#ifdef COGL/' cogl/winsys/cogl-winsys-egl.c
diff -r ad29ddfee1c9 -r d5aab818505e collectd/receipt
--- a/collectd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/collectd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="5.1.0"
 CATEGORY="network"
 SHORT_DESC="System Statistics Collection Daemon"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://collectd.org"
+WEB_SITE="http://collectd.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://collectd.org/files/$TARBALL"
 
 BUILD_DEPENDS="slitaz-toolchain rrdtool-dev perl curl-dev libxml2-dev"
-SPLIT="collectd collectd-dev collectd-apache:apache collectd-bind:bind"
+SPLIT="$PACKAGE-dev $PACKAGE-apache:apache $PACKAGE-bind:bind"
 
 compile_rules() {
 	case $SET in
@@ -34,7 +34,7 @@
 				$CONFIGURE_ARGS &&
 			fix libtool &&
 			make &&
-			make DESTDIR=$DESTDIR install || return 1
+			make DESTDIR=$install install || return 1
 
 			# Add init script and fixes
 			install -Dm755 $stuff/collectd $install/etc/init.d/collectd
@@ -48,7 +48,7 @@
 				$CONFIGURE_ARGS &&
 			fix libtool &&
 			make &&
-			make DESTDIR=$DESTDIR install
+			make DESTDIR=$install install
 			;;
 		bind)
 			sed -i 's/ipt_error_target/ipt2_error_target/' src/libiptc/libiptc.c
@@ -60,7 +60,7 @@
 				$CONFIGURE_ARGS &&
 			fix libtool &&
 			make &&
-			make DESTDIR=$DESTDIR install
+			make DESTDIR=$install install
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e colord-gtk/receipt
--- a/colord-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/colord-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gobject-introspection-dev intltool libxslt gtk3-dev colord-dev \
 vala"
-SPLIT="colord-gtk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e colord/receipt
--- a/colord/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/colord/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,9 @@
 WGET_URL="http://www.freedesktop.org/software/colord/releases/$TARBALL"
 
 BUILD_DEPENDS="meson ninja glib-dev lcms2-dev sqlite3-dev libgusb-dev \
-libgudev-dev vala polkit-dev gobject-introspection-dev gettext docbook-utils \
-libxml2-tools gtk-doc dbus-dev"
-SPLIT="colord-dev"
+libgudev-dev vala polkit-dev gobject-introspection-dev gettext-dev \
+docbook-utils libxml2-tools gtk-doc dbus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	if ! grep -q colord "/etc/passwd"; then
diff -r ad29ddfee1c9 -r d5aab818505e comical/receipt
--- a/comical/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/comical/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,21 +7,18 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://comical.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="wxWidgets28"
 BUILD_DEPENDS="wxWidgets28-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make -j 1
+compile_rules() {
+	make -j1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/comical $fs/usr/bin
+	DEPENDS="wxWidgets28"
 }
diff -r ad29ddfee1c9 -r d5aab818505e comix/receipt
--- a/comix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/comix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="comix"
 VERSION="4.0.4"
 CATEGORY="graphics"
-SHORT_DESC="Comix is an image viewer, specifically designed to handle comic books."
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Comic book image viewer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://comix.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://comix.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="viewer comic"
 
-DEPENDS="python python-pygtk python-pil rar"
 BUILD_DEPENDS="python python-pygtk-dev python-pil unrar"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr
-	python install.py --no-mime --dir $DESTDIR/usr install
+compile_rules() {
+	mkdir -p $install/usr
+	python -B install.py --no-mime --dir $install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/* $fs/usr/
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-pygtk python-pil rar"
+	TAGS="viewer comic"
 }
diff -r ad29ddfee1c9 -r d5aab818505e commoncpp2/receipt
--- a/commoncpp2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/commoncpp2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,14 +5,14 @@
 CATEGORY="development"
 SHORT_DESC="A very portable and highly optimized class framework for writing \
 C++ applications"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/commoncpp/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/commoncpp/$TARBALL"
 
-SPLIT="commoncpp2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i -e '50 a\#include <sys/stat.h>' inc/cc++/applog.h
diff -r ad29ddfee1c9 -r d5aab818505e compface/receipt
--- a/compface/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compface/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,15 +6,17 @@
 SHORT_DESC="Utils & libs to convert from/to X-Face format"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
-WEB_SITE="http://freecode.com/projects/compface"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/compface"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.xemacs.org/pub/xemacs/aux/$TARBALL"
 
-SPLIT="xbm2xface compface compface-dev"
+SPLIT="xbm2xface $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	install -Dm755 $src/xbm2xface.pl $install/usr/bin/xbm2xface.pl
 }
diff -r ad29ddfee1c9 -r d5aab818505e compiz-bcop/receipt
--- a/compiz-bcop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-bcop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,22 +6,21 @@
 SHORT_DESC="Compiz option code generator"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/compiz-reloaded"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://github.com/compiz-reloaded"
 WGET_URL="$WEB_SITE/$PACKAGE/releases/download/v$VERSION/$TARBALL"
-DEPENDS="xorg-libX11 compiz-core libxslt"
+
 BUILD_DEPENDS="xorg-dev compiz-core-dev libxslt-dev startup-notification-dev libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr
+compile_rules() {
+	./configure \
+		--prefix=/usr &&
 	make &&
-	make DESTDIR="${DESTDIR}" install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="xorg-libX11 compiz-core libxslt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e compiz-ccsm/receipt
--- a/compiz-ccsm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-ccsm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="compiz-ccsm"
 VERSION="0.8.12.3"
 CATEGORY="x-window"
-SHORT_DESC="Compiz Config Settings Manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Compiz Config Settings Manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded/ccsm"
 REPOLOGY="ccsm"
@@ -12,27 +12,23 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/releases/download/v$VERSION/ccsm-$VERSION.tar.xz"
 
-DEPENDS="python python-pygobject compiz-core compiz-libcompizconfig \
-compiz-compizconfig-python gtk-girepository"
-BUILD_DEPENDS="$DEPENDS python-dev libtool compiz-core-dev \
-compiz-libcompizconfig-dev intltool"
+BUILD_DEPENDS="python-pygobject compiz-compizconfig-python gtk-girepository \
+python-dev libtool compiz-core-dev compiz-libcompizconfig-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./setup.py install --prefix=/usr --with-gtk=2.0 --root="$DESTDIR"
+compile_rules() {
+	python -B setup.py install --prefix=/usr --with-gtk=2.0 --root=$install
 
-	find $DESTDIR -name ccsm.desktop | xargs \
+	find $install -name ccsm.desktop | xargs \
 	sed -i 's#Exec=.*#Exec=sh -c \"ccsm \|\| LC_ALL=C LANG=C ccsm\"#'
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/locale
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/locale/ru $fs/usr/share/locale
 	cp -a $install/usr/share/ccsm $fs/usr/share
 	cp -a $install/usr/share/icons $fs/usr/share
+	DEPENDS="python python-pygobject compiz-core compiz-libcompizconfig \
+	compiz-compizconfig-python gtk-girepository"
 }
diff -r ad29ddfee1c9 -r d5aab818505e compiz-compizconfig-python/receipt
--- a/compiz-compizconfig-python/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-compizconfig-python/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Compiz Config Python module"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded"
 REPOLOGY="compizconfig-python"
diff -r ad29ddfee1c9 -r d5aab818505e compiz-core/receipt
--- a/compiz-core/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-core/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="compiz-core"
 VERSION="0.8.12.3"
 CATEGORY="x-window"
-SHORT_DESC="Compiz is an OpenGL compositing manager for 3D effect"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="OpenGL compositing manager for 3D effect"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT GPL LGPL"
 WEB_SITE="https://github.com/compiz-reloaded"
 REPOLOGY="compiz"
@@ -15,8 +15,8 @@
 BUILD_DEPENDS="xorg-dev intltool librsvg-dev libxslt-dev pango-dev libtool \
 startup-notification-dev mesa-dev file dbus-dev dbus-glib-dev cairo-dev \
 util-linux-uuid-dev expat-dev xorg-libxshmfence-dev glu-dev \
-xorg-xcb-util-dev"
-SPLIT="compiz-core-dev"
+xorg-xcb-util-dev libjpeg-turbo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e compiz-libcompizconfig/receipt
--- a/compiz-libcompizconfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-libcompizconfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Compiz configuration library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded"
 REPOLOGY="libcompizconfig"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="xorg-dev compiz-core-dev glibc-dev libxml2-dev mesa-dev \
 libxslt-dev startup-notification-dev protobuf-dev glib-dev libtool"
-SPLIT="compiz-libcompizconfig-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure &&
diff -r ad29ddfee1c9 -r d5aab818505e compiz-plugins-main/receipt
--- a/compiz-plugins-main/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-plugins-main/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.12.2"
 CATEGORY="x-window"
 SHORT_DESC="Compiz main plugins"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded"
 
@@ -15,8 +15,8 @@
 startup-notification-dev mesa-dev gtk2-dev intltool librsvg-dev \
 compiz-libcompizconfig compiz-libcompizconfig-dev compiz-bcop glu-dev \
 util-linux-uuid-dev libtool util-linux-getopt xorg-libxshmfence-dev expat-dev \
-xorg-xcb-util-dev"
-SPLIT="compiz-plugins-main-dev"
+xorg-xcb-util-dev libjpeg-turbo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e compiz-plugins-unsupported/receipt
--- a/compiz-plugins-unsupported/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz-plugins-unsupported/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.12"
 CATEGORY="x-window"
 SHORT_DESC="Compiz extra plugins"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded"
 
diff -r ad29ddfee1c9 -r d5aab818505e compiz/receipt
--- a/compiz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compiz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,53 +3,48 @@
 PACKAGE="compiz"
 VERSION="0.8.12"
 CATEGORY="meta"
-SHORT_DESC="Compiz 3D effect support on SliTaz."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Compiz 3D effect support on SliTaz"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT GPL LGPL"
 WEB_SITE="http://www.compiz.org/"
-TAGS="window-manager"
 
-DEPENDS="emerald compiz-core compiz-plugins-main compiz-libcompizconfig \
-slitaz-configs cairo-gl"
-SUGGESTED="compiz-ccsm compiz-plugins-extra emerald-themes"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -r $stuff/xsessions $fs/usr/share
 	install -m 0777 $stuff/compiz-session $fs/usr/bin
 	install -m 0777 $stuff/compiz-startwm $fs/usr/bin
 	chown -R 0.0 $fs
+	DEPENDS="emerald compiz-core compiz-plugins-main compiz-libcompizconfig \
+	slitaz-configs cairo-gl"
+	SUGGESTED="compiz-ccsm compiz-plugins-extra emerald-themes"
+	TAGS="window-manager"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" tazx auto
 
 	res=$(cat $root/etc/slim.conf | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" $root/etc/slim.conf
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" $root/etc/slim.conf
 		status
 	fi
 	for i in $(ls -d "$1"/home/* 2> /dev/null);
-	do	[ -d "$i" ] && \
+	do	[ -d "$i" ] &&
 		sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"compiz"|' -i \
 		"$i/.config/slitaz/applications.conf" \
 		"$1/etc/slitaz/applications.conf"
 	done
 }
 
-post_remove()
-{
+post_remove() {
 	# Remove WM from SLIM available sessions.
 	if grep -q $PACKAGE $root/etc/slim.conf; then
 		sed -i s/,$PACKAGE// $root/etc/slim.conf
 	fi
 	for i in $(ls -d "$1"/home/* 2> /dev/null);
-	do [ -d "$i" ] && \
+	do [ -d "$i" ] &&
 		sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"lxde-session"|' -i \
 		"$i/.config/slitaz/applications.conf" \
 		"$1/etc/slitaz/applications.conf"
diff -r ad29ddfee1c9 -r d5aab818505e compton-conf/receipt
--- a/compton-conf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compton-conf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="GUI configuration tool for compton X composite manager"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://github.com/lxde/compton-conf"
+WEB_SITE="https://github.com/lxqt/compton-conf"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/compton-conf/releases/download/$VERSION/$TARBALL"
@@ -14,7 +14,8 @@
 BUILD_DEPENDS="cmake lxqt-build-tools mesa-dev libconfig-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e compton/receipt
--- a/compton/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/compton/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="b7f43ee"
 CATEGORY="x-window"
 SHORT_DESC="A compositor for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/chjj/compton"
 
diff -r ad29ddfee1c9 -r d5aab818505e conky/receipt
--- a/conky/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/conky/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.9.0"
 CATEGORY="system-tools"
 SHORT_DESC="Simple and very light system monitor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://conky.sourceforge.net/"
+WEB_SITE="https://github.com/brndnmtthws/conky"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e connman-ui/receipt
--- a/connman-ui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/connman-ui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="fce0af9"
 CATEGORY="network"
 SHORT_DESC="A full-featured GTK based trayicon UI for ConnMan"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/tbursztyka/connman-ui"
 
@@ -23,7 +23,7 @@
 	# change some icons
 	cp -a $stuff/icons/*.png $src/data/icons &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e connman/receipt
--- a/connman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/connman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.21"
 CATEGORY="network"
 SHORT_DESC="Daemon for managing internet connections"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://connman.net/"
+WEB_SITE="https://01.org/connman"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="glib-dev dbus-dev iptables-dev iptables gnutls-dev libnl-dev
 openconnect udev-dev wpa_supplicant readline-dev ncurses-dev openvpn
 bluez-dev ppp-dev"
-SPLIT="connman connman-dev connman-tools"
+SPLIT="$PACKAGE-dev $PACKAGE-tools"
 
 compile_rules() {
 	# add dependency on libncurses.so,
@@ -31,7 +31,7 @@
 		--enable-test \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/usr/sbin/
 	install -m755 $src/client/connmanctl $install/usr/sbin/
diff -r ad29ddfee1c9 -r d5aab818505e conntrack-tools/receipt
--- a/conntrack-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/conntrack-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="conntrack-tools"
 VERSION="1.4.2"
 CATEGORY="security"
-SHORT_DESC="userspace tools to interact with the Connection Tracking System"
+SHORT_DESC="Userspace tools to interact with the Connection Tracking System"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.netfilter.org/"
+WEB_SITE="http://conntrack-tools.netfilter.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.netfilter.org/projects/$PACKAGE/files/$TARBALL"
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e consolekit2/receipt
--- a/consolekit2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/consolekit2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,9 @@
 TARBALL="ConsoleKit2-$VERSION.tar.bz2"
 WGET_URL="https://github.com/Consolekit2/ConsoleKit2/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev gettext dbus-dev glib-dev polkit-dev eudev-dev \
-xmlto libxslt docbook-xsl libxml2-tools acl-dev"
-SPLIT="consolekit2-dev"
+BUILD_DEPENDS="xorg-libX11-dev gettext-dev dbus-dev glib-dev polkit-dev \
+eudev-dev xmlto libxslt docbook-xsl libxml2-tools acl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e consonance/receipt
--- a/consonance/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/consonance/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.5.1"
 CATEGORY="multimedia"
 SHORT_DESC="A lightwight music manager"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://sites.google.com/site/consonancemanager/"
+WEB_SITE="https://sites.google.com/site/consonancemanager/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/sujith/consonance/$TARBALL"
@@ -23,7 +23,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/usr/share/pixmaps
 	ln -s ../consonance/data/consonance.png $install/usr/share/pixmaps/consonance.png
diff -r ad29ddfee1c9 -r d5aab818505e cookutils/receipt
--- a/cookutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cookutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,17 @@
 VERSION="1088"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages builder new generation"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-SPLIT="cookutils-daemon"
+SPLIT="$PACKAGE-daemon"
 
 compile_rules() {
-	make DESTDIR=$install install
+	make DESTDIR=$install install || return 1
 
 	# Set correct architecture
 	sed -i "/^ARCH=/ s|.*|ARCH=\"$ARCH\"|" $install/etc/slitaz/cook.conf
@@ -43,7 +43,7 @@
 NO_post_install_cookutils() {
 	case "$(cat "$1/etc/hostname" 2>/dev/null)" in
 		tank*)
-			if ! chroot "$1/" tazpkg list | grep -q aufs ; then
+			if ! chroot "$1/" tazpkg list | grep -q aufs; then
 				tazpkg get-install aufs --root="$1/"
 				sed -i 's/LOAD_MODULES="/&aufs /' "$1/etc/rcS.conf"
 			fi
diff -r ad29ddfee1c9 -r d5aab818505e coova-chilli/receipt
--- a/coova-chilli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/coova-chilli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Captive portal or wireless LAN access point controller"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.coova.org/CoovaChilli"
+WEB_SITE="https://coova.github.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ap.coova.org/chilli/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev curl-dev perl"
-SPLIT="coova-chilli-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|return -1; safe_close|return -1;\n safe_close|' src/redir.c
@@ -46,7 +46,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e copyq/receipt
--- a/copyq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/copyq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -2,21 +2,19 @@
 
 PACKAGE="copyq"
 VERSION="3.1.1+git"
-VERSION_GIT="4d97bdb"
 CATEGORY="utilities"
 SHORT_DESC="Clipboard Manager with Advanced Features"
 WEB_SITE="http://hluk.github.io/CopyQ/"
 LICENSE="GPL3"
+MAINTAINER="psychomaniak@xakep.ru"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-MAINTAINER="psychomaniak@xakep.ru"
+VERSION_GIT="4d97bdb"
 WGET_URL="https://github.com/hluk/CopyQ/archive/$VERSION_GIT.tar.gz"
 
-DEPENDS="qt5-base"
 BUILD_DEPENDS="qt5-dev cmake expat-dev xorg-dev zlib-dev expat-dev mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cat > p.diff <<EOT
 --- o.cpp
 +++ configurationmanager.cpp
@@ -29,12 +27,18 @@
 EOT
 	patch $src/src/gui/configurationmanager.cpp p.diff
 	mkdir $src/b
-	cd $src/b && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-	make &&	make install
+	cd $src/b
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make install
+
 	rm -rf $src/b
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="qt5-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e coreutils/receipt
--- a/coreutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/coreutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.30"
 CATEGORY="meta"
 SHORT_DESC="Utilities for using and setting the basic system"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/coreutils/coreutils.html"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter05/coreutils.html"
@@ -12,17 +12,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake autoconf gettext xz libcap-dev gmp-dev patch texinfo \
-openssl-dev"
+BUILD_DEPENDS="automake autoconf gettext-dev xz libcap-dev gmp-dev patch \
+texinfo openssl-dev"
 SPLIT="\
-coreutils-character      coreutils-command          coreutils-conditions \
-coreutils-context-system coreutils-context-user     coreutils-context-working \
-coreutils-directory      coreutils-disk             coreutils-file-attributes \
-coreutils-file-format    coreutils-file-output-full coreutils-file-output-part \
-coreutils-file-sort      coreutils-file-special     coreutils-file-summarize \
-coreutils-line           coreutils-numeric          coreutils-operations \
-coreutils-path           coreutils-print            coreutils-redirection \
-coreutils-multicall:multi"
+$PACKAGE-character      $PACKAGE-command          $PACKAGE-conditions \
+$PACKAGE-context-system $PACKAGE-context-user     $PACKAGE-context-working \
+$PACKAGE-directory      $PACKAGE-disk             $PACKAGE-file-attributes \
+$PACKAGE-file-format    $PACKAGE-file-output-full $PACKAGE-file-output-part \
+$PACKAGE-file-sort      $PACKAGE-file-special     $PACKAGE-file-summarize \
+$PACKAGE-line           $PACKAGE-numeric          $PACKAGE-operations \
+$PACKAGE-path           $PACKAGE-print            $PACKAGE-redirection \
+$PACKAGE-multicall:multi"
 
 compile_rules() {
 	case $SET in
@@ -40,7 +40,8 @@
 		--with-openssl \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	# LFS: Move programs to the locations specified by the FHS
 	mkdir -p \
@@ -111,7 +112,8 @@
 		*-conditions)
 			copy false true [ expr test
 			CAT="system-tools|conditions"
-			DEPENDS="glibc-base gmp" ;;
+			DEPENDS="glibc-base gmp"
+			;;
 		*-context-system)
 			copy date uname chcon hostid nproc runcon uptime
 			CAT="system-tools|system context"
@@ -127,7 +129,8 @@
 		*-directory)
 			copy ls dir dircolors vdir
 			CAT="system-tools|list directories"
-			DEPENDS="glibc-base libcap" ;;
+			DEPENDS="glibc-base libcap"
+			;;
 		*-disk)
 			copy df sync du stat truncate
 			CAT="system-tools|work with disks"
@@ -169,11 +172,13 @@
 		*-numeric)
 			copy factor seq
 			CAT="system-tools|numeric"
-			DEPENDS="glibc-base gmp" ;;
+			DEPENDS="glibc-base gmp"
+			;;
 		*-operations)
 			copy cp dd mv install rm shred
 			CAT="system-tools|perform basic operations"
-			DEPENDS="glibc-base acl attr" ;;
+			DEPENDS="glibc-base acl attr"
+			;;
 		*-path)
 			copy basename dirname pathchk
 			CAT="system-tools|perform path manipulation"
diff -r ad29ddfee1c9 -r d5aab818505e corkscrew/receipt
--- a/corkscrew/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/corkscrew/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="corkscrew"
 VERSION="2.0"
 CATEGORY="network"
-SHORT_DESC="tool for tunneling ssh through proxies"
+SHORT_DESC="Tool for tunneling SSH through proxies"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://www.agroman.net/corkscrew"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.agroman.net/corkscrew"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="ssh"
 
-DEPENDS="openssh"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssh"
+	TAGS="ssh"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e cortex/receipt
--- a/cortex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cortex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,27 @@
 PACKAGE="cortex"
 VERSION="02102016"
 CATEGORY="utilities"
-SHORT_DESC="An ncurses reddit browser and monitor."
+SHORT_DESC="An ncurses reddit browser and monitor"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://cortex.glacicle.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://cortex.glacicle.org/"
 WGET_URL="git|git://github.com/GGLucas/cortex"
 
-DEPENDS="python3 cacerts"
 BUILD_DEPENDS="git bzip2"
 
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/home/tux/.cortex
 	cp -a $src/$PACKAGE $fs/usr/bin
 	cp -a $src/config.example $fs/home/tux/.cortex/config
+	DEPENDS="python3 cacerts"
 }
 
-post_install()
-{
-        chroot "$1/" chown -R tux.users "/home/tux/.cortex"
+post_install() {
+	chroot "$1/" chown -R tux.users "/home/tux/.cortex"
 }
 
-post_remove()
-{
-        chroot "$1/" rm -r "/home/tux/.cortex"
+post_remove() {
+	chroot "$1/" rm -r "/home/tux/.cortex"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e couchdb/receipt
--- a/couchdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/couchdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,10 +4,10 @@
 VERSION="1.2.0"
 SOURCE="apache-couchdb"
 CATEGORY="development"
-SHORT_DESC="Apache CouchDB is document-oriented database"
+SHORT_DESC="Document-oriented database"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://couchdb.apache.org"
+WEB_SITE="http://couchdb.apache.org/"
 
 TARBALL="$SOURCE-$VERSION.tar.gz"
 APACHE_MIRROR="http://mirrors.dedipower.com/ftp.apache.org/"
@@ -20,7 +20,7 @@
 		--with-js-include=/usr/include/js \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cowpatty/receipt
--- a/cowpatty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cowpatty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.8"
 CATEGORY="network"
 SHORT_DESC="Brute-force dictionary attack against WPA-PSK"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.willhackforsushi.com/?page_id=50"
 
diff -r ad29ddfee1c9 -r d5aab818505e cpio/receipt
--- a/cpio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cpio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.12"
 CATEGORY="base-system"
 SHORT_DESC="GNU cpio archiver"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/cpio/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/cpio.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="tar gettext texinfo"
+BUILD_DEPENDS="tar gettext-dev texinfo"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cplay/receipt
--- a/cplay/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cplay/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/hukka/cplay/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e cppunit/receipt
--- a/cppunit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cppunit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.14.0"
 CATEGORY="system-tools"
 SHORT_DESC="A C++ unit testing framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/cppunit/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://dev-www.libreoffice.org/src/$TARBALL"
 
-SPLIT="cppunit-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cpufrequtils/receipt
--- a/cpufrequtils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cpufrequtils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="008"
 CATEGORY="system-tools"
 SHORT_DESC="Userspace tools for the kernel cpufreq subsystem"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/cpufreq/"
 
@@ -12,19 +12,15 @@
 WGET_URL="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/cpufreq/$TARBALL"
 TARBALL_SHA256="a2149db551f83112209b1a8e79bd50d386979bbf64edbc69126f4e0b4f0a4cab"
 
-BUILD_DEPENDS="libtool gettext sed"
-SPLIT="cpufrequtils-dev"
+BUILD_DEPENDS="libtool gettext-dev sed"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make LIBTOOL_OPT="--silent --tag=CC" &&
-	make DESTDIR=$DESTDIR mandir=/usr/share/man install
+	make DESTDIR=$install mandir=/usr/share/man install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		cpufrequtils)
 			copy @std *.mo
diff -r ad29ddfee1c9 -r d5aab818505e cpulimit/receipt
--- a/cpulimit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cpulimit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Limits the CPU usage of a process"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://cpulimit.sourceforge.net"
+WEB_SITE="http://cpulimit.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e cpuspeed/receipt
--- a/cpuspeed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cpuspeed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5"
 SHORT_DESC="CPU frequency scaling utility"
 CATEGORY="system-tools"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.carlthompson.net/Software/CPUSpeed"
 
diff -r ad29ddfee1c9 -r d5aab818505e cramfs/receipt
--- a/cramfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cramfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Simple and small, compressed filesystem"
 LICENSE="GPL2"
 MAINTAINER="pascal.bellard@slitaz.org"
-WEB_SITE="http://cramfs.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/cramfs/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e cream/receipt
--- a/cream/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cream/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,12 +11,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/cream-browser/$TARBALL"
 
-BUILD_DEPENDS="webkitgtk-dev libsoup-dev gtk2-dev gettext-tools"
+BUILD_DEPENDS="webkitgtk-dev libsoup-dev gtk2-dev gettext"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cromfs/receipt
--- a/cromfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cromfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,15 +20,15 @@
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make -j 1 2>&1 | grep -v cromfs-driver-static
+	make -j1 || return 1
 
-	mkdir -p $DESTDIR/bin   $DESTDIR/usr/bin
-	cp $src/cromfs-driver   $DESTDIR/bin
+	mkdir -p $install/bin   $install/usr/bin
+	cp $src/cromfs-driver   $install/bin
 	# Maybe have a plited packages (cromfs-static)
-	#cp $src/cromfs-driver-static $DESTDIR/bin/cromfs-driver
-	cp $src/util/cvcromfs   $DESTDIR/usr/bin
-	cp $src/util/mkcromfs   $DESTDIR/usr/bin
-	cp $src/util/unmkcromfs $DESTDIR/bin
+	#cp $src/cromfs-driver-static $install/bin/cromfs-driver
+	cp $src/util/cvcromfs   $install/usr/bin
+	cp $src/util/mkcromfs   $install/usr/bin
+	cp $src/util/unmkcromfs $install/bin
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e croscore-fonts/receipt
--- a/croscore-fonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/croscore-fonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 (serif), and Symbol Neu (symbol)"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="SIL_OFL"
-WEB_SITE="http://fedoraproject.org/wiki/Google_Croscore_fonts"
+WEB_SITE="https://fedoraproject.org/wiki/Google_Croscore_fonts"
 HOST_ARCH="any"
 
 TARBALL="croscorefonts-$VERSION.tar.bz2"
diff -r ad29ddfee1c9 -r d5aab818505e crosstool-ng/receipt
--- a/crosstool-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/crosstool-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="crosstool-ng"
 VERSION="1.20.0"
 CATEGORY="development"
-SHORT_DESC="Tool to Build toolchains."
+SHORT_DESC="Tool to Build toolchains"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ymorin.is-a-geek.org/projects/crosstool"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ymorin.is-a-geek.org/projects/crosstool"
 WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/$TARBALL"
 
-DEPENDS="slitaz-toolchain"
 BUILD_DEPENDS="subversion flex cvs gawk texinfo ncurses-dev automake libtool \
 gperf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="slitaz-toolchain"
 }
diff -r ad29ddfee1c9 -r d5aab818505e crunch/receipt
--- a/crunch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/crunch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="crunch"
 VERSION="3.6"
 CATEGORY="network"
-SHORT_DESC="Wordlist generator."
+SHORT_DESC="Wordlist generator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/crunch-wordlist/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://wiki.backtrack-fr.net/index.php/Crunch"
-WGET_URL="http://tenet.dl.sourceforge.net/project/crunch-wordlist/crunch-wordlist/$TARBALL"
+WGET_URL="$SF_MIRROR/crunch-wordlist/$TARBALL"
 
 BUILD_DEPENDS="sudo"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/crunch $fs/usr/share
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e cryptopp/receipt
--- a/cryptopp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cryptopp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,21 @@
 PACKAGE="cryptopp"
 VERSION="5.6.5"
 CATEGORY="security"
-SHORT_DESC="C++ class library of cryptographic schemes."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="C++ class library of cryptographic schemes"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT PublicDomain"
-TARBALL="${PACKAGE}${VERSION//./}.zip"
 WEB_SITE="https://www.cryptopp.com/"
+
+TARBALL="$PACKAGE${VERSION//./}.zip"
 WGET_URL="$WEB_SITE$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make 
-	make libcryptopp.so
+compile_rules() {
+	make &&
+	make libcryptopp.so &&
 	make PREFIX=/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/doc/$PACKAGE
 	cp -a $install/usr/* $fs/usr
 	cp $src/License.txt $fs/usr/share/doc/$PACKAGE
diff -r ad29ddfee1c9 -r d5aab818505e cryptsetup/receipt
--- a/cryptsetup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cryptsetup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,16 @@
 VERSION="2.0.3"
 CATEGORY="system-tools"
 SHORT_DESC="dm-crypt setup tool for encryption of block devices"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gitlab.com/cryptsetup/cryptsetup"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/cryptsetup/v${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev popt-dev libgcrypt-dev \
-argon2-dev"
-BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev gettext popt-dev json-c-dev \
-libgcrypt-dev argon2-dev"
-SPLIT="cryptsetup-dev"
+BUILD_DEPENDS="util-linux-uuid-dev libdevmapper-dev gettext-dev popt-dev \
+json-c-dev libgcrypt-dev argon2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -27,9 +25,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		cryptsetup)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e cssc/receipt
--- a/cssc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cssc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e csstidy/receipt
--- a/csstidy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/csstidy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="csstidy"
 VERSION="1.4"
 CATEGORY="development"
-SHORT_DESC="CSSTidy is a program that optimises, formats and fixes CSS code"
+SHORT_DESC="Optimise, format and fix CSS code"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://csstidy.sourceforge.net/"
+
 TARBALL="$PACKAGE-source-$VERSION.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="scons2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	scons
-	mkdir -p $install/usr/bin
-	cp -a $src/release/csstidy/csstidy $install/usr/bin
+compile_rules() {
+	scons &&
+	install -Dm755 release/csstidy/csstidy $install/usr/bin/csstidy
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e csync/receipt
--- a/csync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/csync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.50.8"
 CATEGORY="network"
 SHORT_DESC="File synchronizer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.csync.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="check-dev cmake sqlite3-dev iniparser-dev \
 expat-dev openssl-dev log4c-dev neon-dev samba-dev"
-SPLIT="csync-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir csync-build
@@ -23,22 +23,18 @@
 		-DWITH_LOG4C=OFF \
 		-DLOG_TO_CALLBACK=ON \
 		.. &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		csync)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/etc $fs/
-			cp -a $install/usr/bin $fs/usr
-			cp -a $install/usr/lib/*.so* $fs/usr/lib
-			cp -a $install/usr/lib/csync-0 $fs/usr/lib
+			copy @std
 			DEPENDS="libsqlite3 neon"
 			;;
 		*-dev)
-			mkdir -p $fs/usr
-			cp -a $install/usr/include $fs/usr
+			copy @dev
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e ctags/receipt
--- a/ctags/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ctags/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ctags"
 VERSION="5.8"
 CATEGORY="utilities"
-SHORT_DESC="Generates an index file of language objects found in source files."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Generates an index file of language objects found in source files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ctags.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make prefix=$DESTDIR/usr install
+	make prefix=$install/usr install || return 1
 
 	cook_pick_manpages ctags.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy ctags
 }
diff -r ad29ddfee1c9 -r d5aab818505e ctorrent-dnh/receipt
--- a/ctorrent-dnh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ctorrent-dnh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,22 @@
 VERSION="3.3.2"
 CATEGORY="network"
 SHORT_DESC="Command line Bittorrent client"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.rahul.net/dholmes/ctorrent/"
 
-TARBALL="${PACKAGE}$VERSION.tar.gz"
+TARBALL="$PACKAGE$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/dtorrent/$TARBALL"
 
 compile_rules() {
-	mv ${PACKAGE}$VERSION $PACKAGE-$VERSION 2>/dev/null
+	mv $PACKAGE$VERSION $PACKAGE-$VERSION 2>/dev/null
 	cd $src
 	./configure \
 		--prefix=/usr \
 		--with-ssl=no \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cups-filters/receipt
--- a/cups-filters/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cups-filters/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="cups-dev zlib-dev libjpeg-turbo-dev libpng16-dev tiff-dev \
 glib-dev lcms2-dev freetype-dev fontconfig-dev ijs-dev qpdf-dev poppler-dev \
 dbus-dev"
-SPLIT="cups-filters-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e cups-pdf/receipt
--- a/cups-pdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cups-pdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="2.6.1"
 CATEGORY="system-tools"
 SHORT_DESC="PDF printer for CUPS"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf"
+WEB_SITE="https://pawn.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/"
 
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-WGET_URL="${WEB_SITE}/src/${TARBALL}"
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/src/$TARBALL"
 
 compile_rules() {
 	cd $src/src
diff -r ad29ddfee1c9 -r d5aab818505e cups/receipt
--- a/cups/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cups/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.2"
 CATEGORY="system-tools"
 SHORT_DESC="Common UNIX Printing System"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2"
 WEB_SITE="https://www.cups.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libusb-dev zlib-dev acl-dev dbus-dev gnutls-dev perl \
 python pam pam-dev"
-SPLIT="libcups cups cups-pam:pam cups-doc cups-dev"
+SPLIT="libcups $PACKAGE $PACKAGE-pam:pam $PACKAGE-doc $PACKAGE-dev"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e curl/receipt
--- a/curl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/curl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.61.1"
 CATEGORY="network"
 SHORT_DESC="Tool and libs for transferring files with URL syntax"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://curl.haxx.se/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/curl.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="zlib-dev openssl-dev libidn2-dev"
 # libssh2-dev c-ares-dev brotli-dev openldap-dev libpsl-dev"
-SPLIT="libcurl curl-dev"
+SPLIT="libcurl $PACKAGE-dev"
 
 compile_rules() {
 	# --with-libssh2 --with-brotli --enable-ldap --with-nghttp2
diff -r ad29ddfee1c9 -r d5aab818505e curlftpfs/receipt
--- a/curlftpfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/curlftpfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.2"
 CATEGORY="system-tools"
 SHORT_DESC="Using FUSE to access FTP servers"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://curlftpfs.sourceforge.net/"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e cv/receipt
--- a/cv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="cv"
 VERSION="0.4.1"
@@ -6,22 +6,21 @@
 SHORT_DESC="Linux tool to show progress for cp, rm, dd, ..."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/Xfennec/progress"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/Xfennec/cv"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/local||' Makefile
-	make && make DESTDIR=$DESTDIR install
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cvs/receipt
--- a/cvs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cvs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.11.23"
 CATEGORY="development"
 SHORT_DESC="Concurrent Versions System"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://cvs.nongnu.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.gnu.org/non-gnu/cvs/source/stable/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="automake perl krb5-dev texinfo zlib-dev"
-SPLIT="cvs-contrib"
+SPLIT="$PACKAGE-contrib"
 
 compile_rules() {
 	unset EDITOR VISUAL
diff -r ad29ddfee1c9 -r d5aab818505e cwallpaper-fltk/receipt
--- a/cwallpaper-fltk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cwallpaper-fltk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,29 @@
 PACKAGE="cwallpaper-fltk"
 VERSION="0.4.2"
 CATEGORY="system-tools"
-SHORT_DESC="PC XT-compatible emulator/virtual machine."
+SHORT_DESC="PC XT-compatible emulator/virtual machine"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://cwallpaper.sourceforge.net"
+WEB_SITE="http://cwallpaper.sourceforge.net/"
 REPOLOGY="cwallpaper"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/cwallpaper/$PACKAGE/cwallpaper-fltk-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/cwallpaper/$TARBALL"
 
-SUGGESTED="hsetroot feh"
-DEPENDS="fltk"
 BUILD_DEPENDS="fltk-dev xorg-libX11-dev xorg-libXinerama-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i s"#g++#${HOST_SYSTEM}-g++#" Makefile || return 1
-	make && mkdir -p ${DESTDIR}/usr/bin/ &&
-	make DESTDIR=${DESTDIR} install
+compile_rules() {
+	sed -i "s#g++#${HOST_SYSTEM}-g++#" Makefile || return 1
+	make &&
+	mkdir -p $install/usr/bin/ &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/cwallpaper
 	cp -a $install/usr/bin $fs/usr
 	cp $install/usr/share/cwallpaper/example_config \
 		$fs/usr/share/cwallpaper
+	DEPENDS="fltk"
+	SUGGESTED="hsetroot feh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e cyrus-imapd/receipt
--- a/cyrus-imapd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cyrus-imapd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="libcomerr libcomerr-dev cyrus-sasl cyrus-sasl-dev openssl-dev \
 db-dev perl-dev zlib-dev"
-SPLIT="cyrus-imapd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lpthread"
@@ -29,7 +29,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -80,7 +80,7 @@
 pop3 110/tcp pop-3
 nntp 119/tcp readnews untp
 imap 143/tcp imap2 imap4
-imsp 406/tcp 
+imsp 406/tcp
 nntps 563/tcp snntp
 acap 674/tcp
 imaps 993/tcp
@@ -112,7 +112,7 @@
 		echo "createmailbox user.$i"
 	done | chroot "$1/" cyradm -u cyrus -w cyrus 127.0.0.1 >/dev/null 2>&1
 	chroot "$1/" su -c "/usr/lib/cyrus/bin/reconstruct" cyrus >/dev/null 2>&1
-	cat <<EOF
+	[ -n "$quiet" ] || cat <<EOF
 
 	.---------------------------------------------------.
 	| Users must have a password to access the mailbox. |
diff -r ad29ddfee1c9 -r d5aab818505e cyrus-sasl/receipt
--- a/cyrus-sasl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/cyrus-sasl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="ftp://ftp.cyrusimap.org/cyrus-sasl/$TARBALL"
 
 BUILD_DEPENDS="automake libtool openldap-dev db-dev openssl-dev krb5-dev pam-dev"
-SPLIT="libsasl libsasl-modules cyrus-sasl cyrus-sasl-dev \
-cyrus-sasl-pam:pam libsasl-without-ldap:wo"
+SPLIT="libsasl libsasl-modules $PACKAGE $PACKAGE-dev \
+$PACKAGE-pam:pam libsasl-without-ldap:wo"
 
 compile_rules() {
 	autoreconf -fi || return 1
diff -r ad29ddfee1c9 -r d5aab818505e d-feet/receipt
--- a/d-feet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/d-feet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="d-feet"
 VERSION="0.1.15"
 CATEGORY="system-tools"
-SHORT_DESC="D-Feet is an easy to use D-Bus debugger."
-MAINTAINER="monghitri@aruba.it"
+SHORT_DESC="Easy to use D-Bus debugger"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://wiki.gnome.org/Apps/DFeet"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://live.gnome.org/DFeet/"
-WGET_URL="ftp://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION:0:3}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:3}/$TARBALL"
 
-DEPENDS="dbus python-dbus python-pygtk python"
 BUILD_DEPENDS="dbus-dev python-dbus-dev python-pygtk-dev python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="dbus python-dbus python-pygtk python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dahdi-linux/receipt
--- a/dahdi-linux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dahdi-linux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,11 +4,12 @@
 VERSION="2.11.1"
 EXTRAVERSION="_$kvers"
 CATEGORY="network"
-SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules."
+SHORT_DESC="Digium Asterisk Hardware Device Interface: kernel modules"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.asterisk.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.asterisk.org/"
 WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL"
 EXTRA_SOURCE_FILES="dahdi-fw-hx8-2.06.tar.gz dahdi-fw-oct6114-032-1.05.01.tar.gz \
 dahdi-fw-oct6114-064-1.05.01.tar.gz	dahdi-fw-oct6114-128-1.05.01.tar.gz \
@@ -21,49 +22,41 @@
 dahdi-fwload-vpmadt032-1.25.0.tar.gz"
 
 BUILD_DEPENDS="linux-module-headers xz perl"
-SPLIT="dahdi-linux dahdi-linux-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
+compile_rules() {
 	FIRMWARE_URL=http://downloads.digium.com/pub/telephony/firmware/releases
-	for i in $EXTRA_SOURCE_FILES ; do
+	for i in $EXTRA_SOURCE_FILES; do
 		[ -s $SRC/$i ] ||
 		  wget -P $SRC $FIRMWARE_URL/$i
 		cp $SRC/$i drivers/dahdi/firmware/
 		tar xzf $SRC/$i -C drivers/dahdi/firmware/
 	done
+
 	make KVERS="/usr/src/linux" install 2>&1 | grep -v 'slitaz/modules' &&
-	find $DESTDIR/lib/modules -name '*.ko' -exec xz {} \; 
-	for i in $EXTRA_SOURCE_FILES ; do
+	find $install/lib/modules -name '*.ko' -exec xz {} \;
+	for i in $EXTRA_SOURCE_FILES; do
 		[ -s $SRC/$i ] ||
 		cp drivers/dahdi/firmware/$i $SRC/
 	done
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	dahdi-linux)
-		DEPENDS="linux eudev"
-		cp -a $install/* $fs
-		rm -rf $fs/usr/include
-		;;
-	dahdi-linux-dev)
-		mkdir -p $fs/usr
-		cp -a $install/usr/include $fs/usr
-		;;
+		dahdi-linux)
+			copy @std
+			DEPENDS="linux eudev"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
 
-# Post install/remove commands for Tazpkg.
-post_install_dahdi_linux()
-{
+post_install_dahdi_linux() {
 	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
 
-post_remove_dahdi_linux()
-{
+post_remove_dahdi_linux() {
 	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
 }
diff -r ad29ddfee1c9 -r d5aab818505e dahdi-tools/receipt
--- a/dahdi-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dahdi-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,16 @@
 WGET_URL="http://downloads.asterisk.org/pub/telephony/$PACKAGE/releases/$TARBALL"
 
 BUILD_DEPENDS="dahdi-linux-dev ppp-dev newt-dev libpri-dev gtk2-dev file"
-SPLIT="dahdi-man dahdi-perl dahdi-ppp dahdi-dev dahdi-tools"
+SPLIT="dahdi-man dahdi-perl dahdi-ppp dahdi-dev $PACKAGE"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make -C ppp &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR -C ppp install &&
-	make DESTDIR=$DESTDIR config
+	make DESTDIR=$install install &&
+	make DESTDIR=$install -C ppp install &&
+	make DESTDIR=$install config
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dahdi/receipt
--- a/dahdi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dahdi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,12 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dahdi"
 VERSION="1.0"
 CATEGORY="meta"
-SHORT_DESC="Digium Asterisk Hardware Device Interface."
+SHORT_DESC="Digium Asterisk Hardware Device Interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.asterisk.org/"
-PROVIDE="zaptel"
 
 DEPENDS="dahdi-linux dahdi-tools"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir $fs/dev
-}
+PROVIDE="zaptel"
diff -r ad29ddfee1c9 -r d5aab818505e daloradius/receipt
--- a/daloradius/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/daloradius/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,17 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="daloradius"
 VERSION="0.9-9"
 CATEGORY="network"
-SHORT_DESC="A RADIUS web platform for managing Hotspots."
+SHORT_DESC="A RADIUS web platform for managing Hotspots"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://daloradius.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.daloradius.com/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEBENDS="php-gd php-mysql freeradius"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/daloradius $fs/etc/mysql.d
 	cp -a $src/* $fs/usr/share/daloradius
 	mv $fs/usr/share/daloradius/library/daloradius.conf.php $fs/etc/
@@ -27,14 +24,14 @@
 chmod -x /etc/mysql.d/daloradius
 EOT
 	chmod 755 $fs/etc/mysql.d/daloradius
+	DEPENDS="php-gd php-mysql freeradius"
 }
 
-post_install()
-{
+post_install() {
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/daloradius/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/daloradius/" => "/usr/share/daloradius/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/daloradius/" => "/usr/share/daloradius/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
diff -r ad29ddfee1c9 -r d5aab818505e dansguardian/receipt
--- a/dansguardian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dansguardian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10.1.1"
 CATEGORY="network"
 SHORT_DESC="Web content filter"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20170722001531/http://dansguardian.org:80/"
 
@@ -20,7 +20,7 @@
 		--with-proxygroup=nogroup \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dar/receipt
--- a/dar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext zlib-dev bzip2-dev lzo-dev xz-dev libgpg-error-dev \
+BUILD_DEPENDS="gettext-dev zlib-dev bzip2-dev lzo-dev xz-dev libgpg-error-dev \
 libgcrypt-dev attr-dev e2fsprogs-dev upx gpgme-dev"
-SPLIT="dar-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e darkstat/receipt
--- a/darkstat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/darkstat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.719"
 CATEGORY="network"
 SHORT_DESC="Network statistics gatherer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 BSD"
 WEB_SITE="https://unix4lyfe.org/darkstat/"
 
diff -r ad29ddfee1c9 -r d5aab818505e dashel/receipt
--- a/dashel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dashel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dashel"
 VERSION="1.0.4"
 CATEGORY="system-tools"
-SHORT_DESC="C++ cross-platform data stream helper encapsulation library."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="C++ cross-platform data stream helper encapsulation library"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://aseba-community.github.io/dashel/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://aseba-community.github.io/dashel/"
 WGET_URL="https://github.com/aseba-community/dashel/archive/$VERSION.tar.gz"
 
-DEPENDS="hal"
 BUILD_DEPENDS="cmake hal-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/* $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="hal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e davfs2/receipt
--- a/davfs2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/davfs2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Remote collaborative authoring of Web resources"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://savannah.nongnu.org/projects/$PACKAGE"
+WEB_SITE="http://savannah.nongnu.org/projects/davfs2"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e davmail/receipt
--- a/davmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/davmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,24 +6,19 @@
 SHORT_DESC="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://davmail.sourceforge.net/"
+
 TARBALL="$PACKAGE-src-$VERSION.tgz"
-WEB_SITE="http://davmail.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="java-jre"
 BUILD_DEPENDS="apache-ant java-jdk"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export JAVA_HOME=/usr/lib/jvm/java-icedtea
 	ant
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/davmail $fs/usr/share/applications \
 		 $fs/usr/bin
 	cp -a $src/dist/lib $fs/usr/share/davmail
@@ -33,4 +28,5 @@
 	ln -s /usr/share/davmail/davmail.sh $fs/usr/bin/davmail
 	sed -i 's|/bin/bash|/bin/sh|' $fs/usr/share/davmail/davmail.sh
 	cp -a $src/dist/davmail.desktop $fs/usr/share/applications
+	DEPENDS="java-jre"
 }
diff -r ad29ddfee1c9 -r d5aab818505e db/receipt
--- a/db/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/db/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.oracle.com/berkeley-db/$TARBALL"
 
-SPLIT="libdb libdb-cxx db-dev"
+SPLIT="libdb libdb-cxx $PACKAGE-dev"
 
 compile_rules() {
 	cd $src/build_unix
diff -r ad29ddfee1c9 -r d5aab818505e dbus-glib/receipt
--- a/dbus-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dbus-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.110"
 CATEGORY="x-window"
 SHORT_DESC="GLib interfaces to the D-Bus API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://freedesktop.org/wiki/Software/DBusBindings/#dbus-glibobsoleteunmaintained"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/dbus-glib.html"
@@ -12,26 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dbus.freedesktop.org/releases/dbus-glib/$TARBALL"
 
-BUILD_DEPENDS_arm="dbus-dev glib-dev expat-dev"
-BUILD_DEPENDS="dbus-dev glib-dev expat-dev gettext gtk-doc"
-SPLIT="dbus-glib-dev"
+BUILD_DEPENDS="dbus-dev glib-dev expat-dev gettext-dev gtk-doc"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export ac_cv_have_abstract_sockets=${ac_cv_have_abstract_sockets=yes} ;;
-	esac
-
 	./configure \
 		--disable-static \
 		--disable-bash-completion \
-		$CONFIGURE_ARGS || return 1
-
-	case "$ARCH" in
-		arm)
-			patch -p1 < $stuff/dbus-glib.patch &&
-			patch -p0 < $stuff/dbus.patch ;;
-	esac
-
+		$CONFIGURE_ARGS &&
 	fix libtool
 	make &&
 	make install
diff -r ad29ddfee1c9 -r d5aab818505e dbus/receipt
--- a/dbus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dbus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.12.8"
 CATEGORY="x-window"
 SHORT_DESC="D-Bus, a message bus system"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/dbus/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/dbus.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="expat-dev xorg-libX11-dev glib-dev xorg-libICE-dev \
 xorg-libSM-dev libxslt xmlto libxml2-tools" # docbook-xsl
-SPLIT="dbus-helper dbus-introspect dbus dbus-dev"
+SPLIT="$PACKAGE-helper $PACKAGE-introspect $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	# temporarily: --disable-xml-docs
diff -r ad29ddfee1c9 -r d5aab818505e dcfldd/receipt
--- a/dcfldd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dcfldd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dcfldd"
 VERSION="1.3.4-1"
 CATEGORY="misc"
-SHORT_DESC="Enhanced version dd with features useful for forensics and security."
+SHORT_DESC="Enhanced version dd with features useful for forensics and security"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dcfldd.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin  $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e dcmtk/receipt
--- a/dcmtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dcmtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,14 +12,14 @@
 WGET_URL="ftp://dicom.offis.de/pub/dicom/offis/software/$PACKAGE/$PACKAGE${VERSION//./}/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev tiff-dev libpng16-dev zlib-dev" # libwrap-dev
-#SPLIT="dcmtk dcmtk-dev"
+#SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--sysconfdir=/etc/dcmtk \
 		$CONFIGURE_ARGS &&
 	make -j1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dconf-editor/receipt
--- a/dconf-editor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dconf-editor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja vala libxml2-tools dconf-dev gtk3-dev gettext"
+BUILD_DEPENDS="meson ninja vala libxml2-tools dconf-dev gtk3-dev gettext-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e dconf/receipt
--- a/dconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja vala libxslt-dev gtk-doc dbus-dev"
-SPLIT="dconf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e dcron/receipt
--- a/dcron/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dcron/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,23 +3,20 @@
 PACKAGE="dcron"
 VERSION="4.5"
 CATEGORY="utilities"
-SHORT_DESC="Dillon's lightweight cron daemon."
+SHORT_DESC="Dillon's lightweight cron daemon"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://www.jimpryor.net/linux/dcron.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.jimpryor.net/linux/dcron.html"
 WGET_URL="http://www.jimpryor.net/linux/releases/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make PREFIX=/usr CRONTAB_GROUP=users &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/bin $fs/usr
diff -r ad29ddfee1c9 -r d5aab818505e dd_rescue/receipt
--- a/dd_rescue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dd_rescue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.22"
 CATEGORY="system-tools"
 SHORT_DESC="Block device copy tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.garloff.de/kurt/linux/ddrescue/"
 REPOLOGY="ddrescue"
diff -r ad29ddfee1c9 -r d5aab818505e ddclient/receipt
--- a/ddclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ddclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ddclient"
 VERSION="3.8.3"
 CATEGORY="network"
-SHORT_DESC="Dynamic DNS update tool."
+SHORT_DESC="Dynamic DNS update tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/p/ddclient/wiki/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ddclient.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/ddclient"
-TAGS="DNS"
 
-DEPENDS="perl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/sbin $fs/etc/ddclient $fs/var/cache/ddclient \
 		 $fs/etc/init.d
 	cp $src/ddclient $fs/usr/sbin
 	cp $src/sample-etc_ddclient.conf $fs/etc/ddclient/ddclient.conf
 	cp $stuff/ddclient $fs/etc/init.d
+	DEPENDS="perl"
+	CONFIG_FILES="/etc/ddclient"
+	TAGS="DNS"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ddd/receipt
--- a/ddd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ddd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="GNU Data Display Debugger, a graphical front-end for command-line \
 debuggers"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.gnu.org/software/ddd/"
 
@@ -26,7 +26,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/icons/ddd.xpm $install/usr/share/pixmaps/ddd.xpm
 
diff -r ad29ddfee1c9 -r d5aab818505e ddrescue/receipt
--- a/ddrescue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ddrescue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="ddrescue"
 VERSION="1.14"
 CATEGORY="system-tools"
-SHORT_DESC="Data recovery tool."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="Data recovery tool"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/ddrescue/ddrescue.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/ddrescue/ddrescue.html"
 WGET_URL="http://ftp.gnu.org/gnu/ddrescue/$TARBALL"
-TAGS="recovery toolkit tools"
 
-DEPENDS="gcc-lib-base"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="gcc-lib-base"
+	TAGS="recovery toolkit tools"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ddumbfs/receipt
--- a/ddumbfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ddumbfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e deadbeef/receipt
--- a/deadbeef/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/deadbeef/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,18 @@
 VERSION="0.7.2"
 CATEGORY="multimedia"
 SHORT_DESC="Simple to use GTK+ audio player with systray support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://deadbeef.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext intltool yasm zlib-dev jansson-dev gtk2-dev \
+BUILD_DEPENDS="gettext-dev intltool yasm zlib-dev jansson-dev gtk2-dev \
 alsa-lib-dev dbus-dev curl-dev libmad-dev libvorbis-dev libogg-dev flac-dev \
 libsndfile-dev libcdio-dev libcddb-dev cdparanoia-III-dev xorg-libX11-dev \
 imlib2-dev libjpeg-turbo-dev libpng16-dev libsamplerate-dev faad2-dev "
-SPLIT="deadbeef-plugins deadbeef-dev"
+SPLIT="$PACKAGE-plugins $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e debootstrap/receipt
--- a/debootstrap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/debootstrap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,17 @@
 VERSION="1.0.48"
 CATEGORY="misc"
 SHORT_DESC="Bootstrap a basic Debian system"
-MAINTAINER="shann@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://wiki.debian.org/Debootstrap"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://wiki.debian.org/Debootstrap"
 WGET_URL="http://people.slitaz.org/~shann/packages/$PACKAGE/$TARBALL"
 
-DEPENDS="dpkg tar"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/sbin $fs/usr/share
 	cp -a $src/usr/sbin/*  $fs/usr/sbin
 	cp -a $src/usr/share/* $fs/usr/share
 	chown -R root.root $fs
+	DEPENDS="dpkg tar"
 }
diff -r ad29ddfee1c9 -r d5aab818505e decibel/receipt
--- a/decibel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/decibel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,19 @@
 VERSION="1.06"
 CATEGORY="multimedia"
 SHORT_DESC="Decibel audio player for GNOME Desktop"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://decibel.silent-blade.org/"
 
 TARBALL="decibel-audio-player-$VERSION.tar.gz"
 WGET_URL="http://decibel.silent-blade.org/uploads/Main/$TARBALL"
 
-BUILD_DEPENDS="gettext findutils"
+BUILD_DEPENDS="gettext-dev findutils"
 
 compile_rules() {
 	make \
 		prefix=/usr \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e defrag/receipt
--- a/defrag/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/defrag/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="defrag"
 VERSION="0.08"
 CATEGORY="misc"
-SHORT_DESC="A defragmentation script."
+SHORT_DESC="A defragmentation script"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="unknown"
 WEB_SITE="http://ck.kolivas.org/apps/defrag/"
+
 URL="$(dirname $WEB_SITE)/$PACKAGE-$VERSION/$PACKAGE"
 EXTRA_SOURCE_FILES="$PACKAGE"
-SUGGESTED="shake"
-DEPENDS="bash"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
-	[ -s "$SRC/$PACKAGE" ] ||
-		 wget -P $SRC $URL
+	[ -s "$SRC/$PACKAGE" ] ||  wget -P $SRC $URL
+
 	cp $SRC/$PACKAGE $fs/usr/bin
+	DEPENDS="bash"
+	SUGGESTED="shake"
 }
diff -r ad29ddfee1c9 -r d5aab818505e defragfs/receipt
--- a/defragfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/defragfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="defragfs"
 VERSION="1.1.1"
 CATEGORY="misc"
-SHORT_DESC="Measurement and Report and Defrag fs/file fragmentation."
+SHORT_DESC="Measurement and Report and Defrag fs/file fragmentation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://defragfs.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.gz"
-WEB_SITE="http://defragfs.sourceforge.net/"
-WGET_URL="http://vorboss.dl.sourceforge.net/project/$PACKAGE/$PACKAGE/$PACKAGE-${VERSION%.*}/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="perl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	zcat $src/$TARBALL > $fs/usr/bin/defragfs
 	chmod 755 $fs/usr/bin/defragfs
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dega/receipt
--- a/dega/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dega/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,28 +4,23 @@
 VERSION="1.12"
 CATEGORY="games"
 SHORT_DESC="A small Sega Master System and Game Gear emulator"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://www.finalburn.com/dega"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.finalburn.com/dega"
 WGET_URL="http://www.emulinks.de/emus/$TARBALL"
-TAGS="emulator sega"
 
-DEPENDS="libsdl"
 BUILD_DEPENDS="nasm libsdl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/--libs.*/& -lm/' Makefile
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/dega $fs/usr/bin
+	DEPENDS="libsdl"
+	TAGS="emulator sega"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e deluge/receipt
--- a/deluge/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/deluge/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.15"
 CATEGORY="network"
 SHORT_DESC="A bittorrent client written with Python and PyGTK"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://deluge-torrent.org/"
 
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="python intltool"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --prefix=/usr --root=$DESTDIR --optimize=1
+	python -B setup.py build &&
+	python -B setup.py install --prefix=/usr --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e desktop-file-utils/receipt
--- a/desktop-file-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/desktop-file-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.23"
 CATEGORY="system-tools"
 SHORT_DESC="Utilities for .desktop files"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/desktop-file-utils/"
 
@@ -12,17 +12,20 @@
 WGET_URL="https://www.freedesktop.org/software/desktop-file-utils/releases/$TARBALL"
 
 BUILD_DEPENDS="glib-dev glib-static"
-SPLIT="desktop-file-validate-static desktop-file-utils-extra"
+SPLIT="desktop-file-validate-static $PACKAGE-extra"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install &&
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	make clean &&
 	./configure \
 		LDFLAGS='-static -pthread' \
 		--bindir=/usr/sbin \
 		$CONFIGURE_ARGS &&
-	make && make bin_PROGRAMS=desktop-file-validate LN_S=echo install
+	make &&
+	make bin_PROGRAMS=desktop-file-validate LN_S=echo install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e deutex-devel/receipt
--- a/deutex-devel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/deutex-devel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="deutex-devel"
 VERSION="4.4.902"
 CATEGORY="development"
-SHORT_DESC="A WAD file composer for Doom, Heretic, Hexen and Strife."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="A WAD file composer for Doom, Heretic, Hexen and Strife"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.teaser.fr/~amajorel/deutex/"
 REPOLOGY="deutex"
@@ -13,21 +13,20 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="http://www.teaser.fr/~amajorel/deutex/fungus/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir -p $DESTDIR/usr/bin
-	mkdir -p $DESTDIR/usr/share/man/man6
-	./configure --cflags="${CFLAGS}" && 
-	make && 
-	make BINDIR=$DESTDIR/usr/bin MANDIR=$DESTDIR/usr/share/man install
+compile_rules() {
+	mkdir -p $install/usr/bin
+	mkdir -p $install/usr/share/man/man6
+
+	./configure \
+		--cflags="$CFLAGS" &&
+	make &&
+	make \
+		BINDIR=$install/usr/bin \
+		MANDIR=$install/usr/share/man \
+		install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dev86/receipt
--- a/dev86/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dev86/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GITHUB/lkundrak/dev86/tarball/v$VERSION"
 
 BUILD_DEPENDS="coreutils-file-output-full" # for `cat -v`
-SPLIT="elksemu dev86"
+SPLIT="elksemu $PACKAGE"
 case $ARCH in
 	# elksemu isn't supported on x86-64, see:
 	# /usr/include/sys/vm86.h:24:3: error: #error This header is unsupported on x86-64.
@@ -23,7 +23,7 @@
 	sed -i 's|/usr/man|/usr/share/man|' man/Makefile
 	sed -i 's|REFIX)/man|REFIX)/share/man|' Makefile */Makefile
 	make -j1 PREFIX=/usr &&
-	make -j1 DIST=$DESTDIR install || return 1
+	make -j1 DIST=$install install || return 1
 
 	install -Dm755 $stuff/com2exe $install/usr/bin/com2exe
 }
diff -r ad29ddfee1c9 -r d5aab818505e devede/receipt
--- a/devede/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/devede/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,36 +4,32 @@
 VERSION="3.23.0"
 CATEGORY="multimedia"
 SHORT_DESC="A program to create VideoDVDs and CDs"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.rastersoft.com/programas/devede.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.rastersoft.com/programas/devede.html"
 WGET_URL="http://www.rastersoft.com/descargas/$TARBALL"
 
-DEPENDS="cdrkit dvdauthor mplayer mencoder python-pygtk ttf-dejavu vcdimager python-dbus"
 BUILD_DEPENDS="python-pygtk-dev vcdimager-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
-	./install.sh --DESTDIR=$DESTDIR \
+compile_rules() {
+	./install.sh \
+		--DESTDIR=$install \
 		--prefix=/usr \
 		--unistall=no \
 		--targeted=yes
 
-	mkdir -p $DESTDIR/usr/share/applications
-	cp -a $PACKAGE.desktop $DESTDIR/usr/share/applications/$PACKAGE.desktop
+	mkdir -p $install/usr/share/applications
+	cp -a $PACKAGE.desktop $install/usr/share/applications/$PACKAGE.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/devede $fs/usr/share
+	DEPENDS="cdrkit dvdauthor mplayer mencoder python-pygtk ttf-dejavu \
+	vcdimager python-dbus"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e devilspie/receipt
--- a/devilspie/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/devilspie/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.22"
 CATEGORY="x-window"
 SHORT_DESC="Windows matching utility"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.burtonini.com/blog/tag/devilspie.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e dex2jar/receipt
--- a/dex2jar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dex2jar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,19 @@
 PACKAGE="dex2jar"
 VERSION="0.0.9.15"
 CATEGORY="development"
-SHORT_DESC="Tools to work with android .dex and java .class files."
+SHORT_DESC="Tools to work with android .dex and java .class files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="https://sourceforge.net/projects/dex2jar/"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="https://sourceforge.net/projects/dex2jar/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="java-jre"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/dex2jar $fs/usr/bin
 	cp -a $src/*.sh $src/lib $fs/usr/share/dex2jar
-	for i in $(cd $src ; ls *.sh); do
+	for i in $(cd $src; ls *.sh); do
 		ln -s /usr/share/dex2jar/$i $fs/usr/bin/$i
 	done
+	DEPENDS="java-jre"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dfbterm/receipt
--- a/dfbterm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dfbterm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,28 @@
 PACKAGE="dfbterm"
 VERSION="0.8.15"
 CATEGORY="graphics"
-SHORT_DESC="DirectFB Terminal emulator."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="DirectFB Terminal emulator"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.directfb.org/" # FIXME. See also https://github.com/DirectFB
+
 SOURCE="DFBTerm"
-TARBALL="${SOURCE}-${VERSION}.tar.gz"
-WEB_SITE="http://www.directfb.org/index.php?path=Projects/DFBTerm"
+TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="http://www.directfb.org/downloads/Programs/$TARBALL"
 
-DEPENDS="directfb lite freetype"
 BUILD_DEPENDS="directfb-dev lite-dev freetype-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	 ./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="directfb lite freetype"
 }
 
-# Make sur it as cross compile properly
-testsuite()
-{
+testsuite() {
 	readelf -h $install/usr/bin/$PACKAGE
 }
diff -r ad29ddfee1c9 -r d5aab818505e dfc/receipt
--- a/dfc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dfc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dfc"
 VERSION="3.0.5"
 CATEGORY="utilities"
-SHORT_DESC="Displays file system space usage using graphs and colors."
+SHORT_DESC="Displays file system space usage using graphs and colors"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://projects.gw-computing.net/projects/dfc"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://projects.gw-computing.net/projects/dfc"
 WGET_URL="https://projects.gw-computing.net/attachments/download/467/$TARBALL"
 
-DEPENDS="ncurses"
-BUILD_DEPENDS="ncurses-dev cmake gettext"
+BUILD_DEPENDS="ncurses-dev cmake gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONF_INSTALL_DIR=/etc
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSCONF_INSTALL_DIR=/etc \
+		. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share $fs/etc
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/doc $fs/usr/share
-	cp -a $install/usr/share/locale $fs/usr/share
-	cp -a $install/usr/etc/* $fs/etc
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dfm/receipt
--- a/dfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,23 +7,19 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://sourceforge.net/projects/dfm/"
+
 TARBALL="Dino_src-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/dfm/$TARBALL"
 
-DEPENDS="bzlib libQtGui libQtNetwork"
 BUILD_DEPENDS="qmake Qt4-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	qmake Dino.pro &&
 	make &&
 	lrelease Dino.pro
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/bin \
 		$fs/usr/share/Dino/bin/translations \
@@ -33,4 +29,5 @@
 	install -m644 $src/dino.png $fs/usr/share/Dino
 	ln -sf /usr/share/Dino/bin/Dino $fs/usr/bin/dino
 	install -m644 $src/dino.desktop $fs/usr/share/applications
+	DEPENDS="bzlib libQtGui libQtNetwork"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dhcp/receipt
--- a/dhcp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dhcp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://ftp.isc.org/isc/dhcp/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="dhcp-client dhcp-relay dhcp-dev"
+SPLIT="$PACKAGE-client $PACKAGE-relay $PACKAGE-dev"
 SIBLINGS="dhcp6"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 		--disable-dhcpv6 \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc/init.d
 	cp $stuff/dhcpd $install/etc/init.d
diff -r ad29ddfee1c9 -r d5aab818505e dhcp6/receipt
--- a/dhcp6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dhcp6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://ftp.isc.org/isc/dhcp/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="dhcp6-client dhcp6-relay dhcp6-dev"
+SPLIT="$PACKAGE-client $PACKAGE-relay $PACKAGE-dev"
 SIBLINGS="dhcp"
 
 compile_rules() {
@@ -23,7 +23,7 @@
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc/init.d
 	cp $WOK/dhcp/stuff/dhcpd     $install/etc/init.d
diff -r ad29ddfee1c9 -r d5aab818505e dhid/receipt
--- a/dhid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dhid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="5.5"
 CATEGORY="network"
 SHORT_DESC="Open source Dynamic IP Updater"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://dhis.org"
+WEB_SITE="http://dhis.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.dhis.org/pub/dhis/$TARBALL"
@@ -14,11 +14,7 @@
 BUILD_DEPENDS="gmp-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_FLAGS=" LFLAGS=-L/cross/$ARCH/sysroot/usr/lib";;
-	esac
-
-	make CC=$HOST_SYSTEM-gcc $ARCH_FLAGS || return 1
+	make CC=$HOST_SYSTEM-gcc || return 1
 
 	install -Dm644 $src/dhid.conf.sample $install/etc/dhid.conf
 	install -Dm644 $src/README           $install/usr/share/doc/dhid/README
diff -r ad29ddfee1c9 -r d5aab818505e dia/receipt
--- a/dia/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dia/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="GTK+ based diagram creation program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://projects.gnome.org/dia/"
+WEB_SITE="https://wiki.gnome.org/Apps/Dia"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
@@ -28,7 +28,7 @@
 	fix libtool &&
 	sed -i 's# data doc tests installer# data tests installer#' Makefile &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dialog/receipt
--- a/dialog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dialog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.3-20180621"
 CATEGORY="base-system"
 SHORT_DESC="Script-interpreter which provides a set of curses widgets"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://invisible-island.net/dialog/" # "HTTP/1.1 403 Forbidden" for wget
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="ftp://ftp.invisible-island.net/dialog/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev gettext"
-SPLIT="dialog-dev"
+BUILD_DEPENDS="ncurses-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		--enable-widec \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Config file.
 	install -Dm644 $stuff/dialogrc $install/etc/dialogrc
diff -r ad29ddfee1c9 -r d5aab818505e dietlibc/receipt
--- a/dietlibc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dietlibc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,23 @@
 PACKAGE="dietlibc"
 VERSION="0.33"
 CATEGORY="development"
-SHORT_DESC="A libc optimized ofr small size."
+SHORT_DESC="A libc optimized for small size"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.fefe.de/dietlibc/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.fefe.de/dietlibc/"
 WGET_URL="http://www.kernel.org/pub/linux/libs/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|.*/nice.S.*|// &|' i386/dyn_syscalls.S
-	make prefix=/usr/lib/diet && 
-	#make dyn prefix=/usr/lib/diet && 
-	make prefix=/usr/lib/diet DESTDIR=$DESTDIR install 2> /dev/null
+
+	make prefix=/usr/lib/diet &&
+	#make dyn prefix=/usr/lib/diet &&
+	make prefix=/usr/lib/diet DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/include
 	cp -a $install/* $fs
 	cp -a $install/usr/lib/diet/man $install/usr
diff -r ad29ddfee1c9 -r d5aab818505e diffutils/receipt
--- a/diffutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/diffutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,9 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e diggerjs/receipt
--- a/diggerjs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/diggerjs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,19 @@
 PACKAGE="diggerjs"
 VERSION="0.9.6"
 CATEGORY="games"
-SHORT_DESC="Javascript BoulerDash/Digger clone."
+SHORT_DESC="Javascript BoulerDash/Digger clone"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="unknown"
+WEB_SITE="https://www.heise.de/download/product/digger.js-8148"
+
 SOURCE="digger.js"
 TARBALL="$SOURCE-$VERSION.zip"
-WEB_SITE="http://www.heise.de/software/download/digger.js/8148"
 WGET_URL="http://www.tikkel.de/download/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/diggerjs
 	cp -a $src/* $fs/usr/share/diggerjs
-	cp -a stuff/* $fs
+	cp -a $stuff/* $fs
 
 	# translate
 	sed -i 's/Daten werden geladen .*)/Loading graphics.../' \
@@ -25,7 +24,7 @@
 	# remove TODO stuff...
 	sed -i '/HighScorefunktion programmieren/d' \
 		$fs/usr/share/diggerjs/main.js
-	
+
 	# remove java stuff...
 	sed -i '/<applet/,/applet>/d' $fs/usr/share/diggerjs/*.html
 	rm -f $fs/usr/share/diggerjs/SndServer.class
diff -r ad29ddfee1c9 -r d5aab818505e dillo/receipt
--- a/dillo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dillo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.5"
 CATEGORY="network"
 SHORT_DESC="Light and fast web browse using FLTK"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.dillo.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e directfb-examples/receipt
--- a/directfb-examples/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/directfb-examples/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,44 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="directfb-examples"
 VERSION="1.2.0"
 CATEGORY="system-tools"
-SHORT_DESC="DirectFB examples."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="DirectFB examples"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-SOURCE="DirectFB-examples"
-TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.directfb.org/"
+
+TARBALL="DirectFB-examples-$VERSION.tar.gz"
 WGET_URL="http://www.directfb.org/downloads/Extras/$TARBALL"
 
-DEPENDS="directfb"
 BUILD_DEPENDS="directfb-dev"
 
-# Handle cross compilation.
-case "$ARCH" in
-	arm) 
-		export LDFLAGS="$LDFLAGS -L/cross/arm/sysroot/usr/lib"
-		export CPPFLAGS="$CPPFLAGS -I/cross/arm/sysroot/usr/include/directfb" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/directfb-* $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="directfb"
 }
 
-testsuite()
-{
+testsuite() {
 	readelf -h $install/usr/bin/spacedream
 }
diff -r ad29ddfee1c9 -r d5aab818505e directfb/receipt
--- a/directfb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/directfb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="e97c8d4" # no releases here; latest commit (2014-01-30) hash
 CATEGORY="system-tools"
 SHORT_DESC="Thin library that provides hardware graphics acceleration"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/DirectFB"
 
@@ -18,27 +18,16 @@
 BUILD_DEPENDS="libtool automake gfortran libpng16-dev libjpeg-turbo-dev \
 freetype-dev fluxcomp mesa-dev xorg-libxshmfence-dev expat-dev \
 xorg-libXcomposite-dev"
-
-
-SPLIT="directfb-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm)
-			ARCH_ARGS="--with-gfxdrivers=none --disable-x11"
-			export LDFLAGS="$LDFLAGS -L/cross/arm/sysroot/usr/lib"
-			export CPPFLAGS="$CPPFLAGS -I/cross/arm/sysroot/usr/include"
-			;;
-	esac
-
 	./autogen.sh \
 		--disable-osx \
 		--with-dither-rgb16=none \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -46,9 +35,6 @@
 		directfb)
 			copy @std
 			DEPENDS="freetype libjpeg-turbo libpng16 tslib"
-			case "$SLITAZ_ARCH" in
-				arm) DEPENDS="libpng12 libjpeg freetype zlib" ;;
-			esac
 			;;
 		*-dev)
 			copy @dev
diff -r ad29ddfee1c9 -r d5aab818505e dirmngr/receipt
--- a/dirmngr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dirmngr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dirmngr"
 VERSION="1.1.1"
@@ -7,27 +7,22 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/dirmngr/$TARBALL"
+# Integrity check: https://www.gnupg.org/download/integrity_check.html
+TARBALL_SHA1="e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690"
 
-DEPENDS="libassuan libgcrypt libksba libldap pth zlib"
 BUILD_DEPENDS="pth-dev libgpg-error-dev libgcrypt-dev libassuan-dev \
 libksba-dev openldap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Integrity check: https://www.gnupg.org/download/integrity_check.html
-	echo "e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690  $SRC/$TARBALL" | sha1sum -c || exit 1
-
-	./configure $CONFIGURE_ARGS && make && make install
-
-	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/doc $fs/usr/share/info $fs/usr/share/locale
+genpkg_rules() {
+	copy @std
+	DEPENDS="libassuan libgcrypt libksba libldap pth zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e discount/receipt
--- a/discount/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/discount/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,19 @@
 VERSION="2.1.8"
 CATEGORY="utilities"
 SHORT_DESC="C implementation of the markdown spec"
-MAINTAINER="necrophcodr@necrophcodr.me"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD3"
-WEB_SITE="http://www.pell.portland.or.us/~orc/Code/markdown"
+WEB_SITE="http://www.pell.portland.or.us/~orc/Code/markdown/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-SPLIT="discount-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure.sh --prefix=/usr &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e disktype/receipt
--- a/disktype/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/disktype/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,9 +3,8 @@
 PACKAGE="disktype"
 VERSION="9"
 CATEGORY="system-tools"
-SHORT_DESC="Detects the content format of a disk or disk image (file systems, \
-partition tables, and boot codes)"
-MAINTAINER="db_slitaz@m4x.org"
+SHORT_DESC="Detects the content format of a disk or disk image"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://disktype.sourceforge.net/"
 
@@ -14,7 +13,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm755 $src/disktype $install/usr/bin/disktype
+	install -Dm755 disktype $install/usr/bin/disktype
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e distcc/receipt
--- a/distcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/distcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.3"
 CATEGORY="development"
 SHORT_DESC="Distributed compilation for C/C++"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/distcc/distcc"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="popt-dev lzo-dev python-dev gtk2-dev libgnome-dev \
 libgnomeui-dev libbonoboui-dev libgnomecanvas-dev libgnome-keyring-dev"
-SPLIT="distcc distccmon-gui"
+SPLIT="distccmon-gui"
 
 compile_rules() {
 	export CFLAGS="-Wno-error=unused-but-set-variable -Wno-unused-local-typedefs"
@@ -22,7 +22,7 @@
 		--with-gtk \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -51,7 +51,7 @@
 				$fs/usr/bin/distccmon-gui
 			cp -a $install/usr/share/distcc/distccmon-gnome-icon.png \
 				$fs/usr/share/pixmaps/distccmon-gui.png
-			cp stuff/*.desktop $fs/usr/share/applications
+			cp $stuff/*.desktop $fs/usr/share/applications
 			;;
 	esac
 }
@@ -65,7 +65,7 @@
 	# Fix perms for files and directories
 	chroot "$1/" chown -R distcc.distcc /var/log/distccd
 
-	cat <<EOF
+	[ -n "$quiet" ] || cat <<EOF
 
 	.---------------------------------------------------------.
 	| Now you can:                                            |
diff -r ad29ddfee1c9 -r d5aab818505e djmount/receipt
--- a/djmount/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/djmount/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.71"
 CATEGORY="multimedia"
 SHORT_DESC="Mount uPnP mediaservers content as a Linux filesystem"
-MAINTAINER="slitaz@kacper.se"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://djmount.sourceforge.net"
+WEB_SITE="http://djmount.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e djview/receipt
--- a/djview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/djview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,24 +12,20 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/djvu/$TARBALL"
 
-DEPENDS="qt5-base djvulibre"
 BUILD_DEPENDS="qt5-dev djvulibre-dev gzip xorg-dev zlib-dev expat-dev mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure
 	sed -i 's/-O2/-Os/g' $src/src/Makefile
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	ln -s djview $fs/usr/bin/djview4
 	cd $fs/usr/share/icons/hicolor/32x32/
 	mv mime* apps
 	rm -rf ../64x64 ../scalable $fs/usr/lib/*/*/*.la
+	DEPENDS="qt5-base djvulibre"
 }
diff -r ad29ddfee1c9 -r d5aab818505e djvulibre/receipt
--- a/djvulibre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/djvulibre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,11 +12,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/djvu/$TARBALL"
 
-BUILD_DEPENDS_arm="tiff-dev jpeg-dev"
 BUILD_DEPENDS="tiff-dev libjpeg-turbo-dev xdg-utils bash rsvg-convert \
 libpng12-dev"
 BUILD_DEPENDS="rsvg-convert libjpeg-turbo-dev tiff-dev"
-SPLIT="djvulibre-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e dkms/receipt
--- a/dkms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dkms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,15 +6,15 @@
 SHORT_DESC="Dynamic Kernel Module Support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://linux.dell.com/dkms"
+WEB_SITE="http://linux.dell.com/dkms/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/permalink/$TARBALL"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
-	make DESTDIR=$DESTDIR install &&
+	make DESTDIR=$install install &&
 	chown -R root:root $install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e dmenu/receipt
--- a/dmenu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dmenu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dmenu"
 VERSION="4.5"
 CATEGORY="misc"
-SHORT_DESC="dynamic menu lauch bar"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Dynamic menu lauch bar"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://tools.suckless.org/dmenu/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tools.suckless.org/dmenu/"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
-TAGS="launchbar"
 
-DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXinerama"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXinerama-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-    make CC=${HOST_SYSTEM}-gcc &&
-    make DESTDIR=$DESTDIR install
+compile_rules() {
+	make CC=${HOST_SYSTEM}-gcc &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp -a $install/usr/local/bin/* $fs/usr/bin/
+genpkg_rules() {
+	mkdir -p $fs/usr/bin
+	cp -a $install/usr/local/bin/* $fs/usr/bin/
+	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXinerama"
+	TAGS="launchbar"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dmidecode/receipt
--- a/dmidecode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dmidecode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.2"
 CATEGORY="system-tools"
 SHORT_DESC="Desktop Management Interface table related utilities"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.nongnu.org/dmidecode/"
 
diff -r ad29ddfee1c9 -r d5aab818505e dnsmasq/receipt
--- a/dnsmasq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dnsmasq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dnsmasq"
 VERSION="2.68"
 CATEGORY="network"
-SHORT_DESC="Lightweight, DNS forwarder and DHCP server."
+SHORT_DESC="Lightweight, DNS forwarder and DHCP server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 WGET_URL="http://www.thekelleys.org.uk/$PACKAGE/$TARBALL"
-CONFIG_FILE="/etc/dnsmasq.conf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i -e 's/nawk/awk/' -e 's|/usr/local|/usr|' Makefile
-	make PREFIX=/usr && make DESTDIR=$DESTDIR install &&
-	mkdir -p $DESTDIR/etc &&
-	cp -a $src/dnsmasq.conf.example $DESTDIR/etc/dnsmasq.conf
+
+	make PREFIX=/usr &&
+	make DESTDIR=$install install || return 1
+
+	install -Dm644 $src/dnsmasq.conf.example $install/etc/dnsmasq.conf
+	cp -a $stuff/* $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/etc $fs
-	cp -a $stuff/* $fs
+genpkg_rules() {
+	copy @std
+	CONFIG_FILES="/etc/dnsmasq.conf"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dnstop/receipt
--- a/dnstop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dnstop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Displays various tables of DNS traffic on your network"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://dns.measurement-factory.com/tools/dnstop"
+WEB_SITE="http://dns.measurement-factory.com/tools/dnstop/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/src/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e dnstracer/receipt
--- a/dnstracer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dnstracer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,25 @@
 PACKAGE="dnstracer"
 VERSION="1.9"
 CATEGORY="network"
-SHORT_DESC="Traces a chain of DNS servers to the source."
+SHORT_DESC="Traces a chain of DNS servers to the source"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.mavetju.org/unix/dnstracer.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.mavetju.org/unix/dnstracer.php"
 WGET_URL="http://www.mavetju.org/download/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="autoconf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	autoconf
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dokuwiki/receipt
--- a/dokuwiki/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dokuwiki/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dokuwiki"
 VERSION="2012-01-25"
 CATEGORY="development"
-SHORT_DESC="DokuWiki is a simple to use Wiki aimed at the documentation needs of a smail company."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Simple to use Wiki"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.splitbrain.org/projects/dokuwiki"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://www.splitbrain.org/projects/dokuwiki"
 WGET_URL="http://www.splitbrain.org/_media/projects/dokuwiki/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www
 	cp -a $src $fs/var/www/dokuwiki
 	chown www.www -R $fs/var/www
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dolibarr/receipt
--- a/dolibarr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dolibarr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,16 @@
 VERSION="3.1.0"
 CATEGORY="office"
 SHORT_DESC="ERP/CRM"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.dolibarr.fr/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="apache php-apache php-gd php-mysqli"
-BUILD_DEPENDS=""
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
-	# Fix attributs and perms
+compile_rules() {
+	# Fix attributes and perms
 	chown -R root.root *
 	chmod -x C* I* R* 
 	find . \( -name "*.php" \
@@ -30,47 +25,42 @@
 		-o -name "*.html" \) -exec chmod -x {} \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	
+genpkg_rules() {
 	mkdir -p $fs/etc/dolibarr \
 		$fs/usr/share/dolibarr \
 		$fs/var/lib/dolibarr/documents \
 		$fs/usr/share/doc/$PACKAGE/schemas \
-		$fs/usr/share/applications 
-		
-	
+		$fs/usr/share/applications
+
 	cp -a $src/htdocs $fs/usr/share/dolibarr
 	cp -a $src/scripts $fs/usr/share/dolibarr
-	
+
 	# Remove install directory
 	#rm -rf $fs/usr/share/dolibarr/htdocs/install
-	
+
 	# Populate documents directory
-	for dir in facture users propale mycompany ficheinter produit rapport
-	do
+	for dir in facture users propale mycompany ficheinter produit rapport; do
 		mkdir $fs/var/lib/dolibarr/documents/$dir
 	done
-	
+
 	# Fix perms
 	chown -R root.www $fs/var/lib/dolibarr/documents
 	chmod -R 770 $fs/var/lib/dolibarr/documents
-	
+
 	cp $stuff/conf.php $fs/etc/dolibarr
 	cp $stuff/$PACKAGE-$VERSION-mysql.sql $fs/usr/share/doc/$PACKAGE/schemas
 	cp -a $stuff/pixmaps $fs/usr/share/
-	
+
 	ln -s /etc/dolibarr/conf.php $fs/usr/share/dolibarr/htdocs/conf
-
+	DEPENDS="apache php-apache php-gd php-mysqli"
 }
 
 post_install(){
-	
+
 	db_name=dolibarr
 	db_user=dolibarr
 	db_password=dolibarr
-	
+
 	# Configure apache server
 	if [ -f "$1/etc/apache/httpd.conf" ]; then
 		if [ ! -f "$1/etc/apache/conf.d/dolibarr.conf" ]; then
@@ -88,32 +78,35 @@
 EOT
 			if [ -z "$1" ]; then
 				# Start Web server.
-				test -f /var/run/apache/httpd.pid && \
+				test -f /var/run/apache/httpd.pid &&
 					( kill -0 $(cat /var/run/apache/httpd.pid) && /etc/init.d/apache restart )
 			fi
 		fi
 	fi
-	
+
 	# Configure every thing.
 	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
+			( /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" ; status
+			action "Create $db_name database"
+			mysql -Be "create database $db_name"
+			status
+
 			# We suppose that databse user does not exist.
 			# It may be false.
-			echo  -n "Create user $db_user with password $db_password"
-			mysql -Be "grant all privileges on ${db_name}.* to '$db_user'@'localhost' 
-				identified by '$db_password'" ; status
+			action "Create user $db_user with password $db_password"
+			mysql -Be "grant all privileges on ${db_name}.* to '$db_user'@'localhost'
+				identified by '$db_password'"
+			status
+
 			# At last populate the database.
-			echo -n "Create $db_name database schema."
-			mysql -u $db_user -p${db_password} -D $db_name < /usr/share/doc/dolibarr/schemas/$PACKAGE-$VERSION-mysql.sql ; status
-			
+			action "Create $db_name database schema."
+			mysql -u $db_user -p${db_password} -D $db_name < /usr/share/doc/dolibarr/schemas/$PACKAGE-$VERSION-mysql.sql
+			status
 		fi
-			
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e dooble/receipt
--- a/dooble/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dooble/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,23 @@
 PACKAGE="dooble"
 VERSION="1.56d"
 CATEGORY="network"
-SHORT_DESC="Private mode only (almost) worst Qt webkit browser. With builtin fm & xterm."
+SHORT_DESC="Private mode only (almost) worst Qt webkit browser. With builtin fm & xterm"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="BSD"
-WEB_SITE="http://dooble.sourceforge.net"
+WEB_SITE="https://dooble.sourceforge.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/files/Dooble-${VERSION}-src.tar.gz"
+WGET_URL="$SF_MIRROR/$PACKAGE/Dooble-$VERSION-src.tar.gz"
 
-DEPENDS="qt5 libgcrypt sqlite3 cacerts "
 BUILD_DEPENDS="wget cacerts qt5-dev libgcrypt-dev sqlite3-dev qtwebkit"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	srcdir="$src/Version 1.x" ; cd $srcdir
+compile_rules() {
+	srcdir="$src/Version 1.x"; cd $srcdir
 #	find . -regex '.*\(win32\|osx64\|icns\).*' -exec ls -l {} \; -delete
 	sed -i 's|local/dooble/do|bin/do|g' dooble.desktop
-	qmake PREFIX="/usr/" ${PACKAGE}.qt5.pro
-	make && make INSTALL_ROOT=$install install
+	qmake PREFIX="/usr/" $PACKAGE.qt5.pro
+	make &&
+	make INSTALL_ROOT=$install install || return 1
 #	rm -rf $install/usr/local/$PACKAGE/D${PACKAGE:1}
 	mkdir -p $install/usr/share $install/usr/bin $install/usr/lib
 	install $src/libSpotOn/libspoton.so $install/usr/lib
@@ -31,21 +30,21 @@
 #	cd $install/usr/share/$PACKAGE && rm -rf Tab Images
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE
 	cp -a $src/D${PACKAGE:1} $fs/usr/bin
 	cp -a $src/libSpotOn/libspoton.so $fs/usr/lib
 #	cp -a $install/* $fs
-#	cd $fs/usr/share/$PACKAGE ; ln -s ../../bin/D${PACKAGE:1} D${PACKAGE:1}
-#	cd $fs/usr/share/$PACKAGE/Icons ; rm -rf 64x64 nuovext nuvola black-and-white && ln -s faience nuovext
-#	cd $fs/usr/share/$PACKAGE/Translations ; find . -size -44k -delete
+#	cd $fs/usr/share/$PACKAGE; ln -s ../../bin/D${PACKAGE:1} D${PACKAGE:1}
+#	cd $fs/usr/share/$PACKAGE/Icons; rm -rf 64x64 nuovext nuvola black-and-white && ln -s faience nuovext
+#	cd $fs/usr/share/$PACKAGE/Translations; find . -size -44k -delete
 #	mv $fs/usr/share/$PACKAGE/$PACKAGE.sh $fs/usr/bin/ && cd $fs/usr/bin
 #	sed -i 's|local/dooble/Dooble|bin/Dooble|g' $PACKAGE.sh
 #	sed -i 's|cd /usr/local/dooble|cd /usr/share/dooble|g' $PACKAGE.sh
 #	sed -i 's/fusion/ /g' $PACKAGE.sh
-	cd $fs/usr/share/$PACKAGE ; cat>'Dooble.ini' << EOT
+
+	cd $fs/usr/share/$PACKAGE
+	cat>'Dooble.ini' <<EOT
 [General]
 iconSet=/usr/share/dooble/Icons/faience/configuration.cfg
 desktopBackground=/usr/share/images/slitaz-background.jpg
@@ -60,10 +59,10 @@
 searchName=DuckDuckGo
 EOT
 	chown -R root:root $fs
+	DEPENDS="qt5 libgcrypt sqlite3 cacerts"
 }
 
-post_install()
-{
+post_install() {
 	for i in $(ls "$1/home" 2> /dev/null); do
 		[ -f "$1/home/$i/.dooble/Dooble/Dooble.ini" ] && continue
 		mkdir -p "$1/home/$i/.dooble/Dooble"
@@ -73,9 +72,6 @@
 	done
 }
 
-post_remove()
-{
-	echo -n "Removing configuration files..."
+post_remove() {
 	rm -rf /home/*/.dooble
-	status
 }
diff -r ad29ddfee1c9 -r d5aab818505e dos2unix/receipt
--- a/dos2unix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dos2unix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://waterlan.home.xs4all.nl/dos2unix/$TARBALL"
 
-BUILD_DEPENDS=""
-
 compile_rules() {
 	sed -e '/^LDFLAGS/s|=|+=|' \
 		-e '/CFLAGS_OS \+=/d' \
diff -r ad29ddfee1c9 -r d5aab818505e dosbox/receipt
--- a/dosbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dosbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.74-2"
 CATEGORY="system-tools"
 SHORT_DESC="A DOS emulator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.dosbox.com/"
 
diff -r ad29ddfee1c9 -r d5aab818505e dosfstools/receipt
--- a/dosfstools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dosfstools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Tools to create and check DOS filesystems"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/dosfstools/dosfstools/"
 
@@ -13,15 +13,13 @@
 
 BUILD_DEPENDS="eudev-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="eudev"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dotconf/receipt
--- a/dotconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dotconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="dotconf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i &&
diff -r ad29ddfee1c9 -r d5aab818505e dovecot/receipt
--- a/dovecot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dovecot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.1.6"
 CATEGORY="network"
 SHORT_DESC="Dovecot IMAP and POP3 Server"
-MAINTAINER="l.lemarinel@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://dovecot.org"
+WEB_SITE="https://dovecot.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.dovecot.org/releases/${VERSION:0:3}/$TARBALL"
@@ -27,7 +27,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/init.d/dovecot $install/etc/init.d/dovecot
 }
diff -r ad29ddfee1c9 -r d5aab818505e dpkg/receipt
--- a/dpkg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dpkg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.16.12"
 CATEGORY="misc"
 SHORT_DESC="Debian package management system"
-MAINTAINER="shann@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://wiki.debian.org/dpkg"
@@ -16,13 +16,11 @@
 /etc/alternatives/README
 /etc/dpkg/dpkg.cfg"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/alternatives $fs/etc/dpkg $fs/etc/cron.daily $fs/etc/logrotate.d
 	mkdir -p $fs/usr/share $fs/usr/sbin $fs/usr/sbin $fs/sbin
 	cp -a $src/etc/* $fs/etc
 	cp -a $src/sbin/* $fs/sbin
 	cp -a $src/usr/* $fs/usr
-        chown -R root.root $fs
+	chown -R root.root $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e drakon-editor/receipt
--- a/drakon-editor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/drakon-editor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,15 +6,12 @@
 SHORT_DESC="A visual language for specifications from the Russian space program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://drakon-editor.sourceforge.net/"
+
 TARBALL="drakon_editor$VERSION.zip"
-WEB_SITE="http://drakon-editor.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="tk tcllib libsqlite3-tcl libtkimg"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $src $fs/usr/share/$PACKAGE
 	cat > $fs/usr/share/applications/$PACKAGE.desktop <<EOT
@@ -22,7 +19,8 @@
 Type=Application
 Name=Drakon diagram editor
 Name[fr]=Editeur de diagrammes Drakon
-Exec=/usr/share/$PACKAGE/drakon_editor.tcl %f
+Exec=/usr/share/drakon-editor/drakon_editor.tcl %f
 Categories=Development;Building;
 EOT
+	DEPENDS="tk tcllib libsqlite3-tcl libtkimg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e drbd-utils/receipt
--- a/drbd-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/drbd-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="drbd-utils"
 VERSION="8.9.1"
 CATEGORY="system-tools"
-SHORT_DESC="DRBD is a block device to build high availability clusters"
+SHORT_DESC="Block device to build high availability clusters"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://drbd.linbit.com/"
+WEB_SITE="https://www.linbit.com/en/drbd-community/drbd-download/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://oss.linbit.com/drbd/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e drbl/receipt
--- a/drbl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/drbl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="drbl"
 VERSION="2.3.10"
 CATEGORY="misc"
 SHORT_DESC="Diskless Remote Boot in Linux"
-MAINTAINER="shann@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://drbl.org/"
+WEB_SITE="https://drbl.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://free.nchc.org.tw/$PACKAGE-core/src/stable/$TARBALL"
 
-DEPENDS="bash bc binutils dialog disktype dmidecode e2fsprogs ethtool expect \
-file gnu-netcat lzop memtest mtools openssh parted partimage perl pigz procps \
-reiserfsprogs rsync strace tcpdump syslinux systemd udpcast"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
+	DEPENDS="bash bc binutils dialog disktype dmidecode e2fsprogs ethtool \
+	expect file gnu-netcat lzop memtest mtools openssh parted partimage perl \
+	pigz procps reiserfsprogs rsync strace tcpdump syslinux systemd udpcast"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dropbear/receipt
--- a/dropbear/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dropbear/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,20 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://matt.ucc.asn.au/dropbear/releases/$TARBALL"
 
-case "$ARCH" in
-	i486)   BUILD_DEPENDS="zlib-dev pam pam-dev"; SPLIT="dropbear-pam";;
-	x86_64) BUILD_DEPENDS="zlib-dev";;
-	arm*)   BUILD_DEPENDS="";;
-esac
+BUILD_DEPENDS="zlib-dev pam-dev"
+SPLIT="$PACKAGE-pam"
 
 compile_rules() {
-	# Handle multiarch compilation.
-	case "$ARCH" in
-		arm)
-			CROSS_ARGS="--disable-zlib"
-			CROSS_BUGS="Fails to find zlib: -lz... no" ;;
-	esac
-
 	local i DROPBEARS="dropbearkey dropbearconvert dbclient scp"
 	sed -iold -e 's|/usr/.*/xauth|/usr/bin/xauth|' \
 		-e 's|ENABLE_SVR_PAM_AUTH|ENABLE_SVR_PASSWORD_AUTH|' \
@@ -33,27 +23,20 @@
 	./configure \
 		--prefix=/usr \
 		--without-pam \
-		$CONFIGURE_ARGS $CROSS_ARGS &&
+		$CONFIGURE_ARGS &&
 	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
-	install -dm755 $install/usr/sbin &&
-	install -m755 dropbearmulti $install/usr/sbin/dropbear || exit 1
+	install -Dm755 dropbearmulti $install/usr/sbin/dropbear || return 1
 
-	# No PAM support in ARM
-	case "$ARCH" in
-		arm) echo "Skipping Dropbear PAM..." ;;
-		i?86)
-			sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' options.h
-			./configure \
-				--enable-pam \
-				$CONFIGURE_ARGS &&
-			make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
-			install -m755 dropbearmulti $install/usr/sbin/dropbear-pam || return 1
-			;;
-	esac
+	sed -i 's|ENABLE_SVR_PASSWORD_AUTH|ENABLE_SVR_PAM_AUTH|' options.h
+	./configure \
+		--enable-pam \
+		$CONFIGURE_ARGS &&
+	make PROGRAMS="dropbear $DROPBEARS" MULTI=1 SCPPROGRESS=1 &&
+	install -Dm755 dropbearmulti $install/usr/sbin/dropbear-pam || return 1
 
 	install -dm755 $install/usr/bin &&
 	for i in $DROPBEARS ssh; do
-		ln -s ../sbin/dropbear $install/usr/bin/$i || exit 1
+		ln -s ../sbin/dropbear $install/usr/bin/$i || return 1
 	done
 
 	cook_pick_manpages $src/*.1 $src/*.8
@@ -77,7 +60,6 @@
 	chown -R root:root $install
 
 	ln -s daemon $install/etc/init.d/sshd
-
 }
 
 genpkg_rules() {
@@ -116,14 +98,13 @@
 	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
 #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
 EOT
-	[ -n "$quiet" ] && return
-	cat <<EOT
+	[ -n "$quiet" ] || cat <<EOT
 
 	.-------------------------------------------------.
 	| To start dropbear server you can run:           |
+	|    /etc/init.d/dropbear start                   |
 	|                                                 |
-	| /etc/init.d/dropbear start                      |
-	| Or add dropbear to RUN_DAEMONS in /etc/rcS.conf |
+	| or add dropbear to RUN_DAEMONS in /etc/rcS.conf |
 	'-------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e drupal/receipt
--- a/drupal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/drupal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,18 @@
 PACKAGE="drupal"
 VERSION="7.26"
 CATEGORY="misc"
-SHORT_DESC="Drupal $VERSION PHP content management system."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Drupal PHP content management system"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="apache lighttpd cherokee"
+WEB_SITE="https://www.drupal.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://drupal.org/"
 WGET_URL="http://ftp.drupal.org/files/projects/$TARBALL"
 
-DEPENDS="php mysql"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www/drupal
 	cp -a $src/* $fs/var/www/drupal
 	chown -R 80.80 $fs/var/www/drupal
+	DEPENDS="php mysql"
+	SUGGESTED="apache lighttpd cherokee"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dssi/receipt
--- a/dssi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dssi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev ladspa-dev"
-SPLIT="dssi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dstat/receipt
--- a/dstat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dstat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,22 @@
 PACKAGE="dstat"
 VERSION="0.7.3"
 CATEGORY="system-tools"
-SHORT_DESC="Versatile tool for generating system resource statistics."
+SHORT_DESC="Versatile tool for generating system resource statistics"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://dag.wiee.rs/home-made/dstat/"
+
 TARBALL="$VERSION.tar.gz"
-WEB_SITE="http://dag.wieers.com/home-made/dstat/"
 WGET_URL="https://github.com/dagwieers/dstat/archive/$TARBALL"
-TAGS="resource system monitor stats statistics"
 
-DEPENDS="python"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/dstat $fs/usr/share
+	DEPENDS="python"
+	TAGS="resource system monitor stats statistics"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dtach/receipt
--- a/dtach/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dtach/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8"
 CATEGORY="system-tools"
 SHORT_DESC="Emulates the detach feature of screen"
-MAINTAINER="christophe.paris@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dtach.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e duat/receipt
--- a/duat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/duat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="duat"
 VERSION="20150601"
 CATEGORY="network"
-SHORT_DESC="Versatile Tunneling/Proxy system."
+SHORT_DESC="Versatile Tunneling/Proxy system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE"
 WEB_SITE="https://code.google.com/archive/p/duat/"
+
+TARBALL="$PACKAGE" # FIXME versioning
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/duat/$TARBALL"
 
-DEPENDS="perl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE $fs/usr/bin
 	chmod +x $fs/usr/bin/$PACKAGE
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e duktape/receipt
--- a/duktape/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/duktape/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://duktape.org/$TARBALL"
 TARBALL_MD5="352105b39979fc766bbd0b3721e8c2b5"
 
-SPLIT="duktape-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mv Makefile.sharedlibrary Makefile
diff -r ad29ddfee1c9 -r d5aab818505e dukto/receipt
--- a/dukto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dukto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,25 @@
 PACKAGE="dukto"
 VERSION="108"
 CATEGORY="network"
-SHORT_DESC="A simple, fast and multi-platform file transfer tool for LAN users."
+SHORT_DESC="A simple, fast and multi-platform file transfer tool for LAN users"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://code.google.com/p/$PACKAGE/"
+WEB_SITE="https://code.google.com/archive/p/dukto"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="subversion|http://$PACKAGE.googlecode.com/svn/trunk/"
+WGET_URL="subversion|http://dukto.googlecode.com/svn/trunk/"
 
 BUILD_DEPENDS="subversion Qt4-dev qmake libQtDeclarative"
-DEPENDS="gcc-lib-base libQtDeclarative"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	qmake PREFIX="/usr/" &&
 	make $MAKEFLAGS &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $install/* $fs/
 	ln -s /opt/dukto/bin/dukto $fs/usr/bin
+	DEPENDS="gcc-lib-base libQtDeclarative"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dummynet/receipt
--- a/dummynet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dummynet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="dummynet"
 VERSION="20120812"
 CATEGORY="network"
-SHORT_DESC="Network testing/emulation tool."
-MAINTAINER="samuel_trassare@yahoo.com"
+SHORT_DESC="Network testing/emulation tool"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://info.iet.unipi.it/~luigi/dummynet/"
 TARBALL="$VERSION-ipfw3.tgz"
@@ -12,26 +12,21 @@
 
 BUILD_DEPENDS="linux-module-headers"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	installed=/var/lib/tazpkg/installed
-	kvers=$(. $installed/linux-module-headers/receipt ; echo $VERSION)
+	kvers=$(. $installed/linux-module-headers/receipt; echo $VERSION)
 	sed -i "s/WARN := -O1 -Wall -Werror/WARN := -O1 -Wall/" kipfw/Makefile
 	sed -i "s/uname -r/echo $kvers-slitaz/" Makefile.inc
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin \
 		$fs/lib/modules/$kvers-slitaz/kernel/net
 	cp -a $src/ipfw/ipfw $fs/usr/bin
 	cp -a $src/kipfw-mod/ipfw_mod.ko $fs/lib/modules/$kvers-slitaz/kernel/net
 }
 
-post_install()
-{
-	[ "$1" ] || depmod -a
+post_install() {
+	[ -n "$1" ] || depmod -a
 }
diff -r ad29ddfee1c9 -r d5aab818505e duplicity/receipt
--- a/duplicity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/duplicity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="duplicity"
 VERSION="0.6.20"
 CATEGORY="network"
-SHORT_DESC="Encrypted bandwidth-efficient backup using the rsync algorithm."
+SHORT_DESC="Encrypted bandwidth-efficient backup using the rsync algorithm"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://duplicity.nongnu.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://code.launchpad.net/$PACKAGE/${VERSION%.*}-series/$VERSION/+download/$TARBALL"
 
-DEPENDS="python librsync-dev gnupg python-paramiko cryptopp lftp"
-BUILD_DEPENDS="python-dev $DEPENDS"
+BUILD_DEPENDS="python-dev librsync-dev gnupg python-paramiko cryptopp lftp"
 # NcFTP boto librsync-dev
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./setup.py install --root=$DESTDIR install
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python librsync-dev gnupg python-paramiko cryptopp lftp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e duviz/receipt
--- a/duviz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/duviz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="duviz"
 VERSION="09032015"
 CATEGORY="utilities"
-SHORT_DESC="Disk space usage visualization utility."
+SHORT_DESC="Disk space usage visualization utility"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://soxofaan.github.io/duviz/"
+WEB_SITE="https://github.com/soxofaan/duviz"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/soxofaan/duviz"
 
-DEPENDS="python"
 BUILD_DEPENDS="git bzip2"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/duviz.py $fs/usr/bin/duviz
+	DEPENDS="python"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e dvd+rw-tools/receipt
--- a/dvd+rw-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dvd+rw-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="7.1"
 CATEGORY="multimedia"
 SHORT_DESC="DVD RW tools"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://fy.chalmers.se/~appro/linux/DVD+RW"
+WEB_SITE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/tools/$TARBALL"
@@ -18,9 +18,9 @@
 	grep -qs 'define u8' growisofs.c ||
 	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' growisofs.c
 	make
-	mkdir -p $DESTDIR/usr/bin/
+	mkdir -p $install/usr/bin/
 	for bin in growisofs dvd+rw-booktype dvd+rw-format dvd+rw-mediainfo dvd-ram-control; do
-		install -m755 $bin $DESTDIR/usr/bin/
+		install -m755 $bin $install/usr/bin/
 	done
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e dvdauthor/receipt
--- a/dvdauthor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dvdauthor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.2"
 CATEGORY="multimedia"
 SHORT_DESC="A simple set of tools to help you author a DVD"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dvdauthor.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e dvgrab/receipt
--- a/dvgrab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dvgrab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="dvgrab"
 VERSION="3.5"
 CATEGORY="multimedia"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="Saves audio and video data from an IEEE (FireWire) digital source"
-WEB_SITE="http://www.kinodv.org"
+WEB_SITE="http://www.kinodv.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/kino/$TARBALL"
@@ -19,7 +19,7 @@
 	./configure \
 		--prefix=/usr &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e dvtm/receipt
--- a/dvtm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dvtm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dvtm"
 VERSION="0.9"
@@ -6,22 +6,21 @@
 SHORT_DESC="A tiling window management for the console"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.brain-dump.org/projects/dvtm"
+WEB_SITE="http://www.brain-dump.org/projects/dvtm/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev ncurses-extra"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' config.mk
-	make && make install
+
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr/bin $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e dwm/receipt
--- a/dwm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dwm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.0"
 CATEGORY="x-window"
 SHORT_DESC="Very light dynamic window manager for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://dwm.suckless.org/"
 
@@ -41,7 +41,7 @@
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	if ! echo "$res" | grep -q $PACKAGE; then
 		action "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},dwm/" /etc/slim.conf
+		sed -i "s/^sessions.*/sessions            $res,dwm/" /etc/slim.conf
 		status
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e dzen2/receipt
--- a/dzen2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/dzen2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,27 @@
 VERSION="0.8.5"
 CATEGORY="utilities"
 SHORT_DESC="A general purpose messaging and notification program"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://gotmor.googlepages.com/dzen"
+WEB_SITE="https://github.com/robm/dzen"
 REPOLOGY="dzen"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://gotmor.googlepages.com/$TARBALL"
-TAGS="system monitor notification"
 
-DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -e 's/\/usr\/local/\/usr/' < config.mk > config.mk.slitaz
 	mv config.mk.slitaz config.mk
-	make && make DESTDIR=$DESTDIR install
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp"
+	TAGS="system monitor notification"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e e2fsprogs/receipt
--- a/e2fsprogs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/e2fsprogs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.44.4"
 CATEGORY="base-system"
 SHORT_DESC="Filesystem utilities for use with ext2 and ext3"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://e2fsprogs.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/e2fsprogs.html"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="util-linux-uuid-dev util-linux-blkid-dev gettext attr-dev \
+BUILD_DEPENDS="util-linux-uuid-dev util-linux-blkid-dev gettext-dev attr-dev \
 acl-dev texinfo"
-SPLIT="libcomerr-dev e2fsprogs-dev e2fsprogs-fsck libcomerr e2fsprogs"
+SPLIT="libcomerr-dev $PACKAGE-dev $PACKAGE-fsck libcomerr $PACKAGE"
 
 compile_rules() {
 #	mkdir -p $install/usr/share/man/man8/
diff -r ad29ddfee1c9 -r d5aab818505e e2tools/receipt
--- a/e2tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/e2tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,27 @@
 PACKAGE="e2tools"
 VERSION="0.0.16"
 CATEGORY="base-system"
-SHORT_DESC="Read, write, and manipulate files in an ext2/ext3 filesystem."
+SHORT_DESC="Read, write, and manipulate files in an ext2/ext3 filesystem"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/ndim/e2tools"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/ndim/$PACKAGE"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-DEPENDS="e2fsprogs"
-BUILD_DEPENDS="e2fsprogs-dev wget"
+BUILD_DEPENDS="e2fsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
+
 	./configure \
 		--prefix=/usr \
-		$CONFIGURE_ARGS
-	make && make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="e2fsprogs"
 }
diff -r ad29ddfee1c9 -r d5aab818505e e3/receipt
--- a/e3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/e3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="e3"
 VERSION="2.8"
 CATEGORY="utilities"
-SHORT_DESC="e3 is a full featured text editor written in NASM assembler."
+SHORT_DESC="Full featured text editor written in NASM assembler"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="https://sites.google.com/site/e3editor/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://sites.google.com/site/e3editor"
 WGET_URL="https://sites.google.com/site/e3editor/Home/$TARBALL?attredirects=0"
-TAGS="text-editor"
 
-DEPENDS=""
-BUILD_DEPENDS="make nasm wget"
+BUILD_DEPENDS="make nasm"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-    sed -i -e 's/-D$(EXMODE)//' Makefile &&
-    sed -i -e 's#/man/man#/share/man/man#' Makefile
-    make && make PREFIX=$DESTDIR install
+compile_rules() {
+	sed \
+		-e 's/-D$(EXMODE)//' \
+		-e 's#/man/man#/share/man/man#' \
+		-i Makefile
+
+	make &&
+	make PREFIX=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -R $install/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e eaccelerator/receipt
--- a/eaccelerator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eaccelerator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="eaccelerator"
 VERSION="0.9.6.1"
 CATEGORY="system-tools"
-SHORT_DESC="PHP accelerator, optimizer, and dynamic content cache."
+SHORT_DESC="PHP accelerator, optimizer, and dynamic content cache"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://eaccelerator.net/"
@@ -11,15 +11,10 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://bart.eaccelerator.net/source/$VERSION/$TARBALL"
-TAGS="php"
 
-DEPENDS="php m4"
 BUILD_DEPENDS="php-dev sed coreutils-conditions"	# gawk re2c
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export PHP_PREFIX="/usr"
 	$PHP_PREFIX/bin/phpize
 	./configure --enable-eaccelerator=shared \
@@ -27,20 +22,18 @@
 		--prefix=/usr --infodir=/usr/share/info \
 		--mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/tmp/eaccelerator $fs/usr/share/php
 	cp $(find $install | grep eaccelerator.so) $fs/usr/share/php/
 	chmod 0777 $fs/tmp/eaccelerator
+	DEPENDS="php m4"
+	TAGS="php"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	grep -q ^extension=msql.so "$1/etc/php.ini" || \
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=eaccelerator.so\neaccelerator.shm_size="48"\neaccelerator.cache_dir="/tmp/eaccelerator"\neaccelerator.enable="1"\neaccelerator.optimizer="1"\neaccelerator.check_mtime="1"\neaccelerator.debug="0"\neaccelerator.filter=""\neaccelerator.shm_max="0"\neaccelerator.shm_ttl="0"\neaccelerator.shm_prune_period="0"\neaccelerator.shm_only="0"\neaccelerator.compress="1"\neaccelerator.compress_level="9"|' -i "$1/etc/php.ini"
 
@@ -55,9 +48,7 @@
 EOT
 }
 
-# Pre and post remove commands for Tazpkg.
-pre_remove()
-{
+pre_remove() {
 	sed -i '/.*eaccelerator.*/d' /etc/php.ini
 
 	# Start Web server.
diff -r ad29ddfee1c9 -r d5aab818505e eboard/receipt
--- a/eboard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eboard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,7 @@
 		--extra-libs=dl \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ebtables/receipt
--- a/ebtables/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ebtables/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,17 +6,17 @@
 SHORT_DESC="Filtering tool for a Linux-based bridging firewall"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://ebtables.sourceforge.net/"
+WEB_SITE="http://ebtables.netfilter.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
 	sed -i 's/), ret = 0/), ret = ret - ret/' communication.c
-	mkdir -p $DESTDIR/etc/rc.d/init.d/ $DESTDIR/etc/sysconfig/
+	mkdir -p $install/etc/rc.d/init.d/ $install/etc/sysconfig/
 
 	make &&
-	make DESTDIR=$DESTDIR -j1 install
+	make DESTDIR=$install -j1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e echinus/receipt
--- a/echinus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/echinus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="echinus"
 VERSION="0.4.0"
 CATEGORY="x-window"
 SHORT_DESC="A window manager for X in the spirit of dwm"
-MAINTAINER="devl547@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://plhk.ru/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.rootshell.be/~polachok/code/"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="window-manager"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev xorg-libXrandr-dev"
-DEPENDS="xorg-libX11 xorg-libXft"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cp $stuff/config.mk config.mk
+compile_rules() {
+	cp $stuff/config.mk .
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/examples $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11 xorg-libXft"
+	TAGS="window-manager"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ecj/receipt
--- a/ecj/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ecj/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ecj"
 VERSION="3.6"
 CATEGORY="development"
-SHORT_DESC="The Eclipse standalone batch Java compiler and Ant compiler adapter."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="The Eclipse standalone batch Java compiler and Ant compiler adapter"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://www.eclipse.org/jdt/core/"
+
 TARBALL="$PACKAGE-$VERSION.jar"
-WEB_SITE="http://www.eclipse.org/jdt/core/"
 # 3.4.2: WGET_URL="http://download.eclipse.org/eclipse/downloads/drops/R-$VERSION-200902111700/$TARBALL"
 # 3.5.2: WGET_URL="http://download.eclipse.org/eclipse/downloads/drops/R-$VERSION-201002111343/$TARBALL"
 # 3.6:
 WGET_URL="http://download.eclipse.org/eclipse/downloads/drops/R-$VERSION-201006080911/$TARBALL"
-TAGS="compiler java"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-SUGGESTED="java-jre"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Build the ecj shell script to use the current version
-	mkdir -p $DESTDIR/usr/bin && 
-	echo "#!/bin/sh" > $DESTDIR/usr/bin/ecj &&
-	echo "ECJ_VERSION=$VERSION" >> $DESTDIR/usr/bin/ecj &&
-	cat $stuff/ecj.sh.part >> $DESTDIR/usr/bin/ecj &&
-	chmod +x $DESTDIR/usr/bin/ecj &&
-	mkdir -p $DESTDIR/usr/share/java &&
-	cp -a $src/*.jar $DESTDIR/usr/share/java
+	mkdir -p $install/usr/bin
+	echo "#!/bin/sh" > $install/usr/bin/ecj
+	echo "ECJ_VERSION=$VERSION" >> $install/usr/bin/ecj
+	cat $stuff/ecj.sh.part >> $install/usr/bin/ecj
+	chmod +x $install/usr/bin/ecj
+	mkdir -p $install/usr/share/java
+	cp -a $src/*.jar $install/usr/share/java
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
+	SUGGESTED="java-jre"
+	TAGS="compiler java"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ecm/receipt
--- a/ecm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ecm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,24 +5,24 @@
 CATEGORY="misc"
 SHORT_DESC="Converts CD image files into a lossless format optimized for \
 compression tools"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://web.archive.org/web/20140328062622/http://www.neillcorlett.com/ecm/"
 
 TARBALL="cmdpack-$VERSION-src.tar.gz"
 WGET_URL="https://web.archive.org/web/20130616041227if_/http://www.neillcorlett.com/downloads/$TARBALL"
 
-SPLIT="ecm ecm-extras"
+SPLIT="$PACKAGE-extras"
 
 compile_rules() {
 	sed -i 's|-Werror||' src/mkgcc
 	cd $src/src
 	sed -i 's/uint8_t saved_address.4./& = {0,0,0,0}/' cdpatch.c
-	mkdir -p $DESTDIR/usr/bin
+	mkdir -p $install/usr/bin
 	for i in *.c; do
 		echo "Compile $i..."
 		./mkgcc ${i%.c} || return 1
-		cp -a ${i%.c} $DESTDIR/usr/bin
+		cp -a ${i%.c} $install/usr/bin
 	done
 
 	ln -sf ecm $install/usr/bin/unecm
diff -r ad29ddfee1c9 -r d5aab818505e ecofont/receipt
--- a/ecofont/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ecofont/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="20% ink saving font from SPRANQ"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://www.ecofont.eu/ecofont_en.html"
+WEB_SITE="https://www.ecofont.com/"
 REPOLOGY="fonts:ecofont"
 
 TARBALL="spranq_eco_sans_regular.zip"
diff -r ad29ddfee1c9 -r d5aab818505e econnman/receipt
--- a/econnman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/econnman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1"
 CATEGORY="base-system"
 SHORT_DESC="ConnMan user interface for Enlightenment"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://www.enlightenment.org/"
 
@@ -24,6 +24,5 @@
 
 genpkg_rules(){
 	copy @std
-	DEPENDS=""
 	TAGS="e enlightenment network"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ed/receipt
--- a/ed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,21 @@
 PACKAGE="ed"
 VERSION="1.9"
 CATEGORY="development"
-SHORT_DESC="A line-oriented text editor."
+SHORT_DESC="A line-oriented text editor"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/ed/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/ed/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr && 
-	make CC=${HOST_SYSTEM}-gcc && make install
+compile_rules() {
+	./configure --prefix=/usr &&
+	make CC=${HOST_SYSTEM}-gcc &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e edbus/receipt
--- a/edbus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/edbus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.10"
 CATEGORY="x-window"
 SHORT_DESC="EFL Dbus wrapping and glue layer library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.enlightenment.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.enlightenment.org/releases/$TARBALL"
 
 BUILD_DEPENDS="ecore-dev dbus-dev"
-SPLIT="edbus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS="$CFLAGS -fvisibility=hidden"
@@ -21,7 +21,8 @@
 	./configure \
 		--disable-doc \
 		$CONFIGURE_ARGS &&
-	make $MAKEFILE && make install
+	make $MAKEFILE &&
+	make install
 }
 
 genpkg_rules() {
@@ -31,7 +32,7 @@
 			DEPENDS="ecore dbus"
 			TAGS="e enlightenment efl"
 			;;
-		edbus-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="ecore-dev dbus-dev"
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e editobj/receipt
--- a/editobj/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/editobj/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="editobj"
-SOURCE="EditObj2"
 VERSION="0.4"
 CATEGORY="x-window"
-SHORT_DESC="Dialog box generator for Python objects."
+SHORT_DESC="Dialog box generator for Python objects"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.lesfleursdunormal.fr/static/informatique/editobj/index_en.html"
+
+SOURCE="EditObj2"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.lesfleursdunormal.fr/static/informatique/editobj/index_en.html"
 WGET_URL="http://download.gna.org/songwrite/$TARBALL" # FIXME
 
-DEPENDS="python"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python ./setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr/ $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e efl/receipt
--- a/efl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/efl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,21 @@
 VERSION="1.21.1"
 CATEGORY="base-system"
 SHORT_DESC="Enlightenment Foundation Libraries"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL2 LGPL2 zlib/libpng"
 WEB_SITE="https://www.enlightenment.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://download.enlightenment.org/rel/libs/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext openssl-dev libunwind-dev libjpeg-turbo-dev \
+BUILD_DEPENDS="gettext-dev openssl-dev libunwind-dev libjpeg-turbo-dev \
 gstreamer1-dev luajit-dev freetype-dev fontconfig-dev fribidi-dev \
 xorg-libX11-dev xorg-libXext-dev xorg-libXrender-dev mesa-dev giflib-dev \
 tiff-dev libwebp-dev poppler-dev libspectre-dev libraw-dev librsvg-dev \
 eudev-dev dbus-dev pulseaudio-dev xorg-libXcursor-dev xorg-libXcomposite-dev \
 xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXScrnSaver-dev bullet-dev \
 gst1-plugins-base-dev libsndfile-dev xorg-libXtst-dev"
-SPLIT="efl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e eggwm/receipt
--- a/eggwm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eggwm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,50 +1,45 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="eggwm"
 VERSION="0.2"
 CATEGORY="x-window"
-SHORT_DESC="EggWM is a light QT Window Manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Light QT Window Manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://code.google.com/archive/p/eggwm"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://code.google.com/p/eggwm/"
 WGET_URL="http://eggwm.googlecode.com/files/$TARBALL"
 
-DEPENDS="xorg-libX11 libQtCore libQtGui"
 BUILD_DEPENDS="qmake Qt4-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	qmake EggWM.pro && 
-	make && 
-	make install INSTALL_ROOT=$DESTDIR
+compile_rules() {
+	qmake EggWM.pro &&
+	make &&
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share
 	install -m 755 $src/eggwm $fs/usr/bin/eggwm
 	cp -a $src/installation $fs/usr/share/eggwm
 	rm -rf $fs/usr/share/eggwm/themes/testtheme
 	find $fs/usr/share/eggwm -type f -exec chmod 0644 {} \;
 	cp -r $stuff/xsessions $fs/usr/share
+	DEPENDS="xorg-libX11 libQtCore libQtGui"
 }
 
-post_install()
-{
+post_install() {
 	res=$(cat $root/etc/slim.conf | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" $root/etc/slim.conf
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" $root/etc/slim.conf
 		status
 	fi
 }
 
-post_remove()
-{
+post_remove() {
 	# Remove WM from SLIM available sessions.
 	if grep -q $PACKAGE "$1/etc/slim.conf"; then
 		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
diff -r ad29ddfee1c9 -r d5aab818505e eigen/receipt
--- a/eigen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eigen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="eigen"
 VERSION="3.2.2"
 CATEGORY="development"
-SHORT_DESC="A C++ template library for linear algebra."
+SHORT_DESC="A C++ template library for linear algebra"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MPL2 LGPL BSD"
-WEB_SITE="http://eigen.tuxfamily.org/"
+WEB_SITE="http://eigen.tuxfamily.org/index.php?title=Main_Page"
 REPOLOGY="eigen3"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://bitbucket.org/$PACKAGE/$PACKAGE/get/$VERSION.tar.bz2"
 
-DEPENDS=""
 BUILD_DEPENDS="cmake glib"
 
-# Rules to configure and make the package.
-#
-compile_rules()
-{
+compile_rules() {
 	mkdir built
-	cd built
-	cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+	cd    built
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e ejabberd/receipt
--- a/ejabberd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ejabberd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Jabber/XMPP instant messaging server (real-time communication)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.ejabberb.im/"
+WEB_SITE="https://www.ejabberd.im/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.process-one.net/downloads/$PACKAGE/$VERSION/$TARBALL"
@@ -17,7 +17,7 @@
 	cd $src/src
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p                    $install/etc/init.d/
 	ln -s /usr/sbin/ejabberdctl $install/etc/init.d/ejabberd
diff -r ad29ddfee1c9 -r d5aab818505e electric-fence/receipt
--- a/electric-fence/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/electric-fence/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="2.1.13"
 CATEGORY="development"
 SHORT_DESC="Memory allocation debugger"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20121027131441/http://perens.com/works/software/ElectricFence/"
 REPOLOGY="electricfence"
 
-TARBALL="${PACKAGE}_${VERSION}-0.1.tar.gz"
+TARBALL="${PACKAGE}_$VERSION-0.1.tar.gz"
 #WGET_URL="http://perens.com/works/software/ElectricFence/$TARBALL"
 WGET_URL="https://web.archive.org/web/20110624035729if_/http://www.perens.com/works/software/ElectricFence/$TARBALL"
 
diff -r ad29ddfee1c9 -r d5aab818505e electricsheep/receipt
--- a/electricsheep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/electricsheep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,18 @@
 VERSION="2.7b12"
 CATEGORY="graphics"
 SHORT_DESC="Distributed screen-saver that renders morphing abstract animations"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://electricsheep.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://community.electricsheep.org/"
 WGET_URL="http://147.52.159.12/mirrors/ftp.kernel.org/pub/dist/vectorlinux/VL64-7.0/sourceAbs/$PACKAGE/$TARBALL"
 
-DEPENDS="curl expat flam3 ffmpeg mplayer libglade gtk2"
 BUILD_DEPENDS="curl-dev expat-dev ffmpeg-dev libglade-dev gtk2-dev flam3-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i	-e 's/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/' \
+compile_rules() {
+	sed \
+		-e 's/CODEC_TYPE_VIDEO/AVMEDIA_TYPE_VIDEO/' \
 		-e 's/guess_format/av_guess_format/' \
 		-e 's/PKT_FLAG_KEY/AV_PKT_FLAG_KEY/' \
 		-e '/stream_copy/d' -e '/av_set_parameters/d' \
@@ -29,24 +28,26 @@
 		-e 's/av_close_input_file(/avformat_close_input(\&/' \
 		-e 's/av_find_stream_info(ictx/avformat_find_stream_info(ictx,NULL/' \
 		-e '/av_destruct_packet/d' \
-			electricsheep.c
-	mkdir -p $DESTDIR/usr/share/gconf/defaults
-	sed -i	-e '/update-gconf-defaults/d' \
+		-i electricsheep.c
+	mkdir -p $install/usr/share/gconf/defaults
+	sed \
+		-e '/update-gconf-defaults/d' \
 		-e 's|/usr/share/gconf/defaults|$(DESTDIR)&|' \
 		-e '/GNOME_SCREENSAVER/d' \
-			Makefile*
+		-i Makefile*
+
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 	rm -r $fs/usr/share/man
 	rm $fs/usr/share/electricsheep/electricsheep-wait.avi
+	DEPENDS="curl expat flam3 ffmpeg mplayer libglade gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e elfkickers/receipt
--- a/elfkickers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/elfkickers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,11 @@
 
 compile_rules() {
 	sed -i 's|.*asm/elf.h.*|#define ELF_DATA ELFDATA2LSB\n#define ELF_CLASS ELFCLASS32\n#define ELF_ARCH EM_386|' sstrip/sstrip.c
-	mkdir -p $DESTDIR/usr/bin
-	for i in elfls rebind elftoc sstrip ; do
+
+	for i in elfls rebind elftoc sstrip; do
 		cd $i
-		make && cp $i $DESTDIR/usr/bin
+		make &&
+		install -Dm755 $i $install/usr/bin/$i
 		cd ..
 	done
 }
diff -r ad29ddfee1c9 -r d5aab818505e elfutils/receipt
--- a/elfutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/elfutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,8 @@
 WGET_URL="https://sourceware.org/elfutils/ftp/$VERSION/$TARBALL"
 TARBALL_MD5="35decb1ebfb90d565e4c411bee4185cc"
 
-BUILD_DEPENDS_arm="bzip2-dev xz-dev"
-BUILD_DEPENDS="gettext-tools zlib-dev bzip2-dev xz-dev"
-SPLIT="elfutils-dev"
+BUILD_DEPENDS="gettext zlib-dev bzip2-dev xz-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e elilo/receipt
--- a/elilo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/elilo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="The EFI linux boot loader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://elilo.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/elilo/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e elinks-small/receipt
--- a/elinks-small/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/elinks-small/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,23 +4,18 @@
 VERSION="0.12pre6"
 CATEGORY="network"
 SHORT_DESC="Small Elinks www text browser version (no JS SSL GPM)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://elinks.or.cz"
+WEB_SITE="http://elinks.or.cz/"
 REPOLOGY="elinks"
 
 SOURCE="elinks"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/download/$TARBALL"
-TAGS="web-browser"
 
-TAGS="browser web"
-DEPENDS="bzip2 zlib libidn expat"
 BUILD_DEPENDS="bzip2-dev zlib-dev libidn-dev expat-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--enable-small \
 		--enable-fastmem \
@@ -30,14 +25,15 @@
 		--without-spidermonkey \
 		--without-gpm \
 		--without-x \
-		$CONFIGURE_ARGS && 
-	make && make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	# No conflict with full elinks
 	cp -a $install/usr/bin/elinks $fs/usr/bin/elinks-small
+	DEPENDS="bzip2 zlib libidn expat"
+	TAGS="web-browser browser web"
 }
diff -r ad29ddfee1c9 -r d5aab818505e elinks/receipt
--- a/elinks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/elinks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Full featured www text browser"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://elinks.or.cz"
+WEB_SITE="http://elinks.or.cz/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
 BUILD_DEPENDS="openssl10-dev bzip2-dev spidermonkey-dev zlib-dev libidn-dev \
-expat-dev gpm-dev gettext"
+expat-dev gpm-dev gettext-dev"
 
 compile_rules() {
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0"
@@ -29,7 +29,7 @@
 		--enable-88-colors \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e emacs-pkg-lua-mode/receipt
--- a/emacs-pkg-lua-mode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emacs-pkg-lua-mode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="emacs-pkg-lua-mode"
 VERSION="20111107"
 CATEGORY="development"
-SHORT_DESC="An Emacs major mode for editing Lua code."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="An Emacs major mode for editing Lua code"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://immerrr.github.com/lua-mode/"
+WEB_SITE="http://immerrr.github.io/lua-mode/"
 REPOLOGY="emacs-lua-mode"
 
 BUILD_DEPENDS="emacs"
@@ -14,21 +14,19 @@
 
 DEPENDS="emacs"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	echo -n "Installing start file"
-	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d && \
+	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d &&
 	cp -a $stuff/90-lua-mode.el $fs/usr/share/emacs/site-lisp/site-start.d
 	status
 
 	echo -n "Installing lua-mode"
-	mkdir -p $fs/usr/share/emacs/site-lisp/lua-mode && \
+	mkdir -p $fs/usr/share/emacs/site-lisp/lua-mode &&
 	cp -a $stuff/lua-mode.el $fs/usr/share/emacs/site-lisp/lua-mode
 	status
 
 	# byte-compile files, remove src
-	for file in $fs/usr/share/emacs/site-lisp/lua-mode/*.el ; do
+	for file in $fs/usr/share/emacs/site-lisp/lua-mode/*.el; do
 		echo -n "Byte-compiling $(basename file)"
 		emacs -batch -f batch-byte-compile $file 2> /dev/null; err=$?
 		status
@@ -37,12 +35,10 @@
 	true
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
 
-post_remove()
-{
+post_remove() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
diff -r ad29ddfee1c9 -r d5aab818505e emacs-pkg-text-translator/receipt
--- a/emacs-pkg-text-translator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emacs-pkg-text-translator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="emacs-pkg-text-translator"
 VERSION="0.6.6.1"
 CATEGORY="development"
-SHORT_DESC="Translates strings by using translation services on the web."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Translates strings by using translation services on the web"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://d.hatena.ne.jp/khiker/20070503/emacs_text_translator"
-TAGS="emacs"
 
-DEPENDS="emacs"
+genpkg_rules() {
+	# Installing start file
+	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d &&
+	cp -a $stuff/90*.el $fs/usr/share/emacs/site-lisp/site-start.d
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	echo -n "Installing start file"
-	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d && \
-	cp -a stuff/90*.el $fs/usr/share/emacs/site-lisp/site-start.d
-	status
-
-	echo -n "Installing text-translator"
-	mkdir -p $fs/usr/share/emacs/site-lisp/text-translator && \
-	cp -a stuff/text*.el $fs/usr/share/emacs/site-lisp/text-translator
-	status
+	# Installing text-translator
+	mkdir -p $fs/usr/share/emacs/site-lisp/text-translator &&
+	cp -a $stuff/text*.el $fs/usr/share/emacs/site-lisp/text-translator
+	DEPENDS="emacs"
+	TAGS="emacs"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
 
-post_remove()
-{
+post_remove() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
diff -r ad29ddfee1c9 -r d5aab818505e emacs-pkg-vala-mode/receipt
--- a/emacs-pkg-vala-mode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emacs-pkg-vala-mode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,46 +3,41 @@
 PACKAGE="emacs-pkg-vala-mode"
 VERSION="0.1"
 CATEGORY="development"
-SHORT_DESC="An Emacs major mode for editing Vala code."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="An Emacs major mode for editing Vala code"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://live.gnome.org/Vala/Emacs"
+WEB_SITE="https://wiki.gnome.org/Projects/Vala/Emacs"
 REPOLOGY="emacs-vala-mode"
 
 BUILD_DEPENDS="emacs"
-TAGS="emacs vala"
 
-DEPENDS="emacs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	echo -n "Installing start file"
-	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d && \
-	cp -a stuff/80-vala-init.el $fs/usr/share/emacs/site-lisp/site-start.d
+	mkdir -p $fs/usr/share/emacs/site-lisp/site-start.d &&
+	cp -a $stuff/80-vala-init.el $fs/usr/share/emacs/site-lisp/site-start.d
 	status
 
 	echo -n "Installing vala-mode"
-	mkdir -p $fs/usr/share/emacs/site-lisp/vala-mode && \
-	cp -a stuff/vala-mode.el $fs/usr/share/emacs/site-lisp/vala-mode
+	mkdir -p $fs/usr/share/emacs/site-lisp/vala-mode &&
+	cp -a $stuff/vala-mode.el $fs/usr/share/emacs/site-lisp/vala-mode
 	status
 
 	# byte-compile files, remove src
-	for file in $fs/usr/share/emacs/site-lisp/vala-mode/vala*.el ; do
+	for file in $fs/usr/share/emacs/site-lisp/vala-mode/vala*.el; do
 		echo -n "Byte-compiling $(basename file)"
-		emacs -batch -f batch-byte-compile $file 2> /dev/null; err=$?
+		emacs -batch -f batch-byte-compile $file 2>/dev/null; err=$?
 		status
 		[ "$err" = "0" ] && rm -f $file
 	done
 	true
+	DEPENDS="emacs"
+	TAGS="emacs vala"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
 
-post_remove()
-{
+post_remove() {
 	chroot "$1/" tazpkg reconfigure emacs
 }
diff -r ad29ddfee1c9 -r d5aab818505e emacs/receipt
--- a/emacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="25.3"
 CATEGORY="editors"
 SHORT_DESC="The GNU Emacs editor"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.gnu.org/software/emacs/"
 
@@ -15,9 +15,8 @@
 fontconfig-dev glib-dev gnutls-dev gtk2-dev jpeg-dev \
 libpng16-dev librsvg-dev ncurses-dev pango-dev tiff-dev xorg-dev \
 xorg-dev-proto" # giflib-dev: version 4 needed, add --with-gif=no)
-SPLIT="emacs-help emacs-lisp-sources emacs"
+SPLIT="$PACKAGE-help $PACKAGE-lisp-sources $PACKAGE"
 
-# Rules to configure and make the package.
 compile_rules() {
 	./configure \
 		--infodir=/usr/share/info \
@@ -34,7 +33,7 @@
 		--sharedstatedir=/var/lib \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Install specific site file
 	mkdir -p                   $install/usr/share/emacs/site-lisp/site-start.d
@@ -48,7 +47,6 @@
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules() {
 	case $PACKAGE in
 		emacs-help)
diff -r ad29ddfee1c9 -r d5aab818505e emelfm2/receipt
--- a/emelfm2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emelfm2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,28 @@
 PACKAGE="emelfm2"
 VERSION="0.9.1"
 CATEGORY="system-tools"
-SHORT_DESC="GTK powerfull file manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GTK powerfull file manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://web.archive.org/web/20171213042310/http://emelfm2.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://emelfm2.net/rel/$TARBALL" # FIXME
 
-BUILD_DEPENDS="gtk2-dev xorg-xorgproto libmagic-dev \
-coreutils-operations gettext-tools"
+BUILD_DEPENDS="gtk2-dev xorg-xorgproto libmagic-dev coreutils-operations gettext"
 
 compile_rules() {
-	sed -i 's|xpdf|epdfview|g' src/e2_filetype.c
-	sed -i 's|gview|viewnior|g' src/e2_filetype.c
-	sed -i 's|totem|xine|g' src/e2_filetype.c
-	sed -i 's|Totem|Xine|g' src/e2_filetype.c
+	sed \
+		-e 's|xpdf|epdfview|g' \
+		-e 's|gview|viewnior|g' \
+		-e 's|totem|xine|g' \
+		-e 's|Totem|Xine|g' \
+		-i src/e2_filetype.c
 
 	make PREFIX=/usr &&
-	make i18n PREFIX=/usr &&
-	make install PREFIX=$DESTDIR/usr &&
-	make install_i18n PREFIX=$DESTDIR/usr
+	make PREFIX=/usr i18n &&
+	make PREFIX=$install/usr install &&
+	make PREFIX=$install/usr install_i18n
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e emerald-themes/receipt
--- a/emerald-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emerald-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,22 +6,22 @@
 SHORT_DESC="Themes for Emerald"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/compiz-reloaded"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://github.com/compiz-reloaded"
 WGET_URL="$WEB_SITE/$PACKAGE/releases/download/v$VERSION/$TARBALL"
 
-DEPENDS="xorg-libX11 emerald"
 BUILD_DEPENDS="xorg-dev gtk2-dev autoconf automake libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mv $install/* $fs
+	DEPENDS="xorg-libX11 emerald"
 }
diff -r ad29ddfee1c9 -r d5aab818505e emerald/receipt
--- a/emerald/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emerald/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.12.4"
 CATEGORY="x-window"
 SHORT_DESC="Window decorator for Compiz"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/compiz-reloaded"
 
diff -r ad29ddfee1c9 -r d5aab818505e emesene/receipt
--- a/emesene/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/emesene/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6"
 CATEGORY="network"
 SHORT_DESC="Instant messaging client for Windows Live Messenger (tm) network"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://github.com/emesene/emesene"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py build_ext -i || return 1
+	python -B setup.py build_ext -i || return 1
 
 	mkdir -p \
 		$install/usr/bin \
diff -r ad29ddfee1c9 -r d5aab818505e enca/receipt
--- a/enca/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enca/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,24 @@
 PACKAGE="enca"
 VERSION="1.19"
 CATEGORY="x-window"
-SHORT_DESC="Enca is an Extremely Naive Charset Analyser"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Extremely Naive Charset Analyser"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://cihar.com/software/enca/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://dl.cihar.com/enca/$TARBALL"
 
-SPLIT="enca-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	#sed -e "s#./make_hash#./native_make_hash#" -i tools/Makefile.am || exit 1
+	#sed -e "s#./make_hash#./native_make_hash#" -i tools/Makefile.am || return 1
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e encfs/receipt
--- a/encfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/encfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.4"
 CATEGORY="security"
 SHORT_DESC="Encryption filesystem for FUSE"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.arg0.net/encfs"
 REPOLOGY="fusefs:encfs"
@@ -22,7 +22,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e enchant/receipt
--- a/enchant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enchant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.1"
 CATEGORY="text"
 SHORT_DESC="Enchant spell checking library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://abiword.github.io/enchant/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/enchant.html"
diff -r ad29ddfee1c9 -r d5aab818505e enet/receipt
--- a/enet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,26 @@
 PACKAGE="enet"
 VERSION="1.2.1"
 CATEGORY="development"
-SHORT_DESC="relatively thin, simple and robust network communication layer on top of UDP"
+SHORT_DESC="Network communication layer on top of UDP"
 MAINTAINER="devl547@gmail.com"
 LICENSE="MIT"
+WEB_SITE="http://enet.bespin.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://enet.bespin.org/"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man --enable-crc32 $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-crc32 \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*a $fs/usr/lib
 	cp -a $install/usr/include $fs/usr
diff -r ad29ddfee1c9 -r d5aab818505e engrampa/receipt
--- a/engrampa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/engrampa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/engrampa/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk3-dev caja-dev json-glib-dev itstool \
-xorg-libSM-dev"
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev caja-dev json-glib-dev \
+itstool xorg-libSM-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e enigma/receipt
--- a/enigma/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enigma/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/enigma-game/$TARBALL"
 
-BUILD_DEPENDS="gettext libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev \
+BUILD_DEPENDS="gettext-dev libsdl-ttf-dev libsdl-mixer-dev libsdl-image-dev \
 libsdl-dev xerces-c-dev curl-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 		CPPFLAGS="-I/usr/include/SDL" \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e enki/receipt
--- a/enki/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enki/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,24 @@
 VERSION="2.0"
 CATEGORY="development"
 SHORT_DESC="The fast 2D robot simulator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://web.archive.org/web/20170312092223/http://home.gna.org/enki/"
 # https://github.com/enki-community/enki
 WGET_URL="svn|svn://svn.gna.org/svn/enki/trunk" # FIXME
 
-DEPENDS=""
 BUILD_DEPENDS="subversion cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/* $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e enlightenment/receipt
--- a/enlightenment/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enlightenment/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,17 @@
 VERSION="0.22.4"
 CATEGORY="x-window"
 SHORT_DESC="Enlightenment window manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.enlightenment.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://download.enlightenment.org/rel/apps/enlightenment/$TARBALL"
 
-BUILD_DEPENDS="pam-dev bluez-dev gettext efl-dev alsa-lib-dev pulseaudio-dev \
+BUILD_DEPENDS="pam-dev bluez-dev gettext-dev efl-dev alsa-lib-dev pulseaudio-dev \
 xorg-xcb-util-keysyms-dev pm-utils"
-SPLIT="enlightenment-backgrounds enlightenment enlightenment-common \
-enlightenment-dev enlightenment-pam:pam"
+SPLIT="$PACKAGE-backgrounds $PACKAGE $PACKAGE-common $PACKAGE-dev \
+$PACKAGE-pam:pam"
 
 COOKOPTS="!menus !pixmaps"
 
diff -r ad29ddfee1c9 -r d5aab818505e enna/receipt
--- a/enna/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/enna/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,27 @@
 PACKAGE="enna"
 VERSION="v0.4.1"
 CATEGORY="multimedia"
-SHORT_DESC="Enna media center."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Enna media center"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://enna.geexbox.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="hg|http://hg.geexbox.org/enna"
 BRANCH="$VERSION"
-TAGS="images music video e17"
 
-DEPENDS="eina eet ecore evas efreet edje edbus emotion ethumb elementary  \
-embryo libvalhalla libcurl xine-lib libexif alsa-lib libplayer xorg-libXrandr"
 BUILD_DEPENDS="shared-mime-info eina-dev eet-dev ecore-dev evas-dev efreet-dev \
 edje-dev edbus-dev emotion-dev ethumb-dev elementary-dev embryo-dev curl-dev \
 eio-dev xine-lib-dev libexif-dev alsa-lib-dev libplayer-dev libxml2-dev \
 libtool expat-dev jpeg-dev glib-dev ffmpeg-dev libvalhalla-dev libelementary \
-xorg-libXrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext"
+xorg-libXrandr-dev ffmpeg-compat-dev eeze-dev lua-dev gettext-dev"
 
 # Handle cross compilation
 case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS mercurial automake " ;;
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS mercurial automake ";;
 esac
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	while read name file; do
 		sed -i "s/name: \"$name\";/&\n\ttype: RECT;/" \
 			data/theme/default/$file.edc
@@ -76,20 +72,21 @@
 		--enable-backend-emotion \
 		--enable-activity-tv \
 		$CONFIGURE_ARGS &&
-	make -j 1 && make install
+	make -j1 && make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/enna $fs/usr/share
+	DEPENDS="eina eet ecore evas efreet edje edbus emotion ethumb elementary \
+	embryo libvalhalla libcurl xine-lib libexif alsa-lib libplayer \
+	xorg-libXrandr"
+	TAGS="images music video e17"
 }
 
-post_install()
-{
-	for f in $(cd "$1/" ; find usr/lib/ -name "*ver-svn-05*" ! -path */enlightenment/*); do 
-		ln -s /$f "$1/$(echo $f|sed s/-05/-03/)"; 
-	done	
+post_install() {
+	for f in $(cd "$1/"; find usr/lib/ -name "*ver-svn-05*" ! -path */enlightenment/*); do 
+		ln -s /$f "$1/$(echo $f|sed s/-05/-03/)";
+	done
 }
diff -r ad29ddfee1c9 -r d5aab818505e eom/receipt
--- a/eom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/eom/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk-doc itstool \
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc itstool \
 gobject-introspection-dev libexif-dev lcms2-dev exempi-dev libjpeg-turbo-dev \
 dbus-glib-dev librsvg-dev gtk3-dev mate-desktop-dev gdk-pixbuf-dev \
 shared-mime-info-dev libpeas-dev"
-SPLIT="eom-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e epdf/receipt
--- a/epdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/epdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="79352"
 CATEGORY="x-window"
 SHORT_DESC="Enlightenment's PDF library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.enlightenment.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="poppler-dev subversion automake autoconf libtool eina-dev \
 ecore-dev evas-dev"
-SPLIT="epdf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e epdfview-cups/receipt
--- a/epdfview-cups/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/epdfview-cups/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,45 +3,44 @@
 PACKAGE="epdfview-cups"
 VERSION="0.1.8"
 CATEGORY="office"
-SHORT_DESC="Lightweight PDF document viewer using Poppler and Cups, color invert."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight PDF document viewer using Poppler and CUPS, color invert"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/jristz/epdfview/"
 REPOLOGY="epdfview"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}archive/$VERSION.tar.gz"
-PROVIDE="epdfview:cups"
 
-DEPENDS="gtk2 poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
 BUILD_DEPENDS="gtk2-dev poppler-dev poppler cups cups-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-        sed -i 's/FORMAT_RGB24/FORMAT_ARGB32/g' src/PDFDocument.cxx
+compile_rules() {
+	sed -i 's/FORMAT_RGB24/FORMAT_ARGB32/g' src/PDFDocument.cxx
 	sed -i 's/<config.h>/&\n#include <stdio.h>\n#define g_fopen fopen/' \
 		src/epdfview.h
 	find . -name '*.[ch]*' | xargs sed -i 's|<glib/.*h|<glib.h|'
 	# cups 1.6 support
-	sed -i -e '/ippNew/{NNNNNNNNNd}' \
-	    -e 's/state->values\[0\].integer/ippGetInteger(state, 0)/' \
-	    -e 's/location->values\[0\].string.text/ippGetString(location, 0, NULL)/' \
-	    -e 's/.*IPP_TAG_KEYWORD.*/    ipp_t *request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);\n&/' \
-		src/PrintPter.cxx
+	sed \
+		-e '/ippNew/{NNNNNNNNNd}' \
+		-e 's/state->values\[0\].integer/ippGetInteger(state, 0)/' \
+		-e 's/location->values\[0\].string.text/ippGetString(location, 0, NULL)/' \
+		-e 's/.*IPP_TAG_KEYWORD.*/    ipp_t *request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);\n&/' \
+		-i src/PrintPter.cxx
 
 	./configure \
 		--with-cups \
 		$CONFIGURE_ARGS &&
-	make &&	make install
+	make &&
+	make install || return 1
+
 	cp -f $stuff/*.desktop $install/usr/share/applications
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy epdfview *.desktop *.xml
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \
 		$fs/usr/share/icons/hicolor/48x48/apps/epdfview.png
+	DEPENDS="gtk2 poppler glib libpng16 cups xorg-libXdamage gcc-lib-base libcomerr3"
+	PROVIDE="epdfview:cups"
 }
diff -r ad29ddfee1c9 -r d5aab818505e epdfview/receipt
--- a/epdfview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/epdfview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.8"
 CATEGORY="office"
 SHORT_DESC="Lightweight PDF document viewer using Poppler"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/jristz/epdfview"
 
diff -r ad29ddfee1c9 -r d5aab818505e ephoto/receipt
--- a/ephoto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ephoto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://download.enlightenment.org/rel/apps/ephoto/$TARBALL"
 
-BUILD_DEPENDS="automake gettext libtool efl-dev curl-dev check-dev"
+BUILD_DEPENDS="automake gettext-dev libtool efl-dev curl-dev check-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e epm/receipt
--- a/epm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/epm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,10 @@
 WGET_URL="https://github.com/michaelrsweet/epm/archive/release-$VERSION.tar.gz" #
 
 compile_rules() {
-	./configure --prefix=/usr && make -j 1 &&
+	./configure \
+		--prefix=/usr \
+		&&
+	make -j1 &&
 	install -Dm755 $src/epm $install/usr/bin/epm
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e epour/receipt
--- a/epour/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/epour/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 efl-dev python-efl python-dbus-dev python-pyxdg"
 
 compile_rules(){
-	python -B ./setup.py install --root=$install
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules(){
diff -r ad29ddfee1c9 -r d5aab818505e erlang/receipt
--- a/erlang/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/erlang/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Erlang programming language"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://$PACKAGE.org/"
+WEB_SITE="http://www.erlang.org/"
 
 SOURCE="otp_src"
 TARBALL="${SOURCE}_$VERSION.tar.gz"
@@ -19,19 +19,19 @@
 	sed -i 's|./Install|sh -x Install|' Makefile*
 
 	./configure $CONFIGURE_ARGS &&
-	make -j 1 &&
-	make -j 1 INSTALL_PREFIX=$DESTDIR install || return 1
+	make -j1 &&
+	make -j1 INSTALL_PREFIX=$install install || return 1
 
 	for i in \
-		$DESTDIR/usr/lib/erlang/*/bin/erl \
-		$DESTDIR/usr/lib/erlang/bin/erl \
-		$DESTDIR/usr/lib/erlang/*/bin/start \
-		$DESTDIR/usr/lib/erlang/bin/start
+		$install/usr/lib/erlang/*/bin/erl \
+		$install/usr/lib/erlang/bin/erl \
+		$install/usr/lib/erlang/*/bin/start \
+		$install/usr/lib/erlang/bin/start
 	do
 		sed -i 's|^ROOTDIR=.*$|ROOTDIR=/usr/lib/erlang|' $i
 	done
-	for file in $(ls $DESTDIR/usr/bin); do
-		ln -sf /usr/lib/erlang/bin/$file $DESTDIR/usr/bin/$file || return 1
+	for file in $(ls $install/usr/bin); do
+		ln -sf /usr/lib/erlang/bin/$file $install/usr/bin/$file || return 1
 	done
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e esound/receipt
--- a/esound/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/esound/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/esound/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="audiofile-dev alsa-lib-dev"
-SPLIT="esound-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lm"
diff -r ad29ddfee1c9 -r d5aab818505e espeak/receipt
--- a/espeak/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/espeak/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.45.05"
 CATEGORY="misc"
 SHORT_DESC="Speech synthesizer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://espeak.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="portaudio-dev jack-dev"
-SPLIT="espeak-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	[ -d $src-source ] && mv $src-source $PACKAGE-$VERSION 2>/dev/null
@@ -21,7 +21,8 @@
 	# Using portaudio v19
 	cp portaudio19.h portaudio.h
 
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e esterel-scLego/receipt
--- a/esterel-scLego/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/esterel-scLego/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,22 @@
 PACKAGE="esterel-scLego"
 VERSION="p5"
 CATEGORY="development"
-SHORT_DESC="Esterel langauge tool extension for the Lego MindStorms RCX."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Esterel langauge tool extension for the Lego MindStorms RCX"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://www.emn.fr/x-info/lego/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://www.emn.fr/x-info/lego/"
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
-DEPENDS="perl-core"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr
-	cp -a $src/bin $DESTDIR/usr
-	cp -a $src/lib $DESTDIR/usr
+compile_rules() {
+	mkdir -p $install/usr
+	cp -a $src/bin $install/usr
+	cp -a $src/lib $install/usr
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
+	DEPENDS="perl-core"
 }
diff -r ad29ddfee1c9 -r d5aab818505e esterel/receipt
--- a/esterel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/esterel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,21 @@
 PACKAGE="esterel"
 VERSION="5.92"
 CATEGORY="development"
-SHORT_DESC="Esterel langauge tools."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Esterel langauge tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://www.emn.fr/x-info/lego/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://www.emn.fr/x-info/lego/"
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
-DEPENDS="glibc-base"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr
-	cp -a $src/bin $DESTDIR/usr
-	cp -a $src/include $DESTDIR/usr
-	cp -a $src/share $DESTDIR/usr
+compile_rules() {
+	mkdir -p $install/usr
+	cp -r bin/ include/ share/ $install/usr/
+	cp -r man/ $install/usr/share/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="glibc-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e etherape/receipt
--- a/etherape/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/etherape/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.9.14"
 CATEGORY="network"
 SHORT_DESC="A graphical network monitor and visualization tool"
-MAINTAINER="hackdorte@sapo.pt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://etherape.sourceforge.net"
+WEB_SITE="https://etherape.sourceforge.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -22,7 +22,7 @@
 		--disable-scrollkeeper \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# The SliTaz use Tazbox.
 	sed -i 's/^Exec=.*/Exec=tazbox su dbus-launch etherape/' \
diff -r ad29ddfee1c9 -r d5aab818505e etherboot/receipt
--- a/etherboot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/etherboot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,33 @@
 PACKAGE="etherboot"
 VERSION="5.4.3"
 CATEGORY="system-tools"
-SHORT_DESC="Ethernet bootloader for PXE and NBI images."
+SHORT_DESC="Ethernet bootloader for PXE and NBI images"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://etherboot.org/wiki/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.etherboot.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="perl gcc49"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	make CC=gcc-49 bin/etherboot-net.bzImage
 }
 
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/boot
 	cp $src/src/bin/etherboot-net.bzImage $fs/usr/share/boot/etherboot
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
-	echo "----"
-	echo "You can create pxe/nbi boot floppy with:"
-	echo "# cp /usr/share/boot/etherboot /dev/fd0"
-	echo "----"
+post_install() {
+	[ -n "$quiet" ] || cat <<EOT
+
+	.------------------------------------------.
+	| You can create pxe/nbi boot floppy with: |
+	|                                          |
+	| # cp /usr/share/boot/etherboot /dev/fd0  |
+	'------------------------------------------'
+EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e ethtool/receipt
--- a/ethtool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ethtool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,25 @@
 PACKAGE="ethtool"
 VERSION="4.2"
 CATEGORY="network"
-SHORT_DESC="Display or change ethernet card settings."
+SHORT_DESC="Display or change ethernet card settings"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-BUILD_DEPENDS="wget"
+WEB_SITE="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.kernel.org/pub/software/network/ethtool"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="ethernet"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS && \
-	make && make install
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="ethernet"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ettercap/receipt
--- a/ettercap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ettercap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="ettercap"
 VERSION="NG-0.7.3"
 CATEGORY="network"
-SHORT_DESC="Ettercap is a suite for man in the middle attacks on LAN"
+SHORT_DESC="Suite for 'man in the middle' attacks on LAN"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://ettercap.sourceforge.net"
+WEB_SITE="http://ettercap.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -23,7 +23,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e eudev/receipt
--- a/eudev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/eudev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.2.5"
 CATEGORY="base-system"
 SHORT_DESC="Programs for dynamic creation of device nodes"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://dev.gentoo.org/~blueness/eudev/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/eudev.html"
@@ -14,7 +14,7 @@
 TARBALL_MD5="6ca08c0e14380f87df8e8aceac123671"
 
 BUILD_DEPENDS="gobject-introspection-dev util-linux-blkid-dev gperf kmod-dev"
-SPLIT="eudev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl
diff -r ad29ddfee1c9 -r d5aab818505e evince/receipt
--- a/evince/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/evince/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.32.0"
 CATEGORY="office"
 SHORT_DESC="Document viewer for Gnome"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://projects.gnome.org/evince/"
+WEB_SITE="https://wiki.gnome.org/Apps/Evince"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="gnome-doc-utils docbook-xml libxml2-dev \
 gnome-icon-theme gtk2-dev intltool lcms-dev util-linux-uuid-dev \
 poppler-dev tiff-dev dbus-glib-dev xorg-dev lcms2-dev"
-SPLIT="evince-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lICE"
@@ -34,7 +34,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/evince.desktop $install/usr/share/applications/evince.desktop
 }
diff -r ad29ddfee1c9 -r d5aab818505e evolution-data-server/receipt
--- a/evolution-data-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/evolution-data-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.28.1"
 CATEGORY="network"
 SHORT_DESC="Integrated mail, addressbook and calendaring, server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://projects.gnome.org/evolution/download.shtml"
+WEB_SITE="https://wiki.gnome.org/Apps/Evolution"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="libglade-dev libsoup-dev gtk2-dev orbit2-dev libbonobo-dev \
 gconf-dev libical-dev firefox-dev db-dev xorg-libxcb-dev popt-dev bison flex \
 glib-dev sqlite3-dev"
-SPLIT="evolution-data-server-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -30,7 +30,7 @@
 		--with-nspr-libs=/usr/lib/firefox-devel-3.5.3/sdk/lib \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e exa/receipt
--- a/exa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="exa"
 VERSION="0.7.0"
@@ -13,20 +13,17 @@
 
 BUILD_DEPENDS="rust libgit2-dev cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# save caches here
 	export CARGO_HOME=/home/cargo
 
 	sed -i 's|/usr/local|/usr|' Makefile
 
-	make && make DESTDIR=$install install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e exempi/receipt
--- a/exempi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exempi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://libopenraw.freedesktop.org/download/$TARBALL"
 
 BUILD_DEPENDS="expat-dev zlib-dev boost-dev boost-unit-test-framework"
-SPLIT="exempi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e exfat-utils/receipt
--- a/exfat-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exfat-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,22 @@
 PACKAGE="exfat-utils"
 VERSION="1.0.0"
 CATEGORY="base-system"
-SHORT_DESC="exFAT file system tools."
+SHORT_DESC="exFAT file system tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/relan/exfat"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/relan/exfat/archive/v$VERSION.tar.gz"
 
-DEPENDS=""
 BUILD_DEPENDS="scons2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	scons PREFIX=/usr
-	scons -k DESTDIR=$DESTDIR install
+	scons -k DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/sbin
 	cp -a $install/* $fs/sbin
 }
diff -r ad29ddfee1c9 -r d5aab818505e exif/receipt
--- a/exif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.6.21"
 CATEGORY="graphics"
 SHORT_DESC="Read EXIF data from images"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libexif.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/libexif/$TARBALL"
 
-BUILD_DEPENDS="gettext libexif libexif-dev popt-dev"
+BUILD_DEPENDS="gettext-dev libexif-dev popt-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e exiftool/receipt
--- a/exiftool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exiftool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,26 @@
 PACKAGE="exiftool"
 VERSION="8.40"
 CATEGORY="system-tools"
-SHORT_DESC="Application for reading, writing and editing meta information in a wide variety of files."
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="Reading, writing and editing meta information in a wide variety of files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Artistic"
-SUGGESTED="perl-archive-zip perl-io-compress"
+WEB_SITE="http://owl.phy.queensu.ca/~phil/exiftool/"
+
 SOURCE="Image-ExifTool"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://owl.phy.queensu.ca/~phil/exiftool/"
 WGET_URL="http://owl.phy.queensu.ca/~phil/exiftool/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	perl Makefile.PL && make &&
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	perl Makefile.PL &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share
+	DEPENDS="perl"
+	SUGGESTED="perl-archive-zip perl-io-compress"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e exiv2/receipt
--- a/exiv2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exiv2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.26"
 CATEGORY="graphics"
 SHORT_DESC="EXIF and IPTC metadata manipulation library and tools"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.exiv2.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/exiv2.html"
@@ -13,8 +13,8 @@
 WGET_URL="http://www.exiv2.org/builds/exiv2-$VERSION-trunk.tar.gz"
 TARBALL_MD5="f936d2ca5cbe1e18c71ca2baa5e84fb4"
 
-BUILD_DEPENDS="cmake gettext zlib-dev expat-dev curl-dev libssh-dev"
-SPLIT="exiv2-dev"
+BUILD_DEPENDS="cmake gettext-dev zlib-dev expat-dev curl-dev libssh-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# some MacOS meta files(?) treated as "bad" *.po files
diff -r ad29ddfee1c9 -r d5aab818505e exo/receipt
--- a/exo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.3" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce extension library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/exo/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev libxfce4util-dev libxfce4ui-dev"
-SPLIT="exo-tools exo-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e exosip/receipt
--- a/exosip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/exosip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="c-ares-dev osip-dev openssl-dev"
-SPLIT="exosip-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e expat/receipt
--- a/expat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/expat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.6"
 CATEGORY="x-window"
 SHORT_DESC="XML parsing C library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://libexpat.github.io/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/expat.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="expat-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e expect/receipt
--- a/expect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/expect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="5.45.4"
 CATEGORY="utilities"
 SHORT_DESC="A tool for automating interactive applications"
-MAINTAINER="samuel_trassare@yahoo.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
-WEB_SITE="http://expect.sourceforge.net"
+WEB_SITE="http://expect.sourceforge.net/"
 
 TARBALL="$PACKAGE$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -18,7 +18,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e expedite/receipt
--- a/expedite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/expedite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,24 @@
 PACKAGE="expedite"
 VERSION="1.7.8"
 CATEGORY="graphics"
-SHORT_DESC="Performance and correctness test suite for Evas."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Performance and correctness test suite for Evas"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://www.enlightenment.org/"
 WGET_URL="http://download.enlightenment.org/releases//$TARBALL"
 TAGS="e enlightenment"
 
-DEPENDS="evas python"
 BUILD_DEPENDS="evas-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make $MAKEFLAGS && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make $MAKEFLAGS &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
+	DEPENDS="evas python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e extended-actions/receipt
--- a/extended-actions/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/extended-actions/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,29 +7,29 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://launchpad.net/extended-actions"
+
 BRANCH="5"
 TARBALL="$PACKAGE-$BRANCH.tar.bz2"
 WGET_URL="bzr|lp:extended-actions"
 
-DEPENDS="libgee glib"
 BUILD_DEPENDS="bzr cmake vala glib-dev libgee-dev"
 
 TODO="Setup extended-actions specific to SliTaz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# gee-1.0 is old while gee-0.8 is latest ;)
+compile_rules() {
+	# gee-1.0 is old while gee-0.8 is latest ;-)
 	sed -i 's|gee-1.0|gee-0.8|g' $(grep -l gee-1.0 $(find . -type f))
 
-	mkdir build && cd build &&
-	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libgee glib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e extrema/receipt
--- a/extrema/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/extrema/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.4.5"
 CATEGORY="office"
 SHORT_DESC="Powerful visualization and data analysis tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://exsitewebware.com/extrema/"
 
@@ -14,10 +14,10 @@
 BUILD_DEPENDS="gtk2-dev wxWidgets28-dev"
 
 compile_rules() {
-	sed -i "s|^pkgdatadir = |&$DESTDIR|" src/Makefile*
+	sed -i "s|^pkgdatadir = |&$install|" src/Makefile*
 	sed -i 's/<vector>/&\n#include <cstddef>/' \
 		src/Graphics/GRA_thiessenTriangulation.h
-	mkdir -p $DESTDIR/usr/share/extrema
+	mkdir -p $install/usr/share/extrema
 
 	./configure \
 		--enable-shared \
diff -r ad29ddfee1c9 -r d5aab818505e extundelete/receipt
--- a/extundelete/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/extundelete/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="extundelete"
 VERSION="0.2.4"
 CATEGORY="base-system"
-SHORT_DESC="Recover deleted files from an ext3 or ext4 partition."
+SHORT_DESC="Recover deleted files from an ext3 or ext4 partition"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -13,16 +13,16 @@
 DEPENDS="e2fsprogs gcc-lib-base"
 BUILD_DEPENDS="e2fsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/*inode;/inodebuf;/' src/block.c
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e ez-ipupdate/receipt
--- a/ez-ipupdate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ez-ipupdate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ez-ipupdate"
 VERSION="3.0.11b7"
 CATEGORY="network"
-SHORT_DESC="Update your host name for some dynamic DNS services."
+SHORT_DESC="Update your host name for some dynamic DNS services"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://web.archive.org/web/20120709060406/http://ez-ipupdate.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20120709060406/http://ez-ipupdate.com/"
 WGET_URL="${WEB_SITE}dist/$TARBALL"
-TAGS="DNS"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	grep -q errno.h conf_file.h || echo "#include <errno.h>" >> conf_file.h
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--enable-default-service=dyndns \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure \
+		--enable-default-service=dyndns \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	TAGS="DNS"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e f2fs-tools/receipt
--- a/f2fs-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/f2fs-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$TARBALL"
 
 BUILD_DEPENDS="automake libtool util-linux-uuid-dev"
-SPLIT="f2fs-tools-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e faad2/receipt
--- a/faad2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/faad2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.8.6"
 CATEGORY="multimedia"
 SHORT_DESC="ISO AAC audio decoder"
-MAINTAINER="slitaz@kacper.se"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://faac.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/faac/$TARBALL"
 
-SPLIT="faad2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e faenza-icon-theme/receipt
--- a/faenza-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/faenza-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,20 +6,16 @@
 SHORT_DESC="Faenza icon theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://tiheum.deviantart.com/art/Faenza-Icons-173323228"
+WEB_SITE="https://www.deviantart.com/tiheum/art/Faenza-Icons-173323228"
 
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/icons
 	cp -r Faenza* $install/usr/share/icons
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e faience-icon-theme/receipt
--- a/faience-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/faience-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,22 +6,18 @@
 SHORT_DESC="Icon theme based on Faenza"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="https://tiheum.deviantart.com/art/Faience-icon-theme-255099649"
+WEB_SITE="https://www.deviantart.com/tiheum/art/Faience-icon-theme-255099649"
 
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/icons
 	cp -r Faience* $install/usr/share/icons
 	find $install -name '*.theme' -exec chmod 0644 '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	DEPENDS="faenza-icon-theme"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fail2ban/receipt
--- a/fail2ban/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fail2ban/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="fail2ban"
 VERSION="0.9.0"
 CATEGORY="network"
-SHORT_DESC="Scans log files to bans IP that makes too many password failures."
+SHORT_DESC="Scans log files to bans IP that makes too many password failures"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -15,15 +15,11 @@
 DEPENDS="iptables"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/logrotate.d $fs/etc/init.d
 	cp -a $install/* $fs
 	sed -i 's/= \\s\*(/= \\s*\\S+\\s\*(/'  $fs/etc/fail2ban/filter.d/common.conf
@@ -35,7 +31,6 @@
 
 	cat >> $fs/etc/fail2ban/jail.conf <<EOT
 [apache-noscript]
-
 enabled  = false
 port     = http,https
 filter   = apache-noscript
@@ -44,7 +39,6 @@
 maxretry = 2
 
 [apache-proxy]
-
 enabled  = false
 port     = http,https
 filter   = apache-proxy
@@ -54,15 +48,14 @@
 maxretry = 2
 
 [apache-w00tw00t]
-enabled = false
-filter = apache-w00tw00t
-action = iptables[name=Apache-w00tw00t,port=80,protocol=tcp]
-        logpath = /var/log/apache/*access
-        maxretry = 1
-        bantime  = 172800
+enabled  = false
+filter   = apache-w00tw00t
+action   = iptables[name=Apache-w00tw00t,port=80,protocol=tcp]
+logpath  = /var/log/apache/*access
+maxretry = 1
+bantime  = 172800
 
 [lighttpd-fastcgi]
-
 enabled  = false
 port     = http,https
 filter   = lighttpd-fastcgi
@@ -71,7 +64,6 @@
 maxretry = 2
 
 [ssh-ddos]
-
 enabled  = true
 port     = ssh,sftp
 filter   = sshd-ddos
diff -r ad29ddfee1c9 -r d5aab818505e fakeroot/receipt
--- a/fakeroot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fakeroot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,11 +5,11 @@
 CATEGORY="development"
 SHORT_DESC="Gives a fake root environment, useful for building packages as a \
 non-privileged user"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://packages.debian.org/fakeroot"
+WEB_SITE="https://packages.debian.org/search?keywords=fakeroot"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.bz2"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.bz2"
 WGET_URL="http://ftp.debian.org/debian/pool/main/f/$PACKAGE/$TARBALL"
 
 compile_rules() {
@@ -18,7 +18,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fasm/receipt
--- a/fasm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fasm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,33 @@
 PACKAGE="fasm"
 VERSION="1.73.04"
 CATEGORY="development"
-SHORT_DESC="Assembly language programming for x86, x86-64 and ARM systems."
+SHORT_DESC="Assembly language programming for x86, x86-64 and ARM systems"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://flatassembler.net/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
+WGET_URL="$WEB_SITE$TARBALL"
 EXTRA_SOURCE_FILES="FASMARM_small.ZIP"
-WEB_SITE="http://flatassembler.net/"
-WGET_URL="$WEB_SITE$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -s $SRC/FASMARM_small.ZIP ] ||
 		wget -P $SRC \
 		http://arm.flatassembler.net/FASMARM_small.ZIP
 	unzip $SRC/FASMARM_small.ZIP
 	mv ReadMe.txt fasmarm.txt
 	cp $src/SOURCE/LINUX/FASMARM.ASM $src/source/Linux/fasmarm.asm
-	for i in $src/SOURCE/*.INC ; do
+	for i in $src/SOURCE/*.INC; do
 		cp $i $src/source/$(basename $i | tr [A-Z] [a-z])
 	done
-	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/doc/fasm
+	mkdir -p $install/usr/bin $install/usr/share/doc/fasm
 	cd $src/source/Linux
-	../../fasm fasm.asm $DESTDIR/usr/bin/fasm
-	../../fasm fasmarm.asm $DESTDIR/usr/bin/fasmarm
-	cp ../../*.txt $DESTDIR/usr/share/doc/fasm
+	../../fasm fasm.asm $install/usr/bin/fasm
+	../../fasm fasmarm.asm $install/usr/bin/fasmarm
+	cp ../../*.txt $install/usr/share/doc/fasm
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e fastjar/receipt
--- a/fastjar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fastjar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.98"
 CATEGORY="development"
 SHORT_DESC="A fast C implementation of the JDK jar utility"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://savannah.nongnu.org/projects/fastjar/"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fatback/receipt
--- a/fatback/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fatback/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fatback"
 VERSION="1.3"
 CATEGORY="misc"
-SHORT_DESC="A *nix tool for recovering files from FAT file systems."
+SHORT_DESC="A *nix tool for recovering files from FAT file systems"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/fatback/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/fatback/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="flex autoconf automake libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	autoreconf -i
 	./configure --prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/bin $fs/usr/
 }
diff -r ad29ddfee1c9 -r d5aab818505e fbff/receipt
--- a/fbff/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbff/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="FFmpeg client in frame buffer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://repo.or.cz/w/fbff.git"
+WEB_SITE="https://repo.or.cz/w/fbff.git"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://repo.or.cz/fbff.git"
@@ -14,9 +14,6 @@
 BUILD_DEPENDS="ffmpeg-dev zlib-dev git"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) sed -i s"#/opt#/cross/$ARCH/sysroot/usr#" Makefile ;;
-	esac
 	sed -i "s|cc|$HOST_SYSTEM-gcc|" Makefile
 
 	make || return 1
diff -r ad29ddfee1c9 -r d5aab818505e fbgrab/receipt
--- a/fbgrab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbgrab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="fbgrab"
 VERSION="1.2"
 CATEGORY="misc"
-SHORT_DESC="Frame buffer grabber."
+SHORT_DESC="Frame buffer grabber"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://fbgrab.monells.se/"
diff -r ad29ddfee1c9 -r d5aab818505e fbida/receipt
--- a/fbida/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbida/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Image viewer for the framebuffer console"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://linux.bytesex.org/fbida/"
+WEB_SITE="https://www.kraxel.org/blog/linux/fbida/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.bytesex.org/releases/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e fbpanel/receipt
--- a/fbpanel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbpanel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fbpanel"
 VERSION="6.1"
 CATEGORY="x-window"
-SHORT_DESC="Fbpanel is a lightweight GTK2-based panel for UNIX desktop."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight GTK2-based panel for UNIX desktop"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://fbpanel.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tbz2"
-WEB_SITE="http://fbpanel.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk2"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
-	./configure && make && make install
+
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
 	# Custom config file
 	cp -a $stuff/default $fs/usr/share/fbpanel
+	DEPENDS="gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fbpdf-mupdf/receipt
--- a/fbpdf-mupdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbpdf-mupdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fbpdf-mupdf"
-PROVIDE="fbpdf"
 VERSION="20130411"
 CATEGORY="multimedia"
 SHORT_DESC="PDF reader in frame buffer (mupdf based)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://repo.or.cz/w/fbpdf.git"
+WEB_SITE="https://repo.or.cz/w/fbpdf.git"
 REPOLOGY="fbpdf"
 
 TARBALL="fbpdf-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/snapshot/262662b256aa261c7eb5b06b4018591ce2dd6d44.tar.gz"
-TAGS="pdf"
 
-DEPENDS="bzlib djvulibre freetype jbig2dec openjpeg"
 BUILD_DEPENDS="djvulibre-dev mupdf-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# mupdf 1.4 patch
-	sed -i 's|^CFLAGS.*|& -I/usr/include/mupdf|;s|lfitz|lmupdf|' Makefile
-	mkdir $DESTDIR
-	make &&
-	cp fbpdf fbdjvu $DESTDIR
+	sed -i 's|^CFLAGS.*|& -I/usr/include/mupdf|; s|lfitz|lmupdf|' Makefile
+
+	make || return 1
+
+	install -Dm755 fbpdf  $install/usr/bin/fbpdf
+	install -Dm755 fbdjvu $install/usr/bin/fbdjvu
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $install/fb* $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="bzlib djvulibre freetype jbig2dec openjpeg"
+	PROVIDE="fbpdf"
+	TAGS="pdf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fbreader/receipt
--- a/fbreader/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbreader/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="E-Book Reader supporting many e-book formats"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://www.fbreader.org/"
+WEB_SITE="https://fbreader.org/"
 
 TARBALL="$PACKAGE-sources-$VERSION.tgz"
 WGET_URL="http://www.fbreader.org/$TARBALL"
 
 BUILD_DEPENDS="expat-dev liblinebreak-dev curl-dev fribidi-dev bzip2-dev \
-sqlite3-dev gtk2-dev xorg-dev glib-dev gettext intltool"
+sqlite3-dev gtk2-dev xorg-dev glib-dev gettext-dev intltool"
 
 compile_rules() {
 	# GCC 4.5.0 fix
@@ -21,7 +21,7 @@
 	echo "TARGET_STATUS = release" >> makefiles/target.mk
 
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fbterm/receipt
--- a/fbterm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbterm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,16 +16,15 @@
 # -> http://www.codon.org.uk/~mjg59/libx86/
 BUILD_DEPENDS="freetype-dev fontconfig-dev gpm-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/-1/(u16) &/' src/lib/vterm_states.cpp
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="fontconfig freetype"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fbvnc-auth/receipt
--- a/fbvnc-auth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbvnc-auth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,11 +14,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/zohead/fbvnc/archive/$HASH.tar.gz"
 
-#BUILD_DEPENDS_arm=""
 #BUILD_DEPENDS="git"
 
 compile_rules() {
-	sed -i s"/cc/${HOST_SYSTEM}-gcc/" Makefile &&
+	sed -i s"/cc/${HOST_SYSTEM}-gcc/" Makefile
+
 	make &&
 	install -Dm755 $src/fbvnc $install/usr/bin/fbvnc
 }
diff -r ad29ddfee1c9 -r d5aab818505e fbvnc/receipt
--- a/fbvnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbvnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,13 @@
 SHORT_DESC="VNC client in frame buffer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://repo.or.cz/w/fbvnc.git"
+WEB_SITE="https://repo.or.cz/w/fbvnc.git"
 
 #TARBALL="$PACKAGE-$VERSION.tar.bz2"
 #WGET_URL="git|git://repo.or.cz/fbvnc.git"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://repo.or.cz/fbvnc.git/snapshot/d1a3369e9c4cdf06bc7fd83408076d7965f879d9.tar.gz"
 
-#BUILD_DEPENDS_arm=""
 #BUILD_DEPENDS="git"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fbxkb/receipt
--- a/fbxkb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fbxkb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="fbxkb"
 VERSION="0.6"
 CATEGORY="utilities"
-SHORT_DESC="fbxkb is NETWM compliant keyboard indicator and switcher"
+SHORT_DESC="NETWM-compliant keyboard indicator and switcher"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://fbxkb.sourceforge.net/"
diff -r ad29ddfee1c9 -r d5aab818505e fceux/receipt
--- a/fceux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fceux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,19 @@
 VERSION="2.2.3"
 CATEGORY="games"
 SHORT_DESC="A fast and ultra-compatible NES/Famicom emulator with SDL, OpenGL and SVGALIB support"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://fceux.com/web/home.html"
+WEB_SITE="http://www.fceux.com/web/home.html"
 
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
-WGET_URL="$SF_MIRROR/fceultra/Source%20Code/$VERSION%20src/$TARBALL"
+WGET_URL="$SF_MIRROR/fceultra/$TARBALL"
 
 BUILD_DEPENDS="scons2 mesa-dev libsdl-dev lua-dev gtk2-dev zlib-dev \
 elfutils-dev glu-dev"
 
 compile_rules() {
 	scons
-	sed -i "s|/usr/local|$DESTDIR/usr|" SConstruct
+	sed -i "s|/usr/local|$install/usr|" SConstruct
 	scons install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e fcgi/receipt
--- a/fcgi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcgi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,20 @@
 VERSION="2.4.0"
 CATEGORY="development"
 SHORT_DESC="Fast CGI binary and library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://fastcgi-archives.github.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.fastcgi.com/dist/$TARBALL" # FIXME
 
-SPLIT="fcgi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fcitx-configtool/receipt
--- a/fcitx-configtool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcitx-configtool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,27 +6,25 @@
 SHORT_DESC="fcitx chinese input-medthod GUI configure tool"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://fcitx-im.org/wiki/Configtool"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://fcitx-im.org/wiki/Configtool"
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
-DEPENDS="fcitx gtk2"
 BUILD_DEPENDS="fcitx libunique-dev gtk2-dev cmake intltool xorg-libXrender-dev \
 cairo-dev pango-dev fcitx-dev file"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|<glib/.*h>|<glib.h>|' gtk/sub_config_parser.[hc] gtk/config_widget.h
-	cmake -DCMAKE_INSTALL_PREFIX=/usr
-	make && make DESTDIR=$DESTDIR install
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr $fs/
+genpkg_rules() {
+	copy @std *.mo
+	DEPENDS="fcitx gtk2"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e fcitx-googlepinyin/receipt
--- a/fcitx-googlepinyin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcitx-googlepinyin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,7 @@
 	cmake $src -DCMAKE_INSTALL_PREFIX=/usr || return 1
 	cd $src
 	make -C build || return 1
-	make install/fast -C build DESTDIR=$DESTDIR
+	make install/fast -C build DESTDIR=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fcitx-zm/receipt
--- a/fcitx-zm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcitx-zm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,29 @@
 VERSION="4.0"
 CATEGORY="x-window"
 SHORT_DESC="Zhengma Table for FCITX-4.0"
-WEB_SITE="https://fcitx-im.org/wiki/Fcitx"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://fcitx-im.org/wiki/Fcitx"
+
 TARBALL="zm.mb"
 WGET_URL="https://download.fcitx-im.org/data/$TARBALL"
 
-DEPENDS="fcitx"
 BUILD_DEPENDS="fcitx-tools"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
-	echo -n "Remove All Words,Remained Hanzi only"
-	mkdir $DESTDIR
-	cd $DESTDIR
+compile_rules() {
+	# Remove all words, remained Hanzi only
+	mkdir $install
+	cd $install
 	[ -s $SRC/zm.mb ] || wget -P $SRC $WGET_URL || return 1
 	cp $stuff/zm.conf .
 	mb2txt $SRC/zm.mb | awk 'NR<=10{print} NR>10{if(length($2)==3)print}' > zm.txt
 	txt2mb zm.txt zm.mb
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	EXTDIR="$fs/usr/share/fcitx/data/table"
 	mkdir -p $EXTDIR
-	cp $install/zm.mb $EXTDIR	
+	cp $install/zm.mb $EXTDIR
 	cp $install/zm.conf $EXTDIR
+	DEPENDS="fcitx"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e fcitx/receipt
--- a/fcitx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcitx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="fcitx"
 VERSION="4.1.2"
 CATEGORY="x-window"
-SHORT_DESC="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux."
+SHORT_DESC="Free Chinese Input Toy of X, a collection of Simplified Chinese input methods for Linux"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-${VERSION}_all.tar.bz2"
@@ -11,85 +11,80 @@
 WGET_URL="https://download.fcitx-im.org/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake intltool cairo-dev pango-dev gtk2-dev dbus-dev opencc-dev"
-SPLIT="fcitx-dev fcitx-skin-classic fcitx-skin-dark fcitx-skin-default \
-fcitx-tools libfcitx"
+SPLIT="$PACKAGE-dev $PACKAGE-skin-classic $PACKAGE-skin-dark \
+$PACKAGE-skin-default $PACKAGE-tools libfcitx"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $src/build
-	cd $src/build
-	cmake $src \
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DENABLE_QT_IM_MODULE=OFF \
 		-DENABLE_GTK2_IM_MODULE=OFF \
 		-DENABLE_GTK3_IM_MODULE=OFF \
-		-DENABLE_OPENCC=ON || return 1
-	cd $src
-	make -C build || return 1
-	make install/fast -C build DESTDIR=$DESTDIR
+		-DENABLE_OPENCC=ON \
+		.. &&
+	make &&
+	make DESTDIR=$install install/fast
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	fcitx)
-		DEPENDS="libfcitx fcitx-skin-default gtk2"
-		mkdir -p $fs/usr/bin/ $fs/usr/share/fcitx/ $fs/usr/share/applications/
-		cp -a $install/usr/bin/fcitx $fs/usr/bin/
-		cp -a $install/usr/bin/fcitx-configtool $fs/usr/bin/
-		cp -a $install/usr/bin/fcitx-remote $fs/usr/bin/
-		cp -a $install/usr/bin/fcitx4-config $fs/usr/bin/
-		cp -a $install/usr/share/fcitx/addon/ $fs/usr/share/fcitx/
-		cp -a $install/usr/share/fcitx/configdesc/ $fs/usr/share/fcitx/
-		cp -a $install/usr/share/fcitx/data/ $fs/usr/share/fcitx/
-		cp -a $install/usr/share/fcitx/pinyin/ $fs/usr/share/fcitx/
-		cp -a $install/usr/share/fcitx/table/ $fs/usr/share/fcitx/
-		cp -a $install/usr/share/applications/*.desktop $fs/usr/share/applications/
-		cp -a $install/usr/share/icons/ $fs/usr/share/
-		;;
-	fcitx-dev)
-		CAT="development|The fcitx-dev package includes the header files for the FCITX package."
-		DEPENDS="libfcitx xorg-libX11-dev"
-		mkdir -p $fs/usr/lib/pkgconfig/ $fs/usr/share/
-		cp -a $install/usr/lib/libfcitx*.so $fs/usr/lib/
-		cp -a $install/usr/lib/pkgconfig/*.pc $fs/usr/lib/pkgconfig/
-		cp -a $install/usr/share/cmake/ $fs/usr/share/
-		cp -a $install/usr/include/ $fs/usr/
-		;;
-	fcitx-skin-classic)
-		CAT="x-window|The classic skin of fcitx."
-		mkdir -p $fs/usr/share/fcitx/skin/
-		cp -a $install/usr/share/fcitx/skin/classic/ $fs/usr/share/fcitx/skin/
-		;;
-	fcitx-skin-dark)
-		CAT="x-window|The dark skin of fcitx."
-		mkdir -p $fs/usr/share/fcitx/skin/
-		cp -a $install/usr/share/fcitx/skin/dark/ $fs/usr/share/fcitx/dark/
-		;;
-	fcitx-skin-default)
-		CAT="x-window|The default skin of fcitx."
-		mkdir -p $fs/usr/share/fcitx/skin/
-		cp -a $install/usr/share/fcitx/skin/default $fs/usr/share/fcitx/skin/
-		;;
-	fcitx-tools)
-		CAT="x-window|The fcitx-tools package includes some tools of fcitx."
-		DEPENDS="fcitx"
-		mkdir -p $fs/usr/bin/
-		cp -a $install/usr/bin/createPYMB $fs/usr/bin/
-		cp -a $install/usr/bin/readPYBase $fs/usr/bin/
-		cp -a $install/usr/bin/readPYMB $fs/usr/bin/
-		cp -a $install/usr/bin/mb2org $fs/usr/bin/
-		cp -a $install/usr/bin/mb2txt $fs/usr/bin/
-		cp -a $install/usr/bin/scel2org $fs/usr/bin/
-		cp -a $install/usr/bin/txt2mb $fs/usr/bin/
-		;;
-	libfcitx)
-		CAT="x-window|The libfcitx package provides shared libraries for FCITX."
-		mkdir -p $fs/usr/lib/fcitx/
-		cp -a $install/usr/lib/fcitx/*.so $fs/usr/lib/fcitx/
-		cp -a $install/usr/lib/libfcitx*.so.* $fs/usr/lib/
-		;;
+		fcitx)
+			DEPENDS="libfcitx fcitx-skin-default gtk2"
+			mkdir -p $fs/usr/bin/ $fs/usr/share/fcitx/ $fs/usr/share/applications/
+			cp -a $install/usr/bin/fcitx $fs/usr/bin/
+			cp -a $install/usr/bin/fcitx-configtool $fs/usr/bin/
+			cp -a $install/usr/bin/fcitx-remote $fs/usr/bin/
+			cp -a $install/usr/bin/fcitx4-config $fs/usr/bin/
+			cp -a $install/usr/share/fcitx/addon/ $fs/usr/share/fcitx/
+			cp -a $install/usr/share/fcitx/configdesc/ $fs/usr/share/fcitx/
+			cp -a $install/usr/share/fcitx/data/ $fs/usr/share/fcitx/
+			cp -a $install/usr/share/fcitx/pinyin/ $fs/usr/share/fcitx/
+			cp -a $install/usr/share/fcitx/table/ $fs/usr/share/fcitx/
+			cp -a $install/usr/share/applications/*.desktop $fs/usr/share/applications/
+			cp -a $install/usr/share/icons/ $fs/usr/share/
+			;;
+		*-dev)
+			DEPENDS="libfcitx xorg-libX11-dev"
+			mkdir -p $fs/usr/lib/pkgconfig/ $fs/usr/share/
+			cp -a $install/usr/lib/libfcitx*.so $fs/usr/lib/
+			cp -a $install/usr/lib/pkgconfig/*.pc $fs/usr/lib/pkgconfig/
+			cp -a $install/usr/share/cmake/ $fs/usr/share/
+			cp -a $install/usr/include/ $fs/usr/
+			;;
+		*-skin-classic)
+			CAT="x-window|classic skin"
+			mkdir -p $fs/usr/share/fcitx/skin/
+			cp -a $install/usr/share/fcitx/skin/classic/ $fs/usr/share/fcitx/skin/
+			;;
+		*-skin-dark)
+			CAT="x-window|dark skin"
+			mkdir -p $fs/usr/share/fcitx/skin/
+			cp -a $install/usr/share/fcitx/skin/dark/ $fs/usr/share/fcitx/dark/
+			;;
+		*-skin-default)
+			CAT="x-window|default skin"
+			mkdir -p $fs/usr/share/fcitx/skin/
+			cp -a $install/usr/share/fcitx/skin/default $fs/usr/share/fcitx/skin/
+			;;
+		*-tools)
+			CAT="x-window|some tools"
+			DEPENDS="fcitx"
+			mkdir -p $fs/usr/bin/
+			cp -a $install/usr/bin/createPYMB $fs/usr/bin/
+			cp -a $install/usr/bin/readPYBase $fs/usr/bin/
+			cp -a $install/usr/bin/readPYMB $fs/usr/bin/
+			cp -a $install/usr/bin/mb2org $fs/usr/bin/
+			cp -a $install/usr/bin/mb2txt $fs/usr/bin/
+			cp -a $install/usr/bin/scel2org $fs/usr/bin/
+			cp -a $install/usr/bin/txt2mb $fs/usr/bin/
+			;;
+		libfcitx)
+			CAT="x-window|shared libraries"
+			mkdir -p $fs/usr/lib/fcitx/
+			cp -a $install/usr/lib/fcitx/*.so $fs/usr/lib/fcitx/
+			cp -a $install/usr/lib/libfcitx*.so.* $fs/usr/lib/
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e fcron/receipt
--- a/fcron/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fcron/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.4"
 CATEGORY="network"
 SHORT_DESC="Periodical command scheduler"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://fcron.free.fr/"
 
@@ -26,7 +26,7 @@
 		--with-sysfcrontab=yes \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/fcron $install/etc/init.d/fcron
 }
diff -r ad29ddfee1c9 -r d5aab818505e fdk-aac/receipt
--- a/fdk-aac/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fdk-aac/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/opencore-amr/$TARBALL"
 
-SPLIT="fdk-aac-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e fdutils/receipt
--- a/fdutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fdutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,14 +14,14 @@
 BUILD_DEPENDS="flex"
 
 compile_rules() {
-	mkdir -p $DESTDIR/etc
+	mkdir -p $install/etc
 	sed \
-		-e "s|^bindir.*|bindir = $DESTDIR/usr/bin|" \
-		-e "s|^sysconfdir.*|sysconfdir = $DESTDIR/etc|" \
+		-e "s|^bindir.*|bindir = $install/usr/bin|" \
+		-e "s|^sysconfdir.*|sysconfdir = $install/etc|" \
 		-i src/Makefile*
 
 	./configure $CONFIGURE_ARGS &&
-	make DESTDIR=$DESTDIR install-prog
+	make DESTDIR=$install install-prog
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e feedparser/receipt
--- a/feedparser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/feedparser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,21 @@
 VERSION="5.1.3"
 CATEGORY="misc"
 SHORT_DESC="Parse RSS and Atom feeds in Python"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://github.com/kurtmckee/feedparser"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/kurtmckee/feedparser"
 WGET_URL="http://feedparser.googlecode.com/files/$TARBALL"
 
-DEPENDS="libxml2 python"
 BUILD_DEPENDS="libxml2-dev python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib 
+genpkg_rules() {
+	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/python* $fs/usr/lib
+	DEPENDS="libxml2 python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e feh/receipt
--- a/feh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/feh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,44 +1,37 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="feh"
 VERSION="2.10"
 CATEGORY="graphics"
 SHORT_DESC="Lightweight and powerful image viewer and composer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://feh.finalrewind.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://feh.finalrewind.org/"
 WGET_URL="https://feh.finalrewind.org/$TARBALL"
-TAGS="image photo viewer"
 
-DEPENDS="imlib2 giblib jpeg libpng16 xorg-libX11 freetype xorg-libXau \
-xorg-libXdmcp xorg-libXext xorg-libXinerama libcurl"
 BUILD_DEPENDS="imlib2-dev giblib-dev xorg-xorgproto \
 xorg-libX11-dev libpng16-dev jpeg-dev curl-dev xorg-libXinerama-dev \
 xorg-libXt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i -e 's:/usr/local:/usr:g' config.mk &&
-	make && make DESTDIR=$DESTDIR install &&
+compile_rules() {
+	sed -i 's|/usr/local|/usr|g' config.mk
+
+	make &&
+	make DESTDIR=$install install || return 1
+
 	# Fix path to icon and remove from menu since it need a param to
 	# load images.
-	sed -i \
-		-e s'#/home/slitaz/wok/feh/install##' \
-		-e '/Categories.*/'d \
-		$DESTDIR/usr/share/applications/feh.desktop || return 1
+	sed \
+		-e 's|/home/slitaz/wok/feh/install||' \
+		-e '/Categories.*/d' \
+		-i $install/usr/share/applications/feh.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	mkdir -p $fs/usr/share/feh
-	mkdir -p $fs/usr/share/feh/fonts
-	mkdir -p $fs/usr/share/feh/images
-	
-	cp -a $install/usr/bin/feh $fs/usr/bin
-	cp -a $install/usr/share/feh/fonts $fs/usr/share/feh
-	cp -a $install/usr/share/feh/images $fs/usr/share/feh
+genpkg_rules() {
+	copy @std
+	DEPENDS="imlib2 giblib jpeg libpng16 xorg-libX11 freetype xorg-libXau \
+	xorg-libXdmcp xorg-libXext xorg-libXinerama libcurl"
+	TAGS="image photo viewer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fetchmail/receipt
--- a/fetchmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fetchmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,21 @@
 VERSION="6.3.26"
 CATEGORY="network"
 SHORT_DESC="Mail retrieval and forwarding utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.fetchmail.info/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="openssl-dev gettext"
+BUILD_DEPENDS="openssl-dev gettext-dev"
 
 compile_rules() {
 	./configure \
 		--with-ssl \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ffmpeg-compat/receipt
--- a/ffmpeg-compat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ffmpeg-compat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="ffmpeg-compat"
 VERSION="0.10.12"
 CATEGORY="multimedia"
-SHORT_DESC="Record, convert and stream audio and video (compatible libs version)."
+SHORT_DESC="Record, convert and stream audio and video (compatible libs version)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://ffmpeg.org/"
@@ -11,18 +11,15 @@
 TARBALL="ffmpeg-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
-BUILD_DEPENDS_arm="zlib-dev bzip2-dev yasm libsdl-dev"
 BUILD_DEPENDS="libsdl-dev zlib-dev bzip2-dev coreutils-file-format \
 coreutils-file-special yasm"
-SPLIT="ffmpeg-compat-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case "$ARCH" in
 		i?86)
-			ARCH_ARGS="--arch=$ARCH --cpu=$ARCH";;
-		arm*)
-			ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
-			--cross-prefix=$HOST_SYSTEM-";;
+			ARCH_ARGS="--arch=$ARCH --cpu=$ARCH"
+			;;
 		x86_64)
 			ARCH_ARGS="" #???
 			;;
@@ -53,7 +50,8 @@
 		--disable-debug \
 		--disable-doc \
 		$ARCH_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
@@ -62,9 +60,6 @@
 			mkdir -p $fs/usr/lib
 			cp -a $install/usr/lib/ffmpeg-compat $fs/usr/lib
 			DEPENDS="alsa-lib libsdl bzip2"
-			case "$SLITAZ_ARCH" in
-				arm*) DEPENDS="alsa-lib bzip2";;
-			esac
 			;;
 		*-dev)
 			mkdir -p $fs/usr
@@ -78,5 +73,5 @@
 }
 
 post_remove_ffmpeg_compat() {
-	sed -i '#/usr/lib/ffmpeg-compat#'d "$1/etc/ld.so.conf"
+	sed -i '/\/usr\/lib\/ffmpeg-compat/d' "$1/etc/ld.so.conf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ffmpeg/receipt
--- a/ffmpeg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ffmpeg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,17 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
-BUILD_DEPENDS_arm="zlib-dev bzip2-dev yasm"
 BUILD_DEPENDS="coreutils-file-format libass-dev fdk-aac-dev lame-dev opus-dev \
 libtheora-dev libvorbis-dev libvpx-dev x264-dev x265-dev xorg-libX11-dev \
 libsdl2-dev yasm"
-SPLIT="ffplay ffserver ffmpeg-dev ffmpeg"
+SPLIT="ffplay ffserver $PACKAGE-dev $PACKAGE"
 
 compile_rules() {
 	case "$ARCH" in
-		i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH" ;;
-		arm*) ARCH_ARGS="--enable-cross-compile --arch=armel --target-os=linux \
-			--cross-prefix=$HOST_SYSTEM-" ;;
+		i?86) ARCH_ARGS="--arch=$ARCH --cpu=$ARCH";;
 	esac
 
 	sed -i 's|-lflite"|-lflite -lasound"|' configure
@@ -85,9 +82,6 @@
 			TAGS="audio video convert stream"
 			DEPENDS="bzlib fdk-aac freetype lame libass liblzma libtheora-enc \
 			libvorbis libvpx opus x264 x265 xorg-libxcb zlib"
-			case "$SLITAZ_ARCH" in
-				arm*) DEPENDS="alsa-lib bzip2 zlib" ;;
-			esac
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e ffmpegthumbnailer/receipt
--- a/ffmpegthumbnailer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ffmpegthumbnailer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,11 @@
 WGET_URL="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake libjpeg-turbo-dev zlib-dev libpng16-dev ffmpeg-dev"
-SPLIT="ffmpegthumbnailer-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
+compile_rules() {
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -25,21 +24,19 @@
 		-DENABLE_THUMBNAILER=ON \
 		.. &&
 	make &&
-	make install &&
+	make install || return 1
 
 	addtypes="video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;application/mxf;\vid\
 eo/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v\
 -es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/v\
 nd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;\
 video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;vid\
-eo/x-ogm+ogg;video/x-theora+ogg;" &&
+eo/x-ogm+ogg;video/x-theora+ogg;"
 	sed -i "/MimeType=/ s|\$|$addtypes|" \
 		$install/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		ffmpegthumbnailer)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e fftw/receipt
--- a/fftw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fftw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.3.6-pl2"
 CATEGORY="multimedia"
 SHORT_DESC="A library for computing the discrete Fourier transform (DFT)"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.fftw.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/fftw.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.fftw.org/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="fftw-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# --enable-threads: ardour need it: cannot find -lfftw3f_threads
@@ -26,7 +26,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	# build long double precission (fftw3l)
 	make clean
@@ -38,7 +38,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	# build single precision (fftw3f)
 	make clean
@@ -50,7 +50,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e file/receipt
--- a/file/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/file/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.34"
 CATEGORY="system-tools"
 SHORT_DESC="Determines file type using 'magic' numbers"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/file/file"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/file.html"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/file/file/archive/FILE${VERSION/./_}.tar.gz"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="automake libtool zlib-dev python"
 SPLIT="libmagic libmagic-dev python-magic"
 
@@ -22,13 +21,14 @@
 		--libdir=/usr/lib \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	rmdir --ignore-fail-on-non-empty $install/usr/share/man/man5/
 
 	cd python
-	python setup.py build &&
-	python setup.py install --root=$install
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 # Be sure it as cross compile.
diff -r ad29ddfee1c9 -r d5aab818505e filezilla/receipt
--- a/filezilla/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/filezilla/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="3.7.3"
 CATEGORY="network"
 SHORT_DESC="FTP Client"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://filezilla-project.org/"
 
 TARBALL="FileZilla_${VERSION}_src.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="xdg-utils gettext wxWidgets28-dev gnutls-dev libidn-dev \
+BUILD_DEPENDS="xdg-utils gettext-dev wxWidgets28-dev gnutls-dev libidn-dev \
 sqlite3-dev"
 
 compile_rules() {
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e findutils/receipt
--- a/findutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/findutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.6.0"
 CATEGORY="utilities"
 SHORT_DESC="GNU utilities and tools to find/locate"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/findutils/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/findutils.html"
diff -r ad29ddfee1c9 -r d5aab818505e firefox-langpack/receipt
--- a/firefox-langpack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firefox-langpack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,13 @@
 SHORT_DESC="Firefox language pack"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL2"
-WEB_SITE="http://www.mozilla.org/firefox"
+WEB_SITE="https://www.mozilla.org/en-US/firefox/"
 HOST_ARCH="any"
 REPOLOGY="-"
 
-SPLIT="$PACKAGE-da $PACKAGE-de $PACKAGE-en_GB $PACKAGE-es_ES $PACKAGE-fr \
-$PACKAGE-id $PACKAGE-it $PACKAGE-pt_BR $PACKAGE-pt_PT $PACKAGE-ru \
+SPLIT="\
+$PACKAGE-da    $PACKAGE-de    $PACKAGE-en_GB $PACKAGE-es_ES $PACKAGE-fr \
+$PACKAGE-id    $PACKAGE-it    $PACKAGE-pt_BR $PACKAGE-pt_PT $PACKAGE-ru \
 $PACKAGE-zh_CN $PACKAGE-zh_TW"
 COOKOPTS="!strip" # waste of time to search, nothing to strip
 
diff -r ad29ddfee1c9 -r d5aab818505e firefox-official/receipt
--- a/firefox-official/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firefox-official/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,14 @@
 SHORT_DESC="Official Firefox build by the Mozilla foundation"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MPL2"
-WEB_SITE="http://www.mozilla.org/firefox"
+WEB_SITE="https://www.mozilla.org/en-US/firefox/"
 REPOLOGY="firefox"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="firefox-${ARCH/i486/i686}-en-US-$VERSION.tar.bz2"
 WGET_URL="http://ftp.mozilla.org/pub/firefox/releases/$VERSION/linux-${ARCH/i486/i686}/en-US/firefox-$VERSION.tar.bz2"
 
-fo='firefox-official'
-SPLIT="$fo-de:de $fo-es:es $fo-fr:fr $fo-it:it $fo-pt-BR:pt-BR $fo-ru:ru \
-$fo-uk:uk"
+SPLIT="$PACKAGE-de:de $PACKAGE-es:es $PACKAGE-fr:fr $PACKAGE-it:it \
+$PACKAGE-pt-BR:pt-BR $PACKAGE-ru:ru $PACKAGE-uk:uk"
 
 compile_rules() {
 	case $SET in
@@ -30,7 +28,6 @@
 	[ -e "$SRC/$TARBALL" ] || wget -O $SRC/$TARBALL $WGET_URL
 	tar -xf $SRC/$TARBALL 2>/dev/null
 
-
 	# Installation path
 	fx='/opt/mozilla/firefox'
 
diff -r ad29ddfee1c9 -r d5aab818505e firefox/receipt
--- a/firefox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firefox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,23 +3,20 @@
 PACKAGE="firefox"
 VERSION="17.0.11esr"
 CATEGORY="network"
-SHORT_DESC="User friendly, secure and fast web browser."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="User friendly, secure and fast web browser"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL2"
+WEB_SITE="https://www.mozilla.org/en-US/firefox/"
+
 TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
-WEB_SITE="http://www.mozilla.org/firefox"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL"
-TAGS="web-browser"
 
-DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \
-alsa-lib xorg-libXt libevent libvpx pango nss libfirefox"
 BUILD_DEPENDS="zip libidl coreutils findutils wireless_tools-dev \
 perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev \
-dbus-glib-dev gtk2-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip"
-SPLIT="firefox firefox-dev libfirefox"
+dbus-glib-dev gtk2-dev glib-dev pango-dev nss-dev sqlite3-dev tar gzip \
+libjpeg-turbo-dev"
+SPLIT="$PACKAGE-dev libfirefox"
 
-# Rules to configure and make the package.
-#
 # A long compile time... dont forget to build libidl before and check the
 # .mozconfig file from the stuff and the stuff/README document.
 #
@@ -27,8 +24,7 @@
 # build time.
 # At least 2.5 GB free disk space
 
-compile_rules()
-{
+compile_rules() {
 	# load mozconfig
 	cp -a $stuff/mozconfig $src
 
@@ -46,7 +42,7 @@
 	fn2="$tarpath/firefox-${VERSION%esr}.en-US.linux-$(uname -m).tar.bz2"
 	[ -e "$fn1" ] && tarball="$fn1" && echo "$ARCH tarball found"
 	[ -e "$fn2" ] && tarball="$fn2" && echo "$(uname -m) tarball found"
-	[ -z "$tarball" ] && echo "ERROR: tarball not found" && exit 1
+	[ -z "$tarball" ] && echo "ERROR: tarball not found" && return 1
 	# extract tarball
 	mkdir -p $install/usr/lib/firefox-$VERSION &&
 	tar -xvf $tarball -C $install/usr/lib/firefox-$VERSION \
@@ -61,138 +57,135 @@
 	ln -sf ../mozilla/plugins $install/usr/lib/firefox-$VERSION
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	firefox)
-		# program
-		mkdir -p $fs/usr/lib &&
-		cp -a $install/usr/lib/$PACKAGE-$VERSION $fs/usr/lib &&
-		cp -a $install/usr/lib/mozilla $fs/usr/lib &&
-		cp -a $install/usr/bin $fs/usr
+		firefox)
+			# program
+			mkdir -p $fs/usr/lib &&
+			cp -a $install/usr/lib/$PACKAGE-$VERSION $fs/usr/lib &&
+			cp -a $install/usr/lib/mozilla $fs/usr/lib &&
+			cp -a $install/usr/bin $fs/usr
 
-		# search Plugin (by: oddball)
-		cp -a $stuff/searchplugins $fs/usr/lib/$PACKAGE-$VERSION
+			# search Plugin (by: oddball)
+			cp -a $stuff/searchplugins $fs/usr/lib/$PACKAGE-$VERSION
 
-		# prefs
-		mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/distribution &&
-		cp -a $stuff/distribution.ini $fs/usr/lib/$PACKAGE-$VERSION/distribution
+			# prefs
+			mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/distribution &&
+			cp -a $stuff/distribution.ini $fs/usr/lib/$PACKAGE-$VERSION/distribution
 
-		# mozilla-common files
-		# dictionaries
-		rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries &&
-		ln -sf ../mozilla-common-$VERSION/dictionaries \
-			$fs/usr/lib/$PACKAGE-$VERSION/dictionaries
-		# plugin-container
-		rm -f $fs/usr/lib/$PACKAGE-$VERSION/plugin-container &&
-		ln -sf ../mozilla-common-$VERSION/plugin-container \
-			$fs/usr/lib/$PACKAGE-$VERSION/plugin-container
-		# mozilla-xremote-client
-		rm -f $fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client &&
-		ln -sf ../mozilla-common-$VERSION/mozilla-xremote-client \
-			$fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client
-		# components/libdbusservice.so
-		# components/libmozgnome.so
-		for file in libdbusservice.so libmozgnome.so; do
-			rm -f $fs/usr/lib/$PACKAGE-$VERSION/components/$file &&
-			ln -sf ../../mozilla-common-$VERSION/components/$file \
-				$fs/usr/lib/$PACKAGE-$VERSION/components/$file
-		done
-		# chrome.manifest
-		rm -f $fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest &&
-		ln -sf ../mozilla-common-$VERSION/chrome.manifest \
-			$fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest
+			# mozilla-common files
+			# dictionaries
+			rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries &&
+			ln -sf ../mozilla-common-$VERSION/dictionaries \
+				$fs/usr/lib/$PACKAGE-$VERSION/dictionaries
+			# plugin-container
+			rm -f $fs/usr/lib/$PACKAGE-$VERSION/plugin-container &&
+			ln -sf ../mozilla-common-$VERSION/plugin-container \
+				$fs/usr/lib/$PACKAGE-$VERSION/plugin-container
+			# mozilla-xremote-client
+			rm -f $fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client &&
+			ln -sf ../mozilla-common-$VERSION/mozilla-xremote-client \
+				$fs/usr/lib/$PACKAGE-$VERSION/mozilla-xremote-client
+			# components/libdbusservice.so
+			# components/libmozgnome.so
+			for file in libdbusservice.so libmozgnome.so; do
+				rm -f $fs/usr/lib/$PACKAGE-$VERSION/components/$file &&
+				ln -sf ../../mozilla-common-$VERSION/components/$file \
+					$fs/usr/lib/$PACKAGE-$VERSION/components/$file
+			done
+			# chrome.manifest
+			rm -f $fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest &&
+			ln -sf ../mozilla-common-$VERSION/chrome.manifest \
+				$fs/usr/lib/$PACKAGE-$VERSION/chrome.manifest
 
-		# run-mozilla.sh
-		rm -f $fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh &&
-		ln -sf ../mozilla-common-$VERSION/run-mozilla.sh \
-			$fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh
+			# run-mozilla.sh
+			rm -f $fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh &&
+			ln -sf ../mozilla-common-$VERSION/run-mozilla.sh \
+				$fs/usr/lib/$PACKAGE-$VERSION/run-mozilla.sh
 
-		# libmozalloc.so
-		rm -f $fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so &&
-		ln -sf ../mozilla-common-$VERSION/libmozalloc.so \
-			$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
+			# libmozalloc.so
+			rm -f $fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so &&
+			ln -sf ../mozilla-common-$VERSION/libmozalloc.so \
+				$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
 
-		chown -R root.root $fs
-		;;
-	firefox-dev)
-		CAT="development|firefox devel files"
-		DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk \
-			glib xorg-libXt xorg-libXinerama \
-			xorg-libXcursor xorg-libXcomposite xorg-libXext \
+			chown -R root.root $fs
+			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
+			xorg-libXdamage alsa-lib xorg-libXt libevent libvpx pango nss \
+			libfirefox"
+			TAGS="web-browser"
+			;;
+		*-dev)
+			DEPENDS="alsa-lib sqlite3 cairo dbus-glib pango atk glib xorg-libXt \
+			xorg-libXinerama xorg-libXcursor xorg-libXcomposite xorg-libXext \
 			xorg-libXdamage xorg-libxcb xorg-libSM xorg-libICE"
-		mkdir -p $fs/usr/include/$WANTED-$VERSION &&
-		cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
+			mkdir -p $fs/usr/include/$WANTED-$VERSION
+			cp -rL $src/obj-firefox/dist/include/* $fs/usr/include/$WANTED-$VERSION
 
-		mkdir -p $fs/usr/lib/$WANTED-devel/sdk/bin/ply &&
-		cp -rL $src/obj-firefox/dist/sdk/bin/*.py \
-			$fs/usr/lib/$WANTED-devel/sdk/bin &&
-		cp -rL $src/obj-firefox/dist/sdk/bin/ply/*.py \
-			$fs/usr/lib/$WANTED-devel/sdk/bin/ply &&
-		mkdir -p $fs/usr/lib/$WANTED-devel/sdk/lib &&
-		cp -rL $src/obj-firefox/dist/sdk/lib/* \
-			$fs/usr/lib/$WANTED-devel/sdk/lib
+			mkdir -p $fs/usr/lib/$WANTED-devel/sdk/bin/ply
+			cp -rL $src/obj-firefox/dist/sdk/bin/*.py \
+				$fs/usr/lib/$WANTED-devel/sdk/bin
+			cp -rL $src/obj-firefox/dist/sdk/bin/ply/*.py \
+				$fs/usr/lib/$WANTED-devel/sdk/bin/ply
+			mkdir -p $fs/usr/lib/$WANTED-devel/sdk/lib
+			cp -rL $src/obj-firefox/dist/sdk/lib/* \
+				$fs/usr/lib/$WANTED-devel/sdk/lib
 
-#		mkdir -v $fs/usr/include/$WANTED-$VERSION/npapi &&
-#		cp -a $src/dom/plugins/base/*.h $fs/usr/include/$WANTED-$VERSION/npapi
+			# mkdir -v $fs/usr/include/$WANTED-$VERSION/npapi
+			# cp -a $src/dom/plugins/base/*.h $fs/usr/include/$WANTED-$VERSION/npapi
 
-		# /usr/share/idl folder should also be in firefox-dev
-		mkdir -p $fs/usr/share/$WANTED-$VERSION/idl &&
-		cp -rL $src/obj-firefox/dist/idl/* $fs/usr/share/$WANTED-$VERSION/idl
+			# /usr/share/idl folder should also be in firefox-dev
+			mkdir -p $fs/usr/share/$WANTED-$VERSION/idl
+			cp -rL $src/obj-firefox/dist/idl/* $fs/usr/share/$WANTED-$VERSION/idl
 
-		# copy missing *.pc files
-		mkdir -p $fs/usr/lib/pkgconfig &&
-		cp -a $stuff/*.pc $fs/usr/lib/pkgconfig &&
-		# fix version
-		sed -i "s/VERSION/$VERSION/" $fs/usr/lib/pkgconfig/*
-		;;
-	libfirefox)
-		CAT="network|firefox/thunderbird common files"
-		DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
+			# copy missing *.pc files
+			mkdir -p $fs/usr/lib/pkgconfig
+			cp -a $stuff/*.pc $fs/usr/lib/pkgconfig
+			# fix version
+			sed -i "s/VERSION/$VERSION/" $fs/usr/lib/pkgconfig/*
+			;;
+		libfirefox)
+			CAT="network|firefox/thunderbird common files"
+			DEPENDS="gtk2 sqlite3 dbus dbus-glib glib jpeg xorg-libX11 \
 			xorg-libXdamage alsa-lib xorg-libXt"
-		# dictionaries/en-US.aff
-		# dictionaries/en-US.dic
-		mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
-#		cp -a $install/usr/lib/firefox-$VERSION/dictionaries \
-#			$fs/usr/lib/mozilla-common-$VERSION
+			# dictionaries/en-US.aff
+			# dictionaries/en-US.dic
+			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/dictionaries
+			# cp -a $install/usr/lib/firefox-$VERSION/dictionaries \
+			# $fs/usr/lib/mozilla-common-$VERSION
 
-		# plugin-container
-		cp -a $install/usr/lib/firefox-$VERSION/plugin-container \
-			$fs/usr/lib/mozilla-common-$VERSION
+			# plugin-container
+			cp -a $install/usr/lib/firefox-$VERSION/plugin-container \
+				$fs/usr/lib/mozilla-common-$VERSION
 
-		# mozilla-xremote-client
-		cp -a $install/usr/lib/firefox-$VERSION/mozilla-xremote-client \
-			$fs/usr/lib/mozilla-common-$VERSION
+			# mozilla-xremote-client
+			cp -a $install/usr/lib/firefox-$VERSION/mozilla-xremote-client \
+				$fs/usr/lib/mozilla-common-$VERSION
 
-		# components/libdbusservice.so
-		# components/libmozgnome.so
-		mkdir -p $fs/usr/lib/mozilla-common-$VERSION/components
-		for file in libdbusservice.so libmozgnome.so; do
-			cp -a $install/usr/lib/firefox-$VERSION/components/$file \
-			$fs/usr/lib/mozilla-common-$VERSION/components
-		done
+			# components/libdbusservice.so
+			# components/libmozgnome.so
+			mkdir -p $fs/usr/lib/mozilla-common-$VERSION/components
+			for file in libdbusservice.so libmozgnome.so; do
+				cp -a $install/usr/lib/firefox-$VERSION/components/$file \
+				$fs/usr/lib/mozilla-common-$VERSION/components
+			done
 
-		# chrome.manifest
-		cp -a $install/usr/lib/firefox-$VERSION/chrome.manifest \
-			$fs/usr/lib/mozilla-common-$VERSION
+			# chrome.manifest
+			cp -a $install/usr/lib/firefox-$VERSION/chrome.manifest \
+				$fs/usr/lib/mozilla-common-$VERSION
 
-		# run-mozilla.sh
-		cp -a $install/usr/lib/firefox-$VERSION/run-mozilla.sh \
-			$fs/usr/lib/mozilla-common-$VERSION
+			# run-mozilla.sh
+			cp -a $install/usr/lib/firefox-$VERSION/run-mozilla.sh \
+				$fs/usr/lib/mozilla-common-$VERSION
 
-		# libmozalloc.so
-		cp -a $install/usr/lib/firefox-$VERSION/libmozalloc.so \
-			$fs/usr/lib/mozilla-common-$VERSION
-		;;
+			# libmozalloc.so
+			cp -a $install/usr/lib/firefox-$VERSION/libmozalloc.so \
+				$fs/usr/lib/mozilla-common-$VERSION
+			;;
 	esac
 }
 
-# Pre and post install commands for Tazpkg.
-post_install_firefox_dev()
-{
-	for i in usr/share/idl/firefox- usr/include/firefox- \
-		usr/lib/firefox-devel- ; do
+post_install_firefox_dev() {
+	for i in usr/share/idl/firefox- usr/include/firefox- usr/lib/firefox-devel-; do
 		for j in $(ls -d "$1"/$i* 2>/dev/null); do
 			[ "${j##*-}" = "$VERSION" ] && continue
 			[ ! -d "$j" ] || rm -rf "$j"
diff -r ad29ddfee1c9 -r d5aab818505e firejail/receipt
--- a/firejail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firejail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e firmware-mod-kit/receipt
--- a/firmware-mod-kit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firmware-mod-kit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="firmware-mod-kit"
 VERSION="099"
 CATEGORY="misc"
-SHORT_DESC="Scripts and utilities to rebuild openwrt based images."
+SHORT_DESC="Scripts and utilities to rebuild openwrt based images"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/rampageX/firmware-mod-kit/wiki"
@@ -11,21 +11,18 @@
 TARBALL="fmk_$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$PACKAGE/$TARBALL"
 
-DEPENDS="liblzma zlib bash python-magic coreutils-file-special"
 BUILD_DEPENDS="xz-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
-	./configure $CONFIGURE_ARGS && make -j1
+	./configure $CONFIGURE_ARGS &&
+	make -j1 || return 1
 
 	mkdir -p $install/usr/share
 	cp -a $src $install/usr/share/firmware-mod-kit
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="liblzma zlib bash python-magic coreutils-file-special"
 }
diff -r ad29ddfee1c9 -r d5aab818505e firmware/receipt
--- a/firmware/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/firmware/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,43 +17,72 @@
 # Package name matched to kernel module.
 # For example, firmware-b43 contains firmware for b43 kernel module.
 f='firmware'
-SPLIT="$f-acenic $f-af9013 $f-aic94xx $f-amdgpu $f-ar5523 $f-at76c50x-usb \
-$f-ath10k_pci $f-ath3k $f-ath6kl_sdio $f-ath6kl_usb $f-ath9k_htc $f-atmel \
-$f-b43 $f-b43legacy $f-bcm203x $f-bfusb $f-bna $f-bnx2 $f-bnx2x $f-brcmfmac \
-$f-brcmsmac $f-bt3c_cs $f-btintel $f-btmrvl_sdio $f-carl9170 $f-cassini \
-$f-cpia2 $f-cx18 $f-cx231xx $f-cx23885 $f-cx24117 $f-cx25840 $f-cxgb3 $f-cxgb4 \
-$f-daqboard2000 $f-drx39xyj $f-ds3000 $f-dvb-ttpci $f-dvb-ttusb-budget \
-$f-dvb-usb-af9015 $f-dvb-usb-af9035 $f-dvb-usb-az6007 $f-dvb-usb-dib0700 \
-$f-dvb-usb-dw2102 $f-dvb-usb-ec168 $f-dvb-usb-lmedm04 $f-e100 $f-emi26 \
-$f-emi62 $f-go7007 $f-go7007-loader $f-gspca_vicam $f-i1480-dfu-usb \
-$f-i2400m-usb $f-i915 $f-io_edgeport $f-io_ti $f-ipw2100 $f-ipw2200 $f-isci \
-$f-isight_$f $f-ivtv $f-iwl3945 $f-iwl4965 $f-iwlwifi $f-jr3_pci $f-kaweth \
-$f-keyspan $f-keyspan_pda $f-lgs8gxx $f-libertas_cs $f-libertas_sdio \
-$f-libertas_tf_usb $f-m88ds3103 $f-me4000 $f-me_daq $f-mga $f-mn88472 \
-$f-mn88473 $f-mt7601u $f-mwifiex_sdio $f-mwifiex_usb $f-mwl8k $f-myri10ge \
-$f-netxen_nic $f-ni_pcidio $f-nouveau $f-orinoco $f-orinoco_usb $f-p54pci \
-$f-p54usb $f-pcnet_cs $f-prism2_usb $f-pvrusb2 $f-qat_dh895xcc $f-qed \
-$f-qlcnic $f-r128 $f-r8169 $f-r8192e_pci $f-r8192u_usb $f-r8712u $f-radeon \
-$f-rsi_sdio $f-rsi_usb $f-rt2800pci $f-rt2800usb $f-rt61pci $f-rt73usb \
-$f-rtl8188ee $f-rtl8192ce $f-rtl8192cu $f-rtl8192de $f-rtl8192ee $f-rtl8192se \
-$f-rtl8723ae $f-rtl8723be $f-rtl8821ae $f-rtl8xxxu $f-s2255drv \
-$f-saa7134-go7007 $f-serial_cs $f-si2157 $f-si2165 $f-si2168 $f-slicoss \
-$f-smc91c92_cs $f-smsmdtv $f-snd-asihpi $f-snd-cs46xx $f-snd-darla20 \
-$f-snd-darla24 $f-snd-echo3g $f-snd-emu10k1 $f-snd-gina20 $f-snd-gina24 \
-$f-snd-hda-codec-ca0132 $f-snd-hdsp $f-snd-indigo $f-snd-indigodj \
-$f-snd-indigodjx $f-snd-indigoio $f-snd-indigoiox $f-snd-korg1212 \
-$f-snd-layla20 $f-snd-layla24 $f-snd-maestro3 $f-snd-mia $f-snd-mixart \
-$f-snd-mona $f-snd-pcxhr $f-snd-riptide $f-snd-usb-6fire $f-snd-vx-lib \
-$f-snd-ymfpci $f-speedfax $f-starfire $f-tda10071 $f-tehuti $f-tg3 \
-$f-ti_usb_3410_5052 $f-tuner-xc2028 $f-typhoon $f-ueagle-atm $f-usb8xxx \
-$f-usbdux $f-usbduxfast $f-usbduxsigma $f-wcn36xx $f-wd719x $f-whiteheat \
-$f-wil6210 $f-wl1251 $f-wl12xx $f-wl18xx $f-xc4000 $f-xc5000 $f-zd1201 \
-$f-zd1211rw \
-$f-atheros $f-rt2x00 $f-rtlnic $f-rtlwifi"
+SPLIT="\
+$PACKAGE-acenic          $PACKAGE-af9013           $PACKAGE-aic94xx \
+$PACKAGE-amdgpu          $PACKAGE-ar5523           $PACKAGE-at76c50x-usb \
+$PACKAGE-ath10k_pci      $PACKAGE-ath3k            $PACKAGE-ath6kl_sdio \
+$PACKAGE-ath6kl_usb      $PACKAGE-ath9k_htc        $PACKAGE-atmel \
+$PACKAGE-b43             $PACKAGE-b43legacy        $PACKAGE-bcm203x \
+$PACKAGE-bfusb           $PACKAGE-bna              $PACKAGE-bnx2 \
+$PACKAGE-bnx2x           $PACKAGE-brcmfmac         $PACKAGE-brcmsmac \
+$PACKAGE-bt3c_cs         $PACKAGE-btintel          $PACKAGE-btmrvl_sdio \
+$PACKAGE-carl9170        $PACKAGE-cassini          $PACKAGE-cpia2 \
+$PACKAGE-cx18            $PACKAGE-cx231xx          $PACKAGE-cx23885 \
+$PACKAGE-cx24117         $PACKAGE-cx25840          $PACKAGE-cxgb3 \
+$PACKAGE-cxgb4           $PACKAGE-daqboard2000     $PACKAGE-drx39xyj \
+$PACKAGE-ds3000          $PACKAGE-dvb-ttpci        $PACKAGE-dvb-ttusb-budget \
+$PACKAGE-dvb-usb-af9015  $PACKAGE-dvb-usb-af9035   $PACKAGE-dvb-usb-az6007 \
+$PACKAGE-dvb-usb-dib0700 $PACKAGE-dvb-usb-dw2102   $PACKAGE-dvb-usb-ec168 \
+$PACKAGE-dvb-usb-lmedm04 $PACKAGE-e100             $PACKAGE-emi26 \
+$PACKAGE-emi62           $PACKAGE-go7007           $PACKAGE-go7007-loader \
+$PACKAGE-gspca_vicam     $PACKAGE-i1480-dfu-usb    $PACKAGE-i2400m-usb \
+$PACKAGE-i915            $PACKAGE-io_edgeport      $PACKAGE-io_ti \
+$PACKAGE-ipw2100         $PACKAGE-ipw2200          $PACKAGE-isci \
+$PACKAGE-isight_firmware $PACKAGE-ivtv             $PACKAGE-iwl3945 \
+$PACKAGE-iwl4965         $PACKAGE-iwlwifi          $PACKAGE-jr3_pci \
+$PACKAGE-kaweth          $PACKAGE-keyspan          $PACKAGE-keyspan_pda \
+$PACKAGE-lgs8gxx         $PACKAGE-libertas_cs      $PACKAGE-libertas_sdio \
+$PACKAGE-libertas_tf_usb $PACKAGE-m88ds3103        $PACKAGE-me4000 \
+$PACKAGE-me_daq          $PACKAGE-mga              $PACKAGE-mn88472 \
+$PACKAGE-mn88473         $PACKAGE-mt7601u          $PACKAGE-mwifiex_sdio \
+$PACKAGE-mwifiex_usb     $PACKAGE-mwl8k            $PACKAGE-myri10ge \
+$PACKAGE-netxen_nic      $PACKAGE-ni_pcidio        $PACKAGE-nouveau \
+$PACKAGE-orinoco         $PACKAGE-orinoco_usb      $PACKAGE-p54pci \
+$PACKAGE-p54usb          $PACKAGE-pcnet_cs         $PACKAGE-prism2_usb \
+$PACKAGE-pvrusb2         $PACKAGE-qat_dh895xcc     $PACKAGE-qed \
+$PACKAGE-qlcnic          $PACKAGE-r128             $PACKAGE-r8169 \
+$PACKAGE-r8192e_pci      $PACKAGE-r8192u_usb       $PACKAGE-r8712u \
+$PACKAGE-radeon          $PACKAGE-rsi_sdio         $PACKAGE-rsi_usb \
+$PACKAGE-rt2800pci       $PACKAGE-rt2800usb        $PACKAGE-rt61pci \
+$PACKAGE-rt73usb         $PACKAGE-rtl8188ee        $PACKAGE-rtl8192ce \
+$PACKAGE-rtl8192cu       $PACKAGE-rtl8192de        $PACKAGE-rtl8192ee \
+$PACKAGE-rtl8192se       $PACKAGE-rtl8723ae        $PACKAGE-rtl8723be \
+$PACKAGE-rtl8821ae       $PACKAGE-rtl8xxxu         $PACKAGE-s2255drv \
+$PACKAGE-saa7134-go7007  $PACKAGE-serial_cs        $PACKAGE-si2157 \
+$PACKAGE-si2165          $PACKAGE-si2168           $PACKAGE-slicoss \
+$PACKAGE-smc91c92_cs     $PACKAGE-smsmdtv          $PACKAGE-snd-asihpi \
+$PACKAGE-snd-cs46xx      $PACKAGE-snd-darla20      $PACKAGE-snd-darla24 \
+$PACKAGE-snd-echo3g      $PACKAGE-snd-emu10k1      $PACKAGE-snd-gina20 \
+$PACKAGE-snd-gina24      $PACKAGE-snd-hda-codec-ca0132 $PACKAGE-snd-hdsp \
+$PACKAGE-snd-indigo      $PACKAGE-snd-indigodj     $PACKAGE-snd-indigodjx \
+$PACKAGE-snd-indigoio    $PACKAGE-snd-indigoiox    $PACKAGE-snd-korg1212 \
+$PACKAGE-snd-layla20     $PACKAGE-snd-layla24      $PACKAGE-snd-maestro3 \
+$PACKAGE-snd-mia         $PACKAGE-snd-mixart       $PACKAGE-snd-mona \
+$PACKAGE-snd-pcxhr       $PACKAGE-snd-riptide      $PACKAGE-snd-usb-6fire \
+$PACKAGE-snd-vx-lib      $PACKAGE-snd-ymfpci       $PACKAGE-speedfax \
+$PACKAGE-starfire        $PACKAGE-tda10071         $PACKAGE-tehuti \
+$PACKAGE-tg3             $PACKAGE-ti_usb_3410_5052 $PACKAGE-tuner-xc2028 \
+$PACKAGE-typhoon         $PACKAGE-ueagle-atm       $PACKAGE-usb8xxx \
+$PACKAGE-usbdux          $PACKAGE-usbduxfast       $PACKAGE-usbduxsigma \
+$PACKAGE-wcn36xx         $PACKAGE-wd719x           $PACKAGE-whiteheat \
+$PACKAGE-wil6210         $PACKAGE-wl1251           $PACKAGE-wl12xx \
+$PACKAGE-wl18xx          $PACKAGE-xc4000           $PACKAGE-xc5000 \
+$PACKAGE-zd1201          $PACKAGE-zd1211rw \
+\
+$PACKAGE-atheros         $PACKAGE-rt2x00           $PACKAGE-rtlnic \
+$PACKAGE-rtlwifi"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# mainline linux kernel firmware
 	make install
 	mkdir -p $install/usr/share/licenses
@@ -109,7 +138,9 @@
 			bfusb)
 				cp *.frm $fdir;;
 			alsa-firmware)
-				./configure $CONFIGURE_ARGS && make && make install;;
+				./configure $CONFIGURE_ARGS &&
+				make &&
+				make install;;
 		esac
 
 	done <<EOT
@@ -141,7 +172,6 @@
 	find $install -type d -exec chmod 755 '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules() {
 	module=${PACKAGE#*-}
 	case $module in
diff -r ad29ddfee1c9 -r d5aab818505e fish/receipt
--- a/fish/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fish/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.0"
 CATEGORY="system-tools"
 SHORT_DESC="The Friendly Interactive SHell"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://fishshell.com/"
 
@@ -12,15 +12,15 @@
 WGET_URL="https://github.com/fish-shell/fish-shell/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev"
-SPLIT="fish-doc"
+SPLIT="$PACKAGE-doc"
 
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		fish)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e flac/receipt
--- a/flac/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flac/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.3.2"
 CATEGORY="multimedia"
 SHORT_DESC="FLAC stands for Free Lossless Audio Codec"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
-WEB_SITE="http://flac.sourceforge.net/"
+WEB_SITE="https://xiph.org/flac/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://downloads.xiph.org/releases/flac/$TARBALL"
 TARBALL_SHA256="91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f"
 
 BUILD_DEPENDS="libogg-dev"
-SPLIT="flac-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# gcc4 fix: http://bugs.gentoo.org/199579
diff -r ad29ddfee1c9 -r d5aab818505e flam3/receipt
--- a/flam3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flam3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="graphics"
 SHORT_DESC="Tools to create/display fractal flames: algorithmically generated \
 images and animations"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://flam3.com/"
 
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/scottdraves/flam3/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="expat-dev libjpeg-turbo-dev libpng16-dev libxml2-dev"
-SPLIT="flam3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR -j1 install
+	make DESTDIR=$install -j1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e flashrom/receipt
--- a/flashrom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flashrom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,25 @@
 PACKAGE="flashrom"
 VERSION="0.9.6.1"
 CATEGORY="misc"
-SHORT_DESC="tility Identify, read, write, verify and erase flash chips."
+SHORT_DESC="Identify, read, write, verify and erase flash chips"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://flashrom.org/Flashrom"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://flashrom.org/"
 WGET_URL="http://download.flashrom.org/releases/$TARBALL"
 
-DEPENDS="pciutils"
 BUILD_DEPENDS="pciutils-dev zlib-dev libftdi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|/usr/local$|/usr|' Makefile
-	make && make DESTDIR=$DESTDIR install
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="pciutils"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e flatpress/receipt
--- a/flatpress/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flatpress/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="flatpress"
 VERSION="0.1010.2"
 CATEGORY="network"
-SHORT_DESC="Blog engine without SQL."
+SHORT_DESC="Blog engine without SQL"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://flatpress.org/home/"
+
 TARBALL="$PACKAGE-$VERSION-sotto-voce.tar.bz2"
-WEB_SITE="http://flatpress.org/home/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="php"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/var/www/$PACKAGE
-	cp -a $src/* $DESTDIR/var/www/$PACKAGE
-	chown -R 80.80 $DESTDIR/var/www/$PACKAGE
+compile_rules() {
+	mkdir -p $install/var/www/$PACKAGE
+	cp -a $src/* $install/var/www/$PACKAGE
+	chown -R 80.80 $install/var/www/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e flex/receipt
--- a/flex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="flex"
 VERSION="2.6.4"
 CATEGORY="development"
-SHORT_DESC="Flex is a fast lexical analyser generator"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Fast lexical analyser generator"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/westes/flex"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/flex.html"
@@ -13,17 +13,11 @@
 WGET_URL="$WEB_SITE/releases/download/v$VERSION/$TARBALL"
 TARBALL_MD5="2882e3179748cc9f9c23ec593d6adc8d"
 
-BUILD_DEPENDS="bison gettext help2man indent"
+BUILD_DEPENDS="bison gettext-dev help2man indent"
 
-SPLIT="libflex flex"
+SPLIT="libflex $PACKAGE"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			export ac_cv_func_malloc_0_nonnull=yes
-			export ac_cv_func_realloc_0_nonnull=yes
-	esac
-
 	# Fix a problem introduced with glibc-2.26
 	sed -i "/math.h/a #include <malloc.h>" src/flexdef.h
 
diff -r ad29ddfee1c9 -r d5aab818505e flmusic/receipt
--- a/flmusic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flmusic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="1.2.1"
 CATEGORY="multimedia"
 SHORT_DESC="FLTK Audio player"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://home.arcor.de/szukw000/english_index.html"
+WEB_SITE="https://web.archive.org/web/20150803070352/http://home.arcor.de/szukw000/english_index.html"
 
 TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz"
-WGET_URL="http://home.arcor.de/szukw000/$TARBALL"
+WGET_URL="http://home.arcor.de/szukw000/$TARBALL" # FIXME
 
 BUILD_DEPENDS="fltk-dev alsa-lib-dev sox-dev xorg-libX11-dev"
 
@@ -22,8 +22,8 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	mkdir -p $DESTDIR/usr/bin &&
-	make DESTDIR=$DESTDIR install
+	mkdir -p $install/usr/bin &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e florence/receipt
--- a/florence/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/florence/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool glib-dev xorg-libXext-dev cairo-dev librsvg-dev \
 libxml2-dev gstreamer1-dev gtk3-dev xorg-libXtst-dev"
-SPLIT="florence-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e flrec/receipt
--- a/flrec/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flrec/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="flrec"
 VERSION="0.13"
 CATEGORY="multimedia"
-SHORT_DESC="FLTK RECorder is a simple audio hard disk recorder"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Simple audio hard disk recorder"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matteolucarelli.altervista.org/flrec/index_en.htm"
 
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make CC=$HOST_SYSTEM-g++ &&
-	install -Dm755 $src/flrec $install/usr/bin/flrec
+	install -Dm755 flrec $install/usr/bin/flrec
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fltk-2.0.x/receipt
--- a/fltk-2.0.x/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fltk-2.0.x/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,20 @@
 PACKAGE="fltk-2.0.x"
 VERSION="r7725"
 CATEGORY="system-tools"
-SHORT_DESC="Fast Light Tool Kit (provide fluid)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Fast Light Tool Kit (provide fluid)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
+WEB_SITE="http://www.fltk.org/index.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.fltk.org/"
 WGET_URL="subversion|http://svn.easysw.com/public/fltk/fltk/trunk"
 BRANCH="${VERSION#r}"
 
 BUILD_DEPENDS="xorg-libXft-dev glu glu-dev mesa mesa-dev \
 subversion autoconf xorg-dev libpng12-dev"
-SPLIT="fltk-2.0.x-dev fltk-2.0.x-fluid2 fltk-2.0.x-gl"
+SPLIT="$PACKAGE-dev $PACKAGE-fluid2 $PACKAGE-gl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/0xAA\([,}]\)/-86\1/g' src/UpBox.cxx
 	find -name Makefile | sed 's/Makefile/makedepend/' | xargs touch -d 197001010000
 	  patch -p0 src/filename_list.cxx <<EOF
@@ -28,6 +27,7 @@
 EOF
 	autoconf
 	export LD_LIBRARY_PATH="/lib:/usr/lib:$src/lib"
+
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -36,43 +36,40 @@
 		$CONFIGURE_ARGS &&
 	make &&
 	cp -f fltk2-config /usr/bin &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	fltk-2.0.x)
-		DEPENDS="expat fontconfig freetype jpeg xorg-libX11 \
+		fltk-2.0.x)
+			DEPENDS="expat fontconfig freetype jpeg xorg-libX11 \
 			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
 			xorg-libXrender zlib libpng12 xorg-libXi \
 			xorg-libXinerama gcc-lib-base"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		# Remove gl support --> fltk-2.0.x-gl
-		rm $fs/usr/lib/libfltk2*gl*
-		;;
-	fltk-2.0.x-dev)
-		CAT="development|Fast Light Tool Kit devel files (FLZK 2.0)."
-		DEPENDS="fltk-2.0.x"
-		mkdir -p $fs/usr/bin $fs/usr/lib
-		cp -a $install/usr/bin/fltk2-config $fs/usr/bin
-		cp -a $install/usr/lib/*.*a $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		;;
-	fltk-2.0.x-fluid2)
-		CAT="development|Fast Light Tool Kit designer 2.0 serie."
-		DEPENDS="fltk-2.0.x"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/fluid2 $fs/usr/bin
-		;;
-	fltk-2.0.x-gl)
-		CAT="x-window|Fast Light Tool Kit GL library."
-		DEPENDS="mesa glu expat fontconfig xorg-libXft \
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/*.so* $fs/usr/lib
+			# Remove gl support --> fltk-2.0.x-gl
+			rm $fs/usr/lib/libfltk2*gl*
+			;;
+		*-dev)
+			DEPENDS="fltk-2.0.x"
+			mkdir -p $fs/usr/bin $fs/usr/lib
+			cp -a $install/usr/bin/fltk2-config $fs/usr/bin
+			cp -a $install/usr/lib/*.*a $fs/usr/lib
+			cp -a $install/usr/include $fs/usr
+			;;
+		*-fluid2)
+			CAT="development|designer"
+			DEPENDS="fltk-2.0.x"
+			mkdir -p $fs/usr/bin
+			cp -a $install/usr/bin/fluid2 $fs/usr/bin
+			;;
+		*-gl)
+			CAT="x-window|GL library"
+			DEPENDS="mesa glu expat fontconfig xorg-libXft \
 			xorg-libXi xorg-libXinerama xorg-libXext gcc-lib-base"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libfltk2*gl*.so* $fs/usr/lib
-		;;
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libfltk2*gl*.so* $fs/usr/lib
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e fltk/receipt
--- a/fltk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fltk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,41 +4,33 @@
 VERSION="1.3.4"
 CATEGORY="system-tools"
 SHORT_DESC="Fast Light Tool Kit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://www.fltk.org/"
+WEB_SITE="http://www.fltk.org/index.php"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/fltk.html"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
 
-BUILD_DEPENDS_arm="jpeg-dev libpng16-dev xorg-libXft-dev"
 BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng16-dev \
 xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev mesa-dev xorg-libXinerama-dev \
 freetype-dev xorg-libXft-dev xorg-libXcursor-dev xorg-xprop"
-SPLIT="fltk-blocks fltk-checkers fltk-sudoku fltk-colbrowser fltk-editor \
-fltk-doc fltk fltk-dev"
+SPLIT="$PACKAGE-blocks $PACKAGE-checkers $PACKAGE-sudoku $PACKAGE-colbrowser \
+$PACKAGE-editor $PACKAGE-doc $PACKAGE $PACKAGE-dev"
 COOKOPTS="!menus"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS="--x-includes=/cross/$ARCH/sysroot/usr/include \
-			--x-libraries=/cross/$ARCH/sysroot/usr/lib";;
-		*) ARCH_ARGS='';;
-	esac
-
 	sed -i -e '/cat./d' documentation/Makefile
 
 	./configure \
 		--enable-shared \
 		--enable-xft \
 		--enable-threads \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	sed -i 's| -shared | -Wl,-Os,--as-needed\0|g' makeinclude &&
 	sed -i s'#"rgb.txt"#"/usr/share/fltk/rgb.txt"#' test/colbrowser.cxx &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	sed -i '/mimelnk/d' fluid/Makefile
 	make -C fluid install-linux || return 1
@@ -102,15 +94,9 @@
 			;;
 		fltk)
 			copy @std @rm
-			case "$SLITAZ_ARCH" in
-				arm*)
-					DEPENDS="expat fontconfig freetype jpeg libpng16 \
-					xorg-libXft" ;;
-				*)
-					DEPENDS="fontconfig libjpeg-turbo libpng16 mesa \
-					xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
-					xorg-libXft xorg-libXinerama xorg-libXrender"
-			esac
+			DEPENDS="fontconfig libjpeg-turbo libpng16 mesa \
+			xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
+			xorg-libXft xorg-libXinerama xorg-libXrender"
 			;;
 		fltk-dev)
 			copy @dev @rm # remove examples in doc
diff -r ad29ddfee1c9 -r d5aab818505e fluidsynth/receipt
--- a/fluidsynth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fluidsynth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.8"
 CATEGORY="multimedia"
 SHORT_DESC="A real-time software synthesizer based on the SoundFont 2 specifications"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://www.fluidsynth.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake ladspa-dev glib-dev libsndfile-dev pulseaudio-dev \
 alsa-lib-dev jack-dev dbus-dev readline-dev"
-SPLIT="fluidsynth-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e fluxbox/receipt
--- a/fluxbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fluxbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,100 +3,91 @@
 PACKAGE="fluxbox"
 VERSION="1.3.7"
 CATEGORY="x-window"
-SHORT_DESC="Fluxbox is a light and fast window manager for X."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Light and fast window manager for X"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://www.fluxbox.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.fluxbox.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev fontconfig-dev imlib2-dev"
-SPLIT="fluxbox fluxbox-themes fluxbox-tools"
+SPLIT="$PACKAGE-themes $PACKAGE-tools"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make 2>&1 | grep -v defaults.cc: && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	fluxbox)
-		TAGS="window-manager"
-		DEPENDS="xorg fontconfig imlib2 hsetroot xorg-xcompmgr"
-		mkdir -p $fs/usr/share/fluxbox/styles
-		cp -a $install/usr/bin $fs/usr
-		for f in apps keys overlay windowmenu init menu
-		do
-			cp -a $install/usr/share/fluxbox/$f $fs/usr/share/fluxbox
-		done
+		fluxbox)
+			TAGS="window-manager"
+			DEPENDS="xorg fontconfig imlib2 hsetroot xorg-xcompmgr"
+			mkdir -p $fs/usr/share/fluxbox/styles
+			cp -a $install/usr/bin $fs/usr
+			for f in apps keys overlay windowmenu init menu; do
+				cp -a $install/usr/share/fluxbox/$f $fs/usr/share/fluxbox
+			done
 
-		# 3 Default themes --> fluxbox-themes
-		for s in Shade Flux Results
-		do
-			cp -a $install/usr/share/fluxbox/styles/$s \
-				$fs/usr/share/fluxbox/styles
-		done
+			# 3 Default themes --> fluxbox-themes
+			for s in Shade Flux Results; do
+				cp -a $install/usr/share/fluxbox/styles/$s \
+					$fs/usr/share/fluxbox/styles
+			done
 
-		# Split tools --> fluxbox-tools
-		for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
-			fluxbox-update_configs
-		do
-			rm $fs/usr/bin/$t
-		done
+			# Split tools --> fluxbox-tools
+			for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
+				fluxbox-update_configs; do
+				rm $fs/usr/bin/$t
+			done
 
-		# XDG Xsessions
-		cp -a $stuff/xsessions $fs/usr/share
+			# XDG Xsessions
+			cp -a $stuff/xsessions $fs/usr/share
 
-		# Custom SliTaz integration
-		mkdir -p $fs/usr/share/slitaz/fluxbox
-		cp -a $stuff/fluxbox-session $fs/usr/bin
-		cp -a $stuff/startup $fs/usr/share/slitaz/fluxbox
-		cp -a $stuff/styles $fs/usr/share/fluxbox
-		# Overwrite
-		cp -f $stuff/menu $fs/usr/share/fluxbox
-		cp -f $stuff/init $fs/usr/share/fluxbox
-		;;
-	fluxbox-themes)
-		CAT="x-window|Fluxbox additionnal themes."
-		DEPENDS="fluxbox"
-		mkdir -p $fs/usr/share/fluxbox
-		cp -a $install/usr/share/fluxbox/styles $fs/usr/share/fluxbox
-		# Rome style provided by fluxbox package
-		for s in Shade Flux Results
-		do
-			rm -rf $fs/usr/share/fluxbox/styles/$s
-		done
-		;;
-	fluxbox-tools)
-		CAT="x-window|Fluxbox additionnal tools (fbsetroot)."
-		DEPENDS="fluxbox"
-		mkdir -p $fs/usr/bin
-		for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
-			fluxbox-update_configs
-		do
-			cp -a $install/usr/bin/$t $fs/usr/bin
-		done
-		;;
+			# Custom SliTaz integration
+			mkdir -p $fs/usr/share/slitaz/fluxbox
+			cp -a $stuff/fluxbox-session $fs/usr/bin
+			cp -a $stuff/startup $fs/usr/share/slitaz/fluxbox
+			cp -a $stuff/styles $fs/usr/share/fluxbox
+			# Overwrite
+			cp -f $stuff/menu $fs/usr/share/fluxbox
+			cp -f $stuff/init $fs/usr/share/fluxbox
+			;;
+		fluxbox-themes)
+			CAT="x-window|additionnal themes"
+			DEPENDS="fluxbox"
+			mkdir -p $fs/usr/share/fluxbox
+			cp -a $install/usr/share/fluxbox/styles $fs/usr/share/fluxbox
+			# Rome style provided by fluxbox package
+			for s in Shade Flux Results; do
+				rm -rf $fs/usr/share/fluxbox/styles/$s
+			done
+			;;
+		fluxbox-tools)
+			CAT="x-window|additionnal tools"
+			DEPENDS="fluxbox"
+			mkdir -p $fs/usr/bin
+			for t in fbsetroot fbsetbg fluxbox-generate_menu fluxbox-remote \
+				fluxbox-update_configs; do
+				cp -a $install/usr/bin/$t $fs/usr/bin
+			done
+			;;
 	esac
 }
 
-post_install_fluxbox()
-{
+post_install_fluxbox() {
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
 		status
 	fi
 }
 
-post_remove_fluxbox()
-{
+post_remove_fluxbox() {
 	# Remove WM from SLIM available sessions.
 	if grep -q $PACKAGE "$1/etc/slim.conf"; then
 		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
diff -r ad29ddfee1c9 -r d5aab818505e flxine/receipt
--- a/flxine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/flxine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,11 +4,11 @@
 VERSION="0.6.10"
 CATEGORY="multimedia"
 SHORT_DESC="FLTK Xine frontend"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://home.arcor.de/szukw000/english_index.html"
+WEB_SITE="https://web.archive.org/web/20150803070352/http://home.arcor.de/szukw000/english_index.html"
 
-TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz"
+TARBALL="$PACKAGE-fltk13-source-$VERSION.tgz" # FIXME
 WGET_URL="http://home.arcor.de/szukw000/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info fltk-dev xine-lib-dev autoconf automake \
@@ -18,7 +18,8 @@
 	#export ac_cv_lib_pthread_pthread_create=yes
 	./bootstrap.sh &&
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e font-manager/receipt
--- a/font-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/font-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/FontManager/master/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="vala gettext intltool freetype-dev fontconfig-dev json-glib-dev \
-cairo-dev gtk3-dev libgee-dev gucharmap3-dev sqlite3-dev yelp-tools itstool \
-file gobject-introspection-dev"
+BUILD_DEPENDS="vala gettext-dev intltool freetype-dev fontconfig-dev \
+json-glib-dev cairo-dev gtk3-dev libgee-dev gucharmap3-dev sqlite3-dev \
+yelp-tools itstool file gobject-introspection-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e fontconfig-infinality-yad/receipt
--- a/fontconfig-infinality-yad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fontconfig-infinality-yad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,11 +9,7 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="fontconfig-infinality"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/bin \
 		$fs/usr/share/applications \
@@ -21,4 +17,5 @@
 	cp -a $stuff/infctl-yad $fs/usr/bin
 	cp -a $stuff/*.desktop $fs/usr/share/applications
 	cp -a $stuff/*.png $fs/usr/share/pixmaps
+	DEPENDS="fontconfig-infinality"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fontconfig-infinality/receipt
--- a/fontconfig-infinality/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fontconfig-infinality/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,11 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://github.com/bohoomil/fontconfig-ultimate"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.infinality.net/fedora/linux/zips/$TARBALL" # FIXME
-CONFIG_FILES="/etc/fonts/infinality/infinality.conf"
 
-DEPENDS="fontconfig"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/etc/fonts \
 		$fs/usr/bin
@@ -25,4 +21,6 @@
 	sed -i 's|bin/bash|bin/sh|; s|^function \([a-z]*\) |\1()\n|g; \
 		s|select style|for style|; s|rm -r|rm -rf|; s|mkdir|mkdir -p|' \
 		$fs/usr/bin/infctl.sh
+	DEPENDS="fontconfig"
+	CONFIG_FILES="/etc/fonts/infinality/infinality.conf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fontconfig/receipt
--- a/fontconfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fontconfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.13.1"
 CATEGORY="x-window"
 SHORT_DESC="Font configuration utilities and library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/fontconfig/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/fontconfig.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.freedesktop.org/software/fontconfig/release/$TARBALL"
 
-BUILD_DEPENDS="gettext libxml2-dev freetype-dev gperf"
-SPLIT="fontconfig-dev"
+BUILD_DEPENDS="gettext-dev libxml2-dev freetype-dev gperf"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	rm -f src/fcobjshash.h
diff -r ad29ddfee1c9 -r d5aab818505e fontforge/receipt
--- a/fontforge/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fontforge/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,8 @@
 xorg-libX11-dev xorg-libICE-dev zlib-dev freetype-dev libjpeg-turbo-dev \
 libpng16-dev tiff-dev readline-dev cairo-dev pango-dev xorg-libXft-dev \
 gtk2-dev python-dev libuninameslist-dev libspiro-dev util-linux-uuid-dev \
-xorg-libSM-dev gettext"
-SPLIT="fontforge-fonts fontforge-dev"
+xorg-libSM-dev gettext-dev"
+SPLIT="$PACKAGE-fonts $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	rm -r $src/.git
@@ -33,16 +33,15 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		fontforge)
-			copy @std *.mo
-			rm $fs/usr/share/fontforge/pixmaps/*.ttf
-			DEPENDS="gtk2 libuninameslist python libspiro libltdl xorg-libSM"
-			TAGS="editor font"
-			;;
 		*-fonts)
 			copy *.ttf
 			CAT="fonts|fonts"
 			;;
+		fontforge)
+			copy @std @rm *.mo
+			DEPENDS="gtk2 libuninameslist python libspiro libltdl xorg-libSM"
+			TAGS="editor font"
+			;;
 		*-dev)
 			copy @dev
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e foo2xqx/receipt
--- a/foo2xqx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foo2xqx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="foo2xqx"
 VERSION="20170320"
 CATEGORY="system-tools"
-SHORT_DESC="a linux printer driver for XQX stream protocol"
+SHORT_DESC="Linux printer driver for XQX stream protocol"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://foo2xqx.rkkda.com/"
@@ -13,12 +13,9 @@
 WGET_URL="http://foo2zjs.rkkda.com/$TARBALL"
 
 BUILD_DEPENDS="foomatic-db-engine bc groff coreutils-context-system"
-SPLIT="foo2xqx foo2xqx-data"
+SPLIT="$PACKAGE-data"
 
-# Rules to configure and make the package.
-#
-compile_rules()
-{
+compile_rules() {
 	FOO2XQX="P1005 P1006 P1007 P1008 P1505"
 	FOO2ZJS="cpwl 2200 2300 2430 1000 1005 1018 1020 1025"
 	FOO2HP="1215 1600 2600n"
@@ -29,28 +26,26 @@
 	FOO2QPDL="300 310 315 325 360 365 2160 3160 3175 3185 6110 600 610"
 	make
 	for i in $FOO2XQX $FOO2ZJS $FOO2HP $FOO2OAK $FOO2LAVA \
-		 $FOO2SLX $FOO2HIPERC $FOO2QPDL ; do
+		 $FOO2SLX $FOO2HIPERC $FOO2QPDL; do
 		./getweb $i
 	done
-	mkdir -p $DESTDIR/filter
-	make DESTDIR=$DESTDIR install
+	mkdir -p $install/filter
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	foo2xqx)
-		DEPENDS="ghostscript foo2xqx-data"
-		mkdir -p $fs/usr
-		cp -a $install/bin $fs
-		cp -a $install/usr/bin $fs/usr
-		;;
-	foo2xqx-data)
-		CAT="non-free|firmware files"
-		mkdir -p $fs/usr/lib/cups
-		cp -a $install/usr/share $fs/usr
-		cp -a $install/filter $fs/usr/lib/cups/
-		;;
+		foo2xqx)
+			DEPENDS="ghostscript foo2xqx-data"
+			mkdir -p $fs/usr
+			cp -a $install/bin $fs
+			cp -a $install/usr/bin $fs/usr
+			;;
+		foo2xqx-data)
+			CAT="non-free|firmware files"
+			mkdir -p $fs/usr/lib/cups
+			cp -a $install/usr/share $fs/usr
+			cp -a $install/filter $fs/usr/lib/cups/
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e foobillard/receipt
--- a/foobillard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foobillard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,18 @@
 PACKAGE="foobillard"
 VERSION="3.0a"
 CATEGORY="games"
-SHORT_DESC="An OpenGL billiard game for Linux."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="An OpenGL billiard game for Linux"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://foobillard.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://foobillard.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libsdl freetype libpng16 mesa glu"
 BUILD_DEPENDS="libsdl-dev freetype-dev libpng16-dev glu mesa-dev \
 zlib-dev glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i -e 's/-lXaw//' -e 's/-lXi//' src/Makefile.in
 
 	./configure \
@@ -25,14 +23,13 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/foobillard $fs/usr/share
+	DEPENDS="libsdl freetype libpng16 mesa glu"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e foobillardplus/receipt
--- a/foobillardplus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foobillardplus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="automake autoconf libsdl-dev libsdl-mixer-dev libsdl-net-dev \
 mesa-dev glu-dev freetype-dev libpng16-dev"
-SPLIT="foobillardplus-music foobillardplus"
+SPLIT="$PACKAGE-music $PACKAGE"
 
 compile_rules() {
 	aclocal --force
diff -r ad29ddfee1c9 -r d5aab818505e foomatic-db-engine/receipt
--- a/foomatic-db-engine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foomatic-db-engine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 CATEGORY="system-tools"
 SHORT_DESC="Database engine generates PPD files from the data in Foomatic's \
 XML database"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.linuxprinting.org/foomatic.html"
+WEB_SITE="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
@@ -21,7 +21,7 @@
 	make &&
 	eval $(perl -V:archname)
 	make \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		INSTALLARCHLIB=/usr/lib/perl5/$PERL_VER/$archname \
 		INSTALLSITELIB=/usr/lib/perl5/site_perl/$PERL_VER/ \
 		INSTALLSITEARCH=/usr/lib/perl5/site_perl/$PERL_VER/$archname \
diff -r ad29ddfee1c9 -r d5aab818505e foomatic-db-nonfree/receipt
--- a/foomatic-db-nonfree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foomatic-db-nonfree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 CATEGORY="system-tools"
 SHORT_DESC="Database engine generates PPD files from the data in Foomatic's \
 XML database"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://www.linuxprinting.org/foomatic.html"
+WEB_SITE="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
@@ -17,7 +17,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# gzip all ppd files
 	find $install/usr/share/foomatic/db/source -name "*.ppd" | xargs gzip -n9
diff -r ad29ddfee1c9 -r d5aab818505e foomatic-db/receipt
--- a/foomatic-db/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foomatic-db/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="4.0-20101114"
 CATEGORY="system-tools"
 SHORT_DESC="Database used by foomatic-db-engine to generate PPD files"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.linuxprinting.org/foomatic.html"
+WEB_SITE="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chown -R root:root $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e foomatic-filters/receipt
--- a/foomatic-filters/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foomatic-filters/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="4.0.5"
 CATEGORY="system-tools"
 SHORT_DESC="Top quality printer drivers for Canon, Epson"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.linuxprinting.org/foomatic.html"
+WEB_SITE="https://wiki.linuxfoundation.org/openprinting/database/foomatic"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.openprinting.org/download/foomatic/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fop/receipt
--- a/fop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,16 @@
 PACKAGE="fop"
 VERSION="1.0"
 CATEGORY="development"
-SHORT_DESC="Open source XSL-FO implementation."
+SHORT_DESC="Open source XSL-FO implementation"
 MAINTAINER="paul@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="https://xmlgraphics.apache.org/fop/"
+
 TARBALL="$PACKAGE-$VERSION-bin.tar.gz"
-WEB_SITE="https://xmlgraphics.apache.org/fop/"
 WGET_URL="http://apache.mirrors.timporter.net/xmlgraphics/fop/binaries/$TARBALL"
-SUGGESTED="java-jre"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/xml/docbook/$PACKAGE-$VERSION
 	cp -a $src/* $fs/usr/share/xml/docbook/$PACKAGE-$VERSION
+	SUGGESTED="java-jre"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e foremost/receipt
--- a/foremost/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/foremost/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Data carving utility"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain"
-WEB_SITE="http://foremost.sourceforge.net"
+WEB_SITE="http://foremost.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/pkg/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e four-in-a-row/receipt
--- a/four-in-a-row/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/four-in-a-row/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext-dev \
 itstool"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fox/receipt
--- a/fox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,34 +4,29 @@
 VERSION="1.6.49"
 CATEGORY="x-window"
 SHORT_DESC="Fox toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.fox-toolkit.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.fox-toolkit.org/pub/$TARBALL"
 
-BUILD_DEPENDS_arm="jpeg-dev libpng16-dev tiff-dev xorg-libXft-dev"
 BUILD_DEPENDS="libpng16-dev jpeg-dev tiff-dev xorg-libXft-dev mesa-dev \
 glu-dev freetype-dev fontconfig-dev expat-dev libxml2-dev xorg-dev \
 xorg-libxshmfence-dev"
-SPLIT="adie calculator fox-dev fox-doc pathfinder shutterbug"
+SPLIT="adie calculator $PACKAGE-dev $PACKAGE-doc pathfinder shutterbug"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS="--with-opengl=no";;
-	esac
-
 	./configure \
 		--with-xft \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
+		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 testsuite() {
-	readelf -h $install/usr/bin/adie || exit 1
+	readelf -h $install/usr/bin/adie
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fox14/receipt
--- a/fox14/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fox14/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.35"
 CATEGORY="x-window"
 SHORT_DESC="Fox toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.fox-toolkit.org/"
 REPOLOGY="fox"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="bzlib xorg-libXrender xorg-libXrender-dev fontconfig-dev \
 freetype-dev libpng12-dev jpeg-dev tiff-dev xorg-libXft-dev mesa glu expat-dev \
 libxml2-dev"
-SPLIT="fox14-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/fxpngio.cpp
@@ -27,7 +27,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fpc-bootstrap/receipt
--- a/fpc-bootstrap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fpc-bootstrap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,11 @@
 VERSION="2.6.2" # last 2.x.x version is 2.6.4, and it lacks arm and x86_64 archs
 CATEGORY="development"
 SHORT_DESC="Bootstrap to compile fpc"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://freepascal.org/"
 
 case "$ARCH" in
-	arm*)   BOOTSTRAP="arm-linux-ppcarm";;
 	x86_64) BOOTSTRAP="x86_64-linux-ppcx64";;
 	i?86)   BOOTSTRAP="i386-linux-ppc386";;
 esac
@@ -18,7 +17,7 @@
 
 compile_rules() {
 	[ -f $src/$TARBALL ] && bunzip2 -d $src/$TARBALL
-	install -Dm 755 $src/${TARBALL%.bz2} $install/usr/bin/${BOOTSTRAP#*linux-}
+	install -Dm755 $src/${TARBALL%.bz2} $install/usr/bin/${BOOTSTRAP#*linux-}
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fpc/receipt
--- a/fpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,47 +4,29 @@
 VERSION="2.6.4"
 CATEGORY="development"
 SHORT_DESC="The Free Pascal Compiler"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.freepascal.org/"
 
 TARBALL="fpcbuild-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.freepascal.org/pub/fpc/dist/$VERSION/source/$TARBALL"
 
-BUILD_DEPENDS_arm=""
 BUILD_DEPENDS="fpc-bootstrap"
-SPLIT="fpc-src fpc"
-
-CROSS_BUGS="arm-slitaz-gnueabi-as: Command not found"
+SPLIT="$PACKAGE-src $PACKAGE"
 
 compile_rules() {
 	sed -i 's|/man$|/share/man|' $src/install/man/Makefile # fix man install path
 
 	case $ARCH in
-		arm*)   Arch='arm';;
 		i?86)   Arch='386';;
 		x86_64) Arch='x64';;
 	esac
 
-	case "$ARCH" in
-		arm*)
-			make crossinstall \
-				NOGDB=1 \
-				CPU_TARGET=arm \
-				OS_TARGET=linux \
-				OPT=-dFPC_ARMEL \
-				CROSSBINDIR=/cross/$ARCH/tools/bin \
-				BINUTILSPREFIX=arm-slitaz-gnueabi- \
-				INSTALL_PREFIX=$install/usr
-				;;
-		*)
-			make     NOGDB=1 FPC=/usr/bin/ppc$Arch build &&
-			make -j1 NOGDB=1 FPC=/usr/bin/ppc$Arch PREFIX=$install/usr install
-			;;
-	esac || return 1
+	make     NOGDB=1 FPC=/usr/bin/ppc$Arch build &&
+	make -j1 NOGDB=1 FPC=/usr/bin/ppc$Arch PREFIX=$install/usr install || return 1
 
 	# install package license
-	install -Dm 644 $src/fpcsrc/rtl/COPYING.FPC \
+	install -Dm644 fpcsrc/rtl/COPYING.FPC \
 		$install/usr/share/licenses/fpc/COPYING.FPC
 
 	# create symlink for compiler
@@ -68,7 +50,7 @@
 		fpc)
 			copy @std @rm
 			DEPENDS="ncurses"
-			CONFIG_FILE="/etc/fpc.cfg"
+			CONFIG_FILES="/etc/fpc.cfg"
 			TAGS="compiler pascal"
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e fping/receipt
--- a/fping/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fping/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,26 @@
 PACKAGE="fping"
 VERSION="3.4"
 CATEGORY="system-tools"
-SHORT_DESC="ICMP echo with multiple hosts."
+SHORT_DESC="ICMP echo with multiple hosts"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
+WEB_SITE="http://fping.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://fping.org/"
 WGET_URL="${WEB_SITE}dist/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS && \
-	make && make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc
 	cp -a $install/usr/sbin $fs/usr
 	cp $stuff/protocols $fs/etc
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e fpm2/receipt
--- a/fpm2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fpm2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="fpm2"
 VERSION="0.76.1"
 CATEGORY="utilities"
-SHORT_DESC="Password manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Password manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://als.regnet.cz/fpm2/"
@@ -15,20 +15,15 @@
 xorg-libXrandr xorg-libXrender xorg-libXdamage"
 BUILD_DEPENDS="gtk2-dev libxml2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/pixmaps/fpm2/logo.png \
diff -r ad29ddfee1c9 -r d5aab818505e freealut/receipt
--- a/freealut/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freealut/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 COMMIT="2fa9ea27be7bb4124a878d44c14e6634f7beb1e2"
 VERSION="${COMMIT:0:7}"
 CATEGORY="multimedia"
-SHORT_DESC="freealut is a free implementation of OpenAL's ALUT standard"
+SHORT_DESC="Free implementation of OpenAL's ALUT standard"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL"
 #WEB_SITE="http://distro.ibiblio.org/rootlinux/rootlinux-ports/more/freealut/freealut-1.1.0/doc/alut.html"
@@ -14,24 +14,26 @@
 WGET_URL="https://github.com/vancegroup/$PACKAGE/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="cmake openal-dev"
-SPLIT="freealut-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
-	cmake .. -DCMAKE_INSTALL_PREFIX:STRING="/usr" &&
-	make && make install
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+		.. &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		freealut)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/*.so* $fs/usr/lib
+			copy @std
 			DEPENDS="openal glibc-base"
 			;;
 		*-dev)
-			cp -a $install/* $fs
-			rm -r $fs/usr/lib/*.so*
+			copy @dev
 			DEPENDS="freealut openal-dev"
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e freeciv/receipt
--- a/freeciv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freeciv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk2-dev gettext \
+BUILD_DEPENDS="zlib-dev ncurses-dev readline-dev gtk2-dev gettext-dev \
 libsdl-mixer-dev glibc-locale bzip2-dev expat-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e freedoom/receipt
--- a/freedoom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freedoom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="freedoom"
 VERSION="0.7"
 CATEGORY="games"
-SHORT_DESC="completely free Doom IWADS (game data)"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Completely free Doom IWADS (game data)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.nongnu.org/freedoom/"
@@ -12,18 +12,14 @@
 
 BUILD_DEPENDS="deutex-devel python git ghostscript imagemagick"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make -j1
-	mkdir -p $DESTDIR/usr/share/games/doom
-	cp -a $src/wads/*.wad $DESTDIR/usr/share/games/doom
+compile_rules() {
+	make -j1 || return 1
+
+	mkdir -p $install/usr/share/games/doom
+	cp -a $src/wads/*.wad $install/usr/share/games/doom
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/share $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e freeglut/receipt
--- a/freeglut/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freeglut/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.0"
 CATEGORY="x-window"
 SHORT_DESC="OpenGL utility toolkit"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://freeglut.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake mesa-dev glu-dev xorg-libXi-dev"
-SPLIT="freeglut-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e freeimage/receipt
--- a/freeimage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freeimage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="graphics"
 SHORT_DESC="Library to support popular graphics image formats like PNG, BMP, \
 JPEG, TIFF and others"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://freeimage.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e freeradius/receipt
--- a/freeradius/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freeradius/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.1.12"
 CATEGORY="security"
 SHORT_DESC="Radius server"
-MAINTAINER="sdaigl@lacitec.on.ca"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2"
-WEB_SITE="http://www.freeradius.org/"
+WEB_SITE="http://freeradius.org/"
 
 TARBALL="freeradius-server-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.freeradius.org/pub/freeradius/$TARBALL"
 
 BUILD_DEPENDS="libtool openldap-dev openssl-dev pam-dev krb5-dev gdbm-dev libtool"
-SPLIT="freeradius freeradius-dialupadmin freeradius-pam"
+SPLIT="$PACKAGE-dialupadmin $PACKAGE-pam"
 
 compile_rules() {
 	export CFLAGS="$CFLAGS -fno-strict-aliasing"
@@ -23,7 +23,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make R=$DESTDIR install
+	make R=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e freerdp/receipt
--- a/freerdp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freerdp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 
 BUILD_DEPENDS="zlib-dev openssl-dev cups-dev alsa-lib-dev xorg-libxcb-dev xorg-dev \
 xorg-dev-proto cmake ffmpeg-dev xorg-libXv-dev pcsc-lite-dev"
-SPLIT="freerdp freerdp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cmake \
@@ -20,7 +20,7 @@
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e freetds/receipt
--- a/freetds/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freetds/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,14 +12,15 @@
 WGET_URL="ftp://ftp.ibiblio.org/pub/Linux/ALPHA/$PACKAGE/stable/$TARBALL"
 
 BUILD_DEPENDS="readline-dev"
-SPLIT="freetds-dev"
+SPLIT="$PACKAGE-dev"
+
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e freetuxtv/receipt
--- a/freetuxtv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freetuxtv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="freetuxtv"
 VERSION="0.6.5"
 CATEGORY="network"
-SHORT_DESC="FreetuxTV is a free GTK+ WebTV and Web Radio player for Linux"
+SHORT_DESC="Free GTK+ WebTV and Web Radio player for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://code.google.com/p/freetuxtv/"
+WEB_SITE="https://code.google.com/archive/p/freetuxtv"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://freetuxtv.googlecode.com/files/$TARBALL"
@@ -19,7 +19,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e freetype-infinality/receipt
--- a/freetype-infinality/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freetype-infinality/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://download.savannah.gnu.org/releases/freetype/$TARBALL"
 
 BUILD_DEPENDS="bzip2-dev"
-SPLIT="freetype-infinality-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e freetype/receipt
--- a/freetype/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freetype/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.9.1"
 CATEGORY="x-window"
 SHORT_DESC="A free, high-quality, and portable font engine"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="FTL GPL2"
 WEB_SITE="https://www.freetype.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/freetype2.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="automake libtool autoconf zlib-dev bzip2-dev libpng16-dev"
-SPLIT="freetype-dev"
+SPLIT="$PACKAGE-dev"
 
 # Option "--harfbuzz" used in the task to install build dependency harfbuzz-dev
 [ -n "$harfbuzz" ] && BUILD_DEPENDS="$BUILD_DEPENDS harfbuzz-dev"
diff -r ad29ddfee1c9 -r d5aab818505e freetype1/receipt
--- a/freetype1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/freetype1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.1"
 CATEGORY="x-window"
 SHORT_DESC="Freetype1 font engine"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.freetype.org/"
 REPOLOGY="freetype"
@@ -12,25 +12,25 @@
 TARBALL="freetype-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/freetype/$TARBALL"
 
-SPLIT="freetype1-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# NOTE: DESTDIR is not recognized by freetype1 make install
 	./configure \
-		--sysconfdir=$DESTDIR/etc \
-		--prefix=$DESTDIR/usr \
-		--mandir=$DESTDIR/usr/share/man \
-		--includedir=$DESTDIR/usr/include \
-		--libdir=$DESTDIR/usr/lib \
+		--sysconfdir=$install/etc \
+		--prefix=$install/usr \
+		--mandir=$install/usr/share/man \
+		--includedir=$install/usr/include \
+		--libdir=$install/usr/lib \
 		--with-x \
 		--enable-gif \
 		$CONFIGURE_ARGS &&
 	make ttlib ttpo || return 1
 
 	cd lib
-	make DESTDIR=$DESTDIR -f arch/unix/Makefile install || return 1
+	make DESTDIR=$install -f arch/unix/Makefile install || return 1
 	cd ../po
-	make DESTDIR=$DESTDIR -f Makefile install || return 1
+	make DESTDIR=$install -f Makefile install || return 1
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e frei0r-plugins/receipt
--- a/frei0r-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/frei0r-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3"
 CATEGORY="multimedia"
 SHORT_DESC="frei0r is a minimalistic plugin API for video sources and filters"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://frei0r.dyne.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.dyne.org/frei0r/releases/$TARBALL"
 
 BUILD_DEPENDS="gavl-dev"
-SPLIT="frei0r-plugins-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e fribidi/receipt
--- a/fribidi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fribidi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Implementation of the Unicode Bidirectional Algorithm"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/fribidi/fribidi/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/fribidi.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/fribidi/fribidi/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="glib-dev"
-SPLIT="fribidi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e fritzing/receipt
--- a/fritzing/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fritzing/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="fritzing"
 VERSION="0.8.7b"
 CATEGORY="development"
-SHORT_DESC="Let's makes electronics accessible as a creative material for anyone."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Let's make electronics accessible as a creative material for anyone"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-TARBALL="$PACKAGE-${VERSION}.source.tar.bz2"
-WEB_SITE="http://fritzing.org"
+WEB_SITE="http://fritzing.org/home/"
+
+TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
 WGET_URL="http://fritzing.org/download/$VERSION/source-tarball/$TARBALL"
-HOST_ARCH="i486 x86_64"
 
-DEPENDS="boost-graph libQtCore libQtXml quazip"
 BUILD_DEPENDS="boost-dev boost-graph qmake Qt4-dev libQtNetwork \
 quazip-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	 qmake && make &&
-	 make INSTALL_ROOT=$install install
+compile_rules() {
+	qmake &&
+	make &&
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/${PACKAGE} $fs/usr/share
+	cp -a $install/usr/share/$PACKAGE $fs/usr/share
 	cp -a $install/usr/share/icons $fs/usr/share/pixmaps
+	DEPENDS="boost-graph libQtCore libQtXml quazip"
 }
diff -r ad29ddfee1c9 -r d5aab818505e frogatto/receipt
--- a/frogatto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/frogatto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="frogatto"
 VERSION="1.3.1"
 CATEGORY="games"
-SHORT_DESC="Frogatto & Friends is an action-adventure game, starring a certain quixotic frog"
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="Action-adventure game, starring a certain quixotic frog"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY-3 custom"
 WEB_SITE="https://frogatto.com/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="xorg-libX11-dev libsdl-dev mesa-dev glu-dev glew-dev \
 libsdl-image-dev libpng16-dev zlib-dev boost-dev libsdl-ttf-dev \
 libsdl-mixer-dev coreutils-file-format ccache"
-SPLIT="frogatto-data"
+SPLIT="$PACKAGE-data"
 
 compile_rules() {
 	CXXFLAGS="$CXXFLAGS -std=gnu++98" make game server || return 1
@@ -22,9 +22,9 @@
 	mkdir -p $install/opt/frogatto/
 	cp game server *.ttf $install/opt/frogatto/
 	cp -r data/ images/ modules/ music/ $install/opt/frogatto
-	install -Dm 755 $stuff/frogatto $install/usr/bin/frogatto
-	install -Dm 644 $stuff/frogatto.desktop $install/usr/share/applications/frogatto.desktop
-	install -Dm 644 $src/images/window-icon.png $install/usr/share/pixmaps/frogatto.png
+	install -Dm755 $stuff/frogatto $install/usr/bin/frogatto
+	install -Dm644 $stuff/frogatto.desktop $install/usr/share/applications/frogatto.desktop
+	install -Dm644 $src/images/window-icon.png $install/usr/share/pixmaps/frogatto.png
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e frox/receipt
--- a/frox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/frox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="frox"
 VERSION="0.7.18"
@@ -6,27 +6,24 @@
 SHORT_DESC="A transparent ftp proxy"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://frox.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://frox.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/frox.conf"
-TAG="ftp"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		--enable-configfile=/etc/frox.conf \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install || return 1
+
+	install -Dm644 src/frox.conf $install/etc/frox.conf
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/etc
-	cp -a $src/src/frox.conf $fs/etc
-	chown root.root $fs/etc/frox.conf
-	cp -a $install/usr $fs/
+genpkg_rules() {
+	copy @std
+	CONFIG_FILES="/etc/frox.conf"
+	TAGS="ftp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e frozen-bubble/receipt
--- a/frozen-bubble/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/frozen-bubble/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,25 @@
 VERSION="2.2.0"
 CATEGORY="games"
 SHORT_DESC="A bubbles game"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.frozen-bubble.org"
+WEB_SITE="http://www.frozen-bubble.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/data/$TARBALL"
+WGET_URL="${WEB_SITE}data/$TARBALL"
 
-BUILD_DEPENDS="perl-locale-gettext gettext glib-dev libsdl-dev libsdl-gfx-dev \
-libsdl-image-dev libsdl-net-dev freetype-dev libsdl-ttf-dev libsdl-mixer-dev \
-libsdl-pango-dev libsmpeg-dev pkg-config libsdl-perl mesa-dev glibc-locale \
-perl-dev"
+BUILD_DEPENDS="perl-locale-gettext gettext-dev glib-dev libsdl-dev \
+libsdl-gfx-dev libsdl-image-dev libsdl-net-dev freetype-dev libsdl-ttf-dev \
+libsdl-mixer-dev libsdl-pango-dev libsmpeg-dev pkg-config libsdl-perl mesa-dev \
+glibc-locale perl-dev"
 
 compile_rules() {
 	make \
-		OPTIMIZE="${CFLAGS}" \
+		OPTIMIZE="$CFLAGS" \
 		CFLAGS="$(pkg-config glib-2.0 --cflags)" \
 		INSTALLDIRS=vendor \
 		PREFIX=/usr &&
-	make DESTDIR=$DESTDIR PREFIX=/usr install
+	make DESTDIR=$install PREFIX=/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fsarchiver/receipt
--- a/fsarchiver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fsarchiver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fsarchiver"
 VERSION="0.6.12"
 CATEGORY="utilities"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="A safe and flexible file-system backup and deployment tool"
 WEB_SITE="http://www.fsarchiver.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="compression filesystem archive backup"
 
-DEPENDS="bzip2 e2fsprogs lzo xz libgcrypt liblzma util-linux-blkid \
-libcomerr3 zlib"
 BUILD_DEPENDS="bzip2-dev e2fsprogs-dev libgcrypt-dev lzo-dev xz-dev \
 util-linux-blkid-dev attr-dev util-linux-uuid-dev zlib-dev"
 
-# Rules to configure and make the package.
 compile_rules() {
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR="$DESTDIR" install
+	make DESTDIR=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
-	
+	DEPENDS="bzip2 e2fsprogs lzo xz libgcrypt liblzma util-linux-blkid \
+	libcomerr3 zlib"
+	TAGS="compression filesystem archive backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fsthost/receipt
--- a/fsthost/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fsthost/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="fsthost"
 VERSION="1.4.0"
 CATEGORY="multimedia"
-SHORT_DESC="FSTHost is VST host for Jack with GTK interface"
-MAINTAINER="xj@wp.pl"
+SHORT_DESC="VST host for JACK with GTK interface"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://fsthost.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/fsthost/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e fswebcam/receipt
--- a/fswebcam/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fswebcam/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="fswebcam"
 VERSION="20140113"
 CATEGORY="misc"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="Tiny and flexible webcam app"
-WEB_SITE="http://www.firestorm.cx/fswebcam/"
-CONFIG_FILES="etc/fswebcam.conf"
+WEB_SITE="https://www.sanslogic.co.uk/fswebcam/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/files/$TARBALL"
-TAGS="webcam"
-HOST_ARCH="i486 x86_64"
 
-DEPENDS="libgd"
 BUILD_DEPENDS="libgd-dev libjpeg-turbo"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
-		--prefix=/usr $CONFIGURE_ARGS &&
-	make && make install 
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/etc $fs/usr
-	cp -a stuff/fswebcam.conf $fs/etc/fswebcam.conf
+	cp -a $stuff/fswebcam.conf $fs/etc/fswebcam.conf
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libgd"
+	CONFIG_FILES="etc/fswebcam.conf"
+	TAGS="webcam"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ftgl/receipt
--- a/ftgl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ftgl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.3-rc5"
 CATEGORY="x-window"
 SHORT_DESC="OpenGL library to use arbitrary fonts"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/ftgl/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="freetype-dev freeglut-dev mesa-dev glu-dev \
 expat-dev xorg-libxshmfence-dev"
-SPLIT="ftgl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ftjam/receipt
--- a/ftjam/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ftjam/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ftjam"
 VERSION="2.5.3rc2"
 CATEGORY="development"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC=="FT Jam - an enhanced version of the Jam build tool"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-SHORT_DESC=="FT Jam - an enhanced version of the Jam build tool"
-WEB_SITE="http://freetype.org/jam/"
-PROVIDE="jam"
+WEB_SITE="https://www.freetype.org/jam/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://david.freetype.org/jam/$TARBALL"
 
-DEPENDS="glibc-base"
 BUILD_DEPENDS="bison"
 
-# Rules to configure and make the package.
 compile_rules() {
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install 
+	make DESTDIR=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="glibc-base"
+	PROVIDE="jam"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ftop/receipt
--- a/ftop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ftop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ftop"
 VERSION="1.0"
 CATEGORY="utilities"
-SHORT_DESC="Show progress of open files and file systems."
+SHORT_DESC="Show progress of open files and file systems"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2.1"
+WEB_SITE="https://sourceforge.net/projects/ftop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/ftop/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ftp-proxy/receipt
--- a/ftp-proxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ftp-proxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make INST_ROOT=$DESTDIR install
+	make INST_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e funionfs/receipt
--- a/funionfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/funionfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fuse-emulator/receipt
--- a/fuse-emulator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fuse-emulator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.0"
 CATEGORY="games"
 SHORT_DESC="ZX Spectrum emulator"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://fuse-emulator.sourceforge.net/fuse.php"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="perl libspectrum-dev xorg-libX11-dev xorg-libICE-dev gtk2-dev \
 gtk3-dev alsa-lib-dev libsdl-dev libgcrypt-dev"
-SPLIT="fuse-emulator-gtk3:gtk3"
+SPLIT="$PACKAGE-gtk3:gtk3"
 
 compile_rules() {
 	SET_ARGS=''; [ -z "$SET" ] && SET_ARGS='--disable-gtk3'
diff -r ad29ddfee1c9 -r d5aab818505e fuse-exfat/receipt
--- a/fuse-exfat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fuse-exfat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 
 compile_rules() {
 	scons PREFIX=/usr
-	scons -k DESTDIR=$DESTDIR install
+	scons -k DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fuse2/receipt
--- a/fuse2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fuse2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.9.7"
 CATEGORY="system-tools"
 SHORT_DESC="FUSE Filsystem in Userspace, compatible with GVFS"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/libfuse/libfuse"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/fuse2.html"
@@ -14,7 +14,7 @@
 WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="util-linux-mount"
-SPLIT="fuse2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export MOUNT_FUSE_PATH=/usr/bin
diff -r ad29ddfee1c9 -r d5aab818505e fuse3/receipt
--- a/fuse3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fuse3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="https://github.com/libfuse/libfuse/releases/download/fuse-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="meson ninja eudev-dev"
-SPLIT="fuse-common fuse3 fuse3-dev"
+SPLIT="fuse-common $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e fusecloop/receipt
--- a/fusecloop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fusecloop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 EXTRA_SOURCE_FILES="$ADVANCECOMP_TARBALL"
 
 BUILD_DEPENDS="fuse2-dev zlib-dev automake"
-SPLIT="fusecloop cloop-utils"
+SPLIT="cloop-utils"
 
 compile_rules() {
 	[ -s $SRC/$ADVANCECOMP_TARBALL ] ||
@@ -29,14 +29,15 @@
 	cp create_compressed_fs.c $ADVANCECOMP/redef.cc
 	sed -i 's/Z_BEST_COMPRESSION/Z_BEST_SPEED/' create_compressed_fs.c
 	sed -i 's/def FIND_BEST_COMPRESSION/ 1/' $ADVANCECOMP/redef.cc
+
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make &&
+	make || return 1
 
-	cd $ADVANCECOMP &&
+	cd $ADVANCECOMP
 	./autogen.sh
 	automake --add-missing
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e fusedav/receipt
--- a/fusedav/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fusedav/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Linux userspace file system driver for mounting WebDAV shares"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://0pointer.de/lennart/projects/fusedav"
+WEB_SITE="http://0pointer.de/lennart/projects/fusedav/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
@@ -24,7 +24,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fuseiso/receipt
--- a/fuseiso/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fuseiso/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20070708"
 CATEGORY="system-tools"
 SHORT_DESC="Using FUSE to mount ISO filesystem"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/fuseiso/"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e fwbuilder/receipt
--- a/fwbuilder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fwbuilder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,31 @@
 PACKAGE="fwbuilder"
 VERSION="5.0.0.3568"
 CATEGORY="network"
-SHORT_DESC="Firewall management GUI."
+SHORT_DESC="Firewall management GUI"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/fwbuilder"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libxml2 libxslt zlib libQtGui libQtNetwork libQtCore"
 BUILD_DEPENDS="qmake libxslt-dev Qt4-dev autoconf automake libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	sed -i 's/Categories=.*/Categories=GNOME;Application;System;/' src/res/fwbuilder.desktop
+compile_rules() {
+	sed -i 's/Categories=.*/Categories=GNOME;Application;System;/' \
+	src/res/fwbuilder.desktop
+
 	./autogen.sh
-	./configure --prefix=/usr --infodir=/usr/share/info \
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libxml2 libxslt zlib libQtGui libQtNetwork libQtCore"
 }
diff -r ad29ddfee1c9 -r d5aab818505e fwknop/receipt
--- a/fwknop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/fwknop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libtool gpgme-dev libpcap-dev iptables gnupg texinfo \
 libgpg-error-dev"
-SPLIT="fwknop-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fiv &&
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-antivirus/receipt
--- a/gadmin-antivirus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-antivirus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-bind/receipt
--- a/gadmin-bind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-bind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-dhcpd/receipt
--- a/gadmin-dhcpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-dhcpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-httpd/receipt
--- a/gadmin-httpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-httpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-openvpn-client/receipt
--- a/gadmin-openvpn-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-openvpn-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-openvpn-server/receipt
--- a/gadmin-openvpn-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-openvpn-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-proftpd/receipt
--- a/gadmin-proftpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-proftpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-rsync/receipt
--- a/gadmin-rsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-rsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-samba/receipt
--- a/gadmin-samba/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-samba/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-sendmail/receipt
--- a/gadmin-sendmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-sendmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-squid/receipt
--- a/gadmin-squid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-squid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmin-sshd/receipt
--- a/gadmin-sshd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmin-sshd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gadmintools/receipt
--- a/gadmintools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gadmintools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gadmintools"
 VERSION="1.0"
 CATEGORY="meta"
-SHORT_DESC="GTK+ configuration tools."
+SHORT_DESC="GTK+ configuration tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://web.archive.org/web/20180218034430/http://dalalven.dtdns.net/linux/gadmintools-webpage/"
diff -r ad29ddfee1c9 -r d5aab818505e gajim/receipt
--- a/gajim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gajim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.14.1"
 CATEGORY="network"
 SHORT_DESC="GTK Jabber client"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.gajim.org/"
+WEB_SITE="https://gajim.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.gajim.org/downloads/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext xorg-xcb-util-dev enchant-dev xorg-xorgproto \
+BUILD_DEPENDS="gettext-dev xorg-xcb-util-dev enchant-dev xorg-xorgproto \
 python-dev libffi-dev intltool python-pygtk-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e galculator/receipt
--- a/galculator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/galculator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.4"
 CATEGORY="system-tools"
 SHORT_DESC="Graphical scientific calculator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://galculator.mnim.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gambas2/receipt
--- a/gambas2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gambas2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.0"
 CATEGORY="development"
 SHORT_DESC="Free development environment based on a Basic interpreter"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gambas.sourceforge.net/"
 
@@ -24,7 +24,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gamin/receipt
--- a/gamin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gamin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,15 @@
 VERSION="0.1.10"
 CATEGORY="system-tools"
 SHORT_DESC="File and directory monitoring system"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://www.gnome.org/~veillard/gamin/"
+WEB_SITE="https://people.gnome.org/~veillard/gamin/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.gnome.org/~veillard/gamin/sources/$TARBALL"
 
-CROSS_BUGS="error: cannot run test program while cross compiling"
-
 BUILD_DEPENDS="glib-dev gtk2-dev"
-SPLIT="gamin-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
@@ -33,8 +31,8 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	mkdir -p $DESTDIR/usr/include &&
-	make -j1 DESTDIR=$DESTDIR install
+	mkdir -p $install/usr/include &&
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gammu/receipt
--- a/gammu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gammu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.27.0"
 CATEGORY="system-tools"
 SHORT_DESC="Library and utility to control cell phone"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://wammu.eu/gammu/"
+WEB_SITE="https://wammu.eu/gammu/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="bluez sqlite3 libusb-compat libcurl cmake"
-SPLIT="gammu-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -22,7 +22,7 @@
 		-DBUILD_SHARED_LIBS=ON \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e garcon/receipt
--- a/garcon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/garcon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="misc"
 SHORT_DESC="Xfce menu library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool libxfce4util-dev gtk2-dev libxfce4ui-dev \
 xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
-SPLIT="garcon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gaupol/receipt
--- a/gaupol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gaupol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gaupol"
 VERSION="0.19.2"
 CATEGORY="multimedia"
-SHORT_DESC="Gaupol is an editor for text-based subtitle files."
+SHORT_DESC="Text-based subtitle files editor"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://otsaloma.io/gaupol/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://otsaloma.io/gaupol/"
 WGET_URL="http://download.gna.org/$PACKAGE/${VERSION:0:4}/$TARBALL" # FIXME
 
-DEPENDS="python python-pygtk"
-SUGGESTED="mplayer"
-BUILD_DEPENDS="python-dev intltool gettext"
+BUILD_DEPENDS="python-dev intltool gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py clean install --prefix=$install/usr
+compile_rules() {
+	python -B setup.py clean install --prefix=$install/usr
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
 	sed -i 's|/home/slitaz/wok/gaupol/install||g' \
 		$install/usr/lib/$PYTHON_LIB/site-packages/aeidon/paths.py
 	cp -a $install/usr $fs
+	DEPENDS="python python-pygtk"
+	SUGGESTED="mplayer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gavl/receipt
--- a/gavl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gavl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.4.0"
 CATEGORY="multimedia"
 SHORT_DESC="A low level library, upon which multimedia APIs can be built"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://gmerlin.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/gmerlin/$TARBALL"
 
-SPLIT="gavl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gawk/receipt
--- a/gawk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gawk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.2.1"
 CATEGORY="development"
 SHORT_DESC="GNU awk to handle simple data-reformatting"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gawk/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/gawk.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="readline-dev gettext"
-SPLIT="gawk-dev"
+BUILD_DEPENDS="readline-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gc/receipt
--- a/gc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.2"
 CATEGORY="development"
 SHORT_DESC="A garbage collector for C and C++"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT GPL"
 WEB_SITE="http://www.hboehm.info/gc/"
 REPOLOGY="boehm-gc"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.hboehm.info/gc/gc_source/$TARBALL"
 
-SPLIT="gc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# libatomic_ops
 	cd $src/libatomic_ops*
@@ -29,7 +29,7 @@
 		--disable-static \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcab/receipt
--- a/gcab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="meson ninja git glib-dev gobject-introspection-dev vala gettext \
-intltool"
+BUILD_DEPENDS="meson ninja git glib-dev gobject-introspection-dev vala \
+gettext-dev intltool"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcc+gcj/receipt
--- a/gcc+gcj/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc+gcj/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,40 +1,32 @@
 # SliTaz package receipt.
 
 PACKAGE="gcc+gcj"
-SOURCE="gcc"
 VERSION="4.6.3"
 CATEGORY="development"
-SHORT_DESC="The GNU Compiler Collection, including the gcj Compiler for Java."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="The GNU Compiler Collection, including the gcj Compiler for Java"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gcc.gnu.org/java/"
+WEB_SITE="https://gcc.gnu.org/"
 REPOLOGY="gcc"
 
-TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
+TARBALL="gcc-$VERSION.tar.bz2"
+WGET_URL="$GNU_MIRROR/gcc/gcc-$VERSION/$TARBALL"
 
 ECJ_JAR="ecj-latest.jar"
 ECJ_URL="ftp://sourceware.org/pub/java/$ECJ_JAR"
 EXTRA_SOURCE_FILES="$ECJ_JAR"
-PROVIDE="$SOURCE jre jdk"
+PROVIDE="gcc jre jdk"
 TAGS="compiler C C++ objective-C java"
 
-DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr python \
-gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 xorg-libxcb xorg-xcb-util \
-xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
-xorg-libXcursor xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
-xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXtst alsa-lib elfutils"
 BUILD_DEPENDS="glibc-dev gawk flex python perl gmp gmp-dev mpfr mpfr-dev mpc-library \
 expat-dev zlib-dev fastjar gtk2-dev libart_lgpl-dev xorg-dev xorg-xorgproto \
 xorg-libXtst \
 elfutils elfutils-dev util-linux-uuid-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/@mkdir_p@/mkdir -p/' libjava/classpath/lib/copy-vmresources.sh.in
 	# Set HOST_SYSTEM if not defined in tazwok.conf as it should be
-	if [ -z "$HOST_SYSTEM" ] ; then
+	if [ -z "$HOST_SYSTEM" ]; then
 		HOST_SYSTEM="$ARCH-slitaz-linux"
 	fi
 	GCC_TARGET=$HOST_SYSTEM
@@ -42,11 +34,11 @@
 	# Get ecj.jar needed to build gcj. We have to dl it each time from the
 	# sources repository to ensure that we receive the latest JAR.
 	# (See http://gcc.gnu.org/install/configure.html --with-ecj-jar)
-	if [ ! -f "$ECJ_JAR" ] ; then
+	if [ ! -f "$ECJ_JAR" ]; then
 		echo "Downloading ECJ jar to: $(pwd)"
 		wget -c $ECJ_URL
 		# Exit if download failed to avoid errors.
-		if [ ! -f "$ECJ_JAR" ] ; then
+		if [ ! -f "$ECJ_JAR" ]; then
 			echo -e "\nECJ jar download failed, exiting. Please check ECJ_URL variable.\n"
 			return 1
 		fi
@@ -58,30 +50,40 @@
 		$src/libiberty/Makefile.in || return 1
 	mkdir -p ../build && cd ../build
 
-	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
-	../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
-		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
-		--enable-languages=c,c++,objc,java --enable-shared \
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')	#'
+
+	../${src##*/}/configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-nls \
+		--enable-languages=c,c++,objc,java \
+		--enable-shared \
 		--with-system-zlib \
-		--enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \
-		--enable-threads=posix --with-tune=$ARCH \
-		--enable-java-home --with-arch-directory=i386 \
+		--enable-clocale=gnu \
+		--enable-objc-gc \
+		--enable-__cxa_atexit \
+		--enable-threads=posix \
+		--with-tune=$ARCH \
+		--enable-java-home \
+		--with-arch-directory=i386 \
 		--with-jvm-root-dir=/usr/lib/jvm/java-gcj \
 		--with-jvm-jar-dir=/usr/lib/jvm-exports/java-gcj \
 		--with-python-dir=/usr/lib/$PYTHON_LIB/site-packages \
-		--with-x --enable-java-awt=gtk \
+		--with-x \
+		--enable-java-awt=gtk \
 		--enable-gtk-cairo \
 		--enable-lto \
-		$CONFIGURE_ARGS $GCC_TARGET  &&
+		$GCC_TARGET \
+		$CONFIGURE_ARGS &&
 	make bootstrap &&
 	# Make install in the source tree to help creating derived pkgs
 	# and keep $_pkg variable set for genpkg.
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p  $fs/usr/share
 	cp -a $install/usr/share/java $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
@@ -95,15 +97,19 @@
 	rm $fs/usr/lib/*.la
 	# Include files.
 	cp -a $install/usr/include $fs/usr
+	DEPENDS="glibc-base glib gcc-lib-base util-linux-uuid zlib libgomp gmp mpfr \
+	python gtk2 atk cairo expat fontconfig freetype pango xorg-pixman libpng16 \
+	xorg-libxcb xorg-xcb-util xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
+	xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
+	xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
+	xorg-libXtst alsa-lib elfutils"
 }
 
-# Post install commands for Tazpkg.
-post_install()
-{
-	if [ ! -f "$1/lib/cpp" ] ; then
+post_install() {
+	if [ ! -f "$1/lib/cpp" ]; then
 		ln -s ../usr/bin/cpp "$1/lib"
 	fi
-	if [ ! -f "$1/usr/bin/cc" ] ; then
+	if [ ! -f "$1/usr/bin/cc" ]; then
 		ln -s gcc "$1/usr/bin/cc"
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e gcc/receipt
--- a/gcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="7.3.0"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/gcc.html"
@@ -14,8 +14,8 @@
 WGET_URL="http://ftp.gnu.org/gnu/gcc/gcc-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
-SPLIT="gcc-lib-base gcc-lib-math libgfortran gfortran libgomp libobjc \
-libatomic gcc"
+SPLIT="$PACKAGE-lib-base $PACKAGE-lib-math libgfortran gfortran libgomp libobjc \
+libatomic $PACKAGE"
 
 if [ "$2" == "--first-pass" -o "$3" == "--first-pass" ]; then
 	STAGE='first'
@@ -37,11 +37,6 @@
 			languages="c,c++,objc,fortran"
 			sed -i.orig '/m64=/ s|lib64|lib|' gcc/config/i386/t-linux64
 			;;
-		arm*)
-			ARCH_ARGS=""
-			pkgversion="SliTaz ARM"
-			languages="c,c++"
-			;;
 	esac
 
 	# Use libiberty.a from binutils.
@@ -86,7 +81,8 @@
 				$CONFIGURE_ARGS $ARCH_ARGS
 				;;
 	esac &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	ln -sv ../usr/bin/cpp $install/lib
@@ -98,17 +94,6 @@
 		$install/usr/lib/bfd-plugins/
 
 
-	# ARM packages use another libs...
-	case "$ARCH" in
-		arm)
-			libdir="$CROSS_TREE/tools/arm-slitaz-linux-gnueabi/lib"
-			cp -af $libdir/libgcc_s.so*    $install/usr/lib # for gcc-lib-base
-			cp -af $libdir/libstdc++.so*   $install/usr/lib
-			cp -af $libdir/libquadmath.so* $install/usr/lib # for gcc-lib-math
-			;;
-	esac
-
-
 	# Place the debugging symbols for selected libraries in separate files.
 	# This debugging information is needed if running regression tests that use valgrind or gdb.
 	# http://www.linuxfromscratch.org/lfs/view/stable/chapter06/strippingagain.html
diff -r ad29ddfee1c9 -r d5aab818505e gcc3/receipt
--- a/gcc3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gcc3"
 VERSION="3.4.6"
 CATEGORY="development"
-SHORT_DESC="The GNU Compiler Collection."
+SHORT_DESC="The GNU Compiler Collection"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
@@ -17,30 +17,35 @@
 BUILD_DEPENDS="gawk gcc49"
 DEPENDS="gcc"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/struct siginfo /siginfo_t /' gcc/config/*/linux*.h
-	mkdir gcc-build 
+	mkdir gcc-build
 	cd gcc-build
-	{
+
 	export LD_LIBRARY_PATH="/usr/libgcc49:$LD_LIBRARY_PATH"
 	export CC=gcc-49
 	export CXX=g++-49
-	$src/configure --prefix=/usr --libexecdir=/usr/lib \
-		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
-		--enable-languages=c,c++ --enable-shared --with-system-zlib \
-		--enable-clocale=gnu --enable-objc-gc --enable-__cxa_atexit \
-		--enable-threads=posix --with-tune=$ARCH \
-		--program-suffix=-3 $CONFIGURE_ARGS
+	$src/configure \
+		--prefix=/usr \
+		--libexecdir=/usr/lib \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--enable-nls \
+		--enable-languages=c,c++ \
+		--enable-shared \
+		--with-system-zlib \
+		--enable-clocale=gnu \
+		--enable-objc-gc \
+		--enable-__cxa_atexit \
+		--enable-threads=posix \
+		--with-tune=$ARCH \
+		--program-suffix=-3 \
+		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS bootstrap &&
 	make $MAKEFLAGS install
-	} 2>&1 | sed 's/: No such file/: no such file/'
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $install/usr/lib $install/usr/include $fs/usr
 	rm $fs/usr/lib/lib*
diff -r ad29ddfee1c9 -r d5aab818505e gcc49/receipt
--- a/gcc49/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc49/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.9.2"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
 REPOLOGY="gcc"
@@ -17,11 +17,10 @@
 # for cookutils that are not used by tazwok/cook-toolchain since it installs
 # and uses its own copy.
 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
-SPLIT="gcc49-lib-base"
+SPLIT="$PACKAGE-lib-base"
 
 compile_rules() {
 	case $ARCH in
-		arm*)   ARCH_ARGS="--with-tune=armv6";;
 		i?86)   ARCH_ARGS="--with-tune=$ARCH";;
 		x86_64) ARCH_ARGS="--with-tune=nocona";;
 	esac
@@ -41,7 +40,7 @@
 	$src/configure \
 		--libexecdir=/usr/lib \
 		--enable-nls \
-		--enable-languages=${languages} \
+		--enable-languages=$languages \
 		--enable-shared \
 		--with-system-zlib \
 		--enable-clocale=gnu \
@@ -56,7 +55,8 @@
 		--disable-multilib \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcc54/receipt
--- a/gcc54/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc54/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.4.0"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
 REPOLOGY="gcc"
@@ -16,11 +16,10 @@
 # for cookutils that are not used by tazwok/cook-toolchain since it installs
 # and uses its own copy.
 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
-SPLIT="gcc54-lib-base"
+SPLIT="$PACKAGE-lib-base"
 
 compile_rules() {
 	case $ARCH in
-		arm*)   ARCH_ARGS="--with-tune=armv6";;
 		i?86)   ARCH_ARGS="--with-tune=$ARCH";;
 		x86_64) ARCH_ARGS="--with-tune=nocona";;
 	esac
@@ -38,7 +37,7 @@
 	$src/configure \
 		--libexecdir=/usr/lib \
 		--enable-nls \
-		--enable-languages=${languages} \
+		--enable-languages=$languages \
 		--enable-shared \
 		--with-system-zlib \
 		--enable-clocale=gnu \
@@ -53,7 +52,8 @@
 		--disable-multilib \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcc6/receipt
--- a/gcc6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.4.0"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
 REPOLOGY="gcc"
@@ -16,13 +16,10 @@
 # for cookutils that are not used by tazwok/cook-toolchain since it installs
 # and uses its own copy.
 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
-SPLIT="gcc6-lib-base"
+SPLIT="$PACKAGE-lib-base"
 
 compile_rules() {
 	case $ARCH in
-		arm*)
-			ARCH_ARGS="--with-tune=armv6"
-			;;
 		i?86)
 			ARCH_ARGS="--with-tune=$ARCH"
 			export CFLAGS="-march=i486 -Os -pipe"
@@ -46,12 +43,13 @@
 
 	sed -i 's/^T_CFLAGS =$/& -fomit-frame-pointer/' gcc/Makefile.in
 
-	mkdir -p ../gcc-build && cd ../gcc-build
+	mkdir -p ../gcc-build
+	cd ../gcc-build
 
 	$src/configure \
 		--libexecdir=/usr/lib \
 		--enable-nls \
-		--enable-languages=${languages} \
+		--enable-languages=$languages \
 		--enable-shared \
 		--with-system-zlib \
 		--enable-clocale=gnu \
@@ -66,7 +64,8 @@
 		--disable-multilib \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
@@ -98,7 +97,7 @@
 	esac
 }
 
-post_remove_gcc61_lib_base() {
+post_remove_gcc6_lib_base() {
 	cd "$1/usr/lib"
 	ln -s libstdc++.so.6.*.* libstdc++.so.6
 	ln -s libstdc++.so.6.*.* libstdc++.so
diff -r ad29ddfee1c9 -r d5aab818505e gcc61/receipt
--- a/gcc61/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcc61/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.1.0"
 CATEGORY="development"
 SHORT_DESC="The GNU Compiler Collection"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcc.gnu.org/"
 REPOLOGY="gcc"
@@ -16,13 +16,10 @@
 # for cookutils that are not used by tazwok/cook-toolchain since it installs
 # and uses its own copy.
 BUILD_DEPENDS="mpc-library-dev mpfr-dev gmp-dev elfutils-dev zlib-dev"
-SPLIT="gcc61-lib-base"
+SPLIT="$PACKAGE-lib-base"
 
 compile_rules() {
 	case $ARCH in
-		arm*)
-			ARCH_ARGS="--with-tune=armv6"
-			;;
 		i?86)
 			ARCH_ARGS="--with-tune=$ARCH"
 			export CFLAGS="-march=i486 -Os -pipe"
@@ -51,7 +48,7 @@
 	$src/configure \
 		--libexecdir=/usr/lib \
 		--enable-nls \
-		--enable-languages=${languages} \
+		--enable-languages=$languages \
 		--enable-shared \
 		--with-system-zlib \
 		--enable-clocale=gnu \
@@ -66,7 +63,8 @@
 		--disable-multilib \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcolor2/receipt
--- a/gcolor2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcolor2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4"
 CATEGORY="graphics"
 SHORT_DESC="Light and simple color selector"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gcolor2.sourceforge.net/"
 
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gcompris/receipt
--- a/gcompris/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcompris/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="games"
 SHORT_DESC="Educational software suite comprising of numerous activities for \
 children aged 2 to 10"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gcompris.net/index-en.html"
 
@@ -16,11 +16,23 @@
 gnuchess gnet-dev sqlite3-dev libcroco-dev intltool perl texi2html texinfo \
 python-dev"
 gv="gcompris-voices"
-SPLIT="gcompris-music $gv-af $gv-ar $gv-ast $gv-bg $gv-br $gv-ca $gv-cs $gv-da \
-$gv-de $gv-el $gv-en $gv-eo $gv-es $gv-eu $gv-fi $gv-fr $gv-gd $gv-he $gv-hi \
-$gv-hu $gv-id $gv-it $gv-kn $gv-lt $gv-mr $gv-nb $gv-nl $gv-nn $gv-pa $gv-pl \
-$gv-pt $gv-pt_BR $gv-ro $gv-ru $gv-sk $gv-sl $gv-so $gv-sr $gv-sv $gv-th \
-$gv-ur $gv-zh_CN $gv-zh_TW $gv gcompris"
+SPLIT="\
+$PACKAGE-music        $PACKAGE-voices-af    $PACKAGE-voices-ar \
+$PACKAGE-voices-ast   $PACKAGE-voices-bg    $PACKAGE-voices-br \
+$PACKAGE-voices-ca    $PACKAGE-voices-cs    $PACKAGE-voices-da \
+$PACKAGE-voices-de    $PACKAGE-voices-el    $PACKAGE-voices-en \
+$PACKAGE-voices-eo    $PACKAGE-voices-es    $PACKAGE-voices-eu \
+$PACKAGE-voices-fi    $PACKAGE-voices-fr    $PACKAGE-voices-gd \
+$PACKAGE-voices-he    $PACKAGE-voices-hi    $PACKAGE-voices-hu \
+$PACKAGE-voices-id    $PACKAGE-voices-it    $PACKAGE-voices-kn \
+$PACKAGE-voices-lt    $PACKAGE-voices-mr    $PACKAGE-voices-nb \
+$PACKAGE-voices-nl    $PACKAGE-voices-nn    $PACKAGE-voices-pa \
+$PACKAGE-voices-pl    $PACKAGE-voices-pt    $PACKAGE-voices-pt_BR \
+$PACKAGE-voices-ro    $PACKAGE-voices-ru    $PACKAGE-voices-sk \
+$PACKAGE-voices-sl    $PACKAGE-voices-so    $PACKAGE-voices-sr \
+$PACKAGE-voices-sv    $PACKAGE-voices-th    $PACKAGE-voices-ur \
+$PACKAGE-voices-zh_CN $PACKAGE-voices-zh_TW $PACKAGE-voices \
+$PACKAGE"
 
 COOKOPTS="!i18nz"
 
diff -r ad29ddfee1c9 -r d5aab818505e gconf/receipt
--- a/gconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.2.6"
 CATEGORY="utilities"
 SHORT_DESC="A configuration database system"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://projects-old.gnome.org/gconf/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gcr/receipt
--- a/gcr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gcr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev gtk3-dev vala \
 p11-kit-dev libgcrypt-dev"
-SPLIT="gcr-base gcr gcr-dev"
+SPLIT="$PACKAGE-base $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml
diff -r ad29ddfee1c9 -r d5aab818505e gdal/receipt
--- a/gdal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gdal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.2"
 CATEGORY="meta"
 SHORT_DESC="Geospatial Data Abstraction Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.gdal.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="python-dev postgresql-dev geos-dev proj-dev curl-dev \
 swig tiff-dev jasper-dev jpeg-dev perl-dev"
-SPLIT="gdal gdal-dev gdal-bin gdal-datas libgdal"
+SPLIT="$PACKAGE-dev $PACKAGE-bin $PACKAGE-datas libgdal"
 
 COOKOPTS="skip-log-errors"
 
@@ -29,7 +29,7 @@
 		--with-ogr &&
 	fix libtool &&
 	make &&
-	make install BINDINGS="perl python"
+	make BINDINGS="perl python" install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gdb/receipt
--- a/gdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.0.1"
 CATEGORY="development"
 SHORT_DESC="The GNU Project Debugger"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/gdb/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev python-dev readline-dev perl-dev texinfo"
-SPLIT="gdb-python:py gdb-dev"
+SPLIT="$PACKAGE-python:py $PACKAGE-dev"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e gdbm/receipt
--- a/gdbm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gdbm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="GNU database manager"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="https://www.gnu.org/software/gdbm"
+WEB_SITE="https://www.gnu.org/software/gdbm/" # How to avoid redirection to local GNU mirror?
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/gdbm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext readline-dev"
-SPLIT="gdbm-tools gdbm-dev"
+BUILD_DEPENDS="gettext-dev readline-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gdk-pixbuf/receipt
--- a/gdk-pixbuf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gdk-pixbuf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.38.0"
 CATEGORY="x-window"
 SHORT_DESC="An image loading library for GTK+2"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gtk.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gdk-pixbuf.html"
@@ -13,8 +13,8 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja glib-dev shared-mime-info-dev libpng16-dev \
-libjpeg-turbo-dev tiff-dev gobject-introspection-dev xorg-libX11-dev gettext \
-libxslt docbook-xsl libxml2-tools"
+libjpeg-turbo-dev tiff-dev gobject-introspection-dev xorg-libX11-dev \
+gettext-dev libxslt docbook-xsl libxml2-tools"
 SPLIT="$PACKAGE-dev $PACKAGE"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e geany-plugins/receipt
--- a/geany-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geany-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,13 @@
 VERSION="1.31"
 CATEGORY="development"
 SHORT_DESC="Additional plugins for Geany"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://plugins.geany.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm="gtkspell-dev geany-dev lua-dev libxml2-dev"
 BUILD_DEPENDS="intltool geany-dev gtk2-dev check-dev vte-gtk2-dev \
 python-dev python-pygtk-dev gtkspell-dev" # lua5.1-dev but produces error
 
diff -r ad29ddfee1c9 -r d5aab818505e geany/receipt
--- a/geany/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geany/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,20 @@
 VERSION="1.31"
 CATEGORY="development"
 SHORT_DESC="Small and fast IDE using GTK+ toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.geany.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.geany.org/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev expat-dev gtk2-dev atk-dev pango-dev cairo-dev \
-xorg-pixman-dev libpng16-dev freetype-dev fontconfig-dev xorg-libXrender-dev \
-xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
-xorg-libXdmcp-dev libxml2-dev"
 BUILD_DEPENDS="gtk2-dev intltool python-lxml python-docutils"
-SPLIT="geany-doc geany-dev"
+SPLIT="$PACKAGE-doc $PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/_Keywords=/d' $src/geany.desktop.in
 
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--disable-vte";;
-	esac
-
-	./configure \
-		$ARCH_ARGS $CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install
diff -r ad29ddfee1c9 -r d5aab818505e gecko-mediaplayer/receipt
--- a/gecko-mediaplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gecko-mediaplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 CATEGORY="multimedia"
 SHORT_DESC="Browser plugin that uses gnome-mplayer to play media in a web \
 browser"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://code.google.com/p/gecko-mediaplayer/"
+WEB_SITE="https://code.google.com/archive/p/gecko-mediaplayer"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://gecko-mediaplayer.googlecode.com/files/$TARBALL"
@@ -26,7 +26,7 @@
 		CPPFLAGS="$CPPFLAGS -I/usr/include/nspr" \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e geeqie/.icon.png
Binary file geeqie/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e geeqie/receipt
--- a/geeqie/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geeqie/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.geeqie.org/$TARBALL"
 
-BUILD_DEPENDS="automake gettext intltool lcms2-dev gtk2-dev"
+BUILD_DEPENDS="automake gettext-dev intltool lcms2-dev gtk2-dev \
+libjpeg-turbo-dev tiff-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e gegl/receipt
--- a/gegl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gegl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.2"
 CATEGORY="system-tools"
 SHORT_DESC="Generic Graphics Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://gegl.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gegl.html"
@@ -13,11 +13,11 @@
 WGET_URL="https://download.gimp.org/pub/gegl/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="babl-dev glib-dev json-glib-dev libjpeg-turbo-dev libpng16-dev \
-gobject-introspection-dev gettext gexiv2-dev cairo-dev pango-dev \
+gobject-introspection-dev gettext-dev gexiv2-dev cairo-dev pango-dev \
 gdk-pixbuf-dev lensfun-dev librsvg-dev v4l-utils-dev openexr-dev ilmbase-dev \
 libsdl-dev libraw-dev jasper-dev lua-dev ffmpeg-dev lcms-dev libspiro-dev \
 exiv2-dev tiff-dev libwebp-dev gdb"
-SPLIT="$PACKAGE $PACKAGE-extra $PACKAGE-dev"
+SPLIT="$PACKAGE-extra $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gejengel/receipt
--- a/gejengel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gejengel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.1.4"
 CATEGORY="network"
 SHORT_DESC="A simple, light and clean audio player"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://code.google.com/p/gejengel/"
+WEB_SITE="https://github.com/dirkvdb/gejengel"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://gejengel.googlecode.com/files/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e gen-init-cpio/receipt
--- a/gen-init-cpio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gen-init-cpio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,24 +9,14 @@
 WEB_SITE="https://www.kernel.org/"
 REPOLOGY="-"
 
-TARBALL=""
-WGET_URL=""
-TAGS=""
-
-DEPENDS="glibc-base"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-
-compile_rules()
-{
+compile_rules() {
 	cd $stuff
-	make && make DESTDIR=$DESTDIR install &&
+	make &&
+	make DESTDIR=$install install &&
 	rm gen_init_cpio *.o
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/sbin $fs
+	DEPENDS="glibc-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e genext2fs/receipt
--- a/genext2fs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/genext2fs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,23 @@
 PACKAGE="genext2fs"
 VERSION="1.4.1"
 CATEGORY="base-system"
-SHORT_DESC="Generates an ext2 filesystem as a normal (i.e. non-root) user."
+SHORT_DESC="Generates an ext2 filesystem as a normal (i.e. non-root) user"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://genext2fs.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://genext2fs.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e genromfs/receipt
--- a/genromfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/genromfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,21 @@
 PACKAGE="genromfs"
 VERSION="0.5.7"
 CATEGORY="base-system"
-SHORT_DESC="Romfs creation tool."
+SHORT_DESC="Romfs creation tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://romfs.sourceforge.net/"
 WGET_URL="https://github.com/chexum/$PACKAGE/archive/$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|prefix)/man|prefix)/share/man|' Makefile
 
 	make &&
-	make PREFIX=$DESTDIR install
+	make PREFIX=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	ln -s genromfs $fs/usr/bin/mkromfs
diff -r ad29ddfee1c9 -r d5aab818505e gens-gs/receipt
--- a/gens-gs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gens-gs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,10 +5,10 @@
 _VERSION=gs-r7
 CATEGORY="games"
 SHORT_DESC="An emulator for Sega Genesis, Sega CD and 32X"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://info.sonicretro.org/Gens/GS"
-HOST_ARCH="i486" # cite: configure: error: 64-bit is currently not supported.
+WEB_SITE="https://segaretro.org/Gens/GS"
+HOST_ARCH="i486" # quote: configure: error: 64-bit is currently not supported.
 
 TARBALL="Gens-${_VERSION}.tar.gz"
 WGET_URL="http://segaretro.org/images/6/6d/$TARBALL"
@@ -19,7 +19,8 @@
 	chmod +x install-sh
 	./configure $CONFIGURE_ARGS
 	find -name "Makefile" | xargs sed -i 's|-DGTK_DISABLE_DEPRECATED||g'
-	make -j1 && make -j1 DESTDIR=$DESTDIR install
+	make -j1 &&
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e geoip/receipt
--- a/geoip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geoip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.4.8"
 CATEGORY="network"
 SHORT_DESC="Non-DNS IP-to-country resolver C library & utils"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.maxmind.com/app/c"
+WEB_SITE="https://dev.maxmind.com/geoip/legacy/downloadable/"
 
 TARBALL="GeoIP-$VERSION.tar.gz"
 WGET_URL="http://www.maxmind.com/download/geoip/api/c/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev automake autoconf libtool"
-SPLIT="geoip-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e geomyidae/receipt
--- a/geomyidae/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geomyidae/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="geomyidae"
 VERSION="0.31.1"
 CATEGORY="network"
-SHORT_DESC="Geomyidae is a daemon for serving the Gopher protocol"
+SHORT_DESC="Daemon for serving the Gopher protocol"
 MAINTAINER="allan316@gmail.com"
 LICENSE="MIT"
 WEB_SITE="http://www.r-36.net/"
diff -r ad29ddfee1c9 -r d5aab818505e geos/receipt
--- a/geos/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/geos/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="3.6.3"
 CATEGORY="misc"
 SHORT_DESC="Geometry Engine, Open Source"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://trac.osgeo.org/geos/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.osgeo.org/geos/$TARBALL"
 
-SPLIT="geos-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gesftpserver/receipt
--- a/gesftpserver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gesftpserver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Green End SFTP Server with up to version 6 protocol support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.greenend.org.uk/rjk/sftpserver"
+WEB_SITE="http://www.greenend.org.uk/rjk/sftpserver/"
 
 TARBALL="sftpserver-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e get-LibreOffice/receipt
--- a/get-LibreOffice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-LibreOffice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-LibreOffice"
 VERSION="1.2"
 CATEGORY="office"
-SHORT_DESC="Productivity suite."
-MAINTAINER="ben@seawolfsanctuary.com"
+SHORT_DESC="Productivity suite"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="https://www.documentfoundation.org"
+WEB_SITE="https://www.documentfoundation.org/"
 REPOLOGY="-"
 
-TAGS="office word excel ppt openoffice libreoffice"
+compile_rules() {
+	install -mD755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+	ln -s get-LibreOffice $install/usr/bin/get-libreoffice
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-LibreOffice $fs/usr/bin
-	ln -s get-LibreOffice $fs/usr/bin/get-libreoffice
+genpkg_rules() {
+	copy @std
+	TAGS="office word excel ppt openoffice libreoffice"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-OpenOffice3/receipt
--- a/get-OpenOffice3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-OpenOffice3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,21 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-OpenOffice3"
 VERSION="1.2"
 CATEGORY="office"
 SHORT_DESC="Productivity suite"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.openoffice.org"
+WEB_SITE="http://www.openoffice.org/"
 REPOLOGY="-"
 
-TAGS="office word excel ppt openoffice"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-OpenOffice3 $fs/usr/bin
-	ln -s get-OpenOffice3 $fs/usr/bin/get-openoffice
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+	ln -s get-OpenOffice3 $install/usr/bin/get-openoffice
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="office word excel ppt openoffice"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-algobox/receipt
--- a/get-algobox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-algobox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-algobox"
 VERSION="1.00"
@@ -9,10 +9,10 @@
 WEB_SITE="http://www.xm1math.net/algobox/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-algobox $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-bitcoin/receipt
--- a/get-bitcoin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-bitcoin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-bitcoin"
 VERSION="1.00"
 CATEGORY="misc"
-SHORT_DESC="Get digital currency tool for instant payments to anyone, anywhere."
+SHORT_DESC="Get digital currency tool for instant payments to anyone, anywhere"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://bitcoin.org/"
+WEB_SITE="https://bitcoin.org/en/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/get-bitcoin $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-dropbox/receipt
--- a/get-dropbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-dropbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,21 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-dropbox"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Dropbox daemon and client for online storage."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Get Dropbox daemon and client for online storage"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.getdropbox.com/"
+WEB_SITE="https://www.dropbox.com/?landing=dbv2"
 REPOLOGY="-"
 
-DEPENDS="wget"
-TAGS="sync storage"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE    $install/usr/bin/$PACKAGE
+	install -Dm644 $stuff/dropbox.png $install/usr/share/pixmaps/dropbox.png
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/share/pixmaps
-	cp stuff/get-dropbox $fs/usr/bin
-	cp stuff/dropbox.png $fs/usr/share/pixmaps
+genpkg_rules() {
+	copy @std
+	DEPENDS="wget"
+	TAGS="sync storage"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-dsl-firmware/receipt
--- a/get-dsl-firmware/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-dsl-firmware/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-dsl-firmware"
 VERSION="1.0"
 CATEGORY="non-free"
-SHORT_DESC="Get misc dsl modem firmwares."
+SHORT_DESC="Get misc DSL modem firmwares"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://hg.slitaz.org/wok/file/tip/$PACKAGE/stuff/$PACKAGE"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/$PACKAGE $fs/usr/bin
-	for i in speedtouch speedtouch-silver ueagle ueagle-atm speedtch ; do
-		ln -s $PACKAGE $fs/usr/bin/get-$i-firmware
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+
+	for i in speedtouch speedtouch-silver ueagle ueagle-atm speedtch; do
+		ln -s $PACKAGE $install/usr/bin/get-$i-firmware
 	done
 }
+
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-dsl-firmware/stuff/get-dsl-firmware
--- a/get-dsl-firmware/stuff/get-dsl-firmware	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-dsl-firmware/stuff/get-dsl-firmware	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,41 @@
 #!/bin/sh
 
-MODULE=$(echo $0 | sed 's/.*get-\(.*\)-firmware/\1/')
+MODULE=$(echo $0 | sed 's/.*get-\(.*\)-firmware/\1/')	#'
 ROOT="$1"
 PKG=$MODULE-firmware
 DEPENDS=""
 TMP=/tmp/$(basename $0)$$
 
 case "$MODULE" in
-speedtouch|speedtouch-silver|speedtch)
-	VERSION="3.012"
-	TARBALL="SpeedTouch330_firmware_$(echo $VERSION | sed 's/\.//').zip"
-	SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
-	WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
-	URL="http://www.speedtouch.com/download/drivers/USB/$TARBALL"
-	;;
-ueagle|ueagle-atm)
-	VERSION="1.1"
-	TARBALL="ueagle-data-$VERSION.tar.gz"
-	SHORT_DESC="Firmware for Fast800 USB ADSL Modem."
-	SOURCE="ueagle-data"
-	WEB_SITE="http://eagle-usb.org/"
-	URL="${WEB_SITE}ueagle-atm/non-free/$TARBALL"
-	;;
-*)	echo "Unknown dsl driver. Please run one of the following commands:"
-	for i in $(cd $(dirname $0); ls get-*-firmware); do
-		[ -L $i ] || continue
-		[ "$(readlink $i)" = "get-dsl-firmware" ] || continue
-		echo "  $i"
-	done
-	exit 1;;
+	speedtouch|speedtouch-silver|speedtch)
+		VERSION="3.012"
+		TARBALL="SpeedTouch330_firmware_$(echo $VERSION | sed 's/\.//').zip"
+		SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
+		WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
+		URL="http://www.speedtouch.com/download/drivers/USB/$TARBALL"
+		;;
+	ueagle|ueagle-atm)
+		VERSION="1.1"
+		TARBALL="ueagle-data-$VERSION.tar.gz"
+		SHORT_DESC="Firmware for Fast800 USB ADSL Modem."
+		SOURCE="ueagle-data"
+		WEB_SITE="http://eagle-usb.org/"
+		URL="${WEB_SITE}ueagle-atm/non-free/$TARBALL"
+		;;
+	*)
+		echo "Unknown dsl driver. Please run one of the following commands:"
+		for i in $(cd $(dirname $0); ls get-*-firmware); do
+			[ -L $i ] || continue
+			[ "$(readlink $i)" = "get-dsl-firmware" ] || continue
+			echo "  $i"
+		done
+		exit 1
+		;;
 esac
 
 # Check if user is root to install.
-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 use 'su' and root password to become super-user.\n"
 	exit 0
 fi
@@ -51,33 +53,33 @@
 mkdir -p $PKG-$VERSION/fs/lib/firmware
 
 case "$MODULE" in
-speedtouch|speedtouch-silver|speedtch)
-	wget $URL
-	unzip -n $(basename $URL)
-	wget http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
-	tar xzf firmware-extractor.tar.gz
-	cd firmware-extractor/
-	gcc -o firmware-extractor firmware.c
-	FIRMWARE="ZZZL_$VERSION"
-	[ "$MODULE" = "speedtouch" ] && FIRMWARE="KQD6_$VERSION"
-	cp ../$FIRMWARE mgmt.o
-	./firmware-extractor mgmt.o
-	install -m 600 speedtch-1.bin speedtch-2.bin \
-		../$PKG-$VERSION/fs/lib/firmware
-	cd ..
-	;;
-ueagle|ueagle-atm)
-	wget $URL
-	tar xzf $(basename $URL)
-	wget $(dirname $URL)/ueagle4-data-1.0.tar.gz
-	tar xzf ueagle4-data-1.0.tar.gz
-	mkdir -p $PKG-$VERSION/fs/lib/firmware/ueagle-atm
-	cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* \
-		$PKG-$VERSION/fs/lib/firmware/ueagle-atm
-	chown root.root $PKG-$VERSION/fs/lib/firmware/ueagle-atm/*
-	ln $PKG-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin.v2 \
-		$PKG-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin || true
-	;;
+	speedtouch|speedtouch-silver|speedtch)
+		wget $URL
+		unzip -n $(basename $URL)
+		wget http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
+		tar xzf firmware-extractor.tar.gz
+		cd firmware-extractor/
+		gcc -o firmware-extractor firmware.c
+		FIRMWARE="ZZZL_$VERSION"
+		[ "$MODULE" = "speedtouch" ] && FIRMWARE="KQD6_$VERSION"
+		cp ../$FIRMWARE mgmt.o
+		./firmware-extractor mgmt.o
+		install -m 600 speedtch-1.bin speedtch-2.bin \
+			../$PKG-$VERSION/fs/lib/firmware
+		cd ..
+		;;
+	ueagle|ueagle-atm)
+		wget $URL
+		tar xzf $(basename $URL)
+		wget $(dirname $URL)/ueagle4-data-1.0.tar.gz
+		tar xzf ueagle4-data-1.0.tar.gz
+		mkdir -p $PKG-$VERSION/fs/lib/firmware/ueagle-atm
+		cp -a ueagle-*/*.fw ueagle-*/*.bin ueagle4*/*.fw ueagle4*/*.bin* \
+			$PKG-$VERSION/fs/lib/firmware/ueagle-atm
+		chown root.root $PKG-$VERSION/fs/lib/firmware/ueagle-atm/*
+		ln $PKG-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin.v2 \
+			$PKG-$VERSION/fs/lib/firmware/ueagle-atm/CMV4p.bin || true
+		;;
 esac
 
 if [ ! -f $TARBALL ]; then
diff -r ad29ddfee1c9 -r d5aab818505e get-eclipse-pdt/receipt
--- a/get-eclipse-pdt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-eclipse-pdt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-eclipse-pdt"
 VERSION="1.0"
 CATEGORY="development"
 SHORT_DESC="Eclipse PHP Development Tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.eclipse.org"
+WEB_SITE="http://www.eclipse.org/"
 REPOLOGY="-"
 
-TAGS="IDE development programming"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-* $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="IDE development programming"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-flash-plugin/receipt
--- a/get-flash-plugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-flash-plugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-flash-plugin"
 VERSION="1.5"
 CATEGORY="non-free"
-SHORT_DESC="Get Adobe Flash Player."
+SHORT_DESC="Get Adobe Flash Player"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.adobe.com/products/flash/"
+WEB_SITE="https://get.adobe.com/flashplayer/otherversions/"
 REPOLOGY="-"
 
-DEPENDS="libfirefox"
-TAGS="flash"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/get-flash-plugin $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="libfirefox"
+	TAGS="flash"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-foxit-reader/receipt
--- a/get-foxit-reader/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-foxit-reader/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-foxit-reader"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="A free PDF document viewer for the Linux platform."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="A free PDF document viewer for the Linux platform"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.foxitsoftware.com/pdf/desklinux/"
+WEB_SITE="https://www.foxitsoftware.com/"
 REPOLOGY="-"
 
-TAGS="pdf viewer"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp stuff/get-foxit-reader $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	TAGS="pdf viewer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-geogebra/receipt
--- a/get-geogebra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-geogebra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-geogebra"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get geogebra: Mathematics software for learning and teaching."
+SHORT_DESC="Get geogebra: Mathematics software for learning and teaching"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.geogebra.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-geogebra $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-google-earth/receipt
--- a/get-google-earth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-google-earth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,18 @@
 PACKAGE="get-google-earth"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Google Earth."
+SHORT_DESC="Get Google Earth"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://earth.google.com/"
+WEB_SITE="https://www.google.com/earth/"
 REPOLOGY="-"
 
-TAGS="map visualization"
-
-DEPENDS="bzip2 xorg-base-fonts"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-google-earth $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	DEPENDS="bzip2 xorg-base-fonts"
+	TAGS="map visualization"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-google-talkplugin/receipt
--- a/get-google-talkplugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-google-talkplugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-google-talkplugin"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Google Talk Plugin."
+SHORT_DESC="Get Google Talk Plugin"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.google.com/chat/video"
+WEB_SITE="https://tools.google.com/dlpage/hangoutplugin"
 REPOLOGY="-"
 
-TAGS="webcam chat"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-google-talkplugin $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="webcam chat"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-java6-jdk/receipt
--- a/get-java6-jdk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-java6-jdk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,16 @@
 VERSION="1.0"
 CATEGORY="non-free"
 SHORT_DESC="SUN Java Development Kit"
-MAINTAINER="dasilvakevin@hotmail.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.java.com"
+WEB_SITE="https://www.java.com/en/"
 REPOLOGY="-"
 
-TAGS="java"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-java6-jdk $fs/usr/bin
+compile_rules() {
+	install -mD755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
-
+genpkg_rules() {
+	copy @std
+	TAGS="java"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-java6-jre/receipt
--- a/get-java6-jre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-java6-jre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-java6-jre"
 VERSION="1.1.0"
 CATEGORY="non-free"
 SHORT_DESC="SUN Java Runtime"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.java.com"
+WEB_SITE="https://www.java.com/en/"
 REPOLOGY="-"
 
-TAGS="java"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -o root -g root -m755 stuff/get-java6-jre $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="java"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-libaacs/receipt
--- a/get-libaacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-libaacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-libaacs"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get a library to play encrypted blu-ray."
+SHORT_DESC="Get a library to play encrypted blu-ray"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://vlc-bluray.whoknowsmy.name/"
+WEB_SITE="https://vlc-bluray.whoknowsmy.name/"
 REPOLOGY="-"
 
-TAGS="bluray"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-libaacs $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="bluray"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-libstdc++5/receipt
--- a/get-libstdc++5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-libstdc++5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,16 @@
 PACKAGE="get-libstdc++5"
 VERSION="1.00"
 CATEGORY="development"
-SHORT_DESC="Get Obsolate GNU C++ library."
+SHORT_DESC="Get obsolete GNU C++ library"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://gcc.gnu.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-libstdc++5 $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-linuxqq/receipt
--- a/get-linuxqq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-linuxqq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-linuxqq"
 VERSION="1.01"
@@ -9,10 +9,11 @@
 WEB_SITE="http://im.qq.com/"
 REPOLOGY="-"
 
-TAGS="im instant-messaging"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp stuff/get-linuxqq $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	TAGS="im instant-messaging"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-litecoin/receipt
--- a/get-litecoin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-litecoin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-litecoin"
 VERSION="1.00"
 CATEGORY="misc"
-SHORT_DESC="Get digital currency tool for instant payments to anyone, anywhere."
+SHORT_DESC="Get digital currency tool for instant payments to anyone, anywhere"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://litecoin.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/get-litecoin $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-msttcorefonts/receipt
--- a/get-msttcorefonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-msttcorefonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
-# http://corefonts.sourceforge.net/
+# SliTaz package receipt v2.
 
 PACKAGE="get-msttcorefonts"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="An easy way to install Microsoft's TrueType core fonts on linux."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="An easy way to install Microsoft's TrueType core fonts on Linux"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://sourceforge.net/projects/corefonts"
+WEB_SITE="https://sourceforge.net/projects/corefonts/"
 REPOLOGY="-"
 
-TAGS="utilities"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-DEPENDS="cabextract"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/$PACKAGE $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="cabextract"
+	TAGS="utilities"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-msttcorefonts2/receipt
--- a/get-msttcorefonts2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-msttcorefonts2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-msttcorefonts2"
 VERSION="1.00"
@@ -6,16 +6,15 @@
 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"
+WEB_SITE="https://sourceforge.net/projects/mscorefonts2/"
 REPOLOGY="-"
 
-TAGS="utilities"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-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
+genpkg_rules() {
+	copy @std
+	DEPENDS="cabextract"
+	TAGS="utilities"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-nz/receipt
--- a/get-nz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-nz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-nz"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get nanozip archiver."
+SHORT_DESC="Get nanozip archiver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.nanozip.net/"
+WEB_SITE="https://web.archive.org/web/20161006132549/http://www.nanozip.net/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-nz $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-opera/receipt
--- a/get-opera/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-opera/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-opera"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Opera Web browser."
+SHORT_DESC="Get Opera Web browser"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.opera.com/"
 REPOLOGY="-"
 
-TAGS="browser"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-opera $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="browser"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-palemoon/receipt
--- a/get-palemoon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-palemoon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,14 +3,14 @@
 PACKAGE="get-palemoon"
 VERSION="27.6.1"
 CATEGORY="non-free"
-SHORT_DESC="Browser based on Firefox that's optimised for performance. Official sse2 version."
+SHORT_DESC="Browser based on Firefox that's optimised for performance. Official sse2 version"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
 WEB_SITE="http://www.palemoon.org/"
 REPOLOGY="-"
 
 compile_rules() {
-	install -Dm0755 $stuff/get-palemoon $install/usr/bin/get-palemoon
+	install -Dm0755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
 genpkg_rules() {
@@ -19,7 +19,11 @@
 }
 
 post_install() {
-	echo 'To get browser run get-palemoon command as root'
-	echo 'For media playback try to install ffmpeg package'
+	[ -n "$quiet" ] || cat <<EOT
+
+	.-------------------------------------------------.
+	| To get browser run get-palemoon command as root |
+	| For media playback install ffmpeg package       |
+	'-------------------------------------------------'
+EOT
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e get-playonlinux/receipt
--- a/get-playonlinux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-playonlinux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-playonlinux"
 VERSION="1.00"
 CATEGORY="games"
-SHORT_DESC="Get playonlinux."
+SHORT_DESC="Get playonlinux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.playonlinux.com/"
+WEB_SITE="https://www.playonlinux.com/en/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-playonlinux $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
-post_install()
-{
-	[ -n "$1" ] || get-playonlinux
+genpkg_rules() {
+	copy @std
 }
+
+post_install() {
+	chroot "$1/" get-playonlinux
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-prince/receipt
--- a/get-prince/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-prince/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-prince"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="formatter for converting XML and HTML into PDF."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Formatter for converting XML and HTML into PDF"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.princexml.com/"
+WEB_SITE="https://www.princexml.com/"
 REPOLOGY="-"
 
-TAGS="utilities"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp stuff/get-prince $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="utilities"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-rar/receipt
--- a/get-rar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-rar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-rar"
 VERSION="171201"
@@ -9,13 +9,11 @@
 WEB_SITE="https://www.rarlab.com/"
 REPOLOGY="-"
 
-TAGS="compression archive"
-
 compile_rules() {
-	install -Dm0755 $stuff/get-rar $install/usr/bin/get-rar
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
 genpkg_rules() {
 	copy @std
+	TAGS="compression archive"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e get-realplayer/receipt
--- a/get-realplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-realplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-realplayer"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Real Player for Linux."
+SHORT_DESC="Get Real Player for Linux"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.real.com"
+WEB_SITE="http://www.real.com/"
 REPOLOGY="-"
 
-TAGS="music audio sound player"
-
-DEPENDS="tar bash"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-realplayer $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	DEPENDS="tar bash"
+	TAGS="music audio sound player"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-scilab/receipt
--- a/get-scilab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-scilab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-scilab"
 VERSION="1.00"
 CATEGORY="misc"
-SHORT_DESC="Get scilab: Free Open Source Software for Numerical Computation."
+SHORT_DESC="Free Open Source Software for Numerical Computation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.scilab.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-scilab $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-skype/receipt
--- a/get-skype/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-skype/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-skype"
 VERSION="1.1"
 CATEGORY="non-free"
-SHORT_DESC="Get Skype Internet Telephony."
+SHORT_DESC="Get Skype Internet Telephony"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.skype.com/"
+WEB_SITE="https://www.skype.com/en/"
 REPOLOGY="-"
 
-TAGS="chat telephony"
-
-DEPENDS="bzip2"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-skype $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	DEPENDS="bzip2"
+	TAGS="chat telephony"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-softmodem-driver/receipt
--- a/get-softmodem-driver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-softmodem-driver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,30 @@
 PACKAGE="get-softmodem-driver"
 VERSION="0.11"
 CATEGORY="non-free"
-SHORT_DESC="Get misc softmodem drivers."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Get misc softmodem drivers"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="modem dialup"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 
-DEPENDS="alsa-lib-dev cpio linux-source slitaz-toolchain"
+	for i in hsfmodem hcfpcimodem martian slmodem; do
+		ln -s $PACKAGE $install/usr/bin/get-$i-driver
+	done
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/$PACKAGE $fs/usr/bin
-	for i in hsfmodem hcfpcimodem martian slmodem; do
-		ln -s $PACKAGE $fs/usr/bin/get-$i-driver
-	done
-	mkdir -p $fs/usr/share/softmodem
-	cp -a $stuff/*diff $fs/usr/share/softmodem
-	cp -a $stuff/*receipt $fs/usr/share/softmodem
-	cp -a $stuff/*init $fs/usr/share/softmodem
-	cp -a $stuff/*country $fs/usr/share/softmodem
-	cp -a $stuff/zone.tab $fs/usr/share/softmodem
+	mkdir -p $install/usr/share/softmodem/
+	cp -a \
+		$stuff/*diff \
+		$stuff/*receipt \
+		$stuff/*init \
+		$stuff/*country \
+		$stuff/zone.tab \
+		$install/usr/share/softmodem/
 }
+
+genpkg_rules() {
+	DEPENDS="alsa-lib-dev cpio linux-source slitaz-toolchain"
+	TAGS="modem dialup"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-softmodem-driver/stuff/hcfpcimodem.receipt
--- a/get-softmodem-driver/stuff/hcfpcimodem.receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-softmodem-driver/stuff/hcfpcimodem.receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,20 @@
 VERSION="1.19full"
 CATEGORY="non-free"
 SHORT_DESC="Driver for the Conexant HCF (controllerless) Softmodem family."
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"
 WEB_SITE="http://www.linuxant.com/drivers"
 WGET_URL="http://www.linuxant.com/drivers/hcf/full/archive/$PACKAGE-$VERSION/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
+post_install() {
 	/usr/sbin/hcfpciconfig --auto
 }
 
-post_remove()
-{
-    echo -n "Removing modules.."
-    rm -rf /lib/modules/`uname -r`/extra/hcfpci*
-    status
+post_remove() {
+	action "Removing modules.."
+	rm -rf /lib/modules/$(uname -r)/extra/hcfpci*
+	status
 	rm -rf /usr/share/hcfpicmodem
 	rm -rf /etc/hcfpcimodem
-}
\ No newline at end of file
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-softmodem-driver/stuff/hsfmodem.receipt
--- a/get-softmodem-driver/stuff/hsfmodem.receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-softmodem-driver/stuff/hsfmodem.receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,20 @@
 VERSION="7.80.02.04full"
 CATEGORY="non-free"
 SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family."
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="module-init-tools linux-source"
 WEB_SITE="http://www.linuxant.com/drivers"
 WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$PACKAGE-$VERSION/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
+post_install() {
 	/usr/sbin/hsfconfig --auto
 }
 
-post_remove()
-{
-	echo -n "Removing modules.."
-	rm -rf /lib/modules/`uname -r`/extra/hsf*
+post_remove() {
+	action "Removing modules.."
+	rm -rf /lib/modules/$(uname -r)/extra/hsf*
 	status
 	rm -rf /usr/share/hsfmodem
 	rm -rf /etc/hsfmodem
-}
\ No newline at end of file
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-softmodem-driver/stuff/martian.receipt
--- a/get-softmodem-driver/stuff/martian.receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-softmodem-driver/stuff/martian.receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,23 +4,22 @@
 VERSION="full-20080617"
 CATEGORY="non-free"
 SHORT_DESC="Driver for the Agere Systems PCI Modem built on DSP 164x (Mars) series."
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
+WEB_SITE="http://martian.barrelsoutofbond.org"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="module-init-tools linux-source"
-WEB_SITE="http://martian.barrelsoutofbond.org"
 WGET_URL="http://www.barrelsoutofbond.org/downloads/$PACKAGE/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
+DEPENDS="module-init-tools linux-source"
 
-post_install()
-{
+post_install() {
 	# Country settings
 	if [ -e /etc/TZ ]; then
-		ZONE=`cat /etc/TZ`
-		CODE=`grep $ZONE /usr/share/martian/zone.tab | cut -f1'`
+		ZONE=$(cat /etc/TZ)
+		CODE=$(grep $ZONE /usr/share/martian/zone.tab | cut -f1)
 		if [ -n $CODE ]; then
-			COUNTRY=`grep ^$CODE /usr/share/martian/martian.country | cut -f2`
-			COUNTRY_NAME=`grep ^$CODE /usr/share/martian/martian.country | cut -f3`
+			COUNTRY=$(grep ^$CODE /usr/share/martian/martian.country | cut -f2)
+			COUNTRY_NAME=$(grep ^$CODE /usr/share/martian/martian.country | cut -f3)
 		fi
 	fi
 	if [ -z $COUNTRY ]; then
@@ -29,21 +28,20 @@
 	fi
 	echo "Automatic country setting: $COUNTRY_NAME"
 	# Save options
-	if [ `grep -c MARTIAN_OPTIONS /etc/daemons.conf` -gt 0 ]; then
+	if [ $(grep -c MARTIAN_OPTIONS /etc/daemons.conf) -gt 0 ]; then
 		sed -i 's/MARTIAN_OPTIONS=.*/MARTIAN_OPTIONS="--country='"$COUNTRY"' \/dev\/ttySM0"/' /etc/daemons.conf
 	else
-	echo "# slmodemd daemon options." >> $root/etc/daemons.conf
+		echo "# slmodemd daemon options." >> $root/etc/daemons.conf
 		echo "MARTIAN_OPTIONS=\"--country=$COUNTRY /dev/ttySM0\"" >> $root/etc/daemons.conf
 		echo  >> $root/etc/daemons.conf
 	fi
 	# Load module
 	/sbin/depmod -a
-	/sbin/modprobe martian_dev && \
+	/sbin/modprobe martian_dev &&
 	/etc/init.d/martian start
 }
 
-post_remove()
-{
+post_remove() {
 	/etc/init.d/martian stop
 	rm -rf /usr/share/martian
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-softmodem-driver/stuff/slmodem.receipt
--- a/get-softmodem-driver/stuff/slmodem.receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-softmodem-driver/stuff/slmodem.receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,19 @@
 VERSION="2.9.11-20090222"
 CATEGORY="non-free"
 SHORT_DESC="Support for the SmartLink Softmodem and ALSA supported chipsets."
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 DEPENDS="alsa-lib module-init-tools linux-source"
 WEB_SITE="http://linmodems.technion.ac.il"
 WGET_URL="http://linmodems.technion.ac.il/packages/smartlink/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-post_install()
-{
+post_install() {
 	# Country detection
 	if [ -e /etc/TZ ]; then
-		ZONE=`cat /etc/TZ`
-		CODE=`grep $ZONE /usr/share/slmodem/zone.tab | cut -f1'`
+		ZONE=$(cat /etc/TZ)
+		CODE=$(grep $ZONE /usr/share/slmodem/zone.tab | cut -f1)
 		if [ -n $CODE ]; then
-			COUNTRY=`grep ^$CODE /usr/share/slmodem/slmodem.country | cut -f2`
+			COUNTRY=$(grep ^$CODE /usr/share/slmodem/slmodem.country | cut -f2)
 		fi
 	fi
 	if [ -z $COUNTRY ]; then
@@ -27,7 +24,7 @@
 	fi
 	echo "Automatic country setting: $COUNTRY"
 	# Save options
-	if [ `grep -c SLMODEM_OPTIONS /etc/daemons.conf` -gt 0 ]; then
+	if [ $(grep -c SLMODEM_OPTIONS /etc/daemons.conf) -gt 0 ]; then
 		sed -i 's/SLMODEM_OPTIONS=.*/SLMODEM_OPTIONS="--country='"$COUNTRY"' \/dev\/slamr0"/' /etc/daemons.conf
 	else
 		echo "# slmodemd daemon options." >> $root/etc/daemons.conf
diff -r ad29ddfee1c9 -r d5aab818505e get-src2pkg/receipt
--- a/get-src2pkg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-src2pkg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-src2pkg"
 VERSION="1.00"
@@ -9,10 +9,10 @@
 WEB_SITE="https://distro.ibiblio.org/amigolinux/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/get-src2pkg $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-sublime-text-3/receipt
--- a/get-sublime-text-3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-sublime-text-3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-sublime-text-3"
 VERSION="1"
 CATEGORY="non-free"
-SHORT_DESC="Sublime Text is a sophisticated text editor for code, markup and prose"
+SHORT_DESC="Sophisticated text editor for code, markup and prose"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="non-free"
 WEB_SITE="http://www.sublimetext.com/"
 REPOLOGY="-"
 
-TAGS="development text-editor IDE programming"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $stuff/$PACKAGE $fs/usr/bin
-	chmod a+x $fs/usr/bin/$PACKAGE
+genpkg_rules() {
+	copy @std
+	TAGS="development text-editor IDE programming"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-teamviewer/receipt
--- a/get-teamviewer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-teamviewer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,16 @@
 PACKAGE="get-teamviewer"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get TeamViewer (Remote Control Application)."
+SHORT_DESC="Get TeamViewer (Remote Control Application)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://www.teamviewer.com/"
+WEB_SITE="https://www.teamviewer.com/en/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/$PACKAGE $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-texlive/receipt
--- a/get-texlive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-texlive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-texlive"
 VERSION="2008"
 CATEGORY="office"
-SHORT_DESC="get texlive distribution for tex, latex..."
-MAINTAINER="sygne@ombres.eu"
+SHORT_DESC="Get texlive distribution for TeX, latex..."
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.tug.org/texlive/"
 REPOLOGY="-"
 
-TAGS="latex tex"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/$PACKAGE $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
-# post install
-post_install()
-{
-	echo -e "
-To get texlive, run \033[1mget-texlive\033[0m as root.
-This will install about 31 Mo of tools in /usr/local/texlive
-"
+genpkg_rules() {
+	copy @std
+	TAGS="latex tex"
 }
 
+post_install() {
+	[ -n "$quiet" ] || cat <<EOT
+
+	.--------------------------------------------------------------.
+	| To get texlive, run as root:                                 |
+	|    get-texlive                                               |
+	|                                                              |
+	| This will install about 31 MB of tools in /usr/local/texlive |
+	'--------------------------------------------------------------'
+EOT
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-unace/receipt
--- a/get-unace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-unace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-unace"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get UNACE unpacker."
+SHORT_DESC="Get UNACE unpacker"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.winace.com/"
 REPOLOGY="-"
 
-TAGS="compression archive"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-unace $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="compression archive"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-upx/receipt
--- a/get-upx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-upx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-upx"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get UPX executable packer."
+SHORT_DESC="Get UPX executable packer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://upx.sourceforge.net/"
+WEB_SITE="https://upx.github.io/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-upx $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-virtualbox/receipt
--- a/get-virtualbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-virtualbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,23 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-virtualbox"
 VERSION="1.02"
 CATEGORY="non-free"
-SHORT_DESC="Get a x86 virtualization software."
+SHORT_DESC="Get a x86 virtualization software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.virtualbox.org/"
 REPOLOGY="-"
 
-DEPENDS="wget"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/get-virtualbox $fs/usr/bin
-	
-	# Improve Slitaz support.
-	#cd $fs/usr/bin && patch -p1 -i $stuff/installer.u
+	# Improve SliTaz support.
+	# cd $install/usr/bin
+	# patch -p1 -i $stuff/installer.u
 }
 
+genpkg_rules() {
+	copy @std
+	DEPENDS="wget"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-wakoopa/receipt
--- a/get-wakoopa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-wakoopa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,19 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-wakoopa"
 VERSION="1.02"
 CATEGORY="non-free"
-SHORT_DESC="Wakoopa is the perfect place to discover software and games online."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Perfect place to discover software and games online"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://wakoopa.com"
+WEB_SITE="http://wakoopa.com/"
 REPOLOGY="-"
 
-TAGS="games"
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr/bin
-    cp stuff/get-wakoopa $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	TAGS="games"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-wfica/receipt
--- a/get-wfica/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-wfica/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-wfica"
 VERSION="1.01"
 CATEGORY="non-free"
-SHORT_DESC="Get Citrix ICA Client."
+SHORT_DESC="Get Citrix ICA Client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.citrix.com/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp $stuff/$PACKAGE $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-wifi-firmware/receipt
--- a/get-wifi-firmware/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-wifi-firmware/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-wifi-firmware"
 VERSION="2.0"
 CATEGORY="non-free"
-SHORT_DESC="Get misc wifi firmwares."
+SHORT_DESC="Get misc Wi-Fi firmwares"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://hg.slitaz.org/wok/file/tip/$PACKAGE/stuff/$PACKAGE"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/$PACKAGE $fs/usr/bin
-	$fs/usr/bin/$PACKAGE --install
+compile_rules() {
+	install $stuff/$PACKAGE $install/usr/bin/$PACKAGE
+
+	$install/usr/bin/$PACKAGE --install
 }
 
-post_install()
-{
-	install_resolver=false
-	[ -s /etc/resolv.conf -a ! -s "$1/etc/resolv.conf" ] && install_resolver=true
+genpkg_rules() {
+	copy @std
+}
+
+post_install() {
+	if [ -s /etc/resolv.conf -a ! -s "$1/etc/resolv.conf" ]; then
+		install_resolver=true
+	else
+		install_resolver=false
+	fi
+
 	$install_resolver && cp /etc/resolv.conf "$1/etc/resolv.conf"
-	# directly support some freely distributable firmware drivers 
+
+	# directly support some freely distributable firmware drivers
 	chroot "$1/" /usr/bin/get-wifi-firmware --get-free-firmware
+
 	$install_resolver && rm -f "$1/etc/resolv.conf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e get-wink/receipt
--- a/get-wink/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-wink/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-wink"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get a Tutorial and Presentation creation software."
+SHORT_DESC="Get a Tutorial and Presentation creation software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.debugmode.com/wink/"
 REPOLOGY="-"
 
-TAGS="tutorial screenshot"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-wink $fs/usr/bin
+compile_rules() {
+	install $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="tutorial screenshot"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-xcas/receipt
--- a/get-xcas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-xcas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,18 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-xcas"
 VERSION="1.00"
 CATEGORY="misc"
-SHORT_DESC="Get Xcas: Computer algebra system."
+SHORT_DESC="Get Xcas: Computer algebra system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-xcas $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-xlite/receipt
--- a/get-xlite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-xlite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-xlite"
 VERSION="1.00"
 CATEGORY="non-free"
-SHORT_DESC="Get Xlite soft phone."
+SHORT_DESC="Get Xlite soft phone"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.counterpath.net/"
+WEB_SITE="https://www.counterpath.com/"
 REPOLOGY="-"
 
-TAGS="softphone telephony"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-xlite $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="softphone telephony"
+}
diff -r ad29ddfee1c9 -r d5aab818505e get-xnviewmp/receipt
--- a/get-xnviewmp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/get-xnviewmp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="get-xnviewmp"
 VERSION="1.1"
 CATEGORY="non-free"
-SHORT_DESC="Get XnViewMP. Image viewer"
-MAINTAINER="taziden@slitaz.org"
+SHORT_DESC="Get XnViewMP image viewer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://www.xnview.com/"
+WEB_SITE="https://www.xnview.com/en/"
 REPOLOGY="-"
 
-TAGS="image photo viewer"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp stuff/get-xnviewmp $fs/usr/bin
+compile_rules() {
+	install -Dm755 $stuff/$PACKAGE $install/usr/bin/$PACKAGE
 }
 
+genpkg_rules() {
+	copy @std
+	TAGS="image photo viewer"
+}
diff -r ad29ddfee1c9 -r d5aab818505e getmail/receipt
--- a/getmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/getmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A simple mail retrieval agent intended as a replacement for fetchmail"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://pyropus.ca/software/getmail"
+WEB_SITE="http://pyropus.ca/software/getmail/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/old-versions/$TARBALL"
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gettext/receipt
--- a/gettext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gettext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.19.8.1"
 CATEGORY="development"
 SHORT_DESC="Utilities for the GNU Translation Project"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gettext/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/gettext.html"
@@ -12,17 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm="attr-dev ncurses-dev libxml2-tools libxml2-dev"
 BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev emacs \
 xorg-libXrandr-dev xorg-libXfixes-dev"
-SPLIT="gettext-base gettext-tools emacs-pkg-po-mode gettext"
+SPLIT="$PACKAGE-base $PACKAGE-tools emacs-pkg-po-mode $PACKAGE"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS="--disable-acl";;
-	esac
-
-	./configure $CONFIGURE_ARGS $ARCH_ARGS && make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	chmod 0755 $install/usr/lib/preloadable_libintl.so
 
diff -r ad29ddfee1c9 -r d5aab818505e gexiv2/receipt
--- a/gexiv2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gexiv2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev exiv2-dev gobject-introspection-dev vala"
-SPLIT="gexiv2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gf2x/receipt
--- a/gf2x/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gf2x/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://gforge.inria.fr/frs/download.php/file/36934/$TARBALL"
 
-SPLIT="gf2x-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gftp/receipt
--- a/gftp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gftp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.0.19"
 CATEGORY="network"
 SHORT_DESC="Small and fast FTP client"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.gftp.org/"
+WEB_SITE="https://www.gftp.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.gftp.org/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gettext"
+BUILD_DEPENDS="gtk2-dev gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e ggseq/receipt
--- a/ggseq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ggseq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="ggseq"
 VERSION="0.3.1"
 CATEGORY="multimedia"
-SHORT_DESC="Gungirl Sequencer is an easy to use Audiosequencer"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Gungirl Sequencer - easy to use audio sequencer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ggseq.sourceforge.net/"
 
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ghex/receipt
--- a/ghex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ghex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="ghex"
 VERSION="2.24.0"
 CATEGORY="x-window"
-SHORT_DESC="GHex is a simple binary editor"
-MAINTAINER="samuel_trassare@yahoo.com"
+SHORT_DESC="Simple binary editor"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://directory.fsf.org/wiki/Ghex"
 
diff -r ad29ddfee1c9 -r d5aab818505e ghostscript/receipt
--- a/ghostscript/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ghostscript/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="9.22"
 CATEGORY="office"
 SHORT_DESC="Ghostscript tools and utilities"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://pages.cs.wisc.edu/~ghost/"
 
@@ -32,7 +32,7 @@
 		--disable-compile-inits \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install soinstall
+	make DESTDIR=$install install soinstall
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e giac/receipt
--- a/giac/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/giac/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="giac"
 VERSION="1.4.9"
 CATEGORY="misc"
-SHORT_DESC="Giac/Xcas is a free computer algebra system"
+SHORT_DESC="Free computer algebra system"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
diff -r ad29ddfee1c9 -r d5aab818505e giblib/receipt
--- a/giblib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/giblib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.4"
 CATEGORY="graphics"
 SHORT_DESC="Giblib graphic library"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://freshmeat.sourceforge.net/projects/giblib"
 
@@ -13,18 +13,15 @@
 
 BUILD_DEPENDS="gfortran imlib2-dev imlib2 xorg-xorgproto freetype-dev \
 xorg-libXext-dev"
-SPLIT="giblib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib" ;;
-	esac
+	sed -i 's|/doc|/share&|' Makefile*
 
-	sed -i 's|/doc|/share&|' Makefile*
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e giflib/receipt
--- a/giflib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/giflib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.1.4"
 CATEGORY="graphics"
 SHORT_DESC="A library and utilities for processing GIFs"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://sourceforge.net/projects/giflib/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/giflib.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/giflib/$TARBALL"
 
-SPLIT="giflib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gifsicle/receipt
--- a/gifsicle/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gifsicle/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://www.lcdf.org/gifsicle/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev"
-SPLIT="gifview gifsicle"
+SPLIT="gifview $PACKAGE"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gimp/receipt
--- a/gimp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gimp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10.2"
 CATEGORY="graphics"
 SHORT_DESC="GNU Image Manipulation Program"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gimp.org/"
 
@@ -17,8 +17,9 @@
 xorg-libXpm-dev openexr-dev ilmbase-dev libwebp-dev libheif-dev libmypaint-dev \
 mypaint-brushes-dev librsvg-dev poppler-dev poppler-data libwmf-dev \
 openjpeg2-dev xorg-libXcursor-dev libgudev-dev xdg-utils libxslt \
-shared-mime-info-dev desktop-file-utils-extra gtk-doc"
-SPLIT="$PACKAGE-brushes $PACKAGE-console $PACKAGE-dev $PACKAGE-plug-ins $PACKAGE"
+shared-mime-info-dev desktop-file-utils-extra gtk-doc tiff-dev"
+SPLIT="$PACKAGE-brushes $PACKAGE-console $PACKAGE-dev $PACKAGE-plug-ins \
+$PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e git-gui/receipt
--- a/git-gui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/git-gui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,34 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
+
 PACKAGE="git-gui"
 VERSION="0.13.0"
 CATEGORY="development"
-SHORT_DESC="Graphical interface for the Git dRCS."
-MAINTAINER="ben@seawolfsanctuary.com"
+SHORT_DESC="Graphical interface for the Git dRCS"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://mirrors.edge.kernel.org/pub/software/scm/git/docs/git-gui.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.kernel.org/pub/software/scm/git/docs/git-gui.html"
 WGET_URL="git|http://repo.or.cz/r/git-gui.git"
 BRANCH="gitgui-$VERSION"
 
-DEPENDS="tk git"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="tk git"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make clean
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs/
-	
+
 	# Extra icons, .desktop file etc.:
 	cp -a $stuff/* $fs/usr
 
 	mkdir -p $fs/usr/bin
 	ln -s /usr/lib/git-core/git-gui /usr/lib/git-core/git-citool \
 		/usr/lib/git-core/git-gui--askpass $fs/usr/bin
+	DEPENDS="tk git"
 }
diff -r ad29ddfee1c9 -r d5aab818505e git/receipt
--- a/git/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/git/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,15 @@
 VERSION="2.17.1"
 CATEGORY="development"
 SHORT_DESC="Fast version control system"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://git-scm.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/software/scm/git/$TARBALL"
 
-# NO_NSEC=1
-CROSS_BUGS="bug: can't run test and make package."
-
 BUILD_DEPENDS="zlib-dev openssl-dev curl-dev expat-dev perl python-dev \
-tar bzip2 gettext-tools"
+tar bzip2 gettext"
 
 compile_rules() {
 	./configure \
@@ -25,7 +22,7 @@
 		--without-tcltk \
 		$CONFIGURE_ARGS &&
 	make THREADED_DELTA_SEARCH=1 &&
-	make THREADED_DELTA_SEARCH=1 DESTDIR=$DESTDIR install || return 1
+	make THREADED_DELTA_SEARCH=1 DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/git-daemon $install/etc/init.d/git-daemon
 }
diff -r ad29ddfee1c9 -r d5aab818505e gitmail/receipt
--- a/gitmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gitmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gitmail"
 VERSION="0.4"
 CATEGORY="network"
-SHORT_DESC="Ghost In The Mail is a simple mail client"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Ghost In The Mail - simple mail client"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gitmail.sourceforge.net/"
 
@@ -22,7 +22,7 @@
 	fix libtool &&
 	make &&
 	make \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		gitmaildocdir=/usr/share/doc/GhostInTheMail \
 		install
 }
diff -r ad29ddfee1c9 -r d5aab818505e giws/receipt
--- a/giws/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/giws/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python libxml2-python"
 
 compile_rules() {
-	python -B setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gkII/receipt
--- a/gkII/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gkII/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gkII"
 VERSION="0.4.7"
 CATEGORY="graphics"
-SHORT_DESC="GTK2 based fractal program."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GTK2 based fractal program"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.jwm-art.net/gkII/"
 REPOLOGY="gkii"
@@ -12,22 +12,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.jwm-art.net/gkII/$TARBALL"
 
-DEPENDS="gtk2"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-#
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' my_png.c
 	sed -i 's/LIBS.*/& -lm/' Makefile
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp $src/src/gkII $fs/usr/bin
+	DEPENDS="gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e glade-perl/receipt
--- a/glade-perl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glade-perl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.007"
 CATEGORY="development"
 SHORT_DESC="Gtk2-GladeXML perl bindings for glade 2.x"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SOURCE="Gtk2-GladeXML"
 TARBALL="$SOURCE-$VERSION.tar.gz"
@@ -18,7 +18,7 @@
 compile_rules() {
 	perl Makefile.PL &&
 	make &&
-	make install DESTDIR=$DESTDIR
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e glade3/receipt
--- a/glade3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glade3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.8.6"
 CATEGORY="development"
 SHORT_DESC="A user interface designer for GTK+2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2"
 WEB_SITE="https://glade.gnome.org/"
 REPOLOGY="glade"
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk-doc gtk2-dev python-pygtk-dev python-dev itstool"
-SPLIT="glade3-python glade3 glade3-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e glances/receipt
--- a/glances/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glances/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,24 @@
 PACKAGE="glances"
 VERSION="1.5.1"
 CATEGORY="utilities"
-SHORT_DESC="A CLI curses based monitoring tool for GNU/Linux and BSD OS."
+SHORT_DESC="A CLI curses based monitoring tool for GNU/Linux and BSD OS"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL3"
+WEB_SITE="https://nicolargo.github.io/glances/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://nicolargo.github.com/glances/"
 WGET_URL="git|git://github.com/nicolargo/glances.git"
-SUGGESTED="python-jinja2"
 
-DEPENDS="python python-psutil"
 BUILD_DEPENDS="git bzip2 python-dev python-psutil"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	# remove stuff
 	rm -rf $fs/usr/share/man
+	DEPENDS="python python-psutil"
+	SUGGESTED="python-jinja2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e glew/receipt
--- a/glew/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glew/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,11 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev mesa-dev"
-SPLIT="glew-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e glib-networking/receipt
--- a/glib-networking/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glib-networking/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.56.1"
 CATEGORY="x-window"
 SHORT_DESC="TLS support for glib"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.gtk.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/glib-networking.html"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev gnutls-dev"
 BUILD_DEPENDS="meson ninja intltool gnutls-dev gsettings-desktop-schemas-dev \
 glib-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e glib/receipt
--- a/glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.56.1"
 CATEGORY="x-window"
 SHORT_DESC="C routines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/glib/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/glib2.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext \
+BUILD_DEPENDS="automake libtool zlib-dev libffi-dev gettext-dev \
 util-linux-mount-dev pcre-dev glib-dev   elfutils-dev gtk-doc libxslt \
 docbook-xsl dbus-dev"
 SPLIT="$PACKAGE-static $PACKAGE-dev"
diff -r ad29ddfee1c9 -r d5aab818505e glibc/receipt
--- a/glibc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glibc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.26"
 CATEGORY="meta"
 SHORT_DESC="The GNU C libraries"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/libc/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/glibc.html"
@@ -12,25 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="linux-api-headers autoconf bash gawk gettext bison texinfo"
+BUILD_DEPENDS="linux-api-headers autoconf bash gawk gettext-dev bison texinfo"
 # slitaz-i18n should present in wok
-SPLIT="glibc-base glibc-locale nscd glibc-dev"
+SPLIT="$PACKAGE-base $PACKAGE-locale nscd $PACKAGE-dev"
 
 # Locales include to glibc-base package by default, other locales are in: locale-** and glibc-locale
 DEFAULT_LOCALE="en_US en_GB"
 
-# Handle multiarch compilation.
-case "$ARCH" in
-	arm*) VERSION="2.13";;
-esac
-
-# Handle multiarch installation.
-case "$SLITAZ_ARCH" in
-	arm*) VERSION="2.13";;
-esac
-
-
-# Rules to compile & install the temporary toolchain.
+# Compile & install the temporary toolchain.
 cook_tmp_toolchain() {
 	unset CFLAGS CXXFLAGS
 	case $ARCH in
@@ -65,7 +54,6 @@
 	unset SPECS
 }
 
-# Rules to configure and make the package.
 compile_rules() {
 	# Glibc needs ld.so.conf in the install destdir.
 	mkdir -p $install/etc
@@ -159,15 +147,6 @@
 			TAGS="LFS"
 			;;
 		glibc-base)
-			case "$ARCH" in
-				arm*)
-					# Eglibc is cross compiled by cross to have a toolchain so we can
-					# use these files instead of recooking it. ARM use Eglibc
-					echo "Using cross compiled Eglibc..."
-					install="/cross/$ARCH/sysroot"
-					copy libc_nonshared.a libpthread_nonshared.a
-					;;
-			esac
 			copy \
 				ld-*.so*            ld.so*            \
 				libanl-*.so*        libanl.so*        \
diff -r ad29ddfee1c9 -r d5aab818505e glibmm/receipt
--- a/glibmm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glibmm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.56.0"
 CATEGORY="x-window"
 SHORT_DESC="C++ bindings for GLib"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/glibmm/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/glibmm.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev libsigc++-dev"
-SPLIT="libgiomm glibmm-dev"
+SPLIT="libgiomm $PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|glibmm-$VERSION|" docs/Makefile.in
@@ -39,7 +39,6 @@
 			copy @dev
 			DEPENDS="glibmm libgiomm \
 			glib-dev libsigc++-dev   perl"
-			PROVIDE="libgiomm-dev" # single dev package now
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gliv/receipt
--- a/gliv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gliv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,29 +7,20 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://guichaz.free.fr/gliv/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
-DEPENDS="gtk2 gtkglext gettext-base pangox-compat"
 BUILD_DEPENDS="gtk2-dev gtkglext gtkglext-dev bison mesa-dev pangox-compat-dev \
 glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 gtkglext gettext-base pangox-compat"
 }
diff -r ad29ddfee1c9 -r d5aab818505e glm/receipt
--- a/glm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,13 @@
 VERSION="0.9.3.2"
 CATEGORY="development"
 SHORT_DESC="C++ mathematics library for 3D software based on the OpenGL Shading Language (GLSL) specification"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://glm.g-truc.net/"
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="$SF_MIRROR/ogl-math/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/include $fs/usr/share/doc
 	cp -a $src/glm $fs/usr/include
 	cp -a $src/doc $fs/usr/share/doc/glm
diff -r ad29ddfee1c9 -r d5aab818505e glpi/receipt
--- a/glpi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glpi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,27 @@
 PACKAGE="glpi"
 VERSION="0.80.7"
 CATEGORY="network"
-SHORT_DESC="IT and Asset Management."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="IT and Asset Management"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://glpi-project.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://glpi-project.org/"
 WGET_URL="https://forge.indepnet.net/attachments/download/1054/$TARBALL"
-CONFIG_FILES="/etc/glpi/config_db.php"
 
-DEPENDS="mysql apache php-apache php-ldap php-imap php-mysql pam logrotate"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/$PACKAGE \
 		$fs/etc/$PACKAGE \
 		$fs/var/log/$PACKAGE \
 		$fs/var/lib/$PACKAGE
-		 
+
 	cp -a $src/* $fs/usr/share/$PACKAGE
 	[ -d $fs/usr/share/$PACKAGE/files ] &&  mv $fs/usr/share/$PACKAGE/files $fs/var/lib/$PACKAGE
 
 	# Copy config db as temporary file.
 	cp $stuff/config_db.php $fs/etc/glpi/
 	cp -a $stuff/logrotate.d $fs/etc
-	
+
 	cd $fs/usr/share/glpi
 	[ -f config/config_db.php ] && rm -f config/config_db.php
 	[ -f config/config_db_slave.php ] && rm -f config/config_db_slave.php
@@ -38,7 +34,7 @@
 	chown -R www.www $fs/var/lib/$PACKAGE/files $fs/etc/$PACKAGE/*
 
 	# Create the magic file config_path.php
-	cat <<EOF> $fs/usr/share/glpi/config/config_path.php
+	cat > $fs/usr/share/glpi/config/config_path.php <<EOF
 <?php
 // for packaging defaults
 
@@ -56,10 +52,11 @@
 ?>
 
 EOF
+	DEPENDS="mysql apache php-apache php-ldap php-imap php-mysql pam logrotate"
+	CONFIG_FILES="/etc/glpi/config_db.php"
 }
 
-post_install()
-{
+post_install() {
 	# Configure apache server
 	if [ -f "$1/etc/apache/httpd.conf" ]; then
 		if [ ! -f "$1/etc/apache/conf.d/glpi" ]; then
@@ -101,8 +98,10 @@
 EOT
 			if [ -z "$1" ]; then
 				# Start Web server.
-				test -f /var/run/apache/httpd.pid && \
-					( kill -0 $(cat /var/run/apache/httpd.pid) && /etc/init.d/apache restart )
+				if [ -f /var/run/apache/httpd.pid ]; then
+					kill -0 $(cat /var/run/apache/httpd.pid) &&
+					/etc/init.d/apache restart
+				fi
 			fi
 		fi
 	fi
@@ -111,48 +110,53 @@
 	if [ -z "$1" ]; then
 		if ( ! mysqladmin -s ping > /dev/null ); then
 			echo "Starting MySQL server"
-			( /etc/init.d/mysql start ; status  ) || exit 
+			( /etc/init.d/mysql start; status  ) || exit
 			sleep 4 #let the mysql daemon start
 		fi
+
 		if ( ! mysql -u root -Be 'show databases' | grep -q glpi ); then
-			echo -n "Create Glpi database"
-			mysql -Be "create database glpi" ; status
+			action "Create Glpi database"
+			mysql -Be "create database glpi"
+			status
+
 			# We suppose that glpi user does not exist.
 			# It may be false.
-			echo  -n "Create user glpi with password glpi"
-			mysql -Be "grant all privileges on glpi.* to 'glpi'@'localhost' 
-				identified by 'glpi'" ; status
+			action "Create user glpi with password glpi"
+			mysql -Be "grant all privileges on glpi.* to 'glpi'@'localhost'
+				identified by 'glpi'"
+			status
+
 			# At last create the database for glpi.
-			echo -n "Create glpi database schema."
-			mysql -u glpi -pglpi -D glpi < /usr/share/glpi/install/mysql/glpi-0.80.3-empty.sql ; status
-			
+			action "Create glpi database schema"
+			mysql -u glpi -pglpi -D glpi < /usr/share/glpi/install/mysql/glpi-0.80.3-empty.sql
+			status
+			fi
 		fi
-			
-	fi
 	true
 }
 
-post_remove()
-{
-		echo -n "Would you like to remove data and database files.(y/n) "
-		read answer
+post_remove() {
+	echo -n "Would you like to remove data and database files.(y/n) "
+	read answer
 
-		case $answer in 
+	case $answer in
 		y|Y)
-			echo -n "Removing data directories..."
-			rm -rf /var/lib/glpi ; status
+			action "Removing data directories..."
+			rm -rf /var/lib/glpi
+			status
+
 			if ( mysql -u root -Be 'show databases' | grep -q glpi ); then
-				echo -n "Deleting Glpi database"
-				mysql -Be "drop database glpi" ; status
+				action "Deleting Glpi database"
+				mysql -Be "drop database glpi"
+				 status
+
 				# We suppose that glpi user does not exist.
 				# It may be false.
-				echo  -n "Delete user glpi"
-				mysql -Be "delete from mysql.db where user='glpi'" ; status
+				action "Delete user glpi"
+				mysql -Be "delete from mysql.db where user='glpi'"
+				status
 			fi
-			unset $answer
 			;;
-		*)
-			;;
-		esac
-	
+	esac
+	unset $answer
 }
diff -r ad29ddfee1c9 -r d5aab818505e glu/receipt
--- a/glu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="mesa-dev automake autoconf libtool expat-dev xorg-dev \
 xorg-libxshmfence-dev"
-SPLIT="glu-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e glusterfs/receipt
--- a/glusterfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glusterfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="flex python-dev readline-dev mpc-library elfutils openssl-dev \
 acl-dev sqlite3-dev liburcu-dev libxml2-dev rpcsvc-proto libtirpc-dev"
-SPLIT="glusterfs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^cat/,/^EOM/d;s/exit/echo '$HOST_SYSTEM'\n&/" config.sub
diff -r ad29ddfee1c9 -r d5aab818505e glw/receipt
--- a/glw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/glw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="ftp://ftp.freedesktop.org/pub/mesa/glw/$TARBALL"
 
 BUILD_DEPENDS="mesa-dev automake autoconf libtool util-linux-uuid-dev \
-expat-dev xorg-dev intltool gettext xorg-libxshmfence-dev"
-SPLIT="glw-dev"
+expat-dev xorg-dev intltool gettext-dev xorg-libxshmfence-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gmerlin/receipt
--- a/gmerlin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmerlin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gmerlin"
 VERSION="1.2.0"
 CATEGORY="multimedia"
-SHORT_DESC="Gmerlin is a multimedia architecture for Linux"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Multimedia architecture for Linux"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://gmerlin.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="texinfo libxml2-dev expat-dev gavl-dev gtk2-dev alsa-lib-dev \
-libpng16-dev mesa-dev xorg-libxshmfence-dev gettext"
+libpng16-dev mesa-dev xorg-libxshmfence-dev gettext-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gmime/receipt
--- a/gmime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="gtk-doc zlib-dev glib-dev gpgme-dev gobject-introspection-dev \
 vala libgpg-error-dev"
-SPLIT="gmime-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gmp/receipt
--- a/gmp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.1.2"
 CATEGORY="libdevel"
 SHORT_DESC="GNU Multiple Precision Arithmetic Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://gmplib.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/gmp.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="binutils m4 ncurses-dev readline-dev texinfo"
-SPLIT="gmp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Create generic libraries
@@ -26,14 +26,16 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	# -j > 1 make install fails.
-	make && make html &&
-	make install && make install-html
+	make &&
+	make html &&
+	make install &&
+	make install-html
 }
 
 testsuite() {
 	checklog=$(mktemp)
 	make check 2>&1 | tee $checklog
-	pass=$(awk '/# PASS:/{total+=$3} ; END{print total}' $checklog)
+	pass=$(awk '/# PASS:/{total+=$3}; END{print total}' $checklog)
 	echo "$pass / 190 tests passed"
 	rm $checklog
 }
diff -r ad29ddfee1c9 -r d5aab818505e gmpc/receipt
--- a/gmpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,17 @@
 VERSION="11.8.16"
 CATEGORY="multimedia"
 SHORT_DESC="A GTK2 client for MPD"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://gmpclient.org"
+WEB_SITE="https://gmpclient.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://download.sarine.nl/Programs/${PACKAGE}/${VERSION%.*}/$TARBALL"
+WGET_URL="http://download.sarine.nl/Programs/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="gob2-dev libglade-dev libmpd libmpd-dev curl-dev \
-sqlite3-dev xorg-libSM-dev libsoup-dev libsexy-dev xorg-xcb-util-dev \
-util-linux-uuid-dev flex intltool"
 BUILD_DEPENDS="gob2-dev libglade-dev libmpd libmpd-dev curl-dev sqlite3-dev \
 xorg-libSM-dev libsoup-dev xorg-xcb-util-dev util-linux-uuid-dev flex intltool \
 vala"
-SPLIT="gmpc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lm"
diff -r ad29ddfee1c9 -r d5aab818505e gmrun/receipt
--- a/gmrun/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmrun/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gmrun"
 VERSION="0.9.2"
 CATEGORY="utilities"
-SHORT_DESC="Program launcher with autocompletion."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Program launcher with autocompletion"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/gmrun/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://sourceforge.net/projects/gmrun"
 WGET_URL="$SF_MIRROR/gmrun/$TARBALL"
 
-DEPENDS="gtk2 gcc-lib-base popt"
 BUILD_DEPENDS="gtk2-dev popt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-    ./configure --prefix=/usr \
-        $CONFIGURE_ARGS &&
-    make &&
-    make install DESTDIR=$DESTDIR
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr
-    cp -a $install/usr/bin $fs/usr
-    cp -a $install/usr/share $fs/usr
-    cp $stuff/gmrunrc $fs/usr/share/gmrun
+genpkg_rules() {
+	mkdir -p $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share $fs/usr
+	cp $stuff/gmrunrc $fs/usr/share/gmrun
+	DEPENDS="gtk2 gcc-lib-base popt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gmtk/receipt
--- a/gmtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gmtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/kdekorte/gmtk/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext intltool xorg-libX11-dev gtk3-dev gtk2-dev glib-dev \
+BUILD_DEPENDS="gettext-dev intltool xorg-libX11-dev gtk3-dev gtk2-dev glib-dev \
 gconf-dev alsa-lib-dev pulseaudio-dev"
-SPLIT="gmlib gmtk gmtk3 gmtk-dev"
+SPLIT="gmlib $PACKAGE gmtk3 $PACKAGE-dev"
 
 compile_rules() {
 	# The goal of this tricky receipt is to provide different GTK2 and GTK3
diff -r ad29ddfee1c9 -r d5aab818505e gnaughty/receipt
--- a/gnaughty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnaughty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gnaughty"
 VERSION="1.2.4"
 CATEGORY="utilities"
-SHORT_DESC="Gnaughty is an utility to automatically download adult sex content."
+SHORT_DESC="Automatically download adult sex content"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://gnaughty.sourceforge.net/"
diff -r ad29ddfee1c9 -r d5aab818505e gnet/receipt
--- a/gnet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gnet"
 VERSION="2.0.8"
 CATEGORY="network"
-SHORT_DESC="GNet is a simple network library"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Simple network library"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://www.gnetlibrary.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev util-linux-uuid-dev xorg-libXt"
-SPLIT="gnet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnomad2/receipt
--- a/gnomad2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnomad2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gnomad2"
 VERSION="2.9.4"
 CATEGORY="multimedia"
 SHORT_DESC="GTK+ music manager and swiss army knife for the Creative Labs NOMAD and Zen range"
-MAINTAINER="keupont@no-log.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="libusb-compat libnjb libid3tag taglib freetype gtk2 glibc dbus-glib hal \
-libmtp"
+WEB_SITE="http://gnomad2.sourceforge.net/"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
 BUILD_DEPENDS="intltool libnjb-dev libid3tag-dev taglib-dev libmtp-dev \
 hal-dev libusb-compat-dev gtk2-dev glib-dev"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gnomad2.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure && make && make install
+compile_rules() {
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libusb-compat libnjb libid3tag taglib freetype gtk2 glibc \
+	dbus-glib hal libmtp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnome-alsamixer/receipt
--- a/gnome-alsamixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-alsamixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,9 +15,7 @@
 BUILD_DEPENDS="automake autoconf glib dbus-dev libgnomeui-dev libgnome-dev \
 gconf-dev alsa-lib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	if [ ! -f "$SRC/$(basename "$EXTRA_URL")" ]; then
 		wget $EXTRA_URL -P $SRC
 	fi
@@ -32,7 +30,8 @@
 	sed -i 's|pt_BR|& ru|' $src/configure.ac
 
 	./autogen.sh
-	make && make install
+	make &&
+	make install
 
 	mkdir -p $install/usr/share/applications $install/usr/share/man/man1
 	cp -a $src/debian/$PACKAGE.desktop $install/usr/share/applications
@@ -40,9 +39,7 @@
 	gzip -9 $install/usr/share/man/man1/$PACKAGE.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	find $fs -name '*.xpm' -delete
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnome-calculator/receipt
--- a/gnome-calculator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-calculator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja vala gtk3-dev gtksourceview3-dev libsoup-dev \
-gettext mpfr-dev gmp-dev mpc-library-dev itstool yelp-xsl"
+gettext-dev mpfr-dev gmp-dev mpc-library-dev itstool yelp-xsl"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e gnome-chess/receipt
--- a/gnome-chess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-chess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja vala gtk3-dev librsvg-dev gettext itstool"
+BUILD_DEPENDS="meson ninja vala gtk3-dev librsvg-dev gettext-dev itstool"
 
 compile_rules() {
 	# help files on the next languages are failed to build on the some reason...
diff -r ad29ddfee1c9 -r d5aab818505e gnome-commander/receipt
--- a/gnome-commander/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-commander/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="itstool docbook-xml glib-dev gettext gtk2-dev libgnome-dev \
+BUILD_DEPENDS="itstool docbook-xml glib-dev gettext-dev gtk2-dev libgnome-dev \
 libgnomeui-dev libunique-dev exiv2-dev taglib-dev chmlib-dev libgsf-dev \
 poppler-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-desktop/receipt
--- a/gnome-desktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-desktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="xorg-libX11-dev eudev-dev libseccomp-dev gdk-pixbuf-dev \
 gtk3-dev glib-dev gsettings-desktop-schemas-dev xorg-xkeyboard-config-dev \
-iso-codes-dev itstool libxml2-tools gettext gobject-introspection-dev"
+iso-codes-dev itstool libxml2-tools gettext-dev gobject-introspection-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,11 +29,11 @@
 	case $PACKAGE in
 		gnome-desktop)
 			copy @std
-			DEPENDS=""
+			DEPENDS=" "
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS=""
+			DEPENDS=" "
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnome-desktop2/receipt
--- a/gnome-desktop2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-desktop2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.32.1"
 CATEGORY="x-window"
 SHORT_DESC="GNOME2 Desktop"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-doc-utils/receipt
--- a/gnome-doc-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-doc-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.20.10"
 CATEGORY="development"
 SHORT_DESC="Documentation utilities for GNOME"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnome.org/"
 
@@ -18,7 +18,7 @@
 		--disable-scrollkeeper \
 		$CONFIGURE_ARGS &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-games/receipt
--- a/gnome-games/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-games/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.29.1"
 CATEGORY="games"
 SHORT_DESC="Simple game launcher for GNOME"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Apps/Games"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool vala glib-dev grilo-dev gtk3-dev libmanette-dev \
 librsvg-dev libsoup-dev libxml2-dev retro-gtk-dev sqlite3-dev tracker-dev"
-SPLIT="gnome-games-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gnome-hearts/receipt
--- a/gnome-hearts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-hearts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,7 @@
 		--disable-scrollkeeper \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-icon-theme/receipt
--- a/gnome-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.12.0"
 CATEGORY="customization"
 SHORT_DESC="Default GNOME icon theme"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://www.gnome.org/"
 
@@ -18,7 +18,7 @@
 		--prefix=/usr \
 		&&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-js-common/receipt
--- a/gnome-js-common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-js-common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.2"
 CATEGORY="system-tools"
 SHORT_DESC="Gnome JS common files"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnome.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-keyring/receipt
--- a/gnome-keyring/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-keyring/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.32.1"
 CATEGORY="x-window"
 SHORT_DESC="A program that keep password and other secrets for users"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-keyring3/receipt
--- a/gnome-keyring3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-keyring3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,8 @@
 TARBALL="gnome-keyring-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gnome-keyring/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="intltool gcr-dev libcap-ng-dev libxslt gtk-doc"
+BUILD_DEPENDS="shared-mime-info intltool gcr-dev libcap-ng-dev libxslt gtk-doc \
+libgcrypt-dev"
 
 compile_rules() {
 	sed -i -r 's:"(/desktop):"/org/gnome\1:' schema/*.xml
diff -r ad29ddfee1c9 -r d5aab818505e gnome-menus/receipt
--- a/gnome-menus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-menus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.30.2"
 CATEGORY="x-window"
 SHORT_DESC="GNOME menu libs and tools (without desktop files)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
@@ -12,13 +12,13 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool python-dev python glib-dev"
-SPLIT="gnome-menus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-mime-data/receipt
--- a/gnome-mime-data/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-mime-data/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,22 @@
 VERSION="2.18.0"
 CATEGORY="x-window"
 SHORT_DESC="The GNOME Mime Data file types"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="perl-xml-parser gettext"
-SPLIT="gnome-mime-data-dev"
+BUILD_DEPENDS="perl-xml-parser gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--sysconfdir=/etc/gnome \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-mines/receipt
--- a/gnome-mines/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-mines/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja vala libgee-dev gtk3-dev librsvg-dev \
-libgnome-games-support-dev gettext itstool"
+libgnome-games-support-dev gettext-dev itstool"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e gnome-mplayer/receipt
--- a/gnome-mplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-mplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,18 +3,18 @@
 PACKAGE="gnome-mplayer"
 VERSION="1.0.8"
 CATEGORY="multimedia"
-SHORT_DESC="GNOME MPlayer is a GTK interface for MPlayer"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="GTK interface for MPlayer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sites.google.com/site/kdekorte2/gnomemplayer"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/$TARBALL"
 
-BUILD_DEPENDS="gettext xorg-libX11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev   \
+BUILD_DEPENDS="gettext-dev xorg-libX11-dev gtk3-dev gtk2-dev glib-dev gmtk-dev \
 dbus-dev dbus-glib-dev xorg-libXScrnSaver-dev alsa-lib-dev pulseaudio-dev \
 libnotify-dev libgpod-dev"
-SPLIT="gnome-mplayer-gtk3:gtk3"
+SPLIT="$PACKAGE-gtk3:gtk3"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e gnome-online-accounts/receipt
--- a/gnome-online-accounts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-online-accounts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev libxslt gobject-introspection-dev vala gtk3-dev \
-webkit2gtk-dev json-glib-dev rest-dev libsecret-dev krb5-dev gettext \
+webkit2gtk-dev json-glib-dev rest-dev libsecret-dev krb5-dev gettext-dev \
 docbook-xsl"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-ppp/receipt
--- a/gnome-ppp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-ppp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.3.23"
 CATEGORY="network"
 SHORT_DESC="A GNOME 2 WvDial frontend"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.gnomefiles.org/app.php?soft_id=41"
+WEB_SITE="https://web.archive.org/web/20100728041618/http://www.gnomefiles.org:80/app.php?soft_id=41"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/$TARBALL"
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-python-desktop/receipt
--- a/gnome-python-desktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-python-desktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.32.0"
 CATEGORY="system-tools"
 SHORT_DESC="Python bindings for GNOME desktop"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL LGPL"
 WEB_SITE="https://www.gnome.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gnome-python/receipt
--- a/gnome-python/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-python/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.28.1"
 CATEGORY="x-window"
 SHORT_DESC="Python bindings for GNOME"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.gnome.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="python-dev python-pygobject2-dev python-pygtk-dev libgnome-dev audiofile \
 esound libxml2-dev libgcrypt-dev"
-SPLIT="python-gconf gnome-python gnome-python-dev"
+SPLIT="python-gconf $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gnome-sudoku/receipt
--- a/gnome-sudoku/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-sudoku/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja vala libgee-dev gtk3-dev json-glib-dev qqwing-dev \
-gettext itstool"
+gettext-dev itstool"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e gnome-vfs-monikers/receipt
--- a/gnome-vfs-monikers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-vfs-monikers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="2.15.3"
 CATEGORY="x-window"
 SHORT_DESC="GNOME Bonobo monikers"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gnome-vfs-dev libbonobo-dev glib-dev orbit2-dev dbus-glib-dev \
 perl-xml-parser libxml2-dev gnutls-dev libgcrypt-dev"
-SPLIT="gnome-vfs-monikers-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS="-I/usr/include/libbonobo-2.0 -I/usr/include/glib-2.0 \
@@ -23,7 +23,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnome-vfs/receipt
--- a/gnome-vfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnome-vfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.4"
 CATEGORY="x-window"
 SHORT_DESC="The GNOME Virtual File System libraries"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/gnome-vfs/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="gtk2-dev dbus-glib-dev gconf-dev bzip2-dev shared-mime-info \
 gnome-mime-data-dev libxml2-dev zlib-dev intltool gnutls-dev libgcrypt-dev \
 libtool gtk-doc automake"
-SPLIT="gnome-vfs gnome-vfs-dev gnome-vfs-i18n"
+SPLIT="$PACKAGE-dev $PACKAGE-i18n"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -38,7 +38,7 @@
 	make &&
 	make \
 		GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		install || return 1
 
 #	mkdir -p $install/usr/share/gconf/schemas/
@@ -57,7 +57,8 @@
 #		--libexecdir=/usr/lib/gnome-vfs-2.0 \
 #		--disable-schemas-install \
 #		$CONFIGURE_ARGS &&
-#	make && make DESTDIR=$DESTDIR install
+#	make &&
+#	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnu-efi/receipt
--- a/gnu-efi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnu-efi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,24 @@
 PACKAGE="gnu-efi"
 VERSION="3.0.6"
 CATEGORY="development"
-SHORT_DESC="Development files for EFI applications."
+SHORT_DESC="Development files for EFI applications"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/gnu-efi/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://gnu-efi.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="linux-api-headers"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	KERNEL_VERSION=$(grep ^VERSION= $WOK/linux/receipt | cut -d '"' -f 2)
-	sed -i "s|^INSTALLROOT.*|INSTALLROOT := $DESTDIR|;s|/local||" Make.defaults
-	make -j1 && make -j1 install
+compile_rules() {
+	KERNEL_VERSION=$(. $WOK/linux/receipt; echo $VERSION)
+	sed -i "s|^INSTALLROOT.*|INSTALLROOT := $install|; s|/local||" Make.defaults
+
+	make -j1 &&
+	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnu-netcat/receipt
--- a/gnu-netcat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnu-netcat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,30 @@
 VERSION="0.7.1"
 CATEGORY="network"
 SHORT_DESC="GNU rewrite of netcat, the network piping application"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://netcat.sourceforge.net/"
+
 SOURCE="netcat"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://netcat.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
 
-DEPENDS="texinfo"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --mandir=/usr/share/man \
+compile_rules() {
+	./configure \
+		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="texinfo"
 }
 
-post_remove()
-{
+post_remove() {
 	ln -s /bin/busybox "$1/usr/bin/nc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnubg/receipt
--- a/gnubg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnubg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnucash/receipt
--- a/gnucash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnucash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.6.3"
 CATEGORY="office"
 SHORT_DESC="Financial-accounting software"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.gnucash.org"
+WEB_SITE="http://www.gnucash.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -19,7 +19,7 @@
 
 compile_rules() {
 	# busybox compliance
-	sed -i 's/cat -s/cat/g' $src/doc/Makefile.in
+	sed -i 's|cat -s|cat|g' $src/doc/Makefile.in
 
 	./configure \
 		--libexecdir=/usr/lib \
@@ -29,7 +29,7 @@
 		--enable-locale-specific-tax \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j1 install $DESTDIR=$install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnuchess/receipt
--- a/gnuchess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnuchess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/chess/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev readline-dev gettext"
+BUILD_DEPENDS="ncurses-dev readline-dev gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gnugo/receipt
--- a/gnugo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnugo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnumeric/receipt
--- a/gnumeric/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnumeric/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.12.32"
 CATEGORY="office"
 SHORT_DESC="Office Spreadsheet application"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://www.gnumeric.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk-doc bison goffice-dev gtk3-dev intltool gettext \
+BUILD_DEPENDS="gtk-doc bison goffice-dev gtk3-dev intltool gettext-dev \
 xorg-dev zlib-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gnupg/receipt
--- a/gnupg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnupg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.10"
 CATEGORY="security"
 SHORT_DESC="Free implementation of the OpenPGP"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gnupg.html"
@@ -15,8 +15,8 @@
 TARBALL_SHA1="3e87504e2ca317718aa9b6299947ebf7e906b54e"
 
 BUILD_DEPENDS="libgpg-error-dev libassuan-dev libgcrypt-dev libksba-dev \
-npth-dev perl libusb-dev sqlite3-dev gettext zlib-dev bzip2-dev readline-dev \
-texinfo gnutls-dev openldap-dev"
+npth-dev perl libusb-dev sqlite3-dev gettext-dev zlib-dev bzip2-dev \
+readline-dev texinfo gnutls-dev openldap-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gnuplot/receipt
--- a/gnuplot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnuplot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,38 +3,27 @@
 PACKAGE="gnuplot"
 VERSION="4.6.5"
 CATEGORY="graphics"
-SHORT_DESC="Command-line driven interactive data and function plotting."
+SHORT_DESC="Command-line driven interactive data and function plotting"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.gnuplot.info/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnuplot.info/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="zlib readline ncurses libgd jpeg freetype libpng16 gcc-lib-base \
-xorg-libXpm xorg-libX11 xorg-libXau xorg-libXdmcp fontconfig expat wxWidgets \
-xorg-libXxf86vm"
 BUILD_DEPENDS="zlib-dev readline-dev ncurses-dev libgd-dev jpeg-dev \
 freetype-dev libpng16-dev xorg-libXpm-dev xorg-libX11-dev xorg-libXau-dev \
 xorg-libXdmcp-dev fontconfig-dev expat-dev wxWidgets-dev pango-dev cairo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
 	make $MAKEOPTS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/gnuplot $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib readline ncurses libgd jpeg freetype libpng16 gcc-lib-base \
+	xorg-libXpm xorg-libX11 xorg-libXau xorg-libXdmcp fontconfig expat \
+	wxWidgets xorg-libXxf86vm"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnuradio/receipt
--- a/gnuradio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnuradio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,13 @@
 VERSION="3.7.8"
 CATEGORY="development"
 MAINTAINER="pascal.bellard@slitaz.org"
-SHORT_DESC="Signal processing blocks to implement software radios."
+SHORT_DESC="Signal processing blocks to implement software radios"
 LICENSE="GPL3"
-WEB_SITE="http://gnuradio.org/"
+WEB_SITE="https://www.gnuradio.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/releases/$PACKAGE/$TARBALL"
 
-DEPENDS="python boost-date-time boost-program-options \
-boost-filesystem boost-system boost-thread orc alsa-lib \
-gsl fftw jack portaudio"
 BUILD_DEPENDS="cmake fftw-dev python-numpy python-cheetah python-lxml \
 boost-dev boost-filesystem boost-system boost-unit-test-framework \
 boost-program-options boost-thread boost-math-tr1 boost-regex \
@@ -20,25 +18,26 @@
 swig cppunit-dev orc-dev python-sphinx gsl-dev libusb-dev \
 alsa-lib-dev jack-dev portaudio-dev log4c-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd build
-	cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=/usr .. &&
+	cd    build
+	cmake \
+		-Wno-dev \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	sed -i 's,bin/ctest.*,& || true,' Makefile &&
 	make test &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/usr/lib
 	cp -a $install/etc $fs
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/gnuradio $fs/usr/share
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/lib/python* $fs/usr/lib
+	DEPENDS="python boost-date-time boost-program-options boost-filesystem \
+	boost-system boost-thread orc alsa-lib gsl fftw jack portaudio"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnustep-back/receipt
--- a/gnustep-back/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnustep-back/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,31 @@
 PACKAGE="gnustep-back"
 VERSION="0.25.1"
 CATEGORY="x-window"
-SHORT_DESC="GNUstep Generic back-end."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GNUstep Generic back-end"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnustep.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnustep.org/"
 WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
 
-DEPENDS="gnustep-base gnustep-gui libart_lgpl audiofile aspell \
-giflib gnutls libbfd util-linux-uuid libtasn1 xorg-libXmu freetype"
 BUILD_DEPENDS="gnustep-make tar gnustep-base-dev gnustep-gui-dev libart_lgpl-dev \
 audiofile-dev aspell-dev giflib-dev gnutls-dev util-linux-uuid-dev \
 libtasn1-dev xorg-libXmu-dev freetype-dev xorg-libXt-dev xorg-libXrender-dev \
 freetype-dev cairo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/GNUstep $fs/usr/lib
-}
\ No newline at end of file
+	DEPENDS="gnustep-base gnustep-gui libart_lgpl audiofile aspell \
+	giflib gnutls libbfd util-linux-uuid libtasn1 xorg-libXmu freetype"
+}
diff -r ad29ddfee1c9 -r d5aab818505e gnustep-base/receipt
--- a/gnustep-base/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnustep-base/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,43 +3,36 @@
 PACKAGE="gnustep-base"
 VERSION="1.25.0"
 CATEGORY="x-window"
-SHORT_DESC="GNUstep base package."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GNUstep base package"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnustep.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnustep.org/"
 WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
 
-DEPENDS="libffi libxslt gnutls libbfd libobjc openssl libtasn1 icu"
 BUILD_DEPENDS="gnustep-make libffi-dev libxslt-dev gnutls-dev openssl-dev \
 libtasn1-dev tar icu-dev"
-SPLIT="gnustep-base-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--with-ffi-library=/usr/lib \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	gnustep-base)
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		cp -a $install/usr/lib/GNUstep $fs/usr/lib
-		;;
-	gnustep-base-dev)
-		DEPENDS="gnustep-base"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/share/GNUstep $fs/usr/share
-		;;
+		gnustep-base)
+			copy @std
+			DEPENDS="libffi libxslt gnutls libbfd libobjc openssl libtasn1 icu"
+			;;
+		*-dev)
+			copy @std
+			DEPENDS="gnustep-base"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnustep-gui/receipt
--- a/gnustep-gui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnustep-gui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,43 +3,41 @@
 PACKAGE="gnustep-gui"
 VERSION="0.25.1"
 CATEGORY="x-window"
-SHORT_DESC="GNUstep GUI class library."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GNUstep GUI class library"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnustep.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnustep.org/"
 WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
 
-DEPENDS="gnustep-base audiofile aspell giflib portaudio cups libcomerr3 \
-libtasn1 jpeg tiff libpng16"
 BUILD_DEPENDS="gnustep-make gnustep-base-dev audiofile-dev aspell-dev giflib-dev \
 portaudio-dev cups-dev libtasn1-dev tar jpeg-dev tiff-dev libpng16-dev"
-SPLIT="gnustep-gui-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	gnustep-gui)
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		cp -a $install/usr/lib/GNUstep $fs/usr/lib
-		;;
-	gnustep-gui-dev)
-		DEPENDS="gnustep-gui"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/share/GNUstep $fs/usr/share
-		;;
+		gnustep-gui)
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/bin $fs/usr
+			cp -a $install/usr/lib/*.so* $fs/usr/lib
+			cp -a $install/usr/lib/GNUstep $fs/usr/lib
+			DEPENDS="gnustep-base audiofile aspell giflib portaudio cups \
+			libcomerr3 libtasn1 jpeg tiff libpng16"
+			;;
+		*-dev)
+			mkdir -p $fs/usr/share
+			cp -a $install/usr/include $fs/usr
+			cp -a $install/usr/share/GNUstep $fs/usr/share
+			DEPENDS="gnustep-gui"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnustep-make/receipt
--- a/gnustep-make/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnustep-make/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gnustep-make"
 VERSION="2.7.0"
 CATEGORY="development"
-SHORT_DESC="GNUstep make package."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GNUstep make package"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnustep.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnustep.org/"
 WGET_URL="ftp://ftp.gnustep.org/pub/gnustep/core/$TARBALL"
 
-DEPENDS="make"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--with-layout=fhs \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/etc $fs
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/GNUstep $fs/usr/share
+	DEPENDS="make"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gnutls/receipt
--- a/gnutls/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gnutls/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.19"
 CATEGORY="security"
 SHORT_DESC="GNU Transport Layer Security Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://gnutls.org/"
 
@@ -12,27 +12,18 @@
 WGET_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v${VERSION%.*}/$TARBALL"
 TARBALL_SHA1="51b29b7e37467a765378f3c8e546a5c1bb2a5054"
 
-BUILD_DEPENDS_arm="libtasn1-dev ncurses-dev readline-dev nettle-dev \
-libgpg-error-dev libgcrypt-dev openssl-dev gmp-dev lzip"
-BUILD_DEPENDS="nettle-dev libtasn1-dev libunistring-dev gettext openssl-dev \
+BUILD_DEPENDS="nettle-dev libtasn1-dev libunistring-dev gettext-dev openssl-dev \
 libidn2-dev unbound-dev p11-kit-dev zlib-dev"
-SPLIT="libgnutls gnutls-dev"
+SPLIT="libgnutls $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			ARCH_ARGS="--with-libgcrypt-prefix=/cross/$ARCH/sysroot/usr \
-			--without-p11-kit --disable-rpath --with-libgcrypt --disable-guile \
-			--with-zlib" ;;
-	esac
-
 	./configure \
 		--enable-openssl-compatibility \
 		--with-default-trust-store-file="/etc/ssl/ca-bundle.crt" \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install &&
+	make &&
+	make install &&
 	make -C doc/reference install-data-local
 }
 
@@ -40,12 +31,7 @@
 	case $PACKAGE in
 		gnutls)
 			copy bin/
-			DEPENDS_arm="nettle libgpg-error ncurses readline zlib \
-			gcc-lib-base libgnutls openssl libtasn1"
 			DEPENDS="libgnutls libtasn1"
-			case $ARCH in
-				arm*) DEPENDS=$DEPENDS_arm;;
-			esac
 			;;
 		libgnutls)
 			copy *.so*
diff -r ad29ddfee1c9 -r d5aab818505e go-bin/receipt
--- a/go-bin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/go-bin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -26,7 +26,6 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
-	DEPENDS=""
 	PROVIDE="go"
 	TAGS="go"
 }
diff -r ad29ddfee1c9 -r d5aab818505e go/receipt
--- a/go/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/go/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.10.2"
 CATEGORY="development"
 SHORT_DESC="The Go programming language"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://golang.org/"
+WEB_SITE="https://golang.org/"
 
 TARBALL="$PACKAGE$VERSION.src.tar.gz"
 WGET_URL="https://dl.google.com/go/$TARBALL"
 
 BUILD_DEPENDS="go-bin bash bison make ed"
-SPLIT="go-sources emacs-pkg-go-mode go"
+SPLIT="$PACKAGE-sources emacs-pkg-go-mode $PACKAGE"
 
 compile_rules() {
 	cd $src/src
@@ -38,16 +38,10 @@
 			# A mature implementation. The compiler has an effective optimizer
 			# (registerizer) and generates good code (although gccgo can do
 			# noticeably better sometimes).
-			export GOARCH="amd64" ;;
+			export GOARCH="amd64";;
 		i486)
 			# Comparable to the amd64
-			export GOARCH="386" ;;
-		arm)
-			# Supports Linux, FreeBSD and NetBSD binaries. Less widely used
-			# than the other ports.
-			export GOARCH="arm"
-			# ARM11 (VFPv1) or better cores + cross-compiling.
-			export GOARM=6 ;;
+			export GOARCH="386";;
 	esac
 
 	# Build go
@@ -110,7 +104,7 @@
 		go)
 			copy @std @rm
 			TAGS="go"
-			DEPENDS=""
+			DEPENDS=" "
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e goaccess/receipt
--- a/goaccess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/goaccess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,36 @@
 PACKAGE="goaccess"
 VERSION="0.6.1"
 CATEGORY="network"
-SHORT_DESC="Visual web log analyzer."
+SHORT_DESC="Visual web log analyzer"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="ncurses geoip"
-BUILD_DEPENDS="ncurses-dev geoip-dev glib-dev"
+WEB_SITE="https://goaccess.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://goaccess.prosoftcorp.com/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --enable-geoip --enable-utf8 
+BUILD_DEPENDS="ncurses-dev geoip-dev glib-dev"
+
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--enable-geoip \
+		--enable-utf8 \
+		|| return 1
+
 	# hack for curses.h path
-	mkdir /usr/include/ncursesw && ln -s /usr/include/curses.h /usr/include/ncursesw/curses.h
-	make
-	make DESTDIR=$DESTDIR install
+	mkdir /usr/include/ncursesw
+	ln -s /usr/include/curses.h /usr/include/ncursesw/curses.h
+
+	make &&
+	make DESTDIR=$install install
+
 	# and remove hack
 	rm -rf /usr/include/ncursesw
-
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses geoip"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e gob2/receipt
--- a/gob2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gob2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,31 @@
 PACKAGE="gob2"
 VERSION="2.0.17"
 CATEGORY="x-window"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Simple preprocessor for easily creating GTK objects"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SHORT_DESC="GTK Object Builder (GOB) is a simple preprocessor for easily \
-creating GTK objects"
-WEB_SITE="http://www.5z.com/jirka/gob.html"
+WEB_SITE="https://www.jirka.org/gob.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/${PACKAGE}/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="flex glib-dev"
-SPLIT="gob2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make -j1 && make install
+	./configure $CONFIGURE_ARGS &&
+	make -j1 &&
+	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		gob2)
-			mkdir -p $fs/usr
-			cp -a $install/usr/bin $fs/usr
+			copy @std
 			DEPENDS="glib"
 			;;
 		*-dev)
-			mkdir -p $fs/usr/share
-			cp -a $install/usr/share/aclocal* $fs/usr/share	
+			copy @dev
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gobby/receipt
--- a/gobby/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gobby/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,32 @@
 PACKAGE="gobby"
 VERSION="0.4.12"
 CATEGORY="network"
-SHORT_DESC="Network collaborative editor."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Network collaborative editor"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://gobby.github.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gobby.0x539.de/trac/"
 WGET_URL="http://releases.0x539.de/gobby/$TARBALL"
 
-DEPENDS="gnutls libgpg-error libgcrypt gtk2 cairomm glibmm gtkmm gtksourceview \
-libsigc++ libxml++ net6 obby xorg-libXdamage gcc-lib-base libtasn1"
 BUILD_DEPENDS="intltool libxml++-dev cairomm-dev glibmm-dev gtkmm-dev net6-dev \
 obby-dev gtksourceview-dev gnutls-dev libsigc++-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# for glibmm >= 2.31
 	sed -i 's|.*gselector.hpp|#include <glibmm/main.h>\n&|' src/gselector.cpp
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/icons/hicolor/48x48/apps/* \
 		$fs/usr/share/pixmaps
+	DEPENDS="gnutls libgpg-error libgcrypt gtk2 cairomm glibmm gtkmm \
+	gtksourceview libsigc++ libxml++ net6 obby xorg-libXdamage gcc-lib-base \
+	libtasn1"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gobject-introspection/receipt
--- a/gobject-introspection/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gobject-introspection/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.52.1"
 CATEGORY="development"
 SHORT_DESC="Introspection system for GObject-based libraries"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2 MIT"
 WEB_SITE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gobject-introspection.html"
@@ -12,24 +12,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev libffi-dev cairo-dev dbus-dev"
 BUILD_DEPENDS="glib-dev cairo-dev gtk-doc python-dev util-linux-mount-dev openssl-dev"
-SPLIT="gobject-introspection-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			export   CFLAGS="$CFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib"
-			export    PKG_CONFIG_PATH="/cross/$ARCH/sysroot/usr/pkgconfig"
-			;;
-	esac
-
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gocr/receipt
--- a/gocr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gocr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gocr"
 VERSION="0.50"
 CATEGORY="office"
-SHORT_DESC="Optical Character Recognition program."
+SHORT_DESC="Optical Character Recognition program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://jocr.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://jocr.sourceforge.net/"
 WGET_URL="http://www-e.uni-magdeburg.de/jschulen/ocr/$TARBALL"
 
-DEPENDS="libpng16"
+compile_rules() {
+	sed -i 's|pnmtopng|pnm2png|' src/pnm.c
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's/pnmtopng/pnm2png/' src/pnm.c
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/bin
-	cp -a $install/bin/gocr $fs/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e goffice/receipt
--- a/goffice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/goffice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="goffice"
 VERSION="0.10.32"
 CATEGORY="libs"
-SHORT_DESC="GOffice is a library of document-centric objects and utilities"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Document-centric objects and utilities"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/goffice/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cairo-dev gtk3-dev libgsf-dev librsvg-dev libxslt-dev gtk-doc \
 intltool"
-SPLIT="goffice-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gogglesmm/receipt
--- a/gogglesmm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gogglesmm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gogglesmm"
 VERSION="0.12.6"
 CATEGORY="multimedia"
-SHORT_DESC="Goggles Music Manager is nice a music collection manager and player"
-MAINTAINER="chadi.elahmad@gmail.com"
+SHORT_DESC="Nice music collection manager and player"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://gogglesmm.github.io/"
 
@@ -17,7 +17,7 @@
 
 compile_rules() {
 	sed -i 's/0x80/-128/g' src/gmutils.cpp
-	# Fixed installing .mo files since busybox install commmand 
+	# Fixed installing .mo files since busybox install commmand
 	# doesn't have -T option
 	sed -i 's| -T||g' $src/Makefile
 
@@ -27,7 +27,7 @@
 		--infodir=/usr/share/info \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p            $install/usr/share/pixmaps/
 	cp $src/extra/*.png $install/usr/share/pixmaps/
diff -r ad29ddfee1c9 -r d5aab818505e goocanvas/receipt
--- a/goocanvas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/goocanvas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.0.0"
 CATEGORY="x-window"
 SHORT_DESC="Cairo canvas widget for GTK+2"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/GooCanvas"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gettext"
-SPLIT="goocanvas-dev"
+BUILD_DEPENDS="gtk2-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e goocanvas2/receipt
--- a/goocanvas2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/goocanvas2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="goocanvas-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/goocanvas/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk3-dev gettext"
-SPLIT="goocanvas2-dev"
+BUILD_DEPENDS="gtk3-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gource/receipt
--- a/gource/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gource/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gource"
 VERSION="0.38"
 CATEGORY="development"
-SHORT_DESC="software version control visualization"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Software version control visualization"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://gource.io/"
@@ -15,20 +15,16 @@
 BUILD_DEPENDS="mesa-dev ftgl-dev libsdl-image-dev pcre-dev glew-dev \
 libsdl-dev freetype-dev boost-dev boost-filesystem glm"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/boost::filesystem3::/boost::filesystem::/' src/logmill.cpp
-	./configure $CONFIGURE_ARGS && 
-	make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/gource $fs/usr/share
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e gpa/receipt
--- a/gpa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.10"
 CATEGORY="security"
 SHORT_DESC="GNU Privacy Assistant"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/related_software/gpa/"
 
@@ -14,7 +14,7 @@
 TARBALL_SHA1="c629348725c1bf5dafd57f8a70187dc89815ce60"
 
 BUILD_DEPENDS="gtk2-dev libgpg-error-dev libassuan-dev gpgme-dev"
-SPLIT="gpa-langpack"
+SPLIT="$PACKAGE-langpack"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gparted/receipt
--- a/gparted/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gparted/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.32.0"
 CATEGORY="system-tools"
 SHORT_DESC="A partition editor to graphically manage disk partitions"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gparted.sourceforge.io/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/xsoft/gparted.html"
@@ -15,8 +15,6 @@
 BUILD_DEPENDS="gtk2-dev libsigc++-dev glibmm-dev gtkmm-dev parted-dev \
 cairomm-dev pangomm-dev glibmm-dev intltool util-linux-uuid-dev"
 
-CROSS="error: cannot run test program while cross compiling"
-
 compile_rules() {
 	# Remove the "-v" option from the swapon/off commands.
 	# This will allow gparted to play nicely with busybox.
diff -r ad29ddfee1c9 -r d5aab818505e gperf/receipt
--- a/gperf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gperf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="gperf"
 VERSION="3.1"
 CATEGORY="development"
-SHORT_DESC="GNU gperf is a perfect hash function generator"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Perfect hash function generator"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gperf/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/gperf.html"
@@ -13,7 +13,9 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gperiodic/receipt
--- a/gperiodic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gperiodic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,23 @@
 VERSION="2.0.10"
 CATEGORY="misc"
 SHORT_DESC="A periodic table element"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.frantz.fi/software/gperiodic.php"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.frantz.fi/software/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gettext-tools"
+BUILD_DEPENDS="gtk2-dev gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's| GtkTooltips| struct _GtkTooltips|' gperiodic.h
-	make && make install
+
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std *.mo
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gpgme/receipt
--- a/gpgme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpgme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.11.1"
 CATEGORY="security"
 SHORT_DESC="Support for cryptography"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnupg.org/related_software/gpgme/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gpgme.html"
@@ -15,7 +15,7 @@
 TARBALL_SHA1="95b1fc427871ca8d30d6d3b1985c816fe0b5077b"
 
 BUILD_DEPENDS="libgpg-error-dev libassuan-dev gnupg swig python-dev"
-SPLIT="python-gpgme gpgme-lisp gpgme gpgme-dev"
+SPLIT="python-gpgme $PACKAGE-lisp $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gphoto2/receipt
--- a/gphoto2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gphoto2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.15"
 CATEGORY="graphics"
 SHORT_DESC="Digital camera download and access program"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gphoto.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gphotofs/receipt
--- a/gphotofs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gphotofs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
 
-BUILD_DEPENDS="fuse2-dev glib-dev libgphoto2-dev gettext"
+BUILD_DEPENDS="fuse2-dev glib-dev libgphoto2-dev gettext-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gpick/receipt
--- a/gpick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,28 +7,24 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="http://www.gpick.org/"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="gtk2"
-SUGGESTED="lua"
-BUILD_DEPENDS="scons gettext lemon flex gtk2-dev expat-dev boost-dev \
+BUILD_DEPENDS="scons gettext-dev lemon flex gtk2-dev expat-dev boost-dev \
 dbus-glib-dev lua-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	scons DESTDIR=$install BUILD_TARGET="linux2" install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/bin $fs/usr
 	cp -a $install/share/$PACKAGE $fs/usr/share
 	cp -a $install/share/icons $fs/usr/share
 	cp -a $install/share/locale $fs/usr/share
 	cp -a $install/share/man $fs/usr/share
+	DEPENDS="gtk2"
+	SUGGESTED="lua"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e gpicview/receipt
--- a/gpicview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpicview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.5"
 CATEGORY="graphics"
 SHORT_DESC="Lightweight image viewer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/GPicView"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/gpicview.html"
diff -r ad29ddfee1c9 -r d5aab818505e gpm/receipt
--- a/gpm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.lzma"
 WGET_URL="${WEB_SITE}archives/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo"
-SPLIT="gpm-extra gpm gpm-dev"
+SPLIT="$PACKAGE-extra $PACKAGE $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -21,8 +20,10 @@
 
 	./autogen.sh
 	ln -s headers/gpm.h src		# ???
+
 	./configure $CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	chmod a+x $install/usr/lib/*
 	install -Dm755 $stuff/etc/init.d/gpm $install/etc/init.d/gpm
diff -r ad29ddfee1c9 -r d5aab818505e gpodder/receipt
--- a/gpodder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpodder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,21 @@
 PACKAGE="gpodder"
 VERSION="3.5.2"
 CATEGORY="multimedia"
-SHORT_DESC="A simple and usable podcast consumption."
+SHORT_DESC="A simple and usable podcast consumption"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://gpodder.github.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gpodder.org"
 WGET_URL="$WEB_SITE/src/$TARBALL"
 
-DEPENDS="python python-dbus python-pygtk python-mygpoclient feedparser"
 BUILD_DEPENDS="python-dev python-mygpoclient feedparser intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/gpodder $fs/usr/share
-	cp -a $install/usr/share/dbus-1 $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-dbus python-pygtk python-mygpoclient feedparser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gputils/receipt
--- a/gputils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gputils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="gputils"
 VERSION="0.14.3"
 CATEGORY="development"
-SHORT_DESC="Tools for the Microchip (TM) PIC microcontrollers"
+SHORT_DESC="Tools for the Microchip™ PIC microcontrollers"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gputils.sourceforge.net/"
+WEB_SITE="https://gputils.sourceforge.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -14,7 +14,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gpxe/receipt
--- a/gpxe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gpxe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,19 @@
 PACKAGE="gpxe"
 VERSION="0.9.3"
 CATEGORY="system-tools"
-SHORT_DESC="Ethernet bootloader."
+SHORT_DESC="Ethernet bootloader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://etherboot.org/wiki/"
+HOST_ARCH="i486"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.etherboot.org/"
 WGET_URL="http://kernel.org/pub/software/utils/boot/$PACKAGE/Old/$TARBALL"
 
 BUILD_DEPENDS="perl gcc49"
-SPLIT="gpxe gpxe-pxe"
+SPLIT="$PACKAGE-pxe"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	sed -i 's/ = ++ns->cur_rx %/++; ns->cur_rx %=/' drivers/net/ns83820.c
 	sed -i 's/ = (++tp->cur_rx) %/++; tp->cur_rx %=/' drivers/net/tulip.c
@@ -27,30 +27,30 @@
 	grep -v housekeeping: | grep -v blib.list
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	gpxe)
-		mkdir -p $fs/boot
-		cp $src/src/bin/gpxe.lkrn $fs/boot/gpxe
-		# install 255 bytes of forced url at offset 519
-		echo -n "\
+		gpxe)
+			mkdir -p $fs/boot
+			cp $src/src/bin/gpxe.lkrn $fs/boot/gpxe
+			# install 255 bytes of forced url at offset 519
+			echo -n "\
 http://mirror.slitaz.org/pxe/pxelinux.0,\
 http://mirror.switch.ch/ftp/mirror/pxe/pxelinux.0,\
-http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" | cat - /dev/zero | \
-			dd bs=1 seek=519 count=255 conv=notrunc of=$fs/boot/gpxe
-		;;
-	gpxe-pxe)
-		CAT="system-tools|Ethernet bootloader for pxe server."
-		mkdir -p $fs/usr/share/boot
-		cp $src/src/bin/undionly.kpxe $fs/usr/share/boot/gpxe.pxe
-		# install 255 bytes of forced url at offset 5
-		echo -n "\
+http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" \
+			| cat - /dev/zero \
+			| dd bs=1 seek=519 count=255 conv=notrunc of=$fs/boot/gpxe
+			;;
+		gpxe-pxe)
+			CAT="system-tools|for pxe server"
+			mkdir -p $fs/usr/share/boot
+			cp $src/src/bin/undionly.kpxe $fs/usr/share/boot/gpxe.pxe
+			# install 255 bytes of forced url at offset 5
+			echo -n "\
 http://mirror.slitaz.org/pxe/pxelinux.0,\
 http://mirror.switch.ch/ftp/mirror/pxe/pxelinux.0,\
-http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" | cat - /dev/zero | \
-		   dd bs=1 seek=5 count=255 conv=notrunc of=$fs/usr/share/boot/gpxe.pxe
-		;;
+http://download.tuxfamily.org/slitaz/pxe/pxelinux.0" \
+			| cat - /dev/zero \
+			| dd bs=1 seek=5 count=255 conv=notrunc of=$fs/usr/share/boot/gpxe.pxe
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gqview/receipt
--- a/gqview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gqview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gqview"
 VERSION="2.0.4"
 CATEGORY="graphics"
-SHORT_DESC="Images viewer and manager using GTK+."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Images viewer and manager using GTK+"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://gqview.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gqview.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk2 xorg-libXdamage"
-BUILD_DEPENDS="gtk2-dev gettext-tools"
+BUILD_DEPENDS="gtk2-dev gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
-	./configure --prefix=/usr --mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/locale
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/pixmaps $fs/usr/share
-	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 xorg-libXdamage"
 }
diff -r ad29ddfee1c9 -r d5aab818505e granite/receipt
--- a/granite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/granite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/elementary/granite/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake vala gtk3-dev libgee-dev gobject-introspection-dev \
-gettext"
+gettext-dev"
 SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
 
 COOKOPTS="!menus"
diff -r ad29ddfee1c9 -r d5aab818505e grantlee/receipt
--- a/grantlee/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grantlee/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://downloads.grantlee.org/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev"
-SPLIT="grantlee-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e graphite2/receipt
--- a/graphite2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/graphite2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Graphite font engine"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="http://graphite.sil.org/"
+WEB_SITE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/graphite2.html"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="https://github.com/silnrsi/graphite/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake freetype-dev"
-SPLIT="graphite2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e graphviz/receipt
--- a/graphviz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/graphviz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,8 +16,9 @@
 libjpeg-turbo-dev libgd-dev swig ocaml python-dev tcl-dev tk-dev librsvg-dev \
 ruby-dev libcroco-dev util-linux-uuid-dev pango-dev libxml2-dev gdk-pixbuf-dev \
 guile-dev gmp-dev pcre-dev perl-dev libtool" # php-dev lua-dev
-SPLIT="$PACKAGE-dev $PACKAGE-doc $PACKAGE-demo $PACKAGE-guile $PACKAGE-ocaml \
-$PACKAGE-perl $PACKAGE-python $PACKAGE-ruby $PACKAGE-tcl $PACKAGE"
+SPLIT="\
+$PACKAGE-dev  $PACKAGE-doc    $PACKAGE-demo $PACKAGE-guile $PACKAGE-ocaml \
+$PACKAGE-perl $PACKAGE-python $PACKAGE-ruby $PACKAGE-tcl   $PACKAGE"
 COOKOPTS="skip-log-errors"
 
 # FIXME: PHP and Lua support is temporarily disabled
diff -r ad29ddfee1c9 -r d5aab818505e graveman/receipt
--- a/graveman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/graveman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Frontend for cd-burning tools"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://graveman.tuxfamily.org"
+WEB_SITE="http://graveman.tuxfamily.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/sources/$TARBALL"
@@ -19,7 +19,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e greenbone-security-assistant/receipt
--- a/greenbone-security-assistant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/greenbone-security-assistant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://wald.intevation.org/frs/download.php/2442/$TARBALL"
 
 BUILD_DEPENDS="cmake libmicrohttpd-dev libxml2-dev glib-dev libxslt-dev \
-openvas-libraries-dev gettext doxygen tzdata"
+openvas-libraries-dev gettext-dev doxygen tzdata"
 
 compile_rules() {
 	mkdir -p build
diff -r ad29ddfee1c9 -r d5aab818505e grep/receipt
--- a/grep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="pcre-dev perl gettext"
+BUILD_DEPENDS="pcre-dev perl gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e grilo/receipt
--- a/grilo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grilo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="glib-dev libxml2-dev gobject-introspection-dev vala intltool \
 gtk3-dev liboauth-dev libsoup-dev totem-pl-parser-dev"
-SPLIT="grilo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gringotts/receipt
--- a/gringotts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gringotts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,25 @@
 PACKAGE="gringotts"
 VERSION="1.2.10"
 CATEGORY="security"
-SHORT_DESC="An electronic strongbox."
+SHORT_DESC="An electronic strongbox"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://gringotts.shlomifish.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://gringotts.shlomifish.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE.berlios/$TARBALL"
 
-DEPENDS="gtk2 libgringotts popt"
 BUILD_DEPENDS="gtk2-dev libgringotts-dev popt-dev libmcrypt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/pixmaps $fs/usr/share
@@ -33,4 +29,5 @@
 		$fs/usr/share/applications
 	sed -i '/X-GNOME-DocPath/d' $fs/usr/share/applications/gringotts.desktop
 	echo "Categories=Office;" >> $fs/usr/share/applications/gringotts.desktop
+	DEPENDS="gtk2 libgringotts popt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e grisbi/receipt
--- a/grisbi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grisbi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.0"
 CATEGORY="office"
 SHORT_DESC="Personnal bank manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.grisbi.org/"
 
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gritz/receipt
--- a/gritz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gritz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,23 @@
 # SliTaz package receipt.
 
-PACKAGE="gritz"
+PACKAGE="gritz" # FIXME: author renamed gritz to spread0r
 VERSION="1.0"
 CATEGORY="misc"
-SHORT_DESC="A txt reader, which makes you reading twice as fast as usual."
+SHORT_DESC="Text reader, which makes you reading twice as fast as usual"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/xypiie/spread0r"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/xypiie/gritz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-DEPENDS="perl-gtk2"
 BUILD_DEPENDS="perl"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	libperl=$(tazpkg list-files perl | \
 	  sed '/^\/usr\/lib\/perl/!d;s|\(/usr/lib/perl[^/]*/[^/]*\).*|\1|;q')
 	mkdir -p $fs/usr/bin $fs$libperl
 	cp -a $src/lib/*.pm $fs$libperl
 	cp -a $src/gritz.pl $fs/usr/bin/gritz
+	DEPENDS="perl-gtk2"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e groff/receipt
--- a/groff/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/groff/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.22.3"
 CATEGORY="utilities"
 SHORT_DESC="The GNU troff text-formatting system"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/groff/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/groff.html"
diff -r ad29ddfee1c9 -r d5aab818505e grooms/receipt
--- a/grooms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grooms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Play the board game, Go, over the Internet"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://grooms.tuxfamily.org"
+WEB_SITE="http://grooms.tuxfamily.org/"
 
 TARBALL="$PACKAGE-$VERSION.zip"
-WGET_URL="${WEB_SITE}/$TARBALL"
+WGET_URL="${WEB_SITE}$TARBALL"
 
 compile_rules() {
 	mkdir -p         $install/var/lib
diff -r ad29ddfee1c9 -r d5aab818505e grsync/receipt
--- a/grsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.2"
 CATEGORY="network"
 SHORT_DESC="GTK+ intuitive interface to rsync"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.opbyte.it/grsync/"
 
@@ -25,7 +25,7 @@
 		--disable-unity \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e grub/receipt
--- a/grub/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grub/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="grub"
 VERSION="0.97"
 CATEGORY="base-system"
-SHORT_DESC="GRUB boot loader."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GRUB boot loader"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/grub/"
 REPOLOGY="grub-legacy"
@@ -15,32 +15,32 @@
 
 BUILD_DEPENDS="gcc3"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/\[ .grub-probe.*\]/mount | grep $grubdir | grep -q xfs/' \
 		util/grub-install.in
-	./configure CC=gcc-3 --prefix=/usr --infodir=/usr/share/info \
-	--without-curses --mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure \
+		CC=gcc-3 \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--without-curses \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/boot/grub $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib $fs/usr
-	
+
 	# Permissions
 	chmod 755 $fs/usr/sbin/grub-*
 	chmod 655 $fs/usr/lib/grub/*/*
-	
-	# Strip.
+
 	# Example config file (menu.lst).
 	cp $stuff/example-menu.lst $fs/boot/grub
 	cp $stuff/splash.xpm.gz $fs/boot/grub
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e grub2/receipt
--- a/grub2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grub2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="flex bison zlib-dev xz-dev freetype-dev ncurses-dev \
 libusb-compat-dev libusb-dev libdevmapper-dev"
-SPLIT="grub2 grub2-efi:efi grub2-efi-modules:efi"
+SPLIT="$PACKAGE-efi:efi $PACKAGE-efi-modules:efi"
 
 compile_rules() {
 	sed -i 's|sys/types.h>|&\n#include <sys/sysmacros.h>|' \
@@ -34,7 +34,7 @@
 			#chmod +x install-sh
 			./configure $CONFIGURE_ARGS &&
 			make $MAKEFLAGS &&
-			make DESTDIR=$DESTDIR install || return 1
+			make DESTDIR=$install install || return 1
 
 			# Example config file (grub.cfg)
 			install -Dm0644 $stuff/example-grub.cfg $install/boot/grub/example-grub.cfg
diff -r ad29ddfee1c9 -r d5aab818505e grub4dos/receipt
--- a/grub4dos/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/grub4dos/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,20 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE-$VERSION-src.zip"
 
 BUILD_DEPENDS="lzma gcc3"
-SPLIT="grub4dos-linux"
+SPLIT="$PACKAGE-linux"
 
 compile_rules() {
 	sed -i 's/\[ .grub-probe.*\]/mount | grep $grubdir | grep -q xfs/' \
 		util/grub-install.in
-	sh ./configure CC=gcc-3 CFLAGS="-march=i486  -Os -pipe" \
+
+	sh ./configure \
+		CC=gcc-3 \
+		CFLAGS="-march=i486  -Os -pipe" \
 		--enable-preset-menu=$stuff/menu.lst \
 		--without-curses \
-	$CONFIGURE_ARGS &&
-	make && make install
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gsasl/receipt
--- a/gsasl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsasl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://alpha.gnu.org/pub/gnu/$PACKAGE/$TARBALL"
 
-SPLIT="gsasl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gsettings-desktop-schemas/receipt
--- a/gsettings-desktop-schemas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsettings-desktop-schemas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Collection of GSettings schemas"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://git.gnome.org/browse/gsettings-desktop-schemas"
+WEB_SITE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gsettings-desktop-schemas.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gobject-introspection-dev intltool"
-SPLIT="gsettings-desktop-schemas-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in
diff -r ad29ddfee1c9 -r d5aab818505e gsl/receipt
--- a/gsl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4"
 CATEGORY="libdevel"
 SHORT_DESC="GNU Scientific Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gsl/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/gsl.html"
diff -r ad29ddfee1c9 -r d5aab818505e gsmartcontrol/receipt
--- a/gsmartcontrol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsmartcontrol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,19 @@
 VERSION="0.9.0"
 CATEGORY="system-tools"
 SHORT_DESC="Hard disk drive health inspection tool (GUI for smartctl)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 GPL3"
 WEB_SITE="https://gsmartcontrol.sourceforge.io/home/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="pcre-dev glib-dev gtk2-dev cairomm-dev gtkmm-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gsoap/receipt
--- a/gsoap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsoap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,20 @@
 VERSION="2.8.7"
 CATEGORY="network"
 SHORT_DESC="XML language binding to develop SOAP/XML services in C/C++"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.cs.fsu.edu/~engelen/soap.html"
 
-TARBALL="${PACKAGE}_${VERSION}.zip"
+TARBALL="${PACKAGE}_$VERSION.zip"
 WGET_URL="$SF_MIRROR/gsoap2/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake openssl-dev zlib-dev flex"
-SPLIT="gsoap-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/aclocal-.{am__api_version}/aclocal/' configure
 	sed -i 's/automake-.{am__api_version}/automake/' configure
+
 	CXXFLAGS=-fPIC \
 	CFLAGS=-fPIC \
 	LDFLAGS=-fPIC \
diff -r ad29ddfee1c9 -r d5aab818505e gssdp/receipt
--- a/gssdp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gssdp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="glib-dev libsoup-dev gtk3-dev gobject-introspection-dev \
 gtk-doc vala"
-SPLIT="gssdp-bin gssdp gssdp-dev"
+SPLIT="$PACKAGE-bin $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gst0-ffmpeg/receipt
--- a/gst0-ffmpeg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-ffmpeg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.13"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 FFmpeg Plugins"
-MAINTAINER="jozee@slitaz.org" # + psychomaniak@xakep.ru
+MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 REPOLOGY="gstreamer0plugins:ffmpeg"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev bzip2-dev \
 coreutils-file-format coreutils-file-special glib-dev yasm"
-SPLIT="gst0-ffmpeg-small:small"
+SPLIT="$PACKAGE-small:small"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e gst0-plugins-bad/receipt
--- a/gst0-plugins-bad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-plugins-bad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,21 @@
 VERSION="0.10.23"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 Bad Plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gstreamer.freedesktop.org/"
+WEB_SITE="https://gstreamer.freedesktop.org/"
 REPOLOGY="gstreamer0plugins:bad"
 
 TARBALL="gst-plugins-bad-$VERSION.tar.xz"
 WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-bad/$TARBALL"
 
 BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev \
-gettext \
+gettext-dev \
 faac-dev libpng16-dev libvpx-dev openssl-dev xvidcore-dev libjpeg-turbo-dev \
 faad2-dev jasper-dev libmms-dev libmodplug-dev libsndfile-dev libsdl-dev \
 expat-dev flac-dev mjpegtools-dev curl-dev neon-dev schroedinger-dev opus-dev \
 zvbi-dev"
-SPLIT="gst0-plugins-bad-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gst0-plugins-base/receipt
--- a/gst0-plugins-base/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-plugins-base/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.36"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 Base Plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/7.6/multimedia/gst-plugins-base.html"
@@ -13,19 +13,13 @@
 TARBALL="gst-plugins-base-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gst-plugins-base/0.10/$TARBALL"
 
-BUILD_DEPENDS_arm="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev \
-libtheora-dev libtheora-enc libvorbis-dev udev-dev xorg-libXv-dev \
-xorg-libXvMC-dev util-linux-uuid-dev"
 BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev libtheora-dev \
 libtheora-enc libvorbis-dev eudev-dev xorg-libXv-dev xorg-libXvMC-dev \
 util-linux-uuid-dev cdparanoia-III-dev orc-dev gobject-introspection-dev \
-xorg-dev gettext"
-SPLIT="gst0-plugins-base-dev"
+xorg-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include" ;;
-	esac
 	./configure \
 		--enable-experimental \
 		--disable-static \
diff -r ad29ddfee1c9 -r d5aab818505e gst0-plugins-full/receipt
--- a/gst0-plugins-full/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-plugins-full/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,10 @@
 VERSION="0.10.36"
 CATEGORY="meta"
 SHORT_DESC="Plays all multimedia files GStreamer is capable of"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	DEPENDS="gstreamer0 gst0-plugins-base gst0-plugins-good \
-	gst0-plugins-good-extra gst0-plugins-bad gst0-plugins-ugly gst0-ffmpeg \
-	schroedinger libsdl x264"
-}
+DEPENDS="gstreamer0 gst0-plugins-base gst0-plugins-good gst0-plugins-good-extra \
+gst0-plugins-bad gst0-plugins-ugly gst0-ffmpeg schroedinger libsdl x264"
diff -r ad29ddfee1c9 -r d5aab818505e gst0-plugins-good/receipt
--- a/gst0-plugins-good/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-plugins-good/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.31"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 Good Plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/7.6/multimedia/gst-plugins-good.html"
@@ -13,13 +13,13 @@
 TARBALL="gst-plugins-good-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gst-plugins-good/0.10/$TARBALL"
 
-BUILD_DEPENDS="gettext gconf-dev gtk-doc python glib-dev orc-dev \
+BUILD_DEPENDS="gettext-dev gconf-dev gtk-doc python glib-dev orc-dev \
 gstreamer0-dev gst0-plugins-base-dev gtk2-dev libgudev-dev v4l-utils-dev \
 xorg-libXfixes-dev xorg-libXdamage-dev aalib-dev flac-dev gdk-pixbuf-dev \
 jack2-dev libcaca-dev libdv-dev libraw1394-dev libiec61883-dev libavc1394-dev \
 libshout-dev libsoup-dev speex-dev taglib-dev wavpack-dev libjpeg-turbo-dev \
 xorg-xorgproto xorg-libXv-dev"
-SPLIT="gst0-plugins-good-extra gst0-plugins-good"
+SPLIT="$PACKAGE-extra $PACKAGE"
 
 compile_rules() {
 	sed -i "/input:/d" sys/v4l2/gstv4l2bufferpool.c &&
diff -r ad29ddfee1c9 -r d5aab818505e gst0-plugins-ugly/receipt
--- a/gst0-plugins-ugly/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-plugins-ugly/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.19"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 Ugly Plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 REPOLOGY="gstreamer0plugins:ugly"
diff -r ad29ddfee1c9 -r d5aab818505e gst0-python/receipt
--- a/gst0-python/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst0-python/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10.21"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer Python Plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 REPOLOGY="gstreamer0plugins:python"
@@ -14,13 +14,13 @@
 
 BUILD_DEPENDS="python-pygobject2-dev gstreamer0-dev gst0-plugins-base-dev libxml2-dev \
 python-dev"
-SPLIT="gst0-python-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gst1-omx/receipt
--- a/gst1-omx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="gst1-omx"
-VERSION="1.0.0"
-CATEGORY="system-tools"
-SHORT_DESC="GSt OpenMAX IL plugin with hw-accelerated video decoding on the R-Pi."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL"
-WEB_SITE="http://gstreamer.freedesktop.org/releases/gst-omx/1.0.0.html"
-REPOLOGY="gstreamer1plugins:omx"
-
-TARBALL="gst-omx-$VERSION.tar.xz"
-WGET_URL="http://gstreamer.freedesktop.org/src/gst-omx/$TARBALL"
-HOST_ARCH="arm"
-
-DEPENDS="gstreamer1 gst1-plugins-base"
-BUILD_DEPENDS="gstreamer1-dev gst1-plugins-base-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS &&
-	make && make install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a ${install}/usr/lib ${fs}/usr
-	rm ${fs}/usr/lib/*/*.la
-}
diff -r ad29ddfee1c9 -r d5aab818505e gst1-plugins-base/receipt
--- a/gst1-plugins-base/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gst1-plugins-base/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.10.3"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer Base Plugins"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 REPOLOGY="gstreamer1plugins:base"
@@ -12,13 +12,10 @@
 TARBALL="gst-plugins-base-$VERSION.tar.xz"
 WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$TARBALL"
 
-BUILD_DEPENDS_arm="gstreamer1-dev pango-dev alsa-lib-dev libogg-dev \
-libtheora-dev libtheora-enc libvorbis-dev udev-dev xorg-libXv-dev \
-xorg-libXvMC-dev util-linux-uuid-dev orc-dev opus-dev"
-BUILD_DEPENDS="gettext valgrind-dev python gstreamer1-dev \
+BUILD_DEPENDS="gettext-dev valgrind-dev python gstreamer1-dev \
 orc-dev xorg-libX11-dev xorg-libXv-dev alsa-lib-dev cdparanoia-III-dev \
 libvorbis-dev libogg-dev opus-dev pango-dev libtheora-dev"
-SPLIT="gst1-plugins-base-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
@@ -39,12 +36,6 @@
 			DEPENDS="alsa-lib cairo cdparanoia-III glib gstreamer1 libogg \
 			libtheora-enc libvorbis opus orc pango xorg-libX11 xorg-libXext \
 			xorg-libXv zlib"
-			# Arch install
-			case "$SLITAZ_ARCH" in
-				arm*) DEPENDS="gstreamer1 pango alsa-lib libogg libtheora \
-					libtheora-enc libvorbis vorbis-tools udev xorg xorg-libXv \
-					xorg-libXvMC orc opus";;
-			esac
 			;;
 		*-dev)
 			copy @dev
diff -r ad29ddfee1c9 -r d5aab818505e gstreamer0/receipt
--- a/gstreamer0/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gstreamer0/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,18 @@
 VERSION="0.10.36"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer-0.10 Multimedia Framework"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 
 TARBALL="gstreamer-$VERSION.tar.xz"
 WGET_URL="https://gstreamer.freedesktop.org/src/gstreamer/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev libxml2-dev"
 BUILD_DEPENDS="glib-dev libxml2-dev gobject-introspection-dev python-dev bison \
-flex m4 valgrind gettext"
-SPLIT="gstreamer0-dev"
+flex m4 valgrind gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) origin="http://arm.slitaz.org";;
-		*)    origin="http://www.slitaz.org";;
-	esac
-
 	./configure \
 		--libexecdir=/usr/lib \
 		--enable-silent-rules \
@@ -29,7 +23,7 @@
 		--disable-examples \
 		--disable-debug \
 		--with-package-name="GStreamer-0.10" \
-		--with-package-origin="$origin" \
+		--with-package-origin="http://www.slitaz.org" \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gstreamer1/receipt
--- a/gstreamer1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gstreamer1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,15 @@
 VERSION="1.10.3"
 CATEGORY="multimedia"
 SHORT_DESC="GStreamer Multimedia Framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://gstreamer.freedesktop.org/"
 
 TARBALL="gstreamer-$VERSION.tar.xz"
 WGET_URL="https://gstreamer.freedesktop.org/src/gstreamer/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev libxml2-dev pkg-config"
-BUILD_DEPENDS="gettext perl valgrind-dev glib-dev"
-SPLIT="gstreamer1-dev"
+BUILD_DEPENDS="gettext-dev perl valgrind-dev glib-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e gsynaptics/receipt
--- a/gsynaptics/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gsynaptics/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Synaptics TouchPad driver for XOrg/XFree86 (Deprecated)"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://sourceforge.jp/projects/gsynaptics/"
+WEB_SITE="https://ja.osdn.net/projects/gsynaptics/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://sourceforge.jp/frs/redir.php?m=keihanna&f=%2F$PACKAGE%2F38463%2F$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e gtick/receipt
--- a/gtick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtick"
 VERSION="0.4.2"
 CATEGORY="multimedia"
-SHORT_DESC="GTick is a metronome application."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Metronome application"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.antcom.de/gtick/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.antcom.de/gtick/"
 WGET_URL="http://www.antcom.de/gtick/download/$TARBALL"
 
-DEPENDS="gtk2 xorg-libXdamage libsndfile libogg"
 BUILD_DEPENDS="gtk2-dev xorg-xorgproto"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 xorg-libXdamage libsndfile libogg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk-doc/receipt
--- a/gtk-doc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-doc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
-BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl itstool gettext"
+BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl itstool gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtk-engines/receipt
--- a/gtk-engines/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-engines/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
 
 BUILD_DEPENDS="file gtk2-dev intltool"
-SPLIT="gtk-clearlooks gtk-engines gtk-engines-dev"
+SPLIT="gtk-clearlooks $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtk-girepository/receipt
--- a/gtk-girepository/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-girepository/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,7 +9,6 @@
 LICENSE="GPL2"
 REPOLOGY="-"
 
-DEPENDS="gtk2 gobject-introspection"
 BUILD_DEPENDS="pango-dev gtk2-dev gdk-pixbuf-dev atk-dev"
 
 compile_rules() {
@@ -19,4 +18,5 @@
 
 genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk2 gobject-introspection"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk-gnutella/receipt
--- a/gtk-gnutella/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-gnutella/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,28 +6,22 @@
 SHORT_DESC="p2p client"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://gtk-gnutella.sourceforge.net/en/?page=news"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://gtk-gnutella.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 \
-xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp \
-xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
-xorg-libXdamage libtasn1"
 BUILD_DEPENDS="zlib-dev gtk2-dev libxml2-dev glib-dev xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./build.sh --prefix=/usr \
-	--disable-dbus \
-	--disable-nls &&
-	make $MAKEFLAGS install INSTALL_PREFIX=$DESTDIR
+compile_rules() {
+	./build.sh \
+		--prefix=/usr \
+		--disable-dbus \
+		--disable-nls &&
+	make $MAKEFLAGS install INSTALL_PREFIX=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	mkdir -p $fs/usr/share/applications
 	mkdir -p $fs/usr/share/pixmaps
@@ -36,4 +30,8 @@
 	cp -a $install/usr/share/applications/* $fs/usr/share/applications/
 	cp -a $install/usr/share/pixmaps/* $fs/usr/share/pixmaps
 	cp -a $install/usr/share/gtk-gnutella/pixmaps/* $fs/usr/share/gtk-gnutella/pixmaps/
+	DEPENDS="gnutls libgcrypt libgpg-error expat gtk2 libxml2 xorg-libX11 \
+	xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
+	xorg-libXfixes xorg-libXinerama xorg-libXrandr xorg-libXrender \
+	xorg-libXdamage libtasn1"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk-nodoka-engine/receipt
--- a/gtk-nodoka-engine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-nodoka-engine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,13 +4,13 @@
 VERSION="0.7.5"
 CATEGORY="customization"
 SHORT_DESC="Light and modern GTK theme engine"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://fedorahosted.org/nodoka/"
+WEB_SITE="https://pagure.io/nodoka-theme"
 REPOLOGY="gtk-nodoka-engine"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://fedorahosted.org/released/nodoka/$TARBALL"
+WGET_URL="https://fedorahosted.org/released/nodoka/$TARBALL" # FIXME
 
 BUILD_DEPENDS="gtk2-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e gtk-recordmydesktop/receipt
--- a/gtk-recordmydesktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-recordmydesktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,24 @@
 VERSION="0.3.8"
 CATEGORY="misc"
 SHORT_DESC="Desktop recording software (GTK frontend)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://recordmydesktop.sourceforge.net/about.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://recordmydesktop.sourceforge.net"
-WGET_URL="$SF_MIRROR/project/recordmydesktop/gtk-recordMyDesktop/$VERSION/$TARBALL"
-TAGS="desktop"
+WGET_URL="$SF_MIRROR/recordmydesktop/$TARBALL"
 
-DEPENDS="python python-pygtk recordmydesktop"
-BUILD_DEPENDS="python-dev python-pygtk-dev gettext-tools"
+BUILD_DEPENDS="python-dev python-pygtk-dev gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-pygtk recordmydesktop"
+	TAGS="desktop"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk-sharp/receipt
--- a/gtk-sharp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-sharp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-sharp"
 VERSION="2.12.26"
 CATEGORY="libs"
-SHORT_DESC="Gtk# is a Graphical User Interface Toolkit for mono and .Net"
+SHORT_DESC="Graphical User Interface Toolkit for mono and .Net"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.mono-project.com/docs/gui/gtksharp/"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-albatross/receipt
--- a/gtk-theme-albatross/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-albatross/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-albatross"
 VERSION="1.7.4"
 CATEGORY="customization"
-SHORT_DESC="Albatross is GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Albatross"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-blackbird/receipt
--- a/gtk-theme-blackbird/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-blackbird/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-blackbird"
 VERSION="0.4"
 CATEGORY="customization"
-SHORT_DESC="Blackbird is GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Blackbird"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-bluebird/receipt
--- a/gtk-theme-bluebird/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-bluebird/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-bluebird"
 VERSION="1.2"
 CATEGORY="customization"
-SHORT_DESC="Bluebird is GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Bluebird"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-greybird/receipt
--- a/gtk-theme-greybird/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-greybird/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-greybird"
 VERSION="1.6.2"
 CATEGORY="customization"
-SHORT_DESC="Greybird is GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Greybird"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-orion/receipt
--- a/gtk-theme-orion/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-orion/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-orion"
 VERSION="1.5"
 CATEGORY="customization"
-SHORT_DESC="Orion is GTK+2 and GTK+3 theme from the Shimmer Project"
+SHORT_DESC="GTK+2 and GTK+3 theme from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
 WEB_SITE="https://github.com/shimmerproject/Orion"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-switch/receipt
--- a/gtk-theme-switch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-switch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,7 @@
 LICENSE="GPL2"
 WEB_SITE="https://packages.qa.debian.org/g/gtk-theme-switch.html"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.gz"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/g/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
diff -r ad29ddfee1c9 -r d5aab818505e gtk-theme-vertex/receipt
--- a/gtk-theme-vertex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-theme-vertex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gtk-theme-vertex"
 VERSION="20170128"
 CATEGORY="customization"
-SHORT_DESC="Vertex is a theme for GTK 3, GTK 2, Gnome-Shell and Cinnamon"
+SHORT_DESC="Theme for GTK2, GTK3, Gnome-Shell and Cinnamon"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/horst3180/vertex-theme"
@@ -18,7 +18,8 @@
 		--prefix=/usr \
 		--disable-cinnamon \
 		--disable-gnome-shell \
-		--disable-unity
+		--disable-unity \
+		&&
 	make install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e gtk-vnc/receipt
--- a/gtk-vnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-vnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.4"
 CATEGORY="x-window"
 SHORT_DESC="VNC viewer widget for GTK"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/gtk-vnc"
 
diff -r ad29ddfee1c9 -r d5aab818505e gtk-xfce-engine/receipt
--- a/gtk-xfce-engine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk-xfce-engine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="customization"
 SHORT_DESC="GTK engine for Xfce"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e gtk2-engine-murrine/receipt
--- a/gtk2-engine-murrine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk2-engine-murrine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.98.2"
 CATEGORY="customization"
 SHORT_DESC="GTK2 engine to make your desktop look like a murrina"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 #WEB_SITE="http://www.cimitan.com/murrine"
 WEB_SITE="https://ubuntuforums.org/showthread.php?t=239378"
diff -r ad29ddfee1c9 -r d5aab818505e gtk2-theme-blinder/receipt
--- a/gtk2-theme-blinder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk2-theme-blinder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,18 +1,15 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtk2-theme-blinder"
 VERSION="1.0.3"
 CATEGORY="customization"
-SHORT_DESC="An elegant and modern gtk2 theme with a soft color of ice."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="An elegant and modern GTK2 theme with a soft color of ice"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://people.slitaz.org/~leonardolaporte/"
 
-DEPENDS="gtk2-engine-murrine"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/themes
-	cp -a stuff/* $fs/usr/share/themes
+	cp -a $stuff/* $fs/usr/share/themes
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk2-theme-chrommo/receipt
--- a/gtk2-theme-chrommo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk2-theme-chrommo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,13 @@
 PACKAGE="gtk2-theme-chrommo"
 VERSION="1.0.5"
 CATEGORY="customization"
-SHORT_DESC="A beautiful and modern theme with white color."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="A beautiful and modern theme with white color"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://people.slitaz.org/~leonardolaporte/"
 
-DEPENDS="gtk2-engine-murrine"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/themes
-	cp -a stuff/* $fs/usr/share/themes
+	cp -a $stuff/* $fs/usr/share/themes
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtk2/receipt
--- a/gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.31"
 CATEGORY="x-window"
 SHORT_DESC="The GIMP Toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gtk.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/gtk2.html"
@@ -15,9 +15,9 @@
 BUILD_DEPENDS="paper-icon-theme rsvg-convert optipng-static pngquant-static \
 symlinks \
 glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc automake gettext xorg-libXinerama-dev"
+gobject-introspection-dev gtk-doc automake gettext-dev xorg-libXinerama-dev"
 BUILD_DEPENDS="glib-dev atk-dev pango-dev cairo-dev gdk-pixbuf-dev cups-dev \
-gobject-introspection-dev gtk-doc gettext xorg-libXinerama-dev \
+gobject-introspection-dev gtk-doc gettext-dev xorg-libXinerama-dev \
 shared-mime-info-dev"
 SPLIT="$PACKAGE-demo $PACKAGE $PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e gtk3-engine-solidity/receipt
--- a/gtk3-engine-solidity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk3-engine-solidity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Solidity GTK+3 engine and themes"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://gnome-look.org/content/show.php/solidity+gtk3+engine?content=142331"
+WEB_SITE="https://www.gnome-look.org/content/show.php/solidity+gtk3+engine?content=142331"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://gnome-look.org/CONTENT/content-files/142331-solidity-$VERSION.tar.bz2"
diff -r ad29ddfee1c9 -r d5aab818505e gtk3/receipt
--- a/gtk3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtk3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$GNOME_MIRROR/gtk+/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="xorg-libSM-dev"
-BUILD_DEPENDS="gettext wayland-protocols-dev wayland-dev glib-dev atk-dev \
+BUILD_DEPENDS="gettext-dev wayland-protocols-dev wayland-dev glib-dev atk-dev \
 pango-dev cairo-dev gdk-pixbuf-dev xorg-libXinerama-dev xorg-libXi-dev \
 xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXdamage-dev libxkbcommon-dev \
 mesa-dev libepoxy-dev at-spi2-atk-dev iso-codes-dev cups-dev rest-dev \
diff -r ad29ddfee1c9 -r d5aab818505e gtkballs/receipt
--- a/gtkballs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkballs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.1.5"
 CATEGORY="games"
 SHORT_DESC="Clone of DOS Lines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gtkballs.antex.ru/"
 
@@ -12,11 +12,12 @@
 WGET_URL="http://gtkballs.antex.ru/dist/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
-SPLIT="gtkballs-themes gtkballs"
+SPLIT="$PACKAGE-themes $PACKAGE"
 
 compile_rules() {
 	sed -i 's|^localstatedir =.*|localstatedir = /var/games|' Makefile*
 	mkdir -p $install/var/games
+
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/games \
@@ -24,7 +25,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/cell.xpm $install/usr/share/gtkballs/themes/Default/
 	mv       $install/usr/share/gtkballs/themes/Default \
diff -r ad29ddfee1c9 -r d5aab818505e gtkdatabox/receipt
--- a/gtkdatabox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkdatabox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.1.1"
 CATEGORY="development"
 SHORT_DESC="Widget for live display of large amounts of fluctuating data"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://sourceforge.net/projects/gtkdatabox/"
 
@@ -21,10 +21,10 @@
 	# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/gtkdatabox/gtkdatabox-0.9.1.1.ebuild?view=markup
 	# Remove -D.*DISABLE_DEPRECATED cflags
 	find . -iname 'Makefile.am' -exec \
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + && \
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + &&
 	# Do Makefile.in after Makefile.am to avoid automake maintainer-mode
 	find . -iname 'Makefile.in' -exec \
-	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + && \
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + &&
 
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
diff -r ad29ddfee1c9 -r d5aab818505e gtkdialog/receipt
--- a/gtkdialog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkdialog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.3"
 CATEGORY="x-window"
 SHORT_DESC="Small utility for fast and easy GUI building using GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/oshazard/gtkdialog"
 
@@ -17,7 +17,7 @@
 	./autogen.sh \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cook_pick_docs README TODO doc/reference
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtkglext/receipt
--- a/gtkglext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkglext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,24 @@
 PACKAGE="gtkglext"
 VERSION="1.2.0"
 CATEGORY="x-window"
-SHORT_DESC="GtkGLExt is an OpenGL extension to GTK+"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="OpenGL extension to GTK+"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gtkglext.sourceforge.net/"
+WEB_SITE="https://projects-old.gnome.org/gtkglext/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev glu glu-dev mesa-dev \
 util-linux-uuid-dev autoconf pangox-compat-dev expat-dev xorg-libxshmfence-dev"
-SPLIT="gtkglext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoconf --force
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gtkhash/receipt
--- a/gtkhash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkhash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE/releases/download/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext intltool automake libtool gtk3-dev libb2-dev mhash-dev \
-caja-dev libgcrypt-dev openssl-dev"
+BUILD_DEPENDS="gettext-dev intltool automake libtool gtk3-dev libb2-dev \
+mhash-dev caja-dev libgcrypt-dev openssl-dev"
 SPLIT="$PACKAGE-caja $PACKAGE"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gtkhotkey/receipt
--- a/gtkhotkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkhotkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.1"
 CATEGORY="x-window"
 SHORT_DESC="Platform independent hotkey handling for GTK+ applications"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://launchpad.net/gtkhotkey"
 
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gtk2-dev intltool"
-SPLIT="gtkhotkey-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|<glib/.*h>|<glib.h>|' src/x11/tomboykeybinder.h src/gtk-hotkey-error.h
diff -r ad29ddfee1c9 -r d5aab818505e gtklife/receipt
--- a/gtklife/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtklife/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="5.1"
 CATEGORY="games"
 SHORT_DESC="Fast, featureful, open-source Conway's Life program"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://ironphoenix.org/tril/gtklife/"
+WEB_SITE="http://ironphoenix.org/gtklife/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ironphoenix.org/tril/gtklife/$TARBALL"
@@ -23,10 +23,10 @@
 		$CONFIGURE_ARGS &&
 	make || return 1
 
-	mkdir -p $DESTDIR/usr/games $DESTDIR/usr/share/gtklife
-	cp -a graphics $DESTDIR/usr/share/gtklife
-	cp -a patterns $DESTDIR/usr/share/gtklife
-	cp gtklife $DESTDIR/usr/games
+	mkdir -p $install/usr/games $install/usr/share/gtklife
+	cp -a graphics $install/usr/share/gtklife
+	cp -a patterns $install/usr/share/gtklife
+	cp gtklife $install/usr/games
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gtklp/applications/gtklp.desktop
--- a/gtklp/applications/gtklp.desktop	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Printer Administration
-Comment=Tool to use and administrate CUPS
-Categories=Application;System;
-Icon=printer
-Exec=gtklp
-Type=Application
-StartupNotify=true
-Terminal=false
diff -r ad29ddfee1c9 -r d5aab818505e gtklp/applications/gtklpq.desktop
--- a/gtklp/applications/gtklpq.desktop	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Printer Queue
-Comment=Tools to use and administrate CUPS
-Categories=Application;Utility;
-Icon=printer
-Exec=gtklpq
-Type=Application
-StartupNotify=true
-Terminal=false
diff -r ad29ddfee1c9 -r d5aab818505e gtklp/receipt
--- a/gtklp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtklp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.3.0"
 CATEGORY="utilities"
 SHORT_DESC="Tools to use and administrate CUPS"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gtklp.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/gtklp/"
 
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="cups-dev gtk2-dev autoconf automake libtool gettext-tools"
+BUILD_DEPENDS="cups-dev gtk2-dev autoconf automake libtool gettext"
 
 compile_rules() {
 	sed -i 's/^gettextize .*/autopoint -f/' autogen.sh
@@ -23,7 +23,7 @@
 	./configure &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gtklp/stuff/gtklp.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtklp/stuff/gtklp.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Printer Administration
+Comment=Tool to use and administrate CUPS
+Categories=Application;System;
+Icon=printer
+Exec=gtklp
+Type=Application
+StartupNotify=true
+Terminal=false
diff -r ad29ddfee1c9 -r d5aab818505e gtklp/stuff/gtklpq.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtklp/stuff/gtklpq.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Printer Queue
+Comment=Tools to use and administrate CUPS
+Categories=Application;Utility;
+Icon=printer
+Exec=gtklpq
+Type=Application
+StartupNotify=true
+Terminal=false
diff -r ad29ddfee1c9 -r d5aab818505e gtkmm/receipt
--- a/gtkmm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkmm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.24.5"
 CATEGORY="x-window"
 SHORT_DESC="C++ interface for the popular GUI library GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="https://www.gtkmm.org/"
+WEB_SITE="https://www.gtkmm.org/en/"
 REPOLOGY="gtkmm2"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="doxygen gtk2-dev atkmm-dev glibmm-dev cairomm-dev libsigc++-dev \
 pangomm-dev glibmm-dev mm-common"
-SPLIT="gtkmm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -34,7 +34,7 @@
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS="gtkmm gtk2-dev atkmm-dev glibmm-dev libgiomm-dev \
+			DEPENDS="gtkmm gtk2-dev atkmm-dev glibmm-dev glibmm-dev \
 			pangomm-dev"
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e gtkmm3/receipt
--- a/gtkmm3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkmm3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="gtkmm-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtkmm/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk3-dev libgiomm-dev pangomm-dev cairomm-dev glibmm-dev \
+BUILD_DEPENDS="gtk3-dev glibmm-dev pangomm-dev cairomm-dev glibmm-dev \
 atkmm-dev"
-SPLIT="gtkmm3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|gtkmm-$VERSION|" docs/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e gtkperf/receipt
--- a/gtkperf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkperf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,10 +8,10 @@
 LICENSE="GPL2"
 WEB_SITE="http://gtkperf.sourceforge.net/"
 
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gettext autoconf"
+BUILD_DEPENDS="gtk2-dev gettext-dev autoconf"
 
 COOKOPTS="skip-log-errors"
 
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gtkpod/receipt
--- a/gtkpod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkpod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gtkpod"
 VERSION="1.0.0"
 CATEGORY="multimedia"
-SHORT_DESC="platform independent GUI for Apple's iPod using GTK2"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Platform independent GUI for Apple's iPod using GTK2"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gtkpod.org/wiki/Home"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gtkpod.org/wiki/Home"
 WGET_URL="$SF_MIRROR/gtkpod/$TARBALL"
 
-DEPENDS="libgpod libid3tag flac libvorbis curl libglade hal"
-BUILD_DEPENDS="flex libgpod-dev libid3tag-dev flac-dev libvorbis-dev curl curl-dev libglade-dev intltool libplist-dev"
+BUILD_DEPENDS="flex libgpod-dev libid3tag-dev flac-dev libvorbis-dev curl \
+curl-dev libglade-dev intltool libplist-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/$PACKAGE/icons/hicolor $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/$PACKAGE/data  $fs/usr/share/$PACKAGE 
-	cp -a $install/usr/share/$PACKAGE/scripts  $fs/usr/share/$PACKAGE 
+	cp -a $install/usr/share/$PACKAGE/data  $fs/usr/share/$PACKAGE
+	cp -a $install/usr/share/$PACKAGE/scripts  $fs/usr/share/$PACKAGE
 	cp -a $install/usr/share/$PACKAGE/icons/hicolor/16x16 \
 		$fs/usr/share/$PACKAGE/icons/hicolor
 	cp $install/usr/share/icons/hicolor/48x48/apps/gtkpod.png \
 		$fs/usr/share/pixmaps/gtkpod.png
+	DEPENDS="libgpod libid3tag flac libvorbis curl libglade hal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gtksourceview/receipt
--- a/gtksourceview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtksourceview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="2.10.5"
 CATEGORY="x-window"
 SHORT_DESC="Extends GTK+ framework for multiline text editing"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://projects.gnome.org/gtksourceview/"
+WEB_SITE="https://wiki.gnome.org/Projects/GtkSourceView"
 REPOLOGY="gtksourceview2"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev libxml2-dev expat-dev"
-SPLIT="gtksourceview-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtksourceview3/receipt
--- a/gtksourceview3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtksourceview3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="gtksourceview-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gtksourceview/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev itstool gtk3-dev libxml2-dev gettext gtk-doc vala \
+BUILD_DEPENDS="glib-dev itstool gtk3-dev libxml2-dev gettext-dev gtk-doc vala \
 gobject-introspection-dev"
-SPLIT="gtksourceview3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtkspell/receipt
--- a/gtkspell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkspell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev enchant-dev intltool"
-SPLIT="gtkspell-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtkspell3/receipt
--- a/gtkspell3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtkspell3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gobject-introspection vala intltool gtk3-dev enchant-dev \
 gtk-doc"
-SPLIT="gtkspell3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gtktetris/receipt
--- a/gtktetris/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gtktetris/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="gtktetris"
 VERSION="0.6.2"
 CATEGORY="games"
-SHORT_DESC="Simple tetris game using GTK."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Simple tetris game using GTK"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/gtktetris/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/gtktetris/"
 WGET_URL="http://mirror.slitaz.org/sources/packages/g/$TARBALL"
 
-DEPENDS="gtk2 xorg-libXdamage"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{	
-	cd $src
+compile_rules() {
 	sed -i s:'BIN_PATH = /usr/local/bin':'BIN_PATH = /usr/games:' Makefile
 	sed -i s:'HIGHSCORE_PATH = /usr/local/games/gtktetris':'HIGHSCORE_PATH=/var/games/gtktetris:' Makefile
+
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/games $fs/var/games/gtktetris
 	cp -a $src/gtktetris $fs/usr/games
 	touch $fs/var/games/gtktetris/highscore.dat
 	chmod 666 $fs/var/games/gtktetris/highscore.dat
+	DEPENDS="gtk2 xorg-libXdamage"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e guacamole/receipt
--- a/guacamole/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/guacamole/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,43 +6,36 @@
 SHORT_DESC="Clientless remote desktop gateway for VNC or RDP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://guacamole.apache.org/"
+
 TARBALL="$PACKAGE-server-$VERSION.tar.gz"
-WEB_SITE="http://guac-dev.org/"
-WGET_URL="$SF_MIRROR/project/$PACKAGE/current/source/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cairo-dev ossp-uuid-dev libxml2-dev openssl-dev jpeg-dev \
 libvncserver-dev freerdp-dev libvorbis-dev pango-dev pulseaudio-dev \
 libssh2-dev xorg-dev json-c-dev libsndfile-dev flac-dev dbus-dev \
 libgcrypt-dev"
-SPLIT="guacamole-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	guacamole)
-		DEPENDS="cairo ossp-uuid libxml2 libvorbis openssl freerdp \
+		guacamole)
+			copy @std
+			DEPENDS="cairo ossp-uuid libxml2 libvorbis openssl freerdp \
 			libvncserver libssh2 pango pulseaudio json-c \
 			libsndfile flac bzlib zlib"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/sbin $fs/usr
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		;;
-	guacamole-dev)
-		DEPENDS="guacamole"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/lib/*a $fs/usr/lib
-		;;
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e gucharmap/receipt
--- a/gucharmap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gucharmap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="itstool libxml2-tools glib-dev gtk2-dev intltool"
-SPLIT="gucharmap-dev gucharmap-i18n"
+SPLIT="$PACKAGE-dev $PACKAGE-i18n"
 
 compile_rules() {
 	./configure \
@@ -33,11 +33,11 @@
 			copy @std
 			DEPENDS="gtk2 xorg-libXdamage"
 			;;
-		gucharmap-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="gucharmap"
 			;;
-		gucharmap-i18n)
+		*-i18n)
 			copy locale/
 			CAT="localization|language files"
 			DEPENDS="gucharmap"
diff -r ad29ddfee1c9 -r d5aab818505e gucharmap3/receipt
--- a/gucharmap3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gucharmap3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,10 @@
 TARBALL="gucharmap-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/gucharmap/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk-doc automake gettext libtool gobject-introspection-dev \
-intltool yelp-tools itstool gtk3-dev desktop-file-utils-extra wget \
+BUILD_DEPENDS="gtk-doc automake gettext-dev libtool gobject-introspection-dev \
+intltool yelp-tools-dev itstool gtk3-dev desktop-file-utils-extra wget \
 coreutils-file-summarize unzip vala"
-SPLIT="gucharmap3-i18n gucharmap-gnome gucharmap3 gucharmap3-dev"
+SPLIT="$PACKAGE-i18n $PACKAGE-gnome $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e guichan/receipt
--- a/guichan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/guichan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev libsdl-image-dev mesa-dev"
-SPLIT="guichan-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e guile/receipt
--- a/guile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/guile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.4"
 CATEGORY="development"
 SHORT_DESC="GNU Ubiquitous Intelligent Language for Extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://www.gnu.org/software/guile/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/guile.html"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libtool gmp-dev libunistring-dev libffi-dev gettext gc-dev \
+BUILD_DEPENDS="libtool gmp-dev libunistring-dev libffi-dev gettext-dev gc-dev \
 texinfo readline-dev"
-SPLIT="guile-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gujin/receipt
--- a/gujin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gujin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="gujin"
 VERSION="2.8.6"
 CATEGORY="base-system"
-SHORT_DESC="Graphical real-mode bootloader."
+SHORT_DESC="Graphical real-mode bootloader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://gujin.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/gujin/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/sbin $fs
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e gummi/receipt
--- a/gummi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gummi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,25 @@
 PACKAGE="gummi"
 VERSION="0.6.1"
 CATEGORY="office"
-SHORT_DESC="LaTeX editor designed with simplicity in mind."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="LaTeX editor designed with simplicity in mind"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://github.com/alexandervdm/gummi"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/alexandervdm/gummi"
 WGET_URL="http://dev.midnightcoding.org/attachments/download/239/$TARBALL"
 
-DEPENDS="gtk2 gtksourceview gtkspell poppler"
 BUILD_DEPENDS="gtk2-dev gtksourceview-dev gtkspell-dev intltool poppler-dev glib"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make LDFLAGS="-Wl,--copy-dt-needed-entries -lgthread-2.0" && make install
+	make LDFLAGS="-Wl,--copy-dt-needed-entries -lgthread-2.0" &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/gummi $fs/usr/share
+	DEPENDS="gtk2 gtksourceview gtkspell poppler"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gupnp/receipt
--- a/gupnp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gupnp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="util-linux-uuid-dev glib-dev gssdp-dev libsoup-dev libxml2-dev \
 gobject-introspection-dev gtk-doc vala"
-SPLIT="gupnp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e gutenprint/receipt
--- a/gutenprint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gutenprint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.2.8"
 CATEGORY="system-tools"
 SHORT_DESC="Top quality printer drivers for Canon, Epson"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gimp-print.sourceforge.net/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gnutls-dev expat-dev cups-dev libgcrypt-dev zlib-dev \
 foomatic-db-engine libtasn1-dev gmp-dev tar"
-SPLIT="gutenprint-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gutenpy/receipt
--- a/gutenpy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gutenpy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,12 +17,12 @@
 	# Fix missing .desktop file
 	sed -i '/share\/applications/d; /gutenpy.desktop/d' setup.py
 
-	python -B setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
 	cp -a $install/usr $fs
 	# Add gutenpy.desktop file
-	cp -a stuff/* $fs
+	cp -a $stuff/* $fs
 	DEPENDS="python python-pygtk"
 }
diff -r ad29ddfee1c9 -r d5aab818505e guvcview/receipt
--- a/guvcview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/guvcview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool v4l-utils-dev eudev-dev libusb-dev ffmpeg-dev \
 libpng16-dev libsdl2-dev gsl-dev portaudio-dev gtk3-dev"
-SPLIT="guvcview-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e gv/receipt
--- a/gv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gvfb/receipt
--- a/gvfb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gvfb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gvfb"
 VERSION="1.0.0"
 CATEGORY="x-window"
-SHORT_DESC="A virtual frame buffer program running on GTK."
+SHORT_DESC="A virtual frame buffer program running on GTK"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -13,21 +13,20 @@
 DEPENDS="gtk2"
 BUILD_DEPENDS="cmake gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
+
 	mkdir built
-	cd built
-	cmake	-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
-		-DCMAKE_INSTALL_PREFIX=/usr ../src
+	cd    built
+	cmake \
+		-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0 \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		../src &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e gvfs/receipt
--- a/gvfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gvfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.36.2"
 CATEGORY="system-tools"
 SHORT_DESC="Userspace virtual filesystem"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/gvfs"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/gvfs.html"
@@ -13,13 +13,14 @@
 WGET_URL="$GNOME_MIRROR/gvfs/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja shared-mime-info libxslt glib-dev gtk-doc dbus-dev \
-gcr-dev gettext polkit-dev libcap-dev libgphoto2-dev libarchive-dev \
+gcr-dev gettext-dev polkit-dev libcap-dev libgphoto2-dev libarchive-dev \
 libsoup-dev libcdio-paranoia-dev libmtp-dev fuse2-dev udisks2-dev gtk3-dev \
 libbluray-dev libgudev-dev libsecret-dev libxml2-dev openssh samba-dev \
 dbus-glib-dev libnfs-dev libgdata-dev gnome-online-accounts-dev"
-SPLIT="gvfs-admin gvfs-afp gvfs-archive gvfs-cdda gvfs-fuse gvfs-goa \
-gvfs-google gvfs-gphoto2 gvfs-gtk gvfs-http gvfs-libmtp gvfs-nfs gvfs-smb \
-gvfs-udisks2 gvfs gvfs-dev"
+SPLIT="$PACKAGE-admin $PACKAGE-afp $PACKAGE-archive $PACKAGE-cdda \
+$PACKAGE-fuse $PACKAGE-goa $PACKAGE-google $PACKAGE-gphoto2 $PACKAGE-gtk \
+$PACKAGE-http $PACKAGE-libmtp $PACKAGE-nfs $PACKAGE-smb $PACKAGE-udisks2 \
+$PACKAGE $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 # while webkit2gtk is broken on x86_64...
diff -r ad29ddfee1c9 -r d5aab818505e gvim/receipt
--- a/gvim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gvim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="7.3"
 CATEGORY="editors"
 SHORT_DESC="Advanced text editor with GTK+ GUI"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
-WEB_SITE="http://www.vim.org/"
+WEB_SITE="https://www.vim.org/"
 REPOLOGY="vim"
 
 SOURCE="vim"
@@ -38,10 +38,10 @@
 		VIMRCLOC=/etc/vim \
 		VIMRUNTIMEDIR=/usr/share/vim/vim73 \
 		MAKE="make -e" &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	mkdir -p $DESTDIR/etc/vim
-	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
+	mkdir -p $install/etc/vim
+	cp -a $src/runtime/vimrc_example.vim $install/etc/vim/vimrc
 }
 
 genpkg_rules() {
@@ -50,7 +50,7 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/vim $fs/usr/share
 	cp -a $src/runtime/vim16x16.png $fs/usr/share/icons/hicolor/16x16/apps/gvim.png
-	cp -a stuff/gvim.desktop $fs/usr/share/applications
+	cp -a $stuff/gvim.desktop $fs/usr/share/applications
 	cp -a $install/etc/vim $fs/etc
 	DEPENDS="ncurses gtk2 xorg-libXt xorg-libXau xorg-libXdmcp"
 	CONFIG_FILES="/etc/vim/vimrc"
diff -r ad29ddfee1c9 -r d5aab818505e gvolwheel/receipt
--- a/gvolwheel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gvolwheel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Lightweight application to control the audio volume"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://gvolwheel.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/gvolwheel/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e gvpe/receipt
--- a/gvpe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gvpe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="gvpe"
 VERSION="2.25"
 CATEGORY="network"
-SHORT_DESC="creates a virtual ethernet network with multiple nodes."
+SHORT_DESC="Creates a virtual ethernet network with multiple nodes"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -14,20 +14,15 @@
 DEPENDS="zlib openssl"
 BUILD_DEPENDS="zlib-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/sbin $fs/usr
diff -r ad29ddfee1c9 -r d5aab818505e gweled/receipt
--- a/gweled/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gweled/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,27 @@
 PACKAGE="gweled"
 VERSION="0.9.1"
 CATEGORY="games"
-SHORT_DESC="Gweled game."
+SHORT_DESC="Gweled game"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://launchpad.net/gweled"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://launchpad.net/$PACKAGE"
 WGET_URL="$WEB_SITE/trunk/$VERSION/+download/$TARBALL"
 
-DEPENDS="gtk2 librsvg libmikmod"
-BUILD_DEPENDS="wget intltool gtk2-dev librsvg-dev libmikmod-dev"
+BUILD_DEPENDS="intltool gtk2-dev librsvg-dev libmikmod-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk2 librsvg libmikmod"
 }
diff -r ad29ddfee1c9 -r d5aab818505e gxine/receipt
--- a/gxine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gxine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.5.905"
 CATEGORY="multimedia"
 SHORT_DESC="GTK+ Xine media player user interface"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.xine-project.org"
+WEB_SITE="http://www.xine-project.org/home"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://switch.dl.sourceforge.net/sourceforge/xine/$TARBALL"
+WGET_URL="$SF_MIRROR/xine/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info spidermonkey-dev xine-lib-dev xorg-dev \
 dbus-dev gtk2-dev xorg-libXinerama-dev xorg-libXext-dev perl \
@@ -33,7 +33,7 @@
 		VENDOR_PKG_VERSION="$VERSION; SliTaz GNU/Linux" \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e gxmessage/receipt
--- a/gxmessage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gxmessage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.6.2"
 CATEGORY="utilities"
 SHORT_DESC="GTK2-based clone of xmessage"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"
 
diff -r ad29ddfee1c9 -r d5aab818505e gyrus/receipt
--- a/gyrus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gyrus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.12"
 CATEGORY="network"
 SHORT_DESC="Small tool for the administration of mailboxes in IMAP/Cyrus servers"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Attic/Gyrus"
 
diff -r ad29ddfee1c9 -r d5aab818505e gzip/receipt
--- a/gzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/gzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,16 @@
 VERSION="1.9"
 CATEGORY="system-tools"
 SHORT_DESC="GNU compression utilities"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/gzip/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/gzip.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="glibc-dev"
-SPLIT="gzip-full"
+SPLIT="$PACKAGE-full"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e h8300-binutils/receipt
--- a/h8300-binutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/h8300-binutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="h8300-binutils"
-SOURCE="binutils"
 VERSION="2.16.1"
 CATEGORY="development"
-SHORT_DESC="binutils targeting the H8/300."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="binutils targeting the H8/300"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnu.org/software/binutils/"
+
+SOURCE="binutils"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.gnu.org/software/binutils/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
-TAGS="assembler linker"
 
 BUILD_DEPENDS="slitaz-toolchain bison flex"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ]; then
 	. $WOK/h8300-toolchain/stuff/h8300.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--target=$H8300_TARGET \
 		--prefix=/usr \
@@ -31,16 +28,15 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs$H8300_ROOT
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/$H8300_TARGET/* $fs$H8300_ROOT
 	# do not need to copy lib/libiberty.a
-	
+
 	strip -s $fs$H8300_ROOT/bin/*
+	TAGS="assembler linker"
 }
diff -r ad29ddfee1c9 -r d5aab818505e h8300-gcc/receipt
--- a/h8300-gcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/h8300-gcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="4.4.4"
 CATEGORY="development"
 SHORT_DESC="gcc targeting the H8/300"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.gnu.org/software/gcc/"
@@ -17,16 +17,15 @@
 h8300-binutils gcc49"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ]; then
 	. $WOK/h8300-toolchain/stuff/h8300.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	rm -f -r $src/libssp $src/libstdc++-v3 $src/binutils
 	mkdir -p $SOURCE-$VERSION-build
 	cd $SOURCE-$VERSION-build
+
 	$src/configure \
 		CC=gcc-49 CXX=g++-49 \
 		--target=$H8300_TARGET \
@@ -40,12 +39,10 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/include $fs/usr
@@ -57,9 +54,3 @@
 	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
 	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8sx
 }
-
-# Rules to clean the package
-clean_wok()
-{
-	rm -r $SOURCE-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e h8300-gcc3/receipt
--- a/h8300-gcc3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/h8300-gcc3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,28 @@
 # SliTaz package receipt.
 
 PACKAGE="h8300-gcc3"
-SOURCE="gcc"
 VERSION="3.4.6"
 CATEGORY="development"
 SHORT_DESC="gcc targeting the H8/300"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnu.org/software/gcc/"
+
+SOURCE="gcc"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.gnu.org/software/gcc/"
 WGET_URL="$GNU_MIRROR/$SOURCE/$SOURCE-$VERSION/$TARBALL"
-PROVIDE="h8300-gcc"
-TAGS="compiler C C++ ada"
 
-DEPENDS="h8300-binutils"
 BUILD_DEPENDS="bison flex h8300-binutils"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ]; then
 	. $WOK/h8300-toolchain/stuff/h8300.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	rm -f -r $src/libssp $src/libstdc++-v3 $src/binutils
 	mkdir -p $SOURCE-$VERSION-build	\
-		$DESTDIR/usr/share/man/man1 $DESTDIR/usr/share/man/man7
+		$install/usr/share/man/man1 $install/usr/share/man/man7
 	cd $SOURCE-$VERSION-build
 	$src/configure \
 		--target=$H8300_TARGET \
@@ -39,12 +35,10 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install 
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/include $fs/usr
@@ -54,10 +48,7 @@
 	# Do not include the h8300* variant folders; create separate packages if they are needed
 	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300h
 	rm -r -f $fs/usr/lib/gcc/$H8300_TARGET/$VERSION/h8300s
+	DEPENDS="h8300-binutils"
+	PROVIDE="h8300-gcc"
+	TAGS="compiler C C++ ada"
 }
-
-# Rules to clean the package
-clean_wok()
-{
-	rm -r $SOURCE-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e h8300-gdb/receipt
--- a/h8300-gdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/h8300-gdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="7.1"
 CATEGORY="development"
 SHORT_DESC="The GNU Project Debugger targeting the H8/300"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gnu.org/software/gdb/"
 
@@ -13,10 +13,10 @@
 WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
 
 BUILD_DEPENDS="slitaz-toolchain ncurses-dev expat-dev texinfo gcc49"
-SPLIT="h8300-gdb h8300-gdb-dev"
+SPLIT="$PACKAGE-dev"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ] ; then
+if [ -e $WOK/h8300-toolchain/stuff/h8300.conf ]; then
 	. $WOK/h8300-toolchain/stuff/h8300.conf
 fi
 
@@ -33,7 +33,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -42,7 +42,7 @@
 			copy @std
 			DEPENDS="ncurses expat"
 			;;
-		h8300-gdb-dev)
+		*-dev)
 			copy @dev
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e h8300-toolchain/receipt
--- a/h8300-toolchain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/h8300-toolchain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,14 +3,9 @@
 PACKAGE="h8300-toolchain"
 VERSION="1.0"
 CATEGORY="meta"
-SHORT_DESC="H8/300 toolchain meta package for devel."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="H8/300 toolchain meta package for devel"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="h8300-gcc"
 WEB_SITE="http://www.slitaz.org/"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/var
-}
+DEPENDS="h8300-gcc"
diff -r ad29ddfee1c9 -r d5aab818505e hal-cups-utils/receipt
--- a/hal-cups-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hal-cups-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,27 @@
 PACKAGE="hal-cups-utils"
 VERSION="0.6.19"
 CATEGORY="system-tools"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
+SHORT_DESC="Cups backend/utils to browse and configure using HAL UDIs"
 LICENSE="GPL2"
-SHORT_DESC="Cups backend/utils to browse and configure using HAL UDIs"
 WEB_SITE="https://packages.ubuntu.com/jaunty/hal-cups-utils"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://fedorahosted.org/releases/h/a/$PACKAGE/$TARBALL"
 
-DEPENDS="hal dbus dbus-glib cups"
 BUILD_DEPENDS="hal-dev dbus-dev dbus-glib-dev cups-dev"
 
-# Rules to configure and make the package.
+compile_rules() {
+	./configure \
+		--libexecdir=/usr/lib/hal/scripts/ \
+		&&
+	make &&
+	make install
+}
 
-compile_rules() {
-	cd $src
-	./configure \
-	--libexecdir=/usr/lib/hal/scripts/ &&
-	make && make install
-}
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
+	DEPENDS="hal dbus dbus-glib cups"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hal-info/receipt
--- a/hal-info/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hal-info/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="20091130"
 CATEGORY="x-window"
 SHORT_DESC="hal sub-package that provides the hardware data and quirks"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/hal/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
@@ -19,7 +19,7 @@
 		--disable-recall \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hal/receipt
--- a/hal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,16 @@
 VERSION="0.5.14"
 CATEGORY="x-window"
 SHORT_DESC="Hardware Abstraction Layer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/hal"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/hal/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="dbus-dev dbus-glib dbus-glib-dev eudev-dev pciutils \
 util-linux-blkid-dev expat-dev util-linux-uuid-dev glib-dev v4l-utils-dev"
-SPLIT="hal-scripts hal-extra hal hal-dev"
-
-CROSS="error: cannot check for file existence when cross compiling"
+SPLIT="$PACKAGE-scripts $PACKAGE-extra $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
@@ -41,9 +39,14 @@
 	chmod -R +x $install$libexecdir/scripts/*
 
 	# init script
-	cp -a $stuff/etc $install
+	install -Dm755 $stuff/hald $install/etc/init.d/hald
+	# and its conf
+	install -Dm644 $stuff/hald.conf $install/etc/daemons.conf.d/hald.conf
+
 	# policy for ntfs-3g
-	cp -a $stuff/policy $install/usr/share/hal/fdi/
+	install -Dm644 $stuff/30-ntfs-write.fdi \
+		$install/usr/share/hal/fdi/policy/10osvendor/30-ntfs-write.fdi
+
 	# change bash to sh in hal scripts; use full-path
 	sed -i \
 		-e 's:/bin/bash:/bin/sh:' \
diff -r ad29ddfee1c9 -r d5aab818505e hal/stuff/30-ntfs-write.fdi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hal/stuff/30-ntfs-write.fdi	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+  <device>
+   	<match key="volume.fstype" string="ntfs">
+        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
+        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
+        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
+        <merge key="volume.fstype" type="string">ntfs-3g</merge>
+       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
+        <append key="volume.mount.valid_options" type="strlist">atime</append>
+        <append key="volume.mount.valid_options" type="strlist">noatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
+       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
+       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
+       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
+       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
+       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
+      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
+       	<append key="volume.mount.valid_options" type="strlist">silent</append>
+       	<append key="volume.mount.valid_options" type="strlist">force</append>
+       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
+       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
+       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
+       	<append key="volume.mount.valid_options" type="strlist">debug</append>
+       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
+       	<append key="volume.mount.valid_options" type="strlist">sync</append>
+       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
+       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
+       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
+        <append key="volume.mount.valid_options" type="strlist">quiet</append>
+       	<append key="volume.mount.valid_options" type="strlist">remount</append>
+       	<append key="volume.mount.valid_options" type="strlist">exec</append>
+       	<append key="volume.mount.valid_options" type="strlist">recover</append>
+       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
+       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
+       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+	</match>
+  </device>
+</deviceinfo>
diff -r ad29ddfee1c9 -r d5aab818505e hal/stuff/etc/init.d/hald
--- a/hal/stuff/etc/init.d/hald	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#!/bin/sh
-# /etc/init.d/hald: Start, stop and restart HAL daemon on SliTaz,
-# at boot time or with the command line. Daemons options are configured
-# with /etc/daemons.conf
-#
-. /etc/init.d/rc.functions
-. /etc/daemons.conf
-
-NAME=HAL
-DESC="$(_ 'Hardware Abstraction Layer')"
-DAEMON=/usr/sbin/hald
-OPTIONS=$HALD_OPTIONS
-PIDFILE=/run/hald/pid
-
-case "$1" in
-	start)
-		if active_pidfile $PIDFILE hald ; then
-			_ '%s is already running.' $NAME
-			exit 1
-		fi
-		action 'Starting %s: %s...' "$DESC" $NAME
-		mkdir -p $(dirname $PIDFILE)
-		$DAEMON $OPTIONS
-		status ;;
-	stop)
-		if ! active_pidfile $PIDFILE hald ; then
-			_ '%s is not running.' $NAME
-			exit 1
-		fi
-		action 'Stopping %s: %s...' "$DESC" $NAME
-		kill $(cat $PIDFILE)
-		rm $PIDFILE
-		status ;;
-	restart)
-		if ! active_pidfile $PIDFILE hald ; then
-			_ '%s is not running.' $NAME
-			exit 1
-		fi
-		action 'Restarting %s: %s...' "$DESC" $NAME
-		kill $(cat $PIDFILE)
-		rm $PIDFILE
-		sleep 2
-		$DAEMON $OPTIONS
-		status ;;
-	*)
-		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
-		newline
-		exit 1 ;;
-esac
-
-exit 0
diff -r ad29ddfee1c9 -r d5aab818505e hal/stuff/hald
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hal/stuff/hald	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,51 @@
+#!/bin/sh
+# /etc/init.d/hald: Start, stop and restart HAL daemon on SliTaz,
+# at boot time or with the command line. Daemons options are configured
+# with /etc/daemons.conf
+#
+. /etc/init.d/rc.functions
+. /etc/daemons.conf
+
+NAME=HAL
+DESC="$(_ 'Hardware Abstraction Layer')"
+DAEMON=/usr/sbin/hald
+OPTIONS=$HALD_OPTIONS
+PIDFILE=/run/hald/pid
+
+case "$1" in
+	start)
+		if active_pidfile $PIDFILE hald ; then
+			_ '%s is already running.' $NAME
+			exit 1
+		fi
+		action 'Starting %s: %s...' "$DESC" $NAME
+		mkdir -p $(dirname $PIDFILE)
+		$DAEMON $OPTIONS
+		status ;;
+	stop)
+		if ! active_pidfile $PIDFILE hald ; then
+			_ '%s is not running.' $NAME
+			exit 1
+		fi
+		action 'Stopping %s: %s...' "$DESC" $NAME
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		status ;;
+	restart)
+		if ! active_pidfile $PIDFILE hald ; then
+			_ '%s is not running.' $NAME
+			exit 1
+		fi
+		action 'Restarting %s: %s...' "$DESC" $NAME
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		sleep 2
+		$DAEMON $OPTIONS
+		status ;;
+	*)
+		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
+		newline
+		exit 1 ;;
+esac
+
+exit 0
diff -r ad29ddfee1c9 -r d5aab818505e hal/stuff/hald.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hal/stuff/hald.conf	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,2 @@
+# HAL daemon options.
+HALD_OPTIONS="--daemon=yes"
diff -r ad29ddfee1c9 -r d5aab818505e hal/stuff/policy/10osvendor/30-ntfs-write.fdi
--- a/hal/stuff/policy/10osvendor/30-ntfs-write.fdi	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-   	<match key="volume.fstype" string="ntfs">
-        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
-        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
-        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
-        <merge key="volume.fstype" type="string">ntfs-3g</merge>
-       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
-        <append key="volume.mount.valid_options" type="strlist">atime</append>
-        <append key="volume.mount.valid_options" type="strlist">noatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
-       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
-       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
-       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
-      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
-       	<append key="volume.mount.valid_options" type="strlist">silent</append>
-       	<append key="volume.mount.valid_options" type="strlist">force</append>
-       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
-       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
-       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
-       	<append key="volume.mount.valid_options" type="strlist">debug</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
-       	<append key="volume.mount.valid_options" type="strlist">sync</append>
-       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
-       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
-       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.valid_options" type="strlist">quiet</append>
-       	<append key="volume.mount.valid_options" type="strlist">remount</append>
-       	<append key="volume.mount.valid_options" type="strlist">exec</append>
-       	<append key="volume.mount.valid_options" type="strlist">recover</append>
-       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
-       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
-       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-	</match>
-  </device>
-</deviceinfo>
diff -r ad29ddfee1c9 -r d5aab818505e haproxy/receipt
--- a/haproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/haproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Reliable, High Performance TCP/HTTP Load Balancer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL LGPL"
-WEB_SITE="http://haproxy.1wt.eu"
+WEB_SITE="http://www.haproxy.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/download/${VERSION%.*}/src/$TARBALL"
@@ -15,7 +15,13 @@
 
 compile_rules() {
 	sed -i 's|/doc|/share&|' Makefile*
-	make TARGET=linux26 USE_PCRE=1 PREFIX=/usr DESTDIR=$DESTDIR install
+
+	make \
+		TARGET=linux26 \
+		USE_PCRE=1 \
+		PREFIX=/usr \
+		DESTDIR=$install \
+		install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hardinfo/receipt
--- a/hardinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hardinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,33 @@
 PACKAGE="hardinfo"
 VERSION="0.5.1"
 CATEGORY="system-tools"
-SHORT_DESC="A tool to get hardware informations and perform benchmarks."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="A tool to get hardware informations and perform benchmarks"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://hardinfo.berlios.de/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://hardinfo.berlios.de/"
 WGET_URL="http://download.berlios.de/hardinfo/$TARBALL"
 
-DEPENDS="gtk2 pciutils xorg-libXdamage"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	sed -i 's/^GTK_LIBS.*/& -lgmodule-2.0 -lm/' Makefile && make &&
-	make DESTDIR=$DESTDIR install
+	sed -i 's/^GTK_LIBS.*/& -lgmodule-2.0 -lm/' Makefile &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/$PACKAGE/modules $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $src/*.so $fs/usr/lib/$PACKAGE/modules
 	cp -a $install/usr/share/$PACKAGE $fs/usr/share
+
 	cd $fs/usr/share/pixmaps
 	rm ../$PACKAGE/pixmaps/logo.xcf
 	ln -s ../$PACKAGE/pixmaps/logo.png hardinfo.png
+	DEPENDS="gtk2 pciutils xorg-libXdamage"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e hardware-ibm-6272/receipt
--- a/hardware-ibm-6272/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hardware-ibm-6272/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,46 +8,16 @@
 SHORT_DESC="IBM 300GL 6272/6282 (P75-233 ISA/PCI/USB/ETH desktop) hardware support"
 WEB_SITE="http://www.slitaz.org/"
 
-DEPENDS="isapnptools"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/etc/init.d
-	cat > $fs/etc/init.d/pnp.sh <<EOT
-#!/bin/sh
-
-. /etc/init.d/rc.functions
-
-echo -n "Switching on isa pnp ethernet card "
-# io 0x360..0x250 by 0x10, irq 15 12 11 10 9 7 6 5 4 3
-for io in \$(seq 360 -10 250); do for irq in 15 12 11 10; do
-pnpdump | busybox awk "BEGIN {s=0} \\
-/CONFIGURE CSC6040/ {s=1} { \\
-  if (s==0) print; \\
-  else if (/INT 0/) print \\"(INT 0 (IRQ \$irq (MODE +E)))\\"; \\
-  else if (/IO 0/) print \\"(IO 0 (SIZE 16) (BASE 0x0\$io) (CHECK))\\"; \\
-  else if (/ACT Y/) { s=0; print \\"(ACT Y)\\"} \\
-  else print \\
-}" > /etc/isapnp.conf
-if isapnp /etc/isapnp.conf > /dev/null 2>&1 ; then
-  modprobe cs89x0 io=0x\$io irq=\$irq > /dev/null 2>&1
-  break 2
-fi
-done ; done
-status
-EOT
-	chmod +x $fs/etc/init.d/pnp.sh
+genpkg_rules() {
+	install -Dm755 $stuff/pnp.sh $fs/etc/init.d/pnp.sh
+	DEPENDS="isapnptools"
 }
 
-# Pre and post install commands for Tazpkg.
-pre_remove()
-{
+pre_remove() {
 	sed -i 's/pnp.sh //' "$1/etc/rcS.conf"
 }
 
-post_install()
-{
+post_install() {
 	grep pnp.sh "$1/etc/rcS.conf" ||
 	sed -i 's/RUN_SCRIPTS="/&pnp.sh /' "$1/etc/rcS.conf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hardware-ibm-6272/stuff/pnp.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hardware-ibm-6272/stuff/pnp.sh	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+. /etc/init.d/rc.functions
+
+action "Switching on ISA PNP ethernet card"
+
+# io 0x360..0x250 by 0x10, irq 15 12 11 10 9 7 6 5 4 3
+
+for io in $(seq 360 -10 250); do
+	for irq in 15 12 11 10; do
+		pnpdump \
+		| busybox awk -virq=$irq -vio=$io '
+			BEGIN {s=0}
+			/CONFIGURE CSC6040/
+				{s=1}
+			{
+				if (s==0) print;
+				else if (/INT 0/)
+					printf("(INT 0 (IRQ %s (MODE +E)))\n", irq);
+				else if (/IO 0/)
+					printf("(IO 0 (SIZE 16) (BASE 0x0%s) (CHECK))\n", io);
+				else if (/ACT Y/)
+					{s=0; print "(ACT Y)"}
+				else print
+			}' \
+		> /etc/isapnp.conf
+
+		if isapnp /etc/isapnp.conf >/dev/null 2>&1; then
+			modprobe cs89x0 io=0x$io irq=$irq >/dev/null 2>&1
+			break 2
+		fi
+	done
+done
+
+status
diff -r ad29ddfee1c9 -r d5aab818505e hardware-thinkpad-600e/receipt
--- a/hardware-thinkpad-600e/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hardware-thinkpad-600e/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,18 +8,14 @@
 SHORT_DESC="ThinkPad 600e (PII pcmcia laptop) hardware support"
 WEB_SITE="http://www.slitaz.org/"
 
-DEPENDS="linux-acpi linux-mwave tp_smapi linux-sound xorg-xf86-video-neomagic"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc
+	DEPENDS="linux-acpi linux-mwave tp_smapi linux-sound \
+	xorg-xf86-video-neomagic"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
-	for i in thinkpad_acpi snd_cs46xx yenta_socket ; do
+post_install() {
+	for i in thinkpad_acpi snd_cs46xx yenta_socket; do
 		grep -q $i "$1/etc/rcS.conf" ||
 		sed -i "s/LOAD_MODULES=\"/&$i /" $i "$1/etc/rcS.conf"
 		[ -n "$1" ] || modprobe $i
@@ -27,7 +23,7 @@
 	# FIXME update /etc/modprobe.d/ ?
 	# modprobe snd-cs4236 index=0 port=0x530 cport=0x538 irq=5 dma1=1 dma2=0 isapnp=0
 	# modprobe snd-cs4232 port=0x530 cport=0x120 irq=5 dma1=1 dma2=0 isapnp=0
-	
+
 	# Video: remove 24bits (use 1024x768x16), neomagic driver
 	sed -i 's/vesa/neomagic/;/Display/{NNN/24$/d}' "$1/etc/X11/xorg.conf"
 	sed -i '/Display/{NNNN/24$/d}' "$1/etc/X11/xorg.conf.d/70-Screen.conf"
diff -r ad29ddfee1c9 -r d5aab818505e harfbuzz/receipt
--- a/harfbuzz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/harfbuzz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.8.4"
 CATEGORY="system-tools"
 SHORT_DESC="OpenType text shaping engine"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/HarfBuzz/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/harfbuzz.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="glib-dev gobject-introspection-dev cairo-dev freetype-dev \
 fontconfig-dev icu-dev"
-SPLIT="libharfbuzz libharfbuzz-icu harfbuzz-icu-dev harfbuzz-dev"
+SPLIT="libharfbuzz libharfbuzz-icu $PACKAGE-icu-dev $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e haserl-lua/receipt
--- a/haserl-lua/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/haserl-lua/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,38 +1,32 @@
 # SliTaz package receipt.
 
 PACKAGE="haserl-lua"
-SOURCE="haserl"
 VERSION="0.9.27"
 CATEGORY="network"
-SHORT_DESC="Small program that uses shell or Lua script to create cgi web scripts"
-MAINTAINER="milka@konstelacioj.info"
+SHORT_DESC="Create CGI web scripts using shell or Lua script"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://haserl.sourceforge.net/"
 REPOLOGY="haserl"
 
+SOURCE="haserl"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="glibc-dev lua-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--bindir=/usr/bin \
 		--with-lua \
 		--program-suffix=-lua \
-    	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	SUGGESTED="bash lua lua-dev"
-}
\ No newline at end of file
+}
diff -r ad29ddfee1c9 -r d5aab818505e haserl/receipt
--- a/haserl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/haserl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="haserl"
 VERSION="0.9.27"
 CATEGORY="network"
-SHORT_DESC="Small program that uses shell or Lua script to create cgi web scripts"
-MAINTAINER="milka@konstelacioj.info"
+SHORT_DESC="Create CGI web scripts using shell or Lua script"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="bash lua lua-dev"
+WEB_SITE="http://haserl.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://haserl.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="glibc-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--bindir=/usr/bin \
-    	$CONFIGURE_ARGS
-	make
-	make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-}
\ No newline at end of file
+genpkg_rules() {
+	copy @std
+	SUGGESTED="bash lua lua-dev"
+}
diff -r ad29ddfee1c9 -r d5aab818505e hash-slinger/receipt
--- a/hash-slinger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hash-slinger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hash-slinger"
 VERSION="2.6"
 CATEGORY="network"
-SHORT_DESC="Various tools to generate special DNS records."
+SHORT_DESC="Various tools to generate special DNS records"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://people.redhat.com/pwouters/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://people.redhat.com/pwouters"
 WGET_URL="http://people.redhat.com/pwouters/$PACKAGE/$TARBALL"
 
-DEPENDS="python"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e hashalot/receipt
--- a/hashalot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hashalot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,23 @@
 PACKAGE="hashalot"
 VERSION="0.3"
 CATEGORY="system-tools"
-SHORT_DESC="Passphrase to binary key filter."
+SHORT_DESC="Passphrase to binary key filter"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.paranoiacs.org/~sluskyb/hacks/hashalot/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.paranoiacs.org/~sluskyb/hacks/hashalot"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e hd2u/receipt
--- a/hd2u/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hd2u/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.4"
 CATEGORY="misc"
 SHORT_DESC="Dos2Unix text file converter"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://hany.sk/~hany/software/hd2u/"
 
diff -r ad29ddfee1c9 -r d5aab818505e hdf5/receipt
--- a/hdf5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hdf5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Data model, library, and file format for storing and managing data"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://www.hdfgroup.org/HDF5"
+WEB_SITE="https://www.hdfgroup.org/solutions/hdf5/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.hdfgroup.org/ftp/HDF5/current/src/$TARBALL"
 
 BUILD_DEPENDS="cmake szip zlib-dev"
-SPLIT="hdf5-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|// .*|/* & */|' test/th5s.c tools/lib/h5tools_str.c
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make all &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hdparm/receipt
--- a/hdparm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hdparm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hdparm"
 VERSION="9.37"
 CATEGORY="system-tools"
-SHORT_DESC="hdparm - get/set ATA/SATA drive parameters under Linux"
+SHORT_DESC="Get and set (S)ATA drive parameters under Linux"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://sourceforge.net/projects/hdparm/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/hdparm/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="glibc"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/sbin
-	cp -a $install/sbin/hdparm $fs/sbin/
+genpkg_rules() {
+	copy @std
+	DEPENDS="glibc"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e help2man/receipt
--- a/help2man/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/help2man/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,17 +11,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="perl gettext texinfo perl-locale-gettext"
+BUILD_DEPENDS="perl gettext-dev texinfo perl-locale-gettext"
 
 compile_rules() {
 	./configure \
 		--enable-nls \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$install install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
 	copy @std
 	DEPENDS="perl-locale-gettext"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e hexchat/receipt
--- a/hexchat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hexchat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.12.4"
 CATEGORY="network"
 SHORT_DESC="IRC client using GTK+"
-MAINTAINER="lenios@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://hexchat.github.io/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="automake autoconf-archive libtool intltool gtk2-dev perl-dev \
 python-dev openssl-dev pciutils-dev dbus-glib-dev libnotify-dev \
 libcanberra-dev iso-codes" # libproxy-dev
-SPLIT="hexchat-plugin-perl hexchat-plugin-python hexchat hexchat-dev"
+SPLIT="$PACKAGE-plugin-perl $PACKAGE-plugin-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e hfsprescue/receipt
--- a/hfsprescue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hfsprescue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hfsprescue"
 VERSION="1.1"
 CATEGORY="base-system"
-SHORT_DESC="HFS+ recovery tool."
+SHORT_DESC="HFS+ recovery tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.plop.at/en/hfsprescue/index.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.plop.at/en/hfsprescue.html"
 WGET_URL="http://download.plop.at/$PACKAGE/$TARBALL"
 
-DEPENDS="gcc-lib-base"
 BUILD_DEPENDS="zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hfsprogs/receipt
--- a/hfsprogs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hfsprogs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="HFS+ Filesystem user space tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="APLS"
-WEB_SITE="https://www.opensource.apple.com/"
+WEB_SITE="https://opensource.apple.com/"
 
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 TARBALL2="${PACKAGE}_$VERSION-11.debian.tar.gz"
@@ -14,9 +14,7 @@
 
 BUILD_DEPENDS="libbsd-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -s "$SRC/$TARBALL2" ] ||
 	wget -P $SRC $(dirname $WGET_URL)/$TARBALL2
 	tar -xzf $SRC/$TARBALL2
@@ -33,12 +31,11 @@
 	install -m755 $src/fsck_hfs.tproj/fsck_hfs   $install/sbin/fsck.hfsplus
 	install -m644 $src/newfs_hfs.tproj/hfsbootdata.img \
 		$install/usr/share/hfsprogs/hfsbootdata
+
 	cook_pick_manpages newfs_hfs.tproj/newfs_hfs.8 fsck_hfs.tproj/fsck_hfs.8
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="libbsd openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hfsutils/receipt
--- a/hfsutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hfsutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,21 +11,17 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.mars.org/pub/hfs/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/bin $install/usr/share/man/man1
 	sed -i 's|DEST =.|&$(DESTDIR)|' Makefile.in
 
-	./configure $CONFIGURE_ARGS && make && make install &&
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
-	docdir=$install/usr/share/doc/hfsutils-$VERSION &&
-	mkdir -p $docdir &&
-	cp doc/*.txt $docdir
+	cook_pick_docs doc/*.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e hiawatha/receipt
--- a/hiawatha/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hiawatha/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,38 +1,34 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hiawatha"
 VERSION="10.7"
 CATEGORY="network"
-SHORT_DESC="Advanced and secure webserver."
+SHORT_DESC="Advanced and secure webserver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.hiawatha-webserver.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.hiawatha-webserver.org/"
 WGET_URL="${WEB_SITE}files/$TARBALL"
-PROVIDE="lighttpd"
-CONFIG_FILES="/etc/hiawatha"
-TAGS="webserver http server"
-PROVIDE="lighttpd"
 
-DEPENDS="openssl libxml2 libxslt zlib"
 BUILD_DEPENDS="openssl-dev libxml2-dev libxslt-dev zlib-dev cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-	      -DLOG_DIR=/var/log -DWEBROOT_DIR=/var/www -DPID_DIR=/var/run \
-	      -DWORK_DIR=/var/lib .
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
+		-DLOG_DIR=/var/log \
+		-DWEBROOT_DIR=/var/www \
+		-DPID_DIR=/var/run \
+		-DWORK_DIR=/var/lib \
+		. &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	mkdir -p $fs/usr
-	cp -a $install/var $fs
-	cp -a $install/etc $fs
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl libxml2 libxslt zlib"
+	PROVIDE="lighttpd"
+	CONFIG_FILES="/etc/hiawatha"
+	TAGS="webserver http server"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hicolor-icon-theme/receipt
--- a/hicolor-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hicolor-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.17"
 CATEGORY="misc"
 SHORT_DESC="Icon theme that all icon themes automatically inherit from"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/icon-theme/"
 
diff -r ad29ddfee1c9 -r d5aab818505e hiredis/receipt
--- a/hiredis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hiredis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-SPLIT="hiredis-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make &&
 	make \
 		PREFIX=/usr \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e hitori/receipt
--- a/hitori/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hitori/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gettext itstool libxml2-tools gtk3-dev cairo-dev \
+BUILD_DEPENDS="glib-dev gettext-dev itstool libxml2-tools gtk3-dev cairo-dev \
 desktop-file-utils-extra"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e homebank/receipt
--- a/homebank/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/homebank/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,17 @@
 PACKAGE="homebank"
 VERSION="4.4"
 CATEGORY="office"
-SHORT_DESC="Personal accounts manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Personal accounts manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://homebank.free.fr/en/index.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://homebank.free.fr/"
 WGET_URL="http://homebank.free.fr/public/$TARBALL"
-TAGS="office finance"
 
-DEPENDS="gtk2 xorg-libXdamage"
 BUILD_DEPENDS="intltool gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# GTK+ dont support svg
 	sed -i s/svg/png/ src/*.c
 	chmod +x install-sh
@@ -25,12 +22,12 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/homebank $fs/usr/share/icons/hicolor
 
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/homebank/images $fs/usr/share/homebank
 	cp -a $install/usr/share/icons/hicolor/48x48 $fs/usr/share/icons/hicolor
+	DEPENDS="gtk2 xorg-libXdamage"
+	TAGS="office finance"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hostapd/receipt
--- a/hostapd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hostapd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="hostapd"
 VERSION="2.2"
 CATEGORY="network"
-SHORT_DESC="Daemon for wireless software access points."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Daemon for wireless software access points"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://w1.fi/hostapd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://hostap.epitest.fi/hostapd/"
 WGET_URL="http://hostap.epitest.fi/releases/$TARBALL"
 
-DEPENDS="openssl libnl"
 BUILD_DEPENDS="openssl-dev libnl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src/hostapd &&
-	cp -a $stuff/config .config &&
-	sed -i "s|/usr/local/bin|/usr/bin|" Makefile &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	cd $src/hostapd
+	cp -a $stuff/config .config
+	sed -i "s|/usr/local/bin|/usr/bin|" Makefile
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/hostapd
-	
+
 	cp -a $stuff/hostapd $fs/etc/init.d &&
 	cp -a $src/hostapd/hostapd.accept $src/hostapd/hostapd.conf \
 		$src/hostapd/hostapd.deny $src/hostapd/hostapd.eap_user \
@@ -35,4 +33,5 @@
 		$src/hostapd/wired.conf $src/hostapd/hlr_auc_gw.milenage_db \
 		$fs/etc/hostapd &&
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="openssl libnl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hp15c/receipt
--- a/hp15c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hp15c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,44 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="hp15c"
-SOURCE="HP-15C"
 VERSION="3.3.00"
 CATEGORY="office"
-SHORT_DESC="HP-15C emulator."
+SHORT_DESC="HP-15C emulator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://hp-15c.homepage.t-online.de/content_web.htm"
+
+SOURCE="HP-15C"
 TARBALL="${SOURCE}_${VERSION}_Source.zip"
 WGET_URL="https://goo.gl/aHJxj4"
 
-DEPENDS="tk tcl"
 BUILD_DEPENDS="wget"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/hp15c $fs/usr/share/applications \
-		 $fs/usr/share/fonts/truetype/ttf-dejavu
+genpkg_rules() {
+	mkdir -p $fs/usr/share/hp15c $fs/usr/share/fonts/truetype/ttf-dejavu
 	cp -a $src/* $fs/usr/share/hp15c
 	mv $fs/usr/share/hp15c/HP-15C_Simulator_Font.ttf \
 	   $fs/usr/share/fonts/truetype/ttf-dejavu
-	cat > $fs/usr/share/hp15c/HP-15C.sh <<EOT
-#!/bin/sh
-
-cd /usr/share/hp15c
-tclsh HP-15C.tcl
-EOT
-	chmod +x $fs/usr/share/hp15c/HP-15C.sh
-	cat > $fs/usr/share/applications/hp15c.desktop <<EOT
-[Desktop Entry]
-Encoding=UTF-8
-Name=HP-15C Calculator
-Name[fr]=Calculatrice HP-15C
-Name[pt]=Calculadora HP-15C
-Exec=/usr/share/hp15c/HP-15C.sh
-Icon=/usr/share/hp15c/HP-15C.gif
-Terminal=false
-Type=Application
-Categories=Application;Utility;
-EOT
+	install -Dm755 $stuff/HP-15C.sh     $fs/usr/share/hp15c/HP-15C.sh
+	install -Dm644 $stuff/hp15c.desktop $fs/usr/share/applications/hp15c.desktop
+	DEPENDS="tk tcl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hp15c/stuff/HP15C.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hp15c/stuff/HP15C.sh	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/share/hp15c
+tclsh HP-15C.tcl
diff -r ad29ddfee1c9 -r d5aab818505e hp15c/stuff/hp15c.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hp15c/stuff/hp15c.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=HP-15C Calculator
+Name[fr]=Calculatrice HP-15C
+Name[pt]=Calculadora HP-15C
+Exec=/usr/share/hp15c/HP-15C.sh
+Icon=/usr/share/hp15c/HP-15C.gif
+Categories=Application;Utility;
diff -r ad29ddfee1c9 -r d5aab818505e hplip/receipt
--- a/hplip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hplip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 CATEGORY="system-tools"
 SHORT_DESC="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and \
 some LaserJet"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://hplipopensource.com"
+WEB_SITE="https://developers.hp.com/hp-linux-imaging-and-printing"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -17,15 +17,13 @@
 jpeg-dev cups-dev dbus-dev tiff-dev python python-dev python-dbus net-snmp-dev \
 libtool"
 
-BUGS="Unable to delete hplip.desktop from $fs.  Using hack in post_install."
-
 compile_rules() {
 	./configure  \
 		--disable-doc-build \
 		--enable-qt4 \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hsetroot/receipt
--- a/hsetroot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hsetroot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.2"
 CATEGORY="x-window"
 SHORT_DESC="Tool to set desktop wallpaper"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/himdel/hsetroot"
 
@@ -16,9 +16,10 @@
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ht/receipt
--- a/ht/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ht/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ht"
 VERSION="2.1.0"
 CATEGORY="development"
-SHORT_DESC="File viewer/editor/analyser for text/binary/executable files."
+SHORT_DESC="File viewer/editor/analyser for text/binary/executable files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://hte.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://hte.sourceforge.net/"
 WGET_URL="$SF_MIRROR/hte/$TARBALL"
-TAGS="viewer text-editor analysis"
 
-DEPENDS="gcc-lib-base lzo ncurses xorg-libX11 xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="lzo-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
 	chmod +x install-sh
-	./configure --prefix=/usr --infodir=/usr/share/info \
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="lzo ncurses xorg-libX11 xorg-libXau xorg-libXdmcp"
+	TAGS="viewer text-editor analysis"
 }
diff -r ad29ddfee1c9 -r d5aab818505e html2text/receipt
--- a/html2text/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/html2text/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,11 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
 WEB_SITE="http://www.mbayer.de/html2text/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.ibiblio.org/pub/linux/apps/www/converters/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS
 	sed -i 's|/usr/local/bin|/usr/bin|; s|/usr/local/man|/usr/share/man|;
 		s|$(BINDIR)|$(DESTDIR)&|; s|$(MANDIR)|$(DESTDIR)&|; s|$(DOCDIR)|$(DESTDIR)&|' \
@@ -26,9 +22,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -r $fs/usr/share/doc
 }
diff -r ad29ddfee1c9 -r d5aab818505e htmldoc/receipt
--- a/htmldoc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/htmldoc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.9.1"
 CATEGORY="utilities"
 SHORT_DESC="Convert HTML pages into a PDF document"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://michaelrsweet.github.io/htmldoc/"
+WEB_SITE="https://www.msweet.org/htmldoc/"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="https://github.com/michaelrsweet/htmldoc/releases/download/v$VERSION/$TARBALL"
@@ -17,7 +17,9 @@
 compile_rules() {
 	echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop
 
-	./configure $CONFIGURE_ARGS && make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	find $install -type f -exec chmod u+w '{}' \;
 }
diff -r ad29ddfee1c9 -r d5aab818505e htop/receipt
--- a/htop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/htop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.2"
 CATEGORY="system-tools"
 SHORT_DESC="Interactive process viewer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://htop.sourceforge.net/"
 
@@ -14,13 +14,8 @@
 BUILD_DEPENDS="ncurses-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS="--enable-native_affinity=no";;
-	esac
-
 	./configure \
 		--enable-unicode \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e httpfs-fuse/receipt
--- a/httpfs-fuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/httpfs-fuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/httpfs/$TARBALL"
 
 BUILD_DEPENDS="fuse2-dev upx391"
-SPLIT="httpfs-fuse-static"
+SPLIT="$PACKAGE-static"
 
 compile_rules() {
 	mkdir -p $install/usr/bin $install/usr/share/boot
diff -r ad29ddfee1c9 -r d5aab818505e httpie/receipt
--- a/httpie/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/httpie/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="httpie"
 VERSION="0.8.0"
 CATEGORY="network"
-SHORT_DESC="HTTPie is a command line HTTP client, a user-friendly cURL replacement"
+SHORT_DESC="Command line HTTP client, a user-friendly cURL replacement"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://httpie.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/jakubroztocil/$PACKAGE/archive/$VERSION.tar.gz"
 
-DEPENDS="python-requests python-pygments"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --no-compile --root=$install
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python-requests python-pygments"
 }
diff -r ad29ddfee1c9 -r d5aab818505e httping/receipt
--- a/httping/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/httping/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,30 @@
 PACKAGE="httping"
 VERSION="2.5"
 CATEGORY="network"
-SHORT_DESC="Httping is like 'ping' but for http-requests."
+SHORT_DESC="Like 'ping' but for http-requests"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.vanheusden.com/httping/"
+WEB_SITE="https://www.vanheusden.com/httping/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://www.vanheusden.com/httping/$TARBALL"
 
-DEPENDS="ncurses fftw openssl"
-BUILD_DEPENDS="ncurses-dev fftw-dev gettext openssl-dev"
+BUILD_DEPENDS="ncurses-dev fftw-dev gettext-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 		#--with-tfo force enable tcp fast open
 	./configure \
 		--with-ncurses \
 		--with-openssl \
 		--with-fftw3 &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/ $fs/usr
 	rm -r $fs/usr/share/man
+	DEPENDS="ncurses fftw openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e httptunnel/receipt
--- a/httptunnel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/httptunnel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="httptunnel"
 VERSION="3.3"
 CATEGORY="network"
 SHORT_DESC="httptunnel creates a bidirectianal virtual data connection tunnelled in HTTP requests"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/larsbrinkhoff/httptunnel"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/larsbrinkhoff/httptunnel"
 WGET_URL="$WEB_SITE/$TARBALL" # FIXME
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure && make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e httrack/receipt
--- a/httrack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/httrack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.45.4"
 CATEGORY="system-tools"
 SHORT_DESC="An easy-to-use offline browser utility"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.httrack.com/"
 
diff -r ad29ddfee1c9 -r d5aab818505e hubicfuse/receipt
--- a/hubicfuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hubicfuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,11 @@
 BUILD_DEPENDS="curl-dev fuse2-dev openssl-dev libxml2-dev glib json-c-dev"
 
 compile_rules() {
-	./configure -prefix=/usr $CONFIGURE_ARGS &&
+	./configure \
+		-prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hunspell/receipt
--- a/hunspell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hunspell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/hunspell/hunspell/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext readline-dev"
-SPLIT="hunspell-dev"
+BUILD_DEPENDS="automake libtool gettext-dev readline-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vfi &&
@@ -26,7 +26,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e hydra/receipt
--- a/hydra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hydra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,17 @@
 VERSION="7.3"
 CATEGORY="system-tools"
 SHORT_DESC="THC password cracker for FTP, HTTP, HTTPS, SMB, etc."
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/vanhauser-thc/thc-hydra"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WEB_SITE="https://github.com/vanhauser-thc/thc-hydra"
 WGET_URL="http://freeworld.thc.org/releases/$TARBALL"
 
-DEPENDS="gtk2 openssl xorg-libXdamage apr libssh libmysqlclient \
-libidn libpostgresqlclient libsvn"
 BUILD_DEPENDS="openssl-dev apr-dev gtk2-dev libssh-dev libmysqlclient \
 postgresql-dev subversion-dev libidn-dev mysql-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS
@@ -30,10 +26,10 @@
 	[ -f hydra ]
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/hydra $fs/usr/bin
 	cp -a $src/xhydra $fs/usr/bin
+	DEPENDS="gtk2 openssl xorg-libXdamage apr libssh libmysqlclient \
+	libidn libpostgresqlclient libsvn"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hydrogen/receipt
--- a/hydrogen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hydrogen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,16 +5,16 @@
 COMMIT="1bab373"
 CATEGORY="multimedia"
 SHORT_DESC="Advanced Drum Machine"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.hydrogen-music.org/"
+WEB_SITE="http://hydrogen-music.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/hydrogen-music/hydrogen/archive/${COMMIT:-$VERSION}.tar.gz"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev zlib-dev libarchive-dev libsndfile-dev \
 alsa-lib-dev ladspa-dev liblo-dev jack-dev pulseaudio-dev cppunit-dev doxygen"
-SPLIT="hydrogen-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/man/man1|/share&|' CMakeLists.txt
diff -r ad29ddfee1c9 -r d5aab818505e hydroxygen-iconset/receipt
--- a/hydroxygen-iconset/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hydroxygen-iconset/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,12 @@
 SHORT_DESC="GTK+ port of the KDE4 Oxygen icon theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="CC GPL"
-WEB_SITE="http://deviantdark.deviantart.com/art/hydroxygen-iconset-100826865"
+WEB_SITE="https://www.deviantart.com/deviantdark/art/hydroxygen-iconset-100826865"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://fc04.deviantart.com/fs40/f/2009/019/8/7/hydroxygen_iconset_by_deviantdark.zip"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Source Zip archive contains Tar.Bz2 archive inside
 	echo 'Extract sources'
 	busybox tar -xjf hydroxygen_iconset.tar.bz2 || return 1
@@ -85,8 +83,6 @@
 	echo 'All done! ;-)'
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e hylafax/receipt
--- a/hylafax/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hylafax/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,47 +1,44 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="hylafax"
 VERSION="6.0.6"
 CATEGORY="network"
-SHORT_DESC="enterprise-class system for sending and receiving facsimiles."
+SHORT_DESC="Enterprise-class system for sending and receiving facsimiles"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://www.hylafax.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.hylafax.org/"
 WGET_URL="ftp://ftp.hylafax.org/source/$TARBALL"
 
-DEPENDS="jpeg tiff tiff-apps zlib postfix mgetty ghostscript"
 BUILD_DEPENDS="tiff-dev tiff-apps zlib-dev mgetty ghostscript"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -f defs.org ] && cp defs.org defs
 	[ -f etc/Makefile.org ] && cp etc/Makefile.org etc/Makefile
 	sed  -i -e 's|=/usr/local/|=/usr/|g' configure
 	yes '' | ./configure
 	make
 	cp defs defs.org
-	sed -i  -e "s|= /usr/bin|= $DESTDIR/usr/bin|" \
-		-e "s|= /usr/sbin|= $DESTDIR//usr/sbin|" \
-		-e "s|= /usr/lib|= $DESTDIR/usr/lib|" \
-		-e "s|= /usr/man|= $DESTDIR/usr/man|" \
-		-e "s|= /var/|= $DESTDIR/var/|" \
+	sed \
+		-e "s|= /usr/bin|= $install/usr/bin|" \
+		-e "s|= /usr/sbin|= $install//usr/sbin|" \
+		-e "s|= /usr/lib|= $install/usr/lib|" \
+		-e "s|= /usr/man|= $install/usr/man|" \
+		-e "s|= /var/|= $install/var/|" \
 		-e 's|= uucp|= root|' \
 		-e 's|= bin|= root|' \
-		defs
-	mkdir -p $DESTDIR/usr/lib $DESTDIR/var/spool/hylafax
+		-i defs
+	mkdir -p $install/usr/lib $install/var/spool/hylafax
 	cp etc/Makefile etc/Makefile.org
-	sed -i  -e "s|/etc/init.d|$DESTDIR/etc/init.d|" \
-		-e "s|/etc/config|$DESTDIR/etc/config|" \
+	sed -i  -e "s|/etc/init.d|$install/etc/init.d|" \
+		-e "s|/etc/config|$install/etc/config|" \
 		etc/Makefile
-	mkdir -p $DESTDIR/etc/init.d
-	make DESTDIR=$DESTDIR install
+	mkdir -p $install/etc/init.d
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/sbin $fs/usr
@@ -49,4 +46,5 @@
 	cp -a $install/var $fs
 	rm -rf $install/var/spool/hylafax/etc/templates
 	cp -a $install/etc $fs
+	DEPENDS="jpeg tiff tiff-apps zlib postfix mgetty ghostscript"
 }
diff -r ad29ddfee1c9 -r d5aab818505e hyphen/receipt
--- a/hyphen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/hyphen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,16 +11,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/hunspell/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext perl"
-SPLIT="hyphen-dev"
+BUILD_DEPENDS="automake libtool gettext-dev perl"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install-libLTLIBRARIES &&
-	make DESTDIR=$DESTDIR install-binSCRIPTS     &&
-	make DESTDIR=$DESTDIR install-includeHEADERS
+	make DESTDIR=$install install-libLTLIBRARIES &&
+	make DESTDIR=$install install-binSCRIPTS     &&
+	make DESTDIR=$install install-includeHEADERS
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e i2c-tools/receipt
--- a/i2c-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/i2c-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,26 @@
 PACKAGE="i2c-tools"
 VERSION="3.1.1"
 CATEGORY="system-tools"
-SHORT_DESC="The i2c-tools provide a heterogeneous set of I2C tools for Linux"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Heterogeneous set of I2C tools for Linux"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://i2c.wiki.kernel.org/index.php/I2C_Tools"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://dl.lm-sensors.org/$PACKAGE/releases/$TARBALL" # FIXME
 
-SPLIT="i2c-tools-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	sed -i s"#^prefix	=.*#prefix	= /usr#" Makefile &&
-	make && make DESTDIR=${DESTDIR} install
+	sed -i s"#^prefix	=.*#prefix	= /usr#" Makefile
+
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-		i2c-tools)
-			mkdir -p $fs/usr
-			cp -a $install/usr/bin $fs/usr
-			cp -a $install/usr/sbin $fs/usr
-			;;
-		*-dev)
-			mkdir -p $fs/usr
-			cp -a $install/usr/include $fs/usr
-			;;
+		i2c-tools) copy @std;;
+		*-dev)     copy @dev;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e i3/receipt
--- a/i3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/i3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="i3"
 VERSION="4.5.1"
 CATEGORY="x-window"
-SHORT_DESC="i3 tiling window manager"
-MAINTAINER="ybringler@gmail.com"
+SHORT_DESC="Tiling window manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://i3wm.org/"
 
@@ -12,28 +12,28 @@
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
 BUILD_DEPENDS="make gcc xorg-xcb-proto xorg-libxcb-dev xorg-xcb-util-dev \
-libev-dev flex bison yajl-dev t2 docbook-xml xorg-libXcursor-dev xorg-libX11-dev \
-pcre-dev startup-notification-dev xorg-xcb-util-keysyms-dev xorg-xcb-util-wm-dev pango-dev"
-SPLIT="i3-man"
+libev-dev flex bison yajl-dev t2 docbook-xml xorg-libXcursor-dev \
+xorg-libX11-dev pcre-dev startup-notification-dev xorg-xcb-util-keysyms-dev \
+xorg-xcb-util-wm-dev pango-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	make && make install
+	make &&
+	make install || return 1
+
+	cook_pick_manpages man/*.1
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		i3)
-			cp -a $install/* $fs
+			copy @std
 			DEPENDS="cairo glib libev libpcre pango startup-notification \
 			xorg-libX11 xorg-libXcursor xorg-libxcb xorg-xcb-util \
 			xorg-xcb-util-keysyms xorg-xcb-util-wm yajl   dmenu"
 			;;
-		i3-man)
-			CAT="x-window|man pages"
-			mkdir -p $fs/usr/share/man
-			for i in $src/man/*.man; do
-				cp $i $fs/usr/share/man/raw-${i##*/}
-			done
+		*-dev)
+			copy @dev
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e i3status/receipt
--- a/i3status/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/i3status/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="i3status"
 VERSION="2.7"
 CATEGORY="x-window"
 SHORT_DESC="i3 status bar"
-MAINTAINER="ybringler@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://i3wm.org/i3status"
+WEB_SITE="https://i3wm.org/i3status/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="alsa-lib yajl wireless_tools"
-BUILD_DEPENDS="make gcc alsa-lib-dev dev86 libconfuse wireless_tools-dev yajl-dev"
+BUILD_DEPENDS="make gcc alsa-lib-dev dev86 libconfuse wireless_tools-dev \
+yajl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make install
+compile_rules() {
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="alsa-lib yajl wireless_tools"
 }
diff -r ad29ddfee1c9 -r d5aab818505e i7z/receipt
--- a/i7z/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/i7z/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,24 @@
 PACKAGE="i7z"
 VERSION="0.27.2"
 CATEGORY="misc"
-SHORT_DESC="A better i7 (and now i3, i5) reporting tool for Linux."
+SHORT_DESC="A better i7 (and now i3, i5) reporting tool for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://github.com/ajaiantilal/i7z"
 # WEB_SITE="https://github.com/afontenot/i7z" # newer fork
 # WEB_SITE="https://github.com/DimitryAndric/i7z" # even more newer fork
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://i7z.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="ncurses"
-BUILD_DEPENDS="wget ncurses-dev"
+BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iagno/receipt
--- a/iagno/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iagno/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev librsvg-dev libcanberra-dev gettext-dev \
 itstool"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e iana-etc/receipt
--- a/iana-etc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iana-etc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Data for network services and protocols"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OSL3"
-WEB_SITE="http://freecode.com/projects/iana-etc"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/iana-etc"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/iana-etc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -15,7 +15,8 @@
 BUILD_DEPENDS="gawk"
 
 compile_rules() {
-	make && make DESTDIR=$install install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e iasl/receipt
--- a/iasl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iasl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20100915"
 CATEGORY="development"
 SHORT_DESC="Intel ACPI Source Language compiler"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://acpica.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e iat/receipt
--- a/iat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,42 +1,34 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iat"
 VERSION="0.1.3"
 CATEGORY="utilities"
 SHORT_DESC="iat (Iso9660 Analyzer Tool) converts many types of CD-ROM \
 image file formats and converting them into ISO-9660."
-MAINTAINER="chadi.elahmad@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/iat.berlios/"
+HANDBOOK_URL='http://www.slitaz.org/doc/handbook/utilities.html#iat'
 
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
-WEB_SITE="https://sourceforge.net/projects/iat.berlios/"
 WGET_URL="http://download.berlios.de/iat/$TARBALL" # FIXME
-HANDBOOK_URL='http://www.slitaz.org/doc/handbook/utilities.html#iat'
 
-DEPENDS=""
-BUILD_DEPENDS=""
-TAGS="iso CD convert"
-
-# Rules to configure and make the package.
-# The src files are in a folder simply named iat.
-compile_rules()
-{
+compile_rules() {
+	# The src files are in a folder simply named iat.
 	cd $src/..
-	if test -d $PACKAGE ; then mv -f $PACKAGE $PACKAGE-$VERSION ; fi
+	[ -d $PACKAGE ] && mv -f $PACKAGE $PACKAGE-$VERSION
 
 	cd $src
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		$CONFIGURE_ARGS && \
-	make && \
-	make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="iso CD convert"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ibus-hangul/receipt
--- a/ibus-hangul/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ibus-hangul/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ibus.googlecode.com/files/$TARBALL" # FIXME
 
-BUILD_DEPENDS="intltool gettext perl ibus-dev glib-dev libhangul-dev"
+BUILD_DEPENDS="intltool gettext-dev perl ibus-dev glib-dev libhangul-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -k DESTDIR=$DESTDIR install
+	make -k DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ibus/receipt
--- a/ibus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ibus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 WGET_URL="http://ibus.googlecode.com/files/$TARBALL" # FIXME
 
 BUILD_DEPENDS="gtk2-dev gconf-dev python-dev python-dbus-dev dbus-glib-dev \
-intltool gettext perl iso-codes-dev"
-SPLIT="ibus-dev"
+intltool gettext-dev perl iso-codes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e icecast/receipt
--- a/icecast/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icecast/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,7 @@
 PACKAGE="icecast"
 VERSION="2.3.3"
 CATEGORY="multimedia"
-SHORT_DESC="An opensource alternative to shoutcast that supports mp3, ogg \
-(vorbis/theora) and aac streaming"
+SHORT_DESC="Opensource alternative to shoutcast that supports audio streaming"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.icecast.org/"
@@ -19,8 +18,8 @@
 		--disable-yp \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make -j2 &&
-	make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icedtea6-jdk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.9.9"
 CATEGORY="development"
 SHORT_DESC="A Free Software harness for OpenJDK"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.iced-tea.org/"
 REPOLOGY="icedtea6"
@@ -19,7 +19,7 @@
 xalan-xerces-j gtk2-dev giflib-dev libpng16-dev xorg-dev xorg-libXtst-dev \
 xorg-libXp-dev xorg-dev-proto nss nss-dev jdk6-jaxws jdk6-jaxp jdk6-jaf \
 openjdk-6-src"
-SPLIT="$PACKAGE icedtea6-jre java-jdk java-jre"
+SPLIT="icedtea6-jre java-jdk java-jre"
 
 # Note to icedtea6 updaters,
 # You should check version into receipts:
@@ -36,11 +36,11 @@
 
 compile_rules() {
 	# Limit memory usage
-	ulimit -v $(awk '/MemTotal/ { print int(($2*80)/100) }' < /proc/meminfo)
+	ulimit -v $(awk '/MemTotal/ { print int(($2*80)/100) }' < /proc/meminfo)	#'
 
 	local JVM_PREFIX
 	JVM_PREFIX="/usr/lib/jvm/java-icedtea"
-	
+
 	# NOTE: This build does not seem to work with ECJ 3.5
 	local ECJ_VERSION
 	ECJ_VERSION="3.6"
@@ -48,7 +48,7 @@
 	cd $src
 	mkdir drops
 	sed -i -e 's/mkdir -p drops/true/' -e 's/ jar xf/ fastjar xf/'  Makefile*
-	
+
 	# Check than all sources files are available, or exit.
 	REPO=http://icedtea.classpath.org/download/drops
 	if [ -x /usr/bin/cook ]; then
@@ -77,7 +77,7 @@
 find -name GenerateCurrencyData.java | xargs sed -i 's|throw new RuntimeException("time is|System.err.println("time is|' 2> /dev/null
 find -name CurrencyData.properties | xargs sed -i 's/TR=TRL.*/TR=TRY/' 2> /dev/null
 # Busybox compatibility
-#find -name Sanity.gmk | xargs sed -i 's/--sync -kP/-k/' Makefile 
+#find -name Sanity.gmk | xargs sed -i 's/--sync -kP/-k/' Makefile
 find -name Platform.gmk | xargs sed -i "s@MB_OF_MEMORY *:=.*free.*@MB_OF_MEMORY := $mem@" Makefile
 EOT
 	sed -i  -e 's|touch .*|&\n\tsh slitaz.sh|' \
@@ -102,16 +102,16 @@
 		--with-rhino=/usr/share/java/js.jar \
 		--with-abs-install-dir=$JVM_PREFIX \
 		$CONFIGURE_ARGS || return 1
-	make -j 1 ARCH_PREFIX= 2>&1 | sed '/java_lang_ClassLoaderr.NativeLibrary/d'
+	make -j1 ARCH_PREFIX= 2>&1 | sed '/java_lang_ClassLoaderr.NativeLibrary/d'
 	} 2>&1 | sed 's/No such file/no such file/'
-	
+
 	echo "Copying needed files to install dir..."
-	rm -rf $DESTDIR
+	rm -rf $install
 
 	local JVM_BUILDDIR
 	JVM_BUILDDIR=$src/openjdk.build/j2sdk-image
 	local JVM_DESTDIR
-	JVM_DESTDIR=${DESTDIR}$JVM_PREFIX
+	JVM_DESTDIR=$install$JVM_PREFIX
 	echo "OpenJDK build     : source/openjdk.build/j2sdk-image"
 	echo "OpenJDK install   : install/$JVM_PREFIX"
 
@@ -124,26 +124,26 @@
 	mkdir -p $JVM_DESTDIR/jre
 	cp -a $JVM_BUILDDIR/jre/bin $JVM_DESTDIR/jre
 	cp -a $JVM_BUILDDIR/jre/lib $JVM_DESTDIR/jre
-	
+
 	# Delete duplicated executables from the JDK bin
 	echo "Deleting duplicated files..."
-	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin) ; do
+	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin); do
 		rm -f $JVM_DESTDIR/bin/$jbin
 	done
 
 	# Create symlinks for JDK binaries
 	echo "Creating symlinks for JDK binaries..."
-	mkdir -p $DESTDIR/usr/jdk-bin
-	for jbin in $(ls -1 $JVM_DESTDIR/bin) ; do
-		ln -s $JVM_PREFIX/bin/$jbin $DESTDIR/usr/jdk-bin/$jbin
+	mkdir -p $install/usr/jdk-bin
+	for jbin in $(ls -1 $JVM_DESTDIR/bin); do
+		ln -s $JVM_PREFIX/bin/$jbin $install/usr/jdk-bin/$jbin
 	done
-	
+
 	# Create symlinks for JRE binaries
 	echo "Creating symlinks for JRE binaries..."
-	mkdir -p $DESTDIR/usr/jre-bin
-	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin) ; do
+	mkdir -p $install/usr/jre-bin
+	for jbin in $(ls -1 $JVM_DESTDIR/jre/bin); do
 		ln -s $JVM_PREFIX/jre/bin/$jbin $JVM_DESTDIR/bin/$jbin
-		ln -s $JVM_PREFIX/jre/bin/$jbin $DESTDIR/usr/jre-bin
+		ln -s $JVM_PREFIX/jre/bin/$jbin $install/usr/jre-bin
 	done
 	if [ ! -x /usr/bin/cook ]; then
 		report close-bloc
diff -r ad29ddfee1c9 -r d5aab818505e icewm-xdgmenu/receipt
--- a/icewm-xdgmenu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icewm-xdgmenu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,31 +7,29 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20150421203203/http://bkhome.org/blog/?viewDetailed=02680"
+
 SOURCE="xdg_puppy-0.7.6-9.tar.bz2"
 TARBALL=$SOURCE
 WGET_URL="http://distro.ibiblio.org/puppylinux/sources/x/$TARBALL"
 
-DEPENDS="gnome-menus slitaz-menus icewm"
 BUILD_DEPENDS="gnome-menus gnome-menus-dev glib-dev xorg-libXpm xorg-libXext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/$PACKAGE
 	sed -i 's|root0/.|usr/share/|g'	Makefile
-	sed -i '/tar -/d' Makefile	&& make
+	sed -i '/tar -/d' Makefile
+
+	make &&
 	make PKGNAME=$install BINDIR=/usr/bin install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	cp -f $stuff/* $fs/usr/share/icewm
+	DEPENDS="gnome-menus slitaz-menus icewm"
 }
 
-post_install()
-{
+post_install() {
 	ico="/usr/share/icons/SliTaz"
 	IconPath="$ico/apps/22:/usr/share/pixmaps:$ico/categories/22:$ico/devices/22:$ico/mimetypes/32"
 	pref="$1/usr/share/icewm/preferences"
diff -r ad29ddfee1c9 -r d5aab818505e icewm/receipt
--- a/icewm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icewm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/bbidulock/icewm/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-mkfontdir gettext fontconfig-dev xorg-libXext-dev \
+BUILD_DEPENDS="xorg-mkfontdir gettext-dev fontconfig-dev xorg-libXext-dev \
 xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \
 xorg-libXft-dev alsa-lib-dev libsndfile-dev xorg-libXinerama-dev fribidi-dev \
 gdk-pixbuf-dev flac-dev"
@@ -23,7 +23,8 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make install &&
+	make install || return 1
+
 	rm $install/usr/share/xsessions/icewm.desktop
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e icinga/receipt
--- a/icinga/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icinga/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.2.1"
 CATEGORY="system-tools"
 SHORT_DESC="Open Source host, service and network monitoring program"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.icinga.org"
+WEB_SITE="https://icinga.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -30,8 +30,8 @@
 		--localstatedir=/var/log/icinga \
 		--with-mail=/usr/bin/mailx \
 		$CONFIGURE_ARGS &&
-	make all && \
-	make DESTDIR=$DESTDIR \
+	make all &&
+	make DESTDIR=$install \
 		install \
 		install-commandmode \
 		install-config \
diff -r ad29ddfee1c9 -r d5aab818505e icmpshell/receipt
--- a/icmpshell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icmpshell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	make -j 1 linux || return 1
+	make -j1 linux || return 1
 
 	install -Dm755 $src/ish  $install/usr/sbin/ish
 	install -Dm755 $src/ishd $install/usr/sbin/ishd
diff -r ad29ddfee1c9 -r d5aab818505e icon-naming-utils/receipt
--- a/icon-naming-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icon-naming-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.8.90"
 CATEGORY="development"
 SHORT_DESC="Perl script used for desktop icon compatibility"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://tango.freedesktop.org/"
+WEB_SITE="http://tango.freedesktop.org/Tango_Desktop_Project"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 #WGET_URL="http://tango.freedesktop.org/releases/$TARBALL"
@@ -15,7 +15,9 @@
 BUILD_DEPENDS="perl perl-xml-simple"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e icoutils/receipt
--- a/icoutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icoutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="icoutils"
 VERSION="0.30.0"
 CATEGORY="misc"
-SHORT_DESC="Microsoft Windows icon and cursor files convertion tools."
+SHORT_DESC="Microsoft Windows icon and cursor files convertion tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.nongnu.org/icoutils/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.nongnu.org/icoutils"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
-DEPENDS="libpng16"
-BUILD_DEPENDS="libpng16-dev libpng16"
+BUILD_DEPENDS="libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --mandir=/usr/share/man \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16"
 }
diff -r ad29ddfee1c9 -r d5aab818505e icu/receipt
--- a/icu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/icu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="60.2"
 CATEGORY="system-tools"
 SHORT_DESC="International Components for Unicode"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://site.icu-project.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/icu.html"
@@ -19,7 +19,8 @@
 WGET_URL="svn|http://source.icu-project.org/repos/icu/tags/release-${VERSION//./-}/"
 
 BUILD_DEPENDS="subversion"
-SPLIT="libicu icu icu-dev libicu-full:full icu-full:full icu-full-dev:full"
+SPLIT="libicu $PACKAGE $PACKAGE-dev \
+libicu-full:full $PACKAGE-full:full $PACKAGE-full-dev:full"
 
 compile_rules() {
 #	fix math
@@ -31,7 +32,8 @@
 	fi
 
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e id3lib/receipt
--- a/id3lib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/id3lib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.8.3"
 CATEGORY="multimedia"
 SHORT_DESC="Library to manipulate ID3v1 and ID3v2 tags"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://id3lib.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="patch libtool zlib-dev"
-SPLIT="id3lib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	libtoolize -fc &&
diff -r ad29ddfee1c9 -r d5aab818505e idesk/receipt
--- a/idesk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/idesk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.7.5"
 CATEGORY="x-window"
 SHORT_DESC="IDesk gives users icons on their desktop"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://idesk.sourceforge.net/"
+WEB_SITE="http://idesk.sourceforge.net/html/index.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Custom default.lnk with Home icon
 	install -Dm644 $stuff/default.lnk $install/usr/share/idesk/default.lnk
diff -r ad29ddfee1c9 -r d5aab818505e iftop/receipt
--- a/iftop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iftop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,29 @@
 PACKAGE="iftop"
 VERSION="0.17"
 CATEGORY="system-tools"
-SHORT_DESC="Bandwidth usage on an interface."
+SHORT_DESC="Bandwidth usage on an interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.ex-parrot.com/~pdw/iftop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ex-parrot.com/~pdw/iftop/"
 WGET_URL="${WEB_SITE}download/$TARBALL"
-TAGS="network monitor usage"
 
 BUILD_DEPENDS="libpcap-dev ncurses-dev"
-DEPENDS="libpcap ncurses"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS
-	make
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="libpcap ncurses"
+	TAGS="network monitor usage"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iftopcolor/receipt
--- a/iftopcolor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iftopcolor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iftopcolor"
 VERSION="20140730"
 CATEGORY="network"
-SHORT_DESC="Added color bars to iftop."
+SHORT_DESC="Added color bars to iftop"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/srix/iftopcolor"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/srix/iftopcolor"
 WGET_URL="git|git://github.com/srix/iftopcolor"
 
-DEPENDS="libpcap ncurses"
 BUILD_DEPENDS="libpcap-dev ncurses-dev git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr
-	$CONFIGURE_ARGS
-	make
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpcap ncurses"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e igmpproxy/receipt
--- a/igmpproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/igmpproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Simple forwarding of Multicast traffic between networks"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://igmpproxy.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/igmpproxy/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -14,7 +14,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ii/receipt
--- a/ii/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ii/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,21 @@
 PACKAGE="ii"
 VERSION="1.6"
 CATEGORY="network"
-SHORT_DESC="Minimalist IRC client."
+SHORT_DESC="Minimalist IRC client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://tools.suckless.org/ii/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tools.suckless.org/ii"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' config.mk
+
 	make clean &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e ijs/receipt
--- a/ijs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ijs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://www.openprinting.org/download/ijs/download/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="ijs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e iksemel/receipt
--- a/iksemel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iksemel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://jabberstudio.rediris.es/$PACKAGE/$TARBALL"
 
-SPLIT="iksemel-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ilmbase/receipt
--- a/ilmbase/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ilmbase/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,15 +3,15 @@
 PACKAGE="ilmbase"
 VERSION="2.2.0"
 CATEGORY="x-window"
-SHORT_DESC="IlmThread is a thread abstraction library for use with OpenEXR"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Thread abstraction library for use with OpenEXR"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.openexr.org"
+WEB_SITE="http://www.openexr.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://savannah.nongnu.org/download/openexr/$TARBALL"
 
-SPLIT="ilmbase-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e imagemagick/receipt
--- a/imagemagick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/imagemagick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.0.6-10"
 CATEGORY="graphics"
 SHORT_DESC="ImageMagick - convert, edit, and compose images"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://www.imagemagick.org/script/index.php"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/imagemagick.html"
@@ -17,7 +17,7 @@
 libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
 libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
 openexr-dev libgsf-dev libcroco-dev" # graphviz-dev
-SPLIT="perl-image-magick imagemagick imagemagick-dev"
+SPLIT="perl-image-magick $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -30,7 +30,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod -R u+w $install/usr/lib/perl5/
 }
diff -r ad29ddfee1c9 -r d5aab818505e imagemagick6/receipt
--- a/imagemagick6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/imagemagick6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.9.9-9"
 CATEGORY="graphics"
 SHORT_DESC="ImageMagick (v.6) - convert, edit, and compose images"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://www.imagemagick.org/script/index.php"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/imagemagick6.html"
@@ -18,7 +18,7 @@
 libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
 libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
 openexr-dev libgsf-dev" # graphviz-dev
-SPLIT="imagemagick6-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -28,7 +28,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install-libs-only
+	make DESTDIR=$install install-libs-only
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e imagination/receipt
--- a/imagination/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/imagination/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0"
 CATEGORY="graphics"
 SHORT_DESC="Lightweight and simple GTK+ DVD slideshow maker"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://imagination.sourceforge.net/"
 
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e imap-upload/receipt
--- a/imap-upload/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/imap-upload/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,18 @@
 PACKAGE="imap-upload"
 VERSION="1.2"
 CATEGORY="network"
-SHORT_DESC="Tool for uploading a local mbox file to IMAP4 server."
+SHORT_DESC="Upload local mbox file to IMAP4 server"
 MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.zip"
 LICENSE="MIT"
 WEB_SITE="http://imap-upload.sourceforge.net/"
+
+TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python"
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	echo -e "#!/usr/bin/env python\n" | cat - $src/imap_upload.py \
 		> $fs/usr/bin/imap_upload
 	chmod 755 $fs/usr/bin/imap_upload
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e imlib2/receipt
--- a/imlib2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/imlib2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.1"
 CATEGORY="graphics"
 SHORT_DESC="Imlib2 graphic library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL LGPL2"
 WEB_SITE="https://sourceforge.net/projects/enlightenment/"
 
@@ -13,10 +13,7 @@
 
 BUILD_DEPENDS="freetype-dev xorg-libX11-dev xorg-libICE-dev libjpeg-turbo-dev \
 tiff-dev giflib-dev libid3tag-dev xorg-libXext-dev xz-dev"
-SPLIT="imlib2-test imlib2-dev"
-
-# ARM: jpeg-dev must be installed in build chroot and libjpeg.la must
-# be modified manually
+SPLIT="$PACKAGE-test $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e incron/receipt
--- a/incron/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/incron/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="incron"
 VERSION="0.5.10"
 CATEGORY="base-system"
-SHORT_DESC="The inotify cron handles filesystem events."
+SHORT_DESC="The inotify cron handles filesystem events"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://inotify.aiken.cz/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://inotify.aiken.cz/"
 WGET_URL="${WEB_SITE}download/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/incron.d"
 
-DEPENDS="gcc-lib-base"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|fcntl.h>|&\n#include <unistd.h>|' icd-main.cpp
 	sed -i 's|/usr/local|/usr|' Makefile
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/etc $fs/
 	cp -a $install/var $fs/
+	CONFIG_FILES="/etc/incron.d"
 }
diff -r ad29ddfee1c9 -r d5aab818505e indent/receipt
--- a/indent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/indent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext texi2html texinfo"
+BUILD_DEPENDS="gettext-dev texi2html texinfo"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e inetutils/receipt
--- a/inetutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/inetutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,8 @@
 		--disable-rsh \
 		--disable-servers \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install || return 1
 
 	mkdir -p $install/bin $install/sbin
 	for i in hostname ping ping6 traceroute; do
diff -r ad29ddfee1c9 -r d5aab818505e iniparser/receipt
--- a/iniparser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iniparser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Free stand-alone ini file parsing library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://ndevilla.free.fr/iniparser/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/ndevilla/iniparser/archive/v$VERSION.tar.gz"
 
-SPLIT="iniparser-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make || return 1
diff -r ad29ddfee1c9 -r d5aab818505e inkscape/receipt
--- a/inkscape/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/inkscape/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.92.2"
 CATEGORY="graphics"
 SHORT_DESC="Professional quality vector graphics software"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://inkscape.org/en/"
+WEB_SITE="https://inkscape.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/xsoft/inkscape.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="cmake gtest pango-dev fontconfig-dev glib-dev gsl-dev \
 gnome-vfs-dev lcms2-dev gc-dev poppler-dev libwpg-dev libvisio-dev libcdr-dev \
 libwpd-dev popt-dev potrace-dev gtkmm-dev gtk2-dev gtkspell-dev boost-dev \
-aspell-dev libxslt-dev imagemagick6-dev gettext dbus-dev"
+aspell-dev libxslt-dev imagemagick6-dev gettext-dev dbus-dev"
 COOKOPTS="!svgz" # don't process svg or they will be broken
 SPLIT="$PACKAGE-examples $PACKAGE-tutorials $PACKAGE"
 
@@ -28,7 +28,8 @@
 		-DWITH_DBUS=ON \
 		.. &&
 	make &&
-	make install &&
+	make install || return 1
+
 	rm $install/usr/lib/inkscape/lib*_LIB.a
 
 #		-DCMAKE_BUILD_TYPE=Release \
diff -r ad29ddfee1c9 -r d5aab818505e inotify-tools/receipt
--- a/inotify-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/inotify-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.14"
 CATEGORY="system-tools"
 SHORT_DESC="Set of programs providing a simple interface to inotify"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://github.com/rvoicilas/inotify-tools/wiki"
 
diff -r ad29ddfee1c9 -r d5aab818505e input-utils/receipt
--- a/input-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/input-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20081014-101501"
 CATEGORY="system-tools"
 SHORT_DESC="Small collection of linux input layer tools"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dl.bytesex.org/cvs-snapshots/"
 
@@ -21,7 +21,8 @@
 	esac
 
 	export prefix CFLAGS
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e intel-microcode/receipt
--- a/intel-microcode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/intel-microcode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 TARBALL_MD5="873f2bdd7c0edf317f416f54fee74b42"
 
 BUILD_DEPENDS="iucode-tool"
-SPLIT="intel-microcode-initrd"
+SPLIT="$PACKAGE-initrd"
 
 compile_rules() {
 	mkdir -p $install/lib/firmware/
@@ -55,8 +55,7 @@
 	fi
 }
 post_install_intel_microcode_initrd() {
-	if [ -n "$quiet" ]; then
-		cat <<EOT
+	[ -n "$quiet" ] || cat <<EOT
 
 	.------------------------------------------------------------------.
 	| In order to update the Intel CPU microcode on boot, add the file |
@@ -65,5 +64,4 @@
 	'------------------------------------------------------------------'
 
 EOT
-	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e intel2gas/receipt
--- a/intel2gas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/intel2gas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="intel2gas"
 VERSION="1.3.3"
 CATEGORY="development"
-SHORT_DESC="Convert assembler source file for NASM/MASM/TASM to GAS."
+SHORT_DESC="Convert assembler source file for NASM/MASM/TASM to GAS"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -12,23 +12,20 @@
 
 DEPENDS="gcc-lib-base"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/strchr(str/strchr((char *) str/' strhandle.cc
 	sed -i 's/strstr(source/strstr((char *) source/' intel2gas.cc
 	sed -i 's/prefix = @/prefix = ${DESTDIR}@/' Makefile.in
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e intltool/receipt
--- a/intltool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/intltool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.51.0"
 CATEGORY="development"
 SHORT_DESC="Internationalization tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://freedesktop.org/wiki/Software/intltool/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/intltool.html"
@@ -17,13 +17,15 @@
 compile_rules() {
 	sed -i 's:\\\${:\\\$\\{:' intltool-update.in
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	cook_pick_docs doc/I18N-HOWTO
 }
 
 genpkg_rules() {
 	copy @std @dev
-	DEPENDS="perl-xml-parser gettext"
+	DEPENDS="perl-xml-parser gettext-dev"
 	TAGS="LFS"
 }
diff -r ad29ddfee1c9 -r d5aab818505e inxi/receipt
--- a/inxi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/inxi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,12 @@
 SHORT_DESC="Full featured CLI system information tool"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://smxi.org/docs/inxi.htm"
+WEB_SITE="https://smxi.org/docs/inxi.htm"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/smxi/inxi/archive/$COMMIT.tar.gz"
 
-DEPENDS="bash gawk sed coreutils-disk pciutils procps"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/man/man1
 	install -m0755 $src/inxi $fs/usr/bin
 	install -m0644 $src/inxi.1.gz $fs/usr/share/man/man1
@@ -40,4 +37,5 @@
 	sed -i 's|strings:binutils|strings:busybox|' $inxi
 	sed -i 's|runlevel:sysvinit|runlevel:|' $inxi # no package
 	sed -i 's|print_lines_basic "0" "" "Debian/Ubuntu:.*$|print_lines_basic "0" "" "SliTaz:^$package_deb"|' $inxi
+	DEPENDS="bash gawk sed coreutils-disk pciutils procps"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iotop/receipt
--- a/iotop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iotop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="iotop"
 VERSION="0.6"
 CATEGORY="system-tools"
-SHORT_DESC="Show of behalf of which process is the I/O going on."
+SHORT_DESC="Show of behalf of which process is the I/O going on"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://guichaz.free.fr/iotop"
+WEB_SITE="http://guichaz.free.fr/iotop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/files/$TARBALL"
+WGET_URL="${WEB_SITE}files/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ipaex-fonts/receipt
--- a/ipaex-fonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ipaex-fonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,14 @@
 SHORT_DESC="IPAexMincho and IPAexGothic (Sans serif) fonts"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
-WEB_SITE="http://ipafont.ipa.go.jp/"
+WEB_SITE="https://ipafont.ipa.go.jp/"
 REPOLOGY="fonts:ipa"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont${VERSION/./}.zip"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cd $src
+genpkg_rules() {
+	cd $src # keep it
 
 	mkdir -p $fs/usr/share/fonts/TTF/ipaex
 	cp *.ttf $fs/usr/share/fonts/TTF/ipaex
diff -r ad29ddfee1c9 -r d5aab818505e ipcalc/receipt
--- a/ipcalc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ipcalc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,22 +3,19 @@
 PACKAGE="ipcalc"
 VERSION="0.41"
 CATEGORY="network"
-SHORT_DESC="IP Calculator."
+SHORT_DESC="IP Calculator"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://jodies.de/ipcalc"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://jodies.de/ipcalc-archive/$TARBALL"
 
-DEPENDS="perl"
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/var/www/cgi-bin/ipcalc $fs/usr/share/images/ipcalc
 	cp -a $src/ipcalc $fs/usr/bin
 	cp -a $src/ipcalc.cgi $fs/var/www/cgi-bin/ipcalc
 	cp -a $src/ipcalc.gif $fs/usr/share/images/ipcalc
 	cp -a $src/ipcalculator.png $fs/usr/share/images/ipcalc
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iperf/receipt
--- a/iperf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iperf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Measure network performance"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://iperf.fr/"
+WEB_SITE="https://iperf.fr/"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="${WEB_SITE}download/${PACKAGE}_$VERSION/$TARBALL"
@@ -15,7 +15,7 @@
 compile_rules() {
 	./configure prefix=/usr &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ipkungfu/receipt
--- a/ipkungfu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ipkungfu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ipmitool/receipt
--- a/ipmitool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ipmitool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,7 +9,7 @@
 WEB_SITE="https://sourceforge.net/projects/ipmitool/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev ncurses-dev zlib-dev readline-dev"
 
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e iproute2/receipt
--- a/iproute2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iproute2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Utilites for networking and traffic control"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+WEB_SITE="https://wiki.linuxfoundation.org/networking/iproute2"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/iproute2.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
@@ -15,10 +15,15 @@
 BUILD_DEPENDS="bison flex iptables-dev db-dev libmnl-dev elfutils-dev"
 
 compile_rules() {
-	./configure /usr/include $CONFIGURE_ARGS &&
+	./configure \
+		/usr/include \
+		$CONFIGURE_ARGS &&
 	sed -i 's|tc-skbmod\.8||' $src/man/man8/Makefile &&
 	make &&
-	make DOCDIR=/usr/share/doc/$PACKAGE-$VERSION DESTDIR=$DESTDIR install
+	make \
+		DOCDIR=/usr/share/doc/$PACKAGE-$VERSION \
+		DESTDIR=$install \
+		install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e iptables-template/receipt
--- a/iptables-template/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iptables-template/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,17 @@
 PACKAGE="iptables-template"
 VERSION="20140704"
 CATEGORY="system-tools"
-SHORT_DESC="Template for iptables setup."
+SHORT_DESC="Template for iptables setup"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://gist.github.com/jirutka/3742890"
 EXTRA_SOURCE_FILES="rules-both.iptables rules-ipv4.iptables rules-ipv6.ip6tables"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/iptables
-	while read dir file ; do
+	while read dir file; do
 		[ -s "$SRC/$file" ] ||
-			wget --no-check-certificate -P $SRC \
-				$WEB_SITE/raw/$dir/$file
+			wget --no-check-certificate -P $SRC $WEB_SITE/raw/$dir/$file
 		cp $SRC/$file $install/usr/share/iptables/
 	done <<EOT
 c025b0b8c58af49aa9644982c459314c9adba157 rules-both.iptables
@@ -25,8 +22,6 @@
 EOT
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e iptables/receipt
--- a/iptables/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iptables/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 EXTRAVERSION="_$kvers"
 CATEGORY="security"
 SHORT_DESC="Packet filtering framework (Firewall)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/iptables/"
+WEB_SITE="https://netfilter.org/projects/iptables/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/iptables.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -15,7 +15,7 @@
 TARBALL_SHA1="b2592490ca7a6c2cd0f069e167a4337c86acdf91"
 
 BUILD_DEPENDS="linux-module-headers libmnl-dev libnftnl-dev"
-SPLIT="iptables-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Set the right Kernel path to compile.
diff -r ad29ddfee1c9 -r d5aab818505e iptraf-ng/receipt
--- a/iptraf-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iptraf-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="iptraf-ng"
 VERSION="1.1.4"
 CATEGORY="network"
-SHORT_DESC="IP Network Monitoring Software."
+SHORT_DESC="IP Network Monitoring Software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://pagure.io/iptraf-ng"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://fedorahosted.org/iptraf-ng/"
-WGET_URL="https://fedorahosted.org/releases/i/p/$PACKAGE/$TARBALL"
-CONFIG_FILES="/var/lib/iptraf-ng/iptraf.cfg"
-PROVIDE="iptraf"
+WGET_URL="https://fedorahosted.org/releases/i/p/$PACKAGE/$TARBALL" # FIXME
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/log/iptraf-ng
 	cp -a $install/sbin $fs
+	DEPENDS="ncurses"
+	PROVIDE="iptraf"
+	CONFIG_FILES="/var/lib/iptraf-ng/iptraf.cfg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iptraf/receipt
--- a/iptraf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iptraf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="IP Network Monitoring Software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.seul.org/"
+WEB_SITE="http://iptraf.seul.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://iptraf.seul.org/pub/$PACKAGE/$TARBALL"
@@ -15,13 +15,13 @@
 
 compile_rules() {
 	cd $src/src
-	mkdir -p $DESTDIR/usr/bin 2> /dev/null
+	mkdir -p $install/usr/bin 2> /dev/null
 	sed -i 's/ARPHRD_PPP:$/& case ARPHRD_NONE:/' packet.c
 	sed -i 's|/local/|/|' Makefile
 
 	make clean &&
 	make &&
-	cp rvnamed rawtime iptraf $DESTDIR/usr/bin
+	cp rvnamed rawtime iptraf $install/usr/bin
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e iptstate/receipt
--- a/iptstate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iptstate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,7 @@
 PACKAGE="iptstate"
 VERSION="2.2.6"
 CATEGORY="network"
-SHORT_DESC="IPTState is a top-like interface to your netfilter \
-connection-tracking table"
+SHORT_DESC="Top-like interface to netfilter connection-tracking table"
 MAINTAINER="paul@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="https://www.phildev.net/iptstate/"
diff -r ad29ddfee1c9 -r d5aab818505e ipxe/receipt
--- a/ipxe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ipxe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GITHUB/ipxe/ipxe/tarball/$COMMIT"
 
 BUILD_DEPENDS="perl xz-dev"
-SPLIT="ipxe-pxe"
+SPLIT="$PACKAGE-pxe"
 
 compile_rules() {
 	cd $src/src
diff -r ad29ddfee1c9 -r d5aab818505e iron-linux/receipt
--- a/iron-linux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iron-linux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="iron-linux"
 VERSION="48.2550.0"
 CATEGORY="network"
-SHORT_DESC="A secure web browser based on Chromium."
+SHORT_DESC="A secure web browser based on Chromium"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -11,33 +11,24 @@
 WGET_URL="https://www.srware.net/downloads/$PACKAGE.tar.gz"
 TAGS="chromium web-browser"
 
-DEPENDS="bash nss libfirefox gconf libcups libjpeg62 libpng12 libffi x264" # may need updating?
+DEPENDS="bash nss libfirefox gconf libcups libjpeg6b libpng12 libffi x264" # may need updating?
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$PACKAGE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/share/pixmaps
 	cp -a $install/$PACKAGE $fs/usr/lib
 	cp -a $fs/usr/lib/$PACKAGE/product_logo_48.png \
 		$fs/usr/share/pixmaps/iron.png
 }
 
-# Create a link to /usr/bin/iron.
-post_install()
-{
+post_install() {
 	ln -s /usr/lib/iron-linux/iron "$1/usr/bin/iron"
 }
 
-# Remove link.
-post_remove()
-{
+post_remove() {
 	rm "$1/usr/bin/iron"
 }
-	
diff -r ad29ddfee1c9 -r d5aab818505e irrlicht/receipt
--- a/irrlicht/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/irrlicht/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,11 +12,11 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev mesa-dev"
-SPLIT="irrlicht-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd $src/source/Irrlicht
-	sed -i "s|^INSTALL_DIR.*|INSTALL_DIR = $DESTDIR/usr/lib|" Makefile
+	sed -i "s|^INSTALL_DIR.*|INSTALL_DIR = $install/usr/lib|" Makefile
 	make sharedlib &&
 	make &&
 	make install
@@ -25,14 +25,11 @@
 genpkg_rules() {
 	case $PACKAGE in
 		irrlicht)
-			mkdir -p $fs/usr
-			cp -a $install/usr/lib $fs/usr
+			copy @std
 			DEPENDS="mesa gcc-lib-base xorg-libxcb xorg-libXfixes"
 			;;
 		*-dev)
-			mkdir -p $fs/usr
-			cp -a $install/usr/include $fs/usr
-			DEPENDS="irrlicht"
+			copy @dev
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e irssi-scripts/receipt
--- a/irssi-scripts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/irssi-scripts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="latest"
 CATEGORY="network"
 SHORT_DESC="Perl scripts for Irssi IRC client"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 BSD PublicDomain"
 WEB_SITE="https://scripts.irssi.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e irssi/receipt
--- a/irssi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/irssi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.1"
 CATEGORY="network"
 SHORT_DESC="Lightweight console IRC client"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://irssi.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/irssi/irssi/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="glib-dev openssl-dev ncurses-dev perl-dev"
-SPLIT="irssi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	find $install -type f -exec chmod u+w '{}' \; # for Perl files
 }
diff -r ad29ddfee1c9 -r d5aab818505e isapnptools/receipt
--- a/isapnptools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/isapnptools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="ftp://metalab.unc.edu/pub/Linux/system/hardware/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="isapnptools-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e iso-codes/receipt
--- a/iso-codes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iso-codes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-upstream-$VERSION.tar.bz2"
 WGET_URL="https://salsa.debian.org/debian/iso-codes/-/archive/upstream/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext python3"
-SPLIT="iso-codes-dev"
+BUILD_DEPENDS="gettext-dev python3"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e isomaster/receipt
--- a/isomaster/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/isomaster/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.3.14"
 CATEGORY="utilities"
 SHORT_DESC="Graphical CD image (ISO) editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://littlesvr.ca/isomaster/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://littlesvr.ca/isomaster/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk2-dev iniparser-dev"
+BUILD_DEPENDS="gettext-dev gtk2-dev iniparser-dev"
 
 compile_rules() {
 	rm -r iniparser-4.1/
diff -r ad29ddfee1c9 -r d5aab818505e isync/receipt
--- a/isync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/isync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,25 +6,26 @@
 SHORT_DESC="IMAP and MailDir mailbox synchronizer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://isync.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://isync.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="email imap"
 
-DEPENDS="db openssl"
 BUILD_DEPENDS="db-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -lpthread"
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="db openssl"
+	TAGS="email imap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e itaka/receipt
--- a/itaka/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/itaka/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.2"
 CATEGORY="network"
 SHORT_DESC="Itaka on-demand screenshot server. Start server and let client connect via http"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20140701101226/http://itaka.jardinpresente.com.ar/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e iucode-tool/receipt
--- a/iucode-tool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iucode-tool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,5 +22,4 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS=""
 }
diff -r ad29ddfee1c9 -r d5aab818505e ivman/receipt
--- a/ivman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ivman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,18 +6,18 @@
 SHORT_DESC="Generic handler for HAL events"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 QPL"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="http://ivman.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="$DEPENDS hal-dev dbus-dev glib-dev libxml2-dev dbus-glib-dev"
+BUILD_DEPENDS="hal-dev dbus-dev glib-dev libxml2-dev dbus-glib-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp $stuff/*.xml $install/etc/ivman/
 	sed -i 's|bash|sh|' $install/usr/bin/ivman-launch
diff -r ad29ddfee1c9 -r d5aab818505e iw/receipt
--- a/iw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,24 @@
 PACKAGE="iw"
 VERSION="3.14"
 CATEGORY="network"
-SHORT_DESC="Wireless configuration tool."
+SHORT_DESC="Wireless configuration tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://wireless.kernel.org/en/users/Documentation/iw"
 WGET_URL="https://www.kernel.org/pub/software/network/iw/$TARBALL"
-TAGS="wireless"
 
-DEPENDS="libnl"
 BUILD_DEPENDS="libnl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{	
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="libnl"
+	TAGS="wireless"
 }
diff -r ad29ddfee1c9 -r d5aab818505e iwatch/receipt
--- a/iwatch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/iwatch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,18 +3,17 @@
 PACKAGE="iwatch"
 VERSION="0.2.2"
 CATEGORY="base-system"
-SHORT_DESC="Realtime filesystem monitor."
+SHORT_DESC="Realtime filesystem monitor"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://iwatch.sourceforge.net/index.html"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://iwatch.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="perl-linux-inotify2 perl-event perl-mail-sendmail perl-xml-simple"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/iwatch $fs/usr/bin
+	DEPENDS="perl-linux-inotify2 perl-event perl-mail-sendmail perl-xml-simple"
 }
diff -r ad29ddfee1c9 -r d5aab818505e jabberd2/receipt
--- a/jabberd2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jabberd2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -24,7 +24,7 @@
 		--enable-sqlite \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e jack/receipt
--- a/jack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="automake libtool \
 db-dev libsndfile-dev libsamplerate-dev alsa-lib-dev readline-dev doxygen"
-SPLIT="jack-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e jack2/receipt
--- a/jack2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jack2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="patch python libsamplerate-dev alsa-lib-dev dbus-dev expat-dev \
 libsndfile-dev readline-dev opus-dev doxygen"
-SPLIT="jack2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./waf configure \
diff -r ad29ddfee1c9 -r d5aab818505e jansson/receipt
--- a/jansson/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jansson/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.11"
 CATEGORY="x-window"
 SHORT_DESC="C library for encoding, decoding and manipulating JSON data"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.digip.org/jansson/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.digip.org/jansson/releases/$TARBALL"
 
-SPLIT="jansson-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e japanes-theme/receipt
--- a/japanes-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/japanes-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,12 @@
 SHORT_DESC="Japanes Openbox and GTK2 Theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://holkfoor.deviantart.com/art/Japanes-Openbox-and-GTK2-Theme-382947891"
+WEB_SITE="https://www.deviantart.com/holkfoor/art/Japanes-Openbox-and-GTK2-Theme-382947891"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.dropbox.com/s/2ronvzzogtdlmbt/Japanes_GTK2_and_Openbox.tar.bz2"
-TAGS="holkfoor openbox"
 
-DEPENDS="gtk-clearlooks openbox"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/themes
 	cp -a $src/Japanes $install/usr/share/themes
 
@@ -24,14 +20,13 @@
 		s|^.*progressbarstyle|#&|' $install/usr/share/themes/Japanes/gtk-2.0/gtkrc
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk-clearlooks openbox"
+	TAGS="holkfoor openbox"
 }
 
-post_install()
-{
+post_install() {
 	# Set GTK+ Theme
 	for i in $1/etc/xdg/lxsession/*/desktop.conf \
 		$1/home/*/.config/lxsession/*/desktop.conf; do
diff -r ad29ddfee1c9 -r d5aab818505e jasper/receipt
--- a/jasper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jasper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.14"
 CATEGORY="graphics"
 SHORT_DESC="Implementation of JPEG-2000 codec"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.ece.uvic.ca/~frodo/jasper/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/jasper.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.ece.uvic.ca/~frodo/jasper/software/$TARBALL"
 
 BUILD_DEPENDS="cmake libjpeg-turbo-dev"
-SPLIT="jasper-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e jbig2dec/receipt
--- a/jbig2dec/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jbig2dec/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.11"
 CATEGORY="development"
 SHORT_DESC="Decoder implementation of the JBIG2 image compressiong format"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://sourceforge.net/projects/jbig2dec/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev"
-SPLIT="jbig2dec-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e jbigkit/receipt
--- a/jbigkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jbigkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 high-resolution images"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
+WEB_SITE="https://www.cl.cam.ac.uk/~mgk25/jbigkit/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.cl.cam.ac.uk/~mgk25/download//$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e jdk6-jaf/receipt
--- a/jdk6-jaf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk6-jaf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,9 @@
 VERSION="b20"
 CATEGORY="meta"
 SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://java.sun.com"
+WEB_SITE="https://www.oracle.com/technetwork/java/index.html"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk6-jaxp/receipt
--- a/jdk6-jaxp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk6-jaxp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,9 @@
 VERSION="b20"
 CATEGORY="meta"
 SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://java.sun.com"
+WEB_SITE="https://www.oracle.com/technetwork/java/index.html"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk6-jaxws/receipt
--- a/jdk6-jaxws/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk6-jaxws/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,9 @@
 VERSION="b20"
 CATEGORY="meta"
 SHORT_DESC="A component of Sun's jdk6 we use to cook icedtea6 (empty package)"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://java.sun.com"
+WEB_SITE="https://www.oracle.com/technetwork/java/index.html"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-corba/receipt
--- a/jdk7-corba/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-corba/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://icedtea.classpath.org"
+WEB_SITE="https://icedtea.classpath.org/wiki/Main_Page"
 
 TARBALL="corba.tar.bz2"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/icedtea7/$VERSION/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-hotspot/receipt
--- a/jdk7-hotspot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-hotspot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://icedtea.classpath.org"
+WEB_SITE="https://icedtea.classpath.org/wiki/Main_Page"
 
 TARBALL="hotspot.tar.bz2"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/icedtea7/$VERSION/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-jaf/receipt
--- a/jdk7-jaf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-jaf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://java.sun.com"
+WEB_SITE="https://www.oracle.com/technetwork/java/index.html"
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-jaxp/receipt
--- a/jdk7-jaxp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-jaxp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://icedtea.classpath.org"
+WEB_SITE="https://icedtea.classpath.org/wiki/Main_Page"
 
 TARBALL="jaxp.tar.bz2"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/icedtea7/$VERSION/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-jaxws/receipt
--- a/jdk7-jaxws/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-jaxws/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://icedtea.classpath.org"
+WEB_SITE="https://icedtea.classpath.org/wiki/Main_Page"
 
 TARBALL="jaxws.tar.bz2"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/icedtea7/$VERSION/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jdk7-langtools/receipt
--- a/jdk7-langtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jdk7-langtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,7 @@
 SHORT_DESC="A component of Sun's JDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://icedtea.classpath.org"
+WEB_SITE="https://icedtea.classpath.org/wiki/Main_Page"
 
 TARBALL="langtools.tar.bz2"
 WGET_URL="http://icedtea.wildebeest.org/download/drops/icedtea7/$VERSION/$TARBALL"
-
-COOK_OPT="!unpack !repack_src !fs"
-
-compile_rules() {
-	mkdir -p $install
-}
diff -r ad29ddfee1c9 -r d5aab818505e jed/receipt
--- a/jed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,29 @@
 VERSION="0.99-19"
 CATEGORY="development"
 SHORT_DESC="JED text editor"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.jedsoft.org/jed/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.jedsoft.org/jed/"
 WGET_URL="ftp://ftp.fu-berlin.de/pub/unix/editors/jed/v${VERSION%-*}/$TARBALL"
 # ftp://space.mit.edu/pub/davis/jed/v${VERSION%-*}/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="slang"
 BUILD_DEPENDS="slang-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	JED_ROOT=/usr/share/jed ./configure --prefix=/usr $CONFIGURE_ARGS
+compile_rules() {
+	JED_ROOT=/usr/share/jed \
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install 2>&1 | grep -v xjed
+	make -j1 DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/jed
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/jed/lib $fs/usr/share/jed
+	DEPENDS="slang"
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e jikes/receipt
--- a/jikes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jikes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.22"
 CATEGORY="development"
 SHORT_DESC="An Open Source compiler for Java"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="EPL"
 WEB_SITE="http://jikes.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="jikes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS  &&
diff -r ad29ddfee1c9 -r d5aab818505e jnettop/receipt
--- a/jnettop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jnettop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,31 @@
 PACKAGE="jnettop"
 VERSION="0.13.0"
 CATEGORY="network"
-SHORT_DESC="Network online traffic visualizer."
+SHORT_DESC="Network online traffic visualizer"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://web.archive.org/web/20161127214942/http://jnettop.kubs.info/wiki/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20161127214942/http://jnettop.kubs.info/wiki/"
 WGET_URL="http://jnettop.kubs.info/dist/$TARBALL" # FIXME
 
-DEPENDS="ncurses libpcap libdb"
 BUILD_DEPENDS="ncurses-dev libpcap-dev glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/root
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/jnettop $fs/usr/share
 	# config file
 	cp -a $src/.jnettop $fs/root/.jnettop
+	DEPENDS="ncurses libpcap libdb"
 }
diff -r ad29ddfee1c9 -r d5aab818505e joe/receipt
--- a/joe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/joe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="joe"
 VERSION="3.7"
 CATEGORY="utilities"
-SHORT_DESC="Joe's Own Editor is a fully featured terminal based screen editor"
-MAINTAINER="threarth@yahoo.it"
+SHORT_DESC="Fully featured terminal based screen editor"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://joe-editor.sourceforge.net/"
+WEB_SITE="https://joe-editor.sourceforge.io/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/joe-editor/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e john/receipt
--- a/john/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/john/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Fast password cracker"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.openwall.com/john/"
+WEB_SITE="https://www.openwall.com/john/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}g/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e jpeg/receipt
--- a/jpeg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jpeg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="9b"
 CATEGORY="x-window"
 SHORT_DESC="JPEG image programs"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.ijg.org/"
 
-TARBALL="jpegsrc.v${VERSION}.tar.gz"
+TARBALL="jpegsrc.v$VERSION.tar.gz"
 WGET_URL="http://www.ijg.org/files/$TARBALL"
 
-SPLIT="libjpeg jpeg jpeg-dev"
+SPLIT="libjpeg $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/jpegint.h $install/usr/include/jpegint.h
 }
diff -r ad29ddfee1c9 -r d5aab818505e jpegtran/receipt
--- a/jpegtran/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jpegtran/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="jpegtran"
 VERSION="9a"
 CATEGORY="graphics"
-SHORT_DESC="Convert jpeg files to progressive jpeg files."
+SHORT_DESC="Convert jpeg files to progressive jpeg files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://jpegclub.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://jpegclub.org/"
 WGET_URL="${WEB_SITE}jpegcrop.tar.gz"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+compile_rules() {
+	cd $src/jpeg-9a
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src/jpeg-9a
-	./configure --prefix=/usr --infodir=/usr/share/info \
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
diff -r ad29ddfee1c9 -r d5aab818505e jpilot/receipt
--- a/jpilot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jpilot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,15 +3,15 @@
 PACKAGE="jpilot"
 VERSION="1.8.2"
 CATEGORY="office"
-SHORT_DESC="J-Pilot is a desktop organizer application for PalmOS devices"
+SHORT_DESC="Desktop organizer application for PalmOS devices"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL2"
-WEB_SITE="http://www.jpilot.org"
+WEB_SITE="http://jpilot.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev gettext pilot-link-dev intltool"
+BUILD_DEPENDS="gtk2-dev gettext-dev pilot-link-dev intltool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -33,7 +33,7 @@
 }
 
 post_install(){
-	cat <<EOT
+	[ -n "$quiet" ] | cat <<EOT
 
 	.-----------------------------------------------.
 	| Don't forget to add yourself to group dialout |
diff -r ad29ddfee1c9 -r d5aab818505e jq/receipt
--- a/jq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5"
 CATEGORY="utilities"
 SHORT_DESC="Lightweight and flexible command-line JSON processor"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://stedolan.github.io/jq/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/stedolan/jq/releases/download/jq-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="oniguruma-dev"
-SPLIT="jq-dev jq-static:static"
+SPLIT="$PACKAGE-dev $PACKAGE-static:static"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e js/receipt
--- a/js/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/js/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 
 BUILD_DEPENDS="autoconf213 xorg-libXt-dev python-dev xorg-libX11-dev nspr-dev \
 zlib-dev icu-dev coreutils-file-special"
-SPLIT="js-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS=${CFLAGS//-Os/-O2}
@@ -40,7 +40,8 @@
 		--enable-threadsafe \
 		--enable-readline \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	cd $install/usr/include/mozjs-38
 	for link in $(find . -type l); do
diff -r ad29ddfee1c9 -r d5aab818505e js185/receipt
--- a/js185/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/js185/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://ftp.mozilla.org/pub/js/$TARBALL"
 
 BUILD_DEPENDS="perl zip nspr-dev libffi-dev"
-SPLIT="js185-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd js/src
@@ -26,7 +26,8 @@
 		--enable-threadsafe \
 		--enable-system-ffi \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	install -Dm755 shell/js -t $install/usr/bin/
 	rm $install/usr/lib/libmozjs185-1.0.a
diff -r ad29ddfee1c9 -r d5aab818505e jsmin/receipt
--- a/jsmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jsmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,17 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make jsmin
 
 	mkdir -p $install/usr/bin
 	cp -a $src/jsmin $install/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy jsmin
 }
diff -r ad29ddfee1c9 -r d5aab818505e json-glib/receipt
--- a/json-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/json-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.2"
 CATEGORY="development"
 SHORT_DESC="JSON parser for GLib"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/JsonGlib"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/json-glib.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext"
-SPLIT="json-glib-dev"
+BUILD_DEPENDS="meson ninja glib-dev gobject-introspection-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e jssame/receipt
--- a/jssame/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jssame/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,9 +8,7 @@
 LICENSE="unknown"
 WEB_SITE="http://www.slitaz.org/"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $stuff/* $fs
 	chown -R 80.80 $fs/var/www/same
 }
diff -r ad29ddfee1c9 -r d5aab818505e jstetris/receipt
--- a/jstetris/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jstetris/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,28 +4,19 @@
 VERSION="1.1.0"
 CATEGORY="games"
 SHORT_DESC="Tetris game in javascript"
-TARBALL="JsTetris.js"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="unknown"
 WEB_SITE="http://javascript.internet.com/games/Tetris.html"
+
+TARBALL="JsTetris.js"
 WGET_URL="http://javascript.internet.com/games/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-        mkdir -p $fs/var/www/tetris $fs/usr/share/applications
+genpkg_rules() {
+	mkdir -p $fs/var/www/tetris $fs/usr/share/applications
 	cp $src/* $fs/var/www/tetris
 	cp $stuff/index.html $fs/var/www/tetris
 	chown -R 80.80 $fs/var/www/tetris
-	cat > $fs/usr/share/applications/tetris.desktop <<EOT
-[Desktop Entry]
-Type=Application
-Name=Tetris
-Exec=browser file:///var/www/tetris/index.html
-Icon=other
-Terminal=false
-Categories=Game;
-Comment=Tetris game
-EOT
+
+	install -Dm644 $stuff/tetris.desktop \
+		$fs/usr/share/applications/tetris.desktop
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e jstetris/stuff/tetris.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jstetris/stuff/tetris.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Tetris
+Exec=browser file:///var/www/tetris/index.html
+Icon=other
+Terminal=false
+Categories=Game;
+Comment=Tetris game
diff -r ad29ddfee1c9 -r d5aab818505e jtoolkit/receipt
--- a/jtoolkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jtoolkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="jtoolkit"
 VERSION="0.7.8"
 CATEGORY="system-tools"
-SHORT_DESC="Python web application framework built on modpython and Apache."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Python web application framework built on modpython and Apache"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SOURCE="jToolkit"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="http://jtoolkit.sourceforge.net/"
+
+TARBALL="jToolkit-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python jToolkitSetup.py install --root=$DESTDIR
+compile_rules() {
+	python -B jToolkitSetup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e juffed/receipt
--- a/juffed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/juffed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Qt4 text & code editor"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
-WEB_SITE="http://juffed.com"
+WEB_SITE="http://juffed.com/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 # COMMIT="58e2c637f1"
 # VERSION="${COMMIT:0:4}git"
@@ -17,18 +17,16 @@
 DEPENDS="libQtGui libQtDBus libQtNetwork libqscintilla"
 BUILD_DEPENDS="Qt4-dev cmake qmake libqscintilla-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	#sed -i 's/ ON/ OFF/g' $src/plugins/CMakeLists.txt
-	cd $src && cmake \
+	cmake \
 		-DCMAKE_BUILD_TYPE=release \
-		-DCMAKE_INSTALL_PREFIX=/usr . &&
-	make && make DESTDIR=$DESTDIR install
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e jwm/receipt
--- a/jwm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/jwm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="jwm"
 VERSION="2.2.0"
 CATEGORY="x-window"
-SHORT_DESC="JWM is a light Window Manager for the X window system"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight Window Manager for the X window system"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://joewing.net/programs/jwm/"
 
@@ -12,21 +12,15 @@
 WGET_URL="http://www.joewing.net/programs/jwm/releases/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev jpeg-dev libpng16-dev \
-xorg-libXext-dev gettext"
+xorg-libXext-dev gettext-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--disable-nls";;
-		*)    ARCH_ARGS="";;
-	esac
-
 	./configure \
 		--sysconfdir=/etc/xdg/jwm \
 		--disable-fribidi \
 		--disable-rpath \
 		--disable-rsvg \
 		--disable-confirm \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	make &&
 	make install || return 1
@@ -45,11 +39,8 @@
 	copy @std
 	DEPENDS="xorg-libX11 xorg-libXft xorg-libXrender xorg-libXpm xorg-libXext \
 	xorg-libXmu xorg-libXinerama xorg-libXau xorg-libXdmcp xorg-libXt libjpeg \
-	libpng16 slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot"
-	case "$ARCH" in
-		arm*) DEPENDS="$DEPENDS joe lynx ytree";;
-		*)    DEPENDS="$DEPENDS compton nano" ;;
-	esac
+	libpng16 slitaz-configs-base xorg-xload xorg-xclock imlib2 hsetroot \
+	compton nano"
 	TAGS="window-manager"
 }
 
@@ -61,7 +52,7 @@
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
 	fi
 	true
 }
diff -r ad29ddfee1c9 -r d5aab818505e kamailio/receipt
--- a/kamailio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kamailio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -31,7 +31,7 @@
 	make all &&
 	make \
 		PREFIX=/usr \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		install || return 1
 
 	mkdir -p $install/var/run/kamailio
diff -r ad29ddfee1c9 -r d5aab818505e karmen/receipt
--- a/karmen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/karmen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="karmen"
 VERSION="0.15"
 CATEGORY="x-window"
-SHORT_DESC="Very light and minimalistic window manager for X."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Very light and minimalistic window manager for X"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://karmen.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://karmen.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="window-manager"
 
-DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
 BUILD_DEPENDS="xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	# Custom configuration and scripts.
@@ -34,21 +30,21 @@
 	cp -a $stuff/xsessions $fs/usr/share
 	cp -a $stuff/etc $fs
 	chown 0.0 $fs/usr/bin/*
+	DEPENDS="xorg-libX11 xorg-xsetroot nano xterm xorg-xclock dialog"
+	TAGS="window-manager"
 }
 
-post_install()
-{
+post_install() {
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
 		status
 	fi
 }
 
-post_remove()
-{
+post_remove() {
 	# Remove WM from SLIM available sessions.
 	if grep -q $PACKAGE "$1/etc/slim.conf"; then
 		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
diff -r ad29ddfee1c9 -r d5aab818505e kazehakase/receipt
--- a/kazehakase/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kazehakase/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="GTK+ web browser using Webkit rendering engine"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://kazehakase.sourceforge.jp/"
+WEB_SITE="https://osdn.net/projects/kazehakase/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://iij.dl.osdn.jp/kazehakase/43802/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e kbd/receipt
--- a/kbd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kbd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.4"
 CATEGORY="system-tools"
 SHORT_DESC="Keyboard mapping definitions and tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://kbd-project.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/kbd.html"
@@ -12,9 +12,8 @@
 TARBALL="kbd-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
 
-BUILD_DEPENDS_arm="flex check-dev"
-BUILD_DEPENDS="check-dev bison flex gettext patch pam-dev busybox"
-SPLIT="kbd-base kbd-vlock kbd-busybox kbd"
+BUILD_DEPENDS="check-dev bison flex gettext-dev patch pam-dev busybox"
+SPLIT="$PACKAGE-base $PACKAGE-vlock $PACKAGE-busybox $PACKAGE"
 
 compile_rules() {
 	sed -i 's/\(RESIZECONS_PROGS=\)yes/\1no/g' configure
@@ -35,7 +34,8 @@
 		--datadir=/usr/share/kbd \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install || return 1
 
 	mv $install/usr/share/kbd/locale $install/usr/share
 
diff -r ad29ddfee1c9 -r d5aab818505e keepalived/receipt
--- a/keepalived/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keepalived/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e keepassx/receipt
--- a/keepassx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keepassx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,25 @@
 VERSION="0.4.3"
 CATEGORY="graphics"
 SHORT_DESC="Cross platform password manager"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.keepassx.org/"
+WEB_SITE="https://www.keepassx.org/"
 REPOLOGY="keepassx0"
 
 #SOURCE="KeePassX"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="password key"
 
-DEPENDS="xorg-libXtst libQtCore libQtGui libQtXml gcc-lib-base"
 BUILD_DEPENDS="Qt4-dev xorg-libXtst-dev xorg-libXtst qmake mesa-libegl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
 	qmake PREFIX=/usr &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/share/keepassx \
 		$fs/usr/share/licenses \
@@ -39,4 +33,6 @@
 	cp -a $install/usr/share/keepassx/license.html $fs/usr/share/licenses/$PACKAGE.html
 	ln -s /usr/share/keepassx/icons/keepassx_small.png $fs/usr/share/icons/hicolor/16x16/apps/keepassx.png
 	ln -s /usr/share/keepassx/icons/keepassx_large.png $fs/usr/share/icons/hicolor/48x48/apps/keepassx.png
+	DEPENDS="xorg-libXtst libQtCore libQtGui libQtXml gcc-lib-base"
+	TAGS="password key"
 }
diff -r ad29ddfee1c9 -r d5aab818505e kexec-tools/receipt
--- a/kexec-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kexec-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,43 +3,41 @@
 PACKAGE="kexec-tools"
 VERSION="2.0.4"
 CATEGORY="system-tools"
-SHORT_DESC="Directly boot into a new kernel."
+SHORT_DESC="Directly boot into a new kernel"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kexec/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/kexec/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev xz-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -lpthread"
 	case "$ARCH" in
-	i?86)
-		./configure prefix=/usr \
-			--target=i386-linux ;;
-	*)
-		./configure prefix=/usr \
-			--build=$BUILD_SYSTEM \
-			--host=$HOST_SYSTEM ;;
+		i?86)
+			./configure \
+				prefix=/usr \
+				--target=i386-linux
+			;;
+		*)
+			./configure \
+				prefix=/usr \
+				$CONFIGURE_ARGS
+			;;
 	esac &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Important cross compiled package so run readelf.
-testsuite()
-{
+testsuite() {
 	cd $install
 	readelf -h usr/sbin/kexec
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share
+	DEPENDS="zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e keybinder/receipt
--- a/keybinder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keybinder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gtk2-dev gobject-introspection-dev xorg-libXext-dev python-dev \
 python-pygtk-dev python-pygobject2-dev automake autoconf libtool"
-SPLIT="keybinder-python keybinder-dev"
+SPLIT="$PACKAGE-python $PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vif &&
diff -r ad29ddfee1c9 -r d5aab818505e keybinder3/receipt
--- a/keybinder3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keybinder3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gtk3-dev gobject-introspection-dev xorg-libXext-dev \
 xorg-libXrender-dev"
-SPLIT="keybinder3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e keychain/receipt
--- a/keychain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keychain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,20 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="keychain"
 VERSION="2.7.1"
 CATEGORY="network"
-SHORT_DESC="Ssh and GPG keys managment tools."
+SHORT_DESC="SSH and GPG keys managment tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.funtoo.org/Keychain"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://www.funtoo.org/Keychain"
 WGET_URL="http://www.funtoo.org/archive/$PACKAGE/$TARBALL"
-SUGGESTED="openssh gnupg"
-TAGS="ssh"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/keychain $fs/usr/bin
+	SUGGESTED="openssh gnupg"
+	TAGS="ssh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e keyutils/receipt
--- a/keyutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/keyutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://people.redhat.com/~dhowells/keyutils/$TARBALL"
 
 BUILD_DEPENDS="file krb5-dev"
-SPLIT="keyutils-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e kguiaddons/receipt
--- a/kguiaddons/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kguiaddons/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,11 @@
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules qt5-dev mesa-dev"
-SPLIT="kguiaddons-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e kidletime/receipt
--- a/kidletime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kidletime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="kidletime"
 VERSION="5.37.0"
 CATEGORY="system-tools"
-SHORT_DESC="KIdleTime is used to report idle time of user and system"
+SHORT_DESC="Report idle time of user and system"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/kidletime"
@@ -13,7 +13,7 @@
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules qt5-dev mesa-dev"
-SPLIT="kidletime-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e kilo/receipt
--- a/kilo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kilo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,20 @@
 PACKAGE="kilo"
 VERSION="15072016"
 CATEGORY="office"
-SHORT_DESC="A text editor in less than 1000 LOC with syntax highlight and search."
+SHORT_DESC="A text editor in less than 1000 LOC with syntax highlight and search"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://github.com/antirez/kilo"
 WGET_URL="git|git://github.com/antirez/kilo"
 
-#DEPENDS=""
 BUILD_DEPENDS="git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make 
+compile_rules() {
+	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE $fs/usr/bin
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e kino/receipt
--- a/kino/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kino/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.4"
 CATEGORY="multimedia"
 SHORT_DESC="Non linear Video editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20171208061933/http://kinodv.org/"
 
@@ -28,7 +28,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e kismet/receipt
--- a/kismet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kismet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2011-03-R2"
 CATEGORY="network"
 SHORT_DESC="Wireless network monitoring tool"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.kismetwireless.net/"
 
@@ -20,7 +20,7 @@
 		--sysconfdir=/etc/kismet \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $src/kismet_capture $install/usr/bin/kismet_capture
 }
diff -r ad29ddfee1c9 -r d5aab818505e kivy/receipt
--- a/kivy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kivy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="kivy"
-SOURCE="Kivy"
 VERSION="1.4.1"
 CATEGORY="development"
-SHORT_DESC="Cross platform library for rapid development of applications."
+SHORT_DESC="Cross platform library for rapid development of applications"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL3"
-WEB_SITE="http://kivy.org/"
+WEB_SITE="https://kivy.org/"
+
+SOURCE="Kivy"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="https://files.pythonhosted.org/packages/source/${SOURCE:0:1}/$SOURCE/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python-dev python-cython mesa-dev glew-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e kkedit/receipt
--- a/kkedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kkedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,24 +7,23 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://keithhedger.hostingsiteforfree.com/pages/kkedit/help.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://khapplications.darktech.org/zips/kkedit/KKEdit-$VERSION.tar.gz"
 
-DEPENDS="gtk2 gtksourceview libunique"
 BUILD_DEPENDS="automake autoconf gtk2-dev gtksourceview-dev libunique-dev \
 ctags libxml2-dev libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --disable-docviewer --prefix=/usr --&&
+compile_rules() {
+	./configure \
+		--disable-docviewer \
+		--prefix=/usr \
+		--&&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/share/KKEdit \
 		$fs/usr/share/applications \
@@ -33,4 +32,5 @@
 	cp -a $stuff/*.desktop $fs/usr/share/applications
 	cp -a $stuff/*.png $fs/usr/share/pixmaps
 	cp -a $install/usr/share/KKEdit/tools $fs/usr/share/KKEdit
+	DEPENDS="gtk2 gtksourceview libunique"
 }
diff -r ad29ddfee1c9 -r d5aab818505e klavaro/receipt
--- a/klavaro/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/klavaro/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,32 @@
 PACKAGE="klavaro"
 VERSION="1.2.2"
 CATEGORY="system-tools"
-SHORT_DESC="Free touch typing tutor program."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Free touch typing tutor program"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://klavaro.sourceforge.net/en/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://klavaro.sourceforge.net/en/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="typing"
 
-DEPENDS="gtk2 xorg-libXdamage gtkdatabox libcurl libsexy"
-BUILD_DEPENDS="$DEPENDS gtk2-dev xorg-xorgproto gtkdatabox-dev \
-curl-dev libsexy-dev"
+BUILD_DEPENDS="xorg-libXdamage gtk2-dev xorg-xorgproto gtkdatabox-dev curl-dev \
+libsexy-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lgmodule-2.0"
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/klavaro $fs/usr/share
 	cp -a $install/usr/share/icons/hicolor/24x24/apps/* \
 		$fs/usr/share/pixmaps
+	DEPENDS="gtk2 xorg-libXdamage gtkdatabox libcurl libsexy"
+	TAGS="typing"
 }
diff -r ad29ddfee1c9 -r d5aab818505e kmod/receipt
--- a/kmod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kmod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,16 @@
 VERSION="25"
 CATEGORY="base-system"
 SHORT_DESC="Linux kernel modules tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://www.kernel.org/pub/linux/utils/kernel/kmod/"
+WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/kmod.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS_arm="zlib-dev xz-dev"
 BUILD_DEPENDS="zlib-dev xz-dev tar"
-SPLIT="kmod-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e knock/receipt
--- a/knock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/knock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Port knock sequence listener"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.zeroflux.org/$PACKAGE"
+WEB_SITE="http://www.zeroflux.org/projects/knock"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.zeroflux.org/proj/$PACKAGE/files/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/etc/init.d/knock       $install/etc/init.d/knock
 	install -Dm755 $stuff/usr/sbin/knockd-helper $install/usr/sbin/knockd-helper
diff -r ad29ddfee1c9 -r d5aab818505e kobodeluxe/receipt
--- a/kobodeluxe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kobodeluxe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 # TODO : Regularly check if the install script automatically
 # installs the pixmap and the .desktop file. Then remove the
 # part in genpkg_rules() where it's done manually.
 
 PACKAGE="kobodeluxe"
-SOURCE="KoboDeluxe"
 VERSION="0.5.1"
 CATEGORY="games"
-SHORT_DESC="Kobo Deluxe is a third person scrolling 2D shooter game."
-MAINTAINER="chadi.elahmad@gmail.com"
+SHORT_DESC="Third person scrolling 2D shooter game"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.olofson.net/kobodl/"
+
+SOURCE="KoboDeluxe"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.olofson.net/kobodl"
 WGET_URL="http://www.olofson.net/kobodl/download/$TARBALL"
-TAGS="shooting"
 
-DEPENDS="libsdl libsdl-image gcc-lib-base"
-BUILD_DEPENDS="libsdl-dev libsdl-image-dev "
+BUILD_DEPENDS="libsdl-dev libsdl-image-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/pipe2/pipe_2/' enemy.cpp enemies.h
 	sed -i 's/strchr.txt/strchr((char *) txt/' graphics/window.cpp
+
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -32,12 +29,10 @@
 		--sharedstatedir=/var/games \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	# manually moving the pixmap and the .desktop
 	mkdir -p $install/usr/share/pixmaps
 	mkdir -p $install/usr/share/applications
@@ -51,9 +46,10 @@
 
 	mkdir -p $fs/var/games/kobo-deluxe/scores
 	chmod 667 $fs/var/games/kobo-deluxe/scores
+	DEPENDS="libsdl libsdl-image gcc-lib-base"
+	TAGS="shooting"
 }
 
-pre_remove()
-{
+pre_remove() {
 	rm -rf /var/games/kobo-deluxe/*
 }
diff -r ad29ddfee1c9 -r d5aab818505e kqoauth/receipt
--- a/kqoauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kqoauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 GITHASH="7c31a120f86f3351a9eb0bafd321f2a977b3e0a5"
 VERSION=${GITHASH:0:7}
 CATEGORY="development"
-SHORT_DESC="kQOAuth is a OAuth 1.0 library written for Qt in C++"
+SHORT_DESC="OAuth 1.0 library written for Qt in C++"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/kypeli/kQOAuth"
@@ -13,10 +13,12 @@
 WGET_URL="https://github.com/kypeli/kQOAuth/tarball/$GITHASH"
 
 BUILD_DEPENDS="qmake Qt4-dev openssl-dev"
-SPLIT="kqoauth-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	qmake && make && make INSTALL_ROOT=$install install
+	qmake &&
+	make &&
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e krb5/receipt
--- a/krb5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/krb5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://web.mit.edu/kerberos/dist/krb5/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="automake perl gettext openssl-dev"
-SPLIT="krb5-plugins krb5-clients krb5-user libcomerr3 libkrb5 libkrb5support \
-krb5 krb5-dev"
+BUILD_DEPENDS="automake perl gettext-dev openssl-dev"
+SPLIT="$PACKAGE-plugins $PACKAGE-clients $PACKAGE-user libcomerr3 libkrb5 \
+libkrb5support $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	cd $src/src
diff -r ad29ddfee1c9 -r d5aab818505e kriss_feed/receipt
--- a/kriss_feed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kriss_feed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="kriss_feed"
 VERSION="7"
 CATEGORY="network"
-SHORT_DESC="A simple and smart (or stupid) feed reader."
-WEB_SITE="https://github.com/tontof/kriss_feed"
+SHORT_DESC="A simple and smart (or stupid) feed reader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
+WEB_SITE="https://github.com/tontof/kriss_feed"
+
 TARBALL="$PACKAGE-$VERSION"
 WGET_URL="$WEB_SITE/raw/c13cfb50ad593884ee6a5b21d9eb80750b71d693/index.php"
 
-DEPENDS="php"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www/$PACKAGE
 	cd $fs/var/www/$PACKAGE
 	cp "$SRC/$TARBALL" $fs/var/www/$PACKAGE/index.php
+	DEPENDS="php"
 }
 
-post_install()
-{
+post_install() {
 	chown -R www "$1/var/www/$PACKAGE"
 }
diff -r ad29ddfee1c9 -r d5aab818505e kwayland/receipt
--- a/kwayland/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kwayland/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,11 @@
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules qt5-dev mesa-dev"
-SPLIT="kwayland-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e kwindowsystem/receipt
--- a/kwindowsystem/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/kwindowsystem/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,10 +14,11 @@
 
 BUILD_DEPENDS="cmake qt5-dev extra-cmake-modules mesa-dev \
 xorg-xcb-util-keysyms-dev"
-SPLIT="kwindowsystem-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e labyrinth/receipt
--- a/labyrinth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/labyrinth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="labyrinth"
 VERSION="0.7a1"
 CATEGORY="office"
-SHORT_DESC="Labyrinth is a lightweight mind-mapping tool."
+SHORT_DESC="Lightweight mind-mapping tool"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/labyrinth-team/labyrinth"
@@ -11,12 +11,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/labyrinth-team/labyrinth"
 
-BUILD_DEPENDS="bzip2 git python-dev python-pygtk-dev gtk2-dev python-pycairo-dev \
-python-pygobject2-dev gettext"
+BUILD_DEPENDS="bzip2 git python-dev python-pygtk-dev gtk2-dev \
+python-pycairo-dev python-pygobject2-dev gettext-dev"
 
 compile_rules() {
-	python setup.py install --root=$DESTDIR &&
-	./install_data_files.sh DESTDIR=$DESTDIR
+	python -B setup.py install --root=$install &&
+	./install_data_files.sh DESTDIR=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ladspa/receipt
--- a/ladspa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ladspa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,27 @@
 VERSION="1.13"
 CATEGORY="multimedia"
 SHORT_DESC="LADSPA: Linux Audio Developer's Simple Plugin API"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.ladspa.org/"
 
 TARBALL="ladspa_sdk_$VERSION.tgz"
 WGET_URL="https://github.com/OpenMandrivaAssociation/ladspa/raw/master/$TARBALL"
 
-SPLIT="ladspa-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	cd src
-	sed -i \
+	cd $src/src
+	sed \
 		-e 's/mkdirhier/mkdir -p/' \
-		-e "s#-O3#${CFLAGS} ${LDFLAGS/,--as-needed/}#" \
-		makefile
+		-e "s#-O3#$CFLAGS ${LDFLAGS/,--as-needed/}#" \
+		-i makefile
+
 	make targets &&
-	make INSTALL_PLUGINS_DIR=$DESTDIR/usr/lib/ladspa/ \
-		INSTALL_INCLUDE_DIR=$DESTDIR/usr/include/ \
-		INSTALL_BINARY_DIR=$DESTDIR/usr/bin/ \
+	make \
+		INSTALL_PLUGINS_DIR=$install/usr/lib/ladspa/ \
+		INSTALL_INCLUDE_DIR=$install/usr/include/ \
+		INSTALL_BINARY_DIR=$install/usr/bin/ \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e lame/receipt
--- a/lame/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lame/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.100"
 CATEGORY="multimedia"
 SHORT_DESC="MPEG Audio Layer III (MP3) encoder"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://lame.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html"
@@ -12,9 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm="ncurses-dev"
 BUILD_DEPENDS="ncurses-dev nasm"
-SPLIT="lame-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e lapack/receipt
--- a/lapack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lapack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,20 @@
 VERSION="3.7.1"
 CATEGORY="libs"
 SHORT_DESC="Linear Algebra PACKage"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.netlib.org/lapack"
+WEB_SITE="http://www.netlib.org/lapack/"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="cmake gfortran gcc-lib-math python"
-SPLIT="blas blas-dev lapack lapack-dev"
+SPLIT="blas blas-dev $PACKAGE $PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
-	cmake .. \
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DBUILD_SHARED_LIBS=ON \
@@ -28,9 +27,10 @@
 		-DCMAKE_Fortran_COMPILER=gfortran \
 		-DLAPACKE_WITH_TMG=ON \
 		-DCBLAS=ON \
-		-DBUILD_DEPRECATED=ON &&
+		-DBUILD_DEPRECATED=ON \
+		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	licdir="$install/usr/share/licenses"
 	mkdir -p $licdir
@@ -38,9 +38,7 @@
 	cp $src/LICENSE $licdir/lapack.LICENSE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		blas)
 			copy lib*blas.so*
diff -r ad29ddfee1c9 -r d5aab818505e laptop-detect/receipt
--- a/laptop-detect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/laptop-detect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,18 +11,14 @@
 TARBALL="${PACKAGE}_$VERSION.tar.xz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/l/laptop-detect/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/sbin
 	sed -e "s|@VERSION@|$VERSION|g" < laptop-detect.in > $install/usr/sbin/laptop-detect
 	chmod 755 $install/usr/sbin/laptop-detect
 	cook_pick_manpages *.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="dmidecode"
 }
diff -r ad29ddfee1c9 -r d5aab818505e laptop-mode-tools/receipt
--- a/laptop-mode-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/laptop-mode-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="laptop-mode-tools"
 VERSION="1.60"
@@ -6,28 +6,20 @@
 SHORT_DESC="Laptop ACPI tools"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="GPL2"
-DEPENDS="acpid hdparm util-linux-flock util-linux-blockdev"
+WEB_SITE="http://rickysarraf.github.io/laptop-mode-tools/"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
-WEB_SITE="http://rickysarraf.github.io/laptop-mode-tools/"
 WGET_URL="http://samwel.tk/laptop_mode/tools/downloads/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/man|/usr/share/man|' install.sh
-	make DESTDIR=$DESTDIR INIT_D=none install
+
+	make DESTDIR=$install INIT_D=none install || return 1
+
+	install -Dm755 $stuff/laptop-mode.sh $install/etc/init.d/laptop-mode.sh
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/sbin/ $fs/etc/init.d/ $fs/lib
-	cp -a $install/usr/sbin/laptop_mode $fs/usr/sbin/
-	cp -a $stuff/laptop-mode.sh $fs/etc/init.d/
-	cp -a $install/etc/acpi $fs/etc/
-	cp -a $install/etc/laptop-mode $fs/etc/
-	cp -a $install/etc/power $fs/etc/
-	cp -a $install/etc/udev $fs/etc/
-	cp -a $install/lib/udev $fs/lib/
-	cp -a $install/usr/lib/ $fs/usr/
+genpkg_rules() {
+	copy @std
+	DEPENDS="acpid hdparm util-linux-flock util-linux-blockdev"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lazarus/receipt
--- a/lazarus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lazarus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,30 +4,24 @@
 VERSION="1.6.0-0"
 CATEGORY="development"
 SHORT_DESC="Lazarus Component Library and IDE for Freepascal"
-MAINTAINER="shevtsov.anton@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL LGPL"
-WEB_SITE="http://www.lazarus-ide.org"
+WEB_SITE="http://www.lazarus-ide.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lazarus/$TARBALL"
-TAGS="lazarus ide pascal"
 
-DEPENDS="fpc fpc-src gdb make"
 BUILD_DEPENDS="gtk2-dev fpc fpc-src"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make -j 1 clean bigide
+compile_rules() {
+	make -j1 clean bigide
 	#&& make INSTALL_PREFIX=/usr install
-
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cd $src
+genpkg_rules() {
+	cd $src # keep it
 	#strip lazarus
-	#strip startlazarus	
+	#strip startlazarus
 	#strip lazbuild
 	#strip tools/lazres
 	#strip tools/updatepofiles
@@ -43,7 +37,7 @@
 	install -m 755 -d $fs/usr/bin
 	install -m 755 -d $fs/usr/share/man
 	install -m 755 -d $fs/usr/share/man/man1
-	
+
 	cd $src
 	cp -Rfp packager debugger designer converter ide images languages lazarus.app units $fs/usr/share/lazarus
 	cp -Rfp components docs doceditor examples lcl test tools $fs/usr/share/lazarus
@@ -74,7 +68,6 @@
 
 	rm -f man1/lrstolfm.1.gz man1/lazarus-ide.1.gz man1/lazres.1.gz man1/lazbuild.1.gz man1/startlazarus.1.gz man1/updatepofiles.1.gz man1/svn2revisioninc.1.gz
 
-	
 	install -c -m 644 $src/install/lazarus.desktop $fs/usr/share/applications/lazarus.desktop
 	install -c -m 644 $src/images/icons/lazarus128x128.png $fs/usr/share/pixmaps/lazarus.png
 	install -c -m 644 $src/install/lazarus-mime.xml $fs/usr/share/mime/packages/lazarus.xml
@@ -87,4 +80,6 @@
 	install -m 755 -d $fs/usr/share/lazarus/components/synedit/design/languages
 
 	#cp -a $install/* $fs
+	DEPENDS="fpc fpc-src gdb make"
+	TAGS="lazarus ide pascal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lbreakout2/receipt
--- a/lbreakout2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lbreakout2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -31,6 +31,6 @@
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	rm -rf $fs/usr/share/doc
-	cp -a stuff/* $fs
+	cp -a $stuff/* $fs
 	DEPENDS="libpng16 libsdl libsdl-mixer zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lcdnurse/receipt
--- a/lcdnurse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lcdnurse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lcms/receipt
--- a/lcms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lcms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.19"
 CATEGORY="graphics"
 SHORT_DESC="A free color management engine in 100K"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.littlecms.com/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lcms.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="tiff-dev libjpeg-turbo-dev zlib-dev gfortran xz-dev"
-SPLIT="lcms-dev lcms-apps"
+SPLIT="$PACKAGE-dev $PACKAGE-apps"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lcms2/receipt
--- a/lcms2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lcms2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,13 +8,12 @@
 LICENSE="MIT"
 WEB_SITE="http://www.littlecms.com/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lcms2.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lcms/$TARBALL"
 
 BUILD_DEPENDS="libjpeg-turbo-dev zlib-dev tiff-dev"
-SPLIT="lcms2-apps lcms2-dev"
+SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
 	# don't use --disable-static: optipng-static require such lib
diff -r ad29ddfee1c9 -r d5aab818505e ldapfuse/receipt
--- a/ldapfuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ldapfuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ldm/receipt
--- a/ldm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ldm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ldm"
 VERSION="0.3"
 CATEGORY="system-tools"
-SHORT_DESC="l(ightweight) d(evice) m(ounter)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight Device Mounter"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://github.com/LemonBoy/ldm"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/LemonBoy/ldm"
-WGET_URL="https://github.com/LemonBoy/ldm/tarball/v${VERSION}"
+WGET_URL="https://github.com/LemonBoy/ldm/tarball/v$VERSION"
 
-DEPENDS="eudev"
 BUILD_DEPENDS="eudev-dev util-linux-mount-dev util-linux-blkid"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make ldm.o &&
 	cc -o ldm ldm.o -ludev -lmount -lblkid &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="eudev"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ldns/receipt
--- a/ldns/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ldns/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://www.nlnetlabs.nl/downloads/ldns/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev perl"
-SPLIT="ldns-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e le/receipt
--- a/le/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/le/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="le"
 VERSION="1.14.2"
 CATEGORY="utilities"
 SHORT_DESC="Small editor using ncurses"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="ftp://ftp.yar.ru/pub/source/le/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="ftp://ftp.yar.ru/pub/source/le/"
 WGET_URL="ftp://ftp.yar.ru/pub/source/le/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="ncurses gcc-lib-base"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
 
 	./configure \
@@ -25,14 +22,13 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/le $fs/usr/share
+	DEPENDS="ncurses gcc-lib-base"
+	TAGS="text-editor"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e leafpad/receipt
--- a/leafpad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/leafpad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.18.1"
 CATEGORY="utilities"
 SHORT_DESC="Simple GTK text editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://tarot.freeshell.org/leafpad/"
 
@@ -18,7 +18,9 @@
 compile_rules() {
 	chmod +x install-sh
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ledger/receipt
--- a/ledger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ledger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 command-line"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://ledger-cli.org/"
+WEB_SITE="https://www.ledger-cli.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.newartisans.com/pub/ledger/$TARBALL"
@@ -18,10 +18,9 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	# copy sample file
-	install -Dm644 $src/sample.dat $install/usr/share/ledger/sample.dat
+	install -Dm644 sample.dat $install/usr/share/ledger/sample.dat
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lensfun/receipt
--- a/lensfun/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lensfun/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="multimedia"
 SHORT_DESC="Database of photographic lenses and a library that allows advanced \
 access to the database"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3 GPL3"
 WEB_SITE="http://lensfun.sourceforge.net/"
 
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/lensfun/$TARBALL"
 
 BUILD_DEPENDS="cmake glib-dev libpng16-dev"
-SPLIT="lenstool lensfun lensfun-dev"
+SPLIT="lenstool $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e leocad-pieces/receipt
--- a/leocad-pieces/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/leocad-pieces/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,17 +3,16 @@
 PACKAGE="leocad-pieces"
 VERSION="4806"
 CATEGORY="games"
-SHORT_DESC="Pieces library for LeoCAD."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Pieces library for LeoCAD"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.leocad.org/"
+
 SOURCE="pieces"
 TARBALL="$SOURCE-$VERSION.zip"
-WEB_SITE="https://www.leocad.org/"
 WGET_URL="http://leocad.googlecode.com/files/$TARBALL" # FIXME
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/leocad
 	cp -a $src/* $fs/usr/share/leocad
 }
diff -r ad29ddfee1c9 -r d5aab818505e leocad/receipt
--- a/leocad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/leocad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,25 @@
 PACKAGE="leocad"
 VERSION="0.76.2"
 CATEGORY="games"
-SHORT_DESC="A CAD program that uses toy bricks."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="A CAD program that uses toy bricks"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.leocad.org/"
+
 TARBALL="$PACKAGE-$VERSION-src.tgz"
-WEB_SITE="https://www.leocad.org/"
 WGET_URL="http://leocad.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="glibc-base gcc-lib-base glib expat zlib leocad-pieces \
-gtk2 atk cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb xorg-xcb-util \
-xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
-xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft xorg-libXinerama \
-xorg-libXrender mesa glu"
-BUILD_DEPENDS="mesa-dev gtk2-dev glib-dev"
+BUILD_DEPENDS="mesa-dev gtk2-dev glib-dev libjpeg-turbo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11 -ldl"
+
 	make PREFIX="/usr" config &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/leocad \
 		 $fs/usr/bin
 
@@ -41,4 +34,9 @@
 
 	chmod +x $fs/usr/bin/leocad
 	cp -a $install/* $fs
+	DEPENDS="glibc-base gcc-lib-base glib expat zlib leocad-pieces gtk2 atk \
+	cairo xorg-pixman pango jpeg libpng16 fontconfig freetype xorg-libxcb \
+	xorg-xcb-util xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
+	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXft \
+	xorg-libXinerama xorg-libXrender mesa glu"
 }
diff -r ad29ddfee1c9 -r d5aab818505e leptonica/receipt
--- a/leptonica/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/leptonica/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://www.leptonica.org/source/$TARBALL"
 
 BUILD_DEPENDS="giflib-dev jpeg-dev libpng16-dev tiff-dev xorg-dev"
-SPLIT="leptonica-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e less/receipt
--- a/less/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/less/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,13 @@
 VERSION="530"
 CATEGORY="base-system"
 SHORT_DESC="A terminal based program for viewing text files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.greenwoodsoftware.com/less"
+WEB_SITE="http://www.greenwoodsoftware.com/less/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/less.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev pcre-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e lessfs/receipt
--- a/lessfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lessfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,7 @@
 		--with-berkeleydb \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/etc/lessfs.cfg-bdb $install/etc/lessfs.cfg
 }
diff -r ad29ddfee1c9 -r d5aab818505e lesstif/receipt
--- a/lesstif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lesstif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="lesstif"
 VERSION="0.95.2"
 CATEGORY="x-window"
-SHORT_DESC="An LGPL clone of Motif, which is a set of GUI widgets"
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Clone of Motif, a set of GUI widgets"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/lesstif/"
 
@@ -13,13 +13,13 @@
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libXt-dev xorg-libXext-dev \
 util-linux-uuid-dev automake"
-SPLIT="lesstif-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lfs-book/receipt
--- a/lfs-book/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lfs-book/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,13 @@
 VERSION="7.3"
 CATEGORY="development"
 SHORT_DESC="Linux From Scratch book"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY-NC-SA-2 MIT"
 WEB_SITE="http://www.linuxfromscratch.org/lfs/"
 TARBALL="LFS-BOOK-$VERSION.tar.bz2"
 WGET_URL="http://www.linuxfromscratch.org/lfs/downloads/$VERSION/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/doc/$PACKAGE
 	cp -a $src/* $fs/usr/share/doc/$PACKAGE
 }
diff -r ad29ddfee1c9 -r d5aab818505e lftp/receipt
--- a/lftp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lftp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.8.4"
 CATEGORY="network"
 SHORT_DESC="Small but powerful FTP client"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://lftp.yar.ru/"
 
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}ftp/$TARBALL"
 
 BUILD_DEPENDS="gmp-dev ncurses-dev readline-dev expat-dev gperf gnutls-dev \
-gettext"
+gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lftpfs/receipt
--- a/lftpfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lftpfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lftpfs"
 VERSION="0.4.3"
 CATEGORY="system-tools"
-SHORT_DESC="filesystem with caching for smart mirror of sites based on FUSE and LFTP."
+SHORT_DESC="Filesystem with caching for smart mirror of sites based on FUSE and LFTP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://lftpfs.sourceforge.net/"
@@ -12,19 +12,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="perl-fuse perl-ipc-run"
 BUILD_DEPENDS="perl-fuse perl-ipc-run"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="perl-fuse perl-ipc-run"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lha/receipt
--- a/lha/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lha/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lha"
 VERSION="1.14i-ac20050924p1"
 CATEGORY="system-tools"
-SHORT_DESC="File archiver."
+SHORT_DESC="File archiver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CC-SA"
+WEB_SITE="http://lha.osdn.jp/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.jp/"
 WGET_URL="http://osdn.dl.sourceforge.jp/$PACKAGE/22231/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e libQtMimeTypes/receipt
--- a/libQtMimeTypes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libQtMimeTypes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$WEB_SITE/archive/$BRANCH.tar.gz"
 
 BUILD_DEPENDS="Qt4-dev qmake"
-SPLIT="libQtMimeTypes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	qmake &&
diff -r ad29ddfee1c9 -r d5aab818505e libXaw3dXft/receipt
--- a/libXaw3dXft/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libXaw3dXft/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXmu-dev xorg-libXext-dev \
 xorg-libXft-dev xorg-libXpm-dev"
-SPLIT="libXaw3dXft-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e liba53/receipt
--- a/liba53/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liba53/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,23 +6,20 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="The A5/3 library"
-WEB_SITE="http://www.rangenetworks.com/"
+WEB_SITE="https://rangenetworks.com/"
+
 OBVERSION="4.0.0"
 TARBALL="openbts-$OBVERSION.zip"
 WGET_URL="https://github.com/RangeNetworks/dev/releases/download/v$OBVERSION/v$OBVERSION-source.zip"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	tar xzf liba53_$VERSION.tar.gz
 	cd liba53*
-	mkdir -p $DESTDIR/usr/lib $DESTDIR/usr/include
+	mkdir -p $install/usr/lib $install/usr/include
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	cp -a $install/usr $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e libaal/receipt
--- a/libaal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libaal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 #WGET_URL="http://www.kernel.org/pub/linux/utils/fs/reiser4/libaal/$TARBALL" # historical, now empty
 WGET_URL="$SF_MIRROR/reiser4/$TARBALL"
 
-SPLIT="libaal-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libacpi/receipt
--- a/libacpi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libacpi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,18 +12,14 @@
 WGET_URL="http://www.ngolde.de/download/$TARBALL"
 
 BUILD_DEPENDS="patch"
-SPLIT="libacpi-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make PREFIX=/usr &&
 	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libacpi) copy *.so*;;
 		*-dev)   copy @dev bin/;;
diff -r ad29ddfee1c9 -r d5aab818505e libaio/receipt
--- a/libaio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libaio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 #WGET_URL="https://www.kernel.org/pub/linux/kernel/people/bcrl/aio/$TARBALL" # historical
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/liba/libaio/libaio_$VERSION.orig.tar.gz"
 
-SPLIT="libaio-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make prefix="$install/usr" install || return 1
diff -r ad29ddfee1c9 -r d5aab818505e libao/receipt
--- a/libao/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libao/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.1.0"
 CATEGORY="multimedia"
 SHORT_DESC="Cross-platform audio output library and plugins"
-MAINTAINER="rj.rohit@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://downloads.xiph.org/releases/ao/"
+WEB_SITE="https://ftp.osuosl.org/pub/xiph/releases/ao/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev"
-SPLIT="libao-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libappindicator-gtk2/receipt
--- a/libappindicator-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libappindicator-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,8 @@
 BUILD_DEPENDS="glib-dev gtk-doc gtk2-dev libindicator-gtk2-dev \
 libdbusmenu-gtk2-dev dbus-glib-dev gobject-introspection-dev vala python-dev \
 python-pygtk-dev python-pygobject2-dev gtk3-dev libindicator-gtk3-dev libdbusmenu-gtk3-dev"
-SPLIT="libappindicator-gtk2 libappindicator-gtk2-python \
-libappindicator-gtk2-dev libappindicator-gtk3:3 libappindicator-gtk3-dev:3"
+SPLIT="$PACKAGE-python $PACKAGE-dev \
+libappindicator-gtk3:3 libappindicator-gtk3-dev:3"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e libarchive/receipt
--- a/libarchive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libarchive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.3.3"
 CATEGORY="system-tools"
 SHORT_DESC="C library and command line tool for reading archive"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.libarchive.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libarchive.html"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
-BUILD_DEPENDS="e2fsprogs-dev zlib-dev bzip2-dev gettext lz4-dev zstd-dev xz-dev \
-lzo-dev libxml2-dev expat-dev attr-dev acl-dev nettle-dev openssl-dev"
-SPLIT="libarchive-dev"
+BUILD_DEPENDS="e2fsprogs-dev zlib-dev bzip2-dev gettext-dev lz4-dev zstd-dev \
+xz-dev lzo-dev libxml2-dev expat-dev attr-dev acl-dev nettle-dev openssl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libart_lgpl/receipt
--- a/libart_lgpl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libart_lgpl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.3.21"
 CATEGORY="x-window"
 SHORT_DESC="A library for high-performance 2D graphics"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.levien.com/libart/"
 REPOLOGY="libart-lgpl"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-SPLIT="libart_lgpl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libass/receipt
--- a/libass/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libass/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.13.6"
 CATEGORY="multimedia"
 SHORT_DESC="A portable library for SSA/ASS subtitles rendering"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/libass/libass"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libass.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/libass/libass/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="yasm-dev freetype-dev fribidi-dev fontconfig-dev"
-SPLIT="libass-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libassuan/receipt
--- a/libassuan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libassuan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.1"
 CATEGORY="security"
 SHORT_DESC="IPC library used by some of the other GnuPG related packages"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/related_software/libassuan/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libassuan.html"
@@ -15,7 +15,7 @@
 TARBALL_SHA1="c8432695bf1daa914a92f51e911881ed93d50604"
 
 BUILD_DEPENDS="libgpg-error-dev"
-SPLIT="libassuan-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libasyncns/receipt
--- a/libasyncns/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libasyncns/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,14 +5,14 @@
 CATEGORY="development"
 SHORT_DESC="A C library for Linux/Unix for executing name service queries \
 asynchronously"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://0pointer.de/lennart/projects/libasyncns"
+WEB_SITE="http://0pointer.de/lennart/projects/libasyncns/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-SPLIT="libasyncns-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libatasmart/receipt
--- a/libatasmart/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libatasmart/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.19"
 CATEGORY="system-tools"
 SHORT_DESC="Disk reporting library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://0pointer.de/blog/projects/being-smart.html"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libatasmart.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://0pointer.de/public/$TARBALL"
 
 BUILD_DEPENDS="eudev-dev"
-SPLIT="libatasmart-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libav/receipt
--- a/libav/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libav/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 netatalk-dev schroedinger-dev speex-dev libtheora-dev libvorbis-dev \
 libvpx-dev x264 xvidcore-dev \
 zlib-dev bzlib binutils "
-SPLIT="libav-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e libavc1394/receipt
--- a/libavc1394/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libavc1394/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.4"
 CATEGORY="system-tools"
 SHORT_DESC="Interface for the 1394 Trade Association AV/C Digital Interface"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://sourceforge.net/projects/libavc1394/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libraw1394-dev"
-SPLIT="libavc1394-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libb2/receipt
--- a/libb2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libb2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/BLAKE2/libb2/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="libb2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e libbcm2835/receipt
--- a/libbcm2835/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libbcm2835"
-VERSION="1.36"
-CATEGORY="system-tools"
-SHORT_DESC="C library for Broadcom BCM 2835 as used in Raspberry Pi."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL"
-WEB_SITE="http://www.airspayce.com/mikem/bcm2835/index.html"
-REPOLOGY="bcm2835"
-
-SOURCE="bcm2835"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="http://www.airspayce.com/mikem/bcm2835/$TARBALL"
-HOST_ARCH="arm"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS &&
-	make && make install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/${PACKAGE}
-	cp -a ${install}/usr/lib ${fs}/usr
-	cp -a ${install}/usr/include ${fs}/usr
-	cp -a ${src}/examples ${fs}/usr/share/${PACKAGE}
-}
diff -r ad29ddfee1c9 -r d5aab818505e libbluray/receipt
--- a/libbluray/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libbluray/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="ftp://ftp.videolan.org/pub/videolan/libbluray/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev freetype-dev fontconfig-dev"
-SPLIT="libbluray-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libbonobo/receipt
--- a/libbonobo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libbonobo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.32.1"
 CATEGORY="x-window"
 SHORT_DESC="GNOME CORBA framework"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/libbonobo/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool orbit2-dev glib-dev libxml2-dev popt-dev"
-SPLIT="libbonobo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/-DG_DISABLE_DEPRECATED//' activation-server/Makefile*
diff -r ad29ddfee1c9 -r d5aab818505e libbonoboui/receipt
--- a/libbonoboui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libbonoboui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.5"
 CATEGORY="x-window"
 SHORT_DESC="Library for compound documents in GNOME"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://developer.gnome.org/libbonoboui/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="intltool gtk2-dev pangox-compat-dev xorg-libICE-dev popt-dev \
 libgnomecanvas-dev libbonobo-dev libgnome-dev gconf-dev libglade-dev \
 xorg-libSM-dev libgcrypt-dev"
-SPLIT="libbonoboui-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libbsd/receipt
--- a/libbsd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libbsd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://libbsd.freedesktop.org/releases/$TARBALL"
 
-SPLIT="libbsd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libbytesize/receipt
--- a/libbytesize/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libbytesize/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/storaged-project/libbytesize/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext gmp-dev mpfr-dev pcre-dev"
-SPLIT="libbytesize-python libbytesize libbytesize-dev"
+BUILD_DEPENDS="gettext-dev gmp-dev mpfr-dev pcre-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -24,7 +24,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libbytesize-python)
+		*-python)
 			copy *.py
 			DEPENDS="libbytesize python"
 			CAT="libs|python bindings"
diff -r ad29ddfee1c9 -r d5aab818505e libcaca/receipt
--- a/libcaca/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcaca/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="zlib-dev xorg-libX11-dev mesa-dev ncurses-dev python imlib2-dev \
 pango-dev doxygen cppunit-dev"
-SPLIT="python-caca libcaca-dev"
+SPLIT="python-caca $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libcanberra/receipt
--- a/libcanberra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcanberra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,8 @@
 
 BUILD_DEPENDS="libtool gtk2-dev libvorbis-dev alsa-lib-dev eudev-dev \
 gstreamer1-dev gtk3-dev"
-SPLIT="libcanberra-gnome libcanberra-gstreamer1 libcanberra-gtk2 \
-libcanberra-gtk3 libcanberra libcanberra-dev"
+SPLIT="$PACKAGE-gnome $PACKAGE-gstreamer1 $PACKAGE-gtk2 $PACKAGE-gtk3 \
+$PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libcap-ng/receipt
--- a/libcap-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcap-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.9"
 CATEGORY="security"
 SHORT_DESC="New generation libcap library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://people.redhat.com/sgrubb/libcap-ng/"
 
diff -r ad29ddfee1c9 -r d5aab818505e libcap/receipt
--- a/libcap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.25"
 CATEGORY="system-tools"
 SHORT_DESC="Support for getting/setting POSIX.1e capabilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://sites.google.com/site/fullycapable/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/libcap.html"
@@ -12,21 +12,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$TARBALL"
 
-BUILD_DEPENDS_arm="gperf pam-dev attr-dev"
 BUILD_DEPENDS="pam-dev attr-dev perl" # no gperf:
 # libcap-2.25 incompatible with gperf 3.1: https://bugs.gentoo.org/604802
-SPLIT="libcap-pam libcap libcap-dev"
+SPLIT="$PACKAGE-pam $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	# Handle cross compilation.
-	case "$ARCH" in
-		arm*) ARCH_ARGS="CC=$HOST_SYSTEM-gcc BUILD_CC=gcc" ;;
-	esac
-
 	# Prevent a static library from being installed
 	sed -i '/install.*STALIBNAME/d' libcap/Makefile
 
-	make $ARCH_ARGS &&
+	make &&
 	make \
 		RAISE_SETFCAP=no \
 		lib=lib \
diff -r ad29ddfee1c9 -r d5aab818505e libcclc/receipt
--- a/libcclc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcclc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/ccl/$TARBALL"
 
 BUILD_DEPENDS="file openssl-dev"
-SPLIT="libcclc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libccls/receipt
--- a/libccls/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libccls/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Server library for internet cafe programs"
 MAINTAINER="allan316@gmail.com"
 LICENSE="BSD"
-WEB_SITE="http://ccl.sourceforge.net"
+WEB_SITE="http://ccl.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/ccl/$TARBALL"
 
 BUILD_DEPENDS="file sqlite3-dev glib-dev openssl-dev"
-SPLIT="libccls-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libcddb/receipt
--- a/libcddb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcddb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.2"
 CATEGORY="multimedia"
 SHORT_DESC="C library to access data on a CDDB server freedb.org"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://libcddb.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libcddb.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libcddb-utils libcddb-dev"
+SPLIT="$PACKAGE-utils $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libcdio-paranoia/receipt
--- a/libcdio-paranoia/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcdio-paranoia/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://ftp.gnu.org/gnu/libcdio/$TARBALL"
 
 BUILD_DEPENDS="libcdio-dev"
-SPLIT="libcdio-paranoia-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libcdio/receipt
--- a/libcdio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcdio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.94"
 CATEGORY="multimedia"
 SHORT_DESC="GNU Compact Disc Input and Control Library"
-MAINTAINER="rj.rohit@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/libcdio/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libcdio.html"
diff -r ad29ddfee1c9 -r d5aab818505e libcdr/receipt
--- a/libcdr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcdr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="librevenge-dev lcms2-dev icu-dev boost-dev cppunit-dev \
 doxygen"
-SPLIT="libcdr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libconfig/receipt
--- a/libconfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libconfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/hyperrealm/libconfig/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool texinfo"
-SPLIT="libconfig-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 #?	# See: https://github.com/hyperrealm/libconfig/issues/47
diff -r ad29ddfee1c9 -r d5aab818505e libconfuse/receipt
--- a/libconfuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libconfuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,21 @@
 VERSION="2.7"
 CATEGORY="misc"
 SHORT_DESC="Configuration file parser library"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="ISC"
 WEB_SITE="http://www.nongnu.org/confuse/"
 
 TARBALL="confuse-$VERSION.tar.gz"
 WGET_URL="http://savannah.nongnu.org/download/confuse/$TARBALL"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	sed -i 's/ -Werror//' src/Makefile &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libcroco/receipt
--- a/libcroco/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libcroco/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.12"
 CATEGORY="system-tools"
 SHORT_DESC="Cascading Style Sheet (CSS2) parsing and manipulation toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://developer.gnome.org/libcroco/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libcroco.html"
diff -r ad29ddfee1c9 -r d5aab818505e libctpp2/receipt
--- a/libctpp2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libctpp2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,13 +13,11 @@
 WGET_URL="http://ctpp.havoc.ru/download/$TARBALL"
 
 BUILD_DEPENDS="cmake"
-SPLIT="libctpp2-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd build
+	cd    build
 
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -28,9 +26,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libctpp2) copy @std;;
 		*-dev)    copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e libdaemon/receipt
--- a/libdaemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdaemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://0pointer.de/lennart/projects/libdaemon/$TARBALL"
 
-SPLIT="libdaemon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libdaq/receipt
--- a/libdaq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdaq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.1"
 CATEGORY="network"
 SHORT_DESC="Data Acquisition library for packet I/O"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/Xiche/libdaq"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/Xiche/libdaq/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool flex bison libpcap-dev"
-SPLIT="libdaq-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap &&
diff -r ad29ddfee1c9 -r d5aab818505e libdbusmenu-qt/receipt
--- a/libdbusmenu-qt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdbusmenu-qt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.3+16.04.20160218"
 CATEGORY="system-tools"
 SHORT_DESC="Library to import and export QMenu instances using the DBusMenu"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://launchpad.net/libdbusmenu-qt"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/kde/libdbusmenu-qt.html"
@@ -13,12 +13,13 @@
 WGET_URL="http://launchpad.net/ubuntu/+archive/primary/+files/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev"
-SPLIT="libdbusmenu-qt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|com\.trolltech|org.qtproject|' src/com.canonical.dbusmenu.xml
 
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e libdbusmenu/receipt
--- a/libdbusmenu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdbusmenu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,9 @@
 
 BUILD_DEPENDS="intltool gtk-doc gtk3-dev gtk2-dev json-glib-dev vala \
 gobject-introspection-dev"
-SPLIT="libdbusmenu-gtk2-apps libdbusmenu-gtk2 libdbusmenu-gtk2-dev \
-libdbusmenu-gtk3-apps:3 libdbusmenu-gtk3:3 libdbusmenu-gtk3-dev:3"
+SPLIT="\
+$PACKAGE-gtk2-apps   $PACKAGE-gtk2   $PACKAGE-gtk2-dev \
+$PACKAGE-gtk3-apps:3 $PACKAGE-gtk3:3 $PACKAGE-gtk3-dev:3"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e libde265/receipt
--- a/libde265/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libde265/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/strukturag/libde265/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool libsdl-dev"
-SPLIT="libde265-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e libdes/receipt
--- a/libdes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,16 @@
 VERSION="4.04b"
 CATEGORY="security"
 SHORT_DESC="Library for DES encryption"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://web.archive.org/web/20150803212935/http://linux.maruhn.com/sec/libdes.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/$TARBALL"
 
-SPLIT="libdes-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i "s|/usr/local/|$install/usr/|; s|/usr/man|/usr/share/man|" Makefile
 	for i in lib bin include share/man/man1 share/man/man3; do
 		mkdir -p $install/usr/$i
@@ -24,9 +22,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libdes) copy @std;;
 		*-dev)  copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e libdesktop-agnostic/receipt
--- a/libdesktop-agnostic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdesktop-agnostic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,16 +5,16 @@
 COMMIT="be0f0cb"
 CATEGORY="x-window"
 SHORT_DESC="Desktop agnostic library for GLib-based projects"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://launchpad.net/libdesktop-agnostic"
 
 TARBALL="libdesktop-agnostic-${COMMIT:-$VERSION}.tar.gz"
 WGET_URL="https://github.com/p12tic/libdesktop-agnostic/archive/${COMMIT:-v$VERSION}.tar.gz"
 
-BUILD_DEPENDS="python-dev vala gettext intltool gtk2-dev gconf-dev \
+BUILD_DEPENDS="python-dev vala gettext-dev intltool gtk2-dev gconf-dev \
 gobject-introspection-dev python-pygobject2-dev python-pygtk-dev"
-SPLIT="libdesktop-agnostic-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# site script isn't used
@@ -27,7 +27,7 @@
 	./waf &&
 	./waf install \
 		--prefix=/usr \
-		--destdir=$DESTDIR
+		--destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libdisasm/receipt
--- a/libdisasm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdisasm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/bastard/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="libdisasm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
@@ -25,7 +25,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libdnet/receipt
--- a/libdnet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdnet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="network"
 SHORT_DESC="A simplified, portable interface to serveral low-level networking \
 routines"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/dugsong/libdnet"
 
@@ -13,13 +13,13 @@
 WGET_URL="http://libdnet.googlecode.com/files/$TARBALL" # FIXME
 
 BUILD_DEPENDS="python python-dev"
-SPLIT="libdnet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libdrm-mach64/receipt
--- a/libdrm-mach64/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdrm-mach64/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="20180107"
 CATEGORY="x-window"
 SHORT_DESC="DRM Library for mach64"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://dri.freedesktop.org/wiki/DRM"
+WEB_SITE="https://dri.freedesktop.org/wiki/DRM/"
 REPOLOGY="mach64drm"
 
 TARBALL="mach64-$VERSION.tar.gz"
diff -r ad29ddfee1c9 -r d5aab818505e libdrm/receipt
--- a/libdrm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdrm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Freedesktop DRM Library"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
-WEB_SITE="https://dri.freedesktop.org/"
+WEB_SITE="https://dri.freedesktop.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libdrm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -14,8 +14,8 @@
 
 BUILD_DEPENDS="autoconf automake libtool xorg-util-macros libxslt \
 xorg-libpciaccess-dev cairo-dev eudev-dev libxslt docbook-xsl valgrind-dev"
-SPLIT="libdrm-amdgpu libdrm-etnaviv libdrm-exynos libdrm-intel libdrm-nouveau \
-libdrm-omap libdrm-radeon libdrm-tegra libdrm-dev"
+SPLIT="$PACKAGE-amdgpu $PACKAGE-etnaviv $PACKAGE-exynos $PACKAGE-intel \
+$PACKAGE-nouveau $PACKAGE-omap $PACKAGE-radeon $PACKAGE-tegra $PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fiv &&
diff -r ad29ddfee1c9 -r d5aab818505e libdv/receipt
--- a/libdv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.0"
 CATEGORY="multimedia"
 SHORT_DESC="Software codec for DV video"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libdv.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libdv.html"
@@ -14,7 +14,7 @@
 
 # With no effect on final binaries: xorg-libX11-dev xorg-libXt-dev libsdl-dev
 BUILD_DEPENDS="gfortran"
-SPLIT="libdv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	tazpkg -r popt
diff -r ad29ddfee1c9 -r d5aab818505e libdvdcss/receipt
--- a/libdvdcss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdvdcss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,20 @@
 VERSION="1.2.12"
 CATEGORY="system-tools"
 SHORT_DESC="Accessing DVDs like a block device"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.videolan.org/developers/libdvdcss.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.videolan.org/pub/videolan/libdvdcss/$VERSION/$TARBALL"
 
-SPLIT="libdvdcss-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libdvdread/receipt
--- a/libdvdread/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libdvdread/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.1.3"
 CATEGORY="system-tools"
 SHORT_DESC="Librairy for reading DVDs"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dvdnav.mplayerhq.hu/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.videolan.org/pub/videolan/libdvdread/$TARBALL"
 
 BUILD_DEPENDS="libdvdcss-dev autoconf automake libtool"
-SPLIT="libdvdread-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libedit/receipt
--- a/libedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="3.0"
 CATEGORY="misc"
 SHORT_DESC="Berkeley-style licensed command line editor library"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.thrysoee.dk/editline/"
+WEB_SITE="http://thrysoee.dk/editline/"
 
 TARBALL="libedit-20100424-$VERSION.tar.gz"
 WGET_URL="http://www.thrysoee.dk/editline/$TARBALL"
 
-BUILD_DEPENDS="gettext"
-SPLIT="libedit-dev"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libee/receipt
--- a/libee/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libee/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.2"
 CATEGORY="system-tools"
 SHORT_DESC="An Event Expression Library inspired by CEE"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libee.org/download/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://www.libee.org/files/download/$TARBALL"
 
 BUILD_DEPENDS="libestr-dev automake"
-SPLIT="libee-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libesmtp/receipt
--- a/libesmtp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libesmtp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="network"
 SHORT_DESC="A library for posting electronic mail"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="http://brianstafford.info/libesmtp/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libesmtp.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://brianstafford.info/libesmtp/$TARBALL"
 
 BUILD_DEPENDS="automake libtool openssl-dev"
-SPLIT="libesmtp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# fix a build issue with OpenSSL-1.1.0
diff -r ad29ddfee1c9 -r d5aab818505e libestr/receipt
--- a/libestr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libestr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.1.2"
 CATEGORY="system-tools"
 SHORT_DESC="Some essentials for string handling"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="http://libestr.adiscon.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libestr.adiscon.com/files/download/$TARBALL"
 
-SPLIT="libestr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libetpan/receipt
--- a/libetpan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libetpan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.0"
 CATEGORY="misc"
 SHORT_DESC="Mail library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://libetpan.sourceforge.net/libetpan/index.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libetpan-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/--iso-8601=minutes/+%Y-%m-%dT%H:%M%Z/' configure
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libev/receipt
--- a/libev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="4.04"
 CATEGORY="system-tools"
 SHORT_DESC="A full-featured and high-performance event loop"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://software.schmorp.de/pkg/libev.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dist.schmorp.de/libev/$TARBALL"
 
-SPLIT="libev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libevent/receipt
--- a/libevent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libevent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.8"
 CATEGORY="system-tools"
 SHORT_DESC="An event notification library"
-MAINTAINER="0dddba11@googlemail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://libevent.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libevent.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/libevent/libevent/releases/download/release-$VERSION-stable/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev zlib-dev"
-SPLIT="libevent-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libexif/receipt
--- a/libexif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libexif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.21"
 CATEGORY="graphics"
 SHORT_DESC="Library for easy access to EXIF data"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libexif.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libexif.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext"
-SPLIT="libexif-dev"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libextractor/receipt
--- a/libextractor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libextractor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,11 +13,12 @@
 
 BUILD_DEPENDS="libtool   iso-codes libvorbis-dev flac-dev zlib-dev bzip2-dev \
 libmpeg2-dev libjpeg-turbo-dev tiff-dev libarchive-dev exiv2-dev giflib-dev \
-libmagic-dev tidy-dev gettext glib-dev gdk-pixbuf-dev libgsf-dev ffmpeg-dev"
-SPLIT="libextractor-archive libextractor-exiv2 libextractor-flac \
-libextractor-gif libextractor-jpeg libextractor-mime libextractor-mpeg \
-libextractor-ogg libextractor-ole2 libextractor-thumbnailffmpeg \
-libextractor-thumbnailgtk libextractor-tiff libextractor libextractor-dev"
+libmagic-dev tidy-dev gettext-dev glib-dev gdk-pixbuf-dev libgsf-dev ffmpeg-dev"
+SPLIT="\
+$PACKAGE-archive $PACKAGE-exiv2           $PACKAGE-flac         $PACKAGE-gif \
+$PACKAGE-jpeg    $PACKAGE-mime            $PACKAGE-mpeg         $PACKAGE-ogg \
+$PACKAGE-ole2    $PACKAGE-thumbnailffmpeg $PACKAGE-thumbnailgtk $PACKAGE-tiff \
+$PACKAGE         $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libfakekey/receipt
--- a/libfakekey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libfakekey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="X virtual keyboard library"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="https://www.yoctoproject.org/tools-resources/projects/matchbox"
+WEB_SITE="https://www.yoctoproject.org/software-item/matchbox/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libfakekey/snapshot/$TARBALL"
 
 BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXtst-dev"
-SPLIT="libfakekey-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e libffcall/receipt
--- a/libffcall/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libffcall/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 	make install || return 1
 
 	mkdir -p $install/usr/share/doc/
-	mv $install/usr/share/html/ $install/usr/share/doc/$PACKAGE/ 
+	mv $install/usr/share/html/ $install/usr/share/doc/$PACKAGE/
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libffi/receipt
--- a/libffi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libffi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.2.1"
 CATEGORY="development"
 SHORT_DESC="A portable foreign function interface library"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://sourceware.org/libffi/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libffi.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://sourceware.org/ftp/libffi/$TARBALL"
 
-SPLIT="libffi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e '/^includesdir/ s/$(libdir).*$/$(includedir)/' \
@@ -27,7 +27,8 @@
 		$CONFIGURE_ARGS &&
 #	sed -i 's|^\(toolexeclibdir = \).*|\1/usr/lib|' Makefile \
 #		$HOST_SYSTEM-gnu/Makefile &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libfm-extra/receipt
--- a/libfm-extra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libfm-extra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,8 @@
 #WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL" # SF download problems
 WGET_URL="https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS="automake gtk-doc libtool gettext intltool glib-dev"
-SPLIT="libfm-extra-dev"
+BUILD_DEPENDS="automake gtk-doc libtool gettext-dev intltool glib-dev"
+SPLIT="$PACKAGE-dev"
 SIBLINGS="libfm"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libfm-qt/receipt
--- a/libfm-qt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libfm-qt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,17 +6,18 @@
 SHORT_DESC="Core library of PCManFM-Qt"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://github.com/lxde/libfm-qt"
+WEB_SITE="https://github.com/lxqt/libfm-qt"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/libfm-qt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/libfm-qt/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="lxqt-build-tools mesa-dev libfm-dev"
-SPLIT="libfm-qt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e libfm/receipt
--- a/libfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.0.2"
 CATEGORY="system-tools"
 SHORT_DESC="File management support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/Libfm"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/libfm.html"
@@ -13,10 +13,10 @@
 #WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL" # SF download problems
 WGET_URL="https://git.lxde.org/gitweb/?p=lxde/libfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS="automake gtk-doc libtool gettext glib-dev intltool vala \
+BUILD_DEPENDS="automake gtk-doc libtool gettext-dev glib-dev intltool vala \
 gtk2-dev pango-dev cairo-dev menu-cache-dev libexif-dev"
 SIBLINGS="libfm-extra"
-SPLIT="libfm-gtk libfm-dev"
+SPLIT="$PACKAGE-gtk $PACKAGE-dev"
 
 compile_rules() {
 	# tarball from git.lxde.org requires this step
diff -r ad29ddfee1c9 -r d5aab818505e libftdi/receipt
--- a/libftdi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libftdi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.18"
 CATEGORY="system-tools"
 SHORT_DESC="A library to talk to FTDI chips using libusb"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL2 LGPL2"
 WEB_SITE="https://www.intra2net.com/en/developer/libftdi/"
 
@@ -12,13 +12,13 @@
 WGET_URL="https://www.intra2net.com/en/developer/libftdi/download/$TARBALL"
 
 BUILD_DEPENDS="slitaz-toolchain libusb-dev libusb libusb-compat-dev eudev-dev"
-SPLIT="libftdi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgcrypt/receipt
--- a/libgcrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgcrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.8.3"
 CATEGORY="security"
 SHORT_DESC="Cryptographic library based on GnuPG"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://www.gnupg.org/related_software/libgcrypt/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgcrypt.html"
@@ -15,15 +15,9 @@
 TARBALL_SHA1="13bd2ce69e59ab538e959911dfae80ea309636e3"
 
 BUILD_DEPENDS="libgpg-error-dev"
-SPLIT="libgcrypt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm)
-			CONFIGURE_ARGS="--build=i486-slitaz-linux \
-							--host=arm-slitaz-linux-gnueabi";;
-	esac
-
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e libgd/receipt
--- a/libgd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Library for the dynamic creation of images"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://www.libgd.org/"
+WEB_SITE="https://libgd.github.io/"
 REPOLOGY="gd"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="automake libtool xorg-libX11-dev zlib-dev libpng16-dev \
 freetype-dev fontconfig-dev libjpeg-turbo-dev xorg-libXpm-dev tiff-dev \
 libwebp-dev"
-SPLIT="libgd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e libgdata/receipt
--- a/libgdata/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgdata/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,10 +14,11 @@
 BUILD_DEPENDS="glib-dev libxml2-dev libsoup-dev json-glib-dev liboauth-dev \
 gdk-pixbuf-dev uhttpmock-dev intltool gobject-introspection-dev vala \
 shared-mime-info gcr-dev gnome-online-accounts-dev"
-SPLIT="libgdata-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	DATADIRNAME=share ./configure \
+	DATADIRNAME=share \
+	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		$CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgdiplus/receipt
--- a/libgdiplus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgdiplus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,9 +5,9 @@
 CATEGORY="development"
 SHORT_DESC="Mono library providing a GDI+ compatible API on non-Windows \
 operating systems"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.mono-project.com/Libgdiplus"
+WEB_SITE="https://www.mono-project.com/Libgdiplus/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mono/libgdiplus/archive/$VERSION.tar.gz"
@@ -16,7 +16,7 @@
 cairo-dev expat-dev freetype-dev fontconfig-dev giflib giflib-dev jpeg-dev \
 libpng16-dev tiff-dev xorg-pixman-dev libexif-dev libexif zlib-dev \
 util-linux-uuid-dev automake autoconf libtool"
-SPLIT="libgdiplus-dev"
+SPLIT="$PACKAGE-dev"
 
 # Build documentation at http://mono-project.com/Compiling_Mono
 # and http://mono-project.com/Release_Notes_Mono_2.4#Installing_Mono_2.4
@@ -28,7 +28,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgee/receipt
--- a/libgee/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgee/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.20.1"
 CATEGORY="x-window"
 SHORT_DESC="GObject collection library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/Libgee"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev gobject-introspection-dev"
-SPLIT="libgee-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgit2/receipt
--- a/libgit2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgit2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A linkable library for Git"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="https://libgit2.github.com/"
+WEB_SITE="https://libgit2.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libgit2/libgit2/archive/v$VERSION.tar.gz"
diff -r ad29ddfee1c9 -r d5aab818505e libglade/receipt
--- a/libglade/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libglade/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.6.4"
 CATEGORY="x-window"
 SHORT_DESC="The Glade libs"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://developer.gnome.org/libglade/"
 
@@ -12,10 +12,10 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
-SPLIT="libglade-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in || exit 1
+	sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in || return 1
 	mkdir po; touch po/POTFILES.in
 
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libglademm/receipt
--- a/libglademm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libglademm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.6.7"
 CATEGORY="system-tools"
 SHORT_DESC="A C++ wrapper for libglade"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.gtkmm.org/en/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtkmm-dev libglade-dev cairomm-dev libxml2-dev glibmm-dev"
-SPLIT="libglademm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|gtkmm/main|gtkmm|' examples/variablesmap/main.cc
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgnome-games-support/receipt
--- a/libgnome-games-support/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnome-games-support/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Code shared between GNOME games"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3 LGPL3"
-WEB_SITE="https://git.gnome.org/browse/libgnome-games-support"
+WEB_SITE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala libgee-dev gtk3-dev gettext"
-SPLIT="libgnome-games-support-dev"
+BUILD_DEPENDS="vala libgee-dev gtk3-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgnome-keyring/receipt
--- a/libgnome-keyring/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnome-keyring/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,16 @@
 PACKAGE="libgnome-keyring"
 VERSION="2.32.0"
 CATEGORY="x-window"
-SHORT_DESC="A library that keep password and other secrets for users"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Keep password and other secrets for users"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libgcrypt-dev dbus-dev glib-dev intltool"
-SPLIT="libgnome-keyring-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgnome-keyring3/receipt
--- a/libgnome-keyring3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnome-keyring3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="intltool gtk-doc gobject-introspection-dev vala dbus-dev \
 libgcrypt-dev"
-SPLIT="libgnome-keyring3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgnome/receipt
--- a/libgnome/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnome/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="2.32.1"
 CATEGORY="x-window"
 SHORT_DESC="GNOME Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext gconf-dev intltool gnome-vfs-dev \
+BUILD_DEPENDS="automake libtool gettext-dev gconf-dev intltool gnome-vfs-dev \
 libbonobo-dev libcanberra-dev popt-dev libgcrypt-dev"
-SPLIT="libgnome-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi
diff -r ad29ddfee1c9 -r d5aab818505e libgnomecanvas/receipt
--- a/libgnomecanvas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnomecanvas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.30.3"
 CATEGORY="x-window"
 SHORT_DESC="GNOME canvas library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gtk2-dev libglade-dev libart_lgpl-dev xorg-libXcursor-dev \
 intltool"
-SPLIT="libgnomecanvas-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgnomecanvasmm/receipt
--- a/libgnomecanvasmm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnomecanvasmm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.26.0"
 CATEGORY="x-window"
 SHORT_DESC="A C++ wrapper for libgnomecanvas"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.gtkmm.org/en/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gfortran gtkmm-dev libgnomecanvas-dev"
-SPLIT="libgnomecanvasmm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|.*glibmm/propertyproxy.h|#include <gtkmm.h>\n&|' \
diff -r ad29ddfee1c9 -r d5aab818505e libgnomeprint/receipt
--- a/libgnomeprint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnomeprint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.18.8"
 CATEGORY="x-window"
 SHORT_DESC="GNOME print library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev pango-dev intltool flex libart_lgpl-dev libxml2-dev"
-SPLIT="libgnomeprint-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgnomeprintui/receipt
--- a/libgnomeprintui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnomeprintui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,18 @@
 VERSION="2.18.6"
 CATEGORY="x-window"
 SHORT_DESC="GNOME print user interface library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gnome-icon-theme flex libgnomeprint-dev \
 xorg-libXinerama-dev xorg-libXrandr-dev xorg-libXcursor-dev \
 xorg-libXcomposite-dev xorg-libXdamage-dev \
 libgnomecanvas-dev libart_lgpl-dev intltool"
-SPLIT="libgnomeprintui-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgnomeui/receipt
--- a/libgnomeui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgnomeui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="libgnomeui"
 VERSION="2.24.5"
 CATEGORY="x-window"
-SHORT_DESC="This is the GUI parts of what was previously gnome-libs"
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="GUI parts of what was previously gnome-libs"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e libgooglepinyin/receipt
--- a/libgooglepinyin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgooglepinyin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://libgooglepinyin.googlecode.com/files/$TARBALL" # FIXME
 
 BUILD_DEPENDS="cmake"
-SPLIT="libgooglepinyin-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -21,7 +21,7 @@
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
 	make &&
-	make install/fast DESTDIR=$DESTDIR
+	make install/fast DESTDIR=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgpg-error/receipt
--- a/libgpg-error/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgpg-error/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.32"
 CATEGORY="security"
 SHORT_DESC="Commons error messages for GnuPG"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnupg.org/related_software/libgpg-error/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgpg-error.html"
@@ -14,8 +14,8 @@
 # https://www.gnupg.org/download/integrity_check.html
 TARBALL_SHA1="e310718c7737c816cb1313a2f3baf60fd6a6d5d3"
 
-BUILD_DEPENDS="gettext"
-SPLIT="libgpg-error-dev"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgphoto2/receipt
--- a/libgphoto2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgphoto2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.19"
 CATEGORY="graphics"
 SHORT_DESC="Core library of gphoto2 to access photos from digital camera"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.gphoto.org/"
 REPOLOGY="gphoto2"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
 
-BUILD_DEPENDS="libtool gettext libjpeg-turbo-dev libexif-dev libusb-dev \
+BUILD_DEPENDS="libtool gettext-dev libjpeg-turbo-dev libexif-dev libusb-dev \
 libxml2-dev libgd-dev" # use of libusb-compat-dev disabled while libusb found
-SPLIT="libgphoto2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgpod/receipt
--- a/libgpod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgpod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="0.7.94"
 CATEGORY="multimedia"
 SHORT_DESC="Library to access the contents of an iPod"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.gtkpod.org/libgpod.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/gtkpod/$TARBALL"
 
-BUILD_DEPENDS="$DEPENDS intltool python-pygobject2 libxml2-dev sqlite3-dev glib-dev \
+BUILD_DEPENDS="intltool python-pygobject2 libxml2-dev sqlite3-dev glib-dev \
 libplist-dev zlib-dev libffi"
-SPLIT="libgpod-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgringotts/receipt
--- a/libgringotts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgringotts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/gringotts.berlios/$TARBALL"
 
 BUILD_DEPENDS="bzip2-dev zlib-dev libmcrypt-dev mhash-dev file"
-SPLIT="libgringotts-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgsf/receipt
--- a/libgsf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgsf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.14.42"
 CATEGORY="libs"
 SHORT_DESC="GNOME Structured File Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://developer.gnome.org/gsf/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgsf.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="intltool gtk-doc glib-dev libxml2-dev zlib-dev bzip2-dev \
 gdk-pixbuf-dev gobject-introspection-dev"
-SPLIT="libgsf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libgtkhtml/receipt
--- a/libgtkhtml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgtkhtml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,22 @@
 VERSION="2.11.1"
 CATEGORY="x-window"
 SHORT_DESC="A gtk-based HTML rendering/editing library"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://freshmeat.net/projects/libgtkhtml/"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/libgtkhtml/"
 REPOLOGY="gtkhtml2"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev gtk2-dev xorg-libXdamage-dev expat-dev"
-SPLIT="libgtkhtml-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgtkimageview/receipt
--- a/libgtkimageview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgtkimageview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.4"
 CATEGORY="system-tools"
 SHORT_DESC="Simple image viewer widget for GTK"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://web.archive.org/web/20130517010338/http://trac.bjourne.webfactional.com/"
 
@@ -12,13 +12,13 @@
 WGET_URL="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/$TARBALL?format=raw" # FIXME
 
 BUILD_DEPENDS="gtk2-dev expat-dev"
-SPLIT="libgtkimageview-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libgtop/receipt
--- a/libgtop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgtop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev intltool xorg-libX11-dev xorg-libXau-dev gtk-doc"
-SPLIT="libgtop-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libgudev/receipt
--- a/libgudev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgudev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="232"
 CATEGORY="libdevel"
 SHORT_DESC="GObject bindings for libudev"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/libgudev"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libgudev.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="gtk-doc gobject-introspection-dev eudev-dev glib-dev"
-SPLIT="libgudev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libguess/receipt
--- a/libguess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libguess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,25 +6,22 @@
 SHORT_DESC="User input ambiguity resolver for user inputs written in C++"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://sourceforge.net/projects/libguess"
+WEB_SITE="https://sourceforge.net/projects/libguess"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://git.code.sf.net/p/libguess/code"
 
-DEPENDS="gcc-lib-base glibc-base"
 BUILD_DEPENDS="git"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd Release
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $src/Release/libguess.so $fs/usr/lib
 	mkdir -p $fs/usr/include/libguess
 	install -m644 $src/src/Guess.h $fs/usr/include/libguess/libguess.h
+	DEPENDS="gcc-lib-base glibc-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e libgusb/receipt
--- a/libgusb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libgusb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="libgusb"
 VERSION="0.3.0"
 CATEGORY="libdevel"
-SHORT_DESC="GUsb is a GObject wrapper for libusb1"
+SHORT_DESC="GObject wrapper for libusb1"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/hughsie/libgusb"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="meson ninja glib-dev libusb-dev gobject-introspection-dev vala \
 gtk-doc"
-SPLIT="libgusb-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libhangul/receipt
--- a/libhangul/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libhangul/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libhangul.googlecode.com/files/$TARBALL" # FIXME
 
-SPLIT="libhangul-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libharu/receipt
--- a/libharu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libharu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/libharu/libharu/archive/RELEASE_${VERSION//./_}.tar.gz"
 
 BUILD_DEPENDS="automake libtool zlib-dev libpng16-dev"
-SPLIT="libharu-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch include/config.h.in
diff -r ad29ddfee1c9 -r d5aab818505e libhtp/receipt
--- a/libhtp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libhtp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="0.2.6"
 CATEGORY="system-tools"
 SHORT_DESC="Security-aware parser for the HTTP protocol"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.openinfosecfoundation.org"
+WEB_SITE="https://github.com/OISF/libhtp"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://www.openinfosecfoundation.org/download/$TARBALL"
+WGET_URL="http://www.openinfosecfoundation.org/download/$TARBALL" # FIXME
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="libhtp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libhx/receipt
--- a/libhx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libhx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="coreutils-file-special"
-SPLIT="libhx-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libical/receipt
--- a/libical/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libical/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.1"
 CATEGORY="system-tools"
 SHORT_DESC="iCalendar library implementation in C"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL LGPL2.1"
 WEB_SITE="https://github.com/libical"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libical.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/libical/libical/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake perl db-dev glib-dev gobject-introspection-dev libxml2-dev"
-SPLIT="libical-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libicns/receipt
--- a/libicns/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libicns/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/icns/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev jasper-dev"
-SPLIT="libicns-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libidl/receipt
--- a/libidl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libidl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.14"
 CATEGORY="development"
 SHORT_DESC="IDL Compiling Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://github.com/GNOME/libIDL"
 
@@ -12,9 +12,7 @@
 WGET_URL="$GNOME_MIRROR/libIDL/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="bison flex glib-dev"
-SPLIT="libidl-dev"
-
-CROSS="bug: can not run test program"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libidn/receipt
--- a/libidn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libidn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libidn2/receipt
--- a/libidn2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libidn2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/libidn/$TARBALL"
 
-BUILD_DEPENDS="gtk-doc gettext glib-dev git libunistring-dev"
-SPLIT="libidn2-dev"
+BUILD_DEPENDS="gtk-doc gettext-dev glib-dev git libunistring-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libiec61883/receipt
--- a/libiec61883/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libiec61883/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="libiec61883"
 VERSION="1.2.0"
 CATEGORY="system-tools"
-SHORT_DESC="libiec61883 is a standard defining a high speed serial bus"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Standard defining a high speed serial bus"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://www.kernel.org/pub/linux/libs/ieee1394/$TARBALL"
 
 BUILD_DEPENDS="libraw1394-dev"
-SPLIT="libiec61883-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libimobiledevice/receipt
--- a/libimobiledevice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libimobiledevice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,16 +5,16 @@
 CATEGORY="misc"
 SHORT_DESC="Software library that talks the protocols to support iPhone and \
 iPod Touch devices on Linux"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://libimobiledevice.org"
+WEB_SITE="http://www.libimobiledevice.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
 BUILD_DEPENDS="gnutls-dev glib-dev libplist-dev usbmuxd-dev python-dev swig \
 libxml2-dev libgcrypt-dev"
-SPLIT="libimobiledevice-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libindicator-gtk2/receipt
--- a/libindicator-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libindicator-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://launchpad.net/libindicator/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev glib-dev automake libtool"
-SPLIT="libindicator-gtk2-dev"
+SPLIT="$PACKAGE-dev"
 SIBLINGS="libindicator-gtk3"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libindicator-gtk3/receipt
--- a/libindicator-gtk3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libindicator-gtk3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://launchpad.net/libindicator/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="gtk3-dev glib-dev automake libtool"
-SPLIT="libindicator-gtk3-dev"
+SPLIT="$PACKAGE-dev"
 SIBLINGS="libindicator-gtk2"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libiodbc/receipt
--- a/libiodbc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libiodbc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="3.52.12"
 CATEGORY="system-tools"
 SHORT_DESC="Independent Open DataBase Connectivity"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.iodbc.org/"
+WEB_SITE="http://www.iodbc.org/dataspace/doc/iodbc/wiki/iodbcWiki/WelcomeVisitors"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libiodbc.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/iodbc/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev chrpath"
-SPLIT="libiodbc-gui libiodbc libiodbc-dev"
+SPLIT="$PACKAGE-gui $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -32,7 +32,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libiodbc-gui)
+		*-gui)
 			copy iodbcadm-gtk libdrvproxy.so* libiodbcadm.so*
 			DEPENDS="glib gtk2 libiodbc"
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e libirman/receipt
--- a/libirman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libirman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.4.5"
 CATEGORY="utilities"
 SHORT_DESC="Library for Irman"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lirc.org/html/install.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.lirc.org/software/snapshots/$TARBALL"
 
-SPLIT="libirman-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libisofs/receipt
--- a/libisofs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libisofs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://files.libburnia-project.org/releases/$TARBALL"
 
 BUILD_DEPENDS="gfortran acl-dev attr-dev zlib-dev libjte-dev"
-SPLIT="libisofs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libjpeg-turbo/receipt
--- a/libjpeg-turbo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libjpeg-turbo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,13 +8,12 @@
 LICENSE="MIT"
 WEB_SITE="https://libjpeg-turbo.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libjpeg.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake nasm"
-SPLIT="jpeg-turbo libjpeg-turbo-dev"
+SPLIT="jpeg-turbo $PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libjpeg62/receipt
--- a/libjpeg62/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libjpeg62"
-VERSION="6b"
-CATEGORY="x-window"
-SHORT_DESC="JPEG shared libs (from Independent JPEG Group)"
-MAINTAINER="paul@slitaz.org"
-LICENSE="MIT"
-WEB_SITE="http://www.ijg.org/"
-TARBALL="libjpeg6b_${VERSION}.orig.tar.gz"
-WGET_URL="ftp://ftp.debian.org/debian/pool/main/libj/libjpeg6b/$TARBALL"
-TAGS="jpeg jpg"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --enable-shared --prefix=/usr \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
-	make
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $src/.libs/*.so.62* $fs/usr/lib
-}
diff -r ad29ddfee1c9 -r d5aab818505e libjpeg6b/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libjpeg6b/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,23 @@
+# SliTaz package receipt v2.
+
+PACKAGE="libjpeg6b"
+VERSION="6b2"
+CATEGORY="x-window"
+SHORT_DESC="JPEG shared libs (from Independent JPEG Group)"
+MAINTAINER="paul@slitaz.org"
+LICENSE="MIT"
+WEB_SITE="http://www.ijg.org/"
+
+TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
+WGET_URL="http://ftp.debian.org/debian/pool/main/libj/$PACKAGE/$TARBALL"
+
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make -j1 MKDIR_P="mkdir -p" install
+}
+
+genpkg_rules() {
+	copy *.so*
+	TAGS="jpeg jpg"
+}
diff -r ad29ddfee1c9 -r d5aab818505e libjreen/receipt
--- a/libjreen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libjreen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,19 @@
 WGET_URL="http://qutim.org/dwnl/44/$TARBALL"
 
 BUILD_DEPENDS="Qt4-dev qca-dev libidn-dev cmake qmake zlib-dev"
-SPLIT="libjreen libjreen-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	sed -i	-e 's/ moc_options /&moc_target /' \
+	sed \
+		-e 's/ moc_options /&moc_target /' \
 		-e 's/\(QT4_CREATE_MOC_COMMAND.*\))/\1 "${moc_target}")/' \
-			cmake/jreenMacros.cmake
+		-i cmake/jreenMacros.cmake
 	mkdir build
 	cd    build
-	cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
-	make DESTDIR=$DESTDIR install
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libjson/receipt
--- a/libjson/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libjson/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,16 +11,16 @@
 TARBALL="${PACKAGE}_$VERSION.zip"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libjson-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	unset CXXFLAGS
 	mkdir Objects_static Objects_shared _internal/Source/Dependencies
-	mkdir -p $DESTDIR/usr/lib 
+	mkdir -p $install/usr/lib
 	sed -i 's|^in[a-z]*_path *= |&$(DESTDIR)|' makefile
 	make SHARED=1 all &&
-	make DESTDIR=$DESTDIR install
-	make DESTDIR=$DESTDIR SHARED=1 install
+	make DESTDIR=$install install
+	make DESTDIR=$install SHARED=1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libjte/receipt
--- a/libjte/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libjte/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://www.einval.com/~steve/software/JTE/download/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev bzip2-dev"
-SPLIT="libjte-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e libksba/receipt
--- a/libksba/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libksba/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.5"
 CATEGORY="security"
 SHORT_DESC="Library to work with X.509 certificates, CMS data and related objects"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnupg.org/related_software/libksba/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libksba.html"
@@ -15,7 +15,7 @@
 TARBALL_SHA1="a98385734a0c3f5b713198e8d6e6e4aeb0b76fde"
 
 BUILD_DEPENDS="libgpg-error-dev"
-SPLIT="libksba-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -26,7 +26,13 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libksba) copy @std; DEPENDS="libgpg-error";;
-		*-dev)   copy @dev; DEPENDS="libksba libgpg-error-dev";;
+		libksba)
+			copy @std
+			DEPENDS="libgpg-error"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="libksba libgpg-error-dev"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e libkscreen/receipt
--- a/libkscreen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libkscreen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,11 @@
 WGET_URL="http://download.kde.org/stable/plasma/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules qt5-dev mesa-dev kwayland-dev"
-SPLIT="libkscreen-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e liblinebreak/receipt
--- a/liblinebreak/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblinebreak/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,16 +9,16 @@
 WEB_SITE="http://vimgadgets.sourceforge.net/liblinebreak/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/vimgadgets/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/vimgadgets/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="liblinebreak-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e liblo/receipt
--- a/liblo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.29"
 CATEGORY="multimedia"
 SHORT_DESC="Lightweight OSC (Open Sound Control) protocol implementation"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://liblo.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/radarsat1/liblo/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="doxygen"
-SPLIT="liblo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e liblognorm/receipt
--- a/liblognorm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblognorm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.7"
 CATEGORY="system-tools"
 SHORT_DESC="A log normalization library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.liblognorm.com/download/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://www.liblognorm.com/files/download/$TARBALL"
 
 BUILD_DEPENDS="libestr-dev libee-dev automake"
-SPLIT="liblognorm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e liblouis/receipt
--- a/liblouis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblouis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://liblouis.googlecode.com/files/$TARBALL" # FIXME
 
 BUILD_DEPENDS="python-dev"
-SPLIT="liblouis-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e liblrdf/receipt
--- a/liblrdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblrdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="0.4.0"
 CATEGORY="multimedia"
 SHORT_DESC="A library for the manipulation of RDF file in LADSPA plugins"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://sourceforge.net/projects/lrdf"
+WEB_SITE="https://sourceforge.net/projects/lrdf/"
 
-TARBALL="${PACKAGE}-${VERSION}.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lrdf/$TARBALL"
 
 BUILD_DEPENDS="raptor-dev ladspa-dev curl-dev libxslt-dev \
 autoconf automake libtool"
-SPLIT="liblrdf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vfi
diff -r ad29ddfee1c9 -r d5aab818505e liblxqt/receipt
--- a/liblxqt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liblxqt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Core utility library for all LXDE-Qt components"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://github.com/lxde/liblxqt"
+WEB_SITE="https://github.com/lxqt/liblxqt"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/liblxqt.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="lxqt-build-tools xorg-libX11-dev mesa-dev libqtxdg-dev \
 kwindowsystem-dev xorg-libXScrnSaver-dev"
-SPLIT="liblxqt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r ad29ddfee1c9 -r d5aab818505e libmad/receipt
--- a/libmad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.15.1b"
 CATEGORY="multimedia"
 SHORT_DESC="MPEG audio decoder library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.underbit.com/products/mad/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/mad/$TARBALL"
 
 BUILD_DEPENDS="automake libtool gfortran"
-SPLIT="libmad-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
diff -r ad29ddfee1c9 -r d5aab818505e libmanette/receipt
--- a/libmanette/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmanette/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="meson ninja glib-dev libgudev-dev libevdev-dev \
 gobject-introspection-dev vala libxml2-tools"
-SPLIT="libmanette-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libmatchbox/receipt
--- a/libmatchbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmatchbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.12"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox shared library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://matchbox-project.org/"
+WEB_SITE="https://www.yoctoproject.org/software-item/matchbox/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/snapshot/$TARBALL"
 
 BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libXext-dev pango-dev \
 libpng16-dev libjpeg-turbo-dev"
-SPLIT="libmatchbox-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e libmatekbd/receipt
--- a/libmatekbd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmatekbd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/libmatekbd/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gobject-introspection-dev gtk3-dev libxklavier-dev"
-SPLIT="libmatekbd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmatemixer/receipt
--- a/libmatemixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmatemixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/libmatemixer/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk-doc pulseaudio-dev alsa-lib-dev"
-SPLIT="libmatemixer-pulse libmatemixer libmatemixer-dev"
+SPLIT="$PACKAGE-pulse $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e libmateweather/receipt
--- a/libmateweather/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmateweather/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/libmateweather/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gtk-doc gtk3-dev libsoup-dev tzdata"
-SPLIT="libmateweather-misc-icons libmateweather-misc-locales libmateweather-dev"
+SPLIT="$PACKAGE-misc-icons $PACKAGE-misc-locales $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e libmcp23s17/receipt
--- a/libmcp23s17/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="libmcp23s17"
-VERSION="0.3.0"
-CATEGORY="system-tools"
-SHORT_DESC="A simple C library for accessing an MCP23S17 port expander."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/piface/libmcp23s17"
-WGET_URL="https://github.com/piface/libmcp23s17/archive/v${VERSION}.tar.gz"
-HOST_ARCH="arm"
-
-DEPENDS="i2c-tools"
-TAGS="raspberrypi rpi"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i \
-		-e s"/^CC=gcc/CC=${HOST_SYSTEM}-gcc/" \
-		-e s"/^CFLAGS=.*/CFLAGS=-c -Wall $CFLAGS/" Makefile
-	make && 
-	${HOST_SYSTEM}-gcc -o mcp23s17-example example.c -Isrc/ -L. -lmcp23s17
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/include
-	cp -a ${src}/*-example $fs/usr/bin
-	cp -a ${src}/${PACKAGE}.a ${fs}/usr/lib
-	cp -a ${src}/src/mcp23s17.h ${fs}/usr/include
-}
diff -r ad29ddfee1c9 -r d5aab818505e libmcrypt/receipt
--- a/libmcrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmcrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,20 @@
 VERSION="2.5.8"
 CATEGORY="security"
 SHORT_DESC="Encryption Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://mcrypt.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mcrypt/$TARBALL"
 
-SPLIT="libmcrypt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libmcs/receipt
--- a/libmcs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmcs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.2"
 CATEGORY="system-tools"
 SHORT_DESC="Library for configuration storage"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/atheme-legacy/libmcs/"
 
@@ -12,14 +12,15 @@
 WGET_URL="http://distfiles.atheme.org/$TARBALL"
 
 BUILD_DEPENDS="libmowgli-dev"
-SPLIT="libmcs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	sed -i 's/libmowgli/libmowgli-2/' configure configure.ac libmcs.pc.in
-	sed -i "s/touch -t 0001010000 /touch /g" configure
+	sed -i 's|libmowgli|libmowgli-2|' configure configure.ac libmcs.pc.in
+	sed -i 's|touch -t 0001010000 |touch |g' configure
+
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libmicrohttpd/receipt
--- a/libmicrohttpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmicrohttpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,9 +3,8 @@
 PACKAGE="libmicrohttpd"
 VERSION="0.9.33"
 CATEGORY="network"
-SHORT_DESC="A small C library that is supposed to make it easy to run an HTTP \
-server as part of another application"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Run HTTP server as part of another application"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.gnu.org/software/libmicrohttpd/"
 
@@ -13,7 +12,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libgcrypt-dev gmp-dev gnutls-dev libtasn1-dev"
-SPLIT="libmicrohttpd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -25,12 +24,13 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	mkdir -p $DESTDIR/usr/include/$PACKAGE
-	cp -a src/include/platform.h $DESTDIR/usr/include/$PACKAGE
-	cp -a src/include/plibc/plibc.h $DESTDIR/usr/include/$PACKAGE
-	sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' $DESTDIR/usr/lib/pkgconfig/libmicrohttpd.pc
+	mkdir -p $install/usr/include/$PACKAGE
+	cp -a src/include/platform.h $install/usr/include/$PACKAGE
+	cp -a src/include/plibc/plibc.h $install/usr/include/$PACKAGE
+	sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
+		$install/usr/lib/pkgconfig/libmicrohttpd.pc
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libmikmod/receipt
--- a/libmikmod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmikmod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Mikmod module player library"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2 LGPL2.1"
-WEB_SITE="http://mikmod.shlomifish.org/"
+WEB_SITE="http://mikmod.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mikmod/$TARBALL"
 
 BUILD_DEPENDS="bash"
-SPLIT="libmikmod-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch macintosh/_libmikmodversion.r
diff -r ad29ddfee1c9 -r d5aab818505e libmms/receipt
--- a/libmms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="libmms"
 VERSION="0.6.4"
 CATEGORY="development"
-SHORT_DESC="LibMMS is a common library for parsing mms and mmsh streams"
-MAINTAINER="slitaz@kacper.se"
+SHORT_DESC="Parsing mms and mmsh streams"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://launchpad.net/libmms"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="glib-dev"
-SPLIT="libmms-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmng/receipt
--- a/libmng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev libjpeg-turbo-dev lcms2-dev"
-SPLIT="libmng-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libmnl/receipt
--- a/libmnl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmnl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Minimalistic Netlink communication library"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.netfilter.org/projects/libmnl/"
+WEB_SITE="https://netfilter.org/projects/libmnl/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}files/$TARBALL"
 
-SPLIT="libmnl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmodplug/receipt
--- a/libmodplug/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmodplug/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.8.9.0"
 CATEGORY="multimedia"
 SHORT_DESC="A MOD playing library"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://modplug-xmms.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/modplug-xmms/$TARBALL"
 
-SPLIT="libmodplug-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmowgli/receipt
--- a/libmowgli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmowgli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.0.0"
 CATEGORY="system-tools"
 SHORT_DESC="High performance and highly flexible algorithms"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://atheme.org/projects/libmowgli.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/atheme/libmowgli-2/archive/$TARBALL"
 
-SPLIT="libmowgli-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "s/touch -t 0001010000 /touch /g" configure
diff -r ad29ddfee1c9 -r d5aab818505e libmpd/receipt
--- a/libmpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="11.8.17"
 CATEGORY="multimedia"
 SHORT_DESC="Signal based wrapper around libmpdclient"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gmpclient.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.sarine.nl/Programs/gmpc/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev"
-SPLIT="libmpd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmpdclient/receipt
--- a/libmpdclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmpdclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.11"
 CATEGORY="system-tools"
 SHORT_DESC="Library for interfacing Music Player Daemon (MPD)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.musicpd.org/libs/libmpdclient/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://www.musicpd.org/download/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="doxygen"
-SPLIT="libmpdclient-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmpeg2/receipt
--- a/libmpeg2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmpeg2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.1"
 CATEGORY="multimedia"
 SHORT_DESC="Decoding MPEG-1 and MPEG-2 video streams"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://libmpeg2.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libmpeg2.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gfortran xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
 xorg-libSM-dev xorg-libXv-dev"
-SPLIT="libmpeg2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/static const/static/' libmpeg2/idct_mmx.c &&
diff -r ad29ddfee1c9 -r d5aab818505e libmrss/receipt
--- a/libmrss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmrss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,9 +3,8 @@
 PACKAGE="libmrss"
 VERSION="0.19.2"
 CATEGORY="libs"
-SHORT_DESC="mRss is a C library for parsing, writing and creating RSS/ATOM \
-files or streams"
-MAINTAINER="tcg.thegamer@gmail.com"
+SHORT_DESC="Parsing, writing and creating RSS/ATOM files or streams"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.autistici.org/bakunin/libmrss/doc/"
 
@@ -13,7 +12,7 @@
 WGET_URL="https://www.autistici.org/bakunin/libmrss/$TARBALL"
 
 BUILD_DEPENDS="libnxml-dev curl-dev"
-SPLIT="libmrss-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libmspack/receipt
--- a/libmspack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmspack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.1alpha"
 CATEGORY="development"
 SHORT_DESC="A library for Microsoft compression formats"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.cabextract.org.uk/libmspack/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/kyz/libmspack/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool doxygen"
-SPLIT="libmspack-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd libmspack
diff -r ad29ddfee1c9 -r d5aab818505e libmtp/receipt
--- a/libmtp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmtp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.15"
 CATEGORY="system-tools"
 SHORT_DESC="Access to MTP devices: mp3 players, Android phones"
-MAINTAINER="keupont@no-log.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libmtp.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libusb-dev libgcrypt-dev"
-SPLIT="mtp-tools libmtp-dev"
+SPLIT="mtp-tools $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libmypaint/receipt
--- a/libmypaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libmypaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="libmypaint"
 VERSION="1.3.0"
 CATEGORY="graphics"
-SHORT_DESC="Library for making brushstrokes which is used by MyPaint and other projects"
+SHORT_DESC="Making brushstrokes used by MyPaint and other projects"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="http://mypaint.org/"
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mypaint/libmypaint/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="json-c-dev intltool gobject-introspection-dev"
-SPLIT="libmypaint-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libndp/receipt
--- a/libndp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libndp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://libndp.org/files/$TARBALL"
 
-SPLIT="libndp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libnet/receipt
--- a/libnet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2-rc3"
 CATEGORY="network"
 SHORT_DESC="API for commonly used low-level net functions"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://sourceforge.net/projects/libnet-dev/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/sam-github/libnet/archive/$TARBALL"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="libnet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# documentation is absent -> build is broken
diff -r ad29ddfee1c9 -r d5aab818505e libnetfilter_conntrack/receipt
--- a/libnetfilter_conntrack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnetfilter_conntrack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="API to the in-kernel connection tracking state table"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
+WEB_SITE="https://netfilter.org/projects/libnetfilter_conntrack/"
 REPOLOGY="libnetfilter-conntrack"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
diff -r ad29ddfee1c9 -r d5aab818505e libnetfilter_cthelper/receipt
--- a/libnetfilter_cthelper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnetfilter_cthelper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="API to the user-space helper infrastructure"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/libnetfilter_cthelper/"
+WEB_SITE="https://netfilter.org/projects/libnetfilter_cthelper/"
 REPOLOGY="libnetfilter-cthelper"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.netfilter.org/projects/libnetfilter_cthelper/files/$TARBALL"
 
 BUILD_DEPENDS="libmnl-dev"
-SPLIT="libnetfilter_cthelper-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libnetfilter_cttimeout/receipt
--- a/libnetfilter_cttimeout/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnetfilter_cttimeout/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="API to the fine-grain connection tracking timeout infrastructure"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/libnetfilter_cttimeout/"
+WEB_SITE="https://netfilter.org/projects/libnetfilter_cttimeout/"
 REPOLOGY="libnetfilter-cttimeout"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.netfilter.org/projects/libnetfilter_cttimeout/files/$TARBALL"
 
 BUILD_DEPENDS="libmnl-dev"
-SPLIT="libnetfilter_cttimeout-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libnetfilter_queue/receipt
--- a/libnetfilter_queue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnetfilter_queue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="API to packets that have been queued by the kernel packet filter"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/libnetfilter_queue/"
+WEB_SITE="https://netfilter.org/projects/libnetfilter_queue/"
 REPOLOGY="libnetfilter-queue"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
diff -r ad29ddfee1c9 -r d5aab818505e libnfc/receipt
--- a/libnfc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnfc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libtool libusb-dev libusb-compat-dev pcsc-lite-dev \
 eudev-dev readline-dev"
-SPLIT="libnfc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vifs
diff -r ad29ddfee1c9 -r d5aab818505e libnfnetlink/receipt
--- a/libnfnetlink/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnfnetlink/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Low-level library for netfilter related kernel/userspace communication"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.netfilter.org/projects/libnfnetlink/"
+WEB_SITE="https://netfilter.org/projects/libnfnetlink/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.netfilter.org/projects/libnfnetlink/files/$TARBALL"
 
-SPLIT="libnfnetlink-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libnfs/receipt
--- a/libnfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/sahlberg/libnfs/archive/$TARBALL"
 
 BUILD_DEPENDS="automake libtool   fuse2-dev talloc-dev"
-SPLIT="libnfs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vif &&
diff -r ad29ddfee1c9 -r d5aab818505e libnftnl/receipt
--- a/libnftnl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnftnl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Low-level netlink API"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.iptables.org/projects/libnftnl/"
+WEB_SITE="https://netfilter.org/projects/libnftnl/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}files/$TARBALL"
 TARBALL_SHA1="381b2b3cbb3fad186cb3f57bbf32d70f0b3c3c8e"
 
 BUILD_DEPENDS="libmnl-dev"
-SPLIT="libnftnl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libnice/receipt
--- a/libnice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.14"
 CATEGORY="system-tools"
 SHORT_DESC="The GLib ICE implementation"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1 MPL"
 WEB_SITE="https://nice.freedesktop.org/wiki/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gnutls-dev glib-dev gstreamer0-dev gstreamer1-dev \
 gobject-introspection-dev"
-SPLIT="libnice-gst0 libnice-gst1 libnice libnice-dev"
+SPLIT="$PACKAGE-gst0 $PACKAGE-gst1 $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -24,12 +24,12 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		libnice-gst0)
+		*-gst0)
 			copy libgstnice010.so
 			DEPENDS="glib gstreamer0 libnice"
 			CAT="multimedia|GStreamer-0.10 plugin"
 			;;
-		libnice-gst1)
+		*-gst1)
 			copy libgstnice.so
 			DEPENDS="glib gstreamer1 libnice"
 			CAT="multimedia|GStreamer-1.0 plugin"
@@ -38,7 +38,7 @@
 			copy @std @rm
 			DEPENDS="glib libgnutls"
 			;;
-		libnice-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="libnice libnice-gst0 libnice-gst1 \
 			glib-dev gnutls-dev"
diff -r ad29ddfee1c9 -r d5aab818505e libnids/receipt
--- a/libnids/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnids/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,27 @@
 PACKAGE="libnids"
 VERSION="1.24"
 CATEGORY="development"
-SHORT_DESC="An E-component of Network Intrusion Detection System."
+SHORT_DESC="An E-component of Network Intrusion Detection System"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://libnids.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://libnids.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 #https://sourceforge.net/projects/libnids/files/libnids/1.24/libnids-1.24.tar.gz
 
-DEPENDS=""
 BUILD_DEPENDS="libpcap-dev glib-dev libnet-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i "s|^install_prefix.*|install_prefix = $DESTDIR|" src/Makefile*
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	sed -i "s|^install_prefix.*|install_prefix = $install|" src/Makefile*
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e libnjb/receipt
--- a/libnjb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnjb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.7"
 CATEGORY="system-tools"
 SHORT_DESC="Communicating with the Creative Nomad JukeBox and Dell DJ"
-MAINTAINER="keupont@no-log.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://libnjb.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libusb-compat libusb-compat-dev libusb-dev eudev-dev"
-SPLIT="libnjb-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libnl/receipt
--- a/libnl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/thom311/libnl/releases/download/libnl${VERSION//./_}/$TARBALL"
 
 BUILD_DEPENDS="flex"
-SPLIT="libnl-tools libnl-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libnl1/receipt
--- a/libnl1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnl1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,17 +12,15 @@
 WGET_URL="http://www.infradead.org/~tgr/libnl/files/$TARBALL"
 
 BUILD_DEPENDS="flex"
-SPLIT="libnl1-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure && make && make install
+compile_rules() {
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		libnl1) copy @std;;
 		*-dev)  copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e libnotify/receipt
--- a/libnotify/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnotify/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.7"
 CATEGORY="utilities"
 SHORT_DESC="Notification library"
-MAINTAINER="fabrice.thiroux@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/libnotify/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gdk-pixbuf-dev glib-dev gtk2-dev gobject-introspection-dev \
 gtk-doc xmlto"
-SPLIT="libnotify-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e 's/REQ_GTK_VERSION=2.90/REQ_GTK_VERSION=2.24/' \
diff -r ad29ddfee1c9 -r d5aab818505e libnsl/receipt
--- a/libnsl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnsl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/thkukuk/libnsl/archive/v$VERSION/$TARBALL"
 
-BUILD_DEPENDS="automake gettext libtool libtirpc-dev rpcsvc-proto"
-SPLIT="libnsl-dev"
+BUILD_DEPENDS="automake gettext-dev libtool libtirpc-dev rpcsvc-proto"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e libnxml/receipt
--- a/libnxml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libnxml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,9 +3,8 @@
 PACKAGE="libnxml"
 VERSION="0.18.3"
 CATEGORY="libs"
-SHORT_DESC="nXML is a C library for parsing, writing and creating XML 1.0 and \
-1.1 files or streams"
-MAINTAINER="tcg.thegamer@gmail.com"
+SHORT_DESC="Parsing, writing and creating XML 1.0 and 1.1 files or streams"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.autistici.org/bakunin/libnxml/doc/"
 
@@ -13,7 +12,7 @@
 WGET_URL="https://www.autistici.org/bakunin/libnxml/$TARBALL"
 
 BUILD_DEPENDS="gfortran curl-dev"
-SPLIT="libnxml-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e liboauth/receipt
--- a/liboauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liboauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/x42/liboauth/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool curl-dev nss-dev"
-SPLIT="liboauth-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir m4
diff -r ad29ddfee1c9 -r d5aab818505e libofx/receipt
--- a/libofx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libofx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.8"
 CATEGORY="misc"
 SHORT_DESC="OFX parser library"
-MAINTAINER="remyhr@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://libofx.sourceforge.net/"
 
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="opensp-dev"
-SPLIT="libofx-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libogg/receipt
--- a/libogg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libogg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.3"
 CATEGORY="multimedia"
 SHORT_DESC="OGG library from Xiph.org project"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.xiph.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libogg.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://downloads.xiph.org/releases/ogg/$TARBALL"
 
-SPLIT="libogg-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e liboil/receipt
--- a/liboil/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liboil/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.3.17"
 CATEGORY="development"
 SHORT_DESC="Library of Optimized Inner Loops"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://liboil.freedesktop.org/wiki/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://liboil.freedesktop.org/download/$TARBALL"
 
-SPLIT="liboil-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e liboobs/receipt
--- a/liboobs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liboobs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Object Oriented Backends System"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="https://developer.gnome.org/liboobs/stable"
+WEB_SITE="https://developer.gnome.org/liboobs/stable/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="dbus-glib-dev glib-dev system-tools-backends-dev"
-SPLIT="liboobs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libopenraw/receipt
--- a/libopenraw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libopenraw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="boost-dev boost-unit-test-framework libjpeg-turbo-dev \
 libxml2-dev curl-dev glib-dev gdk-pixbuf-dev"
-SPLIT="libopenraw-gnome libopenraw libopenraw-dev"
+SPLIT="$PACKAGE-gnome $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e liboping/receipt
--- a/liboping/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liboping/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,19 +6,19 @@
 SHORT_DESC="Library to ping IPv4 and IPv6 hosts in parallel"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://noping.cc/"
+WEB_SITE="https://noping.cc/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://noping.cc/files/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev perl-dev libcap-dev"
-SPLIT="liboping-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libosinfo/receipt
--- a/libosinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libosinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="intltool libxslt-dev libsoup-dev gtk-doc check-dev \
 gobject-introspection-dev vala locale-en-base usbids pciids"
-SPLIT="libosinfo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir -p /usr/lib/locale
diff -r ad29ddfee1c9 -r d5aab818505e libotr/receipt
--- a/libotr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libotr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,19 +6,19 @@
 SHORT_DESC="Allows you to have private conversations over messenger"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
-WEB_SITE="http://www.cypherpunks.ca/otr/"
+WEB_SITE="https://otr.cypherpunks.ca/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev"
-SPLIT="libotr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libpano13/receipt
--- a/libpano13/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpano13/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/panotools/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev libpng16-dev libjpeg-turbo-dev tiff-dev"
-SPLIT="libpano13-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# to fix: undefined reference to `float2rgbe'; undefined reference to `rgbe2float'
diff -r ad29ddfee1c9 -r d5aab818505e libpaper/receipt
--- a/libpaper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpaper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.24+nmu5"
 CATEGORY="system-tools"
 SHORT_DESC="Library for handling paper characteristics"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://packages.debian.org/unstable/source/libpaper"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libpaper.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://ftp.debian.org/debian/pool/main/libp/libpaper/$TARBALL"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="libpaper-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e libpcap/receipt
--- a/libpcap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpcap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="libdevel"
 SHORT_DESC="Functions for user-level packet capture, used in low-level network \
 monitoring"
-MAINTAINER="sdaigl@lacitec.on.ca"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.tcpdump.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libpcap.html"
@@ -14,7 +14,7 @@
 WGET_URL="http://www.tcpdump.org/release/$TARBALL"
 
 BUILD_DEPENDS="flex bison libnl-dev"
-SPLIT="libpcap-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libpfm/receipt
--- a/libpfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,31 @@
 PACKAGE="libpfm"
 VERSION="4.8.0"
 CATEGORY="development"
-SHORT_DESC="Improve performance monitoring on Linux."
+SHORT_DESC="Improve performance monitoring on Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://perfmon2.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://perfmon2.sourceforge.net/"
 WGET_URL="$SF_MIRROR/perfmon2/$TARBALL"
 
-SPLIT="libpfm-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|PREFIX=/usr/local|PREFIX=/usr|' config.mk
+
 	make OPTIM="-m32 -O3" &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	libpfm)
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		;;
-	libpfm-dev)
-		DEPENDS="libpfm"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/lib/*a $fs/usr/lib
-		;;
+		libpfm)
+			copy @std
+			;;
+		libpfm-dev)
+			copy @dev
+			DEPENDS="libpfm"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e libpifacedigital/receipt
--- a/libpifacedigital/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpifacedigital/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,36 @@
 PACKAGE="libpifacedigital"
 VERSION="0.2.0"
 CATEGORY="system-tools"
-SHORT_DESC="A simple library for controlling PiFace Digital."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="A simple library for controlling PiFace Digital"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://www.piface.org.uk/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.piface.org.uk"
-WGET_URL="https://github.com/piface/libpifacedigital/archive/v${VERSION}.tar.gz"
+WGET_URL="https://github.com/piface/libpifacedigital/archive/v$VERSION.tar.gz"
 
-TAGS="raspberrypi rpi"
-DEPENDS="i2c-tools libmcp23s17"
 BUILD_DEPENDS="libmcp23s17"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i \
-		-e s"/^CC=gcc/CC=${HOST_SYSTEM}-gcc/" \
-		-e s"/gcc -o/${HOST_SYSTEM}-gcc -o/" \
-		-e s"/^CFLAGS=.*/CFLAGS=-c -Wall $CFLAGS/" \
-		-e s"#INCPATHS=.*#INCPATHS=/usr/include#" \
-		-e s"#LIBPATHS=.*#LIBPATHS=/usr/lib#" Makefile
-	make && make example && 
+compile_rules() {
+	sed \
+		-e "s/^CC=gcc/CC=${HOST_SYSTEM}-gcc/" \
+		-e "s/gcc -o/${HOST_SYSTEM}-gcc -o/" \
+		-e "s/^CFLAGS=.*/CFLAGS=-c -Wall $CFLAGS/" \
+		-e "s#INCPATHS=.*#INCPATHS=/usr/include#" \
+		-e "s#LIBPATHS=.*#LIBPATHS=/usr/lib#" \
+		-i Makefile
+
+	make &&
+	make example &&
 	make pifacedigital
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/include
-	cp -a ${src}/${PACKAGE}.a ${fs}/usr/lib
-	cp -a ${src}/pifacedigital ${fs}/usr/bin
-	cp -a ${src}/example ${fs}/usr/bin/pifacedigital-test
-	cp -a ${src}/src/pifacedigital.h ${fs}/usr/include
+	cp -a $src/$PACKAGE.a $fs/usr/lib
+	cp -a $src/pifacedigital $fs/usr/bin
+	cp -a $src/example $fs/usr/bin/pifacedigital-test
+	cp -a $src/src/pifacedigital.h $fs/usr/include
+	DEPENDS="i2c-tools libmcp23s17"
+	TAGS="raspberrypi rpi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e libpipeline/receipt
--- a/libpipeline/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpipeline/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://download.savannah.gnu.org/releases/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="check-dev"
-SPLIT="libpipeline-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libplayer/receipt
--- a/libplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.1"
 CATEGORY="multimedia"
 SHORT_DESC="A multimedia A/V abstraction layer API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libplayer.geexbox.org/"
 
@@ -13,20 +13,16 @@
 
 BUILD_DEPENDS="shared-mime-info xine-lib-dev xorg-libxcb-dev"
 # xorg-libX11-dev libvdpau-dev with --enable-xlib-hack
-SPLIT="libplayer-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--cross-compile" ;;
-	esac
-
 	sed -i 's/cat -n/awk '"'"'{ printf "%6d  %s\\n",++n,$0 }'"'"' </' configure
 	./configure \
 		--prefix=/usr\
 		--enable-mplayer \
 		--disable-gstreamer \
 		--disable-vlc \
-		$ARCH_ARGS &&
+		&&
 	make &&
 	make install
 }
diff -r ad29ddfee1c9 -r d5aab818505e libplist/receipt
--- a/libplist/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libplist/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,21 @@
 VERSION="2.0.0"
 CATEGORY="multimedia"
 SHORT_DESC="A library to handle Apple Property List format whereas it's binary or XMl"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://libimobiledevice.org/"
+WEB_SITE="http://www.libimobiledevice.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.libimobiledevice.org/downloads/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev glib-dev swig python python-dev python-cython"
-SPLIT="libplist-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libpng12/receipt
--- a/libpng12/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpng12/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 PATCH_URL="$SF_MIRROR/apng/$PATCH"
 
 BUILD_DEPENDS="gawk zlib-dev"
-SPLIT="libpng12-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	[ -s "$SRC/$PATCH" ] || wget -O "$SRC/$PATCH" $PATCH_URL
diff -r ad29ddfee1c9 -r d5aab818505e libpng16/receipt
--- a/libpng16/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpng16/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$SF_MIRROR/libpng/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="libpng16-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# don't use --disable-static: optipng-static require such lib
@@ -30,8 +30,8 @@
 
 	# Misc png tools
 	cd contrib/pngminus
-	make PNGLIB="-L$DESTDIR/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-	cp -a png2pnm pnm2png $DESTDIR/usr/bin
+	make PNGLIB="-L$install/usr/lib -lpng" -f makefile.std png2pnm pnm2png
+	cp -a png2pnm pnm2png $install/usr/bin
 }
 
 genpkg_rules() {
@@ -40,7 +40,7 @@
 			copy @std
 			DEPENDS="zlib"
 			;;
-		libpng16-dev)
+		*-dev)
 			copy @dev
 			DEPENDS="libpng16 zlib-dev"
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e libpri/receipt
--- a/libpri/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpri/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,18 +5,19 @@
 CATEGORY="system-tools"
 SHORT_DESC="C implementation of the Primary Rate ISDN specification (with BRI \
 support)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.asterisk.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.asterisk.org/pub/telephony/libpri/$TARBALL"
 
-SPLIT="libpri-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS="-Wno-error=unused-but-set-variable"
 	sed -i 's|tei = (h->u.data|// &|;s/int tei;/int tei = tei;/' q921.c
+
 	make || return 1
 
 	mkdir -p $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e libproxy/receipt
--- a/libproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="libproxy"
 VERSION="0.4.15"
 CATEGORY="multimedia"
-SHORT_DESC="library to provide automatic proxy configuration management"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Automatic proxy configuration management"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://libproxy.github.io/libproxy/"
 
@@ -12,15 +12,18 @@
 WGET_URL="https://github.com/libproxy/libproxy/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake webkitgtk-dev python-dev perl gtk2-dev"
-SPLIT="libproxy-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh
-	sed -i -e 's/WITH_MOZJS:BOOL=ON/WITH_MOZJS:BOOL=OFF/' \
-	       -e 's|/usr/local|/usr|' CMakeCache.txt
+	sed \
+		-e 's/WITH_MOZJS:BOOL=ON/WITH_MOZJS:BOOL=OFF/' \
+		-e 's|/usr/local|/usr|' \
+		-i CMakeCache.txt
+
 	./autogen.sh &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libpsl/receipt
--- a/libpsl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpsl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext libidn2-dev libunistring-dev publicsuffix-list"
-SPLIT="libpsl-dev"
+BUILD_DEPENDS="gettext-dev libidn2-dev libunistring-dev publicsuffix-list"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	rm -r list # remove outdated list
diff -r ad29ddfee1c9 -r d5aab818505e libpthread-stubs/receipt
--- a/libpthread-stubs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libpthread-stubs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/dist/$TARBALL"
 
-SPLIT="libpthread-stubs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libqcow/receipt
--- a/libqcow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqcow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-alpha-$VERSION.tar.gz"
 WGET_URL="https://github.com/libyal/libqcow/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext openssl-dev zlib-dev fuse2-dev"
-SPLIT="libqcow-dev"
+BUILD_DEPENDS="gettext-dev openssl-dev zlib-dev fuse2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libqmi/receipt
--- a/libqmi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqmi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://www.freedesktop.org/software/libqmi/$TARBALL"
 
 BUILD_DEPENDS="glib-dev libgudev-dev libmbim-dev"
-SPLIT="libqmi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libqscintilla-qt5/receipt
--- a/libqscintilla-qt5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqscintilla-qt5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Scintilla C++ editor class ported to Qt5"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
-WEB_SITE="http://www.riverbankcomputing.co.uk/software/qscintilla"
+WEB_SITE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 REPOLOGY="qscintilla"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/pyqt/QScintilla_gpl-$VERSION.tar.gz"
 
 BUILD_DEPENDS="qt5-dev mesa-dev python"
-SPLIT="libqscintilla-qt5-dev libqscintilla-qt5-python libqscintilla-qt5"
+SPLIT="$PACKAGE-dev $PACKAGE-python $PACKAGE"
 
 compile_rules() {
 	export QMAKEFEATURES=$src/Qt4Qt5/features/
@@ -21,14 +21,14 @@
 	cd $src/Qt4Qt5
 	qmake qscintilla.pro &&
 	make &&
-	make DESTDIR=$DESTDIR INSTALL_ROOT=$DESTDIR install || return 1
+	make DESTDIR=$install INSTALL_ROOT=$install install || return 1
 
 	cd $src/designer-Qt4Qt5
 	qmake designer.pro \
 		INCLUDEPATH+=../Qt4Qt5 \
 		QMAKE_LIBDIR+=../Qt4Qt5 &&
 	make &&
-	make DESTDIR=$DESTDIR INSTALL_ROOT=$DESTDIR install || return 1
+	make DESTDIR=$install INSTALL_ROOT=$install install || return 1
 
 	cd $src/Python
 	python configure.py \
@@ -37,7 +37,7 @@
 		-o ../Qt4Qt5/ \
 		-c &&
 	make &&
-	make DESTDIR=$DESTDIR INSTALL_ROOT=$DESTDIR install || return 1
+	make DESTDIR=$install INSTALL_ROOT=$install install || return 1
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libqscintilla/receipt
--- a/libqscintilla/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqscintilla/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,38 +6,37 @@
 SHORT_DESC="Editor classes & widgets"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
-WEB_SITE="http://www.riverbankcomputing.co.uk/software/qscintilla"
+WEB_SITE="https://www.riverbankcomputing.com/software/qscintilla/intro"
 REPOLOGY="qscintilla"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/pyqt/QScintilla-gpl-$VERSION.tar.gz"
 
 BUILD_DEPENDS="Qt4-dev cmake qmake pyqt"
-SPLIT="libqscintilla libqscintilla-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.BUILD_TYPE=Release
-compile_rules()
-{
-	cd $src ; rm -rf doc Qt3 ; cd $src/Qt4Qt5
+compile_rules() {
+	rm -rf doc Qt3
+	cd $src/Qt4Qt5
+
 	qmake qscintilla.pro
-	sed -i 's/-O2/-Os/g' Makefile && make
-	make DESTDIR=$DESTDIR INSTALL_ROOT=$install install
+	sed -i 's/-O2/-Os/g' Makefile &&
+	make &&
+	make DESTDIR=$install INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	libqscintilla)
-		DEPENDS="libQtGui"
-		SUGGESTED="juffed"
-		mkdir $fs/usr ; cp -a $install/usr/lib $fs/usr
-		;;
-	libqscintilla-dev)
-		CAT="development|Editor classes & widgets: qm, dev files."
-		DEPENDS="libqscintilla"
-		cp -a $install/* $fs
-		rm -rf $fs/usr/lib
-		;;
+		libqscintilla)
+			mkdir $fs/usr
+			cp -a $install/usr/lib $fs/usr
+			DEPENDS="libQtGui"
+			SUGGESTED="juffed"
+			;;
+		*-dev)
+			cp -a $install/* $fs
+			rm -rf $fs/usr/lib
+			DEPENDS="libqscintilla"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e libqtxdg/receipt
--- a/libqtxdg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqtxdg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Qt implementation of freedesktop.org XDG specs"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://github.com/lxde/libqtxdg"
+WEB_SITE="https://github.com/lxqt/libqtxdg"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxqt/libqtxdg.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/lxde/libqtxdg/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="lxqt-build-tools mesa-dev"
-SPLIT="libqtxdg-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r ad29ddfee1c9 -r d5aab818505e libquicktime/receipt
--- a/libquicktime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libquicktime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="libquicktime"
 VERSION="1.2.4"
 CATEGORY="multimedia"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 SHORT_DESC="A library for reading and writing quicktime files"
 WEB_SITE="http://libquicktime.sourceforge.net/"
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gtk2-dev ffmpeg-dev alsa-lib-dev xorg-libXv-dev xorg-libXaw-dev \
 x264-dev zlib-dev mesa-dev"
-SPLIT="libquicktime-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libquvi-scripts/receipt
--- a/libquvi-scripts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libquvi-scripts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/quvi/$TARBALL"
 
-SPLIT="libquvi-scripts-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libquvi/receipt
--- a/libquvi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libquvi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/quvi/$TARBALL"
 
-BUILD_DEPENDS="automake gettext libgcrypt-dev libtool lua5.1-dev libproxy-dev \
-curl-dev glib-dev libquvi-scripts-dev"
-SPLIT="libquvi-dev"
+BUILD_DEPENDS="automake gettext-dev libgcrypt-dev libtool lua5.1-dev \
+libproxy-dev curl-dev glib-dev libquvi-scripts-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fvi &&
diff -r ad29ddfee1c9 -r d5aab818505e libqwt5-qt4/receipt
--- a/libqwt5-qt4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqwt5-qt4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,41 +4,34 @@
 VERSION="5.2.0"
 CATEGORY="graphics"
 SHORT_DESC="Lib Qt Widgets for Technical applications"
-MAINTAINER="slitaz@objectif-securite.ch"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://qwt.sourceforge.net"
+WEB_SITE="http://qwt.sourceforge.net/"
 REPOLOGY="qwt"
 
 SOURCE="qwt"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="http://switch.dl.sourceforge.net/sourceforge/qwt/$TARBALL"
+WGET_URL="$SF_MIRROR/qwt/$TARBALL"
 
-BUILD_DEPENDS="$DEPENDS qt4 qmake Qt4-dev"
-SPLIT="libqwt5-qt4-dev"
+BUILD_DEPENDS="libQtCore libQtGui libQtScript libQtXml libQtDesigner qt4 qmake \
+Qt4-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	qmake
 	make -j1 &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	libqwt5-qt4)
-		DEPENDS="libQtCore libQtGui libQtScript libQtXml libQtDesigner gcc-lib-base"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/qt $fs/usr/lib
-		cp -a $install/usr/local/qwt-$VERSION/lib/libqwt.so* $fs/usr/lib
-		;;
-	libqwt5-qt4-dev)
-		DEPENDS="qt-x11-opensource-src libqwt5-qt4"
-		mkdir -p $fs/usr/include
-		cp -a $install/usr/local/qwt-$VERSION/include/*.h \
-			$fs/usr/include
+		libqwt5-qt4)
+			copy @std
+			DEPENDS="libQtCore libQtGui libQtScript libQtXml libQtDesigner gcc-lib-base"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="qt-x11-opensource-src libqwt5-qt4"
 		;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e libqwt6-qt4/receipt
--- a/libqwt6-qt4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libqwt6-qt4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,46 +4,40 @@
 VERSION="6.0.1"
 CATEGORY="graphics"
 SHORT_DESC="Lib Qt Widgets for Technical applications"
-MAINTAINER="slitaz@objectif-securite.ch"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://qwt.sourceforge.net"
+WEB_SITE="http://qwt.sourceforge.net/"
 REPOLOGY="qwt"
 
 SOURCE="qwt"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="http://switch.dl.sourceforge.net/sourceforge/qwt/$TARBALL"
+WGET_URL="$SF_MIRROR/qwt/$TARBALL"
 
 BUILD_DEPENDS="qmake Qt4-dev"
-SPLIT="libqwt6-qt4-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i \
-		-e 's/$${QWT_INSTALL_PREFIX}\/include/\/usr\/include\/qwt\//' \
-		-e 's/$${QWT_INSTALL_PREFIX}\/lib/\/usr\/lib\//' \
-		-e 's/$${QWT_INSTALL_PREFIX}\/plugins\/designer/\/usr\/lib\/qt\/plugins\/designer\//' \
-		-e 's/$${QWT_INSTALL_PREFIX}\/features/\/usr\/share\/qwt\/features\//' \
-		qwtconfig.pri
+compile_rules() {
+	sed \
+		-e 's|$${QWT_INSTALL_PREFIX}/include|/usr/include/qwt/|' \
+		-e 's|$${QWT_INSTALL_PREFIX}/lib|/usr/lib/|' \
+		-e 's|$${QWT_INSTALL_PREFIX}/plugins/designer|/usr/lib/qt/plugins/designer/|' \
+		-e 's|$${QWT_INSTALL_PREFIX}/features|/usr/share/qwt/features/|' \
+		-i qwtconfig.pri
+
 	qmake &&
 	make -j1 &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	libqwt6-qt4)
-		DEPENDS="libQtCore libQtGui libQtScript libQtXml libQtDesigner gcc-lib-base"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/lib $fs/usr
-		cp -a $install/usr/share/qwt $fs/usr/share
-		;;
-	libqwt6-qt4-dev)
-		DEPENDS="qt-x11-opensource-src libqwt6-qt4"
-		mkdir -p $fs/usr
-		cp -a $install/usr/include $fs/usr
-		;;
+		libqwt6-qt4)
+			copy @std
+			DEPENDS="libQtCore libQtGui libQtScript libQtXml libQtDesigner"
+			;;
+		*-dev)
+			copy @dev
+			DEPENDS="qt-x11-opensource-src libqwt6-qt4"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e libraw/receipt
--- a/libraw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libraw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.18.7"
 CATEGORY="graphics"
 SHORT_DESC="RAW image decoder library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.libraw.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libraw.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libraw.org/data/$TARBALL"
 
 BUILD_DEPENDS="libjpeg-turbo-dev lcms2-dev jasper-dev"
-SPLIT="libraw-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	CXX="g++ -Wno-narrowing" \
diff -r ad29ddfee1c9 -r d5aab818505e libraw1394/receipt
--- a/libraw1394/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libraw1394/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.1.2"
 CATEGORY="system-tools"
 SHORT_DESC="IEEE 1394 is a standard defining a high speed serial bus"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/libs/ieee1394/$TARBALL"
 
-SPLIT="libraw1394-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e librep/receipt
--- a/librep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/librep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://download.tuxfamily.org/librep/$TARBALL"
 
 BUILD_DEPENDS="gmp-dev gdbm-dev libffi-dev readline-dev texinfo"
-SPLIT="librep-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e librevenge/receipt
--- a/librevenge/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/librevenge/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/libwpd/$TARBALL"
 
 BUILD_DEPENDS="boost-dev cppunit-dev doxygen zlib-dev"
-SPLIT="librevenge-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e librsvg/receipt
--- a/librsvg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/librsvg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.42.2"
 CATEGORY="graphics"
 SHORT_DESC="Rendering SVG"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/LibRsvg"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/librsvg.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="glib-dev gdk-pixbuf-dev libxml2-dev pango-dev libcroco-dev \
 gtk-doc gobject-introspection-dev vala gtk3-dev rust"
-SPLIT="rsvg-convert rsvg-view librsvg-dev"
+SPLIT="rsvg-convert rsvg-view $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e librsync/receipt
--- a/librsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/librsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/librsync/librsync/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake bzip2-dev zlib-dev popt-dev libb2-dev"
-SPLIT="librsync-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -24,7 +24,7 @@
 		.. &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libsamplerate/receipt
--- a/libsamplerate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsamplerate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.9"
 CATEGORY="multimedia"
 SHORT_DESC="Sample Rate Converter for audio"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mega-nerd.com/SRC/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libsamplerate.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.mega-nerd.com/SRC/$TARBALL"
 
-SPLIT="libsamplerate-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-gfx/receipt
--- a/libsdl-gfx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-gfx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.26"
 CATEGORY="x-window"
 SHORT_DESC="SDL gfx support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"
 REPOLOGY="sdl-gfx"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.ferzkopp.net/Software/SDL_gfx-2.0/$TARBALL"
 
 BUILD_DEPENDS="automake libtool xorg-libX11-dev xorg-libICE-dev libsdl-dev"
-SPLIT="libsdl-gfx-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/usr/local/|/usr/|' autogen.sh
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-image/receipt
--- a/libsdl-image/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-image/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.12"
 CATEGORY="development"
 SHORT_DESC="An image file loading library"
-MAINTAINER="chadi.elahmad@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_image/release-1.2.html"
 REPOLOGY="sdl-image"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
-SPLIT="libsdl-image-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-mixer/receipt
--- a/libsdl-mixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-mixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.12"
 CATEGORY="development"
 SHORT_DESC="A multichannel sample and music mixer"
-MAINTAINER="chadi.elahmad@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_mixer/release-1.2.html"
 REPOLOGY="sdl-mixer"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_mixer/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev fluidsynth-dev libvorbis-dev flac-dev libsmpeg-dev"
-SPLIT="libsdl-mixer-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-net/receipt
--- a/libsdl-net/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-net/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.8"
 CATEGORY="x-window"
 SHORT_DESC="SDL net support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_net/release-1.2.html"
 REPOLOGY="sdl-net"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_net/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev"
-SPLIT="libsdl-net-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-pango/receipt
--- a/libsdl-pango/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-pango/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.2"
 CATEGORY="x-window"
 SHORT_DESC="Pango SDL binding"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://sdlpango.sourceforge.net/"
 REPOLOGY="sdl-pango"
@@ -13,18 +13,13 @@
 WGET_URL="$SF_MIRROR/sdlpango/$TARBALL"
 
 BUILD_DEPENDS="patch gfortran pango-dev libsdl-dev"
-SPLIT="libsdl-pango-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	# Handle cross compilation
-	case "$ARCH" in
-		arm*) ARCH_MAKE="LIBS=/cross/$ARCH/sysroot/usr/lib" ;;
-	esac
-
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make $ARCH_MAKE &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-perl/receipt
--- a/libsdl-perl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-perl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.2.6"
 CATEGORY="x-window"
 SHORT_DESC="SDL perl support"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-WEB_SITE="http://sdl.perl.org"
+WEB_SITE="http://sdl.perl.org/"
 REPOLOGY="sdl-perl"
 
 TARBALL="SDL_Perl-v$VERSION.tar.gz"
@@ -16,7 +16,7 @@
 glu-dev"
 
 compile_rules() {
-	perl Build.PL destdir="$DESTDIR" &&
+	perl Build.PL destdir="$install" &&
 	perl Build &&
 	perl Build install
 }
diff -r ad29ddfee1c9 -r d5aab818505e libsdl-ttf/receipt
--- a/libsdl-ttf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl-ttf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.11" # version 1.2.2 the last from 1.2 series, but it need freetype1
 CATEGORY="x-window"
 SHORT_DESC="SDL ttf support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html"
 REPOLOGY="sdl-ttf"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_ttf/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev freetype-dev"
-SPLIT="libsdl-ttf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl/receipt
--- a/libsdl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.15"
 CATEGORY="x-window"
 SHORT_DESC="Simple DirectMedia Layer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/sdl.html"
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="nasm alsa-lib-dev xorg-libX11-dev xorg-libICE-dev \
 xorg-libXrandr-dev mesa-dev glu-dev tslib-dev libusb-dev"
-SPLIT="libsdl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e '/_XData32/s:register long:register _Xconst long:' \
diff -r ad29ddfee1c9 -r d5aab818505e libsdl2-image/receipt
--- a/libsdl2-image/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl2-image/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.1"
 CATEGORY="graphics"
 SHORT_DESC="An image file loading library"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_image/"
 REPOLOGY="sdl2-image"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_image/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl2-dev libjpeg-turbo-dev libpng16-dev tiff-dev libwebp-dev"
-SPLIT="libsdl2-image-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl2-mixer/receipt
--- a/libsdl2-mixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl2-mixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.1"
 CATEGORY="multimedia"
 SHORT_DESC="A multichannel sample and music mixer"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_mixer/"
 REPOLOGY="sdl2-mixer"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="libsdl2-dev libmodplug-dev fluidsynth-dev libvorbis-dev \
 flac-dev libsmpeg2-dev"
-SPLIT="libsdl2-mixer-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl2-net/receipt
--- a/libsdl2-net/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl2-net/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.1"
 CATEGORY="network"
 SHORT_DESC="SDL2 net support"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_net/"
 REPOLOGY="sdl2-net"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.libsdl.org/projects/SDL_net/release/$TARBALL"
 
 BUILD_DEPENDS="libsdl2-dev"
-SPLIT="libsdl2-net-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl2-ttf/receipt
--- a/libsdl2-ttf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl2-ttf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.14"
 CATEGORY="x-window"
 SHORT_DESC="SDL2 ttf support"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libsdl.org/projects/SDL_ttf/"
 REPOLOGY="sdl2-ttf"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="freetype-dev libsdl2-dev xorg-libX11-dev xorg-libICE-dev \
 mesa-dev expat-dev xorg-libxshmfence-dev"
-SPLIT="libsdl2-ttf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsdl2/receipt
--- a/libsdl2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsdl2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Cross-platform interactive media development library"
-MAINTAINER="tcg.thegamer@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="http://libsdl.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/sdl2.html"
@@ -17,7 +17,7 @@
 xorg-libXinerama-dev xorg-libXScrnSaver-dev xorg-libXxf86vm-dev mesa-dev \
 wayland-dev wayland-protocols-dev libxkbcommon-dev eudev-dev dbus-dev ibus-dev \
 tslib-dev graphviz" # + fcitx-dev -> broken
-SPLIT="libsdl2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libsearpc/receipt
--- a/libsearpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsearpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="3.0.2"
 CATEGORY="network"
 SHORT_DESC="A simple and easy-to-use C language RPC framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/haiwen/libsearpc/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://github.com/haiwen/$PACKAGE/archive/v${VERSION}.tar.gz"
+WGET_URL="https://github.com/haiwen/$PACKAGE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="wget python-dev glib-dev jansson-dev python-simplejson \
 automake libtool"
-SPLIT="libsearpc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e libsecret/receipt
--- a/libsecret/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsecret/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libtool intltool libxslt docbook-xsl libgcrypt-dev \
 gobject-introspection-dev vala util-linux-mount-dev"
-SPLIT="libsecret-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libsexy/receipt
--- a/libsexy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsexy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.11"
 CATEGORY="x-window"
 SHORT_DESC="Sexy widgests for GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://blog.chipx86.com/tag/libsexy/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://releases.chipx86.com/libsexy/libsexy/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev xorg-xorgproto libxml2-dev"
-SPLIT="libsexy-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsexymm/receipt
--- a/libsexymm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsexymm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="0.1.9"
 CATEGORY="x-window"
 SHORT_DESC="Gtkmm binding for libsexy"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://osiris.chipx86.com/projects/libsexy/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://releases.chipx86.com/libsexy/libsexymm/$TARBALL"
 
-BUILD_DEPENDS="glibmm-dev libgiomm-dev cairomm-dev gtkmm-dev libsexy-dev \
+BUILD_DEPENDS="glibmm-dev glibmm-dev cairomm-dev gtkmm-dev libsexy-dev \
 libsigc++-dev libxml2-dev gtk2-dev"
-SPLIT="libsexymm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libshout/receipt
--- a/libshout/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libshout/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.1"
 CATEGORY="multimedia"
 SHORT_DESC="Library for accessing a shoutcast/icecast server"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://icecast.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libogg-dev libvorbis-dev libtheora-dev speex-dev openssl-dev"
-SPLIT="libshout-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e 's/SSLeay_add_all_algorithms/OpenSSL_add_all_algorithms/g' -i src/tls.c
diff -r ad29ddfee1c9 -r d5aab818505e libsieve/receipt
--- a/libsieve/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsieve/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,18 +6,18 @@
 SHORT_DESC="A library for parsing, sorting and filtering your mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://libsieve.sourceforge.net/"
+WEB_SITE="https://github.com/sodabrew/libsieve"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/downloads/sodabrew/$PACKAGE/$TARBALL"
 
-SPLIT="libsieve-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libsigc++/receipt
--- a/libsigc++/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsigc++/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10.0"
 CATEGORY="system-tools"
 SHORT_DESC="Callback Framework for C++"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/libsigc++/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libsigc.html"
diff -r ad29ddfee1c9 -r d5aab818505e libsigsegv/receipt
--- a/libsigsegv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsigsegv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libsigsegv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libsmfm-core/receipt
--- a/libsmfm-core/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsmfm-core/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/libsmfm-core/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gtk-doc libtool gettext glib-dev intltool pango-dev \
+BUILD_DEPENDS="automake gtk-doc libtool gettext-dev glib-dev intltool pango-dev \
 menu-cache-dev   libexif-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e libsmfm-gtk/receipt
--- a/libsmfm-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsmfm-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/libsmfm-gtk/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gtk-doc libtool gettext shared-mime-info \
+BUILD_DEPENDS="automake gtk-doc libtool gettext-dev shared-mime-info \
 libsmfm-core-dev intltool pango-dev gtk2-dev menu-cache-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e libsmpeg/receipt
--- a/libsmpeg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsmpeg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -26,7 +26,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make LDFLAGS+=-lstdc++ &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libsmpeg2/receipt
--- a/libsmpeg2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsmpeg2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="subversion|svn://svn.icculus.org/smpeg/tags/release_${VERSION//./_}"
 
 BUILD_DEPENDS="subversion automake libsdl2-dev"
-SPLIT="libsmpeg2-player libsmpeg2 libsmpeg2-dev"
+SPLIT="$PACKAGE-player $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	CFLAGS="$CFLAGS -Wno-error=narrowing"
diff -r ad29ddfee1c9 -r d5aab818505e libsndfile/receipt
--- a/libsndfile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsndfile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.28"
 CATEGORY="multimedia"
 SHORT_DESC="Reading and writing files containing sampled sound"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.mega-nerd.com/libsndfile/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev libvorbis-dev flac-dev"
-SPLIT="libsndfile-apps libsndfile-dev"
+SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libsoup/receipt
--- a/libsoup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsoup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.62.2"
 CATEGORY="network"
 SHORT_DESC="HTTP client/server library for GNOME"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/libsoup"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libsoup.html"
@@ -12,11 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-networking glib-dev libxml2-dev libgcrypt-dev \
-libtasn1-dev gnutls-dev zlib-dev libgnome-keyring-dev sqlite3-dev dbus-dev"
 BUILD_DEPENDS="glib-dev libxml2-dev sqlite3-dev intltool gtk-doc \
 gobject-introspection-dev vala glib-networking python3"
-SPLIT="libsoup-gnome libsoup-dev"
+SPLIT="$PACKAGE-gnome $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libspectre/receipt
--- a/libspectre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libspectre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="libspectre"
 VERSION="0.2.8"
 CATEGORY="office"
-SHORT_DESC="libspectre is a small library for rendering Postscript documents"
+SHORT_DESC="Rendering Postscript documents"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/libspectre/"
@@ -12,7 +12,7 @@
 WGET_URL="https://libspectre.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="ghostscript-dev cairo-dev"
-SPLIT="libspectre-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libspectrum/receipt
--- a/libspectrum/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libspectrum/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.1"
 CATEGORY="misc"
 SHORT_DESC="ZX Spectrum emulator support library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://fuse-emulator.sourceforge.net/libspectrum.php"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/fuse-emulator/$TARBALL"
 
 BUILD_DEPENDS="perl zlib-dev libgcrypt-dev bzip2-dev glib-dev audiofile-dev"
-SPLIT="libspectrum-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libspiro/receipt
--- a/libspiro/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libspiro/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="autoconf automake libtool bash"
-SPLIT="libspiro-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i
diff -r ad29ddfee1c9 -r d5aab818505e libssh/receipt
--- a/libssh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libssh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.5"
 CATEGORY="network"
 SHORT_DESC="Library for accessing SSH client services through C libraries"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.libssh.org/"
 
@@ -13,7 +13,7 @@
 TARBALL_MD5="d3fc864208bf607ad87cdee836894feb"
 
 BUILD_DEPENDS="cmake zlib-dev libgcrypt-dev" # or openssl-dev (currently broken)
-SPLIT="libssh-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libssh2/receipt
--- a/libssh2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libssh2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}download/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev zlib-dev"
-SPLIT="libssh2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libstatgrab/receipt
--- a/libstatgrab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libstatgrab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.91"
 CATEGORY="system-tools"
 SHORT_DESC="Provides statistics about the system on which it's run"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.i-scream.org/libstatgrab/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libstatgrab.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="libstatgrab-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libstroke/receipt
--- a/libstroke/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libstroke/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.1"
 CATEGORY="system-tools"
 SHORT_DESC="A stroke (mouse gesture) translation library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://etla.net/libstroke/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.ubuntu.com/ubuntu/pool/universe/libs/libstroke/$TARBALL"
 
 BUILD_DEPENDS="patch gfortran xorg-libXt-dev"
-SPLIT="libstroke-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libsysstat/receipt
--- a/libsysstat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libsysstat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/lxde/libsysstat/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="lxqt-build-tools"
-SPLIT="libsysstat-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e libt4k_common/receipt
--- a/libt4k_common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libt4k_common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.1"
 CATEGORY="games"
 SHORT_DESC="Common libraries for tux4kids games"
-MAINTAINER="samuel_trassare@yahoo.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/tux4kids/t4kcommon"
 REPOLOGY="t4k-common"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="libsdl-dev libsdl-image-dev libsdl-mixer-dev libsdl-ttf-dev \
 libsdl-net-dev librsvg-dev libsdl-pango-dev wget libxml2-dev libcroco-dev"
-SPLIT="libt4k_common-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libtar/receipt
--- a/libtar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.2.11"
 CATEGORY="development"
 SHORT_DESC="C library for manipulating POSIX tar files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://repo.or.cz/w/libtar.git/"
+WEB_SITE="https://repo.or.cz/w/libtar.git/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.feep.net/pub/software/$PACKAGE/$TARBALL" # FIXME
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="libtar-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,8 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libtasn1/receipt
--- a/libtasn1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtasn1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.13"
 CATEGORY="security"
 SHORT_DESC="Library for ASN.1 and DER manipulation"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3 LGPL2.1"
 WEB_SITE="https://www.gnu.org/software/libtasn1/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libtasn1.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libtasn1-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Package failed to build when optimized for size
diff -r ad29ddfee1c9 -r d5aab818505e libtdb/receipt
--- a/libtdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.15"
 CATEGORY="misc"
 SHORT_DESC="A trivial database"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://tdb.samba.org/"
 REPOLOGY="tdb"
@@ -13,7 +13,7 @@
 WGET_URL="https://www.samba.org/ftp/tdb/$TARBALL"
 
 BUILD_DEPENDS="python-dev libxslt-dev docbook-xsl"
-SPLIT="libtdb-python libtdb libtdb-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	# site script isn't used
@@ -22,7 +22,8 @@
 		--localstatedir=/var \
 		--sysconfdir=/etc/samba \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	cook_pick_docs docs/README web/index.html
 }
diff -r ad29ddfee1c9 -r d5aab818505e libtheora/receipt
--- a/libtheora/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtheora/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.1"
 CATEGORY="multimedia"
 SHORT_DESC="Theora video compression format"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.theora.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://downloads.xiph.org/releases/theora/$TARBALL"
 
 BUILD_DEPENDS="libogg-dev libvorbis-dev libpng16-dev"
-SPLIT="libtheora-enc libtheora-dev"
+SPLIT="$PACKAGE-enc $PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/png_\(sizeof\)/\1/g' examples/png2theora.c &&
diff -r ad29ddfee1c9 -r d5aab818505e libtirpc/receipt
--- a/libtirpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtirpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libtirpc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,8 @@
 		--disable-static \
 		--disable-gssapi \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	mv -v $install/usr/lib/libtirpc.so.* $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e libtkimg/receipt
--- a/libtkimg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtkimg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/tkimg/$TARBALL"
 
 BUILD_DEPENDS="tcllib tcl-dev tk-dev xorg-dev"
-SPLIT="libtkimg-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make distclean
@@ -22,7 +22,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make all &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libtool/receipt
--- a/libtool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.6"
 CATEGORY="development"
 SHORT_DESC="The GNU Portable Library Tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnu.org/software/libtool/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/libtool.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="automake autoconf gfortran"
-SPLIT="libltdl libtool"
+SPLIT="libltdl $PACKAGE"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libtorrent-rasterbar/receipt
--- a/libtorrent-rasterbar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtorrent-rasterbar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.9"
 CATEGORY="development"
 SHORT_DESC="A C++ bittorrent implementation library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.libtorrent.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e libtorrent/receipt
--- a/libtorrent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libtorrent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.13.6"
 CATEGORY="network"
 SHORT_DESC="Torrent library for rtorrent"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rakshasa.github.io/rtorrent/"
 
@@ -15,7 +15,7 @@
 PATCH_URL="https://github.com/rakshasa/libtorrent/commit/4607bbf7.patch"
 
 BUILD_DEPENDS="automake libtool zlib-dev openssl-dev"
-SPLIT="libtorrent-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	[ -e $SRC/$PATCH_FILE ] || wget -O $SRC/$PATCH_FILE $PATCH_URL
diff -r ad29ddfee1c9 -r d5aab818505e libunibreak/receipt
--- a/libunibreak/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libunibreak/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/adah1972/libunibreak/releases/download/libunibreak_${VERSION//./_}/$TARBALL"
 
-SPLIT="libunibreak-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libuninameslist/receipt
--- a/libuninameslist/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libuninameslist/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="autoconf automake libtool bash"
-SPLIT="libuninameslist-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i
diff -r ad29ddfee1c9 -r d5aab818505e libunique/receipt
--- a/libunique/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libunique/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.6"
 CATEGORY="development"
 SHORT_DESC="Library for writing single instance application"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Attic/LibUnique"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libunique.html"
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="patch automake glib-dev gettext libtool gtk2-dev \
+BUILD_DEPENDS="patch automake glib-dev gettext-dev libtool gtk2-dev \
 xorg-libICE-dev gobject-introspection-dev gtk-doc"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e libunistring/receipt
--- a/libunistring/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libunistring/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="libunistring-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libunwind/receipt
--- a/libunwind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libunwind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.1"
 CATEGORY="development"
 SHORT_DESC="C programming interface (API) to determine the call-chain of a program"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="custom"
 WEB_SITE="http://www.nongnu.org/libunwind/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.savannah.gnu.org/releases/libunwind/$TARBALL"
 
 BUILD_DEPENDS="xz-dev"
-SPLIT="libunwind-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libupnp/receipt
--- a/libupnp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libupnp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.17"
 CATEGORY="network"
 SHORT_DESC="The portable Universal Plug and Play (UPnP)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://pupnp.sourceforge.net/"
 
@@ -12,13 +12,13 @@
 WGET_URL="$SF_MIRROR/pupnp/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev libpthread-stubs"
-SPLIT="libupnp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e liburcu/receipt
--- a/liburcu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liburcu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="userspace-rcu-$VERSION.tar.bz2"
 WGET_URL="http://www.lttng.org/files/urcu/$TARBALL"
 
-SPLIT="liburcu-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libusb-compat/receipt
--- a/libusb-compat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libusb-compat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="libusb-compat"
 VERSION="0.1.5"
 CATEGORY="system-tools"
-SHORT_DESC="Compatibility layer to converts libusb 0.1 calls into 1.0 equivalents"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Compatibility layer to convert libusb 0.1 calls into 1.0 equivalents"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://libusb.info/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libusb-compat.html"
@@ -14,9 +14,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/libusb/libusb-compat-0.1/archive/v$VERSION.tar.gz"
 
-
 BUILD_DEPENDS="automake libtool libusb-dev eudev-dev"
-SPLIT="libusb-compat-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap.sh || return 1
diff -r ad29ddfee1c9 -r d5aab818505e libusb/receipt
--- a/libusb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libusb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.22"
 CATEGORY="system-tools"
 SHORT_DESC="Library used by some applications for USB device access"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://libusb.info/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libusb.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/libusb/libusb/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="eudev-dev"
-SPLIT="libusb-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|^PROJECT_LOGO|#&|' doc/doxygen.cfg.in
diff -r ad29ddfee1c9 -r d5aab818505e libuv/receipt
--- a/libuv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libuv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://dist.libuv.org/dist/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="automake libtool libnsl-dev"
-SPLIT="libuv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e libva/receipt
--- a/libva/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libva/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libdrm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXfixes-dev \
 mesa-dev expat-dev xorg-libxshmfence-dev wayland-dev"
-SPLIT="libva-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libvalhalla/receipt
--- a/libvalhalla/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvalhalla/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.0"
 CATEGORY="multimedia"
 SHORT_DESC="A tiny media scanner API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libvalhalla.geexbox.org/"
 
@@ -13,30 +13,19 @@
 
 BUILD_DEPENDS="ffmpeg-dev ffmpeg-compat-dev libsqlite3 sqlite3-dev \
 libxml2-dev libexif-dev curl-dev"
-SPLIT="libvalhalla-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			export PKG_CONFIG_PATH=/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat/pkgconfig
-			export LDFLAGS="$LDFLAGS -Wl,-rpath=/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat"
-			export CFLAGS="$CFLAGS -I/cross/$ARCH/sysroot/usr/include/ffmpeg-compat"
-			export LDFLAGS="$LDFLAGS -L/cross/$ARCH/sysroot/usr/lib/ffmpeg-compat -lavformat" 
-			ARCH_ARGS="--cross-compile"
-			;;
-		*)
-			#export LDFLAGS="$LDFLAGS -lavformat"
-			export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig
-			export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/ffmpeg-compat"
-			;;
-	esac
+	#export LDFLAGS="$LDFLAGS -lavformat"
+	export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig
+	export LDFLAGS="$LDFLAGS -Wl,-rpath=/usr/lib/ffmpeg-compat"
 
 	# Fix Busybox cat
 	sed -i 's/cat -n/awk '"'"'{ printf "%6d  %s\\n",++n,$0 }'"'"' </' configure
 
 	./configure \
 		--prefix=/usr \
-		$ARCH_ARGS &&
+		&&
 	make &&
 	make install
 }
diff -r ad29ddfee1c9 -r d5aab818505e libvdpau/receipt
--- a/libvdpau/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvdpau/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://people.freedesktop.org/~aplattner/vdpau/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto xorg-libXext-dev"
-SPLIT="libvdpau-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libvips/receipt
--- a/libvips/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvips/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 
 BUILD_DEPENDS="gtk-doc libtool swig \
 gobject-introspection-dev fftw-dev lcms-dev libpng16-dev jpeg-dev \
-imagemagick-dev tiff-dev zlib-dev libexif-dev gettext"
-SPLIT="libvips-dev"
+imagemagick-dev tiff-dev zlib-dev libexif-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap.sh &&
@@ -23,7 +23,7 @@
 		--enable-gtk-doc=no &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libvirt-glib/receipt
--- a/libvirt-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvirt-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libvirt-dev glib-dev libxml2-dev intltool gtk-doc \
 gobject-introspection-dev vala"
-SPLIT="libvirt-glib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libvirt/receipt
--- a/libvirt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvirt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,10 +14,10 @@
 
 BUILD_DEPENDS="xorg-libX11-dev acl-dev attr-dev util-linux-blkid-dev curl-dev \
 dbus-dev libdevmapper-dev fuse2-dev glusterfs-dev gnutls-dev netcf-dev \
-libnl-dev parted-dev libpcap-dev libssh-dev libxml2-dev gettext \
+libnl-dev parted-dev libpcap-dev libssh-dev libxml2-dev gettext-dev \
 xorg-libpciaccess-dev libsasl cyrus-sasl-dev libtirpc-dev yajl-dev \
 rpcsvc-proto lvm2-dev open-iscsi"
-SPLIT="libvirt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lX11"
diff -r ad29ddfee1c9 -r d5aab818505e libvisio/receipt
--- a/libvisio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvisio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="librevenge-dev libxml2-dev icu-dev boost-dev cppunit-dev \
 doxygen perl gperf"
-SPLIT="libvisio-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libvncserver/receipt
--- a/libvncserver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvncserver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.11"
 CATEGORY="network"
 SHORT_DESC="VNC library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://libvnc.github.io/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/LibVNC/libvncserver/archive/$TARBALL"
 
 BUILD_DEPENDS="automake libtool openssl-dev libjpeg-turbo-dev libpng16-dev"
-SPLIT="libvncserver-novnc libvncserver-dev"
+SPLIT="$PACKAGE-novnc $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e libvorbis/receipt
--- a/libvorbis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvorbis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.6"
 CATEGORY="multimedia"
 SHORT_DESC="Vorbis base library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.xiph.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://downloads.xiph.org/releases/vorbis/$TARBALL"
 
 BUILD_DEPENDS="libogg-dev"
-SPLIT="libvorbis-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libvpx/receipt
--- a/libvpx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libvpx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.0"
 CATEGORY="multimedia"
 SHORT_DESC="The VP8 Codec SDK"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.webmproject.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libvpx.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/webmproject/libvpx/archive/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="perl coreutils-file-output-full yasm diffutils"
-SPLIT="libvpx-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	fix math
@@ -28,7 +28,8 @@
 		--enable-shared \
 		--disable-static \
 		&&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libwebp/receipt
--- a/libwebp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwebp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev giflib-dev"
-SPLIT="libwebp-apps libwebp-dev"
+SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libwmf/receipt
--- a/libwmf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwmf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.8.4"
 CATEGORY="misc"
 SHORT_DESC="Converting WMF files"
-MAINTAINER="monghitri@aruba.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://wvware.sourceforge.net/libwmf.html"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="gfortran xorg-libXt-dev expat-dev libxml2-dev freetype-dev \
 libjpeg-turbo-dev libgd-dev gdk-pixbuf-dev gtk2-dev"
-SPLIT="libwmf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libwnck2/receipt
--- a/libwnck2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwnck2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.31.0"
 CATEGORY="x-window"
 SHORT_DESC="Window Navigator Construction Kit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://developer.gnome.org/libwnck/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool startup-notification-dev xorg-libX11-dev gtk2-dev \
 gobject-introspection-dev xorg-xcb-util-dev"
-SPLIT="libwnck2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libwnck3/receipt
--- a/libwnck3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwnck3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,9 @@
 TARBALL="libwnck-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/libwnck/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext startup-notification-dev xorg-libX11-dev gtk3-dev \
+BUILD_DEPENDS="gettext-dev startup-notification-dev xorg-libX11-dev gtk3-dev \
 xorg-libXres-dev gtk-doc xorg-xcb-util-dev"
-SPLIT="libwnck3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libwpd/receipt
--- a/libwpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/libwpd/$TARBALL"
 
 BUILD_DEPENDS="doxygen librevenge-dev boost-dev"
-SPLIT="libwpd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libwpg/receipt
--- a/libwpg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwpg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/libwpg/$TARBALL"
 
 BUILD_DEPENDS="librevenge-dev libwpd-dev doxygen"
-SPLIT="libwpg-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libwrap/receipt
--- a/libwrap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libwrap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.6.24"
 CATEGORY="system-tools"
 SHORT_DESC="Monitors and Controls incoming TCP connections"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="ftp://ftp.porcupine.org/pub/security/index.html"
 
@@ -14,7 +14,7 @@
 TARBALL2="tcp-wrappers_${VERSION%.*}.q-${VERSION##*.}.debian.tar.xz"
 WGET_URL2="http://http.debian.net/debian/pool/main/t/tcp-wrappers/$TARBALL2"
 
-SPLIT="libwrap-dev tcpd"
+SPLIT="$PACKAGE-dev tcpd"
 
 compile_rules() {
 	[ -e "$SRC/$TARBALL2" ] || wget -P $SRC $WGET_URL2
diff -r ad29ddfee1c9 -r d5aab818505e libxdg-basedir/receipt
--- a/libxdg-basedir/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxdg-basedir/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.0"
 CATEGORY="development"
 SHORT_DESC="Implements functions for the XDG Base Directory specification"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/devnev/libxdg-basedir"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/devnev/$PACKAGE/archive/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake libtool"
-SPLIT="libxdg-basedir-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	unset CFLAGS
diff -r ad29ddfee1c9 -r d5aab818505e libxfce4ui/receipt
--- a/libxfce4ui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxfce4ui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce GTK widget library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
 gtk2-dev libxfce4util-dev startup-notification-dev xfconf-dev glade3-dev \
 xorg-xcb-util-dev"
-SPLIT="libxfce4ui-dev libxfce4ui-glade3 libxfce4ui"
+SPLIT="$PACKAGE-dev $PACKAGE-glade3 $PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libxfce4util/receipt
--- a/libxfce4util/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxfce4util/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.1" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce utility library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool glib-dev"
-SPLIT="libxfce4util-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libxfcegui4/receipt
--- a/libxfcegui4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxfcegui4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="4.10.0"
 CATEGORY="x-window"
 SHORT_DESC="Xfce Gtk Widget library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://www.xfce.org"
+WEB_SITE="https://www.xfce.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev libxfce4util-dev xfconf-dev startup-notification-dev \
 libglade-dev xorg-xcb-util-dev intltool util-linux-uuid-dev"
-SPLIT="libxfcegui4-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# xfce_setenv is removed in libxfce4util 4.11.0
@@ -25,7 +25,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libxkbcommon/receipt
--- a/libxkbcommon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxkbcommon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,8 @@
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros xorg-xkeyboard-config-dev \
 bison wayland-protocols-dev wayland-dev"
-SPLIT="libxkbcommon-x11 libxkbcommon libxkbcommon-dev \
-libxkbcommon-wayland:w libxkbcommon-wayland-dev:w"
+SPLIT="$PACKAGE-x11 $PACKAGE $PACKAGE-dev \
+$PACKAGE-wayland:w $PACKAGE-wayland-dev:w"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e libxklavier/receipt
--- a/libxklavier/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxklavier/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://people.freedesktop.org/~svu/$TARBALL"
 
-BUILD_DEPENDS="gettext gobject-introspection-dev vala gtk-doc xorg-libX11-dev \
-xorg-server-dev xorg-xkbcomp-dev xorg-libxkbfile-dev xorg-libXi-dev \
-iso-codes-dev"
-SPLIT="libxklavier-dev"
+BUILD_DEPENDS="gettext-dev gobject-introspection-dev vala gtk-doc \
+xorg-libX11-dev xorg-server-dev xorg-xkbcomp-dev xorg-libxkbfile-dev \
+xorg-libXi-dev libxml2-dev iso-codes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libxml++/receipt
--- a/libxml++/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxml++/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.1"
 CATEGORY="system-tools"
 SHORT_DESC="C++ wrapper for the libxml XML parser library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://libxmlplusplus.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev glibmm-dev"
-SPLIT="libxml++-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e libxml2/receipt
--- a/libxml2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxml2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.9.8"
 CATEGORY="system-tools"
 SHORT_DESC="XML C parser and toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://xmlsoft.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html"
@@ -12,20 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://xmlsoft.org/libxml2/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="zlib-dev xz-dev python-dev ncurses-dev readline-dev"
-SPLIT="libxml2-tools libxml2-python libxml2-dev libxml2-min:min"
+SPLIT="$PACKAGE-tools $PACKAGE-python $PACKAGE-dev $PACKAGE-min:min"
 
 # Note: libxml2 can be build using option --with-minimum
 # and binaries are splited into libxml2-tools
 compile_rules() {
-	# When cross compiling Python is installed in chroot and is used
-	# by cross tools, cook don't need to install it in /usr/cross/arm
-	# Building with LZMA support is buggy and build fails
-	case "$ARCH" in
-		arm) ARCH_ARGS="--without-lzma" ;;
-	esac
-
 	case $SET in
 		min) SET_ARGS='--with-minimum';;
 	esac
@@ -36,10 +28,10 @@
 		--with-html-dir=/usr/share/doc \
 		--with-threads \
 		--with-history \
-		$CONFIGURE_ARGS $ARCH_ARGS $SET_ARGS &&
+		$CONFIGURE_ARGS $SET_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	find $install -name '*.sh' -exec chmod +x \{\} \;
 }
@@ -49,9 +41,6 @@
 		libxml2)
 			copy libxml2.so*
 			DEPENDS="liblzma zlib"
-			case "$ARCH" in
-				arm) DEPENDS="zlib" ;;
-			esac
 			;;
 		libxml2-tools)
 			copy xmllint xmlcatalog
diff -r ad29ddfee1c9 -r d5aab818505e libxslt/receipt
--- a/libxslt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libxslt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.32"
 CATEGORY="system-tools"
 SHORT_DESC="XSLT support for libxml2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.xmlsoft.org/XSLT/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html"
@@ -12,9 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://xmlsoft.org/sources/$TARBALL"
 
-BUILD_DEPENDS_arm="libgcrypt-dev libgpg-error-dev libxml2-dev"
 BUILD_DEPENDS="libgcrypt-dev libgpg-error-dev libxml2-dev zlib-dev python-dev"
-SPLIT="libxslt-python libxslt-dev"
+SPLIT="$PACKAGE-python $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libzdb/receipt
--- a/libzdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libzdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0"
 CATEGORY="system-tools"
 SHORT_DESC="Zild Database Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://www.tildeslash.com/libzdb/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://www.tildeslash.com/libzdb/dist/$TARBALL"
 
 BUILD_DEPENDS="sqlite3-dev"
-SPLIT="libzdb-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libzeitgeist/receipt
--- a/libzeitgeist/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libzeitgeist/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="glib-dev"
-SPLIT="libzeitgeist-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e libzim/receipt
--- a/libzim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libzim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,13 +13,13 @@
 WGET_URL="http://www.openzim.org/archive/$TARBALL"
 
 BUILD_DEPENDS="xz-dev autoconf automake libtool"
-SPLIT="libzim-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e libzip/receipt
--- a/libzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/libzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://nih.at/libzip/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev coreutils-conditions bzip2-dev perl"
-SPLIT="libzip-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export MKDIRPROG='mkdir -p'
diff -r ad29ddfee1c9 -r d5aab818505e licenses/receipt
--- a/licenses/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/licenses/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,16 +13,13 @@
 GPL2.html GPL1.html LGPL2.1.html LGPL2.html FDL1.2.html FDL1.1.html \
 MPL2.html MPL1.1.html MPL2.txt MPL1.1.txt"
 
-src_wget()
-{
+src_wget() {
 	local file="$SRC/$(basename $2)"
 	[ -s "$file" ] || wget -O "$file" "$1"
 	cp "$file" "$2"
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	### GNU Licenses ###
 	G=http://www.gnu.org/licenses
 	O=$G/old-licenses
@@ -57,5 +54,4 @@
 	src_wget http://www.mozilla.org/MPL/2.0/index.txt	$L/MPL2.txt
 	src_wget http://www.mozilla.org/MPL/1.1/	$L/MPL1.1.html
 	src_wget http://www.mozilla.org/MPL/1.1/index.txt	$L/MPL1.1.txt
-
 }
diff -r ad29ddfee1c9 -r d5aab818505e liferea/receipt
--- a/liferea/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/liferea/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lightdm-qt/receipt
--- a/lightdm-qt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lightdm-qt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,8 +16,8 @@
 
 BUILD_DEPENDS="Qt4-dev gobject-introspection-dev pam-dev itstool \
 libxklavier-dev libgcrypt-dev wget xorg-libXdmcp-dev xorg-libX11-dev \
-xorg-libXi-dev xorg-libxkbfile-dev gettext intltool"
-SPLIT="lightdm-qt-dev"
+xorg-libXi-dev xorg-libxkbfile-dev gettext-dev intltool"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lightdm/receipt
--- a/lightdm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lightdm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="gobject-introspection-dev pam-dev itstool libxklavier-dev \
 libgcrypt-dev intltool"
-SPLIT="lightdm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lightsoff/receipt
--- a/lightsoff/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lightsoff/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja vala gtk3-dev clutter-dev clutter-gtk-dev \
-librsvg-dev gettext itstool"
+librsvg-dev gettext-dev itstool"
 
 compile_rules() {
 	mv data/icons/hicolor/symbolic/apps/lightsoff-symbolic \
diff -r ad29ddfee1c9 -r d5aab818505e lighttpd-ssl/receipt
--- a/lighttpd-ssl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lighttpd-ssl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.35"
 CATEGORY="network"
 SHORT_DESC="Fast and light HTTP Web server with SSL support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.lighttpd.net/"
 REPOLOGY="lighttpd"
@@ -37,7 +37,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
@@ -49,8 +49,8 @@
 	# Modules.
 	mkdir -p $fs/usr/lib/lighttpd
 	for module in $BASE_MODULES; do
-		action 'Copying : mod_${module}.so'
-		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
+		action 'Copying : mod_$module.so'
+		cp $install/usr/lib/lighttpd/mod_$module.so $fs/usr/lib/lighttpd
 		status
 	done
 
@@ -88,7 +88,8 @@
 
 # We stop the server by default in case of upgarde.
 pre_install() {
-	[ -z "$1" ] && for i in httpd lighttpd ngnix apache cherokee $PACKAGE ; do
+	[ -z "$1" ] &&
+	for i in httpd lighttpd ngnix apache cherokee lighttpd-ssl; do
 		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
 	done
 	# Backup config file.
@@ -97,14 +98,13 @@
 	fi
 }
 
-post_install()
-{
+post_install() {
 	if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then
 		openssl req -new -x509 \
 			-keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \
 			-out "$1/etc/ssl/lighttpd/lighttpd.pem" \
 			-days 3650 -nodes <<EOT
-$(. "$1/etc/locale.conf" ; echo ${LANG#*_})
+$(. "$1/etc/locale.conf"; echo ${LANG#*_})
 $(cat "$1/etc/TZ")
 
 $(cat "$1/etc/hostname")
diff -r ad29ddfee1c9 -r d5aab818505e lighttpd/receipt
--- a/lighttpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lighttpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.35"
 CATEGORY="network"
 SHORT_DESC="Fast and light HTTP Web server"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.lighttpd.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.lighttpd.net/lighttpd/releases-${VERSION%.*}.x/$TARBALL"
 
 BUILD_DEPENDS="pcre-dev bzip2-dev zlib-dev"
-SPLIT="lighttpd lighttpd-modules"
+SPLIT="$PACKAGE-modules"
 
 compile_rules() {
 	sed -i '/addrs_left/d' src/mod_extforward.c
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
@@ -54,8 +54,9 @@
 			# Modules.
 			mkdir -p $fs/usr/lib/lighttpd
 			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
+				action "Copying: mod_$module.so"
+				cp $install/usr/lib/lighttpd/mod_$module.so $fs/usr/lib/lighttpd
+				status
 			done
 
 			# Config file.
@@ -84,7 +85,7 @@
 			mkdir -p $fs/usr/
 			cp -a $install/usr/lib $fs/usr
 			for module in $BASE_MODULES; do
-				rm -f $fs/usr/lib/lighttpd/mod_${module}.so
+				rm -f $fs/usr/lib/lighttpd/mod_$module.so
 			done
 			rm -f $fs/usr/lib/lighttpd/*.la
 			;;
@@ -98,7 +99,8 @@
 
 # We stop the server by default in case of upgarde.
 pre_install_lighttpd() {
-	[ -z "$1" ] && for i in httpd ngnix apache cherokee $PACKAGE ; do
+	[ -z "$1" ] &&
+	for i in httpd ngnix apache cherokee lighttpd; do
 		[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
 	done
 	# Backup config file.
@@ -116,6 +118,7 @@
 
 	# Just in case.
 	chown www.www "$1/var/log/$PACKAGE"
-	[ "$1" ] || netstat -ltn 2> /dev/null | grep -q :80 ||
-	/etc/init.d/$PACKAGE start
+	[ -n "$1" ] ||
+		netstat -ltn 2>/dev/null | grep -q :80 ||
+		/etc/init.d/$PACKAGE start
 }
diff -r ad29ddfee1c9 -r d5aab818505e lilo/receipt
--- a/lilo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lilo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,22 @@
 PACKAGE="lilo"
 VERSION="24.0"
 CATEGORY="system-tools"
-SHORT_DESC="LInux boot LOader."
+SHORT_DESC="LInux boot LOader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://web.archive.org/web/20160705200041/https://alioth.debian.org/projects/lilo/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20160705200041/https://alioth.debian.org/projects/lilo/"
 WGET_URL="http://lilo.alioth.debian.org/ftp/sources/$TARBALL" # FIXME
 
 BUILD_DEPENDS="dev86 libdevmapper"
-DEPENDS="libdevmapper"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make alles &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/sbin $fs
+	DEPENDS="libdevmapper"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lilv/receipt
--- a/lilv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lilv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="lilv"
 VERSION="0.24.2"
 CATEGORY="development"
-SHORT_DESC="Make the use of LV2 plugins as simple as possible for applications."
+SHORT_DESC="Make the use of LV2 plugins as simple as possible for applications"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://drobilla.net/software/lilv/"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lincity-ng/receipt
--- a/lincity-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lincity-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,37 +3,33 @@
 PACKAGE="lincity-ng"
 VERSION="2.0"
 CATEGORY="games"
-SHORT_DESC="A City Simulation Game. It is a polished and improved version of the classic LinCity game."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="A City Simulation Game"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/lincity-ng.berlios/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://sourceforge.net/projects/lincity-ng.berlios/"
 WGET_URL="http://download.berlios.de/$PACKAGE/$TARBALL" # FIXME
 
-DEPENDS="mesa libxml2 physfs libsdl-gfx libsdl-image libsdl-mixer libsdl-ttf \
-xorg-libxcb"
 BUILD_DEPENDS="mesa-dev libxml2-dev libsdl-gfx-dev libsdl-image-dev \
 libsdl-mixer-dev libsdl-ttf libsdl-ttf-dev ftjam physfs-dev glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	jam && jam -sprefix=/usr install
+	jam &&
+	jam -sprefix=/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/lincity-ng $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
+	DEPENDS="mesa libxml2 physfs libsdl-gfx libsdl-image libsdl-mixer \
+	libsdl-ttf xorg-libxcb"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lines/receipt
--- a/lines/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lines/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,16 +8,13 @@
 LICENSE="unknown"
 WEB_SITE="http://dmitry.baranovskiy.com/work/lines/"
 
-DEPENDS="yad-html"
-
 COOKOPTS="!pixmaps"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/games \
 		$fs/usr/share/icons/hicolor/48x48/apps
 	cp -a $stuff/lines.html $fs/usr/games
 	cp -a $stuff/lines.png $fs/usr/share/icons/hicolor/48x48/apps
+	DEPENDS="yad-html"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lingot/receipt
--- a/lingot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lingot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.1"
 CATEGORY="multimedia"
 SHORT_DESC="Musical instrument tuner"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nongnu.org/lingot/"
 
diff -r ad29ddfee1c9 -r d5aab818505e links/receipt
--- a/links/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/links/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.14"
 CATEGORY="network"
 SHORT_DESC="Light and fast web browser"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://links.twibright.com/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/links.html"
@@ -14,17 +14,7 @@
 
 BUILD_DEPENDS="gpm-dev openssl-dev zlib-dev bzip2-dev xz-dev xorg-libX11-dev \
 xorg-libXt-dev libpng16-dev libjpeg-turbo-dev tiff-dev directfb-dev"
-SPLIT="links-dfb:dfb links-cli:cli"
-
-case "$ARCH" in
-	arm*)
-		VERSION="2.7"
-		TARBALL="$PACKAGE-$VERSION.tar.gz"
-		WGET_URL="http://links.twibright.com/download/$TARBALL";;
-esac
-case "$SLITAZ_ARCH" in
-	arm*) VERSION="2.7";;
-esac
+SPLIT="$PACKAGE-dfb:dfb $PACKAGE-cli:cli"
 
 compile_rules() {
 	case $SET in
@@ -37,7 +27,7 @@
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/graphics/links.xpm $install/usr/share/pixmaps/links.xpm
 	install -Dm644 $stuff/links.html       $install/usr/share/webhome/links.html
diff -r ad29ddfee1c9 -r d5aab818505e linld/receipt
--- a/linld/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linld/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="linld"
 VERSION="0.97"
 CATEGORY="system-tools"
-SHORT_DESC="Boot loader for DOS/Win9x."
+SHORT_DESC="Boot loader for DOS/Win9x"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
 SUFFIX="${VERSION//./}"
@@ -14,10 +14,8 @@
 
 BUILD_DEPENDS="dosbox upx"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mv DIST $src 2> /dev/null
+compile_rules() {
+	mv DIST $src 2>/dev/null
 	cd $src
 	rm LINLD$SUFFIX/CRTL.CPP
 	cp $stuff/src/* LINLD$SUFFIX/
@@ -50,9 +48,7 @@
 	cp tobzimage $install/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/share/boot $fs/usr/share
 }
diff -r ad29ddfee1c9 -r d5aab818505e linphone/receipt
--- a/linphone/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linphone/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool libsdl-dev ffmpeg-dev osip-dev exosip-dev speex-dev \
 xorg-libXv-dev v4l-utils-dev libglade-dev gtk2-dev glib-dev speex-dev"
-SPLIT="linphone-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
@@ -35,7 +35,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e linux-cloop/receipt
--- a/linux-cloop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linux-cloop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 CATEGORY="base-system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-SHORT_DESC="The read-only compressed loop device kernel module."
+SHORT_DESC="The read-only compressed loop device kernel module"
 WEB_SITE="http://knoppix.net/wiki/Cloop"
 REPOLOGY="cloop"
 
diff -r ad29ddfee1c9 -r d5aab818505e linux-dev/receipt
--- a/linux-dev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linux-dev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -41,7 +41,7 @@
 
 	make mrproper &&
 	make headers_check &&
-	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install
+	make INSTALL_HDR_PATH=$install/usr headers_install
 
 	find $install \( -name .install -o -name ..install.cmd \) -delete
 
diff -r ad29ddfee1c9 -r d5aab818505e linux-libre-api-headers/receipt
--- a/linux-libre-api-headers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linux-libre-api-headers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,19 @@
 PACKAGE="linux-libre-api-headers"
 VERSION="2.6.37-gnu"
 CATEGORY="development"
-SHORT_DESC="Kernel headers sanitized for use in userspace."
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="Kernel headers sanitized for use in userspace"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-PROVIDE="linux-api-headers"
+WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
+
 SOURCE="linux-libre"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
 WGET_URL="http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="perl"
 
-# Rules to compile & install the temporary toolchain.
-cook_tmp_toolchain()
-{
+# Compile & install the temporary toolchain.
+cook_tmp_toolchain() {
 	cd $src
 	make mrproper &&
 	make headers_check &&
@@ -24,26 +23,20 @@
 	cp -r dest/include/* /tools/include
 }
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make mrproper &&
 	make headers_check &&
-	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install
+	make INSTALL_HDR_PATH=$install/usr headers_install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/include $fs/usr
-	rm -f $(find ${fs} -name .install -or -name ..install.cmd)
+	rm -f $(find $fs -name .install -or -name ..install.cmd)
+	PROVIDE="linux-api-headers"
 }
 
-# Post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	# Removed old linux-libre-headers
 	[ ! -d "$1/var/lib/tazpkg/installed/linux-libre-headers" ] ||
 	rm -rf "$1/var/lib/tazpkg/installed/linux-libre-headers"
diff -r ad29ddfee1c9 -r d5aab818505e linux-libre/receipt
--- a/linux-libre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linux-libre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,33 +4,37 @@
 VERSION="2.6.37-gnu"
 CATEGORY="base-system"
 SHORT_DESC="The Linux Libre kernel"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.fsfla.org/svnwiki/selibre/linux-libre/"
 WGET_URL="http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="slitaz-toolchain perl git lzma patch gcc3"
-SPLIT="linux-libre-acpi linux-libre-agp linux-libre-aoe linux-libre-appletalk \
-linux-libre-autofs linux-libre-bluetooth linux-libre-bridge linux-libre-btrfs \
-linux-libre-cifs linux-libre-coda linux-libre-configfs linux-libre-cpufreq \
-linux-libre-cramfs linux-libre-crypto linux-libre-cryptoloop \
-linux-libre-dialup linux-libre-dlm linux-libre-drm linux-libre-firewire \
-linux-libre-gfs2 linux-libre-hfs linux-libre-hfsplus linux-libre-hwmon \
-linux-libre-input-misc linux-libre-input-tablet linux-libre-input-touchscreen \
-linux-libre-ipv6 linux-libre-irda linux-libre-isdn linux-libre-jfs \
-linux-libre-joystick linux-libre-kvm linux-libre-logfs linux-libre-md \
-linux-libre-memstick linux-libre-minix linux-libre-mmc \
-linux-libre-module-headers linux-libre-mwave linux-libre-nbd linux-libre-ncpfs \
-linux-libre-netfilter linux-libre-nfsd linux-libre-reiserfs linux-libre-sched \
-linux-libre-scsi linux-libre-sound linux-libre-source linux-libre-speakup \
-linux-libre-squashfs linux-libre-toshiba linux-libre-udf linux-libre-usbdsl \
-linux-libre-usbip linux-libre-usb-misc linux-libre-uwb linux-libre-video \
-linux-libre-wimax linux-libre-wireless linux-libre-without-modules lguest-libre"
+SPLIT="\
+$PACKAGE-acpi         $PACKAGE-agp                $PACKAGE-aoe \
+$PACKAGE-appletalk    $PACKAGE-autofs             $PACKAGE-bluetooth \
+$PACKAGE-bridge       $PACKAGE-btrfs              $PACKAGE-cifs \
+$PACKAGE-coda         $PACKAGE-configfs           $PACKAGE-cpufreq \
+$PACKAGE-cramfs       $PACKAGE-crypto             $PACKAGE-cryptoloop \
+$PACKAGE-dialup       $PACKAGE-dlm                $PACKAGE-drm \
+$PACKAGE-firewire     $PACKAGE-gfs2               $PACKAGE-hfs \
+$PACKAGE-hfsplus      $PACKAGE-hwmon              $PACKAGE-input-misc \
+$PACKAGE-input-tablet $PACKAGEe-input-touchscreen $PACKAGE-ipv6 \
+$PACKAGE-irda         $PACKAGE-isdn               $PACKAGE-jfs \
+$PACKAGE-joystick     $PACKAGE-kvm                $PACKAGE-logfs \
+$PACKAGE-md           $PACKAGE-memstick           $PACKAGE-minix \
+$PACKAGE-mmc          $PACKAGE-module-headers     $PACKAGE-mwave \
+$PACKAGE-nbd          $PACKAGE-ncpfs              $PACKAGE-netfilter \
+$PACKAGE-nfsd         $PACKAGE-reiserfs           $PACKAGE-sched \
+$PACKAGE-scsi         $PACKAGE-sound              $PACKAGE-source \
+$PACKAGE-speakup      $PACKAGE-squashfs           $PACKAGE-toshiba \
+$PACKAGE-udf          $PACKAGE-usbdsl             $PACKAGE-usbip \
+$PACKAGE-usb-misc     $PACKAGE-uwb                $PACKAGE-video \
+$PACKAGE-wimax        $PACKAGE-wireless           $PACKAGE-without-modules \
+lguest-libre"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# this is code to help update the kernel version faster
 	#for i in $(grep -l 'WANTED="linux-libre"' $WOK/*/receipt)
 	#do
@@ -56,13 +60,13 @@
 	echo "Copying Aufs files and patches..."
 	cp -a $AUFSDIR/Documentation $AUFSDIR/fs $AUFSDIR/include $src
 	cp -a $AUFSDIR/*.patch $stuff
-	
+
 	# SliTaz db
 	rm -rf $WOK/$PACKAGE/slitaz && mkdir $WOK/$PACKAGE/slitaz
 	echo "$WGET_URL" > $WOK/$PACKAGE/slitaz/url
 	cp $stuff/gztazmod.sh $stuff/list_modules.sh $WOK/$PACKAGE/slitaz
 	cp $stuff/bootloader.sh $WOK/$PACKAGE/slitaz
-	
+
 	# Apply patches
 	echo "Applying patches..."
 	while read patch_file; do
@@ -91,7 +95,7 @@
 
 	export LD_LIBRARY_PATH="/usr/libgcc3:$LD_LIBRARY_PATH"
 	export MAKEFLAGS="$MAKEFLAGS CC=gcc-3 CXX=g++-3"
-	
+
 	make mrproper
 	cd Documentation/lguest
 	make $MAKEFLAGS lguest || return 1
@@ -107,8 +111,8 @@
 		-e 's/^CONFIG_RT2870/#&/' .config
 	yes '' | make oldconfig
 	make $MAKEFLAGS bzImage || return 1
-	[ -d $DESTDIR ] || mkdir -p $DESTDIR
-	mv arch/x86/boot/bzImage $DESTDIR
+	[ -d $install ] || mkdir -p $install
+	mv arch/x86/boot/bzImage $install
 	mv System.map System.map-without-modules
 
 	# Build bzImage with modules
@@ -117,21 +121,19 @@
 	ln .config $WOK/$PACKAGE/slitaz/config
 	make $MAKEFLAGS bzImage &&
 	make $MAKEFLAGS modules &&
-	make INSTALL_MOD_PATH=$DESTDIR modules_install &&
-	make INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
+	make INSTALL_MOD_PATH=$install modules_install &&
+	make INSTALL_HDR_PATH=$install/usr headers_install &&
 	[ -s arch/x86/boot/bzImage ] return 1
-	mkdir -p $DESTDIR/boot 2> /dev/null
-	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
+	mkdir -p $install/boot 2>/dev/null
+	mv arch/x86/boot/bzImage $install/boot/vmlinuz-$VERSION-slitaz
 
 	# Compress all modules.
-	$stuff/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
+	$stuff/gztazmod.sh $install/lib/modules/$VERSION-slitaz
 	ln System.map System.map-modules
 	ln Module.symvers Module.symvers-modules
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		linux-libre)
 			local path
@@ -147,7 +149,7 @@
 			export _pkg
 			mkdir $WOK/$PACKAGE/tmp
 			$stuff/list_modules.sh \
-			$(cat stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
+			$(cat $stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
 			while read module; do
 				dir=$(dirname $module)
 				[ -d $path/$dir ] || mkdir -p $path/$dir
@@ -465,7 +467,7 @@
 			# Modules paths and list
 			MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 			MODULES="fs/dlm/dlm.ko.gz"
-			mkdir -p ${fs}${MOD_PATH} $fs/etc
+			mkdir -p $fs${MOD_PATH} $fs/etc
 			for module in $MODULES; do
 				dir=$MOD_PATH/$(dirname $module)
 				[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -878,7 +880,7 @@
 			mkdir -p $fs/$path/drivers/media/video
 			cp -a $src/drivers/media/video/*.h  $fs/$path/drivers/media/video/
 
-			for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo ; do
+			for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do
 				mkdir -p $fs/$path/drivers/media/video/$i
 				cp -a $src/drivers/media/video/$i/*.h $fs/$path/drivers/media/video/$i
 			done
@@ -1172,7 +1174,7 @@
 			# Modules paths and list
 			MOD_PATH="lib/modules/$VERSION-slitaz/kernel"
 			MODULES="drivers/char/toshiba.ko.gz"
-			mkdir -p ${fs}${MOD_PATH}
+			mkdir -p $fs${MOD_PATH}
 			for module in $MODULES; do
 				dir=$MOD_PATH/$(dirname $module)
 				[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -1266,7 +1268,7 @@
 			MODULES="drivers/video/backlight/lcd.ko.gz
 			drivers/video/backlight/generic_bl.ko.gz
 			drivers/gpio/bt8xxgpio.ko.gz"
-			mkdir -p ${fs}${MOD_PATH}
+			mkdir -p $fs${MOD_PATH}
 			for module in $MODULES; do
 				dir=$MOD_PATH/$(dirname $module)
 				[ -d $fs/$dir ] || mkdir -p $fs/$dir
@@ -1334,13 +1336,11 @@
 	esac
 }
 
-# Pre and post install commands for Tazpkg.
-post_install_linux_libre()
-{
+post_install_linux_libre() {
 	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)
+		root_dev=$(cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1)	#'MC
 		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
diff -r ad29ddfee1c9 -r d5aab818505e linux/receipt
--- a/linux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,48 +1,46 @@
 # SliTaz package receipt v2.
 
 PACKAGE="linux"
-VERSION="4.17.7"
+VERSION="4.14.76"
 KBASEVER="$(echo $VERSION | cut -d. -f1,2)"
 CATEGORY="base-system"
 SHORT_DESC="The Linux Kernel"
 MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.kernel.org/"
-HOST_ARCH="i486 arm x86_64"
 
 TARBALL="$PACKAGE-$KBASEVER.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/kernel/v4.x/$TARBALL"
 
-BUILD_DEPENDS_arm="xz"
 BUILD_DEPENDS_x86_64="perl xz patch kmod bc elfutils-dev openssl-dev"
 BUILD_DEPENDS="perl xz lzma patch kmod bc elfutils-dev openssl-dev" # git
 # Removed: lguest, linux-firmware, linux-logfs, linux-irda, linux-toshiba
 SPLIT="\
-linux-acpi            linux-agp               linux-aoe \
-linux-appletalk       linux-arcnet            linux-autofs \
-linux-bluetooth       linux-bridge            linux-btrfs \
-linux-cifs            linux-coda              linux-cpufreq \
-linux-cramfs          linux-crypto            linux-cryptoloop \
-linux-dialup          linux-dlm               linux-drm \
-linux-ecryptfs        linux-efi               linux-ethernet \
-linux-exofs           linux-firewire          linux-gfs2 \
-linux-hfs             linux-hfsplus           linux-hid \
-linux-hwmon           linux-ide               linux-input-misc \
-linux-input-tablet    linux-input-touchscreen linux-ipv6 \
-linux-isdn            linux-jfs \
-linux-joystick        linux-kvm               linux-md \
-linux-media           linux-memstick          linux-minix \
-linux-mmc             linux-module-headers    linux-mwave \
-linux-ncpfs           linux-nbd               linux-netfilter \
-linux-nfc             linux-nfs               linux-nfsd \
-linux-ocfs2           linux-orangefs          linux-radio \
-linux-reiserfs        linux-romfs             linux-sched \
-linux-scsi            linux-sound             linux-source \
-linux-speakup         linux-squashfs          linux-staging \
-linux-usb-gadget      linux-usb-misc          linux-usbdsl \
-linux-usbip           linux-uwb               linux-video \
-linux-wan             linux-watchdog          linux-wimax \
-linux-wireless        linux-without-modules   linux-zram"
+$PACKAGE-acpi            $PACKAGE-agp               $PACKAGE-aoe \
+$PACKAGE-appletalk       $PACKAGE-arcnet            $PACKAGE-autofs \
+$PACKAGE-bluetooth       $PACKAGE-bridge            $PACKAGE-btrfs \
+$PACKAGE-cifs            $PACKAGE-coda              $PACKAGE-cpufreq \
+$PACKAGE-cramfs          $PACKAGE-crypto            $PACKAGE-cryptoloop \
+$PACKAGE-dialup          $PACKAGE-dlm               $PACKAGE-drm \
+$PACKAGE-ecryptfs        $PACKAGE-efi               $PACKAGE-ethernet \
+$PACKAGE-exofs           $PACKAGE-firewire          $PACKAGE-gfs2 \
+$PACKAGE-hfs             $PACKAGE-hfsplus           $PACKAGE-hid \
+$PACKAGE-hwmon           $PACKAGE-ide               $PACKAGE-input-misc \
+$PACKAGE-input-tablet    $PACKAGE-input-touchscreen $PACKAGE-ipv6 \
+$PACKAGE-isdn            $PACKAGE-jfs \
+$PACKAGE-joystick        $PACKAGE-kvm               $PACKAGE-md \
+$PACKAGE-media           $PACKAGE-memstick          $PACKAGE-minix \
+$PACKAGE-mmc             $PACKAGE-module-headers    $PACKAGE-mwave \
+$PACKAGE-ncpfs           $PACKAGE-nbd               $PACKAGE-netfilter \
+$PACKAGE-nfc             $PACKAGE-nfs               $PACKAGE-nfsd \
+$PACKAGE-ocfs2           $PACKAGE-orangefs          $PACKAGE-radio \
+$PACKAGE-reiserfs        $PACKAGE-romfs             $PACKAGE-sched \
+$PACKAGE-scsi            $PACKAGE-sound             $PACKAGE-source \
+$PACKAGE-speakup         $PACKAGE-squashfs          $PACKAGE-staging \
+$PACKAGE-usb-gadget      $PACKAGE-usb-misc          $PACKAGE-usbdsl \
+$PACKAGE-usbip           $PACKAGE-uwb               $PACKAGE-video \
+$PACKAGE-wan             $PACKAGE-watchdog          $PACKAGE-wimax \
+$PACKAGE-wireless        $PACKAGE-without-modules   $PACKAGE-zram"
 COOKOPTS="skip-log-errors"
 
 if [ "$KBASEVER" != "${VERSION%.0}" ]; then
@@ -63,22 +61,12 @@
 # CONFIG_RETPOLINE
 #   against Spectre v.2 available both for i386 and x86_64 architectures.
 
-# Handle multiarch installation. ARM use Busybox modutils, so avoid any
-# deps on kmod. SLITAZ_ARCH can have also custom post_install commands
-if [ -f $root/etc/slitaz/slitaz.conf ]; then
-	. $root/etc/slitaz/slitaz.conf
-	case "$SLITAZ_ARCH" in
-		arm) DEPENDS="" ;;
-	esac
-fi
 
-# Rules to configure and make the package.
 compile_rules() {
 	case $ARCH in
 		# Linux don't supported i386 CPU, but ARCH should be 'i386' if we need 32bit CPU support
 		i?86)   ConfigFile="$stuff/linux-slitaz.config";   Arch='i386';;
 		x86_64) ConfigFile="$stuff/linux-slitaz64.config"; Arch='x86_64';;
-		arm*)   ConfigFile="$stuff/arm/linux-arm.config";  Arch='arm';;
 	esac
 
 	# Update sources to the $VERSION using base sources ($KBASEVER) and patch
@@ -96,25 +84,6 @@
 		cp /usr/share/boot/initrd initrd.cpio
 	fi
 
-	# Handle cross compilation
-	case "$ARCH" in
-		arm)
-			echo "Compiling: $Arch Kernel"
-			make mrproper
-			patch -Np1 < $stuff/arm/linux-arm.patch || exit 1
-			cp -f $ConfigFile .config
-			yes '' | make ARCH=$Arch oldconfig
-			make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- bzImage &&
-			make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- modules &&
-			make ARCH=$Arch CROSS_COMPILE=${HOST_SYSTEM}- \
-				INSTALL_MOD_PATH=$DESTDIR modules_install &&
-			mkdir -p $DESTDIR/boot &&
-			cp -a arch/arm/boot/zImage \
-				$DESTDIR/boot/linux-$VERSION-slitaz-$ARCH
-			#$stuff/tools/gztazmod.sh $DESTDIR/lib/modules/$VERSION-slitaz
-			return 0 ;;
-	esac
-
 	# Get and apply Aufs patches
 	. $stuff/tools/aufs-patches
 
@@ -152,10 +121,10 @@
 		yes '' | make ARCH=$Arch oldconfig
 
 		title 'Building bzImage without modules...'
-		make ARCH=$Arch -j4 bzImage || exit 1
+		make ARCH=$Arch -j4 bzImage || return 1
 
-		mkdir -p $DESTDIR
-		mv arch/x86/boot/bzImage $DESTDIR
+		mkdir -p $install
+		mv arch/x86/boot/bzImage $install
 		mv System.map System.map-without-modules
 	fi
 
@@ -169,14 +138,14 @@
 	title 'Building bzImage with modules...'
 	make ARCH=$Arch -j4 bzImage &&
 	make ARCH=$Arch -j4 modules &&
-	make ARCH=$Arch INSTALL_MOD_PATH=$DESTDIR     modules_install &&
-	make ARCH=$Arch INSTALL_HDR_PATH=$DESTDIR/usr headers_install &&
+	make ARCH=$Arch INSTALL_MOD_PATH=$install     modules_install &&
+	make ARCH=$Arch INSTALL_HDR_PATH=$install/usr headers_install &&
 
 	[ -s arch/x86/boot/bzImage ] || return 1
-	mkdir -p $DESTDIR/boot
-	mv arch/x86/boot/bzImage $DESTDIR/boot/vmlinuz-$VERSION-slitaz
+	mkdir -p $install/boot
+	mv arch/x86/boot/bzImage $install/boot/vmlinuz-$VERSION-slitaz
 
-	$stuff/tools/install_module_headers.sh $DESTDIR $src $VERSION-slitaz
+	$stuff/tools/install_module_headers.sh $install $src $VERSION-slitaz
 
 	ln System.map System.map-modules
 	ln Module.symvers Module.symvers-modules
@@ -188,7 +157,6 @@
 }
 
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules() {
 	DEPENDS="linux"				# default, may be subject to change later
 
@@ -274,13 +242,6 @@
 	case $PACKAGE in
 		linux)
 			DEPENDS="kmod"
-			case "$ARCH" in
-				arm)
-					echo "Packing: ARM Kernel"
-					cp -a $install/* $fs
-					rm -f $fs/lib/modules/*/build $fs/lib/modules/*/source
-					return 0 ;;
-			esac
 
 			# Copy the Kernel
 			cp -a $install/boot $fs
@@ -393,14 +354,6 @@
 
 
 post_install_linux() {
-	# Handle multiarch installation
-	case "$SLITAZ_ARCH" in
-		arm)
-			echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH"
-			echo "Modules: /lib/modules/$VERSION-slitaz"
-			return 0 ;;
-	esac
-
 	# GRUB stuff.
 	if [ -f "$1/boot/grub/menu.lst" ]; then
 		# Current root device
diff -r ad29ddfee1c9 -r d5aab818505e linuxconsoletools/receipt
--- a/linuxconsoletools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linuxconsoletools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,25 @@
 PACKAGE="linuxconsoletools"
 VERSION="1.4.5"
 CATEGORY="system-tools"
-SHORT_DESC="Configure joysticks, or connect legacy input devices."
+SHORT_DESC="Configure joysticks, or connect legacy input devices"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://sourceforge.net/projects/linuxconsole/"
 WGET_URL="$SF_MIRROR/linuxconsole/$TARBALL"
 
-DEPENDS="libsdl"
 BUILD_DEPENDS="libsdl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export PREFIX=/usr
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/joystick $fs/usr/share
+	DEPENDS="libsdl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e linuxdcpp/receipt
--- a/linuxdcpp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/linuxdcpp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.3"
 CATEGORY="network"
 SHORT_DESC="Direct Connect client based on DC++"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://launchpad.net/linuxdcpp"
 
@@ -14,9 +14,9 @@
 BUILD_DEPENDS="gtk2-dev libglade-dev openssl-dev scons2 libglade bzlib bzip2-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr
+	mkdir -p $install/usr
 	scons PREFIX=/usr &&
-	scons PREFIX=$DESTDIR/usr install
+	scons PREFIX=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lionwiki/receipt
--- a/lionwiki/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lionwiki/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Minimalist Wiki engine programmed in PHP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://lionwiki.0o.cz"
+WEB_SITE="http://lionwiki.0o.cz/index.php?page=Main+page"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL"
+WGET_URL="$WEB_SITE/download/$VERSION/$TARBALL" # FIXME
 
 compile_rules() {
 	mkdir -p $install/var/www
diff -r ad29ddfee1c9 -r d5aab818505e lirc/receipt
--- a/lirc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lirc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="utilities"
 SHORT_DESC="Enables decoding and sending signals of many commonly used remote \
 controls"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lirc.org/"
 
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="linux linux-module-headers python libusb-dev libirman-dev \
 portaudio-dev alsa-lib-dev libusb-compat-dev util-linux-uuid-dev \
 libftdi-dev jack-dev libxslt python3 eudev-dev"
-SPLIT="lirc-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -30,7 +30,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e listpatron/receipt
--- a/listpatron/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/listpatron/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.1.1"
 CATEGORY="office"
 SHORT_DESC="GTK+2 application for maintaining lists of information"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.electricmonk.nl/Programmings/ListPatron"
+WEB_SITE="https://github.com/fboender/listpatron"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://projects.electricmonk.nl/projects/$PACKAGE/$TARBALL"
+WGET_URL="http://projects.electricmonk.nl/projects/$PACKAGE/$TARBALL" # FIXME
 
 BUILD_DEPENDS="gtk2-dev"
 
@@ -19,7 +19,7 @@
 		--libexecdir=/usr/lib/$PACKAGE \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lite/receipt
--- a/lite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="lite"
 VERSION="0.8.10"
 CATEGORY="graphics"
-SHORT_DESC="LiTE is a Toolkit Engine using DirectFB"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Toolkit Engine using DirectFB"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.directfb.org/index.php?path=Platform/LiTE"
 
@@ -12,15 +12,9 @@
 WGET_URL="http://www.directfb.org/downloads/Libs/$TARBALL"
 
 BUILD_DEPENDS="directfb-dev"
-SPLIT="lite-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm)
-			export LDFLAGS="$LDFLAGS -L/cross/arm/sysroot/usr/lib"
-			export CPPFLAGS="$CPPFLAGS -I/cross/arm/sysroot/usr/include/directfb" ;;
-	esac
-
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e litmus/receipt
--- a/litmus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/litmus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="litmus"
 VERSION="0.12.1"
 CATEGORY="network"
-SHORT_DESC="WEBDAV server protocol compliance test suite."
+SHORT_DESC="WEBDAV server protocol compliance test suite"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://web.archive.org/web/20171006064353/http://www.webdav.org/neon/litmus"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20171006064353/http://www.webdav.org/neon/litmus"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="openssl libkrb5 libcomerr3 expat neon readline zlib"
 BUILD_DEPENDS="openssl-dev krb5-dev expat-dev neon-dev readline-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--libexecdir=/usr/lib --mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl libkrb5 libcomerr3 expat neon readline zlib"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e littleutils/receipt
--- a/littleutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/littleutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="littleutils"
 VERSION="1.0.32"
 CATEGORY="misc"
-SHORT_DESC="Image optimizers, archive recompressors, file property tools ..."
+SHORT_DESC="Image optimizers, archive recompressors, file property tools..."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://sourceforge.net/projects/littleutils/"
@@ -16,7 +16,7 @@
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lives/receipt
--- a/lives/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lives/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.8.6"
 CATEGORY="multimedia"
 SHORT_DESC="Simple to use, yet powerful video editor and VJ tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://lives.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://lives-video.com/releases/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib alsa-lib-dev libpng16-dev gtk2-dev procps expat-dev \
-perl gettext-tools"
+perl gettext"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Fix the name (.desktop) file.
 	sed -i 's|^Exec=.*|Exec=lives-exe|' $install/usr/share/applications/LiVES.desktop
diff -r ad29ddfee1c9 -r d5aab818505e llvm/receipt
--- a/llvm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/llvm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="${WEB_SITE}releases/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake zlib-dev libffi-dev python"
-SPLIT="llvm-dev llvm-libs"
+SPLIT="$PACKAGE-dev $PACKAGE-libs"
 
 compile_rules() {
 #	fix math
diff -r ad29ddfee1c9 -r d5aab818505e lm-sensors/receipt
--- a/lm-sensors/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lm-sensors/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://ftp.gwdg.de/pub/linux/misc/lm-sensors/$TARBALL"
 
 BUILD_DEPENDS="rrdtool-dev"
-SPLIT="lm-sensors-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/etc/sysconfig|/etc/conf.d|' prog/detect/sensors-detect
diff -r ad29ddfee1c9 -r d5aab818505e lmms/receipt
--- a/lmms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lmms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lmms"
 VERSION="0.4.13"
 CATEGORY="multimedia"
 SHORT_DESC="The Linux MultiMedia Studio"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://lmms.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://lmms.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libsdl glib fluidsynth libpng16 libvorbis fftw xorg-libXft \
-xorg-libXinerama libsamplerate libQtGui libQtXml"
 BUILD_DEPENDS="libsdl-dev glib-dev fftw-dev fluidsynth-dev libpng16-dev \
 libogg-dev libvorbis-dev alsa-lib-dev xorg-libXft-dev xorg-libXinerama-dev \
 libsndfile-dev libsamplerate-dev Qt4-dev qt4-phonon qmake cmake freetype-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr
-	make && make DESTDIR=$DESTDIR install
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/lmms $fs/usr/share
-	rm -rf $fs/usr/share/lmms/locale
+genpkg_rules() {
+	copy @std
+	DEPENDS="libsdl glib fluidsynth libpng16 libvorbis fftw xorg-libXft \
+	xorg-libXinerama libsamplerate libQtGui libQtXml"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lockdis/receipt
--- a/lockdis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lockdis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="lockdis"
 VERSION="1.0"
 CATEGORY="x-window"
-SHORT_DESC="Simple screen locker."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Simple screen locker"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://lockdis.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://lockdis.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="xorg-libX11 xorg-libXau xorg-libXpm xorg-libXdmcp"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXau-dev xorg-libXpm-dev xorg-libXdmcp-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="xorg-libX11 xorg-libXau xorg-libXpm xorg-libXdmcp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e log4c/receipt
--- a/log4c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/log4c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.2.1"
 CATEGORY="system-tools"
 SHORT_DESC="Logging for C Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://log4c.sourceforge.net"
+WEB_SITE="http://log4c.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e logfence/receipt
--- a/logfence/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/logfence/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e logrotate/receipt
--- a/logrotate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/logrotate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -28,7 +28,7 @@
 genpkg_rules() {
 	copy @std
 	DEPENDS="popt"
-	CONFIG_FILE="/etc/logrotate.conf"
+	CONFIG_FILES="/etc/logrotate.conf"
 }
 
 post_install() {
diff -r ad29ddfee1c9 -r d5aab818505e logsurfer/receipt
--- a/logsurfer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/logsurfer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="logsurfer"
 VERSION="1.8"
 CATEGORY="system-tools"
-SHORT_DESC="A program for monitoring system logs in real-time."
+SHORT_DESC="A program for monitoring system logs in real-time"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://www.crypt.gen.nz/logsurfer"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.crypt.gen.nz/logsurfer"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share/man/man1 \
-		 $DESTDIR/usr/share/man/man4 \
-		 $DESTDIR/usr/bin
-	sed -i "s|dir = @|dir = $DESTDIR/@|" Makefile.in
-	./configure --prefix=/usr \
+compile_rules() {
+	mkdir -p \
+		$install/usr/share/man/man1 \
+		$install/usr/share/man/man4 \
+		$install/usr/bin
+	sed -i "s|dir = @|dir = $install/@|" Makefile.in
+
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e loqui/receipt
--- a/loqui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/loqui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.2"
 CATEGORY="x-window"
 SHORT_DESC="Light IRC Client for GTK2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://launchpad.net/loqui"
 
diff -r ad29ddfee1c9 -r d5aab818505e lorcon-old/receipt
--- a/lorcon-old/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lorcon-old/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="224"
 CATEGORY="network"
 SHORT_DESC="Loss Of Radio CONnectivity"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://802.11ninja.net"
+WEB_SITE="http://code.google.com/archive/p/lorcon/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="subversion|http://802.11ninja.net/svn/lorcon/branch/lorcon-old/"
+WGET_URL="subversion|http://802.11ninja.net/svn/lorcon/branch/lorcon-old/" # FIXME
 
 BUILD_DEPENDS="subversion"
-SPLIT="lorcon-old-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch -d 197001010000 .depend
diff -r ad29ddfee1c9 -r d5aab818505e lorcon/receipt
--- a/lorcon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lorcon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,16 @@
 SHORT_DESC="A generic library for injecting 802.11 frames, capable of \
 injection via multiple driver frameworks, without forcing modification of the \
 application code"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://802.11ninja.net/lorcon/"
+WEB_SITE="http://code.google.com/archive/p/lorcon/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 BRANCH="$VERSION"
-WGET_URL="subversion|http://802.11ninja.net/svn/lorcon/trunk"
+WGET_URL="subversion|http://802.11ninja.net/svn/lorcon/trunk" # FIXME
 
 BUILD_DEPENDS="subversion"
-SPLIT="lorcon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch -d 197001010000 .depend
@@ -23,7 +23,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lostirc/receipt
--- a/lostirc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lostirc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.4.6"
 CATEGORY="network"
 SHORT_DESC="A simple IRC client"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://lostirc.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://dfn.dl.sourceforge.net/sourceforge/lostirc/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="glibmm-dev cairomm-dev gtkmm-dev libsigc++-dev gtk2-dev"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/skel/.lostirc/perform.conf \
 		$install/etc/skel/.lostirc/perform.conf
diff -r ad29ddfee1c9 -r d5aab818505e lrzip/receipt
--- a/lrzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lrzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lrzsz/receipt
--- a/lrzsz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lrzsz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,22 @@
 PACKAGE="lrzsz"
 VERSION="0.12.20"
 CATEGORY="network"
-SHORT_DESC="free x/y/zmodem implementation"
+SHORT_DESC="Free x/y/zmodem implementation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://ohse.de/uwe/software/lrzsz.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://ohse.de/uwe/software/lrzsz.html"
 WGET_URL="https://ohse.de/uwe/releases/$TARBALL"
 
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e lsdvd/receipt
--- a/lsdvd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lsdvd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="lsdvd"
 VERSION="0.16"
 CATEGORY="system-tools"
-SHORT_DESC="A console application that displays the content of a DVD."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="A console application that displays the content of a DVD"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/lsdvd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/lsdvd/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libdvdread"
 BUILD_DEPENDS="libdvdread-dev automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make &&	make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libdvdread"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lshw/receipt
--- a/lshw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lshw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lshw"
 VERSION="B.02.15"
 CATEGORY="system-tools"
 SHORT_DESC="Hardware Lister"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://ezix.org/project/wiki/HardwareLiSter"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://ezix.org/project/wiki/HardwareLiSter"
 WGET_URL="https://ezix.org/software/files/$TARBALL"
 
-DEPENDS="gcc-lib-base"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/hwNode::hwNode/hwNode/' src/core/scsi.cc
 	grep -qs 'define u8' src/core/scsi.cc src/core/burner.cc ||
 	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
 		src/core/scsi.cc src/core/burner.cc
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/share/lshw $fs/usr/share
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lsscsi/receipt
--- a/lsscsi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lsscsi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.21"
 CATEGORY="system-tools"
 SHORT_DESC="Lists information about SCSI devices"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sg.danny.cz/scsi/lsscsi.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e lsyncd/receipt
--- a/lsyncd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lsyncd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,26 @@
 PACKAGE="lsyncd"
 VERSION="2.1.5"
 CATEGORY="network"
-SHORT_DESC="Live Syncing (Mirror) Daemon."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Live Syncing (Mirror) Daemon"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://axkibe.github.io/lsyncd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://axkibe.github.io/lsyncd/"
 WGET_URL="http://lsyncd.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="lua5.1"
 BUILD_DEPENDS="lua5.1-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS LDFLAGS="$LDFLAGS -ldl" &&
-	make && make install
+compile_rules() {
+	./configure \
+		LDFLAGS="$LDFLAGS -ldl" \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="lua5.1"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lua/receipt
--- a/lua/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lua/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.3.4"
 CATEGORY="development"
 SHORT_DESC="Powerful, fast, light-weight, embeddable scripting language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.lua.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lua.html"
@@ -33,9 +33,9 @@
 	esac &&
 
 	make \
-		INSTALL_TOP=$DESTDIR/usr \
+		INSTALL_TOP=$install/usr \
 		INSTALL_DATA="cp -d" \
-		INSTALL_MAN=$DESTDIR/usr/share/man/man1 \
+		INSTALL_MAN=$install/usr/share/man/man1 \
 		TO_LIB="liblua.so liblua.so.${VERSION%.*} liblua.so.$VERSION" \
 		install || return 1
 
diff -r ad29ddfee1c9 -r d5aab818505e lua5.1/receipt
--- a/lua5.1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lua5.1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.1.5"
 CATEGORY="development"
 SHORT_DESC="Powerful, fast, light-weight, embeddable scripting language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.lua.org/"
 REPOLOGY="lua51"
@@ -15,7 +15,7 @@
 TARBALL_SHA1="b3882111ad02ecc6b972f8c1241647905cb2e3fc"
 
 BUILD_DEPENDS="readline-dev"
-SPLIT="lua5.1-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e luafilesystem/receipt
--- a/luafilesystem/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/luafilesystem/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,7 @@
 
 BUILD_DEPENDS="lua-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Determine Lua version (i.e "5.3")
 	luaver=$(grep 'V=' /usr/lib/pkgconfig/lua.pc | cut -d= -f2)
 	# Fix prefix and install dir
@@ -23,12 +21,12 @@
 	# Use DESTDIR
 	sed -i "s|\$(LUA_LIBDIR)|\$(DESTDIR)&|" $src/Makefile
 
-	make && make test && make install
+	make &&
+	make test &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	SUGGESTED="lua"
 }
diff -r ad29ddfee1c9 -r d5aab818505e luajit/receipt
--- a/luajit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/luajit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,23 @@
 VERSION="2.0.3"
 CATEGORY="development"
 SHORT_DESC="Just-In-Time Compiler for Lua"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://luajit.org"
+WEB_SITE="http://luajit.org/"
 
 TARBALL="LuaJIT-$VERSION.tar.gz"
 WGET_URL="http://luajit.org/download/$TARBALL"
 
-SPLIT="luajit-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	make amalg PREFIX=/usr &&
-	make install DESTDIR=$DESTDIR PREFIX=/usr
+	make PREFIX=/usr amalg &&
+	make DESTDIR=$install PREFIX=/usr install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-		luajit)
-			copy @std
-			;;
-		*-dev)
-			copy @dev
-			;;
+		luajit) copy @std;;
+		*-dev)  copy @dev;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e luasocket/receipt
--- a/luasocket/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/luasocket/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="luasocket"
 VERSION="2.0.2"
 CATEGORY="development"
-SHORT_DESC="Network support for the Lua language."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Network support for the Lua language"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://w3.impa.br/~diego/software/luasocket/home.html"
 REPOLOGY="lua:socket"
@@ -12,19 +12,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://luaforge.net/frs/download.php/2664/$TARBALL"
 
-DEPENDS="lua5.1"
 BUILD_DEPENDS="lua5.1-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make CFLAGS="$CFLAGS -I/usr/include/lua/5.1" && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make CFLAGS="$CFLAGS -I/usr/include/lua/5.1" &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/lua $fs/usr/share
+	DEPENDS="lua5.1"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lucene++/receipt
--- a/lucene++/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lucene++/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake boost-dev boost-date-time boost-filesystem \
 boost-regex boost-thread boost-iostreams python"
-SPLIT="lucene++-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r ad29ddfee1c9 -r d5aab818505e luckybackup/receipt
--- a/luckybackup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/luckybackup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,28 @@
 VERSION="0.4.8"
 CATEGORY="misc"
 MAINTAINER="pascal.bellard@slitaz.org"
-SHORT_DESC="A powerful, fast and reliable backup & sync tool."
+SHORT_DESC="A powerful, fast and reliable backup & sync tool"
 LICENSE="GPL3"
 WEB_SITE="http://luckybackup.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/source/$TARBALL"
-TAGS="backup"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libQtCore libQtNetwork libQtGui"
 BUILD_DEPENDS="Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	qmake PREFIX=/usr &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/share/luckybackup $fs/usr/share
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/menu $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libQtCore libQtNetwork libQtGui"
+	TAGS="backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e luksus/receipt
--- a/luksus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/luksus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,18 +3,15 @@
 PACKAGE="luksus"
 VERSION="1.6"
 CATEGORY="system-tools"
-SHORT_DESC="Command line encryption management tool."
+SHORT_DESC="Command line encryption management tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/thomasfrivold/luksus"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/thomasfrivold/luksus"
 WGET_URL="https://github.com/thomasfrivold/luksus/archive/v$VERSION.tar.gz"
 
-DEPENDS="bash dialog cryptsetup tcplay gnupg openssl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/luksus
 	cp -a $src/LUKSUS* $fs/usr/share/luksus
 	cat > $fs/usr/bin/luksus <<EOT
@@ -24,4 +21,5 @@
 exec ./LUKSUS "$@"
 EOT
 	chmod 755 $fs/usr/bin/luksus
+	DEPENDS="bash dialog cryptsetup tcplay gnupg openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lutris/receipt
--- a/lutris/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lutris/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,22 @@
 PACKAGE="lutris"
 VERSION="0.3.4"
 CATEGORY="games"
-SHORT_DESC="An open gaming platform for Linux."
+SHORT_DESC="An open gaming platform for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://lutris.net/"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
-WEB_SITE="https://lutris.net/"
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
-DEPENDS="python python-pyxdg python-pygobject2 python-pyyaml libsoup"
 BUILD_DEPENDS="python python-pyxdg"
 
-SUGGESTED="wine scummvm gens-gs mupen64plus dosbox pcsxr-svn"
-# uae mednafen sdlmame snes9x-gtk steam atari800 dolphin-emu frotz hatari
-# jzintv mednafen nulldc o2em openmsx osmose
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python python-pyxdg python-pygobject2 python-pyyaml libsoup"
+	SUGGESTED="wine scummvm gens-gs mupen64plus dosbox pcsxr-svn"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lv2/receipt
--- a/lv2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lv2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lvm2/receipt
--- a/lvm2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lvm2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.02.181"
 CATEGORY="system-tools"
 SHORT_DESC="Linux Logical Volume Manager"
-MAINTAINER="guillaume.michon@laposte.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sourceware.org/lvm2/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/lvm2.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="libaio-dev util-linux-blkid-dev eudev-dev ncurses-dev \
 readline-dev coreutils-file-format"
-SPLIT="dmsetup libdevmapper libdevmapper-dev lvm2 lvm2-dev"
+SPLIT="dmsetup libdevmapper libdevmapper-dev $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lvmts/receipt
--- a/lvmts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lvmts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 GITHASH="aa722606e6dbdf6c15eb8b9294ad789814592c18"
 VERSION=${GITHASH:0:7}
 CATEGORY="system-tools"
-SHORT_DESC="Hierarchical Storage Manager utilizing LVM."
+SHORT_DESC="Hierarchical Storage Manager utilizing LVM"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -14,19 +14,14 @@
 DEPENDS="lvm2 blktrace libconfuse"
 BUILD_DEPENDS="lvm2-dev libconfuse"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make -j 1 && 
-	for i in lvmtscd lvmtscat lvmls lvmtsd lvmdefrag ; do
-		install -D -m 755 $i $DESTDIR/usr/sbin/$i
+compile_rules() {
+	make -j1 || return 1
+
+	for i in lvmtscd lvmtscat lvmls lvmtsd lvmdefrag; do
+		install -Dm755 $i $install/usr/sbin/$i
 	done
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lxappearance-obconf/receipt
--- a/lxappearance-obconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxappearance-obconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.3"
 CATEGORY="x-window"
 SHORT_DESC="LXDE GTK+ theme switcher (plugin)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://lxde.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxappearance-obconf.html"
diff -r ad29ddfee1c9 -r d5aab818505e lxappearance/receipt
--- a/lxappearance/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxappearance/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.3"
 CATEGORY="x-window"
 SHORT_DESC="LXDE GTK+ theme switcher"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXAppearance"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxappearance.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev dbus-dev dbus-glib-dev"
-SPLIT="lxappearance-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# remove keywords from desktop file
diff -r ad29ddfee1c9 -r d5aab818505e lxc/receipt
--- a/lxc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="Userspace control package for Linux Containers"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://linuxcontainers.org/"
+WEB_SITE="https://linuxcontainers.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
 BUILD_DEPENDS="libcap-dev util-linux-getopt"
-SPLIT="lxc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	sed \
 		-e 's/^is_set(/zgrep() { zcat | grep "$@"; }\n\n&/' \
diff -r ad29ddfee1c9 -r d5aab818505e lxde-icon-theme/receipt
--- a/lxde-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxde-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,12 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="coreutils-operations"
-SPLIT="lxde-icon-theme-base lxde-icon-theme"
+SPLIT="$PACKAGE-base $PACKAGE"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lxde/receipt
--- a/lxde/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxde/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,13 +4,11 @@
 VERSION="0.3.2.1"
 CATEGORY="meta"
 SHORT_DESC="Meta-package for the Lightweight X11 Desktop Environement"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://lxde.org/"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/applications
 	install -m 0755 $stuff/lxde-session $fs/usr/bin
 	install -m 0755 $stuff/lxde-logout $fs/usr/bin
diff -r ad29ddfee1c9 -r d5aab818505e lxdm/receipt
--- a/lxdm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxdm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.3"
 CATEGORY="x-window"
 SHORT_DESC="GUI login manager for LXDE"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://wiki.lxde.org/en/LXDM"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool xorg-libX11-dev gtk2-dev   iso-codes" # + consolekit2-dev
-SPLIT="lxdm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lxhotkey/receipt
--- a/lxhotkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxhotkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool libfm-dev xorg-libX11-dev"
-SPLIT="lxhotkey-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e lxinput/receipt
--- a/lxinput/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxinput/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.5"
 CATEGORY="x-window"
 SHORT_DESC="LXDE keyboard and mouse configuration"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://lxde.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxinput.html"
@@ -18,9 +18,9 @@
 	sed -i 's|^Icon=.*$|Icon=preferences-desktop-keyboard|' \
 		data/lxinput.desktop.in
 
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lxlauncher/receipt
--- a/lxlauncher/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxlauncher/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="LXDE launcher for netbooks"
 LICENSE="GPL3"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 WEB_SITE="https://wiki.lxde.org/en/LXLauncher"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
diff -r ad29ddfee1c9 -r d5aab818505e lxmenu-data/receipt
--- a/lxmenu-data/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxmenu-data/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.5"
 CATEGORY="x-window"
 SHORT_DESC="LXDE freedesktop.org menu specification"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://lxde.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxmenu-data.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
-BUILD_DEPENDS="gettext intltool"
+BUILD_DEPENDS="gettext-dev intltool"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e lxnetdaemon/receipt
--- a/lxnetdaemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxnetdaemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.1.1"
 CATEGORY="network"
 SHORT_DESC="Network manager for LXpanel"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://lxde.sourceforge.net/"
+WEB_SITE="https://lxde.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
@@ -14,13 +14,13 @@
 BUILD_DEPENDS="glib-dev"
 
 compile_rules() {
-	sed -i "s|for script in .(datadir)|for script in $DESTDIR/\$(datadir)|" \
+	sed -i "s|for script in .(datadir)|for script in $install/\$(datadir)|" \
 		Makefile.in
 
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod +x $install/usr/share/lxnetdaemon/*.sh
 	# Config
diff -r ad29ddfee1c9 -r d5aab818505e lxpanel/receipt
--- a/lxpanel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxpanel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,33 +5,26 @@
 VERSION="0.9.3.postgit20180412"
 CATEGORY="x-window"
 SHORT_DESC="LXDE panel"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXPanel"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://git.lxde.org/gitweb/?p=lxde/lxpanel.git;a=snapshot;h=$COMMIT;sf=txz"
 
-BUILD_DEPENDS_arm="gtk2-dev menu-cache-dev alsa-lib-dev wireless_tools-dev \
-libxml2-dev lxmenu-data"
 BUILD_DEPENDS="automake libtool intltool gtk2-dev menu-cache-dev alsa-lib-dev \
 wireless_tools-dev libxml2-dev lxmenu-data libwnck2-dev libfm-dev \
 keybinder-dev"
-SPLIT="lxpanel-extra lxpanel lxpanel-dev"
+SPLIT="$PACKAGE-extra $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS='--with-plugins="netstatus,volumealsa,cpu,batt,xkb,thermal,cpufreq,monitors"';;
-	esac
-
 	./autogen.sh
 	CFLAGS="$CFLAGS -lgmodule-2.0"
 	./configure \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make install || exit 1
+	make install || return 1
 
 	# SliTaz profile
 	cp -r $stuff/slitaz $install/etc/xdg/lxpanel/
diff -r ad29ddfee1c9 -r d5aab818505e lxpolkit/receipt
--- a/lxpolkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxpolkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.0"
 CATEGORY="x-window"
 SHORT_DESC="LXDE PolicyKit authentication agent"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://lxde.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-appswitcher/receipt
--- a/lxqt-appswitcher/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-appswitcher/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,26 +7,24 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-appswitcher"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
-TAGS="LXQt"
 
-DEPENDS="libQtCore libQtDBus libQtGui libQtXml liblxqt lxqt-globalkeys"
 BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev liblxqt-dev \
 lxqt-globalkeys-dev libqtxdg-dev "
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|lxqt/LxQt|lxqt/LXQt/|' src/*.h src/*.cpp
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libQtCore libQtDBus libQtGui libQtXml liblxqt lxqt-globalkeys"
+	TAGS="LXQt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-config-randr/receipt
--- a/lxqt-config-randr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-config-randr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,25 +7,25 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/lxqt-config-randr"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
-TAGS="LXQt"
 
-DEPENDS="libQtCore libQtGui xorg-libX11 xorg-libXext xorg-libXrandr"
-BUILD_DEPENDS="wget cacerts cmake Qt4-dev qmake xorg-libX11-dev \
-xorg-libXrandr-dev libqtxdg-dev liblxqt-dev"
+BUILD_DEPENDS="cmake Qt4-dev qmake xorg-libX11-dev xorg-libXrandr-dev \
+libqtxdg-dev liblxqt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libQtCore libQtGui xorg-libX11 xorg-libXext xorg-libXrandr"
+	TAGS="LXQt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-connman-applet/receipt
--- a/lxqt-connman-applet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-connman-applet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/lxde/lxqt-connman-applet/archive/${COMMIT:-$VERSION}.tar.gz"
 
 BUILD_DEPENDS="cmake liblxqt-dev mesa-dev kwindowsystem-dev lxqt-build-tools"
-SPLIT="lxqt-connman-applet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-globalkeys/receipt
--- a/lxqt-globalkeys/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-globalkeys/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev lxqt-build-tools liblxqt-dev \
 kwindowsystem-dev"
-SPLIT="lxqt-globalkeys-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# fix undefined variable
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-l10n/receipt
--- a/lxqt-l10n/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-l10n/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,11 @@
 WGET_URL="https://github.com/lxde/lxqt-l10n/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev lxqt-build-tools"
-SPLIT="lxqt-l10n-extra"
+SPLIT="$PACKAGE-extra"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-panel/receipt
--- a/lxqt-panel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-panel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 lm-sensors-dev libsysstat-dev libdbusmenu-qt-dev xorg-libXcomposite-dev \
 xorg-libXrender-dev alsa-lib-dev libxkbcommon-dev xorg-xcb-util-dev \
 pulseaudio-dev"
-SPLIT="lxqt-panel-sensors lxqt-panel lxqt-panel-dev"
+SPLIT="$PACKAGE-sensors $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	sed -i.orig 's|<KF5/KWindowSystem/|<|' \
diff -r ad29ddfee1c9 -r d5aab818505e lxqt-themes/receipt
--- a/lxqt-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -27,7 +27,7 @@
 	case $PACKAGE in
 		lxqt-themes)
 			copy @std
-			DEPENDS=""
+			DEPENDS=" "
 			;;
 		*-dev)
 			copy @dev
diff -r ad29ddfee1c9 -r d5aab818505e lxqt/receipt
--- a/lxqt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxqt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,10 +20,6 @@
 SUGGESTED="copyq juffed qps qupzilla oxygen-icons \
 lxqt-connman-applet lxqt-l10n-extra"
 
-genpkg_rules() {
-	mkdir -p $fs/etc
-}
-
 post_install() {
 	for i in $(ls -d "$1"/home/* 2>/dev/null); do
 		[ -d "$i" ] &&
diff -r ad29ddfee1c9 -r d5aab818505e lxrandr/receipt
--- a/lxrandr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxrandr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.1"
 CATEGORY="utilities"
 SHORT_DESC="LXDE monitor configuration tool"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXRandR"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxrandr.html"
@@ -19,9 +19,9 @@
 	sed -i 's|^Icon=.*$|Icon=preferences-desktop-display|;
 		/^_Keywords=/d' data/lxrandr.desktop.in
 
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lxsession/receipt
--- a/lxsession/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxsession/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.3"
 CATEGORY="x-window"
 SHORT_DESC="Standard session manager used by LXDE"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXSession"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxsession.html"
diff -r ad29ddfee1c9 -r d5aab818505e lxtask/receipt
--- a/lxtask/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxtask/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.8"
 CATEGORY="system-tools"
 SHORT_DESC="LXDE task manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXTask"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxtask.html"
diff -r ad29ddfee1c9 -r d5aab818505e lxterminal/receipt
--- a/lxterminal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lxterminal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.1"
 CATEGORY="system-tools"
 SHORT_DESC="LXDE terminal emulator"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/LXTerminal"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/lxterminal.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/lxde/$TARBALL"
 
 BUILD_DEPENDS="intltool gtk2-dev vte-gtk2-dev"
-SPLIT="lxterminal-locales"
+SPLIT="$PACKAGE-locales"
 
 compile_rules() {
 	sed -i '/_Keywords=/d; /TryExec=/d' $src/data/lxterminal.desktop.in
diff -r ad29ddfee1c9 -r d5aab818505e lynis/receipt
--- a/lynis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lynis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,17 @@
 PACKAGE="lynis"
 VERSION="2.1.1"
 CATEGORY="security"
-SHORT_DESC="Security and system auditing tool."
+SHORT_DESC="Security and system auditing tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://cisofy.com/lynis/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://cisofy.com/files/$TARBALL"
 
-SUGGESTED="wget procps perl findutils rpm4"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $src $fs/usr/share/lynis
 	chown -R root.root $fs/usr/share/lynis
+	SUGGESTED="wget procps perl findutils rpm4"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e lynx/receipt
--- a/lynx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lynx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.8.8"
 CATEGORY="network"
 SHORT_DESC="Terminal-based text-only browser"
-MAINTAINER="samuel_trassare@yahoo.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://lynx.isc.org"
+WEB_SITE="http://lynx.isc.org/"
 
 TARBALL="$PACKAGE$VERSION.tar.gz"
 WGET_URL="http://lynx.isc.org/$PACKAGE$VERSION/$TARBALL"
 
 # Will require build dep libtirpc after glibc is upgraded to 2.14.
-BUILD_DEPENDS="openssl-dev ncurses-dev zlib-dev gettext-tools"
+BUILD_DEPENDS="openssl-dev ncurses-dev zlib-dev gettext"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lyx/receipt
--- a/lyx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lyx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,53 +3,46 @@
 PACKAGE="lyx"
 VERSION="2.0.5.1"
 CATEGORY="office"
-SHORT_DESC="An advanced WYSIWYM document processor & LaTeX front-end"
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="Advanced WYSIWYM document processor & LaTeX front-end"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.lyx.org"
+WEB_SITE="https://www.lyx.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$TARBALL"
 
 BUILD_DEPENDS="python Qt4-dev bison aspell-dev xorg-libX11-dev aiksaurus-dev \
 zlib-dev"
-SPLIT="lyx lyx-dev lyx-examples lyx-locales"
+SPLIT="$PACKAGE-doc $PACKAGE-examples $PACKAGE-locales $PACKAGE"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --with-frontend=qt4 $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--with-frontend=qt4 \
+		$CONFIGURE_ARGS &&
 	make &&
 	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	lyx)
-		DEPENDS="aiksaurus aspell bzlib libQtGui python"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/share/lyx $fs/usr/share
-		rm -r $fs/usr/share/lyx/doc $fs/usr/share/lyx/examples
-		;;
-	lyx-doc)
-		CAT="office|Documentation for LyX"
-		DEPENDS="lyx"
-		mkdir -p $fs/usr/share/lyx
-		cp -a $install/usr/share/lyx/doc $fs/usr/share/lyx
-		;;
-	lyx-examples)
-		CAT="officer|Examples for LyX"
-		DEPENDS="lyx"
-		mkdir -p $fs/usr/share/lyx
-		cp -a $install/usr/share/lyx/examples $fs/usr/share/lyx
-		;;
-	lyx-locales)
-		CAT="localization|Locale files for LyX"
-		DEPENDS="lyx"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/share/locale $fs/usr/share
-		;;
+		*-doc)
+			copy usr/share/lyx/doc/
+			CAT="office|documentation"
+			DEPENDS="lyx"
+			;;
+		*-examples)
+			copy usr/share/lyx/examples/
+			CAT="officer|examples"
+			DEPENDS="lyx"
+			;;
+		*-locales)
+			copy locale/
+			CAT="localization|locale files"
+			DEPENDS="lyx"
+			;;
+		lyx)
+			copy @std @rm
+			DEPENDS="aiksaurus aspell bzlib libQtGui python"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e lz4/receipt
--- a/lz4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lz4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,11 +11,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GITHUB/lz4/lz4/tarball/v$VERSION"
 
-SPLIT="lz4-dev lz4-lib"
+SPLIT="$PACKAGE-lib $PACKAGE-dev"
 
 compile_rules() {
 	export AR="$HOST_SYSTEM-ar"
-	make && make PREFIX=/usr DESTDIR=$DESTDIR install
+	make &&
+	make PREFIX=/usr DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -25,12 +26,12 @@
 			DEPENDS=" "
 			TAGS="compression"
 			;;
-		lz4-lib)
+		*-lib)
 			copy *.so*
-			CAT="base-system|lz4c compressor shared library"
+			CAT="base-system|shared library"
 			DEPENDS=" "
 			;;
-		lz4-dev)
+		*-dev)
 			copy @dev
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e lz5/receipt
--- a/lz5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lz5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GITHUB/inikep/lz5/tarball/v$VERSION"
 
-SPLIT="lz5-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e lzip/receipt
--- a/lzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.20"
 CATEGORY="utilities"
 SHORT_DESC="LZMA lossless data compressor"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nongnu.org/lzip/lzip.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e lzma/receipt
--- a/lzma/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lzma/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,18 +12,11 @@
 WGET_URL="$SF_MIRROR/sevenzip/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="lzma lzlib lzlib-dev"
+SPLIT="lzlib lzlib-dev"
 
 compile_rules() {
 	cd CPP/7zip/Compress/LZMA_Alone
 
-	# Handle cross compilation
-	case "$ARCH" in
-		arm)
-			sed -i s'/g++/arm-slitaz-linux-gnueabi-c++/' makefile.gcc
-			sed -i s'/gcc/arm-slitaz-linux-gnueabi-gcc/' makefile.gcc ;;
-	esac
-
 	# Remove copyright message.
 	sed '/MY_VERSION_COPYRIGHT_DATE/d' -i LzmaAlone.cpp
 
diff -r ad29ddfee1c9 -r d5aab818505e lzo/receipt
--- a/lzo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lzo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10"
 CATEGORY="system-tools"
 SHORT_DESC="Data compression library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.oberhumer.com/opensource/lzo/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/lzo.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.oberhumer.com/opensource/lzo/download/$TARBALL"
 
-SPLIT="lzo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e lzop/receipt
--- a/lzop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/lzop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,9 +1,9 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="lzop"
 VERSION="1.03"
 CATEGORY="base-system"
-SHORT_DESC="Compressor with a high compression speed."
+SHORT_DESC="Compressor with a high compression speed"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lzop.org/"
@@ -11,17 +11,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}download/$TARBALL"
 
-DEPENDS="lzo"
 BUILD_DEPENDS="lzo-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy lzop
+	DEPENDS="lzo"
 }
diff -r ad29ddfee1c9 -r d5aab818505e m4/receipt
--- a/m4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/m4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.18"
 CATEGORY="development"
 SHORT_DESC="GNU traditional Unix macro processor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/m4/m4.html"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/m4.html"
@@ -13,7 +13,9 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e macchanger/receipt
--- a/macchanger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/macchanger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="macchanger"
 VERSION="1.5.0"
 CATEGORY="network"
 SHORT_DESC="A small utility to change your MAC address"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.gnu.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org"
 WGET_URL="ftp://ftp.gnu.org/gnu/macchanger/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/macchanger $fs/usr/share	
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e madeirado-theme/receipt
--- a/madeirado-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/madeirado-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="madeirado-theme"
 VERSION="20130702"
@@ -6,18 +6,15 @@
 SHORT_DESC="Madeirado theme for GTK2, Openbox, SLiM, and wallparer"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://holkfoor.deviantart.com/art/Madeirado-Pack-Theme-382214228"
+WEB_SITE="https://www.deviantart.com/holkfoor/art/Madeirado-Pack-Theme-382214228"
+HOST_ARCH="any"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://dl.dropboxusercontent.com/s/ax6iqx6aa344fsu/Madeirado_GTK2_Openbox_Slim_Wallpaper.tar.bz2"
-TAGS="holkfoor openbox slim wallpaper"
-#HOST_ARCH="any" # imagemagick missing in arm
 
-DEPENDS="gtk-clearlooks openbox slim"
 BUILD_DEPENDS="imagemagick"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	M=Madeirado
 	s=$install/usr/share/slim/themes
 	t=$install/usr/share/themes
@@ -42,14 +39,13 @@
 	ln -s ../slim/themes/$M/background.jpg $i/$M.jpg
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk-clearlooks openbox slim"
+	TAGS="holkfoor openbox slim wallpaper"
 }
 
-post_install()
-{
+post_install() {
 	# Set GTK+ Theme
 	for i in $1/etc/xdg/lxsession/*/desktop.conf \
 		$1/home/*/.config/lxsession/*/desktop.conf; do
diff -r ad29ddfee1c9 -r d5aab818505e magicpoint/receipt
--- a/magicpoint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/magicpoint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.13a+upstream20090219"
 CATEGORY="x-window"
 SHORT_DESC="An X11-based presentation tool"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://member.wide.ad.jp/wg/mgp/"
 
@@ -16,21 +16,17 @@
 BUILD_DEPENDS="perl xorg-libX11-dev xorg-libXft-dev fontconfig-dev xorg-imake \
 xorg-cf-files imlib2-dev xorg-libXmu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	xmkmf &&
 	make -j1 Makefiles &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install &&
+	make -j1 DESTDIR=$install install &&
 
 	chmod -R u+w $install/usr/lib/X11/mgp
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="giflib imlib2 libpng16 xorg-libSM xorg-libX11 xorg-libXext \
 	xorg-libXft xorg-libXmu xorg-libXt"
diff -r ad29ddfee1c9 -r d5aab818505e magicrescue/receipt
--- a/magicrescue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/magicrescue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,25 @@
 PACKAGE="magicrescue"
 VERSION="1.1.9"
 CATEGORY="utilities"
-SHORT_DESC="Find and recover deleted files on block devices."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Find and recover deleted files on block devices"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/magicrescue/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://freshmeat.net/projects/magicrescue/"
 WGET_URL="http://www.itu.dk/people/jobr/$PACKAGE/release/$TARBALL"
 
-DEPENDS="perl"
+compile_rules() {
+	sed -i 's|/man/|/share&|' Makefile*
+	install -d $install/usr
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's|/man/|/share&|' Makefile*
-	install -d $DESTDIR/usr
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make PREFIX=$DESTDIR/usr install
+	make PREFIX=$install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/magicrescue $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e magnifier/receipt
--- a/magnifier/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/magnifier/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	cd $src
-	./install.sh DESTDIR=$DESTDIR install
+	./install.sh DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mailgraph/receipt
--- a/mailgraph/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mailgraph/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,19 @@
 PACKAGE="mailgraph"
 VERSION="1.14"
 CATEGORY="misc"
-SHORT_DESC="A RRDtool frontend for Mail statistics."
+SHORT_DESC="A RRDtool frontend for Mail statistics"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mailgraph.schweikert.ch/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mailgraph.schweikert.ch/"
 WGET_URL="${WEB_SITE}pub/$TARBALL"
-TAGS="logs"
 
-DEPENDS="rrdtool-perl perl-file-tail"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/var/www/cgi-bin
-	install -o root -g root -m 755 $src/mailgraph.pl $fs/usr/bin/mailgraph
-	install -o root -g root -m 755 $src/mailgraph.cgi $fs/var/www/cgi-bin/
-	install -o root -g root -m 644 $src/mailgraph.css $fs/var/www/cgi-bin/
+	install -m755 $src/mailgraph.pl $fs/usr/bin/mailgraph
+	install -m755 $src/mailgraph.cgi $fs/var/www/cgi-bin/
+	install -m644 $src/mailgraph.css $fs/var/www/cgi-bin/
+	DEPENDS="rrdtool-perl perl-file-tail"
+	TAGS="logs"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mailsync/receipt
--- a/mailsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mailsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,19 +6,16 @@
 SHORT_DESC="A way of synchronizing a collection of mailboxes"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mailsync.sourceforge.net/"
+
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
-WEB_SITE="http://mailsync.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 EXTRA_SOURCE_FILES="imap-2007f.tar.gz"
 WGET_URL2="ftp://ftp.cac.washington.edu/mail/$EXTRA_SOURCE_FILES"
-TAGS="email imap"
 
-DEPENDS="openssl"
 BUILD_DEPENDS="c-client openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -s $SRC/$EXTRA_SOURCE_FILES ] ||
 		wget -P $SRC $WGET_URL2
 	tar xzf $SRC/$EXTRA_SOURCE_FILES
@@ -27,15 +24,18 @@
 		src/osdep/unix/Makefile
 	make slx
 	cd ..
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		--with-c-client=$src/${EXTRA_SOURCE_FILES%%.*} \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	TAGS="email imap"
+	DEPENDS="openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mailx/receipt
--- a/mailx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mailx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,29 @@
 PACKAGE="mailx"
 VERSION="12.4"
 CATEGORY="network"
-SHORT_DESC="Command-line Mail User Agent derived from Berkeley Mail."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Command-line Mail User Agent derived from Berkeley Mail"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://heirloom.sourceforge.net/mailx.html"
 WGET_URL="$SF_MIRROR/heirloom/$TARBALL"
 
-DEPENDS="sendmail"
+compile_rules() {
+	sed -i 's|STACK|STACK_OF(X509)|' openssl.c
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's|STACK|STACK_OF(X509)|' openssl.c
 	make SENDMAIL=/usr/sbin/sendmail &&
-	make PREFIX=/usr UCBINSTALL=/usr/bin/install \
-		DESTDIR=$DESTDIR install
+	make \
+		PREFIX=/usr \
+		UCBINSTALL=/usr/bin/install \
+		DESTDIR=$install \
+		install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/bin $fs/usr
 	cd $fs/usr/bin
 	ln -s mailx mail && ln -s mailx nail
+	DEPENDS="sendmail"
 }
diff -r ad29ddfee1c9 -r d5aab818505e make/receipt
--- a/make/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/make/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.2.1"
 CATEGORY="development"
 SHORT_DESC="GNU Make to generate executables and other files from source"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/make/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/make.html"
@@ -12,10 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e makeself/receipt
--- a/makeself/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/makeself/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="makeself"
 VERSION="2.1.5"
 CATEGORY="development"
-SHORT_DESC="Utility to create self-extraction packages."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Utility to create self-extraction packages"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://megastep.org/makeself"
+
 TARBALL="$PACKAGE-$VERSION.run"
-WEB_SITE="http://megastep.org/makeself"
 WGET_URL="http://megastep.org/makeself/$PACKAGE-$VERSION.run"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir -p $DESTDIR/usr/bin
-	mkdir -p $DESTDIR/usr/share/makeself
-	cp -a makeself.sh $DESTDIR/usr/bin/makeself
-	cp -a makeself-header.sh $DESTDIR/usr/share/makeself
-	sed -e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=/usr/share/makeself/makeself-header.sh|' -i $DESTDIR/usr/bin/makeself
-
+compile_rules() {
+	install -Dm755 makeself.sh        $install/usr/bin/makeself
+	install -Dm755 makeself-header.sh $install/usr/share/makeself/makeself-header.sh
+	sed \
+		-e 's|HEADER=`dirname $0`/makeself-header.sh|HEADER=/usr/share/makeself/makeself-header.sh|' \
+		-i $install/usr/bin/makeself
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e man-db/receipt
--- a/man-db/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/man-db/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://download.savannah.gnu.org/releases/man-db/$TARBALL"
 
-BUILD_DEPENDS="groff bzip2-dev xz-dev gettext libpipeline-dev gdbm-dev \
+BUILD_DEPENDS="groff bzip2-dev xz-dev gettext-dev libpipeline-dev gdbm-dev \
 zlib-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e man2html/receipt
--- a/man2html/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/man2html/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,16 +7,15 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://github.com/man-pages-zh/man2html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/man-pages-zh/man2html/archive/$VERSION.tar.gz"
 
-DEPENDS="glib"
-BUILD_DEPENDS="glib-dev gettext-tools"
+BUILD_DEPENDS="glib-dev gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make install
+compile_rules() {
+	make &&
+	make install || return 1
 
 	# translations
 	make pot
@@ -36,8 +35,7 @@
 	chmod a+x $install/var/www/man.cgi
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="glib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mana/receipt
--- a/mana/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mana/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,31 +6,30 @@
 SHORT_DESC="A fully free and open source MMORPG game with the looks of old-fashioned 2D RPG"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://themanaworld.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://themanaworld.org/"
 WGET_URL="http://manasource.org/files/$TARBALL"
 
 BUILD_DEPENDS="physfs-dev libxml2-dev libsdl-mixer-dev libsdl-image-dev \
 libsdl-net-dev libsdl-ttf-dev libsdl-ttf curl-dev zlib-dev libpng16-dev guichan-dev \
 libsdl-gfx-dev enet"
-DEPENDS="ttf-dejavu physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
-libsdl-ttf curl zlib libpng16 guichan libsdl-gfx"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --without-opengl $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--without-opengl \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share/
 	cp -a $install/usr/share/mana $fs/usr/share/
 	cp -a $install/usr/share/pixmaps $fs/usr/share/
+	DEPENDS="ttf-dejavu physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
+	libsdl-ttf curl zlib libpng16 guichan libsdl-gfx"
 }
diff -r ad29ddfee1c9 -r d5aab818505e manaplus/receipt
--- a/manaplus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/manaplus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="manaplus"
 VERSION="1.3.8.4"
 CATEGORY="games"
 SHORT_DESC="Extended client for Evol Online and The Mana World"
-MAINTAINER="admin@trixarian.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://manaplus.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://manaplus.org/"
 WGET_URL="http://download.evolonline.org/manaplus/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng16-dev zlib-dev"
-DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net libsdl-ttf libpng16 libsdl-gfx ttf-dejavu zlib"
+BUILD_DEPENDS="curl-dev enet libxml2-dev libsdl-mixer-dev libsdl-image-dev \
+libsdl-net-dev libsdl-ttf-dev libsdl-gfx-dev physfs-dev libpng16-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --without-opengl $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--without-opengl \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/applications $fs/usr/share/
-	cp -a $install/usr/share/locale $fs/usr/share/
-	cp -a $install/usr/share/manaplus $fs/usr/share/
-	cp -a $install/usr/share/pixmaps $fs/usr/share/
+genpkg_rules() {
+	copy @std
+	DEPENDS="curl physfs libxml2 libsdl-mixer libsdl-image libsdl-net \
+	libsdl-ttf libpng16 libsdl-gfx ttf-dejavu zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e manserver/receipt
--- a/manserver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/manserver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,14 +7,11 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
 WEB_SITE="https://web.archive.org/web/20160326063337/http://www.squarebox.co.uk/users/rolf/download/manServer.shtml"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.squarebox.co.uk/download/$TARBALL"
 
-DEPENDS="perl" #also can use busybox to extract gz, bz2 or xz man pages
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/licenses $fs/usr/share/man/man1 $fs/etc/init.d
 
 	install -Dm755 $src/manServer.pl $fs/usr/bin/manServer
@@ -23,4 +20,5 @@
 	install -Dm644 $src/manServer.1 $fs/usr/share/man/man1
 	install -Dm644 $stuff/manpath.config $fs/etc/manpath.config
 	ln -s daemon $fs/etc/init.d/manserver
+	DEPENDS="perl" #also can use busybox to extract gz, bz2 or xz man pages
 }
diff -r ad29ddfee1c9 -r d5aab818505e mapserver/receipt
--- a/mapserver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mapserver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,41 @@
 PACKAGE="mapserver"
 VERSION="6.4.3"
 CATEGORY="misc"
-SHORT_DESC="Open Source platform for publishing spatial data."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="Open Source platform for publishing spatial data"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://mapserver.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.osgeo.org/mapserver/$TARBALL"
 
-DEPENDS="giflib libgd libgdal libpostgresqlclient fribidi cairo fcgi"
 BUILD_DEPENDS="giflib-dev gdal-dev libgd-dev proj-dev postgresql-dev curl-dev \
 geos-dev apache-dev freetype-dev libpng16-dev jpeg-dev libgd-dev libgd \
 libxml2-dev fribidi-dev cairo-dev fcgi-dev cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE="Release" \
-		-DWITH_PROJ=1 -DWITH_POSTGIS=1 -DWITH_GEOS=1 -DWITH_GDAL=1 \
-		-DWITH_OGR=1 -DWITH_GD=1 -DWITH_CLIENT_WMS=1 WITH_CLIENT_WFS=1 \
-		-DWITH_WCS=1 .. &&
-	make && make install
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE="Release" \
+		-DWITH_PROJ=1 \
+		-DWITH_POSTGIS=1 \
+		-DWITH_GEOS=1 \
+		-DWITH_GDAL=1 \
+		-DWITH_OGR=1 \
+		-DWITH_GD=1 \
+		-DWITH_CLIENT_WMS=1 \
+		-DWITH_CLIENT_WFS=1 \
+		-DWITH_WCS=1 \
+		.. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	
+genpkg_rules() {
 	mkdir -p $fs/var/www/cgi-bin
 	cp -a $install/usr/bin/mapserv  $fs/var/www/cgi-bin
 	cp -a $install/* $fs/
-}
\ No newline at end of file
+	DEPENDS="giflib libgd libgdal libpostgresqlclient fribidi cairo fcgi"
+}
diff -r ad29ddfee1c9 -r d5aab818505e marble/receipt
--- a/marble/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/marble/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="marble"
 VERSION="v17.08.2"
 CATEGORY="misc"
-SHORT_DESC="A virtual globe and world atlas."
+SHORT_DESC="A virtual globe and world atlas"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1 GPL3"
+WEB_SITE="https://marble.kde.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://marble.kde.org/"
 BRANCH="$VERSION"
 WGET_URL="git|git://anongit.kde.org/marble"
-TAGS="globe atlas"
 
-DEPENDS="qt5-base "
-BUILD_DEPENDS="git qt5-dev cmake xorg-dev mesa-dev zlib-dev "
+BUILD_DEPENDS="git qt5-dev cmake xorg-dev mesa-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
-	cmake	-DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE \
-		-DCMAKE_INSTALL_PREFIX=/usr .. &&
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DQTONLY=TRUE \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	make install
 
 	# remove unwanted files
-#	cd $DESTDIR/usr/share/applications
+#	cd $install/usr/share/applications
 #	mv marble_osm.desktop marble.desktop
 #	for i in $(sed '/MimeType/!d;s/.*=//' marble_*); do
 #		sed -i "s|MimeType.*|&$i|" marble.desktop
@@ -33,13 +34,13 @@
 #	rm -f marble_*.desktop marble-*.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 
 	# remove unwanted files
 	rm -rf $fs/usr/include
 	rm -rf $fs/usr/share/marble/cmake
 #	rm $fs/usr/bin/marble-mobile $fs/usr/bin/marble-touch
+	DEPENDS="qt5-base"
+	TAGS="globe atlas"
 }
diff -r ad29ddfee1c9 -r d5aab818505e marco/receipt
--- a/marco/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/marco/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/marco/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk3-dev startup-notification-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev startup-notification-dev \
 xorg-libXcursor-dev libgtop-dev libcanberra-dev zenity itstool \
 xorg-xcb-util-dev"
-SPLIT="marco-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mariadb/receipt
--- a/mariadb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mariadb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,171 +3,159 @@
 PACKAGE="mariadb"
 VERSION="10.0.11"
 CATEGORY="office"
-SHORT_DESC="SQL database system."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="SQL database system"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mariadb.org/en/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mariadb.org/en/"
 WGET_URL="http://pangolin.slitaz.org/downloads/sources/$TARBALL"
 
 BUILD_DEPENDS="cmake ncurses-dev bison openssl-dev"
-SPLIT="mariadb libmariadbclient mariadb-client mariadb-dev mariadb-test"
+SPLIT="libmariadbclient $PACKAGE-client $PACKAGE-dev $PACKAGE-test"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	
-	cd $src
-	cmake  . -DCMAKE_INSTALL_PREFIX=/usr \
-	-DINSTALL-DOCREADMEDIR=/usr/share/doc \
-	-DINSTALL_MYSQLDATADIR=/var/lib/mysql \
-	-DINSTALL_SYSCONFDIR=/etc \
-	-DINSTALL_LIBDIR=lib/mysql \
-	-DINSTALL_INFODIR=share/doc/mysql \
-	-DINSTALL_MANDIR=share/man \
-	-DINSTALL_PLUGINDIR=lib/mysql/plugin \
-	-DINSTALL_SHAREDIR=share \
-	-DINSTALL_MYSQLSHAREDIR=share/mysql \
-	-DINSTALL_UNIX_ADDRDIR=/var/run/mysqld/mysqld.sock &&
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL-DOCREADMEDIR=/usr/share/doc \
+		-DINSTALL_MYSQLDATADIR=/var/lib/mysql \
+		-DINSTALL_SYSCONFDIR=/etc \
+		-DINSTALL_LIBDIR=lib/mysql \
+		-DINSTALL_INFODIR=share/doc/mysql \
+		-DINSTALL_MANDIR=share/man \
+		-DINSTALL_PLUGINDIR=lib/mysql/plugin \
+		-DINSTALL_SHAREDIR=share \
+		-DINSTALL_MYSQLSHAREDIR=share/mysql \
+		-DINSTALL_UNIX_ADDRDIR=/var/run/mysqld/mysqld.sock \
+		. &&
 	make $MAKEFLAGS &&
-	make install 
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	mariadb)
-		CONFIG_FILES="/etc/mysql"
-		TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE"
-		PROVIDE="mysql"
-		CONFIG_FILES="/etc/mysql/my.cnf"
-		DATABASE_FILES="/var/lib/mysql"
-		CROSS="bug: can not run test programm"
-		DEPENDS="busybox libmariadbclient mariadb-client zlib \
+		mariadb)
+			CONFIG_FILES="/etc/mysql"
+			TAZPANEL_DAEMON="man|edit::/etc/mysql/my.cnf|options|web::$WEB_SITE"
+			PROVIDE="mysql"
+			CONFIG_FILES="/etc/mysql/my.cnf"
+			DATABASE_FILES="/var/lib/mysql"
+			DEPENDS="busybox libmariadbclient mariadb-client zlib \
 			slitaz-base-files gcc-lib-base"
-		mkdir -p \
-			$fs/usr/share \
-			$fs/usr/lib/mysql/plugin \
-			$fs/etc/mysql \
-			$fs/etc/mysql.d \
-			$fs/var/lib/mysql 
+			mkdir -p \
+				$fs/usr/share \
+				$fs/usr/lib/mysql/plugin \
+				$fs/etc/mysql \
+				$fs/etc/mysql.d \
+				$fs/var/lib/mysql
 
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/scripts/* $fs/usr/bin
-		cp -a $install/usr/lib/mysql/plugin/*.so* $fs/usr/lib/mysql/plugin
-		cp -a $install/usr/share/mysql $fs/usr/share
+			cp -a $install/usr/bin $fs/usr
+			cp -a $install/usr/scripts/* $fs/usr/bin
+			cp -a $install/usr/lib/mysql/plugin/*.so* $fs/usr/lib/mysql/plugin
+			cp -a $install/usr/share/mysql $fs/usr/share
 
-		# Configuration file
-		cp -a $stuff/etc/init.d $fs/etc
-		cp -a $src/support-files/my-medium.cnf $fs/etc/mysql/my.cnf
-		cp -a $src/support-files/my-small.cnf $fs/etc/mysql
-		grep -q "bind-address" $fs/etc/mysql/my.cnf || sed -i \
-			's/^\[mysqld\]/[mysqld]\nbind-address\t= 127.0.0.1/' \
-			$fs/etc/mysql/my.cnf
+			# Configuration file
+			cp -a $stuff/etc/init.d $fs/etc
+			cp -a $src/support-files/my-medium.cnf $fs/etc/mysql/my.cnf
+			cp -a $src/support-files/my-small.cnf $fs/etc/mysql
+			grep -q "bind-address" $fs/etc/mysql/my.cnf || sed -i \
+				's/^\[mysqld\]/[mysqld]\nbind-address\t= 127.0.0.1/' \
+				$fs/etc/mysql/my.cnf
 
-		# Permissions
-		chmod 600 $fs/etc/mysql/my.cnf
+			# Permissions
+			chmod 600 $fs/etc/mysql/my.cnf
 
-		cat $stuff/*.files-list | while read file; do
-			[ -f $fs$file ] && rm -f $fs$file
-		done
-		;;
-	libmariadbclient)
-		CAT="misc|SQL database system client libraries."
-		PROVIDE="libmysqlclient"
-		DEPENDS="zlib openssl"
-		mkdir -p $fs/usr/lib/mysql
-		cp -a $install/usr/lib/mysql/libmysqlclient*so* $fs/usr/lib/mysql
-		cd $fs/usr/lib
-		ln -s mysql/libmysqlclient.so .
-		ln -s mysql/libmysqlclient.so.18 .
-		ln -s mysql/libmysqlclient.so.18.0.0 .
-		ln -s mysql/libmysqlclient_r.so .
-		ln -s mysql/libmysqlclient_r.so.18 .
-		ln -s mysql/libmysqlclient_r.so.18.0.0 .
-		;;
-	mariadb-client)
-		CAT="office|SQL database system client files."
-		PROVIDE="mysql_or_postgresql mysql-client"
-		DEPENDS="libmariadbclient zlib ncurses gcc-lib-base ncurses"
-		while read file; do
-			dir=$(dirname $file)
-			[ -d $fs$dir ] || mkdir -p $fs$dir
-			cp -a $install$file $fs$file
-		done < $wanted_stuff/$PACKAGE.files-list
-		;;
-	mariadb-dev)
-		CAT="development|SQL database system devel files."
-		PROVIDE="mysql-dev"
-		DEPENDS="zlib"
-		mkdir -p $fs/usr/lib/mysql/plugin $fs/usr/share
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/share/aclocal $fs/usr/share
-		cp -a $install/usr/lib/mysql/*.*a $fs/usr/lib/mysql
-		#~ cp -a $install/usr/lib/mysql/plugin/*.*a $fs/usr/lib/mysql/plugin
-		while read file; do
-			dir=$(dirname $file)
-			[ -d $fs$dir ] || mkdir -p $fs$dir
-			cp -a $install$file $fs$file
-		done < $wanted_stuff/$PACKAGE.files-list
-		;;
-	mariadb-test)
-		CAT="misc|SQL database system tests and benchs."
-		DEPENDS="mariadb perl openssl"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/mysql-test $fs/usr
-		cp -a $install/usr/sql-bench $fs/usr
-		find $fs/usr/mysql-test $fs/usr/sql-bench -type d -exec chmod 2777 {} \;
-		while read file; do
-			dir=$(dirname $file)
-			[ -d $fs$dir ] || mkdir -p $fs$dir
-			cp -a $install$file $fs$file
-		done < $wanted_stuff/$PACKAGE.files-list
-		mv $fs/usr/mysql-test $fs/usr/share/mysql-test
-		mv $fs/usr/sql-bench $fs/usr/share/sql-bench
-		;;
+			cat $stuff/*.files-list | while read file; do
+				[ -f $fs$file ] && rm -f $fs$file
+			done
+			;;
+		libmariadbclient)
+			CAT="misc|client libraries"
+			PROVIDE="libmysqlclient"
+			DEPENDS="zlib openssl"
+			mkdir -p $fs/usr/lib/mysql
+			cp -a $install/usr/lib/mysql/libmysqlclient*so* $fs/usr/lib/mysql
+			cd $fs/usr/lib
+			ln -s mysql/libmysqlclient.so .
+			ln -s mysql/libmysqlclient.so.18 .
+			ln -s mysql/libmysqlclient.so.18.0.0 .
+			ln -s mysql/libmysqlclient_r.so .
+			ln -s mysql/libmysqlclient_r.so.18 .
+			ln -s mysql/libmysqlclient_r.so.18.0.0 .
+			;;
+		mariadb-client)
+			CAT="office|client files"
+			PROVIDE="mysql_or_postgresql mysql-client"
+			DEPENDS="libmariadbclient zlib ncurses gcc-lib-base ncurses"
+			while read file; do
+				dir=$(dirname $file)
+				[ -d $fs$dir ] || mkdir -p $fs$dir
+				cp -a $install$file $fs$file
+			done < $wanted_stuff/$PACKAGE.files-list
+			;;
+		mariadb-dev)
+			PROVIDE="mysql-dev"
+			DEPENDS="zlib"
+			mkdir -p $fs/usr/lib/mysql/plugin $fs/usr/share
+			cp -a $install/usr/include $fs/usr
+			cp -a $install/usr/share/aclocal $fs/usr/share
+			cp -a $install/usr/lib/mysql/*.*a $fs/usr/lib/mysql
+			#~ cp -a $install/usr/lib/mysql/plugin/*.*a $fs/usr/lib/mysql/plugin
+			while read file; do
+				dir=$(dirname $file)
+				[ -d $fs$dir ] || mkdir -p $fs$dir
+				cp -a $install$file $fs$file
+			done < $wanted_stuff/$PACKAGE.files-list
+			;;
+		mariadb-test)
+			CAT="misc|tests and benchs"
+			DEPENDS="mariadb perl openssl"
+			mkdir -p $fs/usr/share
+			cp -a $install/usr/mysql-test $fs/usr
+			cp -a $install/usr/sql-bench $fs/usr
+			find $fs/usr/mysql-test $fs/usr/sql-bench -type d -exec chmod 2777 {} \;
+			while read file; do
+				dir=$(dirname $file)
+				[ -d $fs$dir ] || mkdir -p $fs$dir
+				cp -a $install$file $fs$file
+			done < $wanted_stuff/$PACKAGE.files-list
+			mv $fs/usr/mysql-test $fs/usr/share/mysql-test
+			mv $fs/usr/sql-bench $fs/usr/share/sql-bench
+			;;
 	esac
 }
 
-# Pre and post install commands for Tazpkg.
-post_install_mariadb()
-{
-	
+post_install_mariadb() {
 	local user
 	local group
-	
+
 	user=mysql
 	group=mysql
-	
+
 	if ! grep -q $user "$1/etc/passwd"; then
-		echo -n "Adding user/group $user..."
 		chroot "$1/" addgroup -S $group
 		chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user
-		status
 	fi
 
-	cat <<EOF
-----
-To start $PACKAGE server you can run :
+	[ -s "$quiet" ] || cat <<EOF
 
-    /etc/init.d/$PACKAGE start
-
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.------------------------------------------------.
+	| To start mariadb server you can run:           |
+	|                                                |
+	|    /etc/init.d/mariadb start                   |
+	|                                                |
+	| or add mariadb to RUN_DAEMONS in /etc/rcS.conf |
+	'------------------------------------------------'
 EOF
 }
 
-pre_install_mariadb()
-{
+pre_install_mariadb() {
 	# Cleanup old files
 	rm -f "$1/usr/libexec/mysql"*
 	# Mv config
 	[ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf"
 }
 
-post_remove_mariadb()
-{
-	echo "Removing user/group mysql"
+post_remove_mariadb() {
 	deluser mysql
 }
diff -r ad29ddfee1c9 -r d5aab818505e masqmail/receipt
--- a/masqmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/masqmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,37 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="masqmail"
 VERSION="0.2.28"
 CATEGORY="network"
-SHORT_DESC="An MTA for workstations and for servers in small networks."
+SHORT_DESC="An MTA for workstations and for servers in small networks"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://marmaro.de/prog/masqmail"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://marmaro.de/prog/masqmail"
 WGET_URL="$WEB_SITE/files/$TARBALL"
-TAGS="mail"
 
 BUILD_DEPENDS="glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--with-user=root --with-group=root \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--with-user=root \
+		--with-group=root \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/share/masqmail $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/etc $fs
-	cp -a $install/var $fs
+genpkg_rules() {
+	copy @std
+	TAGS="mail"
 }
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-common/receipt
--- a/matchbox-common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.1"
 CATEGORY="x-window"
 SHORT_DESC="Common files for matchbox window manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
@@ -23,6 +23,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS=""
 	TAGS="matchbox"
 }
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-desktop-2/receipt
--- a/matchbox-desktop-2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-desktop-2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox desktop v2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 REPOLOGY="matchbox-desktop"
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-desktop/receipt
--- a/matchbox-desktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-desktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.1"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox desktop"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-panel-2/receipt
--- a/matchbox-panel-2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-panel-2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.11"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox panel v2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 REPOLOGY="matchbox-panel"
@@ -12,7 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://git.yoctoproject.org/cgit/cgit.cgi/matchbox-panel-2/snapshot/$TARBALL"
 
-BUILD_DEPENDS="automake libtool gettext xorg-libX11-dev gtk3-dev dbus-glib-dev"
+BUILD_DEPENDS="automake libtool gettext-dev xorg-libX11-dev gtk3-dev \
+dbus-glib-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-panel-manager/receipt
--- a/matchbox-panel-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-panel-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox Panel Manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-panel/receipt
--- a/matchbox-panel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-panel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.3"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox panel"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-themes-extra/receipt
--- a/matchbox-themes-extra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-themes-extra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3"
 CATEGORY="customization"
 SHORT_DESC="Matchbox extra themes"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-window-manager-2/receipt
--- a/matchbox-window-manager-2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-window-manager-2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 HASH="5f44595c66be118b1a74f489de7f8492035cbdf0"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox Window Manager v2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://matchbox-project.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e matchbox-window-manager/receipt
--- a/matchbox-window-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matchbox-window-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Matchbox Window Manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://matchbox-project.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e mate-applets/receipt
--- a/mate-applets/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-applets/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-applets/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools xorg-libX11-dev python-dev gtk3-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev xorg-libX11-dev python-dev gtk3-dev \
 mate-panel-dev libgtop-dev libwnck3-dev libnotify-dev dbus-glib-dev \
 polkit-dev upower-dev gucharmap3-dev python-pygobject-dev itstool libmateweather-dev \
 gtksourceview3-dev wireless_tools-dev" # + cpufrequtils-dev + libcpupower(absent)
@@ -20,7 +20,7 @@
 $ma-accessx-status $ma-battstat $ma-charpick  $ma-command  $ma-cpufreq \
 $ma-drivemount     $ma-geyes    $ma-multiload $ma-netspeed $ma-stickynotes \
 $ma-timer          $ma-trash    $ma-weather \
-mate-applets"
+$PACKAGE"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-backgrounds/receipt
--- a/mate-backgrounds/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-backgrounds/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-backgrounds/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common glib-dev"
-SPLIT="mate-backgrounds-abstract mate-backgrounds-desktop \
-mate-backgrounds-nature"
+SPLIT="$PACKAGE-abstract $PACKAGE-desktop $PACKAGE-nature"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-calc/receipt
--- a/mate-calc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-calc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-calc/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk3-dev itstool"
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev itstool"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-common/receipt
--- a/mate-common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,6 +22,6 @@
 
 genpkg_rules() {
 	copy @std @dev
-	DEPENDS="automake libtool gettext intltool"
+	DEPENDS="automake libtool gettext-dev intltool"
 	TAGS="MATE"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mate-control-center/receipt
--- a/mate-control-center/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-control-center/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 xorg-xorgproto gtk3-dev mate-desktop-dev mate-menus-dev dbus-glib-dev marco-dev \
 librsvg-dev mate-settings-daemon-dev libappindicator-gtk3-dev \
 desktop-file-utils xorg-libXcursor-dev libmatekbd-dev libxklavier-dev"
-SPLIT="mate-control-center-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-desktop/receipt
--- a/mate-desktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-desktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="mate-common gtk-doc gobject-introspection-dev dconf-dev \
 startup-notification-dev xorg-libX11-dev xorg-libXrandr-dev gdk-pixbuf-dev \
 gtk3-dev xorg-xcb-util-dev"
-SPLIT="mate-desktop-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-icon-theme/receipt
--- a/mate-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-icon-theme/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common icon-naming-utils"
-SPLIT="mate-icon-theme-menta"
+SPLIT="$PACKAGE-menta"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-menu/receipt
--- a/mate-menu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-menu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python-distutils-extra intltool file"
 
 compile_rules() {
-	python setup.py install --root=$install
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mate-menus/receipt
--- a/mate-menus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-menus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/mate-desktop/mate-menus/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="mate-common gobject-introspection-dev python-dev"
-SPLIT="mate-menus-python mate-menus mate-menus-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
@@ -25,7 +25,7 @@
 
 genpkg_rules() {
 	case $PACKAGE in
-		mate-menus-python)
+		*-python)
 			copy python*/*.so *.py
 			DEPENDS="glib mate-menus python"
 			CAT="python|Python bindings"
diff -r ad29ddfee1c9 -r d5aab818505e mate-notification-daemon/receipt
--- a/mate-notification-daemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-notification-daemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev libcanberra-dev \
 libwnck3-dev libnotify-dev"
-SPLIT="mate-notification-daemon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-panel/receipt
--- a/mate-panel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-panel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-panel/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common gtk-doc yelp-tools gobject-introspection-dev \
+BUILD_DEPENDS="mate-common gtk-doc yelp-tools-dev gobject-introspection-dev \
 xorg-libICE-dev xorg-libSM-dev gtk3-dev mate-desktop-dev mate-menus-dev \
 dbus-glib-dev libwnck3-dev librsvg-dev libmateweather-dev itstool"
-SPLIT="mate-panel-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-power-manager/receipt
--- a/mate-power-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-power-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-power-manager/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools itstool libcanberra-dev dbus-glib-dev \
-libnotify-dev upower-dev libgnome-keyring3-dev mate-panel-dev"
+BUILD_DEPENDS="mate-common yelp-tools-dev itstool libcanberra-dev \
+dbus-glib-dev libnotify-dev upower-dev libgnome-keyring3-dev mate-panel-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-screensaver/receipt
--- a/mate-screensaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-screensaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="mate-common xorg-libX11-dev xorg-libXScrnSaver-dev gtk3-dev \
 dbus-glib-dev mate-desktop-dev mate-menus-dev xmlto xorg-libXext-dev \
 mesa-dev libmatekbd-dev libnotify-dev expat-dev xorg-libxshmfence-dev"
-SPLIT="mate-screensaver-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-sensors-applet/receipt
--- a/mate-sensors-applet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-sensors-applet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-sensors-applet/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk3-dev mate-panel-dev dbus-glib-dev \
-libatasmart-dev libnotify-dev lm-sensors-dev libxslt-dev itstool"
-SPLIT="mate-sensors-applet-dev"
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk3-dev mate-panel-dev \
+dbus-glib-dev libatasmart-dev libnotify-dev lm-sensors-dev libxslt-dev itstool"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-settings-daemon/receipt
--- a/mate-settings-daemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-settings-daemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="mate-common gtk3-dev dbus-glib-dev dconf-dev mate-desktop-dev \
 libnotify-dev xorg-libXxf86misc-dev libmatekbd-dev libcanberra-dev \
 libmatemixer-dev nss-dev polkit-dev pulseaudio-dev"
-SPLIT="mate-settings-daemon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-system-monitor/receipt
--- a/mate-system-monitor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-system-monitor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-system-monitor/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools libgtop-dev libwnck3-dev gtk3-dev \
-gtkmm3-dev librsvg-dev glibmm-dev libgiomm-dev itstool"
+BUILD_DEPENDS="mate-common yelp-tools-dev libgtop-dev libwnck3-dev gtk3-dev \
+gtkmm3-dev librsvg-dev glibmm-dev glibmm-dev itstool"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e mate-terminal/receipt
--- a/mate-terminal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-terminal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-terminal/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools vte-dev gtk3-dev dconf-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev vte-dev gtk3-dev dconf-dev \
 xorg-libX11-dev itstool xorg-libSM-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mate-utils/receipt
--- a/mate-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/mate-utils/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk-doc gtk3-dev mate-panel-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gtk3-dev mate-panel-dev \
 libgtop-dev libcanberra-dev itstool xorg-libSM-dev"
-SPLIT="mate-utils-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e mate/receipt
--- a/mate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,7 +10,7 @@
 LICENSE="GPL"
 WEB_SITE="https://github.com/mate-desktop"
 
-SPLIT="mate-extra"
+SPLIT="$PACKAGE-extra"
 
 genpkg_rules() {
 	case $PACKAGE in
diff -r ad29ddfee1c9 -r d5aab818505e mathomatic/receipt
--- a/mathomatic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mathomatic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/rubicks/mathomatic/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool readline-dev"
-SPLIT="mathomatic-optional mathomatic"
+SPLIT="$PACKAGE-optional $PACKAGE"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e matio/receipt
--- a/matio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="matio-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e matplotlib/receipt
--- a/matplotlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/matplotlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="matplotlib"
 VERSION="1.0.0"
 CATEGORY="graphics"
-SHORT_DESC="2D plotting library for the Python."
+SHORT_DESC="2D plotting library for the Python"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PSL BSD"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -16,16 +16,13 @@
 BUILD_DEPENDS="python python-dev zlib-dev libpng16-dev freetype-dev python-numpy \
 python-pygtk-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp -a $stuff/setup.cfg .
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e maxima/receipt
--- a/maxima/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/maxima/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,28 @@
 PACKAGE="maxima"
 VERSION="5.41.0"
 CATEGORY="misc"
-SHORT_DESC="a Computer Algebra System."
+SHORT_DESC="A Computer Algebra System"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://maxima.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://maxima.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="tk rlwrap"
 BUILD_DEPENDS="clisp texinfo"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --mandir=/usr/share/man \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--localstatedir=/var \
-	$CONFIGURE_ARGS &&
-	make -j 1 && make -j 1 check &&
-	make DESTDIR=$DESTDIR install
+		$CONFIGURE_ARGS &&
+	make -j1 &&
+	make -j1 check &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr $fs
 	cat > $fs/usr/share/applications/xmaxima.desktop <<EOT
@@ -38,4 +37,5 @@
 Type=Application
 Categories=GNOME;Application;Utility;
 EOT
+	DEPENDS="tk rlwrap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mb-applet-volume/receipt
--- a/mb-applet-volume/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mb-applet-volume/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,26 @@
 PACKAGE="mb-applet-volume"
 VERSION="0.2"
 CATEGORY="x-window"
-SHORT_DESC="Matchbox volume applet."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Matchbox volume applet"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://matchbox-project.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://matchbox-project.org/"
 WGET_URL="${WEB_SITE}sources/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="gtk2 libmatchbox"
 BUILD_DEPENDS="gtk2-dev libmatchbox-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
+	DEPENDS="gtk2 libmatchbox"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mbedtls/receipt
--- a/mbedtls/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mbedtls/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,12 +11,13 @@
 TARBALL="$PACKAGE-$VERSION-gpl.tgz"
 WGET_URL="https://tls.mbed.org/download/$TARBALL"
 
-SPLIT="mbedtls-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	sed -i -e 's|//\(#define MBEDTLS_THREADING_C\)|\1|' \
-	       -e 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' \
-	       include/mbedtls/config.h
+	sed \
+		-e 's|//\(#define MBEDTLS_THREADING_C\)|\1|' \
+		-e 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' \
+		-i include/mbedtls/config.h
 	sed -i 's|<time.h>|"platform.h"|' include/mbedtls/ssl.h
 
 	LDFLAGS="$LDFLAGS -I../include " \
diff -r ad29ddfee1c9 -r d5aab818505e mc/receipt
--- a/mc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.8.21"
 CATEGORY="system-tools"
 SHORT_DESC="Midnight Commander - ncurses based file manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://midnight-commander.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/mc.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://ftp.midnight-commander.org/$TARBALL"
 
-BUILD_DEPENDS="check-dev glib-dev gettext gpm-dev libssh2-dev"
-SPLIT="mc-noarch"
+BUILD_DEPENDS="check-dev glib-dev gettext-dev gpm-dev libssh2-dev"
+SPLIT="$PACKAGE-noarch"
 
 COOKOPTS="!menus"
 
diff -r ad29ddfee1c9 -r d5aab818505e mcabber/receipt
--- a/mcabber/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mcabber/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,12 @@
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev glib-dev"
-SPLIT="mcabber-help"
+SPLIT="$PACKAGE-help"
 
 compile_rules() {
-	./configure && make && make install
+	./configure &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mcrypt/receipt
--- a/mcrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mcrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.6.8"
 CATEGORY="security"
 SHORT_DESC="Simple crypting program"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://mcrypt.sourceforge.net/"
 
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mdadm/receipt
--- a/mdadm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mdadm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,17 @@
 VERSION="4.0"
 CATEGORY="system-tools"
 SHORT_DESC="Software RAID tools"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.kernel.org/pub/linux/utils/raid/mdadm/ANNOUNCE"
 WGET_URL="https://www.kernel.org/pub/linux/utils/raid/mdadm/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make mdadm
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/mdadm $fs/usr/bin
 }
diff -r ad29ddfee1c9 -r d5aab818505e mdbtools/receipt
--- a/mdbtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mdbtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,7 +9,7 @@
 WEB_SITE="http://mdbtools.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="bison flex unixODBC-dev glib-dev readline-dev"
 
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mdk3/receipt
--- a/mdk3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mdk3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mdk3"
 VERSION="v6"
 CATEGORY="security"
 SHORT_DESC="WLAN penetration tool"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://aspj.aircrack-ng.org/index.html#mdk3"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://aspj.aircrack-ng.org/index.html#mdk3"
 WGET_URL="http://homepages.tu-darmstadt.de/~p_larbig/wlan/$TARBALL"
 
-DEPENDS=""
+compile_rules() {
+	sed -i "s|/usr/local|/usr|" Makefile
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	sed -i -e "s:/usr/local:/usr:" Makefile
-	make -C osdep
-	make
-	make DESTDIR="$DESTDIR" install
+	make -C osdep &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e mdp/receipt
--- a/mdp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mdp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,23 @@
 PACKAGE="mdp"
 VERSION="0.91.3"
 CATEGORY="office"
-SHORT_DESC="A command-line based markdown presentation tool."
+SHORT_DESC="A command-line based markdown presentation tool"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://github.com/visit1985/mdp"
 WGET_URL="git|git://github.com/visit1985/mdp"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/mdp
 	cp -a $install/$PACKAGE $fs/usr/bin
 	cp -a $src/*.md $fs/usr/share/mdp
+	DEPENDS="ncurses"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e mediainfo-gui/receipt
--- a/mediainfo-gui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mediainfo-gui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,12 +10,9 @@
 TARBALL="MediaInfo_GUI_${VERSION}_GNU_FromSource.tar.xz"
 WGET_URL="http://mediaarea.net/download/binary/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="wxWidgets gtk2"
 BUILD_DEPENDS="wxWidgets-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./GUI_Compile.sh
 	cd MediaInfo/Project/GNU/GUI; make DESTDIR=$install install
 
@@ -24,8 +21,7 @@
 		$install/usr/share/applications
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="wxWidgets gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mediawiki/receipt
--- a/mediawiki/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mediawiki/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.30.0"
 CATEGORY="network"
 SHORT_DESC="MediaWiki engine"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.mediawiki.org/wiki/MediaWiki"
 
diff -r ad29ddfee1c9 -r d5aab818505e megatools/receipt
--- a/megatools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/megatools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A collection of CLI programs for accessing Mega service"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL2"
-WEB_SITE="https://megatools.megous.com"
+WEB_SITE="https://megatools.megous.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/builds/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e meld/receipt
--- a/meld/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/meld/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="meld"
 VERSION="1.6.0"
 CATEGORY="development"
-SHORT_DESC="Visual diff and merge tool for GNOME."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Visual diff and merge tool for GNOME"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://meldmerge.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://meldmerge.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:3}/$TARBALL"
 
-DEPENDS="python-pygtk rarian"
-BUILD_DEPENDS="python-pygtk-dev rarian-dev gnome-doc-utils intltool util-linux-getopt"
+BUILD_DEPENDS="python-pygtk-dev rarian-dev gnome-doc-utils intltool \
+util-linux-getopt"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make prefix=/usr && make prefix=/usr DESTDIR=$DESTDIR install
+compile_rules() {
+	make prefix=/usr &&
+	make prefix=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/meld $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="python-pygtk rarian"
 }
diff -r ad29ddfee1c9 -r d5aab818505e memcached/receipt
--- a/memcached/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/memcached/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,20 @@
 VERSION="1.4.14"
 CATEGORY="system-tools"
 SHORT_DESC="High-performance, distributed memory object caching system"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://memcached.org"
+WEB_SITE="http://memcached.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://memcached.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="libevent-dev"
-SPLIT="memcached-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e memo/receipt
--- a/memo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/memo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="memo"
 VERSION="0.6"
 CATEGORY="office"
-SHORT_DESC="Memo is a command line, Unix-style note-taking software"
+SHORT_DESC="Command line, Unix-style note-taking software"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://palovandalo.com/memo/"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="ncurses-dev"
 
 compile_rules() {
-	install -Dm 755 memo $install/usr/bin/memo || return 1
+	install -Dm755 memo $install/usr/bin/memo || return 1
 
 	cook_pick_manpages doc/memo.1
 }
diff -r ad29ddfee1c9 -r d5aab818505e memtest/receipt
--- a/memtest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/memtest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="${WEB_SITE}download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="xz gcc3"
-SPLIT="memtest-serial:serial"
+SPLIT="$PACKAGE-serial:serial"
 
 compile_rules() {
 	sed -i '/scp memtest.bin/d; s/gcc/gcc-3/; s/-fno-stack-protector//' Makefile
diff -r ad29ddfee1c9 -r d5aab818505e menu-cache/receipt
--- a/menu-cache/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/menu-cache/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.0"
 CATEGORY="x-window"
 SHORT_DESC="LXDE implementation of the freedesktop menu's cache"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/lxde/menu-cache"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/menu-cache.html"
@@ -14,7 +14,7 @@
 WGET_URL="https://github.com/lxde/menu-cache/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake gtk-doc libtool glib-dev libfm-extra-dev"
-SPLIT="menu-cache-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# tarball from github.com requires this step
diff -r ad29ddfee1c9 -r d5aab818505e menu-railroad/receipt
--- a/menu-railroad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/menu-railroad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,17 +3,15 @@
 PACKAGE="menu-railroad"
 VERSION="1.0"
 CATEGORY="x-window"
-SHORT_DESC="Freedesktop menu for railroading applications."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Freedesktop menu for railroading applications"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://icons.mysitemyway.com/free-clipart-icons/1/locomotive-train-icon-id/39275/style-id/294/grunge-brushed-metal-pewter-icons/transport-travel/"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	# Menu directory icon is free from the above website
 	mkdir -p $fs/usr/share $fs/etc/xdg
-	cp -a stuff/desktop-directories $fs/usr/share
-	cp -a stuff/pixmaps $fs/usr/share
-	cp -a stuff/menus $fs/etc/xdg
+	cp -a $stuff/desktop-directories $fs/usr/share
+	cp -a $stuff/pixmaps $fs/usr/share
+	cp -a $stuff/menus $fs/etc/xdg
 }
diff -r ad29ddfee1c9 -r d5aab818505e mercurial/receipt
--- a/mercurial/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mercurial/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.5"
 CATEGORY="development"
 SHORT_DESC="Revision tools system"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.mercurial-scm.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/mercurial.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.mercurial-scm.org/release/$TARBALL"
 
-BUILD_DEPENDS="python-dev patch openssl-dev glib-dev gettext python-docutils"
+BUILD_DEPENDS="python-dev patch openssl-dev glib-dev gettext-dev python-docutils"
 
 compile_rules() {
 	make build &&
diff -r ad29ddfee1c9 -r d5aab818505e merkaartor/receipt
--- a/merkaartor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/merkaartor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="merkaartor"
 VERSION="0.18.1"
 CATEGORY="misc"
-SHORT_DESC="An openstreetmap mapping program."
+SHORT_DESC="An openstreetmap mapping program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -11,19 +11,15 @@
 WGET_URL="https://github.com/openstreetmap/merkaartor/archive/$VERSION.tar.gz"
 TAGS="openstreetmap"
 
-DEPENDS="gdal proj libQtWebkit libQtSvg libQtXml libpostgresqlclient"
 BUILD_DEPENDS="wget Qt4-dev qmake gdal-dev proj-dev libQtWebkit"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	qmake PREFIX="/usr/" &&
 	make $MAKEFLAGS &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="gdal proj libQtWebkit libQtSvg libQtXml libpostgresqlclient"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mesa-demos/receipt
--- a/mesa-demos/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mesa-demos/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mesa/receipt
--- a/mesa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mesa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,8 +19,9 @@
 elfutils-dev llvm-dev xorg-libpciaccess-dev wayland-dev libva-dev libvdpau-dev \
 wayland-protocols-dev libatomic zlib-dev xorg-libXi-dev"
 BUILD_DEPENDS="${BUILD_DEPENDS/libva-dev/}"
-SPLIT="mesa-dri mesa-libegl mesa-libgbm mesa-osmesa mesa-libswrAVX \
-mesa-libwayland-egl mesa-libxatracker mesa-vdpau mesa mesa-dev"
+SPLIT="$PACKAGE-dri $PACKAGE-libegl $PACKAGE-libgbm $PACKAGE-osmesa \
+$PACKAGE-libswrAVX $PACKAGE-libwayland-egl $PACKAGE-libxatracker $PACKAGE-vdpau \
+$PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	# Removed from the full list: freedreno,vc4
diff -r ad29ddfee1c9 -r d5aab818505e mesa12/receipt
--- a/mesa12/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mesa12/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 xorg-libxcb-dev xorg-libxshmfence-dev xorg-libX11-dev xorg-libXext-dev \
 xorg-libXdamage-dev xorg-libXfixes-dev xorg-libXxf86vm-dev expat-dev \
 elfutils-dev llvm-dev xorg-libpciaccess-dev"
-SPLIT="mesa12 mesa12-dev mesa12-dri mesa12-libegl"
+SPLIT="$PACKAGE-dev $PACKAGE-dri $PACKAGE-libegl"
 
 compile_rules() {
 	# "swr" driver is disabled due to compilation errors
@@ -40,7 +40,8 @@
 
 	unset GLL_DRV &&
 
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	install -Dm644 $stuff/90-DRI.conf $install/etc/X11/xorg.conf.d/90-DRI.conf
 }
diff -r ad29ddfee1c9 -r d5aab818505e metacity/receipt
--- a/metacity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/metacity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -24,7 +24,7 @@
 		&&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e metasploit/receipt
--- a/metasploit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/metasploit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,24 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="metasploit"
 VERSION="3.6.0"
 CATEGORY="network"
-SHORT_DESC="The Metasploit Framework is an advanced open-source platform for developing, testing, and using exploit code"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Advanced platform for developing, testing, and using exploit code"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-SOURCE="framework"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="https://www.metasploit.com/"
+
+TARBALL="framework-$VERSION.tar.bz2"
 WGET_URL="http://updates.metasploit.com/data/releases/$TARBALL"
 
-DEPENDS="ruby libpcap"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/$PACKAGE $fs/etc/profile.d
 	cp -a $src/* $fs/usr/share/$PACKAGE
 	echo "export PATH=$PATH:/usr/share/$PACKAGE" > $fs/etc/profile.d/$PACKAGE.sh
 	chmod 755 $fs/etc/profile.d/$PACKAGE.sh
+	DEPENDS="ruby libpcap"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e mfoc/receipt
--- a/mfoc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mfoc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,26 @@
 PACKAGE="mfoc"
 VERSION="0.10.7"
 CATEGORY="development"
-SHORT_DESC="Mifare Classic Offline Cracker."
+SHORT_DESC="Mifare Classic Offline Cracker"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/nfc-tools/mfoc"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/nfc-tools/mfoc"
 WGET_URL="http://mfoc.googlecode.com/files/$TARBALL"
 
-DEPENDS="libnfc"
 BUILD_DEPENDS="libnfc-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libnfc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mfstool/receipt
--- a/mfstool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mfstool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,23 +3,22 @@
 PACKAGE="mfstool"
 VERSION="0.5pre"
 CATEGORY="base-system"
-SHORT_DESC="Allows to manipulate Minix filesystem images in user-space."
+SHORT_DESC="Allows to manipulate Minix filesystem images in user-space"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mfstool.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mfstool.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e mgetty/receipt
--- a/mgetty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mgetty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE$VERSION-Jun05.tar.gz"
 WGET_URL="ftp://mgetty.greenie.net/pub/$PACKAGE/source/${VERSION%.*}/$TARBALL"
 
-SPLIT="mgetty-voicetools"
+SPLIT="$PACKAGE-voicetools"
 
 compile_rules() {
 	[ -f Makefile.dist ] && mv -f Makefile.dist Makefile
@@ -24,15 +24,15 @@
 		-e "s|^CONFDIR=.*|CONFDIR=/etc/mgetty+sendfax|" \
 		-e 's|/man/|/share&|' \
 		Makefile
-	sed -i  -e "s|^prefix=/usr/local|prefix=$DESTDIR/usr|" \
-		-e "s|^spool=/var/spool|spool=$DESTDIR/var/spool|" \
-		-e "s|^CONFDIR=.*|CONFDIR=$DESTDIR/etc/mgetty+sendfax|" \
+	sed -i  -e "s|^prefix=/usr/local|prefix=$install/usr|" \
+		-e "s|^spool=/var/spool|spool=$install/var/spool|" \
+		-e "s|^CONFDIR=.*|CONFDIR=$install/etc/mgetty+sendfax|" \
 		-e 's|/man/|/share&|' \
 		-e 's|^INSTALL=install .*|INSTALL=install -c -o root -g root|' \
 		Makefile.install
 	make bin-all vgetty
-	mkdir -p $DESTDIR/var/spool $DESTDIR/usr/share/man/man1 \
-		$DESTDIR/usr/share/man/man8
+	mkdir -p $install/var/spool $install/usr/share/man/man1 \
+		$install/usr/share/man/man8
 	mv -f Makefile.install Makefile
 	sed -i 's|chown|echo chown|' Makefile fax/Makefile
 	make -k install.bin vgetty-install
diff -r ad29ddfee1c9 -r d5aab818505e mhash/receipt
--- a/mhash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mhash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="mhash-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mhwaveedit/receipt
--- a/mhwaveedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mhwaveedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="mhwaveedit"
 VERSION="1.4.23"
 CATEGORY="multimedia"
-SHORT_DESC="Lightweight sound files editor, recorder and player."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight sound files editor, recorder and player"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/magnush/mhwaveedit/"
 
@@ -24,7 +24,7 @@
 		--without-esound \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e miau/receipt
--- a/miau/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/miau/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.6"
 CATEGORY="network"
 SHORT_DESC="Another IRC-bouncer/proxy"
-MAINTAINER="christophe.paris@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://miau.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e micro_proxy/receipt
--- a/micro_proxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/micro_proxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 	mv $PACKAGE $PACKAGE-$VERSION 2>/dev/null
 	cd $src
 	make &&
-	install -Dm 755 $src/micro_proxy $install/usr/bin/micro_proxy
+	install -Dm755 $src/micro_proxy $install/usr/bin/micro_proxy
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e microperl/receipt
--- a/microperl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/microperl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.24.0"
 CATEGORY="development"
 SHORT_DESC="A micro version of Perl"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://www.perl.org/"
 
@@ -19,7 +19,7 @@
 
 	make -f Makefile.micro regen_uconfig &&
 	make -f Makefile.micro &&
-	install -Dm 755 $src/microperl $install/usr/bin/microperl
+	install -Dm755 $src/microperl $install/usr/bin/microperl
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e micropython/receipt
--- a/micropython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/micropython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,25 +7,22 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="http://micropython.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/$PACKAGE/$PACKAGE/archive/v$VERSION.tar.gz"
 
-DEPENDS="readline libffi"
 BUILD_DEPENDS="git readline-dev libffi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|bash|sh|' $src/py/py-version.sh
 	sed -i 's|-lreadline|& -lncurses -ldl -lffi|' $src/unix/Makefile
 
 	cd unix
-	make -j 1
+	make -j1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/unix/micropython $fs/usr/bin
+	DEPENDS="readline libffi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e midori-video/receipt
--- a/midori-video/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/midori-video/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,17 @@
 VERSION="0.5.2"
 CATEGORY="multimedia"
 SHORT_DESC="Add video support to midori for html5 videos"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="midori"
 
 DEPENDS="midori libwebkit-video gstreamer0 gst0-plugins-base gst0-plugins-good \
-	gst0-ffmpeg-small"
+gst0-ffmpeg-small"
 
 SUGGESTED="gst0-plugins-bad gst0-ffmpeg"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/doc
 	cp $WOK/$PACKAGE/description.txt $fs/usr/share/doc/midori-video.txt
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e midori/receipt
--- a/midori/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/midori/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.11"
 CATEGORY="network"
 SHORT_DESC="Lightweight web browser based on GTK+/WebKit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.midori-browser.org/"
 
@@ -12,10 +12,8 @@
 WGET_URL="https://midori-browser.org/downloads/$TARBALL"
 TARBALL_SHA1="64c86935028feb5f89d799c2acacaad67764da6f"
 
-BUILD_DEPENDS_arm="glib-dev libnotify-dev gtk2-dev xorg-libXScrnSaver-dev \
-webkitgtk-dev libunique-dev libsoup-dev libxslt-dev gettext intltool"
 BUILD_DEPENDS="cmake vala sqlite3-dev libsoup-dev shared-mime-info gcr-dev \
-webkitgtk-dev gettext rsvg-convert intltool"
+webkitgtk-dev gettext-dev rsvg-convert intltool"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mikmod/receipt
--- a/mikmod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mikmod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Mikmod module player"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://mikmod.shlomifish.org/"
+WEB_SITE="http://mikmod.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e mindi/receipt
--- a/mindi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mindi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,32 @@
 PACKAGE="mindi"
 VERSION="2.1.3"
 CATEGORY="system-tools"
-SHORT_DESC="GPL disaster recovery solution."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="GPL disaster recovery solution"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mondorescue.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.mondorescue.org/src/$TARBALL"
 
-DEPENDS="syslinux syslinux-extra"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	PREFIX=$install/usr \
-		CONFDIR=$install/etc \
-		CACHEDIR=$install/var/cache/mindi ./install.sh 
+	CONFDIR=$install/etc \
+	CACHEDIR=$install/var/cache/mindi \
+	./install.sh
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
-	
+
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/etc $fs/
 	cp -a $install/var $fs/
-	
+
 	#Fix path
 	sed -i -e "s!$install/!/!" $fs/etc/mindi/perl-scripts
 	sed -i -e "s!$install/!/!" $fs/usr/sbin/mindi
 	sed -i -e "s!/usr/lib/isolinux.bin!/boot/isolinux/isolinux.bin!" $fs/usr/sbin/mindi
+	DEPENDS="syslinux syslinux-extra"
 }
diff -r ad29ddfee1c9 -r d5aab818505e minetest/receipt
--- a/minetest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/minetest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 EXTRA_SOURCE_FILES="$WGET_URL2"
 
 BUILD_DEPENDS="cmake irrlicht-dev gmp-dev jsoncpp-dev luajit-dev curl-dev \
-gettext openal-dev libvorbis-dev xorg-libX11-dev xorg-libXext-dev \
+gettext-dev openal-dev libvorbis-dev xorg-libX11-dev xorg-libXext-dev \
 xorg-libICE-dev xorg-libSM-dev freetype-dev ncurses-dev sqlite3-dev mesa-dev \
 glu-dev libjpeg-turbo-dev bzip2-dev zlib-dev libpng16-dev doxygen graphviz"
 SPLIT="$PACKAGE-data"
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-binutils/receipt
--- a/mingw32-binutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-binutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.28-1"
 CATEGORY="development"
 SHORT_DESC="MinGW32 binutils"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mingw.org/"
 
@@ -14,13 +14,11 @@
 BUILD_DEPENDS="slitaz-toolchain bison flex texinfo"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|2 << 31|0|' gas/config/tc-i386.c
 	./configure \
 		--prefix=/usr \
@@ -35,19 +33,17 @@
 -Wno-error=unused-but-set-variable -Wno-error=unused-value \
 -Wno-error=unused-but-set-parameter -Wno-error=logical-not-parentheses \
 -Wno-error=maybe-uninitialized -Wno-error=shift-negative-value" LDFLAGS="-s" &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs$MINGW32_ROOT
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install$MINGW32_ROOT/* $fs$MINGW32_ROOT
 	# do not need to copy lib/libiberty.a
 
 	strip -s $fs$MINGW32_ROOT/bin/*
-	
+
 	#Create a symlink for --with-sysroot
 	ln -s . $fs$MINGW32_ROOT/usr
 
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-gcc-c/receipt
--- a/mingw32-gcc-c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-gcc-c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,8 +4,8 @@
 SOURCE="gcc-core"
 VERSION="3.4.5-20060117-2"
 CATEGORY="development"
-SHORT_DESC="MinGW32 gcc, for the C language only."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 gcc, for the C language only"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$SOURCE-$VERSION-src.tar.gz"
 WEB_SITE="http://www.mingw.org/"
@@ -18,15 +18,13 @@
 BUILD_DEPENDS="slitaz-toolchain bison flex mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share/man/man1 $DESTDIR/usr/share/man/man7 
-	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
+compile_rules() {
+	mkdir -p $install/usr/share/man/man1 $install/usr/share/man/man7 
+	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ]; then
 		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
 		return 1
 	fi
@@ -48,13 +46,11 @@
 		--disable-win32-registry \
 		--enable-sjlj-exceptions \
 		$CONFIGURE_ARGS &&
-	make CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s"  &&
-	make DESTDIR=$DESTDIR install 2>&1 | grep -v fixinc/fixincl
+	make CFLAGS="-O2 -fomit-frame-pointer" LDFLAGS="-s" &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	# do not need to copy lib/libiberty.a
@@ -62,16 +58,8 @@
 	cp -a $install/usr/lib/gcc $fs/usr/lib
 }
 
-# Rules to setup after installation
-post_install()
-{
+post_install() {
 	MINGW32_ID="i586-pc-mingw32"
 	# Archives get stripped during packaging; need to run ranlib
 	chroot "$1/" find "/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \;
 }
-
-# Rules to clean the package
-clean_wok()
-{
-	rm -r $SOURCE-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-gcc/receipt
--- a/mingw32-gcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-gcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.4.5-20060117-2"
 CATEGORY="development"
 SHORT_DESC="MinGW32 gcc, for C, C++, and Ada"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mingw.org/"
 
@@ -24,12 +24,12 @@
 	echo "CFLAGS=CXXFLAGS='$CFLAGS'"
 
 	# Configuration only needs included if we're in the build/wok environment
-	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 		.   $WOK/mingw32-toolchain/stuff/mingw32.conf
 	fi
 
-	mkdir -p $DESTDIR/usr/share/man/man1 $DESTDIR/usr/share/man/man7 
-	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
+	mkdir -p $install/usr/share/man/man1 $install/usr/share/man/man7 
+	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ]; then
 		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
 		return 1
 	fi
@@ -61,17 +61,15 @@
 		--disable-win32-registry \
 		--enable-sjlj-exceptions \
 		$CONFIGURE_ARGS &&
-	make -j4 \
+	make \
 		CFLAGS="-O2 -fomit-frame-pointer" \
 		LDFLAGS="-s" &&
-	make \
-		DESTDIR=$DESTDIR \
-		install 2>&1 | grep -v fixinc/fixincl
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
 	# Configuration only needs included if we're in the build/wok environment
-	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 		.   $WOK/mingw32-toolchain/stuff/mingw32.conf
 	fi
 
@@ -95,7 +93,3 @@
 	chroot "$1/" find "/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \;
 	chroot "$1/" find "/usr/$MINGW32_ID/lib/"     -name *.a -exec $MINGW32_ID-ranlib {} \;
 }
-
-clean_wok() {
-	rm -rf gcc-core-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-runtime-headers/receipt
--- a/mingw32-runtime-headers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-runtime-headers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,37 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="mingw32-runtime-headers"
-SOURCE="mingwrt"
 VERSION="3.15.2-mingw32"
 CATEGORY="development"
-SHORT_DESC="MinGW32 runtime headers."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 runtime headers"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://www.mingw.org/"
+
+SOURCE="mingwrt"
 TARBALL="$SOURCE-$VERSION-src.tar.gz"
-WEB_SITE="http://www.mingw.org/"
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
-	mkdir -p $DESTDIR$MINGW32_ROOT
-	cp -a include $DESTDIR$MINGW32_ROOT
-	cp -a profile/*.h $DESTDIR$MINGW32_ROOT/include
+compile_rules() {
+	mkdir -p $install$MINGW32_ROOT
+	cp -a include $install$MINGW32_ROOT
+	cp -a profile/*.h $install$MINGW32_ROOT/include
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-runtime/receipt
--- a/mingw32-runtime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-runtime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="mingw32-runtime"
 VERSION="3.15.2-mingw32"
 CATEGORY="development"
-SHORT_DESC="MinGW32 runtime."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 runtime"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://www.mingw.org/"
 
@@ -22,18 +22,18 @@
 	echo "CFLAGS=CXXFLAGS='$CFLAGS'"
 
 	# Configuration only needs included if we're in the build/wok environment
-	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 		. $WOK/mingw32-toolchain/stuff/mingw32.conf
 	fi
 
 	sed -i 's|/doc/|/share&|' configure */configure Makefile.in
-	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
+	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ]; then
 		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
 		return 1
 	fi
 
-	find $src -name 'Makefile*' | xargs sed -i "s|^inst_.*:= *|&$DESTDIR/|"
-	mkdir -p $DESTDIR/usr/bin
+	find $src -name 'Makefile*' | xargs sed -i "s|^inst_.*:= *|&$install/|"
+	mkdir -p $install/usr/bin
 	rm -f -r $src/binutils
 
 	mkdir -p mingwrt-$VERSION-build
@@ -51,7 +51,7 @@
 
 genpkg_rules() {
 	# Configuration only needs included if we're in the build/wok environment
-	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 		.   $WOK/mingw32-toolchain/stuff/mingw32.conf
 	fi
 
@@ -66,7 +66,3 @@
 	# Archives get stripped during packaging; need to run ranlib
 	chroot "$1/" find "/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \;
 }
-
-clean_wok() {
-	rm -r mingwrt-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-toolchain/receipt
--- a/mingw32-toolchain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-toolchain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,15 +3,9 @@
 PACKAGE="mingw32-toolchain"
 VERSION="1.0"
 CATEGORY="meta"
-SHORT_DESC="MinGW32 toolchain meta package for devel."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 toolchain meta package for devel"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://www.slitaz.org/"
 
 DEPENDS="mingw32-gcc"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/var
-}
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-w32api-headers/receipt
--- a/mingw32-w32api-headers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-w32api-headers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,28 @@
 # SliTaz package receipt.
 
 PACKAGE="mingw32-w32api-headers"
-SOURCE="w32api"
 VERSION="3.13-mingw32"
 CATEGORY="development"
-SHORT_DESC="MinGW32 w32api headers."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 w32api headers"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://www.mingw.org/"
+
+SOURCE="w32api"
 TARBALL="$SOURCE-$VERSION-src.tar.gz"
-WEB_SITE="http://www.mingw.org/"
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolchain/stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
+	.   $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
-	mkdir -p $DESTDIR$MINGW32_ROOT
-	cp -a include $DESTDIR$MINGW32_ROOT
+compile_rules() {
+	mkdir -p $install$MINGW32_ROOT
+	cp -a include $install$MINGW32_ROOT
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e mingw32-w32api/receipt
--- a/mingw32-w32api/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mingw32-w32api/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,35 +4,32 @@
 SOURCE="w32api"
 VERSION="3.13-mingw32"
 CATEGORY="development"
-SHORT_DESC="MinGW32 w32api."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="MinGW32 w32api"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 TARBALL="$SOURCE-$VERSION-src.tar.gz"
 WEB_SITE="http://www.mingw.org/"
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 MINGW32_ID="i586-pc-mingw32"
 
-DEPENDS=""
 BUILD_DEPENDS="slitaz-toolchain mingw32-binutils mingw32-runtime-headers mingw32-w32api-headers mingw32-gcc-c"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ]; then
 	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ] ; then
+compile_rules() {
+	if [ "$MINGW32_ID" != "$MINGW32_TARGET" ]; then
 		echo "ERROR: Conf 'TARGET' string differs from Receipt 'ID' string"
 		return 1
 	fi
 
-	find $src -name 'Makefile*' | xargs sed -i "s|^inst_.*:= *|&$DESTDIR/|"
+	find $src -name 'Makefile*' | xargs sed -i "s|^inst_.*:= *|&$install/|"
 	rm -f -r $src/binutils
-	mkdir -p $SOURCE-$VERSION-build $DESTDIR/usr/lib
+	mkdir -p $SOURCE-$VERSION-build $install/usr/lib
 	cd $SOURCE-$VERSION-build
-	
+
 	# NOTE: DESTDIR not handled correctly; have to fudge --prefix
 	$src/configure \
 		--prefix=/usr/$MINGW32_TARGET \
@@ -42,24 +39,14 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs$MINGW32_ROOT
 	cp -a $install/usr/lib $fs$MINGW32_ROOT
 	chown -R root.root $fs
 }
 
-# Rules to setup after installation
-post_install()
-{
+post_install() {
 	MINGW32_ID="i586-pc-mingw32"
 	# Archives get stripped during packaging; need to run ranlib
 	chroot "$1/" find "/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \;
 }
-
-# Rules to clean the package
-clean_wok()
-{
-	rm -r $SOURCE-$VERSION-build
-}
diff -r ad29ddfee1c9 -r d5aab818505e minicom/receipt
--- a/minicom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/minicom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.7.1"
 CATEGORY="development"
 SHORT_DESC="Menu driven communications program"
-MAINTAINER="f.lombard@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://salsa.debian.org/minicom-team/minicom"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://salsa.debian.org/minicom-team/minicom/-/archive/master/v$VERSION.tar.bz2"
 
-BUILD_DEPENDS="automake gettext ncurses-dev"
+BUILD_DEPENDS="automake gettext-dev ncurses-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e minidlna/receipt
--- a/minidlna/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/minidlna/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,12 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ffmpeg-dev jpeg-dev sqlite3-dev libexif-dev libid3tag-dev \
-libogg-dev libvorbis-dev flac-dev gettext"
+libogg-dev libvorbis-dev flac-dev gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/minidlna.conf $install/etc/minidlna.conf
 }
diff -r ad29ddfee1c9 -r d5aab818505e minised/receipt
--- a/minised/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/minised/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="minised"
 VERSION="1.14"
 CATEGORY="base-system"
-SHORT_DESC="A smaller, cheaper, faster SED implementation."
+SHORT_DESC="A smaller, cheaper, faster SED implementation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.exactcode.de/site/open_source/minised/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.exactcode.de/site/open_source/minised/"
 WGET_URL="http://dl.exactcode.de/oss/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e minitube/receipt
--- a/minitube/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/minitube/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,23 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="minitube"
 VERSION="2.4-1"
 CATEGORY="multimedia"
-SHORT_DESC="Minitube is a native YouTube client"
+SHORT_DESC="Native YouTube client"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://flavio.tordini.org/minitube"
+
 #TARBALL="$PACKAGE-$VERSION.tar.gz"
 #deb# TARBALL="$PACKAGE.deb"
 #deb# WGET_URL="http://flavio.tordini.org/files/minitube/minitube.deb"
-TARBALL="${PACKAGE}-${VERSION}.mga5.i586.rpm"
+TARBALL="$PACKAGE-$VERSION.mga5.i586.rpm"
 WGET_URL="http://mirrors.kernel.org/mageia/distrib/5/i586/media/core/release/$TARBALL"
 
-DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtScript libQtSql \
- libQtXml libQtOpenGL phonon phonon-vlc libvlc libgnutls cacerts"
 # BUILD_DEPENDS="Qt4-dev qmake qt4-phonon"
 
-# Rules to configure and make the package.
 #deb#compile_rules()
 #deb#{
 	# put default icons to resources (instead of to hicolor icon theme)
@@ -27,14 +25,13 @@
 
 #	mkdir build; cd build
 #	qmake ../minitube.pro &&
-#	make && make INSTALL_ROOT=$install install
+#	make &&
+#	make INSTALL_ROOT=$install install
 #deb#	busybox ar vx $src/$TARBALL
 #deb#	tar xf data.tar*
 #deb#}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 #	cp -a $install/* $fs
 	mkdir -p	$fs/usr
 	cp -a $src/*	$fs/usr
@@ -45,4 +42,6 @@
 	for size in 64 128 256 512 scalable; do
 		rm -rf $fs/usr/share/icons/hicolor/${size}*
 	done
+	DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtScript libQtSql \
+	libQtXml libQtOpenGL phonon phonon-vlc libvlc libgnutls cacerts"
 }
diff -r ad29ddfee1c9 -r d5aab818505e miniupnpc/receipt
--- a/miniupnpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/miniupnpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,39 +3,29 @@
 PACKAGE="miniupnpc"
 VERSION="2.0.20171212"
 CATEGORY="network"
-SHORT_DESC="UPnP Internet Gateway Device (IGD) specifications client."
+SHORT_DESC="UPnP Internet Gateway Device (IGD) specifications client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://miniupnp.tuxfamily.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://miniupnp.tuxfamily.org/"
 WGET_URL="$WEB_SITE/files/$TARBALL"
-TAGS="upnp"
 
-BUILD_DEPENDS=""
-SPLIT="miniupnpc-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	miniupnpc)
-		DEPENDS=""
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		;;
-	miniupnpc-dev)
-		DEPENDS="miniupnpc"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/lib/*a $fs/usr/lib
-		;;
+		miniupnpc)
+			copy @std
+			TAGS="upnp"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e miniupnpd/receipt
--- a/miniupnpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/miniupnpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,32 @@
 PACKAGE="miniupnpd"
 VERSION="2.0.20171212"
 CATEGORY="network"
-SHORT_DESC="UPnP Internet Gateway Device (IGD) specifications server."
+SHORT_DESC="UPnP Internet Gateway Device (IGD) specifications server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://miniupnp.tuxfamily.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://miniupnp.tuxfamily.org/"
 WGET_URL="$WEB_SITE/files/$TARBALL"
-TAGS="upnp"
 
-DEPENDS="iptables openssl"
 BUILD_DEPENDS="iptables-dev libnfnetlink-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share/man/man8
-	sed -i 's,^EXTIF=eth0,EXTIF=$(route -n | awk ''/^0.0.0.0/ { print $8 }''),' netfilter/iptables_init.sh
+compile_rules() {
+	mkdir -p $install/usr/share/man/man8
+	sed -i 's,^EXTIF=eth0,EXTIF=$(route -n | awk ''/^0.0.0.0/ { print $8 }''),' \
+		netfilter/iptables_init.sh
+
 	make -f Makefile.linux config.h
 	KERNEL_VERSION=$(grep -s ^VERSION= $WOK/linux/receipt | cut -d '"' -f 2)
 	sed -i "s,OS_VERSION.*,OS_VERSION \"Linux/$KERNEL_VERSION\"," config.h
 	make CFLAGS="-DIPTABLES_143" -f Makefile.linux &&
-	make -f Makefile.linux DESTDIR=$DESTDIR install
+	make -f Makefile.linux DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="iptables openssl"
+	TAGS="upnp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mirage/receipt
--- a/mirage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mirage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mirage"
 VERSION="0.9.5.2"
 CATEGORY="graphics"
-SHORT_DESC="A fast and simple image viewer."
+SHORT_DESC="A fast and simple image viewer"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://mirageiv.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://mirageiv.sourceforge.net/"
 WGET_URL="http://download.berlios.de/mirageiv/$TARBALL" # FIXME
 
-DEPENDS="python python-pygtk xorg-libX11 xorg-libXau xorg-libXdmcp libffi"
-BUILD_DEPENDS="python python-dev xorg-xorgproto xorg-libX11-dev gettext"
+BUILD_DEPENDS="python python-dev xorg-xorgproto xorg-libX11-dev gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python python-pygtk xorg-libX11 xorg-libXau xorg-libXdmcp libffi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e miro/receipt
--- a/miro/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/miro/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="6.0"
 CATEGORY="multimedia"
 SHORT_DESC="The free and open source internet TV platform"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.getmiro.com"
+WEB_SITE="http://www.getmiro.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.osuosl.org/pub/pculture.org/$PACKAGE/src/$TARBALL"
@@ -19,8 +19,8 @@
 
 compile_rules() {
 	cd $src/linux
-	python setup.py install --root=$DESTDIR
-	sed -i "s|./miro.real|/usr/bin/miro.real|g" $DESTDIR/usr/bin/miro
+	python -B setup.py install --root=$install &&
+	sed -i "s|./miro.real|/usr/bin/miro.real|g" $install/usr/bin/miro
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mirror-tools/receipt
--- a/mirror-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mirror-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="mirror-tools"
 VERSION="306"
 CATEGORY="misc"
-SHORT_DESC="Mirrors toolset."
+SHORT_DESC="Mirrors toolset"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
@@ -12,15 +12,13 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="rrdtool rgzip"
 SIBLINGS="qemu-box slitaz-dev-tools slitaz-mercurial-style tazchroot tazdev \
 tazwikiss yaff"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $src/$PACKAGE/rootfs/* $fs
 	mkdir -p $fs/var/www
 	cp -a $src/$PACKAGE/slitaz $fs/var/www
 	chown -R 80.80 $fs/var/www
+	DEPENDS="rrdtool rgzip"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mist-icon-theme/receipt
--- a/mist-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mist-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,29 +7,24 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL"
 WEB_SITE="http://xfce-look.org/content/show.php/Mist?content=148172"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://dl.dropbox.com/u/64670113/Mist.tar.bz2"
 
-DEPENDS="gnome-icon-theme"
-BUILD_DEPENDS="wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	iconpath=usr/share/icons/mist
 	mkdir -p $fs/$iconpath
 	cp -a $src/* $fs/$iconpath
 	rm -rf $fs/$iconpath/256x256
+	DEPENDS="gnome-icon-theme"
 }
 
 qtfix="usr/share/icons/hicolor/index.theme"
 
-post_install()
-{
+post_install() {
 	sed '/Inherits=/s|=.*$|=mist|' -i "$1/$qtfix"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed '/Inherits=/s|=.*$|=SliTaz|' -i "$1/$qtfix"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mitter/receipt
--- a/mitter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mitter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mitter"
 VERSION="0.4.5"
 CATEGORY="network"
-SHORT_DESC="Mitter is a client for Twitter."
+SHORT_DESC="Twitter client"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://web.archive.org/web/20120808040147/http://code.google.com/p/mitter"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://web.archive.org/web/20120808040147/http://code.google.com/p/mitter"
 WGET_URL="http://mitter.googlecode.com/files/$TARBALL" # FIXME
-DEPENDS="python python-pygtk python-simplejson"
+
 BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $stuff/mitter.desktop $fs/usr/share/applications
 	cp -a $install/usr $fs
+	DEPENDS="python python-pygtk python-simplejson"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mixxx/receipt
--- a/mixxx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mixxx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,30 +4,27 @@
 VERSION="1.10.1"
 CATEGORY="multimedia"
 SHORT_DESC="Digital DJ mixing software"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.mixxx.org/"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WEB_SITE="http://www.mixxx.org/"
 WGET_URL="http://downloads.mixxx.org/$PACKAGE-$VERSION/$TARBALL"
 
-DEPENDS="libsndfile libogg libid3tag libmad libvorbis taglib libshout \
-portaudio portmidi libQtOpenGL libQtWebkit libQt3Support libQtScript \
-libQtSvg libQtDBus libQtPlugins qt4-phonon"
-BUILD_DEPENDS="libsndfile-dev libogg-dev libid3tag-dev libmad-dev \
-libvorbis-dev taglib-dev libshout-dev portaudio-dev qt4-phonon \
-Qt4-dev alsa-lib-dev jack-dev mesa-dev scons \
-flac-dev portmidi-dev"
+BUILD_DEPENDS="libsndfile-dev libogg-dev libid3tag-dev libmad-dev libvorbis-dev \
+taglib-dev libshout-dev portaudio-dev qt4-phonon Qt4-dev alsa-lib-dev jack-dev \
+mesa-dev scons flac-dev portmidi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	scons qtdir=/usr/lib/qt prefix=/usr install_root=$DESTDIR/usr | sed s/ERROR/error/
-	scons qtdir=/usr/lib/qt prefix=/usr install_root=$DESTDIR/usr install | sed s/ERROR/error/
+compile_rules() {
+	scons qtdir=/usr/lib/qt prefix=/usr install_root=$install/usr \
+	| sed s/ERROR/error/
+	scons qtdir=/usr/lib/qt prefix=/usr install_root=$install/usr install \
+	| sed s/ERROR/error/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="libsndfile libogg libid3tag libmad libvorbis taglib libshout \
+	portaudio portmidi libQtOpenGL libQtWebkit libQt3Support libQtScript \
+	libQtSvg libQtDBus libQtPlugins qt4-phonon"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mjpegtools/receipt
--- a/mjpegtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mjpegtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.0"
 CATEGORY="multimedia"
 SHORT_DESC="MPEG manipulation tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://mjpeg.sourceforge.net/"
 
@@ -15,7 +15,7 @@
 xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes \
 xorg-libXinerama xorg-libXrandr xorg-libXrender xorg-libXdamage gcc-lib-base \
 libdv-dev libsdl-gfx-dev jpeg-dev"
-SPLIT="mjpegtools-dev"
+SPLIT="$PACKAGE-dev"
 
 BUILD_DEPENDS="libjpeg-turbo-dev libpng16-dev libdv-dev xorg-libX11-dev \
 xorg-libICE-dev xorg-libXxf86dga-dev gtk2-dev libsdl-dev"
diff -r ad29ddfee1c9 -r d5aab818505e mk-livestatus/receipt
--- a/mk-livestatus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mk-livestatus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mk-livestatus"
 VERSION="1.2.2"
 CATEGORY="system-tools"
 SHORT_DESC="Nagios status broker module"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://mathias-kettner.de/checkmk_livestatus.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://mathias-kettner.de/checkmk_livestatus.html"
 WGET_URL="https://mathias-kettner.de/download/$TARBALL"
 
-DEPENDS="nagios"
 BUILD_DEPENDS="nagios-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure &&
-	make && make -j1 install
+	make &&
+	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="nagios"
 }
 
-post_install()
-{
+post_install() {
 	# Modify nagios config
 	cat >> "$1/etc/nagios/nagios.cfg" <<EOT
 broker_module=/usr/lib/mk-livestatus/livestatus.o /var/lib/nagios/rw/live
diff -r ad29ddfee1c9 -r d5aab818505e mktorrent/receipt
--- a/mktorrent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mktorrent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mktorrent"
 VERSION="1.0"
 CATEGORY="network"
-SHORT_DESC="Command line utility to create BitTorrent metainfo files."
+SHORT_DESC="Command line utility to create BitTorrent metainfo files"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/Rudde/mktorrent/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/Rudde/mktorrent/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" # FIXME
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/local/bin $fs/usr
 }
 
-testsuite()
-{
+testsuite() {
 	readelf -h $install/usr/local/bin/$PACKAGE
 }
diff -r ad29ddfee1c9 -r d5aab818505e mlt-python-bindings/receipt
--- a/mlt-python-bindings/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mlt-python-bindings/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,28 @@
 VERSION="0.7.2"
 SOURCE="mlt"
 CATEGORY="multimedia"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-SHORT_DESC="python bindings for MLT multimedia framework"
-WEB_SITE="https://www.mltframework.org"
+SHORT_DESC="Python bindings for MLT multimedia framework"
+WEB_SITE="https://www.mltframework.org/"
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/mlt/$TARBALL"
 
 DEPENDS="python mlt"
 BUILD_DEPENDS="swig python-dev mlt"
 
-# Rules to configure and make the package.
-compile_rules() 
-{
+compile_rules() {
 	cd $src/src/swig/python
 	./build
+
 	PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
-	mkdir -p $DESTDIR/usr/lib/python${PYTHON_VERSION}
-	cp -a $src/src/swig/python/mlt.py $DESTDIR/usr/lib/python${PYTHON_VERSION}
-	cp -a $src/src/swig/python/_mlt.so $DESTDIR/usr/lib/python${PYTHON_VERSION}
-	cp -a $src/src/swig/python/mlt_wrap.o  $DESTDIR/usr/lib/python${PYTHON_VERSION}
- 
+	mkdir -p $install/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/mlt.py $install/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/_mlt.so $install/usr/lib/python${PYTHON_VERSION}
+	cp -a $src/src/swig/python/mlt_wrap.o  $install/usr/lib/python${PYTHON_VERSION}
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/lib $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e mlt/receipt
--- a/mlt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mlt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="mlt"
 VERSION="0.7.2"
 CATEGORY="multimedia"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 SHORT_DESC="An open source multimedia framework"
 WEB_SITE="https://www.mltframework.org/"
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="mlt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mlvpn/receipt
--- a/mlvpn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mlvpn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,19 +12,16 @@
 
 BUILD_DEPENDS="autoconf automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e mm-common/receipt
--- a/mm-common/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mm-common/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mm-common"
 VERSION="0.9.4"
 CATEGORY="development"
 SHORT_DESC="Common build files of the C++ bindings"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://gtkmm.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://gtkmm.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr && make && make install
+compile_rules() {
+	./configure --prefix=/usr &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e mmv/receipt
--- a/mmv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mmv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,16 +7,12 @@
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL"
 WEB_SITE="https://packages.debian.org/sid/mmv"
+
 TARBALL="${PACKAGE}_${VERSION%-*}.orig.tar.gz"
 WGET_URL="http://http.debian.net/debian/pool/main/m/mmv/$TARBALL"
 EXTRA_SOURCE_FILES="${PACKAGE}_$VERSION.debian.tar.gz"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	wget -O "$SRC/${PACKAGE}_$VERSION.debian.tar.gz" \
 		http://http.debian.net/debian/pool/main/m/mmv/${PACKAGE}_$VERSION.debian.tar.gz
 	tar -xzf $SRC/${PACKAGE}_$VERSION.debian.tar.gz debian/patches/
@@ -25,16 +21,17 @@
 	done
 	sed -i '/^CFLAGS/s/=-O2/+=/; /^LDFLAGS/s/-N//' Makefile
 	mkdir -p $install/usr/bin $install/usr/share/man/man1
-	make && make install
+
+	make &&
+	make install || return 1
+
 	cd $install/usr/bin
 	ln -s mmv mcp
 	ln -s mmv mad
 	ln -s mmv mln
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -r $fs/usr/share
 }
diff -r ad29ddfee1c9 -r d5aab818505e mmx-emu/receipt
--- a/mmx-emu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mmx-emu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="mmx-emu"
 VERSION="0.6"
 CATEGORY="system-tools"
-SHORT_DESC="MMX/EMMX/3Dnow! emulator."
+SHORT_DESC="MMX/EMMX/3Dnow! emulator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -11,26 +11,23 @@
 WGET_URL="${WEB_SITE}$TARBALL"
 TAGS="emulator MMX 3Dnow"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|asm/sigcontext|signal|' include/*.h
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $src/libmmxemu.so $fs/usr/lib
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
-	cat << EOT
-To make it work on the program "program", just type:
+post_install() {
+	[ -n "quiet" ] || cat <<EOT
 
-LD_PRELOAD=/usr/lib/libmmxemu.so  program
+	.------------------------------------------------------.
+	| To make it work on the program "program", just type: |
+	|                                                      |
+	| LD_PRELOAD=/usr/lib/libmmxemu.so  program            |
+	'------------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e mobile-broadband-provider-info/receipt
--- a/mobile-broadband-provider-info/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mobile-broadband-provider-info/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="20120614"
 CATEGORY="network"
 SHORT_DESC="Service Provider Database"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="cc-pd"
-WEB_SITE="http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders"
+WEB_SITE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://ftp.acc.umu.se/pub/GNOME/sources/$PACKAGE/$VERSION/$TARBALL"
 
-SPLIT="mobile-broadband-provider-info-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e moc/receipt
--- a/moc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/moc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://ftp.daper.net/pub/soft/moc/stable/$TARBALL"
 
-BUILD_DEPENDS_arm="alsa-lib-dev libid3tag-dev libogg-dev libvorbis-dev"
 BUILD_DEPENDS="libvorbis-dev libogg-dev libmad-dev libid3tag-dev flac-dev db-dev \
 curl-dev libsamplerate-dev alsa-lib-dev ncurses-dev libsndfile-dev libsamplerate \
 libtool libmagic-dev"
@@ -22,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e modem-manager/receipt
--- a/modem-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/modem-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="intltool libgudev-dev gobject-introspection-dev vala polkit-dev \
 libmbim-dev libqmi-dev"
-SPLIT="modem-manager-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e modsecurity-apache/receipt
--- a/modsecurity-apache/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/modsecurity-apache/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mondo/receipt
--- a/mondo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mondo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.2"
 CATEGORY="system-tools"
 SHORT_DESC="GPL disaster recovery solution"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mondorescue.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e mongodb/receipt
--- a/mongodb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mongodb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mongodb"
 VERSION="2.0.6"
 CATEGORY="system-tools"
 SHORT_DESC="MongoDB bridges the gap between key-value stores and traditional RDBMS systems"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3 Apache"
-TARBALL="$PACKAGE-src-r${VERSION}.tar.gz"
 WEB_SITE="http://www.mongodb.org/"
+
+TARBALL="$PACKAGE-src-r$VERSION.tar.gz"
 WGET_URL="http://downloads.mongodb.org/src/$TARBALL"
 
-DEPENDS="pcre boost-filesystem boost-thread boost-program-options \
-spidermonkey"
-BUILD_DEPENDS="$DEPENDS scons2 pcre-dev boost-dev boost-filesystem \
+BUILD_DEPENDS="pcre boost-filesystem boost-thread boost-program-options \
+spidermonkey scons2 pcre-dev boost-dev boost-filesystem \
 boost-thread boost-program-options spidermonkey-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-
+compile_rules() {
 	sed -i 's/native_directory_//' db*/*.cpp
 	sed -i 's/native_file_//' db*/*.cpp shell/shell_utils.cpp
 	sed -i 's/leaf()/leaf().string()/' */*.cpp
 	sed -i 's|.*default_name_check|// &|' tools/tool.cpp db/db.cpp
 	sed -i '/FILESYSTEM_VERSION/d' pch.h
 	grep -rl TIME_UTC util | xargs sed -i 's/TIME_UTC/TIME_UTC_/'
-	
+
 	scons all &&
-	scons --prefix=$DESTDIR/usr install
+	scons --prefix=$install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="pcre boost-filesystem boost-thread boost-program-options \
+	spidermonkey"
 }
diff -r ad29ddfee1c9 -r d5aab818505e monkey/receipt
--- a/monkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/monkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.5.6"
 CATEGORY="network"
 SHORT_DESC="Lightweight HTTP server"
-MAINTAINER="necrophcodr@necrophcodr.me"
+MAINTAINER="devel@slitaz.org"
 LICENSE="APL2"
-WEB_SITE="http://monkey-project.com"
+WEB_SITE="http://monkey-project.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/releases/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="findutils"
-SPLIT="monkey-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# site script isn't used
diff -r ad29ddfee1c9 -r d5aab818505e mono/receipt
--- a/mono/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mono/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="5.12.0.226"
 CATEGORY="development"
 SHORT_DESC="Cross platform, open source .NET framework"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.mono-project.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://download.mono-project.com/sources/mono/$TARBALL"
 
-BUILD_DEPENDS="zlib-dev gettext libtool xorg-libX11-dev cmake libgdiplus-dev"
-SPLIT="mono-doc mono mono-dev"
+BUILD_DEPENDS="zlib-dev gettext-dev libtool xorg-libX11-dev cmake libgdiplus-dev"
+SPLIT="$PACKAGE-doc $PACKAGE $PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 # Build documentation at https://www.mono-project.com/docs/compiling-mono/
@@ -33,7 +33,11 @@
 
 	cd $src/mcs/jay
 	make -j1 &&
-	make DESTDIR=$DESTDIR prefix=/usr INSTALL=../../install-sh install || return 1
+	make \
+		DESTDIR=$install \
+		prefix=/usr \
+		INSTALL=../../install-sh \
+		install || return 1
 
 	chmod +x $install/usr/bin/*.py
 }
diff -r ad29ddfee1c9 -r d5aab818505e moonshiner/receipt
--- a/moonshiner/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/moonshiner/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,23 @@
 PACKAGE="moonshiner"
 VERSION="1.0"
 CATEGORY="office"
-SHORT_DESC="GUI for Ghostscript's PostScript-to-PDF converter."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GUI for Ghostscript's PostScript-to-PDF converter"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://moonshiner.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://moonshiner.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python python-pygtk ghostscript"
 BUILD_DEPENDS="python-dev python-pygtk-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	DEPENDS="python python-pygtk ghostscript"
 }
diff -r ad29ddfee1c9 -r d5aab818505e moosefs/receipt
--- a/moosefs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/moosefs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e moserial/receipt
--- a/moserial/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/moserial/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.32.1"
 CATEGORY="utilities"
 SHORT_DESC="A GTK-based serial console"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="https://live.gnome.org/moserial"
+WEB_SITE="https://wiki.gnome.org/moserial"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mosh/receipt
--- a/mosh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mosh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,9 +17,10 @@
 compile_rules() {
 	./autogen.sh
 	./configure \
-		--enable-compile-warnings=error &&
+		--enable-compile-warnings=error \
+		&&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e motion/receipt
--- a/motion/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/motion/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="motion"
 VERSION="3.2.12"
 CATEGORY="multimedia"
-SHORT_DESC="Motion is a program that monitors the video signal from cameras"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Monitor the video signal from cameras"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.lavrsen.dk/foswiki/bin/view/Motion"
 
diff -r ad29ddfee1c9 -r d5aab818505e mountlo/receipt
--- a/mountlo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mountlo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="mountlo"
 VERSION="0.6"
 CATEGORY="system-tools"
-SHORT_DESC="loopback filesystem mount implemented with FUSE"
+SHORT_DESC="Loopback filesystem mount implemented with FUSE"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/libfuse"
@@ -14,13 +14,13 @@
 
 compile_rules() {
 	[ -f $SRC/$PACKAGE-i386-$VERSION.tar.gz ] ||
-		wget $SF_MIRROR/fuse/$PACKAGE/$VERSION/$PACKAGE-i386-$VERSION.tar.gz \
+		wget $SF_MIRROR/fuse/$PACKAGE-i386-$VERSION.tar.gz \
 			-P $SRC
 	if [ ! -f mountlo-$VERSION/mountlo ]; then
 		tar xzf $SRC/$PACKAGE-i386-$VERSION.tar.gz
 	fi
 
-	install -Dm 755 $src/mountlo-$VERSION/mountlo $install/usr/bin/mountlo
+	install -Dm755 mountlo-$VERSION/mountlo $install/usr/bin/mountlo
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mousepad/receipt
--- a/mousepad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mousepad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.0"
 CATEGORY="x-window"
 SHORT_DESC="Xfce text editor"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/mousepad.html"
diff -r ad29ddfee1c9 -r d5aab818505e mozplugger/receipt
--- a/mozplugger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mozplugger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.14.3"
 CATEGORY="multimedia"
 SHORT_DESC="A Mozilla & Firefox multimedia plugin"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://mozplugger.mozdev.org"
+WEB_SITE="http://mozplugger.mozdev.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/files/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e mp/receipt
--- a/mp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,30 +6,28 @@
 SHORT_DESC="A text editor for programmers"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://triptico.com/software/mp.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://triptico.com/software/mp.html"
 WGET_URL="http://triptico.com/download/mp/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="gtk2"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/bin
+compile_rules() {
+	mkdir -p $install/usr/bin
 	# sed -i 's/TRY_DRIVERS()/(0)/' mp_core.c
 	./config.sh \
 		--prefix=/usr \
 		--without-qt4 \
 		$CONFIGURE_ARGS
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/mp-5 $fs/usr/share
+	DEPENDS="gtk2"
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mp3gain/receipt
--- a/mp3gain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mp3gain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/mp3gain $install/usr/bin/mp3gain
+	install -Dm755 mp3gain $install/usr/bin/mp3gain
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mp3info/receipt
--- a/mp3info/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mp3info/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,24 @@
 PACKAGE="mp3info"
 VERSION="0.8.5a"
 CATEGORY="multimedia"
-SHORT_DESC="Little utility used to read and modify the ID3 tags of MP3 files."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Little utility used to read and modify the ID3 tags of MP3 files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ibiblio.org/mp3info/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://ibiblio.org/mp3info/"
 WGET_URL="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/$TARBALL"
 
-DEPENDS="ncurses gtk2"
 BUILD_DEPENDS="ncurses-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
+compile_rules() {
+	make || return 1
+
+	install -Dm755 mp3info  $install/usr/bin/mp3info
+	install -Dm755 gmp3info $install/usr/bin/gmp3info
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/mp3info $fs/usr/bin
-	cp -a $src/gmp3info $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mp3val/receipt
--- a/mp3val/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mp3val/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 	mv Makefile.linux Makefile
 	make &&
 	mkdir -p $install/usr/bin &&
-	install -Dm 755 $src/mp3val $install/usr/bin/mp3val
+	install -Dm755 $src/mp3val $install/usr/bin/mp3val
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mpc-library/receipt
--- a/mpc-library/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpc-library/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.0"
 CATEGORY="development"
 SHORT_DESC="MPC library: complex numbers arithmetic"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.multiprecision.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/mpc.html"
@@ -14,7 +14,7 @@
 WGET_URL="$GNU_MIRROR/mpc/$TARBALL"
 
 BUILD_DEPENDS="mpfr-dev gmp-dev texinfo"
-SPLIT="mpc-library-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mpc/receipt
--- a/mpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,24 @@
 PACKAGE="mpc"
 VERSION="0.25"
 CATEGORY="multimedia"
-SHORT_DESC="A command line tool to interface MPD."
+SHORT_DESC="A command line tool to interface MPD"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.musicpd.org/clients/mpc/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://www.musicpd.org/clients/mpc/"
 WGET_URL="https://www.musicpd.org/download/mpc/0/$TARBALL"
 
-DEPENDS="mpd libmpdclient"
 BUILD_DEPENDS="libmpdclient-dev"
 
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/mpc
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="mpd libmpdclient"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mpd/receipt
--- a/mpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mpd"
 VERSION="0.17.2"
 CATEGORY="multimedia"
-SHORT_DESC="Music Player Daemon (MPD)."
+SHORT_DESC="Music Player Daemon (MPD)"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.musicpd.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.musicpd.org/"
 WGET_URL="$SF_MIRROR/musicpd/$TARBALL"
 
-DEPENDS="libid3tag libmad libogg libvorbis libsamplerate flac alsa-lib \
-audiofile faad2 lame sqlite3 libcurl glib openssl libwrap"
 BUILD_DEPENDS="alsa-lib-dev zlib-dev libid3tag-dev libsamplerate-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)
-		DEPENDS="alsa-lib zlib glib lame libmad libsamplerate libwrap \
-libogg libvorbis" ;;
-esac
+compile_rules() {
+	sed -i 's/<stdbool.h>/&\n#include <stdio.h>/' src/decoder_api.h
 
-# Handle cross comilation
-case "$ARCH" in
-	arm) 
-		BUILD_DEPENDS="alsa-lib-dev zlib-dev glib-dev lame-dev \
-libmad-dev libsamplerate-dev libwrap-dev libogg-dev libvorbis-dev" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's/<stdbool.h>/&\n#include <stdio.h>/' src/decoder_api.h
 	./configure \
 		--disable-jack \
 		--disable-ao \
@@ -44,20 +28,20 @@
 		--disable-systemd-daemon \
 		--with-zeroconf=no \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/sbin $fs/etc
 	cp -a $install/usr/bin/mpd $fs/usr/sbin
 	cp $install/usr/share/doc/mpd/mpdconf.example $fs/etc/mpd.conf
 	cp -a $stuff/* $fs
+	DEPENDS="libid3tag libmad libogg libvorbis libsamplerate flac alsa-lib \
+	audiofile faad2 lame sqlite3 libcurl glib openssl libwrap"
 }
 
-post_install()
-{
+post_install() {
 	newline
 	# Drop root priviledges and enable pid file
 	action 'Enabling mpd.conf...'
diff -r ad29ddfee1c9 -r d5aab818505e mpfr/receipt
--- a/mpfr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpfr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.0.1"
 CATEGORY="libdevel"
 SHORT_DESC="Multiple-precision floating-point computations"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.mpfr.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/svn/chapter06/mpfr.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.mpfr.org/$PACKAGE-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="gmp-dev texinfo gcc-lib-math"
-SPLIT="mpfr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 #--with-gmp-lib=/cross/$ARCH/sysroot/usr/lib
@@ -31,10 +31,7 @@
 }
 
 testsuite() {
-	case "$ARCH" in
-		arm*) ;;
-		*) make check;;
-	esac
+	make check
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mpfr4/receipt
--- a/mpfr4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpfr4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="3.1.5"
 CATEGORY="libdevel"
 SHORT_DESC="Multiple-precision floating-point computations"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.mpfr.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/mpfr.html"
@@ -29,10 +29,7 @@
 }
 
 testsuite() {
-	case "$ARCH" in
-		arm*) ;;
-		*) make check;;
-	esac
+	make check
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mpg123/receipt
--- a/mpg123/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpg123/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.19.0"
 CATEGORY="multimedia"
 SHORT_DESC="Command line audio player and streamer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.mpg123.de/"
 
@@ -12,12 +12,11 @@
 WGET_URL="http://www.mpg123.de/download/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev audiofile-dev"
-SPLIT="mpg123-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case "$ARCH" in
-		i486) ARCH_ARGS="--with-cpu=i486" ;;
-		arm*) ARCH_ARGS="--with-cpu=arm_nofpu" ;;
+		i486) ARCH_ARGS="--with-cpu=i486";;
 	esac
 
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mpl123/receipt
--- a/mpl123/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpl123/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,20 @@
 PACKAGE="mpl123"
 VERSION="1.1.0"
 CATEGORY="multimedia"
-SHORT_DESC="Light weight Ncurses frontend to mpg123"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight Ncurses frontend to mpg123"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/pankso/mpl123"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/pankso/mpl123"
-WGET_URL="https://github.com/pankso/mpl123/archive/v${VERSION}.tar.gz"
+WGET_URL="https://github.com/pankso/mpl123/archive/v$VERSION.tar.gz"
 
-DEPENDS="dialog mpg123"
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make DESTDIR=${DESTDIR} install
+compile_rules() {
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
-	cp -a ${install}/* ${fs}
+	cp -a $install/* $fs
+	DEPENDS="dialog mpg123"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mplayer-cli/receipt
--- a/mplayer-cli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayer-cli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mplayer-cli"
 VERSION="1.3.0"
@@ -9,28 +9,18 @@
 WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
 REPOLOGY="mplayer"
 
-SOURCE="MPlayer"
-TARBALL="$SOURCE-$VERSION.tar.xz"
+TARBALL="MPlayer-$VERSION.tar.xz"
 WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/$TARBALL"
 
-# CONFIG_FILES="/etc/mplayer" # use ~/ instead
-
-DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng16 \
-libsdl ncurses xorg-libX11 xorg-libXext xorg-libXv xorg-libXxf86vm zlib"
 BUILD_DEPENDS="ncurses-dev xorg-libXv-dev alsa-lib-dev xorg-libXdamage-dev \
 giflib-dev xorg-libXxf86vm-dev xorg-xorgproto freetype-dev fontconfig-dev \
 zlib-dev yasm libmad-dev libsdl-dev gnutls-dev"
-PROVIDE="mplayer"
 
-# Handle cross compilation. Host coreutils-file-* are used
-case "$ARCH" in
-	i?86) ARCH_ARGS="--target=i486-linux --enable-runtime-cpudetection" ;;
-	arm*) ARCH_ARGS="--target=arm-linux --enable-cross-compile" ;;
-esac
+compile_rules() {
+	case "$ARCH" in
+		i?86) ARCH_ARGS="--target=i486-linux --enable-runtime-cpudetection";;
+	esac
 
-# Rules to configure and make the package.
-compile_rules()
-{
 	./configure \
 		--prefix=/usr \
 		--confdir=/etc/mplayer \
@@ -47,16 +37,16 @@
 		--disable-smb \
 		--disable-openal \
 		--disable-faac \
-		--disable-speex --disable-esd \
-		--disable-lirc --disable-lircc \
-		${ARCH_ARGS} &&
+		--disable-speex \
+		--disable-esd \
+		--disable-lirc \
+		--disable-lircc \
+		$ARCH_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install | sed '/install: strip: .*/'d
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/mplayer
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/etc $fs
@@ -71,4 +61,7 @@
 	cp $src/etc/*menu.conf $fs/etc/mplayer
 	# Font
 	cd $fs/usr/share/mplayer && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
+	DEPENDS="alsa-lib bzlib fontconfig freetype giflib libgnutls libmad libpng16 \
+	libsdl ncurses xorg-libX11 xorg-libXext xorg-libXv xorg-libXxf86vm zlib"
+	PROVIDE="mplayer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mplayer-codecs/receipt
--- a/mplayer-codecs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayer-codecs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,19 @@
 PACKAGE="mplayer-codecs"
 VERSION="20110131"
 CATEGORY="multimedia"
-SHORT_DESC="All MPlayer codecs for SliTaz."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="All MPlayer codecs for SliTaz"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www1.mplayerhq.hu/MPlayer/releases/codecs/all-$VERSION.tar.bz2"
 
-DEPENDS="mplayer"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/mplayer/codecs
 	cp -a $src/* $fs/usr/lib/mplayer/codecs
 	# Remove codec depending on libstdc++.so.5
 	rm -f $fs/usr/lib/mplayer/codecs/drvc.so
 	rm -f $fs/usr/lib/mplayer/codecs/cook.so
+	DEPENDS="mplayer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mplayer-skins/receipt
--- a/mplayer-skins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayer-skins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,15 @@
 PACKAGE="mplayer-skins"
 VERSION="1.1"
 CATEGORY="multimedia"
-SHORT_DESC="MPlayer skin selection for SliTaz."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="MPlayer skin selection for SliTaz"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
 
-DEPENDS="mplayer"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/mplayer/skins
-	for i in $stuff/*.tar.bz2
-	do
+	for i in $stuff/*.tar.bz2; do
 		tar xjf $i -C $fs/usr/share/mplayer/skins
 	done
+	DEPENDS="mplayer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mplayer-svn/receipt
--- a/mplayer-svn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayer-svn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,16 @@
 VERSION="32666"
 CATEGORY="multimedia"
 SHORT_DESC="Mplayer SVN version"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
-PROVIDE="mplayer"
-TAGS="player movie audio video"
+
+BRANCH="$VERSION"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk"
-BRANCH="$VERSION"
-SUGGESTED="v4l-utils"
 
-DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora lame giflib \
-xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
 BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-III-dev libmad-dev xorg-libXv-dev libtheora-dev subversion yasm"
 
-# Rules to configure and make the package.
-#
 # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg
 # on svn version is always challenging. Tip: Try to use the same day ffmpeg and
 # mplayer versions (use: svn info), very likely to succeed.
@@ -29,40 +23,71 @@
 #	--disable-libavutil_a --disable-libavcodec_a --disable-libavformat_a
 #	--disable-libpostproc_a --disable-libswscale_a --disable-libavcodec_mpegaudio_hp
 
-compile_rules()
-{
+compile_rules() {
 	sed -i	-e 's/info->color_type/png_get_color_type(png, info)/' \
 		-e 's/pngstr->io_ptr/png_get_io_ptr(pngstr)/' libmpcodecs/vd_mpng.c
-	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
-	sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/" configure
-	# disable unwanted features, remote control, streaming, networking, unwanted codecs, 
+#	KERNEL_VERSION=`grep  ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'`
+#	sed -i "s/uname -r/echo $KERNEL_VERSION-slitaz/" configure
+	# disable unwanted features, remote control, streaming, networking, unwanted codecs,
 	# disable video outputs, audio outputs, some advanced options
 	./configure \
 		--extra-cflags=-DHAVE_MMAP \
 		--prefix=/usr \
 		--confdir=/etc/mplayer \
 		--libdir=/usr/lib/mplayer \
-		--enable-gui --enable-freetype \
+		--enable-gui \
+		--enable-freetype \
 		--language="en de es fr" \
 		--target=i386-linux \
-		--disable-largefiles --disable-dvdnav --disable-pvr --disable-enca --disable-fribidi --disable-maemo \
-		--disable-lirc --disable-lircc \
-		--disable-nemesi --disable-vstream \
-		--disable-smb --disable-live \
-		--disable-speex --disable-mng --disable-liblzo --disable-faad --disable-faad-internal \
-		--disable-libdv --disable-faac --disable-faac-lavc  --disable-ladspa --disable-libbs2b  \
-		--disable-libdca  --disable-musepack \
-		--disable-gl --disable-vdpau --disable-directfb --disable-sdl --disable-mga  \
-		--disable-jack --disable-pulse --disable-ossaudio  --disable-openal --disable-nas --disable-esd  \
-		--disable-mmx --disable-mmxext --disable-3dnow --disable-3dnowext \
-		--disable-sse --disable-sse2 --disable-ssse3 --disable-fastmemcpy  &&		
+		--disable-largefiles \
+		--disable-dvdnav \
+		--disable-pvr \
+		--disable-enca \
+		--disable-fribidi \
+		--disable-maemo \
+		--disable-lirc \
+		--disable-lircc \
+		--disable-nemesi \
+		--disable-vstream \
+		--disable-smb \
+		--disable-live \
+		--disable-speex \
+		--disable-mng \
+		--disable-liblzo \
+		--disable-faad \
+		--disable-faad-internal \
+		--disable-libdv \
+		--disable-faac \
+		--disable-faac-lavc \
+		--disable-ladspa \
+		--disable-libbs2b \
+		--disable-libdca \
+		--disable-musepack \
+		--disable-gl \
+		--disable-vdpau \
+		--disable-directfb \
+		--disable-sdl \
+		--disable-mga \
+		--disable-jack \
+		--disable-pulse \
+		--disable-ossaudio \
+		--disable-openal \
+		--disable-nas \
+		--disable-esd \
+		--disable-mmx \
+		--disable-mmxext \
+		--disable-3dnow \
+		--disable-3dnowext \
+		--disable-sse \
+		--disable-sse2 \
+		--disable-ssse3 \
+		--disable-fastmemcpy \
+		&&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $stuff/mplayer.desktop $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
@@ -73,10 +98,17 @@
 	cp -a $install/etc $fs
 	cp $src/etc/example.conf $fs/etc/mplayer
 	# Config to use Xv by default.
-	cp stuff/mplayer.conf $fs/etc/mplayer
+	cp $stuff/mplayer.conf $fs/etc/mplayer
 	# default skin
 	tar xjf stuff/productive-1.0.tar.bz2 -C $fs/usr/share/mplayer/skins
-	cd $fs/usr/share/mplayer/skins && ln -s productive default
+	cd $fs/usr/share/mplayer/skins
+	ln -s productive default
 	# Font
-	cd .. && ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
+	cd ..
+	ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf
+	DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora lame giflib \
+	xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
+	PROVIDE="mplayer"
+	SUGGESTED="v4l-utils"
+	TAGS="player movie audio video"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mplayer/receipt
--- a/mplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.1"
 CATEGORY="multimedia"
 SHORT_DESC="The Ultimate Movie Player For Linux"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mplayerhq.hu/design7/news.html"
 
@@ -45,7 +45,7 @@
 		--disable-speex \
 		${ARCH_ARGS} &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -55,7 +55,7 @@
 			cp -a $install/usr/bin $fs/usr
 			# Mencoder goes in a splited package.
 			rm $fs/usr/bin/mencoder
-			[ -d "$install/usr/share/mplayer" ] && \
+			[ -d "$install/usr/share/mplayer" ] &&
 				cp -a $install/usr/share/mplayer $fs/usr/share
 			cp -a $install/etc $fs
 			cp $src/etc/example.conf $fs/etc/mplayer
diff -r ad29ddfee1c9 -r d5aab818505e mplayerplug-in/receipt
--- a/mplayerplug-in/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mplayerplug-in/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="3.55"
 CATEGORY="multimedia"
 SHORT_DESC="A browser plugin that uses mplayer to play videos from websites"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://mplayerplug-in.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="mplayer gtk2-dev xorg-libXpm-dev firefox-dev libIDL gettext \
+BUILD_DEPENDS="mplayer gtk2-dev xorg-libXpm-dev firefox-dev libIDL gettext-dev \
 nspr-dev"
 
 compile_rules() {
@@ -37,7 +37,7 @@
 		MOZILLA_HOME="/usr/lib/firefox-$FIREFOX_VER" \
 		GECKO_IDLDIR="/usr/share/idl/firefox-$FIREFOX_VER" &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -53,7 +53,7 @@
 post_install() {
 	FIREFOX_VER=$(. "$1/var/lib/tazpkg/installed/firefox/receipt"; echo $VERSION)
 	cd "$1/"
-	for i in usr/lib/mozilla/plugins/$PACKAGE*.so ; do
+	for i in usr/lib/mozilla/plugins/$PACKAGE*.so; do
 		ln -s "/$i" "$1/usr/lib/firefox-$FIREFOX_VER/plugins"
 	done
 }
diff -r ad29ddfee1c9 -r d5aab818505e mps-youtube/receipt
--- a/mps-youtube/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mps-youtube/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mps-youtube"
 VERSION="0.2.5"
 CATEGORY="network"
-SHORT_DESC="Terminal based YouTube player and downloader."
+SHORT_DESC="Terminal based YouTube player and downloader"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/mps-youtube/mps-youtube"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/mps-youtube/mps-youtube"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-DEPENDS="mplayer"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="mplayer"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e mpv/receipt
--- a/mpv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mpv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,34 +6,33 @@
 SHORT_DESC="Video player based on ffmpeg & mplayer2"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="http://mpv.io/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mpv.io"
 WGET_URL="https://github.com/mpv-player/mpv/archive/v$VERSION.tar.gz"
-WAFTOOL="waf-1.8.4"
 EXTRA_SOURCE_FILES="$WAFTOOL"
 
-DEPENDS="xorg-server xorg-libXv xorg-libXinerama xorg-libXScrnSaver util-linux-uuid \
-alsa-lib enca fribidi libass lua ffmpeg"
-BUILD_DEPENDS="xorg-dev xorg-libXv-dev xorg-libXScrnSaver-dev lua-dev ffmpeg-dev \
-enca-dev fribidi-dev libass-dev alsa-lib-dev"
+BUILD_DEPENDS="xorg-dev xorg-libXv-dev xorg-libXScrnSaver-dev lua-dev \
+ffmpeg-dev enca-dev fribidi-dev libass-dev alsa-lib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
+	WAFTOOL="waf-1.8.4"
+
 	[ -s $SRC/$WAFTOOL ] || wget -P $SRC \
 		http://www.freehackers.org/~tnagy/release/$WAFTOOL
 	install -m 755 $SRC/$WAFTOOL waf
+
 	./bootstrap.py
 	./waf configure \
 		--prefix=/usr \
 		--confdir=/etc/mpv
 		# --enable-libmpv-shared
 	./waf build
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="xorg-server xorg-libXv xorg-libXinerama xorg-libXScrnSaver \
+	util-linux-uuid alsa-lib enca fribidi libass lua ffmpeg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mrxvt-unicode/receipt
--- a/mrxvt-unicode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mrxvt-unicode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,22 +3,18 @@
 PACKAGE="mrxvt-unicode"
 VERSION="a551727"
 CATEGORY="utilities"
-SHORT_DESC="Terminal emulator with muli-tabs support."
+SHORT_DESC="Terminal emulator with muli-tabs support"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/tomas/mrxvt-unicode"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/tomas/mrxvt-unicode"
 WGET_URL="$WEB_SITE/archive/${TARBALL/*-/}"
-TAGS="terminal"
 
-DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM zlib \
-xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm xorg-libXrender"
 BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev xorg-libXft-dev \
-	libtool"
+libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap.sh
 	./configure \
 		--prefix=/usr \
@@ -28,11 +24,13 @@
 		--enable-menubar \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
+	zlib xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
+	xorg-libXrender"
+	TAGS="terminal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mrxvt/receipt
--- a/mrxvt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mrxvt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,22 +3,17 @@
 PACKAGE="mrxvt"
 VERSION="0.5.4"
 CATEGORY="utilities"
-SHORT_DESC="Terminal emulator with muli-tabs support."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Terminal emulator with muli-tabs support"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://materm.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://materm.sourceforge.net/"
 WGET_URL="$SF_MIRROR/materm/$TARBALL"
-TAGS="terminal"
 
-DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
-xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm xorg-libXrender \
-zlib"
 BUILD_DEPENDS="xorg-dev libpng16-dev jpeg-dev freetype-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap.sh
 	./configure \
 		--prefix=/usr \
@@ -28,12 +23,14 @@
 		--enable-menubar \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libpng16 jpeg freetype expat fontconfig xorg-libICE xorg-libSM \
+	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXft xorg-libXpm \
+	xorg-libXrender zlib"
+	TAGS="terminal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ms-sys/receipt
--- a/ms-sys/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ms-sys/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ms-sys"
 VERSION="2.5.0"
 CATEGORY="system-tools"
-SHORT_DESC="Program for writing Microsoft compatible boot records."
+SHORT_DESC="Program for writing Microsoft compatible boot records"
 MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 LICENSE="GPL2"
 WEB_SITE="http://ms-sys.sourceforge.net/"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|PREFIX)/man|PREFIX)/share/man|' Makefile
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e mscore/receipt
--- a/mscore/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mscore/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,34 +3,33 @@
 PACKAGE="mscore"
 VERSION="1.2"
 CATEGORY="multimedia"
-SHORT_DESC="a WYSIWYG music notation program"
+SHORT_DESC="WYSIWYG music notation program"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://musescore.org/"
+
 SOURCE="MuseScore"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://musescore.org"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libQtCore libQtGui libQtDesigner libQtScriptTools libQtNetwork libQtSvg \
-libQtXml portaudio libsndfile alsa-lib openssl"
-BUILD_DEPENDS="cmake doxygen qmake Qt4-dev portaudio-dev alsa-lib-dev libsndfile-dev"
+BUILD_DEPENDS="cmake doxygen qmake Qt4-dev portaudio-dev alsa-lib-dev \
+libsndfile-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lpthread"
 	export QT_PLUGINS_DIR=/usr/lib/qt/plugins
 	sed -i "s/usr\/local/usr/" Makefile
+
 	[ -d build ] && make clean
-	make -j1 PREFIX=/usr release && make -j1 install
+	make -j1 PREFIX=/usr release &&
+	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
+	DEPENDS="libQtCore libQtGui libQtDesigner libQtScriptTools libQtNetwork \
+	libQtSvg libQtXml portaudio libsndfile alsa-lib openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e msmtp/receipt
--- a/msmtp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/msmtp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.6.8"
 CATEGORY="network"
 SHORT_DESC="An SMTP client who transmits a mail to an SMTP server"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://marlam.de/msmtp/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://marlam.de/msmtp/releases/$TARBALL"
 
-BUILD_DEPENDS="openssl-dev gettext"
+BUILD_DEPENDS="openssl-dev gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mspdebug/receipt
--- a/mspdebug/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mspdebug/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,24 @@
 PACKAGE="mspdebug"
 VERSION="0.17"
 CATEGORY="development"
-SHORT_DESC="free debugger for use with MSP430 MCUs."
+SHORT_DESC="Free debugger for use with MSP430 MCUs"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://mspdebug.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libusb-compat"
 BUILD_DEPENDS="libusb-compat-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' Makefile
+
 	make WITHOUT_READLINE=1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libusb-compat"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mtd-utils/receipt
--- a/mtd-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtd-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mtdev/receipt
--- a/mtdev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtdev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE$TARBALL"
 
-SPLIT="mtdev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e mtools/receipt
--- a/mtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.0.18"
 CATEGORY="system-tools"
 SHORT_DESC="Access MS-DOS disk from *nix"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/mtools/intro.html"
 
@@ -12,17 +12,15 @@
 WGET_URL="https://ftp.gnu.org/pub/gnu/mtools/$TARBALL"
 
 BUILD_DEPENDS="texinfo xorg-libX11-dev xorg-libICE-dev"
-SPLIT="mtools-floppyd mtools"
+SPLIT="$PACKAGE-floppyd $PACKAGE"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		*-floppyd)
 			copy floppyd floppyd_installtest
diff -r ad29ddfee1c9 -r d5aab818505e mtop/receipt
--- a/mtop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	perl Makefile.PL --prefix=/usr &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mtpaint/receipt
--- a/mtpaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtpaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,14 +5,14 @@
 COMMIT="3884b6d"
 CATEGORY="graphics"
 SHORT_DESC="Painting program to create pixel art and manipulate digital photos"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://mtpaint.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/wjaguar/mtPaint/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="gtk2-dev libpng16-dev lcms-dev zlib-dev gettext \
+BUILD_DEPENDS="gtk2-dev libpng16-dev lcms-dev zlib-dev gettext-dev \
 libjpeg-turbo-dev tiff-dev"
 
 compile_rules() {
@@ -20,7 +20,6 @@
 
 	case "$ARCH" in
 		i?86)   ARCH_ARGS="--cpu=$ARCH intl nogif nojp2";;
-		arm*)   ARCH_ARGS="--host=$HOST_SYSTEM intl nogif";;
 		x86_64) ARCH_ARGS="intl nogif nojp2";;
 	esac
 
diff -r ad29ddfee1c9 -r d5aab818505e mtpfs/receipt
--- a/mtpfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtpfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1"
 CATEGORY="multimedia"
 SHORT_DESC="FUSE filesystem that supports reading and writing from any MTP device"
-MAINTAINER="keupont@no-log.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.adebenham.com/mtpfs/"
 
@@ -14,7 +14,9 @@
 BUILD_DEPENDS="fuse2-dev libmtp-dev libmad-dev libid3tag-dev glib-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mtr/receipt
--- a/mtr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mtr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="mtr"
 VERSION="0.87"
 CATEGORY="network"
-SHORT_DESC="My traceroute."
+SHORT_DESC="My traceroute"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -13,21 +13,18 @@
 DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev autoconf automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap.sh
 	./configure \
 		--prefix=/usr \
 		--without-gtk \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e multipath-tools/receipt
--- a/multipath-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/multipath-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.0"
 CATEGORY="x-window"
 SHORT_DESC="Device Mapper multipathing driver (provide kpartx)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://christophe.varoqui.free.fr/"
 
@@ -16,8 +16,8 @@
 compile_rules() {
 	cd $src/kpartx
 	make &&
-	#make LIB="/usr/lib" DESTDIR=${DESTDIR} install
-	install -Dm 755 $src/kpartx/kpartx $install/usr/bin/kpartx
+	#make LIB="/usr/lib" DESTDIR=$install install
+	install -Dm755 $src/kpartx/kpartx $install/usr/bin/kpartx
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e multitail/receipt
--- a/multitail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/multitail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="5.2.9"
 CATEGORY="system-tools"
 SHORT_DESC="Monitor multiple log files"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.vanheusden.com/multitail/"
+WEB_SITE="https://www.vanheusden.com/multitail/"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://www.vanheusden.com/multitail/$TARBALL"
@@ -15,8 +15,8 @@
 
 compile_rules() {
 	make || return 1
-	install -Dm 755 $src/multitail      $install/usr/bin/multitail
-	install -Dm 644 $src/multitail.conf $install/etc/multitail.conf
+	install -Dm755 multitail      $install/usr/bin/multitail
+	install -Dm644 multitail.conf $install/etc/multitail.conf
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e muninlite/receipt
--- a/muninlite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/muninlite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Simple Munin node"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="http://muninlite.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/munin-node $install/usr/bin/munin-node
+	install -Dm755 $src/munin-node $install/usr/bin/munin-node
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e muparser/receipt
--- a/muparser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/muparser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,19 +11,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/beltoforion/muparser/archive/v$VERSION.tar.gz"
 
-SPLIT="muparser-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make -j1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		muparser) copy @std;;
 		*-dev)    copy @dev;;
diff -r ad29ddfee1c9 -r d5aab818505e mupdf/receipt
--- a/mupdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mupdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.13.0"
 CATEGORY="x-window"
 SHORT_DESC="MuPDF document viewer"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="AGPL3"
 WEB_SITE="https://mupdf.com/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="freetype-dev libjpeg-turbo-dev jbig2dec-dev openjpeg2-dev \
 freeglut-dev mesa-dev glu-dev curl-dev"
-SPLIT="mupdf mupdf-gl mupdf-tools mupdf-dev"
+SPLIT="$PACKAGE-gl $PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	# use system wide libraries instead of included ones; leave mujs
@@ -24,25 +24,8 @@
 	# fix includes for jbig2dec
 	sed -i '/^JBIG2DEC_CFLAGS :=/s|$| -I./include/mupdf|' Makethird
 
-	case "$ARCH" in
-		arm*)
-			ARCH_ARGS='OS="slitaz-arm"'
-			unset CC CFLAGS
-			make generate
-			cat >> Makerules <<EOT
-ifeq "\$(OS)" "slitaz-arm"
-SYS_FREETYPE_INC = -I/cross/$ARCH/sysroot/usr/include
-CC = ${HOST_SYSTEM}-gcc
-LD = ${HOST_SYSTEM}-ld
-AR = ${HOST_SYSTEM}-ar
-CFLAGS += -I/cross/$ARCH/sysroot/usr/include -O2 -march=armv6 -ftree-vectorize -ffast-math -fsingle-precision-constant
-CROSSCOMPILE=yes
-endif
-EOT
-			;;
-	esac
-	make $ARCH_ARGS build=small libs apps extra &&
-	make $ARCH_ARGS build=small prefix=/usr install || return 1
+	make build=small libs apps extra &&
+	make build=small prefix=/usr install || return 1
 
 	# install tools
 	cd $src/build/small
diff -r ad29ddfee1c9 -r d5aab818505e mupen64plus/receipt
--- a/mupen64plus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mupen64plus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5"
 CATEGORY="games"
 SHORT_DESC="Nintendo64 Emulator"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mupen64plus.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e murrine-svn-themes/receipt
--- a/murrine-svn-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/murrine-svn-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,13 @@
 VERSION="0.6.2"
 CATEGORY="customization"
 SHORT_DESC="Some murrine themes"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://web.archive.org/web/20110726111048/http://www.cimitan.com/murrine/"
 
-DEPENDS="gtk2-engine-murrine"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/themes
-	tar -xzf stuff/murrine-themes.tar.gz -C $fs/usr/share/themes
+	tar -xzf $stuff/murrine-themes.tar.gz -C $fs/usr/share/themes
 
 	# Fix warnings:
 	# .../gtkrx:*: Murrine configuration option "*" in no longer supported and
@@ -24,4 +20,5 @@
 		sed -i 's|^[ \t]*gradients|#\0|' "$gtkrc"
 		sed -i 's|^[ \t]*scrollbar_color|#\0|' "$gtkrc"
 	done
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e murrine-themes/receipt
--- a/murrine-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/murrine-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,12 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="CC-BY-SA-3"
 WEB_SITE="https://launchpad.net/murrine-themes"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/ubuntu/+archive/primary/+files/$TARBALL"
 
-DEPENDS="gtk2-engine-murrine"
-BUILD_DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $src/usr $fs
 	find $fs -type f -exec chmod 644 \{\} \;
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e musique/receipt
--- a/musique/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/musique/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,29 +11,28 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://gitorious.org/minitunes/minitunes/archive/$COMMIT.tar.gz"
 
-DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtSql libQtXml \
-qt4-phonon taglib"
 BUILD_DEPENDS="Qt4-dev qmake taglib-dev qt4-phonon"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# put default icons to resources (instead of to hicolor icon theme) + patch
 	cp -a $stuff/*.png $src/images
 
-	mkdir build; cd build
-	qmake PREFIX=/usr ../musique.pro &&
+	mkdir build
+	cd    build
+	qmake \
+		PREFIX=/usr \
+		../musique.pro &&
 	make &&
 	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 
 	# remove big icons
 	for size in 64 128 256 512; do
 		rm -rf $fs/usr/share/icons/hicolor/${size}x$size
 	done
+	DEPENDS="libQtCore libQtDBus libQtGui libQtNetwork libQtSql libQtXml \
+	qt4-phonon taglib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e musl-libc/receipt
--- a/musl-libc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/musl-libc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,20 +8,16 @@
 LICENSE="MIT"
 WEB_SITE="https://www.musl-libc.org/"
 REPOLOGY="musl"
-HOST_ARCH="i486 x86_64 arm"
 
 TARBALL="musl-$VERSION.tar.gz"
 WGET_URL="https://www.musl-libc.org/releases/$TARBALL"
 
-SPLIT="musl-libc-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	case $ARCH in
 		i*86)   TARGET='i386';;
 		x86_64) TARGET='x86_64';;
-		arm*)   TARGET='ARM';;
 	esac
 	PREFIX='/usr/lib/musl'
 
@@ -31,7 +27,7 @@
 		--target=$TARGET \
 		$CONFIGURE_ARGS &&
 	make &&
-	make $DESTDIR=$DESTDIR install || exit 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc
 	echo "$PREFIX/lib" > $install/etc/ld-musl-$TARGET.path
@@ -40,14 +36,10 @@
 		ln -s /usr/include/$i $install$PREFIX/include/$i
 	done
 
-	docdir=$install/usr/share/doc/$PACKAGE-$VERSION
-	mkdir -p $docdir
-	cp README $docdir
+	cook_pick_docs README
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		musl-libc)
 			copy etc/ *.so*
diff -r ad29ddfee1c9 -r d5aab818505e mutagen/receipt
--- a/mutagen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mutagen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,21 @@
 VERSION="1.28"
 CATEGORY="multimedia"
 SHORT_DESC="Read and write audio tags for many formats"
-MAINTAINER="rj.rohit@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/quodlibet/mutagen"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/downloads/$TARBALL" # FIXME
 TAGS="tagging asf flac m4a mp3 musepack ogg aiff id3"
 
-DEPENDS="python"
 BUILD_DEPENDS="wget cacerts python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e mutt/receipt
--- a/mutt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mutt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Small and powerful text-based mail client"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.mutt.org"
+WEB_SITE="http://www.mutt.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.mutt.org/pub/mutt/$TARBALL"
 
-BUILD_DEPENDS="ncurses-dev openssl-dev cyrus-sasl-dev gettext libidn-dev \
+BUILD_DEPENDS="ncurses-dev openssl-dev cyrus-sasl-dev gettext-dev libidn-dev \
 opensp perl libxslt docbook-xsl"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mxml/receipt
--- a/mxml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mxml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.msweet.org/files/project3/$TARBALL"
 
-SPLIT="mxml-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e mygestures/receipt
--- a/mygestures/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mygestures/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7"
 CATEGORY="x-window"
 SHORT_DESC="Recognizing gestures made with your mouse and perform actions"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/mygestures/"
 
@@ -19,7 +19,7 @@
 		--sysconfdir=/etc/$PACKAGE \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j 1 install
+	make -j1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e mypaint-brushes/receipt
--- a/mypaint-brushes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mypaint-brushes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/Jehan/mypaint-brushes/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake glib-dev intltool"
-SPLIT="mypaint-brushes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e mypaint/receipt
--- a/mypaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mypaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,26 @@
 VERSION="1.0.0"
 CATEGORY="graphics"
 SHORT_DESC="A fast and easy painting application for digital painters, with brush dynamics"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://mypaint.intilinux.com/"
+WEB_SITE="http://mypaint.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.gna.org/$PACKAGE/$TARBALL"
 
-DEPENDS="python-pygtk python-numpy protobuf-python"
-BUILD_DEPENDS="$DEPENDS python-pygtk-dev protobuf-dev python-dev scons2 swig \
-gettext-tools"
+BUILD_DEPENDS="python-numpy protobuf-python python-pygtk-dev protobuf-dev \
+python-dev scons2 swig gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	scons
-	scons prefix=$DESTDIR/usr install
+compile_rules() {
+	scons &&
+	scons prefix=$install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share 
+genpkg_rules() {
+	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/mypaint $fs/usr/share
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/icons $fs/usr/share
+	DEPENDS="python-pygtk python-numpy protobuf-python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e mysql/receipt
--- a/mysql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/mysql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,21 +7,21 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.mysql.com/"
-#CROSS="bug: can not run test programm"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake zlib-dev ncurses-dev readline-dev libunistring-dev \
 libaio-dev"
-SPLIT="libmysqlclient mysql-client mysql-test mysql-dev mysql"
+SPLIT="libmysqlclient $PACKAGE-client $PACKAGE-test $PACKAGE-dev $PACKAGE"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 
 	# CFLAGS/CXXFLAGS as suggested upstream
-	CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-	CXXFLAGS="-fPIC ${CXXFLAGS} -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+	CFLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+	CXXFLAGS="-fPIC $CXXFLAGS -std=gnu++98 -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
 	cmake .. \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -45,7 +45,7 @@
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=bundled \
 		-DWITH_LIBWRAP=OFF \
-		-DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+		-DWITH_MYSQLD_LDFLAGS="$LDFLAGS" \
 		-DWITH_EXTRA_CHARSETS=complex \
 		-DWITH_EMBEDDED_SERVER=ON \
 		-DWITH_INNOBASE_STORAGE_ENGINE=1 \
@@ -54,7 +54,8 @@
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
 		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1 &&
-	make && make DESTDIR=$DESTDIR install || return 1
+	make &&
+	make DESTDIR=$install install || return 1
 
 	# fix paths
 	mv $install/usr/mysql-test $install/usr/share/mysql-test
@@ -74,7 +75,7 @@
 			CAT="database|client libraries"
 			DEPENDS="zlib"
 			;;
-		mysql-client)
+		*-client)
 			# client binaries (plus /usr/bin/mysql), see $src/build/client
 			copy /bin/mysql mysql_plugin mysql_upgrade mysqladmin mysqlbinlog \
 			mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap mysqltest
@@ -82,7 +83,7 @@
 			PROVIDE="mysql_or_postgresql"
 			DEPENDS="libmysqlclient ncurses zlib"
 			;;
-		mysql-test)
+		*-test)
 			copy mysql-test/ sql-bench/ db.opt
 			CAT="development|tests and benchmarks"
 			DEPENDS="mysql perl"
diff -r ad29ddfee1c9 -r d5aab818505e n2n/receipt
--- a/n2n/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/n2n/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make PREFIX=/usr &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e n2nc/receipt
--- a/n2nc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/n2nc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -25,7 +25,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nabi/receipt
--- a/nabi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nabi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Powerful GNU XIM, made for entering Hangul"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://nabi.kldp.net"
+WEB_SITE="http://nabi.kldp.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://kldp.net/frs/download.php/5287/$TARBALL"
@@ -19,7 +19,8 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nagios-nrpe/receipt
--- a/nagios-nrpe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nagios-nrpe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.14"
 CATEGORY="network"
 SHORT_DESC="Service and network monitoring program, remote monitoring"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.nagios.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e nagios-nsca/receipt
--- a/nagios-nsca/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nagios-nsca/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.9.1"
 CATEGORY="network"
 SHORT_DESC="Service and network monitoring program, remote monitoring"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.nagios.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e nagios-plugins/receipt
--- a/nagios-plugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nagios-plugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.16"
 CATEGORY="network"
 SHORT_DESC="Plugins for host, service and network monitoring program"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.nagios.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="openssl-dev radiusclient-ng-dev radiusclient-ng openldap-dev \
 mysql-dev libmysqlclient"
-SPLIT="nagios-plugins-mysql"
+SPLIT="$PACKAGE-mysql"
 
 compile_rules() {
 	sed -i '/gets is a security hole/d' gl/stdio*.h
@@ -27,8 +27,8 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR install-root
+	make DESTDIR=$install install &&
+	make DESTDIR=$install install-root
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nagios/receipt
--- a/nagios/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nagios/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.1"
 CATEGORY="network"
 SHORT_DESC="Host and network monitoring"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.nagios.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libgd-dev libpng16-dev libjpeg-turbo-dev libtool"
-SPLIT="nagios-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -29,8 +29,8 @@
 		$CONFIGURE_ARGS &&
 	sed -i 's!HTMLDIR=.*!HTMLDIR=/usr/share/nagios!' html/Makefile &&
 
-	#~ make all && make DESTDIR=$DESTDIR fullinstall \
-	#~ && make DESTDIR=$DESTDIR install-config
+	#~ make all && make DESTDIR=$install fullinstall \
+	#~ && make DESTDIR=$install install-config
 	make all &&
 	make install &&
 	make install-config &&
diff -r ad29ddfee1c9 -r d5aab818505e nagvis/receipt
--- a/nagvis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nagvis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.5.7"
 CATEGORY="network"
 SHORT_DESC="Visualization addon for nagios"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nagvis.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="nagvis-flex nagvis-doc nagvis"
+SPLIT="$PACKAGE-flex $PACKAGE-doc $PACKAGE"
 
 compile_rules() {
 	mkdir -p \
diff -r ad29ddfee1c9 -r d5aab818505e nail/receipt
--- a/nail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="12.4"
 CATEGORY="network"
 SHORT_DESC="Text mode mail user agent"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://heirloom.sourceforge.net/mailx.html"
 
@@ -22,7 +22,11 @@
 	sed -i -e "/gssapi/d" config.h
 	sed -i -e "s/-lgssapi_krb5//g" LIBS
 
-	make install UCBINSTALL=/usr/bin/install DESTDIR=$DESTDIR PREFIX=/usr || return 1
+	make \
+		UCBINSTALL=/usr/bin/install \
+		DESTDIR=$install \
+		PREFIX=/usr \
+		install || return 1
 
 	mv $install/usr/bin/mailx $install/usr/bin/nail
 }
diff -r ad29ddfee1c9 -r d5aab818505e naim/receipt
--- a/naim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/naim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,13 +14,13 @@
 # https://github.com/jwise/naim
 
 BUILD_DEPENDS="ncurses-dev"
-SPLIT="naim-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nano/receipt
--- a/nano/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nano/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,16 @@
 VERSION="2.9.8"
 CATEGORY="utilities"
 SHORT_DESC="Nano Text Editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://nano-editor.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="${WEB_SITE}dist/v${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="ncurses-dev zlib-dev"
-BUILD_DEPENDS="gettext ncurses-dev zlib-dev groff libmagic-dev"
+BUILD_DEPENDS="gettext-dev ncurses-dev zlib-dev groff libmagic-dev"
 
-SPLIT="nano-noarch"
+SPLIT="$PACKAGE-noarch"
 COOKOPTS="!menus"
 
 compile_rules() {
@@ -23,7 +22,7 @@
 		--enable-utf8 \
 		$CONFIGURE_ARGS &&
 	make &&
-	make install || exit 1
+	make install || return 1
 
 	# Config file
 	install -Dm644 $src/doc/sample.nanorc $install/etc/nanorc
diff -r ad29ddfee1c9 -r d5aab818505e nanoshot/receipt
--- a/nanoshot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nanoshot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="xdg-utils python python-pygobject2 python-pygtk pycurl gnome-python-desktop \
-python-dbus python-pil bash sed gettext"
+python-dbus python-pil bash sed gettext-dev"
 
 compile_rules() {
 	mkdir -p /usr/share/man
diff -r ad29ddfee1c9 -r d5aab818505e nareto/receipt
--- a/nareto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nareto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.1.6"
 CATEGORY="network"
 SHORT_DESC="Nagios reporting tool"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nareto.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}srcs/$TARBALL"
 
-SPLIT="nareto-doc nareto"
+SPLIT="$PACKAGE-doc $PACKAGE"
 
 BUGS="s/oreon/centreon/"
 
diff -r ad29ddfee1c9 -r d5aab818505e nasm/receipt
--- a/nasm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nasm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make INSTALLROOT=$DESTDIR install
+	make INSTALLROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nat-tester/receipt
--- a/nat-tester/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nat-tester/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/usr/share/nat-tester/
 	mv $install/usr/bin/NatTester $install/usr/share/nat-tester/ # ?
diff -r ad29ddfee1c9 -r d5aab818505e nathive/receipt
--- a/nathive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nathive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.924"
 CATEGORY="graphics"
 SHORT_DESC="Lightweight image editor"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.nathive.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="gtk2-dev python-dev coreutils-operations"
 
 compile_rules() {
-	sed -i "s|^BASE.*|BASE = $DESTDIR/usr/|;s|nathive.sh|nathive.py|" makefile
+	sed -i "s|^BASE.*|BASE = $install/usr/|; s|nathive.sh|nathive.py|" makefile
 
 	make install
 }
diff -r ad29ddfee1c9 -r d5aab818505e navit/receipt
--- a/navit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/navit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="navit"
 VERSION="0.2.0"
 CATEGORY="utilities"
-SHORT_DESC="Navit is a car navigation system with routing engine"
+SHORT_DESC="Car navigation system with routing engine"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://www.navit-project.org/"
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nbd/receipt
--- a/nbd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nbd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	touch $install/etc/nbd-server/config
 }
diff -r ad29ddfee1c9 -r d5aab818505e nbs/receipt
--- a/nbs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nbs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,11 @@
 WGET_URL="subversion|http://svn.digium.com/svn/nbs/trunk"
 
 BUILD_DEPENDS="subversion"
-SPLIT="nbs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	ln -s libnbs.so.1.0 $install/usr/lib/libnbs.so.1
 
diff -r ad29ddfee1c9 -r d5aab818505e ncdu/receipt
--- a/ncdu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ncdu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,8 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ncftp/receipt
--- a/ncftp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ncftp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A File Transfer Protocol client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="Artistic"
-WEB_SITE="http://www.ncftp.com/ncftp/"
+WEB_SITE="https://www.ncftp.com/ncftp/"
 
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
 WGET_URL="ftp://ftp.ncftp.com/ncftp/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ncmpc/receipt
--- a/ncmpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ncmpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,9 @@
 BUILD_DEPENDS="glib-dev ncurses-dev libmpdclient-dev"
 
 compile_rules() {
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nconf/receipt
--- a/nconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,14 @@
 VERSION="1.3.0-0"
 CATEGORY="system-tools"
 SHORT_DESC="Enterprise Nagios configurator"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.nconf.org/dokuwiki/doku.php"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://www.nconf.org/dokuwiki/doku.php"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="mysql php-apache nagios perl perl-dbi perl-dbd-mysql"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/nconf \
 		$fs/var/lib/nconf \
 		$fs/etc/nconf \
@@ -22,20 +19,20 @@
 		$fs/etc/nagios/import
 		
 	cp  $stuff/apache2-nconf.conf $fs/etc/apache/conf.d
-	
+
 	# Copy files
 	cp -a $src/* $fs/usr/share/nconf
-	
+
 	# Move config, output, static_cfg, temp tor $fs/var/lib/nconf (FHS)
 	# and link them to $fs/usr/sahre/nconf
 	cp -a  $fs/usr/share/nconf/config.orig/* $fs/etc/nconf
 	mv $fs/usr/share/nconf/output $fs/var/lib/nconf
 	mv $fs/usr/share/nconf/static_cfg $fs/var/lib/nconf
 	mv $fs/usr/share/nconf/temp $fs/var/lib/nconf
-	
+
 	chown -R www.www $fs/usr/share/nconf \
 		$fs/var/lib/nconf
-	
+
 	ln -s /etc/nconf/authentication.php $fs/usr/share/nconf/config
 	ln -s /etc/nconf/main.php $fs/usr/share/nconf/config
 	ln -s /etc/nconf/mysql.php $fs/usr/share/nconf/config
@@ -43,12 +40,12 @@
 	ln -s /var/lib/nconf/output $fs/usr/share/nconf/
 	ln -s /var/lib/nconf/static_cfg $fs/usr/share/nconf/
 	ln -s /var/lib/nconf/temp $fs/usr/share/nconf/
-	
+
 	mv $fs/usr/share/nconf/INSTALL $fs/var/lib/nconf
 	# Cleanup
 	rm -rf $fs/usr/share/nconf/UPDATE*
 	rm -f $fs/usr/share/nconf/INSTALL.php
-	
+
 	# Set default settings
 	sed -i -e 's/Nconf/nconf/' -e 's/link2db/nconf/' $fs/etc/nconf/mysql.php
 	sed -i -e '/NCONFDIR/ s|/var/www|/usr/share|' \
@@ -58,64 +55,72 @@
 	sed -i -e 's|bash|sh|' -e '/OUTPUT_DIR/ s|/var/www/html|/usr/share|' \
 		-e '/NAGIOS_DIR/ s|NAGIOS_DIR=.*|NAGIOS_DIR=\"/etc/nagios\"|' $fs/usr/share/nconf/ADD-ONS/deploy_local.sh
 	sed -i -e 's|bash|sh|' -e '/DBNAME/ s|NConf|nconf|' $fs/usr/share/nconf/ADD-ONS/history_cleanup.sh
+	DEPENDS="mysql php-apache nagios perl perl-dbi perl-dbd-mysql"
 }
 
-post_install()
-{
+post_install() {
 	local db=nconf
 	local db_user=nconf
 	local db_password=nconf
 	local sql_script='/var/lib/nconf/INSTALL/create_database.sql'
-	
+
 	# Minimal config for NConf.
 	if [ -z "$1" ]; then
 		if ( ! mysqladmin -s ping > /dev/null ); then
 			echo "Starting MySQL server"
-			( /etc/init.d/mysql start ; status  ) || exit 
+			( /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 ); then
-			echo -n "Create $db database"
-			mysql -Be "create database $db" ; status
+			action "Create $db database"
+			mysql -Be "create database $db"
+			status
+
 			# We suppose that $DB_USER user does not exist.
 			# It may be false.
-			echo  -n "Create user $db_user with password $db_password"
-			mysql -Be "grant all privileges on $db.* to '"$db_user"'@'localhost' 
-				identified by '"$db_password"'" ; status
+			action "Create user $db_user with password $db_password"
+			mysql -Be "grant all privileges on $db.* to '"$db_user"'@'localhost'
+				identified by '"$db_password"'"
+			status
+
 			# At last create the database for $PACKAGE.
-			echo -n "Create $db database schema."
-			mysql -u $db_user -p${db_password} -D $db < $sql_script  ; status
+			action "Create $db database schema."
+			mysql -u $db_user -p$db_password -D $db < $sql_script
+			status
 		fi
 	fi
 	true
 }
 
-post_remove()
-{
+post_remove() {
 	if [ -z "$1" ]; then
 		local db=nconf
 		local db_user=nconf
 		local db_password=nconf
-	
-		echo -n "Would you like to remove data and database files.(y/n) "
+
+		echo -en "\nWould you like to remove data and database files.(y/n) "
 		read answer
 
-		case $answer in 
-		y|Y)
-			echo -n "Removing data directories..."
-			rm -rf /var/lib/nconf ; status
-			if ( mysql -u root -Be 'show databases' | grep -q $db ); then
-				echo -n "Deleting $db database"
-				mysql -Be "drop database $db" ; status
-				# We suppose that $db_user user does not exist.
-				# It may be false.
-				echo  -n "Delete user $db_user"
-				mysql -Be "delete from mysql.db where user='"$db_user"'" ; status
+		case $answer in
+			y|Y)
+				action "Removing data directories..."
+				rm -rf /var/lib/nconf
+				status
+
+				if ( mysql -u root -Be 'show databases' | grep -q $db ); then
+					action "Deleting $db database"
+					mysql -Be "drop database $db"
+					status
+
+					# We suppose that $db_user user does not exist.
+					# It may be false.
+					action "Delete user $db_user"
+					mysql -Be "delete from mysql.db where user='"$db_user"'"
+					status
 			fi
-			unset answer
-			;;
-		*)
 			;;
 		esac
+		unset answer
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e ncurses-examples/receipt
--- a/ncurses-examples/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ncurses-examples/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ncurses-examples"
 VERSION="5.9"
 CATEGORY="base-system"
-SHORT_DESC="Ncurses test functions."
+SHORT_DESC="Ncurses test functions"
 MAINTAINER="paul@slitaz.org"
-TARBALL="$PACKAGE.tar.gz"
 LICENSE="MIT"
 WEB_SITE="http://invisible-island.net/ncurses/ncurses-examples.html"
+
+TARBALL="$PACKAGE.tar.gz"
 WGET_URL="ftp://invisible-island.net/ncurses-examples/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    	mkdir -p $fs/usr
-    	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	mkdir -p $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ncurses/receipt
--- a/ncurses/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ncurses/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Manage display on terminals"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.gnu.org/software/ncurses/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/ncurses.html"
@@ -12,10 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.gnu.org/gnu/ncurses/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="flex"
-SPLIT="ncurses-libform ncurses-libmenu ncurses-libpanel ncurses-extra \
-ncurses-dev"
+SPLIT="$PACKAGE-libform $PACKAGE-libmenu $PACKAGE-libpanel $PACKAGE-extra \
+$PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
@@ -29,7 +28,8 @@
 		--enable-pc-files \
 		--with-pkg-config-libdir=/usr/lib/pkgconfig \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	mv $install/usr/lib/libncursesw.so.6* $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e ndctl/receipt
--- a/ndctl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ndctl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="automake libtool asciidoc xmlto kmod-dev eudev-dev \
 util-linux-uuid-dev json-c-dev libxml2-tools docbook-xsl"
-SPLIT="ndctl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e ndisc6/receipt
--- a/ndisc6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ndisc6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ndiswrapper-driver/receipt
--- a/ndiswrapper-driver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ndiswrapper-driver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,8 +4,8 @@
 VERSION="1.61"
 EXTRAVERSION="_$kvers"
 CATEGORY="system-tools"
-SHORT_DESC="Add Windows network drivers support to Linux kernel."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="Add Windows network drivers support to Linux kernel"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://ndiswrapper.sourceforge.net/joomla/"
 REPOLOGY="ndiswrapper"
@@ -14,23 +14,23 @@
 WGET_URL="$SF_MIRROR/ndiswrapper/$TARBALL"
 
 BUILD_DEPENDS="linux-module-headers xz"
-SPLIT="ndiswrapper-driver ndiswrapper-utils ndiswrapper"
+SPLIT="ndiswrapper-utils ndiswrapper"
 
 compile_rules() {
-	make KBUILD=/usr/src/linux KVER=linux-${kvers}-slitaz
+	make KBUILD=/usr/src/linux KVER=linux-$kvers-slitaz
 	xz driver/ndiswrapper.ko
 
 	mkdir -p \
 		$install/usr/sbin \
 		$install/sbin \
-		$install/lib/modules/${kvers}-slitaz/kernel/misc
+		$install/lib/modules/$kvers-slitaz/kernel/misc
 
 	# Install utilities
 	install -o root -m755 $src/utils/loadndisdriver      $install/sbin/
 	install -o root -m755 $src/utils/ndiswrapper         $install/usr/sbin/
 	install -o root -m755 $src/utils/ndiswrapper-buginfo $install/usr/sbin/
 	install -o root -m644 $src/driver/ndiswrapper.ko.xz \
-		$install/lib/modules/${kvers}-slitaz/kernel/misc/ndiswrapper.ko.xz
+		$install/lib/modules/$kvers-slitaz/kernel/misc/ndiswrapper.ko.xz
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ndoutils/receipt
--- a/ndoutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ndoutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,19 +22,19 @@
 		--libexecdir=/usr/lib/$PACKAGE \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR install-config
+	make DESTDIR=$install install &&
+	make DESTDIR=$install install-config
 }
 
 genpkg_rules() {
 	mkdir -p $fs/usr/share/nagios/ndoutils \
 		$fs/etc/nagios \
 		$fs/etc/mysql.d
-	
+
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/etc $fs
-	
+
 	# config ndo2db.cfg
 	sed -i  -e 's/ndo2db_user=nagios/ndo2db_user=nagios/' \
 		-e 's/ndo2db_group=nagios/ndo2db_group=nagios/' \
@@ -47,9 +47,9 @@
 		-e 's|buffer_file=/usr/local/nagios/var/|buffer_file=/var/tmp/|' \
 		$fs/etc/nagios/ndomod.cfg
 
-	cp -a  $src/db/mysql.sql  $fs/usr/share/nagios/ndoutils/nagios.sql
-	cp -a stuff/etc $fs
-	
+	cp -a $src/db/mysql.sql $fs/usr/share/nagios/ndoutils/nagios.sql
+	cp -a $stuff/etc $fs
+
 	chmod 755 $fs/usr/bin/*
 	chmod 755 $fs/etc/mysql.d/*
 	DEPENDS="nagios mysql"
diff -r ad29ddfee1c9 -r d5aab818505e ndppd/receipt
--- a/ndppd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ndppd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 	sed -i 's| -1)| ~0U)|' src/iface.cc
 	sed -i 's|/usr/local|/usr|' Makefile
 	make all &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e neon/receipt
--- a/neon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/neon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="0.30.2"
 CATEGORY="development"
 SHORT_DESC="Neon HTTP and WebDAV client library"
-MAINTAINER="lehswe@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://web.archive.org/web/20170928175008/http://www.webdav.org/neon/"
+WEB_SITE="https://web.archive.org/web/20170923042221/http://webdav.org:80/neon/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/neon.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://fossies.org/linux/www/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev openssl-dev libxml2-dev expat-dev"
-SPLIT="neon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|client_set|set|; s|gnutls_retr|&2|; s|type = t|cert_&|' \
diff -r ad29ddfee1c9 -r d5aab818505e net-snmp/receipt
--- a/net-snmp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/net-snmp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,16 @@
 PACKAGE="net-snmp"
 VERSION="5.7.3"
 CATEGORY="network"
-SHORT_DESC="snmp tools"
+SHORT_DESC="SNMP tools"
 MAINTAINER="allan316@gmail.com"
 LICENSE="BSD"
-WEB_SITE="http://net-snmp.sourceforge.net"
+WEB_SITE="http://net-snmp.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="perl-dev openssl-dev file automake libtool"
-SPLIT="net-snmp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i &&
@@ -25,7 +25,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e net-tools/receipt
--- a/net-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/net-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	sed -i '/netinet\/ip/d' iptunnel.c
-	mkdir $DESTDIR
+	mkdir $install
 	enabled="HAVE_AFUNIX HAVE_AFINET HAVE_HWETHER HAVE_HWPPP \
 		 HAVE_HWTUNNEL HAVE_FW_MASQUERADE HAVE_IP_TOOLS HAVE_MII"
 
@@ -21,16 +21,18 @@
 	| while read name; do
 		val=0
 		case " $enabled " in
-			*\ $name\ *) val=1 ;;
+			*\ $name\ *) val=1;;
 		esac
 		echo "#define $name $val"
 		echo "$name=$val" >&2
-	done > config.h 2> config.make
+	done \
+		>  config.h \
+		2> config.make
 
 	sed -i 's/default:/&;/' hostname.c lib/inet_sr.c
 	sed -i '/"usage/,/10baseT/s/.*/&\\n\\/' mii-tool.c
-	make -j 1 &&
-	make BASEDIR=$DESTDIR install
+	make -j1 &&
+	make BASEDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e net6/receipt
--- a/net6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/net6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.3.14"
 CATEGORY="network"
 SHORT_DESC="Net6 library (TCP protocol abstraction for C++)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://releases.0x539.de/net6/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://releases.0x539.de/net6/$TARBALL"
 
-BUILD_DEPENDS="$DEPENDS gnutls-dev libgpg-error-dev libgcrypt-dev libsigc++-dev \
+BUILD_DEPENDS="zlib gnutls-dev libgpg-error-dev libgcrypt-dev libsigc++-dev \
 libtasn1-dev p11-kit-dev"
-SPLIT="net6-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/int kx_prio/d;s|kx_set_priority(session, kx_prio|priority_set_direct(session, "NORMAL:+ANON-DH", NULL|' src/encrypt.cpp
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e netatalk/receipt
--- a/netatalk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/netatalk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="db-dev openssl10-dev file pam-dev libgcrypt-dev"
-SPLIT="netatalk netatalk-pam:pam netatalk-dev"
+SPLIT="$PACKAGE-pam:pam $PACKAGE-dev"
 
 compile_rules() {
 	case $SET in
@@ -28,7 +28,7 @@
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/etc $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e netcf/receipt
--- a/netcf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/netcf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libxml2-dev libxslt-dev readline-dev augeas-dev \
 libnl-dev"
-SPLIT="netcf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	aclocal
diff -r ad29ddfee1c9 -r d5aab818505e nethack/receipt
--- a/nethack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nethack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="nethack"
 VERSION="3.4.3"
 CATEGORY="games"
-SHORT_DESC="NetHack is a single player dungeon exploration game"
+SHORT_DESC="Single-player dungeon exploration game"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="custom"
-WEB_SITE="http://www.nethack.org"
+WEB_SITE="http://www.nethack.org/"
 
 TARBALL="$PACKAGE-343-src.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -18,11 +18,13 @@
 	sed -i "s|\/\* #define LINUX \*\/|#define LINUX|" include/unixconf.h
 	sed -i "s|WINTTYLIB = -ltermlib|# WINTTYLIB = -ltermlib|" src/Makefile
 	sed -i "s|# WINTTYLIB = -lncurses|WINTTYLIB = -lncurses|" src/Makefile
-	sed -i "s|= /usr|= $DESTDIR/usr|" Makefile
+	sed -i "s|= /usr|= $install/usr|" Makefile
 	sed -i "s|= games|= root|" Makefile
 	sed -i "s|= bin|= root|" Makefile
 	sed -i '/rmdir \.\/-p/d' Makefile
-	make && make install
+
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nethogs/receipt
--- a/nethogs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nethogs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/nethogs $install/usr/sbin/nethogs
+	install -Dm755 nethogs $install/usr/sbin/nethogs
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e netkit-rsh/receipt
--- a/netkit-rsh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/netkit-rsh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="netkit-rsh"
 VERSION="0.17"
 CATEGORY="network"
-SHORT_DESC="Remote connexion tools"
+SHORT_DESC="Remote connection tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit"
@@ -14,13 +14,13 @@
 BUILD_DEPENDS="ncurses-dev"
 
 compile_rules() {
-	sed -i \
+	sed \
 		-e 's/union wait/int/' \
 		-e 's/status.w_termsig | status.w_retcode/WTERMSIG(status)/' \
-		rlogin/rlogin.c
+		-i rlogin/rlogin.c
 	sed -i 's|/man|/share&|' configure
-	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/sbin \
-		 $DESTDIR/usr/share/man/man1 $DESTDIR/usr/share/man/man8
+	mkdir -p $install/usr/bin $install/usr/sbin \
+		 $install/usr/share/man/man1 $install/usr/share/man/man8
 	sed -i 's|.*param.h.*|#include <linux/limits.h>\n&|' \
 		rexecd/rexecd.c rshd/rshd.c
 	sed -i 's|.*rlogind.*|#include <stdio.h>\n&|' rlogind/rlogind.h
@@ -28,8 +28,9 @@
 	./configure \
 		--prefix=/usr \
 		--without-pam \
-		--installroot=$DESTDIR &&
-	make && make install
+		--installroot=$install &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e netrik/receipt
--- a/netrik/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/netrik/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,10 +17,12 @@
 compile_rules() {
 	# fix headers
 	for src in colors-bright colors-dark links main pager parse-syntax render screen; do
-		sed -i '/#include <ncursesw/ s|ncursesw/||g' ${src}.c
+		sed -i '/#include <ncursesw/ s|ncursesw/||g' $src.c
 	done
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e netselect/receipt
--- a/netselect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/netselect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,9 @@
 WGET_URL="https://github.com/apenwarr/netselect/archive/$TARBALL"
 
 compile_rules() {
-	make && make install &&
+	make &&
+	make install || return 1
+
 	# weird but `install -m 4755 ...` in Makefile didn't work
 	chmod u+s $install/usr/bin/netselect
 }
diff -r ad29ddfee1c9 -r d5aab818505e nettle/receipt
--- a/nettle/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nettle/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,18 +12,13 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev gmp-dev texinfo"
-SPLIT="nettle-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS='--enable-arm-neon';;
-		*)   ARCH_ARGS='';;
-	esac
-
 	./configure \
 		--libdir=/usr/lib \
 		--disable-static \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
 	make install || return 1
 
diff -r ad29ddfee1c9 -r d5aab818505e network-manager/receipt
--- a/network-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/network-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.9.8.10"
 CATEGORY="system-tools"
 SHORT_DESC="GNOME network manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://projects.gnome.org/NetworkManager/"
+WEB_SITE="https://wiki.gnome.org/Projects/NetworkManager"
 REPOLOGY="networkmanager"
 
 TARBALL="NetworkManager-$VERSION.tar.xz"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="dbus-dev dbus-glib-dev gtk2-dev wireless_tools-dev libgudev-dev \
 libnl-dev nss-dev ppp-dev iptables-dev util-linux-uuid-dev dhcp-client \
 intltool eudev-dev"
-SPLIT="network-manager-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/expires > 0)$/{p;s/.*/{/;NNN;s/$/\n}/}' \
diff -r ad29ddfee1c9 -r d5aab818505e newsbeuter/receipt
--- a/newsbeuter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/newsbeuter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
 
-BUILD_DEPENDS="gettext libxml2-dev json-c-dev curl-dev sqlite3-dev stfl-dev \
+BUILD_DEPENDS="gettext-dev libxml2-dev json-c-dev curl-dev sqlite3-dev stfl-dev \
 ncurses-dev gcc49"
 
 compile_rules() {
@@ -19,7 +19,7 @@
 	export LD_LIBRARY_PATH="/usr/libgcc49:$LD_LIBRARY_PATH"
 
 	make CC=gcc-49 CXX=g++-49 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e newt/receipt
--- a/newt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/newt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.52.20"
 CATEGORY="libdevel"
 SHORT_DESC="Programming library for color text mode"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pagure.io/newt"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/newt.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://releases.pagure.org/newt/$TARBALL"
 
 BUILD_DEPENDS="slang-dev popt-dev python-dev tcl-dev gpm-dev"
-SPLIT="newt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -e 's/^LIBNEWT =/#&/' \
@@ -35,6 +35,8 @@
 			DEPENDS="popt python slang tcl"
 			SUGGESTED="gpm"
 			;;
-		*-dev) copy @dev;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e nfs-utils/receipt
--- a/nfs-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nfs-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,18 +15,13 @@
 util-linux-uuid-dev util-linux-blkid"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			ARCH_ARGS="--with-tirpcinclude=/cross/$ARCH/sysroot/usr/include/tirpc
-			--without-tcp-wrappers CC_FOR_BUILD=${HOST_SYSTEM}-gcc" ;;
-	esac
-
 	#sh autogen.sh
 	./configure \
 		--disable-nfsv4 \
 		--disable-gss \
-		$CONFIGURE_ARGS $ARCH_ARGS &&
-	make && make install || return 1
+		$CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	cp -a $stuff/* $install
 }
@@ -35,10 +30,6 @@
 	copy @std
 	DEPENDS="libtirpc libwrap libcap util-linux-blkid util-linux-uuid rpcbind \
 	linux-nfsd"
-	case "$SLITAZ_ARCH" in
-		arm*) DEPENDS="libtirpc libwrap libcap util-linux-blkid \
-			util-linux-uuid rpcbind";;
-	esac
 	CONFIG_FILES="/etc/exports"
 	TAGS="filesystem"
 }
diff -r ad29ddfee1c9 -r d5aab818505e nghttp2/receipt
--- a/nghttp2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nghttp2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/nghttp2/nghttp2/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev openssl-dev libxml2-dev"
-SPLIT="nghttp2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e nginx/receipt
--- a/nginx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nginx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="pcre-dev openssl-dev zlib-dev libgd-dev geoip-dev libxslt-dev \
 perl-dev"
-SPLIT="nginx-extras:extras"
+SPLIT="$PACKAGE-extras:extras"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e nicotine+/receipt
--- a/nicotine+/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nicotine+/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="nicotine+"
 VERSION="1.2.16"
 CATEGORY="network"
-SHORT_DESC="Nicotine+ is a client for the SoulSeek filesharing network"
+SHORT_DESC="SoulSeek filesharing network client"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.nicotine-plus.org"
+WEB_SITE="http://www.nicotine-plus.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/nicotine-plus/$TARBALL"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python-dev python-pygtk-dev"
 
 compile_rules() {
-	python setup.py install --root=$DESTDIR || return 1
+	python -B setup.py install --root=$install || return 1
 
 	mv $install/usr/bin/nicotine.py $install/usr/bin/nicotine
 }
diff -r ad29ddfee1c9 -r d5aab818505e nilfs-utils/receipt
--- a/nilfs-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nilfs-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://nilfs.sourceforge.net/download/$TARBALL" # note, no $SF_MIRROR
 
 BUILD_DEPENDS="automake libtool util-linux-uuid-dev util-linux-mount-dev"
-SPLIT="nilfs-utils-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e nimrod/receipt
--- a/nimrod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nimrod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="nimrod"
 VERSION="0.9.2"
 CATEGORY="development"
-SHORT_DESC="The Nimrod programming language."
-MAINTAINER="admin@trixarian.net"
+SHORT_DESC="The Nimrod programming language"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://www.nimrod-code.org/"
 REPOLOGY="nim"
@@ -12,28 +12,23 @@
 TARBALL="nimrod_$VERSION.zip"
 WGET_URL="http://nimrod-code.org/download/$TARBALL"
 
-DEPENDS="gcc glibc-base readline"
 BUILD_DEPENDS="gcc glibc-dev readline-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i "s/uname -m/echo $ARCH/" build.sh
 	chmod +x build.sh
 	chmod +x install.sh
 	./build.sh
 	./bin/nimrod c -d:release koch
 	./koch boot -d:release
-	./install.sh $DESTDIR
+	./install.sh $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/nimrod $fs/usr/lib
 	cp -a $install/nimrod/bin $fs/usr
 	cp -a $install/nimrod/config $fs/etc
 	cp -a $install/nimrod/lib $fs/usr/lib/nimrod
 	cp -a $install/nimrod/doc $fs/usr/share/nimrod
+	DEPENDS="gcc glibc-base readline"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ninvaders/receipt
--- a/ninvaders/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ninvaders/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.1"
 CATEGORY="games"
 SHORT_DESC="Space Invaders clone"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ninvaders.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e nis/receipt
--- a/nis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,6 +8,4 @@
 LICENSE="GPL2"
 WEB_SITE="http://www.kernel.org/pub/linux/utils/net/NIS/"
 
-genpkg_rules() {
-	DEPENDS="ypserv yp-tools ypbind-mt"
-}
+DEPENDS="ypserv yp-tools ypbind-mt"
diff -r ad29ddfee1c9 -r d5aab818505e nitrogen/receipt
--- a/nitrogen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nitrogen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.6.1"
 CATEGORY="x-window"
 SHORT_DESC="Background browser and setter for X windows"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/l3ib/nitrogen"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/l3ib/nitrogen/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext xorg-libXinerama-dev"
+BUILD_DEPENDS="glib-dev gtk2-dev gtkmm-dev gettext-dev xorg-libXinerama-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e njconnect/receipt
--- a/njconnect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/njconnect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.2"
 CATEGORY="multimedia"
 SHORT_DESC="Jack connection manager (ncurses)"
-MAINTAINER="xj@wp.pl"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://njconnect.sourceforge.net"
+WEB_SITE="http://njconnect.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e nmap/receipt
--- a/nmap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nmap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.70"
 CATEGORY="security"
 SHORT_DESC="The Network Mapper"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://nmap.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/nmap.html"
@@ -21,7 +21,7 @@
 		--with-liblua=included \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nmon/receipt
--- a/nmon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nmon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="14g"
 CATEGORY="system-tools"
 SHORT_DESC="Nigel's performance Monitor"
-MAINTAINER="meshca@clarkson.edu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://nmon.sourceforge.net/"
 
@@ -14,9 +14,14 @@
 BUILD_DEPENDS="linux-api-headers ncurses-dev"
 
 compile_rules() {
-	cc -o nmon lmon$VERSION.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM \
-		-lncurses -g -D POWER &&
-	install -Dm 755 $src/nmon $install/usr/bin/nmon
+	cc -o nmon lmon$VERSION.c \
+		-g -O2 \
+		-D JFS \
+		-D GETUSER -Wall \
+		-D LARGEMEM \
+		-lncurses -g \
+		-D POWER &&
+	install -Dm755 nmon $install/usr/bin/nmon
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nms/receipt
--- a/nms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	make prefix=/usr DESTDIR=$DESTDIR install
+	make prefix=/usr DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e node/receipt
--- a/node/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/node/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="9.11.2"
 CATEGORY="network"
 SHORT_DESC="Node.js - JavaScript runtime built on Chrome's V8 JavaScript engine"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="https://nodejs.org/"
+WEB_SITE="https://nodejs.org/en/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/nodejs.html"
 REPOLOGY="nodejs"
 
@@ -16,7 +16,7 @@
 TARBALL_SHA256="06484eac7f6b7c87e96983a039422347c0047284bc4d373d90884ae3966dc213"
 
 BUILD_DEPENDS="python-dev zlib-dev c-ares-dev openssl-dev icu-dev"
-SPLIT="node-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# site script didn't used, define prefix here
diff -r ad29ddfee1c9 -r d5aab818505e nomacs/receipt
--- a/nomacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nomacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,34 +6,35 @@
 SHORT_DESC="Pictures browser"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL3"
-WEB_SITE="http://www.nomacs.org"
+WEB_SITE="http://www.nomacs.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/nomacs/nomacs/archive/$VERSION.tar.gz"
 
-DEPENDS="qt5-base"
 BUILD_DEPENDS="qt5-dev cmake exiv2-dev libraw-dev zlib-dev expat-dev mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src/ImageLounge ; sed -i 's/ ON/ OFF/g' CMakeLists.txt
-	mkdir build ; cd build
+compile_rules() {
+	cd $src/ImageLounge
+	sed -i 's/ ON/ OFF/g' CMakeLists.txt
+
+	mkdir build
+	cd    build
 	cmake \
 		-DENABLE_OPENCV=OFF \
 		-DENABLE_RAW=OFF \
 		-DENABLE_WEBP=OFF \
 		-DENABLE_TIFF=OFF \
 		-DDISABLE_QT_DEBUG=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr ..
-	make
-	make DESTDIR=$DESTDIR install
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -rf $src/build
 	cd $fs/usr/share/$PACKAGE/translations
 	find * -size -62k -delete
+	DEPENDS="qt5-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e nomad/receipt
--- a/nomad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nomad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1"
 CATEGORY="misc"
 SHORT_DESC="User friendly Wi-Fi configure for nomads"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://doc.slitaz.org/en:guides:wifi-easy"
 
diff -r ad29ddfee1c9 -r d5aab818505e non-studio/receipt
--- a/non-studio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/non-studio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,22 +5,20 @@
 VERSION="${GITHASH:0:7}"
 CATEGORY="multimedia"
 SHORT_DESC="Complete studio, powerful, fast and light"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://non.tuxfamily.org"
+WEB_SITE="http://non.tuxfamily.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://git.tuxfamily.org/non/non/?p=non/non.git;a=snapshot;h=$GITHASH;sf=tgz"
 
-BUILD_DEPENDS_arm="ntk-dev libsndfile-dev libsigc++-dev liblrdf-dev liblo-dev \
-jack-dev ladspa-dev"
 BUILD_DEPENDS="ntk-dev libsndfile-dev libsigc++-dev liblrdf-dev liblo-dev \
 jack-dev ladspa-dev git python"
 
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e normalize/receipt
--- a/normalize/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/normalize/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e notecase/receipt
--- a/notecase/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/notecase/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.8"
 CATEGORY="office"
 SHORT_DESC="A hierarchical text notes manager"
-MAINTAINER="cooltaz@fastmail.fm"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://notecase.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev xorg-pixman-dev gtksourceview-dev gnome-vfs-dev \
-gconf-dev gettext-tools libgcrypt-dev"
+gconf-dev gettext libgcrypt-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
@@ -29,7 +29,7 @@
 	done
 	cd ..
 	# Install
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e notification-daemon-gtk2/receipt
--- a/notification-daemon-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/notification-daemon-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.5.0" # latest version with gtk2 is 0.5.0 (2010-06-28)
 CATEGORY="x-window"
 SHORT_DESC="Notification daemon for libnotify/notify-send under GTK2"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.galago-project.org/"
+WEB_SITE="http://www.galago-project.org/news/index.php"
 
 TARBALL="notification-daemon-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/notification-daemon/${VERSION%.*}/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e notification-daemon/receipt
--- a/notification-daemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/notification-daemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Notification daemon for libnotify/notify-send"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.galago-project.org/"
+WEB_SITE="http://www.galago-project.org/news/index.php"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk3-dev glib-dev xorg-libX11-dev"
+BUILD_DEPENDS="gettext-dev gtk3-dev glib-dev xorg-libX11-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e notify-python/receipt
--- a/notify-python/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/notify-python/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.1.1"
 CATEGORY="system-tools"
 SHORT_DESC="Python binding to libnotify"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.galago-project.org/"
+WEB_SITE="http://www.galago-project.org/news/index.php"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.galago-project.org/files/releases/source/notify-python/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e noto-mono/receipt
--- a/noto-mono/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/noto-mono/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -26,7 +26,7 @@
 		save_file="NotoMono-$font-$VERSION.ttf"
 		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
 		[ -e "$SRC/$save_file" ] || wget -T 30 -O "$SRC/$save_file" $url
-		[ -e "$SRC/$save_file" ] || exit 1
+		[ -e "$SRC/$save_file" ] || return 1
 		cp "$SRC/$save_file" "$src/$get_file"
 	done
 
diff -r ad29ddfee1c9 -r d5aab818505e noto-sans/receipt
--- a/noto-sans/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/noto-sans/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -31,7 +31,7 @@
 		save_file="NotoSans-$font-$VERSION.ttf"
 		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
 		[ -e "$SRC/$save_file" ] || wget -T 30 -O "$SRC/$save_file" $url
-		[ -e "$SRC/$save_file" ] || exit 1
+		[ -e "$SRC/$save_file" ] || return 1
 		cp "$SRC/$save_file" "$src/$get_file"
 	done
 
diff -r ad29ddfee1c9 -r d5aab818505e noto-serif/receipt
--- a/noto-serif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/noto-serif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -32,7 +32,7 @@
 		save_file="NotoSerif-$variant-$VERSION.ttf"
 		url="https://github.com/googlei18n/noto-fonts/raw/$COMMIT/hinted/$get_file"
 		[ -e "$SRC/$save_file" ] || wget -T 30 -O "$SRC/$save_file" $url
-		[ -e "$SRC/$save_file" ] || exit 1
+		[ -e "$SRC/$save_file" ] || return 1
 		cp "$SRC/$save_file" "$src/$get_file"
 	done
 
diff -r ad29ddfee1c9 -r d5aab818505e novnc/receipt
--- a/novnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/novnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -27,13 +27,16 @@
 
 genpkg_rules() {
 	copy @std
+	DEPENDS="python-websockify net-tools"
+	SUGGESTED="openssl"
+	TAGS="vnc remote-desktop html5"
 }
 
 post_install() {
 	which openssl >/dev/null &&
 	openssl req -new -x509 -keyout "$1/usr/share/novnc/self.pem" \
 		-out "$1/usr/share/novnc/self.pem" -days 3650 -nodes <<EOT
-$(. "$1/etc/locale.conf" ; echo ${LANG#*_})
+$(. "$1/etc/locale.conf"; echo ${LANG#*_})
 $(cat "$1/etc/TZ")
 
 $(cat "$1/etc/hostname")
@@ -41,7 +44,4 @@
 
 
 EOT
-	DEPENDS="python-websockify net-tools"
-	SUGGESTED="openssl"
-	TAGS="vnc remote-desktop html5"
 }
diff -r ad29ddfee1c9 -r d5aab818505e npth/receipt
--- a/npth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/npth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 # https://www.gnupg.org/download/integrity_check.html
 TARBALL_SHA1="f9d63e9747b027e4e404fe3c20c73c73719e1731"
 
-SPLIT="npth-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e nqc/receipt
--- a/nqc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nqc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.1.r6-4"
 CATEGORY="development"
 SHORT_DESC="Compiler for the Not Quite C programming language"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
 WEB_SITE="http://bricxcc.sourceforge.net/nqc/"
 
diff -r ad29ddfee1c9 -r d5aab818505e nspr/receipt
--- a/nspr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nspr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.19"
 CATEGORY="utilities"
 SHORT_DESC="Netscape Portable Runtime"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL2"
 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/nspr.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://archive.mozilla.org/pub/nspr/releases/v$VERSION/src/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="nspr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd nspr
diff -r ad29ddfee1c9 -r d5aab818505e nss-ldapd/receipt
--- a/nss-ldapd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nss-ldapd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,12 +16,14 @@
 
 compile_rules() {
 	mkdir -p \
-		$DESTDIR/usr/lib \
-		$DESTDIR/etc \
-		$DESTDIR/usr/lib/security
+		$install/usr/lib \
+		$install/etc \
+		$install/usr/lib/security
 	sed -i 's/-D / /' */Makefile.in Makefile.in
 
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nss/receipt
--- a/nss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.38"
 CATEGORY="utilities"
 SHORT_DESC="Mozilla Network Security Services (NSS)"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://archive.mozilla.org/pub/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$TARBALL"
 
 BUILD_DEPENDS="nspr-dev sqlite3-dev zlib-dev perl"
-SPLIT="nss-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e nss_ldap/receipt
--- a/nss_ldap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nss_ldap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,7 +22,7 @@
 		--enable-paged-results \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ntfs-3g/receipt
--- a/ntfs-3g/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntfs-3g/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2017.3.23"
 CATEGORY="system-tools"
 SHORT_DESC="Read/write NTFS driver"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2"
 WEB_SITE="https://www.tuxera.com/community/open-source-ntfs-3g/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/ntfs-3g.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://tuxera.com/opensource/$TARBALL"
 
 BUILD_DEPENDS="util-linux-uuid-dev libtool"
-SPLIT="ntfsprogs ntfsprogs-extra ntfs-3g ntfs-3g-dev"
+SPLIT="ntfsprogs ntfsprogs-extra $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	touch $src/libtoolT
diff -r ad29ddfee1c9 -r d5aab818505e ntk/receipt
--- a/ntk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,21 +5,20 @@
 VERSION="${GITHASH:0:7}"
 CATEGORY="x-window"
 SHORT_DESC="Fork of FLTK 1.3.0 with additional functionality"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://non.tuxfamily.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://git.tuxfamily.org/non/fltk/?p=non/fltk.git;a=snapshot;h=$GITHASH;sf=tgz"
 
-BUILD_DEPENDS_arm="xorg-libXft-dev cairo-dev jpeg-dev"
 BUILD_DEPENDS="xorg-libXft-dev cairo-dev jpeg-dev git python"
-SPLIT="ntk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ntl/receipt
--- a/ntl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A Library for doing Number Theory"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://shoup.net/ntl/"
+WEB_SITE="https://shoup.net/ntl/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e ntop/receipt
--- a/ntop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libtool automake autoconf wget subversion libpcap-dev gdbm-dev \
 pcre-dev rrdtool-dev openssl-dev zlib-dev python-dev geoip-dev"
-SPLIT="ntop-dev ntop-man"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
@@ -49,10 +49,6 @@
 		ntop-dev)
 			copy @dev
 			;;
-		ntop-man)
-			CAT="development|man page"
-			copy usr/share/man/
-			;;
 	esac
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e ntp/receipt
--- a/ntp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,8 @@
 	sed -i 's/MOD_NANO/0/' ntpd/ntp_loopfilter.c
 
 	./configure $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install || return 1
+	make &&
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/ntp      $install/etc/init.d/ntp
 	install -Dm644 $stuff/ntp.conf $install/etc/ntp.conf
diff -r ad29ddfee1c9 -r d5aab818505e ntpclient/receipt
--- a/ntpclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ntpclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2015_365"
 CATEGORY="system-tools"
 SHORT_DESC="Tiny NTP Client"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://doolittle.icarus.com/ntpclient/"
 
@@ -15,7 +15,7 @@
 	# disable debug
 	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile &&
 	make &&
-	install -Dm 755 $src/ntpclient $install/usr/bin/ntpclient
+	install -Dm755 $src/ntpclient $install/usr/bin/ntpclient
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e numlockx/receipt
--- a/numlockx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/numlockx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Turns on the numlock key in X11"
 MAINTAINER="mojo@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://freecode.com/projects/numlockx"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/numlockx"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://pkgs.fedoraproject.org/repo/pkgs/$PACKAGE/$TARBALL/be9109370447eae23f6f3f8527bb1a67/$TARBALL"
@@ -14,7 +14,9 @@
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nut/receipt
--- a/nut/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nut/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Network UPS Tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.networkupstools.org"
+WEB_SITE="http://www.networkupstools.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/source/${VERSION%.*}/$TARBALL"
@@ -15,7 +15,9 @@
 openssl-dev" # libwrap-dev
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install || return 1
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install || return 1
 
 	for i in $install/etc/*.sample; do
 		mv $i $install/etc/$(basename $i .sample)
diff -r ad29ddfee1c9 -r d5aab818505e nvclock/receipt
--- a/nvclock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nvclock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8b4"
 CATEGORY="network"
 SHORT_DESC="Small utility which allows users to overclock NVIDIA based video cards"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.linuxhardware.org/nvclock/"
 
@@ -21,8 +21,8 @@
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/bin &&
-	make -j 1 &&
-	make DESTDIR=$DESTDIR install
+	make -j1 &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e nvidia-173xx/receipt
--- a/nvidia-173xx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nvidia-173xx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,20 @@
 VERSION="173.14.39"
 EXTRAVERSION="_$kvers"
 CATEGORY="non-free"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 SHORT_DESC="NVIDIA drivers (non-free)"
 WEB_SITE="http://www.nvidia.com/"
 REPOLOGY="nvidia-legacy-173.14"
 
-SOURCE="NVIDIA-Linux-x86-${VERSION}-pkg1"
-TARBALL="${SOURCE}.run"
+SOURCE="NVIDIA-Linux-x86-$VERSION-pkg1"
+TARBALL="$SOURCE.run"
 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
 RUN_OPTS="--extract-only"
-TAGS="driver graphic video"
-PROVIDE="nvidia mesa"
 
-DEPENDS="linux xorg-server gtk2 cairo linux-agp xorg-libXv"
 BUILD_DEPENDS="linux-module-headers coreutils-file-summarize xz"
 
-# Rules to configure and make the package.
-
-compile_rules()
-{
+compile_rules() {
 	cd $src/usr/src/nv/
 	sed -i 's|.*utsname.*|&\n#include <linux/acpi.h>|' nv-linux.h
 	# Only use .unblocked_ioctl since 2.6.36
@@ -32,10 +26,7 @@
 	xz nvidia.ko
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/share \
 		$fs/usr/lib/X11 \
@@ -48,27 +39,30 @@
 	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz
 	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz
 
-	cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE
-	cp -a $src/usr/bin $fs/usr
-	cp -a $src/nvidia-installer $fs/usr/bin
-	cp -a $src/usr/lib/*.so* $fs/usr/lib/
-	cp -a $src/usr/lib/tls $fs/usr/lib/
+	cp -a $src/LICENSE                $fs/usr/share/licenses/$PACKAGE
+	cp -a $src/usr/bin                $fs/usr
+	cp -a $src/nvidia-installer       $fs/usr/bin
+	cp -a $src/usr/lib/*.so*          $fs/usr/lib/
+	cp -a $src/usr/lib/tls            $fs/usr/lib/
 	cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib
-	cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/
+	cp -a $src/usr/X11R6/lib/modules  $fs/usr/lib/X11/
 	cp -a $src/usr/share/applications $fs/usr/share
-	cp -a $src/usr/share/pixmaps $fs/usr/share
-	cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
-	cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11
+	cp -a $src/usr/share/pixmaps      $fs/usr/share
+	cp -a $src/usr/share/doc/*        $fs/usr/share/doc/$PACKAGE/
+	cp -a $src/usr/X11R6/lib/*        $fs/usr/lib/X11
 
 	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so
 	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1
-	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so
-	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1
+	ln -s libGL.so.$VERSION   $fs/usr/lib/libGL.so
+	ln -s libGL.so.$VERSION   $fs/usr/lib/libGL.so.1
+
 	# exclude from files.list (for tazpkg's "find-depends")
-        cd $fs/usr/lib
-        for i in $(ls libGL.so*) ; do mv -f $i ${i//./-.-} ; done
+	cd $fs/usr/lib
+	for i in $(ls libGL.so*); do
+		mv -f $i ${i//./-.-}
+	done
 
-	ln -s libGLcore.so.$VERSION $fs/usr/lib/libGLcore.so.1
+	ln -s libGLcore.so.$VERSION     $fs/usr/lib/libGLcore.so.1
 	ln -s libnvidia-cfg.so.$VERSION $fs/usr/lib/libnvidia-cfg.so
 	ln -s libnvidia-cfg.so.$VERSION $fs/usr/lib/libnvidia-cfg.so.1
 	ln -s libnvidia-tls.so.$VERSION $fs/usr/lib/libnvidia-tls.so.1
@@ -79,22 +73,26 @@
 	ln -s libXvMCNVIDIA.so.$VERSION $fs/usr/lib/libXvMCNVIDIA_dynamic.so
 	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so
 	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1
-	ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so
+	ln -s libglx.so.$VERSION        $fs/usr/lib/X11/modules/extensions/libglx.so
+
+	DEPENDS="linux xorg-server gtk2 cairo linux-agp xorg-libXv"
+	PROVIDE="nvidia mesa"
+	TAGS="driver graphic video"
 }
 
-pre_install()
-{
+pre_install() {
 	title "PROPRIETARY LICENSE"
 	echo "You are installing a package with proprietary license."
 	echo "You must accept the license."
 	footer
 }
 
-post_install()
-{
+post_install() {
 	# Restore excluded from files.list (for tazpkg's "find-depends")
-        cd $1/usr/lib
-	for i in $(ls libGL.so*) ; do mv -f $i ${i//-.-/.} ; done
+	cd $1/usr/lib
+	for i in $(ls libGL.so*); do
+		mv -f $i ${i//-.-/.}
+	done
 
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 
diff -r ad29ddfee1c9 -r d5aab818505e nvidia-96xx/receipt
--- a/nvidia-96xx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nvidia-96xx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,7 +10,7 @@
 WEB_SITE="http://www.nvidia.com/"
 REPOLOGY="nvidia-legacy-96.43"
 
-TARBALL="NVIDIA-Linux-x86-${VERSION}-pkg0.run"
+TARBALL="NVIDIA-Linux-x86-$VERSION-pkg0.run"
 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
 
 RUN_OPTS="--extract-only"
diff -r ad29ddfee1c9 -r d5aab818505e nzbget/receipt
--- a/nzbget/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/nzbget/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,17 +9,17 @@
 WEB_SITE="http://nzbget.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/nzbget/nzbget-stable/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev openssl-dev ncurses-dev zlib-dev"
-SPLIT="nzbget-webui nzbget"
+SPLIT="$PACKAGE-webui $PACKAGE"
 
 compile_rules() {
 	./configure \
 		--disable-parcheck \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc/
 	mv $install/usr/share/nzbget/nzbget.conf $install/etc/
diff -r ad29ddfee1c9 -r d5aab818505e o3read/receipt
--- a/o3read/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/o3read/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.0.4"
 CATEGORY="utilities"
 SHORT_DESC="Standalone converter for OpenOffice.org writer and calc formats"
-MAINTAINER="milka@konstelacioj.info"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://siag.nu/o3read/"
 
@@ -13,7 +13,8 @@
 
 compile_rules() {
 	sed -i 's|/man/|/share&|' Makefile
-	make install PREFIX=$DESTDIR/usr
+
+	make PREFIX=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e obby/receipt
--- a/obby/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obby/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.7"
 CATEGORY="network"
 SHORT_DESC="Realtime collaborative text-editing functionality"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gobby.0x539.de/trac/"
 
@@ -13,13 +13,13 @@
 
 BUILD_DEPENDS="zlib libtasn1 gnutls-dev libgpg-error-dev libgcrypt-dev \
 net6-dev libsigc++-dev"
-SPLIT="obby-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e obconf-qt/receipt
--- a/obconf-qt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obconf-qt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,26 +7,26 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/lxde/obconf-qt"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lxde/$PACKAGE/archive/$VERSION.tar.gz"
-TAGS="LXQt"
 
-DEPENDS="bzlib fontconfig freetype libQtCore libQtGui libffi libxml2 openbox \
-pango pcre xorg-libICE xorg-libSM xorg-libX11 xorg-libXft zlib"
 BUILD_DEPENDS="wget cacerts cmake Qt4-dev qmake openbox-dev glib-dev \
 xorg-libXft-dev pango-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="bzlib fontconfig freetype libQtCore libQtGui libffi libxml2 \
+	openbox pango pcre xorg-libICE xorg-libSM xorg-libX11 xorg-libXft zlib"
+	TAGS="LXQt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e obconf/receipt
--- a/obconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.4"
 CATEGORY="x-window"
 SHORT_DESC="Openbox configuration tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://openbox.org/wiki/ObConf:About"
 
@@ -19,7 +19,8 @@
 
 	./configure $CONFIGURE_ARGS &&
 	sed -i 's/^mkdir_p = .*/mkdir_p = mkdir -p/' po/Makefile &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	cp -f $stuff/obconf.desktop $install/usr/share/applications/
 }
diff -r ad29ddfee1c9 -r d5aab818505e obfsproxy/receipt
--- a/obfsproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obfsproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,25 @@
 # git log --pretty=format:'' | wc -l
 VERSION="280"
 CATEGORY="network"
-SHORT_DESC="A simple obfuscating proxy from the Tor project."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="A simple obfuscating proxy from the Tor project"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://www.torproject.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.torproject.org/"
-WGET_URL="git|http://git.torproject.org/obfsproxy.git "
+WGET_URL="git|http://git.torproject.org/obfsproxy.git"
 
-DEPENDS="libevent openssl"
 BUILD_DEPENDS="git wget libevent-dev openssl-dev autoconf automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./autogen.sh && ./configure $CONFUGURE_ARGS &&
-	make && make install 
+compile_rules() {
+	./autogen.sh &&
+	./configure $CONFUGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libevent openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e obmenu/receipt
--- a/obmenu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obmenu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	python -B setup.py build &&
-	python -B setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e obshutdown/receipt
--- a/obshutdown/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/obshutdown/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,11 +4,11 @@
 VERSION="0.1-rc1"
 CATEGORY="x-window"
 SHORT_DESC="Light Openbox shutdown manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/panjandrum/obshutdown"
 
-TARBALL="${PACKAGE}-${VERSION}.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/downloads/panjandrum/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev cairo-dev"
@@ -19,7 +19,8 @@
 	for i in $(grep -lr "#include <glib" src/); do
 		sed -i 's/#include <glib\/.*>/#include <glib\.h>/g' "$i"
 	done &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ocsinventory-agent/receipt
--- a/ocsinventory-agent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ocsinventory-agent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.0.4"
 CATEGORY="network"
 SHORT_DESC="OCS Inventory NG agent for Linux"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.ocsinventory-ng.org/"
+WEB_SITE="https://www.ocsinventory-ng.org/en/"
 
 SOURCE="Ocsinventory-Unix-Agent"
 TARBALL="$SOURCE-$VERSION.tar.gz"
@@ -23,7 +23,7 @@
 	PERL_USE_UNSAFE_INC=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
 	rm -f run-postinst
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p \
 		$install/etc/ocsinventory-agent \
diff -r ad29ddfee1c9 -r d5aab818505e ocsinventory/receipt
--- a/ocsinventory/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ocsinventory/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,87 +3,85 @@
 PACKAGE="ocsinventory"
 VERSION="2.3.1"
 CATEGORY="meta"
-SHORT_DESC="Automated inventory and deployement system."
+SHORT_DESC="Automated inventory and deployement system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.ocsinventory-ng.org/en/"
+
 SOURCE="OCSNG_UNIX_SERVER"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.ocsinventory-ng.org/"
 WGET_URL="https://github.com/OCSInventory-NG/OCSInventory-Server/archive/$VERSION.tar.gz"
-TAGS="system administration"
 
 BUILD_DEPENDS="perl perl-dbd-mysql perl-apache-dbi perl-net-ip perl-xml-simple \
 wget"
-SPLIT="ocsinventory ocsinventory-server" # ocsreports
+SPLIT="$PACKAGE-server" # ocsreports
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/Apache
 	perl Makefile.PL &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	ocsinventory)
-		DEPENDS="ocsinventory-server ocsinventory-agent ocsreports"
-		mkdir $fs/usr
-		;;
-	ocsinventory-server)
-		CAT="network|Iventory and package deployment system"
-		DEPENDS="apache php-apache mysql perl perl-xml-simple \
+		ocsinventory)
+			DEPENDS="ocsinventory-server ocsinventory-agent ocsreports"
+			mkdir $fs/usr
+			TAGS="system administration"
+			;;
+		*-server)
+			CAT="network|Iventory and package deployment system"
+			DEPENDS="apache php-apache mysql perl perl-xml-simple \
 			perl-compress-raw-zlib perl-dbi perl-dbd-mysql \
 			perl-apache-dbi perl-net-ip perl-soap-lite \
 			perl-xml-parser perl-xml-sax-writer apache-mod-perl"
-		mkdir -p $fs/usr
-		cp -a $install/usr/lib $fs/usr
-	
-		install -o www -g www -m 0775  -d $fs/var/log/ocsinventory-server
-		install -o root -g www -m 0775 -d $fs/var/lib/ocsinventory-server/ipd
-		install -o root -g www -m 0775 -d $fs/var/lib/ocsinventory-server/download
-	
-		mkdir -p $fs/etc/logrotate.d
-		cp -f $src/etc/logrotate.d/ocsinventory-server \
-			$fs/etc/logrotate.d/ocsinventory-server
-		sed -i "s#PATH_TO_LOG_DIRECTORY#/var/log/ocsinventory-server#g" \
-			$fs/etc/logrotate.d/ocsinventory-server 
-	
-		mkdir -p $fs/etc/apache/conf.d
-		cp $src/etc/ocsinventory/ocsinventory-server.conf \
-			$fs/etc/apache/conf.d/ocsinventory-server.conf
-		sed -i  -e "s#DATABASE_SERVER#localhost#g" \
-			-e "s#DATABASE_PORT#3306#g" \
-			-e "s#VERSION_MP#2#g" \
-			-e "s#PATH_TO_LOG_DIRECTORY#/var/log/ocsinventory-server#g" \
-			$fs/etc/apache/conf.d/ocsinventory-server.conf
+			mkdir -p $fs/usr
+			cp -a $install/usr/lib $fs/usr
 
-		if ! grep -q mod_perl.so $fs/etc/apache/conf.d/ocsinventory-server.conf;
-		then
-			cat > $fs/etc/apache/conf.d/ocsinventory-server.tmp <<EOT
+			install -o www -g www -m 0775  -d $fs/var/log/ocsinventory-server
+			install -o root -g www -m 0775 -d $fs/var/lib/ocsinventory-server/ipd
+			install -o root -g www -m 0775 -d $fs/var/lib/ocsinventory-server/download
+
+			mkdir -p $fs/etc/logrotate.d
+			cp -f $src/etc/logrotate.d/ocsinventory-server \
+				$fs/etc/logrotate.d/ocsinventory-server
+			sed -i "s#PATH_TO_LOG_DIRECTORY#/var/log/ocsinventory-server#g" \
+				$fs/etc/logrotate.d/ocsinventory-server 
+
+			mkdir -p $fs/etc/apache/conf.d
+			cp $src/etc/ocsinventory/ocsinventory-server.conf \
+				$fs/etc/apache/conf.d/ocsinventory-server.conf
+			sed 
+				-e "s#DATABASE_SERVER#localhost#g" \
+				-e "s#DATABASE_PORT#3306#g" \
+				-e "s#VERSION_MP#2#g" \
+				-e "s#PATH_TO_LOG_DIRECTORY#/var/log/ocsinventory-server#g" \
+				-i $fs/etc/apache/conf.d/ocsinventory-server.conf
+
+			if ! grep -q mod_perl.so $fs/etc/apache/conf.d/ocsinventory-server.conf; then
+				cat > $fs/etc/apache/conf.d/ocsinventory-server.tmp <<EOT
 <IfModule !mod_perl.c>
    loadmodule perl_module share/apache/modules/mod_perl.so
 </IfModule>
 
 $(cat $fs/etc/apache/conf.d/ocsinventory-server.conf)
 EOT
-			mv $fs/etc/apache/conf.d/ocsinventory-server.tmp \
-				$fs/etc/apache/conf.d/ocsinventory-server
-			[ -f $fs/etc/apache/conf.d/ocsinventory-server.conf ] && \
-				rm -f $fs/etc/apache/conf.d/ocsinventory-server.conf
-		fi
-		;;
-	ocsreports)
-		CAT="network|Inventory and package deployement system"
-		TAGS="system administration"
-		DEPENDS="php-apache php-mysql mysql"
-		mkdir -p $fs/usr/share \
-			$fs/etc/ocsreports
-		
-		cp -a $src/${PACKAGE} $fs/usr/share/
-		cat > $fs/etc/ocsreports/dbconfig.inc.php <<EOT
+				mv $fs/etc/apache/conf.d/ocsinventory-server.tmp \
+					$fs/etc/apache/conf.d/ocsinventory-server
+				[ -f $fs/etc/apache/conf.d/ocsinventory-server.conf ] &&
+					rm -f $fs/etc/apache/conf.d/ocsinventory-server.conf
+			fi
+			;;
+		ocsreports)
+			CAT="network|Inventory and package deployement system"
+			TAGS="system administration"
+			DEPENDS="php-apache php-mysql mysql"
+			mkdir -p $fs/usr/share \
+				$fs/etc/ocsreports
+
+			cp -a $src/$PACKAGE $fs/usr/share/
+			cat > $fs/etc/ocsreports/dbconfig.inc.php <<EOT
 <?php 
 define("DB_NAME", "ocsweb");
 define("SERVER_READ","localhost");
@@ -93,20 +91,21 @@
 ?>
 EOT
 
-		install -o root -g www -m 0755 $src/binutils/*.pl \
-			$fs/usr/share/ocsreports/
-		
-		rm -f $fs/usr/share/${PACKAGE}/dbconfig.inc.php
-		cd $fs/usr/share/${PACKAGE} ; ln -s /etc/ocsreports/dbconfig.inc.php ; cd -
+			install -o root -g www -m 0755 $src/binutils/*.pl \
+				$fs/usr/share/ocsreports/
 
-		# Remove doc file.
-		rm -f  $fs/usr/share/ocsreports/files/*.pdf
-		;;
+			rm -f $fs/usr/share/$PACKAGE/dbconfig.inc.php
+			cd $fs/usr/share/$PACKAGE
+			ln -s /etc/ocsreports/dbconfig.inc.php
+			cd -
+
+			# Remove doc file.
+			rm -f  $fs/usr/share/ocsreports/files/*.pdf
+			;;
 	esac
 }
 
-post_install_ocsinventory_server()
-{
+post_install_ocsinventory_server() {
 	if [ -z "$1" ]; then
 		echo "Now you can connect to http://$(hostname)/ocsreports"
 		# Restart Apache if is running
@@ -114,8 +113,7 @@
 	fi
 }
 
-post_install_ocsreports()
-{
+post_install_ocsreports() {
 	# Configure apache server
 	if [ -f "$1/etc/apache/httpd.conf" ]; then
 		if [ ! -f "$1/etc/apache/conf.d/$PACKAGE" ]; then
@@ -133,7 +131,7 @@
 EOT
 			if [ -z "$1" ]; then
 				# Start Web server.
-				test -f /var/run/apache/httpd.pid && \
+				test -f /var/run/apache/httpd.pid &&
 					( kill -0 $(cat /var/run/apache/httpd.pid) && /etc/init.d/apache restart )
 			fi
 		fi
@@ -143,46 +141,50 @@
 	if [ -z "$1" ]; then
 		if ( ! mysqladmin -s ping > /dev/null ); then
 			echo "Starting MySQL server"
-			( /etc/init.d/mysql start ; status  ) || exit 
+			( /etc/init.d/mysql start; status ) || exit
 			sleep 4 #let the mysql daemon start
 		fi
+
 		if ( ! mysql -Be 'show databases' | grep -q ocsweb ); then
-			echo -n "Create $PACKAGE database and schema"
-			mysql -Be "create database ocsweb CHARACTER SET utf8 COLLATE utf8_bin" ; status
+			action "Create $PACKAGE database and schema"
+			mysql -Be "create database ocsweb CHARACTER SET utf8 COLLATE utf8_bin"
+			status
+
 			mysql -s -u root ocsweb < /usr/share/$PACKAGE/files/ocsbase_new.sql > /dev/null 2>&1
+
 			# We suppose that ocs user does not exist.
 			# It may be false.
-			echo  -n "Create user ocs with password ocs"
-			mysql -Be "grant all privileges on ocsweb.* to 'ocs'@'localhost' 
-				identified by 'ocs'" ; status
+			action "Create user ocs with password ocs"
+			mysql -Be "grant all privileges on ocsweb.* to 'ocs'@'localhost'
+				identified by 'ocs'"
+			status
 		fi
-			
 	fi
 	true
 }
 
-post_remove_ocsreports()
-{
+post_remove_ocsreports() {
+	[ -z "$1" ] || return
 
-	if [ -z "$1" ]; then
-		echo -n "Would you like to remove data and database files.(y/n) "
-		read answer
+	echo -n "Would you like to remove data and database files.(y/n) "
+	read answer
 
-		case $answer in 
+	case $answer in
 		y|Y)
-			echo -n "Removing data directories..."
+			acrion "Removing data directories..."
 			rm -rf /usr/share/ocsreports
+			status
+
 			if ( mysql -Be 'show databases' | grep -q ocsweb ); then
-				echo -n "Deleting ocsreports database;"
-				mysql -u root -Be "drop database ocsweb;" ; status
-				echo  -n "Delete user ocs"
-				mysql -u root -Be "delete from mysql.db where user=ocs;" ; status
+				action "Deleting ocsreports database"
+				mysql -u root -Be "drop database ocsweb;"
+				status
+
+				action "Delete user ocs"
+				mysql -u root -Be "delete from mysql.db where user=ocs;"
+				status
 			fi
-			unset $answer
 			;;
-		*)
-			;;
-		esac
-	fi
-	
+	esac
+	unset $answer
 }
diff -r ad29ddfee1c9 -r d5aab818505e octave/receipt
--- a/octave/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/octave/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,40 +1,44 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="octave"
 VERSION="4.0.0"
 CATEGORY="development"
-SHORT_DESC="Language for numerical computations."
+SHORT_DESC="Language for numerical computations"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/octave/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://www.gnu.org/software/octave/"
 WGET_URL="ftp://ftp.gnu.org/gnu/$PACKAGE/$TARBALL"
-TAGS="programming language"
 
-DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base expat \
-mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \
-xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl lapack bash \
-gcc fltk gnuplot"
 BUILD_DEPENDS="gfortran zlib-dev ncurses-dev readline-dev freetype-dev xorg-dev \
 fltk-dev perl texinfo lapack tar gawk pcre-dev mesa-dev curl-dev \
-libdrm-dev expat-dev libxml2-dev $DEPENDS"
+libdrm-dev expat-dev libxml2-dev libgfortran zlib ncurses readline freetype \
+gcc-lib-base expat mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm \
+xorg-libXdamage xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl \
+lapack bash gcc fltk gnuplot"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# http://www.nabble.com/Random-rounding-errors-td16010966.html
 	FFLAGS="-O -ffloat-store" \
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--libexecdir=/usr/lib/$PACKAGE \
-	--mandir=/usr/share/man \
-	--enable-shared --disable-static --disable-docs \
-	$CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--libexecdir=/usr/lib/$PACKAGE \
+		--mandir=/usr/share/man \
+		--enable-shared \
+		--disable-static \
+		--disable-docs \
+		$CONFIGURE_ARGS &&
 	LANG=C make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libgfortran zlib ncurses readline freetype gcc-lib-base expat \
+	mesa glu xorg-libX11 xorg-libXext xorg-libXxf86vm xorg-libXdamage \
+	xorg-libXfixes libdrm xorg-libXau xorg-libXdmcp pcre libcurl lapack bash \
+	gcc fltk gnuplot"
+	TAGS="programming language"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ode/receipt
--- a/ode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,14 +5,14 @@
 CATEGORY="misc"
 SHORT_DESC="An open source, high performance library for simulating rigid body \
 dynamics"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1 BSD"
 WEB_SITE="http://www.ode.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/opende/$TARBALL"
 
-SPLIT="ode-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e odt2txt/receipt
--- a/odt2txt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/odt2txt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4"
 CATEGORY="utilities"
 SHORT_DESC="A simple converter from OpenDocument Text to plain text"
-MAINTAINER="milka@konstelacioj.info"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.stosberg.net/odt2txt/"
 
diff -r ad29ddfee1c9 -r d5aab818505e offlineimap/receipt
--- a/offlineimap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/offlineimap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.0.3"
 CATEGORY="network"
 SHORT_DESC="IMAP/Maildir synchronization and reader support"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://software.complete.org/software/projects/show/offlineimap/"
 
@@ -14,9 +14,10 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/etc
-	cp offlineimap.conf* $DESTDIR/etc
-	python setup.py install --root=$DESTDIR
+	mkdir -p $install/etc
+	cp offlineimap.conf* $install/etc
+
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ofono/receipt
--- a/ofono/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ofono/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,22 @@
 VERSION="1.14"
 CATEGORY="network"
 SHORT_DESC="Stack for mobile telephony (GSM/UMTS) applications"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://ofono.org"
+WEB_SITE="http://ofono.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://linux-kernel.uio.no/pub/linux/network/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="dbus-dev eudev-dev glib-dev bluez-dev \
 mobile-broadband-provider-info-dev"
-SPLIT="ofono-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/etc/* $install/etc/
 }
diff -r ad29ddfee1c9 -r d5aab818505e ogmrip/receipt
--- a/ogmrip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ogmrip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.13.7"
 CATEGORY="multimedia"
 SHORT_DESC="Libraries and GTK2 interface for DVD ripping using mencoder"
-MAINTAINER="fredericguilbault@live.ca"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://ogmrip.sourceforge.net/en/index.html"
 
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ola/receipt
--- a/ola/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ola/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 BUILD_DEPENDS="libtool flex protobuf-dev util-linux-uuid-dev cppunit-dev \
 libmicrohttpd-dev libftdi-dev libusb-dev liblo-dev ncurses-dev \
 libusb-compat-dev"
-SPLIT="ola-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -i
diff -r ad29ddfee1c9 -r d5aab818505e oniguruma/receipt
--- a/oniguruma/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/oniguruma/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="oniguruma-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -vfi &&
diff -r ad29ddfee1c9 -r d5aab818505e opal/receipt
--- a/opal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="ptlib-dev openssl-dev"
-SPLIT="opal-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's| abs(| std::fabs(|g' plugins/video/common/mpi.cxx
@@ -33,7 +33,7 @@
 		$CONFIGURE_ARGS &&
 	CXXFLAGS=-Wno-deprecated-declarations \
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod 644 $install/usr/lib/libopal_s.a
 }
diff -r ad29ddfee1c9 -r d5aab818505e open-cobol/receipt
--- a/open-cobol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/open-cobol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e open-iscsi/receipt
--- a/open-iscsi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/open-iscsi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,31 @@
 PACKAGE="open-iscsi"
 VERSION="2.0-871"
 CATEGORY="network"
-SHORT_DESC="Implementation of RFC3720 userland utilities."
+SHORT_DESC="Implementation of RFC3720 userland utilities"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.open-iscsi.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.open-iscsi.org/"
 WGET_URL="${WEB_SITE}bits/$TARBALL"
 
-DEPENDS="linux-scsi"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/ install_kernel / /' Makefile
 	sed -i 's|dirent.h>|&\n#include <sys/types.h>\n#include <sys/stat.h>|' \
 		usr/iscsi_sysfs.c
-	sed -i "s|/etc/iscsi/initiatorname.iscsi|$DESTDIR&|" Makefile
-	make user 2>&1 | grep -v 'slitaz/build/Makefile'
-	make DESTDIR=$DESTDIR install
+	sed -i "s|/etc/iscsi/initiatorname.iscsi|$install&|" Makefile
+
+	make user &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/etc $fs
 	cp -a $install/sbin $fs
+	DEPENDS="linux-scsi"
 }
 
-post_install()
-{
+post_install() {
 	if  [ ! -f "$1/etc/iscsi/initiatorname.iscsi" ]; then
 		echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi"
 	fi
diff -r ad29ddfee1c9 -r d5aab818505e open-vm-tools-kernel/receipt
--- a/open-vm-tools-kernel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/open-vm-tools-kernel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="open-vm-tools-kernel"
 VERSION="10.0.0-3000743"
 EXTRAVERSION="_$kvers"
 CATEGORY="utilities"
 SHORT_DESC="Open VMware Tools"
-MAINTAINER="nobody@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://github.com/vmware/open-vm-tools"
 REPOLOGY="open-vm-tools"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="open-vm-tools-$VERSION.tar.gz"
 WGET_URL="https://github.com/vmware/open-vm-tools/archive/$TARBALL"
 
-DEPENDS="linux shutdown glib libffi libmspack open-vm-tools procps"
 BUILD_DEPENDS="wget cacerts linux autoconf automake libtool linux-source \
 linux-module-headers procps glib-dev libffi-dev libdnet-dev libmspack-dev \
 slitaz-toolchain bc"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	[ -d /lib/modules/${kvers}-slitaz/source ] || get-linux-source
+compile_rules() {
+	[ -d /lib/modules/$kvers-slitaz/source ] || get-linux-source
 
 	cd open-vm-tools
 	sed -i -e "s/-Werror//" configure.ac
 	autoreconf -i
-        ./configure \
+	./configure \
 		--without-pam \
 		--without-x \
 		--without-icu \
@@ -35,22 +31,21 @@
 		--without-gtkmm \
 		--without-xmlsecurity \
 		--without-xerces \
-		--with-kernel-release=${kvers}-slitaz \
-                $CONFIGURE_ARGS && cd modules && \
-        make && make DESTDIR=$install install
+		--with-kernel-release=$kvers-slitaz \
+		$CONFIGURE_ARGS &&
+	cd modules &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-
+genpkg_rules() {
 	mkdir -p $fs/lib
 	cp -a $install/lib/modules $fs/lib
 	TAGS="vmware kernel"
+	DEPENDS="linux shutdown glib libffi libmspack open-vm-tools procps"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 	status
 }
diff -r ad29ddfee1c9 -r d5aab818505e open-vm-tools/receipt
--- a/open-vm-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/open-vm-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="open-vm-tools"
 VERSION="10.0.0-3000743"
 CATEGORY="utilities"
-TAGS="vmware kernel"
 SHORT_DESC="Open VMware Tools"
-MAINTAINER="nobody@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="https://github.com/vmware/open-vm-tools"
+
 TARBALL="open-vm-tools-$VERSION.tar.gz"
-WEB_SITE="https://github.com/vmware/open-vm-tools"
 WGET_URL="https://github.com/vmware/open-vm-tools/archive/$TARBALL"
-HOST_ARCH="i486 x86_64"
 
-DEPENDS="shutdown glib libffi libmspack procps libdnet"
 BUILD_DEPENDS="autoconf automake libtool linux-source procps \
 glib-dev libffi-dev libdnet-dev libmspack-dev openssl-dev"
 
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd open-vm-tools
 	sed -i -e "s/-Werror//" configure.ac
+
 	autoreconf -i
-        ./configure \
+	./configure \
 		--without-kernel-modules \
 		--without-pam \
 		--without-x \
@@ -32,13 +28,12 @@
 		--without-gtkmm \
 		--without-xmlsecurity \
 		--without-xerces \
-                $CONFIGURE_ARGS &&
-        make && make DESTDIR=$install install
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	mkdir -p $fs/usr/share
 	mkdir -p $fs/sbin
@@ -68,4 +63,6 @@
 	cp -a $install/usr/lib/*.a $fs/usr/lib
 	cp -a $install/usr/lib/open-vm-tools $fs/usr/lib
 	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	DEPENDS="shutdown glib libffi libmspack procps libdnet"
+	TAGS="vmware kernel"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openal/receipt
--- a/openal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,12 @@
 WGET_URL="http://www.openal-soft.org/openal-releases/$TARBALL"
 
 BUILD_DEPENDS="cmake"
-SPLIT="openal-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	cmake -DCMAKE_INSTALL_PREFIX=/usr
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
 	make &&
 	make install
 }
diff -r ad29ddfee1c9 -r d5aab818505e openbox-themes-debian/receipt
--- a/openbox-themes-debian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openbox-themes-debian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share
 	cp -a debian/themes $install/usr/share
 
@@ -23,9 +21,7 @@
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="openbox"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openbox/receipt
--- a/openbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,18 @@
 VERSION="3.6.1"
 CATEGORY="x-window"
 SHORT_DESC="Small-footprint and standard compliant Window Manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://openbox.org/"
 
-TARBALL="openbox-$VERSION.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://openbox.org/dist/openbox/$TARBALL"
 
-BUILD_DEPENDS="glib-dev pango-dev \
-gettext xorg-libXcursor-dev xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev \
-xorg-libXinerama-dev startup-notification-dev automake libtool docbook-utils \
-xorg-libXi-dev xorg-xcb-util-dev imlib2-dev librsvg-dev"
-SPLIT="openbox openbox-light:light openbox-themes openbox-python openbox-dev"
+BUILD_DEPENDS="glib-dev pango-dev gettext-dev xorg-libXcursor-dev \
+xorg-libICE-dev xorg-libSM-dev xorg-libXrandr-dev xorg-libXinerama-dev \
+startup-notification-dev automake libtool docbook-utils xorg-libXi-dev \
+xorg-xcb-util-dev imlib2-dev librsvg-dev"
+SPLIT="$PACKAGE-light:light $PACKAGE-themes $PACKAGE-python $PACKAGE-dev"
 
 compile_rules() {
 	case $SET in
@@ -33,7 +33,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install &&
+	make -j1 DESTDIR=$install install &&
 
 	# Pipe menu.
 	install -m755 $stuff/open-folder-menu.sh \
diff -r ad29ddfee1c9 -r d5aab818505e opencc/receipt
--- a/opencc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opencc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,38 +6,38 @@
 SHORT_DESC="Libraries for Simplified-Traditional Chinese Conversion"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="http://byvoid.github.io/OpenCC/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://byvoid.github.io/OpenCC/"
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/opencc/$TARBALL" # FIXME
 
-BUILD_DEPENDS="cmake gettext"
-SPLIT="opencc-tools opencc opencc-dev"
+BUILD_DEPENDS="cmake gettext-dev"
+SPLIT="$PACKAGE-tools $PACKAGE $PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $src/build
-	cd $src/build
-	cmake $src -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_GETTEXT:BOOL=ON || return 1
-	cd $src
-	make -C build || return 1
-	make install -C build DESTDIR=$DESTDIR
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DENABLE_GETTEXT:BOOL=ON \
+		.. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	opencc-tools)
-		CAT="utilities|command line tools"
-		DEPENDS="opencc"
-		copy usr/bin/ # only binaries
-		;;
-	opencc)
-		copy @std @rm # all the rest
-		;;
-	opencc-dev)
-		copy @dev
-		;;
+		opencc-tools)
+			copy usr/bin/ # only binaries
+			CAT="utilities|command line tools"
+			DEPENDS="opencc"
+			;;
+		opencc)
+			copy @std @rm # all the rest
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e openconnect/receipt
--- a/openconnect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openconnect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="7.08"
 CATEGORY="network"
 SHORT_DESC="A client for Cisco's AnyConnect SSL VPN"
-MAINTAINER="samuel_trassare@yahoo.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.infradead.org/openconnect/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.infradead.org/pub/openconnect/$TARBALL"
 
-BUILD_DEPENDS="vpnc gettext gnutls-dev lz4-dev libproxy-dev krb5-dev"
+BUILD_DEPENDS="vpnc gettext-dev gnutls-dev lz4-dev libproxy-dev krb5-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e opencore-amr/receipt
--- a/opencore-amr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opencore-amr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.1.3"
 CATEGORY="multimedia"
 SHORT_DESC="Adaptive Multi Rate (AMR) speech codec"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
-WEB_SITE="http://opencore-amr.sourceforge.net"
+WEB_SITE="http://opencore-amr.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="opencore-amr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e opencpn/receipt
--- a/opencpn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opencpn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="A concise Chart/plotter Navigator"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://opencpn.sourceforge.net"
+WEB_SITE="http://opencpn.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="wxWidgets28-dev mesa-dev glu-dev"
 
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e opencsg/receipt
--- a/opencsg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opencsg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,28 +12,26 @@
 WGET_URL="${WEB_SITE}$TARBALL"
 
 BUILD_DEPENDS="glew-dev mesa-dev freeglut-dev"
-SPLIT="opencsg-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	for i in /usr/lib /usr/bin /bin /usr/include; do
-		mkdir -p $DESTDIR$i
+		mkdir -p $install$i
 	done
 	find -name Makefile | xargs sed -i 's|usr/local|usr|'
-	make -j 1 &&
-	make INSTALL_ROOT=$DESTDIR install
+
+	make -j1 &&
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		opencsg)
-			mkdir -p $fs/usr
-			cp -a $install/usr/lib $fs/usr
+			copy *.so
 			DEPENDS="glew mesa"
 			;;
 		*-dev)
-			mkdir -p $fs/usr
-			cp -a $install/usr/bin $fs/usr
-			cp -a $install/usr/include $fs/usr
+			copy @dev @std @rm # /usr/bin/opencsgexample moved here
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e opencv/receipt
--- a/opencv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opencv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 libjpeg-turbo-dev tiff-dev libpng16-dev libwebp-dev jasper-dev openexr-dev \
 ilmbase-dev gtk2-dev glib-dev gstreamer1-dev gst1-plugins-base-dev \
 libgphoto2-dev shared-mime-info xine-lib-dev protobuf-dev " # lapack-dev
-SPLIT="opencv opencv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	ipp_file=$SRC/$(basename $WGET_URL2)
diff -r ad29ddfee1c9 -r d5aab818505e openerp-client-etl/receipt
--- a/openerp-client-etl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openerp-client-etl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="openerp-client-etl"
 VERSION="1.1.1"
 CATEGORY="development"
-SHORT_DESC="Allows to extract, transform and load data from any data source."
+SHORT_DESC="Allows to extract, transform and load data from any data source"
 MAINTAINER="pascal.bellard@slitaz.org"
+WEB_SITE="https://pypi.org/project/openerp-client-etl"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://pypi.org/project/openerp-client-etl"
 WGET_URL="https://files.pythonhosted.org/packages/source/o/$PACKAGE/$TARBALL"
 
-DEPENDS="python wget"
 BUILD_DEPENDS="python-dev python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python wget"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openerp-client/receipt
--- a/openerp-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openerp-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,40 +1,37 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="openerp-client"
 VERSION="5.0.1-0"
 CATEGORY="office"
-SHORT_DESC="Open source ERP client files."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Open source ERP client files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://openerp.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://openerp.com/"
 WGET_URL="$WEB_SITE/download/stable/source/$TARBALL"
-SUGGESTED="epdfview"
 
-DEPENDS="postgresql-client python python-pygtk python-pygobject2 python-pycairo python-pyxml \
-python-egenix-mx-base"
 BUILD_DEPENDS="python python-dev python-pygtk python-egenix-mx-base"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed 's/^#.*//' < setup.py > setup2.py
-	python setup2.py build
-	python setup2.py install --root=$DESTDIR
+	python -B setup2.py build
+	python -B setup2.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $install/usr/share/openerp-client $fs/usr/share
 	cp -a $install/usr/share/locale $fs/usr/share
-	cp stuff/openerp-client.desktop $fs/usr/share/applications
+	cp $stuff/openerp-client.desktop $fs/usr/share/applications
 	sed -i 's|cd .*install|cd |' $fs/usr/bin/openerp-client
 	mkdir -p $fs/usr/share/openerp-client/pixmaps/
 	ln -s /usr/share/pixmaps/openerp-client/openerp_logo.png \
 		$fs/usr/share/openerp-client/pixmaps
+	DEPENDS="postgresql-client python python-pygtk python-pygobject2 \
+	python-pycairo python-pyxml python-egenix-mx-base"
+	SUGGESTED="epdfview"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openerp-server/receipt
--- a/openerp-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openerp-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,50 +1,48 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="openerp-server"
 VERSION="5.0.1-0"
 CATEGORY="office"
-SHORT_DESC="Open source ERP server files."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Open source ERP server files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://openerp.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://openerp.com/"
 WGET_URL="$WEB_SITE/download/stable/source/$TARBALL"
 
-DEPENDS="python postgresql libxml2-python libxslt python-psycopg2 python-reportlab \
-python-pyparsing graphviz libgcrypt python-pil python-lxml matplotlib \
-python-pyxml python-pychart python-pydot python-egenix-mx-base"
-BUILD_DEPENDS="libxml2-python python-psycopg2 libxml2 libxslt-python python-reportlab \
-python-pychart python-pydot python-dev"
+BUILD_DEPENDS="libxml2-python python-psycopg2 libxml2 libxslt-python \
+python-reportlab python-pychart python-pydot python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/var/log/openerp
 	chmod 777 $fs/var/log/openerp
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $stuff/* $fs
 	sed -i 's|cd .*install|cd |' $fs/usr/bin/openerp-server
+	DEPENDS="python postgresql libxml2-python libxslt python-psycopg2 \
+	python-reportlab python-pyparsing graphviz libgcrypt python-pil \
+	python-lxml matplotlib python-pyxml python-pychart python-pydot \
+	python-egenix-mx-base"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	#chroot "$1/" adduser -H -D -S -s /bin/false -h /dev/null -g "OpenERP Daemon user" openerp
 	[ "$1" ] || /etc/init.d/$PACKAGE start
-	cat <<EOF
-----
-To start $PACKAGE server you can run :
 
-    /etc/init.d/$PACKAGE start
+	[ -n "$quiet" ] ||cat <<EOF
 
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.-------------------------------------------------------.
+	| To start openerp server you can run:                  |
+	|                                                       |
+	| /etc/init.d/openerp-server start                      |
+	|                                                       |
+	| or add openerp-server to RUN_DAEMONS in /etc/rcS.conf |
+	'-------------------------------------------------------'
 EOF
 }
diff -r ad29ddfee1c9 -r d5aab818505e openerp-web/receipt
--- a/openerp-web/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openerp-web/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,47 +3,44 @@
 PACKAGE="openerp-web"
 VERSION="5.0.14"
 CATEGORY="office"
-SHORT_DESC="Open source ERP web client."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Open source ERP web client"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
+WEB_SITE="http://openerp.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://openerp.com/"
 WGET_URL="$WEB_SITE/download/stable/source/$TARBALL"
-CONFIG_FILES="/etc/openerp/openerp-web.conf"
-# http://doc.openerp.com/install/linux/web/index.html
 
-DEPENDS="matplotlib python-turbogears python-pil python \
-python-pyxml python-pyparsing python-babel python-mako python-markupsafe"
 BUILD_DEPENDS="python-dev python python-pyxml python-turbogears"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/openerp $fs/usr/share/applications
-	cp -a stuff/etc $fs/
+	cp -a $stuff/etc $fs/
 	cp -a $install/usr/config/openerp-web.cfg $fs/etc/openerp/openerp-web.conf
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	DEPENDS="matplotlib python-turbogears python-pil python \
+	python-pyxml python-pyparsing python-babel python-mako python-markupsafe"
+	CONFIG_FILES="/etc/openerp/openerp-web.conf"
+	# http://doc.openerp.com/install/linux/web/index.html
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	#sed -i "s/^RUN_DAEMONS=\"/RUN_DAEMONS=\"openerp-web /" "$1/etc/rcS.conf"
 	[ -z "$1" ] && /etc/init.d/openerp-web start
-	cat <<EOF
-----
-To start $PACKAGE server you can run :
 
-    /etc/init.d/openerp-web start
+	[ -n "$quiet" ] || cat <<EOF
 
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.----------------------------------------------------.
+	| To start openerp-web server you can run:           |
+	|                                                    |
+	|    /etc/init.d/openerp-web start                   |
+	|                                                    |
+	| or add openerp-web to RUN_DAEMONS in /etc/rcS.conf |
+	'----------------------------------------------------'
 EOF
 }
diff -r ad29ddfee1c9 -r d5aab818505e openexr/receipt
--- a/openexr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openexr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.2.0"
 CATEGORY="x-window"
 SHORT_DESC="Library for EXR images"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.openexr.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib zlib-dev ilmbase-dev"
-SPLIT="openexr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e openjdk-6-src/receipt
--- a/openjdk-6-src/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openjdk-6-src/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,9 @@
 VERSION="b20-21_jun_2010"
 CATEGORY="meta"
 SHORT_DESC="Openjdk6 we use to cook icedtea6 (empty package)"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://java.sun.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://java.sun.com"
 WGET_URL="http://download.java.net/openjdk/jdk6/promoted/${VERSION%-*}/$TARBALL"
-COOK_OPT="!unpack !repack_src !fs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
-	mkdir -p $fs/usr
-}
diff -r ad29ddfee1c9 -r d5aab818505e openjdk-7-src/receipt
--- a/openjdk-7-src/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openjdk-7-src/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,8 @@
 SHORT_DESC="OpenJDK 7 we use to cook icedtea7 (empty package)"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://java.sun.com/"
+
 SOURCE="openjdk-7-fcs-src"
 TARBALL="$SOURCE-$VERSION.zip"
-WEB_SITE="http://java.sun.com"
 WGET_URL="http://download.java.net/openjdk/jdk7/promoted/${VERSION%-*}/$TARBALL"
-COOK_OPT="!unpack !repack_src !fs"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
-	mkdir -p $fs/usr
-}
diff -r ad29ddfee1c9 -r d5aab818505e openjpeg/receipt
--- a/openjpeg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openjpeg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.2"
 CATEGORY="graphics"
 SHORT_DESC="An open source JPEG 2000 codec"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.openjpeg.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/openjpeg.html"
@@ -14,7 +14,7 @@
 WGET_URL="$SF_MIRROR/openjpeg.mirror/$TARBALL"
 
 BUILD_DEPENDS="automake libtool libpng16-dev zlib-dev tiff-dev lcms2-dev"
-SPLIT="openjpeg-tools openjpeg-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	autoreconf -fi &&
diff -r ad29ddfee1c9 -r d5aab818505e openjpeg2/receipt
--- a/openjpeg2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openjpeg2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="https://github.com/uclouvain/openjpeg/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake zlib-dev libpng16-dev tiff-dev lcms2-dev"
-SPLIT="openjpeg2-tools openjpeg2-dev"
+SPLIT="$PACKAGE-tools $PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e openldap/receipt
--- a/openldap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openldap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://mirror.eu.oneandone.net/software/openldap/openldap-release/$TARBALL"
 
 BUILD_DEPENDS="automake util-linux-uuid-dev openssl-dev libtool groff"
-SPLIT="libldap openldap openldap-dev"
+SPLIT="libldap $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	addgroup -g 84 -S ldap
diff -r ad29ddfee1c9 -r d5aab818505e openmotif/receipt
--- a/openmotif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openmotif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 xorg-xbitmaps fontconfig-dev freetype-dev jpeg-dev libpng16-dev xorg-libXt-dev \
 xorg-libSM-dev xorg-libXmu-dev xorg-libX11-dev xorg-xorgproto \
 bison flex xorg-libXp util-linux-uuid-dev expat-dev libxml2-dev"
-SPLIT="openmotif-demo openmotif-dev openmotif openmotif-man"
+SPLIT="$PACKAGE-demo $PACKAGE-dev $PACKAGE"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
@@ -22,7 +22,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -41,9 +41,5 @@
 			DEPENDS="xorg fontconfig expat freetype jpeg libpng16 xorg-libXp \
 			xorg-libXft"
 			;;
-		openmotif-man)
-			copy man/
-			CAT="non-free|manual pages"
-			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e openmpi/receipt
--- a/openmpi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openmpi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.3" # current stable is 3.0.0
 CATEGORY="development"
 SHORT_DESC="High performance message passing library (MPI)"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.open-mpi.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://www.open-mpi.org/software/ompi/v${VERSION%.*}/downloads/$TARBALL"
 
 BUILD_DEPENDS="gcc gfortran libtool openssh valgrind valgrind-dev"
-SPLIT="openmpi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e openobex/receipt
--- a/openobex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openobex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="openobex"
 VERSION="1.7.2"
 CATEGORY="libs"
-SHORT_DESC="OpenOBEX is an Open-source library for the OBject EXchange protocol"
+SHORT_DESC="Opensource library for the OBject EXchange protocol"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://gitlab.com/openobex/mainline"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake bluez-dev libusb-dev libusb-compat-dev"
-SPLIT="openobex-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# group plugdev (83) provided by slitaz-base-files
diff -r ad29ddfee1c9 -r d5aab818505e opensc/receipt
--- a/opensc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opensc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e openscad/receipt
--- a/openscad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openscad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="openscad"
 VERSION="2014.03"
 CATEGORY="graphics"
-SHORT_DESC="The Programmers Solid 3D CAD Modeller."
+SHORT_DESC="The Programmers Solid 3D CAD Modeller"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.openscad.org/"
+
 TARBALL="$PACKAGE-$VERSION.src.tar.gz"
-WEB_SITE="http://www.openscad.org/"
 WGET_URL="http://files.openscad.org//$TARBALL"
 
-DEPENDS="cgal gmp mpfr glew opencsg mesa boost-program-options \
-boost-filesystem boost-thread boost-regex libQtOpenGL \
-libQtCore libQtGui glib"
 BUILD_DEPENDS="cmake flex Qt4-dev cgal-dev gmp-dev mpfr-dev \
 glib-dev glew-dev opencsg-dev eigen mesa-dev boost-dev \
 boost-program-options boost-filesystem boost-regex boost-thread \
 qmake"
 
-# Rules to configure and make the package.
-#
-compile_rules()
-{
+compile_rules() {
 	./scripts/check-dependencies.sh
 	qmake PREFIX="/usr" &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="cgal gmp mpfr glew opencsg mesa boost-program-options \
+	boost-filesystem boost-thread boost-regex libQtOpenGL \
+	libQtCore libQtGui glib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openshot/receipt
--- a/openshot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openshot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="openshot"
 VERSION="1.4.3"
 CATEGORY="multimedia"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-SHORT_DESC="an open-source, non-linear video editor for Linux based on MLT framework"
+SHORT_DESC="Open-source, non-linear video editor for Linux based on MLT framework"
 WEB_SITE="http://www.openshotvideo.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/openshot/${VERSION%.*}/$VERSION/+download/$TARBALL"
-TAGS=""
 
-DEPENDS="mlt-python-bindings pygoocanvas libsdl librsvg python-pyxdg \
-frei0r-plugins python-pil python-httplib2"
-SUGGESTED="dvgrab libquicktime libavc1394 faac jack ladspa"
 BUILD_DEPENDS="mlt-dev librsvg-dev libsdl-dev frei0r-plugins-dev sox-dev \
 ffmpeg-dev goocanvas-dev"
 
-# Rules to configure and make the package.
 compile_rules() {
-	python setup.py install --root=$DESTDIR --optimize=1
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="mlt-python-bindings pygoocanvas libsdl librsvg python-pyxdg \
+	frei0r-plugins python-pil python-httplib2"
+	SUGGESTED="dvgrab libquicktime libavc1394 faac jack ladspa"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e opensp/receipt
--- a/opensp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opensp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.5.2"
 CATEGORY="misc"
 SHORT_DESC="An implementation of DSSSL, a style language to format SGML or XML documents"
-MAINTAINER="remy.carel@free.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://openjade.sourceforge.net/"
 
 TARBALL="OpenSP-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/openjade/$TARBALL"
 
-BUILD_DEPENDS="perl gfortran gettext docbook-sgml"
-SPLIT="opensp-dev"
+BUILD_DEPENDS="perl gfortran gettext-dev docbook-sgml"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/32,/253,/' lib/Syntax.cxx
diff -r ad29ddfee1c9 -r d5aab818505e openspades/receipt
--- a/openspades/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openspades/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,34 +7,32 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://openspades.yvt.jp/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/yvt/openspades/archive/v$VERSION.tar.gz"
 
-DEPENDS="gcc49-lib-base glew glibc-base libcurl glu libsdl2 \
-libsdl2-image xorg-libxcb mesa util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \
-xorg-libXau xorg-libXdmcp xorg-libXext zlib"
 BUILD_DEPENDS="gcc49 cmake libsdl2-dev libsdl2-image-dev freealut-dev mesa-dev \
 glew-dev curl-dev imagemagick grep unzip"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export CXX=/usr/bin/i486-slitaz-linux-g++-49
 
-	mkdir build; cd build
-	cmake .. \
+	mkdir build
+	cd    build
+	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DOPENSPADES_RESDIR=/usr/share/openspades/Resources \
 		-DOPENSPADES_INSTALL_RESOURCES=share/openspades/Resources \
 		-DOPENSPADES_INSTALL_BINARY=bin \
-		&&
+		.. &&
 	make -j1 &&
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gcc49-lib-base glew glibc-base libcurl glu libsdl2 libsdl2-image \
+	xorg-libxcb mesa util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \
+	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e openssh/receipt
--- a/openssh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openssh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$TARBALL"
 
-BUILD_DEPENDS="openssl-dev zlib-dev openssl-dev perl mdocml-dev pam-dev" # groff
-SPLIT="openssh openssh-pam:pam"
+BUILD_DEPENDS="openssl-dev zlib-dev openssl-dev perl mandoc-dev pam-dev" # groff
+SPLIT="$PACKAGE-pam:pam"
 
 compile_rules() {
 	install -m700 -d /var/lib/sshd
@@ -40,7 +40,7 @@
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -vm755 contrib/ssh-copy-id $install/usr/bin/
 
diff -r ad29ddfee1c9 -r d5aab818505e openssl/receipt
--- a/openssl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openssl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,8 @@
 # Integrity check: https://www.openssl.org/source/
 TARBALL_SHA256="5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="perl zlib-dev"
-SPLIT="openssl openssl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# MAKEFLAGS make OpenSSL build fail.
@@ -25,8 +24,6 @@
 	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 	# marked as not requiring an executable stack (compatibility improvement).
 	case "$ARCH" in
-		arm*)   ARCH_ARGS='linux-armv4'
-		        MAKE_ARGS="CC=$HOST_SYSTEM-gcc AR=\"$HOST_SYSTEM-ar r\" RANLIB=$HOST_SYSTEM-ranlib";;
 		i?86)   ARCH_ARGS='zlib-dynamic linux-elf';;
 		x86_64) ARCH_ARGS='zlib-dynamic enable-ec_nistp_64_gcc_128 linux-x86_64';;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e openssl10/receipt
--- a/openssl10/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openssl10/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,9 +15,8 @@
 # Integrity check: https://www.openssl.org/source/
 TARBALL_SHA256="ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="perl zlib-dev"
-SPLIT="openssl10 openssl10-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# MAKEFLAGS make OpenSSL build fail.
@@ -26,8 +25,6 @@
 	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 	# marked as not requiring an executable stack (compatibility improvement).
 	case "$ARCH" in
-		arm*)   ARCH_ARGS='linux-armv4'
-		        MAKE_ARGS="CC=$HOST_SYSTEM-gcc AR=\"$HOST_SYSTEM-ar r\" RANLIB=$HOST_SYSTEM-ranlib";;
 		i?86)   ARCH_ARGS='zlib-dynamic linux-elf';;
 		x86_64) ARCH_ARGS='zlib-dynamic enable-ec_nistp_64_gcc_128 linux-x86_64';;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e openttd/receipt
--- a/openttd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openttd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,10 @@
 PACKAGE="openttd"
 VERSION="1.7.1"
 CATEGORY="games"
-SHORT_DESC="OpenTTD is a clone of Transport Tycoon Deluxe"
+SHORT_DESC="Clone of Transport Tycoon Deluxe"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.openttd.org"
+WEB_SITE="http://www.openttd.org/en/"
 
 TARBALL="$PACKAGE-$VERSION-source.tar.gz"
 WGET_URL="http://us.binaries.openttd.org/binaries/releases/$VERSION/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e opentyrian/receipt
--- a/opentyrian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opentyrian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="opentyrian"
 VERSION="r886"
 CATEGORY="games"
-SHORT_DESC="OpenTyrian is a port of the DOS shoot-em-up Tyrian"
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Port of the DOS shoot-em-up Tyrian"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 
diff -r ad29ddfee1c9 -r d5aab818505e openvas-administrator/receipt
--- a/openvas-administrator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openvas-administrator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,34 +3,33 @@
 PACKAGE="openvas-administrator"
 VERSION="1.0.1"
 CATEGORY="network"
-SHORT_DESC="Network security scanner (administrator)."
+SHORT_DESC="Network security scanner (administrator)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.openvas.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.openvas.org/"
 WGET_URL="http://wald.intevation.org/frs/download.php/828/$TARBALL"
-CONFIG_FILES="/etc/openvas"
 
-DEPENDS="openvas-libraries util-linux-uuid"
 BUILD_DEPENDS="libpcap doxygen openvas-libraries-dev openvas-libraries \
 gnutls-dev cmake glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/g_strncasecmp/g_ascii_strncasecmp/' src/admin.c
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONF_INSTALL_DIR=/etc \
-		-DLOCALSTATEDIR=/var
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DSYSCONF_INSTALL_DIR=/etc \
+		-DLOCALSTATEDIR=/var \
+		. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/sbin $fs/usr
+	DEPENDS="openvas-libraries util-linux-uuid"
+	CONFIG_FILES="/etc/openvas"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e openvas-libraries/receipt
--- a/openvas-libraries/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openvas-libraries/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="gpgme-dev libgcrypt-dev glib-dev gnutls-dev \
 libpcap-dev bison flex cmake util-linux-uuid-dev zlib-dev libssh-dev \
 hiredis-dev"
-SPLIT="openvas-libraries openvas-libraries-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i '/builtin_functions_ntlmssp/{NNNNNd}' nasl/iconv.c
diff -r ad29ddfee1c9 -r d5aab818505e openvas-scanner/receipt
--- a/openvas-scanner/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openvas-scanner/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -37,7 +37,7 @@
 	chroot "$1/" /usr/sbin/openvas-mkcert <<EOT
 
 
-$(. /etc/locale.conf ; echo ${LANG#*_})
+$(. /etc/locale.conf; echo ${LANG#*_})
 $(cat /etc/TZ)
 
 $(cat /etc/hostname)
diff -r ad29ddfee1c9 -r d5aab818505e openvpn/receipt
--- a/openvpn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openvpn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://swupdate.openvpn.net/community/releases/$TARBALL"
 
 BUILD_DEPENDS="lzo-dev openssl-dev pam-dev lz4-dev"
-SPLIT="openvpn openvpn-doc openvpn-down-root openvpn-pam openvpn-dev"
+SPLIT="$PACKAGE-doc $PACKAGE-down-root $PACKAGE-pam $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e openvswitch/receipt
--- a/openvswitch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/openvswitch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="${WEB_SITE}releases/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev zlib-dev perl"
-SPLIT="openvswitch-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ophcrack/receipt
--- a/ophcrack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ophcrack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="3.5.0"
 CATEGORY="security"
 SHORT_DESC="Windows password cracker"
-MAINTAINER="slitaz@objectif-securite.ch"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://ophcrack.sourceforge.net"
+WEB_SITE="http://ophcrack.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e optipng/receipt
--- a/optipng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/optipng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.6"
 CATEGORY="utilities"
 SHORT_DESC="Compress and optimize PNG images"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="http://optipng.sourceforge.net/"
 TAGS="image compression"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev zlib-dev"
-SPLIT="optipng optipng-static:static"
+SPLIT="$PACKAGE-static:static"
 
 compile_rules() {
 	sed -i 's|prefix)/man|prefix)/share/man|' configure
@@ -32,7 +32,8 @@
 			;;
 	esac &&
 
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e opus-tools/receipt
--- a/opus-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opus-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,15 +13,13 @@
 
 BUILD_DEPENDS="libogg-dev opus-dev flac-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="flac libogg opus"
 }
diff -r ad29ddfee1c9 -r d5aab818505e opus/receipt
--- a/opus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,14 +12,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://archive.mozilla.org/pub/opus/$TARBALL"
 
-SPLIT="opus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e opusfile/receipt
--- a/opusfile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/opusfile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://downloads.xiph.org/releases/opus/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev libogg-dev opus-dev"
-SPLIT="opusfile-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e orage/receipt
--- a/orage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/orage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.1"
 CATEGORY="office"
 SHORT_DESC="Xfce calendar"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e orbit2/receipt
--- a/orbit2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/orbit2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.14.19"
 CATEGORY="development"
 SHORT_DESC="A CORBA 2.4-compliant Object Request Broker (ORB) - deprecated"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://projects.gnome.org/ORBit2/"
 
@@ -12,9 +12,7 @@
 WGET_URL="$GNOME_MIRROR/ORBit2/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev dbus-dev dbus-glib-dev libidl-dev"
-SPLIT="orbit2-dev"
-
-CROSS="bug: Could not check for borked linking while cross-compiling"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/-DG_DISABLE_DEPRECATED//' linc2/src/Makefile*
diff -r ad29ddfee1c9 -r d5aab818505e orc/receipt
--- a/orc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/orc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.26"
 CATEGORY="multimedia"
 SHORT_DESC="Optimized inner loop Runtime Compiler"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://gstreamer.freedesktop.org/data/doc/orc/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://gstreamer.freedesktop.org/src/orc/$TARBALL"
 
 BUILD_DEPENDS="valgrind-dev"
-SPLIT="orc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e ori/receipt
--- a/ori/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ori/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 util-linux-uuid-dev fuse2-dev libevent-dev openssl-dev zlib-dev"
 
 compile_rules() {
-	scons PREFIX=$DESTDIR/usr install
+	scons PREFIX=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e orpheus/receipt
--- a/orpheus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/orpheus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="orpheus"
 VERSION="1.6"
@@ -6,30 +6,26 @@
 SHORT_DESC="Ncurses based audio player"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="mpg123"
+WEB_SITE="http://thekonst.net/en/orpheus"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://thekonst.net/en/orpheus"
 WGET_URL="http://thekonst.net/download/$TARBALL"
-TAGS="audio sound music player"
 
-DEPENDS="ncurses libvorbis libogg libxml2 zlib"
 BUILD_DEPENDS="autoconf automake libvorbis-dev libogg-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|fcntl.h>|&\n#include <unistd.h>|' src/streamtrack.cc
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -logg"
 	unset CFLAGS CXXFLAGS
-	./configure 2>&1 | grep -v /config.rpath &&
+
+	./configure &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses libvorbis libogg libxml2 zlib"
+	SUGGESTED="mpg123"
+	TAGS="audio sound music player"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ortp/receipt
--- a/ortp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ortp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,18 +6,18 @@
 SHORT_DESC="Library implementing the Real-time Transport Protocol (RFC3550)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://freecode.com/projects/ortp"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/ortp"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download-mirror.savannah.gnu.org/releases/linphone/$PACKAGE/sources/$TARBALL"
 
-SPLIT="ortp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e osip/receipt
--- a/osip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/osip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="libosip2-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="osip-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e osmo/receipt
--- a/osmo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/osmo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,20 @@
 VERSION="0.4.0-1"
 CATEGORY="office"
 SHORT_DESC="A handy personal organizer using GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://clayo.org/osmo/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/osmo-pim/$TARBALL"
 
-BUILD_DEPENDS="gettext gtk3-dev libarchive-dev libical-dev gtkspell3-dev \
-libnotify-dev webkit2gtk-dev"
+BUILD_DEPENDS="gettext-dev gtk3-dev libarchive-dev libical-dev gtkspell3-dev \
+libnotify-dev webkit2gtk-dev db-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ossp-uuid/receipt
--- a/ossp-uuid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ossp-uuid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="uuid-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.ossp.org/pkg/lib/uuid/$TARBALL"
 
-SPLIT="ossp-uuid-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e otf-gfs/receipt
--- a/otf-gfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/otf-gfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,25 +7,23 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="SIL_OFL"
 WEB_SITE="http://www.greekfontsociety.gr/pages/gr_typefaces1.html"
-TAGS="font otf"
+
 EXTRA_SOURCE_FILES="GFS_DIDOT_OT.zip GFS_BODONI_OT.zip GFS_OLGA_OT.zip \
 GFS_NEOHELLENIC_OT.zip GFS_ARTEMISIA_OT.zip GFS_THEOKRITOS_OT.zip \
 GFS_PYRSOS.zip GFS_DIDOTCLASS_OT.zip GFS_Porson_OT.zip GFS_SOLOMOS_OT.zip \
 GFS_DECKER.zip GFS_PHILOSTRATOS.zip GFS_GOSCHEN.zip GFS_BODONICLASS_OT.zip \
 GFS_BASKERVILLE_OT.zip GFS_GAZIS.zip GFS_COMPLUTUM_OT.zip GFS_ELPIS_OT.zip"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $src && cd $src
 	for font in $EXTRA_SOURCE_FILES; do
-		[ -s $SRC/${font} ] ||
-			wget -O $SRC/${font} \
-				http://www.greekfontsociety.gr/${font}
-		cp $SRC/${font} .
-		unzip -o ${font}
+		[ -s $SRC/$font ] ||
+			wget -O $SRC/$font http://www.greekfontsociety.gr/$font
+		cp $SRC/$font .
+		unzip -o $font
 	done
 	FONTDIR=$fs/usr/share/fonts/OTF/GFS
 	mkdir -p $FONTDIR
 	install -Dm644 $src/GFS*/*otf $FONTDIR
+	TAGS="font otf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e otf-transcends-games/receipt
--- a/otf-transcends-games/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/otf-transcends-games/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="otf-transcends-games"
 VERSION="0.1"
 CATEGORY="fonts"
-SHORT_DESC="Transcends Games is a font with retro-futuristic style."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Font with retro-futuristic style"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://people.slitaz.org/~leonardolaporte"
+
 SOURCE="transcends-games"
-WEB_SITE="http://people.slitaz.org/~leonardolaporte"
-STUFF_DIR="lab.slitaz/5.0/pkg/font/publicdomain"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="${WEB_SITE}/$STUFF_DIR/$TARBALL"
-TAGS="font otf"
+WGET_URL="$WEB_SITE/lab.slitaz/5.0/pkg/font/publicdomain/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/share/fonts/pd/$SOURCE
-  cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
+compile_rules() {
+	mkdir -p $install/usr/share/fonts/pd/$SOURCE
+	cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
+genpkg_rules() {
+	cp -a $install/* $fs
+	TAGS="font otf"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" /usr/bin/fc-cache
 }
diff -r ad29ddfee1c9 -r d5aab818505e othello/receipt
--- a/othello/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/othello/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Othello game in javascript"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.posi.net/software/othello/"
+WEB_SITE="https://web.archive.org/web/20101231221346/http://www.posi.net:80/software/othello/"
 
 TARBALL="$PACKAGE-$VERSION.tar.lzma"
 
@@ -25,29 +25,18 @@
 	fi
 	#for i in index.html othello.js \
 	#	images/blank.gif images/white.gif images/black.gif \
-	#	images/white-trans.gif images/black-trans.gif ; do
+	#	images/white-trans.gif images/black-trans.gif; do
 	#	[ -s $i ] || wget -P $(dirname $i) $WEB_SITE/$i
 	#done
 	sed -i 's|TITLE>.*</TITLE|TITLE>Othello</TITLE|' index.html
 
-	mkdir -p \
-		$install/var/www/othello \
-		$install/usr/share/applications
+	mkdir -p $install/var/www/othello
 	cp -a $src/* $install/var/www/othello
 	chown -R 80.80 $install/var/www/othello
-	cat > $install/usr/share/applications/othello.desktop <<EOT
-[Desktop Entry]
-Type=Application
-Name=Othello
-Exec=browser file:///var/www/othello/index.html
-Icon=/var/www/othello/images/black.gif
-Terminal=false
-Categories=Game;
-Comment=Othello game
-EOT
+
+	install -Dm644 $stuff/othello.desktop $install/usr/share/applications/othello.desktop
 }
 
 genpkg_rules() {
 	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e othello/stuff/othello.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/othello/stuff/othello.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Othello
+Exec=browser file:///var/www/othello/index.html
+Icon=/var/www/othello/images/black.gif
+Terminal=false
+Categories=Game;
+Comment=Othello game
diff -r ad29ddfee1c9 -r d5aab818505e outguess/receipt
--- a/outguess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/outguess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,8 +16,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	mkdir -p $install/usr/bin
-	install -Dm 755 $src/outguess $install/usr/bin/outguess
+	install -Dm755 outguess $install/usr/bin/outguess
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ovz-web-panel/receipt
--- a/ovz-web-panel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ovz-web-panel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,19 @@
 VERSION="1.7"
 CATEGORY="network"
 SHORT_DESC="GUI web-based frontend for OpenVZ"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-TARBALL="${PACKAGE}-${VERSION}.tgz"
 WEB_SITE="https://code.google.com/archive/p/ovz-web-panel/"
+
+TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://ovz-web-panel.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="ruby ruby-sqlite3"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir $DESTDIR
-	mv * $DESTDIR 2> /dev/null || true
+compile_rules() {
+	mkdir $install
+	mv * $install 2>/dev/null || true
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share \
 		$fs/etc
 
@@ -41,14 +36,10 @@
 
 	# Cleaning.
 	rm -f $fs/usr/share/$PACKAGE/done.*.u
+
+	DEPENDS="ruby ruby-sqlite3"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" ln -s /usr/share/$PACKAGE/script/owp /etc/init.d/owp
 }
-
-clean_wok()
-{
-	[ -d $PACKAGE ] && rm -rf $PACKAGE
-}
diff -r ad29ddfee1c9 -r d5aab818505e owfs/receipt
--- a/owfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/owfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="3.2p1"
 CATEGORY="misc"
 SHORT_DESC="OWFS One Wire File System"
-MAINTAINER="l.lemarinel@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.owfs.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/owfs/owfs/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="fuse2-dev libusb-dev libusb-compat-dev eudev-dev"
 
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e owncloud-client/receipt
--- a/owncloud-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/owncloud-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,27 @@
 VERSION="1.0.5"
 CATEGORY="network"
 SHORT_DESC="The ownCloud Client, based on Mirall"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://owncloud.org/sync-clients/"
+WEB_SITE="https://owncloud.org/download/"
+
 SOURCE="mirall"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WGET_URL="http://download.owncloud.com/download/$TARBALL"
 
-DEPENDS="csync libQtTest libQtNetwork libQtCore libQtXml libQtGui"
 BUILD_DEPENDS="csync-dev Qt4-dev cmake qmake"
-# Rules to configure and make the package.
-compile_rules()
-{
-		mkdir mirall-build && cd mirall-build
-		cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-		&& make && make install
-	
+
+compile_rules() {
+		mkdir mirall-build
+		cd    mirall-build
+		cmake \
+			-DCMAKE_INSTALL_PREFIX=/usr \
+			.. &&
+		make &&
+		make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
+	DEPENDS="csync libQtTest libQtNetwork libQtCore libQtXml libQtGui"
 }
diff -r ad29ddfee1c9 -r d5aab818505e oxygen-gtk/receipt
--- a/oxygen-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/oxygen-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="oxygen-gtk"
 VERSION="1.4.5"
 CATEGORY="customization"
-SHORT_DESC="Oxygen-Gtk is a port of the default KDE widget theme (Oxygen), to GTK"
+SHORT_DESC="Port of the default KDE widget theme (Oxygen) to GTK"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://projects.kde.org/projects/playground/artwork/oxygen-gtk"
diff -r ad29ddfee1c9 -r d5aab818505e oxygen-icons/receipt
--- a/oxygen-icons/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/oxygen-icons/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,9 +6,9 @@
 SHORT_DESC="Oxygen icon theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL3"
-WEB_SITE="http://www.kde.org/"
+WEB_SITE="https://www.kde.org/"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.xz"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.xz"
 WGET_URL="http://archive.ubuntu.com/ubuntu/pool/main/o/oxygen-icons/$TARBALL"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e p0f/receipt
--- a/p0f/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p0f/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="3.01b"
 CATEGORY="network"
 SHORT_DESC="Passive OS fingerprinting tool"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
-WEB_SITE="http://lcamtuf.coredump.cx/p0f.shtml"
+WEB_SITE="http://lcamtuf.coredump.cx/p0f3/"
 
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://lcamtuf.coredump.cx/p0f${VERSION%.*}/releases/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e p11-kit/receipt
--- a/p11-kit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p11-kit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.23.12"
 CATEGORY="security"
 SHORT_DESC="Library to work with PKCS#11 modules"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://p11-glue.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/p11-kit.html"
@@ -12,8 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/p11-glue/p11-kit/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="gettext libtasn1-dev gtk-doc libxslt cacerts libffi-dev glib-dev"
-SPLIT="libp11-kit p11-kit p11-kit-dev"
+BUILD_DEPENDS="gettext-dev libtasn1-dev gtk-doc libxslt cacerts libffi-dev \
+glib-dev"
+SPLIT="libp11-kit $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e p2c/receipt
--- a/p2c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p2c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,44 +3,41 @@
 PACKAGE="p2c"
 VERSION="1.21alpha2"
 CATEGORY="development"
-SHORT_DESC="A Pascal to C translator."
+SHORT_DESC="A Pascal to C translator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://schneider.ncifcrf.gov/p2c/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://schneider.ncifcrf.gov/p2c/"
 WGET_URL="http://darkstar.ist.utl.pt/slackware/slackware_source/d/p2c/$TARBALL"
-TAGS="pascal"
 
-DEPENDS="perl"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
-	sed -i  -e 's|^HOMEDIR.*|HOMEDIR=/usr/lib/p2c|' \
+	sed \
+		-e 's|^HOMEDIR.*|HOMEDIR=/usr/lib/p2c|' \
 		-e 's|^INCDIR.*|INCDIR=/usr/include/p2c|' \
 		-e 's|^BINDIR.*|BINDIR=/usr/bin|' \
 		-e 's|^LIBDIR.*|LIBDIR=/usr/lib|' \
 		-e 's|^ABSHOMEDIR.*|ABSHOMEDIR=/usr/lib/p2c|' \
 		-e 's|^ABSINCDIR.*|ABSINCDIR=/usr/include/p2c|' \
 		-e 's|^ABSLIBDIR.*|ABSLIBDIR=/usr/lib|' \
-	    Makefile
+		-i Makefile
 	grep -q getlinep2c lex.c || sed -i 's/getline/getlinep2c/' *
-	make all p2cc
-	mkdir -p $DESTDIR/usr/lib/p2c $DESTDIR/usr/include/p2c $DESTDIR/usr/bin
-	cp p2c p2cc $DESTDIR/usr/bin
-	cp libp2c.a $DESTDIR/usr/lib
-	ranlib $DESTDIR/usr/lib/libp2c.a
-	cp p2c.h $DESTDIR/usr/include/p2c
+
+	make all p2cc || return 1
+
+	mkdir -p $install/usr/lib/p2c $install/usr/include/p2c $install/usr/bin
+	cp p2c p2cc $install/usr/bin
+	cp libp2c.a $install/usr/lib
+	ranlib $install/usr/lib/libp2c.a
+	cp p2c.h $install/usr/include/p2c
 	cp sys.p2crc loc.p2crc system.imp system.m2 turbo.imp string.pas \
-		$DESTDIR/usr/lib/p2c
-	mv $DESTDIR/usr/lib/p2c/sys.p2crc $DESTDIR/usr/lib/p2c/p2crc
-	
+		$install/usr/lib/p2c
+	mv $install/usr/lib/p2c/sys.p2crc $install/usr/lib/p2c/p2crc
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="perl"
+	TAGS="pascal"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e p4wn/receipt
--- a/p4wn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p4wn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="p4wn"
 VERSION="1.0"
@@ -7,21 +7,18 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://p4wn.sourceforge.net/"
+
 TARBALL="sven_vehars_fancy_version.zip"
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+
+compile_rules() {
 	sed -i '/background-image/d' *.css
 	sed -i 's|title>.*</title|title>Chess</title|' index.html
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-        mkdir -p $fs/var/www/p4wn $fs/usr/share/applications \
-        	$fs/usr/share/pixmaps
+genpkg_rules() {
+	mkdir -p $fs/var/www/p4wn $fs/usr/share/applications \
+		$fs/usr/share/pixmaps
 	cp $src/* $fs/var/www/p4wn
 	rm -f $fs/var/www/p4wn/README $fs/var/www/p4wn/*background.png
 	chown -R 80.80 $fs/var/www/p4wn
@@ -36,4 +33,3 @@
 Comment=Chess game
 EOT
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e p7zip/receipt
--- a/p7zip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p7zip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="16.02"
 CATEGORY="utilities"
 SHORT_DESC="File archiver with high compression ratio"
-MAINTAINER="milka@konstelacioj.info"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 #WEB_SITE="http://p7zip.sourceforge.net/"
 WEB_SITE="https://sourceforge.net/projects/sevenzip/"
diff -r ad29ddfee1c9 -r d5aab818505e p910nd/receipt
--- a/p910nd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/p910nd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make CFLAGS=-DLOCKFILE_DIR=\\\"/var/lock\\\" &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	rm -f $install/etc/init.d/p910nd
 	ln -s daemon $install/etc/init.d/p910nd
diff -r ad29ddfee1c9 -r d5aab818505e palemoon/receipt
--- a/palemoon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/palemoon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,14 @@
 PACKAGE="palemoon"
 VERSION="27.9.3"
 CATEGORY="network"
+SHORT_DESC="Browser based on Firefox that's optimised for performance"
+MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="MPL2"
-SHORT_DESC="Browser based on Firefox that's optimised for performance"
-WEB_SITE="http://palemoon.org"
-MAINTAINER="psychomaniak@xakep.ru"
+WEB_SITE="http://palemoon.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/MoonchildProductions/Pale-Moon/archive/${VERSION}_Release.tar.gz"
-TAGS="browser web-browser"
-PROVIDE="browser-html5"
 
-DEPENDS="gtk2"
 BUILD_DEPENDS="autoconf213 gtk2-dev yasm zip unzip iw dbus-dev dbus-glib-dev \
 iw libpng16-dev gstreamer0 gstreamer0-dev gst0-plugins-base-dev gst0-plugins-base \
 libvpx-dev mesa-dev virtualenv zlib-dev bzip2-dev python-dev \
@@ -21,7 +19,6 @@
 # sqlite sqlite-dev libevent libevent-dev
 
 compile_rules() {
-
 	find -type f | grep duckduckgo | xargs \
 		sed -i 's|name="t" value="palemoon"|name="t" value="slitaz"|'
 	cp $stuff/mozconfig $src
@@ -42,9 +39,10 @@
 	cd $src/obj-i686-pc-linux-gnu
 	( make package | egrep -v 'error|ERROR' ) > ./instLOG 2>&1
 	cd dist
-	for i in bin lib share/applications;
-	 do install -d $DESTDIR/usr/$i; done
-	cp -a $PACKAGE $DESTDIR/usr/lib/$PACKAGE
+	for i in bin lib share/applications; do
+		install -d $install/usr/$i
+	done
+	cp -a $PACKAGE $install/usr/lib/$PACKAGE
 	cp -a $src/browser/branding/official/$PACKAGE.desktop \
 		$install/usr/share/applications
 }
@@ -57,4 +55,7 @@
 	ln -sf /usr/lib/$PACKAGE/browser/chrome/icons/default/default48.png \
 		$fs/usr/share/pixmaps/palemoon.png
 	ln -s palemoon $fs/usr/bin/browser-html5
+	DEPENDS="gtk2"
+	PROVIDE="browser-html5"
+	TAGS="browser web-browser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pam/receipt
--- a/pam/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pam/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.linux-pam.org/library/Linux-PAM-$VERSION.tar.bz2"
 
-BUILD_DEPENDS="db-dev libtirpc-dev gettext"
-SPLIT="pam-dev"
+BUILD_DEPENDS="db-dev libtirpc-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e pam_krb5/receipt
--- a/pam_krb5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pam_krb5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pam_ldap/receipt
--- a/pam_ldap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pam_ldap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 	./vers_string -v
 	./configure $CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pam_mount/receipt
--- a/pam_mount/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pam_mount/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="automake libtool libhx-dev util-linux-mount-dev libxml2-dev \
 pcre-dev openssl-dev cryptsetup-dev pam-dev"
-SPLIT="pam_mount-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	aclocal
diff -r ad29ddfee1c9 -r d5aab818505e pamtester/receipt
--- a/pamtester/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pamtester/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pan/receipt
--- a/pan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,26 @@
 PACKAGE="pan"
 VERSION="0.134"
 CATEGORY="network"
-SHORT_DESC="pan is a usenet newsreader"
+SHORT_DESC="Usenet newsreader"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://pan.rebelbase.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://pan.rebelbase.com"
-WGET_URL="$WEB_SITE/download/releases/$VERSION/source/$TARBALL"
+WGET_URL="${WEB_SITE}download/releases/$VERSION/source/$TARBALL"
 
-DEPENDS="pcre gmime gtkspell gtk2 cairo gcc-lib-base glibc-base"
 BUILD_DEPENDS="intltool gmime-dev glib-dev gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	sed -i 's|<glib/gtypes.h>|<glib.h>|' pan/general/file-util.h \
+compile_rules() {
+	sed -i 's|<glib/gtypes.h>|<glib.h>|' \
+		pan/general/file-util.h \
 		pan/data/article-cache.h \
 		pan/gui/render-bytes.h
-	sed -i -e 's|<glib/gutils.h>|<glib.h>|' \
+	sed \
+		-e 's|<glib/gutils.h>|<glib.h>|' \
 		-e 's|<glib/gtestutils.h>|<glib.h>|' \
 		-e 's|<glibconfig.h>|<glib.h>|' \
-		pan/general/macros.h
+		-i pan/general/macros.h
 	sed -i 's|<glib/gmain.h>|<glib.h>|' pan/general/worker-pool.cc
 	sed -i -e 's|<glib/gtypes.h>|<glib.h>|' \
 		-e 's|<glib/gthreadpool.h>|<glib.h>|' \
@@ -55,15 +54,14 @@
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
+	DEPENDS="pcre gmime gtkspell gtk2 cairo gcc-lib-base glibc-base"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pango/receipt
--- a/pango/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pango/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.42.2"
 CATEGORY="x-window"
 SHORT_DESC="Layout and rendering of internationalized text"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.pango.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="harfbuzz-dev xorg-libXft-dev cairo-dev \
 gobject-introspection-dev meson ninja fribidi-dev"
-SPLIT="pango-typelib pango-dev"
+SPLIT="$PACKAGE-typelib $PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e pangomm/receipt
--- a/pangomm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pangomm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.40.1"
 CATEGORY="x-window"
 SHORT_DESC="Pango binding for GTKmm"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://developer.gnome.org/pangomm/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/pangomm.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glibmm-dev cairomm-dev pango-dev"
-SPLIT="pangomm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|pangomm-$VERSION|" docs/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e pangox-compat/receipt
--- a/pangox-compat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pangox-compat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="pango-dev glib-dev xorg-libX11-dev"
-SPLIT="pangox-compat-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e paper-gtk-theme/receipt
--- a/paper-gtk-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/paper-gtk-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,14 +13,13 @@
 WGET_URL="https://github.com/snwh/paper-gtk-theme/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="autoconf automake"
-SPLIT="paper-gtk-theme-extra"
+SPLIT="$PACKAGE-extra"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	chmod a+x autogen.sh
 	./autogen.sh &&
-	make && make install
+	make &&
+	make install || return 1
 
 	# Define small icons is 16x16
 	sed -i '20 i\
@@ -40,16 +39,14 @@
 	cp -f $stuff/Buttons/*.png $install/usr/share/themes/Paper/gtk-2.0/Buttons/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		paper-gtk-theme)
 			copy gtk-*/ index.theme
 			CAT="customization|GTK+2 and GTK+3 theme"
 			DEPENDS="gtk2-engine-murrine"
 			;;
-		paper-gtk-theme-extra)
+		*-extra)
 			copy @std @rm
 			CAT="customization|extra files"
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e paper-icon-theme/receipt
--- a/paper-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/paper-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 compile_rules() {
 	./autogen.sh &&
 	sed -i 's|-Rv|-R|' Makefile &&
-	make && make install
+	make &&
+	make install || return 1
 
 	# remove hdpi icons, and huge sizes
 	it="$install/usr/share/icons/Paper/index.theme"
diff -r ad29ddfee1c9 -r d5aab818505e par2/receipt
--- a/par2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/par2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,26 @@
 SOURCE="par2cmdline"
 VERSION="0.4"
 CATEGORY="system-tools"
-SHORT_DESC="Utility for posting and recovery of multi-part archives."
+SHORT_DESC="Utility for posting and recovery of multi-part archives"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://parchive.sourceforge.net/"
+
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://parchive.sourceforge.net/"
 WGET_URL="$SF_MIRROR/parchive/$TARBALL"
 
-DEPENDS="gcc-lib-base"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e parcellite/receipt
--- a/parcellite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/parcellite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,32 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="parcellite"
 VERSION="0.9.3"
 CATEGORY="utilities"
 SHORT_DESC="Lightweight GTK+ clipboard manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://parcellite.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://parcellite.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk2 xorg-libX11 xorg-libXdamage"
 BUILD_DEPENDS="xorg-libX11-dev gtk2-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{	
+compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
 	find . -name '*.[ch]*' | xargs sed -i 's|<glib/.*h|<glib.h|'
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications $fs/etc
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/skel $fs/etc
 	chown -R 0.0 $fs
+	DEPENDS="gtk2 xorg-libX11 xorg-libXdamage"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pari/receipt
--- a/pari/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pari/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pari"
 VERSION="2.5.3"
 CATEGORY="utilities"
-SHORT_DESC="PARI/GP is a widely used computer algebra system"
+SHORT_DESC="Widely used computer algebra system"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://pari.math.u-bordeaux.fr/"
@@ -12,7 +12,7 @@
 WGET_URL="http://pari.math.u-bordeaux.fr/pub/$PACKAGE/unix/$TARBALL"
 
 BUILD_DEPENDS="gmp-dev readline-dev xorg-libX11-dev"
-SPLIT="pari-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e parole/receipt
--- a/parole/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/parole/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.4" # I downgraded parole from 0.9.2 to 0.5.4 to build against GTK+2
 CATEGORY="multimedia"
 SHORT_DESC="Media player for Xfce"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://docs.xfce.org/apps/parole/start"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool dbus-dev dbus-glib-dev libxfce4util-dev xfconf-dev \
 libxfce4ui-dev gstreamer0-dev gst0-plugins-base-dev taglib-dev libnotify-dev"
-SPLIT="parole-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e partclone/receipt
--- a/partclone/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/partclone/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,37 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="partclone"
 VERSION="0.2.49"
 CATEGORY="system-tools"
-SHORT_DESC="Utilities to smartly backup partitions."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="Utilities to smartly backup partitions"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://partclone.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="backup"
 
-DEPENDS="ncurses ntfs-3g e2fsprogs"
 BUILD_DEPENDS="util-linux-uuid-dev libxslt e2fsprogs-dev \
- ncurses-dev ntfsprogs-dev ntfs-3g-dev docbook-xsl"
+ncurses-dev ntfsprogs-dev ntfs-3g-dev docbook-xsl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS \
+compile_rules() {
+	./configure \
 		--enable-extfs \
 		--enable-fat \
 		--enable-exfat \
 		--enable-ntfs \
 		--enable-btrfs \
 		--enable-hfsp \
-		--enable-ncursesw &&
-		make && make install 2>&1 | sed "s/8': No such/8': no such/"
+		--enable-ncursesw \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/local
-	cp -a $install/usr/sbin* $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses ntfs-3g e2fsprogs"
+	TAGS="backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e parted/receipt
--- a/parted/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/parted/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.2"
 CATEGORY="system-tools"
 SHORT_DESC="GNU parted partition editor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.gnu.org/software/parted/index.shtml"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/parted.html"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext util-linux-uuid-dev readline-dev check-dev texinfo \
+BUILD_DEPENDS="gettext-dev util-linux-uuid-dev readline-dev check-dev texinfo \
 glib-dev"
-SPLIT="parted-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e partimage/receipt
--- a/partimage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/partimage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="0.6.9"
 CATEGORY="system-tools"
 SHORT_DESC="Saves partitions in an image file"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.partimage.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext newt newt-dev slang-dev bzip2-dev openssl-dev zlib-dev \
+BUILD_DEPENDS="gettext-dev newt-dev slang-dev bzip2-dev openssl-dev zlib-dev \
 pam-dev"
-SPLIT="partimage partimage-pam:pam"
+SPLIT="$PACKAGE-pam:pam"
 
 compile_rules() {
 	sed -i 's/CRYPTO_lock/X509_new/g' configure
@@ -24,18 +24,19 @@
 				--disable-pam \
 				$CONFIGURE_ARGS &&
 			make &&
-			make install
-				;;
+			make install || return 1
+			;;
 		pam)
 			./configure \
 				--enable-pam \
 				$CONFIGURE_ARGS &&
 			make &&
 			make pamfile &&
-			make install &&
+			make install || return 1
+
 			install -Dm644 partimaged.pam $install/etc/pam.d/partimaged
-				;;
-	esac || return 1
+			;;
+	esac
 
 	install -Dm600 $stuff/etc/partimaged/partimaged.cert $install/etc/partimaged/partimaged.cert
 	install -Dm600 $stuff/etc/partimaged/partimaged.key  $install/etc/partimaged/partimaged.key
@@ -74,7 +75,7 @@
 	[ -n "$quiet" ] || cat <<EOT
 
 	.---------------------------------------------------.
-	| To starts partimage server you can run:           |
+	| To start partimage server you can run:            |
 	|   /etc/init.d/partimaged start                    |
 	|                                                   |
 	| Or add partimaged to RUN_DAEMONS in /etc/rcS.conf |
diff -r ad29ddfee1c9 -r d5aab818505e pass/receipt
--- a/pass/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pass/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="pass"
-SOURCE="password-store"
 VERSION="1.6.5"
 CATEGORY="security"
-SHORT_DESC="The standard unix password manager."
+SHORT_DESC="The standard UNIX password manager"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.passwordstore.org/"
+
+SOURCE="password-store"
 TARBALL="$SOURCE-$VERSION.tar.xz"
-WEB_SITE="https://www.passwordstore.org/"
 WGET_URL="http://git.zx2c4.com/$SOURCE/snapshot/$TARBALL"
-SUGGESTED="git gnupg"
 
-DEPENDS="bash"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="bash"
+	SUGGESTED="git gnupg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e patch/receipt
--- a/patch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/patch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.7.6"
 CATEGORY="utilities"
 SHORT_DESC="Utility to patch file with diff file"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://savannah.gnu.org/projects/patch/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/patch.html"
diff -r ad29ddfee1c9 -r d5aab818505e pavucontrol/receipt
--- a/pavucontrol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pavucontrol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,7 @@
 SHORT_DESC="A GTK volume control for PulseAudio"
 MAINTAINER="mojo@slitaz.org"
 LICENSE="LGPL2.1 GPL2 MIT"
-WEB_SITE="http://freedesktop.org/software/pulseaudio/pavucontrol"
+WEB_SITE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 
 TARBALL="$PACKAGE-$COMMIT.tar.xz"
 WGET_URL="https://cgit.freedesktop.org/pulseaudio/pavucontrol/snapshot/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e pbzip2/receipt
--- a/pbzip2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pbzip2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/pbzip2 $install/usr/bin/pbzip2
+	install -Dm755 pbzip2 $install/usr/bin/pbzip2
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pce/receipt
--- a/pce/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pce/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pcf-uming/receipt
--- a/pcf-uming/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcf-uming/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,15 @@
 PACKAGE="pcf-uming"
 VERSION="1.0"
 CATEGORY="x-window"
-SHORT_DESC="Light asian fonts for X."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Light asian fonts for X"
+MAINTAINER="devel@slitaz.org"
 LICENSE="unknown"
+WEB_SITE="http://www.slitaz.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.slitaz.org/"
 WGET_URL="http://mirror.slitaz.org/sources/fonts/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/fonts/X11/uming
 	cp $src/uming.pcf.gz $fs/usr/share/fonts/X11/uming
 	chown -R root.root $fs
diff -r ad29ddfee1c9 -r d5aab818505e pciids/receipt
--- a/pciids/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pciids/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="665b77e"
 CATEGORY="misc"
 SHORT_DESC="List of PCI ID's"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL2"
 WEB_SITE="http://pci-ids.ucw.cz/"
 
diff -r ad29ddfee1c9 -r d5aab818505e pciutils/receipt
--- a/pciutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pciutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.6"
 CATEGORY="system-tools"
 SHORT_DESC="Linux PCI Utilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://mj.ucw.cz/sw/pciutils/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pciutils.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://www.kernel.org/pub/software/utils/pciutils/$TARBALL"
 
 BUILD_DEPENDS="kmod-dev eudev-dev zlib-dev"
-SPLIT="pciutils-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make \
diff -r ad29ddfee1c9 -r d5aab818505e pcmanfm-legacy/receipt
--- a/pcmanfm-legacy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcmanfm-legacy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.5.2"
 CATEGORY="system-tools"
 SHORT_DESC="Light and easy to use file manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://pcmanfm.sourceforge.net/"
+WEB_SITE="https://wiki.lxde.org/en/PCManFM"
 
 TARBALL="pcmanfm-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/pcmanfm/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e pcmanfm/receipt
--- a/pcmanfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcmanfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,15 @@
 VERSION="1.3.0"
 CATEGORY="system-tools"
 SHORT_DESC="Light and easy to use file manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.lxde.org/en/PCManFM"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/lxde/pcmanfm.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-#WGET_URL="$SF_MIRROR/$PACKAGE/files/$TARBALL" # SF download problems
+#WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" # SF download problems
 WGET_URL="http://git.lxde.org/gitweb/?p=lxde/pcmanfm.git;a=snapshot;h=$VERSION;sf=txz"
 
-BUILD_DEPENDS_arm="gtk2-dev dbus-glib-dev dbus-dev startup-notification-dev \
-xorg-libxcb-dev xorg-xcb-util-dev libfm-dev menu-cache-dev expat-dev libfm-gtk \
-gtk-doc libtool"
 BUILD_DEPENDS="intltool xorg-libX11-dev pango-dev libfm-dev gtk2-dev automake"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pcmciautils/receipt
--- a/pcmciautils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcmciautils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="018"
 CATEGORY="system-tools"
 SHORT_DESC="Utilities for inserting and removing PCMCIA cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/pcmcia/"
 
diff -r ad29ddfee1c9 -r d5aab818505e pcre/receipt
--- a/pcre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.42"
 CATEGORY="meta"
 SHORT_DESC="Perl 5 Compatible Regular Expression"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.pcre.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pcre.html"
@@ -13,7 +13,8 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev valgrind-dev"
-SPLIT="libpcre libpcre16 libpcre32 libpcrecpp libpcreposix pcre-apps pcre-dev"
+SPLIT="libpcre libpcre16 libpcre32 libpcrecpp libpcreposix $PACKAGE-apps \
+$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e pcre2/receipt
--- a/pcre2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcre2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,8 @@
 WGET_URL="$SF_MIRROR/pcre/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev bzip2-dev readline-dev valgrind-dev"
-SPLIT="libpcre2-8 libpcre2-16 libpcre2-32 libpcre2-posix pcre2-apps pcre2-dev"
+SPLIT="libpcre2-8 libpcre2-16 libpcre2-32 libpcre2-posix $PACKAGE-apps \
+$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e pcsc-lite/receipt
--- a/pcsc-lite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcsc-lite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://alioth.debian.org/frs/download.php/3741/$TARBALL" # FIXME
 
 BUILD_DEPENDS="eudev-dev perl libtool"
-SPLIT="pcsc-lite-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,9 +22,10 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	install -Dm755 $stuff/init.d/pcscd $install/etc/init.d/pcscd
+	install -Dm755 $stuff/pcscd      $install/etc/init.d/pcscd
+	install -Dm644 $stuff/pcscd.conf $install/etc/daemons.conf.d/pcscd.conf
 }
 
 genpkg_rules() {
@@ -41,6 +42,7 @@
 }
 
 # Daemon options in: daemons.conf
+# TODO: use /etc/daemons.conf.d/
 post_install_pcsc_lite() {
 	if ! grep -q 'PCSCD_OPTIONS' "$1/etc/daemons.conf"; then
 		cat >> "$1/etc/daemons.conf" <<EOT
diff -r ad29ddfee1c9 -r d5aab818505e pcsc-lite/stuff/init.d/pcscd
--- a/pcsc-lite/stuff/init.d/pcscd	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-# /etc/init.d/pcscd: Start, stop and restart pcsc-lite daemon on SliTaz,
-# at boot time or with the command line. Daemons options are configured
-# with /etc/daemons.conf
-#
-. /etc/init.d/rc.functions
-. /etc/daemons.conf
-
-NAME=Pcscd
-DESC="$(_ 'PC/SC smart card daemon')"
-DAEMON=/usr/sbin/pcscd
-PIDFILE=/run/pcscd/pcscd.pid
-
-case "$1" in
-	start)
-		if active_pidfile $PIDFILE pcscd ; then
-			_ '%s is already running.' $NAME
-			exit 1
-		fi
-		action 'Starting %s: %s...' "$DESC" $NAME
-		mkdir -p $(dirname $PIDFILE)
-		$DAEMON $PCSCD_OPTIONS
-		status ;;
-	stop)
-		if ! active_pidfile $PIDFILE pcscd ; then
-			_ '%s is not running.' $NAME
-			exit 1
-		fi
-		action 'Stopping %s: %s...' "$DESC" $NAME
-		kill $(cat $PIDFILE)
-		[ -e $PIDFILE ] && rm -f $PIDFILE
-		status ;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start ;;
-	*)
-		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
-		newline
-		exit 1 ;;
-esac
-
-exit 0
diff -r ad29ddfee1c9 -r d5aab818505e pcsc-lite/stuff/pcscd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pcsc-lite/stuff/pcscd	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,43 @@
+#!/bin/sh
+# /etc/init.d/pcscd: Start, stop and restart pcsc-lite daemon on SliTaz,
+# at boot time or with the command line. Daemons options are configured
+# with /etc/daemons.conf
+#
+. /etc/init.d/rc.functions
+. /etc/daemons.conf
+
+NAME=Pcscd
+DESC="$(_ 'PC/SC smart card daemon')"
+DAEMON=/usr/sbin/pcscd
+PIDFILE=/run/pcscd/pcscd.pid
+
+case "$1" in
+	start)
+		if active_pidfile $PIDFILE pcscd ; then
+			_ '%s is already running.' $NAME
+			exit 1
+		fi
+		action 'Starting %s: %s...' "$DESC" $NAME
+		mkdir -p $(dirname $PIDFILE)
+		$DAEMON $PCSCD_OPTIONS
+		status ;;
+	stop)
+		if ! active_pidfile $PIDFILE pcscd ; then
+			_ '%s is not running.' $NAME
+			exit 1
+		fi
+		action 'Stopping %s: %s...' "$DESC" $NAME
+		kill $(cat $PIDFILE)
+		[ -e $PIDFILE ] && rm -f $PIDFILE
+		status ;;
+	restart)
+		$0 stop
+		sleep 2
+		$0 start ;;
+	*)
+		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
+		newline
+		exit 1 ;;
+esac
+
+exit 0
diff -r ad29ddfee1c9 -r d5aab818505e pcsc-lite/stuff/pcscd.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pcsc-lite/stuff/pcscd.conf	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,2 @@
+# PC/SC smart card daemon options.
+PCSCD_OPTIONS=""
diff -r ad29ddfee1c9 -r d5aab818505e pcsc-tools/receipt
--- a/pcsc-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcsc-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,26 @@
 PACKAGE="pcsc-tools"
 VERSION="1.4.20"
 CATEGORY="system-tools"
-SHORT_DESC="PC/SC Architecture smartcard tools."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="PC/SC Architecture smartcard tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://ludovic.rousseau.free.fr/softwares/$PACKAGE/$TARBALL"
 
-DEPENDS="pcsc-lite perl-glib perl-gtk2 perl-pcsc"
 BUILD_DEPENDS="pcsc-lite-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile
-	make && make DESTDIR=$DESTDIR/usr install
+
+	make &&
+	make DESTDIR=$install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/pcsc $fs/usr/share
+	DEPENDS="pcsc-lite perl-glib perl-gtk2 perl-pcsc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pcsxr-svn/receipt
--- a/pcsxr-svn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pcsxr-svn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="62214"
 CATEGORY="games"
 SHORT_DESC="A Sony PlayStation emulator based on the PCSX-df Project"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://pcsxr.codeplex.com/"
 REPOLOGY="pcsxr"
@@ -12,16 +12,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="subversion|https://pcsxr.svn.codeplex.com/svn/pcsxr"
 BRANCH="$VERSION"
-TAGS="emulator playstation"
 
-DEPENDS="libcdio libglade xorg-libXtst xorg-libXv mesa libsdl"
-BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk2-dev xorg-libXtst xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev \
-zlib-dev libsdl libsdl-dev subversion nasm gettext intltool sed lzma \
-autoconf automake libtool expat-dev xorg-libxshmfence-dev"
+BUILD_DEPENDS="glib-dev libcdio libcdio-dev libglade-dev gtk2-dev xorg-libXtst \
+xorg-libXtst-dev xorg-libXv xorg-libXv-dev mesa-dev zlib-dev libsdl libsdl-dev \
+subversion nasm gettext-dev intltool sed lzma autoconf automake libtool \
+expat-dev xorg-libxshmfence-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -29,12 +26,11 @@
 		--enable-libcdio \
 		--enable-opengl \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
@@ -42,4 +38,6 @@
 	cp -a $install/usr/share/psemu $fs/usr/share
 	cp -a $install/usr/share/pcsx $fs/usr/share
 	find $fs/usr/lib -name "*.la" -delete
+	DEPENDS="libcdio libglade xorg-libXtst xorg-libXv mesa libsdl"
+	TAGS="emulator playstation"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pdf2djvu/receipt
--- a/pdf2djvu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pdf2djvu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pdf2djvu"
 VERSION="0.9.4"
-SHORT_DESC="creates DjVu files from PDF files"
+SHORT_DESC="Creates DjVu files from PDF files"
 CATEGORY="graphics"
+MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="https://bitbucket.org/jwilk/pdf2djvu"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-MAINTAINER="psychomaniak@xakep.ru"
-WEB_SITE="https://bitbucket.org/jwilk/pdf2djvu"
 WGET_URL="$WEB_SITE/downloads/$TARBALL"
 
-TAGS="pdf djvu"
-DEPENDS="djvulibre poppler"
 BUILD_DEPENDS="djvulibre-dev poppler-dev" #exiv2
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure && make && make install
+compile_rules() {
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="djvulibre poppler"
+	TAGS="pdf djvu"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pdnsd/receipt
--- a/pdnsd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pdnsd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mv $install/etc/pdnsd.conf.sample $install/etc/pdnsd.conf
 }
diff -r ad29ddfee1c9 -r d5aab818505e peazip/receipt
--- a/peazip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/peazip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.4.1"
 CATEGORY="utilities"
 SHORT_DESC="Open Source archive manager and data compression utility"
-MAINTAINER="hackdorte@yandex.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3 GPL LGPL freeware"
 WEB_SITE="http://peazip.org/peazip-linux.html"
 
@@ -14,11 +14,10 @@
 WGET_URL3="http://www.peazip.org/downloads/unrar5/peazip_unrar5_plugin-1.LINUX.ALL.tar.gz"
 WGET_URL4="http://www.peazip.org/downloads/additional/peazip_additional_formats_plugin-2.LINUX.ALL.tar.gz"
 
-SPLIT="peazip-plugin-unace peazip-plugin-unrar5 peazip-plugin-additional peazip"
+SPLIT="$PACKAGE-plugin-unace $PACKAGE-plugin-unrar5 $PACKAGE-plugin-additional \
+$PACKAGE"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# download/extract plugins
 	for i in $WGET_URL2 $WGET_URL3 $WGET_URL4; do
 		tarball="$SRC/$(basename $i)"
@@ -63,9 +62,7 @@
 	find $install -type d -exec chmod 0755 '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		peazip-plugin-unace)
 			copy unace/
diff -r ad29ddfee1c9 -r d5aab818505e pekwm/receipt
--- a/pekwm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pekwm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.13"
 CATEGORY="x-window"
 SHORT_DESC="Very light, configurable and themable window manager for X"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.pekwm.org/projects/pekwm"
 
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Custom configuration files and scripts
 	cp -r $stuff/etc     $install
@@ -24,8 +24,8 @@
 
 	# Set perms.
 	chown -R root:root $install
-	chmod +x   $install/etc/pekwm/start
-	chmod +x   $install/usr/share/pekwm/scripts/*
+	chmod +x $install/etc/pekwm/start
+	chmod +x $install/usr/share/pekwm/scripts/*
 }
 
 genpkg_rules() {
@@ -36,19 +36,19 @@
 }
 
 post_install() {
-	# Pekwm searches for default font path (100dpi folder) for xsever to render 
-	# menus; either manually set it in .xinitrc or fake 100dpi folder fonts 
+	# Pekwm searches for default font path (100dpi folder) for xsever to render
+	# menus; either manually set it in .xinitrc or fake 100dpi folder fonts
 	# by linking to ttf-dejavu
 	if [ ! -d "$1/usr/share/fonts/X11/100dpi/" ]; then
 		mkdir -p "$1/usr/share/fonts/X11/100dpi"
 		cd "$1/usr/share/fonts/X11/100dpi"
 		ln -s ../../truetype/ttf-dejavu/* .
 	fi
-	
+
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
 	fi
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e pem/receipt
--- a/pem/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pem/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="pem"
 VERSION="0.7.9"
 CATEGORY="utilities"
-SHORT_DESC="GNU Personal Expenses Manager."
+SHORT_DESC="GNU Personal Expenses Manager"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/pem/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/pem/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/pem $fs/usr/share
+	DEPENDS="perl"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e perdition/receipt
--- a/perdition/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perdition/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="vanessa_logger-dev vanessa_adt-dev vanessa_socket-dev \
 openldap-dev popt-dev cyrus-sasl-dev openssl-dev libidn-dev pam-dev"
-SPLIT="perdition perdition-dev perdition-pam:pam"
+SPLIT="$PACKAGE-dev $PACKAGE-pam:pam"
 
 BUGS="Very slow: more than 10 seconds for login with squirrelmail, why?"
 
@@ -36,7 +36,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/etc $install
 
diff -r ad29ddfee1c9 -r d5aab818505e perl-algorithm-permute/receipt
--- a/perl-algorithm-permute/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-algorithm-permute/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-apache-dbi/receipt
--- a/perl-apache-dbi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-apache-dbi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-appconfig/receipt
--- a/perl-appconfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-appconfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="AppConfig - Perl5 module for reading configuration files and \
 parsing command line arguments"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Artistic"
 WEB_SITE="https://metacpan.org/release/AppConfig"
 REPOLOGY="perl:appconfig"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-archive-zip/receipt
--- a/perl-archive-zip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-archive-zip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.63"
 CATEGORY="perl"
 SHORT_DESC="Archive::Zip - Provide an interface to ZIP archive files"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Archive-Zip"
 REPOLOGY="perl:archive-zip"
diff -r ad29ddfee1c9 -r d5aab818505e perl-authen-sasl/receipt
--- a/perl-authen-sasl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-authen-sasl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-b-hooks-endofscope/receipt
--- a/perl-b-hooks-endofscope/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-b-hooks-endofscope/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-berkeleydb/receipt
--- a/perl-berkeleydb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-berkeleydb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-bit-vector/receipt
--- a/perl-bit-vector/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-bit-vector/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Bit::Vector - Efficient bit vector, set of integers and \"big \
 int\" math library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Bit-Vector"
 REPOLOGY="perl:bit-vector"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-cairo/receipt
--- a/perl-cairo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-cairo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-carp-clan/receipt
--- a/perl-carp-clan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-carp-clan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Carp::Clan - Report errors from perspective of caller of a \
 \"clan\" of modules"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Carp-Clan"
 REPOLOGY="perl:carp-clan"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-cgi-session/receipt
--- a/perl-cgi-session/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-cgi-session/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-class-accessor/receipt
--- a/perl-class-accessor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-class-accessor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.51"
 CATEGORY="perl"
 SHORT_DESC="Class::Accessor - Automated accessor generation"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Class-Accessor"
 REPOLOGY="perl:class-accessor"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-class-data-inheritable/receipt
--- a/perl-class-data-inheritable/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-class-data-inheritable/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-class-inspector/receipt
--- a/perl-class-inspector/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-class-inspector/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Class-Inspector-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-class-singleton/receipt
--- a/perl-class-singleton/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-class-singleton/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5"
 CATEGORY="perl"
 SHORT_DESC="Class::Singleton - Implementation of a \"Singleton\" class"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Class-Singleton"
 REPOLOGY="perl:class-singleton"
@@ -12,20 +12,17 @@
 TARBALL="Class-Singleton-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHAY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-class-tiny/receipt
--- a/perl-class-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-class-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Class-Tiny-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-common-sense/receipt
--- a/perl-common-sense/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-common-sense/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="common-sense-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-config-general/receipt
--- a/perl-config-general/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-config-general/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-config-general"
 VERSION="2.63"
@@ -12,20 +12,17 @@
 TARBALL="Config-General-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TL/TLINDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-config-inifiles/receipt
--- a/perl-config-inifiles/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-config-inifiles/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Config-IniFiles-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$TARBALL"
 
-DEPENDS="perl-io-stringy"
-BUILD_DEPENDS="$DEPENDS perl-module-build"
+BUILD_DEPENDS="perl-io-stringy perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-io-stringy"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-config-tiny/receipt
--- a/perl-config-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-config-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-config-tiny"
 VERSION="2.23"
@@ -13,20 +13,17 @@
 TARBALL="Config-Tiny-$VERSION.tgz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RS/RSAVAGE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-convert-asn1/receipt
--- a/perl-convert-asn1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-convert-asn1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-convert-asn1"
 VERSION="0.27"
@@ -13,20 +13,17 @@
 TARBALL="Convert-ASN1-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GB/GBARR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-cpan-meta-check/receipt
--- a/perl-cpan-meta-check/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-cpan-meta-check/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="CPAN-Meta-Check-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-crypt-blowfish/receipt
--- a/perl-crypt-blowfish/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-crypt-blowfish/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-crypt-blowfish"
 VERSION="2.14"
 CATEGORY="perl"
 SHORT_DESC="Crypt::Blowfish - Perl Blowfish encryption module"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Perl"
 WEB_SITE="https://metacpan.org/release/Crypt-Blowfish"
 REPOLOGY="perl:crypt-blowfish"
@@ -12,20 +12,17 @@
 TARBALL="Crypt-Blowfish-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DP/DPARIS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-crypt-cbc/receipt
--- a/perl-crypt-cbc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-crypt-cbc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-crypt-cbc"
 VERSION="2.33"
 CATEGORY="perl"
 SHORT_DESC="Crypt::CBC - Encrypt Data with Cipher Block Chaining Mode"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Perl"
 WEB_SITE="https://metacpan.org/release/Crypt-CBC"
 REPOLOGY="perl:crypt-cbc"
@@ -12,20 +12,17 @@
 TARBALL="Crypt-CBC-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LD/LDS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-crypt-des/receipt
--- a/perl-crypt-des/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-crypt-des/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Crypt-DES-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DP/DPARIS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-crypt-rc4/receipt
--- a/perl-crypt-rc4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-crypt-rc4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Crypt-RC4-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SI/SIFUKURT/$TARBALL"
 
-DEPENDS="perl"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-crypt-smbhash/receipt
--- a/perl-crypt-smbhash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-crypt-smbhash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-crypt-smbhash"
 VERSION="0.12"
@@ -13,20 +13,17 @@
 TARBALL="Crypt-SmbHash-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BJ/BJKUIT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-curses/receipt
--- a/perl-curses/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-curses/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,17 +15,14 @@
 DEPENDS="perl ncurses ncurses-libform ncurses-libmenu ncurses-libpanel"
 BUILD_DEPENDS="perl-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL PANELS MENUS FORMS &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-date-calc/receipt
--- a/perl-date-calc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-date-calc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.4"
 CATEGORY="perl"
 SHORT_DESC="Date::Calc - Gregorian calendar date calculations"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Date-Calc"
 REPOLOGY="perl:date-calc"
@@ -12,20 +12,17 @@
 TARBALL="Date-Calc-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/ST/STBEY/$TARBALL"
 
-DEPENDS="perl-bit-vector perl-carp-clan"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-bit-vector perl-carp-clan"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install UNINST=1 install &&
+	make &&
+	make DESTDIR=$install UNINST=1 install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-bit-vector perl-carp-clan"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-date-manip/receipt
--- a/perl-date-manip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-date-manip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.73"
 CATEGORY="perl"
 SHORT_DESC="Date::Manip - Date manipulation routines"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Date-Manip"
 REPOLOGY="perl:date-manip"
diff -r ad29ddfee1c9 -r d5aab818505e perl-datetime-format-mail/receipt
--- a/perl-datetime-format-mail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-datetime-format-mail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="DateTime-Format-Mail-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BO/BOOK/$TARBALL"
 
-DEPENDS="perl-datetime perl-params-validate"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-datetime perl-params-validate"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-datetime perl-params-validate"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-datetime-format-strptime/receipt
--- a/perl-datetime-format-strptime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-datetime-format-strptime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,22 +13,21 @@
 TARBALL="DateTime-Format-Strptime-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-datetime perl-datetime-locale perl-datetime-timezone \
+BUILD_DEPENDS="perl-datetime perl-datetime-locale perl-datetime-timezone \
 perl-package-deprecationmanager perl-params-validationcompiler perl-specio \
-perl-try-tiny"
-BUILD_DEPENDS="$DEPENDS perl-test-warnings"
+perl-try-tiny perl-test-warnings"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-datetime perl-datetime-locale perl-datetime-timezone \
+	perl-package-deprecationmanager perl-params-validationcompiler perl-specio \
+	perl-try-tiny"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-datetime-format-w3cdtf/receipt
--- a/perl-datetime-format-w3cdtf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-datetime-format-w3cdtf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-datetime-format-w3cdtf"
 VERSION="0.07"
@@ -12,20 +12,17 @@
 TARBALL="DateTime-Format-W3CDTF-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GW/GWILLIAMS/$TARBALL"
 
-DEPENDS="perl-datetime"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-datetime"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-datetime"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-datetime-locale/receipt
--- a/perl-datetime-locale/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-datetime-locale/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,22 +12,21 @@
 TARBALL="DateTime-Locale-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-dist-checkconflicts perl-file-sharedir perl-scalar-list-utils \
-perl-namespace-autoclean perl-params-validationcompiler perl-specio"
-BUILD_DEPENDS="$DEPENDS perl-file-sharedir-install perl-cpan-meta-check \
-perl-test-fatal perl-test-file-sharedir perl-test-requires perl-test-warnings"
+BUILD_DEPENDS="perl-dist-checkconflicts perl-file-sharedir \
+perl-scalar-list-utils perl-namespace-autoclean perl-params-validationcompiler \
+perl-specio perl-file-sharedir-install perl-cpan-meta-check perl-test-fatal \
+perl-test-file-sharedir perl-test-requires perl-test-warnings"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-dist-checkconflicts perl-file-sharedir perl-scalar-list-utils \
+	perl-namespace-autoclean perl-params-validationcompiler perl-specio"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-datetime-timezone/receipt
--- a/perl-datetime-timezone/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-datetime-timezone/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-datetime-timezone"
 VERSION="2.19"
@@ -12,21 +12,20 @@
 TARBALL="DateTime-TimeZone-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-class-singleton perl-module-runtime perl-namespace-autoclean \
-perl-params-validationcompiler perl-specio perl-try-tiny"
-BUILD_DEPENDS="$DEPENDS perl-test-requires"
+BUILD_DEPENDS="perl-class-singleton perl-module-runtime \
+perl-namespace-autoclean perl-params-validationcompiler perl-specio \
+perl-try-tiny perl-test-requires"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-class-singleton perl-module-runtime perl-namespace-autoclean \
+	perl-params-validationcompiler perl-specio perl-try-tiny"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-dbd-mysql/receipt
--- a/perl-dbd-mysql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-dbd-mysql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-dbd-mysql"
 VERSION="4.046"
@@ -12,20 +12,17 @@
 TARBALL="DBD-mysql-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/C/CA/CAPTTOFU/$TARBALL"
 
-DEPENDS="perl perl-dbi libmysqlclient zlib"
 BUILD_DEPENDS="perl-dev perl-dbi mysql-dev perl-devel-checklib"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl perl-dbi libmysqlclient zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-dbd-pg/receipt
--- a/perl-dbd-pg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-dbd-pg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="DBD-Pg-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TU/TURNSTEP/$TARBALL"
 
-DEPENDS="perl-dbi libpostgresqlclient"
-BUILD_DEPENDS="$DEPENDS perl-dev postgresql-dev"
+BUILD_DEPENDS="perl-dbi libpostgresqlclient perl-dev postgresql-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-dbi libpostgresqlclient"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-dbd-sqlite/receipt
--- a/perl-dbd-sqlite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-dbd-sqlite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.58"
 CATEGORY="perl"
 SHORT_DESC="DBD::SQLite - Self-contained RDBMS in a DBI Driver"
-MAINTAINER="admin@trixarian.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/DBD-SQLite"
 REPOLOGY="perl:dbd-sqlite"
@@ -13,20 +13,17 @@
 WGET_URL="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/$TARBALL"
 
 # FIXME: sqlite3-dev and libsqlite3 aren't detected as (b)deps
-DEPENDS="perl-dbi libsqlite3"
-BUILD_DEPENDS="$DEPENDS perl-dev sqlite3-dev"
+BUILD_DEPENDS="perl-dbi libsqlite3 perl-dev sqlite3-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl-dbi libsqlite3"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-dbi/receipt
--- a/perl-dbi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-dbi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="DBI-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TI/TIMB/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-devel-checklib/receipt
--- a/perl-devel-checklib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-devel-checklib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Devel-CheckLib-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MATTN/$TARBALL"
 
-DEPENDS="perl-io-captureoutput perl-mock-config"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-io-captureoutput perl-mock-config"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-io-captureoutput perl-mock-config"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-devel-stacktrace/receipt
--- a/perl-devel-stacktrace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-devel-stacktrace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Devel-StackTrace-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-devel-symdump/receipt
--- a/perl-devel-symdump/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-devel-symdump/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-devel-symdump"
 VERSION="2.18"
@@ -12,20 +12,17 @@
 TARBALL="Devel-Symdump-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AN/ANDK/$TARBALL"
 
-DEPENDS="perl"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-digest-hmac/receipt
--- a/perl-digest-hmac/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-digest-hmac/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Digest-HMAC-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-digest-md4/receipt
--- a/perl-digest-md4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-digest-md4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-digest-md4"
 VERSION="1.9"
@@ -12,20 +12,17 @@
 TARBALL="Digest-MD4-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MI/MIKEM/DigestMD4/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-digest-perl-md4/receipt
--- a/perl-digest-perl-md4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-digest-perl-md4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Digest-Perl-MD4-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/O/OT/OTAKA/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-digest-perl-md5/receipt
--- a/perl-digest-perl-md5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-digest-perl-md5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-digest-perl-md5"
 VERSION="1.9"
@@ -13,20 +13,17 @@
 TARBALL="Digest-Perl-MD5-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DE/DELTA/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-digest-sha1/receipt
--- a/perl-digest-sha1/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-digest-sha1/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-digest-sha1"
 VERSION="2.13"
@@ -12,20 +12,17 @@
 TARBALL="Digest-SHA1-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-dist-checkconflicts/receipt
--- a/perl-dist-checkconflicts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-dist-checkconflicts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-dist-checkconflicts"
 VERSION="0.11"
@@ -12,20 +12,17 @@
 TARBALL="Dist-CheckConflicts-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DO/DOY/$TARBALL"
 
-DEPENDS="perl-module-runtime"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-module-runtime"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-module-runtime"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-email-date-format/receipt
--- a/perl-email-date-format/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-email-date-format/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Email-Date-Format-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-encode-locale/receipt
--- a/perl-encode-locale/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-encode-locale/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.05"
 CATEGORY="perl"
 SHORT_DESC="Encode::Locale - Determine the locale encoding"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Encode-Locale"
 REPOLOGY="perl:encode-locale"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-eval-closure/receipt
--- a/perl-eval-closure/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-eval-closure/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-eval-closure"
 VERSION="0.14"
@@ -12,20 +12,17 @@
 TARBALL="Eval-Closure-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DO/DOY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-event/receipt
--- a/perl-event/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-event/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-event"
 VERSION="1.26"
@@ -8,25 +8,22 @@
 LICENSE="unknown"
 WEB_SITE="https://metacpan.org/release/Event"
 REPOLOGY="perl:event"
-SUGGESTED="perl-time-hires"
 
 TARBALL="Event-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETJ/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl"
+	SUGGESTED="perl-time-hires"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-exception-class/receipt
--- a/perl-exception-class/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-exception-class/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Exception-Class-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-class-data-inheritable perl-devel-stacktrace"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-class-data-inheritable perl-devel-stacktrace"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-class-data-inheritable perl-devel-stacktrace"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-expect/receipt
--- a/perl-expect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-expect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-expect"
 VERSION="1.35"
@@ -9,25 +9,22 @@
 LICENSE="unknown"
 WEB_SITE="https://metacpan.org/release/Expect"
 REPOLOGY="perl:expect"
-SUGGESTED="perl-io-stty"
 
 TARBALL="Expect-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JA/JACOBY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-io-tty"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
+	SUGGESTED="perl-io-stty"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-exporter-tiny/receipt
--- a/perl-exporter-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-exporter-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Exporter::Tiny - an exporter with the features of Sub::Exporter \
 but only core dependencies"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Exporter-Tiny"
 REPOLOGY="perl:exporter-tiny"
@@ -25,5 +25,5 @@
 
 genpkg_rules() {
 	copy @std
-DEPENDS="perl"
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-extutils-config/receipt
--- a/perl-extutils-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-extutils-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="ExtUtils-Config-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-extutils-depends/receipt
--- a/perl-extutils-depends/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-extutils-depends/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="ExtUtils-Depends-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-extutils-helpers/receipt
--- a/perl-extutils-helpers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-extutils-helpers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="ExtUtils-Helpers-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-extutils-installpaths/receipt
--- a/perl-extutils-installpaths/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-extutils-installpaths/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="ExtUtils-InstallPaths-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl-extutils-config"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-extutils-config"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-extutils-config"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-extutils-pkgconfig/receipt
--- a/perl-extutils-pkgconfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-extutils-pkgconfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-extutils-pkgconfig"
 VERSION="1.16"
@@ -12,20 +12,17 @@
 TARBALL="ExtUtils-PkgConfig-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="perl pkg-config"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl pkg-config"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl pkg-config"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-fcgi-procmanager/receipt
--- a/perl-fcgi-procmanager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-fcgi-procmanager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-fcgi-procmanager"
 VERSION="0.28"
 CATEGORY="perl"
 SHORT_DESC="FCGI::ProcManager - functions for managing FastCGI applications"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/FCGI-ProcManager"
 REPOLOGY="perl:fcgi-procmanager"
@@ -12,20 +12,17 @@
 TARBALL="FCGI-ProcManager-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AR/ARODLAND/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-fcgi/receipt
--- a/perl-fcgi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-fcgi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.78"
 CATEGORY="perl"
 SHORT_DESC="FCGI - Fast CGI module"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="unknown"
 WEB_SITE="https://metacpan.org/release/FCGI"
 REPOLOGY="perl:fcgi"
@@ -12,20 +12,17 @@
 TARBALL="FCGI-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-basedir/receipt
--- a/perl-file-basedir/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-basedir/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="File-BaseDir-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KI/KIMRYAN/$TARBALL"
 
-DEPENDS="perl-ipc-system-simple"
-BUILD_DEPENDS="$DEPENDS perl-module-build perl-file-which"
+BUILD_DEPENDS="perl-ipc-system-simple perl-module-build perl-file-which"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-ipc-system-simple"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-copy-recursive/receipt
--- a/perl-file-copy-recursive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-copy-recursive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="File-Copy-Recursive-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DM/DMUEY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-desktopentry/receipt
--- a/perl-file-desktopentry/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-desktopentry/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="File-DesktopEntry-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/$TARBALL"
 
-DEPENDS="perl-file-basedir perl-uri"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-file-basedir perl-uri"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-file-basedir perl-uri"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-find-rule/receipt
--- a/perl-file-find-rule/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-find-rule/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.34"
 CATEGORY="perl"
 SHORT_DESC="File::Find::Rule - Alternative interface to File::Find"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/File-Find-Rule"
 REPOLOGY="perl:file-find-rule"
@@ -12,20 +12,17 @@
 TARBALL="File-Find-Rule-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$TARBALL"
 
-DEPENDS="perl-number-compare perl-text-glob"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-number-compare perl-text-glob"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-number-compare perl-text-glob"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-listing/receipt
--- a/perl-file-listing/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-listing/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.04"
 CATEGORY="perl"
 SHORT_DESC="File::Listing - parse directory listing"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/File-Listing"
 REPOLOGY="perl:file-listing"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-remove/receipt
--- a/perl-file-remove/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-remove/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-rsyncp/receipt
--- a/perl-file-rsyncp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-rsyncp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-file-rsyncp"
 VERSION="0.74"
 CATEGORY="perl"
 SHORT_DESC="File::RsyncP - Perl Rsync client"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/File-RsyncP"
 REPOLOGY="perl:file-rsyncp"
@@ -12,20 +12,17 @@
 TARBALL="File-RsyncP-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/C/CB/CBARRATT/$TARBALL"
 
-DEPENDS="perl rsync"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make -j1 && make -j1 DESTDIR=$install install &&
+	make -j1 &&
+	make -j1 DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl rsync"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-sharedir-install/receipt
--- a/perl-file-sharedir-install/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-sharedir-install/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="File-ShareDir-Install-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-module-build-tiny"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-sharedir/receipt
--- a/perl-file-sharedir/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-sharedir/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-slurp/receipt
--- a/perl-file-slurp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-slurp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="File::Slurp - Simple and Efficient Reading/Writing/Modifying of \
 Complete Files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/File-Slurp"
 REPOLOGY="perl:file-slurp"
@@ -16,17 +16,14 @@
 DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-slurper/receipt
--- a/perl-file-slurper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-slurper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-file-slurper"
 VERSION="0.012"
@@ -12,20 +12,17 @@
 TARBALL="File-Slurper-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-tail/receipt
--- a/perl-file-tail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-tail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="File-Tail-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MG/MGRABNAR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-file-which/receipt
--- a/perl-file-which/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-file-which/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="File-Which-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-filesys-statvfs/receipt
--- a/perl-filesys-statvfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-filesys-statvfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-filesys-statvfs"
 VERSION="0.82"
@@ -12,20 +12,17 @@
 TARBALL="Filesys-Statvfs-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/I/IG/IGUTHRIE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-font-afm/receipt
--- a/perl-font-afm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-font-afm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Font-AFM-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-fuse/receipt
--- a/perl-fuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-fuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,18 @@
 TARBALL="Fuse-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DP/DPATES/$TARBALL"
 
-DEPENDS="fuse2 perl-filesys-statvfs perl-lchown perl-unix-mknod"
-BUILD_DEPENDS="$DEPENDS perl-dev fuse2-dev"
+BUILD_DEPENDS="fuse2 perl-filesys-statvfs perl-lchown perl-unix-mknod \
+perl-dev fuse2-dev"
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
 genpkg_rules() {
 	copy @std
+	DEPENDS="fuse2 perl-filesys-statvfs perl-lchown perl-unix-mknod"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-geo-ipfree/receipt
--- a/perl-geo-ipfree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-geo-ipfree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-geo-ipfree"
 VERSION="1.151940"
 CATEGORY="perl"
 SHORT_DESC="Geo::IPfree - Look up the country of an IPv4 address"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Geo-IPfree"
 REPOLOGY="perl:geo-ipfree"
@@ -12,20 +12,17 @@
 TARBALL="Geo-IPfree-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BR/BRICAS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-glib/receipt
--- a/perl-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-glib"
 VERSION="1.327"
@@ -12,20 +12,17 @@
 TARBALL="Glib-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="perl glib"
 BUILD_DEPENDS="perl-dev perl-extutils-depends perl-extutils-pkgconfig glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl glib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-gssapi/receipt
--- a/perl-gssapi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-gssapi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-gssapi"
 VERSION="0.28"
@@ -12,20 +12,17 @@
 TARBALL="GSSAPI-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AG/AGROLMS/$TARBALL"
 
-DEPENDS="libcomerr3 libkrb5 perl"
 BUILD_DEPENDS="perl-dev krb5-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="libcomerr3 libkrb5 perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-gtk2-trayicon/receipt
--- a/perl-gtk2-trayicon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-gtk2-trayicon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,18 @@
 TARBALL="Gtk2-TrayIcon-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BO/BORUP/$TARBALL"
 
-DEPENDS="perl-gtk2"
-BUILD_DEPENDS="$DEPENDS perl-dev perl-extutils-depends perl-extutils-pkgconfig \
+BUILD_DEPENDS="perl-gtk2 perl-dev perl-extutils-depends perl-extutils-pkgconfig \
 gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl-gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-gtk2/receipt
--- a/perl-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,22 +12,19 @@
 TARBALL="Gtk2-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="perl-glib perl-pango atk cairo fontconfig freetype gdk-pixbuf glib \
-gtk2 pango"
 BUILD_DEPENDS="perl-dev perl-glib perl-pango perl-extutils-depends \
 perl-extutils-pkgconfig gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl-glib perl-pango atk cairo fontconfig freetype gdk-pixbuf glib \
+	gtk2 pango"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-html-formatter/receipt
--- a/perl-html-formatter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-html-formatter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-html-formatter"
 VERSION="2.16"
@@ -12,20 +12,17 @@
 TARBALL="HTML-Formatter-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NI/NIGELM/$TARBALL"
 
-DEPENDS="perl-font-afm perl-html-tree"
-BUILD_DEPENDS="$DEPENDS perl-file-slurper perl-test-warnings"
+BUILD_DEPENDS="perl-font-afm perl-html-tree perl-file-slurper perl-test-warnings"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-font-afm perl-html-tree"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-html-parser/receipt
--- a/perl-html-parser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-html-parser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-html-tagset/receipt
--- a/perl-html-tagset/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-html-tagset/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-html-tree/receipt
--- a/perl-html-tree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-html-tree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-html-tree"
 VERSION="5.07"
 CATEGORY="perl"
 SHORT_DESC="HTML::Tree - build and scan parse-trees of HTML"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTML-Tree"
 REPOLOGY="perl:html-tree"
@@ -12,22 +12,19 @@
 TARBALL="HTML-Tree-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$TARBALL"
 
-DEPENDS="perl-html-parser perl-html-tagset"
-BUILD_DEPENDS="$DEPENDS perl-module-build perl-test-fatal perl-html-formatter \
-perl-libwww-perl"
+BUILD_DEPENDS="perl-html-parser perl-html-tagset perl-module-build \
+perl-test-fatal perl-html-formatter perl-libwww-perl"
 # BDEP loop: 'perl-html-tree' needs 'perl-html-formatter' needs 'perl-html-tree'
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Build.PL &&
-	./Build && ./Build install --destdir $install &&
+	./Build &&
+	./Build install --destdir $install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-html-parser perl-html-tagset"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-cookies/receipt
--- a/perl-http-cookies/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-cookies/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.04"
 CATEGORY="perl"
 SHORT_DESC="HTTP::Cookies - HTTP cookie jars"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Cookies"
 REPOLOGY="perl:http-cookies"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-daemon/receipt
--- a/perl-http-daemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-daemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.01"
 CATEGORY="perl"
 SHORT_DESC="HTTP::Daemon - a simple http server class"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Daemon"
 REPOLOGY="perl:http-daemon"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-date/receipt
--- a/perl-http-date/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-date/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.02"
 CATEGORY="perl"
 SHORT_DESC="HTTP::Date - date conversion routines"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Date"
 REPOLOGY="perl:http-date"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-message/receipt
--- a/perl-http-message/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-message/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.18"
 CATEGORY="perl"
 SHORT_DESC="HTTP::Message - HTTP style message"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Message"
 REPOLOGY="perl:http-message"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-negotiate/receipt
--- a/perl-http-negotiate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-negotiate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.01"
 CATEGORY="perl"
 SHORT_DESC="HTTP::Negotiate - choose a variant to serve"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Negotiate"
 REPOLOGY="perl:http-negotiate"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-parser/receipt
--- a/perl-http-parser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-parser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="HTTP::Parser - parse HTTP/1.1 request into HTTP::Request/Response \
 object"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/HTTP-Parser"
 REPOLOGY="perl:http-parser"
@@ -13,20 +13,17 @@
 TARBALL="HTTP-Parser-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ED/EDECA/$TARBALL"
 
-DEPENDS="perl-http-message perl-uri"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-http-message perl-uri"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-http-message perl-uri"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-http-server-simple/receipt
--- a/perl-http-server-simple/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-http-server-simple/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="HTTP-Server-Simple-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BP/BPS/$TARBALL"
 
-DEPENDS="perl-cgi"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-cgi"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-cgi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-image-librsvg/receipt
--- a/perl-image-librsvg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-image-librsvg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-image-librsvg"
 VERSION="0.07"
@@ -12,20 +12,17 @@
 TARBALL="Image-LibRSVG-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TOMSON/$TARBALL"
 
-DEPENDS="perl cairo gdk-pixbuf glib librsvg"
 BUILD_DEPENDS="perl-dev librsvg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl cairo gdk-pixbuf glib librsvg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-importer/receipt
--- a/perl-importer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-importer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-importer"
 VERSION="0.025"
@@ -13,20 +13,17 @@
 TARBALL="Importer-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-inc-latest/receipt
--- a/perl-inc-latest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-inc-latest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-inc-latest"
 VERSION="0.500"
@@ -13,20 +13,17 @@
 TARBALL="inc-latest-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-captureoutput/receipt
--- a/perl-io-captureoutput/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-captureoutput/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-io-captureoutput"
 VERSION="1.1104"
@@ -13,20 +13,17 @@
 TARBALL="IO-CaptureOutput-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-html/receipt
--- a/perl-io-html/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-html/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-interactive-tiny/receipt
--- a/perl-io-interactive-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-interactive-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-multiplex/receipt
--- a/perl-io-multiplex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-multiplex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="IO-Multiplex-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BB/BBB/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-sessiondata/receipt
--- a/perl-io-sessiondata/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-sessiondata/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-io-sessiondata"
 VERSION="1.03"
@@ -12,20 +12,17 @@
 TARBALL="IO-SessionData-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PH/PHRED/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-socket-inet6/receipt
--- a/perl-io-socket-inet6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-socket-inet6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,11 +1,11 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-io-socket-inet6"
 VERSION="2.72"
 CATEGORY="perl"
 SHORT_DESC="IO::Socket::INET6 - Object interface for AF_INET/AF_INET6 domain \
 sockets"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/IO-Socket-INET6"
 REPOLOGY="perl:io-socket-inet6"
@@ -13,20 +13,17 @@
 TARBALL="IO-Socket-INET6-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$TARBALL"
 
-DEPENDS="perl-socket6"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-socket6"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-socket6"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-stringy/receipt
--- a/perl-io-stringy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-stringy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="IO-stringy-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DS/DSKOLL/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-stty/receipt
--- a/perl-io-stty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-stty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,16 @@
 TARBALL="IO-Stty-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Build.PL &&
 	./Build --destdir $install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-io-tty/receipt
--- a/perl-io-tty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-io-tty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="IO-Tty-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-ipc-run/receipt
--- a/perl-ipc-run/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-ipc-run/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="IPC-Run-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TODDR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-ipc-run3/receipt
--- a/perl-ipc-run3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-ipc-run3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-ipc-run3"
 VERSION="0.048"
@@ -12,20 +12,17 @@
 TARBALL="IPC-Run3-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-ipc-system-simple/receipt
--- a/perl-ipc-system-simple/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-ipc-system-simple/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-ipc-system-simple"
 VERSION="1.25"
@@ -13,20 +13,17 @@
 TARBALL="IPC-System-Simple-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PJ/PJF/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-jcode/receipt
--- a/perl-jcode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-jcode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Jcode-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DANKOGAI/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-json/receipt
--- a/perl-json/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-json/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.97001"
 CATEGORY="perl"
 SHORT_DESC="JSON - JSON (JavaScript Object Notation) encoder/decoder"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/JSON"
 REPOLOGY="perl:json"
@@ -12,20 +12,17 @@
 TARBALL="JSON-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-lchown/receipt
--- a/perl-lchown/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-lchown/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Lchown-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NC/NCLEATON/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-libnet/receipt
--- a/perl-libnet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-libnet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,22 +12,19 @@
 TARBALL="libnet-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHAY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# avoid interactive questions
 	PERL_MM_USE_DEFAULT=1 \
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-libwww-perl/receipt
--- a/perl-libwww-perl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-libwww-perl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-linux-inotify2/receipt
--- a/perl-linux-inotify2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-linux-inotify2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-linux-inotify2"
 VERSION="1.22"
@@ -12,20 +12,17 @@
 TARBALL="Linux-Inotify2-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/$TARBALL"
 
-DEPENDS="perl-common-sense"
-BUILD_DEPENDS="$DEPENDS perl-dev"
+BUILD_DEPENDS="perl-common-sense perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-common-sense"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-list-moreutils-xs/receipt
--- a/perl-list-moreutils-xs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-list-moreutils-xs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-list-moreutils/receipt
--- a/perl-list-moreutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-list-moreutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.428"
 CATEGORY="perl"
 SHORT_DESC="List::MoreUtils - Provide the stuff missing in List::Util"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/List-MoreUtils"
 REPOLOGY="perl:list-moreutils"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-locale-gettext/receipt
--- a/perl-locale-gettext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-locale-gettext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.07"
 CATEGORY="perl"
 SHORT_DESC="Locale::gettext - message handling functions"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/gettext"
 REPOLOGY="perl:locale-gettext"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-locale-maketext-gettext/receipt
--- a/perl-locale-maketext-gettext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-locale-maketext-gettext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,11 +1,11 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-locale-maketext-gettext"
 VERSION="1.28"
 CATEGORY="perl"
 SHORT_DESC="Locale::Maketext::Gettext - Joins the gettext and Maketext \
 frameworks"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://metacpan.org/release/Locale-Maketext-Gettext"
 REPOLOGY="perl:locale-maketext-gettext"
@@ -13,22 +13,17 @@
 TARBALL="Locale-Maketext-Gettext-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/I/IM/IMACAT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
-	# strip
-	sed -i '/^=/,/^=cut/d' $fs/usr/bin/maketext
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-locale-maketext-lexicon/receipt
--- a/perl-locale-maketext-lexicon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-locale-maketext-lexicon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Locale-Maketext-Lexicon-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DRTECH/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-log-agent/receipt
--- a/perl-log-agent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-log-agent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-log-agent"
 VERSION="1.003"
@@ -12,20 +12,17 @@
 TARBALL="Log-Agent-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MR/MROGASKI/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-lwp-mediatypes/receipt
--- a/perl-lwp-mediatypes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-lwp-mediatypes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.02"
 CATEGORY="perl"
 SHORT_DESC="LWP::MediaTypes - guess media type for a file or a URL"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/LWP-MediaTypes"
 REPOLOGY="perl:lwp-mediatypes"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-lwp-protocol-https/receipt
--- a/perl-lwp-protocol-https/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-lwp-protocol-https/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-lwp-protocol-https"
 VERSION="6.07"
@@ -12,20 +12,17 @@
 TARBALL="LWP-Protocol-https-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/$TARBALL"
 
-DEPENDS="perl-io-socket-ssl perl-libwww-perl perl-mozilla-ca perl-net-http"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-io-socket-ssl perl-libwww-perl perl-mozilla-ca perl-net-http"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-io-socket-ssl perl-libwww-perl perl-mozilla-ca perl-net-http"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mail-sendmail/receipt
--- a/perl-mail-sendmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mail-sendmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Mail-Sendmail-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NE/NEILB/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mailtools/receipt
--- a/perl-mailtools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mailtools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="MailTools-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MARKOV/$TARBALL"
 
-DEPENDS="perl-timedate"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-timedate"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-timedate"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-math-round/receipt
--- a/perl-math-round/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-math-round/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.07"
 CATEGORY="perl"
 SHORT_DESC="Math::Round - Perl extension for rounding numbers"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Math-Round"
 REPOLOGY="perl:math-round"
@@ -12,21 +12,18 @@
 TARBALL="Math-Round-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GR/GROMMEL/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install &&
 	find $install -type f -exec dos2unix '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mime-lite/receipt
--- a/perl-mime-lite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mime-lite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="MIME-Lite-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl-email-date-format perl-mime-types perl-mailtools"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-email-date-format perl-mime-types perl-mailtools"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-email-date-format perl-mime-types perl-mailtools"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mock-config/receipt
--- a/perl-mock-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mock-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-mock-config"
 VERSION="0.03"
@@ -12,20 +12,17 @@
 TARBALL="Mock-Config-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-build-tiny/receipt
--- a/perl-module-build-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-build-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,19 @@
 TARBALL="Module-Build-Tiny-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl-extutils-config perl-extutils-helpers perl-extutils-installpaths"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-extutils-config perl-extutils-helpers \
+perl-extutils-installpaths"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Build.PL &&
-	./Build && ./Build install --destdir $install &&
+	./Build &&
+	./Build install --destdir $install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-extutils-config perl-extutils-helpers \
+	perl-extutils-installpaths"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-build/receipt
--- a/perl-module-build/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-build/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Module-Build-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LE/LEONT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-inc-latest"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-implementation/receipt
--- a/perl-module-implementation/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-implementation/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,11 +1,11 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-module-implementation"
 VERSION="0.09"
 CATEGORY="perl"
 SHORT_DESC="Module::Implementation - Loads one of several alternate underlying \
 implementations for a module"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Module-Implementation"
 REPOLOGY="perl:module-implementation"
@@ -13,20 +13,18 @@
 TARBALL="Module-Implementation-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-module-runtime perl-try-tiny"
-BUILD_DEPENDS="$DEPENDS perl-test-fatal perl-test-requires"
+BUILD_DEPENDS="perl-module-runtime perl-try-tiny perl-test-fatal \
+perl-test-requires"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-module-runtime perl-try-tiny"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-install/receipt
--- a/perl-module-install/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-install/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-runtime/receipt
--- a/perl-module-runtime/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-runtime/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.016"
 CATEGORY="perl"
 SHORT_DESC="Module::Runtime - runtime module handling"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Module-Runtime"
 REPOLOGY="perl:module-runtime"
@@ -12,20 +12,17 @@
 TARBALL="Module-Runtime-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-module-scandeps/receipt
--- a/perl-module-scandeps/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-module-scandeps/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mozilla-ca/receipt
--- a/perl-mozilla-ca/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mozilla-ca/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Mozilla-CA-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AB/ABH/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-mro-compat/receipt
--- a/perl-mro-compat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-mro-compat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-mro-compat"
 VERSION="0.13"
@@ -12,20 +12,17 @@
 TARBALL="MRO-Compat-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-namespace-autoclean/receipt
--- a/perl-namespace-autoclean/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-namespace-autoclean/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,18 @@
 TARBALL="namespace-autoclean-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
-BUILD_DEPENDS="$DEPENDS perl-test-requires"
+BUILD_DEPENDS="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify \
+perl-test-requires"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-namespace-clean/receipt
--- a/perl-namespace-clean/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-namespace-clean/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-namespace-clean"
 VERSION="0.27"
@@ -12,20 +12,17 @@
 TARBALL="namespace-clean-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RI/RIBASUSHI/$TARBALL"
 
-DEPENDS="perl-b-hooks-endofscope perl-package-stash"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-b-hooks-endofscope perl-package-stash"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-b-hooks-endofscope perl-package-stash"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-dns/receipt
--- a/perl-net-dns/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-dns/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.17"
 CATEGORY="perl"
 SHORT_DESC="Net::DNS - Perl Interface to the Domain Name System"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Net-DNS"
 REPOLOGY="perl:net-dns"
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-ftp-autoreconnect/receipt
--- a/perl-net-ftp-autoreconnect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-ftp-autoreconnect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-net-ftp-autoreconnect"
 VERSION="0.3"
@@ -13,20 +13,17 @@
 TARBALL="Net-FTP-AutoReconnect-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GI/GIFF/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-ftp-retrhandle/receipt
--- a/perl-net-ftp-retrhandle/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-ftp-retrhandle/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Net-FTP-RetrHandle-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GI/GIFF/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-http/receipt
--- a/perl-net-http/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-http/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.18"
 CATEGORY="perl"
 SHORT_DESC="Net::HTTP - Low-level HTTP connection (client)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Net-HTTP"
 REPOLOGY="perl:net-http"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-ip/receipt
--- a/perl-net-ip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-ip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Net-IP-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MANU/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-mysql/receipt
--- a/perl-net-mysql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-mysql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Net-MySQL-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TS/TSUCCHI/$TARBALL"
 
-DEPENDS="perl-digest-sha1 libmysqlclient"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-digest-sha1 libmysqlclient"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-digest-sha1 libmysqlclient"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-pcap/receipt
--- a/perl-net-pcap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-pcap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-net-pcap"
 VERSION="0.18"
@@ -12,20 +12,17 @@
 TARBALL="Net-Pcap-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SA/SAPER/$TARBALL"
 
-DEPENDS="perl libpcap"
 BUILD_DEPENDS="perl-dev libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl libpcap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-server/receipt
--- a/perl-net-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Net-Server-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RH/RHANDOM/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-smtp-ssl/receipt
--- a/perl-net-smtp-ssl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-smtp-ssl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.04"
 CATEGORY="perl"
 SHORT_DESC="Net::SMTP::SSL - SSL support for Net::SMTP"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Net-SMTP-SSL"
 REPOLOGY="perl:net-smtp-ssl"
@@ -12,20 +12,17 @@
 TARBALL="Net-SMTP-SSL-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl-io-socket-ssl"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-io-socket-ssl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-io-socket-ssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-snmp/receipt
--- a/perl-net-snmp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-snmp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Net-SNMP-v$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DT/DTOWN/$TARBALL"
 
-DEPENDS="perl-crypt-des perl-digest-hmac perl-digest-sha1"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-crypt-des perl-digest-hmac perl-digest-sha1"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-crypt-des perl-digest-hmac perl-digest-sha1"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-ssleay/receipt
--- a/perl-net-ssleay/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-ssleay/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,22 +12,19 @@
 TARBALL="Net-SSLeay-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MI/MIKEM/$TARBALL"
 
-DEPENDS="perl openssl zlib"
 BUILD_DEPENDS="perl-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# avoid interactive questions
 	PERL_MM_USE_DEFAULT=1 \
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl openssl zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-telnet/receipt
--- a/perl-net-telnet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-telnet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-net-telnet"
 VERSION="3.04"
@@ -12,20 +12,17 @@
 TARBALL="Net-Telnet-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JR/JROGERS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-net-xwhois/receipt
--- a/perl-net-xwhois/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-net-xwhois/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Net-XWhois-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/V/VI/VIPUL/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-number-compare/receipt
--- a/perl-number-compare/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-number-compare/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.03"
 CATEGORY="perl"
 SHORT_DESC="Number::Compare - numeric comparisons"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="unknown"
 WEB_SITE="https://metacpan.org/release/Number-Compare"
 REPOLOGY="perl:number-compare"
@@ -12,20 +12,17 @@
 TARBALL="Number-Compare-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-number-range/receipt
--- a/perl-number-range/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-number-range/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Number-Range-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/L/LA/LARRYSH/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-package-deprecationmanager/receipt
--- a/perl-package-deprecationmanager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-package-deprecationmanager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,18 @@
 TARBALL="Package-DeprecationManager-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-package-stash perl-params-util perl-sub-install perl-sub-name"
-BUILD_DEPENDS="$DEPENDS perl-test-fatal perl-test-warnings"
+BUILD_DEPENDS="perl-package-stash perl-params-util perl-sub-install \
+perl-sub-name perl-test-fatal perl-test-warnings"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-package-stash perl-params-util perl-sub-install perl-sub-name"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-package-stash-xs/receipt
--- a/perl-package-stash-xs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-package-stash-xs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Package-Stash-XS-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DO/DOY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-package-stash/receipt
--- a/perl-package-stash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-package-stash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-package-stash"
 VERSION="0.37"
@@ -12,21 +12,18 @@
 TARBALL="Package-Stash-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DO/DOY/$TARBALL"
 
-DEPENDS="perl-dist-checkconflicts perl-module-implementation"
-BUILD_DEPENDS="$DEPENDS perl-package-stash-xs perl-test-fatal \
-perl-test-requires"
+BUILD_DEPENDS="perl-dist-checkconflicts perl-module-implementation \
+perl-package-stash-xs perl-test-fatal perl-test-requires"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-dist-checkconflicts perl-module-implementation"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-pango/receipt
--- a/perl-pango/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-pango/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-pango"
 VERSION="1.227"
@@ -12,21 +12,18 @@
 TARBALL="Pango-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/X/XA/XAOC/$TARBALL"
 
-DEPENDS="perl-cairo perl-glib cairo freetype glib pango"
-BUILD_DEPENDS="$DEPENDS perl-dev perl-extutils-depends perl-extutils-pkgconfig \
-pango-dev"
+BUILD_DEPENDS="perl-cairo perl-glib cairo freetype glib pango perl-dev \
+perl-extutils-depends perl-extutils-pkgconfig pango-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std @dev
+	DEPENDS="perl-cairo perl-glib cairo freetype glib pango"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-params-util/receipt
--- a/perl-params-util/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-params-util/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-params-util"
 VERSION="1.07"
@@ -12,20 +12,17 @@
 TARBALL="Params-Util-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-params-validate/receipt
--- a/perl-params-validate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-params-validate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-params-validate"
 VERSION="1.29"
@@ -12,21 +12,17 @@
 TARBALL="Params-Validate-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-module-implementation"
-BUILD_DEPENDS="$DEPENDS perl-dev perl-module-build perl-test-fatal \
-perl-test-requires"
+BUILD_DEPENDS="perl-module-implementation perl-dev perl-module-build \
+perl-test-fatal perl-test-requires"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Build.PL &&
 	./Build --destdir $install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-module-implementation"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-params-validationcompiler/receipt
--- a/perl-params-validationcompiler/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-params-validationcompiler/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-parse-recdescent/receipt
--- a/perl-parse-recdescent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-parse-recdescent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Parse-RecDescent-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JT/JTBRAUN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-path-class/receipt
--- a/perl-path-class/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-path-class/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Path-Class-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/$TARBALL"
 
-DEPENDS="perl-module-build"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-module-build"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-path-tiny/receipt
--- a/perl-path-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-path-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-pcsc/receipt
--- a/perl-pcsc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-pcsc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.14"
 CATEGORY="perl"
 SHORT_DESC="Chipcard::PCSC - Smart card reader interface library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/pcsc-perl"
 REPOLOGY="perl:pcsc-perl"
@@ -12,20 +12,17 @@
 TARBALL="pcsc-perl-$VERSION.tar.bz2"
 WGET_URL="https://cpan.metacpan.org/authors/id/W/WH/WHOM/$TARBALL"
 
-DEPENDS="perl pcsc-lite"
 BUILD_DEPENDS="perl-dev pcsc-lite-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl pcsc-lite"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-perl-ldap/receipt
--- a/perl-perl-ldap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-perl-ldap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,25 @@
 TARBALL="perl-ldap-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MA/MARSCHAP/$TARBALL"
 
-DEPENDS="perl-convert-asn1 perl-text-soundex perl-io-socket-inet6 \
+BUILD_DEPENDS="perl-convert-asn1 perl-text-soundex perl-io-socket-inet6 \
 perl-io-socket-ssl perl-authen-sasl perl-digest-hmac perl-gssapi perl-uri \
 perl-xml-sax-writer perl-xml-sax-base perl-libwww-perl perl-lwp-mediatypes \
-perl-http-negotiate perl-http-message perl-json"
-BUILD_DEPENDS="$DEPENDS perl-module-install"
+perl-http-negotiate perl-http-message perl-json perl-module-install"
 
 compile_rules() {
 	# avoid interactive questions
 	PERL_MM_USE_DEFAULT=1 \
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
 genpkg_rules() {
 	copy @std
+	DEPENDS="perl-convert-asn1 perl-text-soundex perl-io-socket-inet6 \
+	perl-io-socket-ssl perl-authen-sasl perl-digest-hmac perl-gssapi perl-uri \
+	perl-xml-sax-writer perl-xml-sax-base perl-libwww-perl perl-lwp-mediatypes \
+	perl-http-negotiate perl-http-message perl-json"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-perl-tidy/receipt
--- a/perl-perl-tidy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-perl-tidy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-perl-tidy"
 VERSION="20180220"
@@ -8,25 +8,22 @@
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Perl-Tidy"
 REPOLOGY="perl:perl-tidy"
-PROVIDE="perltidy" # substitute old name
 
 TARBALL="Perl-Tidy-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHANCOCK/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
+	PROVIDE="perltidy" # substitute old name
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-pod-coverage/receipt
--- a/perl-pod-coverage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-pod-coverage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-pod-coverage"
 VERSION="0.23"
@@ -13,20 +13,17 @@
 TARBALL="Pod-Coverage-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RC/RCLAMP/$TARBALL"
 
-DEPENDS="perl-devel-symdump"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-devel-symdump"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-devel-symdump"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-proc-processtable/receipt
--- a/perl-proc-processtable/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-proc-processtable/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Proc-ProcessTable-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JW/JWB/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-rfc-rfc822-address/receipt
--- a/perl-rfc-rfc822-address/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-rfc-rfc822-address/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="RFC-RFC822-Address-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AB/ABIGAIL/$TARBALL"
 
-DEPENDS="perl-parse-recdescent"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-parse-recdescent"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-parse-recdescent"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-role-tiny/receipt
--- a/perl-role-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-role-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Role-Tiny-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-rrd-simple/receipt
--- a/perl-rrd-simple/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-rrd-simple/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,21 +13,18 @@
 TARBALL="RRD-Simple-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NI/NICOLAW/$TARBALL"
 
-DEPENDS="perl rrdtool-perl"
 BUILD_DEPENDS="perl rrdtool-perl perl-test-pod perl-test-deep \
 perl-test-pod-coverage perl-module-build"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl rrdtool-perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-scalar-list-utils/receipt
--- a/perl-scalar-list-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-scalar-list-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Scalar-List-Utils-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PE/PEVANS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-scope-guard/receipt
--- a/perl-scope-guard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-scope-guard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-scope-guard"
 VERSION="0.21"
@@ -12,20 +12,17 @@
 TARBALL="Scope-Guard-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/C/CH/CHOCOLATE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sgmlspm/receipt
--- a/perl-sgmlspm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sgmlspm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,8 @@
 	chmod 644 MYMETA.yml
 
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install || return 1
+	make &&
+	make DESTDIR=$install install || return 1
 
 	ln -sv sgmlspl.pl $install/usr/bin/sgmlspl
 	chmod -R u+w $install
diff -r ad29ddfee1c9 -r d5aab818505e perl-soap-lite/receipt
--- a/perl-soap-lite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-soap-lite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,22 +12,21 @@
 TARBALL="SOAP-Lite-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PH/PHRED/$TARBALL"
 
-DEPENDS="perl-class-inspector perl-io-sessiondata perl-io-socket-ssl \
+BUILD_DEPENDS="perl-class-inspector perl-io-sessiondata perl-io-socket-ssl \
 perl-lwp-protocol-https perl-libwww-perl perl-task-weaken perl-uri \
 perl-xml-parser"
-BUILD_DEPENDS="$DEPENDS"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-class-inspector perl-io-sessiondata perl-io-socket-ssl \
+	perl-lwp-protocol-https perl-libwww-perl perl-task-weaken perl-uri \
+	perl-xml-parser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-socket6/receipt
--- a/perl-socket6/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-socket6/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,11 +1,11 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-socket6"
 VERSION="0.28"
 CATEGORY="perl"
 SHORT_DESC="Socket6 - IPv6 related part of the C socket.h defines and \
 structure manipulators"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Socket6"
 REPOLOGY="perl:socket6"
@@ -13,20 +13,17 @@
 TARBALL="Socket6-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-specio/receipt
--- a/perl-specio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-specio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,19 @@
 TARBALL="Specio-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl-devel-stacktrace perl-eval-closure perl-module-runtime \
-perl-mro-compat perl-role-tiny perl-test-fatal"
-BUILD_DEPENDS="$DEPENDS perl-test-needs"
+BUILD_DEPENDS="perl-devel-stacktrace perl-eval-closure perl-module-runtime \
+perl-mro-compat perl-role-tiny perl-test-fatal perl-test-needs"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-devel-stacktrace perl-eval-closure perl-module-runtime \
+	perl-mro-compat perl-role-tiny perl-test-fatal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-spreadsheet-parseexcel/receipt
--- a/perl-spreadsheet-parseexcel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-spreadsheet-parseexcel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,19 @@
 TARBALL="Spreadsheet-ParseExcel-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DO/DOUGW/$TARBALL"
 
-DEPENDS="perl-crypt-rc4 perl-digest-perl-md5 perl-io-stringy \
+BUILD_DEPENDS="perl-crypt-rc4 perl-digest-perl-md5 perl-io-stringy \
 perl-ole-storage_lite"
-BUILD_DEPENDS="$DEPENDS"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-crypt-rc4 perl-digest-perl-md5 perl-io-stringy \
+	perl-ole-storage_lite"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-spreadsheet-writeexcel/receipt
--- a/perl-spreadsheet-writeexcel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-spreadsheet-writeexcel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-spreadsheet-writeexcel"
 VERSION="2.40"
@@ -13,20 +13,17 @@
 TARBALL="Spreadsheet-WriteExcel-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JM/JMCNAMARA/$TARBALL"
 
-DEPENDS="perl-ole-storage_lite perl-parse-recdescent"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-ole-storage_lite perl-parse-recdescent"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-ole-storage_lite perl-parse-recdescent"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-exporter-progressive/receipt
--- a/perl-sub-exporter-progressive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-exporter-progressive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-sub-exporter-progressive"
 VERSION="0.001013"
@@ -12,20 +12,17 @@
 TARBALL="Sub-Exporter-Progressive-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/F/FR/FREW/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-identify/receipt
--- a/perl-sub-identify/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-identify/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Sub-Identify-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RG/RGARCIA/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-info/receipt
--- a/perl-sub-info/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-info/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Sub-Info-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$TARBALL"
 
-DEPENDS="perl-importer"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-importer"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-importer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-install/receipt
--- a/perl-sub-install/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-install/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,17 +15,14 @@
 DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-name/receipt
--- a/perl-sub-name/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-name/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-sub-name"
 VERSION="0.21"
@@ -12,20 +12,17 @@
 TARBALL="Sub-Name-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-sub-uplevel/receipt
--- a/perl-sub-uplevel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-sub-uplevel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Sub-Uplevel-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-task-weaken/receipt
--- a/perl-task-weaken/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-task-weaken/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-template-toolkit/receipt
--- a/perl-template-toolkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-template-toolkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.27"
 CATEGORY="perl"
 SHORT_DESC="Template::Toolkit - Template Processing System"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Perl"
 WEB_SITE="https://metacpan.org/release/Template-Toolkit"
 REPOLOGY="perl:template-toolkit"
@@ -12,20 +12,17 @@
 TARBALL="Template-Toolkit-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AB/ABW/$TARBALL"
 
-DEPENDS="perl perl-appconfig"
 BUILD_DEPENDS="perl-dev perl-appconfig"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL TT_XS_ENABLE=y TT_XS_DEFAULT=y TT_ACCEPT=y TT_QUIET=n &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl perl-appconfig"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-term-animation/receipt
--- a/perl-term-animation/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-term-animation/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Term-Animation-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KB/KBAUCOM/$TARBALL"
 
-DEPENDS="perl-curses"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-curses"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-curses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-term-readkey/receipt
--- a/perl-term-readkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-term-readkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-term-readkey"
 VERSION="2.37"
 CATEGORY="perl"
 SHORT_DESC="Term::ReadKey - A perl module for simple terminal control"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/TermReadKey"
 REPOLOGY="perl:term-readkey"
@@ -12,20 +12,17 @@
 TARBALL="TermReadKey-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-term-table/receipt
--- a/perl-term-table/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-term-table/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-term-table"
 VERSION="0.012"
@@ -12,20 +12,17 @@
 TARBALL="Term-Table-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$TARBALL"
 
-DEPENDS="perl-importer"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-importer"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-importer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-deep/receipt
--- a/perl-test-deep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-deep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-test-deep"
 VERSION="1.128"
 CATEGORY="perl"
 SHORT_DESC="Test::Deep - Extremely flexible deep comparison"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Deep"
 REPOLOGY="perl:test-deep"
@@ -12,20 +12,17 @@
 TARBALL="Test-Deep-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-exception/receipt
--- a/perl-test-exception/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-exception/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Test-Exception-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/EX/EXODIST/$TARBALL"
 
-DEPENDS="perl-sub-uplevel"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-sub-uplevel"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-sub-uplevel"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-fatal/receipt
--- a/perl-test-fatal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-fatal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Test::Fatal - incredibly simple helpers for testing code with \
 exceptions"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Fatal"
 REPOLOGY="perl:test-fatal"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-file-sharedir/receipt
--- a/perl-test-file-sharedir/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-file-sharedir/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,21 +13,19 @@
 TARBALL="Test-File-ShareDir-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/K/KE/KENTNL/$TARBALL"
 
-DEPENDS="perl-class-tiny perl-file-copy-recursive perl-file-sharedir \
-perl-path-tiny perl-scope-guard"
-BUILD_DEPENDS="$DEPENDS perl-test-fatal"
+BUILD_DEPENDS="perl-class-tiny perl-file-copy-recursive perl-file-sharedir \
+perl-path-tiny perl-scope-guard perl-test-fatal"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-class-tiny perl-file-copy-recursive perl-file-sharedir \
+	perl-path-tiny perl-scope-guard"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-manifest/receipt
--- a/perl-test-manifest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-manifest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Test-Manifest-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BD/BDFOY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-needs/receipt
--- a/perl-test-needs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-needs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Test-Needs-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/H/HA/HAARG/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-nowarnings/receipt
--- a/perl-test-nowarnings/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-nowarnings/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Test::NoWarnings - Make sure you didn't emit any warnings while \
 testing"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://metacpan.org/release/Test-NoWarnings"
 REPOLOGY="perl:test-nowarnings"
@@ -13,20 +13,17 @@
 TARBALL="Test-NoWarnings-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/A/AD/ADAMK/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-number-delta/receipt
--- a/perl-test-number-delta/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-number-delta/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Test-Number-Delta-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DA/DAGOLDEN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-pod-coverage/receipt
--- a/perl-test-pod-coverage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-pod-coverage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.10"
 CATEGORY="perl"
 SHORT_DESC="Test::Pod::Coverage - Check for pod coverage in your distribution"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Pod-Coverage"
 REPOLOGY="perl:test-pod-coverage"
@@ -12,18 +12,15 @@
 TARBALL="Test-Pod-Coverage-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/N/NE/NEILB/$TARBALL"
 
-DEPENDS="perl-pod-coverage"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-pod-coverage"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-pod-coverage"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-pod/receipt
--- a/perl-test-pod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-pod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.52"
 CATEGORY="perl"
 SHORT_DESC="Test::Pod - check for POD errors in files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Pod"
 REPOLOGY="perl:test-pod"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-requires/receipt
--- a/perl-test-requires/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-requires/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.10"
 CATEGORY="perl"
 SHORT_DESC="Test::Requires - Checks to see if the module can be loaded"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Requires"
 REPOLOGY="perl:test-requires"
@@ -12,20 +12,17 @@
 TARBALL="Test-Requires-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TO/TOKUHIROM/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-requiresinternet/receipt
--- a/perl-test-requiresinternet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-requiresinternet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-simple/receipt
--- a/perl-test-simple/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-simple/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.302140"
 CATEGORY="perl"
 SHORT_DESC="Basic utilities for writing tests"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Simple"
 REPOLOGY="perl:test-simple"
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-warn/receipt
--- a/perl-test-warn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-warn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-warnings/receipt
--- a/perl-test-warnings/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-warnings/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.026"
 CATEGORY="perl"
 SHORT_DESC="Test::Warnings - Test for warnings and the lack of them"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Test-Warnings"
 REPOLOGY="perl:test-warnings"
@@ -12,20 +12,17 @@
 TARBALL="Test-Warnings-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/E/ET/ETHER/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test-without-module/receipt
--- a/perl-test-without-module/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test-without-module/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-test-without-module"
 VERSION="0.20"
@@ -13,20 +13,17 @@
 TARBALL="Test-Without-Module-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/C/CO/CORION/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test2-plugin-nowarnings/receipt
--- a/perl-test2-plugin-nowarnings/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test2-plugin-nowarnings/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Test2-Plugin-NoWarnings-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-ipc-run3 perl-test2-suite"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-test2-suite/receipt
--- a/perl-test2-suite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-test2-suite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-aspell/receipt
--- a/perl-text-aspell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-aspell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Text-Aspell-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/H/HA/HANK/$TARBALL"
 
-DEPENDS="perl aspell gcc-lib-base"
 BUILD_DEPENDS="perl-dev aspell aspell-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl aspell gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-csv/receipt
--- a/perl-text-csv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-csv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="Text::CSV - comma-separated values manipulator (using XS or \
 PurePerl)"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Text-CSV"
 REPOLOGY="perl:text-csv"
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-glob/receipt
--- a/perl-text-glob/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-glob/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.11"
 CATEGORY="perl"
 SHORT_DESC="Text::Glob - match globbing patterns against text"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Text-Glob"
 REPOLOGY="perl:text-glob"
@@ -15,17 +15,14 @@
 DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-iconv/receipt
--- a/perl-text-iconv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-iconv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-text-iconv"
 VERSION="1.7"
@@ -12,20 +12,17 @@
 TARBALL="Text-Iconv-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MP/MPIOTR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-soundex/receipt
--- a/perl-text-soundex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-soundex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Text-Soundex-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-text-template/receipt
--- a/perl-text-template/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-text-template/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Text-Template-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MS/MSCHOUT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-timedate/receipt
--- a/perl-timedate/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-timedate/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-timedate"
 VERSION="2.30"
@@ -12,20 +12,17 @@
 TARBALL="TimeDate-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GB/GBARR/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-tk/receipt
--- a/perl-tk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-tk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="804.034"
 CATEGORY="perl"
 SHORT_DESC="Tk - a graphical user interface toolkit for Perl"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Tk"
 REPOLOGY="perl:tk"
@@ -14,11 +14,9 @@
 
 BUILD_DEPENDS="perl-dev xorg-libX11-dev freetype-dev xorg-libXft-dev \
 fontconfig-dev libpng16-dev zlib-dev libjpeg-turbo-dev tk-dev"
-SPLIT="perl-tk-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# The Xlib header is wrong...
 	sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' \
 		pTk/Xlib.h
@@ -29,9 +27,7 @@
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		perl-tk)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e perl-try-tiny/receipt
--- a/perl-try-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-try-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.30"
 CATEGORY="perl"
 SHORT_DESC='Try::Tiny - Minimal try/catch with proper preservation of \$@'
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/Try-Tiny"
 REPOLOGY="perl:try-tiny"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-unicode-map/receipt
--- a/perl-unicode-map/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-unicode-map/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Unicode-Map-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MS/MSCHWARTZ/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-unicode-map8/receipt
--- a/perl-unicode-map8/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-unicode-map8/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Unicode-Map8-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/$TARBALL"
 
-DEPENDS="perl-unicode-string"
-BUILD_DEPENDS="$DEPENDS perl-dev"
+BUILD_DEPENDS="perl-unicode-string perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-unicode-string"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-unicode-maputf8/receipt
--- a/perl-unicode-maputf8/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-unicode-maputf8/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,20 +13,17 @@
 TARBALL="Unicode-MapUTF8-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SN/SNOWHARE/$TARBALL"
 
-DEPENDS="perl-jcode perl-unicode-map perl-unicode-map8 perl-unicode-string"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-jcode perl-unicode-map perl-unicode-map8 perl-unicode-string"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-jcode perl-unicode-map perl-unicode-map8 perl-unicode-string"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-unicode-string/receipt
--- a/perl-unicode-string/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-unicode-string/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Unicode-String-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GA/GAAS/GAAS/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-unix-mknod/receipt
--- a/perl-unix-mknod/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-unix-mknod/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="Unix-Mknod-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PI/PIRZYK/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-uri/receipt
--- a/perl-uri/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-uri/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.74"
 CATEGORY="perl"
 SHORT_DESC="URI - Uniform Resource Identifiers (absolute and relative)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/URI"
 REPOLOGY="perl:uri"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-variable-magic/receipt
--- a/perl-variable-magic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-variable-magic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-variable-magic"
 VERSION="0.62"
@@ -13,20 +13,17 @@
 TARBALL="Variable-Magic-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/V/VP/VPIT/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-version/receipt
--- a/perl-version/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-version/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="version-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JP/JPEACOCK/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-www-robotrules/receipt
--- a/perl-www-robotrules/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-www-robotrules/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.02"
 CATEGORY="perl"
 SHORT_DESC="WWW::RobotRules - database of robots.txt-derived permissions"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/WWW-RobotRules"
 REPOLOGY="perl:www-robotrules"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-entities/receipt
--- a/perl-xml-entities/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-entities/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="XML-Entities-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SI/SIXTEASE/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-filter-buffertext/receipt
--- a/perl-xml-filter-buffertext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-filter-buffertext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-xml-filter-buffertext"
 VERSION="1.01"
@@ -13,20 +13,17 @@
 TARBALL="XML-Filter-BufferText-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/R/RB/RBERJON/$TARBALL"
 
-DEPENDS="perl-xml-sax perl-xml-sax-base"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-xml-sax perl-xml-sax-base"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-xml-sax perl-xml-sax-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-namespacesupport/receipt
--- a/perl-xml-namespacesupport/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-namespacesupport/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-xml-namespacesupport"
 VERSION="1.12"
@@ -12,20 +12,17 @@
 TARBALL="XML-NamespaceSupport-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-parser/receipt
--- a/perl-xml-parser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-parser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.44"
 CATEGORY="perl"
 SHORT_DESC="XML::Parser - A Perl module for parsing XML documents"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/XML-Parser"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/xml-parser.html"
@@ -17,7 +17,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-rss/receipt
--- a/perl-xml-rss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-rss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,19 @@
 TARBALL="XML-RSS-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/$TARBALL"
 
-DEPENDS="perl-datetime perl-datetime-format-mail perl-datetime-format-w3cdtf \
-perl-html-parser perl-xml-parser"
-BUILD_DEPENDS="$DEPENDS perl-test-manifest"
+BUILD_DEPENDS="perl-datetime perl-datetime-format-mail \
+perl-datetime-format-w3cdtf perl-html-parser perl-xml-parser perl-test-manifest"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-datetime perl-datetime-format-mail \
+	perl-datetime-format-w3cdtf perl-html-parser perl-xml-parser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-sax-base/receipt
--- a/perl-xml-sax-base/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-sax-base/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="XML-SAX-Base-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-sax-expat/receipt
--- a/perl-xml-sax-expat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-sax-expat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,21 +12,19 @@
 TARBALL="XML-SAX-Expat-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/B/BJ/BJOERN/$TARBALL"
 
-DEPENDS="perl-xml-namespacesupport perl-xml-parser perl-xml-sax \
+BUILD_DEPENDS="perl-xml-namespacesupport perl-xml-parser perl-xml-sax \
 perl-xml-sax-base"
-BUILD_DEPENDS="$DEPENDS"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make -j1 install && make -j1 DESTDIR=$install install &&
+	make -j1 install &&
+	make -j1 DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-xml-namespacesupport perl-xml-parser perl-xml-sax \
+	perl-xml-sax-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-sax-writer/receipt
--- a/perl-xml-sax-writer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-sax-writer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,19 @@
 TARBALL="XML-SAX-Writer-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/P/PE/PERIGRIN/$TARBALL"
 
-DEPENDS="perl-xml-filter-buffertext perl-xml-namespacesupport perl-xml-sax-base"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-xml-filter-buffertext perl-xml-namespacesupport \
+perl-xml-sax-base"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-xml-filter-buffertext perl-xml-namespacesupport \
+	perl-xml-sax-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-simple/receipt
--- a/perl-xml-simple/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-simple/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.25"
 CATEGORY="perl"
 SHORT_DESC="XML::Simple module is used to read and write XML"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/XML-Simple"
 REPOLOGY="perl:xml-simple"
@@ -12,20 +12,17 @@
 TARBALL="XML-Simple-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/$TARBALL"
 
-DEPENDS="perl-xml-namespacesupport perl-xml-sax perl-xml-sax-expat"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-xml-namespacesupport perl-xml-sax perl-xml-sax-expat"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-xml-namespacesupport perl-xml-sax perl-xml-sax-expat"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-twig/receipt
--- a/perl-xml-twig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-twig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="perl"
 SHORT_DESC="XML::Twig - A perl module for processing huge XML documents in \
 tree mode"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/XML-Twig"
 REPOLOGY="perl:xml-twig"
@@ -13,20 +13,17 @@
 TARBALL="XML-Twig-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/M/MI/MIROD/$TARBALL"
 
-DEPENDS="perl-xml-parser"
-BUILD_DEPENDS="$DEPENDS"
+BUILD_DEPENDS="perl-xml-parser"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL -y &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl-xml-parser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xml-writer/receipt
--- a/perl-xml-writer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xml-writer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.625"
 CATEGORY="perl"
 SHORT_DESC="XML::Writer - Perl extension for writing XML documents"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/XML-Writer"
 REPOLOGY="perl:xml-writer"
@@ -12,20 +12,17 @@
 TARBALL="XML-Writer-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/J/JO/JOSEPHW/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-xsloader/receipt
--- a/perl-xsloader/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-xsloader/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,17 @@
 TARBALL="XSLoader-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/S/SA/SAPER/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-yaml-syck/receipt
--- a/perl-yaml-syck/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-yaml-syck/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.30"
 CATEGORY="perl"
 SHORT_DESC="YAML::Syck - Fast, lightweight YAML loader and dumper"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://metacpan.org/release/YAML-Syck"
 REPOLOGY="perl:yaml-syck"
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL -y &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-yaml-tiny/receipt
--- a/perl-yaml-tiny/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-yaml-tiny/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 
 compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl-yaml/receipt
--- a/perl-yaml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl-yaml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="perl-yaml"
 VERSION="1.26"
 CATEGORY="perl"
 SHORT_DESC="YAML - YAML Ain't Markup Language™"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://metacpan.org/release/YAML"
 REPOLOGY="perl:yaml"
@@ -12,20 +12,17 @@
 TARBALL="YAML-$VERSION.tar.gz"
 WGET_URL="https://cpan.metacpan.org/authors/id/T/TI/TINITA/$TARBALL"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL &&
-	make && make DESTDIR=$install install &&
+	make &&
+	make DESTDIR=$install install &&
 
 	chmod -R u+w $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e perl/receipt
--- a/perl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/perl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.28.0"
 CATEGORY="development"
 SHORT_DESC="Perl interpreter and modules"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://www.perl.org/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/perl.html"
@@ -23,7 +23,7 @@
 
 COOKOPTS="!perlz"
 BUILD_DEPENDS="zlib-dev bzip2-dev less gdbm-dev"
-SPLIT="perl-core perl perl-dev"
+SPLIT="$PACKAGE-core $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	export BUILD_ZLIB=False
diff -r ad29ddfee1c9 -r d5aab818505e pflogsumm/receipt
--- a/pflogsumm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pflogsumm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,19 @@
 PACKAGE="pflogsumm"
 VERSION="1.1.3"
 CATEGORY="misc"
-SHORT_DESC="Provides an over-view of postfix activity."
+SHORT_DESC="Provides an over-view of postfix activity"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://jimsun.linxnet.com/postfix_contrib.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://jimsun.linxnet.com/postfix_contrib.html"
 WGET_URL="http://jimsun.linxnet.com/downloads/$TARBALL"
-TAGS="postfix mail logs analysis"
 
-DEPENDS="perl-date-calc"
-SUGGESTED="postfix"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	install -m 755 $src/pflogsumm.pl $fs/usr/bin/pflogsumm
 	sed -i 's/m#\^(/m#(/' $fs/usr/bin/pflogsumm
+	DEPENDS="perl-date-calc"
+	SUGGESTED="postfix"
+	TAGS="postfix mail logs analysis"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pgadmin/receipt
--- a/pgadmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pgadmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,28 @@
 VERSION="1.18.1"
 CATEGORY="utilities"
 SHORT_DESC="PostgreSQL administration an management tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.pgadmin.org/"
+
 SOURCE="pgadmin3"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.pgadmin.org"
 WGET_URL="ftp://ftp.ch.postgresql.org/mirror/postgresql/pgadmin3/release/v$VERSION/src/$TARBALL"
 
-DEPENDS="postgresql wxWidgets28 gtk2 libxslt libcomerr3 libkrb5 xorg-libXxf86vm"
 BUILD_DEPENDS="openssl postgresql postgresql-dev libxslt-dev libxml2-dev \
 wxWidgets28-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pgadmin3/i18n
 
 	cp -a $install/usr/bin $fs/usr
@@ -37,6 +34,8 @@
 	cp -a $install/usr/share/pgadmin3/i18n/fr_FR $fs/usr/share/pgadmin3/i18n
 	cp -a $install/usr/share/pgadmin3/i18n/*.lng $fs/usr/share/pgadmin3/i18n
 
-	cp -a stuff/applications $fs/usr/share
-	cp -a stuff/icons $fs/usr/share
+	cp -a $stuff/applications $fs/usr/share
+	cp -a $stuff/icons $fs/usr/share
+	DEPENDS="postgresql wxWidgets28 gtk2 libxslt libcomerr3 libkrb5 \
+	xorg-libXxf86vm"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pgbadger/receipt
--- a/pgbadger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pgbadger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,23 +6,20 @@
 SHORT_DESC="A fast PostgreSQL Log Analyzer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/dalibo/pgbadger/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/dalibo/pgbadger/"
 WGET_URL="${WEB_SITE}archive/v$VERSION.tar.gz"
 
-DEPENDS="perl"
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	perl Makefile.PL --prefix=/usr &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs/
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pgrouting/receipt
--- a/pgrouting/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pgrouting/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,29 @@
 PACKAGE="pgrouting"
 VERSION="2.0.0"
 CATEGORY="misc"
-SHORT_DESC="provide geospatial routing for PostGIS / PostgreSQL."
+SHORT_DESC="Geospatial routing for PostGIS / PostgreSQL"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://pgrouting.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://pgrouting.org/"
 WGET_URL="https://codeload.github.com/pgRouting/pgrouting/tar.gz/v$VERSION"
 
-DEPENDS="gcc-lib-base cgal gmp boost-thread boost-system"
-BUILD_DEPENDS="wget cmake postgresql-dev boost-dev cgal-dev gmp-dev \
-mpfr-dev boost-graph boost-thread"
+BUILD_DEPENDS="cmake postgresql-dev boost-dev cgal-dev gmp-dev mpfr-dev \
+boost-graph boost-thread"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd build
-	cmake -DWITH_DD=ON ..
-	make
+	cd    build
+	cmake \
+		-DWITH_DD=ON \
+		.. &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/* $fs/usr
+	DEPENDS="gcc-lib-base cgal gmp boost-thread boost-system"
 }
diff -r ad29ddfee1c9 -r d5aab818505e phonon-vlc/receipt
--- a/phonon-vlc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phonon-vlc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,9 @@
 DEPENDS="libQtCore libQtDBus libQtGui libQtXml phonon libvlc"
 BUILD_DEPENDS="phonon cmake qmake automoc4 Qt4-dev libvlc-dev phonon-dev"
 
-compile_rules()
-{
-		mkdir build; cd build
+compile_rules() {
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -26,11 +26,10 @@
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -rf $fs/usr/share
 }
diff -r ad29ddfee1c9 -r d5aab818505e phonon/receipt
--- a/phonon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phonon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="phonon"
 VERSION="4.7.2"
 CATEGORY="libs"
-SHORT_DESC="kde libphonon"
+SHORT_DESC="KDE libphonon"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="LGPL2.1"
 WEB_SITE="http://phonon.kde.org/"
@@ -12,10 +12,11 @@
 WGET_URL="http://download.kde.org/stable/$PACKAGE/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake qmake automoc4 Qt4-dev"
-SPLIT="phonon-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=Release \
@@ -25,7 +26,7 @@
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e php-auth-pam/receipt
--- a/php-auth-pam/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/php-auth-pam/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,41 +4,37 @@
 VERSION="0.4"
 CATEGORY="development"
 SHORT_DESC="PHP extension for PAM"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://packages.debian.org/"
+WEB_SITE="https://www.debian.org/distrib/packages" # and ..?
 REPOLOGY="php:auth-pam"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.gz"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/p/php-auth-pam/$TARBALL"
 
-DEPENDS="php-apache pam"
 BUILD_DEPENDS="php-dev pam pam-dev autoconf automake sed coreutils-conditions"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	test -d  ${PACKAGE}-${VERSION} \
-		|| make ${PACKAGE}-${VERSION}.orig ${PACKAGE}-${VERSION}
+compile_rules() {
+	[ -d $PACKAGE-$VERSION ] ||
+	make $PACKAGE-$VERSION.orig $PACKAGE-$VERSION
 	cd $src
 	phpize
-	sed -i 's/^function_entry/zend_&/;s/pval /zval /' pam_auth.c # php 5.4
-	
-	./configure $CONFIGURE_ARGS \
-		--prefix=/usr &&
-	
-	make && make DESTDIR=$DESTDIR install
+	sed -i 's|^function_entry|zend_&|; s|pval |zval |' pam_auth.c # php 5.4
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/php
 	cp -a $install/usr/lib/php/extensions/*/*.so $fs/usr/share/php
+	DEPENDS="php-apache pam"
 }
 
-post_install()
-{
+post_install() {
 	grep -q ^extension=pam_auth.so "$1/etc/php.ini" || \
 	    sed -e 's|extension=msql.so|extension=msql.so\nextension=pam_auth.so|' -i "$1/etc/php.ini"
 	# Start Web server.
@@ -58,9 +54,7 @@
 	true
 }
 
-# Pre and post remove commands for Tazpkg.
-pre_remove()
-{
+pre_remove() {
 	sed -i '/.*=pam_auth.so.*/d' /etc/php.ini
 
 	# Start Web server.
@@ -75,9 +69,3 @@
 lighttpd lighttpd.pid
 EOT
 }
-
-
-clean_wok()
-{
-	test -d  ${PACKAGE}-${VERSION} && rm -rf ${PACKAGE}-${VERSION}
-}
diff -r ad29ddfee1c9 -r d5aab818505e php-auth-sasl/receipt
--- a/php-auth-sasl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/php-auth-sasl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="php-auth-sasl"
 VERSION="1.0.4"
 CATEGORY="development"
-SHORT_DESC="Abstraction of various SASL mechanism responses for php."
+SHORT_DESC="Abstraction of various SASL mechanism responses for PHP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://pear.php.net/"
@@ -13,24 +13,18 @@
 TARBALL="$SOURCE-$VERSION.tgz"
 WGET_URL="http://download.pear.php.net/package/$TARBALL"
 
-DEPENDS="php-pear"
 BUILD_DEPENDS="php-pear php-cli"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir -p $DESTDIR/usr/share/php
+compile_rules() {
+	mkdir -p $install/usr/share/php
 	tar czf $TARBALL $SOURCE-$VERSION package.xml
-	pear install --offline --installroot=$DESTDIR $TARBALL
+	pear install --offline --installroot=$install $TARBALL
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -rf $fs/usr/share/php/.channels $fs/usr/share/php/.registry/.c*
 	rm -rf $fs/usr/share/php/.f* $fs/usr/share/php/.l*
 	rm -rf $fs/usr/share/php/.dep*
+	DEPENDS="php-pear"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e php-docs-en/receipt
--- a/php-docs-en/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/php-docs-en/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,14 @@
 VERSION="5.5.13"
 CATEGORY="misc"
 SHORT_DESC="Set of HTML documentation for PHP.(English version)"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.php.net/docs.php"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.php.net/distributions/manual/php_manual_en.tar.gz"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/doc
 	cp -a $src $fs/usr/share/doc/php-en
 }
diff -r ad29ddfee1c9 -r d5aab818505e php/receipt
--- a/php/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/php/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,91 +4,63 @@
 VERSION="5.5.13"
 CATEGORY="development"
 SHORT_DESC="PHP web programming language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.php.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.php.net/distributions/$TARBALL"
 
-BUILD_DEPENDS_arm="sqlite3-dev libxml2-dev zlib-dev curl-dev"
 BUILD_DEPENDS="sqlite3-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
-net-snmp-dev postgresql-dev gettext openssl-dev apache-dev apr-util-dev \
+net-snmp-dev postgresql-dev gettext-dev openssl-dev apache-dev apr-util-dev \
 c-client mhash-dev libpng16-dev libunixODBC unixODBC-dev openldap-dev \
 libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl \
 jpeg-dev net-snmp-dev libvpx-dev apache coreutils-conditions sed re2c"
-SPLIT="php-apache php-cherokee php-cli php-common php-curl php-dba php-dev \
-php-gd php-imap php-ldap php-mcrypt php-mysqli php-mysql php-odbc php-openssl \
-php-pdo-mysql php-pdo-pgsql php-pear php-pgsql php-snmp php-soap php-sqlite"
-
+SPLIT="\
+$PACKAGE-apache    $PACKAGE-cherokee $PACKAGE-cli     $PACKAGE-common \
+$PACKAGE-curl      $PACKAGE-dba      $PACKAGE-dev     $PACKAGE-gd \
+$PACKAGE-imap      $PACKAGE-ldap     $PACKAGE-mcrypt  $PACKAGE-mysqli \
+$PACKAGE-mysql     $PACKAGE-odbc     $PACKAGE-openssl $PACKAGE-pdo-mysql \
+$PACKAGE-pdo-pgsql $PACKAGE-pear     $PACKAGE-pgsql   $PACKAGE-snmp \
+$PACKAGE-soap      $PACKAGE-sqlite"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			ARCH_ARGS="\
-			--prefix=/usr \
-			--sysconfdir=/etc \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man \
-			--config-cache \
-			--enable-mbstring \
-			--enable-sockets \
-			--enable-ftp \
-			--enable-zip \
-			--enable-calendar \
-			--enable-exif \
-			--enable-dba=shared \
-			--enable-sqlite-utf8 \
-			--with-mhash \
-			--with-sqlite=shared \
-			--with-config-file-path=/etc \
-			--with-zlib \
-			--with-gettext \
-			--with-curl=shared \
-			--with-openssl=shared \
-			--with-jpeg-dir=/usr \
-			--with-png-dir=/usr \
-			--with-apxs2=/usr/bin/apxs"
-			;;
-		*)
-			ARCH_ARGS="\
-			--enable-mbstring \
-			--enable-sockets \
-			--enable-ftp \
-			--enable-zip \
-			--enable-calendar \
-			--enable-exif \
-			--config-cache \
-			--enable-dba=shared \
-			--with-config-file-path=/etc \
-			--with-zlib \
-			--with-gettext \
-			--with-mcrypt=shared,/usr \
-			--with-mysql=shared,/usr \
-			--with-mysqli=shared \
-			--with-mysql-sock=/var/run/mysqld/mysql.sock \
-			--with-pdo-sqlite=shared,/usr \
-			--with-pgsql=shared,/usr \
-			--with-snmp=shared,/usr \
-			--enable-soap=shared,/usr \
-			--with-ldap=shared \
-			--with-imap=shared \
-			--with-imap-ssl \
-			--with-mhash \
-			--with-gd=shared \
-			--with-jpeg-dir=/usr \
-			--with-png-dir=/usr \
-			--with-vpx-dir=/usr \
-			--with-openssl=shared \
-			--with-unixODBC=shared,/usr \
-			--with-pear=/usr/share/php \
-			--with-pdo-mysql=shared \
-			--with-pdo-pgsql=shared \
-			--with-curl=shared \
-			--with-sqlite3=shared,/usr \
-			--enable-maintainer-zts"
-			;;
-	esac
+	ARCH_ARGS="\
+	--enable-mbstring \
+	--enable-sockets \
+	--enable-ftp \
+	--enable-zip \
+	--enable-calendar \
+	--enable-exif \
+	--config-cache \
+	--enable-dba=shared \
+	--with-config-file-path=/etc \
+	--with-zlib \
+	--with-gettext \
+	--with-mcrypt=shared,/usr \
+	--with-mysql=shared,/usr \
+	--with-mysqli=shared \
+	--with-mysql-sock=/var/run/mysqld/mysql.sock \
+	--with-pdo-sqlite=shared,/usr \
+	--with-pgsql=shared,/usr \
+	--with-snmp=shared,/usr \
+	--enable-soap=shared,/usr \
+	--with-ldap=shared \
+	--with-imap=shared \
+	--with-imap-ssl \
+	--with-mhash \
+	--with-gd=shared \
+	--with-jpeg-dir=/usr \
+	--with-png-dir=/usr \
+	--with-vpx-dir=/usr \
+	--with-openssl=shared \
+	--with-unixODBC=shared,/usr \
+	--with-pear=/usr/share/php \
+	--with-pdo-mysql=shared \
+	--with-pdo-pgsql=shared \
+	--with-curl=shared \
+	--with-sqlite3=shared,/usr \
+	--enable-maintainer-zts"
 
 	sed -i 's|PLANE_[UVY]\]|VPX_&|;s|IMG_FMT_I420|VPX_&|' ext/gd/libgd/webpimg.c
 	sed -i 's/pam_start/pam_nostart/' configure
@@ -97,22 +69,22 @@
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make -j1 INSTALL_ROOT=$DESTDIR install
+	make -j1 INSTALL_ROOT=$install install
 
 	./configure \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS \
 		--with-apxs2=/usr/bin/apxs &&
 	make $MAKEFLAGS &&
-	mkdir -p $DESTDIR/etc/apache &&
-	cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf &&
-	make -j1 INSTALL_ROOT=$DESTDIR install || return 1
+	mkdir -p $install/etc/apache &&
+	cp /etc/apache/httpd.conf $install/etc/apache/httpd.conf &&
+	make -j1 INSTALL_ROOT=$install install || return 1
 
 	# Production config file.
-	mkdir -p $DESTDIR/etc
-	cp $src/php.ini-production $DESTDIR/etc/php.ini || exit 1
+	mkdir -p $install/etc
+	cp $src/php.ini-production $install/etc/php.ini || return 1
 	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
-		-i $DESTDIR/etc/php.ini
+		-i $install/etc/php.ini
 
 	install -Dm755 $src/sapi/cgi/php-cgi    $install/usr/bin/php-cgi
 
diff -r ad29ddfee1c9 -r d5aab818505e phpfm/receipt
--- a/phpfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phpfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 SOURCE="phpFileManager"
 VERSION="0.9.8"
 CATEGORY="misc"
-SHORT_DESC="PHP Filesystem Management Tool in a single file."
+SHORT_DESC="PHP Filesystem Management Tool in a single file"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 LGPL2.1 MPL"
 TARBALL="$SOURCE-$VERSION.zip"
@@ -13,9 +13,7 @@
 
 DEPENDS="php"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www/$PACKAGE
 	cp $src/index.php $fs/var/www/$PACKAGE/
 }
diff -r ad29ddfee1c9 -r d5aab818505e phpldapadmin/receipt
--- a/phpldapadmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phpldapadmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,15 @@
 PACKAGE="phpldapadmin"
 VERSION="1.2.2"
 CATEGORY="misc"
-SHORT_DESC="Administration of LDAP over the Web."
+SHORT_DESC="Administration of LDAP over the Web"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://phpldapadmin.sourceforge.net/wiki/index.php/Main_Page"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://phpldapadmin.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/phpldapadmin/config.php"
 
-DEPENDS="php-ldap"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/phpldapadmin $fs/etc $fs/usr/share/applications
 	cp -a $src/. $fs/usr/share/phpldapadmin
 	mv $fs/usr/share/phpldapadmin/config $fs/etc/phpldapadmin
@@ -25,10 +21,11 @@
 	chown -R www.www $fs/usr/share/phpldapadmin $fs/etc/phpldapadmin
 	chmod 700 $fs/etc/phpldapadmin
 	chmod 600 $fs/etc/phpldapadmin/config.php
+	DEPENDS="php-ldap"
+	CONFIG_FILES="/etc/phpldapadmin/config.php"
 }
 
-post_install()
-{
+post_install() {
 	if [ -s "$1/etc/openldap/slapd.conf" ]; then
 		rootdn=$(awk '/^rootdn/ { print $2 }' < "$1/etc/openldap/slapd.conf" | sed 's/"//g')
 		sed -i "s|'login','dn','');|'login','dn','');\\n\$ldapservers->SetValue(\$i,'login','dn','$rootdn');|" "$1/etc/phpldapadmin/config.php"
diff -r ad29ddfee1c9 -r d5aab818505e phpmyadmin/receipt
--- a/phpmyadmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phpmyadmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,15 @@
 PACKAGE="phpmyadmin"
 VERSION="3.5.2"
 CATEGORY="misc"
-SHORT_DESC="Administration of MySQL over the Web."
+SHORT_DESC="Administration of MySQL over the Web"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-PHPMYADM="phpMyAdmin-$VERSION-all-languages"
-TARBALL="$PHPMYADM.tar.bz2"
 WEB_SITE="https://www.phpmyadmin.net/"
+
+TARBALL="phpMyAdmin-$VERSION-all-languages.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-SUGGESTED="php-mcrypt"
-CONFIG_FILES="/etc/phpmyadmin/config.inc.php"
 
-DEPENDS="php-mysqli"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/phpmyadmin $fs/etc/phpmyadmin $fs/usr/share/applications
 	cp -a $src/. $fs/usr/share/phpmyadmin
 	ln -s /etc/phpmyadmin/config.inc.php $fs/usr/share/phpmyadmin/config.inc.php
@@ -27,30 +21,33 @@
 	chown -R www.www $fs/usr/share/phpmyadmin $fs/etc/phpmyadmin
 	chmod 700 $fs/etc/phpmyadmin
 	chmod 644 $fs/etc/phpmyadmin/config.inc.php
-	
+
 	sed -i s'/\?>//' $fs/etc/phpmyadmin/config.inc.php
-	
-	cat <<"EOT">> $fs/etc/phpmyadmin/config.inc.php
+
+	cat >> $fs/etc/phpmyadmin/config.inc.php <<"EOT"
 
 $cfg['McryptDisableWarning'] = true;
-// For public use you may comment the following lines 
+// For public use you may comment the following lines
 // to enforce the security.
 $cfg['Servers'][$i]['AllowNoPassword'] = true;
 $cfg['Servers'][$i]['AllowNoPasswordRoot'] = true;
 $cfg['Servers'][$i]['AllowRoot'] = true;
 ?>
 EOT
+	DEPENDS="php-mysqli"
+	SUGGESTED="php-mcrypt"
+	CONFIG_FILES="/etc/phpmyadmin/config.inc.php"
 }
 
-post_install()
-{
-	secret=$(dd if=/dev/urandom count=1 2> /dev/null | md5sum | sed 's/ .*//')
+post_install() {
+	secret=$(dd if=/dev/urandom count=1 2>/dev/null | md5sum | sed 's/ .*//')
 	sed -i "s/^\(.*blowfish_secret'] = '\)'/\1$secret'/" \
 		"$1/etc/phpmyadmin/config.inc.php"
+
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/phpmyadmin/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
@@ -58,6 +55,7 @@
 			fi
 		fi
 	fi
+
 	# Configure apache server
 	if [ -f "$1/etc/apache/httpd.conf" ]; then
 		if [ ! -f "$1/etc/apache/conf.d/phpmyadmin" ]; then
diff -r ad29ddfee1c9 -r d5aab818505e phppgadmin/receipt
--- a/phppgadmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phppgadmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,34 +3,31 @@
 PACKAGE="phppgadmin"
 VERSION="5.1"
 CATEGORY="misc"
-SHORT_DESC="Administration of postgresql over the Web."
+SHORT_DESC="Administration of postgresql over the Web"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://phppgadmin.sourceforge.net/doku.php"
+
 SOURCE="phpPgAdmin"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/phppgadmin/config.inc.php"
 
-DEPENDS="php-pgsql"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/phppgadmin $fs/etc $fs/usr/share/applications
 	cp -a $src/. $fs/usr/share/phppgadmin
 	mv $fs/usr/share/phppgadmin/conf $fs/etc/phppgadmin
 	ln -s /etc/phppgadmin $fs/usr/share/phppgadmin/conf
 	mv -f $fs/etc/phppgadmin/config.inc.php-dist $fs/etc/phppgadmin/config.inc.php
 	sed -i -e "s/conf\['extra_login_security'\] = true/conf['extra_login_security'] = false/" $fs/etc/phppgadmin/config.inc.php
-	cp stuff/phppgadmin.desktop $fs/usr/share/applications
+	cp $stuff/phppgadmin.desktop $fs/usr/share/applications
 	chown -R www.www $fs/usr/share/phppgadmin $fs/etc/phppgadmin
 	chmod 700 $fs/etc/phppgadmin
 	chmod 600 $fs/etc/phppgadmin/*
+	DEPENDS="php-pgsql"
+	CONFIG_FILES="/etc/phppgadmin/config.inc.php"
 }
 
-post_install()
-{
+post_install() {
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/phppgadmin/ "$1/etc/lighttpd/lighttpd.conf"; then
@@ -64,10 +61,12 @@
 			fi
 		fi
 	fi
-	cat << EOT
-------
-User 'postgres' can login on localhost without passwd after:
-# /etc/init.d/postgresql start
-------
+
+	[ -n "$quiet" ] || cat << EOT
+
+	.--------------------------------------------------------------.
+	| User 'postgres' can login on localhost without passwd after: |
+	|    # /etc/init.d/postgresql start                            |
+	'--------------------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e phproxy/receipt
--- a/phproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,36 +4,32 @@
 SOURCE="PHProxy"
 VERSION="0.5b2"
 CATEGORY="network"
-SHORT_DESC="A proxy HTTP."
+SHORT_DESC="A proxy HTTP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sebsauvage.net/wiki/doku.php?id=phproxy"
+
 TARBALL="$SOURCE%20$VERSION%20mod%20SSE+ARKA%2020100825.7z"
 WGET_URL="http://sebsauvage.net/temp/$TARBALL"
 
-DEPENDS="php"
 BUILD_DEPENDS="p7zip"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	dos2unix *
-	mkdir -p $DESTDIR/usr/share/$PACKAGE
-	cp *.php *.css $DESTDIR/usr/share/$PACKAGE
+	mkdir -p $install/usr/share/$PACKAGE
+	cp *.php *.css $install/usr/share/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="php"
 }
 
-post_install()
-{
+post_install() {
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/phproxy/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phproxy/" => "/usr/share/phproxy/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/phproxy/" => "/usr/share/phproxy/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
diff -r ad29ddfee1c9 -r d5aab818505e phpsysinfo/receipt
--- a/phpsysinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phpsysinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Displays information about your system nicely"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://phpsysinfo.sourceforge.net/"
+WEB_SITE="http://phpsysinfo.github.io/phpsysinfo/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e phpvirtualbox/receipt
--- a/phpvirtualbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/phpvirtualbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,25 @@
 PACKAGE="phpvirtualbox"
 VERSION="4.0-7"
 CATEGORY="network"
-SHORT_DESC="Virtualbox AJAX interface."
+SHORT_DESC="Virtualbox AJAX interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/phpvirtualbox/phpvirtualbox"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="https://github.com/phpvirtualbox/phpvirtualbox"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="php-soap virtualbox"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/etc
 	cp -a $src $fs/usr/share/phpvirtualbox
 	cp -a $fs/usr/share/phpvirtualbox/config.php-example $fs/etc/phpvirtualbox.php
 	dos2unix $fs/etc/phpvirtualbox.php
 	ln -s /etc/phpvirtualbox.php $fs/usr/share/phpvirtualbox/config.php
-	cp -a stuff/* $fs/
+	cp -a $stuff/* $fs/
+	DEPENDS="php-soap virtualbox"
 }
 
-post_install()
-{
+post_install() {
 	# Virtualbox OSE needs to disable authenication for vboxwebsrv
 	[ -d "$1/var/lib/tazpkg/installed/virtualbox" ] ||
 	chroot "$1/" VBoxManage setproperty websrvauthlibrary null 
@@ -63,12 +60,15 @@
 		fi
 	fi
 	[ -z "$1" ] && /etc/init.d/vboxwebsrv start
-	cat <<EOT
-Please configure /etc/phpvirtualbox.php now.
+
+	[ -n "$quiet" ] || cat <<EOT
+
+	.----------------------------------------------.
+	| Please configure /etc/phpvirtualbox.php now. |
+	'----------------------------------------------'
 EOT
 }
 
-pre_remove()
-{
+pre_remove() {
 	/etc/init.d/vboxwebsrv stop
 }
diff -r ad29ddfee1c9 -r d5aab818505e physfs/receipt
--- a/physfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/physfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://icculus.org/physfs/downloads/$TARBALL"
 
 BUILD_DEPENDS="cmake wget"
-SPLIT="physfs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CFLAGS="-Wno-error=unused-but-set-variable"
@@ -24,7 +24,7 @@
 		-DPHYSFS_BUILD_WX_TEST=OFF \
 		-DPHYSFS_INTERNAL_ZLIB=OFF \
 		. &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pi-blaster/receipt
--- a/pi-blaster/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="pi-blaster"
-GITHASH="177cef81774d6df5c6284c198ff818515281db14"
-VERSION=${GITHASH:0:6}
-CATEGORY="system-tools"
-SHORT_DESC="Enables PWM on the GPIO pins you request of a Raspberry Pi."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="MIT"
-TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="https://github.com/sarfata/pi-blaster/"
-WGET_URL="https://codeload.github.com/sarfata/pi-blaster/zip/$GITHASH"
-HOST_ARCH="arm"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i s"/gcc/${HOST_SYSTEM}-gcc/" Makefile &&
-	make
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/etc $fs/usr/sbin
-	cp -a ${src}/${PACKAGE} ${fs}/usr/sbin
-	cp -a ${stuff}/init.d $fs/etc
-}
diff -r ad29ddfee1c9 -r d5aab818505e pi-blaster/stuff/init.d/pi-blaster
--- a/pi-blaster/stuff/init.d/pi-blaster	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Start, stop and restart pi-blaster on SliTaz
-#
-# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
-# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
-#
-. /etc/init.d/rc.functions
-
-NAME=$(basename $0)
-DESC="$(_ '%s daemon' $NAME)"
-DAEMON=$(which $NAME)
-OPTIONS=""
-PID=$(pidof $NAME)
-
-case "$1" in
-	start)
-		if [ "$PID" ]; then
-			_ '%s is already running.' $NAME
-		else
-			action 'Starting %s: %s...' "$DESC" $NAME
-			${DAEMON} ${OPTIONS}; status
-		fi ;;
-	stop)
-		if [ "$PID" ]; then
-			action 'Stopping %s: %s...' "$DESC" $NAME
-			killall ${NAME} 2>/dev/null; status
-		else
-			_ '%s is not running.' $NAME
-		fi ;;
-	restart)
-		$0 stop && sleep 1 && $0 start ;;
-	*)
-		emsg "<n><b>$(_ 'Usage:')</b> $0 [start|stop|restart]"
-		newline ;;
-esac
-exit 0
diff -r ad29ddfee1c9 -r d5aab818505e picard/receipt
--- a/picard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/picard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="picard"
 VERSION="1.4.0.5"
 # Last v 1.3.2 released on 7 Jan 2015, but project is actively developed
 COMMIT="46dbab9"
 CATEGORY="utilities"
-SHORT_DESC="Picard is a cross-platform music tagger written in Python"
+SHORT_DESC="Cross-platform music tagger"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://picard.musicbrainz.org/"
+
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="https://github.com/metabrainz/picard/archive/$COMMIT.tar.gz"
 
-DEPENDS="python pyqt mutagen"
-BUILD_DEPENDS="python-dev pyqt mutagen gettext"
+BUILD_DEPENDS="python-dev pyqt mutagen gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root="$install"
+compile_rules() {
+	python -B setup.py install --root="$install"
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python pyqt mutagen"
 }
diff -r ad29ddfee1c9 -r d5aab818505e piclass-code-examples/receipt
--- a/piclass-code-examples/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="piclass-code-examples"
-GITHASH="0487029f735e1d9f9b41cf94e3572c1e3d7beec8"
-VERSION=${GITHASH:0:7}
-CATEGORY="development"
-SHORT_DESC="PiClass Python and SHell code examples"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-TARBALL="$PACKAGE-$VERSION.tar.zip"
-WEB_SITE="http://piclass.org"
-WGET_URL="https://codeload.github.com/piclass/code-examples/zip/$GITHASH"
-HOST_ARCH="arm"
-
-TAGS="python raspberrypi rpi"
-DEPENDS="python python-smbus i2c-tools slitaz-arm-rpi"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make DESTDIR=${DESTDIR} install
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}
-	cp -a ${install}/* ${fs}
-}
diff -r ad29ddfee1c9 -r d5aab818505e picoblog/receipt
--- a/picoblog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/picoblog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="picoblog"
 VERSION="1.0"
 CATEGORY="network"
-SHORT_DESC="Tiny blog engine."
+SHORT_DESC="Tiny blog engine"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://dev.kd2.org/picoblog/"
+
 TARBALL="$PACKAGE-$VERSION"
-WEB_SITE="http://dev.kd2.org/picoblog/"
 URL="http://svn.kd2.org/svn/misc/apps/picoblog/index.php"
-TAGS="blog"
 
-DEPENDS="php"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -s "$SRC/$TARBALL" ] ||
 		wget -O "$SRC/$TARBALL" $URL
-	mkdir -p $DESTDIR/var/www/$PACKAGE 2> /dev/null
-	cp "$SRC/$TARBALL" $DESTDIR/var/www/$PACKAGE/index.php
-	chown -R 80.80 $DESTDIR/var/www/$PACKAGE
+	mkdir -p $install/var/www/$PACKAGE 2> /dev/null
+	cp "$SRC/$TARBALL" $install/var/www/$PACKAGE/index.php
+	chown -R 80.80 $install/var/www/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="php"
+	TAGS="blog"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pidgin-facebookchat/receipt
--- a/pidgin-facebookchat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pidgin-facebookchat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.69"
 CATEGORY="network"
 SHORT_DESC="Facebook chat plugin for Pidgin and libpurple messengers"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/dequis/purple-facebook"
 
@@ -23,7 +23,7 @@
 genpkg_rules() {
 	mkdir -p $fs/usr/lib/purple-2
 	cp -a $src/libfacebook.so $fs/usr/lib/purple-2
-	
+
 	# Pidgin icons
 	mkdir -p $fs/usr/share/pixmaps/pidgin/protocols/16x16
 	mkdir -p $fs/usr/share/pixmaps/pidgin/protocols/22x22
diff -r ad29ddfee1c9 -r d5aab818505e pidgin-libnotify/receipt
--- a/pidgin-libnotify/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pidgin-libnotify/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.14"
 CATEGORY="network"
 SHORT_DESC="Notification interface for Pidgin"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://gaim-libnotify.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/gaim-libnotify/$PACKAGE/$PACKAGE-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/gaim-libnotify/$TARBALL"
 
 BUILD_DEPENDS="intltool libpurple-dev libnotify-dev pidgin-dev libffi gtk2-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e pidgin-musictracker/receipt
--- a/pidgin-musictracker/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pidgin-musictracker/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.4.22"
 CATEGORY="network"
 SHORT_DESC="A Pidgin 'now playing' plugin to publicise the songs you are listening to"
-MAINTAINER="ben@seawolfsanctuary.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://pidgin-musictracker.googlecode.com"
+WEB_SITE="http://pidgin-musictracker.googlecode.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/files/$TARBALL"
 
-BUILD_DEPENDS="pidgin-dev gettext libpurple-dev pcre-dev dbus-glib-dev \
+BUILD_DEPENDS="pidgin-dev gettext-dev libpurple-dev pcre-dev dbus-glib-dev \
 gtk2-dev glib-dev libffi"
 
 compile_rules() {
@@ -23,7 +23,7 @@
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pidgin-otr/receipt
--- a/pidgin-otr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pidgin-otr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,27 @@
 PACKAGE="pidgin-otr"
 VERSION="4.0.0"
 CATEGORY="network"
-SHORT_DESC="Allows you to have private conversations over Pidgin messenger."
+SHORT_DESC="Allows you to have private conversations over Pidgin messenger"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://otr.cypherpunks.ca/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.cypherpunks.ca/otr/"
 WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="pidgin libotr"
 BUILD_DEPENDS="libgpg-error-dev libgcrypt-dev libotr-dev glib-dev gtk2-dev \
 pidgin-dev libpurple-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	rm -f $fs/usr/lib/pidgin/pidgin-otr.la
+	DEPENDS="pidgin libotr"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pidgin/receipt
--- a/pidgin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pidgin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.12.0"
 CATEGORY="network"
 SHORT_DESC="Instant messaging client using GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.pidgin.im/"
 
@@ -15,7 +15,7 @@
 startup-notification-dev libgpg-error-dev libxml2-dev xorg-libxcb-dev \
 libidn-dev libtasn1-dev intltool expat-dev nss-dev \
 ncurses-dev xorg-xcb-util-dev gmp-dev"
-SPLIT="libpurple libpurple-dev pidgin pidgin-dev"
+SPLIT="libpurple libpurple-dev $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	touch pidgin.desktop package_revision_raw.txt
diff -r ad29ddfee1c9 -r d5aab818505e pifmrds/receipt
--- a/pifmrds/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="pifmrds"
-GITHASH="c67306ea9b8d827f45e0d90279d367e97119bcb1"
-VERSION=${GITHASH:0:7}
-CATEGORY="system-tools"
-SHORT_DESC="FM-RDS transmitter using the Raspberry Pi's PWM."
-MAINTAINER="pascal.bellard@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="https://github.com/ChristopheJacquet/PiFmRds"
-TARBALL="$PACKAGE-$VERSION.zip"
-WGET_URL="$WEB_SITE/archive/$GITHASH.zip"
-HOST_ARCH="arm"
-TAGS="radio FM RDS"
-SUGGESTED="sox"
-
-DEPENDS="libsndfile"
-BUILD_DEPENDS="wget libsndfile-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src/src
-	sed -i 's|^CC|# &|;/^ifeq/d;/^else/,/^endif/d;s|-march.*$||' Makefile
-	make
-}
-
-# SliTaz package testsuite
-testsuite() {
-	readelf -Ah $src/src/pi_fm_rds
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/sbin
-	cp $src/src/pi_fm_rds $fs/usr/sbin
-	cat > $fs/usr/sbin/pifmogg.sh <<EOT
-#!/bin/sh
-
-fifo=/tmp/pifmogg$$
-mkfifo $fifo
-find $@ -name '*.ogg' -or -name '*.wav' -print | while read file ; do
-	echo "RT $(basename $file .ogg)" > $FIFO
-	cat $file
-done | pi_fm_rds -audio - -ctl $fifo -freq ${FM_FREQ:-107.9} \
-	-ps ${RDS_SERVICE:-RASP-PI} -pi ${RDS_ID:-$(printf "%04X" $RANDOM)}
-rm -f $fifo
-EOT
-	chmod +x $fs/usr/sbin/pifmogg.sh
-}
diff -r ad29ddfee1c9 -r d5aab818505e pigz/receipt
--- a/pigz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pigz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,8 +17,8 @@
 	sed -i 's/-lz/& -lm/' Makefile
 	make || return 1
 
-	install -Dm 755 $src/pigz $install/usr/bin/pigz
-	ln -s                pigz $install/usr/bin/unpigz
+	install -Dm755 pigz $install/usr/bin/pigz
+	ln -s          pigz $install/usr/bin/unpigz
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pilot-link/receipt
--- a/pilot-link/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pilot-link/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://downloads.pilot-link.org/$TARBALL"
 
 BUILD_DEPENDS="popt-dev readline-dev"
-SPLIT="pilot-link-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e pingus/receipt
--- a/pingus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pingus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,8 +6,8 @@
 PACKAGE="pingus"
 VERSION="0.7.3"
 CATEGORY="games"
-SHORT_DESC="Pingus is a free Lemmings-like game"
-MAINTAINER="chadi.elahmad@gmail.com"
+SHORT_DESC="Free Lemmings-like game"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pingus.seul.org/"
 
@@ -21,24 +21,16 @@
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/screenshot.cpp
 	scons || return 1
 
-	mkdir -p $install/usr/bin $install/usr/share/pingus
-	cp -a $src/pingus $install/usr/bin
-	cp -a $src/data   $install/usr/share/pingus
+	install -Dm755 pingus $install/usr/bin/pingus
+	mkdir -p $install/usr/share/pingus/
+	cp -r data/ $install/usr/share/pingus/
 
 	# the tarball doesn't contain any .desktop file, nor a pixmap
 	# let's create them
-	mkdir -p $install/usr/share/pixmaps
-	mkdir -p $install/usr/share/applications
-	cp $src/data/images/core/editor/actions.png \
+	install -Dm644 $src/data/images/core/editor/actions.png \
 		$install/usr/share/pixmaps/pingus.png
-	cat > $install/usr/share/applications/pingus.desktop <<EOF
-[Desktop Entry]
-Name=Pingus
-Exec=pingus -w
-Type=Application
-Categories=Application;Game;
-Icon=pingus
-EOF
+	install -Dm644 $stuff/pingus.desktop \
+		$install/usr/share/applications/pingus.desktop
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pingus/stuff/pingus-0.7.2_gcc4.u
--- a/pingus/stuff/pingus-0.7.2_gcc4.u	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
---- pingus-0.7.2-ori/SConstruct	Tue Oct 30 10:23:37 2007
-+++ pingus-0.7.2/SConstruct	Tue Jan  5 13:09:07 2010
-@@ -333,7 +333,7 @@
- SpaceListOption = _SpaceListOptionClass()
- 
- def DefineOptions(filename, args):
--   opts = Options(filename, args)
-+   opts = Variables(filename, args)
-    opts.Add('CC', 'C Compiler', 'gcc')
-    opts.Add('CXX', 'C++ Compiler', 'g++')
- #   opts.Add('debug', 'Build with debugging options', 0)
-@@ -347,11 +347,11 @@
-    opts.Add('CCFLAGS',    'C Compiler flags', [])
-    opts.Add('LINKFLAGS',  'Linker Compiler flags', [])
- 
--   opts.Add(BoolOption('with_xinput',        'Build with Xinput support', False))
--   opts.Add(BoolOption('with_linuxusbmouse', 'Build with Linux USB mouse support', True))
--   opts.Add(BoolOption('with_linuxevdev',    'Build with Linux evdev support', True))
--   opts.Add(BoolOption('with_wiimote',       'Build with Wiimote support', False))
--   opts.Add(BoolOption('ignore_errors',      'Ignore any fatal configuration errors', False))
-+   opts.Add(BoolVariable('with_xinput',        'Build with Xinput support', False))
-+   opts.Add(BoolVariable('with_linuxusbmouse', 'Build with Linux USB mouse support', True))
-+   opts.Add(BoolVariable('with_linuxevdev',    'Build with Linux evdev support', True))
-+   opts.Add(BoolVariable('with_wiimote',       'Build with Wiimote support', False))
-+   opts.Add(BoolVariable('ignore_errors',      'Ignore any fatal configuration errors', False))
-    opts.Add('optional_sources', 'Additional source files', [])
-    return opts
- 
---- pingus-0.7.2-ori/src/input/evdev_device.cpp	Mon Oct  1 19:24:54 2007
-+++ pingus-0.7.2/src/input/evdev_device.cpp	Tue Jan  5 13:10:57 2010
-@@ -24,6 +24,8 @@
- #include <unistd.h>
- #include <stdexcept>
- #include <iostream>
-+#include <cstdio>
-+#include <cstring>
- #include <errno.h>
- 
- #include "evdev_device.hpp"
---- pingus-0.7.2-ori/src/tinygettext/po_file_reader.cpp	Thu Oct 18 19:54:01 2007
-+++ pingus-0.7.2/src/tinygettext/po_file_reader.cpp	Tue Jan  5 13:10:31 2010
-@@ -24,6 +24,7 @@
- #include <sstream>
- #include <stdexcept>
- #include <string.h>
-+#include <cstdio> 
- #include "iconv.hpp"
- #include "po_file_reader.hpp"
- 
diff -r ad29ddfee1c9 -r d5aab818505e pingus/stuff/pingus.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pingus/stuff/pingus.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Pingus
+Exec=pingus -w
+Type=Application
+Categories=Application;Game;
+Icon=pingus
diff -r ad29ddfee1c9 -r d5aab818505e pinta/receipt
--- a/pinta/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pinta/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 COOKOPTS="!pixmaps"
 
 DEPENDS="mono gtk-sharp"
-BUILD_DEPENDS="automake intltool gettext glib-dev mono-dev gtk-sharp-dev"
+BUILD_DEPENDS="automake intltool gettext-dev glib-dev mono-dev gtk-sharp-dev"
 
 compile_rules() {
 	# update the project and solution files for mono4 (taken from Fedora)
diff -r ad29ddfee1c9 -r d5aab818505e pixiewps/receipt
--- a/pixiewps/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pixiewps/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,21 +11,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|\$(DESTDIR)/usr|/usr|; s|/local||' src/Makefile
 	cd $src/src
 
-	make && make install
+	make &&
+	make install || return 1
 
-	docdir=$install/usr/share/doc/$PACKAGE-$VERSION
-	mkdir -p $docdir
-	cp $src/README.md $docdir
+	cook_pick_docs $src/README.md
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e pkcs/receipt
--- a/pkcs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pkcs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.20"
 CATEGORY="development"
 SHORT_DESC="Public-key cryptography devel files"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.truecrypt.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e pkg-config/receipt
--- a/pkg-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pkg-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.29.2"
 CATEGORY="development"
 SHORT_DESC="Free desktop packages manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/pkg-config/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/pkg-config.html"
@@ -12,24 +12,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://pkg-config.freedesktop.org/releases/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="gcc libtool perl"
 
 compile_rules() {
-	case "$ARCH" in
-		arm)
-			./configure \
-				--program-prefix=$TOOLPREFIX \
-				--build=i486-slitaz-linux \
-				--host=arm-slitaz-linux-gnueabi \
-				--cache-file=arm-linux.cache ;;
-		*)
-			./configure \
-				--with-internal-glib \
-				--disable-host-tool \
-				$CONFIGURE_ARGS
-				;;
-	esac &&
+	./configure \
+		--with-internal-glib \
+		--disable-host-tool \
+		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
 	make install || return 1
diff -r ad29ddfee1c9 -r d5aab818505e pktstat/receipt
--- a/pktstat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pktstat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pktstat"
 VERSION="1.8.5"
 CATEGORY="network"
-SHORT_DESC="Real-time interface traffic viewer for ncurses."
+SHORT_DESC="Real-time interface traffic viewer for ncurses"
 MAINTAINER="paul@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="https://github.com/dleonard0/pktstat"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/dleonard0/pktstat"
-WGET_URL="http://www.adaptive-enterprises.com.au/~d/software/pktstat/$TARBALL" # FIXME
+WGET_URL="https://github.com/dleonard0/pktstat/archive/v$VERSION.tar.gz"
 
-DEPENDS="ncurses libpcap"
 BUILD_DEPENDS="ncurses-dev libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses libpcap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e plm2c/receipt
--- a/plm2c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/plm2c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 	cd plm2c
 	sed -i '/strcat/d' misc.h
 	make &&
-	install -Dm 755 $src/plm2c/plm2c $install/usr/bin/plm2c
+	install -Dm755 plm2c/plm2c $install/usr/bin/plm2c
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e plotdrop/receipt
--- a/plotdrop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/plotdrop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,18 @@
 VERSION="0.5.3"
 CATEGORY="graphics"
 SHORT_DESC="A minimal GTK frontend to GNUPlot"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://plotdrop.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/project/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libglade-dev glib-dev"
 
 compile_rules() {
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ploticus/receipt
--- a/ploticus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ploticus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ploticus"
 VERSION="2.42"
 CATEGORY="misc"
-SHORT_DESC="Data display engine."
+SHORT_DESC="Data display engine"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
-SOURCE="ploticus${VERSION/./}_src"
-TARBALL="$SOURCE.tar.gz"
 WEB_SITE="http://ploticus.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 
-DEPENDS="zlib xorg libpng16"
+TARBALL="ploticus${VERSION/./}_src.tar.gz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
 BUILD_DEPENDS="zlib-dev xorg-dev libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
-	make || return 1
-	mkdir -p $DESTDIR/usr/bin
-	cp pl $DESTDIR/usr/bin
+	make &&
+	install -Dm755 pl $install/usr/bin/pl
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib xorg libpng16"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pluma/receipt
--- a/pluma/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pluma/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,10 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mate-desktop/pluma/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="mate-common yelp-tools gtk-doc gobject-introspection-dev \
+BUILD_DEPENDS="mate-common yelp-tools-dev gtk-doc gobject-introspection-dev \
 enchant-dev iso-codes-dev gtk3-dev gtksourceview3-dev libpeas-dev itstool \
 xorg-libSM-dev"
-SPLIT="pluma-dev pluma-plugins pluma"
+SPLIT="$PACKAGE-dev $PACKAGE-plugins $PACKAGE"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e plymouth/receipt
--- a/plymouth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/plymouth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.8.6.1"
 CATEGORY="base-system"
 SHORT_DESC="A graphical boot splash screen with KMS support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/Plymouth"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/Plymouth/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.freedesktop.org/software/plymouth/releases/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e pm-utils/receipt
--- a/pm-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pm-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.4.1"
 CATEGORY="system-tools"
 SHORT_DESC="Collection of scripts that handle suspend and resume"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://pm-utils.freedesktop.org/"
+WEB_SITE="https://pm-utils.freedesktop.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pm-utils.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -17,7 +17,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# add video quirks
 	cp -r $stuff/video-quirks $install/usr/lib/pm-utils/
diff -r ad29ddfee1c9 -r d5aab818505e pmail/receipt
--- a/pmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,31 @@
 PACKAGE="pmail"
 VERSION="0.9.16"
 CATEGORY="network"
-SHORT_DESC="Mail transfer client based on the protocols of POP3 and SMTP."
+SHORT_DESC="Mail transfer client based on the protocols of POP3 and SMTP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.ibiblio.org/pub/Linux/system/mail/pop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.ibiblio.org/pub/Linux/system/mail/pop/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i  -e "s|BINDIR = @prefix@/bin|BINDIR = $DESTDIR/usr/bin|" \
-		-e "s|MANDIR = @prefix@/man/man1|MANDIR = $DESTDIR/usr/share/man/man1|" \
-		Makefile.in
-	mkdir -p $DESTDIR/usr/bin $DESTDIR/usr/share/man/man1
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
-	make -j 1 &&
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	sed \
+		-e "s|BINDIR = @prefix@/bin|BINDIR = $install/usr/bin|" \
+		-e "s|MANDIR = @prefix@/man/man1|MANDIR = $install/usr/share/man/man1|" \
+		-i Makefile.in
+	mkdir -p $install/usr/bin $install/usr/share/man/man1
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
+	make -j1 &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e pngcrush/receipt
--- a/pngcrush/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pngcrush/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pngcrush"
 VERSION="1.8.1"
 CATEGORY="graphics"
 SHORT_DESC="PNG optimizer"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="https://sourceforge.net/projects/pmt/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/pmt/$TARBALL"
 
-DEPENDS="glibc-base"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
-
-	mkdir -p $install/usr/bin
-	cp -a $src/pngcrush $install/usr/bin
+compile_rules() {
+	make &&
+	install -Dm755 pngcrush $install/usr/bin/pngcrush
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e pngquant/receipt
--- a/pngquant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pngquant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://pngquant.org/"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GITHUB/pornel/pngquant/tarball/$VERSION"
@@ -16,7 +15,7 @@
 EXTRA_WGET_URL="$GITHUB/ImageOptim/libimagequant/tarball/$VERSION"
 
 BUILD_DEPENDS="lcms2-dev libpng16-dev zlib-dev"
-SPLIT="pngquant pngquant-static:static"
+SPLIT="$PACKAGE-static:static"
 
 compile_rules() {
 	if [ ! -e "$SRC/$EXTRA_TARBALL" ]; then
@@ -38,7 +37,8 @@
 			;;
 	esac &&
 
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pngrewrite/receipt
--- a/pngrewrite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pngrewrite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,22 @@
 PACKAGE="pngrewrite"
 VERSION="1.4.0"
 CATEGORY="graphics"
-SHORT_DESC="Utility to reduce unnecessarily large palettes and bit depths in PNG image files"
+SHORT_DESC="Reduce unnecessarily large palettes and bit depths in PNG image files"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="zlib/libpng"
 WEB_SITE="http://entropymine.com/jason/pngrewrite/"
+
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="libpng16"
 BUILD_DEPENDS="libpng16-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
-
-	mkdir -p $install/usr/bin
-	cp -a $src/pngrewrite $install/usr/bin
+compile_rules() {
+	make &&
+	install -Dm755 pngrewrite $install/usr/bin/pngrewrite
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpng16"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pnm2ppa/receipt
--- a/pnm2ppa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pnm2ppa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.12"
 CATEGORY="system-tools"
 SHORT_DESC="Ghostscript print filter and color driver for some HP DeskJet printers"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://pnm2ppa.sourceforge.net/"
 
@@ -15,17 +15,12 @@
 
 compile_rules() {
 	make BINDIR="/usr/bin" CONFDIR="/etc" &&
-	make BINDIR=$DESTDIR/usr/bin  CONFDIR=$DESTDIR/etc install
+	make BINDIR=$install/usr/bin CONFDIR=$install/etc install
 }
 
 genpkg_rules() {
-	mkdir -p  $fs/usr/share
-
-	cp -a $install/etc   $fs
-	cp -a $install/usr/bin $fs/usr
-
-	# Still needs ppd file download for the specific printer from 
+	copy @std
+	# Still needs ppd file download for the specific printer from
 	# http://www.linuxprinting.org/show_driver.cgi?driver=pnm2ppa&fromprinter=HP-DeskJet_710C
-
 	DEPENDS="ghostscript cups foomatic-filters"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pnmixer/receipt
--- a/pnmixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pnmixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/nicklan/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext xorg-libX11-dev gtk2-dev"
+BUILD_DEPENDS="automake glib-dev alsa-lib-dev gettext-dev xorg-libX11-dev \
+gtk2-dev"
 
 compile_rules() {
 	cp $stuff/ru.po $src/po; echo "ru" >> $src/po/LINGUAS
diff -r ad29ddfee1c9 -r d5aab818505e podofo/receipt
--- a/podofo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/podofo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.1"
 CATEGORY="office"
 SHORT_DESC="PDF library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://podofo.sourceforge.net/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake fontconfig-dev freetype-dev zlib-dev jpeg-dev tiff-dev \
 libpng16-dev"
-SPLIT="podofo-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
@@ -26,7 +26,7 @@
 		-DPODOFO_BUILD_SHARED:BOOL=TRUE \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e poedit/receipt
--- a/poedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/poedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,25 @@
 VERSION="1.8.6"
 CATEGORY="localization"
 SHORT_DESC="A cross-platform gettext catalogs editing tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://poedit.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/vslavik/$PACKAGE/archive/v$VERSION-oss.tar.gz"
 
-BUILD_DEPENDS="automake gettext asciidoc libxslt xmlto util-linux-getopt \
+BUILD_DEPENDS="automake gettext-dev asciidoc libxslt xmlto util-linux-getopt \
 docbook-xsl gcc49 wxWidgets-dev icu-dev gtkspell-dev \
 lucene++-dev db-dev libdb libdb-cxx expat-dev"
-SPLIT="poedit-i18n poedit"
+SPLIT="$PACKAGE-i18n $PACKAGE"
 
 compile_rules() {
-	export CXX=/usr/bin/i486-slitaz-linux-g++-49
+	export CXX=/usr/bin/i486-slitaz-linux-g++-49 # FIXME: what about x86_64?
 	#export CXXFLAGS="$CFLAGS -std=gnu++11"
 	./bootstrap &&
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -34,7 +34,7 @@
 			;;
 		poedit)
 			copy @std @rm
-			DEPENDS="wxWidgets lucene++ gtkspell gcc49-lib-base gettext-tools"
+			DEPENDS="wxWidgets lucene++ gtkspell gcc49-lib-base gettext"
 			SUGGESTED="aspell"
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e polipo/receipt
--- a/polipo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/polipo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Small and fast caching web proxy"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://www.pps.jussieu.fr/~jch/software/polipo/"
+WEB_SITE="https://www.irif.fr/~jch/software/polipo/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.pps.univ-paris-diderot.fr/~jch/software/files/$PACKAGE/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e polkit-qt/receipt
--- a/polkit-qt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/polkit-qt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.112.0"
 CATEGORY="system-tools"
 SHORT_DESC="Library that allows to access PolicyKit API with a nice Qt-style API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/polkit-qt-1"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/kde/polkit-qt.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://download.kde.org/stable/apps/KDE4.x/admin/$TARBALL"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev polkit-dev glib-dev"
-SPLIT="polkit-qt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build; cd build
diff -r ad29ddfee1c9 -r d5aab818505e polkit/receipt
--- a/polkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/polkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.113"
 CATEGORY="base-system"
 SHORT_DESC="Authorization manager"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/polkit/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/polkit.html"
@@ -15,9 +15,7 @@
 JS='js185'
 BUILD_DEPENDS="glib-dev $JS-dev expat-dev intltool pam-dev \
 gobject-introspection-dev gtk-doc"
-SPLIT="polkit polkit-dev  polkit-pam:pam polkit-pam-dev:pam"
-
-CROSS="error: cannot check for file existence when cross compiling"
+SPLIT="$PACKAGE-dev  $PACKAGE-pam:pam $PACKAGE-pam-dev:pam"
 
 compile_rules() {
 	if ! grep -q polkitd "/etc/passwd"; then
diff -r ad29ddfee1c9 -r d5aab818505e polkit105/receipt
--- a/polkit105/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/polkit105/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 
 BUILD_DEPENDS="libtool automake intltool glib-dev gtk-doc \
 gobject-introspection-dev expat-dev"
-SPLIT="polkit105-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	libtoolize --force &&
diff -r ad29ddfee1c9 -r d5aab818505e ponyprog/receipt
--- a/ponyprog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ponyprog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,15 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL"
 WEB_SITE="http://www.lancos.com/prog.html"
-SOURCE="PonyProg2000"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+
+TARBALL="PonyProg2000-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="xorg-libXaw"
+compile_rules() {
+	install -Dm755 bin/ponyprog2000 $install/usr/bin/ponyprog2000
+}
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-        mkdir -p $fs/usr/bin
-        cp -a $src/bin/${PACKAGE}2000 $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libXaw"
 }
diff -r ad29ddfee1c9 -r d5aab818505e poppler-data/receipt
--- a/poppler-data/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/poppler-data/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.9"
 CATEGORY="misc"
 SHORT_DESC="Encoding files for use with poppler"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://poppler.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html"
diff -r ad29ddfee1c9 -r d5aab818505e poppler-qt4/receipt
--- a/poppler-qt4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/poppler-qt4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.51.0"
 CATEGORY="office"
 SHORT_DESC="Poppler compiled with Qt4 library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://poppler.freedesktop.org/"
 REPOLOGY="poppler"
@@ -15,13 +15,11 @@
 BUILD_DEPENDS="xorg-libXdamage expat-dev jpeg-dev tiff-dev \
 freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev cairo-dev \
 automake bzip2-dev libpng16-dev libtool Qt4-dev libxml2-dev"
-SPLIT="poppler-qt4-apps poppler-qt4-dev"
+SPLIT="$PACKAGE-apps $PACKAGE-dev"
 
 # FIXME: after Qt will be available, to merge this receipt with the poppler receipt.
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	autoreconf -fi
 	./configure \
 		--enable-zlib \
@@ -29,12 +27,11 @@
 		--enable-poppler-qt4 \
 		--disable-libopenjpeg \
 		$CONFIGURE_ARGS &&
-	make &&	make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		poppler-qt4)
 			copy /usr/lib/*qt4.so*
diff -r ad29ddfee1c9 -r d5aab818505e poppler/receipt
--- a/poppler/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/poppler/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.68.0"
 CATEGORY="office"
 SHORT_DESC="PDF rendering library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://poppler.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/poppler.html"
diff -r ad29ddfee1c9 -r d5aab818505e popt/receipt
--- a/popt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/popt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.16"
 CATEGORY="system-tools"
 SHORT_DESC="Library for parsing command line options"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://directory.fsf.org/wiki/Popt"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/popt.html"
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://rpm5.org/files/popt/$TARBALL"
 
-BUILD_DEPENDS="gettext"
-SPLIT="popt-dev"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e poptop/receipt
--- a/poptop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/poptop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,55 +3,48 @@
 PACKAGE="poptop"
 VERSION="1.3.4"
 CATEGORY="network"
-SHORT_DESC="Microsoft Point-to-Point Tunneling Protocol server."
+SHORT_DESC="Microsoft Point-to-Point Tunneling Protocol server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://poptop.sourceforge.net/"
+
 SOURCE="pptpd"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://poptop.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="vpn tunnel"
 
-SPLIT="poptop bcrelay poptop-man"
+SPLIT="bcrelay"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	PPPVER=$(. $WOK/ppp/receipt ; echo $VERSION)
+compile_rules() {
+	PPPVER=$(. $WOK/ppp/receipt; echo $VERSION)
 	sed -i "s/#define VERSION.*/#define VERSION \"${PPPVER:-2.4.3}\"/" \
 		plugins/patchlevel.h
-	sed -i "s|^LIBDIR.*|LIBDIR=$DESTDIR/usr/lib/pptpd|" plugins/Makefile
-	./configure --prefix=/usr \
+	sed -i "s|^LIBDIR.*|LIBDIR=$install/usr/lib/pptpd|" plugins/Makefile
+
+	./configure \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install || return 1
+
+	install -Dm644 samples/pptpd.conf    $install/etc/pptpd.conf
+	install -Dm644 samples/options.pptpd $install/etc/ppp/options.pptpd
+
+	mkdir -p $install/etc/init.d/
+	ln -s daemon $install/etc/init.d/pptpd
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	poptop)
-		CONFIG_FILES="/etc/pptpd.conf /etc/ppp/options.pptpd"
-		DEPENDS="ppp bcrelay"
-		mkdir -p $fs/usr $fs/etc/ppp $fs/etc/init.d
-		cp -a $install/usr/lib $fs/usr
-		cp -a $install/usr/sbin $fs/usr
-		rm -f $fs/usr/sbin/bcrelay
-		cp $src/samples/pptpd.conf $fs/etc
-		cp $src/samples/options.pptpd $fs/etc/ppp
-		ln -s daemon $fs/etc/init.d/pptpd
-		;;
-	bcrelay)
-		CAT="network|Broadcast relay daemon."
-		mkdir -p $fs/usr/sbin
-		cp -a $install/usr/sbin/bcrelay $fs/usr/sbin
-		;;
-	poptop-man)
-		CAT="network|PPTP server man pages."
-		mkdir -p $fs/usr/
-		cp -a $install/usr/share $fs/usr/
-		;;
+		bcrelay)
+			copy bcrelay
+			CAT="network|broadcast relay daemon"
+			;;
+		poptop)
+			copy @std @rm
+			CONFIG_FILES="/etc/pptpd.conf /etc/ppp/options.pptpd"
+			DEPENDS="ppp bcrelay"
+			TAGS="vpn tunnel"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e portaudio/receipt
--- a/portaudio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/portaudio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="v19_20110326"
 CATEGORY="system-tools"
 SHORT_DESC="A portable cross-platform audio API"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-SA"
 WEB_SITE="http://www.portaudio.com/"
 
@@ -12,13 +12,13 @@
 WGET_URL="http://www.portaudio.com/archives/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev jack-dev"
-SPLIT="portaudio-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e portmap/receipt
--- a/portmap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/portmap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,45 +1,42 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="portmap"
 VERSION="6.0"
 CATEGORY="network"
 SHORT_DESC="RPC portmapper"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-TARBALL="${PACKAGE}-${VERSION}.tgz"
 WEB_SITE="ftp://ftp.porcupine.org/pub/security/index.html"
+
+TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="http://neil.brown.name/portmap/$TARBALL"
 
-DEPENDS="libwrap"
 BUILD_DEPENDS="libwrap-dev"
 
-# rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
-	# Build 
+compile_rules() {
 	# Disabling TCP_WRAPPER with NO_TCP_WRAPPER variable
-	NO_TCP_WRAPPER=1  make
+	NO_TCP_WRAPPER=1  make || return 1
+
+	install -Dm755 pmap_dump $install/usr/sbin/pmap_dump
+	install -Dm755 pmap_set  $install/usr/sbin/pmap_set
+	install -Dm755 portmap   $install/usr/sbin/portmap
+
+	install -Dm755 $stuff/init.d/portmap $install/etc/init.d/portmap
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/sbin
-	cp -a $src/pmap_dump $fs/usr/sbin
-	cp -a $src/pmap_set $fs/usr/sbin
-	cp -a $src/portmap $fs/usr/sbin
-
-	mkdir -p $fs/etc/init.d
-	install -g root -o root -m 0755 stuff/init.d/portmap $fs/etc/init.d
+genpkg_rules() {
+	copy @std
+	DEPENDS="libwrap"
 }
 
+# Post message when installing.
+post_install() {
+	[ -n "$quiet" ] || cat <<EOT
 
-post_install()
-{
-	# Post message when installing.
-	echo -e "\nTo starts $PACKAGE server you can run :\n"
-        echo "/etc/init.d/$PACKAGE start"
-	echo -e "Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf\n"	                        
+	.------------------------------------------------.
+	| To start portmap server you can run:           |
+	|   /etc/init.d/portmap start                    |
+	| or add portmap to RUN_DAEMONS in /etc/rcS.conf |
+	'------------------------------------------------'
+EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e portmidi/receipt
--- a/portmidi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/portmidi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="217"
 CATEGORY="multimedia"
 SHORT_DESC="Platform Independent Library for MIDI I/O"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://portmedia.sourceforge.net/portmidi/"
 
diff -r ad29ddfee1c9 -r d5aab818505e portsentry/receipt
--- a/portsentry/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/portsentry/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,8 @@
 	sed -i 's/dot $/&\\/' portsentry.c
 	make linux || return 1
 
-	install -Dm 755 $src/portsentry      $install/usr/sbin/portsentry
-	install -Dm 644 $src/portsentry.conf $install/etc/portsentry/portsentry.conf
+	install -Dm755 $src/portsentry      $install/usr/sbin/portsentry
+	install -Dm644 $src/portsentry.conf $install/etc/portsentry/portsentry.conf
 	cat > $install/etc/portsentry/portsentry.ignore.static <<EOT
 127.0.0.1/32
 192.168.0.0/16
diff -r ad29ddfee1c9 -r d5aab818505e posixovl/receipt
--- a/posixovl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/posixovl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,9 @@
 	sed -i 's/cb->ll.size/0/' posixovl.c
 
 	sh autogen.sh
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e postfix/receipt
--- a/postfix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/postfix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="postfix"
 VERSION="2.10.2"
 CATEGORY="network"
-SHORT_DESC="fast, easy to administer, and secure mailer"
+SHORT_DESC="Fast, easy to administer, and secure mailer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -12,11 +12,9 @@
 
 BUILD_DEPENDS="db-dev openldap-dev pcre-dev openssl-dev perl mysql-dev \
 cyrus-sasl-dev libsasl"
-SPLIT="postfix postfix-mysql"
+SPLIT="$PACKAGE-mysql"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make makefiles \
 	CCARGS='-DHAS_DB -DHAS_LDAP \
 		-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I /usr/include/sasl \
@@ -26,74 +24,69 @@
 		-DDEF_MANPAGE_DIR=\"/usr/share/man\"' \
 	AUXLIBS="-ldb -lldap -llber -lsasl2 -lssl -lcrypto -lpthread \
 		-L/usr/lib/mysql -lmysqlclient -lz -lm " &&
-	make
+	make &&
 	install_root=$WOK/$PACKAGE/install \
 		sh postfix-install -non-interactive
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	postfix)
-		TAZPANEL_DAEMON="man|edit::/etc/postfix/main.cf|options|web::$WEB_SITE"
-		CONFIG_FILES="/etc/postfix"
-		PROVIDE="sendmail"
-		DEPENDS="libdb libldap pcre openssl slitaz-base-files libsasl \
+		postfix)
+			TAZPANEL_DAEMON="man|edit::/etc/postfix/main.cf|options|web::$WEB_SITE"
+			CONFIG_FILES="/etc/postfix"
+			PROVIDE="sendmail"
+			DEPENDS="libdb libldap pcre openssl slitaz-base-files libsasl \
 			libkrb5 libcomerr3 libmysqlclient"
-		mkdir -p $fs/usr/share/licenses/
-		cp -a $install/usr/lib $fs/usr
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/sbin $fs/usr
-		cp -a $install/etc $fs
+			mkdir -p $fs/usr/share/licenses/
+			cp -a $install/usr/lib $fs/usr
+			cp -a $install/usr/bin $fs/usr
+			cp -a $install/usr/sbin $fs/usr
+			cp -a $install/etc $fs
 
-		awk 'BEGIN {n=0} /MUST/ {n++} /ALIASES/ {n++} { if (n==1) print }' \
+			awk 'BEGIN {n=0} /MUST/ {n++} /ALIASES/ {n++} { if (n==1) print }' \
 			< $install/etc/postfix/aliases > $fs/etc/postfix/aliases
-		while read keyword data; do
-			grep -q ^$keyword $fs/etc/postfix/main.cf && continue
-			mv $fs/etc/postfix/main.cf $fs/etc/postfix/main.cf.$$
-			awk "BEGIN { scan=1 } /^#$keyword / { if (scan) { print \"$keyword $data\" ; scan=0 } } { print }" \
+			while read keyword data; do
+				grep -q ^$keyword $fs/etc/postfix/main.cf && continue
+				mv $fs/etc/postfix/main.cf $fs/etc/postfix/main.cf.$$
+				awk "BEGIN { scan=1 } /^#$keyword / { if (scan) { print \"$keyword $data\"; scan=0 } } { print }" \
 				< $fs/etc/postfix/main.cf.$$ > $fs/etc/postfix/main.cf
-			rm -f $fs/etc/postfix/main.cf.$$
-		done << EOF
+				rm -f $fs/etc/postfix/main.cf.$$
+			done << EOF
 mydomain = localdomain
 myorigin = localhost
 mydestination = localhost, localhost.\$mydomain
 mynetworks = 127.0.0.0/8
 alias_maps = hash:/etc/postfix/aliases
 EOF
-		cat >> $fs/etc/postfix/main.cf <<EOF
+			cat >> $fs/etc/postfix/main.cf <<EOF
 
 # Unsafe, see CVE-2014-3566 POODLE
 smtpd_tls_mandatory_protocols = !SSLv2, !SSLv3
 EOF
-		cp -a $stuff/etc $fs
-		cp -a $install/var $fs
-		mv $fs/etc/postfix/TLS_LICENSE $fs/usr/share/licenses/POSTFIX_TLS_LICENSE
-		mv $fs/etc/postfix/LICENSE $fs/usr/share/licenses/POSTFIX_LICENSE
-		cp -a $stuff/etc/init.d $fs/etc
-		rm -f $fs/usr/lib/postfix/post* $fs/usr/lib/postfix/*.cf
-		strip -s $fs/usr/lib/postfix/*
-		;;
-	postfix-mysql)
-		CAT="network|MySQL support for postfix"
-		DEPENDS="postfix libmysqlclient"
-		mkdir -p $fs/usr/lib/postfix/
-		cp -a $src/src/global/dict_mysql.o $fs/usr/lib/postfix
-		;;
+			cp -a $stuff/etc $fs
+			cp -a $install/var $fs
+			mv $fs/etc/postfix/TLS_LICENSE $fs/usr/share/licenses/POSTFIX_TLS_LICENSE
+			mv $fs/etc/postfix/LICENSE $fs/usr/share/licenses/POSTFIX_LICENSE
+			cp -a $stuff/etc/init.d $fs/etc
+			rm -f $fs/usr/lib/postfix/post* $fs/usr/lib/postfix/*.cf
+			strip -s $fs/usr/lib/postfix/*
+			;;
+		*-mysql)
+			CAT="network|postfix support"
+			DEPENDS="postfix libmysqlclient"
+			mkdir -p $fs/usr/lib/postfix/
+			cp -a $src/src/global/dict_mysql.o $fs/usr/lib/postfix
+			;;
 	esac
 }
 
-# Pre and post install commands for Tazpkg.
-post_install_postfix()
-{
-
+post_install_postfix() {
 	local user
 	local group
-	
+
 	user=postfix
 	group=postdrop
-	
+
 	if ! grep -q $user "$1/etc/passwd"; then
 		echo -n "Adding user/group $user..."
 		chroot "$1/" addgroup -S $user
@@ -104,42 +97,42 @@
 
 	# addgroup postdrop if needed
 	if ! grep -q postdrop "$1/etc/group"; then
-		echo -n "Adding group ${group}..."
+		echo -n "Adding group $group..."
 		chroot "$1/" addgroup -S $group
 		status
 	fi
 
-	chroot "$1/" chown ${user} /var/spool/postfix/* /var/lib/postfix
-	chroot "$1/" chgrp ${group} /var/spool/postfix/maildrop \
+	chroot "$1/" chown $user /var/spool/postfix/* /var/lib/postfix
+	chroot "$1/" chgrp $group /var/spool/postfix/maildrop \
 		/var/spool/postfix/public /usr/sbin/postdrop /usr/sbin/postqueue
 	chmod 2755 "$1/usr/sbin/postdrop" "$1/usr/sbin/postqueue"
 	chmod 2710 "$1/var/spool/postfix/public"
 	chmod 1730 "$1/var/spool/postfix/maildrop"
 	chroot "$1/" postalias /etc/postfix/aliases
 	cat <<EOF
-	
-----
-Warning: you still need to edit myorigin/mydestination/mynetworks
-parameter settings in /etc/postfix/main.cf.
-See also http://www.postfix.org/STANDARD_CONFIGURATION_README.html
 
-To start $PACKAGE server you can run :
-
-    /etc/init.d/$PACKAGE start
-
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.-----------------------------------------------------------.
+	| WARNING:                                                  |
+	| you still need to edit myorigin/mydestination/mynetworks  |
+	| parameter settings in /etc/postfix/main.cf.               |
+	| See also:                                                 |
+	| http://www.postfix.org/STANDARD_CONFIGURATION_README.html |
+	|-----------------------------------------------------------|
+	| To start postfix server you can run:                      |
+	|                                                           |
+	|    /etc/init.d/$PACKAGE start                             |
+	|                                                           |
+	| or add postfix to RUN_DAEMONS in /etc/rcS.conf            |
+	'-----------------------------------------------------------'
 EOF
 }
 
 # Overlap busybox
-pre_install_postfix()
-{
+pre_install_postfix() {
 	rm -f "$1/usr/sbin/sendmail"
 }
 
-post_remove_postfix()
-{
+post_remove_postfix() {
 	deluser postfix
 	delgroup postdrop
 	ln -s /bin/busybox /usr/sbin/sendmail
diff -r ad29ddfee1c9 -r d5aab818505e postgis/receipt
--- a/postgis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/postgis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.0"
 CATEGORY="misc"
 SHORT_DESC="Support for geographic objects to PostgreSQL"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://postgis.refractions.net/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="postgresql-dev geos-dev proj-dev libxml2-dev \
 gtk2-dev gdal-dev jasper-dev curl-dev libpostgresqlclient tiff"
-SPLIT="postgis-gui postgis"
+SPLIT="$PACKAGE-gui $PACKAGE"
 
 compile_rules() {
 	touch config.rpath
diff -r ad29ddfee1c9 -r d5aab818505e postgresql/receipt
--- a/postgresql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/postgresql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,14 +7,12 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.postgresql.org/"
-DATABASE_FILES="/var/lib/pgsql"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://ftp.postgresql.org/pub/source/v$VERSION/$TARBALL"
 
-DEPENDS="postgresql-client slitaz-base-files"
 BUILD_DEPENDS="readline-dev zlib-dev perl-dev python-dev"
-SPLIT="libpostgresqlclient postgresql-client postgresql-dev postgresql-doc"
+SPLIT="libpostgresqlclient $PACKAGE-client $PACKAGE-dev $PACKAGE-doc"
 
 compile_rules() {
 	sed -i '/DEFAULT_PGSOCKET_DIR/s@/tmp@/run/postgresql@' src/include/pg_config_manual.h &&
@@ -25,9 +23,10 @@
 		--with-system-tzdata=/usr/share/zoneinfo \
 		--with-perl --with-python \
 		$CONFIGURE_ARGS &&
-	make && make install && make install-docs
-
-	make -C doc/src/sgml DESTDIR=$DESTDIR install-html
+	make &&
+	make install &&
+	make install-docs &&
+	make -C doc/src/sgml DESTDIR=$install install-html
 }
 
 genpkg_rules() {
@@ -46,6 +45,7 @@
 			find $fs -name $i -delete
 		done
 		rm -r $fs/usr/include $fs/usr/lib/postgresql/pgxs
+		DEPENDS="postgresql-client slitaz-base-files"
 		;;
 	libpostgresqlclient)
 		CAT="misc|Advanced object-relational database management system (client libraries)"
@@ -71,8 +71,7 @@
 }
 
 # Pre and post install commands for Tazpkg.
-post_install_postgresql()
-{
+post_install_postgresql() {
 	# adduser postgres if needed
 	if ! grep -q postgres: "$1/etc/passwd"; then
 		action 'Adding user postgres...'
@@ -89,15 +88,17 @@
 	[ ! -d "$1/var/lib/pgsql" ] && mkdir -p "$1/var/lib/pgsql"
 	chroot "$1/" chown -R postgres.postgres /var/lib/pgsql /var/log/postgresql
 	[ -n "$quiet" ] || cat <<EOF
-----
-postgres has superuser access.
-Configure /var/lib/pgsql/*.conf files.
-To start $PACKAGE server you can run:
 
-    /etc/init.d/$PACKAGE start
-
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.---------------------------------------------------.
+	| postgres has superuser access.                    |
+	| Configure /var/lib/pgsql/*.conf files.            |
+	|---------------------------------------------------|
+	| To start postgresql server you can run:           |
+	|                                                   |
+	|    /etc/init.d/postgresql start                   |
+	|                                                   |
+	| Or add postgresql to RUN_DAEMONS in /etc/rcS.conf |
+	'---------------------------------------------------'
 EOF
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e postgrey/receipt
--- a/postgrey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/postgrey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,47 +1,46 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="postgrey"
 VERSION="1.36"
 CATEGORY="network"
-SHORT_DESC="Postfix policy server implementing greylisting."
+SHORT_DESC="Postfix policy server implementing greylisting"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://postgrey.schweikert.ch/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://postgrey.schweikert.ch/"
 WGET_URL="$WEB_SITE/pub/$TARBALL"
-CONFIG_FILES="/etc/postgrey"
 
-DEPENDS="postfix perl db perl-net-server perl-io-multiplex perl-berkeleydb \
-perl-net-dns"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/etc/postfix $fs/var/spool/postfix/postgrey
 	cp $src/contrib/postgreyreport $src/postgrey $fs/usr/bin
 	cp $src/postgrey_whitelist* $fs/etc/postfix
-	cp -a stuff/etc $fs
+	cp -a $stuff/etc $fs
+	DEPENDS="postfix perl db perl-net-server perl-io-multiplex perl-berkeleydb \
+	perl-net-dns"
+	CONFIG_FILES="/etc/postgrey"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	chroot "$1/" chown postfix /var/spool/postfix/postgrey
-	cat <<EOF
-----
-To use $PACKAGE with postfix, add check_policy_service inet:127.0.0.1:60000 in
-smtpd_recipient_restrictions of /etc/postfix/main.cf, i.e:
 
-    smtpd_recipient_restrictions =
-	....
-	check_policy_service inet:127.0.0.1:60000,
-	permit
-	
-To start $PACKAGE server you can run :
+	[ -n "$quiet" ] || cat <<EOF
 
-    /etc/init.d/$PACKAGE start
-
-Or add $PACKAGE to RUN_DAEMONS in /etc/rcS.conf
-----
+	.--------------------------------------------------------.
+	| To use postgrey with postfix, add check_policy_service |
+	| inet:127.0.0.1:60000 in smtpd_recipient_restrictions   |
+	| of /etc/postfix/main.cf, i.e:                          |
+	|                                                        |
+	|    smtpd_recipient_restrictions =                      |
+	|    ....                                                |
+	|    check_policy_service inet:127.0.0.1:60000,          |
+	|    permit                                              |
+	|--------------------------------------------------------|
+	| To start postgrey server you can run:                  |
+	|                                                        |
+	|    /etc/init.d/postgrey start                          |
+	|                                                        |
+	| or add postgrey to RUN_DAEMONS in /etc/rcS.conf        |
+	'--------------------------------------------------------'
 EOF
 }
diff -r ad29ddfee1c9 -r d5aab818505e potamus/receipt
--- a/potamus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/potamus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="potamus"
 VERSION="15"
 CATEGORY="multimedia"
-SHORT_DESC="Unbloated and easy to use GTK+ Audio player."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Unbloated and easy to use GTK+ Audio player"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://offog.org/code/potamus/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://offog.org/code/potamus/"
 WGET_URL="http://offog.org/files/$TARBALL"
-TAGS="music audio player mp3 ogg flac"
 
-DEPENDS="gtk2 libglade alsa-lib libmad libogg libvorbis libsamplerate"
 BUILD_DEPENDS="gtk2-dev libglade-dev alsa-lib-dev libmad-dev \
-libogg-dev libvorbis-dev libsamplerate-dev"
+libogg-dev libvorbis-dev libsamplerate-dev flac-dev"
 
-# Handle arch install
-case "$SLTAZ_ARCH" in
-	i?86) DEPENDS="$DEPENDS flac" ;;
-esac
+compile_rules() {
+	export LDFLAGS="$LDFLAGS -lm"
 
-# Handle cross compilation.
-case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS flac-dev" ;;
-	arm*) ARCH_ARGS="--disable-input-flac" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	export LDFLAGS="$LDFLAGS -lm"
 	# libmad for MP3
 	./configure \
 		--disable-input-modplug \
@@ -37,20 +24,16 @@
 		--disable-input-opus \
 		--disable-output-ao \
 		--disable-output-jack \
-		$CONFIGURE_ARGS ${ARCH_ARGS} &&
-	make && make install &&
+		$CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
+
 	sed -i s'/Name=.*/Name=Potamus Audio Player/' \
-		${DESTDIR}/usr/share/applications/*.desktop
+		$install/usr/share/applications/*.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib $fs/usr/share/pixmaps
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/${PACKAGE} $fs/usr/share
-	cp -a $install/usr/share/icons/hicolor/48x48/*/${PACKAGE}.png \
-		$fs/usr/share/pixmaps
-	
+genpkg_rules() {
+	copy @std @ico
+	DEPENDS="gtk2 libglade alsa-lib libmad libogg libvorbis libsamplerate flac"
+	TAGS="music audio player mp3 ogg flac"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e potrace/receipt
--- a/potrace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/potrace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/potrace/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="potrace-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e powermanga/receipt
--- a/powermanga/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/powermanga/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,28 +4,27 @@
 VERSION="0.80"
 CATEGORY="games"
 SHORT_DESC="Space War"
-MAINTAINER="arca2@hotmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://linux.tlk.fr/games/Powermanga/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://linux.tlk.fr/games/Powermanga/"
 WGET_URL="http://linux.tlk.fr/games/Powermanga/download/$TARBALL"
 
-DEPENDS="libsdl-mixer zlib"
 BUILD_DEPENDS="libsdl-dev zlib-dev libsdl-mixer-dev xorg-libXext"
 
 # Packaging for SliTaz by Rene Rivero.
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|SDL_mixer.h|SDL/SDL_mixer.h|' src/sdl_mixer.cpp
 	sed -i '239,243 s|^|// |' src/sdl_mixer.cpp
-	./configure && make && make install
+
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/var $fs
 	cp -a $install/usr/games $fs/usr
@@ -34,5 +33,5 @@
 	cp $stuff/power-manga.png $fs/usr/share/games/powermanga
 	cp $stuff/powermanga.desktop $fs/usr/share/applications
 	chown -R root.root $fs
+	DEPENDS="libsdl-mixer zlib"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e powertop/receipt
--- a/powertop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/powertop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,15 +5,15 @@
 CATEGORY="system-tools"
 SHORT_DESC="Utility designed to measure and explain a computer's electrical \
 power consumption"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://01.org/powertop/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://01.org/powertop/sites/default/files/downloads/$TARBALL"
 
-BUILD_DEPENDS="acl gettext ncurses-dev autoconf automake libtool \
-pciutils-dev libnl-dev zlib-dev gettext diffutils"
+BUILD_DEPENDS="acl gettext-dev ncurses-dev autoconf automake libtool \
+pciutils-dev libnl-dev zlib-dev diffutils"
 
 compile_rules() {
 	sed -i 's/AC_PROG_LIBTOOL/AC_PROG_MKDIR_P\n&/' configure.ac
diff -r ad29ddfee1c9 -r d5aab818505e ppp/receipt
--- a/ppp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ppp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.7"
 CATEGORY="network"
 SHORT_DESC="Implements the Point-to-Point Protocol (PPP)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL"
 WEB_SITE="https://ppp.samba.org/"
 
@@ -12,23 +12,19 @@
 WGET_URL="$GITHUB/paulusmack/ppp/tarball/ppp-$VERSION"
 
 BUILD_DEPENDS="pam-dev"
-SPLIT="ppp ppp-pam ppp-dev"
+SPLIT="$PACKAGE-pam $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export PATH=/cross/arm/tools/arm-slitaz-linux-gnueabi/bin:$PATH;;
-	esac
-
 	cp -a $src $src-pam
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR/usr install || return 1
+	make DESTDIR=$install/usr install || return 1
 
 	cd $src-pam
 	sed -i 's/#USE_PAM/USE_PAM/' pppd/Makefile.linux
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR-pam/usr install
+	make DESTDIR=$install-pam/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pptpclient/receipt
--- a/pptpclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pptpclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,51 +3,42 @@
 PACKAGE="pptpclient"
 VERSION="1.8.0"
 CATEGORY="network"
-SHORT_DESC="Microsoft Point-to-Point Tunneling Protocol client."
+SHORT_DESC="Microsoft Point-to-Point Tunneling Protocol client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://pptpclient.sourceforge.net/"
+
 SOURCE="pptp"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://pptpclient.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="vpn tunnel"
 
 BUILD_DEPENDS="ppp perl"
-SPLIT="pptpclient pptpclient-extra pptpclient-man"
+SPLIT="$PACKAGE-extra"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install || retyrn 1
+
+	sed \
+		-e 's|die ".* MPPE .* in kernel|echo "$0: no MPPE kernel module|' \
+		-e 's|wc --lines|wc -l|' \
+		-e '/# system checking/{n;s/^/#/;n;s/^/#/;}' \
+		-i $install/usr/sbin/pptpsetup
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	pptpclient)
-		CONFIG_FILES="/etc/ppp/options.pptp"
-		DEPENDS="ppp"
-		SUGGESTED="pptpclient-extra"
-		mkdir -p $fs/usr/sbin
-		cp -a $install/usr/sbin/pptp $fs/usr/sbin
-		cp -a $install/etc $fs/
-		;;
-	pptpclient-extra)
-		CAT="network|PPTP client configuration helper."
-		DEPENDS="pptpclient perl"
-		mkdir -p $fs/usr/sbin
-		cp -a $install/usr/sbin/pptpsetup $fs/usr/sbin
-		sed -i 's/die ".* MPPE .* in kernel/echo "$0: no MPPE kernel module/' \
-			$fs/usr/sbin/pptpsetup
-		sed -i 's/wc --lines/wc -l/' $fs/usr/sbin/pptpsetup
-		sed -i '/# system checking/{n;s/^/#/;n;s/^/#/;}' $fs/usr/sbin/pptpsetup
-		;;
-	pptpclient-man)
-		CAT="network|PPTP client man pages."
-		mkdir -p $fs/usr/
-		cp -a $install/usr/share $fs/usr/
-		;;
+		pptpclient)
+			copy pptp etc/
+			CONFIG_FILES="/etc/ppp/options.pptp"
+			DEPENDS="ppp"
+			SUGGESTED="pptpclient-extra"
+			TAGS="vpn tunnel"
+			;;
+		*-extra)
+			copy @std @rm
+			CAT="network|configuration helper"
+			DEPENDS="pptpclient perl"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e prboom/receipt
--- a/prboom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/prboom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,34 +3,31 @@
 PACKAGE="prboom"
 VERSION="2.5.0"
 CATEGORY="games"
-SHORT_DESC="PrBoom is the culmination of years of work by various people and projects on the Doom source code."
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Culmination of years of work by various people and projects on the Doom source code"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="nvidia"
+WEB_SITE="http://prboom.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://prboom.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libsdl libsdl-mixer libsdl-net libpng16 mesa glu freedoom"
 BUILD_DEPENDS="libsdl-dev libsdl-mixer-dev libsdl-net-dev mesa-dev glu \
 libpng16-dev glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|png_error_ptr_||;s|png_infopp_||' src/SDL/i_sshot.c
+
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		--disable-i386-asm \
 		$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	echo "Creating package tree"
 	mkdir -p $fs/usr/games \
 		$fs/usr/share/games \
@@ -40,4 +37,6 @@
 	echo "Copying package files"
 	cp -a $install/usr/games $fs/usr
 	cp -a $install/usr/share/games $fs/usr/share
+	DEPENDS="libsdl libsdl-mixer libsdl-net libpng16 mesa glu freedoom"
+	SUGGESTED="nvidia"
 }
diff -r ad29ddfee1c9 -r d5aab818505e primateplunge/receipt
--- a/primateplunge/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/primateplunge/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,22 +7,21 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="other"
 WEB_SITE="https://www.aelius.com/primateplunge/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="libsdl-mixer"
 BUILD_DEPENDS="libsdl-mixer-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	mkdir -p $fs/usr/share/licenses
 	cp $src/COPYING $fs/usr/share/licenses/$PACKAGE
+	DEPENDS="libsdl-mixer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e privoxy/receipt
--- a/privoxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/privoxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -25,7 +25,7 @@
 		--sysconfdir=/etc/privoxy \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/daemon-privoxy $install/etc/init.d/privoxy
 }
diff -r ad29ddfee1c9 -r d5aab818505e procmail/receipt
--- a/procmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/procmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="procmail"
 VERSION="3.22"
 CATEGORY="network"
-SHORT_DESC="mail processing and SmartList mailing list suites."
+SHORT_DESC="Mail processing and SmartList mailing list suites"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -11,19 +11,15 @@
 WGET_URL="${WEB_SITE}$TARBALL"
 CONFIG_FILES="/etc/procmail*"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	find -name '*.c' | xargs sed -i 's/getline/get_line/' src/formisc.h
 	sed -i 's/exec <_autotst.rrr/cat _autotst.rrr |/' initmake
-	yes '' | make VISIBLE_BINDIR=$DESTDIR/usr/bin
-	make BINDIR=$DESTDIR/usr/bin install.bin
+
+	yes '' | make VISIBLE_BINDIR=$install/usr/bin &&
+	make BINDIR=$install/usr/bin install.bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e procps-ng/receipt
--- a/procps-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/procps-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext ncurses-dev"
-SPLIT="procps-ng-dev"
+BUILD_DEPENDS="gettext-dev ncurses-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e procps/receipt
--- a/procps/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/procps/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,59 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="procps"
 VERSION="3.2.8"
 CATEGORY="utilities"
-SHORT_DESC="The proc filesystem utilities."
+SHORT_DESC="The proc filesystem utilities"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://procps.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://procps.sourceforge.net/"
 WGET_URL="http://procps.sourceforge.net/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make -j1 install
+compile_rules() {
+	make &&
+	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr 
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/bin $fs
-	cp -a $install/sbin $fs
-	cp -a $install/lib $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
-
-# Overlap busybox
-pre_install()
-{
-	rm -f "$1/bin/kill"
-	rm -f "$1/bin/ps"
-	rm -f "$1/bin/watch"
-	rm -f "$1/sbin/sysctl"
-	rm -f "$1/usr/bin/pkill"
-	rm -f "$1/usr/bin/pmap"
-	rm -f "$1/usr/bin/pgrep"
-	rm -f "$1/usr/bin/top"
-	rm -f "$1/usr/bin/free"
-	rm -f "$1/usr/bin/uptime"
-}
-
-post_remove()
-{
-	ln -s /bin/busybox /bin/kill
-	ln -s /bin/busybox /bin/ps
-	ln -s /bin/busybox /bin/watch
-	ln -s /bin/busybox /sbin/sysctl	
-	ln -s /bin/busybox /usr/bin/pkill
-	ln -s /bin/busybox /usr/bin/pmap
-	ln -s /bin/busybox /usr/bin/pgrep
-	ln -s /bin/busybox /usr/bin/top
-	ln -s /bin/busybox /usr/bin/free
-	ln -s /bin/busybox /usr/bin/uptime
-}
diff -r ad29ddfee1c9 -r d5aab818505e proftpd/receipt
--- a/proftpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/proftpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="ftp://ftp.proftpd.org/distrib/source/$TARBALL"
 
 BUILD_DEPENDS="acl-dev attr-dev"
-SPLIT="proftpd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	cat >> $install/etc/proftpd.conf <<EOT
 
diff -r ad29ddfee1c9 -r d5aab818505e proj/receipt
--- a/proj/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/proj/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.9.3"
 CATEGORY="misc"
 SHORT_DESC="Cartographic Projections Library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://proj4.org/"
 
@@ -12,10 +12,10 @@
 WGET_URL="http://download.osgeo.org/proj/$TARBALL"
 TARBALL_MD5="d598336ca834742735137c5674b214a1"
 
-SPLIT="proj-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr/bin
+	mkdir -p $install/usr/bin
 
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
diff -r ad29ddfee1c9 -r d5aab818505e proot/receipt
--- a/proot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/proot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	cd $src/src
 	make &&
-	install -Dm 755 $src/src/proot $install/usr/bin/proot
+	install -Dm755 src/proot $install/usr/bin/proot
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e prosody/receipt
--- a/prosody/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/prosody/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,39 +6,30 @@
 SHORT_DESC="xmpp-jabber server in lua"
 MAINTAINER="allan316@gmail.com"
 LICENSE="MIT"
+WEB_SITE="http://prosody.im/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://prosody.im"
 WGET_URL="$WEB_SITE/downloads/source/$TARBALL"
 
-DEPENDS="lua5.1 libidn openssl luaexpat luasocket luafilesystem libidn libcrypto"
-BUILD_DEPENDS="lua5.1-dev libidn-dev openssl-dev luaexpat luasocket luafilesystem libidn-dev libcrypto"
+BUILD_DEPENDS="lua5.1-dev libidn-dev openssl-dev luaexpat luasocket \
+luafilesystem libidn-dev libcrypto"
 
-# Handle cross compilation
-case "$ARCH" in
-	arm*) luapath="/cross/$ARCH/sysroot" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--ostype=linux \
 		--c-compiler=${HOST_SYSTEM}-gcc \
 		--linker=${HOST_SYSTEM}-gcc \
-		--with-lua=${luapath}/usr \
-		--with-lua-lib=${luapath}/usr/lib \
+		--with-lua=/usr \
+		--with-lua-lib=/usr/lib \
 		--runwith=lua5.1 \
-		--with-lua-include=${luapath}/usr/include/lua/5.1 &&
-	make && make DESTDIR=$DESTDIR install
+		--with-lua-include=/usr/include/lua/5.1 &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/etc $fs
-	cp -a $install/var $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="lua5.1 libidn openssl luaexpat luasocket luafilesystem libidn \
+	libcrypto"
 }
diff -r ad29ddfee1c9 -r d5aab818505e protobuf/receipt
--- a/protobuf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/protobuf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.1"
 CATEGORY="network"
 SHORT_DESC="Protocol Buffers - Google's data interchange format"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://developers.google.com/protocol-buffers/"
 
@@ -12,17 +12,17 @@
 WGET_URL="https://github.com/google/protobuf/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="curl automake libtool zlib-dev python-dev"
-SPLIT="protobuf-python protobuf-dev"
+SPLIT="$PACKAGE-python $PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make install || exit 1
+	make install || return 1
 
 	cd $src/python
-	python setup.py install --prefix=/usr --root $DESTDIR
+	python -B setup.py install --prefix=/usr --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e proxychains-ng/receipt
--- a/proxychains-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/proxychains-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,8 +18,8 @@
 		--sysconfdir=/etc \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR install-config
+	make DESTDIR=$install install &&
+	make DESTDIR=$install install-config
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e proxytunnel/receipt
--- a/proxytunnel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/proxytunnel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="proxytunnel"
 VERSION="1.9.0"
 CATEGORY="network"
-SHORT_DESC="Connecting outside through HTTP(S) proxies."
+SHORT_DESC="Connecting outside through HTTP(S) proxies"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://proxytunnel.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://proxytunnel.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="openssl gzip"
 BUILD_DEPENDS="openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
 	sed -i 's|/local||' Makefile
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl gzip"
 }
diff -r ad29ddfee1c9 -r d5aab818505e psmisc/receipt
--- a/psmisc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/psmisc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/psmisc/$TARBALL"
 
-BUILD_DEPENDS="gettext ncurses-dev"
+BUILD_DEPENDS="gettext-dev ncurses-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/bin
 	mv $install/usr/bin/fuser   $install/bin
diff -r ad29ddfee1c9 -r d5aab818505e psyco/receipt
--- a/psyco/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/psyco/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6"
 CATEGORY="system-tools"
 SHORT_DESC="Module which can massively speed up the execution of any Python code"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://psyco.sourceforge.net/"
 HOST_ARCH="i486" # error: Sorry, non-32-bit platforms are not supported at all.
@@ -19,7 +19,8 @@
 	sed -i -e 's/JUMP_IF_FALSE\([: )]\)/JUMP_IF_FALSE_OR_POP\1/' \
 		-e 's/JUMP_IF_TRUE\([: )]\)/JUMP_IF_TRUE_OR_POP\1/' \
 		c/Python/pycompiler.c c/mergepoints.c
-	python setup.py install --root=$DESTDIR
+
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pth/receipt
--- a/pth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.7"
 CATEGORY="system-tools"
 SHORT_DESC="C library for multithreading inside server applications"
-MAINTAINER="fraazz@altern.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.gnu.org/software/pth/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pth.html"
@@ -13,7 +13,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="pth-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	cook_pick_docs README PORTING SUPPORT TESTS
 }
diff -r ad29ddfee1c9 -r d5aab818505e ptlib/receipt
--- a/ptlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ptlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="flex openssl-dev cyrus-sasl-dev zlib-dev alsa-lib-dev expat-dev"
-SPLIT="ptlib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "s/sbin\.Right(1) == '\\\\0')/strlen(sbin\.Right(1)) == 0)/" \
@@ -24,7 +24,7 @@
 		--disable-odbc \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod 755 $install/usr/lib/libpt.so.$VERSION
 }
diff -r ad29ddfee1c9 -r d5aab818505e ptpython/receipt
--- a/ptpython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ptpython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,20 @@
 SOURCE="ptpython"
 VERSION="0.28"
 CATEGORY="development"
-SHORT_DESC="Python REPL."
+SHORT_DESC="Python REPL"
 MAINTAINER="paul@slitaz.org"
+WEB_SITE="https://github.com/jonathanslenders/ptpython"
+
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/jonathanslenders/ptpython"
 WGET_URL="https://files.pythonhosted.org/packages/source/p/$SOURCE/$TARBALL"
 
-DEPENDS="python python-prompt-toolkit python-jedi python-docopt"
 BUILD_DEPENDS="python-dev python-prompt-toolkit python-jedi python-docopt"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python python-prompt-toolkit python-jedi python-docopt"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ptunnel/receipt
--- a/ptunnel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ptunnel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.72"
 CATEGORY="network"
 SHORT_DESC="ptunnel tunnels TCP using ICMP echo request"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.cs.uit.no/~daniels/PingTunnel/"
 
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make CC=${HOST_SYSTEM}-gcc &&
-	install -Dm 755 $src/ptunnel $install/usr/bin/ptunnel
+	install -Dm755 ptunnel $install/usr/bin/ptunnel
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ptxdist/receipt
--- a/ptxdist/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ptxdist/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,32 @@
 PACKAGE="ptxdist"
 VERSION="2012.03.0"
 CATEGORY="development"
-SHORT_DESC="Reproducable Embedded Linux Systems."
+SHORT_DESC="Reproducable Embedded Linux Systems"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.ptxdist.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.ptxdist.org/"
 WGET_URL="${WEB_SITE}software/$PACKAGE/download/$TARBALL"
 
-DEPENDS="slitaz-toolchain ncurses wget ncurses-extra"
-SUGGESTED="subversion bzr git elfkickers ccache"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $src $fs/usr/lib/buildroot
+	DEPENDS="slitaz-toolchain ncurses wget ncurses-extra"
+	SUGGESTED="subversion bzr git elfkickers ccache"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
-	[ -L "$1/usr/bin/wget" ] && tazpkg get-install wget --forced --root="${1:-/}"
-	cat <<EOT
-Now you can do:
-$ cd /usr/lib/buildroot
-$ make menuconfig
+post_install() {
+	[ -L "$1/usr/bin/wget" ] &&
+	tazpkg get-install wget --forced --root="${1:-/}"
+
+	[ -n "$quiet" ] || cat <<EOT
+
+	.-------------------------.
+	| Now you can do:         |
+	|                         |
+	| $ cd /usr/lib/buildroot |
+	| $ make menuconfig       |
+	'-------------------------'
 EOT
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e puddletag/receipt
--- a/puddletag/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/puddletag/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="puddletag"
 VERSION="1.0.5"
@@ -7,23 +7,19 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://puddletag.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="tagging ogg mp3 apev2 mp4 id3"
 
-DEPENDS="mutagen python-configobj python-pyparsing pyqt"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="mutagen python-configobj python-pyparsing pyqt"
+	TAGS="tagging ogg mp3 apev2 mp4 id3"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pugixml/receipt
--- a/pugixml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pugixml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pugixml"
 VERSION="1.6"
 CATEGORY="misc"
-SHORT_DESC="Light-weight, simple and fast XML parser for C++ with XPath support."
+SHORT_DESC="Light-weight, simple and fast XML parser for C++ with XPath support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -13,17 +13,16 @@
 SUGGESTED="cmake"
 BUILD_DEPENDS="cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build && cd build
-	cmake	-DCMAKE_INSTALL_PREFIX=/usr ../scripts
-	make
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		../scripts &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e pulseaudio/receipt
--- a/pulseaudio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pulseaudio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,9 +15,8 @@
 BUILD_DEPENDS="intltool libtool xorg-libxcb-dev xorg-libICE-dev xorg-libSM-dev \
 xorg-libXtst-dev libcap-dev check-dev libsndfile-dev alsa-lib-dev gtk3-dev \
 dbus-dev eudev-dev openssl-dev speexdsp-dev"
-SPLIT="pulseaudio-alsa pulseaudio-cli pulseaudio-esound pulseaudio-glib \
-pulseaudio-http pulseaudio-native pulseaudio-rtp pulseaudio-simple pulseaudio \
-pulseaudio-dev"
+SPLIT="$PACKAGE-alsa $PACKAGE-cli $PACKAGE-esound $PACKAGE-glib $PACKAGE-http \
+$PACKAGE-native $PACKAGE-rtp $PACKAGE-simple $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e puppet-dashboard/receipt
--- a/puppet-dashboard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/puppet-dashboard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="puppet-dashboard"
 VERSION="1.2.10"
 CATEGORY="network"
-SHORT_DESC="Web tracking frontend to puppet."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Web tracking frontend to puppet"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.puppetlabs.com/"
@@ -13,9 +13,7 @@
 DEPENDS="ruby puppet"
 BUILD_DEPENDS="ruby-dev"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $src $fs/usr/share/puppet-dashboard
 }
diff -r ad29ddfee1c9 -r d5aab818505e puppet/receipt
--- a/puppet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/puppet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.7.19"
 CATEGORY="system-tools"
 SHORT_DESC="A system for automating system administration tasks"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://www.puppetlabs.com/"
 
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	ruby ./install.rb \
-		--destdir=$DESTDIR \
+		--destdir=$install \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
 		--mandir=/usr/share/man
diff -r ad29ddfee1c9 -r d5aab818505e pure-ftpd/receipt
--- a/pure-ftpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pure-ftpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,53 +4,44 @@
 VERSION="1.0.46"
 CATEGORY="network"
 SHORT_DESC="A secure FTP daemon"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.pureftpd.org/project/pure-ftpd"
-CONFIG_FILES="/etc/pure-ftpd.conf"
 
 TARBALL="pure-ftpd-$VERSION.tar.bz2"
 WGET_URL="https://download.pureftpd.org/pub/pure-ftpd/releases/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev pam-dev"
-SPLIT="pure-ftpd pure-ftpd-pam"
+SPLIT="$PACKAGE-pam:pam"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cp -a $src $src-pam
+compile_rules() {
+	case $SET in
+		'')  SET_ARGS='--without-pam --with-puredb --with-extauth';;
+		pam) SET_ARGS='--with-pam';;
+	esac
+
 	./configure \
-		--without-pam \
-		--with-puredb \
-		--with-extauth \
+		$SET_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
-
-	cd $src-pam
-	./configure \
-		--with-pam \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR-pam install || return 1
+	make &&
+	make install || return 1
 
 	# daemon
-	mkdir -p $install/etc/init.d $install-pam/etc/init.d
-	install -groot -oroot -m0755 $stuff/pure-ftpd $install/etc/init.d
-	install -groot -oroot -m0755 $stuff/pure-ftpd $install-pam/etc/init.d
+	install -Dm755 $stuff/pure-ftpd $install/etc/init.d/pure-ftpd
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	pure-ftpd)
-		DEPENDS="attr libcap openssl"
-		copy @std
-		;;
-	pure-ftpd-pam)
-		DEPENDS="attr libcap pam"
-		PROVIDE="pure-ftpd:pam"
-		CAT="network|using PAM"
-		install=$install-pam copy @std
-		;;
+		pure-ftpd)
+			copy @std
+			DEPENDS="attr libcap openssl"
+			;;
+		*-pam)
+			copy @std
+			CAT="network|using PAM"
+			DEPENDS="attr libcap pam"
+			PROVIDE="pure-ftpd:pam"
+			;;
 	esac
+	CONFIG_FILES="/etc/pure-ftpd.conf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e putty/receipt
--- a/putty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/putty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.70"
 CATEGORY="utilities"
 SHORT_DESC="A free telnet/SSH client"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://the.earth.li/~sgtatham/putty/latest/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev gtk3-dev krb5-dev"
-SPLIT="putty putty-gtk3:gtk3"
+SPLIT="$PACKAGE-gtk3:gtk3"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e puzzles/receipt
--- a/puzzles/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/puzzles/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,33 @@
 PACKAGE="puzzles"
 VERSION="r8972"
 CATEGORY="games"
-SHORT_DESC="Misc puzzles games."
+SHORT_DESC="Misc puzzles games"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
+
 TARBALL="$PACKAGE.tar.gz"
-WEB_SITE="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="gtk2 cairo xorg-libxcb xorg-libXrandr"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	touch version2.def
 	sed -i 's/-pedantic//' Makefile mkfiles.pl
 	sed -i 's/sizeof(lld)/sizeof(*lld)/' lightup.c
-	mkdir -p $DESTDIR/usr/local/games 2> /dev/null
+	mkdir -p $install/usr/local/games/
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps \
 		$fs/usr/share/applications
-		
 	cp -a $install/usr/local/games $fs/usr
-	
-	for img in $(ls $src/icons/*16d24*)
-	do
+	for img in $(ls $src/icons/*16d24*); do
 		cp $img $fs/usr/share/pixmaps/$(basename $img -16d24.png).png
 	done
-	
 	cp -a $stuff/*.desktop $fs/usr/share/applications
+	DEPENDS="gtk2 cairo xorg-libxcb xorg-libXrandr"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pv/receipt
--- a/pv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,26 @@
 PACKAGE="pv"
 VERSION="1.1.4"
 CATEGORY="misc"
-SHORT_DESC="pipe viewer for monitoring data through a pipeline"
+SHORT_DESC="Pipe viewer for monitoring data through a pipeline"
 MAINTAINER="allan316@gmail.com"
 LICENSE="Artistic"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.ivarch.com/programs/pv.shtml"
 WGET_URL="http://pipeviewer.googlecode.com/files/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e pwauth/receipt
--- a/pwauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pwauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.10"
 CATEGORY="security"
 SHORT_DESC="Support reasonably secure web auth using system password DB"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/phokz/pwauth/"
 
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/pwauth $install/usr/bin/pwauth
+	install -Dm755 $src/pwauth $install/usr/bin/pwauth
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pwgen/receipt
--- a/pwgen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pwgen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pwgen"
 VERSION="2.06"
 CATEGORY="misc"
-SHORT_DESC="Pwgen is a small password generator which creates passwords which can be easily memorized by a human"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Create easily memorized passwords"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="https://sourceforge.net/projects/pwgen/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/pwgen/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pwnat/receipt
--- a/pwnat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pwnat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 compile_rules() {
 	make || return 1
 
-	install -Dm 755 $src/pwnat $install/usr/bin/pwnat
+	install -Dm755 pwnat $install/usr/bin/pwnat
 
 	cook_pick_docs README* C*
 }
diff -r ad29ddfee1c9 -r d5aab818505e pwsafe/receipt
--- a/pwsafe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pwsafe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pwsafe"
 VERSION="0.2.0"
 CATEGORY="utilities"
-SHORT_DESC="pwsafe is commandline program that manages encrypted password databases."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="Commandline program that manages encrypted password databases"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://sourceforge.net/projects/pwsafe"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://sourceforge.net/projects/pwsafe"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="readline ncurses xorg-libSM xorg-libICE xorg-libXmu xorg-libX11 \
-openssl gcc-lib-base xorg-libXt xorg-libXext xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="openssl-dev readline-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-    cd $src
-    ./configure --prefix=/usr \
-        --infodir=/usr/share/info \
-        --mandir=/usr/share/man \
-        $CONFIGURE_ARGS &&
-    make &&
-    make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr
-    cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="readline ncurses xorg-libSM xorg-libICE xorg-libXmu xorg-libX11 \
+	openssl gcc-lib-base xorg-libXt xorg-libXext xorg-libXau xorg-libXdmcp"
 }
 
-post_install() 
-{
-    chmod u+s "$1/usr/bin/pwsafe"
+post_install() {
+	chmod u+s "$1/usr/bin/pwsafe"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pxe-kexec/receipt
--- a/pxe-kexec/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pxe-kexec/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,46 +1,41 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pxe-kexec"
 VERSION="0.2.5"
 CATEGORY="misc"
 MAINTAINER="pascal.bellard@slitaz.org"
-SHORT_DESC="Boots linux with kexec using pxelinux configuration."
+SHORT_DESC="Boots linux with kexec using pxelinux configuration"
 LICENSE="GPL2"
 WEB_SITE="https://web.archive.org/web/20100819083125/http://pxe-kexec.berlios.de/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE.berlios/$TARBALL"
 
-DEPENDS="curl readline kexec-tools gcc-lib-base"
 BUILD_DEPENDS="cmake curl-dev ncurses-dev perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
-}
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+	make DESTDIR=$install install
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+genpkg_rules() {
+	copy @std
+	DEPENDS="curl readline kexec-tools gcc-lib-base"
+}
+
+post_install() {
 	grep -q kexec "$1/etc/init.d/rc.shutdown" &&
 	cat >> "$1/etc/init.d/rc.shutdown" <<EOT
 # pxe-kexec want kexec in shutdown script.
-kexec -e 2>&1 > /dev/null
+kexec -e 2>&1 >/dev/null
 EOT
 }
 
-post_remove()
-{
+post_remove() {
 	sed -i '/kexec/d' "$1/etc/init.d/rc.shutdown"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pxz/receipt
--- a/pxz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pxz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pxz"
 VERSION="4.999.9beta.20091201git"
 CATEGORY="base-system"
-SHORT_DESC="Parallel LZMA compressor using liblzma."
+SHORT_DESC="Parallel LZMA compressor using liblzma"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://jnovy.fedorapeople.org/pxz/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://jnovy.fedorapeople.org/pxz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="liblzma libgomp"
 BUILD_DEPENDS="xz-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="liblzma libgomp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e py-asterisk/receipt
--- a/py-asterisk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/py-asterisk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,8 @@
 BUILD_DEPENDS="python-dev python"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pyalsa/receipt
--- a/pyalsa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyalsa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="python-dev alsa-lib-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$install
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pybootchartgui/receipt
--- a/pybootchartgui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pybootchartgui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,40 +3,36 @@
 PACKAGE="pybootchartgui"
 VERSION="r124"
 CATEGORY="misc"
-SHORT_DESC="bootchart GUI in python"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Bootchart GUI in Python"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://code.google.com/archive/p/pybootchartgui/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://code.google.com/archive/p/pybootchartgui/"
 WGET_URL="$WEB_SITE/files/$TARBALL" # FIXME
 
-DEPENDS="python python-pygtk bootchart"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    PY_VERSION=`cat /var/lib/tazpkg/installed/python/receipt | grep "VERSION="|cut -d \" -f 2 | cut -d . -f 1,2`
+genpkg_rules() {
+	PY_VERSION=$(cat /var/lib/tazpkg/installed/python/receipt | grep "VERSION="|cut -d \" -f 2 | cut -d . -f 1,2)
 	mkdir -p $fs/usr/lib/python$PY_VERSION $fs/usr/bin
-    cp -a $src/pybootchartgui.py $fs/usr/lib/python$PY_VERSION
+	cp -a $src/pybootchartgui.py $fs/usr/lib/python$PY_VERSION
 	cp -a $src/pybootchartgui $fs/usr/lib/python$PY_VERSION
-	
-	
+	DEPENDS="python python-pygtk bootchart"
 }
 
-post_install()
-{
+post_install() {
 	PY_VERSION=$(cat "$1/var/lib/tazpkg/installed/python/receipt" | grep "VERSION="|cut -d \" -f 2 | cut -d . -f 1,2)
-	if [ -f  "$1/usr/bin/pybootchartgui" ] ; then rm "$1/usr/bin/pybootchartgui" ; fi
+	if [ -f  "$1/usr/bin/pybootchartgui" ]; then
+		rm "$1/usr/bin/pybootchartgui"
+	fi
 	ln -s /usr/lib/python$PY_VERSION/pybootchartgui.py "$1/usr/bin/pybootchartgui"
-	if [ -f "$1/etc/bootchartd.conf" ] ; then
+	if [ -f "$1/etc/bootchartd.conf" ]; then
 		sed -i s/'AUTO_RENDER="no"'/'AUTO_RENDER="yes"'/ "$1/etc/bootchartd.conf"
 	fi
 }
 
-post_remove()
-{
-  	rm "$1/usr/bin/pybootchartgui"
- 	if [ -f "$1/etc/bootchartd.conf" ] ; then 
- 		sed -i s/'AUTO_RENDER="yes"'/'AUTO_RENDER="no"'/ "$1/etc/bootchartd.conf"
- 	fi
+post_remove() {
+	rm "$1/usr/bin/pybootchartgui"
+	if [ -f "$1/etc/bootchartd.conf" ]; then
+		sed -i s/'AUTO_RENDER="yes"'/'AUTO_RENDER="no"'/ "$1/etc/bootchartd.conf"
+	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e pycrypto/receipt
--- a/pycrypto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pycrypto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pycrypto"
 VERSION="2.3"
 CATEGORY="development"
-SHORT_DESC="Cryptographic algorithms and protocols for python."
+SHORT_DESC="Cryptographic algorithms and protocols for Python"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="https://www.dlitz.net/software/pycrypto/"
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="python-dev gmp-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pycurl/receipt
--- a/pycurl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pycurl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="7.19.0"
 CATEGORY="development"
 SHORT_DESC="A Python interface to libcurl"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://pycurl.sourceforge.net"
+WEB_SITE="http://pycurl.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://pycurl.sourceforge.net/download/$TARBALL"
@@ -14,9 +14,9 @@
 BUILD_DEPENDS="openssl-dev curl-dev python-dev"
 
 compile_rules() {
-	python setup.py install \
+	python -B setup.py install \
 		--curl-config=/usr/bin/curl-config \
-		--prefix $DESTDIR/usr
+		--prefix $install/usr
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pydf/receipt
--- a/pydf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pydf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="pydf"
 VERSION="12"
 CATEGORY="utilities"
-SHORT_DESC="Python disk file system."
+SHORT_DESC="Python disk file system"
 MAINTAINER="paul@slitaz.org"
 LICENSE="PublicDomain"
-DEPENDS="python"
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
 WEB_SITE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
+
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/etc
 	cp -a $src/pydf $fs/usr/bin
 	cp -a $src/pydfrc $fs/etc
+	DEPENDS="python"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pygoocanvas/receipt
--- a/pygoocanvas/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pygoocanvas/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.14.1"
 CATEGORY="development"
 SHORT_DESC="GooCanvas python bindings"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/PyGoocanvas"
 
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pygtksourceview/receipt
--- a/pygtksourceview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pygtksourceview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Python bindings for GtkSourceView"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://projects.gnome.org/gtksourceview/pygtksourceview.html"
+WEB_SITE="https://wiki.gnome.org/Projects/GtkSourceView"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://ftp.gnome.org/pub/gnome/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="python-dev python-pygtk-dev gtksourceview-dev python-pygobject2-dev libxml2-dev"
 SPLIT="$PACKAGE-dev"
@@ -20,7 +20,8 @@
 		--disable-docs \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pymux/receipt
--- a/pymux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pymux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pymux"
 VERSION="0.6"
 CATEGORY="utilities"
-SHORT_DESC="A terminal multiplexer (like tmux) in Python."
+SHORT_DESC="A terminal multiplexer (like tmux) in Python"
 MAINTAINER="paul@slitaz.org"
 WEB_SITE="https://github.com/jonathanslenders/pymux"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python-dev python-pyte python-prompt-toolkit python-docopt"
 
 compile_rules() {
-	python setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pyneighborhood/receipt
--- a/pyneighborhood/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyneighborhood/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pyneighborhood"
 VERSION="0.5.4"
 CATEGORY="network"
-SHORT_DESC="GUI frontend for samba tools (smbclient, smbmount, etc)."
+SHORT_DESC="GUI frontend for samba tools (smbclient, smbmount, etc.)"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://launchpad.net/pyneighborhood"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://launchpad.net/pyneighborhood"
 WGET_URL="$WEB_SITE/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-DEPENDS="python python-pygtk samba"
-BUILD_DEPENDS="python python-dev gettext"
+BUILD_DEPENDS="python-dev gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# hack Makefile
-	sed -i 's/--prefix=/--root=/' Makefile
+	sed -i 's|--prefix=|--root=|' Makefile
 	# hack .desktop file
-	sed -i 's/Application;Network;System;Utility/Application;System;/' pyNeighborhood.desktop
+	sed -i 's|Application;Network;System;Utility|Application;System;|' pyNeighborhood.desktop
 
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr $fs
-	cp -a $install/share $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-pygtk samba"
 }
diff -r ad29ddfee1c9 -r d5aab818505e pyorbit/receipt
--- a/pyorbit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyorbit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24.0"
 CATEGORY="system-tools"
 SHORT_DESC="Python binding to GNOME ORBit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://www.gnome.org/"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pypar2/receipt
--- a/pypar2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pypar2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 BUILD_DEPENDS="findutils"
 
 compile_rules() {
-	make prefix=/usr DESTDIR=$DESTDIR install || return 1
+	make prefix=/usr DESTDIR=$install install || return 1
 
 	ln -s /usr/share/pypar2/src/main.py $install/usr/bin/pypar2
 	fix symlinks
diff -r ad29ddfee1c9 -r d5aab818505e pyqt/receipt
--- a/pyqt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyqt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	yes yes | python configure.py
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pyradio/receipt
--- a/pyradio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyradio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pyradio"
 VERSION="0.4"
 CATEGORY="multimedia"
-SHORT_DESC="Ncurses internet radio player."
+SHORT_DESC="Ncurses internet radio player"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -14,9 +14,7 @@
 DEPENDS="ncurses mplayer python"
 BUILD_DEPENDS="git"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/pyradio
 	cp -a $src/pyradio $fs/usr/bin
 	cp -a $src/stations.csv $fs/usr/share/pyradio
@@ -24,9 +22,7 @@
 	#cp -a $src/LICENCE $fs/usr/share/pyradio
 }
 
-post_install()
-{
+post_install() {
 	# hack for path to stations file
 	sed -i 's|__file__|"/usr/share/pyradio/"|g' "$1/usr/bin/pyradio"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pyroom/receipt
--- a/pyroom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyroom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,11 +11,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://launchpad.net/pyroom/${VERSION%.*}/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="python python-dev gettext"
+BUILD_DEPENDS="python-dev gettext-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pysdm/receipt
--- a/pysdm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pysdm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,14 +11,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python python-dev gettext-tools"
+BUILD_DEPENDS="python python-dev gettext"
 
 compile_rules() {
 	sed -i 's/gksudo/subox/;s/Settings;//' data/pysdm.desktop
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pysize/receipt
--- a/pysize/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pysize/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,8 @@
 BUILD_DEPENDS="python-dev ncurses-dev python-pygtk-dev"
 
 compile_rules() {
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e pysolfc-cardsets/receipt
--- a/pysolfc-cardsets/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pysolfc-cardsets/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/pysolfc/$TARBALL"
 
 BUILD_DEPENDS="gif2apng"
-SPLIT="pysolfc-cardsets-extra"
+SPLIT="$PACKAGE-extra"
 
 COOKOPTS="!strip" # no executables to strip, loss of time to find it
 
diff -r ad29ddfee1c9 -r d5aab818505e pysolfc/receipt
--- a/pysolfc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pysolfc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pysolfc"
 VERSION="2.0"
 CATEGORY="games"
-SHORT_DESC="PySolFC is an extended version of PySol (a solitaire card game)"
+SHORT_DESC="Extended version of PySol (a solitaire card game)"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://sourceforge.net/projects/pysolfc"
@@ -17,7 +17,7 @@
 	find . -name '*.py' -exec \
 		sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' '{}' \;
 
-	python setup.py install --prefix=$install/usr || return 1
+	python -B setup.py install --prefix=$install/usr || return 1
 
 	mv $install/usr/bin/pysol.py $install/usr/bin/pysol
 	sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' $install/usr/bin/pysol
diff -r ad29ddfee1c9 -r d5aab818505e python-beaker/receipt
--- a/python-beaker/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-beaker/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.10.0"
 CATEGORY="development"
 SHORT_DESC="Cache and Session Library"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-cheetah/receipt
--- a/python-cheetah/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cheetah/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,8 +4,8 @@
 PACKAGE="python-cheetah"
 VERSION="2.4.4"
 CATEGORY="development"
-SHORT_DESC="Cheetah is a template engine and code generation tool"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Template engine and code generation tool"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-cheetah3/receipt
--- a/python-cheetah3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cheetah3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 PACKAGE="python-cheetah3"
 VERSION="3.1.0"
 CATEGORY="development"
-SHORT_DESC="Cheetah is a template engine and code generation tool"
+SHORT_DESC="Template engine and code generation tool"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
diff -r ad29ddfee1c9 -r d5aab818505e python-cherrypy/receipt
--- a/python-cherrypy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cherrypy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 VERSION2="17.3.0" # version for Python2
 CATEGORY="development"
 SHORT_DESC="Object-Oriented HTTP framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-coverage/receipt
--- a/python-coverage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-coverage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,7 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="Apache2"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
-#HOST_ARCH=""
+#HOST_ARCH
 REPOLOGY="python:coverage"
 
 BUILD_DEPENDS="python python3"
diff -r ad29ddfee1c9 -r d5aab818505e python-cssselect/receipt
--- a/python-cssselect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cssselect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.0.3"
 CATEGORY="python"
 SHORT_DESC="Parse CSS3 Selectors and translate them to XPath"
-MAINTAINER="monghitri@aruba.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-cssutils/receipt
--- a/python-cssutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cssutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.0.2"
 CATEGORY="python"
 SHORT_DESC="A CSS Cascading Style Sheets library for Python"
-MAINTAINER="monghitri@aruba.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-cython/receipt
--- a/python-cython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-cython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.28.5"
 CATEGORY="python"
 SHORT_DESC="Language to write C extensions for Python"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-dbus/receipt
--- a/python-dbus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-dbus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.2.8"
 CATEGORY="system-tools"
 SHORT_DESC="Python bindings for libdbus"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-decoratortools/receipt
--- a/python-decoratortools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-decoratortools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.8"
 CATEGORY="python"
 SHORT_DESC="Class, function, and metaclass decorators"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-distribute/receipt
--- a/python-distribute/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-distribute/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.7.3"
 CATEGORY="python"
 SHORT_DESC="Distribute legacy wrapper"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="http://pypi.python.org/pypi/$ORIGIN"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-dnspython/receipt
--- a/python-dnspython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-dnspython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.15.0"
 CATEGORY="python"
 SHORT_DESC="A DNS toolkit for Python"
-MAINTAINER="monghitri@aruba.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-extremes/receipt
--- a/python-extremes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-extremes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.1.1"
 CATEGORY="python"
 SHORT_DESC="Production-quality 'Min' and 'Max' objects (adapted from PEP 326)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://pypi.org/project/$ORIGIN"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-flup/receipt
--- a/python-flup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-flup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.0.3"
 CATEGORY="network"
 SHORT_DESC="Random collection of WSGI modules for Python"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-formencode/receipt
--- a/python-formencode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-formencode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.3.1"
 CATEGORY="python"
 SHORT_DESC="Validate and generate forms"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-html2text/receipt
--- a/python-html2text/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-html2text/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2018.1.9"
 CATEGORY="network"
 SHORT_DESC="Turn HTML into equivalent Markdown-structured text"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-kid/receipt
--- a/python-kid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-kid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.9.6"
 CATEGORY="python"
 SHORT_DESC="A simple and pythonic XML template language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-lxml/receipt
--- a/python-lxml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-lxml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,7 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD GPL PSL"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
-#HOST_ARCH=""
+#HOST_ARCH
 REPOLOGY="python:lxml"
 
 BUILD_DEPENDS="python python3 libxml2-dev libxslt-dev"
diff -r ad29ddfee1c9 -r d5aab818505e python-mako/receipt
--- a/python-mako/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-mako/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.0.7"
 CATEGORY="python"
 SHORT_DESC="Fast template library"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-mechanize/receipt
--- a/python-mechanize/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-mechanize/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.3.7"
 CATEGORY="network"
 SHORT_DESC="Stateful programmatic web browsing"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-mpd/receipt
--- a/python-mpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-mpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.3.0"
 CATEGORY="multimedia"
 SHORT_DESC="Python MPD client library"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-netifaces/receipt
--- a/python-netifaces/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-netifaces/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.10.7"
 CATEGORY="python"
 SHORT_DESC="Portable network interface information"
-MAINTAINER="monghitri@aruba.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-nose/receipt
--- a/python-nose/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-nose/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.3.7"
 CATEGORY="python"
 SHORT_DESC="Unittest extension"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-paste/receipt
--- a/python-paste/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-paste/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.0.3"
 CATEGORY="python"
 SHORT_DESC="Tools for using a Web Server Gateway Interface stack"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-pastedeploy/receipt
--- a/python-pastedeploy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pastedeploy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.5.2"
 CATEGORY="python"
 SHORT_DESC="Load, configure, and compose WSGI applications and servers"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-pastescript/receipt
--- a/python-pastescript/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pastescript/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 CATEGORY="python"
 SHORT_DESC="A pluggable command-line frontend, including commands to setup \
 package file layouts"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-picamera/.icon.png
--- a/python-picamera/.icon.png	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../python/.icon.png
\ No newline at end of file
diff -r ad29ddfee1c9 -r d5aab818505e python-picamera/receipt
--- a/python-picamera/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# SliTaz package receipt v2.
-
-ORIGIN="picamera"
-PACKAGE="picamera"
-VERSION="1.13"
-CATEGORY="multimedia"
-SHORT_DESC="A pure Python interface for the Raspberry Pi camera module"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="BSD"
-WEB_SITE="https://pypi.org/project/$ORIGIN"
-HOST_ARCH="arm"
-REPOLOGY="python:picamera"
-
-BUILD_DEPENDS="python python3"
-SPLIT="${PACKAGE/python/python3}:3"
-
-compile_rules() {
-	pip$SET install --no-compile --root=$install $ORIGIN==$VERSION
-}
-
-genpkg_rules() {
-	copy @std
-	py=${PACKAGE%%-*} # python/python3
-	DEPENDS="$py"
-}
diff -r ad29ddfee1c9 -r d5aab818505e python-prettytable/receipt
--- a/python-prettytable/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-prettytable/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.7.2"
 CATEGORY="system-tools"
 SHORT_DESC="Python library for easily displaying tabular data in ASCII"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-pyalsaaudio/receipt
--- a/python-pyalsaaudio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyalsaaudio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.8.4"
 CATEGORY="multimedia"
 SHORT_DESC="ALSA bindings"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pybluez/receipt
--- a/python-pybluez/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pybluez/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.22"
 CATEGORY="python"
 SHORT_DESC="Python wrappers around system Bluetooth"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pycairo/receipt
--- a/python-pycairo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pycairo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.17.1"
 CATEGORY="python"
 SHORT_DESC="Python interface for cairo"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL LGPL2.1"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pyexiv2/receipt
--- a/python-pyexiv2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyexiv2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 compile_rules() {
 # broken
 	scons PREFIX=/usr &&
-	scons -k DESTDIR=$DESTDIR install
+	scons -k DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e python-pyglow/receipt
--- a/python-pyglow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyglow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2"
 CATEGORY="system-tools"
 SHORT_DESC="Controlling the PiGlow from Python"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/benleb/PyGlow"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-pygobject2/receipt
--- a/python-pygobject2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pygobject2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.28.7"
 CATEGORY="python"
 SHORT_DESC="Python Bindings for GLib/GObject/GIO/GTK+"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pygtk/receipt
--- a/python-pygtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pygtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.24.0"
 CATEGORY="python"
 SHORT_DESC="GTK+ for Python"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://pygobject.readthedocs.io/en/latest/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pylons/receipt
--- a/python-pylons/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pylons/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="1.0.3"
 CATEGORY="python"
 SHORT_DESC="Pylons Web Framework"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-pylorcon/receipt
--- a/python-pylorcon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pylorcon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3"
 CATEGORY="development"
 SHORT_DESC="Python wrapper for the LORCON 802.11 packet injection library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://code.google.com/archive/p/pylorcon/"
 WEB_SITE="https://github.com/tom5760/pylorcon2"
@@ -16,7 +16,7 @@
 BUILD_DEPENDS="python-dev lorcon-old-dev"
 
 compile_rules() {
-	python -B setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e python-pyrex/receipt
--- a/python-pyrex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyrex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.9"
 CATEGORY="python"
 SHORT_DESC="Language for Writing Python Extension Modules"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"
 REPOLOGY="python:pyrex"
diff -r ad29ddfee1c9 -r d5aab818505e python-pysqlite/receipt
--- a/python-pysqlite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pysqlite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.8.3"
 CATEGORY="python"
 SHORT_DESC="DB-API 2.0 interface for SQLite 3.x"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-pyxml/receipt
--- a/python-pyxml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyxml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py build --with-xslt &&
+	python -B setup.py build --with-xslt &&
 	python -B setup.py install --root=$install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e python-pyyaml/receipt
--- a/python-pyyaml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-pyyaml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="3.13"
 CATEGORY="python"
 SHORT_DESC="YAML parser and emitter for Python"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-routes/receipt
--- a/python-routes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-routes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.4.1"
 CATEGORY="python"
 SHORT_DESC="Routing Recognition and Generation Tools"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-rpi.gpio/receipt
--- a/python-rpi.gpio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-rpi.gpio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.6.3"
 CATEGORY="system-tools"
 SHORT_DESC="A module to control Raspberry Pi GPIO channels"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 #HOST_ARCH
diff -r ad29ddfee1c9 -r d5aab818505e python-smbus/receipt
--- a/python-smbus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-smbus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,43 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="python-smbus"
 VERSION="3.1.1"
 CATEGORY="system-tools"
 SHORT_DESC="SMBus access through the I2C /dev interface (from i2c-tools)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/about/"
 REPOLOGY="i2c-tools"
 
-SOURCE="i2c-tools"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
-WGET_URL="http://dl.lm-sensors.org/$SOURCE/releases/$TARBALL"
-TAGS="python"
+TARBALL="i2c-tools-$VERSION.tar.bz2"
+WGET_URL="http://dl.lm-sensors.org/i2c-tools/releases/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Cross compilation hack
-	case "$ARCH" in
-		arm*)
-			mv /usr/bin/i486-slitaz-linux-gcc /tmp &&
-			ln -s /cross/${ARCH}/tools/bin/arm-slitaz-linux-gnueabi-gcc \
-				/usr/bin/i486-slitaz-linux-gcc ;;
-	esac &&
-	make EXTRA=py-smbus && cd py-smbus &&
-	python setup.py install --root=$DESTDIR
-	case "$ARCH" in
-		arm*) 
-			rm /usr/bin/i486-slitaz-linux-gcc &&
-			mv /tmp/i486-slitaz-linux-gcc /usr/bin ;;
-	esac
+compile_rules() {
+	make EXTRA=py-smbus || return 1
+
+	cd py-smbus
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
+	TAGS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e python-tempita/receipt
--- a/python-tempita/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-tempita/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.5.2"
 CATEGORY="python"
 SHORT_DESC="Small text templating language"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-turbogears/receipt
--- a/python-turbogears/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-turbogears/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.3.12"
 CATEGORY="network"
 SHORT_DESC="Python web application framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-weberror/receipt
--- a/python-weberror/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-weberror/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="0.13.1"
 CATEGORY="python"
 SHORT_DESC="Web Error handling and exception catching"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-webob/receipt
--- a/python-webob/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-webob/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 VERSION17="1.7.4" # python-turbogears require "WebOb<1.8.0,>=1.2"
 CATEGORY="python"
 SHORT_DESC="WSGI request and response object"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-webtest/receipt
--- a/python-webtest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-webtest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="2.0.30"
 CATEGORY="python"
 SHORT_DESC="Helper to test WSGI applications"
-MAINTAINER="taziden@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/$ORIGIN/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-wxpython/receipt
--- a/python-wxpython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-wxpython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,7 @@
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	pip install --no-compile --root=$DESTDIR wxPython
+	pip install --no-compile --root=$install wxPython
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e python-wxpython3/receipt
--- a/python-wxpython3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-wxpython3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.2.0"
 CATEGORY="x-window"
 SHORT_DESC="GUI toolkit for the Python programming language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="https://www.wxpython.org/"
 
@@ -34,8 +34,8 @@
 	make $MAKEFLAGS || return 1
 
 	cd $src/wxPython
-	python setup.py WXPORT=gtk2 UNICODE=1 build &&
-	python setup.py WXPORT=gtk2 UNICODE=1 install --root=$DESTDIR
+	python -B setup.py WXPORT=gtk2 UNICODE=1 build &&
+	python -B setup.py WXPORT=gtk2 UNICODE=1 install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e python-youtube-dl/receipt
--- a/python-youtube-dl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-youtube-dl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 VERSION_PIP="2018.9.18" # some inconsistancy in the pipy version
 CATEGORY="utilities"
 SHORT_DESC="Downloads videos from various streaming websites"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rg3.github.io/youtube-dl/"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e python-youtube-dlg/receipt
--- a/python-youtube-dlg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-youtube-dlg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 HOST_ARCH="any"
 REPOLOGY="youtube-dl-gui"
 
-BUILD_DEPENDS="python python-wxpython3-dev python-twodict gettext"
+BUILD_DEPENDS="python python-wxpython3-dev python-twodict gettext-dev"
 COOKOPTS="!pixmaps"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e python-zsi/receipt
--- a/python-zsi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python-zsi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 HOST_ARCH="any"
 REPOLOGY="python:zsi"
 
-# pypi didn't provide downloads; project is unmaintained since 2007;
+# pypi didn't provide downloads; ZSI project is unmaintained since 2007;
 # latest version is Alpha one
 TARBALL="$ORIGIN-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/pywebsvcs/$TARBALL"
@@ -19,7 +19,7 @@
 BUILD_DEPENDS="python"
 
 compile_rules() {
-#	python setup.py build &&
+#	python -B setup.py build &&
 	python -B setup.py install --root=$install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e python/receipt
--- a/python/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.7.15"
 CATEGORY="development"
 SHORT_DESC="The Python programming language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://www.python.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/python2.html"
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="openssl-dev bzip2-dev readline-dev sqlite3-dev zlib-dev \
 ncurses-dev tcl-dev tk-dev db-dev gdbm-dev libffi-dev expat-dev"
-SPLIT="python-dev python-idle python-tcltk python"
+SPLIT="$PACKAGE-dev $PACKAGE-idle $PACKAGE-tcltk $PACKAGE"
 COOKOPTS="!menus !zip"
 
 compile_rules() {
@@ -26,62 +26,17 @@
 	# Enable built-in SQLite3 module to load extensions (fix FS#22122)
 	sed -i.orig "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
 
-	case "$ARCH" in
-		arm*)
-			# First pass for build host tools
-			unset CFLAGS CXXFLAGS
-			cp -f $CONFIG_SITE .
-			CONFIG_SITE="$(pwd)/cook.site"
-			cat >> $CONFIG_SITE <<EOT
-ac_cv_have_long_long_format=yes
-EOT
-			./configure CC=gcc \
-				--disable-ipv6 \
-				--build=i486-slitaz-linux \
-				--host=${BUILD_SYSTEM} &&
-			make python Parser/pgen &&
-			mv python hostpython &&
-			mv Parser/pgen Parser/hostpgen || exit 1
-			make distclean
-			rm -f $CONFIG_SITE
-			# Second pass for host tools
-			. /etc/slitaz/cook.conf
-			cp -f $CONFIG_SITE .
-			CONFIG_SITE="$(pwd)/cook.site"
-			cat >> $CONFIG_SITE <<EOT
-ac_cv_have_long_long_format=yes
-ac_cv_buggy_getaddrinfo=no
-ac_cv_file__dev_ptmx=yes
-ac_cv_file__dev_ptc=no
-EOT
-			./configure CC=${HOST_SYSTEM}-gcc \
-				--disable-ipv6 \
-				--enable-shared \
-				--with-system-ffi \
-				${CONFIGURE_ARGS} &&
-			make \
-				PYTHON_FOR_BUILD=${src}/hostpython \
-				HOSTPYTHON=${src}/hostpython \
-				HOSTPGEN=${src}/Parser/hostpgen \
-				CROSS_COMPILE_TARGET=yes \
-				HOSTARCH=${HOST_SYSTEM} \
-				BUILDARCH=${BUILD_SYSTEM} || exit 1
-			make DESTDIR=$DESTDIR install || exit 1
-			;;
-		i?86|x86_64)
-			./configure \
-				--prefix=/usr \
-				--enable-shared \
-				--with-system-expat \
-				--with-system-ffi \
-				--without-ensurepip \
-				--enable-unicode=ucs4 \
-				$CONFIGURE_ARGS &&
-				make &&
-				make DESTDIR=$DESTDIR install &&
-				chmod -v 755 $install/usr/lib/libpython2.7.so.1.0
-			;;
-	esac
+	./configure \
+		--prefix=/usr \
+		--enable-shared \
+		--with-system-expat \
+		--with-system-ffi \
+		--without-ensurepip \
+		--enable-unicode=ucs4 \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install &&
+	chmod -v 755 $install/usr/lib/libpython2.7.so.1.0
 
 	find $install -type f \( -name '*.pyc' -o -name '*.pyo' \) -delete
 }
diff -r ad29ddfee1c9 -r d5aab818505e python3/receipt
--- a/python3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/python3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="readline-dev gdbm-dev openssl-dev sqlite3-dev zlib-dev tk-dev \
 ncurses-dev xz-dev bzip2-dev expat-dev"
-SPLIT="python3-dev"
+SPLIT="$PACKAGE-dev"
 COOKOPTS="!zip"
 
 compile_rules() {
@@ -27,7 +27,7 @@
 		--without-ensurepip \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	chmod 755 $install/usr/lib/libpython${VERSION%.*}m.so
 	chmod 755 $install/usr/lib/libpython${VERSION%%.*}.so
diff -r ad29ddfee1c9 -r d5aab818505e pyvim/receipt
--- a/pyvim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pyvim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="pyvim"
 VERSION="0.0.13"
 CATEGORY="development"
-SHORT_DESC="Pure Python Vi Implementation."
+SHORT_DESC="Pure Python Vi Implementation"
 MAINTAINER="paul@slitaz.org"
 WEB_SITE="https://github.com/jonathanslenders/pyvim"
 
@@ -11,18 +11,14 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="https://files.pythonhosted.org/packages/source/p/$SOURCE/$TARBALL"
 
-DEPENDS="python python-prompt-toolkit ptpython python-docopt python-pyflakes"
-BUILD_DEPENDS="python-prompt-toolkit ptpython python-docopt python-pyflakes python-dev"
+BUILD_DEPENDS="python-prompt-toolkit ptpython python-docopt python-pyflakes \
+python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python python-prompt-toolkit ptpython python-docopt python-pyflakes"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e pywebkitgtk/receipt
--- a/pywebkitgtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/pywebkitgtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.8"
 CATEGORY="python"
 SHORT_DESC="Python2 bindings to the WebKit GTK+ port"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://code.google.com/archive/p/pywebkitgtk/"
 REPOLOGY="python:pywebkitgtk"
@@ -13,7 +13,7 @@
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/pywebkitgtk/$TARBALL"
 
 BUILD_DEPENDS="python-dev libxslt-dev glib-dev python-pygtk-dev webkitgtk-dev"
-SPLIT="pywebkitgtk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e qarte/receipt
--- a/qarte/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qarte/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,33 +4,27 @@
 VERSION="1.9.0"
 CATEGORY="multimedia"
 SHORT_DESC="ARTE public programms manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://launchpad.net/qarte"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://launchpad.net/qarte"
 WGET_URL="http://oqapy.eu/releases/$TARBALL"
 
-DEPENDS="python pyqt notify-python rtmpdump"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	prefix=${install}/usr
-	install -D -m 0755 qarte $prefix/bin/qarte
-	install -D -m 0644 q_arte.desktop $prefix/share/applications/qarte.desktop
-	install -D -m 0644 qarte.png $prefix/share/pixmaps/qarte.png
+compile_rules() {
+	prefix=$install/usr
+	install -Dm755 qarte          $prefix/bin/qarte
+	install -Dm644 q_arte.desktop $prefix/share/applications/qarte.desktop
+	install -Dm644 qarte.png      $prefix/share/pixmaps/qarte.png
 	mkdir $prefix/share/qarte
-	install -m 0644 *.py $prefix/share/qarte
-	for dir in commonwidgets crontab locale medias VWidgets
-	do
+	install -m644 *.py $prefix/share/qarte
+	for dir in commonwidgets crontab locale medias VWidgets; do
 		cp -r $dir $prefix/share/qarte
 	done
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
+	DEPENDS="python pyqt notify-python rtmpdump"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qastools/receipt
--- a/qastools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qastools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,13 +3,13 @@
 PACKAGE="qastools"
 VERSION="0.17.2"
 CATEGORY="multimedia"
-SHORT_DESC="QasTools is a collection of desktop applications for the ALSA"
+SHORT_DESC="Collection of desktop applications for the ALSA"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
-WEB_SITE="http://xwmw.org/qastools/index.html"
+WEB_SITE="https://xwmw.org/qastools/index.html"
 
 TARBALL="${PACKAGE}_$VERSION.tar.xz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake Qt4-dev qmake alsa-lib-dev"
 SPLIT="qasmixer"
@@ -17,8 +17,11 @@
 COOKOPTS="!menus"
 
 compile_rules() {
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
 	make &&
 	make DESTDIR=$install install
 }
diff -r ad29ddfee1c9 -r d5aab818505e qbittorrent/receipt
--- a/qbittorrent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qbittorrent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,27 +7,23 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://www.qbittorrent.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="qt5-base boost-system openssl libtorrent-rasterbar zlib"
 BUILD_DEPENDS="qt5-dev boost-dev libtorrent-rasterbar-dev openssl-dev \
 geoip xorg-dev zlib-dev"
 
 COOKOPTS="!pixmaps !menus"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr &&
 	make &&
 	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons/hicolor
 
 	cp -a $install/usr/bin $fs/usr
@@ -40,4 +36,5 @@
 		cp -a $install/usr/share/icons/hicolor/${size}x$size \
 			$fs/usr/share/icons/hicolor
 	done
+	DEPENDS="qt5-base boost-system openssl libtorrent-rasterbar zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qca-ossl/receipt
--- a/qca-ossl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qca-ossl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.0-beta3"
 CATEGORY="development"
 SHORT_DESC="OpenSSL plug-in for the Qt Cryptographic Architecture (QCA)"
-MAINTAINER="ben@seawolfsanctuary.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://delta.affinix.com/qca-ossl"
 
@@ -18,7 +18,7 @@
 	./configure \
 		--qtdir=/usr/lib/qt &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qca/receipt
--- a/qca/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qca/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.3"
 CATEGORY="system-tools"
 SHORT_DESC="QCA aims to provide a straightforward and cross-platform crypto API"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://delta.affinix.com/qca/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://delta.affinix.com/download/qca/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="Qt4-dev qmake"
-SPLIT="qca qca-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|set(in, n|this->&|' src/botantools/botan/botan/secmem.h
@@ -24,7 +24,7 @@
 		--no-separate-debug-info \
 		--release &&
 	make &&
-	make INSTALL_ROOT=$WOK/$PACKAGE/install install
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qcad/receipt
--- a/qcad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qcad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,28 @@
 PACKAGE="qcad"
 VERSION="3.7.5"
 CATEGORY="network"
-SHORT_DESC="The Open Source CAD System For Everyone."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="The Open Source CAD System For Everyone"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-TARBALL="${PACKAGE}-${VERSION}-linux-x86_32.tar.gz"
-WEB_SITE="http://www.qcad.org"
-WGET_URL="http://www.qcad.org/archives/qcad/${TARBALL}"
-HOST_ARCH="i486 x86_64"
+WEB_SITE="http://www.qcad.org/"
 
-DEPENDS="libQtWebkit libQtGui libQtDesigner libQtXml libQtDeclarative \
-libQtCore libQtScript libQtNetwork libQtClucene libQtOpenGL libQtDBus \
-libQtScriptTools libQtHelp libQtSvg libQtSql libQtTest libQtMultimedia"
+TARBALL="$PACKAGE-$VERSION-linux-x86_32.tar.gz"
+WGET_URL="http://www.qcad.org/archives/qcad/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+
+compile_rules() {
 	mkdir -p \
-		${install}/usr/bin \
-		${install}/usr/lib/${PACKAGE} \
-		${install}/usr/share/pixmaps
-	cp -a ${src}/* ${install}/usr/lib/${PACKAGE}
+		$install/usr/bin \
+		$install/usr/lib/$PACKAGE \
+		$install/usr/share/pixmaps
+	cp -a $src/* $install/usr/lib/$PACKAGE
 	# /usr/bin/qcad + pixmap
-	install -m 0755 ${stuff}/qcad ${install}/usr/bin/qcad
+	install -m 0755 $stuff/qcad $install/usr/bin/qcad
 	ln -s ../../lib/qcad/qcad_icon.png \
-		${install}/usr/share/pixmaps/${PACKAGE}.png
+		$install/usr/share/pixmaps/$PACKAGE.png
 	# We use our packed deps
 	echo "Cleaning installed files..."
-	cd ${install}/usr/lib/${PACKAGE}
+	cd $install/usr/lib/$PACKAGE
 	rm qcad \
 		libQtWebKit.* libQtGui.* libQtDesigner* libQtXml* \
 		libQtDeclarative.* libQtCore.* libQtScript.* libQtNetwork.* \
@@ -38,20 +33,20 @@
 	rm -rf examples/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs} && cp -a ${install}/* ${fs}
+genpkg_rules() {
+	mkdir -p $fs
+	cp -a $install/* $fs
 
 	# exclude from files.list (for tazpkg-find-depends)
 	# not removed: exactly this version required ($fs/usr/lib/qcad/libfreetype.readme)
-        cd $fs/usr/lib/qcad
+	cd $fs/usr/lib/qcad
 	mv -f libfreetype.so.6 lib-freetype-.-so-.-6
+	DEPENDS="libQtWebkit libQtGui libQtDesigner libQtXml libQtDeclarative \
+	libQtCore libQtScript libQtNetwork libQtClucene libQtOpenGL libQtDBus \
+	libQtScriptTools libQtHelp libQtSvg libQtSql libQtTest libQtMultimedia"
 }
 
-post_install()
-{
-        cd "$1/usr/lib/qcad"
+post_install() {
+	cd "$1/usr/lib/qcad"
 	mv -f lib-freetype-.-so-.-6 libfreetype.so.6
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e qedit/receipt
--- a/qedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,23 +7,26 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
 WEB_SITE="http://hugo.pereira.free.fr/software"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/tgz/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="qt5-base xorg-xcb-util-keysyms"
-BUILD_DEPENDS="qt5-dev cmake xorg-xcb-util-keysyms-dev xorg-dev zlib-dev mesa-dev"
+BUILD_DEPENDS="qt5-dev cmake xorg-xcb-util-keysyms-dev xorg-dev zlib-dev \
+mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	patch $src/patterns/shell_patterns.xml $stuff/strvar_color_slitaz
-	cd $src && cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT5=true . &&
-	make && make DESTDIR=$DESTDIR install
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DUSE_QT5=true \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="qt5-base xorg-xcb-util-keysyms"
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qemacs/receipt
--- a/qemacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qemacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,31 +6,43 @@
 SHORT_DESC="Light emacs clone"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="https://bellard.org/qemacs/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://bellard.org/$PACKAGE/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev"
-SPLIT="qemacs qemacs-tiny qemacs-x11 qemacs-dev"
+SPLIT="$PACKAGE-tiny $PACKAGE-x11 $PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export CFLAGS="-Wno-error=unused-but-set-variable -O2"
 	sed -i 's/\(define SAVED_DATA_SIZE \).*/\1 __builtin_offsetof(EditState,end_of_saved_data)/' qe.h
-	./configure --prefix=/usr --enable-tiny $CONFIGURE_ARGS &&
-	make && mv qe qe-tiny
-	./configure --prefix=/usr --disable-x11 $CONFIGURE_ARGS &&
-	make && mv qe qe-nox11
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make && mv qe qe-x11
+
+	./configure \
+		--prefix=/usr \
+		--enable-tiny \
+		$CONFIGURE_ARGS &&
+	make &&
+	mv qe qe-tiny
+
+	./configure \
+		--prefix=/usr \
+		--disable-x11 \
+		$CONFIGURE_ARGS &&
+	make &&
+	mv qe qe-nox11
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	mv qe qe-x11
+
 	cook_pick_docs qe-doc.html COPYING README
 	cook_pick_manpages *.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		qemacs)
 			mkdir -p $fs/usr/bin $fs/usr/share/qe
@@ -56,14 +68,13 @@
 			install $src/kmaps $src/ligatures $fs/usr/share/qe
 			CAT="editors|Light emacs clone with X11 support."
 			DEPENDS="xorg-libX11 xorg-libXext xorg-libXv xorg-libxcb \
-				 xorg-libXau xorg-libXdmcp"
+			xorg-libXau xorg-libXdmcp"
 			PROVIDE="qemacs"
 			TAGS="editor"
 			;;
 		qemacs-dev)
-			CAT="development|Light emacs clone developmement files."
 			mkdir -p $fs/usr/include/qemacs
-			for i in cutils.h display.h qe.h qeconfig.h qestyles.h ; do
+			for i in cutils.h display.h qe.h qeconfig.h qestyles.h; do
 				cp $src/$i $fs/usr/include/qemacs
 			done
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e qemu-box/receipt
--- a/qemu-box/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qemu-box/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="qemu-box"
 VERSION="306"
 CATEGORY="development"
-SHORT_DESC="SliTaz Qemu frontend."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz Qemu frontend"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,21 +12,17 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="qemu-light"
 SIBLINGS="mirror-tools slitaz-dev-tools slitaz-mercurial-style tazchroot \
 tazdev tazwikiss yaff"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/qemu-box
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 	chown -R root.root $fs
+	DEPENDS="qemu-light"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qemu-light/receipt
--- a/qemu-light/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qemu-light/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,21 @@
 VERSION="2.0.2"
 CATEGORY="misc"
 SHORT_DESC="Light Qemu i386-softmmu target (without xen, vde, bluez, blobs, tls)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.qemu.org/"
+WEB_SITE="https://www.qemu.org/"
 REPOLOGY="qemu"
 
 TARBALL="qemu-$VERSION.tar.bz2"
 WGET_URL="http://wiki.qemu.org/download/$TARBALL"
 
-BUILD_DEPENDS="gettext perl alsa-lib-dev libsdl-dev util-linux-uuid-dev python \
-glib-dev zlib-dev autoconf automake libtool bison flex"
+BUILD_DEPENDS="gettext-dev perl alsa-lib-dev libsdl-dev util-linux-uuid-dev \
+python glib-dev zlib-dev autoconf automake libtool bison flex"
 
 compile_rules() {
 	mkdir -p $DESTIDR/usr/share/qemu/ia32
 
-	[ -s $SRC/$UEFIZIP ] || wget -P $SRC \
-		http://netassist.dl.sourceforge.net/project/edk2/OVMF/$UEFIZIP
+	[ -s $SRC/$UEFIZIP ] || wget -P $SRC $SF_MIRROR/edk2/$UEFIZIP
 	unzip $SRC/$UEFIZIP OVMF.fd -d $DESTIDR/usr/share/qemu/ia32
 
 	TARGET="i386-softmmu"
@@ -42,7 +41,7 @@
 		--target-list="$TARGET" \
 		--cc=$BUILD_SYSTEM-gcc &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qemu/receipt
--- a/qemu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qemu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,15 +6,15 @@
 SHORT_DESC="General-purpose full virtualizer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://qemu.org"
+WEB_SITE="http://qemu.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://wiki.qemu.org/download/$TARBALL"
 
-BUILD_DEPENDS="gettext perl alsa-lib-dev gnutls-dev libsdl-dev bluez-dev \
+BUILD_DEPENDS="gettext-dev perl alsa-lib-dev gnutls-dev libsdl-dev bluez-dev \
 libtasn1-dev vde2-dev curl-dev attr-dev util-linux-uuid-dev \
 glib-dev autoconf automake libtool bison flex libusb-dev ncurses-dev"
-SPLIT="qemu-arm qemu-mips qemu-x86_64 qemu"
+SPLIT="$PACKAGE-arm $PACKAGE-mips $PACKAGE-x86_64 $PACKAGE"
 
 compile_rules() {
 	UEFIZIP="OVMF-IA32-r15214.zip"
@@ -45,7 +45,7 @@
 		--target-list="$TARGET" \
 		--cc=$BUILD_SYSTEM-gcc &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	ln -s qemu-system-i386   $install/usr/bin/qemu
 	ln -s qemu-system-arm    $install/usr/bin/qemu-arm
diff -r ad29ddfee1c9 -r d5aab818505e qemulator/receipt
--- a/qemulator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qemulator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,22 @@
 PACKAGE="qemulator"
 VERSION="0.5"
 CATEGORY="misc"
-SHORT_DESC="The full featured qemu emulation suite."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="The full featured Qemu emulation suite"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://manpages.ubuntu.com/manpages/precise/man1/qemulator.1.html"
+
 SOURCE="Qemulator"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://qemulator.createweb.de/"
-WGET_URL="http://qemulator.createweb.de/phocadownload/$TARBALL"
-TAGS="emulator virtualization"
+WGET_URL="http://qemulator.createweb.de/phocadownload/$TARBALL" # FIXME
 
-DEPENDS="python python-pygtk qemu"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $src/usr/local/* $fs/usr
 	rm -rf $fs/usr/share/icons $fs/usr/share/pixmaps/*.svg
 	cp $src/usr/local/share/icons/hicolor/32x32/apps/* \
 		$fs/usr/share/pixmaps
-	cp stuff/slitaz.png $fs/usr/share/$PACKAGE/icons
+	cp $stuff/slitaz.png $fs/usr/share/$PACKAGE/icons
+	DEPENDS="python python-pygtk qemu"
+	TAGS="emulator virtualization"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qiv/receipt
--- a/qiv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qiv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,12 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev imlib2-dev"
+BUILD_DEPENDS="gtk2-dev imlib2-dev xorg-libXinerama-dev"
 
 compile_rules() {
 	sed -i 's/MAGIC = -DHAVE_MAGIC/# MAGIC = -DHAVE_MAGIC/' Makefile
+
 	make &&
-	install -Dm 755 $src/qiv $install/usr/bin/qiv
+	install -Dm755 qiv $install/usr/bin/qiv
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qiviewer/receipt
--- a/qiviewer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qiviewer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,26 @@
 PACKAGE="qiviewer"
 VERSION="0.5.0"
 CATEGORY="x-window"
-SHORT_DESC="Light and fast QT based images viewer."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Light and fast QT based images viewer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://code.google.com/p/qiviewer/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://code.google.com/p/qiviewer/"
 WGET_URL="http://qiviewer.googlecode.com/files/$TARBALL"
 
-DEPENDS="xorg-libX11 libQtCore libQtGui"
 BUILD_DEPENDS="cmake Qt4-dev qmake xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
-	qmake && make && make INSTALL_ROOT=$DESTDIR install &&
+	qmake &&
+	make &&
+	make INSTALL_ROOT=$install install &&
 	sed -i s'/Name=qiviewer/Name=Qiviewer/' $install/usr/share/applications/*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="xorg-libX11 libQtCore libQtGui"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qjackctl/receipt
--- a/qjackctl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qjackctl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,32 +6,26 @@
 SHORT_DESC="Application to Control Jack"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://qjackctl.sourceforge.net"
+WEB_SITE="http://qjackctl.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/qjackctl/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="alsa-lib bzlib expat fontconfig freetype gcc-lib-base glib \
-glibc-base jack libffi libpng16 libQtCore libQtDBus \
-libQtGui libQtXml xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \
-xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
-BUILD_DEPENDS="qmake Qt4-dev jack \
-jack-dev xorg-xorgproto xorg-libX11-dev"
-TAGS="audio sound"
+BUILD_DEPENDS="qmake Qt4-dev jack-dev xorg-xorgproto xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	#sed -i 's|^LIBS.*|& -Wl,--copy-dt-needed-entries -lX11|' qjackctl.pro.in
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	#rm -rf $fs/usr/share/man
+	DEPENDS="alsa-lib bzlib expat fontconfig freetype gcc-lib-base glib \
+	glibc-base jack libffi libpng16 libQtCore libQtDBus \
+	libQtGui libQtXml xorg-libxcb util-linux-uuid xorg-libICE xorg-libSM \
+	xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender zlib"
+	TAGS="audio sound"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e qjson/receipt
--- a/qjson/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qjson/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="qjson"
 VERSION="0.9.0"
 CATEGORY="development"
-SHORT_DESC="QJson is a Qt-based library that maps JSON data to QVariant objects"
+SHORT_DESC="Map JSON data to QVariant objects"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="http://qjson.sourceforge.net/"
@@ -12,10 +12,11 @@
 WGET_URL="https://github.com/flavio/qjson/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake qt5-dev"
-SPLIT="qjson-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
diff -r ad29ddfee1c9 -r d5aab818505e qlcplus/receipt
--- a/qlcplus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qlcplus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qlcplus"
 VERSION="4.10.2b"
@@ -7,21 +7,19 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="Apache"
 WEB_SITE="http://www.qlcplus.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/mcallegari/qlcplus/archive/QLC+_$VERSION.tar.gz"
 
-DEPENDS="libQtGui libQtNetwork libQtScript alsa-lib libftdi ola"
 BUILD_DEPENDS="Qt4-dev qmake alsa-lib-dev libftdi-dev ola-dev libusb-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	qmake &&
-	make && make INSTALL_ROOT=$install install
+	make &&
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libQtGui libQtNetwork libQtScript alsa-lib libftdi ola"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qoauth/receipt
--- a/qoauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qoauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,21 @@
 PACKAGE="qoauth"
 VERSION="1.0"
 CATEGORY="development"
-SHORT_DESC="OAuth support for Qt applications."
-MAINTAINER="ben@seawolfsanctuary.com"
+SHORT_DESC="OAuth support for Qt applications"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
+WEB_SITE="http://github.com/ayoy/qoauth"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
-WEB_SITE="http://github.com/ayoy/$PACKAGE"
 WGET_URL="http://files.ayoy.net/$PACKAGE/release/$VERSION/src/$TARBALL"
 
-DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
-libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
-libQtOpenGL libQtSql libQtWebkit"
 BUILD_DEPENDS="qmake qca-dev xorg-libX11-dev dbus-dev Qt4-dev slitaz-toolchain"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 #	echo -n "Linking..."
 #	ln -s $src-src $src
 #	status
 
-	cd $src
-
 	qmake PREFIX="/usr"
 #	chmod +x configure
 #	./configure \
@@ -82,20 +76,19 @@
 
 status
 
-	if [ -f /usr/include/QtOAuth ] || [ -d /usr/include/QtOAuth ] ; then
+	if [ -f /usr/include/QtOAuth ] || [ -d /usr/include/QtOAuth ]; then
 		echo -n "Removing QtOAuth placeholder... "
 		rm -rf /usr/include/QtOAuth/
 		status && echo
 	fi
 
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
-	for DIRECTORY in lib include ; do
+	for DIRECTORY in lib include; do
 		cp -a $src/$DIRECTORY $fs/usr
 	done
 	cp  $src/src/*.h $fs/usr/include
@@ -106,16 +99,18 @@
 	cp $fs/usr/include/QtOAuth/interface.h $fs/usr/include/interface.h
 	mv $fs/usr/include/QtOAuth.bak $fs/usr/include/QtOAuth/QtOAuth
 
-	mkdir -p $fs/usr/share/qt/mkspecs/features && \
+	mkdir -p $fs/usr/share/qt/mkspecs/features &&
 	cp $src/oauth.prf $fs/usr/share/qt/mkspecs/features/oauth.prf
 
 	# Copy .desktop file:
 #	cp -a $WOK/$PACKAGE/stuff/* $fs/usr
+	DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
+	libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
+	libQtOpenGL libQtSql libQtWebkit"
 }
 
-pre_install()
-{
-	if [ -f /usr/include/QtOAuth ] || [ -d /usr/include/QtOAuth ] ; then
+pre_install() {
+	if [ -f /usr/include/QtOAuth ] || [ -d /usr/include/QtOAuth ]; then
 		echo -n "Removing QtOAuth placeholder... "
 		rm -rf /usr/include/QtOAuth/
 		status && echo
diff -r ad29ddfee1c9 -r d5aab818505e qpdf/receipt
--- a/qpdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qpdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev libjpeg-turbo-dev fop libxslt libxml2-tools"
-SPLIT="qpdf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e qpdfview/receipt
--- a/qpdfview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qpdfview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qpdfview"
 VERSION="0.4.15"
 CATEGORY="office"
-SHORT_DESC="qpdfview is a tabbed document viewer"
+SHORT_DESC="Tabbed document viewer"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://launchpad.net/qpdfview"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
-TAGS="viewer pdf ps postscript djvu"
 
-DEPENDS="libcups djvulibre libQtDBus libQtSql libQtSvg libgnutls file \
-libspectre poppler-qt4"
 BUILD_DEPENDS="qmake Qt4-dev libspectre-dev poppler-qt4-dev djvulibre-dev \
 libmagic-dev cups-dev zlib-dev wget poppler-qt4 poppler-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	find $src -name *desktop* -exec sed '/Icon=/s/=.*$/=pdf/g' -i {} \;
 	#cp -f $stuff/qpdfview_ru.ts $src/translations
 	#sed -i "s/copy; \\([0-9]*-\\)[0-9]*/copy; \\1$(date +%Y)/" \
-		$src/translations/qpdfview_ru.ts
+	#	$src/translations/qpdfview_ru.ts
 
 	lrelease qpdfview.pro
 	qmake PREFIX=/usr qpdfview.pro
@@ -30,9 +26,9 @@
 	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libcups djvulibre libQtDBus libQtSql libQtSvg libgnutls file \
+	libspectre poppler-qt4"
+	TAGS="viewer pdf ps postscript djvu"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e qqwing/receipt
--- a/qqwing/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qqwing/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://qqwing.com/$TARBALL"
 
-SPLIT="qqwing-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e qrencode/receipt
--- a/qrencode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qrencode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="https://fukuchi.org/works/qrencode/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev"
-SPLIT="qrencode-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qt4-base/receipt
--- a/qt4-base/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qt4-base/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,15 +13,14 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="xorg-libX11-dev dbus-dev libmng-dev \
-cups-dev mysql-dev unixODBC-dev mesa-dev fontconfig-dev \
-postgresql-dev atk-dev autoconf automake bash \
-binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
-freetype-dev gettext glib-dev jpeg-dev libIDL libcap-dev libpng16-dev libtool \
-libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
+BUILD_DEPENDS="xorg-libX11-dev dbus-dev libmng-dev cups-dev mysql-dev \
+unixODBC-dev mesa-dev fontconfig-dev postgresql-dev atk-dev autoconf automake \
+bash binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
+freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
+libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
 pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
-tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
-sqlite3-dev libQtClucene wayland-dev"
+tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev sqlite3-dev \
+libQtClucene wayland-dev"
 SPLIT="qt-base libQtWebkit qtconfig"
 
 compile_rules() {
@@ -62,7 +61,7 @@
 		-continue \
 		2>&1 | sed 's/such file or directory/file/' &&
 	make $MAKEFLAGS &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qt4-examples/receipt
--- a/qt4-examples/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qt4-examples/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qt4-examples"
 VERSION="4.8.6"
@@ -7,33 +7,30 @@
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL3 LGPL2.1"
 WEB_SITE="http://qt-project.org/"
-TAGS="qt"
 
-DEPENDS="libQtCore libQtGui"
 BUILD_DEPENDS="Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/bin $install/usr/share/applications
 
-	for i in desktop/screenshot dialogs/findfiles widgets/charactermap;
-	do
-                ii=$(basename $i) && cd $WOK/qt4/source/qt4-$VERSION/examples/$i
+	for i in desktop/screenshot dialogs/findfiles widgets/charactermap; do
+		ii=$(basename $i)
+		cd $WOK/qt4/source/qt4-$VERSION/examples/$i
 		rm -rf Makefile moc* *.o
-		qmake	$ii.pro
+		qmake $ii.pro
 		sed 's|-O2|'"$CFLAGS"'|' -i Makefile
+
 		make $MAKEFLAGS &&
-		install $ii $DESTDIR/usr/bin
-		install $ii.desktop $DESTDIR/usr/share/applications
+		install $ii $install/usr/bin
+		install $ii.desktop $install/usr/share/applications
 		find $install -name $ii.desktop \
-		-exec echo 'Categories=Utility;'>>$install/usr/share/applications/$ii.desktop \; \
-		-exec sed 's|/opt/|/|g' -i {} \;
+			-exec echo 'Categories=Utility;'>>$install/usr/share/applications/$ii.desktop \; \
+			-exec sed 's|/opt/|/|g' -i '{}' \;
 	done
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libQtCore libQtGui"
+	TAGS="qt"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qt4/receipt
--- a/qt4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qt4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,24 @@
 SOURCE="qt-everywhere-opensource-src"
 VERSION="4.8.6"
 CATEGORY="meta"
-SHORT_DESC="qt x11 toolkit"
+SHORT_DESC="Qt x11 toolkit"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL3 LGPL2.1"
+WEB_SITE="http://qt-project.org/"
+
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://qt-project.org/"
 WGET_URL="http://download.qt-project.org/archive/qt/${VERSION%.*}/$VERSION/$TARBALL"
-PROVIDE="qt-x11-opensource-src Qt4"
-TAGS="qt"
 
-BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer0-dev gst0-python-dev libmng-dev \
-cups-dev mysql-dev unixODBC-dev mesa-dev fontconfig-dev mesa-libegl glu \
-glw postgresql-dev gst0-plugins-base-dev atk-dev autoconf automake bash \
+BUILD_DEPENDS="xorg-libX11-dev dbus-dev gstreamer0-dev gst0-python-dev \
+libmng-dev cups-dev mysql-dev unixODBC-dev mesa-dev fontconfig-dev mesa-libegl \
+glu glw postgresql-dev gst0-plugins-base-dev atk-dev autoconf automake bash \
 binutils bison bzip2-dev cairo-dev coreutils expat-dev flex fontconfig-dev \
-freetype-dev gettext glib-dev jpeg-dev libIDL libcap-dev libpng16-dev libtool \
-libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
+freetype-dev gettext-dev glib-dev jpeg-dev libIDL libcap-dev libpng16-dev \
+libtool libxml2-dev linux-api-headers m4 make mercurial ncurses-dev openssl-dev \
 pango-dev patch pcre-dev perl perl-xml-parser perl-xml-simple xorg-pixman-dev \
 tiff-dev xorg-dev-proto xorg-dev zip unzip gtk2-dev alsa-lib-dev \
 sqlite3-dev glu-dev glw-dev wayland-dev"
-SPLIT="qt4 libQt3Support libQtClucene libQtCore libQtDBus libQtDeclarative \
+SPLIT="libQt3Support libQtClucene libQtCore libQtDBus libQtDeclarative \
 libQtDesigner libQtGui libQtHelp libQtMultimedia libQtNetwork libQtOpenGL \
 libQtPlugins libQtScript libQtScriptTools libQtSql libQtSvg libQtTest \
 libQtWebkit-video libQtXml qmake Qt4-dev qt4-phonon qtconfig-phonon QtDesigner \
@@ -30,33 +29,31 @@
 qt-locale-pl qt-locale-pt qt-locale-ru qt-locale-sl qt-locale-sv qt-locale-uk \
 qt-locale-zh_CN qt-locale-zh_TW"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export CXXFLAGS="$CXXFLAGS -std=gnu++98"
 
 	#ugly fix for missing files, you probably could do better
-	
 	mkdir -p $src/src/3rdparty/webkit/Source/WebKit2/generated
 
 	for i in $(grep MessageReceiver.cpp $stuff/missinglist); do
-	fileprefix=${i%MessageReceiver.cpp}
-	cppfilename=$(find $src/src/3rdparty/webkit/Source/WebKit2  -name $fileprefix.cpp)
-	dname=$(dirname $cppfilename)
-	/usr/bin/python $src/src/3rdparty/webkit/Source/WebKit2/Scripts/generate-message-receiver.py $dname/$fileprefix.messages.in > $src/src/3rdparty/webkit/Source/WebKit2/generated/$i
+		fileprefix=${i%MessageReceiver.cpp}
+		cppfilename=$(find $src/src/3rdparty/webkit/Source/WebKit2  -name $fileprefix.cpp)
+		dname=$(dirname $cppfilename)
+		/usr/bin/python $src/src/3rdparty/webkit/Source/WebKit2/Scripts/generate-message-receiver.py $dname/$fileprefix.messages.in > $src/src/3rdparty/webkit/Source/WebKit2/generated/$i
 	done
-	
+
 	for i in $(grep Messages.h $stuff/missinglist); do
-	fileprefix=${i%Messages.h}
-	hfilename=$(find $src/src/3rdparty/webkit/Source/WebKit2  -name $fileprefix.h)
-	dname=$(dirname $hfilename)
-	/usr/bin/python $src/src/3rdparty/webkit/Source/WebKit2/Scripts/generate-messages-header.py $dname/$fileprefix.messages.in > $src/src/3rdparty/webkit/Source/WebKit2/generated/$i
+		fileprefix=${i%Messages.h}
+		hfilename=$(find $src/src/3rdparty/webkit/Source/WebKit2  -name $fileprefix.h)
+		dname=$(dirname $hfilename)
+		/usr/bin/python $src/src/3rdparty/webkit/Source/WebKit2/Scripts/generate-messages-header.py $dname/$fileprefix.messages.in > $src/src/3rdparty/webkit/Source/WebKit2/generated/$i
 	done
-	
+
 	./configure \
 		-silent \
 		-prefix /usr \
-		-confirm-license -opensource \
+		-confirm-license \
+		-opensource \
 		-sysconfdir /etc \
 		-plugindir /usr/lib/qt/plugins \
 		-importdir /usr/lib/qt/imports \
@@ -81,14 +78,13 @@
 		-optimized-qmake \
 		-opengl \
 		-gtkstyle \
-		2>&1 | sed 's/such file or directory/file/' &&
+		&&
 	make $MAKEFLAGS &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz locale qt package.
-genpkg_locale()
-{
+# Generate a SliTaz locale Qt package.
+genpkg_locale() {
 	LICENSE="GPL3 LGPL2.1 FDL other"
 	usqt=/usr/share/qt/translations
 	mkdir -p $fs$usqt
@@ -104,333 +100,303 @@
 	fi
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	qt4)
-		DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg \
-			libQtXml libQtDesigner libQtScript libQt3Support \
-			libQtClucene libQtDBus libQtHelp libQtOpenGL libQtSql \
-			libQtWebkit gstreamer0"
-		# dummy tree to avoid 'tazwok cmp --cook' building loop
-		mkdir $fs/etc
-		;;
-	libQt3Support)
-		CAT="development|Qt3 support Library"
-		DEPENDS="libQtGui libQtSql libQtXml"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQt3Support.so* $fs/usr/lib
-		;;
-	libQtClucene)
-		CAT="development|Qt clucene Library"
-		DEPENDS="libQtCore"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtCLucene.so* $fs/usr/lib
-		;;
-	libQtCore)
-		CAT="development|Qt Core files"
-		DEPENDS="glib zlib gcc-lib-base"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtCore.so* $fs/usr/lib
-		;;
-	libQtDBus)
-		CAT="development|Qt Dbus Library"
-		DEPENDS="libQtXml"
-		mkdir -p $fs/usr/lib $fs/usr/bin
-		cp -a $install/usr/lib/libQtDBus.so* $fs/usr/lib
-		cp -a $install/usr/bin/qdbus $fs/usr/bin
-		;;
-	libQtDeclarative)
-		CAT="development|Qt Declarative Library"
-		DEPENDS="libQtCore libQtNetwork libQtGui libQtXml libQtSql \
+		qt4)
+			DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg \
+			libQtXml libQtDesigner libQtScript libQt3Support libQtClucene \
+			libQtDBus libQtHelp libQtOpenGL libQtSql libQtWebkit gstreamer0"
+			PROVIDE="qt-x11-opensource-src Qt4"
+			TAGS="qt"
+			;;
+		libQt3Support)
+			CAT="development|Qt3 support Library"
+			DEPENDS="libQtGui libQtSql libQtXml"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQt3Support.so* $fs/usr/lib
+			;;
+		libQtClucene)
+			CAT="development|Qt clucene Library"
+			DEPENDS="libQtCore"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtCLucene.so* $fs/usr/lib
+			;;
+		libQtCore)
+			CAT="development|Qt Core files"
+			DEPENDS="glib zlib gcc-lib-base"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtCore.so* $fs/usr/lib
+			;;
+		libQtDBus)
+			CAT="development|Qt Dbus Library"
+			DEPENDS="libQtXml"
+			mkdir -p $fs/usr/lib $fs/usr/bin
+			cp -a $install/usr/lib/libQtDBus.so* $fs/usr/lib
+			cp -a $install/usr/bin/qdbus $fs/usr/bin
+			;;
+		libQtDeclarative)
+			CAT="development|Qt Declarative Library"
+			DEPENDS="libQtCore libQtNetwork libQtGui libQtXml libQtSql \
 			libQtSvg libQtScript"
-		mkdir -p $fs/usr/lib
-		cp -a $src/lib/libQtDeclarative.so* $fs/usr/lib
-		;;
-	libQtDesigner)
-		CAT="development|Qt Designer"
-		DEPENDS="libQtCore libQtGui libQtScript libQtXml"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtDesigner*.so* $fs/usr/lib
-		;;
-	libQtGui)
-		CAT="development|Qt Gui Library"
-		DEPENDS="libQtCore expat fontconfig freetype xorg-libICE \
+			mkdir -p $fs/usr/lib
+			cp -a $src/lib/libQtDeclarative.so* $fs/usr/lib
+			;;
+		libQtDesigner)
+			CAT="development|Qt Designer"
+			DEPENDS="libQtCore libQtGui libQtScript libQtXml"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtDesigner*.so* $fs/usr/lib
+			;;
+		libQtGui)
+			CAT="development|Qt Gui Library"
+			DEPENDS="libQtCore expat fontconfig freetype xorg-libICE \
 			xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
 			xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender \
 			libpng16"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtGui.so* $fs/usr/lib
-	
-		mkdir -p $fs/usr/lib/qt/plugins/imageformats
-		cp -a $install/usr/lib/qt/plugins/imageformats/libqjpeg.so $fs/usr/lib/qt/plugins/imageformats
-		cp -a $install/usr/lib/qt/plugins/imageformats/libqgif.so $fs/usr/lib/qt/plugins/imageformats
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtGui.so* $fs/usr/lib
 
-		mkdir -p $fs/etc/skel/.config
-		cp -a $stuff/Trolltech.conf $fs/etc/skel/.config
-		;;
-	libQtHelp)
-		CAT="development|Qt help Library"
-		DEPENDS="libQtGui libQtClucene libQtSql libQtXml"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtHelp.so* $fs/usr/lib
-		;;
-	libQtMultimedia)
-		CAT="development|Qt Multimedia Library"
-		DEPENDS="libQtGui alsa-lib"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtMultimedia.so* $fs/usr/lib
-		;;
-	libQtNetwork)
-		CAT="development|Qt Network Library"
-		DEPENDS="libQtCore"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtNetwork.so* $fs/usr/lib
-		;;
-	libQtOpenGL)
-		CAT="development|Qt OpenGL Library"
-		DEPENDS="libQtGui mesa glu xorg-libXxf86vm xorg-libXdamage libdrm"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtOpenGL.so* $fs/usr/lib
-		;;
-	libQtPlugins)
-		CAT="development|qt x11 toolkit plugins"
-		DEPENDS="libQtSql libQt3Support libQtGui libQtCore libQtXml \
+			mkdir -p $fs/usr/lib/qt/plugins/imageformats
+			cp -a $install/usr/lib/qt/plugins/imageformats/libqjpeg.so $fs/usr/lib/qt/plugins/imageformats
+			cp -a $install/usr/lib/qt/plugins/imageformats/libqgif.so $fs/usr/lib/qt/plugins/imageformats
+
+			mkdir -p $fs/etc/skel/.config
+			cp -a $stuff/Trolltech.conf $fs/etc/skel/.config
+			;;
+		libQtHelp)
+			CAT="development|Qt help Library"
+			DEPENDS="libQtGui libQtClucene libQtSql libQtXml"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtHelp.so* $fs/usr/lib
+			;;
+		libQtMultimedia)
+			CAT="development|Qt Multimedia Library"
+			DEPENDS="libQtGui alsa-lib"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtMultimedia.so* $fs/usr/lib
+			;;
+		libQtNetwork)
+			CAT="development|Qt Network Library"
+			DEPENDS="libQtCore"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtNetwork.so* $fs/usr/lib
+			;;
+		libQtOpenGL)
+			CAT="development|Qt OpenGL Library"
+			DEPENDS="libQtGui mesa glu xorg-libXxf86vm xorg-libXdamage libdrm"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtOpenGL.so* $fs/usr/lib
+			;;
+		libQtPlugins)
+			CAT="development|qt x11 toolkit plugins"
+			DEPENDS="libQtSql libQt3Support libQtGui libQtCore libQtXml \
 			libQtNetwork libQtDBus libQtWebkit libQtScript \
 			libQtDesigner libQtOpenGL libQtScriptTools libQtSvg \
 			libQtTest libQtHelp"
-		mkdir -p $fs/usr/lib/qt
-		cp -a $install/usr/lib/qt/plugins $fs/usr/lib/qt
-		find $fs -regex \
-		'.*\(gstreamer\|libqsqlite\|qjpeg\|bqgif\|libqsvg\).*' -delete
-		;;
-	libQtScript)
-		CAT="development|Qt Script Lib"
-		DEPENDS="libQtCore"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtScript.so* $fs/usr/lib
-		;;
-	libQtScriptTools)
-		CAT="development|Qt ScriptTools Lib"
-		DEPENDS="libQtScript libQtGui"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtScriptTools.so* $fs/usr/lib
-		;;
-	libQtSql)
-		CAT="development|Qt sql Library"
-		DEPENDS="libQtCore sqlite3"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtSql.so* $fs/usr/lib
-	
-		#file from libQtPlugins usable with sqlite preinstalled in core slitaz
-		mkdir -p $fs/usr/lib/qt/plugins/sqldrivers
-		cp -a $install/usr/lib/qt/plugins/sqldrivers/libqsqlite.so $fs/usr/lib/qt/plugins/sqldrivers/libqsqlite.so
-		;;
-	libQtSvg)
-		CAT="development|Qt Svg Library"
-		DEPENDS="libQtCore libQtGui libQtXml libpng16"
-		mkdir -p $fs/usr/lib/qt/plugins/imageformats $fs/usr/lib/qt/plugins/iconengines
-		cp -a $install/usr/lib/libQtSvg.so*	$fs/usr/lib
-		cp -a $install/usr/lib/qt/plugins/imageformats/libqsvg.so	$fs/*/*/*/*/imageformats
-		cp -a $install/usr/lib/qt/plugins/iconengines/libqsvgicon.so	$fs/*/*/*/*/iconengines
-		;;
-	libQtTest)
-		CAT="development|Qt Test library"
-		DEPENDS="libQtCore"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtTest.so* $fs/usr/lib
-		;;
-	libQtWebkit-video)
-		CAT="multimedia|Web browser engine for Qt (with gstreamer HTML5 audio video support)"
-		DEPENDS="libQtCore libQtGui libQtNetwork libpng16 \
+			mkdir -p $fs/usr/lib/qt
+			cp -a $install/usr/lib/qt/plugins $fs/usr/lib/qt
+			find $fs -regex \
+			'.*\(gstreamer\|libqsqlite\|qjpeg\|bqgif\|libqsvg\).*' -delete
+			;;
+		libQtScript)
+			CAT="development|Qt Script Lib"
+			DEPENDS="libQtCore"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtScript.so* $fs/usr/lib
+			;;
+		libQtScriptTools)
+			CAT="development|Qt ScriptTools Lib"
+			DEPENDS="libQtScript libQtGui"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtScriptTools.so* $fs/usr/lib
+			;;
+		libQtSql)
+			CAT="development|Qt sql Library"
+			DEPENDS="libQtCore sqlite3"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtSql.so* $fs/usr/lib
+
+			#file from libQtPlugins usable with sqlite preinstalled in core slitaz
+			mkdir -p $fs/usr/lib/qt/plugins/sqldrivers
+			cp -a $install/usr/lib/qt/plugins/sqldrivers/libqsqlite.so $fs/usr/lib/qt/plugins/sqldrivers/libqsqlite.so
+			;;
+		libQtSvg)
+			CAT="development|Qt Svg Library"
+			DEPENDS="libQtCore libQtGui libQtXml libpng16"
+			mkdir -p $fs/usr/lib/qt/plugins/imageformats $fs/usr/lib/qt/plugins/iconengines
+			cp -a $install/usr/lib/libQtSvg.so*	$fs/usr/lib
+			cp -a $install/usr/lib/qt/plugins/imageformats/libqsvg.so	$fs/*/*/*/*/imageformats
+			cp -a $install/usr/lib/qt/plugins/iconengines/libqsvgicon.so	$fs/*/*/*/*/iconengines
+			;;
+		libQtTest)
+			CAT="development|Qt Test library"
+			DEPENDS="libQtCore"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtTest.so* $fs/usr/lib
+			;;
+		libQtWebkit-video)
+			CAT="multimedia|Web browser engine for Qt (with gstreamer HTML5 audio video support)"
+			DEPENDS="libQtCore libQtGui libQtNetwork libpng16 \
 			gst0-plugins-base gst0-plugins-good gst0-ffmpeg"
-		SUGGESTED="gst0-plugins-bad gst0-plugins-ugly"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtWebKit.so* $fs/usr/lib
-		;;
-	libQtXml)
-		CAT="development|Qt Xml library"
-		DEPENDS="libQtNetwork"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libQtXml.so* $fs/usr/lib
-		cp -a $install/usr/lib/libQtXmlPatterns.so* $fs/usr/lib
-		;;
-	qmake)
-		CAT="development|Qt make"
-		TAGS="qt"
-		DEPENDS="zlib gcc-lib-base"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/qmake $fs/usr/bin
-		cp -a $install/usr/bin/moc $fs/usr/bin
-		cp -a $install/usr/bin/uic $fs/usr/bin
-		;;
-	Qt4-dev)
-		CAT="development|qt x11 toolkit"
-		SUGGESTED="libmng nvidia"
-		DEPENDS="QtDesigner jpeg tiff libpng16 mesa glu \
+			SUGGESTED="gst0-plugins-bad gst0-plugins-ugly"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtWebKit.so* $fs/usr/lib
+			;;
+		libQtXml)
+			CAT="development|Qt Xml library"
+			DEPENDS="libQtNetwork"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libQtXml.so* $fs/usr/lib
+			cp -a $install/usr/lib/libQtXmlPatterns.so* $fs/usr/lib
+			;;
+		qmake)
+			CAT="development|Qt make"
+			TAGS="qt"
+			DEPENDS="zlib gcc-lib-base"
+			mkdir -p $fs/usr/bin
+			cp -a $install/usr/bin/qmake $fs/usr/bin
+			cp -a $install/usr/bin/moc $fs/usr/bin
+			cp -a $install/usr/bin/uic $fs/usr/bin
+			;;
+		Qt4-dev)
+			CAT="development|qt x11 toolkit"
+			SUGGESTED="libmng nvidia"
+			DEPENDS="QtDesigner jpeg tiff libpng16 mesa glu \
 			freetds libmysqlclient libpostgresqlclient libunixODBC \
 			xorg-xcb-util libQt3Support libQtClucene libQtPlugins \
 			libQtDBus libQtHelp libQtOpenGL libQtScript libQtSql \
 			libQtScriptTools libQtWebkit libQtTest qtconfig \
 			gcc-lib-base"
-		mkdir -p $fs/usr/lib $fs/usr/include/private
-		cp -a $install/usr/include $fs/usr
-		cp -a $install/usr/lib/pkgconfig  $fs/usr/lib
-		cp -a $install/usr/lib/*.*a  $fs/usr/lib/	
-		cp -a $install/usr/lib/*.prl  $fs/usr/lib/	
-		cp -a $install/usr/share  $fs/usr	
-		cp -a $install/usr/lib/qt $fs/usr/lib
+			mkdir -p $fs/usr/lib $fs/usr/include/private
+			cp -a $install/usr/include        $fs/usr
+			cp -a $install/usr/lib/pkgconfig  $fs/usr/lib
+			cp -a $install/usr/lib/*.*a       $fs/usr/lib/
+			cp -a $install/usr/lib/*.prl      $fs/usr/lib/
+			cp -a $install/usr/share          $fs/usr
+			cp -a $install/usr/lib/qt         $fs/usr/lib
 
-		#private qt includes
-		for i in $src/include/*/private/*; do cp $src/$(cat $i | sed 's/^#include "[./]*\([a-z].*\)"$/\1/') $fs/usr/include/private; done
-	
-		# all qt plugins are in libQtPlugins
-		rm -rf $fs/usr/lib/qt/plugins
-		# all bin and remove QT applications designer, qmake, assistant, linguist: provide seperate packages
-		cp -a $install/usr/bin $fs/usr	
-		rm $fs/usr/bin/qmake
-		rm $fs/usr/bin/designer
-		# Linguist and assistant are now part of QTDesigner packages
-		rm $fs/usr/bin/linguist
-		rm $fs/usr/bin/assistant
-		# qtconfig packaged now in separate package
-		rm $fs/usr/bin/qtconfig
-		rm $fs/usr/share/qt/translations/qtconfig*.qm
-		;;
-	qt4-phonon)
-		CAT="multimedia|Qt phonon library"
-		DEPENDS="glib zlib gcc-lib-base"
-		SUGGESTED="gst0-plugins-good"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/libphonon.so* $fs/usr/lib
-		mkdir -p $fs/usr/lib/qt/plugins/phonon_backend
-		cp -a $install/usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so $fs/usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so
-		;;
-	qtconfig-phonon)
-		CAT="x-window|Qtconfig is a tool that allows users to customize the default settings for Qt applications."
-		DEPENDS="gst0-plugins-base libQt3Support libQtNetwork libQtDBus qt4-phonon"
-		mkdir -p $fs/usr/bin $fs/usr/share/qt/translations
-		cp -a $install/usr/bin/qtconfig $fs/usr/bin
-		cp -a $install/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations
-		;;
-	QtDesigner)
-		CAT="development|Qt Designer"
-		TAGS="qt"
-		DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
+			#private qt includes
+			for i in $src/include/*/private/*; do
+				cp $src/$(cat $i | sed 's/^#include "[./]*\([a-z].*\)"$/\1/') $fs/usr/include/private	#"MC
+			done
+
+			# all qt plugins are in libQtPlugins
+			rm -rf $fs/usr/lib/qt/plugins
+			# all bin and remove QT applications designer, qmake, assistant, linguist: provide seperate packages
+			cp -a $install/usr/bin $fs/usr
+			rm $fs/usr/bin/qmake
+			rm $fs/usr/bin/designer
+			# Linguist and assistant are now part of QTDesigner packages
+			rm $fs/usr/bin/linguist
+			rm $fs/usr/bin/assistant
+			# qtconfig packaged now in separate package
+			rm $fs/usr/bin/qtconfig
+			rm $fs/usr/share/qt/translations/qtconfig*.qm
+			;;
+		qt4-phonon)
+			CAT="multimedia|Qt phonon library"
+			DEPENDS="glib zlib gcc-lib-base"
+			SUGGESTED="gst0-plugins-good"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/libphonon.so* $fs/usr/lib
+			mkdir -p $fs/usr/lib/qt/plugins/phonon_backend
+			cp -a $install/usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so $fs/usr/lib/qt/plugins/phonon_backend/libphonon_gstreamer.so
+			;;
+		qtconfig-phonon)
+			CAT="x-window|Qtconfig is a tool that allows users to customize the default settings for Qt applications."
+			DEPENDS="gst0-plugins-base libQt3Support libQtNetwork libQtDBus qt4-phonon"
+			mkdir -p $fs/usr/bin $fs/usr/share/qt/translations
+			cp -a $install/usr/bin/qtconfig $fs/usr/bin
+			cp -a $install/usr/share/qt/translations/qtconfig*.qm $fs/usr/share/qt/translations
+			;;
+		QtDesigner)
+			CAT="development|Qt Designer"
+			TAGS="qt"
+			DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
 			libQtDesigner libQtScript expat fontconfig freetype \
 			glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
 			xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr \
 			xorg-libXrender zlib libpng16 gcc-lib-base"
-		mkdir -p $fs/usr/bin \
-			 $fs/usr/share/pixmaps \
-			 $fs/usr/share/applications
+			mkdir -p $fs/usr/bin \
+				$fs/usr/share/pixmaps \
+				$fs/usr/share/applications
 
-		cp -a $install/usr/bin/designer* $fs/usr/bin
-		cp -a $install/usr/bin/linguist* $fs/usr/bin
-		cp -a $install/usr/bin/assistant* $fs/usr/bin
-		
-		# add missing icons
-		cp -a $src/tools/assistant/tools/assistant/images/assistant.png $fs/usr/share/pixmaps
-		cp -a $src/tools/designer/src/designer/images/designer.png $fs/usr/share/pixmaps
-		cp -a $src/tools/linguist/linguist/images/icons/linguist-16-32.png  $fs/usr/share/pixmaps
-	
-		# add .desktop files
-		cp -a stuff/*  $fs/usr/share/applications
-		;;
-	qt-locale-cs)
-		CAT="localization|Czech locale for Qt"
-		LICENSE="GPL3 LGPL2.1 FDL other"
-		LOCALE="cs"
-		BOOK=""
-		genpkg_locale
-		;;
-	qt-locale-da)
-		CAT="localization|Danish locale for Qt"
-		LOCALE="da"
-		BOOK="danish"
-		genpkg_locale
-		;;
-	qt-locale-de)
-		CAT="localization|German locale for Qt"
-		LOCALE="de"
-		BOOK="german"
-		genpkg_locale
-		;;
-	qt-locale-es)
-		CAT="localization|Spanish locale for Qt"
-		LOCALE="es"
-		BOOK="spanish"
-		genpkg_locale
-		;;
-	qt-locale-fr)
-		CAT="localization|French locale for Qt"
-		LOCALE="fr"
-		BOOK="french"
-		genpkg_locale
-		;;
-	qt-locale-hu)
-		CAT="localization|Hungarian locale for Qt"
-		LOCALE="hu"
-		BOOK="hungarian"
-		genpkg_locale
-		;;
-	qt-locale-pl)
-		CAT="localization|Polish locale for Qt"
-		LOCALE="pl"
-		BOOK="polish"
-		genpkg_locale
-		;;
-	qt-locale-pt)
-		CAT="localization|Portuguese locale for Qt"
-		LOCALE="pt"
-		BOOK=""
-		genpkg_locale
-		;;
-	qt-locale-ru)
-		CAT="localization|Russian locale for Qt"
-		LOCALE="ru"
-		BOOK="russian"
-		genpkg_locale
-		;;
-	qt-locale-sl)
-		CAT="localization|Slovenian locale for Qt"
-		LOCALE="sl"
-		BOOK=""
-		genpkg_locale
-		;;
-	qt-locale-sv)
-		CAT="localization|Swedish locale for Qt"
-		LOCALE="sv"
-		BOOK="swedish"
-		genpkg_locale
-		;;
-	qt-locale-uk)
-		CAT="localization|Ukrainian locale for Qt"
-		LOCALE="uk"
-		BOOK=""
-		genpkg_locale
-		;;
-	qt-locale-zh_CN)
-		CAT="localization|Chinese Simplified locale for Qt"
-		LOCALE="zh_CN"
-		BOOK=""
-		genpkg_locale
-		;;
-	qt-locale-zh_TW)
-		CAT="localization|Chinese Traditional locale for Qt"
-		LOCALE="zh_TW"
-		BOOK=""
-		genpkg_locale
-		;;
+			cp -a $install/usr/bin/designer* $fs/usr/bin
+			cp -a $install/usr/bin/linguist* $fs/usr/bin
+			cp -a $install/usr/bin/assistant* $fs/usr/bin
+
+			# add missing icons
+			cp -a $src/tools/assistant/tools/assistant/images/assistant.png $fs/usr/share/pixmaps
+			cp -a $src/tools/designer/src/designer/images/designer.png $fs/usr/share/pixmaps
+			cp -a $src/tools/linguist/linguist/images/icons/linguist-16-32.png  $fs/usr/share/pixmaps
+
+			# add .desktop files
+			cp -a $stuff/*  $fs/usr/share/applications
+			;;
+		qt-locale-cs)
+			CAT="localization|Czech locale for Qt"
+			LICENSE="GPL3 LGPL2.1 FDL other"
+			LOCALE="cs" BOOK="" genpkg_locale
+			;;
+		qt-locale-da)
+			CAT="localization|Danish locale for Qt"
+			LOCALE="da" BOOK="danish" genpkg_locale
+			;;
+		qt-locale-de)
+			CAT="localization|German locale for Qt"
+			LOCALE="de" BOOK="german" genpkg_locale
+			;;
+		qt-locale-es)
+			CAT="localization|Spanish locale for Qt"
+			LOCALE="es" BOOK="spanish" genpkg_locale
+			;;
+		qt-locale-fr)
+			CAT="localization|French locale for Qt"
+			LOCALE="fr" BOOK="french" genpkg_locale
+			;;
+		qt-locale-hu)
+			CAT="localization|Hungarian locale for Qt"
+			LOCALE="hu" BOOK="hungarian" genpkg_locale
+			;;
+		qt-locale-pl)
+			CAT="localization|Polish locale for Qt"
+			LOCALE="pl" BOOK="polish" genpkg_locale
+			;;
+		qt-locale-pt)
+			CAT="localization|Portuguese locale for Qt"
+			LOCALE="pt" BOOK="" genpkg_locale
+			;;
+		qt-locale-ru)
+			CAT="localization|Russian locale for Qt"
+			LOCALE="ru" BOOK="russian" genpkg_locale
+			;;
+		qt-locale-sl)
+			CAT="localization|Slovenian locale for Qt"
+			LOCALE="sl" BOOK="" genpkg_locale
+			;;
+		qt-locale-sv)
+			CAT="localization|Swedish locale for Qt"
+			LOCALE="sv" BOOK="swedish" genpkg_locale
+			;;
+		qt-locale-uk)
+			CAT="localization|Ukrainian locale for Qt"
+			LOCALE="uk" BOOK="" genpkg_locale
+			;;
+		qt-locale-zh_CN)
+			CAT="localization|Chinese Simplified locale for Qt"
+			LOCALE="zh_CN" BOOK="" genpkg_locale
+			;;
+		qt-locale-zh_TW)
+			CAT="localization|Chinese Traditional locale for Qt"
+			LOCALE="zh_TW" BOOK="" genpkg_locale
+			;;
 	esac
 }
 
-post_install_libQtGui()
-{
-        for i in $(ls "$1/home" 2> /dev/null); do
-                [ -f "$1/home/$i/.config/Trolltech.conf" ] && continue
-                cp "$1/etc/skel/.config/Trolltech.conf" "$1/home/$i/.config"
-                chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config"
-        done
+post_install_libQtGui() {
+	for i in $(ls "$1/home" 2>/dev/null); do
+		[ -f "$1/home/$i/.config/Trolltech.conf" ] && continue
+		cp "$1/etc/skel/.config/Trolltech.conf" "$1/home/$i/.config"
+		chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config"
+	done
 }
diff -r ad29ddfee1c9 -r d5aab818505e qt5/receipt
--- a/qt5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qt5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,27 +22,30 @@
 xorg-libXcomposite-dev alsa-lib-dev gst1-plugins-base-dev gtk3-dev"
 # Name split packages according to sources structure, for example:
 # $src/qtgamepad/ -> qt5-gamepad
-SPLIT="qt5-3d        qt5-base             qt5-base-gtk3        \
-qt5-canvas3d         qt5-charts           qt5-connectivity     \
-qt5-datavis3d        qt5-declarative      qt5-gamepad          \
-qt5-graphicaleffects qt5-imageformats     qt5-location         \
-qt5-multimedia       qt5-networkauth      qt5-purchasing       \
-qt5-quickcontrols    qt5-quickcontrols2   qt5-remoteobjects    \
-qt5-script           qt5-scxml            qt5-sensors          \
-qt5-serialbus        qt5-serialport       qt5-speech           \
-qt5-svg              qt5-tools            qt5-virtualkeyboard  \
-qt5-wayland          qt5-webchannel       qt5-websockets       \
-qt5-x11extras        qt5-xmlpatterns      qt5-base-egl         \
+SPLIT="\
+$PACKAGE-3d               $PACKAGE-base             $PACKAGE-base-gtk3        \
+$PACKAGE-canvas3d         $PACKAGE-charts           $PACKAGE-connectivity     \
+$PACKAGE-datavis3d        $PACKAGE-declarative      $PACKAGE-gamepad          \
+$PACKAGE-graphicaleffects $PACKAGE-imageformats     $PACKAGE-location         \
+$PACKAGE-multimedia       $PACKAGE-networkauth      $PACKAGE-purchasing       \
+$PACKAGE-quickcontrols    $PACKAGE-quickcontrols2   $PACKAGE-remoteobjects    \
+$PACKAGE-script           $PACKAGE-scxml            $PACKAGE-sensors          \
+$PACKAGE-serialbus        $PACKAGE-serialport       $PACKAGE-speech           \
+$PACKAGE-svg              $PACKAGE-tools            $PACKAGE-virtualkeyboard  \
+$PACKAGE-wayland          $PACKAGE-webchannel       $PACKAGE-websockets       \
+$PACKAGE-x11extras        $PACKAGE-xmlpatterns      $PACKAGE-base-egl         \
 \
-qt5-locale-ar    qt5-locale-ca    qt5-locale-cs    qt5-locale-da \
-qt5-locale-de    qt5-locale-en    qt5-locale-es    qt5-locale-fa \
-qt5-locale-fi    qt5-locale-fr    qt5-locale-gl    qt5-locale-he \
-qt5-locale-hu    qt5-locale-it    qt5-locale-ja    qt5-locale-ko \
-qt5-locale-lt    qt5-locale-lv    qt5-locale-pl    qt5-locale-pt \
-qt5-locale-ru    qt5-locale-sk    qt5-locale-sl    qt5-locale-sv \
-qt5-locale-uk    qt5-locale-zh_CN qt5-locale-zh_TW \
+$PACKAGE-locale-ar    $PACKAGE-locale-ca    $PACKAGE-locale-cs    \
+$PACKAGE-locale-da    $PACKAGE-locale-de    $PACKAGE-locale-en    \
+$PACKAGE-locale-es    $PACKAGE-locale-fa    $PACKAGE-locale-fi    \
+$PACKAGE-locale-fr    $PACKAGE-locale-gl    $PACKAGE-locale-he    \
+$PACKAGE-locale-hu    $PACKAGE-locale-it    $PACKAGE-locale-ja    \
+$PACKAGE-locale-ko    $PACKAGE-locale-lt    $PACKAGE-locale-lv    \
+$PACKAGE-locale-pl    $PACKAGE-locale-pt    $PACKAGE-locale-ru    \
+$PACKAGE-locale-sk    $PACKAGE-locale-sl    $PACKAGE-locale-sv    \
+$PACKAGE-locale-uk    $PACKAGE-locale-zh_CN $PACKAGE-locale-zh_TW \
 \
-qt5-doc qt5-dev"
+$PACKAGE-doc $PACKAGE-dev"
 
 compile_rules() {
 	export QT5PREFIX=/usr # or /opt/qt5
@@ -94,7 +97,7 @@
 		-no-sse2 \
 		-skip qtwebengine &&
 	make &&
-	make INSTALL_ROOT=$install install || exit 1
+	make INSTALL_ROOT=$install install || return 1
 
 #	find $install$QT5PREFIX/lib/pkgconfig -name '*.pc' \
 #		-exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \; &&
@@ -191,7 +194,7 @@
 		qt5-base-egl)
 			copy libQt5Egl*so*
 			CAT="development|EGL libs"
-			DEPENDS="qt5-base mesa mesa-libegl mesa-libgbm" ;;
+			DEPENDS="qt5-base mesa mesa-libegl mesa-libgbm";;
 		*)
 			# examine folders in $src to understand what we need to copy from $install
 			examine="$src/qt${PACKAGE#qt5-}"
diff -r ad29ddfee1c9 -r d5aab818505e qtav/receipt
--- a/qtav/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtav/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="qt5-dev ffmpeg-dev openal-dev pulseaudio-dev xorg-libXv-dev \
 libva-dev mesa-dev libsdl2-dev"
-SPLIT="qtav-dev qtav-player qtav-qmlplayer qtav"
+SPLIT="$PACKAGE-dev $PACKAGE-player $PACKAGE-qmlplayer $PACKAGE"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e qtermwidget/receipt
--- a/qtermwidget/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtermwidget/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,10 +16,11 @@
 WGET_URL="https://github.com/lxde/qtermwidget/archive/$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake qt5-dev mesa-dev lxqt-build-tools"
-SPLIT="qtermwidget-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e qtfm/receipt
--- a/qtfm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtfm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
 # SliTaz package receipt.
 
 PACKAGE="qtfm"
-VERSION="5.9"
+VERSION="6.1.3"
 CATEGORY="x-window"
 SHORT_DESC="Small and lightweight file manager using QT library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="http://www.qtfm.org/"
-# "official" is v.5.5, but here is newer:
-# http://qt-apps.org/content/show.php/QtFM?content=158787
-WGET_URL="http://qt-apps.org/CONTENT/content-files/158787-qtfm.zip"
+WEB_SITE="https://qtfm.eu/"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="https://github.com/rodlie/qtfm/archive/$VERSION.tar.gz"
 
 DEPENDS="libQtGui libQtNetwork libmagic"
 BUILD_DEPENDS="cmake Qt4-dev qmake libmagic-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	lrelease $src/translations/*.ts
-	qmake && make && make INSTALL_ROOT=$DESTDIR install
+	qmake &&
+	make &&
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -rf $fs/usr/share/doc
 }
diff -r ad29ddfee1c9 -r d5aab818505e qtgain/receipt
--- a/qtgain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtgain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qtgain"
 VERSION="0.9.5"
 CATEGORY="multimedia"
-SHORT_DESC="Simple frontend for MP3Gain, VorbisGain, AACGain and Metaflac."
+SHORT_DESC="Simple frontend for MP3Gain, VorbisGain, AACGain and Metaflac"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://qt-apps.org/content/show.php/QtGain?content=56842"
+
 TARBALL="56842-QtGain.tar.lzma"
-WEB_SITE="http://qt-apps.org/content/show.php/QtGain?content=56842"
 WGET_URL="http://qt-apps.org/CONTENT/content-files/$TARBALL"
 
-DEPENDS="libQtCore libQtGui libQtNetwork"
 BUILD_DEPENDS="Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# rename source directory
-	mv QtGain $PACKAGE-$VERSION 2> /dev/null
+	mv QtGain $PACKAGE-$VERSION 2>/dev/null
 	cd $src
-	qmake && make
+	qmake &&
+	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps
 	cp -a $src/bin $fs/usr
 	cp -a $src/qtgain.png $fs/usr/share/pixmaps
 	cp -a $stuff/* $fs
 	chown -R root.root $fs
+	DEPENDS="libQtCore libQtGui libQtNetwork"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e qtkeychain/receipt
--- a/qtkeychain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtkeychain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,16 @@
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="cmake Qt4-dev qmake"
-SPLIT="qtkeychain-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
-	make && make install
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qtpanel/receipt
--- a/qtpanel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtpanel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,35 @@
 # SliTaz package receipt.
 
 PACKAGE="qtpanel"
-VERSION="548e4d3"
+VERSION="548e4d3" # FIXME
 CATEGORY="x-window"
 SHORT_DESC="Patched: size, scroll wheel min/max taskbar items. virt.desktops NOT supported"
+MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL"
 WEB_SITE="https://gitorious.org/qtpanel/qtpanel"
-MAINTAINER="psychomaniak@xakep.ru"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-DEPENDS="libQtGui xorg-libXdamage xorg-libXcomposite"
-BUILD_DEPENDS="Qt4-dev qmake cmake xorg-libX11-dev \
-xorg-libXcomposite-dev xorg-libXdamage-dev"
+BUILD_DEPENDS="Qt4-dev qmake cmake xorg-libX11-dev xorg-libXcomposite-dev \
+xorg-libXdamage-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	#sed -i 's|ddd ddMMM hh:mm||' clockapplet.cpp
-	mkdir b; cd b
-	cmake -DCMAKE_BUILD_TYPE=MinSizeRel ..;	make
+	mkdir b
+	cd    b
+	cmake \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		.. &&
+	make
 	mkdir -p $install/usr/bin
-	install	$src/b/$PACKAGE $install/usr/bin
-	rm -rf	$src/b
+	install $src/b/$PACKAGE $install/usr/bin
+	rm -rf $src/b
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-
-genpkg_rules()
-{
-	cp -a $install/*	$fs
-	mkdir -p		$fs/etc/xdg
-	cp -a $stuff/autostart	$fs/etc/xdg
+genpkg_rules() {
+	cp -a $install/* $fs
+	mkdir -p $fs/etc/xdg
+	cp -a $stuff/autostart $fs/etc/xdg
+	DEPENDS="libQtGui xorg-libXdamage xorg-libXcomposite"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qtractor/receipt
--- a/qtractor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtractor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,15 +3,14 @@
 PACKAGE="qtractor"
 VERSION="0.5.5"
 CATEGORY="multimedia"
-SHORT_DESC="Audio/MIDI multi-track sequencer application."
+SHORT_DESC="Audio/MIDI multi-track sequencer application"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://qtractor.sourceforge.net/qtractor-index.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://qtractor.sourceforge.net/qtractor-index.html"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="jack alsa-lib libsndfile ladspa \
-libvorbis libmad libsamplerate liblo libQtGui libQtXml libQtCore"
 BUILD_DEPENDS="qmake Qt4-dev jack-dev alsa-lib-dev \
 libsndfile-dev ladspa-dev libvorbis-dev libmad-dev libsamplerate-dev \
 xorg-libX11-dev zlib-dev liblo-dev lilv lv2 "
@@ -21,19 +20,16 @@
 # dssi : http://dssi.sourceforge.net/
 # vst : http://www.steinberg.net/
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="jack alsa-lib libsndfile ladspa \
+	libvorbis libmad libsamplerate liblo libQtGui libQtXml libQtCore"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e qtstyleplugins/receipt
--- a/qtstyleplugins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtstyleplugins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qtstyleplugins"
 VERSION="335dbec"
 CATEGORY="customization"
-SHORT_DESC="qt5 style plugins"
+SHORT_DESC="Qt5 style plugins"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL"
+WEB_SITE="https://github.com/qt/qtstyleplugins/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/qt/qtstyleplugins/"
 WGET_URL="${WEB_SITE}archive/${TARBALL/*-}"
 
-DEPENDS="qt5-base gtk2"
 BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
 freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
 glib-dev zlib-dev libxslt-python libxslt-dev gtk2-dev"
 
-compile_rules()
-{
-	cd src ;qmake;make;make INSTALL_ROOT=$DESTDIR DESTDIR=$DESTDIR install
+compile_rules() {
+	qmake
+	make &&
+	make INSTALL_ROOT=$install DESTDIR=$install install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="qt5-base gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qtwebkit/receipt
--- a/qtwebkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtwebkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,29 @@
 PACKAGE="qtwebkit"
 VERSION="5.212.0-alpha2"
 CATEGORY="network"
-SHORT_DESC="KDE version of Qt Webkit browser engine."
+SHORT_DESC="KDE version of Qt Webkit browser engine"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL"
+WEB_SITE="http://code.qt.io/cgit/qt/qtwebkit.git/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://code.qt.io/cgit/qt/qtwebkit.git/"
 WEB_SITE_2="https://github.com/annulen/webkit/"
 WGET_URL="${WEB_SITE_2}releases/download/${TARBALL/.tar*/}/$TARBALL"
 
-DEPENDS="qt5-base qt5-location qt5-sensors qt5-webchannel sqlite3 hyphen libxslt" # gstreamer1 gst1-plugins-base 
 BUILD_DEPENDS="qt5-dev cmake bison flex gperf ruby-dev xorg-dev mesa-dev \
 freetype-dev fontconfig-dev sqlite3-dev libpng16-dev libjpeg-turbo-dev icu-dev \
 glib-dev zlib-dev libxslt-python libxslt-dev gstreamer1-dev \
 gst1-plugins-base-dev hyphen-dev "
 
-compile_rules()
-{
+compile_rules() {
 	mkdir -p WebKitBuild/Release
 	cd WebKitBuild/Release
-        export CFLAGS=${CFLAGS/486 -Os/686 -O0}
+
+	export CFLAGS=${CFLAGS/486 -Os/686 -O0}
 	export CXXFLAGS=${CXXFLAGS/486 -Os/686 -O0}
 	QMAKE_CFLAGS=$CFLAGS QMAKE_CXXFLAGS=$CXXFLAGS \
-	cmake	-DPORT=Qt \
+	cmake \
+		-DPORT=Qt \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DENABLE_API_TESTS=OFF \
 		-DENABLE_WEBKIT2=OFF \
@@ -41,11 +42,11 @@
 		-DENABLE_MEDIA_SOURCE=OFF \
 		-DUSE_GSTREAMER=OFF \
 	../..
-	make && make install
+	make &&
+	make install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 # qtwebkit
 	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share/applications
 	cp -a $src/WebKitBuild/Release/bin/QtTestBrowser $fs/usr/bin
@@ -61,5 +62,6 @@
 
 # qtwebkit + qtwebkit-dev:
 	cp -a $install/* $fs
-
+	DEPENDS="qt5-base qt5-location qt5-sensors qt5-webchannel sqlite3 hyphen \
+	libxslt" # gstreamer1 gst1-plugins-base
 }
diff -r ad29ddfee1c9 -r d5aab818505e qtwitter/receipt
--- a/qtwitter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qtwitter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,25 @@
 PACKAGE="qtwitter"
 VERSION="0.10.0"
 CATEGORY="network"
-SHORT_DESC="A Qt-based, cross-network microblogging client."
-MAINTAINER="ben@seawolfsanctuary.com"
+SHORT_DESC="A Qt-based, cross-network microblogging client"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL3"
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WEB_SITE="http://blog.ayoy.net/qtwitter"
 WGET_URL="http://files.ayoy.net/$PACKAGE/release/$VERSION/src/$TARBALL"
 
-DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
-libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
-libQtOpenGL libQtSql libQtWebkit qoauth qca"
 BUILD_DEPENDS="qmake xorg-dev dbus-dev Qt4-dev qoauth qca-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|-Wl,-rpath|-Wl,--copy-dt-needed-entries -lX11 &|' \
 		qtwitter-app/qtwitter-app.pro
-	qmake PREFIX="/usr" && \
-	make -j4 && make DESTDIR=$DESTDIR install
+
+	qmake PREFIX="/usr" &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/bin \
 		$fs/usr/share/applications $fs/usr/share/pixmaps
 
@@ -38,4 +32,7 @@
 	# Copy .desktop file:
 	cp -a $src/qtwitter-app/x11/*.desktop $fs/usr/share/applications
 	cp -a $src/qtwitter-app/x11/icons/32x32/*.png $fs/usr/share/pixmaps
+	DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml \
+	libQtDesigner libQtScript libQt3Support libQtClucene libQtDBus libQtHelp \
+	libQtOpenGL libQtSql libQtWebkit qoauth qca"
 }
diff -r ad29ddfee1c9 -r d5aab818505e quarry/receipt
--- a/quarry/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quarry/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -24,7 +24,7 @@
 		--enable-sgf-utils \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e quazip/receipt
--- a/quazip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quazip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,29 @@
 PACKAGE="quazip"
 VERSION="0.6.1"
 CATEGORY="system-tools"
-SHORT_DESC="Qt/C++ wrapper for ZIP/UNZIP package."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Qt/C++ wrapper for ZIP/UNZIP package"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://quazip.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="http://quazip.sourceforge.net/"
-WGET_URL="$SF_MIRROR/project/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev Qt4-dev qmake"
-SPLIT="quazip-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/quazip
-	qmake PREFIX=$DESTDIR/usr &&
+	qmake PREFIX=$install/usr &&
 	make &&
 	make staticlib &&
 	make install &&
-	install -m 0644 libquazip.a $DESTDIR/usr/lib &&
+	install -m 0644 libquazip.a $install/usr/lib &&
 	install -D -m 0644 ../FindQuaZip.cmake \
-		$DESTDIR/usr/share/apps/cmake/modules/FindQuaZip.cmake
+		$install/usr/share/apps/cmake/modules/FindQuaZip.cmake
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		quazip)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e quesoglc/receipt
--- a/quesoglc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quesoglc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,8 @@
 PACKAGE="quesoglc"
 VERSION="0.7.2"
 CATEGORY="x-window"
-SHORT_DESC="The OpenGL Character Renderer (GLC) is a state machine that \
-provides OpenGL programs with character rendering services via an application \
-programming interface (API)"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="OpenGL Character Renderer (GLC) state machine"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://quesoglc.sourceforge.net/"
 
@@ -16,13 +14,13 @@
 BUILD_DEPENDS="freetype-dev fontconfig-dev freeglut-dev fribidi-dev \
 mesa-dev expat-dev xorg-libXxf86vm-dev util-linux-uuid-dev xorg-libxcb-dev \
 libxml2-dev xorg-libxshmfence-dev glu-dev"
-SPLIT="quesoglc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e quilt/receipt
--- a/quilt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quilt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,11 @@
 BUILD_DEPENDS="diffutils perl patch"
 
 compile_rules() {
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make BUILD_ROOT=$DESTDIR install
+	make BUILD_ROOT=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e quodlibet/receipt
--- a/quodlibet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quodlibet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,29 @@
 VERSION="2.0"
 CATEGORY="multimedia"
 SHORT_DESC="An audio player written in pygtk"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="gst0-plugins-bad gst0-ffmpeg"
+WEB_SITE="https://quodlibet.readthedocs.io/en/latest/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://quodlibet.readthedocs.io/en/latest/"
 WGET_URL="$WEB_SITE/files/$TARBALL" # FIXME
-TAGS="multimedia audio sound music player python"
 
-DEPENDS="python-dbus gst0-python gst0-plugins-base gst0-plugins-good \
-gst0-plugins-ugly mutagen python-pygtk gstreamer0"
 BUILD_DEPENDS="python-dbus-dev gst0-python-dev gst0-plugins-base-dev \
 gst0-plugins-good gstreamer0-dev gst0-plugins-ugly python-pygtk-dev intltool \
-gettext gtk2-dev python-dev file"
+gettext-dev gtk2-dev python-dev file"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./setup.py build
-	./setup.py install --prefix=$DESTDIR/usr
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --prefix=$install/usr || return 1
+
+	mkdir -p $install/usr/share/pixmaps/
+	cp $stuff/*.png $install/usr/share/pixmaps/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib $fs/usr/share $fs/usr/share/pixmaps
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/python* $fs/usr/lib
-	cp -a stuff/*.png $fs/usr/share/pixmaps/
+genpkg_rules() {
+	copy @std
+	DEPENDS="python-dbus gst0-python gst0-plugins-base gst0-plugins-good \
+	gst0-plugins-ugly mutagen python-pygtk gstreamer0"
+	SUGGESTED="gst0-plugins-bad gst0-ffmpeg"
+	TAGS="multimedia audio sound music player python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e quota/receipt
--- a/quota/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/quota/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,16 +11,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/linuxquota/$TARBALL"
 
-BUILD_DEPENDS="gettext libcomerr-dev e2fsprogs-dev dbus-dev libnl-dev \
+BUILD_DEPENDS="gettext-dev libcomerr-dev e2fsprogs-dev dbus-dev libnl-dev \
 rpcsvc-proto libtirpc-dev"
-SPLIT="quota-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/tirpc/"
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make ROOTDIR=$DESTDIR install
+	make ROOTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e qupzilla/receipt
--- a/qupzilla/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qupzilla/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="Qt4-dev qmake openssl-dev xorg-libX11-dev"
-SPLIT="qupzilla-locales"
+SPLIT="$PACKAGE-locales"
 
 COOKOPTS="!pixmaps"
 
diff -r ad29ddfee1c9 -r d5aab818505e qutim/receipt
--- a/qutim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qutim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,39 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qutim"
 VERSION="0.3.1"
 CATEGORY="network"
-SHORT_DESC="Multiprotocol IM, written in qt4"
+SHORT_DESC="Multiprotocol IM written in Qt4"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL LGPL CC-BY"
+WEB_SITE="http://qutim.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://qutim.org"
-WGET_URL="$WEB_SITE/dwnl/40/$TARBALL"
+WGET_URL="${WEB_SITE}dwnl/40/$TARBALL"
 
-DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen qca-ossl"
-BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev xorg-libXScrnSaver-dev dbus-dev libjreen-dev mesa-dev"
+BUILD_DEPENDS="Qt4-dev qmake cmake qca-dev xorg-libXScrnSaver-dev dbus-dev \
+libjreen-dev mesa-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i  -e 's/ moc_options /&moc_target /' \
+compile_rules() {
+	sed \
+		-e 's/ moc_options /&moc_target /' \
 		-e 's/\(QT4_CREATE_MOC_COMMAND.*\))/\1 "${moc_target}")/' \
-			core/cmake/QutIMMacros.cmake
-	mkdir ../qutim-build && cd ../qutim-build
-	cmake ../$PACKAGE-$VERSION -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=release \
-	-DQUTIM_ENABLE_ALL_PLUGINS=on &&
+		-i core/cmake/QutIMMacros.cmake
+	mkdir ../qutim-build
+	cd    ../qutim-build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=release \
+		-DQUTIM_ENABLE_ALL_PLUGINS=on \
+		../$PACKAGE-$VERSION &&
 	make $MAKEOPTS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
+	DEPENDS="qt4 qca qt4-phonon xorg-libXScrnSaver libjreen qca-ossl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qxkb/receipt
--- a/qxkb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qxkb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="qxkb"
 VERSION="0.4.6"
@@ -7,22 +7,23 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://code.google.com/p/qxkb/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://qxkb.googlecode.com/files/$TARBALL"
 
-DEPENDS="glibc-base libQtSvg xorg-libxkbfile"
 BUILD_DEPENDS="cmake Qt4-dev xorg-libxkbfile-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build && cd build 
-	cmake  -DCMAKE_INSTALL_PREFIX=/usr .. &&
-	make && make install
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="glibc-base libQtSvg xorg-libxkbfile"
 }
diff -r ad29ddfee1c9 -r d5aab818505e qxmpp/receipt
--- a/qxmpp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/qxmpp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="qmake Qt4-dev speex-dev libtheora-dev libogg-dev libvpx-dev \
 doxygen wget"
-SPLIT="qxmpp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/ltheoraenc/& -logg/' src/src.pro
diff -r ad29ddfee1c9 -r d5aab818505e radare2/receipt
--- a/radare2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/radare2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,22 @@
 PACKAGE="radare2"
 VERSION="0.9.8"
 CATEGORY="development"
-SHORT_DESC="The reverse engineering framework."
+SHORT_DESC="The reverse engineering framework"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3 LGPL3"
+WEB_SITE="https://www.radare.org/r/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://radare.org/"
-WGET_URL="${WEB_SITE}get/$TARBALL"
+WGET_URL="${WEB_SITE}get/$TARBALL" # FIXME
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e radeontool/receipt
--- a/radeontool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/radeontool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e radiotray/receipt
--- a/radiotray/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/radiotray/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,24 @@
 PACKAGE="radiotray"
 VERSION="0.6.1"
 CATEGORY="multimedia"
-SHORT_DESC="Online radio streaming player that runs on system tray."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Online radio streaming player that runs on system tray"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://radiotray.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://radiotray.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="python python-lxml gst0-python"
-BUILD_DEPENDS="python python-dev python-pyxdg gst0-python-dev gettext"
+BUILD_DEPENDS="python-dev python-pyxdg gst0-python-dev gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --prefix=/usr --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --prefix=/usr --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/radiotray $fs/usr/share
+	DEPENDS="python python-lxml gst0-python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e radiusclient-ng/receipt
--- a/radiusclient-ng/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/radiusclient-ng/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.berlios.de/radiusclient-ng/$TARBALL" # FIXME
 
-SPLIT="radiusclient-ng-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e radvd/receipt
--- a/radvd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/radvd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc
 	touch $install/etc/radvd.conf
diff -r ad29ddfee1c9 -r d5aab818505e rage/receipt
--- a/rage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.0"
 CATEGORY="multimedia"
 SHORT_DESC="Enlightenment media center"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://www.enlightenment.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e rainbow-cm/receipt
--- a/rainbow-cm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rainbow-cm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/rainbow-cm/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gettext intltool gtk2-dev"
+BUILD_DEPENDS="automake gettext-dev intltool gtk2-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e raine/receipt
--- a/raine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/raine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,18 +6,16 @@
 SHORT_DESC="Emulates M68K Taito and Jaleco arcade machines"
 MAINTAINER="devl547@gmail.com"
 LICENSE="other"
+WEB_SITE="http://rainemu.swishparty.co.uk/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://rainemu.swishparty.co.uk"
 WGET_URL="$WEB_SITE/cgi-bin/gitweb.cgi?p=raine;a=snapshot;h=02988ce197bc5b9f1a9eae66251e883d649cc03b;sf=tgz"
 EXTRA_SOURCE_FILES="raines-0.51.9.tar.bz2"
 
-DEPENDS="libsdl zlib libpng16 libsdl-image liblzma libsdl-ttf muparser mesa"
 BUILD_DEPENDS="libsdl-dev zlib-dev libpng16-dev nasm libsdl-image-dev xz-dev \
 libsdl-ttf-dev muparser-dev mesa-dev glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	touch -d 197001010000 make.dep cpuinfo
 	[ -s "$SRC/raines-0.51.9.tar.bz2" ] ||
 		wget -P $SRC \
@@ -26,13 +24,14 @@
 	mv raine-0.51.9/fonts .
 	mv raine-0.51.9/scripts .
 	mv raine-0.51.9/bitmaps .
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR PREFIX=$install/usr/ install
+
+	make $MAKEFLAGS &&
+	make DESTDIR=$install PREFIX=$install/usr/ install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/games $fs/usr/
 	cp -a $install/usr/share $fs/usr/
+	DEPENDS="libsdl zlib libpng16 libsdl-image liblzma libsdl-ttf muparser mesa"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ranger/receipt
--- a/ranger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ranger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ranger"
 VERSION="1.7.2"
 CATEGORY="utilities"
-SHORT_DESC="File manager."
+SHORT_DESC="File manager"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://nongnu.org/ranger/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://nongnu.org/ranger/"
 WGET_URL="http://nongnu.org/ranger/$PACKAGE-stable.tar.gz"
-TAGS="file-manager"
 
-DEPENDS="python"
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install || return 1
+
+	find $install -type f -exec chmod g-w '{}' \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	# remove stuff
-	rm -rf $fs/usr/share/man
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
+	TAGS="file-manager"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rapidsvn/receipt
--- a/rapidsvn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rapidsvn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,23 @@
 PACKAGE="rapidsvn"
 VERSION="0.12.1"
 CATEGORY="development"
-SHORT_DESC="A cross-platform GUI front-end for the Subversion revision system."
-MAINTAINER="stefanossofroniou542@gmail.com"
+SHORT_DESC="A cross-platform GUI front-end for the Subversion revision system"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://rapidsvn.tigris.org/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.rapidsvn.org/download/release/$VERSION/$TARBALL"
 TAGS="subversion svn version-control versioning"
 
-DEPENDS="wxWidgets28 libsvn apr libltdl xorg-libXxf86vm libproxy libsqlite3 \
-libsasl apr-util"
-BUILD_DEPENDS="$DEPENDS libtool wxWidgets28-dev subversion-dev apr-dev \
+BUILD_DEPENDS="xorg-libXxf86vm libtool wxWidgets28-dev subversion-dev apr-dev \
 apr-util-dev cyrus-sasl-dev neon-dev libproxy-dev sqlite3-dev expat-dev python \
 util-linux-uuid-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp $stuff/client_ls.cpp src/svncpp/client_ls.cpp
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		--with-apr-config=apr-1-config \
 		--with-apu-config=apu-1-config \
 		--with-neon-config=neon-config \
@@ -29,13 +27,14 @@
 		--with-svn-include=/usr/include \
 		--with-svn-lib=/usr/lib \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="wxWidgets28 libsvn apr libltdl xorg-libXxf86vm libproxy libsqlite3 \
+	libsasl apr-util"
 }
diff -r ad29ddfee1c9 -r d5aab818505e raptor/receipt
--- a/raptor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/raptor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.15"
 CATEGORY="multimedia"
 SHORT_DESC="A C library that parses RDF/XML/N-Triples into RDF triples"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://librdf.org/raptor/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://librdf.org/dist/source/$TARBALL"
 
 BUILD_DEPENDS="perl libxml2-dev libxslt-dev curl-dev yajl-dev"
-SPLIT="raptor-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e rarian/receipt
--- a/rarian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rarian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="misc"
 SHORT_DESC="Documentation meta-data library, designed as a replacement for \
 Scrollkeeper"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="https://rarian.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rarian.html"
@@ -14,7 +14,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gfortran libxslt-dev"
-SPLIT="rarian-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e raspberrypi-vc/receipt
--- a/raspberrypi-vc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="raspberrypi-vc"
-GITHASH="1db68b5da75330e4d21fa10b8271c0f463d605d2"
-VERSION=${GITHASH:0:6}
-CATEGORY="system-tools"
-SHORT_DESC="Raspberry Pi VideoCore Tools (vcdbg, vcgencmd, raspivid, etc)."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="custom"
-WEB_SITE="http://www.raspberrypi.org/"
-REPOLOGY="rpi-firmware"
-
-SOURCE="rpi-firmware"
-TARBALL="$SOURCE-$VERSION.zip"
-WGET_URL="https://codeload.github.com/raspberrypi/firmware/zip/$GITHASH"
-TAGS="raspberrypi rpi"
-HOST_ARCH="arm"
-
-BUILD_DEPENDS="wget"
-SPLIT="raspberrypi-vc raspberrypi-boot raspberrypi-boot-x"
-
-# Cross tool PATH is not set in genpkg_rules
-compile_rules()
-{
-	echo -n "Stripping VideoCore libraries..."
-	${ARCH}-slitaz-linux-gnueabi-strip -s ${src}/opt/vc/lib/*.so
-	status
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	case $PACKAGE in
-	raspberrypi-vc)
-		vc="$fs/opt/vc"
-		mkdir -p ${fs}/opt
-		cp -a ${src}/opt/vc ${fs}/opt
-		echo -n "Cleaning: VC libraries devel files"
-		rm -rf ${vc}/include ${vc}/src ${vc}/lib/*.a
-		status
-		;;
-	raspberrypi-boot)
-		CAT="system-tools|Raspberry Pi bootloader firmware."
-		mkdir -p $fs/boot
-		for fw in bootcode.bin fixup.dat start.elf
-		do
-			cp -a ${src}/boot/${fw} ${fs}/boot
-		done
-		;;
-	raspberrypi-boot-x)
-		CAT="system-tools|Raspberry Pi bootloader firmware with Pi camera support."
-		mkdir -p $fs/boot
-		for fw in start_x.elf fixup_x.dat
-		do
-			cp -a ${src}/boot/${fw} ${fs}/boot
-		done
-		;;
-	esac
-}
-
-# PATH + LD_LIBRARY_PATH
-post_install_raspberrypi_vc()
-{
-	# PATH + LD_LIBRARY_PATH
-	if ! fgrep -q '/opt/vc/bin' ${1}/etc/profile; then
-		echo -n "Enabling: /opt/vc/bin /opt/vc/lib"
-		cat >> ${1}/etc/profile << EOT
-
-# Raspberry Pi VC tools and libs
-export PATH=\$PATH:/opt/vc/bin
-export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:/opt/vc/lib
-
-EOT
-		status
-	fi
-	true
-}
diff -r ad29ddfee1c9 -r d5aab818505e rasqal/receipt
--- a/rasqal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rasqal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="raptor-dev pcre-dev mhash-dev util-linux-uuid-dev gmp-dev \
 mpfr-dev"
-SPLIT="rasqal-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e ratmenu/receipt
--- a/ratmenu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ratmenu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,26 +4,25 @@
 VERSION="2.3.20"
 CATEGORY="x-window"
 SHORT_DESC="Menu generator created for ratpoison, but works with any WM"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
+WEB_SITE="https://www.debian.org/distrib/packages" # and ..?
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
-WEB_SITE="http://packages.debian.org"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/r/ratmenu/$TARBALL"
 
-DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make PREFIX=/usr &&
-	make PREFIX=$DESTDIR/usr MANDIR=$DESTDIR/usr/share/man install
+	make \
+		PREFIX=$install/usr \
+		MANDIR=$install/usr/share/man \
+		install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="xorg-libX11"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e ratpoison/receipt
--- a/ratpoison/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ratpoison/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,26 @@
 PACKAGE="ratpoison"
 VERSION="1.4.5"
 CATEGORY="x-window"
-SHORT_DESC="Ratpoison is an extremely light-weightWM using only keyboard."
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="Extremely lightweight WM using only keyboard"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.nongnu.org/ratpoison/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.nongnu.org/ratpoison/"
 WGET_URL="http://savannah.nongnu.org/download/$PACKAGE/$TARBALL"
-TAGS="window-manager"
 
-DEPENDS="microperl xorg-libXtst xorg-libXinerama"
 BUILD_DEPENDS="xorg-libXtst-dev xorg-libXinerama-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure && make CFLAGS="$CFLAGS -DHAVE_GETLINE" && make install
+compile_rules() {
+	./configure &&
+	make CFLAGS="$CFLAGS -DHAVE_GETLINE" &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/ratpoison $fs/usr/share
+	DEPENDS="microperl xorg-libXtst xorg-libXinerama"
+	TAGS="window-manager"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rawstudio/receipt
--- a/rawstudio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rawstudio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2"
 CATEGORY="graphics"
 SHORT_DESC="An open source raw-image converter written in GTK+"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://rawstudio.org/"
@@ -13,9 +13,7 @@
 DEPENDS="desktop-file-utils dbus exiv2 gconf gtk2 lcms jpeg libjpeg tiff libxml2"
 BUILD_DEPENDS="exiv2-dev gconf-dev gtk2-dev dbus-dev lcms-dev jpeg-dev tiff-dev libxml2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export CXXFLAGS="-Wno-narrowing"
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
 	export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
@@ -25,12 +23,11 @@
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/applications $fs/usr/share
diff -r ad29ddfee1c9 -r d5aab818505e razorqt/receipt
--- a/razorqt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/razorqt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="razorqt"
 VERSION="0.5.2"
 CATEGORY="x-window"
-SHORT_DESC="Light and fast QT based Desktop Environment."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Light and fast QT based Desktop Environment"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://razor-qt.org/"
@@ -13,148 +13,150 @@
 BUILD_DEPENDS="cmake Qt4-dev qmake xorg-dev libmagic-dev upower-dev \
 grep libstatgrab-dev alsa-lib-dev polkit-dev polkit-qt-dev glib-dev \
 lightdm-qt-dev imagemagick"
-SPLIT="razorqt-appswitcher razorqt-autosuspend razorqt-dev razorqt-locale-cs \
-razorqt-locale-da razorqt-locale-de razorqt-locale-el razorqt-locale-es \
-razorqt-locale-fr razorqt-locale-hu razorqt-locale-id razorqt-locale-it \
-razorqt-locale-misc razorqt-locale-pl razorqt-locale-pt razorqt-locale-ru \
-razorqt-locale-sl razorqt-locale-sv razorqt-locale-uk razorqt-locale-zh \
-razorqt-policykit-agent razorqt-power razorqt-runner razorqt-themes"
+SPLIT="\
+$PACKAGE-appswitcher $PACKAGE-autosuspend $PACKAGE-dev \
+$PACKAGE-locale-cs   $PACKAGE-locale-da   $PACKAGE-locale-de \
+$PACKAGE-locale-el   $PACKAGE-locale-es   $PACKAGE-locale-fr \
+$PACKAGE-locale-hu   $PACKAGE-locale-id   $PACKAGE-locale-it \
+$PACKAGE-locale-misc $PACKAGE-locale-pl   $PACKAGE-locale-pt \
+$PACKAGE-locale-ru   $PACKAGE-locale-sl   $PACKAGE-locale-sv \
+$PACKAGE-locale-uk   $PACKAGE-locale-zh   $PACKAGE-policykit-agent \
+$PACKAGE-power       $PACKAGE-runner      $PACKAGE-themes"
 
 COOKOPTS="!menus"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make install
 
 	# save space (png -> jpg)
 	cd $install/usr/share/razor/themes/light
 	convert ./simple_blue_widescreen.png ./simple_blue_widescreen.jpg
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	razorqt)
-		DEPENDS="libQtDBus libQtGui libmagic libstatgrab \
+		razorqt)
+			DEPENDS="libQtDBus libQtGui libmagic libstatgrab \
 			xorg-libXcomposite xorg-libXcursor xorg-libXdamage \
 			lightdm-qt"
-		SUGGESTED="razorqt-themes razorqt-appswitcher razorqt-power \
+			SUGGESTED="razorqt-themes razorqt-appswitcher razorqt-power \
 			razorqt-runner razorqt-autosuspend"
 
-		# copy all, then remove unneeded
-		cp -a $install/* $fs
+			# copy all, then remove unneeded
+			cp -a $install/* $fs
 
-		# Dev-files --> razorqt-dev
-		rm -rf $fs/usr/include
-		rm -rf $fs/usr/lib/pkgconfig
+			# Dev-files --> razorqt-dev
+			rm -rf $fs/usr/include
+			rm -rf $fs/usr/lib/pkgconfig
 
-		# Language-files --> razorqt-locale-*
-		find $fs -name '*.qm' -delete
+			# Language-files --> razorqt-locale-*
+			find $fs -name '*.qm' -delete
 
-		# Appswitcher --> razorqt-appswitcher
-		rm -f $fs/usr/bin/razor-appswitcher
-		rm -f $fs/etc/xdg/autostart/razor-appswitcher.desktop
+			# Appswitcher --> razorqt-appswitcher
+			rm -f $fs/usr/bin/razor-appswitcher
+			rm -f $fs/etc/xdg/autostart/razor-appswitcher.desktop
 
-		# Autosuspend --> razorqt-autosuspend
-		rm -f $fs/usr/bin/razor-autosuspend
-		rm -f $fs/usr/bin/razor-config-autosuspend
-		rm -f $fs/etc/xdg/autostart/razor-autosuspend.desktop
-		rm -f $fs/usr/share/applications/razor-config-autosuspend.desktop
+			# Autosuspend --> razorqt-autosuspend
+			rm -f $fs/usr/bin/razor-autosuspend
+			rm -f $fs/usr/bin/razor-config-autosuspend
+			rm -f $fs/etc/xdg/autostart/razor-autosuspend.desktop
+			rm -f $fs/usr/share/applications/razor-config-autosuspend.desktop
 
-		# Policykit-agent --> razorqt-policykit-agent
-		rm -f $fs/usr/bin/razor-policykit-agent
-		rm -f $fs/etc/xdg/autostart/razor-policykit-agent.desktop
+			# Policykit-agent --> razorqt-policykit-agent
+			rm -f $fs/usr/bin/razor-policykit-agent
+			rm -f $fs/etc/xdg/autostart/razor-policykit-agent.desktop
 
-		# Power --> razorqt-power
-		rm -f $fs/usr/bin/razor-power
-		rm -f $fs/usr/share/applications/razor-power.desktop
+			# Power --> razorqt-power
+			rm -f $fs/usr/bin/razor-power
+			rm -f $fs/usr/share/applications/razor-power.desktop
 
-		# Runner --> razorqt-runner
-		rm -f $fs/usr/bin/razor-runner
-		rm -f $fs/etc/xdg/autostart/razor-runner.desktop
+			# Runner --> razorqt-runner
+			rm -f $fs/usr/bin/razor-runner
+			rm -f $fs/etc/xdg/autostart/razor-runner.desktop
 
-		# Themes (all but light) --> razorqt-themes
-		find $fs/usr/share/razor/themes -maxdepth 1 -mindepth 1 -type d \
-			\( ! -name light \) -exec rm -rf \{\} \;
-		rm -f $fs/usr/share/razor/themes/light/simple_blue_widescreen.png
-		rm -f $fs/usr/share/razor/themes/light/96640-simple_blue_widescreen.svg
-		sed 's|png|jpg|' -i $fs/usr/share/razor/themes/light/wallpaper.cfg
+			# Themes (all but light) --> razorqt-themes
+			find $fs/usr/share/razor/themes -maxdepth 1 -mindepth 1 -type d \
+				\( ! -name light \) -exec rm -rf \{\} \;
+			rm -f $fs/usr/share/razor/themes/light/simple_blue_widescreen.png
+			rm -f $fs/usr/share/razor/themes/light/96640-simple_blue_widescreen.svg
+			sed 's|png|jpg|' -i $fs/usr/share/razor/themes/light/wallpaper.cfg
 
-		# Remove confupdate (Port desktop.conf syntax from 0.4.x to 0.5.0 format)
-		rm -f $fs/usr/bin/razor-confupdate
-		rm -rf $fs/usr/lib/razor-confupdate_bin
-		rm -rf $fs/usr/share/razor/razor-confupdate
+			# Remove confupdate (Port desktop.conf syntax from 0.4.x to 0.5.0 format)
+			rm -f $fs/usr/bin/razor-confupdate
+			rm -rf $fs/usr/lib/razor-confupdate_bin
+			rm -rf $fs/usr/share/razor/razor-confupdate
 
-		# Remove heavy graphics
-		rm -f $fs/usr/share/razor/graphics/rqt*
+			# Remove heavy graphics
+			rm -f $fs/usr/share/razor/graphics/rqt*
 
-		# Remove file - not use KDM
-		rm -rf $fs/usr/share/apps
+			# Remove file - not use KDM
+			rm -rf $fs/usr/share/apps
 
-		# Remove empty folders
-		for dir in $(find $fs/usr/share -type d); do
-			rmdir --ignore-fail-on-non-empty $dir
-		done
+			# Remove empty folders
+			for dir in $(find $fs/usr/share -type d); do
+				rmdir --ignore-fail-on-non-empty $dir
+			done
 
-		# Custom SliTaz integration
-		cp -a $stuff/*.conf $fs/etc/razor
-		;;
-	razorqt-appswitcher)
-		CAT="x-window|Razor-qt Apps switcher plugin."
-		DEPENDS="razorqt"
-		mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
-		cp -a $install/usr/bin/razor-appswitcher $fs/usr/bin
-		cp -a $install/etc/xdg/autostart/razor-appswitcher.desktop \
-			$fs/etc/xdg/autostart
-		;;
-	razorqt-autosuspend)
-		CAT="x-window|Razor-qt suspend manage application tool."
-		DEPENDS="razorqt"
-		mkdir -p \
-			$fs/usr/bin \
-			$fs/etc/xdg/autostart \
-			$fs/usr/share/applications
-		cp -a $install/usr/bin/razor-autosuspend $fs/usr/bin
-		cp -a $install/usr/bin/razor-config-autosuspend $fs/usr/bin
-		cp -a $install/etc/xdg/autostart/razor-autosuspend.desktop \
-			$fs/etc/xdg/autostart
-		cp $install/usr/share/applications/razor-config-autosuspend.desktop \
-			$fs/usr/share/applications
-		;;
-	razorqt-dev)
-		CAT="development|Development files for the QT based Razor desktop"
-		DEPENDS="Qt4-dev"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		;;
-	razorqt-locale-misc)
-		CAT="localization|Miscelaneous locales for Razor-qt not included in razorqt-locale-*"
-		LOCALES="cs da de el es fr hu id it pl pt ru sl sv uk zh"
+			# Custom SliTaz integration
+			cp -a $stuff/*.conf $fs/etc/razor
+			;;
+		*-appswitcher)
+			CAT="x-window|apps switcher plugin"
+			DEPENDS="razorqt"
+			mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
+			cp -a $install/usr/bin/razor-appswitcher $fs/usr/bin
+			cp -a $install/etc/xdg/autostart/razor-appswitcher.desktop \
+				$fs/etc/xdg/autostart
+			;;
+		*-autosuspend)
+			CAT="x-window|suspend manage application tool"
+			DEPENDS="razorqt"
+			mkdir -p \
+				$fs/usr/bin \
+				$fs/etc/xdg/autostart \
+				$fs/usr/share/applications
+			cp -a $install/usr/bin/razor-autosuspend $fs/usr/bin
+			cp -a $install/usr/bin/razor-config-autosuspend $fs/usr/bin
+			cp -a $install/etc/xdg/autostart/razor-autosuspend.desktop \
+				$fs/etc/xdg/autostart
+			cp $install/usr/share/applications/razor-config-autosuspend.desktop \
+				$fs/usr/share/applications
+			;;
+		*-dev)
+			CAT="development|Development files for the QT based Razor desktop"
+			DEPENDS="Qt4-dev"
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+			cp -a $install/usr/include $fs/usr
+			;;
+		*-locale-misc)
+			CAT="localization|Miscelaneous locales for Razor-qt not included in razorqt-locale-*"
+			LOCALES="cs da de el es fr hu id it pl pt ru sl sv uk zh"
 
-		# copy all translations
-		cd $install
-		qms=$(find . -name "*.qm" | sed 's|^.||')
-		for qm in $qms; do
-			mkdir -p $(dirname $fs$qm)
-			cp -a $install$qm $fs$qm
-		done
-		# remove translations that exists in razorqt-locale-*
-		for locale in $LOCALES; do
-			cook razorqt-locale-$locale
-			for qm in $(cat $WOK/razorqt-locale-$locale/taz/*/files.list); do
-				rm -f $fs$qm
+			# copy all translations
+			cd $install
+			qms=$(find . -name "*.qm" | sed 's|^.||')
+			for qm in $qms; do
+				mkdir -p $(dirname $fs$qm)
+				cp -a $install$qm $fs$qm
 			done
-		done
-		;;
-	razorqt-locale-*)
-		LOCALE="${PACKAGE#razorqt-locale-}"
-		while read code name; do
-			[ $code == $LOCALE ] && break
-		done <<EOT
+			# remove translations that exists in razorqt-locale-*
+			for locale in $LOCALES; do
+				cook razorqt-locale-$locale
+				for qm in $(cat $WOK/razorqt-locale-$locale/taz/*/files.list); do
+					rm -f $fs$qm
+				done
+			done
+			;;
+		*-locale-*)
+			LOCALE="${PACKAGE#razorqt-locale-}"
+			while read code name; do
+				[ $code == $LOCALE ] && break
+			done <<EOT
 cs	Czech
 da	Danish
 de	German
@@ -172,75 +174,73 @@
 uk	Ukrainian
 zh	Chinese
 EOT
-		CAT="localization|$name locale for Razor-qt"
-		cd $install
-		qms=$(find . \( -name "*_$LOCALE.qm" \) -o \( -name "*_${LOCALE}_*.qm" \) | sed 's|^.||')
-		for qm in $qms; do
-			mkdir -p $(dirname $fs$qm)
-			cp -a $install$qm $fs$qm
-		done
-		;;
-	razorqt-policykit-agent)
-		CAT="x-window|Razor-qt lightweight PolicyKit agent/user interface."
-		DEPENDS="razorqt polkit polkit-qt"
-		mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
-		cp -a $install/usr/bin/razor-policykit-agent $fs/usr/bin
-		cp -a $install/etc/xdg/autostart/razor-policykit-agent.desktop \
-			$fs/etc/xdg/autostart
-		;;
-	razorqt-power)
-		CAT="x-window|Razor-qt power management component."
-		DEPENDS="razorqt upower"
-		mkdir -p $fs/usr/bin $fs/usr/share/applications
-		cp -a $install/usr/bin/razor-power $fs/usr/bin
-		cp $install/usr/share/applications/razor-power.desktop \
-			$fs/usr/share/applications
-		;;
-	razorqt-runner)
-		CAT="x-window|Razor-qt quick launch and runner application."
-		DEPENDS="razorqt"
-		mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
-		cp -a $install/usr/bin/razor-runner $fs/usr/bin
-		cp -a $install/etc/xdg/autostart/razor-runner.desktop \
-			$fs/etc/xdg/autostart
-		;;
-	razorqt-themes)
-		CAT="x-window|Extra themes for Razor-qt desktop"
-		DEPENDS="razorqt"
-		mkdir -p $fs/usr/share/razor
-		cp -a $install/usr/share/razor/themes $fs/usr/share/razor
-		rm -rf $fs/usr/share/razor/themes/light
+			CAT="localization|$name locale"
+			cd $install
+			qms=$(find . \( -name "*_$LOCALE.qm" \) -o \( -name "*_${LOCALE}_*.qm" \) | sed 's|^.||')
+			for qm in $qms; do
+				mkdir -p $(dirname $fs$qm)
+				cp -a $install$qm $fs$qm
+			done
+			;;
+		*-policykit-agent)
+			CAT="x-window|lightweight PolicyKit agent/user interface"
+			DEPENDS="razorqt polkit polkit-qt"
+			mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
+			cp -a $install/usr/bin/razor-policykit-agent $fs/usr/bin
+			cp -a $install/etc/xdg/autostart/razor-policykit-agent.desktop \
+				$fs/etc/xdg/autostart
+			;;
+		*-power)
+		CAT="x-window|power management component"
+			DEPENDS="razorqt upower"
+			mkdir -p $fs/usr/bin $fs/usr/share/applications
+			cp -a $install/usr/bin/razor-power $fs/usr/bin
+			cp $install/usr/share/applications/razor-power.desktop \
+				$fs/usr/share/applications
+			;;
+		*-runner)
+			CAT="x-window|quick launch and runner application"
+			DEPENDS="razorqt"
+			mkdir -p $fs/usr/bin $fs/etc/xdg/autostart
+			cp -a $install/usr/bin/razor-runner $fs/usr/bin
+			cp -a $install/etc/xdg/autostart/razor-runner.desktop \
+				$fs/etc/xdg/autostart
+			;;
+		*-themes)
+			CAT="x-window|extra themes"
+			DEPENDS="razorqt"
+			mkdir -p $fs/usr/share/razor
+			cp -a $install/usr/share/razor/themes $fs/usr/share/razor
+			rm -rf $fs/usr/share/razor/themes/light
 
-		# remove heavy graphics
-		rm -f $fs/usr/share/razor/themes/*/wow5.png
-		rm -f $fs/usr/share/razor/themes/*/wow5_12*.jpg
-		rm -f $fs/usr/share/razor/themes/*/wow5_16*.jpg
-		rm -f $fs/usr/share/razor/themes/*/wow5_19*.jpg
-		rm -f $fs/usr/share/razor/themes/*/wow5_20*.jpg
-		for theme in a-mego ambiance; do
-			cat > $fs/usr/share/razor/themes/$theme/wallpaper.cfg << EOT
+			# remove heavy graphics
+			rm -f $fs/usr/share/razor/themes/*/wow5.png
+			rm -f $fs/usr/share/razor/themes/*/wow5_12*.jpg
+			rm -f $fs/usr/share/razor/themes/*/wow5_16*.jpg
+			rm -f $fs/usr/share/razor/themes/*/wow5_19*.jpg
+			rm -f $fs/usr/share/razor/themes/*/wow5_20*.jpg
+			for theme in a-mego ambiance; do
+				cat > $fs/usr/share/razor/themes/$theme/wallpaper.cfg << EOT
 wallpapers/size=1
 wallpapers/1/file=wow5_1024x768.jpg
 EOT
-		done
-		;;
+			done
+			;;
 	esac
 }
 
-post_install_razorqt()
-{
+post_install_razorqt() {
 	res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//)
 	# Adding WM to SLIM available sessions.
 	if ! echo "$res" | grep -q $PACKAGE; then
 		echo -n "Adding $PACKAGE to /etc/slim.conf..."
-		sed -i "s/^sessions.*/sessions            ${res},$PACKAGE/" "$1/etc/slim.conf"
+		sed -i "s/^sessions.*/sessions            $res,$PACKAGE/" "$1/etc/slim.conf"
 		status
 	fi
 	true
 }
 
-post_remove_razorqt()
-{
+post_remove_razorqt() {
 	# Remove WM from SLIM available sessions.
 	if grep -q $PACKAGE "$1/etc/slim.conf"; then
 		sed -i s/,$PACKAGE// "$1/etc/slim.conf"
diff -r ad29ddfee1c9 -r d5aab818505e rcssmin/receipt
--- a/rcssmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rcssmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rcssmin"
 VERSION="1.0.6"
 CATEGORY="development"
-SHORT_DESC="rCSSmin is a CSS minifier written in Python"
+SHORT_DESC="CSS minifier written in Python"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="Apache"
 WEB_SITE="http://opensource.perlig.de/rcssmin/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://storage.perlig.de/rcssmin/$TARBALL"
 
-DEPENDS="python"
 BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$install
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rcswitch-pi/receipt
--- a/rcswitch-pi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="rcswitch-pi"
-GITHASH="2c9c027217ae0b4fe132e0725db166ac29f93974"
-VERSION="${GITHASH:0:7}"
-CATEGORY="system-tools"
-SHORT_DESC="Control remote power sockets using the Raspberry Pi."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/r10r/rcswitch-pi"
-WGET_URL="git|git://github.com/r10r/rcswitch-pi.git"
-HOST_ARCH="arm"
-
-DEPENDS="wiringpi"
-BUILD_DEPENDS="wiringpi-dev"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	git checkout ${GITHASH} &&
-	make 
-}
-
-# SliTaz package testsuite
-testsuite() {
-	readelf -h ${src}/send || return 1
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	install -m 0755 ${src}/send ${fs}/usr/bin/${PACKAGE}
-}
diff -r ad29ddfee1c9 -r d5aab818505e rdesktop/receipt
--- a/rdesktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rdesktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,32 +6,31 @@
 SHORT_DESC="Remote Desktop Protocol (RDP) client for Windows terminal server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.rdesktop.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://rdesktop.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="rdp remote-desktop"
 
-DEPENDS="openssl xorg-libX11 glibc-base xorg-libXau xorg-libXdmcp \
-alsa-lib libsamplerate libao pcsc-lite"
 BUILD_DEPENDS="openssl-dev xorg-dev pcsc-lite-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --mandir=/usr/share/man \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--disable-credssp \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/rdesktop/keymaps
 	cp -a $install/usr/bin/rdesktop $fs/usr/bin
 	for i in fr de en es it ja common modifiers; do
 		cp -a $install/usr/share/rdesktop/keymaps/$i* \
 			$fs/usr/share/rdesktop/keymaps
 	done
+	DEPENDS="openssl xorg-libX11 glibc-base xorg-libXau xorg-libXdmcp \
+	alsa-lib libsamplerate libao pcsc-lite"
+	TAGS="rdp remote-desktop"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rdpdesk/receipt
--- a/rdpdesk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rdpdesk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="RDP, VNC & ICA client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://rdpdesk.com/"
+WEB_SITE="https://web.archive.org/web/20131105114954/http://rdpdesk.com:80/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="wxWidgets28-dev xorg-imake jpeg-dev zlib-dev gettext-tools \
+BUILD_DEPENDS="wxWidgets28-dev xorg-imake jpeg-dev zlib-dev gettext \
 openssl-dev xorg-libXp autoconf xorg-libXt-dev xorg-libXp-dev xorg-libXaw-dev"
 
 compile_rules() {
@@ -23,7 +23,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e re-alpine/receipt
--- a/re-alpine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/re-alpine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="re-alpine"
 VERSION="2.03"
 CATEGORY="network"
-SHORT_DESC="Re-alpine is the continuation of Alpine (a text-based email client)"
+SHORT_DESC="Continuation of Alpine, text-based email client"
 MAINTAINER="paul@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://sourceforge.net/projects/re-alpine/"
diff -r ad29ddfee1c9 -r d5aab818505e re2c/receipt
--- a/re2c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/re2c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="re2c"
 VERSION="0.13.5"
 CATEGORY="system-tools"
-SHORT_DESC="Re2c is a tool for writing very fast and very flexible scanners."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Writing very fast and flexible scanners"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://re2c.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://re2c.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="scanner"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="scanner"
 }
diff -r ad29ddfee1c9 -r d5aab818505e readline/receipt
--- a/readline/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/readline/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.0"
 CATEGORY="system-tools"
 SHORT_DESC="GNU readline"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/readline"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/readline.html"
@@ -13,13 +13,9 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev flex"
-SPLIT="readline-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export bash_cv_wcwidth_broken=true ;;
-	esac
-
 	sed -i '/MV.*old/d' Makefile.in
 	sed -i '/{OLDSUFF}/c:' support/shlib-install
 
diff -r ad29ddfee1c9 -r d5aab818505e realvnc-viewer/receipt
--- a/realvnc-viewer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/realvnc-viewer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="VNC viewer (graphical remote control)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="https://www.realvnc.com/"
+WEB_SITE="https://www.realvnc.com/en/"
 REPOLOGY="realvnc"
 
-TARBALL="vnc4_${VERSION}+X4.3.0.orig.tar.gz"
+TARBALL="vnc4_$VERSION+X4.3.0.orig.tar.gz"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/v/vnc4/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev \
@@ -20,7 +20,7 @@
 
 	cd $src
 	for i in unix/tx/TXImage.cxx unix/x0vncserver/Image.cxx \
-		 common/network/TcpSocket.cxx ; do
+		 common/network/TcpSocket.cxx; do
 		grep -q stdlib $i || sed -i '1i#include <stdlib.h>' $i
 	done
 
diff -r ad29ddfee1c9 -r d5aab818505e reaver/receipt
--- a/reaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/reaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,25 +13,20 @@
 
 BUILD_DEPENDS="libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
+
 	./configure \
 		--localstatedir=/var \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install || return 1
 
-	cd $src
-	docdir=$install/usr/share/doc/$PACKAGE-$VERSION
-	mkdir -p $docdir
-	cp -a README.md docs/README* $docdir
-	cook_pick_manpages docs/reaver.1.gz
+	cook_pick_docs $src/README.md $src/docs/README*
+	cook_pick_manpages $src/docs/reaver.1.gz
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std var/
 	DEPENDS="libpcap   aircrack-ng pixiewps"
 }
diff -r ad29ddfee1c9 -r d5aab818505e recorder/receipt
--- a/recorder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/recorder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,26 +6,21 @@
 SHORT_DESC="A simple GTK+ disc burner"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL3"
+WEB_SITE="https://code.google.com/archive/p/recorder/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://code.google.com/archive/p/recorder/"
 WGET_URL="http://recorder.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="python-pygtk coreutils cdrkit dvd+rw-tools"
 BUILD_DEPENDS="python-pygtk-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	cp $stuff/Makefile Makefile
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr/
 	cp -a $install/usr/share $fs/usr/
+	DEPENDS="python-pygtk coreutils cdrkit dvd+rw-tools"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e recordmydesktop/receipt
--- a/recordmydesktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/recordmydesktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,34 +6,33 @@
 SHORT_DESC="Desktop recording software"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://recordmydesktop.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://recordmydesktop.sourceforge.net"
-WGET_URL="http://nchc.dl.sourceforge.net/sourceforge/$PACKAGE/$TARBALL"
-TAGS="desktop"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
 xorg-libXext-dev xorg-libXdamage-dev xorg-libXfixes-dev libogg libogg-dev \
 libvorbis libvorbis-dev libtheora-dev zlib-dev xorg-libXfixes-dev \
 xorg-xorgproto"
-DEPENDS="libtheora alsa-lib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
-xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes zlib"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|shmstr.h|shmproto.h|g' src/*.h
 	sed -i 's|shmstr.h|shmproto.h|g' src/*.c
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libtheora alsa-lib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
+	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes zlib"
+	TAGS="desktop"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e redis/receipt
--- a/redis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/redis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,9 +3,8 @@
 PACKAGE="redis"
 VERSION="2.8.19"
 CATEGORY="database"
-SHORT_DESC="Redis is an open source, BSD licensed, advanced key-value cache \
-and store"
-MAINTAINER="nneul@neulinger.org"
+SHORT_DESC="Advanced key-value cache and store"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://redis.io/"
 
diff -r ad29ddfee1c9 -r d5aab818505e redland/receipt
--- a/redland/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/redland/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://download.librdf.org/source/$TARBALL"
 
 BUILD_DEPENDS="rasqal-dev libtool perl db-dev"
-SPLIT="redland-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e redshift/receipt
--- a/redshift/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/redshift/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,25 @@
 PACKAGE="redshift"
 VERSION="1.7"
 CATEGORY="misc"
-SHORT_DESC="Color temperature adjustement."
+SHORT_DESC="Color temperature adjustement"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://launchpad.net/redshift/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://launchpad.net/redshift/"
 WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
 
-DEPENDS="python"
-BUILD_DEPENDS="wget python xorg-libXrandr-dev"
+BUILD_DEPENDS="python xorg-libXrandr-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
-		$CONFIGURE_ARGS && \
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e reiser4progs/receipt
--- a/reiser4progs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/reiser4progs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,17 +12,15 @@
 WGET_URL="$SF_MIRROR/reiser4/$TARBALL"
 
 BUILD_DEPENDS="util-linux-uuid-dev readline-dev libaal-dev"
-SPLIT="reiser4progs-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		reiser4progs)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e reiserfsprogs/receipt
--- a/reiserfsprogs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/reiserfsprogs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.6.27"
 CATEGORY="system-tools"
 SHORT_DESC="ReiserFS tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sfr-fresh.com/linux/misc/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/reiserfs.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="util-linux-uuid-dev libcomerr-dev acl-dev"
-SPLIT="reiserfsprogs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules(){
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e remind/receipt
--- a/remind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/remind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,51 +1,45 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="remind"
 VERSION="03.01.15"
 CATEGORY="utilities"
-SHORT_DESC="Sophisticated calendar and alarm program."
+SHORT_DESC="Sophisticated calendar and alarm program"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.roaringpenguin.com/products/remind"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.roaringpenguin.com/products/remind"
 WGET_URL="http://www.roaringpenguin.com/files/download/$TARBALL"
-TAGS="office calendar"
 
-DEPENDS="tk tcl tcllib xorg-libXScrnSaver"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/skel
 	touch $fs/etc/skel/.reminders
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="tk tcl tcllib xorg-libXScrnSaver"
+	TAGS="office calendar"
 }
 
-post_install()
-{
+post_install() {
 	# Check for ~/.reminders file - needed for wyrd
-	for i in $(ls "$1/home" 2> /dev/null); do
+	for i in $(ls "$1/home" 2>/dev/null); do
 		[ -f "$1/home/$i/.reminders" ] && continue
-		echo -n "Creating config file for $i ..."
-		touch "$1/home/$i/.reminders" 
+		action "Creating config file for $i..."
+		touch "$1/home/$i/.reminders"
 		chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.reminders"
 		status
 	done
 }
 
-post_remove()
-{
+post_remove() {
 	rm -f "$1"/home/*/.reminders
 }
diff -r ad29ddfee1c9 -r d5aab818505e remmina/receipt
--- a/remmina/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/remmina/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Remote desktop client written in GTK+"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="http://remmina.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/FreeRDP/Remmina/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="gtk2-dev intltool cmake libgcrypt-dev libssh-dev vte-dev \
-freerdp-dev libvncserver-dev libgnome-keyring-dev gettext telepathy-glib-dev \
-libappindicator-gtk3-dev xorg-libxkbfile-dev"
+freerdp-dev libvncserver-dev libgnome-keyring-dev gettext-dev \
+telepathy-glib-dev libappindicator-gtk3-dev xorg-libxkbfile-dev"
 SPLIT="$PACKAGE-dev"
 
 compile_rules() {
@@ -29,9 +29,9 @@
 	make || return 1
 
 	sed -i '/external_tools/d' $src/remmina/cmake_install.cmake
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
-	cp -a remmina/include $DESTDIR/usr
+	cp -a remmina/include $install/usr
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rep-gtk/receipt
--- a/rep-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rep-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="http://download.tuxfamily.org/librep/rep-gtk/$TARBALL"
 
 BUILD_DEPENDS="automake libtool librep-dev glib-dev gtk2-dev"
-SPLIT="rep-gtk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e reptyr/receipt
--- a/reptyr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/reptyr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,21 +10,13 @@
 WEB_SITE="https://github.com/nelhage/reptyr"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' Makefile
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e reqflow/receipt
--- a/reqflow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/reqflow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,9 @@
 
 compile_rules() {
 	CFLAGS=$(pkg-config --cflags libzip)
+
 	make &&
-	install -Dm 755 $src/req $install/usr/bin/req
+	install -Dm755 req $install/usr/bin/req
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rest/receipt
--- a/rest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev libsoup-dev gobject-introspection-dev"
-SPLIT="rest-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e retawq/receipt
--- a/retawq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/retawq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="retawq"
 VERSION="0.2.6c"
 CATEGORY="network"
 SHORT_DESC="Multi-threaded web browser for text terminals"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://retawq.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="web-browser"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# We have no locale support on ARM actually
-	case "$ARCH" in
-		arm)  opts="" ;;
-		i?86) opts="--enable-i18n" ;;
-	esac
-
+compile_rules() {
 	./configure \
 		--enable-local-cgi \
 		--path-prefix=/usr \
 		--path-doc=/usr/share/doc/retawq \
 		--path-man=/usr/share/man \
-		$opts &&
-	make && make install
+		--enable-i18n &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/usr/share/applications $install/etc
 	cp $stuff/retawq.desktop $install/usr/share/applications
@@ -37,13 +29,12 @@
 }
 
 # The base web browser for ARM, so check
-testsuite()
-{
+testsuite() {
 	readelf -h $src/retawq
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy bin/ skel/
+	DEPENDS="ncurses"
+	TAGS="web-browser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e retro-gtk/receipt
--- a/retro-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/retro-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="meson ninja libepoxy-dev glib-dev gtk3-dev pulseaudio-dev \
 gobject-introspection-dev vala"
-SPLIT="retro-gtk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	meson-wrapper build &&
diff -r ad29ddfee1c9 -r d5aab818505e retty/receipt
--- a/retty/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/retty/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="retty"
 VERSION="1.0"
@@ -6,24 +6,20 @@
 SHORT_DESC="Terminal attaching without screen"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://pasky.or.cz/dev/retty/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://pasky.or.cz/dev/retty/"
 WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && strip *tty
+compile_rules() {
+	make || return 1
+
+	install -Dm755 blindtty $install/usr/bin/blindtty
+	install -Dm755 retty    $install/usr/bin/retty
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/blindtty $fs/usr/bin
-	cp -a $src/retty $fs/usr/bin
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e rfkill/receipt
--- a/rfkill/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rfkill/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rfkill"
 VERSION="0.5"
 CATEGORY="system-tools"
 SHORT_DESC="Utility to query the state of the rfkill switches"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://wireless.wiki.kernel.org/en/users/Documentation/rfkill"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://wireless.wiki.kernel.org/en/users/Documentation/rfkill"
 WGET_URL="https://www.kernel.org/pub/software/network/rfkill/$TARBALL"
-TAGS="kernel"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/BINDIR) rfkill/BINDIR)/' Makefile
 	sed -i 's/-m 755 -t/-m 755 rfkill/' Makefile
 	sed -i 's/man8\/ rfkill\.8\.gz/man8\//' Makefile
 	sed -i 's/-m 644 -t/-m 644 rfkill.8.gz/' Makefile
-	make && make DESTDIR=$DESTDIR install
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="kernel"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rgzip/receipt
--- a/rgzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rgzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make rgzip &&
-	install -Dm 755 $src/rgzip $install/usr/bin/rgzip
+	install -Dm755 rgzip $install/usr/bin/rgzip
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rhapsody/receipt
--- a/rhapsody/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rhapsody/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,31 @@
 PACKAGE="rhapsody"
 VERSION="0.28b"
 CATEGORY="network"
-SHORT_DESC="Text mode and easy to use IRC client."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Text mode and easy to use IRC client"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-TARBALL="${PACKAGE}_${VERSION}.tgz"
 WEB_SITE="http://rhapsody.sourceforge.net/"
+
+TARBALL="${PACKAGE}_$VERSION.tgz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="irc"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure -i /usr/bin -d /usr/share/doc/rhapsody &&
+compile_rules() {
+	./configure \
+		-i /usr/bin \
+		-d /usr/share/doc/rhapsody &&
 	make clean &&
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/rhapsody $fs/usr/bin
 	# Doc stuff.
 	mkdir -p $fs/usr/share/doc/rhapsody
 	cp -a $src/help $fs/usr/share/doc/rhapsody
 	chmod 644 $fs/usr/share/doc/rhapsody/help/*
+	DEPENDS="ncurses"
+	TAGS="irc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rhino/receipt
--- a/rhino/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rhino/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,22 @@
 PACKAGE="rhino"
 VERSION="1.7R2"
 CATEGORY="development"
-SHORT_DESC="JavaScript for Java."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="JavaScript for Java"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
 TARBALL="${PACKAGE}1_7R2.zip"
 WEB_SITE="http://www.mozilla.org/rhino/"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/js/$TARBALL"
 TAGS="java javascript"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
 SUGGESTED="java-jre"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/java
 	cp -a js*.jar $install/usr/share/java
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e rinetd/receipt
--- a/rinetd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rinetd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Internet 'redirection server'"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.boutell.com/rinetd/"
+WEB_SITE="https://boutell.com/rinetd/"
 
 TARBALL="$PACKAGE.tar.gz"
 WGET_URL="${WEB_SITE}http/$TARBALL"
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/rinetd $install/usr/sbin/rinetd
+	install -Dm755 rinetd $install/usr/sbin/rinetd
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rkhunter/receipt
--- a/rkhunter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rkhunter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,19 @@
 PACKAGE="rkhunter"
 VERSION="1.4.2"
 CATEGORY="security"
-SHORT_DESC="Rootkit scanner."
+SHORT_DESC="Rootkit scanner"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rkhunter.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	export TGZ_BUILD_ROOT=$DESTDIR
+compile_rules() {
+	export TGZ_BUILD_ROOT=$install
 	./installer.sh --layout TGZ --install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e rlog/receipt
--- a/rlog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rlog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,20 @@
 VERSION="1.4"
 CATEGORY="misc"
 SHORT_DESC="C++ logging library"
-MAINTAINER="b1+slitaz@nagel.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.arg0.net/rlog"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://rlog.googlecode.com/files/$TARBALL"
 
-SPLIT="rlog-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rlwrap/receipt
--- a/rlwrap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rlwrap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="rlwrap"
 VERSION="0.37"
 CATEGORY="misc"
-SHORT_DESC="Input history wrapper using GNU readline."
+SHORT_DESC="Input history wrapper using GNU readline"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -12,18 +12,16 @@
 
 BUILD_DEPENDS="readline-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		--localstatedir=/var \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/share/rlwrap $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
diff -r ad29ddfee1c9 -r d5aab818505e rogue/receipt
--- a/rogue/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rogue/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,21 +1,19 @@
-# SliTaz package receipt. 
+# SliTaz package receipt.
 
 PACKAGE="rogue"
 VERSION="5.4.4"
 CATEGORY="non-free"
 SHORT_DESC="The classic dungeon exploration game"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://web.archive.org/web/20160604020207/http://rogue.rogueforge.net/"
+
 TARBALL="$PACKAGE$VERSION-src.tar.gz"
-WEB_SITE="https://web.archive.org/web/20160604020207/http://rogue.rogueforge.net/"
 WGET_URL="http://rogue.rogueforge.net/files/rogue${VERSION%.*}/$TARBALL" # FIXME
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -23,12 +21,11 @@
 		--enable-scorefile=/usr/games/rogue.scr \
 		--enable-lockfile=/var/lock/rogue.lck \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/rogue
 	mkdir -p $fs/usr/games
 	mkdir -p $fs/usr/share/licenses
@@ -42,4 +39,5 @@
 	cp -a $src/rogue.png $fs/usr/share/pixmaps
 	sed -i 's/Exec.*/Exec=xterm -e rogue/' $src/rogue.desktop
 	cp -a $src/rogue.desktop $fs/usr/share/applications
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rosegarden/receipt
--- a/rosegarden/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rosegarden/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,37 +3,36 @@
 PACKAGE="rosegarden"
 VERSION="14.02"
 CATEGORY="multimedia"
-SHORT_DESC="A music composition and editing environment."
+SHORT_DESC="A music composition and editing environment"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.rosegardenmusic.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.rosegardenmusic.com/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAG="midi"
 
-DEPENDS="libQtGui libQtXml libQtNetwork libQtCore jack \
-libsndfile liblrdf fftw libsamplerate alsa-lib xorg-libX11 zlib gcc-lib-base \
-xorg-libxcb xorg-libXau xorg-libXdmcp lirc liblo"
 BUILD_DEPENDS="Qt4-dev ladspa-dev dssi-dev alsa-lib-dev xorg-libSM-dev \
 liblo-dev liblrdf-dev fftw-dev libsndfile-dev libsamplerate-dev xorg-imake \
 xorg-makedepend jack-dev xorg-libX11-dev lirc-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	touch -d 197001010101 dependencies
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		--localstatedir=/var \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/icons $fs/usr/share
+	DEPENDS="libQtGui libQtXml libQtNetwork libQtCore jack libsndfile liblrdf \
+	fftw libsamplerate alsa-lib xorg-libX11 zlib gcc-lib-base xorg-libxcb \
+	xorg-libXau xorg-libXdmcp lirc liblo"
+	TAGS="midi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e roundup/receipt
--- a/roundup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/roundup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="roundup"
 VERSION="1.4.16"
 CATEGORY="development"
-SHORT_DESC="Simple-to-use issue-tracking system with command-line, web and e-mail interfaces."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Simple-to-use issue-tracking system with command-line, web and e-mail interfaces"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
-DEPENDS="python"
+WEB_SITE="http://www.roundup-tracker.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.roundup-tracker.org"
 WGET_URL="https://files.pythonhosted.org/packages/source/r/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share/roundup $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rox-default-icons/receipt
--- a/rox-default-icons/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rox-default-icons/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,22 @@
 PACKAGE="rox-default-icons"
 VERSION="2.8"
 CATEGORY="misc"
-SHORT_DESC="default icons for rox-filer."
-MAINTAINER="sygne@ombres.eu"
+SHORT_DESC="Default icons for rox-filer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://rox.sourceforge.net/desktop/"
+
 SOURCE="rox-filer"
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://rox.sourceforge.net/desktop/"
 WGET_URL="$SF_MIRROR/rox/$TARBALL"
 
-DEPENDS="rox-filer"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/rox-default-icons
-	cp -a $src/ROX-Filer/ROX/* $DESTDIR/rox-default-icons/
+compile_rules() {
+	mkdir -p $install/rox-default-icons
+	cp -a $src/ROX-Filer/ROX/* $install/rox-default-icons/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons
 	cp -r $install/* $fs/usr/share/icons/
+	DEPENDS="rox-filer"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e rox-filer-locales/receipt
--- a/rox-filer-locales/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rox-filer-locales/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.8"
 CATEGORY="localization"
 SHORT_DESC="Locales for the rox-filer"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rox.sourceforge.net/desktop/"
 REPOLOGY="rox-filer"
@@ -14,8 +14,8 @@
 WGET_URL="$SF_MIRROR/rox/$TARBALL"
 
 compile_rules() {
-	mkdir -p $DESTDIR
-	cp -r $src/ROX-Filer/Messages $DESTDIR/
+	mkdir -p $install
+	cp -r $src/ROX-Filer/Messages $install/
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rox-filer/receipt
--- a/rox-filer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rox-filer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,70 +3,65 @@
 PACKAGE="rox-filer"
 VERSION="2.8"
 CATEGORY="system-tools"
-SHORT_DESC="user friendly filer."
-MAINTAINER="sygne@ombres.eu"
+SHORT_DESC="User friendly filer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://rox.sourceforge.net/desktop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://rox.sourceforge.net/desktop/"
 WGET_URL="$SF_MIRROR/rox/$TARBALL"
-TAGS="file-manager"
 
-DEPENDS="gtk2 libglade libxml2 xorg-libXdamage shared-mime-info xorg-libSM"
 BUILD_DEPENDS="libglade-dev libxml2-dev gtk2-dev shared-mime-info-dev \
 xorg-libSM-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lm"
 	echo "compile"
 	# If missing dep compile will block on a read.
 	echo -e "\t" | $src/ROX-Filer/AppRun --compile
 	echo "mkdir"
-	mkdir $DESTDIR
-	cp $src/ROX-Filer/ROX-Filer $DESTDIR/rox-filer
-	cp $src/ROX-Filer/.DirIcon $DESTDIR/
+	mkdir $install
+	cp $src/ROX-Filer/ROX-Filer $install/rox-filer
+	cp $src/ROX-Filer/.DirIcon $install/
 
-	mkdir $DESTDIR/Messages
+	mkdir $install/Messages
 	for locale in de es fr it
 	do
-		cp -r $src/ROX-Filer/Messages/$locale $DESTDIR/Messages
+		cp -r $src/ROX-Filer/Messages/$locale $install/Messages
 	done
 		
-	cp -r $src/ROX-Filer/images $DESTDIR/
-	
-	mkdir $DESTDIR/Help
-	cp $src/ROX-Filer/Help/*.html $DESTDIR/Help/
-	cp $src/ROX-Filer/style.css $DESTDIR/
-	
-	cp $src/ROX-Filer/Options.xml $DESTDIR/
-	cp $src/ROX-Filer/Templates.glade $DESTDIR/
+	cp -r $src/ROX-Filer/images $install/
+
+	mkdir $install/Help
+	cp $src/ROX-Filer/Help/*.html $install/Help/
+	cp $src/ROX-Filer/style.css $install/
+
+	cp $src/ROX-Filer/Options.xml $install/
+	cp $src/ROX-Filer/Templates.glade $install/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/rox-filer
 	cp -r $install/* $fs/usr/share/rox-filer/
 	cp $install/.DirIcon $fs/usr/share/rox-filer/
-	
+
 	mkdir -p $fs/usr/bin
 	cp -r $stuff/rox-filer $fs/usr/bin/
 	ICI=$(pwd)
 		cd $fs/usr/bin/
 		ln -s rox-filer rox
 	cd $ICI
-	
+
 	mkdir -p $fs/usr/lib/openbox
 	cp $stuff/rox-open-folder-menu.sh $fs/usr/lib/openbox/
-	
+
 	strip -s $fs/usr/share/rox-filer/rox-filer
+	DEPENDS="gtk2 libglade libxml2 xorg-libXdamage shared-mime-info xorg-libSM"
+	TAGS="file-manager"
 }
 
-# Post install commands for Tazpkg.
 # Check /usr/share/icons/ROX
-post_install()
-{ 
+post_install() {
 	if [ -e "$1/usr/share/icons/ROX" ]; then
 		echo ""
 		echo "/usr/share/icons/ROX exists"
diff -r ad29ddfee1c9 -r d5aab818505e rp-l2tp/receipt
--- a/rp-l2tp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rp-l2tp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rp-l2tp"
 VERSION="0.4"
 CATEGORY="network"
-SHORT_DESC="L2TP tunnel (vpn)."
+SHORT_DESC="L2TP tunnel (vpn)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://rp-l2tp.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://rp-l2tp.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="vpn tunnel"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/usr/lib/l2tp/plugins
 	cp -a $install/etc $fs
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $src/handlers/l2tp-control $fs/usr/sbin
 	cp -a $src/handlers/*.so $fs/usr/lib/l2tp/plugins
+	TAGS="vpn tunnel"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e rp-pppoe/receipt
--- a/rp-pppoe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rp-pppoe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,10 +4,9 @@
 VERSION="3.12"
 CATEGORY="network"
 SHORT_DESC="Roaring Penguin PPPoE client"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.roaringpenguin.com/products/pppoe"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.roaringpenguin.com/files/download/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e rpcbind/receipt
--- a/rpcbind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rpcbind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,10 +14,6 @@
 BUILD_DEPENDS="libtirpc-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include/tirpc" ;;
-	esac
-
 	./configure \
 		--with-systemdsystemunitdir=no \
 		$CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e rpm/receipt
--- a/rpm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rpm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.14.1"
 CATEGORY="system-tools"
 SHORT_DESC="RPM Package Manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rpm.org/"
 
@@ -15,8 +15,8 @@
 
 BUILD_DEPENDS="p7zip-full gnupg zlib-dev bzip2-dev xz-dev zstd-dev \
 elfutils-dev nss-dev nspr-dev libmagic-dev popt-dev libarchive-dev db-dev \
-gettext dbus-dev"
-SPLIT="rpm-dev"
+gettext-dev dbus-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e rrdtool-lite/receipt
--- a/rrdtool-lite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rrdtool-lite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -28,7 +28,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rrdtool/receipt
--- a/rrdtool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rrdtool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 
 BUILD_DEPENDS="perl-dev zlib-dev freetype-dev libpng16-dev libxml2-dev \
 fontconfig-dev xorg-pixman-dev cairo-dev glib-dev pango-dev python-dev perl groff \
-tcl-dev lua5.1-dev ruby gettext"
-SPLIT="rrdtool-perl rrdtool-python rrdtool-dev rrdtool"
+tcl-dev lua5.1-dev ruby gettext-dev"
+SPLIT="$PACKAGE-perl $PACKAGE-python $PACKAGE-dev $PACKAGE"
 
 compile_rules() {
 	sed -i 's/PL_sv_undef sv_undef/PL_sv_undef PL_sv_undef/' bindings/perl-shared/RRDs.xs
@@ -23,7 +23,7 @@
 	TOREMOVE="/usr/include/lua5.1 /usr/lib/lua5.1"
 	ln -s lua/5.1 /usr/include/lua5.1
 	ln -s lua/5.1 /usr/lib/lua5.1
-	for i in /usr/bin/lua /usr/bin/luac ; do
+	for i in /usr/bin/lua /usr/bin/luac; do
 		[ -e $i ] && continue
 		ln -s $(basename $i)5.1 $i
 		TOREMOVE="$TOREMOVE $i"
@@ -34,7 +34,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	for i in $TOREMOVE; do
 		rm -f $i
diff -r ad29ddfee1c9 -r d5aab818505e rsbep/receipt
--- a/rsbep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rsbep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rsbep"
 VERSION="0.1.0-ttsiodras"
 CATEGORY="misc"
-SHORT_DESC="Shielding your files with Reed-Solomon codes."
+SHORT_DESC="Shielding your files with Reed-Solomon codes"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://users.softlab.ntua.gr/~ttsiod/rsbep.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://users.softlab.ntua.gr/~ttsiod/rsbep.html"
 WGET_URL="http://users.softlab.ntua.gr/~ttsiod/$TARBALL"
 
-SUGGESTED="python"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --mandir=/usr/share/man \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--localstatedir=/var \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	SUGGESTED="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rsh/receipt
--- a/rsh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rsh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 
 compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rsnapshot/receipt
--- a/rsnapshot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rsnapshot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.4.2"
 CATEGORY="system-tools"
 SHORT_DESC="A remote filesystem snapshot utility"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.rsnapshot.org"
+WEB_SITE="http://www.rsnapshot.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/rsnapshot/rsnapshot/archive/$VERSION.tar.gz"
@@ -17,7 +17,7 @@
 	./autogen.sh
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mv $install/etc/rsnapshot.conf.default $install/etc/rsnapshot.conf
 }
diff -r ad29ddfee1c9 -r d5aab818505e rspamd/receipt
--- a/rspamd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rspamd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rspamd"
 VERSION="0.9.10"
 CATEGORY="network"
-SHORT_DESC="Fast, free and open-source spam filtering system."
+SHORT_DESC="Fast, free and open-source spam filtering system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://rspamd.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="https://rspamd.com/"
 WGET_URL="${WEB_SITE}downloads/$TARBALL"
-TAGS="spam"
 
 BUILD_DEPENDS="cmake perl openssl-dev lua-dev glib-dev \
 gmime-dev libevent-dev sqlite3-dev hiredis-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir built
-	cd built
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCONFDIR=/etc/rspamd .. &&
+	cd    built
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCONFDIR=/etc/rspamd \
+		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
+	TAGS="spam"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rsstail/receipt
--- a/rsstail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rsstail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rsstail"
 VERSION="1.8"
 CATEGORY="network"
-SHORT_DESC="RSSTail is more or less an rss reader"
-MAINTAINER="tcg.thegamer@gmail.com"
+SHORT_DESC="RSS reader"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://www.vanheusden.com"
+WEB_SITE="https://www.vanheusden.com/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WGET_URL="${WEB_SITE}/${PACKAGE}/${TARBALL}"
+WGET_URL="$WEB_SITE/$PACKAGE/$TARBALL"
 
-DEPENDS="libnxml libmrss curl"
 BUILD_DEPENDS="libnxml libnxml-dev libmrss libmrss-dev libcurl curl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p ${DESTDIR}/usr/bin && 
-	mkdir -p ${DESTDIR}/usr/share/man/man1 &&
-	make && 
-	make DESTDIR=${DESTDIR} install
+compile_rules() {
+	mkdir -p $install/usr/bin $install/usr/share/man/man1
+
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr/
+genpkg_rules() {
+	copy @std
+	DEPENDS="libnxml libmrss curl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e rsync/receipt
--- a/rsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.1.3"
 CATEGORY="network"
 SHORT_DESC="Utility that provides fast incremental"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://rsync.samba.org/"
 
@@ -24,7 +24,7 @@
 		-e 's/HAVE_ICONV_OPEN ./HAVE_ICONV_OPEN 0/' config.h
 	sed -i 's/-liconv//' Makefile
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Config file is /etc/rsyncd.conf.
 	# User and passwd in /etc/rsyncd.secrets, syntax : user:passwd
diff -r ad29ddfee1c9 -r d5aab818505e rtaudio/receipt
--- a/rtaudio/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rtaudio/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="4.0.11"
 CATEGORY="multimedia"
 SHORT_DESC="Common API for realtime audio input/output (C++ classes)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.music.mcgill.ca/~gary/rtaudio/"
 
-TARBALL="${PACKAGE}-${VERSION}.tar.gz"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.music.mcgill.ca/~gary/rtaudio/release/$TARBALL"
 
 BUILD_DEPENDS="alsa-lib-dev jack-dev"
-SPLIT="rtaudio-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -20,12 +20,12 @@
 		--with-alsa \
 		--with-jack \
 		$CONFIGURE_ARGS &&
-	make -j 1
+	make -j1
 	# Python bindings --> rtaudio-python ??
 	#cd $src/contrib/python/pyrtaudio
 	#CFLAGS="$CFLAGS -I../../../include" \
-	#python setup.py build
-	#python setup.py install --root="$DESTDIR"
+	#python -B setup.py build
+	#python -B setup.py install --root="$install"
 	echo "Continuing, any error will remine in pkg build..."
 
 	mkdir -p $install/usr/lib
diff -r ad29ddfee1c9 -r d5aab818505e rtmpdump/receipt
--- a/rtmpdump/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rtmpdump/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="rtmpdump"
 VERSION="2.3"
 CATEGORY="multimedia"
-SHORT_DESC="rtmpdump is a toolkit for RTMP streams"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Toolkit for RTMP streams"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rtmpdump.mplayerhq.hu/"
 
@@ -12,15 +12,17 @@
 WGET_URL="http://rtmpdump.mplayerhq.hu/download/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev zlib-dev"
-SPLIT="rtmpdump-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr/lib
-	make &&  make \
+	mkdir -p $install/usr/lib
+	make &&
+	make \
 		prefix="/usr" \
 		sbindir="/usr/bin" \
 		mandir="/usr/share/man" \
-		DESTDIR="$DESTDIR" install
+		DESTDIR="$install" \
+		install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rtorrent/receipt
--- a/rtorrent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rtorrent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.6"
 CATEGORY="network"
 SHORT_DESC="Ncurses based torrent client"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://rakshasa.github.io/rtorrent/"
 
diff -r ad29ddfee1c9 -r d5aab818505e rubberband/receipt
--- a/rubberband/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rubberband/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,10 +13,12 @@
 
 BUILD_DEPENDS="libsamplerate-dev libsndfile-dev fftw-dev ladspa-dev \
 vamp-plugin-sdk-dev"
-SPLIT="rubberband-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e rubix/receipt
--- a/rubix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rubix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS
 	make &&
-	install -Dm 755 $src/rubix $install/usr/bin/rubix
+	install -Dm755 rubix $install/usr/bin/rubix
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ruby-actionmailer/receipt
--- a/ruby-actionmailer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-actionmailer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="ruby"
 SHORT_DESC="Email composition, delivery, and receiving framework (part of \
 Rails)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-actionpack/receipt
--- a/ruby-actionpack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-actionpack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="ruby"
 SHORT_DESC="Web-flow and rendering framework putting the VC in MVC (part of \
 Rails)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-activeadmin/receipt
--- a/ruby-activeadmin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-activeadmin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,11 +3,10 @@
 PACKAGE="ruby-activeadmin"
 VERSION="1.3.1"
 CATEGORY="ruby"
-SHORT_DESC="administration framework for Ruby on Rails"
+SHORT_DESC="Administration framework for Ruby on Rails"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-activerecord/receipt
--- a/ruby-activerecord/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-activerecord/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.2.1"
 CATEGORY="ruby"
 SHORT_DESC="Object-relational mapper framework (part of Rails)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-activeresource/receipt
--- a/ruby-activeresource/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-activeresource/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.0.0"
 CATEGORY="ruby"
 SHORT_DESC="REST modeling framework (part of Rails)"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-activesupport/receipt
--- a/ruby-activesupport/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-activesupport/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="ruby"
 SHORT_DESC="A toolkit of support libraries and Ruby core extensions extracted \
 from the Rails framework"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-arbre/receipt
--- a/ruby-arbre/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-arbre/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="An Object Oriented DOM Tree in Ruby"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
+WEB_SITE="https://rubygems.org/gems/arbre"
 HOST_ARCH="any"
 REPOLOGY="${PACKAGE/-/:}"
 
diff -r ad29ddfee1c9 -r d5aab818505e ruby-bigdecimal/receipt
--- a/ruby-bigdecimal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-bigdecimal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-cairo-gobject/receipt
--- a/ruby-cairo-gobject/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-cairo-gobject/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-cairo/receipt
--- a/ruby-cairo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-cairo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-daemon_controller/receipt
--- a/ruby-daemon_controller/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-daemon_controller/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.0"
 CATEGORY="ruby"
 SHORT_DESC="Daemon management capabilities"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-date/receipt
--- a/ruby-date/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-date/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-dbm/receipt
--- a/ruby-dbm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-dbm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-did_you_mean/receipt
--- a/ruby-did_you_mean/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-did_you_mean/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="'Did you mean?' experience in Ruby"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
+WEB_SITE="https://rubygems.org/gems/did_you_mean"
 HOST_ARCH="any"
 REPOLOGY="ruby:did-you-mean"
 
diff -r ad29ddfee1c9 -r d5aab818505e ruby-etc/receipt
--- a/ruby-etc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-etc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-facter/receipt
--- a/ruby-facter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-facter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.1"
 CATEGORY="ruby"
 SHORT_DESC="System inventory tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-fcntl/receipt
--- a/ruby-fcntl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-fcntl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-ffi/receipt
--- a/ruby-ffi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-ffi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-file-tail/receipt
--- a/ruby-file-tail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-file-tail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.0"
 CATEGORY="ruby"
 SHORT_DESC="Library to tail files in Ruby"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache2"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-gdbm/receipt
--- a/ruby-gdbm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-gdbm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,8 +6,7 @@
 SHORT_DESC="Ruby extension for GNU dbm"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
+WEB_SITE="https://rubygems.org/gems/gdbm"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-gio2/receipt
--- a/ruby-gio2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-gio2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-glib2/receipt
--- a/ruby-glib2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-glib2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,8 +7,7 @@
 features"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
+WEB_SITE="https://rubygems.org/gems/glib2"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-gobject-introspection/receipt
--- a/ruby-gobject-introspection/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-gobject-introspection/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-gtk2/receipt
--- a/ruby-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,10 +4,9 @@
 VERSION="3.2.9"
 CATEGORY="ruby"
 SHORT_DESC="Ruby binding of GTK+-2.x"
-MAINTAINER="ben@seawolfsanctuary.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-io-console/receipt
--- a/ruby-io-console/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-io-console/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-json/receipt
--- a/ruby-json/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-json/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-ncursesw/receipt
--- a/ruby-ncursesw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-ncursesw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,8 +6,7 @@
 SHORT_DESC="Ruby extension for the ncurses C library"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
+WEB_SITE="https://rubygems.org/gems/ncursesw"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-nio4r/receipt
--- a/ruby-nio4r/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-nio4r/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-nokogiri/receipt
--- a/ruby-nokogiri/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-nokogiri/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-openssl/receipt
--- a/ruby-openssl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-openssl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-pango/receipt
--- a/ruby-pango/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-pango/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,8 +6,7 @@
 SHORT_DESC="Ruby binding of pango-1.x"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
+WEB_SITE="https://rubygems.org/gems/pango"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-passenger/receipt
--- a/ruby-passenger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-passenger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.3.4"
 CATEGORY="network"
 SHORT_DESC="Modern web server and application server for Ruby"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-pkg-config/receipt
--- a/ruby-pkg-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-pkg-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.1"
 CATEGORY="ruby"
 SHORT_DESC="A pkg-config implementation for Ruby"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-psych/receipt
--- a/ruby-psych/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-psych/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-rack/receipt
--- a/ruby-rack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-rack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.0.5"
 CATEGORY="ruby"
 SHORT_DESC="Modular Ruby webserver interface"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-rails/receipt
--- a/ruby-rails/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-rails/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.2.1"
 CATEGORY="development"
 SHORT_DESC="Full-stack web application framework"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-rake/receipt
--- a/ruby-rake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-rake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="12.3.1"
 CATEGORY="ruby"
 SHORT_DESC="Make-like program implemented in Ruby"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-rb-fsevent/receipt
--- a/ruby-rb-fsevent/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-rb-fsevent/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-sdbm/receipt
--- a/ruby-sdbm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-sdbm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-spruz/receipt
--- a/ruby-spruz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-spruz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.13"
 CATEGORY="ruby"
 SHORT_DESC="All the stuff that isn't good/big enough for a real library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
 HOST_ARCH="any"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-sqlite3/receipt
--- a/ruby-sqlite3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-sqlite3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,10 +4,9 @@
 VERSION="1.3.13"
 CATEGORY="ruby"
 SHORT_DESC="Ruby interface for the SQLite database engine"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-strscan/receipt
--- a/ruby-strscan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-strscan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-webrick/receipt
--- a/ruby-webrick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-webrick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="HTTP server toolkit"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
-WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
+WEB_SITE="https://rubygems.org/gems/webrick"
 HOST_ARCH="any"
 REPOLOGY="${PACKAGE/-/:}"
 
diff -r ad29ddfee1c9 -r d5aab818505e ruby-websocket-driver/receipt
--- a/ruby-websocket-driver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-websocket-driver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby-zlib/receipt
--- a/ruby-zlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby-zlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://rubygems.org/gems/${PACKAGE#*-}"
-HOST_ARCH="i486 x86_64"
 REPOLOGY="${PACKAGE/-/:}"
 
 TARBALL="${PACKAGE#*-}-$VERSION.gem"
diff -r ad29ddfee1c9 -r d5aab818505e ruby/receipt
--- a/ruby/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ruby/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.5.1"
 CATEGORY="development"
 SHORT_DESC="Dynamic programming language focused on simplicity and productivity"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.ruby-lang.org/en/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/ruby.html"
@@ -12,29 +12,19 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://cache.ruby-lang.org/pub/ruby/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS_arm="zlib-dev tcl-dev openssl-dev db-dev readline-dev"
 BUILD_DEPENDS="gmp-dev db-dev libffi-dev openssl-dev tcl-dev tk-dev zlib-dev \
 gdbm-dev readline-dev"
-SPLIT="ruby libruby ruby-stdlib ruby-dev"
+SPLIT="libruby $PACKAGE-stdlib $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			# executable host ruby is required. use --with-baseruby option.
-			# --with-arch=arm
-			export ac_cv_func_getpgrp_void=yes
-			export ac_cv_func_setpgrp_void=yes
-			ARCH_ARGS="--with-baseruby=/usr/bin/ruby" ;;
-	esac
-
 	#	--disable-rubygems
 	./configure \
 		--enable-shared \
 		--disable-install-doc \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make install &&
+	make install || return 1
+
 	rm $install/usr/lib/ruby/gems/*/cache/*.gem
 }
 
@@ -51,12 +41,12 @@
 			CAT="libdevel|shared libraries"
 			DEPENDS="gmp"
 			;;
-		ruby-stdlib)
+		*-stdlib)
 			copy /usr/lib/ruby/
 			CAT="libdevel|native libraries"
 			DEPENDS="gdbm libdb libffi libruby openssl readline zlib"
 			;;
-		ruby-dev)
+		*-dev)
 			copy @dev
 			;;
 	esac
diff -r ad29ddfee1c9 -r d5aab818505e rubyripper/receipt
--- a/rubyripper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rubyripper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.2"
 CATEGORY="multimedia"
 SHORT_DESC="A secure audio disc ripper"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/bleskodev/rubyripper"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -15,24 +15,21 @@
 DEPENDS="cd-discid cdparanoia-III flac normalize ruby"
 BUILD_DEPENDS="cd-discid cdparanoia-III lame normalize ruby-dev vorbis-tools"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--enable-gtk2 \
 		--enable-cli \
 		--enable-lang-all \
-		&& make && make DESTDIR=$DESTDIR install
+		&&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr 
+genpkg_rules() {
+	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	# launcher
 	cp -a $stuff/$PACKAGE $fs/usr/bin
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e runcom/receipt
--- a/runcom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/runcom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,32 +11,26 @@
 
 TAGS="virtual 8086 vm86"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $src
 	cd $src
 	#tarball=$(wget -O - $WEB_SITE/tech.html | \
 	#	  sed '/linuxstart/!d;s/.*href="\([^"]*\)".*/\1/')
 	#wget $WEB_SITE/$tarball
 	#tar xzf $tarball
-	mkdir -p $DESTDIR/usr/bin
-	cc -o $DESTDIR/usr/bin/runcom $stuff/runcom.c
+	mkdir -p $install/usr/bin
+	cc -o $install/usr/bin/runcom $stuff/runcom.c
 	cc -o $src/debug.o -Wa,-a=$src/debug.lst -c $stuff/debug.S
-	objcopy -O binary $src/debug.o $DESTDIR/usr/bin/debug.bin
-	cp $stuff/debug.com $DESTDIR/usr/bin
-	chmod +x $DESTDIR/usr/bin/debug.*
+	objcopy -O binary $src/debug.o $install/usr/bin/debug.bin
+	cp $stuff/debug.com $install/usr/bin
+	chmod +x $install/usr/bin/debug.*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 }
 
-# Post install command for Tazpkg.
-post_install()
-{
+post_install() {
 	fmt="binfmt_misc"
 	proc="/proc/sys/fs/binfmt_misc"
 	bin=":BOOTBIN:E::bin::/usr/bin/runcom:"
@@ -53,8 +47,7 @@
 }
 
 # Pre remove command for Tazpkg.
-pre_remove()
-{
+pre_remove() {
 	echo -1 > /proc/sys/fs/binfmt_misc/BOOTBIN
 	echo -1 > /proc/sys/fs/binfmt_misc/DOSCOM
 	sed -i '/binfmt_misc/{NN;/DOSCOM:E::com/d}' "$1/etc/init.d/local.sh"
diff -r ad29ddfee1c9 -r d5aab818505e rust/receipt
--- a/rust/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rust/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,7 +8,6 @@
 LICENSE="MIT Apache BSD"
 WEB_SITE="https://www.rust-lang.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/rust.html"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="rust-$VERSION-${ARCH/i486/i686}-unknown-linux-gnu.tar.gz"
 WGET_URL="https://static.rust-lang.org/dist/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e rzip/receipt
--- a/rzip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/rzip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	install -Dm 755 $src/rzip $install/usr/bin/rzip
+	install -Dm755 rzip $install/usr/bin/rzip
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e s3ql/receipt
--- a/s3ql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/s3ql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,9 +18,9 @@
 compile_rules() {
 	sed -i 's|http:|https:|' util/distribute_setup.py
 
-	python setup.py build &&
-	python setup.py test &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py test &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e safecopy/receipt
--- a/safecopy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/safecopy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="safecopy"
 VERSION="1.7"
 CATEGORY="system-tools"
 SHORT_DESC="A disk data recovery tool to extract data from damaged media"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://safecopy.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://safecopy.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure && make && make install
+compile_rules() {
+	./configure &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sagan-rules/receipt
--- a/sagan-rules/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sagan-rules/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,13 @@
 VERSION="08222011"
 CATEGORY="security"
 SHORT_DESC="sagan rules"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://sagan.softwink.com/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://sagan.softwink.com/rules/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/sagan/rules
 	cp -a $src/* $fs/etc/sagan/rules
 }
diff -r ad29ddfee1c9 -r d5aab818505e sagan/receipt
--- a/sagan/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sagan/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.0"
 CATEGORY="security"
 SHORT_DESC="Multi-threaded, real time system and event log monitoring system"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sagan.softwink.com/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libesmtp-dev libpcap-dev libdnet-dev liblognorm-dev pcre-dev \
 mysql-dev postgresql-dev"
-SPLIT="sagan-mysql:mysql sagan-pgsql:pgsql"
+SPLIT="$PACKAGE-mysql:mysql $PACKAGE-pgsql:pgsql"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e sakura-gtk2/receipt
--- a/sakura-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sakura-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,18 +4,16 @@
 VERSION="2.4.2" # last sakura with gtk2 is 2.4.2
 CATEGORY="utilities"
 SHORT_DESC="Simple GTK+2 and VTE-based terminal emulator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.pleyades.net/david/projects/sakura"
 
 TARBALL="sakura-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="cmake glib-dev gtk2-dev vte-gtk2-dev gettext"
+BUILD_DEPENDS="cmake glib-dev gtk2-dev vte-gtk2-dev gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_BUILD_TYPE=RELEASE \
@@ -25,15 +23,13 @@
 	sed -i 's/-u//' CMakeLists.txt &&
 	sed -i 's/-u//' CMakeFiles/man.dir/build.make &&
 	make &&
-	make DESTDIR=$DESTDIR install || exit 1
+	make DESTDIR=$install install || return 1
 
 	cp -f $stuff/sakura.desktop $install/usr/share/applications
 	rm -rf $install/usr/share/pixmaps
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	TAGS="terminal"
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 pango vte-gtk2 \
diff -r ad29ddfee1c9 -r d5aab818505e sakura/receipt
--- a/sakura/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sakura/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="sakura-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="cmake glib-dev gtk3-dev vte-dev gettext"
+BUILD_DEPENDS="cmake glib-dev gtk3-dev vte-dev gettext-dev"
 
 compile_rules() {
 	sed -i '/TryExec/d; s|Icon=.*|Icon=utilities-terminal|' sakura.desktop
diff -r ad29ddfee1c9 -r d5aab818505e samba/receipt
--- a/samba/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/samba/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="python-dev perl acl-dev docbook-xsl openldap-dev   \
 gnutls-dev krb5-dev cyrus-sasl-dev zlib-dev popt-dev libtdb-dev talloc-dev \
 libgcrypt-dev nss-dev cups-dev dbus-dev pam pam-dev"
-SPLIT="samba samba-dev samba-pam:pam" # TODO: swat
+SPLIT="$PACKAGE-dev $PACKAGE-pam:pam" # TODO: swat
 
 BUGS="Open directory needs MIT kerberos support (krb5)"
 COOKOPTS="!menus"
@@ -44,7 +44,8 @@
 		--enable-selftest \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	mkdir -p $instsll/lib/
 	mv $install/usr/lib/libnss_wins.so*  $install/usr/lib/libnss_winbind.so* \
diff -r ad29ddfee1c9 -r d5aab818505e sane-backends/receipt
--- a/sane-backends/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sane-backends/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.22"
 CATEGORY="system-tools"
 SHORT_DESC="Scanner Access Now Easy"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sane-project.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="libusb-compat-dev libjpeg-turbo-dev tiff-dev zlib-dev v4l-utils-dev \
 libgphoto2-dev libtool eudev-dev"
-SPLIT="sane-backends-dev"
+SPLIT="$package-dev"
 
 compile_rules() {
 	sed -i 's|prefix}/doc|prefix}/share/doc|' configure
@@ -40,7 +40,7 @@
 	cp $stuff/tazpanel/drag.gif $install/var/www/tazpanel/styles/default/images/
 	ln -s ../../sane.cgi        $install/var/www/tazpanel/menu.d/hardware/sane
 
-	# fix groups/permissions on /var/lock/sane ; add it to scanner group
+	# fix groups/permissions on /var/lock/sane; add it to scanner group
 	chmod 775 "$install/var/lock/sane"
 	chgrp 96  "$install/var/lock/sane"
 
@@ -66,7 +66,7 @@
 	tazpkg reconfigure eudev --root="$1"
 
 	# add group scanner
-	if ! grep -q scanner "$1/etc/group" ; then
+	if ! grep -q scanner "$1/etc/group"; then
 		chroot "$1/" addgroup -g 96 scanner
 	fi
 	chroot "$1/" chgrp scanner /usr/bin/scanimage
diff -r ad29ddfee1c9 -r d5aab818505e sarg/receipt
--- a/sarg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sarg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Squid Analysis Report Generator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://sarg.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/sarg/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-SPLIT="sarg-php"
+SPLIT="$PACKAGE-php"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e sawman/receipt
--- a/sawman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sawman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.3"
 CATEGORY="graphics"
 SHORT_DESC="DirectFB Window manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://directfb.org/index.php?path=Platform/SaWMan"
 
diff -r ad29ddfee1c9 -r d5aab818505e sbackup/receipt
--- a/sbackup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sbackup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,21 +11,22 @@
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="python notify-python gettext-base python-pygtk gvfs fuse2 sshfs-fuse \
-curlftpfs desktop-file-utils gettext-tools"
+BUILD_DEPENDS="python notify-python gettext-base python-pygtk gvfs fuse2 \
+sshfs-fuse curlftpfs desktop-file-utils gettext"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr/share/sbackup
-	cp scripts/* $DESTDIR/usr/share/sbackup/
-	sed -i 's|dbus force-reload|echo &|;s|gconf-schemas|echo &|' Makefile
+	mkdir -p $install/usr/share/sbackup
+	cp scripts/* $install/usr/share/sbackup/
+	sed -i 's|dbus force-reload|echo &|; s|gconf-schemas|echo &|' Makefile
 
-	make && make DESTDIR=$DESTDIR/usr install
+	make &&
+	make DESTDIR=$install/usr install
 	# sudo sbackupconfig
 }
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="python notify-python gettext-base python-pygtk gvfs fuse2 sshfs-fuse \
-	curlftpfs desktop-file-utils"
+	DEPENDS="python notify-python gettext-base python-pygtk gvfs fuse2 \
+	sshfs-fuse curlftpfs desktop-file-utils"
 	TAGS="backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sbxkb/receipt
--- a/sbxkb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sbxkb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sbxkb"
 VERSION="0.7.6"
@@ -7,25 +7,25 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://sourceforge.net/projects/staybox/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/staybox/$TARBALL"
 
-DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base \
-gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
-xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
-xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
-xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
 BUILD_DEPENDS="gtk2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="atk bzlib cairo expat fontconfig freetype gcc-lib-base \
+	gdk-pixbuf glib glibc-base gtk2 libffi libpng16 xorg-libxcb pango \
+	xorg-pixman xorg-libX11 xorg-libXau xorg-libXcomposite xorg-libXcursor \
+	xorg-libXdamage xorg-libXdmcp xorg-libXext xorg-libXfixes \
+	xorg-libXinerama xorg-libXrandr xorg-libXrender zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sc-im/receipt
--- a/sc-im/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sc-im/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sc-im"
 VERSION="0.4.0"
 CATEGORY="office"
-SHORT_DESC="Spreadsheet Calculator Improvised."
+SHORT_DESC="Spreadsheet Calculator Improvised"
 MAINTAINER="paul@slitaz.org"
+WEB_SITE="https://github.com/andmarti1424/sc-im"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/andmarti1424/sc-im"
 WGET_URL="git|git://github.com/andmarti1424/sc-im"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="git ncurses-dev bison"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/src
-	make -j1 && make install
+	make -j1 &&
+	make install
 }
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy scim scim_help
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sc/receipt
--- a/sc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,9 +16,9 @@
 compile_rules() {
 	make || return 1
 
-	for i in sc psc scqref; do
-		install -Dm 755 $src/$i $install/usr/bin/$i
-	done
+	install -Dm755 sc     $install/usr/bin/sc
+	install -Dm755 psc    $install/usr/bin/psc
+	install -Dm755 scqref $install/usr/bin/scqref
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scalpel/receipt
--- a/scalpel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scalpel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,16 +6,16 @@
 SHORT_DESC="Frugal, high performance file carver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.digitalforensicssolutions.com/Scalpel"
+WEB_SITE="https://www.forensicswiki.org/wiki/Scalpel"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="$WEB_SITE/$TARBALL" # FIXME https://github.com/sleuthkit/scalpel
 
 compile_rules() {
 	make || return 1
 
-	install -Dm 755 $src/scalpel      $install/usr/bin/scalpel
-	install -Dm 644 $src/scalpel.conf $install/etc/scalpel.conf
+	install -Dm755 scalpel      $install/usr/bin/scalpel
+	install -Dm644 scalpel.conf $install/etc/scalpel.conf
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scanssh/receipt
--- a/scanssh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scanssh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scanssh"
 VERSION="2.1"
 CATEGORY="network"
 SHORT_DESC="Search for SSH server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://www.monkey.org/~provos/scanssh/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.monkey.org/~provos/scanssh/"
 WGET_URL="https://www.monkey.org/~provos/$TARBALL"
-TAGS="ssh"
 
-DEPENDS="libpcap libdnet libevent"
 BUILD_DEPENDS="libpcap-dev libdnet-dev libevent libevent-dev autoconf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make 
-	install -d -m 755 $DESTDIR/usr/share/man/man1 &&
-	install -m 644 $src/*.1 $DESTDIR/usr/share/man/man1
+	make || return 1
+
+	install -Dm755 scanssh $install/usr/bin/scanssh
+	cook_pick_manpages $src/*.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/scanssh $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpcap libdnet libevent"
+	TAGS="ssh"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e schroedinger/receipt
--- a/schroedinger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/schroedinger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.11"
 CATEGORY="multimedia"
 SHORT_DESC="Dirac video compression library"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL LGPL GPL MIT"
 WEB_SITE="https://launchpad.net/schroedinger"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
 
 BUILD_DEPENDS="orc-dev"
-SPLIT="schroedinger-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e scilab/receipt
--- a/scilab/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scilab/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="gfortran hdf5-dev ocaml fftw-dev libxml2-dev \
-gettext blas lapack curl-dev tcl-dev tk-dev xorg-dev ncurses-dev \
+gettext-dev blas lapack curl-dev tcl-dev tk-dev xorg-dev ncurses-dev \
 arpack-ng-dev matio-dev"
 
 compile_rules() {
@@ -25,7 +25,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make all &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scim-pinyin/receipt
--- a/scim-pinyin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scim-pinyin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,17 @@
 VERSION="0.5.92"
 CATEGORY="utilities"
 SHORT_DESC="Chinese PinYin input for SCIM"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/scim-im/scim-pinyin"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
 
-BUILD_DEPENDS="automake gettext libtool scim-dev"
-SPLIT="scim-pinyin-dev"
+BUILD_DEPENDS="automake gettext-dev libtool scim-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap &&
 
 	./configure \
@@ -26,9 +24,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		scim-pinyin)
 			copy @std
diff -r ad29ddfee1c9 -r d5aab818505e scim-tables/receipt
--- a/scim-tables/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scim-tables/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,28 @@
 VERSION="0.5.14.1"
 CATEGORY="meta"
 SHORT_DESC="SCIM Tables"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/scim-im/scim-tables"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
 
-BUILD_DEPENDS="automake libtool intltool gettext scim-dev"
+BUILD_DEPENDS="automake libtool intltool gettext-dev scim-dev"
 SPLIT="scim-tables-base scim-tables-ja scim-tables-ko scim-tables-zh \
 scim-tables-dev scim-tables-additional"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./bootstrap &&
 
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		scim-tables)
 			DEPENDS="scim $SPLIT"
diff -r ad29ddfee1c9 -r d5aab818505e scim/receipt
--- a/scim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.4.17"
 CATEGORY="utilities"
 SHORT_DESC="Smart Common Input Method"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/scim-im/scim"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/scim-im/scim/archive/$TARBALL"
 
-BUILD_DEPENDS="gettext automake intltool libtool doxygen coreutils-path \
+BUILD_DEPENDS="gettext-dev automake intltool libtool doxygen coreutils-path \
 libxslt docbook-xsl gtk2-dev xorg-libX11-dev"
-SPLIT="scim-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap &&
diff -r ad29ddfee1c9 -r d5aab818505e scite/receipt
--- a/scite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,12 +3,12 @@
 PACKAGE="scite"
 VERSION="4.0.1"
 CATEGORY="utilities"
-SHORT_DESC="Editor with syntax highlighting and source code editing features."
-MAINTAINER="rcx@zoominternet.net"
+SHORT_DESC="Editor with syntax highlighting and source code editing features"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PSL"
 WEB_SITE="https://www.scintilla.org/"
 
-TARBALL="${PACKAGE}${VERSION//./}.tgz"
+TARBALL="$PACKAGE${VERSION//./}.tgz"
 WGET_URL="$SF_MIRROR/scintilla/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev"
@@ -24,9 +24,9 @@
 	make prefix=/usr install || return 1
 
 	# Desktop file and icon
-	mkdir -p $DESTDIR/usr/share/applications $DESTDIR/usr/share/pixmaps
-	cp SciTE.desktop $DESTDIR/usr/share/applications
-	cp Sci48M.png $DESTDIR/usr/share/pixmaps
+	mkdir -p $install/usr/share/applications $install/usr/share/pixmaps
+	cp SciTE.desktop $install/usr/share/applications
+	cp Sci48M.png $install/usr/share/pixmaps
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scons/receipt
--- a/scons/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scons/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="scons"
 VERSION="3.0.1"
 CATEGORY="development"
-SHORT_DESC="SCons is an Open Source software construction tool"
-MAINTAINER="chadi.elahmad@gmail.com"
+SHORT_DESC="Open Source software construction tool"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://scons.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/scons.html"
@@ -15,10 +15,9 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py install \
+	python -B setup.py install \
 		--prefix=/usr \
 		--standard-lib \
-		--optimize=1 \
 		--install-data=/usr/share \
 		--root=$install || return 1
 
diff -r ad29ddfee1c9 -r d5aab818505e scons2/receipt
--- a/scons2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scons2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="scons2"
 VERSION="2.5.1"
 CATEGORY="development"
-SHORT_DESC="SCons (2.x) is an Open Source software construction tool"
+SHORT_DESC="Open Source software construction tool"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="MIT"
 WEB_SITE="https://scons.org/"
@@ -16,10 +16,9 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py install \
+	python -B setup.py install \
 		--prefix=/usr \
 		--standard-lib \
-		--optimize=1 \
 		--install-data=/usr/share \
 		--root=$install || return 1
 
diff -r ad29ddfee1c9 -r d5aab818505e scratch/receipt
--- a/scratch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scratch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.0.7"
 CATEGORY="network"
 SHORT_DESC="Create and share interactive stories, games, music and art"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://scratch.mit.edu/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://download.scratch.mit.edu/$TARBALL"
 
 BUILD_DEPENDS="pango-dev shared-mime-info-dev"
-SPLIT="scratch-help"
+SPLIT="$PACKAGE-help"
 
 compile_rules() {
 	# Fix cross compilation: gcc is hardcoded
@@ -20,25 +20,25 @@
 	sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/scratch &&
 	make build &&
 	# Install
-	mkdir -p ${DESTDIR}/usr/bin \
-		${DESTDIR}/usr/lib/scratch \
-		${DESTDIR}/usr/share/scratch \
-		${DESTDIR}/usr/share/icons/hicolor \
-		${DESTDIR}/usr/share/applications \
-		${DESTDIR}/usr/share/mime/packages \
-		${DESTDIR}/usr/share/icons/hicolor/48x48/apps \
-		${DESTDIR}/usr/share/icons/hicolor/48x48/mimetypes &&
-	install -m 755 src/scratch ${DESTDIR}/usr/bin/scratch &&
-	install -m 644 Scratch.image ${DESTDIR}/usr/lib/scratch/Scratch.image &&
-	install -m 644 Scratch.ini ${DESTDIR}/usr/lib/scratch/Scratch.ini &&
-	cp src/scratch.desktop ${DESTDIR}/usr/share/applications &&
-	cp src/scratch.xml ${DESTDIR}/usr/share/mime/packages &&
-	cp -a Plugins ${DESTDIR}/usr/lib/scratch &&
-	cp -a locale Media Projects ${DESTDIR}/usr/share/scratch &&
+	mkdir -p $install/usr/bin \
+		$install/usr/lib/scratch \
+		$install/usr/share/scratch \
+		$install/usr/share/icons/hicolor \
+		$install/usr/share/applications \
+		$install/usr/share/mime/packages \
+		$install/usr/share/icons/hicolor/48x48/apps \
+		$install/usr/share/icons/hicolor/48x48/mimetypes &&
+	install -m 755 src/scratch $install/usr/bin/scratch &&
+	install -m 644 Scratch.image $install/usr/lib/scratch/Scratch.image &&
+	install -m 644 Scratch.ini $install/usr/lib/scratch/Scratch.ini &&
+	cp src/scratch.desktop $install/usr/share/applications &&
+	cp src/scratch.xml $install/usr/share/mime/packages &&
+	cp -a Plugins $install/usr/lib/scratch &&
+	cp -a locale Media Projects $install/usr/share/scratch &&
 	cp src/icons/48x48/scratch.png \
-		${DESTDIR}/usr/share/icons/hicolor/48x48/apps &&
+		$install/usr/share/icons/hicolor/48x48/apps &&
 	cp src/icons/48x48/gnome-mime-*.png \
-		${DESTDIR}/usr/share/icons/hicolor/48x48/mimetypes
+		$install/usr/share/icons/hicolor/48x48/mimetypes
 }
 
 genpkg_rules() {
@@ -53,7 +53,7 @@
 			CAT="development|help"
 			DEPENDS="scratch"
 			mkdir -p $fs/usr/share/scratch
-			cp -rp ${src}/Help $fs/usr/share/scratch
+			cp -rp $src/Help $fs/usr/share/scratch
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e screen/receipt
--- a/screen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/screen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ncurses-extra pam-dev"
-SPLIT="screen-terminfo screen screen-pam:pam"
+SPLIT="$PACKAGE-terminfo $PACKAGE $PACKAGE-pam:pam"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e screenfetch/receipt
--- a/screenfetch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/screenfetch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,21 @@
 PACKAGE="screenfetch"
 VERSION="3.5.0"
 CATEGORY="utilities"
-SHORT_DESC="Bash screenshot information tool."
+SHORT_DESC="Bash screenshot information tool"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/KittyKatt/screenFetch"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/KittyKatt/screenFetch"
 WGET_URL="git|git://github.com/KittyKatt/screenFetch"
 
-DEPENDS="bash procps xorg-xdpyinfo"
 BUILD_DEPENDS="git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $install/usr/bin
-	cp screenfetch-dev $install/usr/bin/screenfetch
+compile_rules() {
+	install -Dm755 screenfetch-dev $install/usr/bin/screenfetch
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="bash procps xorg-xdpyinfo"
 }
diff -r ad29ddfee1c9 -r d5aab818505e screenlets/receipt
--- a/screenlets/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/screenlets/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,17 @@
 VERSION="0.1.6"
 CATEGORY="system-tools"
 SHORT_DESC="Desktop widgets framework"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://screenlets.org"
+WEB_SITE="https://web.archive.org/web/20121113151039/http://screenlets.org:80/index.php/Home"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/screenlets/trunk/$VERSION/+download/$TARBALL"
 
-BUILD_DEPENDS="python-dev gettext"
+BUILD_DEPENDS="python-dev gettext-dev"
 
 compile_rules() {
-	python setup.py install --root=$install || return 1
+	python -B setup.py install --root=$install || return 1
 
 	mkdir -p      $install/etc/screenlets/
 	echo '/usr' > $install/etc/screenlets/prefix
diff -r ad29ddfee1c9 -r d5aab818505e screentest/receipt
--- a/screentest/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/screentest/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scribus/receipt
--- a/scribus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scribus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,37 +3,35 @@
 PACKAGE="scribus"
 VERSION="1.4.6"
 CATEGORY="office"
-SHORT_DESC="professional publishing software."
+SHORT_DESC="Professional publishing software"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.scribus.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://www.scribus.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="ghostscript libQtGui libQtXml libQtNetwork cups lcms libxml2 \
-gcc-lib-base aspell python krb5 podofo"
 BUILD_DEPENDS="cmake qmake Qt4-dev freetype freetype-dev \
 cairo cairo-dev tiff tiff-dev lcms lcms-dev jpeg jpeg-dev libpng16 libpng16-dev \
 cups cups-dev fontconfig fontconfig-dev libxml2 libxml2-dev podofo-dev \
 ghostscript python python-dev python-pil aspell aspell-dev \
 boost-dev openssl openssl-dev zlib tk"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/usr/lib
 	cp -a $install/usr/share/scribus $fs/usr/share
 	cp -a $install/usr/lib/scribus $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/mimelnk $fs/usr/share
-	cp -a stuff/* $fs
+	cp -a $stuff/* $fs
+	DEPENDS="ghostscript libQtGui libQtXml libQtNetwork cups lcms libxml2 \
+	gcc-lib-base aspell python krb5 podofo"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e scrollz/receipt
--- a/scrollz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scrollz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scrollz"
 VERSION="2.2.3"
 CATEGORY="network"
-SHORT_DESC="ScrollZ IRC client."
+SHORT_DESC="ScrollZ IRC client"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.scrollz.info/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.scrollz.info/"
 WGET_URL="git|git://github.com/ScrollZ/ScrollZ"
 
-DEPENDS=""
 BUILD_DEPENDS="git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure --prefix=/usr &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	# remove stuff
-	rm -rf $fs/usr/share/man
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e scrot/receipt
--- a/scrot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scrot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scrot"
 VERSION="0.8"
@@ -6,27 +6,23 @@
 SHORT_DESC="A screen capture utility"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/scrot"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://freecode.com/projects/scrot"
 WGET_URL="http://www.linuxbrit.co.uk/downloads/$TARBALL"
 
-DEPENDS="bzlib freetype giblib glibc-base imlib2 xorg-libxcb xorg-libX11 \
-xorg-libXau xorg-libXdmcp xorg-libXext zlib"
 BUILD_DEPENDS="patch giblib-dev imlib2-dev xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|prefix)/doc|prefix)/share/doc|' *
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="bzlib freetype giblib glibc-base imlib2 xorg-libxcb xorg-libX11 \
+	xorg-libXau xorg-libXdmcp xorg-libXext zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e scrounge-ntfs/receipt
--- a/scrounge-ntfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scrounge-ntfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scrounge-ntfs"
 VERSION="0.9"
 CATEGORY="system-tools"
-SHORT_DESC="Data recovery program for NTFS file systems."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="Data recovery program for NTFS file systems"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://thewalter.net/stef/software/scrounge/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://thewalter.net/stef/software/scrounge/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e scrub/receipt
--- a/scrub/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scrub/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,26 @@
 PACKAGE="scrub"
 VERSION="2.4"
 CATEGORY="security"
-SHORT_DESC="Iteratively writes patterns on files or disk devices to make retreiving the data more difficult."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Iteratively writes patterns on files or disk devices to make retreiving the data more difficult"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="https://github.com/chaos/scrub"
 WGET_URL="http://diskscrub.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS=""
 BUILD_DEPENDS="perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sctp-tools/receipt
--- a/sctp-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sctp-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,12 +11,12 @@
 TARBALL="lksctp-tools-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/lksctp/$TARBALL"
 
-SPLIT="libsctp sctp-tools libsctp-dev"
+SPLIT="libsctp $PACKAGE libsctp-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e scummvm/receipt
--- a/scummvm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/scummvm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="games"
 SHORT_DESC="A 'virtual machine' for several classic graphical point-and-click \
 adventure games"
-MAINTAINER="admin@trixarian.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.scummvm.org/"
 
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="alsa-lib-dev libmad-dev libmpeg2-dev libogg-dev libsdl-dev \
 libvorbis-dev flac-dev zlib-dev"
-CROSS="bug: Doesn't support --build."
 
 compile_rules() {
 	./configure \
@@ -25,10 +24,11 @@
 		--with-flac-prefix=/usr \
 		--disable-fluidsynth \
 		--host=$HOST_SYSTEM &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
-	mkdir -p $DESTDIR/usr/share/applications
-	cp -a dists/scummvm.desktop $DESTDIR/usr/share/applications
+	mkdir -p $install/usr/share/applications
+	cp -a dists/scummvm.desktop $install/usr/share/applications
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sdcc/receipt
--- a/sdcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sdcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,31 @@
 PACKAGE="sdcc"
 VERSION="3.6.0"
 CATEGORY="development"
-SHORT_DESC="Retargettable C compiler for 8051, Z80 and 68HC08."
+SHORT_DESC="Retargettable C compiler for 8051, Z80 and 68HC08"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://sdcc.sourceforge.net/"
+
 TARBALL="$PACKAGE-src-$VERSION.tar.bz2"
-WEB_SITE="http://sdcc.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
-TAGS="cross compiler C 8051 Z80 68HC08 assembler"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
+BUILD_DEPENDS="flex boost-dev boost-graph gputils texinfo"
 COOKOPTS="!strip"
 
-BUILD_DEPENDS="flex boost-dev boost-graph gputils texinfo"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	#sed -i 's/exec/[ "$1" == ":" ] || &/' device/lib/pic16/depcomp
 	#sed -i 's/ -u$//' device/lib/Makefile*
 
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	TAGS="cross compiler C 8051 Z80 68HC08 assembler"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e seamonkey/receipt
--- a/seamonkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/seamonkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="seamonkey"
 VERSION="2.7.2"
 CATEGORY="network"
-SHORT_DESC="Seamonkey suite (browser, mail, news reader)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Seamonkey suite (browser, mail, news reader)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL MPL"
+WEB_SITE="http://www.seamonkey-project.org/"
+
 TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
-WEB_SITE="http://www.seamonkey-project.org/"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/$VERSION/source/$TARBALL"
-TAGS="web-browser"
 
-DEPENDS="gtk2 glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl libnotify \
-libevent libvpx"
 BUILD_DEPENDS="gtk2-dev zip libIDL coreutils xorg-libXft-dev libevent-dev \
 libvpx-dev perl alsa-lib alsa-lib-dev findutils python python-dev \
 wireless_tools-dev mesa-dev yasm libnotify-dev curl-dev hunspell-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp -a $stuff/seamonkey.mozconfig $src/.mozconfig
 	sed -i -e 's/USE_INPUT_PARTITION/USE_INPUT_FRAGMENTS/' \
 		-e 's/0.9.7/1.0.0/' mozilla/configure.in mozilla/configure
@@ -33,12 +29,10 @@
 	export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey"
 	./configure $CONFIGURE_ARGS 2>&1 | grep -v 'cthandlers/calendar/Makefile.in' &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/lib $fs/etc
 	cp -a $install/usr/bin/seamonkey $fs/usr/bin
 	cp -a $install/usr/lib/seamonkey $fs/usr/lib
@@ -57,4 +51,7 @@
 
 	# Create default user preference file
 	cp $stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js
+	DEPENDS="gtk2 glib jpeg xorg-libX11 libIDL alsa-lib xorg-libXt curl \
+	libnotify libevent libvpx"
+	TAGS="web-browser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e searchmonkey/receipt
--- a/searchmonkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/searchmonkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.1"
 CATEGORY="utilities"
 SHORT_DESC="A fast real-time search engine using GTK+"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://searchmonkey.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e secure-delete/receipt
--- a/secure-delete/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/secure-delete/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="secure-delete"
 VERSION="3.1"
 CATEGORY="misc"
-SHORT_DESC="Secure file, disk, swap, memory erasure utilities."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Secure file, disk, swap, memory erasure utilities"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://www.thc.org/"
+
 SOURCE="secure_delete"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.thc.org/"
 WGET_URL="http://freeworld.thc.org/releases/$TARBALL"
 
-DEPENDS="glibc-base"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	chmod u+w .
 	sed -ie 's/mktemp/mkstemp/g' sfill.c
 	sed -ie "s/sswap smem sdel-mod.o/sswap smem/" Makefile
 	make -j1 &&
-	make -j1 && make -j1 INSTALL_DIR=$DESTDIR/usr/bin install
-	chmod a+r $DESTDIR/usr/bin/*
+	make -j1 &&
+	make -j1 INSTALL_DIR=$install/usr/bin install || return 1
+
+	chmod a+r $install/usr/bin/*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="glibc-base"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sed/receipt
--- a/sed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="acl-dev gettext texinfo"
+BUILD_DEPENDS="acl-dev gettext-dev texinfo"
 
 compile_rules() {
 	# Rebuild after patching
diff -r ad29ddfee1c9 -r d5aab818505e seed/receipt
--- a/seed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/seed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,17 @@
 VERSION="3.8.1"
 CATEGORY="system-tools"
 SHORT_DESC="GObject JavaScriptCore bridge"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/Seed"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gettext libtool webkitgtk-dev intltool \
+BUILD_DEPENDS="gettext-dev libtool webkitgtk-dev intltool \
 gobject-introspection-dev gnome-js-common readline-dev dbus-dev dbus-glib-dev \
 mpfr-dev"
-SPLIT="seed-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e serd/receipt
--- a/serd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/serd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,12 +13,12 @@
 WGET_URL="http://download.drobilla.net/$TARBALL"
 
 BUILD_DEPENDS="python"
-SPLIT="serd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e serf/receipt
--- a/serf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/serf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://archive.apache.org/dist/serf/$TARBALL"
 
 BUILD_DEPENDS="scons2 apr-dev apr-util-dev"
-SPLIT="serf-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i "/Append/s:RPATH=libdir,::"   SConstruct &&
diff -r ad29ddfee1c9 -r d5aab818505e setserial/receipt
--- a/setserial/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/setserial/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,23 @@
 PACKAGE="setserial"
 VERSION="2.17"
 CATEGORY="system-tools"
-SHORT_DESC="Serial port configutation tool."
+SHORT_DESC="Serial port configutation tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://setserial.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/bin
-	
+compile_rules() {
+	mkdir -p $install/usr/bin
+
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make $PACKAGE &&
-	install -m 755 $PACKAGE $DESTDIR/usr/bin
+	install -m 755 $PACKAGE $install/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sg3_utils/receipt
--- a/sg3_utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sg3_utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.42"
 CATEGORY="system-tools"
 SHORT_DESC="Low level utilities for devices that use a SCSI command set"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL BSD"
 WEB_SITE="http://sg.danny.cz/sg/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/sg3_utils.html"
diff -r ad29ddfee1c9 -r d5aab818505e shaarli/receipt
--- a/shaarli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shaarli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,24 @@
 # SliTaz package receipt.
 
 PACKAGE="shaarli"
-GITHASH="48b68c8fa5aa9ca98f3a9aaf9277656fe0cafb01"
-VERSION=${GITHASH:0:7}
+GITHASH="48b68c8"
+VERSION="$GITHASH"
 CATEGORY="network"
-SHORT_DESC="A minimalist delicious clone."
+SHORT_DESC="A minimalist delicious clone"
 WEB_SITE="http://sebsauvage.net/wiki/doku.php?id=php:shaarli"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="zlib/libpng"
+
 TARBALL="${PACKAGE}_$VERSION.zip"
 WGET_URL="https://github.com/sebsauvage/Shaarli/archive/$GITHASH.zip"
 
-DEPENDS="php"
-BUILD_DEPENDS="wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www
 	cp -a $src $fs/var/www/$PACKAGE
 	sed -i "s|mt_rand())|mt_rand().'$WGET_URL$$')|" $fs/var/www/$PACKAGE/index.php
 }
 
-post_install()
-{
+post_install() {
 	chown -R www "$1/var/www/$PACKAGE"
+	DEPENDS="php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e shaarlo/receipt
--- a/shaarlo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shaarlo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,30 @@
 GITHASH="ac6ef877ce1cbd33e85b3d041715d765a26497b7"
 VERSION=${GITHASH:0:7}
 CATEGORY="network"
-SHORT_DESC="Unified Shaarlis Rss."
+SHORT_DESC="Unified Shaarlis Rss"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="zlib/libpng"
 TARBALL="$PACKAGE-$VERSION.zip"
 WEB_SITE="https://github.com/DMeloni/shaarlo"
 WGET_URL="$WEB_SITE/archive/$GITHASH.zip"
 
-DEPENDS="php"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www $fs/etc
 	cp -a $src $fs/var/www/$PACKAGE
 	mv $fs/var/www/$PACKAGE/config.php $fs/etc/shaarlo.php
 	ln -s /etc/shaarlo.php $fs/var/www/$PACKAGE/config.php
 	mkdir $fs/var/www/$PACKAGE/data
 	chmod +w $fs/var/www/$PACKAGE/data
+	DEPENDS="php"
 }
 
-post_install()
-{
+post_install() {
 	chown -R www "$1/var/www/$PACKAGE"
-	cat <<EOT
-Configure /etc/shaarlo.php and put /var/www/$PACKAGE/refresh.php in crontab
+	[ -n "$quiet" ] || cat <<EOT
+
+	.-----------------------------------------.
+	| Configure /etc/shaarlo.php and put      |
+	| /var/www/shaarlo/refresh.php to crontab |
+	'-----------------------------------------'
 EOT
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e shadow/receipt
--- a/shadow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shadow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://github.com/shadow-maint/shadow/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="acl-dev attr-dev gettext"
+BUILD_DEPENDS="acl-dev attr-dev gettext-dev"
 
 compile_rules() {
 	# Disable the installation of the `groups` program and its man pages, as
diff -r ad29ddfee1c9 -r d5aab818505e shake/receipt
--- a/shake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="shake"
 VERSION="0.999"
 CATEGORY="misc"
-SHORT_DESC="A defragmentation tool."
+SHORT_DESC="A defragmentation tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://vleu.net/shake/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://vleu.net/shake/"
 WGET_URL="http://download.savannah.nongnu.org/releases/$PACKAGE/$TARBALL"
-SUGGESTED="defrag"
 
 BUILD_DEPENDS="cmake attr attr-dev help2man"
-DEPENDS="attr"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|.*fcntl.*|#include <sys/types.h>\n&|' judge.h
 	cd $src/build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $install/usr/bin/*  $fs/usr/bin
+	DEPENDS="attr"
+	SUGGESTED="defrag"
 }
diff -r ad29ddfee1c9 -r d5aab818505e shared-desktop-ontologies/receipt
--- a/shared-desktop-ontologies/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shared-desktop-ontologies/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,26 @@
 PACKAGE="shared-desktop-ontologies"
 VERSION="0.11.0"
 CATEGORY="development"
-SHORT_DESC="Provide RDF vocabularies for the Semantic Desktop."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Provide RDF vocabularies for the Semantic Desktop"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://oscaf.sourceforge.net/"
 WGET_URL="$SF_MIRROR/oscaf/$TARBALL"
 
-DEPENDS=""
 BUILD_DEPENDS="cmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p build && cd build
+compile_rules() {
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/* $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e shared-mime-info/receipt
--- a/shared-mime-info/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shared-mime-info/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.10"
 CATEGORY="system-tools"
 SHORT_DESC="Core database of common types"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/shared-mime-info.html"
@@ -12,7 +12,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://people.freedesktop.org/~hadess/$TARBALL"
 
-BUILD_DEPENDS_arm="glib-dev libxml2-dev"
 BUILD_DEPENDS="intltool libxml2-dev glib-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e sharedance/receipt
--- a/sharedance/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sharedance/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,23 @@
 PACKAGE="sharedance"
 VERSION="0.6"
 CATEGORY="network"
-SHORT_DESC="High-performance server to centralize ephemeral key/data."
-MAINTAINER="erjo@slitaz.org"
+SHORT_DESC="High-performance server to centralize ephemeral key/data"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://sharedance.pureftpd.org/project/sharedance"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.pureftpd.org/pub/sharedance/$TARBALL"
 
-DEPENDS="libevent"
 BUILD_DEPENDS="libevent-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libevent"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sharutils/receipt
--- a/sharutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sharutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e shell-detector/receipt
--- a/shell-detector/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shell-detector/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,34 +3,30 @@
 PACKAGE="shell-detector"
 VERSION="20140308"
 CATEGORY="network"
-SHORT_DESC="Web shell detection tool."
+SHORT_DESC="Web shell detection tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.emposha.com/security/php-shell-detector-web-shell-detection-tool.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 #WGET_URL="https://github.com/emposha/PHP-Shell-Detector/tarball/master"
 WGET_URL="git|git://github.com/emposha/PHP-Shell-Detector.git"
 
-DEPENDS="php"
 BUILD_DEPENDS="git"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/$PACKAGE
 	cp -a * $install/usr/share/$PACKAGE
 	ln -s shelldetect.php $install/usr/share/$PACKAGE/index.php
 	chown -R www.www $install/usr/share/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="php"
 }
 
-post_install()
-{
+post_install() {
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/phpsysinfo/ "$1/etc/lighttpd/lighttpd.conf"; then
diff -r ad29ddfee1c9 -r d5aab818505e shell-fm/receipt
--- a/shell-fm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shell-fm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,24 @@
 PACKAGE="shell-fm"
 VERSION="0.8"
 CATEGORY="multimedia"
-SHORT_DESC="console based player for the streams provided by Last.FM"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Console based player for the streams provided by Last.FM"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://nex.scrapping.cc/shell-fm/"
-TARBALL="$PACKAGE-$VERSION.tgz" 
+
+TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="https://github.com/jkramer/shell-fm/tarball/v$VERSION"
 
-DEPENDS="libmad libao taglib zlib"
 BUILD_DEPENDS="libmad-dev libao-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|PREFIX)/man|PREFIX)/share/man|' Makefile
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libmad libao taglib zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e shellinabox/receipt
--- a/shellinabox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shellinabox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p \
 		$install/usr/share/shellinabox/ \
diff -r ad29ddfee1c9 -r d5aab818505e shiki-colors-murrine/receipt
--- a/shiki-colors-murrine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shiki-colors-murrine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,12 +10,7 @@
 TARBALL="gnome-colors-$VERSION.tar.gz"
 WGET_URL="https://github.com/gnome-colors/gnome-colors/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk2-engine-murrine"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	for i in Brave Dust Human Illustrious Noble Wine Wise; do
 		j="$install/usr/share/themes/Shiki-$i-murrine"
 		mkdir -p $j
@@ -26,8 +21,7 @@
 	find $install -type f -exec chmod 644 \{\} \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e shiki-colors/receipt
--- a/shiki-colors/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shiki-colors/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,15 +7,11 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/gnome-colors/gnome-colors"
+
 TARBALL="gnome-colors-$VERSION.tar.gz"
 WGET_URL="https://github.com/gnome-colors/gnome-colors/archive/$VERSION.tar.gz"
 
-DEPENDS="gtk-clearlooks"
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	for i in Brave Dust Human Illustrious Noble Wine Wise; do
 		j="$install/usr/share/themes/Shiki-$i"
 		mkdir -p $j
@@ -25,8 +21,7 @@
 	find $install -type f -exec chmod 644 \{\} \;
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk-clearlooks"
 }
diff -r ad29ddfee1c9 -r d5aab818505e shimmer-themes/receipt
--- a/shimmer-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shimmer-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="The set of GTK+2 and GTK+3 themes from the Shimmer Project"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2 CC-BY-SA-3"
-WEB_SITE="http://shimmerproject.org/"
+WEB_SITE="https://shimmerproject.org/"
 
 DEPENDS="gtk-theme-albatross gtk-theme-blackbird gtk-theme-bluebird \
 gtk-theme-greybird gtk-theme-orion"
diff -r ad29ddfee1c9 -r d5aab818505e shutdown/receipt
--- a/shutdown/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/shutdown/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,11 @@
 VERSION="1.0"
 CATEGORY="utilities"
 SHORT_DESC="Simple wrapper for busybox to provide shutdown command"
-MAINTAINER="nneul@neulinger.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
-WEB_SITE="http://www.slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-genpkg_rules()
-{
-	mkdir -p $fs/sbin
-	cp $stuff/shutdown $fs/sbin/shutdown
-	chmod 755 $fs/sbin/shutdown
+genpkg_rules() {
+	install -Dm755 $stuff/shutdown $fs/sbin/shutdown
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sic/receipt
--- a/sic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,27 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sic"
 VERSION="1.1"
 CATEGORY="network"
-SHORT_DESC="Simple IRC client."
+SHORT_DESC="Simple IRC client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://tools.suckless.org/sic"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tools.suckless.org/sic"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make clean &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e silc-server/receipt
--- a/silc-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/silc-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,24 +6,24 @@
 SHORT_DESC="Secure Internet Live Conferencing server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.silcnet.org"
+WEB_SITE="http://www.silcnet.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$WEB_SITE/download/server/sources/$TARBALL"
 
 compile_rules() {
 	mkdir -p \
-		$DESTDIR/etc \
-		$DESTDIR/usr/share/man/man5 \
-		$DESTDIR/usr/share/man/man8
-	touch $DESTDIR/etc/silcd.pub
+		$install/etc \
+		$install/usr/share/man/man5 \
+		$install/usr/share/man/man8
+	touch $install/etc/silcd.pub
 
 	./configure \
 		--with-logsdir=/var/log/silc \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e singularity/receipt
--- a/singularity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/singularity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="singularity"
 VERSION="0.30c"
 CATEGORY="games"
-SHORT_DESC="Strategy game - simulation of true Al"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Strategy game - simulation of true AI"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://emhsoft.com/singularity/index.html"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WEB_SITE="http://emhsoft.com/singularity/index.html"
 WGET_URL="http://endgame-singularity.googlecode.com/files/$TARBALL"
 
-DEPENDS="python python-pygame libsdl-image libsdl-mixer python-numpy"
 BUILD_DEPENDS="patch"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/games/singularity
 	cp -a $src/singularity.py $fs/usr/games/singularity
 	cat >> $fs/usr/bin/singularity <<EOT
@@ -25,4 +23,5 @@
 EOT
 	chmod +x $fs/usr/bin/singularity
 	cp -a $src/code $src/data $fs/usr/games/singularity
+	DEPENDS="python python-pygame libsdl-image libsdl-mixer python-numpy"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sip/receipt
--- a/sip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,20 +12,22 @@
 WGET_URL="$SF_MIRROR/pyqt/$TARBALL"
 
 BUILD_DEPENDS="python-dev"
-SPLIT="sip-dev"
+SPLIT="$PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	python configure.py &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-		sip)   copy @std; DEPENDS="python";;
-		*-dev) copy @dev;;
+		sip)
+			copy @std
+			DEPENDS="python"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e siproxd/receipt
--- a/siproxd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/siproxd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sipsak/receipt
--- a/sipsak/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sipsak/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sipsak"
 VERSION="0.9.6-1"
 CATEGORY="network"
-SHORT_DESC="SIP swiss army knife."
+SHORT_DESC="SIP swiss army knife"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/sipsak.berlios/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/sipsak.berlios/"
 WGET_URL="$SF_MIRROR/sipsak.berlios/$TARBALL"
 
-DEPENDS="openssl gnutls zlib"
-BUILD_DEPENDS="openssl-dev openssl"
+BUILD_DEPENDS="openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|inline char\* get_body|char* get_body|' header_f.*
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="openssl gnutls zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slang/receipt
--- a/slang/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slang/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.1"
 CATEGORY="development"
 SHORT_DESC="S-Lang library"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.jedsoft.org/slang/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/slang.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://www.jedsoft.org/releases/slang/$TARBALL"
 
 BUILD_DEPENDS="pcre-dev oniguruma-dev libpng16-dev zlib-dev readline-dev"
-SPLIT="slang-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e sleuthkit/receipt
--- a/sleuthkit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sleuthkit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="misc"
 SHORT_DESC="File system and media management forensic analysis tools (supports \
 NTFS, FAT, UFS1/2, FFS, Ext2 and Ext3)"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sleuthkit.org/sleuthkit"
 
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="perl sqlite3-dev libpthread-stubs"
-SPLIT="sleuthkit-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make LDFLAGS+="-lpthread -ldl" &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e slib/receipt
--- a/slib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="slib"
 VERSION="3b3"
 CATEGORY="office"
-SHORT_DESC="portable library for the programming language Scheme"
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Portable library for the programming language Scheme"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://people.csail.mit.edu/jaffer/SLIB"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://groups.csail.mit.edu/mac/ftpdir/scm/$TARBALL"
 
-DEPENDS="guile"
 BUILD_DEPENDS="guile texinfo"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure  \
 		--prefix=/usr &&
 	sed -i 's/SCHEME = scm/SCHEME = guile/' Makefile
@@ -29,23 +27,21 @@
 	ln -s $install/usr/share/slib $install/usr/share/guile/site
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="guile"
 }
 
-post_install()
-{
+post_install() {
 	# add path to initialization file
 	sed -i s'#(load-from.*#(load-from-path "/usr/share/slib/guile.init")#' \
 		"$1/usr/share/guile/1.8/ice-9/slib.scm"
-	printf "Creating catalog"
+
+	action "Creating catalog"
 	chroot "$1/" guile -c "((use-modules (ice-9 slib))(require 'new-catalog)(quit))"
 	status
 }
 
-post_remove()
-{
+post_remove() {
 	rm -f "$1/usr/share/guile/1.8/slibcat"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slim-theme-control/receipt
--- a/slim-theme-control/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim-theme-control/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-20130609"
 CATEGORY="customization"
 SHORT_DESC="Control - theme for SLiM"
-MAINTAINER="holkfoor@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="http://www.slitaz.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e slim-theme-pilar/receipt
--- a/slim-theme-pilar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim-theme-pilar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-20130609"
 CATEGORY="customization"
 SHORT_DESC="Pilar - theme for SLiM"
-MAINTAINER="holkfoor@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="http://www.slitaz.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e slim-theme-radarspider/receipt
--- a/slim-theme-radarspider/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim-theme-radarspider/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-20130609"
 CATEGORY="customization"
 SHORT_DESC="Radar Spider - theme for SLiM"
-MAINTAINER="holkfoor@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="http://www.slitaz.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e slim-theme-robotic/receipt
--- a/slim-theme-robotic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim-theme-robotic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-20130609"
 CATEGORY="customization"
 SHORT_DESC="Robotic - theme for SLiM"
-MAINTAINER="holkfoor@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="http://www.slitaz.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e slim-theme-sandfive/receipt
--- a/slim-theme-sandfive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim-theme-sandfive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-20140601"
 CATEGORY="customization"
 SHORT_DESC="SliTaz SandFive - theme for SLiM"
-MAINTAINER="holkfoor@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="http://www.slitaz.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e slim/receipt
--- a/slim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.6"
 CATEGORY="x-window"
 SHORT_DESC="Desktop-independent graphical login manager for X11"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/slim.berlios/"
 COOKOPTS="!pngquant op8"
@@ -12,37 +12,27 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/slim.berlios/$TARBALL"
 
-BUILD_DEPENDS_arm="freetype-dev jpeg-dev libpng16-dev xorg-libXft-dev \
-xorg-libXmu-dev pam-dev"
 BUILD_DEPENDS="cmake xorg-libX11-dev freetype-dev libjpeg-turbo-dev zlib-dev \
 libpng16-dev fontconfig-dev xorg-libXft-dev xorg-libXrender-dev xorg-libXmu-dev \
 pam-dev   libunistring xorg-libXrandr-dev consolekit2-dev"
-SPLIT="slim-theme-default slim" # slim-pam:pam"
+SPLIT="$PACKAGE-theme-default $PACKAGE" # $PACKAGE-pam:pam"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			INCL=/cross/$ARCH/sysroot/usr/include
-			LIBS=/cross/$ARCH/sysroot/usr/lib ;;
-		i?86|x86_64)
-			INCL=/usr/include
-			LIBS=/usr/lib ;;
-	esac
-
 	case "$SET" in
 		'')  SET_ARGS='-DUSE_PAM=no';;
 		pam) SET_ARGS='-DUSE_PAM=yes';;
 	esac
 
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DUSE_CONSOLEKIT=yes \
-		-DX11_Xmu_LIB="$LIBS/libXmu.so" \
-		-DX11_Xft_INCLUDE_PATH=$INCL \
-		-DX11_Xmu_INCLUDE_PATH=$INCL \
+		-DX11_Xmu_LIB="/usr/lib/libXmu.so" \
+		-DX11_Xft_INCLUDE_PATH=/usr/include \
+		-DX11_Xmu_INCLUDE_PATH=/usr/include \
 		$SET_ARGS \
 		.. &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-arm-adm/receipt
--- a/slitaz-arm-adm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-arm-adm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-arm-adm"
 VERSION="212"
 CATEGORY="base-system"
-SHORT_DESC="SliTaz ARM CGI administration interface."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz ARM CGI administration interface"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://arm.slitaz.org/"
 REPOLOGY="-"
@@ -12,18 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/$VERSION.tar.bz2"
 
-DEPENDS="busybox slitaz-base-files"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}/var/www
-	cp -a ${src}/cgi-adm ${fs}/var/www/adm
+genpkg_rules() {
+	mkdir -p $fs/var/www
+	cp -a $src/cgi-adm $fs/var/www/adm
+	DEPENDS="busybox slitaz-base-files"
 }
 
 # SliTaz RPi files are over written so reinstall pkg
-post_install()
-{
+post_install() {
 	if [ -d "$1/var/lib/tazpkg/installed/slitaz-arm-rpi" ]; then
 		chroot "$1/" spk-add slitaz-arm-rpi --forced
 	fi
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-arm-codex/receipt
--- a/slitaz-arm-codex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-arm-codex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-arm-codex"
 VERSION="632"
 CATEGORY="base-system"
-SHORT_DESC="Static HTML5 SliTaz ARM Codex."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Static HTML5 SliTaz ARM Codex"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://arm.slitaz.org/codex"
 REPOLOGY="-"
@@ -12,16 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-forge/archive/$VERSION.tar.bz2"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	doc="${fs}/usr/share/doc/slitaz-arm/codex"
-	mkdir -p ${doc}/images
-	cp ${src}/arm/codex/*.html ${doc}
-	cp ${src}/arm/style.css ${doc}
-	cp ${src}/arm/style-tiny.css ${doc}
-	cp ${src}/arm/images/logo.png ${doc}/images
-	cp ${src}/arm/images/arm.png ${doc}/images
-	cp ${src}/arm/images/raspberrypi.png ${doc}/images
-	cp ${src}/arm/images/generic.png ${doc}/images
+genpkg_rules() {
+	doc="$fs/usr/share/doc/slitaz-arm/codex"
+	mkdir -p $doc/images
+	cp $src/arm/codex/*.html $doc
+	cp $src/arm/style.css $doc
+	cp $src/arm/style-tiny.css $doc
+	cp $src/arm/images/logo.png $doc/images
+	cp $src/arm/images/arm.png $doc/images
+	cp $src/arm/images/raspberrypi.png $doc/images
+	cp $src/arm/images/generic.png $doc/images
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-arm-configs/receipt
--- a/slitaz-arm-configs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="slitaz-arm-configs"
-VERSION="214"
-CATEGORY="base-system"
-SHORT_DESC="SliTaz ARM config files and artwork."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="GPL3"
-WEB_SITE="http://www.slitaz.org/"
-REPOLOGY="-"
-HOST_ARCH="arm"
-
-CONFIG_FILES="/etc/slitaz/applications.conf /etc/rcS.conf"
-
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/$VERSION.tar.bz2"
-
-DEPENDS="slitaz-configs-base"
-SIBLINGS="slitaz-arm-rpi"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cd ${src}
-	cp -a rootfs/* ${fs}
-	chown -R root.root $fs
-}
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-arm-rpi/receipt
--- a/slitaz-arm-rpi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-arm-rpi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-arm-rpi"
 VERSION="214"
 CATEGORY="base-system"
-SHORT_DESC="SliTaz Raspberry Pi: tools, CGI adm, configs and artwork."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz Raspberry Pi: tools, CGI adm, configs and artwork"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://arm.slitaz.org/rpi/"
 REPOLOGY="-"
@@ -21,35 +21,34 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-arm/archive/$VERSION.tar.bz2"
 
-DEPENDS="slitaz-configs dialog"
 SIBLINGS="slitaz-arm-configs"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p ${fs}/usr/sbin
+genpkg_rules() {
+	mkdir -p $fs/usr/sbin
 	case "$ARCH" in
 		i?86)
-			mkdir -p ${fs}/usr/bin \
-				${fs}/usr/share/applications \
-				${fs}/usr/share/pixmaps
-			cp -a ${src}/rpi/slitaz-rpi ${fs}/usr/bin 
-			cp -a ${src}/rpi/tazbian ${fs}/usr/bin 
-			cp -a ${src}/rpi/tazarch ${fs}/usr/bin 
-			cp -a ${src}/rpi/data/slitaz-rpi.desktop \
-				${fs}/usr/share/applications
-			cp -a ${src}/rpi/data/raspberrypi.png \
-				${fs}/usr/share/pixmaps ;;
+			mkdir -p $fs/usr/bin \
+				$fs/usr/share/applications \
+				$fs/usr/share/pixmaps
+			cp -a $src/rpi/slitaz-rpi $fs/usr/bin
+			cp -a $src/rpi/tazbian $fs/usr/bin
+			cp -a $src/rpi/tazarch $fs/usr/bin
+			cp -a $src/rpi/data/slitaz-rpi.desktop \
+				$fs/usr/share/applications
+			cp -a $src/rpi/data/raspberrypi.png \
+				$fs/usr/share/pixmaps
+			DEPENDS="slitaz-configs dialog"
+			;;
 		arm*)
-			mkdir -p ${fs}/var/www/adm
-			cp -a ${src}/rpi/rootfs/* ${fs}
+			mkdir -p $fs/var/www/adm
+			cp -a $src/rpi/rootfs/* $fs
 			# Tools
 			for tool in tazberry piboot pileds raspicomm piface pitft-setup \
-				pibrella piborg/piborg
-			do
-				cp -a ${src}/rpi/${tool} ${fs}/usr/sbin
+				pibrella piborg/piborg; do
+				cp -a $src/rpi/$tool $fs/usr/sbin
 			done
-			cp -a ${src}/rpi/cgi-adm/* ${fs}/var/www/adm
-			chown -R root.root ${fs} ;;
+			cp -a $src/rpi/cgi-adm/* $fs/var/www/adm
+			chown -R root.root $fs
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-base-files/receipt
--- a/slitaz-base-files/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-base-files/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="337"
 CATEGORY="base-system"
 SHORT_DESC="Linux tree and the necessary files for the base system"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	make DESTDIR=$install install
@@ -88,5 +88,5 @@
 
 # We can not remove this package!
 pre_remove() {
-	exit 1
+	return 1
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-boot-scripts/receipt
--- a/slitaz-boot-scripts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-boot-scripts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-boot-scripts"
 VERSION="444"
 CATEGORY="base-system"
 SHORT_DESC="Provide all the initialisation scripts used at boot time"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,23 +12,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-CONFIG_FILES="
-/etc/inittab
-/etc/init.d/local.sh
-/etc/rcS.conf
-/etc/network.conf"
-
-# Needed to fetch the keymaps and test the filesystem.
-DEPENDS="kbd-base e2fsprogs busybox slitaz-tools"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-#
 # This package is all build by genpkg, it provide the boot scripts found
 # in /etc/init.d with the main config file /etc/rcS.conf. It provide also
 # the default inittab and the network config file used with network.sh
-#
-genpkg_rules()
-{
+
+genpkg_rules() {
 	cp -a $src/etc $fs
 	cp -a $src/usr $fs
 	cp -a $src/init $fs
@@ -37,31 +25,12 @@
 	chmod 755 $fs/etc/init.d/*.sh
 	chmod 755 $fs/etc/init.d/rc*
 	chmod 755 $fs/init
-
-	case "$ARCH" in
-		arm*)
-			# Provided by slitaz-arm-configs
-			rm \
-				$fs/etc/rcS.conf \
-				$fs/etc/inittab \
-				$fs/etc/init.d/rcS \
-				$fs/etc/init.d/rc.shutdown \
-				$fs/etc/init.d/system.sh
-			;;
-	esac
+	# Needed to fetch the keymaps and test the filesystem.
+	DEPENDS="kbd-base e2fsprogs busybox slitaz-tools"
+	CONFIG_FILES="/etc/inittab /etc/init.d/local.sh /etc/rcS.conf /etc/network.conf"
 }
 
-# Post install commands.
-#
-post_install()
-{
-	case "$SLITAZ_ARCH" in
-		i?86)
-			echo
-			chroot "$1/" /usr/bin/rcSconf up ;;
-		arm)
-			if [ ! -d "/var/lib/tazpkg/installed/slitaz-arm-configs" ]; then
-				spk-add slitaz-arm-configs
-			fi ;;
-	esac
+post_install() {
+	echo
+	chroot "$1/" /usr/bin/rcSconf up
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-configs/receipt
--- a/slitaz-configs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-configs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="312"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz config files"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,15 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-configs/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS_arm="gettext"
 BUILD_DEPENDS="locale-de locale-en locale-fr locale-hu locale-ja locale-pt_BR \
-locale-ru locale-zh_CN gettext"
-SPLIT="slitaz-themes slitaz-configs-base"
+locale-ru locale-zh_CN gettext-dev"
+SPLIT="slitaz-themes $PACKAGE-base"
 
 compile_rules() {
 	# xcompmgr produces visual glitches on the screen
 	sed -i 's|xcompmgr|compton|' ob-menu/menu.xml.in
-	make DESTDIR=$DESTDIR menu
+	make DESTDIR=$install menu
 	ln -s menu.en.xml $install/etc/xdg/openbox/menu.xml
 
 	find /usr/share/locale -type f -name 'slitaz*'
@@ -73,41 +72,29 @@
 genpkg_rules() {
 	case $PACKAGE in
 		slitaz-configs)
-			# Special case for ARM since some (most) config files are in slitaz-arm repo.
-			# i486/arm common configs are provided by slitaz-configs-base.
-			case "$ARCH" in
-				arm*)
-					copy \
-						/usr/share/applications/ \
-						/usr/share/slitaz/
-					DEPENDS="slitaz-arm-configs ttf-dejavu slim"
-					;;
-				*)
-					copy \
-						/etc/skel/.gtkrc-2.0* \
-						/etc/skel/.icons/ \
-						/etc/skel/.Xdefaults \
-						/etc/skel/.xinitrc \
-						/etc/skel/.Xresources \
-						/etc/skel/.xsession \
-						/etc/xdg/openbox/autostart \
-						/etc/xdg/openbox/environment \
-						/etc/xdg/openbox/menu.en.xml \
-						/etc/xdg/openbox/menu.xml \
-						/etc/xdg/openbox/rc.xml \
-						/usr/bin/ \
-						/usr/share/applications/ \
-						/usr/share/images/ \
-						/usr/share/pixmaps/ \
-						/usr/share/slitaz/ \
-						/usr/share/templates/ \
-						/usr/share/webhome/ \
-						/root/
-					DEPENDS="slitaz-configs-base xorg-libXcomposite \
-					xorg-libXdamage transset-df ttf-dejavu slim compton"
-					;;
-			esac
-
+			# Common configs are provided by slitaz-configs-base.
+			copy \
+				/etc/skel/.gtkrc-2.0* \
+				/etc/skel/.icons/ \
+				/etc/skel/.Xdefaults \
+				/etc/skel/.xinitrc \
+				/etc/skel/.Xresources \
+				/etc/skel/.xsession \
+				/etc/xdg/openbox/autostart \
+				/etc/xdg/openbox/environment \
+				/etc/xdg/openbox/menu.en.xml \
+				/etc/xdg/openbox/menu.xml \
+				/etc/xdg/openbox/rc.xml \
+				/usr/bin/ \
+				/usr/share/applications/ \
+				/usr/share/images/ \
+				/usr/share/pixmaps/ \
+				/usr/share/slitaz/ \
+				/usr/share/templates/ \
+				/usr/share/webhome/ \
+				/root/
+			DEPENDS="slitaz-configs-base xorg-libXcomposite \
+			xorg-libXdamage transset-df ttf-dejavu slim compton"
 			CAT="base-system|for GUI systems"
 			;;
 		slitaz-themes)
@@ -119,39 +106,17 @@
 			DEPENDS="slim"
 			;;
 		slitaz-configs-base)
-			CAT="base-system|for text based systems"
-
-			# Copy rootfs files and set permissions.
-			case "$ARCH" in
-				arm*)
-					# Most ARM configs are in slitaz-arm repo but Openbox, webhome
-					# are common to all arch.
-					copy \
-						/usr/bin/ \
-						/etc/lxpanel/ \
-						/etc/skel/
-					# No dbus on ARM
-					sed "s/exec dbus.*$/exec\"/" -i $fs/etc/skel/.xinitrc
-					;;
-				*)
-					copy \
-						/boot/ \
-						/etc/skel/ \
-						/etc/polkit-1/ \
-						/etc/slitaz/
-						CONFIG_FILES="/etc/slitaz/applications.conf"
-					;;
-			esac
 			copy \
+				/boot/ \
+				/etc/skel/ \
+				/etc/polkit-1/ \
+				/etc/slitaz/ \
 				/usr/share/ \
 				/root/ \
 				@rm
-
+			CAT="base-system|for text based systems"
+			CONFIG_FILES="/etc/slitaz/applications.conf"
 			DEPENDS=" "
-			# Handle SliTaz arch
-			case "$SLITAZ_ARCH" in
-				arm*) DEPENDS=" " ;;
-			esac
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-dev-pkgs/receipt
--- a/slitaz-dev-pkgs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-dev-pkgs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,15 @@
 PACKAGE="slitaz-dev-pkgs"
 VERSION="1.2"
 CATEGORY="meta"
-SHORT_DESC="Meta-package to install a complete set of development packages."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Meta-package to install a complete set of development packages"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-genpkg_rules() {
-	mkdir $fs/var
-	DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash \
-	bison flex libtool gettext m4 perl perl-xml-parser perl-xml-simple \
-	ncurses-dev pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config \
-	fontconfig-dev freetype-dev glibc-dev libpng16-dev jpeg-dev tiff-dev \
-	libxml2-dev xorg-dev-proto xorg-dev pango-dev atk-dev cairo-dev expat-dev \
-	glib-dev gtk2-dev libIDL zip poppler-dev python patch openssl mercurial \
-	rsync wget xorg-pixman-dev autoconf automake"
-}
+DEPENDS="binutils linux-api-headers gcc make bzip2-dev coreutils bash bison \
+flex libtool gettext-dev m4 perl perl-xml-parser perl-xml-simple ncurses-dev \
+pcre-dev libcap-dev sqlite3-dev zlib-dev pkg-config fontconfig-dev freetype-dev \
+glibc-dev libpng16-dev jpeg-dev tiff-dev libxml2-dev xorg-dev-proto xorg-dev \
+pango-dev atk-dev cairo-dev expat-dev glib-dev gtk2-dev libIDL zip poppler-dev \
+python patch openssl mercurial rsync wget xorg-pixman-dev autoconf automake"
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-dev-tools/receipt
--- a/slitaz-dev-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-dev-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,18 +3,13 @@
 PACKAGE="slitaz-dev-tools"
 VERSION="266"
 CATEGORY="meta"
-SHORT_DESC="SliTaz developers tools meta package."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz developers tools meta package"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="rsync tazdev mercurial"
 SIBLINGS="mirror-tools qemu-box slitaz-mercurial-style slitaz-mercurial-style \
 tazchroot tazdev tazwikiss yaff"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-}
+DEPENDS="rsync tazdev mercurial"
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-doc/receipt
--- a/slitaz-doc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-doc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-doc"
 VERSION="158"
 CATEGORY="base-system"
-SHORT_DESC="SliTaz system documentation."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz system documentation"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,9 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/share/doc \
 		$fs/usr/share/applications \
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-eeepc/receipt
--- a/slitaz-eeepc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-eeepc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,39 +3,35 @@
 PACKAGE="slitaz-eeepc"
 VERSION="1.2"
 CATEGORY="system-tools"
-SHORT_DESC="SliTaz EeePC scripts and configuration files."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz EeePC scripts and configuration files"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="915resolution dmidecode linux-acpi linux-wireless"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/etc/init.d \
 		$fs/etc/skel/Desktop \
 		$fs/usr/share/doc/slitaz-flavors \
 		$fs/sbin
 	# Tool and boot script
-	cp stuff/eeepc.sh $fs/etc/init.d
-	cp stuff/tazeee $fs/sbin
+	cp $stuff/eeepc.sh $fs/etc/init.d
+	cp $stuff/tazeee $fs/sbin
 	# Images
-	cp -a stuff/images $fs/usr/share
-	cp -a stuff/pixmaps $fs/usr/share
+	cp -a $stuff/images $fs/usr/share
+	cp -a $stuff/pixmaps $fs/usr/share
 	# Doc
-	cp -a stuff/eeepc.html $fs/usr/share/doc/slitaz-flavors
+	cp -a $stuff/eeepc.html $fs/usr/share/doc/slitaz-flavors
 	# Desktop icon
-	cp -a stuff/applications/tazeee.desktop $fs/etc/skel/Desktop
+	cp -a $stuff/applications/tazeee.desktop $fs/etc/skel/Desktop
 	# Config
 	touch $fs/etc/eeepc.conf
 	chown -R root.root $fs
+	DEPENDS="915resolution dmidecode linux-acpi linux-wireless"
 }
 
-pre_install()
-{
+pre_install() {
 	. "$1/etc/rcS.conf"
 	sed -i s/'RUN_SCRIPTS="'/'RUN_SCRIPTS="eeepc.sh '/ "$1/etc/rcS.conf"
 	# Load module ac and battery
@@ -43,7 +39,6 @@
 		"$1/etc/rcS.conf"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i s/'RUN_SCRIPTS="eeepc.sh '/'RUN_SCRIPTS="'/ /etc/rcS.conf
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-i18n-extra/receipt
--- a/slitaz-i18n-extra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-i18n-extra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,9 +18,7 @@
 locale-pt-extra locale-pt_BR-extra locale-ru-extra locale-sl-extra \
 locale-sv-extra locale-zh_CN-extra locale-zh_TW-extra"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		slitaz-i18n-extra)
 			. $stuff/locale-pack.conf
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-i18n/receipt
--- a/slitaz-i18n/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-i18n/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,7 +9,6 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-BUILD_DEPENDS_arm=" "
 SPLIT="\
 locale-ar-base locale-ar  locale-ca-base locale-ca  locale-cs-base locale-cs \
 locale-da-base locale-da  locale-de-base locale-de  locale-el-base locale-el \
@@ -23,7 +22,7 @@
 locale-sv-base locale-sv  locale-tr-base locale-tr  locale-uk-base locale-uk \
 locale-zh_CN-base locale-zh_CN \
 locale-zh_TW-base locale-zh_TW \
-slitaz-i18n"
+$PACKAGE"
 
 genpkg_rules() {
 	. $stuff/locale-pack.functions
@@ -197,7 +196,7 @@
 	esac
 
 	case $PACKAGE in
-		*-i18n)   DEPENDS="";;
+		*-i18n)   DEPENDS=" ";;
 		*-base)   DEPENDS="glibc-base";;
 		*-zh_CN)  DEPENDS="locale-zh_CN-base wqy-microhei";;
 		*-zh_TW)  DEPENDS="locale-zh_TW-base pcf-uming";;
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-icon/receipt
--- a/slitaz-icon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-icon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-icon"
 VERSION="1.2.1"
 CATEGORY="misc"
-SHORT_DESC="SliTaz icons in size 22x22 and 32x32 (minimum)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz icons in size 22x22 and 32x32 (minimum)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -14,9 +14,7 @@
 
 BUILD_DEPENDS="faenza-icon-theme"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons
 	cp -a $src/SliTaz $fs/usr/share/icons
 
@@ -43,8 +41,7 @@
 	chown -R root.root $fs
 }
 
-post_install()
-{
+post_install() {
 	# Default icon theme to SliTaz.
 	if [ -f "$1/etc/skel/.gtkrc-2.0" ]; then
 		sed -i s/Tango/SliTaz/ "$1/etc/skel/.gtkrc-2.0"
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-icons-elementary/receipt
--- a/slitaz-icons-elementary/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-icons-elementary/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,6 @@
 
 BUILD_DEPENDS="elementary-icon-theme make-slitaz-icons"
 
-# Rules to compile and makethe package.
 compile_rules() {
 	mksit.sh \
 		-f /usr/share/icons/elementary \
@@ -19,8 +18,6 @@
 		-opmax
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -r $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-icons-faenza/receipt
--- a/slitaz-icons-faenza/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-icons-faenza/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,7 +10,7 @@
 REPOLOGY="-"
 
 BUILD_DEPENDS="faenza-icon-theme make-slitaz-icons"
-SPLIT="slitaz-icons-faenza-dark"
+SPLIT="$PACKAGE-dark"
 
 compile_rules() {
 	# light theme ------------
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-icons-paper/receipt
--- a/slitaz-icons-paper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-icons-paper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,6 @@
 
 BUILD_DEPENDS="paper-icon-theme make-slitaz-icons"
 
-# Rules to compile and make the package.
 compile_rules() {
 	to="$install/usr/share/icons/SliTaz-Paper"
 	mkdir -p $to
@@ -23,8 +22,6 @@
 		-opmax
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -r $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-loram-cdrom/receipt
--- a/slitaz-loram-cdrom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-loram-cdrom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,19 +1,15 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-loram-cdrom"
 VERSION="2.0"
 CATEGORY="misc"
-SHORT_DESC="Rules to build low ram system using cdrom."
+SHORT_DESC="Rules to build low RAM system using CD-ROM"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/etc/tazlito
-    cp stuff/loram.* $fs/etc/tazlito
+genpkg_rules() {
+	mkdir -p $fs/etc/tazlito
+	cp $stuff/loram.* $fs/etc/tazlito
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-loram-http/receipt
--- a/slitaz-loram-http/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-loram-http/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,19 +1,15 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-loram-http"
 VERSION="2.0"
 CATEGORY="misc"
-SHORT_DESC="Rules to build low ram system using http."
+SHORT_DESC="Rules to build low RAM system using HTTP"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/etc/tazlito
-    cp stuff/loram.* $fs/etc/tazlito
+genpkg_rules() {
+	mkdir -p $fs/etc/tazlito
+	cp $stuff/loram.* $fs/etc/tazlito
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-loram/receipt
--- a/slitaz-loram/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-loram/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,19 +1,15 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-loram"
 VERSION="2.0"
 CATEGORY="misc"
-SHORT_DESC="Rules to build low ram rootfs.gz."
+SHORT_DESC="Rules to build low RAM rootfs.gz"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS=""
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/etc/tazlito
-    cp stuff/loram.* $fs/etc/tazlito
+genpkg_rules() {
+	mkdir -p $fs/etc/tazlito
+	cp $stuff/loram.* $fs/etc/tazlito
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-menus/receipt
--- a/slitaz-menus/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-menus/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,12 @@
 VERSION="2.4.3"
 CATEGORY="x-window"
 SHORT_DESC="SliTaz i18n Freedesktop menus"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/etc/xdg
 	cp -a $stuff/desktop-directories $fs/usr/share
 	cp -a $stuff/menus $fs/etc/xdg
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-mercurial-style/receipt
--- a/slitaz-mercurial-style/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-mercurial-style/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-mercurial-style"
 VERSION="306"
 CATEGORY="misc"
-SHORT_DESC="SliTaz CSS style and images for Mercurial Web repos."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz CSS style and images for Mercurial Web repos"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,14 +12,12 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="mercurial"
 SIBLINGS="mirror-tools qemu-box slitaz-dev-tools tazchroot tazdev tazwikiss yaff"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
+genpkg_rules() {
+	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')	#'MC
 	mkdir -p $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial
 	cp -a $src/$PACKAGE/templates $fs/usr/lib/$PYTHON_LIB/site-packages/mercurial
 	chown -R root.root $fs
+	DEPENDS="mercurial"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-polar-cursors/receipt
--- a/slitaz-polar-cursors/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-polar-cursors/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-polar-cursors"
 VERSION="1.0"
 CATEGORY="customization"
 SHORT_DESC="SliTaz cursor theme based on Polar Cursor Theme"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -14,22 +14,17 @@
 
 BUILD_DEPENDS="xorg-xcursorgen"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/Source
 	./Build.sh && cd ..
-	mkdir -p $DESTDIR/usr/share/icons/slitaz-polar
-	cp index.theme $DESTDIR/usr/share/icons/slitaz-polar
-	cp -a Source/cursors $DESTDIR/usr/share/icons/slitaz-polar
+	mkdir -p $install/usr/share/icons/slitaz-polar
+	cp index.theme $install/usr/share/icons/slitaz-polar
+	cp -a Source/cursors $install/usr/share/icons/slitaz-polar
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons
-	cp -a stuff/default $fs/usr/share/icons
+	cp -a $stuff/default $fs/usr/share/icons
 	cp -a $install/* $fs
 	chown -R root.root $fs
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-tango-icon/receipt
--- a/slitaz-tango-icon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-tango-icon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="slitaz-tango-icon"
 VERSION="1.7"
 CATEGORY="misc"
-SHORT_DESC="Tango icons unofficial in size 16x16 and 32x32 (minimum)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Tango icons unofficial in size 16x16 and 32x32 (minimum)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://tango.freedesktop.org/"
 REPOLOGY="-"
@@ -12,22 +12,18 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.tuxfamily.org/slitaz/sources/artwok/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons
 	cp -a $src/* $fs/usr/share/icons
 	chown -R root.root $fs
 }
 
-qtfix="usr/share/icons/hicolor/index.theme"
-
-post_install()
-{
+post_install() {
+	qtfix="usr/share/icons/hicolor/index.theme"
 	sed '/Inherits=/s|=.*$|=Tango|' -i "$1/$qtfix"
 }
 
-pre_remove()
-{
+pre_remove() {
+	qtfix="usr/share/icons/hicolor/index.theme"
 	sed '/Inherits=/s|=.*$|=SliTaz|' -i "$1/$qtfix"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-tic-tac-toe/receipt
--- a/slitaz-tic-tac-toe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-tic-tac-toe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,18 @@
 VERSION="1.2"
 CATEGORY="games"
 SHORT_DESC="Play Tic Tac Toe game with Slitaz"
-MAINTAINER="hackdorte@sapo.pt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://people.slitaz.org/~leonardolaporte/"
 REPOLOGY="-"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr
 	cp -a $stuff/* $install/usr
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="tazweb"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-toolchain/receipt
--- a/slitaz-toolchain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-toolchain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20180210"
 CATEGORY="meta"
 SHORT_DESC="SliTaz meta package to rebuild or install current toolchain"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-tools-boxes/receipt
--- a/slitaz-tools-boxes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-tools-boxes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,23 @@
 PACKAGE="slitaz-tools-boxes"
 VERSION="1028"
 CATEGORY="system-tools"
-SHORT_DESC="All SliTaz GTK/Yad boxes to command line tools."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="All SliTaz GTK/Yad boxes to command line tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
-#CONFIG_FILES="/etc/wireless"
 
 TARBALL="slitaz-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="slitaz-tools gettext-base yad"
-BUILD_DEPENDS="tzdata gettext"
+BUILD_DEPENDS="tzdata gettext-dev"
+
 SIBLINGS="slitaz-tools tazdrop"
-
 COOKOPTS="!menus"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR install-boxes
+compile_rules() {
+	make &&
+	make DESTDIR=$install install-boxes
 
 	# make zone-mini.tab for timezone selector
 	TAB=$WOK/tzdata/install/usr/share/zoneinfo/zone.tab
@@ -31,7 +28,7 @@
 	ZONES="$(cat $TAB | sed '/#/ d' | cut -d'	' -f1,3 | sort -u)"
 	for COUNTRY in $(echo "$ZONES" | cut -d'	' -f1 | sort -u); do
 		echo -ne "$COUNTRY\t" >> $OUT
-		for LOC in $(echo "$ZONES" | sed -n "/$COUNTRY/ s|.*\t\(.*\)|\1|p"); do
+		for LOC in $(echo "$ZONES" | sed -n "/$COUNTRY/ s|.*\t\(.*\)|\1|p"); do	#"
 			echo -n "${LOC##*/} " >> $OUT
 		done
 		echo >> $OUT
@@ -45,17 +42,11 @@
 		$install/usr/share/zoneinfo/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
-	# No CD-ROM on embedded devices
-	case "$ARCH" in
-		arm*) 
-			rm -f $fs/usr/bin/burn-box 
-			rm -f $fs/usr/share/applications/burn-*.desktop ;;
-	esac
 	chmod 0644 $fs/usr/share/locale/*/*/*.mo
 	chown -R root.root $fs
+	DEPENDS="slitaz-tools gettext-base yad"
+	#CONFIG_FILES="/etc/wireless"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-tools/receipt
--- a/slitaz-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slitaz-tools"
 VERSION="1028"
 CATEGORY="system-tools"
-SHORT_DESC="SliTaz tools provide installer and utils usable on terminal."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz tools provide installer and utils usable on terminal"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,31 +12,22 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-tools/archive/$VERSION.tar.bz2"
 
-SUGGESTED="slitaz-tools-boxes"
-DEPENDS="slitaz-boot-scripts dialog gettext-base slitaz-configs-base"
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 SIBLINGS="slitaz-tools-boxes tazdrop"
 
-# Saved config file by package manager
-CONFIG_FILES="
-/etc/TZ
-/etc/keymap.conf
-/etc/locale.conf
-/etc/firewall.conf"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	mkdir -p $install/usr/share
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 	chmod 0644 $fs/usr/share/locale/*/*/*.mo
 	touch $fs/etc/firewall.conf
 	chown -R root.root $fs
+	CONFIG_FILES="/etc/TZ /etc/keymap.conf /etc/locale.conf /etc/firewall.conf"
+	DEPENDS="slitaz-boot-scripts dialog gettext-base slitaz-configs-base"
+	SUGGESTED="slitaz-tools-boxes"
 }
diff -r ad29ddfee1c9 -r d5aab818505e slitaz-violet-theme/receipt
--- a/slitaz-violet-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slitaz-violet-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0"
 CATEGORY="customization"
 SHORT_DESC="Fresh violet theme for GTK2 and Openbox"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
diff -r ad29ddfee1c9 -r d5aab818505e slock/receipt
--- a/slock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="slock"
 VERSION="1.1"
 CATEGORY="security"
-SHORT_DESC="Simple X display locker."
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Simple X display locker"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://tools.suckless.org/slock"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tools.suckless.org/slock"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 
-DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext"
 BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev xorg-libXext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mv config.mk config.mk.original
 	sed -e 's/usr\/local/usr/' < config.mk.original > config.mk
+
 	make CC=$CC &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e slsnif/receipt
--- a/slsnif/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slsnif/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e slurm/receipt
--- a/slurm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/slurm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="slurm"
 VERSION="0.3.3"
 CATEGORY="network"
-SHORT_DESC="Realtime network interface monitor."
+SHORT_DESC="Realtime network interface monitor"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/mattthias/slurm/wiki"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/mattthias/slurm/wiki"
 WGET_URL="https://github.com/mattthias/slurm/archive/upstream/$VERSION.tar.gz"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev automake autoconf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e smake/receipt
--- a/smake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="smake"
 VERSION="1.2.5"
@@ -13,14 +13,10 @@
 
 BUILD_DEPENDS="e2fsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make INS_BASE=/usr DESTDIR=$DESTDIR install
+compile_rules() {
+	make INS_BASE=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy bin/
 }
diff -r ad29ddfee1c9 -r d5aab818505e smartmontools/receipt
--- a/smartmontools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smartmontools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="5.41"
 CATEGORY="system-tools"
 SHORT_DESC="Monitors disk and tape health via S.M.A.R.T."
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://smartmontools.sourceforge.net/"
+WEB_SITE="https://www.smartmontools.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -14,7 +14,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm755 $stuff/etc/init.d/smartd $install/etc/init.d/smartd
 }
diff -r ad29ddfee1c9 -r d5aab818505e smbbox/receipt
--- a/smbbox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smbbox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,19 @@
 PACKAGE="smbbox"
 VERSION="0.99"
 CATEGORY="network"
-SHORT_DESC="Tiny gui for mount/unmount SMB Share."
-MAINTAINER="shann@slitaz.org"
+SHORT_DESC="Tiny GUI for mount/unmount SMB Share"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://smbbox.balinor.net"
+WEB_SITE="http://smbbox.balinor.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://smbbox.balinor.net/src/$TARBALL"
 
-DEPENDS="smbclient cifs-utils"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE/smbbox $fs/usr/bin
 	cp -a $src/$PACKAGE/smbbox-notify $fs/usr/bin
 	chown -R root.root $fs
+	DEPENDS="smbclient cifs-utils"
 }
diff -r ad29ddfee1c9 -r d5aab818505e smbwebclient/receipt
--- a/smbwebclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smbwebclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,15 @@
 PACKAGE="smbwebclient"
 VERSION="2.9"
 CATEGORY="network"
-SHORT_DESC="Samba client over the Web."
+SHORT_DESC="Samba client over the Web"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://smbwebclient.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.php.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/samba/smbwebclient.conf"
 
-DEPENDS="php smbclient"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	if [ ! -d $src ]; then
 		mkdir -p $src
 		cp $SRC/$TARBALL $src
@@ -25,19 +21,20 @@
 	mkdir -p $fs/usr/share/samba $fs/etc/samba
 	cp -a $src/. $fs/usr/share/samba
 	cp -a $stuff/* $fs
+	DEPENDS="php smbclient"
+	CONFIG_FILES="/etc/samba/smbwebclient.conf"
 }
 
-post_install()
-{
+post_install() {
 	if [ -f "$1/etc/locale.conf" ]; then
 		lang=$(. "$1/etc/locale.conf"; echo ${LANG%_*})
 		sed -i "s/DefaultLanguage = 'us'/DefaultLanguage = '$lang'/" \
 			"$1/etc/samba/smbwebclient.conf"
 	fi
-	
+
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/samba/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/smbwebclient/" => "/usr/share/samba/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/smbwebclient/" => "/usr/share/samba/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
@@ -45,6 +42,7 @@
 			fi
 		fi
 	fi
+
 	# Configure apache server
 	if [ -f "$1/etc/apache/httpd.conf" ]; then
 		if [ ! -f "$1/etc/apache/conf.d/smbwebclient" ]; then
@@ -66,9 +64,12 @@
 			fi
 		fi
 	fi
-	cat <<EOF
----
-Check \$cfgDefaultServer in configuration file /etc/samba/smbwebclient.conf 
----
+
+	[- n "$quiet" ] || cat <<"EOF"
+
+	.-----------------------------------------------.
+	| Check $cfgDefaultServer in configuration file |
+	| /etc/samba/smbwebclient.conf                  |
+	'-----------------------------------------------'
 EOF
 }
diff -r ad29ddfee1c9 -r d5aab818505e smplayer-themes/receipt
--- a/smplayer-themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smplayer-themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="smplayer-themes"
 VERSION="16.8.0"
@@ -6,22 +6,19 @@
 SHORT_DESC="Icon themes for smplayer"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="http://smplayer.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://smplayer.sourceforge.net/"
-WGET_URL="$SF_MIRROR/${PACKAGE/-themes/}/$TARBALL"
+WGET_URL="$SF_MIRROR/smplayer/$TARBALL"
 
-DEPENDS="smplayer"
 BUILD_DEPENDS="Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mv $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="smplayer"
 }
diff -r ad29ddfee1c9 -r d5aab818505e smplayer/receipt
--- a/smplayer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smplayer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="smplayer"
 VERSION="18.1.0"
@@ -6,27 +6,21 @@
 SHORT_DESC="QT-based front-end for MPlayer or mpv"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="http://smplayer.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://smplayer.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="player audio video movie"
 
-DEPENDS="mplayer-cli qt5-base qt5-script libxkbcommon-x11 libatomic" 
 BUILD_DEPENDS="qt5-dev xorg-dev zlib-dev"
-SUGGESTED="smplayer-themes smtube mpv"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Some default setting incompatible with minimal mplayer
 	sed '/use_ass_subtitles/s/true/false/' -i src/preferences.cpp
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -fa $install/usr/share/applications/* $fs/usr/share/applications
@@ -41,4 +35,7 @@
 	for size in 64 128 192 256 512 scalable; do
 		rm -rf $fs/usr/share/icons/hicolor/${size}*
 	done
+	DEPENDS="mplayer-cli qt5-base qt5-script libxkbcommon-x11 libatomic"
+	SUGGESTED="smplayer-themes smtube mpv"
+	TAGS="player audio video movie"
 }
diff -r ad29ddfee1c9 -r d5aab818505e smtube/receipt
--- a/smtube/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smtube/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,29 @@
 PACKAGE="smtube"
 VERSION="18.1.0"
 CATEGORY="multimedia"
-SHORT_DESC="Qt Youtube browser using *mplayer or vlc."
+SHORT_DESC="Qt Youtube browser using *mplayer or vlc"
 MAINTAINER="psychomaniak@xakep.ru"
 LICENSE="GPL2"
+WEB_SITE="http://smtube.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://smtube.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="smplayer cacerts qt5 qt5-script qtwebkit"
 BUILD_DEPENDS="qt5-dev qtwebkit"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	##sed 's|tonvid.com/|&terms-of-use.php|' -i src/browserwindow.cpp
 	#sed 's|tonvid.com/|cook.slitaz.org/next/|' -i src/browserwindow.cpp
 	#sed 's|home_page + "search.php?q="|"http://tonvid.com/search.php?q="|' -i src/browserwindow.cpp
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 
 	for size in 16 48 64 128 256; do
 		rm -rf $fs/usr/share/icons/hicolor/${size}x$size
 	done
+	DEPENDS="smplayer cacerts qt5 qt5-script qtwebkit"
 }
diff -r ad29ddfee1c9 -r d5aab818505e smx/receipt
--- a/smx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/smx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="unixODBC-dev apache-dev perl-dev apr-dev apr-util-dev \
 openssl-dev libtdb-dev libgd-dev fcgi-dev"
-SPLIT="smx-fcgi smx smx-dev"
+SPLIT="$PACKAGE-fcgi $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	find docs -type f -exec dos2unix '{}' \;
diff -r ad29ddfee1c9 -r d5aab818505e snort-mysql/receipt
--- a/snort-mysql/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/snort-mysql/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -26,7 +26,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -64,13 +64,13 @@
 		chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
 			-g "Snort Daemon user" -H -D -S -G snort snort
 	fi
-	chroot "$1/" chown snort.snort /var/log/snort 
+	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
+			( /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
diff -r ad29ddfee1c9 -r d5aab818505e snort/receipt
--- a/snort/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/snort/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="http://www.snort.org/downloads/1207"
 
 BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev flex zlib-dev"
-SPLIT="snort-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e snownews/receipt
--- a/snownews/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/snownews/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,27 @@
 PACKAGE="snownews"
 VERSION="1.5.12"
 CATEGORY="network"
-SHORT_DESC="Text mode RSS newsreader."
+SHORT_DESC="Text mode RSS newsreader"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://kiza.kcore.de/software/snownews/index.en"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://kiza.kcore.de/software/snownews/index.en"
 WGET_URL="https://kiza.kcore.de/software/snownews/download/$TARBALL"
 
-DEPENDS="libxml2 ncurses zlib openssl"
-BUILD_DEPENDS="zlib-dev libxml2-dev ncurses-dev gettext perl \
+BUILD_DEPENDS="zlib-dev libxml2-dev ncurses-dev gettext-dev perl \
 openssl-dev acl libcroco wget"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure \
+		--prefix=/usr &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/locale $fs/usr/share
+	DEPENDS="libxml2 ncurses zlib openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e socat/receipt
--- a/socat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/socat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,26 @@
 PACKAGE="socat"
 VERSION="2.0.0-b7"
 CATEGORY="network"
-SHORT_DESC="Reads and writes data across network connections."
+SHORT_DESC="Reads and writes data across network connections"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.dest-unreach.org/socat/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.dest-unreach.org/$PACKAGE/"
 WGET_URL="${WEB_SITE}download/$TARBALL"
-HOST_ARCH="i486 x86_64"
 
 BUILD_DEPENDS="openssl-dev ncurses-dev"
-DEPENDS="openssl ncurses libwrap readline"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="openssl ncurses libwrap readline"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e sockets/receipt
--- a/sockets/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sockets/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sockets"
-SOURCE="Sockets"
 VERSION="2.3.9.7"
 CATEGORY="development"
-SHORT_DESC="C++ Sockets library."
+SHORT_DESC="C++ Sockets library"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.alhem.net/Sockets/"
+
+TARBALL="Sockets-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="gcc-lib-base"
 BUILD_DEPENDS="openssl-dev e2fsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's|/usr/local|/usr|' Makefile*
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs/
+	DEPENDS="gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e softether/receipt
--- a/softether/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/softether/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="softether"
-VERSION="v4.09-9451-beta"
-RELEASE="2014.06.09"
+VERSION="v4.09-9451-beta"; RELEASE="2014.06.09"
 CATEGORY="network"
-SHORT_DESC="An Open-Source Free Cross-platform Multi-protocol VPN Program."
+SHORT_DESC="An Open-Source Free Cross-platform Multi-protocol VPN Program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.softether.org/"
+
 TARBALL="$PACKAGE-src-$VERSION.tar.gz"
-WEB_SITE="https://www.softether.org/"
 WGET_URL="http://www.softether-download.com/files/softether/$VERSION-$RELEASE-tree/Source%20Code/$TARBALL"
 
-DEPENDS="openssl readline ncurses zlib"
 BUILD_DEPENDS="openssl-dev readline-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/bin
+compile_rules() {
+	mkdir -p $install/usr/bin
 	yes 1 | ./configure $CONFIGURE_ARGS &&
-	sed -i "s|^INSTALL_.*DIR=|&$DESTDIR|" Makefile &&
+	sed -i "s|^INSTALL_.*DIR=|&$install|" Makefile &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	sed -i "s|$DESTDIR||" $DESTDIR/usr/bin/*
+	make DESTDIR=$install install &&
+	sed -i "s|$install||" $install/usr/bin/*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
+	DEPENDS="openssl readline ncurses zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e softgun/receipt
--- a/softgun/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/softgun/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="softgun"
 VERSION="0.20"
 CATEGORY="development"
-SHORT_DESC="ARM software emulator."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="ARM software emulator"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://softgun.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://softgun.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="emulator arm"
 
-DEPENDS="alsa-lib"
 BUILD_DEPENDS="alsa-lib-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir -p $DESTDIR/usr/bin
-	make && make prefix=$DESTDIR/usr install
+compile_rules() {
+	mkdir -p $install/usr/bin
+
+	make &&
+	make prefix=$install/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/share/softgun \
 		$fs/usr/share/doc/sotfgun
 	cp -a $install/usr/bin $fs/usr
 	cp -a $src/configs $fs/usr/share/softgun
 	cp $src/README $fs/usr/share/doc/sotfgun
+	DEPENDS="alsa-lib"
+	TAGS="emulator arm"
 }
diff -r ad29ddfee1c9 -r d5aab818505e solid/receipt
--- a/solid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/solid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="solid"
 VERSION="5.37.0"
 CATEGORY="system-tools"
-SHORT_DESC="Solid is a device integration framework"
+SHORT_DESC="Device integration framework"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL2.1"
 WEB_SITE="https://github.com/KDE/solid"
@@ -13,10 +13,11 @@
 WGET_URL="http://download.kde.org/stable/frameworks/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="cmake extra-cmake-modules qt5-dev mesa-dev eudev-dev"
-SPLIT="solid-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	mkdir build; cd build
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
diff -r ad29ddfee1c9 -r d5aab818505e sonata/receipt
--- a/sonata/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sonata/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sonata"
 VERSION="1.6.2.1"
 CATEGORY="multimedia"
 SHORT_DESC="Elegant GTK+ music client for MPD"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://www.nongnu.org/sonata/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.nongnu.org/sonata/"
 WGET_URL="https://github.com/multani/sonata/archive/v$VERSION.tar.gz"
 
-DEPENDS="python-pygtk python-mpd python-dbus mpd libffi"
-BUILD_DEPENDS="python-pygtk-dev python-dbus-dev python-pygobject2-dev gettext \
-acl libcroco python-dev gtk2-dev libffi-dev"
+BUILD_DEPENDS="python-pygtk-dev python-dbus-dev python-pygobject2-dev \
+gettext-dev acl libcroco python-dev gtk2-dev libffi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --prefix=/usr --root="$DESTDIR"
+compile_rules() {
+	python -B setup.py install --prefix=/usr --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/sonata $fs/usr/share
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $stuff/startsonata  $fs/usr/bin/
+	DEPENDS="python-pygtk python-mpd python-dbus mpd libffi"
 }
diff -r ad29ddfee1c9 -r d5aab818505e songwrite/receipt
--- a/songwrite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/songwrite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python"
 
 compile_rules() {
-	python -B ./setup.py install --root=$install || return 1
+	python -B setup.py install --root=$install || return 1
 
 	mv $install/usr/share/songwrite/doc/ $install/usr/share/
 }
diff -r ad29ddfee1c9 -r d5aab818505e soprano/receipt
--- a/soprano/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/soprano/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="soprano"
 VERSION="2.8.0"
 CATEGORY="system-tools"
-SHORT_DESC="Soprano is the Qt/C++ RDF framework"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Qt/C++ RDF framework"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://soprano.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake qmake Qt4-dev raptor-dev libiodbc-dev"
-SPLIT="soprano-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e sord/receipt
--- a/sord/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sord/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,12 @@
 WGET_URL="http://download.drobilla.net/$TARBALL"
 
 BUILD_DEPENDS="python serd-dev pcre-dev"
-SPLIT="sord-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e soundtouch/receipt
--- a/soundtouch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/soundtouch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.0"
 CATEGORY="multimedia"
 SHORT_DESC="An audio processing library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.surina.net/soundtouch/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/$TARBALL"
 
 BUILD_DEPENDS="libtool automake autoconf"
-SPLIT="soundtouch-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap
diff -r ad29ddfee1c9 -r d5aab818505e sox/receipt
--- a/sox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,13 +11,10 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm="ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev \
-libvorbis-dev libpng16-dev lame-dev libsamplerate-dev alsa-lib-dev \
-libao-dev libogg-dev libmagic-dev"
 BUILD_DEPENDS="ffmpeg-dev libsndfile-dev libid3tag-dev libmad-dev \
 libvorbis-dev libpng16-dev lame-dev libsamplerate-dev alsa-lib-dev \
 libao-dev libogg-dev libmagic-dev flac-dev"
-SPLIT="sox-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -32,18 +29,9 @@
 	case $PACKAGE in
 		sox)
 			copy @std
-			case "$SLITAZ_ARCH" in
-				arm*)
-					DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad \
-					libvorbis libpng16 lame libmagic libgomp libao ffmpeg \
-					libsndfile"
-					;;
-				*)
-					DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad \
-					libvorbis libpng16 lame libmagic libgomp libao ffmpeg \
-					libsndfile flac"
-					;;
-			esac
+			DEPENDS="libltdl libsamplerate alsa-lib libid3tag libmad \
+			libvorbis libpng16 lame libmagic libgomp libao ffmpeg \
+			libsndfile flac"
 			;;
 		*-dev)
 			copy @dev
diff -r ad29ddfee1c9 -r d5aab818505e spacefm/receipt
--- a/spacefm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spacefm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool gtk2-dev gtk3-dev startup-notification-dev eudev-dev \
 ffmpegthumbnailer-dev"
-SPLIT="spacefm spacefm-gtk2:gtk2 spacefm-gtk3:gtk3"
+SPLIT="$PACKAGE-gtk2:gtk2 $PACKAGE-gtk3:gtk3"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e spandsp/receipt
--- a/spandsp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spandsp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}downloads/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="tiff-dev zlib-dev jpeg-dev"
-SPLIT="spandsp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e speakup-utils/receipt
--- a/speakup-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speakup-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.1.6"
 CATEGORY="misc"
 SHORT_DESC="Tiny utilities for controlling the Speakup screenreader"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linux-speakup.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e spectrwm/receipt
--- a/spectrwm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spectrwm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="spectrwm"
 VERSION="2.7.2"
@@ -7,26 +7,21 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="ISC MIT"
 WEB_SITE="https://github.com/conformal/spectrwm"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="https://opensource.conformal.com/snapshots/spectrwm/$TARBALL"
-CONFIG_FILES="/etc/spectrwm.conf"
-TAGS="tile window-manager"
 
-DEPENDS="xorg-xcb-util xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libXcursor xorg-libXft"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXrandr-dev \
 xorg-libXcursor-dev xorg-libXft-dev xorg-xcb-util-dev xorg-xcb-util-wm-dev \
 xorg-xcb-util-keysyms-dev xorg-libXt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd linux
-	PREFIX=/usr make && PREFIX=/usr DESTDIR=$install make install
+	PREFIX=/usr make &&
+	PREFIX=/usr DESTDIR=$install make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	mkdir -p $fs/etc
 	# copy conf files (few more exists in $src)
@@ -34,4 +29,7 @@
 	# "switch on" keyboard mapping
 	sed -i 's|# keyboard_mapping.*|keyboard_mapping = /etc/spectrwm_us.conf|' \
 		$fs/etc/spectrwm.conf
+	DEPENDS="xorg-xcb-util xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-libXcursor xorg-libXft"
+	CONFIG_FILES="/etc/spectrwm.conf"
+	TAGS="tile window-manager"
 }
diff -r ad29ddfee1c9 -r d5aab818505e speech-dispatcher/receipt
--- a/speech-dispatcher/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speech-dispatcher/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -32,7 +32,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e speedcrunch/receipt
--- a/speedcrunch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speedcrunch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,35 @@
 # SliTaz package receipt.
 
 PACKAGE="speedcrunch"
-GITHASH="7a34226332a526f0d77f02b17b87f165362a206d"
-VERSION=${GITHASH:0:7}
+GITHASH="7a34226"
+VERSION="$GITHASH" # FIXME
 CATEGORY="utilities"
-SHORT_DESC="SpeedCrunch is a fast, high precision and powerful desktop calculator"
+SHORT_DESC="Fast, high precision and powerful desktop calculator"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
 WEB_SITE="http://speedcrunch.org/"
+
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="https://github.com/speedcrunch/SpeedCrunch/archive/$GITHASH.zip"
-DEPENDS="glibc-base libQtGui libQtXml"
+
 BUILD_DEPENDS="cmake Qt4-dev qmake xorg-xorgproto xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir ./build
-	cd ./build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr ../src &&
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		../src &&
 	make &&
 	lrelease ../src/speedcrunch.pro &&
-	make install
+	make install || return 1
+
 	# proper sub-category
 	sed -i 's|^Categories.*$|&;Calculator;|' \
 		$install/usr/share/applications/speedcrunch.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="glibc-base libQtGui libQtXml"
 }
diff -r ad29ddfee1c9 -r d5aab818505e speedometer/receipt
--- a/speedometer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speedometer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,18 +3,16 @@
 PACKAGE="speedometer"
 VERSION="2.8"
 CATEGORY="utilities"
-SHORT_DESC="Measure and display rate of data across a network connection."
+SHORT_DESC="Measure and display rate of data across a network connection"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="http://excess.org/speedometer/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://excess.org/speedometer/"
 WGET_URL="http://excess.org/speedometer/$TARBALL"
 
-DEPENDS="python python-urwid"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp $src/speedometer.py $fs/usr/bin/speedometer
+	DEPENDS="python python-urwid"
 }
diff -r ad29ddfee1c9 -r d5aab818505e speedtouch/receipt
--- a/speedtouch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speedtouch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.1"
 CATEGORY="misc"
 SHORT_DESC="Driver for the ADSL Speed Touch USB modem"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://speedtouch.sourceforge.net/"
 
@@ -15,9 +15,9 @@
 	./configure $CONFIGURE_ARGS &&
 	make &&
 	make \
-		prefix=$DESTDIR/usr \
-		sysconfdir=$DESTDIR/etc \
-		mandir=$DESTDIR/usr/share/man \
+		prefix=$install/usr \
+		sysconfdir=$install/etc \
+		mandir=$install/usr/share/man \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e speex/receipt
--- a/speex/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speex/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
 
 BUILD_DEPENDS="speexdsp-dev libogg-dev"
-SPLIT="speex-bin speex-dev"
+SPLIT="$PACKAGE-bin $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e speexdsp/receipt
--- a/speexdsp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/speexdsp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="speexdsp"
 VERSION="1.2rc3"
 CATEGORY="multimedia"
-SHORT_DESC="SpeexDSP is a patent-free, Open Source/Free Software DSP library"
+SHORT_DESC="Patent-free, Open Source/Free Software DSP library"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="BSD"
 WEB_SITE="https://www.speex.org/"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
 
-SPLIT="speexdsp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e spice-protocol/receipt
--- a/spice-protocol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spice-protocol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://www.spice-space.org/download/releases/$TARBALL"
 
-PKG_RULE="dev"
-
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e spicview/receipt
--- a/spicview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spicview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/spicview/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool gtk2-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool gtk2-dev \
 gdk-pixbuf-dev libjpeg-turbo-dev libsmfm-gtk-dev libsmfm-core-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e spidermonkey/receipt
--- a/spidermonkey/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spidermonkey/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.8.0-rc1"
 CATEGORY="multimedia"
 SHORT_DESC="Mozilla C implementation of Javascript"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL GPL2 LGPL2.1"
 WEB_SITE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.mozilla.org/pub/mozilla.org/js/$TARBALL"
 
 BUILD_DEPENDS="nspr-dev"
-SPLIT="spidermonkey-dev"
+SPLIT="$PACKAGE-dev"
 
 COOKOPTS="skip-log-errors"
 
@@ -23,10 +23,10 @@
 	# http://projects.archlinux.org/svntogit/community.git/tree/spidermonkey/trunk/PKGBUILD
 	sed -i 's|include|include/js|' rules.mk || return 1
 	# FS#16673
-	export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8"
+	export CFLAGS="$CFLAGS -DJS_C_STRINGS_ARE_UTF8"
 	# build - threadsafe
 	make -j1 -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 \
-		DIST=$DESTDIR/usr all export
+		DIST=$install/usr all export
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e spk/receipt
--- a/spk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="159"
 CATEGORY="base-system"
 SHORT_DESC="Fast and Light SliTaz Packages Toolset"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,15 +12,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/spk/archive/$VERSION.tar.bz2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e spl/receipt
--- a/spl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/spl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/zfsonlinux/zfs/releases/download/zfs-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="linux-module-headers xz"
-SPLIT="spl-src spl"
+SPLIT="$PACKAGE-src $PACKAGE"
 
 compile_rules() {
 	./configure \
@@ -21,7 +21,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e splashutils/receipt
--- a/splashutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/splashutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,10 +19,10 @@
 	LIBS="-lbz2"
 	./configure \
 		--without-klibc \
-		$CONFIGURE_ARGS || exit 1
+		$CONFIGURE_ARGS || return 1
 	sed -i 's|-all-static||' $src/src/Makefile
 	make -j1 &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e splint/receipt
--- a/splint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/splint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="splint"
 VERSION="3.1.2"
 CATEGORY="development"
-SHORT_DESC="A tool for statically checking C programs for security vulnerabilities and coding mistakes."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="A tool for statically checking C programs for security vulnerabilities and coding mistakes"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.src.tgz"
 WEB_SITE="http://www.splint.org/"
@@ -12,17 +12,15 @@
 
 BUILD_DEPENDS="flex autoconf automake libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	autoreconf -i
-	./configure $CONFIGURE_ARGS && make -j1 && make install
+	./configure $CONFIGURE_ARGS &&
+	make -j1 &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs/usr
-    cp -a $install/usr/bin $fs/usr
-    cp -a $install/usr/share $fs/usr
+genpkg_rules() {
+	mkdir -p $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/share $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e splix/receipt
--- a/splix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/splix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="splix"
 VERSION="2.0.0"
 CATEGORY="system-tools"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="CUPS drivers for SPL (Samsung Printer Language) printers"
 WEB_SITE="http://splix.ap2c.org/"
diff -r ad29ddfee1c9 -r d5aab818505e sqlite3/receipt
--- a/sqlite3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sqlite3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="3.24.0"
 CATEGORY="database"
 SHORT_DESC="Small SQL database engine"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
-WEB_SITE="https://www.sqlite.org/"
+WEB_SITE="https://www.sqlite.org/index.html"
 
 TARBALL="sqlite-src-$(echo $VERSION | awk 'BEGIN{FS="."}{printf("%d%02d%02d00",$1,$2,$3)}').zip"
 WGET_URL="https://www.sqlite.org/2018/$TARBALL"
@@ -16,13 +16,9 @@
 EXTRA_SOURCE_FILES="mysql2sqlite.sh"
 
 BUILD_DEPENDS="tcl-dev readline-dev zlib-dev"
-SPLIT="lemon sqlite3-analyzer sqlite3 libsqlite3 libsqlite3-tcl sqlite3-dev"
+SPLIT="lemon $PACKAGE-analyzer $PACKAGE libsqlite3 libsqlite3-tcl $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) ARCH_ARGS="--with-tcl=/cross/arm/sysroot/usr/lib" ;;
-	esac
-
 	[ -s "$SRC/mysql2sqlite.sh" ] || wget -P $SRC \
 		https://gist.github.com/esperlu/943776/raw/dd87f4088f6d5ec7563478f7a28a37ba02cf26e2/mysql2sqlite.sh
 
@@ -45,12 +41,11 @@
 		--enable-rtree \
 		--enable-json1 \
 		TCLLIBDIR=/usr/lib/sqlite$VERSION \
-		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make -j1 &&
 	make showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# recompiling lemon
 	[ -f $src/lemon ] && rm $src/lemon
diff -r ad29ddfee1c9 -r d5aab818505e sqlobject/receipt
--- a/sqlobject/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sqlobject/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sqlobject"
 VERSION="0.12.1"
 CATEGORY="development"
-SHORT_DESC="object-relational mapper for the Python."
+SHORT_DESC="Object-relational mapper for the Python"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL"
+WEB_SITE="http://sqlobject.org/"
+
 SOURCE="SQLObject"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://sqlobject.org/"
 WGET_URL="https://files.pythonhosted.org/packages/source/S/$SOURCE/$TARBALL"
 
-DEPENDS="python"
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squashfs/receipt
--- a/squashfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squashfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="squashfs"
 VERSION="4.3"
 CATEGORY="base-system"
-SHORT_DESC="Linux squashfs userland tools."
+SHORT_DESC="Linux squashfs userland tools"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="http://squashfs.sourceforge.net/"
+
 TARBALL="squashfs$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="zlib liblzma linux-squashfs lzo lz4-lib"
 BUILD_DEPENDS="zlib-dev attr-dev xz-dev lzo-dev lz4-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/squashfs-tools
-	for i in XZ LZMA_XZ LZO LZ4 ; do
+	for i in XZ LZMA_XZ LZO LZ4; do
 		sed -i "s|^#\\(${i}_SUPPORT = 1\\)|\\1|g" Makefile
 	done
-	mkdir -p $DESTDIR/usr/sbin $DESTDIR/sbin
+
 	make || return 1
-	cp -a mksquashfs  $DESTDIR/usr/sbin
-	cp -a unsquashfs $DESTDIR/sbin
+
+	install -Dm755 mksquashfs $install/usr/sbin/mksquashfs
+	install -Dm755 unsquashfs $install/sbin/unsquashfs
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $install/sbin $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib liblzma linux-squashfs lzo lz4-lib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squeak-vm/receipt
--- a/squeak-vm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squeak-vm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,42 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="squeak-vm"
 VERSION="4.10.2.2614"
-SOURCE="Squeak"
 CATEGORY="network"
-SHORT_DESC="Create and share interactive stories, games, music and art."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Create and share interactive stories, games, music and art"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
-TARBALL="$SOURCE-$VERSION-src.tar.gz"
 WEB_SITE="https://scratch.mit.edu/"
+
+TARBALL="Squeak-$VERSION-src.tar.gz"
 WGET_URL="http://squeakvm.org/unix/release/$TARBALL"
 
-SUGGESTED="scratch"
-DEPENDS="alsa-lib dbus xorg-libXrender"
-BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev"
+BUILD_DEPENDS="alsa-lib-dev dbus-dev xorg-libXrender-dev cmake"
 
-# Use build host cmake when cross compiling
-case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS cmake" ;;
-	arm) ARCH_ARGS="--without-SqueakFFIPrims" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	./unix/cmake/configure ${ARCH_ARGS} \
+compile_rules() {
+	./unix/cmake/configure \
 		--prefix=/usr \
 		--without-quartz \
 		--without-gl \
 		--with-x \
 		--enable-mpg-mmx &&
-	make && make DESTDIR=${DESTDIR} install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="alsa-lib dbus xorg-libXrender"
+	SUGGESTED="scratch"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squid-custom-errors/receipt
--- a/squid-custom-errors/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squid-custom-errors/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,24 @@
 VERSION="1.1"
 CATEGORY="misc"
 SHORT_DESC="squid error messages customized for SliTaz"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="squid"
-_TARBALL="$PACKAGE-$VERSION.tar.gz"
+compile_rules() {
+	_TARBALL="$PACKAGE-$VERSION.tar.gz"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	tar xzf $stuff/$_TARBALL 
-	mkdir -p $DESTDIR
-	cp -a $PACKAGE-$VERSION/fr $PACKAGE-$VERSION/wwwroot $DESTDIR
+	tar xzf $stuff/$_TARBALL
+	mkdir -p $install
+	cp -a $PACKAGE-$VERSION/fr $PACKAGE-$VERSION/wwwroot $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squid/errors \
 		$fs/var/www
 		
 	cp -a $install/fr $fs/usr/share/squid/errors
 	cp -a $install/wwwroot/* $fs/var/www
+	DEPENDS="squid"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e squid/receipt
--- a/squid/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squid/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="${WEB_SITE}Versions/v3/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="perl openssl-dev openldap-dev cyrus-sasl-dev libcap-dev"
-SPLIT="squid squid-auth-helpers squid-langpack"
+SPLIT="$PACKAGE-auth-helpers $PACKAGE-langpack"
 
 compile_rules() {
 	touch scripts/boilerplate.h
@@ -86,8 +86,8 @@
 				-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
 				-i $fs/etc/squid/squid.conf
 
-			cat <<EOF>>$fs/etc/squid/squid.conf
-	
+			cat >>$fs/etc/squid/squid.conf <<EOF
+
 cache_effective_user squid
 cache_effective_group squid
 
diff -r ad29ddfee1c9 -r d5aab818505e squidclamav/receipt
--- a/squidclamav/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squidclamav/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="curl-dev c-icap-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/etc
+	mkdir -p $install/etc
 	./configure \
 		--libdir=/usr/lib \
 		--libexecdir=/var/www/cgi-bin \
diff -r ad29ddfee1c9 -r d5aab818505e squidguard/receipt
--- a/squidguard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squidguard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -34,25 +34,25 @@
 		--with-sg-dbhome=/var/lib/squidGuard/db \
 		$CONFIGURE_ARGS &&
 	make &&
-	sed -e "s|^prefix =.*|prefix = $DESTDIR/usr|" \
-	    -e "s|^logdir =.*|logdir = $DESTDIR/var/lib/squidGuard/log|" \
-	    -e "s|^configfile =.*|configfile = $DESTDIR/etc/squidGuard/squidGuard.conf|" \
-	    -e "s|^dbhomedir =.*|dbhomedir = $DESTDIR/var/lib/squidGuard/db|" \
+	sed -e "s|^prefix =.*|prefix = $install/usr|" \
+	    -e "s|^logdir =.*|logdir = $install/var/lib/squidGuard/log|" \
+	    -e "s|^configfile =.*|configfile = $install/etc/squidGuard/squidGuard.conf|" \
+	    -e "s|^dbhomedir =.*|dbhomedir = $install/var/lib/squidGuard/db|" \
 	    -e "s|^SQUIDUSER =.*|SQUIDUSER = nobody|" \
 	    < Makefile > Makefile.slitaz-install
-	mkdir -p $DESTDIR/etc/squidGuard
+	mkdir -p $install/etc/squidGuard
 	make -f Makefile.slitaz-install install
 }
 
 genpkg_rules() {
 	mkdir -p $fs/etc/squid/conf.d
-	
+
 	cp -a $install/* $fs/
 	cp -pa $stuff/squidguard.conf $fs/etc/squid/conf.d
-	
+
 	# Cleanup.
 	rmdir $fs/usr/squidGuard
-	
+
 	DEPENDS="squid libdb"
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e squidguardmgr/receipt
--- a/squidguardmgr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squidguardmgr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,46 +3,43 @@
 PACKAGE="squidguardmgr"
 VERSION="1.12"
 CATEGORY="system-tools"
-SHORT_DESC="Web GUI for squidGuard and SquidClamav administration."
+SHORT_DESC="Web GUI for squidGuard and SquidClamav administration"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://squidguardmgr.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://squidguardmgr.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-DEPENDS="squidguard squidclamav lighttpd"
-BUILD_DEPENDS="perl squidguard "
-CONFIG_FILES="/etc/squidguardmgr.conf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	SQUIDUSR=squid SQUIDGRP=squid perl Makefile.PL << EOT &&
+BUILD_DEPENDS="perl squidguard"
+
+compile_rules() {
+	SQUIDUSR=squid SQUIDGRP=squid perl Makefile.PL << EOT
 /etc/squidGuard/squidGuard.conf
 nobody
 EOT
-	mkdir -p $DESTDIR/var/www/squidguardmgr/ &&
+	mkdir -p $install/var/www/squidguardmgr/
+
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share $fs/etc $fs/var/lib/squidGuard/log $fs/var/lib/squidGuard/db 
-	
+genpkg_rules() {
+	mkdir -p $fs/usr/share $fs/etc $fs/var/lib/squidGuard/log $fs/var/lib/squidGuard/db
+
 	cp -a $install/var/www/squidguardmgr $fs/usr/share
-	( cd $fs ; patch -p0 ) < $stuff/squidguardmgr.U
-	mv $fs/usr/share/squidguardmgr/squidguardmgr.conf $fs/etc 
+	( cd $fs; patch -p0 ) < $stuff/squidguardmgr.U
+	mv $fs/usr/share/squidguardmgr/squidguardmgr.conf $fs/etc
 	ln -s /etc/squidguardmgr.conf $fs/usr/share/squidguardmgr/squidguardmgr.conf
-	
+
 	sed -i -e 's|/var/www/squidguardmgr|/usr/share/squidguardmgr|' \
 		-e 's|SQUIDCLAMAV	off|SQUIDCLAMAV	on|' \
 		-e 's|SC_CONF_FILE|SC_CONF_FILE	/etc/squidclamav.conf|' \
 		-e 's|C_ICAP_SOCKET|C_ICAP_SOCKET	/var/run/c-icap/c-icap.ctl|' $fs/etc/squidguardmgr.conf
+	DEPENDS="squidguard squidclamav lighttpd"
+	CONFIG_FILES="/etc/squidguardmgr.conf"
 }
 
-post_install()
-{
+post_install() {
 	# squidguardmgr config
 	chown root.www "$1/etc/squidGuard/squidGuard.conf"
 	chmod 664 "$1/etc/squidGuard/squidGuard.conf"
@@ -51,7 +48,7 @@
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/squidguardmgr/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
diff -r ad29ddfee1c9 -r d5aab818505e squidview/receipt
--- a/squidview/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squidview/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="squidview"
 VERSION="0.80"
 CATEGORY="network"
-SHORT_DESC="Monitors and displays squid logs in console."
+SHORT_DESC="Monitors and displays squid logs in console"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.rillion.net/squidview/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.rillion.net/squidview/"
 WGET_URL="$WEB_SITE$TARBALL"
 
-DEPENDS="ncurses gcc-lib-base"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-archive/receipt
--- a/squirrelmail-archive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-archive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,30 @@
 PACKAGE="squirrelmail-archive"
 VERSION="1.2-1.4.2"
 CATEGORY="network"
-SHORT_DESC="Mail archiver plugin for Web mail."
+SHORT_DESC="Mail archiver plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="archive_mail"
 TARBALL="$SOURCE.$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
-	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
+pre_remove() {
+	sed -i "/\$plugins.. = '$SOURCE';/d" "$1/etc/squirrelmail/config_local.php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-autocomplete/receipt
--- a/squirrelmail-autocomplete/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-autocomplete/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,37 +3,31 @@
 PACKAGE="squirrelmail-autocomplete"
 VERSION="2.0-1.0.0"
 CATEGORY="network"
-SHORT_DESC="Complete To/Cc/Bcc fields plugin for Web mail (IE only)."
+SHORT_DESC="Complete To/Cc/Bcc fields plugin for Web mail (IE only)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="autocomplete"
 TARBALL="$SOURCE.$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
-	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
+pre_remove() {
+	sed -i "/\$plugins.. = '$SOURCE';/d" "$1/etc/squirrelmail/config_local.php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-autorespond/receipt
--- a/squirrelmail-autorespond/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-autorespond/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,35 @@
 PACKAGE="squirrelmail-autorespond"
 VERSION="0.5.1-1.4"
 CATEGORY="network"
-SHORT_DESC="Vacation and forwarding plugin for Web mail."
+SHORT_DESC="Vacation and forwarding plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="autorespond"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail vacation"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.php \
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
+	DEPENDS="squirrelmail vacation"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-bookmarks/receipt
--- a/squirrelmail-bookmarks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-bookmarks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="squirrelmail-bookmarks"
 VERSION="2.0.3-1.4.1"
 CATEGORY="network"
-SHORT_DESC="Store and manage favorites lists within the Squirrelmail interface."
+SHORT_DESC="Store and manage favorites lists within the Squirrelmail interface"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="bookmarks"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/bookmarks_data.php"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	rm -f $fs/usr/share/squirrelmail/plugins/$SOURCE/bookmarks_data.php
@@ -31,14 +25,14 @@
 		$fs/etc/squirrelmail/bookmarks_data.php
 	ln -s ../../../../../etc/squirrelmail/bookmarks_data.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/bookmarks_data.php
+	DEPENDS="squirrelmail"
+	CONFIG_FILES="/etc/squirrelmail/bookmarks_data.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-calendard-file-backend/receipt
--- a/squirrelmail-calendard-file-backend/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-calendard-file-backend/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,37 +3,31 @@
 PACKAGE="squirrelmail-calendard-file-backend"
 VERSION="1.0-2.0"
 CATEGORY="network"
-SHORT_DESC="File-based backend for calendar data for Web mail."
+SHORT_DESC="File-based backend for calendar data for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="calendar_file_backend"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-PROVIDE="squirrelmail-calendard-backend"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
+	PROVIDE="squirrelmail-calendard-backend"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
-	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
+pre_remove() {
+	sed -i "/\$plugins.. = '$SOURCE';/d" "$1/etc/squirrelmail/config_local.php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-calendard-sql-backend/receipt
--- a/squirrelmail-calendard-sql-backend/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-calendard-sql-backend/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,42 +3,36 @@
 PACKAGE="squirrelmail-calendard-sql-backend"
 VERSION="1.1-2.0"
 CATEGORY="network"
-SHORT_DESC="SQL-based backend for calendar data for Web mail."
+SHORT_DESC="SQL-based backend for calendar data for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="calendar_sql_backend"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
-PROVIDE="squirrelmail-calendard-backend"
 
-DEPENDS="squirrelmail php-mysql"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.php.sample \
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
+	DEPENDS="squirrelmail php-mysql"
+	PROVIDE="squirrelmail-calendard-backend"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-compatibility-plugin/receipt
--- a/squirrelmail-compatibility-plugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-compatibility-plugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,27 @@
 PACKAGE="squirrelmail-compatibility-plugin"
 VERSION="2.0.13-1.0"
 CATEGORY="network"
-SHORT_DESC="Compatibility plugin for Web mail need by many plugins."
+SHORT_DESC="Compatibility plugin for Web mail need by many plugins"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="compatibility"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	local file
 	local line
 	file="$1/usr/share/squirrelmail/functions/strings.php"
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-html/receipt
--- a/squirrelmail-html/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-html/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,39 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="squirrelmail-html"
 VERSION="3.7a-1.4.x"
 CATEGORY="network"
-SHORT_DESC="HTML viewer plugin for Web mail."
+SHORT_DESC="HTML viewer plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="view_as_html"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	chown -R 80 $fs/usr/share/squirrelmail
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-html_mail/receipt
--- a/squirrelmail-html_mail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-html_mail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,21 @@
 PACKAGE="squirrelmail-html_mail"
 VERSION="2.3-1.4"
 CATEGORY="network"
-SHORT_DESC="Vacation and forwarding plugin for Web mail."
+SHORT_DESC="Vacation and forwarding plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="html_mail"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php /etc/apache/conf.d"
 
-DEPENDS="squirrelmail perl-html-parser perl-text-aspell"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail \
 		 $fs/etc/apache/conf.d
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
@@ -37,15 +31,15 @@
   AddHandler cgi-script cgi
 </Directory>
 EOT
+	DEPENDS="squirrelmail perl-html-parser perl-text-aspell"
+	CONFIG_FILES="/etc/squirrelmail/config-html_mail.php /etc/apache/conf.d"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 	rm /etc/apache/conf.d/$SOURCE
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-ldapuser/receipt
--- a/squirrelmail-ldapuser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-ldapuser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="squirrelmail-ldapuser"
 VERSION="0.4"
 CATEGORY="network"
-SHORT_DESC="LDAP backend for Web mail users' profile/preferences."
+SHORT_DESC="LDAP backend for Web mail users' profile/preferences"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 SOURCE="ldapuserdata"
@@ -14,16 +14,12 @@
 
 DEPENDS="squirrelmail openldap"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config_sample.php \
@@ -32,8 +28,7 @@
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 	mv "$1/usr/share/squirrelmail/functions/file_prefs.php" \
 	   "$1/usr/share/squirrelmail/functions/file_prefs.php.original"
@@ -44,8 +39,7 @@
 EOT
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 	sed -i "/plugins.$SOURCE.doc/d" /etc/openldap/slapd.conf
 	rm -f /usr/share/squirrelmail/functions/file_prefs.php
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-legend/receipt
--- a/squirrelmail-legend/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-legend/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,30 @@
 PACKAGE="squirrelmail-legend"
 VERSION="1.2-1.2.8"
 CATEGORY="network"
-SHORT_DESC="Adds a legend below the folder list in Web mail."
+SHORT_DESC="Adds a legend below the folder list in Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="legend"
 TARBALL="$SOURCE.$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-locales/receipt
--- a/squirrelmail-locales/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-locales/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,16 +20,13 @@
 $S-pl_PL $S-pt_BR $S-pt_PT $S-ro_RO $S-ru_RU $S-sk_SK $S-sl_SI $S-sr_YU \
 $S-sv_SE $S-tr_TR $S-ug    $S-uk_UA $S-zh_CN $S-zh_TW"
 
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $install/usr/share/squirrelmail
 	cp -a locale help images $install/usr/share/squirrelmail
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		squirrelmail-locales)
 			DEPENDS="$SPLIT"
@@ -37,15 +34,14 @@
 		*)
 			locale=${PACKAGE#*-}
 			copy /$locale/ sec_remove_$locale.png
-			name=$(grep "($locale)" $src/ReleaseNotes.locales | sed 's| (.*||; s| Bokm.*| Bokmål|')
+			name=$(grep "($locale)" $src/ReleaseNotes.locales | sed 's| (.*||; s| Bokm.*| Bokmål|')	#"
 			CAT="localization|$name locale"
 			DEPENDS="squirrelmail"
 			;;
 	esac
 }
 
-post_install()
-{
+post_install() {
 	case $PACKAGE in
 		squirrelmail-locales);;
 		*)
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-msg_flags/receipt
--- a/squirrelmail-msg_flags/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-msg_flags/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,40 +3,34 @@
 PACKAGE="squirrelmail-msg_flags"
 VERSION="1.4.15a-1.4.3"
 CATEGORY="network"
-SHORT_DESC="Few icons and flags for Web mail."
+SHORT_DESC="Few icons and flags for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="msg_flags"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	( cd "$1/usr/share/squirrelmail/plugins/$SOURCE"
 	  patch -p0 < patches/$SOURCE-squirrelmail-$(. "$1/$INSTALLED/squirrelmail/receipt"; echo $VERSION).diff )
 	echo "$PACKAGE" >> "$1/$INSTALLED/squirrelmail/modifiers"
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	( cd /usr/share/squirrelmail/plugins/$SOURCE
 	  patch -R -p0 < patches/$SOURCE-squirrelmail-$(. $INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
 	sed -i "/^$PACKAGE\$/d" $INSTALLED/squirrelmail/modifiers
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-multilogin/receipt
--- a/squirrelmail-multilogin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-multilogin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="squirrelmail-multilogin"
 VERSION="2.4-1.2.9"
 CATEGORY="network"
-SHORT_DESC="Server chooser plugin for Web mail."
+SHORT_DESC="Server chooser plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 SOURCE="multilogin"
@@ -14,16 +14,12 @@
 
 DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail \
 		 $fs/var/lib/squirrelmail/slitaz.org/data
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
@@ -31,11 +27,10 @@
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
-	( cd $fs/etc/squirrelmail ; patch -p0 ) < stuff/config-$SOURCE.u
+	( cd $fs/etc/squirrelmail; patch -p0 ) < $stuff/config-$SOURCE.u
 }
 
-post_install()
-{
+post_install() {
 	chown www "$1/var/lib/squirrelmail/slitaz.org/data"
 	( cd "$1/usr/share/squirrelmail/plugins/$SOURCE"
 	  patch -p0 < patches/$SOURCE-squirrelmail-$(. "$1/$INSTALLED/squirrelmail/receipt"; echo $VERSION).diff )
@@ -43,8 +38,7 @@
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	( cd /usr/share/squirrelmail/plugins/$SOURCE
 	  patch -R -p0 < patches/$SOURCE-squirrelmail-$(. $INSTALLED/squirrelmail/receipt; echo $VERSION).diff )
 	sed -i "/^$PACKAGE\$/d" $INSTALLED/squirrelmail/modifiers
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-notes/receipt
--- a/squirrelmail-notes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-notes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,35 @@
 PACKAGE="squirrelmail-notes"
 VERSION="1.2-1.4.0"
 CATEGORY="network"
-SHORT_DESC="Notes creation plugin for Web mail."
+SHORT_DESC="Notes creation plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="notes"
 TARBALL="$SOURCE.$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.php.sample \
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
+	DEPENDS="squirrelmail"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-quota/receipt
--- a/squirrelmail-quota/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-quota/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,21 @@
 PACKAGE="squirrelmail-quota"
 VERSION="2.2-1.4.0"
 CATEGORY="network"
-SHORT_DESC="Quota plugin for Web mail."
+SHORT_DESC="Quota plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="check_quota"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.sample.php \
@@ -32,14 +26,14 @@
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
+	DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-shared_calendars/receipt
--- a/squirrelmail-shared_calendars/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-shared_calendars/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,36 @@
 PACKAGE="squirrelmail-shared_calendars"
 VERSION="2.0.1-1.4.0"
 CATEGORY="network"
-SHORT_DESC="Fully iCal-compliant calendaring functionality for Web mail."
+SHORT_DESC="Fully iCal-compliant calendaring functionality for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="shared_calendars"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail squirrelmail-compatibility-plugin squirrelmail-calendard-backend"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/calendar
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/calendar
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a $install/calendar $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/calendar/data/config.php.sample \
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/calendar/data/config.php
+	DEPENDS="squirrelmail squirrelmail-compatibility-plugin \
+	squirrelmail-calendard-backend"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-sieve/receipt
--- a/squirrelmail-sieve/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-sieve/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,35 @@
 PACKAGE="squirrelmail-sieve"
 VERSION="1.9.7"
 CATEGORY="network"
-SHORT_DESC="Sieve Mail Filters plugin for Web mail."
+SHORT_DESC="Sieve Mail Filters plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="avelsieve"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a  $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config/config_sample.php \
 		$fs/etc/squirrelmail/config-$SOURCE.php
 	ln -s /etc/squirrelmail/config-$SOURCE.php \
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config/config.php
+	DEPENDS="squirrelmail"
+	CONFIG_FILES="/etc/squirrelmail/config-$SOURCE.php"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-sizes/receipt
--- a/squirrelmail-sizes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-sizes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,30 @@
 PACKAGE="squirrelmail-sizes"
 VERSION="1.5-1.4.0"
 CATEGORY="network"
-SHORT_DESC="Folder sizes plugin for Web mail."
+SHORT_DESC="Folder sizes plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="folder_sizes"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a  $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-smallcal/receipt
--- a/squirrelmail-smallcal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-smallcal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,39 +3,38 @@
 PACKAGE="squirrelmail-smallcal"
 VERSION="0.8-1.2.3"
 CATEGORY="network"
-SHORT_DESC="Left side calendar plugin for Web mail."
+SHORT_DESC="Left side calendar plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 SOURCE="smallcal"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="${WEB_SITE}plugins/$TARBALL"
 
-DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a $install/$SOURCE $fs/usr/share/squirrelmail/plugins
+	DEPENDS="squirrelmail squirrelmail-compatibility-plugin"
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
-	cat <<EOF
-You can enable calendar display in Option -> Display Preferences
+
+	[ -n "$quiet" ] || cat <<EOF
+
+	.------------------------------------.
+	| You can enable calendar display in |
+	| Option -> Display Preferences      |
+	'------------------------------------'
 EOF
 }
 
-pre_remove()
-{
-	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
+pre_remove() {
+	sed -i "/\$plugins.. = '$SOURCE';/d" "$1/etc/squirrelmail/config_local.php"
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-spamassassin/receipt
--- a/squirrelmail-spamassassin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-spamassassin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="squirrelmail-spamassassin"
 VERSION="1.0-1.2.7"
 CATEGORY="network"
-SHORT_DESC="Vacation and forwarding plugin for Web mail."
+SHORT_DESC="Vacation and forwarding plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 SOURCE="saconf"
@@ -14,26 +14,20 @@
 
 DEPENDS="squirrelmail"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins
 	cp -a  $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail-vkeyboard/receipt
--- a/squirrelmail-vkeyboard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail-vkeyboard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="squirrelmail-vkeyboard"
 VERSION="0.9.1"
 CATEGORY="network"
-SHORT_DESC="Virtual keyboard plugin for Web mail."
+SHORT_DESC="Virtual keyboard plugin for Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 SOURCE="vkeyboard"
@@ -14,16 +14,12 @@
 
 DEPENDS="squirrelmail"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR
-	cp -a $src $DESTDIR/$SOURCE
+compile_rules() {
+	mkdir -p $install
+	cp -a $src $install/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail/plugins $fs/etc/squirrelmail
 	cp -a  $install/$SOURCE $fs/usr/share/squirrelmail/plugins
 	mv $fs/usr/share/squirrelmail/plugins/$SOURCE/config.php.sample \
@@ -32,12 +28,10 @@
 		$fs/usr/share/squirrelmail/plugins/$SOURCE/config.php
 }
 
-post_install()
-{
+post_install() {
 	echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php"
 }
 
-pre_remove()
-{
+pre_remove() {
 	sed -i "/\$plugins.. = '$SOURCE';/d" /etc/squirrelmail/config_local.php
 }
diff -r ad29ddfee1c9 -r d5aab818505e squirrelmail/receipt
--- a/squirrelmail/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/squirrelmail/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,15 @@
 PACKAGE="squirrelmail"
 VERSION="1.4.22"
 CATEGORY="network"
-SHORT_DESC="Web mail."
+SHORT_DESC="Web mail"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.squirrelmail.org/"
+
 TARBALL="$PACKAGE-webmail-$VERSION.tar.bz2"
-WEB_SITE="http://www.squirrelmail.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/squirrelmail/config.php /etc/squirrelmail/config_local.php"
 
-DEPENDS="php"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/squirrelmail $fs/var/lib/squirrelmail/data \
 		 $fs/var/lib/squirrelmail/attach $fs/etc
 	cp -a $src/. $fs/usr/share/squirrelmail
@@ -27,7 +23,7 @@
 	for i in demo test fortune; do
 		rm -rf $fs/usr/share/squirrelmail/plugins/$i
 	done
-	for i in $( cd $fs/usr/share/squirrelmail/plugins/ ; ls -d */ ); do
+	for i in $( cd $fs/usr/share/squirrelmail/plugins/; ls -d */ ); do
 		echo "\$plugins[] = '${i%/}';"
 	done >> $fs/etc/squirrelmail/config_local.php
 	sed -i -e "s|\$domain = 'example.com'|\$domain = 'localhost'|" \
@@ -44,15 +40,17 @@
 			cook $i
 		done
 	fi
+
+	DEPENDS="php"
+	CONFIG_FILES="/etc/squirrelmail/config.php /etc/squirrelmail/config_local.php"
 }
 
-post_install()
-{
+post_install() {
 	#echo "Update /short_open_tag in /etc/php.ini"
 	#sed -i 's/^short_open_tag.*/short_open_tag = On/' /etc/php.ini
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
 		if ! grep -q /usr/share/squirrelmail/ "$1/etc/lighttpd/lighttpd.conf"; then
-	    		sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
+			sed -e 's|.*"/examples/" => "/usr/share/examples/",|    "/examples/" => "/usr/share/examples/",\n    "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i "$1/etc/lighttpd/lighttpd.conf"
 			if [ -z "$1" ]; then
 				# Start Web server.
 				/etc/init.d/lighttpd stop
diff -r ad29ddfee1c9 -r d5aab818505e sratom/receipt
--- a/sratom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sratom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 compile_rules() {
 	./waf configure --prefix=/usr &&
 	./waf build &&
-	./waf install --destdir=$DESTDIR
+	./waf install --destdir=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e srcpd/receipt
--- a/srcpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/srcpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.1"
 CATEGORY="games"
 SHORT_DESC="Simple Railroad Command Protocl Daemon"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://srcpd.sourceforge.net/"
 
diff -r ad29ddfee1c9 -r d5aab818505e ssfs/receipt
--- a/ssfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ssfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="ssfs"
 VERSION="108"
 CATEGORY="network"
-SHORT_DESC="Ssfs is SliTaz Secure File Storage"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz Secure File Storage"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://ssfs.slitaz.org/"
 REPOLOGY="-"
@@ -12,11 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/ssfs/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext-tools"
-SPLIT="ssfs-server"
+BUILD_DEPENDS="gettext"
+SPLIT="$PACKAGE-server"
 
 compile_rules() {
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sshfp/receipt
--- a/sshfp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshfp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sshfp"
 VERSION="1.2.2"
 CATEGORY="network"
-SHORT_DESC="DNS SSHFP records generator."
+SHORT_DESC="DNS SSHFP records generator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.xelerance.com/software/sshfp/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.xelerance.com/software/sshfp/"
 WGET_URL="https://github.com/xelerance/sshfp/archive/$VERSION.tar.gz"
 
-DEPENDS="python-dnspython"
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python-dnspython"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sshfs-fuse/receipt
--- a/sshfs-fuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshfs-fuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="fuse3-dev"
-# gettext glib-dev"
+# gettext-dev glib-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e sshguard/receipt
--- a/sshguard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshguard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 		--with-firewall=iptables \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sshpass/receipt
--- a/sshpass/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshpass/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sshpass"
 VERSION="1.05"
 CATEGORY="network"
-SHORT_DESC="Non-interactive ssh password auth."
+SHORT_DESC="Non-interactive ssh password auth"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://sshpass.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://sshpass.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-SUGGESTED="openssh"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	SUGGESTED="openssh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sshproxy/receipt
--- a/sshproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sshproxy"
 VERSION="0.6.0_beta2"
 CATEGORY="network"
-SHORT_DESC="SSH proxy to connect without passwords or keys."
+SHORT_DESC="SSH proxy to connect without passwords or keys"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://sshproxy-project.org/"
+
 TARBALL="sshproxy_0.6.0~beta2.orig.tar.gz"
-WEB_SITE="http://sshproxy-project.org/"
 WGET_URL="http://ftp.de.debian.org/debian/pool/main/s/sshproxy/$TARBALL"
-TAGS="ssh"
 
-DEPENDS="python python-paramiko python-mysql pycrypto"
 BUILD_DEPENDS="python python-paramiko python-mysql pycrypto"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
-	install -d -m 755 $DESTDIR/usr/share/man/man1 &&
-	install -d -m 755 $DESTDIR/usr/share/man/man5 &&
-	install -d -m 755 $DESTDIR/usr/share/man/man8 &&
-	install -d -m 755 $DESTDIR/usr/share/doc &&
-	install -m 644 $src/doc/*.1 $DESTDIR/usr/share/man/man1 &&
-	install -m 644 $src/doc/*.5 $DESTDIR/usr/share/man/man5 &&
-	install -m 644 $src/doc/*.8 $DESTDIR/usr/share/man/man8 &&
-	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
+compile_rules() {
+	python -B setup.py install --root=$install || return 1
+
+	cook_pick_manpages doc/*.1 doc/*.5 doc/*.8
+	cook_pick_docs $src/[A-Z][A-Z]*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	rm -rf $fs/usr/share/doc $fs/usr/share/man
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-paramiko python-mysql pycrypto"
+	TAGS="ssh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sshttp/receipt
--- a/sshttp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sshttp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Hiding a SSH server behind a HTTP server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://github.com/stealth/$PACKAGE"
+WEB_SITE="https://github.com/stealth/sshttp"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/sshttpd $install/usr/sbin/sshttpd
+	install -Dm755 $src/sshttpd $install/usr/sbin/sshttpd
 }
 
 genpkg_rules() {
@@ -27,7 +27,7 @@
 post_install() {
 	[ -n "$1" ] ||
 	zcat /proc/config.gz | grep -q ^CONFIG_NETFILTER_TPROXY= ||
-	cat <<EOT
+	[ -n "$quiet" ] || cat <<EOT
 
 	.----------------------------------------------------------.
 	| CONFIG_NETFILTER_TPROXY not found in /proc/config.gz     |
diff -r ad29ddfee1c9 -r d5aab818505e ssmtp/receipt
--- a/ssmtp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ssmtp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,11 +4,11 @@
 VERSION="2.64"
 CATEGORY="network"
 SHORT_DESC="Extremely simple MTA to get mail off the system to a mailhub"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://packages.debian.org/stable/mail/ssmtp"
+WEB_SITE="https://packages.debian.org/stable/mail/ssmtp"
 
-TARBALL="${PACKAGE}_${VERSION}.orig.tar.bz2"
+TARBALL="${PACKAGE}_$VERSION.orig.tar.bz2"
 WGET_URL="http://ftp.debian.org/debian/pool/main/s/ssmtp/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev"
@@ -23,9 +23,9 @@
 	make || return 1
 
 	# Install
-	mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp
-	cp ssmtp $DESTDIR/usr/sbin
-	cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp
+	mkdir -p $install/usr/sbin $install/etc/ssmtp
+	cp ssmtp $install/usr/sbin
+	cp revaliases ssmtp.conf $install/etc/ssmtp
 
 	ln -sf ssmtp "$install/usr/sbin/sendmail"
 	ln -sf ssmtp "$install/usr/sbin/newaliases"
diff -r ad29ddfee1c9 -r d5aab818505e st/receipt
--- a/st/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/st/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="st"
 VERSION="0.7"
 CATEGORY="x-window"
 SHORT_DESC="Simple terminal implementation for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://st.suckless.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://dl.suckless.org/st/$TARBALL"
 
-DEPENDS="fontconfig freetype xorg-libX11 xorg-libXft"
 BUILD_DEPENDS="fontconfig-dev freetype-dev xorg-xorgproto xorg-libX11-dev \
 xorg-libXft-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# fix PREFIX
 	sed -i "s|/usr/local|/usr|" config.mk
 	# install terminfo files into DESTDIR
 	sed -i "s|st.info|& -o$install/usr/share/terminfo|" Makefile
 
-	make CC=$HOST_SYSTEM-gcc && make install
+	make CC=$HOST_SYSTEM-gcc &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="fontconfig freetype xorg-libX11 xorg-libXft"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stardict/receipt
--- a/stardict/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stardict/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -30,7 +30,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e startup-notification/receipt
--- a/startup-notification/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/startup-notification/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.12"
 CATEGORY="x-window"
 SHORT_DESC="Startup notification protocol"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/startup-notification/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev xorg-libxcb-dev \
 xorg-xcb-util-dev"
-SPLIT="startup-notification-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e staticperl/receipt
--- a/staticperl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/staticperl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="Perl5"
 WEB_SITE="http://software.schmorp.de/pkg/App-Staticperl.html"
-HOST_ARCH="i486 x86_64"
 
 SPLIT="smallperl:small bigperl:big"
 
diff -r ad29ddfee1c9 -r d5aab818505e steadyflow/receipt
--- a/steadyflow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/steadyflow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="steadyflow"
 VERSION="0.2.0"
@@ -7,47 +7,32 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://launchpad.net/steadyflow"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://launchpad.net/$PACKAGE/trunk/$VERSION/+download/$TARBALL"
-TAGS="gtk3"
 
-DEPENDS="gtk3 libgee libnotify"
 BUILD_DEPENDS="cmake vala gtk3-dev glib-dev libgee-dev libnotify-dev"
 
 BUGS="Not able to download anything. Gnome-VFS error?"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share/man/man1
-	# gee-1.0 is old while gee-0.8 is latest ;)
+compile_rules() {
+	mkdir -p $install/usr/share/man/man1
+	# gee-1.0 is old while gee-0.8 is latest ;-)
 	sed -i 's|gee-1.0|gee-0.8|g; s|Gee-1.0|Gee-0.8|g' \
 		$(grep -li gee-1.0 $(find . -type f))
 	sed -i 's/exit(/GLib.Process.&/' Steadyflow/Services.vala
 
 	mkdir build
-	cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
-	make
-	make install 2>&1 | grep -v gzip:
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p \
-		$fs/usr/share/applications \
-		$fs/usr/share/pixmaps \
-		$fs/usr/share/locale
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/glib* $fs/usr/share
-	cp -a $install/usr/share/steadyflow $fs/usr/share
-
-	# localization
-	. $WOK/slitaz-i18n/stuff/locale-pack.conf
-	for lang in $LOCALE_PACK; do
-		langf=$install/usr/share/locale/$lang
-		[ -d $langf ] && cp -a $langf $fs/usr/share/locale && echo -n "$lang "
-	done
-	echo
+genpkg_rules() {
+	copy @std *.mo
+	DEPENDS="gtk3 libgee libnotify"
+	TAGS="gtk3"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stegdetect/receipt
--- a/stegdetect/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stegdetect/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="stegdetect"
 VERSION="0.6"
 CATEGORY="security"
-SHORT_DESC="steganography detection tool."
+SHORT_DESC="Steganography detection tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/abeluck/stegdetect"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/abeluck/stegdetect"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="stenography"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i '/static int debug/d' stegdetect.c
-	./configure --prefix=/usr \
+
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make
+	make || return 1
+
+	install -Dm755 stegdetect  $install/usr/bin/stegdetect
+	install -Dm755 stegdeimage $install/usr/bin/stegdeimage
+	install -Dm755 stegcompare $install/usr/bin/stegcompare
+	install -Dm755 stegbreak   $install/usr/bin/stegbreak
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/stegdetect $src/stegdeimage $src/stegcompare \
-		$src/stegbreak $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	TAGS="stenography"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stegsnow/receipt
--- a/stegsnow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stegsnow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 compile_rules() {
 	make &&
-	install -Dm 755 $src/snow $install/usr/bin/stegsnow
+	install -Dm755 snow $install/usr/bin/stegsnow
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e stella/receipt
--- a/stella/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stella/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.7.5"
 CATEGORY="games"
 SHORT_DESC="A multi-platform Atari 2600 VCS emulator"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://stella.sourceforge.net/"
 
@@ -16,7 +16,8 @@
 compile_rules() {
 	./configure \
 		--prefix=/usr &&
-	make && make DESTDIR=$DESTDIR install || return 1
+	make &&
+	make DESTDIR=$install install || return 1
 
 	sed -i 's|Icon=stella.png|Icon=stella|' $install/usr/share/applications/stella.desktop
 }
diff -r ad29ddfee1c9 -r d5aab818505e stellarium/receipt
--- a/stellarium/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stellarium/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,30 +4,31 @@
 VERSION="0.11.0"
 CATEGORY="games"
 SHORT_DESC="A stellarium with great graphics and a nice database of sky-objects"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.stellarium.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.stellarium.org/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libpng16 mesa glib freetype openssl libQtScript libQtOpenGL libQtSql \
-libQtNetwork libQtGui zlib"
-BUILD_DEPENDS="gettext perl cmake boost-dev boost-thread mesa-dev \
+BUILD_DEPENDS="gettext-dev perl cmake boost-dev boost-thread mesa-dev \
 qt4 Qt4-dev qmake zlib-dev xorg-libX11-dev libdrm glu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/Ch.*reau/Chereau/' doc/stellarium*
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE || return 1
-	make
-	make DESTDIR=$DESTDIR install
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=RELEASE \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/stellarium $fs/usr/share
+	DEPENDS="libpng16 mesa glib freetype openssl libQtScript libQtOpenGL \
+	libQtSql libQtNetwork libQtGui zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stfl/receipt
--- a/stfl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stfl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev swig python-dev"
-SPLIT="python-stfl stfl-dev"
+SPLIT="python-stfl $PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/usr/local|/usr|' Makefile.cfg
@@ -20,7 +20,7 @@
 	sed -i 's|^include Makefile.deps|-&|' Makefile
 
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 
 	ln -s libstfl.so.$VERSION $install/usr/lib/libstfl.so.0
 }
diff -r ad29ddfee1c9 -r d5aab818505e stjerm-terminal/receipt
--- a/stjerm-terminal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stjerm-terminal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,31 @@
 PACKAGE="stjerm-terminal"
 VERSION="0.18"
 CATEGORY="x-window"
-SHORT_DESC="Stjerm is a quake-like terminal emulator. It's window is shown with a key shortcut."
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Quake-like terminal emulator. It's window is shown with a key shortcut"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/stjerm/stjerm"
 REPOLOGY="stjerm"
 
-SOURCE="stjerm"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+TARBALL="stjerm-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
-TAGS="terminal"
 
-DEPENDS="vte-gtk2"
-BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake"
+BUILD_DEPENDS="vte-gtk2-dev glib-dev gtk2-dev automake xorg-libXinerama-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="vte-gtk2"
+	TAGS="terminal"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stm8flash/receipt
--- a/stm8flash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stm8flash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="stm8flash"
 VERSION="20170817"
 GITHASH="e322a7a"
-SHORT_DESC="program your stm8 devices with SWIM/stlinkv(1,2)"
+SHORT_DESC="Program your stm8 devices with SWIM/stlinkv(1,2)"
 LICENSE="GPL2"
 CATEGORY="electronics"
 MAINTAINER="psychomaniak@xakep.ru"
+WEB_SITE="https://github.com/vdudouyt/stm8flash"
+
 TARBALL="$GITHASH.tar.gz"
-
-WEB_SITE="https://github.com/vdudouyt/stm8flash"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
 
-DEPENDS="libusb"
 BUILD_DEPENDS="libusb-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libusb"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stoq/receipt
--- a/stoq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stoq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,21 @@
 PACKAGE="stoq"
 VERSION="0.9.12"
 CATEGORY="office"
-SHORT_DESC="Stoq is a suite of Retail Management System applications."
+SHORT_DESC="Suite of Retail Management System applications"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.stoq.com.br/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.stoq.com.br"
 WGET_URL="http://download.stoq.com.br/sources/$VERSION/$TARBALL"
 
-DEPENDS="python python-pygtk postgresql python-psycopg2 python-zope.interface python-pil \
-python-reportlab stoqlib stoqdrivers python-kiwi python-gazpacho"
-BUILD_DEPENDS="python-dev python-pygtk-dev python-kiwi stoqlib gettext-tools"
+BUILD_DEPENDS="python-dev python-pygtk-dev python-kiwi stoqlib gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	LOCALEDIR="$install/usr/share/locale"
 	for file in `find $install | grep 'pyc$'`; do
 		rm $file
@@ -33,4 +28,7 @@
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share $fs/usr
 	cp -a $LOCALEDIR/pt_BR/LC_MESSAGES $fs/usr/share/locale/pt
+	DEPENDS="python python-pygtk postgresql python-psycopg2 \
+	python-zope.interface python-pil python-reportlab stoqlib stoqdrivers \
+	python-kiwi python-gazpacho"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stoqdrivers/receipt
--- a/stoqdrivers/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stoqdrivers/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="stoqdrivers"
 VERSION="0.9.8.2"
@@ -6,30 +6,20 @@
 SHORT_DESC="Useful drivers for Stoq and retail systems"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="LGPL2.1"
-SUGGESTED="stoq"
+WEB_SITE="https://www.stoq.com.br/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.stoq.com.br"
 WGET_URL="http://download.stoq.com.br/sources/0.9.11/$TARBALL"
 
-DEPENDS="python python-kiwi python-pyserial python-zope.interface"
-BUILD_DEPENDS="python python-dev python-kiwi python-pyserial python-zope.interface \
-gettext-tools"
+BUILD_DEPENDS="python python-dev python-kiwi python-pyserial \
+python-zope.interface gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	LOCALEDIR="$install/usr/share/locale"
-	for file in `find $install | grep 'pyc$'`; do
-		rm $file
-	done
-	mkdir -p $fs/usr/share/locale/pt
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share $fs/usr
-	cp -a $LOCALEDIR/pt_BR/LC_MESSAGES $fs/usr/share/locale/pt
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-kiwi python-pyserial python-zope.interface"
+	SUGGESTED="stoq"
 }
diff -r ad29ddfee1c9 -r d5aab818505e stoqlib/receipt
--- a/stoqlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stoqlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="stoqlib"
 VERSION="0.9.12"
@@ -6,33 +6,23 @@
 SHORT_DESC="A powerful retail system library"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.stoq.com.br"
+WEB_SITE="https://www.stoq.com.br/"
 REPOLOGY="stoq"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.stoq.com.br/sources/$VERSION/$TARBALL"
 
-DEPENDS="python python-pygtk postgresql python-psycopg2 python-zope.interface python-pil \
-python-reportlab python-kiwi python-gazpacho stoqdrivers python-dateutil"
-BUILD_DEPENDS="python python-dev python-zope.interface python-kiwi python-gazpacho \
-python-psycopg2 stoqdrivers python-pil python-reportlab python-dateutil gettext-tools"
+BUILD_DEPENDS="python-dev python-zope.interface python-kiwi python-gazpacho \
+python-psycopg2 stoqdrivers python-pil python-reportlab python-dateutil \
+gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	chmod +x setup.py
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	LOCALEDIR="$install/usr/share/locale"
-	for file in `find $install | grep 'pyc$'`; do
-		rm $file
-	done
-	mkdir -p $fs/usr/share/locale/pt
-	cp -a $install/usr/lib $fs/usr
-	cp -a $install/usr/share $fs/usr
-	cp -a $LOCALEDIR/pt_BR/LC_MESSAGES $fs/usr/share/locale/pt
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-pygtk postgresql python-psycopg2 \
+	python-zope.interface python-pil python-reportlab python-kiwi \
+	python-gazpacho stoqdrivers python-dateutil"
 }
diff -r ad29ddfee1c9 -r d5aab818505e strace/receipt
--- a/strace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/strace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.20"
 CATEGORY="development"
 SHORT_DESC="System call tracer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://sourceforge.net/projects/strace/"
 
@@ -14,7 +14,9 @@
 BUILD_DEPENDS="perl libunwind-dev" # all optional
 
 compile_rules() {
-	./configure $SET_OPTS $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e streamripper/receipt
--- a/streamripper/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/streamripper/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="streamripper"
 VERSION="1.64.6"
 CATEGORY="multimedia"
-SHORT_DESC="Record streaming mp3 to your hard drive."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Record streaming mp3 to your hard drive"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://streamripper.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://streamripper.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk2 libmad libvorbis faad2 glibc-base"
 BUILD_DEPENDS="gtk2-dev libmad-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	chmod +x install-sh
+
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk2 libmad libvorbis faad2 glibc-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e strigi/receipt
--- a/strigi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/strigi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,54 +1,44 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="strigi"
 VERSION="0.7.8"
 CATEGORY="system-tools"
-SHORT_DESC="Strigi is a fast and light desktop search engine."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Fast and light desktop search engine"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
-SUGGESTED="strigi-client"
+WEB_SITE="http://www.vandenoever.info/software/strigi/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.vandenoever.info/software/strigi/"
 WGET_URL="http://www.vandenoever.info/software/strigi/$TARBALL"
 
-BUILD_DEPENDS="$DEPENDS libxml2-dev cmake Qt4-dev bzlib expat-dev sqlite3-dev \
+BUILD_DEPENDS="libQtXml libxml2-dev cmake Qt4-dev bzlib expat-dev sqlite3-dev \
 dbus-dev libQtCore libQtDBus qmake bzip2-dev xorg-libX11-dev"
-SPLIT="strigi strigi-client strigi-dev"
+SPLIT="$PACKAGE-client $PACKAGE $PACKAGE-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p build && cd build
+compile_rules() {
+	mkdir build
+	cd    build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		.. &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	strigi)
-		DEPENDS="libxml2 expat sqlite3 dbus libQtDBus libQtXml libQtCore"
-		mkdir -p $fs/usr/lib/$PACKAGE
-		cp -a $install/usr/lib/*.so* $fs/usr/lib
-		cp -a $install/usr/lib/$PACKAGE/*.so* $fs/usr/lib/$PACKAGE
-		cp -a $install/usr/share $fs/usr
-		cp -a $install/usr/bin $fs/usr
-		# QT GUI split into strigi-client
-		rm -f $fs/usr/bin/strigiclient	
-		;;
-	strigi-client)
-		CAT="system-tools|Strigi GUI client using QT."
-		DEPENDS="strigi libQtCore libQtDBus"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/strigiclient $fs/usr/bin
-		;;
-	strigi-dev)
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-		cp -a $install/usr/include $fs/usr
-		;;
+		*-client)
+			copy strigiclient
+			CAT="system-tools|GUI client using Qt"
+			DEPENDS="strigi libQtCore libQtDBus"
+			;;
+		strigi)
+			copy @std @rm
+			DEPENDS="libxml2 expat sqlite3 dbus libQtDBus libQtXml libQtCore"
+			SUGGESTED="strigi-client"
+			;;
+		*-dev)
+			copy @dev
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e stuntman/receipt
--- a/stuntman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stuntman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,7 @@
 
 BUILD_DEPENDS="boost-dev openssl-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make
 
 	mkdir -p $install/usr/bin
@@ -23,10 +21,7 @@
 	cook_pick_manpages resources/stunclient.1 resources/stunserver.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="openssl zlib"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e stuurman-desktop/receipt
--- a/stuurman-desktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stuurman-desktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/stuurman-desktop/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool xorg-libX11-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
 libsde-utils-x11-dev pango-dev shared-mime-info libsmfm-core-dev gtk2-dev \
 libsmfm-gtk-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e stuurman/receipt
--- a/stuurman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/stuurman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/stuurman/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake libtool gettext glib-dev intltool xorg-libX11-dev \
+BUILD_DEPENDS="automake libtool gettext-dev glib-dev intltool xorg-libX11-dev \
 pango-dev shared-mime-info libsmfm-core-dev gtk2-dev libsmfm-gtk-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e subversion/receipt
--- a/subversion/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/subversion/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.7"
 CATEGORY="development"
 SHORT_DESC="Subversion Source Code Management access"
-MAINTAINER="lehswe@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://subversion.apache.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/subversion.html"
@@ -12,9 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://archive.apache.org/dist/subversion/$TARBALL"
 
-BUILD_DEPENDS="apr-dev apr-util-dev serf-dev cyrus-sasl-dev dbus-dev gettext \
-libmagic-dev python-dev"
-SPLIT="libsvn subversion subversion-dev"
+BUILD_DEPENDS="apr-dev apr-util-dev serf-dev cyrus-sasl-dev dbus-dev \
+gettext-dev libmagic-dev python-dev"
+SPLIT="libsvn $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e sudo/receipt
--- a/sudo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sudo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="1.8.20p2"
 CATEGORY="security"
 SHORT_DESC="Execute a command as another user"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="ISC"
 WEB_SITE="https://www.sudo.ws/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="${WEB_SITE}dist/$TARBALL"
 
-BUILD_DEPENDS="gettext groff pam-dev"
-SPLIT="sudo sudo-dev sudo-pam:pam sudo-pam-dev:pam"
+BUILD_DEPENDS="gettext-dev groff pam-dev"
+SPLIT="$PACKAGE-dev $PACKAGE-pam:pam $PACKAGE-pam-dev:pam"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e sudoku-savant/receipt
--- a/sudoku-savant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sudoku-savant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,40 +3,37 @@
 PACKAGE="sudoku-savant"
 VERSION="1.3"
 CATEGORY="games"
-SHORT_DESC="Sudoku games/generator using GTK."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Sudoku games/generator using GTK"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://sourceforge.net/projects/sudoku-savant/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://sourceforge.net/projects/sudoku-savant/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
-xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXrandr \
-xorg-libXrender xorg-libXinerama xorg-libXdamage gcc-lib-base"
 BUILD_DEPENDS="gtk2-dev libpthread-stubs desktop-file-utils-extra \
 coreutils-operations"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/games \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
+
 	# desktop-file-install workaround
-	[ -x $DESTDIR/usr/games/sudoku-savant ] && \
+	[ -x $install/usr/games/sudoku-savant ] &&
 		echo "Continue: desktop-file-install dont support busybox install..."
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/usr/games $fs/usr
 	cp $src/$PACKAGE.png $fs/usr/share/pixmaps
 	cp $src/$PACKAGE.desktop $fs/usr/share/applications
+	DEPENDS="expat gtk2 xorg-libX11 xorg-libXau xorg-libXcomposite \
+	xorg-libXcursor xorg-libXdmcp xorg-libXext xorg-libXfixes xorg-libXrandr \
+	xorg-libXrender xorg-libXinerama xorg-libXdamage gcc-lib-base"
 }
diff -r ad29ddfee1c9 -r d5aab818505e suggested-applications/receipt
--- a/suggested-applications/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/suggested-applications/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,14 @@
 PACKAGE="suggested-applications"
 VERSION="1.0"
 CATEGORY="network"
-SHORT_DESC="Set of desktop files for default applications."
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Set of desktop files for default applications"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/usr/bin
-	cp -a stuff/applications $fs/usr/share
-	cp -a stuff/default-app $fs/usr/bin/
+	cp -a $stuff/applications $fs/usr/share
+	cp -a $stuff/default-app $fs/usr/bin/
 }
diff -r ad29ddfee1c9 -r d5aab818505e sundown/receipt
--- a/sundown/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sundown/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -2,32 +2,24 @@
 
 PACKAGE="sundown"
 VERSION="1.16.0"
-COMMIT="37728fb2d7137ff7c37d0a474cb827a8d6d846d8"
+COMMIT="37728fb"
 CATEGORY="utilities"
 SHORT_DESC="Standards compliant, fast, secure markdown processing library in C"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="ISC"
 WEB_SITE="https://github.com/vmg/sundown"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/$COMMIT.tar.gz"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	#sed -i 's|O3|Os|' $src/Makefile
 	sed -i 's|-Wl||' Makefile
 
-	make
-
-	mkdir -p $install/usr/bin
-	cp -a $src/sundown $install/usr/bin
+	make &&
+	install -Dm755 sundown $install/usr/bin/sundown
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e sunxi-tools/receipt
--- a/sunxi-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sunxi-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,12 +9,13 @@
 WEB_SITE="http://linux-sunxi.org/Sunxi-tools"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://nodeload.github.com/amery/sunxi-tools/tarball/v${VERSION}"
+WGET_URL="https://nodeload.github.com/amery/sunxi-tools/tarball/v$VERSION"
 
 BUILD_DEPENDS="libusb-dev"
 
 compile_rules() {
-	make && make phoenix_info || return 1
+	make &&
+	make phoenix_info || return 1
 
 	mkdir -p $install/usr/bin/
 	cp pio nand-part fexc fex2bin fel fel-gpio bin/fel-pio.bin \
diff -r ad29ddfee1c9 -r d5aab818505e superswitcher/receipt
--- a/superswitcher/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/superswitcher/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6"
 CATEGORY="x-window"
 SHORT_DESC="Replacement for the Alt-Tab window switching behavior"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://code.google.com/archive/p/superswitcher/"
 
@@ -28,7 +28,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e supertux/receipt
--- a/supertux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/supertux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,43 +3,42 @@
 PACKAGE="supertux"
 VERSION="0.3.3"
 CATEGORY="games"
-SHORT_DESC="SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games."
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="Classic 2D jump'n run sidescroller game similar to SuperMario games"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-SUGGESTED="nvidia"
+WEB_SITE="http://supertux.lethargik.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://supertux.lethargik.org/"
 WGET_URL="http://supertux.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="libsdl-dev libsdl-image-dev libsdl-mixer-dev curl-dev \
 physfs-dev openal-dev mesa-dev glew-dev cmake boost-dev libvorbis-dev"
-SPLIT="supertux-data"
+SPLIT="$PACKAGE-data"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp $stuff/menu.h src
 	sed -i 's|#  include <curl/types.h>||g' src/addon/addon_manager.cpp
 	sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-	cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-	make && make DESTDIR=$DESTDIR install
+
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DINSTALL_SUBDIR_BIN=bin \
+		. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	supertux)
-		DEPENDS="libsdl libsdl-image libsdl-mixer curl physfs openal \
+		supertux)
+			copy bin/
+			DEPENDS="libsdl libsdl-image libsdl-mixer curl physfs openal \
 			mesa glew supertux-data"
-		mkdir -p $fs/usr
-		cp -a $install/usr/bin $fs/usr
-		;;
-	supertux-data)
-		CAT="games|data files"
-		echo Copying data...
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/share/games $fs/usr/share
-		;;
+			SUGGESTED="nvidia"
+			;;
+		*-data)
+			copy games/
+			CAT="games|data files"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e suplemon/receipt
--- a/suplemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/suplemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="suplemon"
 VERSION="0.1.55"
 CATEGORY="utilities"
-SHORT_DESC="Console text editor with multi cursor support."
+SHORT_DESC="Console text editor with multi cursor support"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/richrd/suplemon"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/richrd/suplemon"
 
-DEPENDS="python3"
 BUILD_DEPENDS="python3-dev git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python3 setup.py install --root=$DESTDIR
+compile_rules() {
+	python3 -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python3"
 }
diff -r ad29ddfee1c9 -r d5aab818505e surf/receipt
--- a/surf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/surf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.8"
 CATEGORY="network"
 SHORT_DESC="Simple web browser based on WebKit/GTK+2"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://surf.suckless.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e suricata/receipt
--- a/suricata/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/suricata/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="1.1.1"
 CATEGORY="security"
 SHORT_DESC="Next Generation Intrusion Detection and Prevention Engine"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.openinfosecfoundation.org/"
+WEB_SITE="https://oisf.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://www.openinfosecfoundation.org/download/$TARBALL"
+WGET_URL="http://www.openinfosecfoundation.org/download/$TARBALL" # FIXME
 
 BUILD_DEPENDS="zlib-dev yaml-dev libnet-dev libpcap-dev libcap-ng-dev libmnl \
 libnfnetlink-dev libnetfilter_queue-dev libnetfilter_queue libhtp-dev pcre-dev"
diff -r ad29ddfee1c9 -r d5aab818505e svkbd/receipt
--- a/svkbd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/svkbd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 VERSION="${GITHASH:0:7}"
 CATEGORY="x-window"
 SHORT_DESC="Simple virtual keyboard that suck less"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tools.suckless.org/x/svkbd"
 COOKOPTS="!menus"
@@ -14,23 +14,19 @@
 WGET_URL="http://git.suckless.org/svkbd/snapshot/svkbd-$GITHASH.tar.bz2"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev"
-SPLIT="svkbd-de svkbd-fr svkbd-ru"
+SPLIT="$PACKAGE-de $PACKAGE-fr $PACKAGE-ru"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cp -d $stuff/*.h .
 	for layout in de en ru fr; do
 		make svkbd-$layout CC=$HOST_SYSTEM-gcc || return 1
 	done
 	# We may need to sed config.def.h to set correct font for RU ???
 	#make svkbd-ru CC=${HOST_SYSTEM}-gcc
-	make install DESTDIR=$DESTDIR PREFIX="/usr"
+	make DESTDIR=$install PREFIX="/usr" install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		svkbd)    copy svkbd-en*;;
 		svkbd-de) copy svkbd-de*; CAT="x-window|DE Layout";;
diff -r ad29ddfee1c9 -r d5aab818505e swagger-py/receipt
--- a/swagger-py/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/swagger-py/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="swagger-py"
 VERSION="0.2.1"
 CATEGORY="development"
-SHORT_DESC="Swagger client library for Python."
+SHORT_DESC="Swagger client library for Python"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/digium/swagger-py"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/digium/swagger-py"
 WGET_URL="$WEB_SITE/archive/$VERSION.tar.gz"
 
-DEPENDS="python"
 BUILD_DEPENDS="python"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e sweethome3d/receipt
--- a/sweethome3d/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sweethome3d/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sweethome3d.com/"
-HOST_ARCH="i486 x86_64"
 
 case $ARCH in
 	i?86)   TARBALL="SweetHome3D-$VERSION-linux-x86.tgz";;
diff -r ad29ddfee1c9 -r d5aab818505e swell-foop/receipt
--- a/swell-foop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/swell-foop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="vala glib-dev gtk3-dev clutter-dev clutter-gtk-dev gettext \
+BUILD_DEPENDS="vala glib-dev gtk3-dev clutter-dev clutter-gtk-dev gettext-dev \
 itstool"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e swfdec/receipt
--- a/swfdec/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/swfdec/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="Macromedia Flash decoding library"
 MAINTAINER="devl547@gmail.com"
 LICENSE="LGPL2.1"
-WEB_SITE="https://swfdec.freedesktop.org/"
+WEB_SITE="https://swfdec.freedesktop.org/wiki/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://swfdec.freedesktop.org/download/swfdec/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="glib-dev liboil-dev pango-dev gtk2-dev libsoup-dev \
 cairo-dev alsa-lib-dev gstreamer0-dev gst0-plugins-base-dev sqlite3-dev"
-SPLIT="swfdec-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,7 +22,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sxiv/receipt
--- a/sxiv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sxiv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,23 @@
 PACKAGE="sxiv"
 VERSION="09122016"
 CATEGORY="graphics"
-SHORT_DESC="Simple X Image Viewer."
+SHORT_DESC="Simple X Image Viewer"
 MAINTAINER="paul@slitaz.org"
 WEB_SITE="https://github.com/muennich/sxiv"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/muennich/sxiv"
 
-DEPENDS="imlib2 libexif giflib xdg-utils"
 BUILD_DEPENDS="xorg-dev git bzip2 imlib2-dev libexif-dev giflib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make 
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/sxiv $fs/usr/share
+	DEPENDS="imlib2 libexif giflib xdg-utils"
 }
-	
diff -r ad29ddfee1c9 -r d5aab818505e sylfilter/receipt
--- a/sylfilter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sylfilter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="sylfilter"
 VERSION="0.8"
 CATEGORY="network"
-SHORT_DESC="SylFilter is a light message filter library and command-line tools"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight message filter library and command-line tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://sylpheed.sraoss.jp/sylfilter/"
 
diff -r ad29ddfee1c9 -r d5aab818505e sylpheed-full/receipt
--- a/sylpheed-full/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sylpheed-full/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.1"
 CATEGORY="network"
 SHORT_DESC="Simple and full featured e-mail client (GPG, spell, ldap support)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sylpheed.sraoss.jp/en/"
 REPOLOGY="sylpheed"
diff -r ad29ddfee1c9 -r d5aab818505e sylpheed/receipt
--- a/sylpheed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sylpheed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.1"
 CATEGORY="network"
 SHORT_DESC="Simple, lightweight but featureful, and easy-to-use e-mail client"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://sylpheed.sraoss.jp/en/"
 
diff -r ad29ddfee1c9 -r d5aab818505e synergy/receipt
--- a/synergy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/synergy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.3.6"
 CATEGORY="x-window"
 SHORT_DESC="Synergy keyboard and mouse sharing"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://synergy-foss.org"
+WEB_SITE="http://synergy-foss.org/"
 
 TARBALL="$PACKAGE-$VERSION-Source.tar.gz"
 WGET_URL="http://synergy.googlecode.com/files/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e sysbench/receipt
--- a/sysbench/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sysbench/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,7 +18,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e sysfsutils/receipt
--- a/sysfsutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sysfsutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.0"
 CATEGORY="system-tools"
 SHORT_DESC="Utilities built upon sysfs"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1"
 WEB_SITE="http://linux-diag.sourceforge.net/Sysfsutils.html"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/linux-diag/$TARBALL"
 
 BUILD_DEPENDS="gfortran autoconf"
-SPLIT="sysfsutils-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e sysklogd/receipt
--- a/sysklogd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sysklogd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 	sed -i 's/union wait/int/' syslogd.c
 	mkdir -p $install/sbin $install/usr/share/man/man5 $install/usr/share/man/man8
 
-	make && make prefix=$install BINDIR=$install/sbin install
+	make &&
+	make prefix=$install BINDIR=$install/sbin install || return 1
 
 	mkdir -p $install/etc
 	cp $stuff/syslog.conf $install/etc
diff -r ad29ddfee1c9 -r d5aab818505e syslinux-slitaz-extra-repack/receipt
--- a/syslinux-slitaz-extra-repack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/syslinux-slitaz-extra-repack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,18 +12,14 @@
 TARBALL="syslinux-slitaz-extra-4.06.cpio"
 WGET_URL="http://mirror1.slitaz.org/packages/5.0/syslinux-extra-4.06.tazpkg"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
+compile_rules() {
 	cpio -dmF $src/$TARBALL -i
 	lzma d $src/fs.cpio.lzma -so | cpio -idm
 	mkdir $install
 	cp -r $src/fs/* $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="syslinux-slitaz-repack posixovl"
 	PROVIDE="syslinux-extra"
diff -r ad29ddfee1c9 -r d5aab818505e syslinux-slitaz-repack/receipt
--- a/syslinux-slitaz-repack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/syslinux-slitaz-repack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,9 +12,7 @@
 TARBALL="syslinux-slitaz-4.06.cpio"
 WGET_URL="http://mirror1.slitaz.org/packages/5.0/syslinux-4.06.tazpkg"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-compile_rules()
-{
+compile_rules() {
 	cpio -dmF $src/$TARBALL -i
 	lzma d $src/fs.cpio.lzma -so | cpio -idm
 	mkdir $install
@@ -23,9 +21,7 @@
 		$install/boot/isolinux/isolinux.cfg
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	CONFIG_FILES="/boot/isolinux/i18n.cfg /boot/isolinux/isolinux.cfg \
 	/boot/isolinux/kbd"
@@ -34,7 +30,6 @@
 	PROVIDE="syslinux"
 }
 
-# Pre and post install commands for Tazpkg.
 post_install() {
 	sed -i "/MENU TITLE SliTaz GNU\/Linux/ s| [0-9X]*$| $(date +%Y%m%d)|" \
 		"$1/boot/isolinux/isolinux.cfg"
diff -r ad29ddfee1c9 -r d5aab818505e syslinux/receipt
--- a/syslinux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/syslinux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.06"
 CATEGORY="base-system"
 SHORT_DESC="LiveCD ISO bootloader (isolinux)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://syslinux.zytor.com/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="kbd-base perl nasm dev86 lzma mingw32-gcc upx posixovl \
 util-linux-uuid-dev advancecomp libidn linld python"
-SPLIT="syslinux syslinux-extra syslinux-modules syslinux-tools"
+SPLIT="$PACKAGE-extra $PACKAGE-modules $PACKAGE-tools"
 
 COOKOPTS="skip-log-errors"
 LINLD="$WOK/linld/source"
diff -r ad29ddfee1c9 -r d5aab818505e sysstat/receipt
--- a/sysstat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sysstat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://perso.wanadoo.fr/sebastien.godard/$TARBALL"
 
-BUILD_DEPENDS="gettext bzip2"
+BUILD_DEPENDS="gettext-dev bzip2"
 
 compile_rules() {
 	sa_lib_dir=/usr/lib/sa \
diff -r ad29ddfee1c9 -r d5aab818505e system-tools-backends/receipt
--- a/system-tools-backends/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/system-tools-backends/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="dbus-dev polkit-dev dbus-glib-dev glib-dev intltool perl-dev"
-SPLIT="system-tools-backends-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e systemd/receipt
--- a/systemd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/systemd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="195"
 CATEGORY="base-system"
 SHORT_DESC="System and service manager for Linux"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1 MIT"
-WEB_SITE="http://freedesktop.org/wiki/Software/systemd/"
+WEB_SITE="https://freedesktop.org/wiki/Software/systemd/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="http://www.freedesktop.org/software/systemd/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e sz81/receipt
--- a/sz81/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/sz81/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,10 +17,10 @@
 	make clean &&
 	make &&
 	make \
-		PREFIX=$DESTDIR/usr \
-		BINDIR=$DESTDIR/usr/bin \
-		DOCDIR=$DESTDIR/usr/share/doc \
-		PACKAGE_DATA_DIR=$DESTDIR/usr/share/sz81 \
+		PREFIX=$install/usr \
+		BINDIR=$install/usr/bin \
+		DOCDIR=$install/usr/share/doc \
+		PACKAGE_DATA_DIR=$install/usr/share/sz81 \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e szip/receipt
--- a/szip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/szip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://support.hdfgroup.org/ftp/lib-external/szip/$VERSION/src/$TARBALL"
 
-SPLIT="szip-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e t2/receipt
--- a/t2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/t2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -22,12 +22,15 @@
 }
 
 post_install() {
-	cat <<EOT
-Now you can do:
-# cd /usr/lib/t2
-# scripts/Config
+	[ -n "$quiet" ] || cat <<EOT
 
-But read http://www.t2-project.org/handbook/html/t2-book.html before...
-
+	.---------------------------------------------------------------.
+	| Now you can do:                                               |
+	| # cd /usr/lib/t2                                              |
+	| # scripts/Config                                              |
+	|                                                               |
+	| But read http://www.t2-project.org/handbook/html/t2-book.html |
+	| before...                                                     |
+	'---------------------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e tabbed/receipt
--- a/tabbed/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tabbed/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6"
 CATEGORY="x-window"
 SHORT_DESC="Simple generic tabbed fronted to xembed aware applications"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tools.suckless.org/tabbed/"
 
@@ -14,16 +14,8 @@
 BUILD_DEPENDS="xorg-libX11-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*)
-			sysroot="/cross/$ARCH/sysroot"
-			sed -i \
-				-e s"#LIBS =.*#LIBS = -L$sysroot/usr/lib -lc -lX11#" \
-				-e s"#INCS =.*#INCS = -I. -I$sysroot/usr/include#" \
-				config.mk || return 1
-	esac
 	make CC=$HOST_SYSTEM-gcc &&
-	install -Dm755 $src/tabbed $install/usr/bin/tabbed
+	install -Dm755tabbed $install/usr/bin/tabbed
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tacacs+/receipt
--- a/tacacs+/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tacacs+/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,28 @@
 PACKAGE="tacacs+"
 VERSION="F4.0.4.18"
 CATEGORY="misc"
-SHORT_DESC="authentication server for cisco devices"
+SHORT_DESC="Authentication server for cisco devices"
 MAINTAINER="allan316@gmail.com"
 LICENSE="MIT"
+WEB_SITE="http://www.shrubbery.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.shrubbery.net"
 WGET_URL="ftp://ftp.shrubbery.net/pub/tac_plus/$TARBALL"
 
-DEPENDS="libwrap pam"
 BUILD_DEPENDS="libwrap-dev pam-dev perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR MKDIRPROG="mkdir -p" install
+	make &&
+	make DESTDIR=$install MKDIRPROG="mkdir -p" install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libwrap pam"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e taglib/receipt
--- a/taglib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/taglib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,15 @@
 VERSION="1.11.1"
 CATEGORY="multimedia"
 SHORT_DESC="Audio tag library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://taglib.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://taglib.org/releases/$TARBALL"
 
-BUILD_DEPENDS_arm="zlib-dev"
 BUILD_DEPENDS="cmake zlib-dev"
-SPLIT="taglib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e tahoe-lafs/receipt
--- a/tahoe-lafs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tahoe-lafs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tahoe-lafs"
 VERSION="1.10.1"
 CATEGORY="system-tools"
-SHORT_DESC="Cloud storage system."
+SHORT_DESC="Cloud storage system"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://tahoe-lafs.org/"
+
 TARBALL="allmydata-tahoe-$VERSION.zip"
-WEB_SITE="https://tahoe-lafs.org/"
 WGET_URL="${WEB_SITE}source/$PACKAGE/releases/$TARBALL"
-TAGS="filesystem backup"
 
-DEPENDS="python python-simplejson python-zope.interface python-twisted python-pyopenssl \
-pycrypto python-zfec python-foolscap python-pyasn1 python-mock \
-python-pycryptopp"
 BUILD_DEPENDS="python-dev gmp-dev openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-simplejson python-zope.interface python-twisted \
+	python-pyopenssl pycrypto python-zfec python-foolscap python-pyasn1 \
+	python-mock python-pycryptopp"
+	TAGS="filesystem backup"
 }
diff -r ad29ddfee1c9 -r d5aab818505e talloc/receipt
--- a/talloc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/talloc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.11"
 CATEGORY="system-tools"
 SHORT_DESC="Hierarchical pool based memory allocator with destructors"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="https://talloc.samba.org/talloc/doc/html/index.html"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/talloc.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://www.samba.org/ftp/talloc/$TARBALL"
 
 BUILD_DEPENDS="python-dev docbook-xsl"
-SPLIT="talloc-python talloc talloc-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure --prefix=/usr &&
diff -r ad29ddfee1c9 -r d5aab818505e tango-icon-theme/receipt
--- a/tango-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tango-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tango-icon-theme"
 VERSION="0.8.90"
@@ -8,24 +8,21 @@
 LICENSE="PublicDomain"
 #WEB_SITE="http://tango.freedesktop.org/" # unavailable now
 WEB_SITE="https://en.wikipedia.org/wiki/Tango_Desktop_Project"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://http.debian.net/debian/pool/main/${PACKAGE:0:1}/$PACKAGE/${PACKAGE}_$VERSION.orig.tar.gz"
 
-DEPENDS=""
-BUILD_DEPENDS="intltool gettext perl icon-naming-utils imagemagick-dev \
+BUILD_DEPENDS="intltool gettext-dev perl icon-naming-utils imagemagick-dev \
 librsvg-dev rsvg-convert perl-xml-simple"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--enable-png-creation \
-		$CONFIGURE_ARGS && \
-	make && make install
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e tar/receipt
--- a/tar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.30"
 CATEGORY="utilities"
 SHORT_DESC="GNU tar archiving tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/tar/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/tar.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="acl-dev gettext texinfo"
+BUILD_DEPENDS="acl-dev gettext-dev texinfo"
 
 compile_rules() {
 	FORCE_UNSAFE_CONFIGURE=1 \
diff -r ad29ddfee1c9 -r d5aab818505e task/receipt
--- a/task/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/task/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="task"
 VERSION="2.3.0"
 CATEGORY="utilities"
-SHORT_DESC="Task is an open source, command line, TODO list manager."
+SHORT_DESC="Opensource commandline TODO list manager"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://taskwarrior.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://taskwarrior.org/"
 WGET_URL="http://www.taskwarrior.org/download/$TARBALL"
-TAGS="office todo"
 
-DEPENDS="ncurses gcc-lib-base util-linux-uuid"
 BUILD_DEPENDS="ncurses-dev cmake util-linux-uuid-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	#./configure \
-		#--prefix=/usr \
-		#--infodir=/usr/share/info \
-		#--mandir=/usr/share/man \
-		#$CONFIGURE_ARGS &&
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/doc $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses util-linux-uuid"
+	TAGS="office todo"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazbug-website/receipt
--- a/tazbug-website/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazbug-website/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="95"
 CATEGORY="misc"
 SHORT_DESC="SliTaz Bug Tracker website"
-MAINTAINER="fredericguilbault@live.ca"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://bugs.slitaz.org/"
 REPOLOGY="-"
@@ -12,15 +12,12 @@
 TARBALL="tazbug-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazbug/archive/$VERSION.tar.bz2"
 
-DEPENDS="busybox gettext-base slitaz-base-files"
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 SIBLINGS="tazbug"
 
-# Use compile_rules with: make && make DESTDIR=$DESTDIR install-server
+# Use compile_rules with: make && make DESTDIR=$install install-server
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	#create path
 	mkdir -pm0755 $fs/etc/slitaz
 	mkdir -pm0755 $fs/var/www/bugs
@@ -38,4 +35,5 @@
 	chown -R 80.80 $fs/var/lib/slitaz/people/
 	chmod 0700 $fs/var/lib/slitaz/auth/people
 	chown -R 80.80 $fs/var/lib/slitaz/auth/people
+	DEPENDS="busybox gettext-base slitaz-base-files"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazbug/receipt
--- a/tazbug/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazbug/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tazbug"
 VERSION="95"
 CATEGORY="network"
 SHORT_DESC="SliTaz Bug Tracker - Client side tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://bugs.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="slitaz"
-
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazbug/archive/$VERSION.tar.bz2"
 
-DEPENDS="busybox gettext-base slitaz-base-files"
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 SIBLINGS="tazbug-website"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install || return 1
+
+	chown -R root.root $install
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
-	chown -R root.root $fs
+	DEPENDS="busybox gettext-base slitaz-base-files"
+	TAGS="slitaz"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazdev/receipt
--- a/tazdev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazdev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="tazdev"
 VERSION="306"
 CATEGORY="development"
-SHORT_DESC="SliTaz developers tools."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz developers tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,15 +12,13 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="rsync"
 SIBLINGS="mirror-tools qemu-box slitaz-dev-tools slitaz-mercurial-style \
 tazchroot tazwikiss yaff"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/slitaz $fs/usr/bin
 	cp -a $src/$PACKAGE/tazdev $fs/usr/bin
 	cp -a $src/$PACKAGE/tazdev.conf $fs/etc/slitaz
 	chown -R root.root $fs
+	DEPENDS="rsync"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazdrop/receipt
--- a/tazdrop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazdrop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1024"
 CATEGORY="office"
 SHORT_DESC="SliTaz desktop Drag N' Drop tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,13 +12,13 @@
 TARBALL="slitaz-tools-$VERSION.tar.gz"
 WGET_URL="http://hg.slitaz.org/slitaz-tools/archive/$VERSION.tar.gz"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 SIBLINGS="slitaz-tools slitaz-tools-boxes"
 
 compile_rules() {
 	make msgfmt
 	cd $src/tazdrop
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tazinst/receipt
--- a/tazinst/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazinst/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="91"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz installer"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,14 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazinst/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext"
-SPLIT="tazinst-gui tazinst"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-gui $PACKAGE"
 
 compile_rules() {
 	sed -i 's| = |=|' $src/applications/tazinst.desktop
 
 	make &&
-	make DESTDIR=$DESTDIR VERSION=$VERSION install
+	make DESTDIR=$install VERSION=$VERSION install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tazirc/receipt
--- a/tazirc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazirc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tazirc"
 VERSION="20"
 CATEGORY="network"
-SHORT_DESC="SliTaz IRC Client and Log Bot."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="SliTaz IRC Client and Log Bot"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,17 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazirc/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext-tools"
+BUILD_DEPENDS="gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$install install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazlito/receipt
--- a/tazlito/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazlito/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,11 +12,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazlito/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	sed -i "s/^VERSION=.*/VERSION=$VERSION/" tazlito
-	make DESTDIR=$DESTDIR VERSION=$VERSION install
+
+	make DESTDIR=$install VERSION=$VERSION install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tazndis/receipt
--- a/tazndis/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazndis/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,18 @@
 VERSION="1.53.1"
 CATEGORY="network"
 SHORT_DESC="ndiswrapper replacement for SliTaz with a GUI"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="slitaz"
-
-DEPENDS="perl-core wireless_tools ndiswrapper-driver gtkdialog"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/sbin
-	cp -a stuff/${PACKAGE} $fs/usr/bin
-	cp -a stuff/${PACKAGE}box $fs/usr/bin
+	cp -a $stuff/$PACKAGE $fs/usr/bin
+	cp -a $stuff/${PACKAGE}box $fs/usr/bin
 
 	cd $fs/usr/sbin
 	ln -sf ../bin/tazndis ndiswrapper
+	DEPENDS="perl-core wireless_tools ndiswrapper-driver gtkdialog"
+	TAGS="slitaz"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazpanel/receipt
--- a/tazpanel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazpanel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,19 +12,22 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazpanel/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext jsmin tidy-html5"
-SPLIT="tazpanel tazpanel-extra:extra"
+BUILD_DEPENDS="gettext-dev jsmin tidy-html5"
+SPLIT="$PACKAGE-extra:extra"
 
 compile_rules() {
 	case $SET in
 		'')
-			make && make DESTDIR=$DESTDIR VERSION=$VERSION install
+			make &&
+			make DESTDIR=$install VERSION=$VERSION install || return 1
+
 			mkdir -p $install/etc/init.d
 			# Init script use tazpanel cmdline
 			ln -s ../../usr/bin/tazpanel $install/etc/init.d/tazpanel
 			;;
 		extra)
-			make && make DESTDIR=$DESTDIR VERSION=$VERSION install_extra
+			make &&
+			make DESTDIR=$install VERSION=$VERSION install_extra
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazpkg-desc-ru/receipt
--- a/tazpkg-desc-ru/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazpkg-desc-ru/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,11 +9,8 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="tazpkg"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/lib/tazpkg
 	install -m644 $stuff/* $fs/var/lib/tazpkg
+	DEPENDS="tazpkg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazpkg/receipt
--- a/tazpkg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazpkg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="965"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,12 +12,11 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazpkg/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS_arm=" "
-BUILD_DEPENDS="gettext tidy-html5 libnotify-dev"
+BUILD_DEPENDS="gettext-dev tidy-html5 libnotify-dev"
 
 compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR VERSION=$VERSION install || return 1
+	make DESTDIR=$install VERSION=$VERSION install || return 1
 
 	# Default icon for mimetype (freedesktop standard compliant file
 	# manager will diplay a tazpkg icon for SliTaz packages).
diff -r ad29ddfee1c9 -r d5aab818505e tazusb/receipt
--- a/tazusb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazusb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tazusb"
 VERSION="199"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz LiveUSB utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="slitaz"
-
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-DEPENDS="lzma"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	make DESTDIR=$DESTDIR VERSION=$VERSION install
+compile_rules() {
+	make DESTDIR=$install VERSION=$VERSION install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-#
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/usr $fs
 	chown -R root.root $fs
+	DEPENDS="lzma"
+	TAGS="slitaz"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazweb/receipt
--- a/tazweb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazweb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,22 +4,21 @@
 VERSION="208"
 CATEGORY="network"
 SHORT_DESC="SliTaz simple, fast and small Web Browser"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="web-browser"
-
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/$PACKAGE/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="glib-dev gtk2-dev libsoup-dev webkitgtk-dev libxslt-dev gettext"
+BUILD_DEPENDS="glib-dev gtk2-dev libsoup-dev webkitgtk-dev libxslt-dev \
+gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make msgfmt && make DESTDIR=$install install
+compile_rules() {
+	make &&
+	make msgfmt &&
+	make DESTDIR=$install install
 }
 
 # Cross compilation check
@@ -27,10 +26,9 @@
 	readelf -h $install/usr/bin/tazweb
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk2 libsoup pango \
 	webkitgtk   gsettings-desktop-schemas"
+	TAGS="web-browser"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tazwikiss/receipt
--- a/tazwikiss/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazwikiss/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,27 +15,21 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="busybox slitaz-base-files"
 SIBLINGS="mirror-tools qemu-box slitaz-dev-tools slitaz-mercurial-style \
 tazchroot tazdev yaff"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR 2>/dev/null
-	cp -a $src/$PACKAGE/rootfs/* $DESTDIR
+compile_rules() {
+	mkdir -p $install
+	cp -a $src/$PACKAGE/rootfs/* $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	chown -R 80.80 $fs/var/www
+	DEPENDS="busybox slitaz-base-files"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	server=busybox
 	# Configure lighttpd server
 	if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then
diff -r ad29ddfee1c9 -r d5aab818505e tazwok/receipt
--- a/tazwok/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tazwok/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,23 +3,16 @@
 PACKAGE="tazwok"
 VERSION="557"
 CATEGORY="base-system"
-SHORT_DESC="SliTaz sources and binaries packages cooker."
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="SliTaz sources and binaries packages cooker"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-TAGS="slitaz"
-SUGGESTED="tazchroot"
-
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tazwok/archive/$VERSION.tar.bz2"
 
-DEPENDS="busybox slitaz-base-files"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/doc/tazwok \
 		$fs/etc/slitaz $fs/usr/share/slitaz/web-bb \
 		$fs/usr/lib/slitaz/chroot-scripts
@@ -37,4 +30,7 @@
 	cp -a $src/chroot-scripts $fs/usr/lib/slitaz/chroot-scripts/tazwok
 	# Build bot for tazwok
 	cp -a $src/examples/tazbb $fs/usr/bin
+	DEPENDS="busybox slitaz-base-files"
+	SUGGESTED="tazchroot"
+	TAGS="slitaz"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tcc/receipt
--- a/tcc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,28 +12,21 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://repo.or.cz/tinycc.git/snapshot/$GITHASH.tar.gz"
 
-BUILD_DEPENDS_arm=" " # Perl is installed in a cross env.
 BUILD_DEPENDS="perl texinfo diffutils"
-SPLIT="tcc-arm tcc-c67 tcc-i386 tcc-x86_64 tcc-win tcc-osx"
+SPLIT="$PACKAGE-arm $PACKAGE-c67 $PACKAGE-i386 $PACKAGE-x86_64 $PACKAGE-win \
+$PACKAGE-osx"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	case "$ARCH" in
-		arm) ARCH_ARGS="--cross-prefix=arm-slitaz-linux-gnueabi- --cpu=armv4l";;
-		*)   ARCH_ARGS="--enable-cross";;
-	esac
-
+compile_rules() {
 	./configure \
 		--prefix=/usr \
-		$ARCH_ARGS &&
-	make && make test &&
-	make DESTDIR=$DESTDIR install
+		--enable-cross \
+		&&
+	make &&
+	make test &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		tcc)
 			copy tcc libtcc.a libtcc1.a libtcc.h /usr/lib/tcc/include/
diff -r ad29ddfee1c9 -r d5aab818505e tcl/receipt
--- a/tcl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.6.8"
 CATEGORY="development"
 SHORT_DESC="The Tool Command Language"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tcl.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tcl.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev"
-SPLIT="tcl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case "$ARCH" in
diff -r ad29ddfee1c9 -r d5aab818505e tcllib/receipt
--- a/tcllib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcllib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tcllib"
 VERSION="1.12"
 CATEGORY="development"
-SHORT_DESC="Tcl-only library of standard routines for Tcl."
+SHORT_DESC="Tcl-only library of standard routines for Tcl"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://sourceforge.net/projects/tcllib/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/tcllib/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="tcl"
 BUILD_DEPENDS="tcl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/* $fs/usr/lib
+	DEPENDS="tcl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tcpcrypt/receipt
--- a/tcpcrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcpcrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="automake libtool libnetfilter_queue-dev \
 libnetfilter_conntrack-dev openssl-dev libpcap-dev libcap-dev"
-SPLIT="tcpcrypt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./bootstrap.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e tcpdump/receipt
--- a/tcpdump/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcpdump/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.9.2"
 CATEGORY="security"
 SHORT_DESC="Powerful command-line packet analyzer"
-MAINTAINER="sdaigl@lacitec.on.ca"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.tcpdump.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e tcpick/receipt
--- a/tcpick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcpick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.1"
 CATEGORY="network"
 SHORT_DESC="TCP stream sniffer and connection tracker"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://tcpick.sourceforge.net/"
@@ -13,17 +13,16 @@
 DEPENDS="libpcap"
 BUILD_DEPENDS="libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/__inline__//' src/*.c
-	./configure --mandir=/usr/share/man && make && make install
+	./configure \
+		--mandir=/usr/share/man \
+		&&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e tcplay/receipt
--- a/tcplay/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcplay/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="cmake libdevmapper-dev libgcrypt-dev util-linux-uuid-dev \
 libdevmapper openssl-dev zlib-dev"
-SPLIT="tcplay libtcplay libtcplay-dev"
+SPLIT="libtcplay libtcplay-dev"
 
 compile_rules() {
 	make -f Makefile.classic || return 1
diff -r ad29ddfee1c9 -r d5aab818505e tcpoverudp/receipt
--- a/tcpoverudp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcpoverudp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="tcpoverudp"
 VERSION="20150601"
 CATEGORY="network"
-SHORT_DESC="Forward TCP connections over UDP without root."
+SHORT_DESC="Forward TCP connections over UDP without root"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="https://www.jankratochvil.net/project/tcpoverudp/"
+
 TARBALL="$PACKAGE"
-WEB_SITE="https://www.jankratochvil.net/project/tcpoverudp/"
 WGET_URL="http://git.jankratochvil.net/?p=tcpoverudp.git;a=blob_plain;f=tcpoverudp;hb=HEAD"
 
-DEPENDS="perl"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE $fs/usr/bin
 	chmod +x $fs/usr/bin/$PACKAGE
+	DEPENDS="perl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tcpreplay/receipt
--- a/tcpreplay/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcpreplay/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tcptrack/receipt
--- a/tcptrack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcptrack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="tcptrack"
 VERSION="1.4.2"
 CATEGORY="network"
-SHORT_DESC="TCP connection tracker."
+SHORT_DESC="TCP connection tracker"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2.1"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/tcptrack"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://freecode.com/projects/tcptrack"
 WGET_URL="http://pkgs.fedoraproject.org/repo/pkgs/tcptrack/$TARBALL/dacf71a6b5310caf1203a2171b598610/$TARBALL"
 
-DEPENDS="ncurses libpcap"
 BUILD_DEPENDS="ncurses-dev libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/_BSD_SOURCE/_DEFAULT_SOURCE/' src/*
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses libpcap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tcsh/receipt
--- a/tcsh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tcsh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,37 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tcsh"
 VERSION="6.18.01"
 CATEGORY="system-tools"
-SHORT_DESC="Enhanced, compatible Berkeley UNIX C shell."
-MAINTAINER="samuel_trassare@yahoo.com"
+SHORT_DESC="Enhanced, compatible Berkeley UNIX C shell"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.tsch.org/Welcome"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.astron.com/pub/$PACKAGE/$TARBALL"
-#The following build dep will be necessary when glibc ups to 2.14.
-#BUILD_DEPENDS="libtirpc"
 
-DEPENDS="ncurses"
+#The following build dep will be necessary when glibc up to 2.14: libtirpc
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/(__ANDROID__)/& \&\& !defined(__GLIBC__)/' sh.proc.c
-	mkdir -p $DESTDIR/usr/bin
-	touch $DESTDIR/usr/bin/tcsh
-	./configure $CONFIGURE_ARGS && 
-	make && 
-	make install &&
-	rm -f $DESTDIR/usr/bin/tcsh.old
+	mkdir -p $install/usr/bin
+	touch $install/usr/bin/tcsh
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
+
+	rm -f $install/usr/bin/tcsh.old
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin \
-		$fs/usr/share
-	cp -a $install/usr/bin/tcsh $fs/usr/bin
-	cp -ar $install/usr/share/locale $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tea/receipt
--- a/tea/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tea/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,31 +4,29 @@
 VERSION="44.1.0"
 VERSION_GIT="6b7a750"
 CATEGORY="development"
-SHORT_DESC="Tead text editor using QT."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Tead text editor using Qt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://semiletov.org/tea/"
 WEB_SITE_OLD="http://tea-editor.sourceforge.net/"
+
+TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/psemiletov/tea-qt/archive/$VERSION_GIT.tar.gz"
-TAGS="text-editor"
 
-DEPENDS="xorg-libX11 qt5-base qt5-declarative"
 BUILD_DEPENDS="qt5-dev xorg-dev mesa-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/usr/local|/usr|g' src.pro
-	qmake PREFIX=/usr && make
-	make INSTALL_ROOT="$DESTDIR" install
+	qmake PREFIX=/usr &&
+	make &&
+	make INSTALL_ROOT="$install" install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/pixmaps
 	cp -a $src/bin/tea $fs/usr/bin
 	cp -a $src/icons/tea_icon_v2.png \
 		$fs/usr/share/pixmaps/tea.png
+	DEPENDS="xorg-libX11 qt5-base qt5-declarative"
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e telegram/receipt
--- a/telegram/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/telegram/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="telegram"
-GITHASH="1dad2e89933085ea1e3d9fb1becb1907ce5de55f"
-VERSION="${GITHASH:0:7}"
+GITHASH="1dad2e8"
+VERSION="$GITHASH"
 CATEGORY="network"
 SHORT_DESC="Telegram messenger CLI"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/vysheng/tg"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/vysheng/tg"
 WGET_URL="$WEB_SITE/archive/$GITHASH.tar.gz"
 
-DEPENDS="libconfig libedit ncurses openssl"
 BUILD_DEPENDS="wget libconfig-dev lua-dev readline-dev openssl-dev libedit \
 zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/telegram $fs/usr/bin
+	DEPENDS="libconfig libedit ncurses openssl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e telepathy-glib/receipt
--- a/telepathy-glib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/telepathy-glib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,13 +13,13 @@
 
 BUILD_DEPENDS="glib-dev gobject-introspection-dev \
 dbus-dev dbus-glib-dev intltool diffutils libffi libxslt gtk-doc"
-SPLIT="telepathy-glib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e terminator/receipt
--- a/terminator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/terminator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,23 @@
 PACKAGE="terminator"
 VERSION="0.96"
 CATEGORY="x-window"
-SHORT_DESC="Tool for arranging terminals."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Tool for arranging terminals"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://launchpad.net/terminator/"
+
 TARBALL="${PACKAGE}_$VERSION.tar.gz"
-WEB_SITE="https://launchpad.net/terminator/"
 WGET_URL="https://launchpad.net/terminator/trunk/$VERSION/+download/$TARBALL"
 
-DEPENDS="python python-pygtk notify-python"
-BUILD_DEPENDS="python-dev gettext intltool"
+BUILD_DEPENDS="python-dev gettext-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR 2>&1 | grep -v "GTK icon cache"
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
+	DEPENDS="python python-pygtk notify-python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e terminology/receipt
--- a/terminology/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/terminology/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,15 +3,15 @@
 PACKAGE="terminology"
 VERSION="1.2.0"
 CATEGORY="base-system"
-SHORT_DESC="Terminology is a terminal emulator with innovative features"
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Terminal emulator with innovative features"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://www.enlightenment.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://download.enlightenment.org/rel/apps/terminology/$TARBALL"
 
-BUILD_DEPENDS="meson ninja gettext intltool efl-dev curl-dev"
+BUILD_DEPENDS="meson ninja gettext-dev intltool efl-dev curl-dev"
 
 COOKOPTS="skip-log-errors"
 
diff -r ad29ddfee1c9 -r d5aab818505e tesseract-data/receipt
--- a/tesseract-data/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tesseract-data/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,17 +14,23 @@
 WGET_URL="https://github.com/tesseract-ocr/tessdata/archive/$VERSION.tar.gz"
 
 t='tesseract'
-SPLIT="$t-afr $t-amh $t-ara $t-asm $t-aze $t-aze_cyrl $t-bel $t-ben $t-bod \
-$t-bos $t-bul $t-cat $t-ceb $t-ces $t-chi_sim $t-chi_tra $t-chr $t-cym $t-dan \
-$t-dan_frak $t-deu $t-deu_frak $t-dzo $t-ell $t-eng $t-enm $t-epo $t-equ \
-$t-est $t-eus $t-fas $t-fin $t-fra $t-frk $t-frm $t-gle $t-glg $t-grc $t-guj \
-$t-hat $t-heb $t-hin $t-hrv $t-hun $t-iku $t-ind $t-isl $t-ita $t-ita_old \
-$t-jav $t-jpn $t-kan $t-kat $t-kat_old $t-kaz $t-khm $t-kir $t-kor $t-kur \
-$t-lao $t-lat $t-lav $t-lit $t-mal $t-mar $t-mkd $t-mlt $t-msa $t-mya $t-nep \
-$t-nld $t-nor $t-ori $t-osd $t-pan $t-pol $t-por $t-pus $t-ron $t-rus $t-san \
-$t-sin $t-slk $t-slk_frak $t-slv $t-spa $t-spa_old $t-sqi $t-srp $t-srp_latn \
-$t-swa $t-swe $t-syr $t-tam $t-tel $t-tgk $t-tgl $t-tha $t-tir $t-tur $t-uig \
-$t-ukr $t-urd $t-uzb $t-uzb_cyrl $t-vie $t-yid"
+SPLIT="\
+$t-afr      $t-amh     $t-ara     $t-asm $t-aze     $t-aze_cyrl $t-bel \
+$t-ben      $t-bod     $t-bos     $t-bul $t-cat     $t-ceb      $t-ces \
+$t-chi_sim  $t-chi_tra $t-chr     $t-cym $t-dan     $t-dan_frak $t-deu \
+$t-deu_frak $t-dzo     $t-ell     $t-eng $t-enm     $t-epo      $t-equ \
+$t-est      $t-eus     $t-fas     $t-fin $t-fra     $t-frk      $t-frm \
+$t-gle      $t-glg     $t-grc     $t-guj $t-hat     $t-heb      $t-hin \
+$t-hrv      $t-hun     $t-iku     $t-ind $t-isl     $t-ita      $t-ita_old \
+$t-jav      $t-jpn     $t-kan     $t-kat $t-kat_old $t-kaz      $t-khm \
+$t-kir      $t-kor     $t-kur     $t-lao $t-lat     $t-lav      $t-lit \
+$t-mal      $t-mar     $t-mkd     $t-mlt $t-msa     $t-mya      $t-nep \
+$t-nld      $t-nor     $t-ori     $t-osd $t-pan     $t-pol      $t-por \
+$t-pus      $t-ron     $t-rus     $t-san $t-sin     $t-slk      $t-slk_frak \
+$t-slv      $t-spa     $t-spa_old $t-sqi $t-srp     $t-srp_latn $t-swa \
+$t-swe      $t-syr     $t-tam     $t-tel $t-tgk     $t-tgl      $t-tha \
+$t-tir      $t-tur     $t-uig     $t-ukr $t-urd     $t-uzb      $t-uzb_cyrl \
+$t-vie      $t-yid"
 
 compile_rules() {
 	mkdir -p $install/usr/share/tessdata/
diff -r ad29ddfee1c9 -r d5aab818505e testdisk/receipt
--- a/testdisk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/testdisk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,32 @@
 PACKAGE="testdisk"
 VERSION="7.0"
 CATEGORY="system-tools"
-SHORT_DESC="Data recovery tools (testdisk + photorec)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Data recovery tools (testdisk + photorec)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.cgsecurity.org/wiki/TestDisk"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://www.cgsecurity.org/wiki/TestDisk"
 WGET_URL="https://www.cgsecurity.org/$TARBALL"
-TAGS="recovery rescue"
 
-DEPENDS="e2fsprogs ncurses jpeg krb5 zlib libcomerr3 ntfsprogs ntfs-3g"
 BUILD_DEPENDS="e2fsprogs-dev ncurses-dev jpeg-dev ntfsprogs-dev ntfs-3g-dev"
-SUGGESTED="btrfs-progs e2fsprogs f2fs-tools dosfstools mtools hfsutils \
-hfsprogs jfsutils util-linux lvm2 nilfs-utils ntfsprogs reiser4progs \
-reiserfsprogs xfsprogs"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/COLOR_RED/COLOR_YELLOW/' src/intrfn.c
-	./configure --with-ntfs3g $CONFIGURE_ARGS &&
-	make && make install
+
+	./configure \
+		--with-ntfs3g \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="e2fsprogs ncurses jpeg krb5 zlib libcomerr3 ntfsprogs ntfs-3g"
+	SUGGESTED="btrfs-progs e2fsprogs f2fs-tools dosfstools mtools hfsutils \
+	hfsprogs jfsutils util-linux lvm2 nilfs-utils ntfsprogs reiser4progs \
+	reiserfsprogs xfsprogs"
+	TAGS="recovery rescue"
 }
diff -r ad29ddfee1c9 -r d5aab818505e texi2html/receipt
--- a/texi2html/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/texi2html/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.82"
 CATEGORY="utilities"
 SHORT_DESC="Converts texinfo documents to HTML"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nongnu.org/texi2html/"
 
diff -r ad29ddfee1c9 -r d5aab818505e texinfo/receipt
--- a/texinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/texinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6.5"
 CATEGORY="development"
 SHORT_DESC="GNU documentation tools"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/texinfo/"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/texinfo.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="perl-dev ncurses-dev gettext"
+BUILD_DEPENDS="perl-dev ncurses-dev gettext-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e texmacs-windows-fonts/receipt
--- a/texmacs-windows-fonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/texmacs-windows-fonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.0"
 CATEGORY="office"
 SHORT_DESC="Fonts for using TeXmacs without TeX"
-MAINTAINER="slitaz@leledy.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LPPL"
-WEB_SITE="http://www.texmacs.org/"
+WEB_SITE="http://www.texmacs.org/tmweb/home/welcome.en.html"
 
 TARBALL="TeXmacs-windows-fonts-$VERSION-noarch.tar.gz"
 WGET_URL="ftp://ftp.texmacs.org/pub/TeXmacs/fonts/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e texmacs/receipt
--- a/texmacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/texmacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.0.7.18"
 CATEGORY="office"
 SHORT_DESC="The high quality of TeX with a WYSIWYG editor"
-MAINTAINER="slitaz@leledy.fr"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-WEB_SITE="http://www.texmacs.org/"
+WEB_SITE="http://www.texmacs.org/tmweb/home/welcome.en.html"
 
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="ftp://ftp.texmacs.org/pub/$PACKAGE/targz/$TARBALL"
@@ -23,7 +23,7 @@
 		--libexecdir=/usr/lib \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e thermald/receipt
--- a/thermald/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thermald/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./autogen.sh
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e thttpd/receipt
--- a/thttpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thttpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,37 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="thttpd"
 VERSION="2.25b"
 CATEGORY="network"
 SHORT_DESC="Throttleable lightweight httpd server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.acme.com/software/thttpd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.acme.com/software/thttpd/"
 WGET_URL="http://www.acme.com/software/thttpd/$TARBALL"
 
-DEPENDS=""
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make || return 1
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make
+	install -Dm755 thttpd              $install/usr/sbin/thttpd
+	install -Dm755 extras/htpasswd     $install/usr/sbin/htpasswd
+	install -Dm755 extras/syslogtocern $install/usr/sbin/syslogcern
+
+	install -Dm644 $stuff/etc/init.d/thttpd      $install/etc/init.d/thttpd
+	install -Dm644 $stuff/etc/thttpd/thttpd.conf $install/etc/thttpd/thttpd.conf
+
+	mkdir -p $install/var/log/thttpd
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/sbin \
-		$fs/var/log/thttpd \
-		
-	cp -a $src/thttpd $fs/usr/sbin
-	cp -a $src/extras/htpasswd $fs/usr/sbin
-	cp -a $src/extras/syslogtocern $fs/usr/sbin
-	cp -a stuff/etc $fs/
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e thunar-archive-plugin/receipt
--- a/thunar-archive-plugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunar-archive-plugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.3.0"
 CATEGORY="x-window"
 SHORT_DESC="Thunar Archive Manager plugin"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
 
diff -r ad29ddfee1c9 -r d5aab818505e thunar-vfs/receipt
--- a/thunar-vfs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunar-vfs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.0"
 CATEGORY="x-window"
 SHORT_DESC="Thunar File Manager Libraries"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev libxfce4util-dev dbus-dev \
 startup-notification-dev xfce4-panel-dev zlib-dev intltool exo-dev \
 dbus-glib-dev util-linux-uuid-dev hal-dev xorg-xcb-util-dev"
-SPLIT="thunar-vfs-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -22,10 +22,10 @@
 		--enable-startup-notification \
 		--disable-gnome-thumbnailers \
 		--enable-debug=no \
-		$CONFIGURE_ARGS && \
+		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e thunar-volman/receipt
--- a/thunar-volman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunar-volman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.8.1" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Thunar volume manager plugin"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e thunar/receipt
--- a/thunar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.6" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Thunar file manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev exo-dev libxfce4ui-dev \
 libgudev-dev libnotify-dev libexif-dev xfce4-panel-dev eudev-dev \
 xorg-libSM-dev startup-notification-dev xorg-xcb-util-dev"
-SPLIT="thunar-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e thunderbird-langpack/receipt
--- a/thunderbird-langpack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunderbird-langpack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,10 +10,11 @@
 HOST_ARCH="any"
 REPOLOGY="-"
 
-SPLIT="$PACKAGE-cs $PACKAGE-da $PACKAGE-de $PACKAGE-el $PACKAGE-en_GB \
-$PACKAGE-en_US $PACKAGE-es_AR $PACKAGE-es_ES $PACKAGE-fr $PACKAGE-hu \
-$PACKAGE-id $PACKAGE-it $PACKAGE-pl $PACKAGE-pt_BR $PACKAGE-pt_PT $PACKAGE-ru \
-$PACKAGE-sl $PACKAGE-sv_SE $PACKAGE-zh_CN $PACKAGE-zh_TW"
+SPLIT="\
+$PACKAGE-cs    $PACKAGE-da    $PACKAGE-de    $PACKAGE-el    $PACKAGE-en_GB \
+$PACKAGE-en_US $PACKAGE-es_AR $PACKAGE-es_ES $PACKAGE-fr    $PACKAGE-hu \
+$PACKAGE-id    $PACKAGE-it    $PACKAGE-pl    $PACKAGE-pt_BR $PACKAGE-pt_PT \
+$PACKAGE-ru    $PACKAGE-sl    $PACKAGE-sv_SE $PACKAGE-zh_CN $PACKAGE-zh_TW"
 COOKOPTS="!strip" # waste of time to search, nothing to strip
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e thunderbird/receipt
--- a/thunderbird/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/thunderbird/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,25 @@
 PACKAGE="thunderbird"
 VERSION="17.0.11esr"
 CATEGORY="network"
-SHORT_DESC="Mozilla's Thunderbird email application."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Mozilla's Thunderbird email application"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
 TARBALL="$PACKAGE-$VERSION.source.tar.bz2"
 WEB_SITE="http://www.mozilla.org/"
 WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$TARBALL"
 
-DEPENDS="alsa-lib gtk2 zip unzip libevent libvpx nspr nss sqlite3 \
-dbus dbus-glib glib libnotify libfirefox"
 BUILD_DEPENDS="alsa-lib-dev gtk2-dev bzip2 zip unzip coreutils \
 libevent-dev libvpx-dev nspr-dev nss-dev yasm sqlite3-dev \
-dbus-dev dbus-glib-dev libnotify-dev freetype fontconfig tar gzip mesa-dev"
-TAGS="email pop imap smtp"
+dbus-dev dbus-glib-dev libnotify-dev freetype fontconfig tar gzip mesa-dev \
+libjpeg-turbo-dev"
 
-# Rules to configure and make the package.
 # WARNING: 1GB RAM minimum. Additional RAM will significantly decrease
 # build time.
 # At least 2.5 GB free disk space
 
-
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	# load mozconfig
-    cp -a $stuff/mozconfig $src
+	cp -a $stuff/mozconfig $src
 
 	# fix path of 'check_debug_ranges.py'
 	ln -s $src/mozilla/build/autoconf/check_debug_ranges.py \
@@ -47,7 +41,7 @@
 	fn2="$tarpath/thunderbird-${VERSION%esr}.en-US.linux-$(uname -m).tar.bz2"
 	[ -e "$fn1" ] && tarball="$fn1" && echo "$ARCH tarball found"
 	[ -e "$fn2" ] && tarball="$fn2" && echo "$(uname -m) tarball found"
-	[ -z "$tarball" ] && echo "ERROR: tarball not found" && exit 1
+	[ -z "$tarball" ] && echo "ERROR: tarball not found" && return 1
 	# extract tarball
 	mkdir -p $install/usr/lib/thunderbird-$VERSION &&
 	tar -xvf $tarball -C $install/usr/lib/thunderbird-$VERSION \
@@ -57,9 +51,7 @@
 	ln -sf ../lib/thunderbird-$VERSION/thunderbird $install/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	# program
 	printf "Installing program.."
 	mkdir -p $fs/usr/lib &&
@@ -128,4 +120,8 @@
 	ln -sf ../mozilla-common-$VERSION/libmozalloc.so \
 		$fs/usr/lib/$PACKAGE-$VERSION/libmozalloc.so
 	status
+
+	DEPENDS="alsa-lib gtk2 zip unzip libevent libvpx nspr nss sqlite3 \
+	dbus dbus-glib glib libnotify libfirefox"
+	TAGS="email pop imap smtp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tidy-html5/receipt
--- a/tidy-html5/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tidy-html5/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/htacg/tidy-html5/releases/download/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="cmake libxslt"
-SPLIT="tidy-html5-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd build/cmake
diff -r ad29ddfee1c9 -r d5aab818505e tidy/receipt
--- a/tidy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tidy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://anduin.linuxfromscratch.org/sources/BLFS/svn/t/$TARBALL"
 
-SPLIT="tidy-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e tiff/receipt
--- a/tiff/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tiff/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.0.9"
 CATEGORY="graphics"
 SHORT_DESC="TIFF images"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.libtiff.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/libtiff.html"
@@ -14,7 +14,8 @@
 
 BUILD_DEPENDS="cmake ninja zlib-dev libjpeg-turbo-dev xz-dev \
 mesa-dev glu-dev freeglut-dev"
-SPLIT="tiff tiff-apps tiff-dev tiff-gl:gl tiff-gl-apps:gl tiff-gl-dev:gl"
+SPLIT="$PACKAGE-apps $PACKAGE-dev $PACKAGE-gl:gl $PACKAGE-gl-apps:gl \
+$PACKAGE-gl-dev:gl"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e tig/receipt
--- a/tig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tightvnc/receipt
--- a/tightvnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tightvnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="tightvnc"
 VERSION="1.3.10"
 CATEGORY="x-window"
-SHORT_DESC="VNC server (graphical remote control)."
+SHORT_DESC="VNC server (graphical remote control)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-${VERSION}_unixsrc.tar.bz2"
@@ -14,11 +14,9 @@
 xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev xorg-libXdmcp-dev \
 xorg-libXmu-dev xorg-xorgproto \
 xorg-xauth jpeg-dev zlib-dev xorg-libXrandr-dev"
-SPLIT="tightvnc tightvnc-extra tightvnc-java tightvnc-viewer"
+SPLIT="$PACKAGE-extra $PACKAGE-java $PACKAGE-viewer"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	[ -d vnc_unixsrc ] && mv vnc_unixsrc $src
 	cd $src
 	sed -i	-e "s| FONTDIR =.*$| FONTDIR = /usr/share/fonts/X11|" \
@@ -29,25 +27,23 @@
 	cd Xvnc &&
 	./configure --prefix=/usr $CONFIGURE_ARGS || return 1
 	  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
-  	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
+	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
 	find -name Makefile | xargs sed -i 's|/usr/X11R6/bin|/usr/bin|g'
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 	cd .. &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	tightvnc)
-		TAGS="remote-desktop vnc"
-		DEPENDS="xorg-base-fonts jpeg zlib"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/Xvnc $fs/usr/bin
-		cp $src/vncpasswd/vncpasswd $fs/usr/bin
-		cat > $fs/usr/bin/startvnc <<EOM
+		tightvnc)
+			TAGS="remote-desktop vnc"
+			DEPENDS="xorg-base-fonts jpeg zlib"
+			mkdir -p $fs/usr/bin
+			cp -a $install/usr/bin/Xvnc $fs/usr/bin
+			cp $src/vncpasswd/vncpasswd $fs/usr/bin
+			cat > $fs/usr/bin/startvnc <<EOM
 #!/bin/sh
 
 case "\$1" in
@@ -58,41 +54,41 @@
 EOT
 	exit 1
 esac
-	
+
 . \$HOME/.config/slitaz/applications.conf
 Xvnc -ac -geometry \${2:-1920x1024} -depth \${3:-24} :\${1:-1} &
 export DISPLAY=:\${1:-1}
 exec \$WINDOW_MANAGER
 EOM
-		chmod +x $fs/usr/bin/startvnc
-		;;
-	tightvnc-extra)
-		CAT="x-window|VNC extra tools."
-		TAGS="vnc"
-		DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
+			chmod +x $fs/usr/bin/startvnc
+			;;
+		tightvnc-extra)
+			CAT="x-window|extra tools"
+			TAGS="vnc"
+			DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
 			xorg-libXext"
-		mkdir -p $fs/usr/bin $fs/etc
-		cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
-		cp $src/tightvncserver.conf $fs/etc
-		cat >> $fs/etc/tightvncserver.conf << 'EOF'
+			mkdir -p $fs/usr/bin $fs/etc
+			cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
+			cp $src/tightvncserver.conf $fs/etc
+			cat >> $fs/etc/tightvncserver.conf << 'EOF'
 $vncClasses = "/usr/share/vnc/classes";
 $fontPath = "/usr/share/fonts/X11/misc/";
 EOF
-		;;
-	tightvnc-java)
-		CAT="x-window|VNC Java client."
-		DEPENDS="tightvnc"
-		mkdir -p $fs/usr/share/vnc 
-		cp -pa $src/classes $fs/usr/share/vnc
-		;;
-	tightvnc-viewer)
-		CAT="x-window|VNC client for X."
-		TAGS="vnc remote-desktop"
-		DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
+			;;
+		tightvnc-java)
+			CAT="x-window|Java client"
+			DEPENDS="tightvnc"
+			mkdir -p $fs/usr/share/vnc
+			cp -pa $src/classes $fs/usr/share/vnc
+			;;
+		tightvnc-viewer)
+			CAT="x-window|X client"
+			TAGS="vnc remote-desktop"
+			DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
 			xorg-libXext xorg-libXp xorg-libXpm xorg-libICE \
 			xorg-libSM xorg-libXt xorg-libXmu xorg-libXaw"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/vncviewer $fs/usr/bin
-		;;
+			mkdir -p $fs/usr/bin
+			cp -a $install/usr/bin/vncviewer $fs/usr/bin
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e tilda/receipt
--- a/tilda/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tilda/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="tilda"
 VERSION="1.4.1"
 CATEGORY="utilities"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="Linux terminal based on classic terminals from first person \
 shooter games"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/lanoxx/tilda/archive/$TARBALL"
 
-BUILD_DEPENDS="automake gettext gtk3-dev vte-dev libconfuse"
+BUILD_DEPENDS="automake gettext-dev gtk3-dev vte-dev libconfuse"
 
 compile_rules() {
 	./autogen.sh \
diff -r ad29ddfee1c9 -r d5aab818505e timidity++/receipt
--- a/timidity++/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/timidity++/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="timidity++"
 VERSION="2.14.0"
 CATEGORY="multimedia"
-SHORT_DESC="TiMidity++ is an open source MIDI to WAVE converter and player"
+SHORT_DESC="MIDI to WAVE converter and player"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://timidity.sourceforge.net/"
@@ -22,7 +22,7 @@
 		--with-default-path=/etc/timidity++/ \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/timidity.cfg $install/etc/timidity++/timidity.cfg
 }
diff -r ad29ddfee1c9 -r d5aab818505e tinc/receipt
--- a/tinc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tinc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/* $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e tint2/receipt
--- a/tint2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tint2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="16.4"
 CATEGORY="x-window"
 SHORT_DESC="Lightweight panel/taskbar for Linux"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://gitlab.com/o9000/tint2"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="cmake xorg-libX11-dev xorg-libXcomposite-dev \
 xorg-libXdamage-dev xorg-libXinerama-dev xorg-libXext-dev xorg-libXrender-dev \
 xorg-libXrandr-dev pango-dev imlib2-dev librsvg-dev startup-notification-dev \
-gtk2-dev gettext"
+gtk2-dev gettext-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e tintin++/receipt
--- a/tintin++/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tintin++/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="2.00.9"
 CATEGORY="games"
 SHORT_DESC="Terminal-based MUD client"
-MAINTAINER="samuel_trassare@yahoo.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://tintin.sourceforge.net"
+WEB_SITE="http://tintin.sourceforge.net/"
 
 TARBALL="tintin-$VERSION.tar.gz"
 WGET_URL="http://sourceforge.net/projects/tintin/files/TinTin%2B%2B%20Source%20Code/$VERSION/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e tinycm/receipt
--- a/tinycm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tinycm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,10 +1,10 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tinycm"
 VERSION="74"
 CATEGORY="network"
-SHORT_DESC="Small and elegent CGI content manager."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Small and elegent CGI content manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,17 +12,14 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/tinycm/archive/$VERSION.tar.bz2"
 
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$install install
+compile_rules() {
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs
 	cp -a $install/* $fs
 	cd $fs/var/www
diff -r ad29ddfee1c9 -r d5aab818505e tinycompress/receipt
--- a/tinycompress/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tinycompress/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="ftp://ftp.alsa-project.org/pub/tinycompress/$TARBALL"
 
-SPLIT="tinycompress-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e tinyproxy/receipt
--- a/tinyproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tinyproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.8.3"
 CATEGORY="network"
 SHORT_DESC="A light-weight HTTP proxy daemon for POSIX operating systems"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://banu.com/tinyproxy/"
 
@@ -16,7 +16,7 @@
 		--sysconfdir=/etc/tinyproxy \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Provide sane defaults
 	sed -i '/^#Listen/a\Listen 127.0.0.1' $install/etc/tinyproxy/tinyproxy.conf
diff -r ad29ddfee1c9 -r d5aab818505e tinypy/receipt
--- a/tinypy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tinypy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1"
 CATEGORY="development"
 SHORT_DESC="A minimalist implementation of Python"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.tinypy.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="python-dev"
 
 compile_rules() {
-	python setup.py linux &&
+	python -B setup.py linux &&
 	install -Dm755 $src/build/tinypy $install/usr/bin/tinypy
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e tiptop/receipt
--- a/tiptop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tiptop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,42 +3,37 @@
 PACKAGE="tiptop"
 VERSION="2.2"
 CATEGORY="utilities"
-SHORT_DESC="Tiptop is a performance monitoring tool for Linux."
+SHORT_DESC="Performance monitoring tool for Linux"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://tiptop.gforge.inria.fr/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tiptop.gforge.inria.fr/"
 WGET_URL="http://tiptop.gforge.inria.fr/releases/$TARBALL"
 
-DEPENDS="ncurses libxml2"
 BUILD_DEPENDS="ncurses-dev libxml2-dev bison flex m4"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr
-	make
+compile_rules() {
+	./configure --prefix=/usr &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/skel
 	cp -a $install/usr/bin $fs/usr
 	cp -a $src/tiptoprc $fs/etc/skel/.tiptoprc
+	DEPENDS="ncurses libxml2"
 }
 
-post_install()
-{
-	for i in $(ls "$1/home" 2> /dev/null); do
+post_install() {
+	for i in $(ls "$1/home" 2>/dev/null); do
 		[ -f "$1/home/$i/.tiptoprc" ] && continue
 		cp "$1/etc/skel/.tiptoprc" "$1/home/$i"
 		chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.tiptoprc"
 	done
 }
 
-post_remove()
-{
+post_remove() {
 	rm -f "$1"/home/*/.tiptoprc
 }
diff -r ad29ddfee1c9 -r d5aab818505e tix/receipt
--- a/tix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,33 @@
 # SliTaz package receipt.
 
 PACKAGE="tix"
-SOURCE="Tix"
 VERSION="8.4.3"
 CATEGORY="development"
-SHORT_DESC="Tk Interface eXtension."
+SHORT_DESC="Tk Interface eXtension"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://tix.sourceforge.net/"
+
+SOURCE="Tix"
 TARBALL="$SOURCE$VERSION-src.tar.gz"
-WEB_SITE="http://tix.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="tcl xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
 BUILD_DEPENDS="tcl-dev tk-dev xorg-dev"
 
-# Rules to configure and make the package.
-#
-compile_rules()
-{
+compile_rules() {
 	# tcl 8.6 support
 	sed -i 's|#include.*tcl\.h.*|#define USE_INTERP_RESULT 1\n&|' \
 		generic/tix.h generic/tixPort.h generic/tixUtils.c \
 		PyTix-2.0/2.0/_tkinter.c PyTix-2.0/2.0/tkappinit.c
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="tcl xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libxcb"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tk/receipt
--- a/tk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="8.6.8"
 CATEGORY="development"
 SHORT_DESC="The TCL GUI toolkit"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://tcl.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tk.html"
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/tcl/$TARBALL"
 
 BUILD_DEPENDS="tcl-dev xorg-libX11-dev"
-SPLIT="tk-demos tk tk-dev"
+SPLIT="$PACKAGE-demos $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
@@ -41,7 +41,7 @@
 		tk-demos)
 			copy demos/
 			CAT="development|demo applications"
-			DEPENDS=""
+			DEPENDS=" "
 			;;
 		tk)
 			copy @std @rm
diff -r ad29ddfee1c9 -r d5aab818505e tklauncher/receipt
--- a/tklauncher/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tklauncher/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.32"
 CATEGORY="x-window"
 SHORT_DESC="TkLauncher desktop launcher"
-MAINTAINER="pasquale_frega@tiscali.it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://web.tiscali.it/pas80/tklauncher.htm"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://web.tiscali.it/pas80/$TARBALL"
 
 BUILD_DEPENDS="tcl-dev tk-dev libtkimg-dev tcl2c tcl2c-fork"
-SPLIT="tklauncher-alt:alt"
+SPLIT="$PACKAGE-alt:alt"
 
 compile_rules() {
 	case $SET in
diff -r ad29ddfee1c9 -r d5aab818505e tls/receipt
--- a/tls/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tls/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.7"
 CATEGORY="network"
 SHORT_DESC="OpenSSL Tcl extension"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://tls.sourceforge.net/"
 
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="openssl10-dev tcl-dev"
-SPLIT="tls-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/include$|/include/openssl-1.0|' ./configure
@@ -22,7 +22,7 @@
 		--disable-symboles \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tmux-mem-cpu-load/receipt
--- a/tmux-mem-cpu-load/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tmux-mem-cpu-load/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,41 +3,40 @@
 PACKAGE="tmux-mem-cpu-load"
 VERSION="2.2.1"
 CATEGORY="utilities"
-SHORT_DESC="CPU, RAM memory, and load monitor for use with tmux."
+SHORT_DESC="CPU, RAM memory, and load monitor for use with tmux"
 MAINTAINER="paul@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="https://github.com/thewtex/tmux-mem-cpu-load"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/thewtex/tmux-mem-cpu-load"
 WGET_URL="git|git://github.com/thewtex/tmux-mem-cpu-load"
 
-DEPENDS="tmux"
 BUILD_DEPENDS="cmake python bzip2 git"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	cmake . -DCMAKE_INSTALL_PREFIX=/usr
-	make && make install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/skel
 	cp -a $install/usr/bin $fs/usr
-	cat >> $fs/etc/skel/.tmux.conf << EOT
+	cat >> $fs/etc/skel/.tmux.conf <<EOT
 # tmux-mem-cpu-load
 set -g status-interval 2
 set -g status-right "#[fg=black,bg=green]#(tmux-mem-cpu-load 2)#[default]"
 EOT
+	DEPENDS="tmux"
 }
 
-post_install()
-{
-	for i in $(ls "$1/home" 2> /dev/null); do
+post_install() {
+	for i in $(ls "$1/home" 2>/dev/null); do
 		grep -qs "tmux-mem-cpu-load" "$1/home/$i/.tmux.conf" && continue
-		echo -n "Checking for .tmux.conf for $i ..."
+
+		action "Checking for .tmux.conf for $i..."
 		cp -a "$1/etc/skel/.tmux.conf" "$1/home/$i/"
 		chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.tmux.conf"
 		status
diff -r ad29ddfee1c9 -r d5aab818505e tmux/receipt
--- a/tmux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tmux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,26 @@
 PACKAGE="tmux"
 VERSION="2.0"
 CATEGORY="utilities"
-SHORT_DESC="Terminal multiplexer."
+SHORT_DESC="Terminal multiplexer"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://github.com/tmux/tmux/wiki"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/tmux/tmux/wiki"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="ncurses libevent"
 BUILD_DEPENDS="ncurses-dev libevent-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make PREFIX=/usr &&
-	make PREFIX=/usr install &&
-	install -d m755 "$DESTDIR/usr/share/tmux/" &&
-	install -m 644 examples/* "$DESTDIR/usr/share/tmux/"
+	make PREFIX=/usr install || return 1
+
+	install -dm755 $install/usr/share/tmux/
+	install -m644 examples/* $install/usr/share/tmux/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/terminfo/s/
 	cp -a $install/usr/bin $fs/usr
 
@@ -37,5 +34,5 @@
 	cp -a $src/ncurses-extra/usr/share/terminfo/s/screen \
 	$fs/usr/share/terminfo/s/
 	rm -r $src/ncurses-extra
+	DEPENDS="ncurses libevent"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e tokyocabinet/receipt
--- a/tokyocabinet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tokyocabinet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,17 +9,17 @@
 WEB_SITE="https://sourceforge.net/projects/tokyocabinet/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="bzip2-dev zlib-dev"
-SPLIT="tokyocabinet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--enable-off64 \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tor-arm/receipt
--- a/tor-arm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tor-arm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tor-arm"
 VERSION="1.4.5.0"
 CATEGORY="network"
-SHORT_DESC="Terminal status monitor for Tor."
+SHORT_DESC="Terminal status monitor for Tor"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
-SOURCE="arm"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://www.atagar.com/arm/download.php"
-WGET_URL="http://www.atagar.com/arm/resources/static/$TARBALL"
+WEB_SITE="https://nyx.torproject.org/"
 
-DEPENDS="python"
-BUILD_DEPENDS="python python-dev"
+TARBALL="arm-$VERSION.tar.bz2"
+WGET_URL="http://www.atagar.com/arm/resources/static/$TARBALL" # FIXME
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+BUILD_DEPENDS="python-dev"
+
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	# remove stuff
-	rm -rf $fs/usr/share/man
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tor/.icon.png
Binary file tor/.icon.png has changed
diff -r ad29ddfee1c9 -r d5aab818505e tor/receipt
--- a/tor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.3.3.10"
 CATEGORY="network"
 SHORT_DESC="An anonymizing overlay network for TCP"
-MAINTAINER="0dddba11@googlemail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.torproject.org/"
+WEB_SITE="https://www.torproject.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://www.torproject.org/dist/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e totem-pl-parser/receipt
--- a/totem-pl-parser/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/totem-pl-parser/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="meson ninja glib-dev libxml2-dev libsoup-dev gmime3-dev \
-libquvi-dev libarchive-dev libgcrypt-dev gobject-introspection-dev gettext"
-SPLIT="totem-pl-parser-dev"
+libquvi-dev libarchive-dev libgcrypt-dev gobject-introspection-dev gettext-dev"
+SPLIT="PACKAGE-dev"
 
 compile_rules() {
 	meson-wrapper build --default-library shared &&
diff -r ad29ddfee1c9 -r d5aab818505e tp_smapi/receipt
--- a/tp_smapi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tp_smapi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.42"
 CATEGORY="base-system"
 SHORT_DESC="IBM ThinkPad SMAPI BIOS driver"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://github.com/evgeni/tp_smapi"
 REPOLOGY="tp-smapi"
diff -r ad29ddfee1c9 -r d5aab818505e traceroute/receipt
--- a/traceroute/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/traceroute/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,25 @@
 PACKAGE="traceroute"
 VERSION="2.0.19"
 CATEGORY="network"
-SHORT_DESC="The full-featured traceroute program."
-MAINTAINER="samuel_trassare@yahoo.com"
+SHORT_DESC="The full-featured traceroute program"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://traceroute.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://traceroute.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make prefix=/usr DESTDIR=$DESTDIR install
+compile_rules() {
+	make &&
+	make prefix=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp $install/usr/bin/traceroute $fs/usr/bin
 }
 
-post_remove()
-{
+post_remove() {
 	# Restore the symlink to busybox.
 	ln -s /bin/busybox /usr/bin/traceroute
 }
diff -r ad29ddfee1c9 -r d5aab818505e tracker/receipt
--- a/tracker/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tracker/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="zlib-dev glib-dev gobject-introspection-dev sqlite3-dev \
 libsoup-dev libxml2-dev json-glib-dev vala intltool upower-dev \
 libunistring-dev network-manager-dev python3"
-SPLIT="tracker-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e trafshow/receipt
--- a/trafshow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/trafshow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,38 +3,33 @@
 PACKAGE="trafshow"
 VERSION="5.2.3"
 CATEGORY="network"
-SHORT_DESC="Full screen network traffic monitor."
+SHORT_DESC="Full screen network traffic monitor"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tgz"
 WEB_SITE="https://web.archive.org/web/20130707021442/soft.risp.ru/trafshow/index_en.shtml"
 WGET_URL="http://fossies.org/linux/misc/$TARBALL"
 
-DEPENDS="ncurses libpcap"
 BUILD_DEPENDS="ncurses-dev libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# fix session.c bug
 	sed -i '43d' session.c
 
 	./configure \
 		--prefix=/usr \
-		$CONFIGURE_ARGS && make 
+		$CONFIGURE_ARGS &&
+	make
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/etc
 	cp -a $src/$PACKAGE $fs/usr/bin
 	cp -a $src/.trafshow $fs/etc/trafshow
 
 	# tidy config file and change perms
 	chown root:root $fs/etc/trafshow
-	sed -i 's|*/icmp|#*/icmp|' $fs/etc/trafshow
-	sed -i 's|nfs|#nfs|' $fs/etc/trafshow
-	sed -i 's|513|#513|' $fs/etc/trafshow
-	sed -i 's|514|#514|' $fs/etc/trafshow
+	sed -i 's|*/icmp|#*/icmp|; s|nfs|#nfs|; s|513|#513|; s|514|#514|' \
+		$fs/etc/trafshow
+	DEPENDS="ncurses libpcap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tramys-client/receipt
--- a/tramys-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tramys-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,12 +9,9 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="yad"
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	install -Dm755 -o root $stuff/tramys2 $install/usr/bin/tramys2
 	install -Dm644 -o root $stuff/tramys2.desktop \
 		$install/usr/share/applications/tramys2.desktop
@@ -26,8 +23,7 @@
 	make clean
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="yad"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tramys-server/receipt
--- a/tramys-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tramys-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -9,13 +9,10 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="tramys"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	install -Dm755 -o www -g www $stuff/tramys2.cgi \
 		$fs/home/slitaz/www/cook/tramys2.cgi
 	install -Dm644 -o www -g www $stuff/tramys2.msg \
 		$fs/home/slitaz/www/cook/tramys2.msg
+	DEPENDS="tramys"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tramys/receipt
--- a/tramys/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tramys/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tramys"
 VERSION="140824"
@@ -9,9 +9,7 @@
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	install -Dm755 -o root $stuff/tramys $fs/usr/bin/tramys
 	install -Dm644 -o root $stuff/mo.list $fs/usr/share/tramys/mo.list
 	install -Dm644 -o root $stuff/qm.list $fs/usr/share/tramys/qm.list
diff -r ad29ddfee1c9 -r d5aab818505e transmission-remote-gtk/receipt
--- a/transmission-remote-gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/transmission-remote-gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://transmission-remote-gtk.googlecode.com/files/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev json-glib-dev curl-dev libnotify-dev \
-libunique-dev intltool gettext-tools"
+libunique-dev intltool gettext"
 
 compile_rules() {
 	./configure \
@@ -20,7 +20,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e transmission/receipt
--- a/transmission/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/transmission/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.93"
 CATEGORY="network"
 SHORT_DESC="A fast, easy, and free BitTorrent client"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://transmissionbt.com/"
 
@@ -13,7 +13,7 @@
 TARBALL_SHA256="8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b"
 
 BUILD_DEPENDS="curl-dev libevent-dev intltool gtk3-dev"
-SPLIT="transmission-cli transmission-daemon transmission-web"
+SPLIT="$PACKAGE-cli $PACKAGE-daemon $PACKAGE-web"
 
 COOKOPTS="skip-log-errors !pixmaps"
 
diff -r ad29ddfee1c9 -r d5aab818505e transset-df/receipt
--- a/transset-df/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/transset-df/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="6"
 CATEGORY="x-window"
 SHORT_DESC="Tool to set windows opacity"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://www.forchheimer.se/transset-df/"
 
diff -r ad29ddfee1c9 -r d5aab818505e trash-cli/receipt
--- a/trash-cli/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/trash-cli/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="trash-cli"
 VERSION="0.12.9.14"
 CATEGORY="utilities"
-SHORT_DESC="Command line interface to the freedesktop.org trashcan."
+SHORT_DESC="Command line interface to the freedesktop.org trashcan"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/andreafrancia/trash-cli"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/andreafrancia/trash-cli"
 WGET_URL="git|git://github.com/andreafrancia/trash-cli"
 
-DEPENDS="python"
 BUILD_DEPENDS="git bzip2 python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tree/receipt
--- a/tree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.0"
 CATEGORY="utilities"
 SHORT_DESC="Recursive directory listing program"
-MAINTAINER="MikeDSmith25@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://mama.indstate.edu/users/ice/tree/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/tree.html"
diff -r ad29ddfee1c9 -r d5aab818505e trickle/receipt
--- a/trickle/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/trickle/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e trojita/receipt
--- a/trojita/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/trojita/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="trojita"
 VERSION="0.5"
@@ -7,24 +7,24 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
 WEB_SITE="http://trojita.flaska.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libQtDBus libQtSql libQtWebkit qtkeychain"
 BUILD_DEPENDS="cmake Qt4-dev qmake dbus-dev zlib-dev qtkeychain-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. &&
-	make && make install
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		.. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
-	# Remove locales
-	rm -r $fs/usr/share/trojita
+genpkg_rules() {
+	copy @std
+	DEPENDS="libQtDBus libQtSql libQtWebkit qtkeychain"
 }
diff -r ad29ddfee1c9 -r d5aab818505e truecrypt/receipt
--- a/truecrypt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/truecrypt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="7.1a"
 CATEGORY="security"
 SHORT_DESC="Free open-source cross-platform disk encryption software"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.truecrypt.org/"
 
@@ -22,10 +22,10 @@
 		TC_EXTRA_CXXFLAGS="$CXXFLAGS" \
 		TC_EXTRA_CFLAGS="$CFLAGS" || return 1
 
-	install -Dm 755 Main/truecrypt $install/usr/bin/truecrypt
-	install -Dm 644 $stuff/16.png  $install/usr/share/icons/hicolor/16x16/apps/truecrypt.png
-	install -Dm 644 $stuff/48.png  $install/usr/share/icons/hicolor/48x48/apps/truecrypt.png
-	install -Dm 644 License.txt    $install/usr/share/licenses/truecrypt/License.txt
+	install -Dm755 Main/truecrypt $install/usr/bin/truecrypt
+	install -Dm644 $stuff/16.png  $install/usr/share/icons/hicolor/16x16/apps/truecrypt.png
+	install -Dm644 $stuff/48.png  $install/usr/share/icons/hicolor/48x48/apps/truecrypt.png
+	install -Dm644 License.txt    $install/usr/share/licenses/truecrypt/License.txt
 
 	# function `cook_pick_docs` and web interface can't cope with spaces
 	mv Release/Setup\ Files/ Release/Setup_Files/
diff -r ad29ddfee1c9 -r d5aab818505e tsclient/receipt
--- a/tsclient/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tsclient/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,17 @@
 PACKAGE="tsclient"
 VERSION="0.150"
 CATEGORY="network"
-SHORT_DESC="GTK frontend to rdesktop and other remote desktop tools."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="GTK frontend to rdesktop and other remote desktop tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/tsclient/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sourceforge.net/projects/tsclient/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="remote-desktop"
 
-DEPENDS="gtk2 rdesktop xorg-libXdamage"
-BUILD_DEPENDS="gtk2-dev perl-xml-parser gettext-tools"
+BUILD_DEPENDS="gtk2-dev perl-xml-parser gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib/$PACKAGE \
@@ -24,12 +21,10 @@
 		--disable-gnome \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/locale $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/$PACKAGE $fs/usr/lib
@@ -37,4 +32,6 @@
 	cp -a $install/usr/share/pixmaps $fs/usr/share
 	cp -a $install/usr/share/applications $fs/usr/share
 	strip -s $fs/usr/lib/$PACKAGE/*
+	DEPENDS="gtk2 rdesktop xorg-libXdamage"
+	TAGS="remote-desktop"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tslib/receipt
--- a/tslib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tslib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,9 @@
 WGET_URL="$SF_MIRROR/tslib.berlios/$TARBALL"
 
 BUILD_DEPENDS="libtool automake autoconf"
-SPLIT="tslib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) export ac_cv_func_malloc_0_nonnull=yes ;;
-	esac
-
 	./autogen.sh &&
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
diff -r ad29ddfee1c9 -r d5aab818505e tsocks/receipt
--- a/tsocks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tsocks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,22 @@
 PACKAGE="tsocks"
 VERSION="1.8beta5"
 CATEGORY="network"
-SHORT_DESC="A transparent SOCKS proxying library."
+SHORT_DESC="A transparent SOCKS proxying library"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://tsocks.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/lib $fs
diff -r ad29ddfee1c9 -r d5aab818505e ttf-bitstream-vera/receipt
--- a/ttf-bitstream-vera/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-bitstream-vera/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,19 +3,17 @@
 PACKAGE="ttf-bitstream-vera"
 VERSION="1.10"
 CATEGORY="fonts"
-SHORT_DESC="The ttf bitstream vera fonts."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="The ttf bitstream vera fonts"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.gnome.org/fonts/"
 REPOLOGY="fonts:bitstream-vera"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$VERSION/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 TAGS="font"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+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*
@@ -23,7 +21,6 @@
 }
 
 # Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	chroot "$1/" /usr/bin/fc-cache
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-bwahh/receipt
--- a/ttf-bwahh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-bwahh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,33 +3,25 @@
 PACKAGE="ttf-bwahh"
 VERSION="0.1"
 CATEGORY="fonts"
-SHORT_DESC="Bwahh is public domain and futuristic display truetype font."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Futuristic display truetype font"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://people.slitaz.org/~leonardolaporte"
+
 SOURCE="bwahh"
-WEB_SITE="http://people.slitaz.org/~leonardolaporte"
-STUFF_DIR="lab.slitaz/5.0/pkg/font/publicdomain"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="${WEB_SITE}/$STUFF_DIR/$TARBALL"
-TAGS="font ttf"
+WGET_URL="${WEB_SITE}/lab.slitaz/5.0/pkg/font/publicdomain/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/share/fonts/pd/$SOURCE
-  cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
+compile_rules() {
+	mkdir -p $install/usr/share/fonts/pd/$SOURCE
+	cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
+genpkg_rules() {
+	cp -a $install/* $fs
+	TAGS="font ttf"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" /usr/bin/fc-cache
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-carlito/receipt
--- a/ttf-carlito/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-carlito/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="ttf-carlito"
 VERSION="20130920"
 CATEGORY="fonts"
-SHORT_DESC="Carlito font is metrically compatible with MS Calibri"
+SHORT_DESC="Metrically compatible with MS Calibri font"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="OFL"
 WEB_SITE="https://fontlibrary.org/en/font/carlito"
@@ -12,16 +12,12 @@
 TARBALL="crosextrafonts-carlito-$VERSION.tar.gz"
 WGET_URL="http://gsdview.appspot.com/chromeos-localmirror/distfiles/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	FONTPATH=$install/usr/share/fonts/truetype/carlito
 	mkdir -p $FONTPATH
 	install -Dm644 $src/*.ttf $FONTPATH
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-dejavu-lgc/receipt
--- a/ttf-dejavu-lgc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-dejavu-lgc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,11 +13,9 @@
 WGET_URL="$SF_MIRROR/dejavu/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info fontforge"
-SPLIT="ttf-dejavu-lgc-extra"
+SPLIT="$PACKAGE-extra"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# Install/repack fonts
 
 	f=$install/usr/share/fonts/truetype/ttf-dejavu
@@ -67,9 +65,7 @@
 	done
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		ttf-dejavu-lgc)
 			copy DejaVuLGCSans.ttf DejaVuLGCSans-Bold.ttf DejaVuLGCSansMono.ttf \
diff -r ad29ddfee1c9 -r d5aab818505e ttf-dejavu/receipt
--- a/ttf-dejavu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-dejavu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$SF_MIRROR/dejavu/$TARBALL"
 
 BUILD_DEPENDS="shared-mime-info fontforge"
-SPLIT="ttf-dejavu-extra"
+SPLIT="$PACKAGE-extra"
 
 compile_rules() {
 	# Install/repack fonts
diff -r ad29ddfee1c9 -r d5aab818505e ttf-inconsolata-dz/receipt
--- a/ttf-inconsolata-dz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-inconsolata-dz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,10 +11,8 @@
 
 TARBALL="$PACKAGE-$VERSION.zip"
 WGET_URL="http://media.nodnod.net/Inconsolata-dz.otf.zip"
-TAGS="font otf"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	install -Dm644 $src/* $fs/usr/share/fonts/TTF/$PACKAGE.otf
+	TAGS="font otf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-mgopen/receipt
--- a/ttf-mgopen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-mgopen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -8,14 +8,13 @@
 LICENSE="other"
 WEB_SITE="https://web.archive.org/web/20130719135032/http://pub.ellak.gr/fonts/mgopen/"
 # en: https://web.archive.org/web/20120409173416/http://www.zvr.gr/typo/mgopen/index
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.fr.freebsd.org/mirrors/ftp.freebsd.org/ports/distfiles/MgOpen.tar.gz"
-TAGS="font ttf"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	TTFDIR=$fs/usr/share/fonts/TTF/MgOpen
 	mkdir -p $TTFDIR
 	install -m644 $src/*.ttf $TTFDIR
+	TAGS="font ttf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-open-dyslexic/receipt
--- a/ttf-open-dyslexic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-open-dyslexic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="ttf-open-dyslexic"
 VERSION="20121111"
 CATEGORY="fonts"
-SHORT_DESC="TrueType font to increase readability for dyslexic readers."
+SHORT_DESC="TrueType font to increase readability for dyslexic readers"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CC-SA"
 WEB_SITE="http://dyslexicfonts.com/"
@@ -11,14 +11,10 @@
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/antijingoist/open-dyslexic/archive/$VERSION-Stable.tar.gz"
-TAGS="font ttf"
 
-BUILD_DEPENDS="wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	TTFDIR=$fs/usr/share/fonts/TTF/OpenDyslexic
 	mkdir -p $TTFDIR
 	install -m644 $src/ttf/*.ttf $TTFDIR
+	TAGS="font ttf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttf-pingwi-typography/receipt
--- a/ttf-pingwi-typography/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-pingwi-typography/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,9 +11,7 @@
 WGET_URL="${WEB_SITE}fonts/fonts_test.zip"
 TAGS="font ttf"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	TTFDIR=$fs/usr/share/fonts/TTF/PWT
 	mkdir -p $TTFDIR
 	install -Dm644 $src/*.ttf $TTFDIR
diff -r ad29ddfee1c9 -r d5aab818505e ttf-roboto/receipt
--- a/ttf-roboto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-roboto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,21 +11,17 @@
 TARBALL="roboto-hinted-$VERSION.zip"
 WGET_URL="https://github.com/google/roboto/releases/download/v$VERSION/roboto-hinted.zip"
 
-SPLIT="ttf-roboto-base ttf-roboto"
+SPLIT="$PACKAGE-base $PACKAGE"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	FONTPATH=$install/usr/share/fonts/truetype/ttf-roboto
 	mkdir -p $FONTPATH
 	install -Dm644 $src/*.ttf $FONTPATH
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-		ttf-roboto-base)
+		*-base)
 			copy Roboto-Regular.ttf Roboto-Bold.ttf Roboto-Italic.ttf \
 			Roboto-BoldItalic.ttf
 			CAT="fonts|base family"
diff -r ad29ddfee1c9 -r d5aab818505e ttf-warenhaus-typenhebel/receipt
--- a/ttf-warenhaus-typenhebel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttf-warenhaus-typenhebel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,35 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ttf-warenhaus-typenhebel"
 VERSION="0.1"
 CATEGORY="fonts"
-SHORT_DESC="This font is an imitation of an old type writer."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Imitation of an old type writer font"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
+WEB_SITE="http://people.slitaz.org/~leonardolaporte"
+
 SOURCE="warenhaus-typenhebel"
-WEB_SITE="http://people.slitaz.org/~leonardolaporte"
-STUFF_DIR="lab.slitaz/5.0/pkg/font/publicdomain"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WGET_URL="${WEB_SITE}/$STUFF_DIR/$TARBALL"
-TAGS="font ttf"
+WGET_URL="http://people.slitaz.org/~leonardolaporte/lab.slitaz/5.0/pkg/font/publicdomain/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS="wget"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/share/fonts/pd/$SOURCE
-  cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
+compile_rules() {
+	mkdir -p $install/usr/share/fonts/pd/$SOURCE
+	cp -a $src/* $install/usr/share/fonts/pd/$SOURCE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
+genpkg_rules() {
+	cp -a $install/* $fs
+	TAGS="font ttf"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" /usr/bin/fc-cache
 }
diff -r ad29ddfee1c9 -r d5aab818505e tty-clock/receipt
--- a/tty-clock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tty-clock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tty-clock"
 VERSION="2.3"
 CATEGORY="utilities"
-SHORT_DESC="Analog ncurses clock."
+SHORT_DESC="Analog ncurses clock"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://github.com/xorg62/tty-clock"
-TAGS="clock"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/archive/v$VERSION.tar.gz"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make PREFIX=/usr install
+compile_rules() {
+	make &&
+	make PREFIX=/usr install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
+	DEPENDS="ncurses"
+	TAGS="clock"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ttysnoop/receipt
--- a/ttysnoop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ttysnoop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Allows you to spy on telnet+serial connections"
 LICENSE="GPL"
 MAINTAINER="pascal.bellard@slitaz.org"
-WEB_SITE="http://freecode.com/projects/ttysnoop"
+WEB_SITE="http://freshmeat.sourceforge.net/projects/ttysnoop"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://sysd.org/stas/files/active/0/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e tuffy-font/receipt
--- a/tuffy-font/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tuffy-font/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="tuffy-font"
 VERSION="1.28"
 CATEGORY="fonts"
-SHORT_DESC="Tuffy font family is a neutral and readable sans-serif text font."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Neutral and readable sans-serif text font"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://tulrich.com/fonts/"
 REPOLOGY="fonts:tulrich-tuffy"
@@ -12,15 +12,11 @@
 TARBALL="tuffy-20120614.zip"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/share/fonts/tuffy
-  cp -a $src/* $install/usr/share/fonts/tuffy
+compile_rules() {
+	mkdir -p $install/usr/share/fonts/tuffy
+	cp -a $src/* $install/usr/share/fonts/tuffy
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
-}
\ No newline at end of file
+genpkg_rules() {
+	cp -a $install/* $fs
+}
diff -r ad29ddfee1c9 -r d5aab818505e tumbler/receipt
--- a/tumbler/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tumbler/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,9 +14,11 @@
 BUILD_DEPENDS="intltool dbus-glib dbus-dev dbus-glib-dev \
 gdk-pixbuf-dev curl-dev freetype-dev libjpeg-turbo-dev ffmpegthumbnailer-dev \
 gst1-plugins-base-dev libgsf-dev poppler-dev libopenraw-dev lcms2-dev"
-SPLIT="tumbler-plugin-cover tumbler-plugin-ffmpeg tumbler-plugin-font \
-tumbler-plugin-gst tumbler-plugin-jpeg tumbler-plugin-odf \
-tumbler-plugin-poppler tumbler-plugin-raw tumbler tumbler-dev"
+SPLIT="\
+$PACKAGE-plugin-cover   $PACKAGE-plugin-ffmpeg $PACKAGE-plugin-font \
+$PACKAGE-plugin-gst     $PACKAGE-plugin-jpeg   $PACKAGE-plugin-odf \
+$PACKAGE-plugin-poppler $PACKAGE-plugin-raw    $PACKAGE \
+$PACKAGE-dev"
 
 compile_rules() {
 	# openraw v.0.0.9 - libopenraw-gnome-1.0.pc;
diff -r ad29ddfee1c9 -r d5aab818505e tunctl/receipt
--- a/tunctl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tunctl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,22 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="tunctl"
 VERSION="1.5"
 CATEGORY="network"
-SHORT_DESC="used to set up and maintain persistent TUN/TAP network interfaces"
+SHORT_DESC="Set up and maintain persistent TUN/TAP network interfaces"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL"
+WEB_SITE="http://tunctl.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tunctl.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS=""
+compile_rules() {
+	cc -g -Wall -o tunctl tunctl.c &&
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-        mkdir -p $DESTDIR/usr/bin
-	cc -g -Wall -o tunctl tunctl.c
-        cp -a tunctl $DESTDIR/usr/bin/
+	install -Dm755 tunctl $install/usr/bin/tunctl
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e tup/receipt
--- a/tup/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tup/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="tup"
 VERSION="0.7.3"
 CATEGORY="utilities"
-SHORT_DESC="Tup is a file-based build system for Linux, OSX, and Windows"
-MAINTAINER="necrophcodr@necrophcodr.me"
+SHORT_DESC="File-based build system for Linux, OSX, and Windows"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://gittup.org/tup/"
 
diff -r ad29ddfee1c9 -r d5aab818505e tupi/receipt
--- a/tupi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tupi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,29 @@
 VERSION="0.2-git03"
 CATEGORY="graphics"
 SHORT_DESC="2D vector animation studio"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-WEB_SITE="http://www.maefloresta.com/"
+WEB_SITE="https://www.maefloresta.com/"
+
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://download.berlios.de/tupi/$TARBALL/from_sourceforge"
 
-DEPENDS="libQtCore libQtSvg libQtOpenGL ffmpeg quazip mesa libogg libtheora libtheora-enc"
 BUILD_DEPENDS="ruby-dev Qt4-dev qmake ffmpeg-dev zlib-dev quazip-dev mesa-dev \
 libogg-dev libtheora-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	 ./configure --prefix=/usr \
+compile_rules() {
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/tupi $fs/usr/lib
 	cp -a $install/usr/share/tupi $fs/usr/share
+	DEPENDS="libQtCore libQtSvg libQtOpenGL ffmpeg quazip mesa libogg libtheora \
+	libtheora-enc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e turnserver/receipt
--- a/turnserver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/turnserver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="turnserver"
 VERSION="0.7.3"
 CATEGORY="network"
-SHORT_DESC="open-source TURN server implementation."
+SHORT_DESC="Open-source TURN server implementation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://turnserver.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://turnserver.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="openssl"
 BUILD_DEPENDS="libconfuse openssl-dev perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# configure script should be really fixed... 
+compile_rules() {
+	# configure script should be really fixed...
 	ln -s $src/missing /root
 	sed -i 's/_SVID_SOURCE/_DEFAULT_SOURCE/' src/Makefile*
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		$CONFIGURE_ARGS 2>&1 | grep -v //missing &&
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="openssl"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e turses/receipt
--- a/turses/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/turses/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="turses"
 VERSION="0.2.7"
 CATEGORY="network"
-SHORT_DESC="A Twitter client for the console."
+SHORT_DESC="A Twitter client for the console"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://pypi.org/project/turses/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://pypi.org/project/turses/"
 WGET_URL="https://files.pythonhosted.org/packages/source/t/$PACKAGE/$TARBALL"
 
-DEPENDS="python python-httplib2 python-urwid python-oauth2 \
-python-tweepy"
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-httplib2 python-urwid python-oauth2 \
+	python-tweepy"
 }
diff -r ad29ddfee1c9 -r d5aab818505e tuxmath/receipt
--- a/tuxmath/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tuxmath/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,27 @@
 SOURCE="tuxmath_w_fonts"
 VERSION="2.0.3"
 CATEGORY="games"
-SHORT_DESC="Arcade game that helps kids practice their math facts."
+SHORT_DESC="Arcade game that helps kids practice their math facts"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://alioth-archive.debian.org/releases/tux4kids/TuxMath-Source/"
+
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="https://alioth-archive.debian.org/releases/tux4kids/TuxMath-Source/"
 WGET_URL="https://alioth.debian.org/frs/download.php/3571/$TARBALL"
 
-DEPENDS="libt4k_common libsdl librsvg libsdl-image libsdl-mixer libsdl-ttf \
-libsdl-net libsdl-pango"
 BUILD_DEPENDS="libt4k_common-dev libsdl-dev librsvg-dev libsdl-image-dev \
 libsdl-mixer-dev libsdl-ttf-dev libsdl-net-dev libsdl-pango-dev"
-TAGS="education"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure LIBS="-lt4k_common" \
+compile_rules() {
+	./configure \
+		LIBS="-lt4k_common" \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/tuxmath $fs/usr/share
@@ -39,5 +34,7 @@
 		cp -a $install/usr/share/locale/$lang/LC_MESSAGES/tuxmath.mo \
 		        $fs/usr/share/locale/$lang/LC_MESSAGES
 	done
+	DEPENDS="libt4k_common libsdl librsvg libsdl-image libsdl-mixer libsdl-ttf \
+	libsdl-net libsdl-pango"
+	TAGS="education"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e tuxpaint/receipt
--- a/tuxpaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tuxpaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.22"
 CATEGORY="graphics"
 SHORT_DESC="Kid painting program"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://tuxpaint.org/"
 
@@ -13,11 +13,11 @@
 
 BUILD_DEPENDS="libpng16-dev fribidi-dev librsvg-dev cairo-dev libsdl-dev \
 libsdl-mixer-dev libsdl-pango-dev libsdl-image-dev libsdl-ttf-dev \
-libpaper-dev python-dev gettext gperf"
+libpaper-dev python-dev gettext-dev gperf"
 
 compile_rules() {
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR -j1 install
+	make PREFIX=/usr DESTDIR=$install -j1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e tuxtype/receipt
--- a/tuxtype/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tuxtype/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Educational typing tutor for kids"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://tux4kids.alioth.debian.org"
+WEB_SITE="http://tux4kids.alioth.debian.org/"
 
 TARBALL="tuxtype_w_fonts-$VERSION.tar.gz"
 WGET_URL="https://alioth.debian.org/frs/download.php/3270/$TARBALL"
@@ -22,7 +22,7 @@
 
 	# Adding the games group satisfies the install script.
 	addgroup games
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 	# We don't need to leave this behind in the build environment.
 	delgroup games
 }
diff -r ad29ddfee1c9 -r d5aab818505e tyrian/receipt
--- a/tyrian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/tyrian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="tyrian"
 VERSION="21"
 CATEGORY="non-free"
-SHORT_DESC="Tyrian is a the DOS shoot-em-up; you need open-tyrian to run it"
-MAINTAINER="mallory@sweetpeople.org"
+SHORT_DESC="DOS shoot-em-up game; you need open-tyrian to run it"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
 REPOLOGY="opentyrian"
diff -r ad29ddfee1c9 -r d5aab818505e ucarp/receipt
--- a/ucarp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ucarp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://download.pureftpd.org/pub/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpcap-dev gfortran gettext"
+BUILD_DEPENDS="libpcap-dev gfortran gettext-dev"
 
 compile_rules() {
 	sed -i 's/\$(SHELL) @install_sh@/@install_sh@/' po/Makefile.in*
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e uchardet/receipt
--- a/uchardet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uchardet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://www.freedesktop.org/software/uchardet/releases/$TARBALL"
 
 BUILD_DEPENDS="cmake"
-SPLIT="uchardet-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cmake \
diff -r ad29ddfee1c9 -r d5aab818505e ucl/receipt
--- a/ucl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ucl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,16 +12,17 @@
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
 BUILD_DEPENDS="gfortran"
-SPLIT="ucl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--enable-shared \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
-	cook_pick_docs AUTHORS NEWS README THANKS TODO $docdir
+	cook_pick_docs AUTHORS NEWS README THANKS TODO
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e uclibc-cross-compiler-x86_64/receipt
--- a/uclibc-cross-compiler-x86_64/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uclibc-cross-compiler-x86_64/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,15 +14,20 @@
 
 COOKOPTS="!strip"
 
-SPLIT="uclibc-armv4eb uclibc-armv4l uclibc-armv4tl uclibc-armv5l uclibc-armv6l \
-uclibc-cross-compiler-armv4eb uclibc-cross-compiler-armv4l \
-uclibc-cross-compiler-armv4tl uclibc-cross-compiler-armv5l \
-uclibc-cross-compiler-armv6l uclibc-cross-compiler-i486 \
-uclibc-cross-compiler-mips uclibc-cross-compiler-mips64 \
-uclibc-cross-compiler-mipsel uclibc-cross-compiler-powerpc \
-uclibc-cross-compiler-sh4 uclibc-cross-compiler-sparc \
-uclibc-cross-compiler-x86_64 uclibc-i486 uclibc-mips uclibc-mips64 \
-uclibc-mipsel uclibc-powerpc uclibc-sh4 uclibc-sparc uclibc-x86_64"
+SPLIT="\
+uclibc-armv4eb uclibc-cross-compiler-armv4eb \
+uclibc-armv4l  uclibc-cross-compiler-armv4l \
+uclibc-armv4tl uclibc-cross-compiler-armv4tl \
+uclibc-armv5l  uclibc-cross-compiler-armv5l \
+uclibc-armv6l  uclibc-cross-compiler-armv6l \
+uclibc-i486    uclibc-cross-compiler-i486 \
+uclibc-mips    uclibc-cross-compiler-mips \
+uclibc-mips64  uclibc-cross-compiler-mips64 \
+uclibc-mipsel  uclibc-cross-compiler-mipsel \
+uclibc-powerpc uclibc-cross-compiler-powerpc \
+uclibc-sh4     uclibc-cross-compiler-sh4 \
+uclibc-sparc   uclibc-cross-compiler-sparc \
+uclibc-x86_64  uclibc-cross-compiler-x86_64"
 
 compile_rules() {
 	for i in $(echo " $SPLIT" | sed -e 's/uclibc-cross-compiler-//g' \
@@ -44,7 +49,7 @@
 				$fs/usr/share/$PACKAGE \
 				$fs/usr/bin
 			cp -a $install/cross-compiler-${PACKAGE##*-}/. $fs/usr/share/$PACKAGE/
-			for i in $(cd $install/cross-compiler-${PACKAGE##*-} ; ls bin/${PACKAGE##*-}-*); do
+			for i in $(cd $install/cross-compiler-${PACKAGE##*-}; ls bin/${PACKAGE##*-}-*); do
 				file=$(basename $i)
 				ln -s ../share/$PACKAGE/bin/$file $fs/usr/bin/uclibc-$file
 			done
diff -r ad29ddfee1c9 -r d5aab818505e udev/receipt
--- a/udev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,21 @@
 VERSION="182"
 CATEGORY="base-system"
 SHORT_DESC="Udev creat automaticly right devices in /dev"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/software/systemd/man/udev.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL"
 
-BUILD_DEPENDS_arm="util-linux-blkid-dev kmod-dev acl-dev glib-dev"
 BUILD_DEPENDS="util-linux-blkid-dev gperf pciids acl-dev \
 usbutils-dev libusb-dev glib-dev pciids usbids kmod-dev \
 libgudev-dev pcre-dev xz-dev util-linux-uuid-dev"
-SPLIT="udev-dev"
+SPLIT="$PACKAGE-dev"
 
 BUILD_WARNING="Install new udev package and rebuild hal"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) # ARM Hack
-			for la in libgthread-2.0.la libglib-2.0.la; do
-				if grep -q "^libdir='/usr/lib'" /usr/lib/$la; then
-					sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
-						/usr/lib/$la
-				fi
-			done ;;
-	esac
-
 	sed -i 's/.*mtd-user.*/&\n#include <stdint.h>/' src/mtd_probe/mtd_probe.h
 	export LDFLAGS="$LDFLAGS -lrt"
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e udevil/receipt
--- a/udevil/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udevil/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.4"
 CATEGORY="system-tools"
 SHORT_DESC="Mount without password"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://ignorantguru.github.io/udevil/"
 
@@ -18,7 +18,8 @@
 		--disable-systemd \
 		$CONFIGURE_ARGS &&
 	fix libtool &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	# Must be suid root
 	chmod +s $install/usr/bin/udevil
diff -r ad29ddfee1c9 -r d5aab818505e udftools/receipt
--- a/udftools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udftools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="udftools"
 VERSION="1.0.0b3"
 CATEGORY="utilities"
-SHORT_DESC="tools for UDF filesystems and DVD/CD-R(W) drives"
+SHORT_DESC="Tools for UDF filesystems and DVD/CD-R(W) drives"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linux-udf.sourceforge.net/"
@@ -22,7 +22,7 @@
 	./configure &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e udhcpc6-fake/receipt
--- a/udhcpc6-fake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udhcpc6-fake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,15 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="udhcpc6-fake"
 VERSION="1.0"
 CATEGORY="network"
-SHORT_DESC="Temporary? udhcpc fake for ipv6 support."
+SHORT_DESC="Temporary? udhcpc fake for ipv6 support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.isc.org/products/DHCP/"
-DEPENDS="dhcp6-client"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a stuff/* $fs
+genpkg_rules() {
+	cp -a $stuff/* $fs
 	chmod +x $fs/sbin/udhcpc $fs/etc/dhclient-script
+	DEPENDS="dhcp6-client"
 }
-
-# Overlap busybox
-pre_install()
-{
-	rm -f "$1/sbin/udhcpc"
-}
-
-post_remove()
-{
-	ln -s /bin/busybox /sbin/udhcpc
-}
diff -r ad29ddfee1c9 -r d5aab818505e udisks/receipt
--- a/udisks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udisks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.0.5"
 CATEGORY="system-tools"
 SHORT_DESC="D-Bus interfaces to query and manipulate storage devices"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/udisks"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/udisks/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/udisks.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -16,7 +16,7 @@
 polkit-dev dbus-dev dbus-glib-dev pcre-dev dbus-dev parted-dev \
 libdevmapper-dev util-linux-blkid-dev util-linux-uuid-dev intltool libxslt \
 docbook-xsl"
-SPLIT="udisks-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# fix glibc-2.24 issue
diff -r ad29ddfee1c9 -r d5aab818505e udisks2/receipt
--- a/udisks2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udisks2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.7.7"
 CATEGORY="system-tools"
 SHORT_DESC="D-Bus service to access and manipulate storage devices"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/udisks/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/udisks2.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="docbook-xsl gtk-doc gobject-introspection-dev libgudev-dev \
 libblockdev-dev polkit-dev libatasmart-dev acl-dev intltool"
-SPLIT="udisks2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e udns/receipt
--- a/udns/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udns/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.corpit.ru/mjt/udns/$TARBALL"
 
-SPLIT="udns-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# GCC 4.5 fix
diff -r ad29ddfee1c9 -r d5aab818505e udpcast/receipt
--- a/udpcast/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/udpcast/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,29 +3,29 @@
 PACKAGE="udpcast"
 VERSION="20120424"
 CATEGORY="network"
-SHORT_DESC="Multicast file transfer."
+SHORT_DESC="Multicast file transfer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2 BSD"
+WEB_SITE="http://udpcast.linux.lu/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://udpcast.linux.lu/"
 WGET_URL="${WEB_SITE}download/$TARBALL"
 
 BUILD_DEPENDS="m4 perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's|#include "console.h"|#include <sys/select.h>\n&|' console.c	
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+compile_rules() {
+	sed -i 's|#include "console.h"|#include <sys/select.h>\n&|' console.c
+
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/sbin $fs/usr
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e uemacs/receipt
--- a/uemacs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uemacs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="uemacs"
 VERSION="20120715"
 CATEGORY="editors"
-SHORT_DESC="Tiny emacs clone."
+SHORT_DESC="Tiny emacs clone"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
-TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://git.kernel.org/?p=editors/uemacs/uemacs.git"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"
-TAGS="editor"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="git ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	mkdir -p $install/usr/bin &&
-	cp em $install/usr/bin
+	install -Dm755 em $install/usr/bin/em
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	TAGS="editor"
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ufiformat/receipt
--- a/ufiformat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ufiformat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ufiformat"
 VERSION="0.9.9"
 CATEGORY="system-tools"
-SHORT_DESC="Low level (physical) formatting tool on USB-FDD."
+SHORT_DESC="Low level (physical) formatting tool on USB-FDD"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.geocities.jp/tedi_world/format_usbfdd_e.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.geocities.jp/tedi_world/format_usbfdd_e.html"
 WGET_URL="http://www.geocities.jp/tedi_world/$TARBALL"
-TAGS="floppy formatter"
 
-DEPENDS="e2fsprogs"
 BUILD_DEPENDS="e2fsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{	
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="e2fsprogs"
+	TAGS="floppy formatter"
 }
diff -r ad29ddfee1c9 -r d5aab818505e ufr2/receipt
--- a/ufr2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ufr2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,21 +4,18 @@
 VERSION="2.20"
 CATEGORY="system-tools"
 SHORT_DESC="Canon URF2 driver with support for LBP, iR and MF series printers"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.canon.com.au/pps/colour/imagepress_c1_drivers.aspx"
 
 SOURCE="UFR_II_Printer_Driver_for_Linux_V220_uk_EN"
-TARBALL="${SOURCE}.tar.gz"
+TARBALL="$SOURCE.tar.gz"
 WGET_URL="http://gdlp01.c-wss.com/gds/8/0100002708/03/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake cairo-dev gtk2-dev cndrvcups-common-dev cups-dev"
 
 compile_rules() {
-	#src="$WOK/$PACKAGE/$SOURCE/Sources"
-	cd $src
-
-	[ -d cndrvcups-lb-$VERSION ] || tar xzf Sources/cndrvcups-lb-${VERSION}-1.tar.gz
+	[ -d cndrvcups-lb-$VERSION ] || tar xzf Sources/cndrvcups-lb-$VERSION-1.tar.gz
 
 	cd $src/cndrvcups-lb-$VERSION/ppd &&
 	./autogen.sh \
@@ -28,7 +25,7 @@
 		--program-suffix="" \
 		--program-prefix="" &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	cd $src/cndrvcups-lb-$VERSION/pstoufr2cpca
 	./autogen.sh \
@@ -38,7 +35,7 @@
 		--program-suffix="" \
 		--program-prefix="" &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
@@ -69,30 +66,38 @@
 }
 
 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 ""
+	cat <<EOT
+
+	.--------------------------------------------------------.
+	|              *** PROPRIETARY LICENSE ***               |
+	|========================================================|
+	| You are installing a package with proprietary license. |
+	| You must accept the license.                           |
+	'--------------------------------------------------------'
+EOT
 }
 
 post_install() {
-	echo ""
-	echo -e "\033[1m CANON PRINTING LICENSE INFORMATION:\033[0m $2"
-	echo "================================================================================"
-	echo "For installing this package, you have to accept the $PACKAGE license."
-	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 <<EOT
+
+	.-------------------------------------------------------------------.
+	|            *** CANON PRINTING LICENSE INFORMATION ***             |
+	|===================================================================|
+	| For installing this package, you have to accept the ufr2 license. |
+	| The license is stored in /usr/share/licenses/ufr2                 |
+	'-------------------------------------------------------------------'
+EOT
+
+	echo -n "Would you like to read the license (y/N) : "; read answer
+	if [ "$answer" == "y" ]; then
 		cat "$1/usr/share/licenses/$PACKAGE/LICENSE" | more
 		echo ""
 	fi
+
 	echo "================================================================================"
-	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."
+	echo -n "Do you accept the license (y/N) : "; read answer
+	if [ "$answer" = "N" ]; then
+		echo "You did not accept the license, removing the package..."
 		chroot "$1/" tazpkg remove "$PACKAGE"
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e ufraw/receipt
--- a/ufraw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ufraw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,48 +3,44 @@
 PACKAGE="ufraw"
 VERSION="0.18"
 CATEGORY="graphics"
-SHORT_DESC="Utility to read and manipulate raw images from digital cameras."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Utility to read and manipulate raw images from digital cameras"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ufraw.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://ufraw.sourceforge.net/"
-WGET_URL="$SF_MIRROR/project/ufraw/ufraw/ufraw-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/ufraw/$TARBALL"
 
-BUILD_DEPENDS="gimp gimp-dev lcms-dev tiff-dev exiv2-dev gtk2-dev \
-libgtkimageview-dev bzip2-dev gettext-tools"
-SPLIT="ufraw gimp-plugin-ufraw ufraw-locales"
+BUILD_DEPENDS="shared-mime-info gimp-dev lcms-dev tiff-dev exiv2-dev gtk2-dev \
+libgtkimageview-dev bzip2-dev gettext"
+SPLIT="gimp-plugin-ufraw $PACKAGE-locales"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export CXXFLAGS="-Wno-narrowing"
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install || return 1
+
+	install -Dm644 ufraw.desktop $install/usr/share/applications/ufraw.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	ufraw)
-		SUGGESTED="ufraw-locales gimp-plugin-ufraw"
-		DEPENDS="gtk2 exiv2 lcms tiff libgtkimageview libgomp bzip2"
-		mkdir -p $fs/usr/share/applications
-		cp -a $install/usr/bin $fs/usr
-		cp -a $src/ufraw.desktop $fs/usr/share/applications
-		;;
-	gimp-plugin-ufraw)
-		CAT="graphics|Add raw files support to GIMP with UFRaw."
-		SUGGESTED="ufraw-locales"
-		DEPENDS="gimp"
-		mkdir -p $fs/usr
-		cp -a $install/usr/lib $fs/usr
-		;;
-	ufraw-locales)
-		CAT="misc|Locales for ufraw and gimp-plugin-ufraw."
-		mkdir -p $fs/usr $fs/usr/share
-		cp -a $install/usr/share/locale $fs/usr/share
-		;;
+		ufraw)
+			copy bin/ *.desktop
+			DEPENDS="gtk2 exiv2 lcms tiff libgtkimageview libgomp bzip2"
+			SUGGESTED="ufraw-locales gimp-plugin-ufraw"
+			;;
+		gimp-plugin-ufraw)
+			copy lib/
+			CAT="graphics|RAW files support for GIMP"
+			DEPENDS="gimp"
+			SUGGESTED="ufraw-locales"
+			;;
+		*-locales)
+			copy locale/
+			CAT="misc|locales for ufraw and gimp-plugin-ufraw"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e uget/receipt
--- a/uget/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uget/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,8 +20,8 @@
 		--with-gtk3 \
 		LDFLAGS='-Wl,-O1 -Wl,--as-needed' \
 		$CONFIGURE_ARGS &&
-	make -j2 -s &&
-	make DESTDIR=$DESTDIR install
+	make -s &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e uhd/receipt
--- a/uhd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uhd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 boost-filesystem boost-program-options boost-regex \
 boost-system boost-unit-test-framework boost-serialization \
 boost-thread boost-math-tr1 libusb-dev eudev-dev"
-SPLIT="uhd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd $src/host
@@ -29,7 +29,8 @@
 		-DENABLE_B200=ON \
 		-DENABLE_USB=ON \
 		.. &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e uhttpmock/receipt
--- a/uhttpmock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uhttpmock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://tecnocode.co.uk/downloads/uhttpmock/$TARBALL"
 
 BUILD_DEPENDS="glib-dev libsoup-dev gobject-introspection-dev vala"
-SPLIT="uhttpmock-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e umfpack/receipt
--- a/umfpack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/umfpack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="http://faculty.cse.tamu.edu/davis/SuiteSparse/$TARBALL"
 
 BUILD_DEPENDS="blas lapack libgfortran"
-SPLIT="umfpack-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cat > dynlink.sh <<EOT
@@ -31,17 +31,17 @@
 		    -e "s|\$(AR[A-Z]*)|sh $src/dynlink.sh|" \
 			< $i/Makefile > $i/Makefile.d
 	done
-	mkdir -p $DESTDIR/usr/lib $DESTDIR/usr/include
-	sed -i "s/lopenblas/lblas/;s|/usr/local|$DESTDIR/usr|" \
+	mkdir -p $install/usr/lib $install/usr/include
+	sed -i "s/lopenblas/lblas/;s|/usr/local|$install/usr|" \
 		SuiteSparse_config/*.mk
 
-	make -j 1 && make install
+	make -j1 && make install
 
 	for i in */Lib/*.so.*; do
-		cp $i $DESTDIR/usr/lib
+		cp $i $install/usr/lib
 		l=$(basename $i)
-		ln -s $l $DESTDIR/usr/lib/${l%.*.*}
-		ln -s $l $DESTDIR/usr/lib/${l%so*}so
+		ln -s $l $install/usr/lib/${l%.*.*}
+		ln -s $l $install/usr/lib/${l%so*}so
 	done
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e uml-utilities/receipt
--- a/uml-utilities/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/uml-utilities/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 compile_rules() {
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e umplayer-svn/receipt
--- a/umplayer-svn/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/umplayer-svn/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -10,27 +10,21 @@
 REPOLOGY="umplayer"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
+BRANCH="$VERSION"
 WGET_URL="subversion|https://umplayer.svn.sourceforge.net/svnroot/umplayer/umplayer/trunk"
-BRANCH="$VERSION"
-TAGS="player audio video movie"
 
-DEPENDS="mplayer libQtCore libQtGui libQtXml"
 BUILD_DEPENDS="subversion qt4 Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src	
+compile_rules() {
 	make PREFIX=/usr &&
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	rm -rf $fs/usr/share/man
+	DEPENDS="mplayer libQtCore libQtGui libQtXml"
+	TAGS="player audio video movie"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e unbound/receipt
--- a/unbound/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unbound/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,13 @@
 SHORT_DESC="A validating, recursive, and caching DNS resolver"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="https://www.unbound.net/"
+WEB_SITE="https://nlnetlabs.nl/projects/unbound/about/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://www.unbound.net/downloads/$TARBALL"
+WGET_URL="https://www.unbound.net/downloads/$TARBALL" # FIXME
 
 BUILD_DEPENDS="openssl-dev expat-dev"
-SPLIT="unbound-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Do we need static libraries?
diff -r ad29ddfee1c9 -r d5aab818505e unclutter/receipt
--- a/unclutter/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unclutter/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,18 +7,16 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
 WEB_SITE="https://packages.debian.org/sid/unclutter"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://http.debian.net/debian/pool/main/u/unclutter/unclutter_8.orig.tar.gz"
 PATCH_URL="http://http.debian.net/debian/pool/main/u/unclutter/unclutter_8-20.debian.tar.gz"
 PATCH="$(basename $PATCH_URL)"
 EXTRA_SOURCE_FILES="$PATCH"
 
-DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	if [ ! -f "$SRC/$PATCH)" ]; then
 		busybox wget -O "$SRC/$PATCH" "$PATCH_URL"
 	fi
@@ -30,14 +28,14 @@
 		patch -p1 -i $src/patch/debian/patches/$patchfile
 	done < $src/patch/debian/patches/series
 
-	make && make install
+	make &&
+	make install || return 1
+
 	mkdir -p $install/usr/share/man/man1
 	install -m0644 $src/unclutter.man $install/usr/share/man/man1/unclutter.1
-	gzip -9 $install/usr/share/man/man1/unclutter.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="xorg-libX11 xorg-libxcb xorg-libXau xorg-libXdmcp"
 }
diff -r ad29ddfee1c9 -r d5aab818505e unetbootin/receipt
--- a/unetbootin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unetbootin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,49 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="unetbootin"
 VERSION="625"
-SYSTEM="linux"
 CATEGORY="system-tools"
-SHORT_DESC="Allows you to create bootable Live USB drives. Binary version."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="Allows you to create bootable Live USB drives. Binary version"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPLv3"
 WEB_SITE="https://launchpad.net/unetbootin"
 
-TARBALL="${PACKAGE}-$SYSTEM-${VERSION}.bin"
-WGET_URL="${WEB_SITE}/trunk/${VERSION}/+download/${TARBALL}"
+TARBALL="$PACKAGE-linux-$VERSION.bin"
+WGET_URL="$WEB_SITE/trunk/$VERSION/+download/$TARBALL"
 
-SUGGESTED="bash gparted xz"
-DEPENDS="dosfstools libQtCore libQtGui mtools p7zip-full"
+compile_rules() {
+	install -Dm755 $TARBALL $install/usr/libexec/$TARBALL
 
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/lib/$PACKAGE
-  cp -a $src/* $install/usr/lib/$PACKAGE
-  chmod +x $install/usr/lib/$PACKAGE/$PACKAGE-$SYSTEM-$VERSION.bin
-
-  mkdir -p $install/usr/bin
-  cp -a $stuff/* $install/usr/bin
-  chmod +x $install/usr/bin/unetbootin
-
-  mkdir -p $install/usr/share/applications
-
-cat > $install/usr/share/applications/$PACKAGE.desktop <<EOT
-[Desktop Entry]
-Type=Application
-Name=Unetbootin
-Comment=Unetbootin allows you to create bootable Live USB drives.
-Categories=GTK;System;Filesystem;
-StartupNotify=false
-Terminal=false
-Icon=drive-harddisk-usb
-Exec=unetbootin
-
-EOT
+	mkdir -p $install/usr/bin
+	sed "s|@VERSION@|$VERSION|" $stuff/unetbootin.in > $install/usr/bin/unetbootin
+	chmod 755 $install/usr/bin/unetbootin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="dosfstools libQtCore libQtGui mtools p7zip-full"
+	SUGGESTED="bash gparted xz"
 }
diff -r ad29ddfee1c9 -r d5aab818505e unetbootin/stuff/unetbootin
--- a/unetbootin/stuff/unetbootin	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-tazbox su /usr/lib/unetbootin/unetbootin-linux-625.bin
\ No newline at end of file
diff -r ad29ddfee1c9 -r d5aab818505e unetbootin/stuff/unetbootin.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/unetbootin/stuff/unetbootin.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Unetbootin
+Comment=Unetbootin allows you to create bootable Live USB drives
+Categories=GTK;System;Filesystem;
+StartupNotify=false
+Terminal=false
+Exec=unetbootin
+Icon=drive-harddisk-usb
diff -r ad29ddfee1c9 -r d5aab818505e unetbootin/stuff/unetbootin.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/unetbootin/stuff/unetbootin.in	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+tazbox su /usr/libexec/unetbootin-linux-@VERSION@.bin
diff -r ad29ddfee1c9 -r d5aab818505e unfs3/receipt
--- a/unfs3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unfs3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.9.22"
 CATEGORY="network"
 SHORT_DESC="User-land NFSv3 Server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://unfs3.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="http://ovh.dl.sourceforge.net/sourceforge/unfs3/${TARBALL}"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="flex"
 
@@ -30,8 +30,7 @@
 }
 
 post_install() {
-	[ -n "$quiet" ] ||
-	cat <<EOT
+	[ -n "$quiet" ] || cat <<EOT
 
 	.----------------------------------------------.
 	| To start unfs3 server you can run:           |
diff -r ad29ddfee1c9 -r d5aab818505e unifont/receipt
--- a/unifont/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unifont/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="unifont"
 VERSION="8.0.01"
 CATEGORY="fonts"
-SHORT_DESC="The Standard GNU Unifont TTF."
-MAINTAINER="hackdorte@sapo.pt"
+SHORT_DESC="The Standard GNU Unifont TTF"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://unifoundry.com/"
 
 TARBALL="$PACKAGE-$VERSION.ttf"
 WGET_URL="${WEB_SITE}pub/$PACKAGE-$VERSION/font-builds/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-  mkdir -p $install/usr/share/fonts/$PACKAGE
-  cp -a $src/* $install/usr/share/fonts/$PACKAGE
+compile_rules() {
+	mkdir -p $install/usr/share/fonts/$PACKAGE
+	cp -a $src/* $install/usr/share/fonts/$PACKAGE
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-  cp -a $install/* $fs
-}
\ No newline at end of file
+genpkg_rules() {
+	copy @std
+}
diff -r ad29ddfee1c9 -r d5aab818505e unionfs-fuse/receipt
--- a/unionfs-fuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unionfs-fuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,10 +3,8 @@
 PACKAGE="unionfs-fuse"
 VERSION="0.24"
 CATEGORY="system-tools"
-SHORT_DESC="unionfs-fuse is an effort to create a userland unionfs \
-implementation that is way more flexible than the current in-kernel based \
-unionfs solution"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Flexible userland unionfs implementation"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://podgorny.cz/moin/UnionFsFuse"
 
@@ -22,7 +20,8 @@
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		. &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e units/receipt
--- a/units/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/units/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,24 @@
 PACKAGE="units"
 VERSION="2.02"
 CATEGORY="utilities"
-SHORT_DESC="Units converter."
+SHORT_DESC="Units converter"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org"
 WGET_URL="http://ftp.gnu.org/gnu/units/$TARBALL"
-SUGGESTED="python" # to run units_cur
 
-DEPENDS="readline ncurses"
 BUILD_DEPENDS="readline-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make -j1 DESTDIR=$DESTDIR install
+	make &&
+	make -j1 DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/units $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="readline ncurses"
+	SUGGESTED="python" # to run units_cur
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e unixODBC/receipt
--- a/unixODBC/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unixODBC/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="ftp://ftp.unixodbc.org/pub/unixODBC/$TARBALL"
 
 BUILD_DEPENDS="readline-dev"
-SPLIT="libunixODBC unixODBC unixODBC-dev"
+SPLIT="libunixODBC $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -23,7 +23,7 @@
 	fix libtool &&
 	make $MAKEFLAGS &&
 	mkdir -p $install/etc/unixODBC/ &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	find doc -name "Makefile*" -delete
 	find doc -type f -exec chmod 644 '{}' \;
diff -r ad29ddfee1c9 -r d5aab818505e unrar/receipt
--- a/unrar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unrar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.5.8"
 CATEGORY="utilities"
 SHORT_DESC="The free UnRar"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="freeware"
 WEB_SITE="https://www.rarlab.com/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/unrar.html"
diff -r ad29ddfee1c9 -r d5aab818505e unshield/receipt
--- a/unshield/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/unshield/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5"
 CATEGORY="utilities"
 SHORT_DESC="Extract files from InstallShield CAB archive"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://sourceforge.net/projects/synce/"
 
@@ -19,7 +19,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e upower/receipt
--- a/upower/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/upower/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="upower"
 VERSION="0.99.7"
 CATEGORY="system-tools"
-SHORT_DESC="UPower is an abstraction for enumerating power devices"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Abstraction for enumerating power devices"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://upower.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/upower.html"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="gobject-introspection-dev libxslt gtk-doc glib-dev eudev-dev \
 libgudev-dev libusb-dev intltool dbus-introspect"
-SPLIT="upower-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e urlgrabber/receipt
--- a/urlgrabber/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/urlgrabber/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="urlgrabber"
 VERSION="3.9.1"
 CATEGORY="development"
-SHORT_DESC="A high-level cross-protocol url-grabber and Python library."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="A high-level cross-protocol url-grabber and Python library"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="http://urlgrabber.baseurl.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://urlgrabber.baseurl.org/"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-DEPENDS="python pycurl"
 BUILD_DEPENDS="python-dev pycurl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --prefix=/usr --root=$DESTDIR --optimize=1
+compile_rules() {
+	python -B setup.py install --prefix=/usr --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="python pycurl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e urxvt/receipt
--- a/urxvt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/urxvt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="9.22"
 CATEGORY="utilities"
 SHORT_DESC="Terminal emulator with Unicode support for X11"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://software.schmorp.de/pkg/rxvt-unicode.html"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libICE-dev gdk-pixbuf-dev \
 startup-notification-dev xorg-libXmu-dev xorg-libXft-dev perl-dev ncurses-extra"
-SPLIT="urxvt-full:full"
+SPLIT="$PACKAGE-full:full"
 
 compile_rules() {
 	case $SET in
@@ -21,7 +21,8 @@
 			./configure \
 				--disable-everything \
 				$CONFIGURE_ARGS &&
-			make && make install
+			make &&
+			make install
 			;;
 		full)
 			./configure \
@@ -29,7 +30,8 @@
 				--enable-256-color \
 				--with-terminfo=/usr/share/terminfo \
 				$CONFIGURE_ARGS &&
-			make && make install || return 1
+			make &&
+			make install || return 1
 
 			R="$install/usr/share/terminfo"
 			mkdir -p $R
diff -r ad29ddfee1c9 -r d5aab818505e usb-modeswitch-data/receipt
--- a/usb-modeswitch-data/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usb-modeswitch-data/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,25 @@
 PACKAGE="usb-modeswitch-data"
 VERSION="20160612"
 CATEGORY="system-tools"
-SHORT_DESC="Device database and the rules file for usb_modeswitch."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Device database and the rules file for usb_modeswitch"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.draisberghof.de/usb_modeswitch/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.draisberghof.de/usb_modeswitch/$TARBALL"
 
-DEPENDS="usb-modeswitch"
 BUILD_DEPENDS="coreutils-operations"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make install
+compile_rules() {
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/lib/udev $fs/etc
 	cp -a $install/usr $fs
+	DEPENDS="usb-modeswitch"
 }
diff -r ad29ddfee1c9 -r d5aab818505e usb-modeswitch/receipt
--- a/usb-modeswitch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usb-modeswitch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -2,26 +2,24 @@
 
 PACKAGE="usb-modeswitch"
 VERSION="2.4.0"
-PACKAGE_DATA="${PACKAGE}-data-20160612"
 CATEGORY="system-tools"
-SHORT_DESC="Handling Mode-Switching USB Devices on Linux."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Handling Mode-Switching USB Devices on Linux"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.draisberghof.de/usb_modeswitch/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="http://www.draisberghof.de/usb_modeswitch/$TARBALL"
+PACKAGE_DATA="$PACKAGE-data-20160612"
 EXTRA_SOURCE_FILES="$PACKAGE_DATA.tar.bz2 usb_modeswitch.setup"
-WGET_URL="http://www.draisberghof.de/usb_modeswitch/$TARBALL"
-TAGS="3g-modem"
 
-DEPENDS="libusb"
 BUILD_DEPENDS="libusb-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir -p $DESTDIR/etc $DESTDIR/lib/udev/usb_modeswitch $DESTDIR/usr/share/man/man1
-	make && make install-static
+compile_rules() {
+	mkdir -p $install/etc $install/lib/udev/usb_modeswitch $install/usr/share/man/man1
+
+	make &&
+	make install-static
 
 	# download data
 	[ -s $SRC/$PACKAGE_DATA.tar.bz2 ] ||
@@ -35,9 +33,7 @@
 			$WEB_SITE/device_reference.txt
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc/usb_modeswitch.d  $fs/lib/udev/rules.d
 	cp -a $install/etc $fs
 	cp -a $install/lib $fs
@@ -47,4 +43,6 @@
 	cp -a $src/$PACKAGE_DATA/40-usb_modeswitch.rules $fs/lib/udev/rules.d
 	cp -a $SRC/usb_modeswitch.setup $fs/etc/
 	chown -R root.root $fs
+	DEPENDS="libusb"
+	TAGS="3g-modem"
 }
diff -r ad29ddfee1c9 -r d5aab818505e usbids/receipt
--- a/usbids/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbids/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20180504"
 CATEGORY="misc"
 SHORT_DESC="List of USB ID's"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="PublicDomain"
 WEB_SITE="http://www.linux-usb.org/usb-ids.html"
 
diff -r ad29ddfee1c9 -r d5aab818505e usbip/receipt
--- a/usbip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="automake libtool sysfsutils-dev libwrap-dev glib-dev"
-SPLIT="usbip-dev"
+SPLIT="$PACKAGE-dev"
 
 # From usbip web site: http://usbip.sourceforge.net/#download
 #
@@ -29,7 +29,9 @@
 
 	cd $src/src
 	./autogen.sh &&
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e usbmanager/receipt
--- a/usbmanager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbmanager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="usbmanager"
 VERSION="1.0.0"
@@ -7,24 +7,21 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="LGPL3"
 WEB_SITE="https://launchpad.net/usbmanager"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://launchpad.net/$PACKAGE/1.x-hal/$VERSION/+download/$TARBALL"
 
-DEPENDS="python dbus-glib python-dbus notify-python python-pygobject2 \
-python-pygtk util-linux-whereis util-linux-mkfs mtools"
-BUILD_DEPENDS="python gettext"
+BUILD_DEPENDS="python gettext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	msgfmt $src/locale/ru.po -o $src/locale/ru.mo
-	./setup.py build
-	./setup.py install --root=$DESTDIR
+
+	python -B setup.py build
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="python dbus-glib python-dbus notify-python python-pygobject2 \
+	python-pygtk util-linux-whereis util-linux-mkfs mtools"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e usbmuxd/receipt
--- a/usbmuxd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbmuxd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.7"
 CATEGORY="misc"
 SHORT_DESC="USB Multiplex Daemon"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 GPL3 LGPL2.1"
 WEB_SITE="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 
@@ -12,14 +12,19 @@
 WGET_URL="http://marcansoft.com/uploads/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cmake libusb-dev libplist-dev"
-SPLIT="usbmuxd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/lib/udev/rules.d/|/etc/udev/rules.d/|g' udev/CMakeLists.txt
+
 	mkdir build
-	cd build
-	cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
-	make && make install
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		-DLIB_SUFFIX="" \
+		.. &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e usbredir/receipt
--- a/usbredir/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbredir/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="http://spice-space.org/download/usbredir/$TARBALL"
 
 BUILD_DEPENDS="glib libusb-dev"
-SPLIT="usbredir-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e usbutils/receipt
--- a/usbutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/usbutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="009"
 CATEGORY="system-tools"
 SHORT_DESC="Displaying information about USB"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://linux-usb.sourceforge.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/usbutils.html"
@@ -13,7 +13,7 @@
 WGET_URL="https://www.kernel.org/pub/linux/utils/usb/usbutils/$TARBALL"
 
 BUILD_DEPENDS="libusb-dev zlib-dev"
-SPLIT="usbutils-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
@@ -25,9 +25,13 @@
 
 genpkg_rules() {
 	case $PACKAGE in
+		*-python)
+			copy *.py
+			DEPENDS="python   usbids"
+			CAT="lsusb for Python"
+			;;
 		usbutils)
-			copy @std
-			find $fs -name '*.py' -delete
+			copy @std @rm
 			DEPENDS="eudev libusb   usbids"
 			TAGS="usb"
 			;;
diff -r ad29ddfee1c9 -r d5aab818505e util-linux/receipt
--- a/util-linux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/util-linux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.32.1"
 CATEGORY="meta"
 SHORT_DESC="Random collection of Linux utilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2 LGPL2.1 BSD PublicDomain"
 WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
 LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/util-linux.html"
@@ -13,22 +13,17 @@
 WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="libcap-dev readline-dev python-dev glib gtk-doc \
-libxslt gettext ncurses-dev zlib-dev"
+libxslt gettext-dev ncurses-dev zlib-dev"
 COOKOPTS="!menus"
-SPLIT="util-linux-bash-completion util-linux-blkid util-linux-blkid-dev \
-util-linux-blockdev util-linux-cfdisk util-linux-column util-linux-cramfs \
-util-linux-eject util-linux-fdisk util-linux-fdisk-dev util-linux-flock \
-util-linux-getopt util-linux-manpages util-linux-minix util-linux-mkfs \
-util-linux-mount util-linux-mount-dev util-linux-partx util-linux-setterm \
-util-linux-sfdisk util-linux-smartcols util-linux-smartcols-dev \
-util-linux-uuid util-linux-uuid-dev util-linux-whereis util-linux-misc"
+SPLIT="$PACKAGE-bash-completion $PACKAGE-blkid $PACKAGE-blkid-dev \
+$PACKAGE-blockdev $PACKAGE-cfdisk $PACKAGE-column $PACKAGE-cramfs \
+$PACKAGE-eject $PACKAGE-fdisk $PACKAGE-fdisk-dev $PACKAGE-flock \
+$PACKAGE-getopt $PACKAGE-manpages $PACKAGE-minix $PACKAGE-mkfs \
+$PACKAGE-mount $PACKAGE-mount-dev $PACKAGE-partx $PACKAGE-setterm \
+$PACKAGE-sfdisk $PACKAGE-smartcols $PACKAGE-smartcols-dev \
+$PACKAGE-uuid $PACKAGE-uuid-dev $PACKAGE-whereis $PACKAGE-misc"
 
 compile_rules() {
-	# Fix undeclared 'LINE_MAX'
-	case "$ARCH" in
-		arm) sed -i s'|LINE_MAX|25|' text-utils/*.c ;;
-	esac
-
 	mkdir -p $install/var/lib/hwclock
 	./configure \
 		ADJTIME_PATH=/var/lib/hwclock/adjtime \
@@ -37,7 +32,7 @@
 		--without-systemdsystemunitdir &&
 	fix libtool &&
 	make &&
-	make install || exit 1
+	make install || return 1
 
 	install -Dm644 $stuff/cfdisk.desktop \
 		$install/usr/share/applications/cfdisk.desktop
diff -r ad29ddfee1c9 -r d5aab818505e utox/receipt
--- a/utox/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/utox/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,17 +4,14 @@
 VERSION="20140903"
 CATEGORY="network"
 SHORT_DESC="A New Kind of Instant Messaging"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
-TARBALL="${PACKAGE}-${VERSION}.tar.xz"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+
 WEB_SITE="https://tox.im/"
 WGET_URL="https://jenkins.libtoxcore.so/job/uTox_linux_i686/lastSuccessfulBuild/artifact/utox/utox_linux_i686.tar.xz"
 
-DEPENDS="dbus bzlib xorg-libX11 gtk2"
-BUILD_DEPENDS="wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	install -D ${src}/${TARBALL} ${fs}/usr/bin/utox
+genpkg_rules() {
+	install -D $src/$TARBALL $fs/usr/bin/utox
+	DEPENDS="dbus bzlib xorg-libX11 gtk2"
 }
diff -r ad29ddfee1c9 -r d5aab818505e v4l-utils/receipt
--- a/v4l-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/v4l-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://linuxtv.org/downloads/v4l-utils/$TARBALL"
 
-BUILD_DEPENDS="libjpeg-turbo-dev perl gettext alsa-lib-dev eudev-dev"
-SPLIT="v4l-utils-dev"
+BUILD_DEPENDS="libjpeg-turbo-dev perl gettext-dev alsa-lib-dev eudev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e v4l4j/receipt
--- a/v4l4j/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/v4l4j/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,26 @@
 PACKAGE="v4l4j"
 VERSION="0.9.1"
 CATEGORY="development"
-SHORT_DESC="v4l4j is a java JNI wrapper to access the Video4Linux API."
+SHORT_DESC="Java JNI wrapper to access the Video4Linux API"
 MAINTAINER="yuripourre@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://code.google.com/p/v4l4j/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://github.com/yuripourre/v4l4j/releases/download/v0.9.1/$TARBALL"
-TAGS="java"
 
-DEPENDS="v4l-utils jpeg icedtea6-jre"
 BUILD_DEPENDS="v4l-utils-dev jpeg-dev apache-ant icedtea6-jdk"
 
-compile_rules()
-{
+compile_rules() {
 	export JAVA_HOME=/usr/lib/jvm/java-icedtea/
 	ant clean all
 	ant -Ddestdir=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
 	#Remove logo images
 	rm -rf $fs/usr/share/pixmaps/
+	DEPENDS="v4l-utils jpeg icedtea6-jre"
+	TAGS="java"
 }
diff -r ad29ddfee1c9 -r d5aab818505e vala/receipt
--- a/vala/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vala/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.40.3"
 CATEGORY="development"
 SHORT_DESC="Compiler for the GObject type system"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="https://wiki.gnome.org/Projects/Vala"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/vala.html"
diff -r ad29ddfee1c9 -r d5aab818505e valgrind/receipt
--- a/valgrind/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/valgrind/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://sourceware.org/ftp/valgrind/$TARBALL"
 
 BUILD_DEPENDS="perl"
-SPLIT="valgrind-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# glibc-2.26 bug
diff -r ad29ddfee1c9 -r d5aab818505e vamp-plugin-sdk/receipt
--- a/vamp-plugin-sdk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vamp-plugin-sdk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,10 +12,12 @@
 WGET_URL="https://code.soundsoftware.ac.uk/attachments/download/2206/$TARBALL"
 
 BUILD_DEPENDS="libsndfile-dev"
-SPLIT="vamp-plugin-sdk-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vanessa_adt/receipt
--- a/vanessa_adt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vanessa_adt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,20 +6,20 @@
 SHORT_DESC="Abstract Data Types"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.vergenet.net/linux/vanessa"
+WEB_SITE="http://horms.net/projects/vanessa/"
 REPOLOGY="vanessa-adt"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" # FIXME
 
 BUILD_DEPENDS="vanessa_logger-dev vanessa_logger"
-SPLIT="vanessa_adt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vanessa_logger/receipt
--- a/vanessa_logger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vanessa_logger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,19 +6,19 @@
 SHORT_DESC="Generic logging layer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.vergenet.net/linux/vanessa"
+WEB_SITE="http://horms.net/projects/vanessa/"
 REPOLOGY="vanessa-logger"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" # FIXME
 
-SPLIT="vanessa_logger-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vanessa_socket/receipt
--- a/vanessa_socket/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vanessa_socket/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,20 +6,20 @@
 SHORT_DESC="Simplifies TCP/IP socket operations"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.vergenet.net/linux/vanessa"
+WEB_SITE="http://horms.net/projects/vanessa/"
 REPOLOGY="vanessa-socket"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" # FIXME
 
 BUILD_DEPENDS="vanessa_logger-dev vanessa_logger popt-dev"
-SPLIT="vanessa_socket-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e varka/receipt
--- a/varka/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/varka/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 WGET_URL="bzr|lp:varka"
 
 BUILD_DEPENDS="bzr cmake gobject-introspection-dev gtk3-dev glib-dev vala \
-gettext-tools"
-SPLIT="varka-dev"
+gettext"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS $(pkg-config --libs gio-unix-2.0 gmodule-2.0)"
diff -r ad29ddfee1c9 -r d5aab818505e vcdimager/receipt
--- a/vcdimager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vcdimager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,16 @@
 PACKAGE="vcdimager"
 VERSION="0.7.24"
 CATEGORY="multimedia"
-SHORT_DESC="vcd tools"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="VCD tools"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.vcdimager.org/"
+WEB_SITE="http://www.gnu.org/software/vcdimager/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libcdio libcdio-dev libxml2-dev popt-dev gfortran"
-SPLIT="vcdimager-xmltools vcdimager vcdimager-dev"
+SPLIT="$PACKAGE-xmltools $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -28,7 +28,7 @@
 			DEPENDS="libcdio libxml2 popt"
 			TAGS="multimedia video vcd"
 			;;
-		vcdimager-xmltools)
+		*-xmltools)
 			copy @std @rm
 			DEPENDS="vcdimager"
 			CAT="multimedia|vcd xml and diagnostic tools"
diff -r ad29ddfee1c9 -r d5aab818505e vde2/receipt
--- a/vde2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vde2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/vde/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev" # python-dev libpcap-dev
-SPLIT="vde2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Disable size optimization (and use default) because inlining functions
diff -r ad29ddfee1c9 -r d5aab818505e verbiste/receipt
--- a/verbiste/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/verbiste/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="verbiste"
 VERSION="0.1.33"
 CATEGORY="office"
-SHORT_DESC="Verbiste is a French conjugation system"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="French conjugation system"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://perso.b2b2c.ca/~sarrazip/dev/verbiste.html"
 
@@ -19,8 +19,7 @@
 	make &&
 	make install || return 1
 
-	mkdir -p $install/usr/share/pixmaps/
-	cp $src/src/gtk/verbiste.png $install/usr/share/pixmaps/
+	install -Dm644 src/gtk/verbiste.png $install/usr/share/pixmaps/verbiste.png
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vfsync/receipt
--- a/vfsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vfsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,9 +13,7 @@
 
 BUILD_DEPENDS="openssl-dev curl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
 	bindir=$install/usr/bin &&
 	docdir=$install/usr/share/doc/$PACKAGE-$VERSION &&
@@ -24,9 +22,7 @@
 	cp readme.txt $docdir
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="openssl libcurl"
 }
diff -r ad29ddfee1c9 -r d5aab818505e vfu/receipt
--- a/vfu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vfu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="vfu"
 VERSION="4.12"
 CATEGORY="utilities"
-SHORT_DESC="VFU is a console (text mode) file manager for UNIX/Linux"
+SHORT_DESC="Console file manager for UNIX/Linux"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://cade.datamax.bg/vfu/"
diff -r ad29ddfee1c9 -r d5aab818505e vice/receipt
--- a/vice/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vice/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/vice-emu/$TARBALL"
 
-BUILD_DEPENDS="automake xa gettext ffmpeg-dev alsa-lib-dev lame-dev \
+BUILD_DEPENDS="automake xa gettext-dev ffmpeg-dev alsa-lib-dev lame-dev \
 libvorbis-dev flac-dev pciutils-dev readline-dev libpng16-dev giflib-dev \
 libjpeg-turbo-dev portaudio-dev mpg123-dev xorg-libICE-dev gtk2-dev \
 vte-gtk2-dev gtkglext-dev mesa-dev xorg-libXxf86vm-dev xorg-libXrandr-dev \
diff -r ad29ddfee1c9 -r d5aab818505e vidalia/receipt
--- a/vidalia/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vidalia/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,27 @@
 PACKAGE="vidalia"
 VERSION="0.2.21"
 CATEGORY="network"
-SHORT_DESC="Controller GUI for the Tor software."
+SHORT_DESC="Controller GUI for the Tor software"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2 LGPL3"
+WEB_SITE="https://www.torproject.org/vidalia/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.torproject.org/vidalia/"
 WGET_URL="https://www.torproject.org/dist/$PACKAGE/$TARBALL"
 
-DEPENDS="tor libQtGui libQtXml mesa-libegl"
 BUILD_DEPENDS="cmake Qt4-dev qmake mesa-libegl openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	mkdir build && cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .. &&
-	make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/ $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="tor libQtGui libQtXml mesa-libegl"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e viewnior/receipt
--- a/viewnior/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/viewnior/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,13 @@
 VERSION="1.6"
 CATEGORY="graphics"
 SHORT_DESC="Fast and elegant image viewer"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://siyanpanayotov.com/project/viewnior/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/xsisqox/Viewnior/archive/$TARBALL"
 
-BUILD_DEPENDS_arm="automake libtool gtk2-dev exiv2-dev intltool"
 BUILD_DEPENDS="automake libtool gtk2-dev exiv2-dev intltool \
 shared-mime-info-dev curl-dev libssh-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e vifm/receipt
--- a/vifm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vifm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="ncurses-dev libmagic-dev xorg-libX11-dev util-linux-whereis vim \
-file mdocml util-linux-column perl"
+file mandoc util-linux-column perl"
 
 compile_rules() {
 	sed -i 's|PACKAGE_DATA_DIR|"/usr/share/vifm"|' src/int/vim.c
diff -r ad29ddfee1c9 -r d5aab818505e vim/receipt
--- a/vim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="8.1.0436"
 CATEGORY="editors"
 SHORT_DESC="Advanced text editor"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.vim.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/vim/vim/archive/v$VERSION.tar.gz"
 
-BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext"
-SPLIT="vim-tiny:tiny"
+BUILD_DEPENDS="python ncurses-dev acl-dev diffutils gettext-dev"
+SPLIT="$PACKAGE-tiny:tiny"
 
 compile_rules() {
 	echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
diff -r ad29ddfee1c9 -r d5aab818505e virt-manager/receipt
--- a/virt-manager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/virt-manager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Console user interface for managing virtual machines"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://virt-manager.org/"
+WEB_SITE="https://virt-manager.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://virt-manager.org/download/sources/virt-manager/$TARBALL"
@@ -14,9 +14,8 @@
 BUILD_DEPENDS="grep glib-dev intltool"
 
 compile_rules() {
-	python setup.py build &&
-
-	python setup.py \
+	python -B setup.py build &&
+	python -B setup.py \
 		--no-update-icon-cache \
 		--no-compile-schemas \
 		install --root $install
diff -r ad29ddfee1c9 -r d5aab818505e virtualbox-ose/receipt
--- a/virtualbox-ose/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/virtualbox-ose/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="misc"
 SHORT_DESC="Powerful x86 virtualization for enterprise as well as home use \
 (Open Source Edition)"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.virtualbox.org/"
 
@@ -18,7 +18,7 @@
 xerces-c-dev openssl-dev zlib-dev libcap-dev glib-dev libvncserver-dev \
 pam pam-dev bzip2 linux-module-headers tar vde2-dev \
 libpng16-dev gsoap-dev libdevmapper-dev makeself cdrkit flex"
-SPLIT="virtualbox-ose-guestutils"
+SPLIT="$PACKAGE-guestutils"
 
 compile_rules() {
 	cp $stuff/LocalConfig.kmk .
diff -r ad29ddfee1c9 -r d5aab818505e virtualenv/receipt
--- a/virtualenv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/virtualenv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,25 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="virtualenv"
 VERSION="1.5.1"
 CATEGORY="development"
-SHORT_DESC="Virtual Python Environment Builder."
-MAINTAINER="taziden@slitaz.org"
+SHORT_DESC="Virtual Python Environment Builder"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://pypi.org/project/virtualenv/"
 REPOLOGY="python:virtualenv"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://files.pythonhosted.org/packages/source/v/virtualenv/$TARBALL"
-TAGS="python"
 
-DEPENDS="python python-dev"
-BUILD_DEPENDS="python python-dev"
+BUILD_DEPENDS="python-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python"
+	TAGS="python"
 }
diff -r ad29ddfee1c9 -r d5aab818505e visualboyadvance/receipt
--- a/visualboyadvance/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/visualboyadvance/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.2"
 CATEGORY="games"
 SHORT_DESC="An emulator for Gameboy and GameboyAdvance systems"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://vba.ngemu.com/"
 
@@ -27,7 +27,7 @@
 		--disable-dev \
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/visualboyadvance-gtk.desktop \
 		$install/usr/share/applications/visualboyadvance-gtk.desktop
diff -r ad29ddfee1c9 -r d5aab818505e visualnqc/receipt
--- a/visualnqc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/visualnqc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0-1"
 CATEGORY="development"
 SHORT_DESC="An iconic language for the Lego Mindstorms RCX"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL"
 WEB_SITE="http://funsoftware.sourceforge.net/"
 
@@ -12,8 +12,8 @@
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
 compile_rules() {
-	mkdir -p $DESTDIR
-	cp -a $src/usr $DESTDIR
+	mkdir -p $install
+	cp -a $src/usr $install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vivaldi/receipt
--- a/vivaldi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vivaldi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,7 +7,6 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="custom"
 WEB_SITE="https://vivaldi.com/"
-HOST_ARCH="i486 x86_64"
 
 TARBALL="vivaldi-stable-$VERSION-1.${ARCH/i486/i386}.rpm"
 WGET_URL="https://downloads.vivaldi.com/stable/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e vkeybd/receipt
--- a/vkeybd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vkeybd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,36 +3,34 @@
 PACKAGE="vkeybd"
 VERSION="0.1.18d"
 CATEGORY="multimedia"
-SHORT_DESC="Virtual Midi keyboard."
+SHORT_DESC="Virtual MIDI keyboard"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.alsa-project.org/~tiwai/alsa.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://ftp.riken.jp/Linux/suse/people/tiwai/vkeybd/$TARBALL"
 
-DEPENDS="tk tcl alsa-lib xorg-libX11"
 BUILD_DEPENDS="tk-dev tcl-dev alsa-lib-dev xorg-libX11-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	# Hack makefile
-	TCL_VERSION=$(sed '/TCL_VERSION/!d;s/.*"\(.*\)"/\1/' /usr/include/tcl.h)
-	sed -i "s|PREFIX = /usr/local|PREFIX = /usr|; \
-	s|TCL_VERSION = 8.4|TCL_VERSION = $TCL_VERSION|" Makefile
+	TCL_VERSION=$(sed '/TCL_VERSION/!d;s/.*"\(.*\)"/\1/' /usr/include/tcl.h)	#"
+	sed \
+		-e 's|PREFIX = /usr/local|PREFIX = /usr|' \
+		-e "s|TCL_VERSION = 8.4|TCL_VERSION = $TCL_VERSION|" \
+		-i Makefile
+
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $install/* $fs
 	# copy .desktop file and pixmap
 	cp -a $src/vkeybd.desktop $fs/usr/share/applications
-	cp -a $src/pixmaps/vkeybd_48x48.png $fs/usr/share/pixmaps	
+	cp -a $src/pixmaps/vkeybd_48x48.png $fs/usr/share/pixmaps
 	chown -R root.root $fs
+	DEPENDS="tk tcl alsa-lib xorg-libX11"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e vlc-plugin/receipt
--- a/vlc-plugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vlc-plugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vlc-plugin"
 VERSION="2.0.0"
 CATEGORY="multimedia"
 SHORT_DESC="VLC Web Browser Plug-in that will allow to play video and audio"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.videolan.org/vlc"
+
 SOURCE="npapi-vlc"
 TARBALL="$SOURCE-$VERSION.tar.xz"
 WGET_URL="http://download.videolan.org/pub/videolan/vlc/$VERSION/$TARBALL"
 
-DEPENDS="libvlc dbus"
 BUILD_DEPENDS="firefox-dev libvlc-dev dbus-dev gtk2-dev util-linux-uuid-dev"
-TAGS="browser plug-in"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/mozilla/plugins
 	cp -a $install/usr/lib/mozilla/plugins/*so $fs/usr/lib/mozilla/plugins
+	DEPENDS="libvlc dbus"
+	TAGS="browser plug-in"
 }
diff -r ad29ddfee1c9 -r d5aab818505e vlc/receipt
--- a/vlc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vlc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,25 @@
 VERSION="2.2.3"
 CATEGORY="multimedia"
 SHORT_DESC="MPEG, VCD/DVD, and DivX player"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.videolan.org/vlc/"
 WGET_URL="http://download.videolan.org/pub/videolan/$PACKAGE/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="Qt4-dev alsa-lib-dev dbus-dev ffmpeg-dev gettext \
+BUILD_DEPENDS="Qt4-dev alsa-lib-dev dbus-dev ffmpeg-dev gettext-dev \
 libmad-dev lua5.1-dev tar xorg-xcb-util-dev yasm expat-dev libxml2-dev \
 util-linux-uuid-dev x264-dev flac-dev taglib-dev gnutls-dev libupnp-dev \
 libsamplerate-dev fribidi-dev zvbi-dev opus-dev gmp-dev ncurses-dev x265-dev"
-SPLIT="vlc libvlc-dev libvlc vlc-locale"
+SPLIT="libvlc-dev libvlc $PACKAGE-locale"
 
-compile_rules()
-{
-	[ -s /var/lib/dbus/machine-id ] || dbus-uuidgen > /var/lib/dbus/machine-id
-	cd $src
+compile_rules() {
+	[ -s /var/lib/dbus/machine-id ] || dbus-uuidgen >/var/lib/dbus/machine-id
+
 	[ -e /usr/bin/luac ] || ln -s luac5.1 /usr/bin/luac
+
 	sed -i 's/ERROR_zip_cannot/error_zip_cannot/' modules/access/zip/zipstream.c
-	# export ncurses paths 
+	# export ncurses paths
 	export NCURSES_CFLAGS="-I/usr/include"
 	export NCURSES_LIBS="-L/lib -lncurses"
 	./configure \
@@ -40,48 +40,47 @@
 	[ -L /usr/bin/luac ] && rm -f /usr/bin/luac
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	vlc)
-		TAGS="audio video multimedia movie player"
-		DEPENDS="libQtCore libQtGui libvlc"
-		mkdir -p $fs/usr/share/pixmaps
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/share/$PACKAGE $fs/usr/share
-		#Remove extra icons
-		rm $fs/usr/share/$PACKAGE/*.ico
-		#copy vlc icon
-		cp -a $install/usr/share/icons/hicolor/16x16/apps/vlc.png $fs/usr/share/pixmaps
-		#Remove unnecessary fonts
-		rm $fs/usr/share/$PACKAGE/skins2/fonts/*
-		;;
-	libvlc-dev)
-		mkdir -p $fs/usr/lib $fs/usr/include $fs/usr/bin
-		#cp $src/vlc-config $fs/usr/bin
-		cp -a $install/usr/lib/*a $fs/usr/lib/
-		cp -a $install/usr/lib/pkgconfig $fs/usr/lib/
-		cp -a $install/usr/include/vlc $fs/usr/include
-		cp -a $install/usr/lib/vlc $fs/usr/lib/
-		rm $fs/usr/lib/vlc/plugins/*/*.so
-		;;
-	libvlc)
-		CAT="multimedia|MPEG, VCD/DVD, and DivX library"
-		DEPENDS="alsa-lib dbus ffmpeg libmad lua5.1 tar x264 x265 xorg-xcb-util zvbi nettle"
-		mkdir -p $fs/usr/lib
-		cp -a $install/usr/lib/*so* $fs/usr/lib/
-		cp -a $install/usr/lib/vlc $fs/usr/lib/
-		# Remove libtool archives
-		rm $fs/usr/lib/vlc/plugins/*/*.la
-		;;
-	vlc-locale)
-		CAT="multimedia|Locale files for vlc"
-		SUGGESTED="vlc"
-		for i in de el en:en_GB es fa fr pl pt_BR ru sv zh_CN zh_TW ; do
-			install -D -m 644 -o root -g root $src/po/${i#*:}.gmo \
-				$fs/usr/share/locale/${i%:*}/LC_MESSAGES/vlc.mo
-		done
-		;;
+		vlc)
+			mkdir -p $fs/usr/share/pixmaps
+			cp -a $install/usr/bin $fs/usr
+			cp -a $install/usr/share/$PACKAGE $fs/usr/share
+			#Remove extra icons
+			rm $fs/usr/share/$PACKAGE/*.ico
+			#copy vlc icon
+			cp -a $install/usr/share/icons/hicolor/16x16/apps/vlc.png $fs/usr/share/pixmaps
+			#Remove unnecessary fonts
+			rm $fs/usr/share/$PACKAGE/skins2/fonts/*
+			DEPENDS="libQtCore libQtGui libvlc"
+			TAGS="audio video multimedia movie player"
+			;;
+		libvlc-dev)
+			mkdir -p $fs/usr/lib $fs/usr/include $fs/usr/bin
+			#cp $src/vlc-config $fs/usr/bin
+			cp -a $install/usr/lib/*a $fs/usr/lib/
+			cp -a $install/usr/lib/pkgconfig $fs/usr/lib/
+			cp -a $install/usr/include/vlc $fs/usr/include
+			cp -a $install/usr/lib/vlc $fs/usr/lib/
+			rm $fs/usr/lib/vlc/plugins/*/*.so
+			;;
+		libvlc)
+			mkdir -p $fs/usr/lib
+			cp -a $install/usr/lib/*so* $fs/usr/lib/
+			cp -a $install/usr/lib/vlc $fs/usr/lib/
+			# Remove libtool archives
+			rm $fs/usr/lib/vlc/plugins/*/*.la
+			DEPENDS="alsa-lib dbus ffmpeg libmad lua5.1 tar x264 x265 \
+			xorg-xcb-util zvbi nettle"
+			CAT="multimedia|MPEG, VCD/DVD, and DivX library"
+			;;
+		vlc-locale)
+			for i in de el en:en_GB es fa fr pl pt_BR ru sv zh_CN zh_TW; do
+				install -Dm644 -o root -g root $src/po/${i#*:}.gmo \
+					$fs/usr/share/locale/${i%:*}/LC_MESSAGES/vlc.mo
+			done
+			CAT="multimedia|locale files"
+			SUGGESTED="vlc"
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e vmtouch/receipt
--- a/vmtouch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vmtouch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,21 @@
 PACKAGE="vmtouch"
 VERSION="1.1.0"
 CATEGORY="utilities"
-SHORT_DESC="The Virtual Memory Toucher."
+SHORT_DESC="The Virtual Memory Toucher"
 MAINTAINER="paul@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="https://hoytech.com/vmtouch/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="git|git://github.com/hoytech/vmtouch"
 
-#DEPENDS=""
 BUILD_DEPENDS="git bzip2"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	gcc -Wall -O2 -o vmtouch vmtouch.c &&
 	mkdir -p $install/usr/bin &&
 	cp -a $PACKAGE $install/usr/bin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e vmware-view-open-client/receipt
--- a/vmware-view-open-client/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vmware-view-open-client/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -2,33 +2,31 @@
 
 PACKAGE="vmware-view-open-client"
 VERSION="4.5.0-297975"
-SOURCE="VMware-view-open-client-source"
 CATEGORY="network"
-SHORT_DESC="Connection tools to remote Windows desktops managed by VMware View."
+SHORT_DESC="Connection tools to remote Windows desktops managed by VMware View"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="http://code.google.com/p/vmware-view-open-client/"
+
+SOURCE="VMware-view-open-client-source"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://code.google.com/p/$PACKAGE/"
 WGET_URL="http://$PACKAGE.googlecode.com/files/$TARBALL"
 
-DEPENDS="gtk2 openssl libxml2 curl boost-signals icu bzlib"
 BUILD_DEPENDS="gtk2-dev openssl-dev libxml2-dev curl-dev boost-dev \
 boost-signals icu-dev icu intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
 	sed -i 's|.*curl/types|// &|' lib/bora/basicHttp/http.c
-	./configure --prefix=/usr \
-		$CONFIGURE_ARGS && \
-	make && make DESTDIR=$DESTDIR install
+
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="gtk2 openssl libxml2 curl boost-signals icu bzlib"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e vnc2swf/receipt
--- a/vnc2swf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vnc2swf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vnc2swf"
 VERSION="0.5.0"
@@ -6,31 +6,29 @@
 SHORT_DESC="VNC recorder"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.unixuser.org/~euske/vnc2swf"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.unixuser.org/~euske/vnc2swf"
 WGET_URL="$WEB_SITE/$TARBALL"
-SUGGESTED="x11vnc"
-TAGS="vnc"
 
-DEPENDS="gcc-lib-base glibc-base xorg-libICE xorg-libSM xorg-libX11 \
-xorg-libXau xorg-libXaw xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm \
-xorg-libXt zlib "
-BUILD_DEPENDS="xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
-xorg-libXau-dev xorg-libXaw-dev xorg-libXdmcp-dev xorg-libXext-dev \
-xorg-libXmu-dev xorg-libXpm-dev xorg-libXt-dev zlib-dev"
+BUILD_DEPENDS="xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
+xorg-libXaw-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXmu-dev \
+xorg-libXpm-dev xorg-libXt-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/
 	cp -a $install/usr/X11R6/bin/ $fs/usr/
+	DEPENDS="gcc-lib-base glibc-base xorg-libICE xorg-libSM xorg-libX11 \
+	xorg-libXau xorg-libXaw xorg-libXdmcp xorg-libXext xorg-libXmu xorg-libXpm \
+	xorg-libXt zlib"
+	SUGGESTED="x11vnc"
+	TAGS="vnc"
 }
diff -r ad29ddfee1c9 -r d5aab818505e volume_key/receipt
--- a/volume_key/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/volume_key/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,12 +13,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://releases.pagure.org/volume_key/$TARBALL"
 
-BUILD_DEPENDS="automake gettext gpgme-dev libtool cryptsetup-dev nss-dev \
+BUILD_DEPENDS="automake gettext-dev gpgme-dev libtool cryptsetup-dev nss-dev \
 python3-dev util-linux-blkid-dev glib-dev"
-SPLIT="volume_key-python volume_key volume_key-dev"
+SPLIT="$PACKAGE-python $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
-	sed -i '/config.h/d' lib/libvolume_key.h &&
+	sed -i '/config.h/d' lib/libvolume_key.h
 	autoreconf -fiv &&
 
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e volumeicon/receipt
--- a/volumeicon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/volumeicon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,30 @@
 PACKAGE="volumeicon"
 VERSION="0.4.6"
 CATEGORY="multimedia"
-SHORT_DESC="Volumeicon is a lightweight volume control in your systray."
+SHORT_DESC="Lightweight volume control in systray"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://softwarebakery.com/maato/volumeicon.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://softwarebakery.com/maato/files/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk2 alsa-lib libnotify"
 BUILD_DEPENDS="gtk2-dev alsa-lib-dev libnotify-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --enable-notify $CONFIGURE_ARGS && 
-	make && make install
+compile_rules() {
+	./configure \
+		--enable-notify \
+		$CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/etc/xdg
-	cp -rf ${stuff}/autostart $fs/etc/xdg
-	cp -rf ${stuff}/skel $fs/etc
+	cp -rf $stuff/autostart $fs/etc/xdg
+	cp -rf $stuff/skel $fs/etc
 	cp -rf $install/* $fs
-	rm -rf $fs/usr/share/${PACKAGE}/icons/*Gnone
-	rm -rf $fs/usr/share/${PACKAGE}/icons/tango
+	rm -rf $fs/usr/share/$PACKAGE/icons/*Gnone
+	rm -rf $fs/usr/share/$PACKAGE/icons/tango
+	DEPENDS="gtk2 alsa-lib libnotify"
 }
diff -r ad29ddfee1c9 -r d5aab818505e vorbis-tools/receipt
--- a/vorbis-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vorbis-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.0"
 CATEGORY="multimedia"
 SHORT_DESC="Vorbis encoder, decoder and tiny tools"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.vorbis.com/"
 
diff -r ad29ddfee1c9 -r d5aab818505e vorbisgain/receipt
--- a/vorbisgain/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vorbisgain/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vorbisgain"
 VERSION="0.37"
 CATEGORY="multimedia"
-SHORT_DESC="Analyzes and adjusts volume on ogg vorbis files."
+SHORT_DESC="Analyzes and adjusts volume on ogg vorbis files"
 MAINTAINER="paul@slitaz.org"
 LICENSE="LGPL2.1"
+WEB_SITE="https://sjeng.org/vorbisgain.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://sjeng.org/vorbisgain.html"
 WGET_URL="https://sjeng.org/ftp/vorbis/$TARBALL"
 
-DEPENDS="libogg libvorbis"
 BUILD_DEPENDS="libogg-dev libvorbis-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libogg libvorbis"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e vpnc/receipt
--- a/vpnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vpnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE$TARBALL"
 
 BUILD_DEPENDS="libgcrypt-dev openssl-dev perl"
-SPLIT="vpnc-cert:cert"
+SPLIT="$PACKAGE-cert:cert"
 
 compile_rules() {
 	case $SET in
@@ -23,7 +23,7 @@
 	make \
 		PREFIX=/usr \
 		DOCDIR=/usr/share/doc/$PACKAGE-$VERSION \
-		DESTDIR=$DESTDIR \
+		DESTDIR=$install \
 		install || return 1
 
 	mkdir -p $install/var/run/vpnc
diff -r ad29ddfee1c9 -r d5aab818505e vsftpd/receipt
--- a/vsftpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vsftpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.5"
 CATEGORY="network"
 SHORT_DESC="Secure FTP server"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://vsftpd.beasts.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e vte-gtk2/receipt
--- a/vte-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vte-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.28.2" # last gtk2-based series is 0.28; last version is 0.28.2 (2011-08-28); see vte receipt for latest vte
 CATEGORY="utilities"
 SHORT_DESC="Terminal capabilities for GTK+ widgets"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/vte.html" # (for gtk3 version)
diff -r ad29ddfee1c9 -r d5aab818505e vte/receipt
--- a/vte/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vte/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.50.2"
 CATEGORY="utilities"
 SHORT_DESC="Terminal capabilities for GTK+ widgets"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/gnome/vte.html"
diff -r ad29ddfee1c9 -r d5aab818505e vym/receipt
--- a/vym/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vym/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vym"
 VERSION="1.12.7"
 CATEGORY="utilities"
 SHORT_DESC="A mindmapping tool"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.insilmaril.de/vym/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.insilmaril.de/vym/"
 WGET_URL="$SF_MIRROR/vym/$TARBALL"
 
-DEPENDS="libQtCore libQtNetwork libQtXml libQtSql libQtGui libQt3Support zip"
 BUILD_DEPENDS="qmake Qt4-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	echo $src
+compile_rules() {
 	qmake PREFIX=/usr &&
 	make &&
-	make INSTALL_ROOT=$DESTDIR install
+	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share $fs/usr
 	cp $install/usr/share/vym/icons/vym.png $fs/usr/share/icons/hicolor/48x48/apps/
 	rm -rf $fs/usr/share/vym/lang
+	DEPENDS="libQtCore libQtNetwork libQtXml libQtSql libQtGui libQt3Support zip"
 }
diff -r ad29ddfee1c9 -r d5aab818505e vzctl/receipt
--- a/vzctl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vzctl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="3.0.25.1"
 CATEGORY="system-tools"
 SHORT_DESC="OpenVZ containers control utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://openvz.livejournal.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WGET_URL="http://download.openvz.org/utils/${PACKAGE}/${VERSION}/src/${TARBALL}"
+WGET_URL="http://download.openvz.org/utils/$PACKAGE/$VERSION/src/$TARBALL"
 
 BUILD_DEPENDS="sed"
 
@@ -20,8 +20,8 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR install-slitaz
+	make DESTDIR=$install install &&
+	make DESTDIR=$install install-slitaz
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e vzquota/receipt
--- a/vzquota/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/vzquota/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,24 +4,20 @@
 VERSION="3.0.12"
 CATEGORY="system-tools"
 SHORT_DESC="Virtuozzo/OpenVZ disk quota control utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://openvz.livejournal.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://openvz.org"
 WGET_URL="http://download.openvz.org/utils/$PACKAGE/$VERSION/src/$TARBALL"
 
-DEPENDS=""
+compile_rules() {
+	make &&
+	make DESTDIR=$install install || return 1
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	make && make DESTDIR=$DESTDIR install
+	mkdir -p $install/var/lib/vzquota/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr $fs/var/lib/vzquota
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e w3m/receipt
--- a/w3m/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/w3m/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,12 +6,12 @@
 SHORT_DESC="Text Mode Web Browser"
 MAINTAINER="mojo@slitaz.org"
 LICENSE="MIT"
-WEB_SITE="http://w3m.sourceforge.net"
+WEB_SITE="http://w3m.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="gc-dev openssl10-dev zlib-dev perl gettext"
+BUILD_DEPENDS="gc-dev openssl10-dev zlib-dev perl gettext-dev"
 
 compile_rules() {
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0"
diff -r ad29ddfee1c9 -r d5aab818505e wammu/receipt
--- a/wammu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wammu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="wammu"
 VERSION="0.33"
 CATEGORY="system-tools"
-SHORT_DESC="Wammu is mobile phone manage."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Mobile phone manager"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://wammu.eu/wammu/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://wammu.eu/wammu/"
-WGET_URL="$SF_MIRROR/gammu/$PACKAGE/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/gammu/$TARBALL"
 
-DEPENDS="gammu python python-pybluez wxpython"
-BUILD_DEPENDS="$DEPENDS gammu-dev python-dev wxpython-dev"
+BUILD_DEPENDS="gammu-dev python-dev python-pybluez wxpython-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/Wammu $fs/usr/share
+	DEPENDS="gammu python python-pybluez wxpython"
 }
diff -r ad29ddfee1c9 -r d5aab818505e warmux/receipt
--- a/warmux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/warmux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="11.04.1"
 CATEGORY="games"
 SHORT_DESC="Warmux game"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.wormux.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -12,15 +12,13 @@
 
 BUILD_DEPENDS="libsdl-dev libsdl-gfx-dev libsdl-image-dev libsdl-mixer-dev \
 libsdl-net-dev libsdl-ttf-dev curl-dev freetype-dev libxml2-dev libxml++-dev"
-SPLIT="warmux warmux-music"
+SPLIT="$PACKAGE-music"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/test -z "$(pkgdatadir)"/test -d "$(pkgdatadir)"/' data/Makefile.in
 	sed -i 's|if USE_X11|if SKIP_USE_X11|' src/tool/copynpaste.cpp
 	sed -i "s|test -d \"\\\$(pkgdatadir|test -d \"\\\$(DESTDIR)\\\$(pkgdatadir|" data/Makefile*
-	mkdir -p $DESTDIR/usr/share/warmux
+	mkdir -p $install/usr/share/warmux
 
 	./configure \
 		--bindir=/usr/games \
@@ -30,31 +28,29 @@
 	make -j1 install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	warmux)
-		PROVIDE="wormux"
-		SUGGESTED="warmux-music"
-		DEPENDS="libsdl-gfx libsdl-image libsdl-mixer libsdl-net \
+		warmux)
+			PROVIDE="wormux"
+			SUGGESTED="warmux-music"
+			DEPENDS="libsdl-gfx libsdl-image libsdl-mixer libsdl-net \
 			libsdl-ttf curl freetype libxml2 libxml++ gcc-lib-base \
 			gettext-base"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/games $fs/usr
-		cp -a $install/usr/share/pixmaps $fs/usr/share
-		cp -a $install/usr/share/warmux $fs/usr/share
+			mkdir -p $fs/usr/share
+			cp -a $install/usr/games $fs/usr
+			cp -a $install/usr/share/pixmaps $fs/usr/share
+			cp -a $install/usr/share/warmux $fs/usr/share
 
-		# Remove unecessary files
-		rm -rf $fs/usr/share/warmux/font
-		rm -rf $fs/usr/share/warmux/music
-		#rm -rf $fs/usr/share/warmux/sound
-		;;
-	warmux-music)
-		CAT="games|game music (~35Mb)"
-		DEPENDS="warmux"
-		mkdir -p $fs/usr/share/warmux
-		cp -a $install/usr/share/warmux/music $fs/usr/share/warmux
-		;;
+			# Remove unecessary files
+			rm -rf $fs/usr/share/warmux/font
+			rm -rf $fs/usr/share/warmux/music
+			#rm -rf $fs/usr/share/warmux/sound
+			;;
+		*-music)
+			CAT="games|game music (~35Mb)"
+			DEPENDS="warmux"
+			mkdir -p $fs/usr/share/warmux
+			cp -a $install/usr/share/warmux/music $fs/usr/share/warmux
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e warzone2100/receipt
--- a/warzone2100/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/warzone2100/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="3.2.3"
 CATEGORY="games"
 SHORT_DESC="3D realtime strategy game on a future Earth"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://wz2100.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WGET_URL="$SF_MIRROR/warzone2100/releases/$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/warzone2100/$TARBALL"
 
-BUILD_DEPENDS="automake perl zip unzip gettext qt5-dev xorg-libX11-dev \
+BUILD_DEPENDS="automake perl zip unzip gettext-dev qt5-dev xorg-libX11-dev \
 libsdl2-dev libpng16-dev libtheora-dev openal-dev libvorbis-dev glew-dev \
 mesa-dev openssl-dev physfs-dev xorg-libXrandr-dev fribidi-dev \
 freetype-dev fontconfig-dev openssl-dev git"
@@ -28,7 +28,7 @@
 		$CONFIGURE_ARGS &&
 	make -C src autorevision.h &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e watchdog/receipt
--- a/watchdog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/watchdog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,35 +3,29 @@
 PACKAGE="watchdog"
 VERSION="5.9"
 CATEGORY="system-tools"
-SHORT_DESC="Software watchdog for Linux."
+SHORT_DESC="Software watchdog for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://watchdog.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/etc $fs
 	cp -a $install/usr/sbin $fs/usr
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
+post_install() {
 	[ -c "$1/dev/watchdog" ] || mknod -m 660  "$1/dev/watchdog" c 10 130
 }
diff -r ad29ddfee1c9 -r d5aab818505e waterline/receipt
--- a/waterline/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/waterline/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/sde-gui/waterline/archive/$COMMIT.tar.gz"
 
-BUILD_DEPENDS="automake gettext intltool libtool gtk2-dev glib-dev jansson-dev \
-libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev \
+BUILD_DEPENDS="automake gettext-dev intltool libtool gtk2-dev glib-dev \
+jansson-dev libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev \
 libsde-utils-gtk-dev xorg-libXcomposite-dev menu-cache-dev alsa-lib-dev"
 SPLIT="$PACKAGE-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e wavemon/receipt
--- a/wavemon/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wavemon/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="wavemon"
 VERSION="0.7.5"
 CATEGORY="network"
-SHORT_DESC="Wavemon is an ncurses-based monitoring application for wireless network devices."
+SHORT_DESC="Ncurses-based monitoring application for wireless network devices"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://github.com/uoaerg/wavemon"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/uoaerg/wavemon"
 WGET_URL="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/$TARBALL"
 
-DEPENDS="ncurses libcap"
 BUILD_DEPENDS="ncurses-dev libcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses libcap"
 }
diff -r ad29ddfee1c9 -r d5aab818505e wavpack/receipt
--- a/wavpack/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wavpack/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="5.1.0"
 CATEGORY="multimedia"
 SHORT_DESC="Hybrid Lossless Audio Compression"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.wavpack.com/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.wavpack.com/$TARBALL"
 
-SPLIT="wavpack-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e wayland-protocols/receipt
--- a/wayland-protocols/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wayland-protocols/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://wayland.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="wayland-dev"
-SPLIT="wayland-protocols-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e wayland/receipt
--- a/wayland/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wayland/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.14.0"
 CATEGORY="x-window"
 SHORT_DESC="Wayland simpler X display server protocol"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://wayland.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/wayland.html"
@@ -13,7 +13,7 @@
 WGET_URL="http://wayland.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="libffi-dev expat-dev libxml2-dev"
-SPLIT="wayland-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e wbar2/receipt
--- a/wbar2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wbar2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.4"
 CATEGORY="system-tools"
 SHORT_DESC="Quick launch bar"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/rodolf0/wbar"
 REPOLOGY="wbar"
diff -r ad29ddfee1c9 -r d5aab818505e wbarconf/receipt
--- a/wbarconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wbarconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.7.2"
 CATEGORY="system-tools"
 SHORT_DESC="Configuration GUI for wbar written in Python and GTK"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://kapsi.fi/ighea/wbarconf/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -12,15 +12,13 @@
 
 DEPENDS="wbar python python-pygtk python-pygobject2"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin $fs/usr/share/wbarconf \
 		$fs/usr/share/pixmaps
 	cp -a $src/wbarconf $fs/usr/bin
 	cp -a $src/locale $fs/usr/share/locale
 	# Add pt_BR traduction, thanks blconde.
-	cp -a stuff/pt_BR $fs/usr/share/locale
+	cp -a $stuff/pt_BR $fs/usr/share/locale
 	cp -a $src/messages.pot $fs/usr/share/wbarconf
 	cp -a $src/wbarbacks $fs/usr/share/wbarconf
 	cp -a $src/wbarconf.png $fs/usr/share/pixmaps
diff -r ad29ddfee1c9 -r d5aab818505e web-applications/receipt
--- a/web-applications/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/web-applications/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="1.6"
 CATEGORY="network"
 SHORT_DESC="Set of desktop files for Web applications"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD Freeware Microsoft GPL3 WhatsApp-Inc"
 WEB_SITE="http://www.slitaz.org/"
 HOST_ARCH="any"
 REPOLOGY="-"
 
 SPLIT="web-google-services web-picozu web-skype web-telegram web-tweetdeck \
-web-whatsapp web-applications"
+web-whatsapp $PACKAGE"
 COOKOPTS="!menus" # I'll decide myself what to copy...
 
 compile_rules() {
@@ -32,7 +32,7 @@
 			;;
 		web-picozu)
 			copy web-picozu*
-			SHORT_DESC="Picozu is a online HTML5 image editor"
+			SHORT_DESC="Online HTML5 image editor"
 			VERSION="0.1"
 			DEPENDS="tazweb"
 			TAGS="cloud editor image picozu"
diff -r ad29ddfee1c9 -r d5aab818505e webalizer/receipt
--- a/webalizer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/webalizer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Web server log file analysis program"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.webalizer.com/"
+WEB_SITE="http://www.webalizer.org/"
 
 TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
 WGET_URL="ftp://ftp.mrunix.net/pub/$PACKAGE/$TARBALL"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mv $install/etc/webalizer.conf.sample $install/etc/webalizer.conf
 	install -Dm755 $stuff/webalizer $install/etc/initcron.d/webalizer
diff -r ad29ddfee1c9 -r d5aab818505e webdiapo/receipt
--- a/webdiapo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/webdiapo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,26 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="webdiapo"
 VERSION="1"
 CATEGORY="network"
-SHORT_DESC="Tiny html slideshow."
+SHORT_DESC="Tiny html slideshow"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://eleydet.free.fr/WebDiapo/"
+
 TARBALL="WebDiapo_v$VERSION.zip"
-WEB_SITE="http://eleydet.free.fr/WebDiapo/"
 WGET_URL="${WEB_SITE}pages/$TARBALL"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/www
 	cp -a $src $fs/var/www/webdiapo
 }
 
-post_install()
-{
-	cat <<EOT
-Update /var/www/webdiapo/pages/ & /var/www/webdiapo/liste_diapos.js and try it:
-$ tazweb --kiosk --notoolbar file:///var/www/webdiapo/index.html
+post_install() {
+	[ -n "$quiet" ] || cat <<EOT
+
+	.----------------------------------------------------------------.
+	| Update                                                         |
+	|   * /var/www/webdiapo/pages/                                   |
+	|   * /var/www/webdiapo/liste_diapos.js                          |
+	| and try it:                                                    |
+	|                                                                |
+	| tazweb --kiosk --notoolbar file:///var/www/webdiapo/index.html |
+	'----------------------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e webian-shell/receipt
--- a/webian-shell/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/webian-shell/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1"
 CATEGORY="network"
 SHORT_DESC="A full screen web browser"
-MAINTAINER="hackdorte@sapo.pt"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MPL2"
 WEB_SITE="http://webian.org/shell/"
 
@@ -12,8 +12,6 @@
 TARBALL="${PACKAGE/-/_}_$VERSION-linux_32.tar.gz"
 WGET_URL="$GITHUB/webianproject/shell/$TARBALL"
 
-DEPENDS="gtk2 nss"
-
 compile_rules() {
 	mkdir -p $install/usr/share/applications
 	mkdir -p $install/usr/share/pixmaps
@@ -24,18 +22,10 @@
 }
 
 genpkg_rules() {
-	cat > $install/usr/share/applications/webian-shell.desktop <<EOT
-[Desktop Entry]
-Type=Application
-Name=Webian Shell
-Comment=A full screen web browser.
-Exec=webian-shell
-Icon=webian-shell
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-EOT
-
+	install -Dm644 $stuff/webian-shell.desktop \
+		$install/usr/share/applications/webian-shell.desktop
 	cp -a $install/* $fs
+	DEPENDS="gtk2 nss"
 }
 
 post_install() {
diff -r ad29ddfee1c9 -r d5aab818505e webian-shell/stuff/webian-shell.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/webian-shell/stuff/webian-shell.desktop	Fri Nov 02 14:15:08 2018 +0200
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Webian Shell
+Comment=A full screen web browser
+Exec=webian-shell
+Icon=webian-shell
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff -r ad29ddfee1c9 -r d5aab818505e webkit2gtk/receipt
--- a/webkit2gtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/webkit2gtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,8 +16,8 @@
 BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
 harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
 libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
-libnotify-dev gettext sqlite3-dev xorg-libXt-dev"
-SPLIT="webkit2gtk-dev"
+libnotify-dev gettext-dev sqlite3-dev xorg-libXt-dev"
+SPLIT="$PACKAGE-dev"
 
 CFLAGS="${CFLAGS/-Os/-O2}"
 CXXFLAGS="${CXXFLAGS/-Os/-O2}"
diff -r ad29ddfee1c9 -r d5aab818505e webkitgtk/receipt
--- a/webkitgtk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/webkitgtk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,13 +15,13 @@
 BUILD_DEPENDS="cmake gperf perl python ruby-dev cairo-dev gnutls-dev gtk3-dev \
 harfbuzz-icu-dev libjpeg-turbo-dev libsoup-dev libxslt-dev libsecret-dev \
 libwebp-dev mesa-dev gtk2-dev enchant-dev gst1-plugins-base-dev \
-libnotify-dev gettext"
-SPLIT="webkitgtk-dev"
+libnotify-dev gettext-dev"
+SPLIT="$PACKAGE-dev"
 
 BUILD_DEPENDS="perl python ruby-dev gperf libjpeg-turbo-dev libpng16-dev \
 libwebp-dev glib-dev icu-dev libxml2-dev pango-dev enchant-dev gtk2-dev \
 xorg-libXt-dev gobject-introspection-dev libsoup-dev libsecret-dev \
-harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext \
+harfbuzz-icu-dev libxslt-dev gst1-plugins-base-dev gettext-dev \
 autoconf automake libtool"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e weechat/receipt
--- a/weechat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/weechat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.1"
 CATEGORY="network"
 SHORT_DESC="A fast, light and extensible chat client"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://weechat.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e wesnoth/receipt
--- a/wesnoth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wesnoth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,72 +4,71 @@
 VERSION="1.12.6"
 CATEGORY="games"
 SHORT_DESC="Turn based strategy game"
-MAINTAINER="mimas@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.wesnoth.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.wesnoth.org/"
-WGET_URL="$SF_MIRROR/wesnoth/wesnoth-${VERSION%.*}/$PACKAGE-$VERSION/$TARBALL"
-TAGS="strategy"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="cairo-dev pango-dev boost-dev boost-regex \
 boost-iostreams libsdl-dev libsdl-mixer-dev libsdl-ttf-dev libsdl-ttf \
 libsdl-image-dev libsdl-net-dev libpng16-dev freetype-dev fontconfig-dev \
 findutils lua-dev boost-serialization autoconf automake fribidi-dev \
 boost-system boost-program-options boost-filesystem boost-locale \
-libvorbis-dev cmake gettext-tools"
-SPLIT="wesnoth-music"
+libvorbis-dev cmake gettext"
+SPLIT="$PACKAGE-music"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cmake -DCMAKE_INSTALL_PREFIX=/usr .
-	make $MAKEFLAGS && make DESTDIR=$DESTDIR install
+compile_rules() {
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		. &&
+	make $MAKEFLAGS &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	wesnoth)
-		DEPENDS="libsdl libsdl-mixer libsdl-ttf libsdl-net \
+		wesnoth)
+			DEPENDS="libsdl libsdl-mixer libsdl-ttf libsdl-net \
 			libsdl-image zlib pango cairo fontconfig \
 			boost-regex boost-iostreams libpng16 fribidi \
 			gcc-lib-base xorg-xcb-util boost-system \
 			boost-program-options"
-		# programs
-		mkdir -p $fs/usr/bin
-		cp $install/usr/bin/wesnoth $fs/usr/bin/
+			# programs
+			mkdir -p $fs/usr/bin
+			cp $install/usr/bin/wesnoth $fs/usr/bin/
 
-		# data
-		mkdir -p $fs/usr/share/wesnoth/
-		cp -a $install/usr/share/wesnoth/data $fs/usr/share/wesnoth/
-		cp -a $install/usr/share/wesnoth/fonts $fs/usr/share/wesnoth/
-		cp -a $install/usr/share/wesnoth/images $fs/usr/share/wesnoth/
-		cp -a $install/usr/share/wesnoth/sounds $fs/usr/share/wesnoth/
+			# data
+			mkdir -p $fs/usr/share/wesnoth/
+			cp -a $install/usr/share/wesnoth/data $fs/usr/share/wesnoth/
+			cp -a $install/usr/share/wesnoth/fonts $fs/usr/share/wesnoth/
+			cp -a $install/usr/share/wesnoth/images $fs/usr/share/wesnoth/
+			cp -a $install/usr/share/wesnoth/sounds $fs/usr/share/wesnoth/
 
-		mkdir $fs/usr/share/wesnoth/translations
-		if [ ! "$LOCALE" = "" ]; then
-			for i in $LOCALE
-			do
-				cp -a $install/usr/share/wesnoth/translations/$i \
-					$fs/usr/share/wesnoth/translations
-			done		
-		else
-			cp -a $install/usr/share/wesnoth/translations \
-				$fs/usr/share/wesnoth/
-		fi
-	
-		# Remove music
-		rm $fs/usr/share/wesnoth/data/core/music/*.ogg 2> /dev/null
+			mkdir $fs/usr/share/wesnoth/translations
+			if [ -n "$LOCALE" ]; then
+				for i in $LOCALE; do
+					cp -a $install/usr/share/wesnoth/translations/$i \
+						$fs/usr/share/wesnoth/translations
+				done
+			else
+				cp -a $install/usr/share/wesnoth/translations \
+					$fs/usr/share/wesnoth/
+			fi
 
-		# finalize
-		cp -a $install/usr/share/applications $fs/usr/share
-		cp -a $install/usr/share/pixmaps $fs/usr/share
-		;;
-	wesnoth-music)
-		CAT="games|music files"
-		mkdir -p $fs/usr/share/wesnoth/data/core
-		cp -a $src/data/core/music $fs/usr/share/wesnoth/data/core
-		;;
+			# Remove music
+			rm $fs/usr/share/wesnoth/data/core/music/*.ogg 2>/dev/null
+
+			# finalize
+			cp -a $install/usr/share/applications $fs/usr/share
+			cp -a $install/usr/share/pixmaps $fs/usr/share
+			TAGS="strategy"
+			;;
+		*-music)
+			CAT="games|music files"
+			mkdir -p $fs/usr/share/wesnoth/data/core
+			cp -a $src/data/core/music $fs/usr/share/wesnoth/data/core
+			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e weston/receipt
--- a/weston/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/weston/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.0"
 CATEGORY="x-window"
 SHORT_DESC="Reference implementation of a Wayland compositor"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://wayland.freedesktop.org/"
 
@@ -15,7 +15,7 @@
 libunwind-dev mtdev-dev xorg-libXcursor-dev pam-dev xz-dev \
 gegl-dev libdrm-dev xorg-libXxf86vm-dev eudev-dev libjpeg-turbo-dev expat-dev \
 xorg-libxshmfence-dev"
-SPLIT="weston-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e wget/receipt
--- a/wget/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wget/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,32 +4,27 @@
 VERSION="1.19.5"
 CATEGORY="network"
 SHORT_DESC="GNU Wget - the non-interactive network downloader"
-MAINTAINER="sygne@ombres.eu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://www.gnu.org/software/wget/"
 
 TARBALL="$PACKAGE-$VERSION.tar.lz"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="lzip openssl-dev libidn2-dev util-linux-uuid-dev gettext \
+BUILD_DEPENDS="lzip openssl-dev libidn2-dev util-linux-uuid-dev gettext-dev \
 zlib-dev perl pcre-dev libpsl-dev gnutls-dev"
 SPLIT="wget+gnutls:gnutls"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) ARCH_ARGS="--with-libssl-prefix=/cross/$ARCH/sysroot/usr/lib" ;;
-	esac
-
 	case $SET in
 		'')     SET_ARGS='--with-ssl=openssl';;
 		gnutls) SET_ARGS='--with-ssl=gnutls';;
 	esac
 
 	./configure \
-		$ARCH_ARGS \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e which/receipt
--- a/which/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/which/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.21"
 CATEGORY="base-system"
 SHORT_DESC="A utility to show the full path of commands"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://savannah.gnu.org/projects/which/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/which.html"
diff -r ad29ddfee1c9 -r d5aab818505e whois/receipt
--- a/whois/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/whois/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,27 +4,22 @@
 VERSION="5.0.11"
 CATEGORY="network"
 SHORT_DESC="The whois client by Marco d'Itri"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
 WEB_SITE="http://www.linux.it/~md/software/"
+
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="http://ftp.debian.org/debian/pool/main/w/$PACKAGE/$TARBALL"
 
-DEPENDS="libidn"
 BUILD_DEPENDS="libidn-dev perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	make prefix=/usr HAVE_LIBIDN=1
-	make prefix=/usr BASEDIR=$DESTDIR install-whois
+	make prefix=/usr BASEDIR=$install install-whois
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="libidn"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e whowatch/receipt
--- a/whowatch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/whowatch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="whowatch"
 VERSION="1.8.5"
 CATEGORY="utilities"
-SHORT_DESC="Real-time user logins monitoring tool."
+SHORT_DESC="Real-time user logins monitoring tool"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://wizard.ae.krakow.pl/~mike/#whowatch"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://wizard.ae.krakow.pl/~mike/#whowatch"
 WGET_URL="http://wizard.ae.krakow.pl/~mike/download/$TARBALL"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-	./configure --prefix=/usr
-	make
+
+	./configure --prefix=/usr &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr	
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
 }
diff -r ad29ddfee1c9 -r d5aab818505e wicd/receipt
--- a/wicd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wicd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,23 @@
 VERSION="1.7.2.4"
 CATEGORY="network"
 SHORT_DESC="Network connection manager"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://wicd.sourceforge.net/"
 WGET_URL="https://launchpad.net/wicd/${VERSION:0:3}/$VERSION/+download/$TARBALL"
-TAGS="wireless ethernet"
 
-DEPENDS="python python-dbus ethtool wpa_supplicant python-pygtk"
 BUILD_DEPENDS="python-distribute python-babel python-dev python-dbus-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	python setup.py configure
 	#HACK for https://bugs.launchpad.net/wicd/+bug/928589
 	mkdir -p translations/ast/LC_MESSAGES
 	msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo
-	python setup.py install --root=$DESTDIR
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr $fs/etc $fs/var
 	cp -a $install/usr/* $fs/usr
 	cp -a $install/etc/* $fs/etc
@@ -47,14 +41,17 @@
 	# change bash to sh
 	sed -i 's/bash/sh/' $fs/usr/sbin/wicd \
 						$fs/usr/bin/wicd-client
+	DEPENDS="python python-dbus ethtool wpa_supplicant python-pygtk"
+	TAGS="wireless ethernet"
 }
 
 # edit daemons.conf.
-post_install()
-{
+post_install() {
 	if ! grep -q ^WICD_OPTIONS "$1/etc/daemons.conf"; then
-		echo '# wicd options.' >> "$1/etc/daemons.conf"
-		echo 'WICD_OPTIONS=""' >> "$1/etc/daemons.conf"
-		echo '' >> "$1/etc/daemons.conf"
+		cat >> "$1/etc/daemons.conf" <<EOT
+# wicd options.
+WICD_OPTIONS=""
+
+EOT
 	fi
 }
diff -r ad29ddfee1c9 -r d5aab818505e wifi/receipt
--- a/wifi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wifi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,21 +1,14 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="wifi"
 VERSION="1.0"
 CATEGORY="meta"
-SHORT_DESC="Meta package to install all wifi related packages."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Meta package to install all Wi-Fi related packages"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
+DEPENDS="linux-wireless wireless_tools ndiswrapper"
 SUGGESTED="b43-fwcutter cabextract unshield"
 TAGS="wireless"
-
-DEPENDS="linux-wireless wireless_tools ndiswrapper"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-}
diff -r ad29ddfee1c9 -r d5aab818505e wifidog/receipt
--- a/wifidog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wifidog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -19,7 +19,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $src/wifidog.conf           $install/etc/wifidog.conf
 	install -Dm755 $src/scripts/init.d/wifidog $install/etc/init.d/wifidog
diff -r ad29ddfee1c9 -r d5aab818505e wimlib/receipt
--- a/wimlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wimlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://wimlib.net/downloads/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev ntfs-3g-dev fuse2-dev openssl-dev"
-SPLIT="wimlib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e wine-rt/receipt
--- a/wine-rt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wine-rt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="1.7.16"
 CATEGORY="misc"
 SHORT_DESC="Windows API for Linux"
-MAINTAINER="xj@wp.pl"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.winehq.org/"
+WEB_SITE="https://www.winehq.org/"
 REPOLOGY="wine"
 
 TARBALL="wine-$VERSION.tar.bz2"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev glu-dev freetype-dev \
 libtool libxml2-dev libxslt-dev lcms-dev jpeg-dev libpng16-dev tiff-dev prelink"
-SPLIT="wine-rt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	CFLAGS="$CFLAGS -O2 -funroll-loops -frounding-math -mfpmath=sse -msse2 \
diff -r ad29ddfee1c9 -r d5aab818505e wine/receipt
--- a/wine/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wine/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="Windows API for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://www.winehq.org/"
+WEB_SITE="https://www.winehq.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="alsa-lib-dev flex bison mesa-dev freetype-dev libtool \
 glu-dev libxml2-dev libxslt-dev lcms-dev prelink cups-dev dbus-dev \
 jpeg-dev libpng16-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
-SPLIT="wine-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e winetricks/receipt
--- a/winetricks/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/winetricks/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,21 +3,18 @@
 PACKAGE="winetricks"
 VERSION="20120912"
 CATEGORY="misc"
-SHORT_DESC="Script to install various redistributable runtime libraries in Wine."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Install various redistributable runtime libraries in Wine"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://wiki.winehq.org/Winetricks"
+
 TARBALL="$PACKAGE-$VERSION"
-SUGGESTED="zenity-gtk2"
-WEB_SITE="http://wiki.winehq.org/winetricks"
 WGET_URL="http://www.kegel.com/wine/$PACKAGE"
 
-DEPENDS="wine cabextract xorg-xmessage unzip wget"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/$PACKAGE-$VERSION $fs/usr/bin/$PACKAGE
 	chmod a+x $fs/usr/bin/$PACKAGE
+	DEPENDS="wine cabextract xorg-xmessage unzip wget"
+	SUGGESTED="zenity-gtk2"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e wipe/receipt
--- a/wipe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wipe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.1"
 CATEGORY="misc"
 SHORT_DESC="A file and block device delete/erase utility - a secure rm"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://wipe.sourceforge.net/"
 
@@ -16,7 +16,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make prefix=$DESTDIR/usr install
+	make prefix=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wireless_tools/receipt
--- a/wireless_tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wireless_tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="29"
 CATEGORY="system-tools"
 SHORT_DESC="Wireless Tools for Linux"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://hewlettpackard.github.io/wireless-tools/Tools.html"
 REPOLOGY="wireless-tools"
@@ -12,13 +12,13 @@
 TARBALL="$PACKAGE.$VERSION.tar.gz"
 WGET_URL="https://hewlettpackard.github.io/wireless-tools/$TARBALL"
 
-SPLIT="wireless_tools-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|PREFIX)/man|PREFIX)/share/man|' Makefile
 
-	make CC=${HOST_SYSTEM}-gcc PREFIX=$DESTDIR/usr &&
-	make PREFIX=$DESTDIR/usr install
+	make CC=${HOST_SYSTEM}-gcc PREFIX=$install/usr &&
+	make PREFIX=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wireshark/receipt
--- a/wireshark/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wireshark/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="wireshark"
 VERSION="2.6.1"
 CATEGORY="network"
-SHORT_DESC="Wireshark is an award-winning network protocol analyzer"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Award-winning network protocol analyzer"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.wireshark.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e wiringpi-pibrella/receipt
--- a/wiringpi-pibrella/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="wiringpi-pibrella"
-GITHASH="53592f938900aa76f9b76b0726c1e18e39f405b5"
-VERSION="${GITHASH:0:7}"
-CATEGORY="system-tools"
-SHORT_DESC="Examples for the Pibrella board from Pimoroni using WiringPi"
-MAINTAINER="pankso@slitaz.org"
-LICENSE="LGPL"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://wiringpi.com/"
-WGET_URL="https://git.drogon.net/?p=pibrella;a=snapshot;h=${GITHASH};sf=tgz"
-TAGS="raspberrypi rpi"
-HOST_ARCH="arm"
-
-DEPENDS="wiringpi"
-# wiringpi + wiringpi-dev must be installed in sysroot
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i s"#CC	= gcc#CC = ${HOST_SYSTEM}-gcc#" Makefile
-	make || return 1
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/include
-	cp -a ${src}/tune $fs/usr/bin/pibrella-tune
-	cp -a ${src}/ladder $fs/usr/bin/pibrella-ladder
-	cp -a ${src}/wire $fs/usr/bin/pibrella-wire
-	cp -a ${src}/pibrella.h $fs/usr/include
-}
diff -r ad29ddfee1c9 -r d5aab818505e wiringpi/receipt
--- a/wiringpi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-# SliTaz package receipt v2.
-
-PACKAGE="wiringpi"
-GITHASH="f18c8f7204d6354220fd6754578b3daa43734e1b"
-VERSION="${GITHASH:0:7}"
-CATEGORY="system-tools"
-SHORT_DESC="GPIO access library written in C for the Raspberry Pi/BCM2835."
-MAINTAINER="pankso@slitaz.org"
-LICENSE="LGPL"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://wiringpi.com/"
-WGET_URL="https://git.drogon.net/?p=wiringPi;a=snapshot;h=${GITHASH};sf=tgz"
-TAGS="raspberrypi rpi"
-HOST_ARCH="arm"
-
-SPLIT="wiringpi wiringpi-dev wiringpi-piglow wiringpi-piface"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Fixes: fancy paths in Makefile and do sym link manually
-	sed -i \
-		-e s"#CC	= gcc#CC = ${HOST_SYSTEM}-gcc#" \
-		-e s"#DESTDIR=.*#DESTDIR=$DESTDIR#" \
-		-e s"#PREFIX=.*#PREFIX=/usr#" */Makefile
-	
-	# First: WiringPi Library
-	cd ${src}/wiringPi
-	make || return 1
-	sed -i '/libwiringPi.so$/'d Makefile
-	make install && cd ${DESTDIR}/usr/lib
-	ln -s libwiringPi.so.2.0 libwiringPi.so
-	
-	# Second: Devices Library
-	cd ${src}/devLib
-	sed -i \
-		-e s'#^INCLUDE.*#INCLUDE = -I. -I${DESTDIR}/usr/include#' \
-		-e '/libwiringPiDev.so$/'d Makefile
-	make || return 1
-	make install && cd ${DESTDIR}/usr/lib
-	ln -s libwiringPiDev.so.2.0 libwiringPiDev.so
-	
-	# Last: GPIO Utility
-	cd ${src}/gpio
-	patch -p0 < ${stuff}/gpio-decodePin.patch
-	mkdir -p ${DESTDIR}/usr/bin
-	make && make install
-	
-	# Extra: PiGlow --> wiringpi-piglow
-	echo "Compiling PiGlow example..."
-	cd ${src}/examples/PiGlow
-	sed -i \
-		-e s'#^INCLUDE.*#INCLUDE = -I. -I${DESTDIR}/usr/include#' \
-		-e s'#^LDFLAGS.*#LDFLAGS= -L${DESTDIR}/usr/lib#' \
-		-e s"#^CC.*#CC = ${HOST_SYSTEM}-gcc#" Makefile
-	make
-	
-	# Extra: PiFace --> wiringpi-piface
-	cd ${src}/examples/PiFace
-	sed -i \
-		-e s'#^INCLUDE.*#INCLUDE = -I. -I${DESTDIR}/usr/include#' \
-		-e s'#^LDFLAGS.*#LDFLAGS= -L${DESTDIR}/usr/lib#' \
-		-e s"#^CC.*#CC = ${HOST_SYSTEM}-gcc#" Makefile
-	make
-}
-
-# SliTaz package testsuite
-testsuite() {
-	readelf -Ah ${install}/usr/bin/gpio || return 1
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	case $PACKAGE in
-	wiringpi)
-		mkdir -p $fs/usr/lib
-		cp -a ${install}/usr/lib/*.so* $fs/usr/lib
-		cp -a ${install}/usr/bin $fs/usr
-		;;
-	wiringpi-dev)
-		CAT="system-tools|The WiringPi headers files."
-		TAGS="raspberrypi rpi"
-		HOST_ARCH="arm"
-		mkdir -p $fs/usr
-		cp -a ${install}/usr/include $fs/usr
-		;;
-	wiringpi-piface)
-		CAT="system-tools|The WiringPi PiFace examples."
-		TAGS="raspberrypi rpi"
-		HOST_ARCH="arm"
-		mkdir -p $fs/usr/lib/wiringpi/piface
-		cd ${src}/examples/PiFace
-		for ex in $(ls *.c)
-		do
-			cp -a ${ex%.c} $fs/usr/lib/wiringpi/piface/${ex%.c}
-		done
-		;;
-	wiringpi-piglow)
-		CAT="system-tools|The WiringPi Piglow utility (useful for SHell scripts)."
-		WEB_SITE="http://wiringpi.com/"
-		TAGS="raspberrypi rpi"
-		HOST_ARCH="arm"
-		mkdir -p $fs/usr/bin
-		cp -a ${src}/examples/PiGlow/piglow $fs/usr/bin
-		;;
-	esac
-}
diff -r ad29ddfee1c9 -r d5aab818505e wiringpi/stuff/gpio-decodePin.patch
--- a/wiringpi/stuff/gpio-decodePin.patch	Sun Oct 28 14:13:49 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- gpio.c
-+++ gpio.slitaz.c
-@@ -74,26 +74,6 @@
- 	      "       gpio gbr <channel>\n"
- 	      "       gpio gbw <channel> <value>" ;	// No trailing newline needed here.
- 
--
--/*
-- * decodePin:
-- *	Decode a pin "number" which can actually be a pin name to represent
-- *	one of the Pi's on-board pins.
-- *********************************************************************************
-- */
--
--static int decodePin (const char *str)
--{
--
--// The first case - see if it's a number:
--
--  if (isdigit (str [0]))
--    return atoi (str) ;
--
--  return 0 ;
--}
--
--
- /*
-  * changeOwner:
-  *	Change the ownership of the file to the real userId of the calling
diff -r ad29ddfee1c9 -r d5aab818505e wkhtmltopdf/receipt
--- a/wkhtmltopdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wkhtmltopdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -24,7 +24,7 @@
 	chmod +x qt/configure
 	scripts/build.py posix-local
 	make &&
-	make INSTALL_ROOT=$DESTDIR/usr install
+	make INSTALL_ROOT=$install/usr install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wmctrl/receipt
--- a/wmctrl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wmctrl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -20,7 +20,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wol/receipt
--- a/wol/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wol/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="wol"
 VERSION="0.7.1"
 CATEGORY="network"
-SHORT_DESC="wol implements Wake On LAN functionality in a small program"
-MAINTAINER="l.lemarinel@gmail.com"
+SHORT_DESC="Wake On LAN functionality in a small program"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://wake-on-lan.sourceforge.net/"
 
@@ -12,7 +12,9 @@
 WGET_URL="$SF_MIRROR/ahh/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wordpress/receipt
--- a/wordpress/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wordpress/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,20 +4,19 @@
 VERSION="3.4.1"
 CATEGORY="misc"
 SHORT_DESC="Blog Tool and Publishing Platform"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wordpress.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="php mysql php-mysql"
-
 genpkg_rules() {
 	mkdir -p $fs/var/www/wordpress
 	cp -a $src/* $fs/var/www/wordpress
 	chown -R www.www $fs/var/www/wordpress
-SUGGESTED="apache cherokee"
+	DEPENDS="php mysql php-mysql"
+	SUGGESTED="apache cherokee"
 }
 
 post_install() {
@@ -33,19 +32,23 @@
 		( /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 ); then
 		action "Create $db database"
-		mysql -Be "create database $db"; status
+		mysql -Be "create database $db"
+		status
 
 		# We suppose that $DB_USER user does not exist.
 		# It may be false.
 		action "Create user $db_user with password $db_password"
-		mysql -Be "grant all privileges on $db.* to '"$db_user"'@'localhost' 
-			identified by '"$db_password"'" ; status
+		mysql -Be "grant all privileges on $db.* to '"$db_user"'@'localhost'
+			identified by '"$db_password"'"
+		status
 
 		# At last create the database for $PACKAGE.
-		action "Create $db database schema."
-		#mysql -u glpi -pglpi -D glpi < /usr/share/glpi/install/mysql/glpi-${VERSION}-empty.sql ; status
+		# action "Create $db database schema."
+		# mysql -u glpi -pglpi -D glpi < /usr/share/glpi/install/mysql/glpi-$VERSION-empty.sql
+		# status
 	fi
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e wordwarvi/receipt
--- a/wordwarvi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wordwarvi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,8 @@
 glib-dev"
 
 compile_rules() {
-	make && make DESTDIR=$DESTDIR install || return 1
+	make &&
+	make DESTDIR=$install install || return 1
 
 	cp -a $stuff/* $install
 }
diff -r ad29ddfee1c9 -r d5aab818505e wpa_supplicant/receipt
--- a/wpa_supplicant/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wpa_supplicant/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.6"
 CATEGORY="utilities"
 SHORT_DESC="WPA Supplicant with support for WPA and WPA2"
-MAINTAINER="0dddba11@googlemail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://w1.fi/wpa_supplicant/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/wpa_supplicant.html"
@@ -13,7 +13,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://w1.fi/releases/$TARBALL"
 
-BUILD_DEPENDS_arm="openssl-dev libnl-dev"
 BUILD_DEPENDS="libnl-dev dbus-dev openssl-dev readline-dev"
 
 compile_rules() {
@@ -31,26 +30,12 @@
 CONFIG_WPS=y
 CONFIG_AP=y
 CONFIG_BGSCAN_SIMPLE=y
-EOT
-	# Don't use DBUS on ARM arch
-	case "$ARCH" in
-		arm)
-			cat >> .config <<EOT
-CFLAGS += -I${sysroot}/usr/include/libnl3
-CFLAGS += -I${sysroot}/usr/include/openssl
-LIBS += -L${sysroot}/usr/lib
-EOT
-			;;
-		i?86|x86_64)
-			cat >> .config <<EOT
 CFLAGS += -I/usr/include/libnl3
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
 EOT
-			;;
-	esac
-	make BINDIR=/sbin LIBDIR=/lib || exit 1
+	make BINDIR=/sbin LIBDIR=/lib || return 1
 
 	# commands
 	bindir="$install/sbin"
@@ -83,9 +68,6 @@
 	DEPENDS="dbus openssl libnl ncurses readline"
 	CONFIG_FILES="/etc/wpa/wpa_supplicant.conf"
 	TAGS="wireless wifi network"
-	case "$SLITAZ_ARCH" in
-		arm*) DEPENDS="openssl libnl";;
-	esac
 }
 
 post_install() {
diff -r ad29ddfee1c9 -r d5aab818505e wput/receipt
--- a/wput/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wput/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.2"
 CATEGORY="network"
 SHORT_DESC="A tiny wget-like ftp-client for uploading files"
-MAINTAINER="l.lemarinel@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://wput.sourceforge.net/"
 
@@ -12,14 +12,14 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 compile_rules() {
-	sed -i "s|^prefix *=.*|prefix = $DESTDIR/usr|" Makefile.in
+	sed -i "s|^prefix *=.*|prefix = $install/usr|" Makefile.in
 	./configure \
 		--prefix=/usr \
 		--disable-g-switch \
 		--without-ssl \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wqy-bitmapfont/receipt
--- a/wqy-bitmapfont/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wqy-bitmapfont/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,16 +3,15 @@
 PACKAGE="wqy-bitmapfont"
 VERSION="0.9.9"
 CATEGORY="x-window"
-SHORT_DESC="A popular Chinese bitmap font."
-MAINTAINER="tsjz@ymail.com"
+SHORT_DESC="A popular Chinese bitmap font"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.wqy.org/"
+
 TARBALL="$PACKAGE-pcf-0.9.9-0.tar.gz"
-WGET_URL="$SF_MIRROR/wqy/$PACKAGE/$VERSION/$TARBALL"
-TAGS="font"
+WGET_URL="$SF_MIRROR/wqy/$TARBALL"
 
-genpkg_rules()
-{
+genpkg_rules() {
 	FONT=/usr/share/fonts/wenquanyi/wqy-bitmapfont
 	mkdir -p \
 		$fs$FONT \
@@ -22,9 +21,9 @@
 	cp -a $src/*.conf $fs/etc/fonts/conf.avail
 	ln -s ../conf.avail/85-wqy-bitmapsong.conf \
 		$fs/etc/fonts/conf.d/85-wqy-bitmapsong.conf
+	TAGS="font"
 }
 
-post_install()
-{
+post_install() {
 	chroot "$1/" fc-cache -f > /dev/null 2>&1
 }
diff -r ad29ddfee1c9 -r d5aab818505e wqy-microhei/receipt
--- a/wqy-microhei/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wqy-microhei/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,13 +6,12 @@
 SHORT_DESC="文泉驿微米黑，版本v0.2.0-beta (开发代号：远古大爆炸，Codename: BigBang)"
 MAINTAINER="lufeng369@slitaz.org"
 LICENSE="Apache GPL3"
-WEB_SITE="http://wenq.org/index.cgi?MicroHei"
+WEB_SITE="http://wenq.org/wqy2/index.cgi?MicroHei"
 REPOLOGY="fonts:wqy-microhei"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/wqy/$TARBALL"
 
-# Rules to configure and make the package.
 compile_rules() {
 	fontdir="$install/usr/share/fonts/truetype/WenQuanYi"
 	mkdir -p $fontdir
@@ -21,7 +20,6 @@
 	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules() {
 	copy *.ttc
 }
diff -r ad29ddfee1c9 -r d5aab818505e wv/receipt
--- a/wv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,16 @@
 VERSION="1.2.9"
 CATEGORY="x-window"
 SHORT_DESC="MS document manipulation library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.abisource.com/projects/"
+WEB_SITE="https://www.abisource.com/projects/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/wv.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.abisource.com/downloads/wv/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="libgsf-dev glib-dev libxml2-dev libpng16-dev"
-SPLIT="wv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|.ac_install_sh -d|mkdir -p|' configure
diff -r ad29ddfee1c9 -r d5aab818505e wvdial/receipt
--- a/wvdial/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wvdial/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.61"
 CATEGORY="network"
 SHORT_DESC="Makes modem-based connection to Internet"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://code.google.com/archive/p/wvstreams/"
 
@@ -17,8 +17,8 @@
 	./configure &&
 	make -j1 &&
 	make -j1 \
-		prefix=$DESTDIR/usr \
-		PPPDIR=$DESTDIR/etc/ppp/peers \
+		prefix=$install/usr \
+		PPPDIR=$install/etc/ppp/peers \
 		install
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e wvstreams/receipt
--- a/wvstreams/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wvstreams/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="wvstreams"
 VERSION="4.6.1"
 CATEGORY="network"
-SHORT_DESC="makes modem-based connection to Internet"
-MAINTAINER="jozee@slitaz.org"
+SHORT_DESC="Makes modem-based connection to Internet"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://code.google.com/archive/p/wvstreams/"
 
@@ -12,7 +12,7 @@
 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/$TARBALL"
 
 BUILD_DEPENDS="ppp-dev openssl10-dev xplc-dev readline-dev bash zlib-dev"
-SPLIT="wvstreams-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/wvuid.h"/&\n#include <unistd.h>/' utils/wvuid.cc
diff -r ad29ddfee1c9 -r d5aab818505e wxHexEditor/receipt
--- a/wxHexEditor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wxHexEditor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,12 +13,9 @@
 SF_PROJECT="wxhexeditor"
 WGET_URL="$SF_MIRROR/$SF_PROJECT/$TARBALL"
 
-DEPENDS="libgomp wxWidgets28"
-BUILD_DEPENDS="wxWidgets28-dev libffi libtool autoconf automake gettext-tools"
+BUILD_DEPENDS="wxWidgets28-dev libffi libtool autoconf automake gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|^PREFIX\ *= /usr/local|PREFIX = /usr|' $src/makefile
 	sed -i 's|^HOST=|HOST = '$HOST_SYSTEM'|' $src/makefile
 
@@ -35,8 +32,7 @@
 	make OPTFLAGS="-fopenmp" && make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libgomp wxWidgets28"
 }
diff -r ad29ddfee1c9 -r d5aab818505e wxWidgets/receipt
--- a/wxWidgets/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wxWidgets/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0.2"
 CATEGORY="x-window"
 SHORT_DESC="Cross-platform GUI Library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://www.wxwidgets.org/"
 REPOLOGY="wxwidgets"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
 xorg-dev xorg-xorgproto glu mesa-dev libpng16-dev tiff-dev \
 jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
-SPLIT="wxWidgets-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's/.*<string>/#include <cmath>\n&/;s/(abs(/(std::abs(/' \
@@ -32,7 +32,7 @@
 		--enable-unicode \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wxWidgets28/receipt
--- a/wxWidgets28/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wxWidgets28/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.8.12.1"
 CATEGORY="x-window"
 SHORT_DESC="Cross-platform GUI Library (oldstable version)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
 WEB_SITE="http://www.wxwidgets.org/"
 REPOLOGY="wxwidgets28"
@@ -15,7 +15,7 @@
 BUILD_DEPENDS="gtk2-dev expat-dev zlib-dev \
 xorg-dev xorg-xorgproto glu mesa-dev libpng12-dev tiff-dev \
 jpeg-dev xorg-libXpm-dev patch xorg-libxshmfence-dev glu-dev"
-SPLIT="wxWidgets28-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|/opt/wx/current/bin/||' wxPython/wx/build/build_options.py
@@ -32,11 +32,11 @@
 		--enable-unicode \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
+	make DESTDIR=$install install &&
 	cd $src/contrib &&
 	{
 		make &&
-		make DESTDIR=$DESTDIR  install
+		make DESTDIR=$install install
 	} 2>&1 | sed 's/h: No such/h: no such/'
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e wxdfast/receipt
--- a/wxdfast/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wxdfast/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="0.6.0"
 CATEGORY="network"
 SHORT_DESC="Download Manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dfast.sourceforge.net/index.html"
 
-TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-WGET_URL="http://heanet.dl.sourceforge.net/sourceforge/dfast/$TARBALL"
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/dfast/$TARBALL"
 
 BUILD_DEPENDS="wxWidgets28-dev"
 
@@ -17,7 +17,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e wxpython/receipt
--- a/wxpython/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wxpython/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="2.8.12.1"
 CATEGORY="x-window"
 SHORT_DESC="GUI toolkit for the Python programming language"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL"
-WEB_SITE="http://www.wxpython.org/"
+WEB_SITE="https://www.wxpython.org/"
 
 TARBALL="wxPython-src-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/wxpython/$TARBALL"
 
 BUILD_DEPENDS="python-dev wxWidgets28-dev mesa-dev glu-dev"
-SPLIT="wxpython-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CXXFLAGS="-Wno-narrowing"
@@ -31,21 +31,18 @@
 		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS
 	cd $src/wxPython
-	python setup.py WXPORT=gtk2 UNICODE=1 build
-	python setup.py WXPORT=gtk2 UNICODE=1 install --root=$DESTDIR
+	python -B setup.py WXPORT=gtk2 UNICODE=1 build &&
+	python -B setup.py WXPORT=gtk2 UNICODE=1 install --root=$install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		wxpython)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/bin $fs/usr
-			cp -a $install/usr/lib/python* $fs/usr/lib
+			copy @std
 			DEPENDS="python wxWidgets28"
 			;;
 		*-dev)
-			mkdir -p $fs/usr
-			cp -a $install/usr/include $fs/usr
+			copy @dev
 			;;
 	esac
 }
diff -r ad29ddfee1c9 -r d5aab818505e wyrd/receipt
--- a/wyrd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/wyrd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="wyrd"
 VERSION="1.4.5"
 CATEGORY="utilities"
-SHORT_DESC="Wyrd is a text-based front-end to Remind"
+SHORT_DESC="Text-based front-end to Remind"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://pessimization.com/software/wyrd/"
@@ -16,7 +16,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make -j1 &&
-	make -j1 DESTDIR=$DESTDIR install
+	make -j1 DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e x11rec/receipt
--- a/x11rec/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/x11rec/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="x11rec"
 VERSION="0.3"
 CATEGORY="x-window"
-SHORT_DESC="A very ad hoc X11 recorder."
+SHORT_DESC="A very ad hoc X11 recorder"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://0xcc.net/x11rec"
@@ -12,11 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="ruby imagemagick xorg-xwininfo gifsicle"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/x11rec $fs/usr/bin
+	DEPENDS="ruby imagemagick xorg-xwininfo gifsicle"
 }
diff -r ad29ddfee1c9 -r d5aab818505e x11vnc/receipt
--- a/x11vnc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/x11vnc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,14 +12,14 @@
 WGET_URL="$SF_MIRROR/libvncserver/$TARBALL"
 
 BUILD_DEPENDS="openssl-dev jpeg-dev xorg-libX11-dev zlib-dev xorg-libXext-dev"
-SPLIT="x11vnc-extra"
+SPLIT="$PACKAGE-extra"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make -j1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
-	# rm -rf $DESTDIR/usr/share/applications
+	# rm -rf $install/usr/share/applications
 	install -Dm755 $stuff/x11vnc $install/etc/init.d/x11vnc
 }
 
diff -r ad29ddfee1c9 -r d5aab818505e x264/receipt
--- a/x264/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/x264/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="20181013"
 CATEGORY="multimedia"
 SHORT_DESC="Free H.264/AVC encoder"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.videolan.org/developers/x264.html"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://ftp.videolan.org/pub/videolan/x264/snapshots/$TARBALL"
 
 BUILD_DEPENDS="nasm"
-SPLIT="x264-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e x265/receipt
--- a/x265/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/x265/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,12 +12,12 @@
 WGET_URL="http://ftp.videolan.org/pub/videolan/x265/$TARBALL"
 
 BUILD_DEPENDS="cmake nasm"
-SPLIT="x265-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Fix build for i486 arch:
 	# -- CMAKE_SYSTEM_PROCESSOR value `i486` is unknown
-	# -- Please add this value near ${src}/source/CMakeLists.txt:78
+	# -- Please add this value near $src/source/CMakeLists.txt:78
 	sed -i 's|i386 i686|i386 i486 i686|' $src/source/CMakeLists.txt
 
 	cd $src/build
diff -r ad29ddfee1c9 -r d5aab818505e xalan-c/receipt
--- a/xalan-c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xalan-c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="An XSLT processor for transforming XML documents into HTML, text, \
 or other XML document types"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://xalan.apache.org/"
 
@@ -13,7 +13,7 @@
 WGET_URL="http://www.eu.apache.org/dist/xalan/xalan-c/sources/$TARBALL"
 
 BUILD_DEPENDS="xerces-c-dev"
-SPLIT="xalan-c-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export XERCESCROOT=/usr
diff -r ad29ddfee1c9 -r d5aab818505e xalan-xerces-j/receipt
--- a/xalan-xerces-j/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xalan-xerces-j/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.7.1"
 CATEGORY="development"
 SHORT_DESC="A validating XML parser and an XSLT processor written in Java"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://xalan.apache.org/"
 REPOLOGY="xalan-j2"
@@ -19,8 +19,8 @@
 	[ -d ${SOURCE}_2_7_1 ] && mv ${SOURCE}_2_7_1  $src
 	cd $src
 
-	mkdir -p $DESTDIR/usr/share/java &&
-	cp -f $src/*.jar $DESTDIR/usr/share/java
+	mkdir -p $install/usr/share/java &&
+	cp -f $src/*.jar $install/usr/share/java
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xaos/receipt
--- a/xaos/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xaos/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,28 +3,24 @@
 PACKAGE="xaos"
 VERSION="3.6"
 CATEGORY="graphics"
-SHORT_DESC="Fast interactive fractal zoomer."
+SHORT_DESC="Fast interactive fractal zoomer"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://matek.hu/xaos/"
+WEB_SITE="http://matek.hu/xaos/doku.php"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/xaos/$TARBALL"
 
-DEPENDS="gsl libpng16 xorg-libX11 xorg-libXext zlib"
-BUILD_DEPENDS="gettext xorg-libX11-dev xorg-libICE-dev libpng16-dev \
+BUILD_DEPENDS="gettext-dev xorg-libX11-dev xorg-libICE-dev libpng16-dev \
 xorg-libXext-dev gsl-dev nasm"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	while read i; do patch -p1 -i $stuff/patches/$i; done < $stuff/patches/series
-
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy bin/ XaoS/ locale/
+	DEPENDS="gsl libpng16 xorg-libX11 xorg-libXext zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xapian/receipt
--- a/xapian/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xapian/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="http://oligarchy.co.uk/xapian/$VERSION/$TARBALL"
 
 BUILD_DEPENDS="perl zlib-dev util-linux-uuid-dev"
-SPLIT="xapian-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xar/receipt
--- a/xar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/downloads/mackyle/xar/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev openssl10-dev zlib-dev bzip2-dev"
-SPLIT="xar-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0"
diff -r ad29ddfee1c9 -r d5aab818505e xarchive/receipt
--- a/xarchive/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xarchive/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.8-6"
 CATEGORY="x-window"
 SHORT_DESC="A GTK+ front-end for command line archiving tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://xarchive.sourceforge.net/"
 
@@ -20,7 +20,7 @@
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xarchiver/receipt
--- a/xarchiver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xarchiver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.4.13"
 CATEGORY="x-window"
 SHORT_DESC="A GTK+ lightweight archive manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 #WEB_SITE="https://wiki.lxde.org/en/Xarchiver"
 WEB_SITE="https://github.com/ib/xarchiver"
diff -r ad29ddfee1c9 -r d5aab818505e xautomation/receipt
--- a/xautomation/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xautomation/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,24 @@
 PACKAGE="xautomation"
 VERSION="1.09"
 CATEGORY="x-window"
-SHORT_DESC="Control X from the command line for scripts (fte, visgrep)."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Control X from the command line for scripts (fte, visgrep)"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://hoopajoo.net/projects/xautomation.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://hoopajoo.net/projects/xautomation.html"
 WGET_URL="http://hoopajoo.net/static/projects/$TARBALL"
 
-DEPENDS="xorg-libX11 libpng16"
 BUILD_DEPENDS="xorg-libX11-dev libpng16-dev xorg-libXtst-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="xorg-libX11 libpng16"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xbattle/receipt
--- a/xbattle/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xbattle/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xbattle"
 VERSION="5.4.1"
 CATEGORY="games"
-SHORT_DESC="Concurrent multi-player battle strategy game for X11."
+SHORT_DESC="Concurrent multi-player battle strategy game for X11"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://web.archive.org/web/20011128105604/http://cns-web.bu.edu/pub/xpip/html/xbattle.html"
+
 TARBALL="${PACKAGE}_$VERSION.orig.tar.gz"
 WGET_URL="$WEB_SITE/downloads/$VERSION/$TARBALL"
-SUGGESTED="xorg-xhost"
 
-DEPENDS="xorg"
 BUILD_DEPENDS="xorg-imake xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	xmkmf
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	cp -a $stuff/*/ $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg"
+	SUGGESTED="xorg-xhost"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xbill/receipt
--- a/xbill/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xbill/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,17 @@
 PACKAGE="xbill"
 VERSION="2.1"
 CATEGORY="games"
-SHORT_DESC="Xbill is a game that tests your reflexes as you seek and destroy all forms of Bill."
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Game that tests your reflexes as you seek and destroy all forms of Bill"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
+WEB_SITE="http://www.xbill.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.xbill.org/"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
-DEPENDS="gtk2 xorg-libXaw lesstif"
 BUILD_DEPENDS="gtk2-dev xorg-libXaw-dev lesstif-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -24,13 +21,13 @@
 		--localstatedir=/var/games \
 		--enable-gtk \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/xbill $fs/usr/share
+	DEPENDS="gtk2 xorg-libXaw lesstif"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xbindkeys/receipt
--- a/xbindkeys/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xbindkeys/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xbindkeys"
 VERSION="1.8.3"
 CATEGORY="x-window"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 SHORT_DESC="Launch shell commands with your keyboard or your mouse under X"
 WEB_SITE="http://hocwp.free.fr/xbindkeys"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="keyboard"
 
-DEPENDS="xorg-libX11"
-BUILD_DEPENDS=" xorg-libX11-dev"
-
-# Rules to configure and make the package.
+BUILD_DEPENDS="xorg-libX11-dev"
 
 compile_rules() {
-	cd $src
-	./configure --prefix=/usr \
-			--disable-tk \
-			--disable-guile &&
+	./configure \
+		--prefix=/usr \
+		--disable-tk \
+		--disable-guile &&
 	make &&
-	make DESTDIR=$DESTDIR install 
+	make DESTDIR=$install install
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr 
-	cp -a $install/usr/bin $fs/usr	
+
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11"
+	TAGS="keyboard"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xcb-util-xrm/receipt
--- a/xcb-util-xrm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xcb-util-xrm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/Airblader/xcb-util-xrm/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-libX11-dev"
-SPLIT="xcb-util-xrm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xchat/receipt
--- a/xchat/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xchat/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.8.8"
 CATEGORY="network"
 SHORT_DESC="IRC client using GTK+"
-MAINTAINER="lenios@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xchat.org/"
 
@@ -12,8 +12,8 @@
 WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="gtk2-dev dbus-dev openssl10-dev shared-mime-info \
-gettext-tools perl-dev"
-SPLIT="xchat-plugin:plugin"
+gettext perl-dev"
+SPLIT="$PACKAGE-plugin:plugin"
 
 compile_rules() {
 	export CPPFLAGS="$CPPFLAGS -I/usr/include/openssl-1.0"
@@ -39,7 +39,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xchm/receipt
--- a/xchm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xchm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,25 +6,23 @@
 SHORT_DESC="Cross-platform GUI for chmlib"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://xchm.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://xchm.sourceforge.net"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="wxWidgets28 chmlib xorg-libXdamage xorg-libXxf86vm"
 BUILD_DEPENDS="wxWidgets28-dev chmlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/locale
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
 	cp -a $install/usr/share/pixmaps $fs/usr/share
+	DEPENDS="wxWidgets28 chmlib xorg-libXdamage xorg-libXxf86vm"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xcircuit/receipt
--- a/xcircuit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xcircuit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,31 +3,30 @@
 PACKAGE="xcircuit"
 VERSION="3.7.32"
 CATEGORY="graphics"
-SHORT_DESC="A program for drawing publishable-quality electrical circuit schematic diagrams"
-MAINTAINER="slaxemulator@gmail.com"
+SHORT_DESC="Drawing publishable-quality electrical circuit schematic diagrams"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://opencircuitdesign.com/xcircuit"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://opencircuitdesign.com/xcircuit"
 WGET_URL="http://opencircuitdesign.com/xcircuit/archive/$TARBALL"
 
-DEPENDS="tcl tk xorg-libXpm zlib"
 BUILD_DEPENDS="tk-dev tcl-dev xorg-libXpm-dev xorg-libXt-dev zlib-dev automake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/$PACKAGE-$VERSION
-	./configure prefix=/usr \
+	./configure \
+		prefix=/usr \
 		--with-tcl=/usr/lib \
 		--with-tk=/usr/lib \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib/$PACKAGE-${VERSION%.*} $fs/usr/lib
+	DEPENDS="tcl tk xorg-libXpm zlib"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xcursor-comix/receipt
--- a/xcursor-comix/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xcursor-comix/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -7,13 +7,13 @@
 SHORT_DESC="Comix cursor theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL"
-WEB_SITE="http://www.limitland.de/comixcursors"
+WEB_SITE="https://limitland.de/comixcursors"
 
 TARBALL="ComixCursors-$VERSION.tar.bz2"
 WGET_URL="https://gitlab.com/limitland/comixcursors/repository/${COMMIT:-$VERSION}/archive.tar.bz2"
 
 BUILD_DEPENDS="bc rsvg-convert coreutils-numeric xorg-xcursorgen symlinks"
-SPLIT="xcursor-comix-opaque-white xcursor-comix"
+SPLIT="$PACKAGE-opaque-white $PACKAGE"
 
 compile_rules() {
 	export MULTISIZE=true
diff -r ad29ddfee1c9 -r d5aab818505e xcursor-human/receipt
--- a/xcursor-human/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xcursor-human/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,8 @@
 BUILD_DEPENDS="python symlinks"
 
 compile_rules() {
-	python setup.py install --prefix=/usr --root="$install" --optimize=1
+	python -B setup.py install --prefix=/usr --root="$install" || return 1
+
 	rm -rf "$install/usr/lib"
 	. $stuff/symdup.sh
 	cp $stuff/index.theme $install/usr/share/icons/Human
diff -r ad29ddfee1c9 -r d5aab818505e xdelta/receipt
--- a/xdelta/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdelta/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xdelta"
 VERSION="3.1.0"
 CATEGORY="system-tools"
-SHORT_DESC="Binary diff, VCDIFF/RFC 3284 delta compression."
+SHORT_DESC="Binary diff, VCDIFF/RFC 3284 delta compression"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://xdelta.org/"
+
 TARBALL="$PACKAGE$VERSION.tar.gz"
-WEB_SITE="http://xdelta.org/"
 WGET_URL="https://github.com/jmacd/xdelta/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake autoconf libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd $src/xdelta3
 	autoreconf -fi
-	./configure --prefix=/usr \
+	./configure \
+		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e xdg-user-dirs/receipt
--- a/xdg-user-dirs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdg-user-dirs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://user-dirs.freedesktop.org/releases/$TARBALL"
 
-BUILD_DEPENDS="gettext libxslt docbook-xsl"
+BUILD_DEPENDS="gettext-dev libxslt docbook-xsl"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xdg-utils/receipt
--- a/xdg-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdg-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,24 +3,20 @@
 PACKAGE="xdg-utils"
 VERSION="1.1.0-rc1"
 CATEGORY="development"
-SHORT_DESC="Assists desktop integration tasks."
+SHORT_DESC="Assists desktop integration tasks"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
 WGET_URL="https://portland.freedesktop.org/download/$TARBALL" # FIXME
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 }
diff -r ad29ddfee1c9 -r d5aab818505e xdialog/receipt
--- a/xdialog/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdialog/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="2.3.1"
 CATEGORY="x-window"
 SHORT_DESC="Like 'dialog' or 'cdialog', but for X using GTK+"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://xdialog.free.fr/"
 
 TARBALL="Xdialog-$VERSION.tar.bz2"
 WGET_URL="http://xdialog.free.fr/$TARBALL"
 
-BUILD_DEPENDS="autoconf automake m4 gettext gtk2-dev"
+BUILD_DEPENDS="autoconf automake m4 gettext-dev gtk2-dev"
 
 compile_rules() {
 	autoconf &&
@@ -19,7 +19,7 @@
 		--with-gtk2 \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xdigger/receipt
--- a/xdigger/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdigger/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,30 +3,28 @@
 PACKAGE="xdigger"
 VERSION="1.0.10"
 CATEGORY="games"
-SHORT_DESC="Digger rewritten for X11."
+SHORT_DESC="Digger rewritten for X11"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.ibiblio.org/pub/Linux/games/arcade/xdigger.lsm"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$(dirname $WEB_SITE)/$TARBALL"
 
-DEPENDS="xorg"
 BUILD_DEPENDS="xorg-imake xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's| inpause) step = Tr.*|&\nwait_count = 0;|;s| && cheat||' runlevels.c
+
 	xmkmf
-	make && make DESTDIR=$DESTDIR install
+	make &&
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/bin/X11/xdigger $fs/usr/bin
 	cp -a $stuff/*/ $fs
+	DEPENDS="xorg"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xdotool/receipt
--- a/xdotool/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xdotool/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,25 +4,26 @@
 VERSION="2.20110530.1"
 CATEGORY="misc"
 SHORT_DESC="Fake keyboard/mouse input, window management, and more"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://www.semicomplete.com/projects/xdotool/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.semicomplete.com/projects/xdotool/"
 WGET_URL="http://semicomplete.googlecode.com/files/$TARBALL" # FIXME
 
-DEPENDS="xorg-libX11 xorg-libXtst"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXtst-dev xorg-libXtst xorg-dev perl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	make PREFIX=/usr INSTALLMAN=/usr/share/man DESTDIR=$DESTDIR install
+	make \
+		PREFIX=/usr \
+		INSTALLMAN=/usr/share/man \
+		DESTDIR=$install \
+		install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $install/usr/lib $fs/usr
+	DEPENDS="xorg-libX11 xorg-libXtst"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xerces-c/receipt
--- a/xerces-c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xerces-c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="3.2.1"
 CATEGORY="development"
 SHORT_DESC="A validating XML parser written in a portable subset of C++"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="Apache"
 WEB_SITE="http://xerces.apache.org/xerces-c/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://apache.osuosl.org/xerces/c/3/sources/$TARBALL"
 
-SPLIT="xerces-c-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	case $ARCH in
diff -r ad29ddfee1c9 -r d5aab818505e xfce-utils/receipt
--- a/xfce-utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce-utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.8.3"
 CATEGORY="x-window"
 SHORT_DESC="Xfce utilities"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -23,7 +23,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-appfinder/receipt
--- a/xfce4-appfinder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-appfinder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce application finder"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-dev-tools/receipt
--- a/xfce4-dev-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-dev-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="development"
 SHORT_DESC="Xfce developpers tools"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://xfce.org/~benny/projects/xfce4-dev-tools/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-icon-theme/receipt
--- a/xfce4-icon-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-icon-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.4.3"
 CATEGORY="customization"
 SHORT_DESC="Icon theme for Xfce Desktop Environment"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://archive.xfce.org/src/art/$PACKAGE/${VERSION%.*}/$TARBALL"
 
 BUILD_DEPENDS="intltool"
-SPLIT="xfce4-icon-theme-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-mixer/receipt
--- a/xfce4-mixer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-mixer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.11.0"
 CATEGORY="sound"
 SHORT_DESC="Xfce audio mixer"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-panel/receipt
--- a/xfce4-panel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-panel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce panel"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev libxfce4util-dev \
 garcon-dev exo-dev libwnck2-dev xorg-libSM-dev"
-SPLIT="xfce4-panel-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-session/receipt
--- a/xfce4-session/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-session/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce session manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-settings/receipt
--- a/xfce4-settings/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-settings/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce settings manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-slitaz-config/receipt
--- a/xfce4-slitaz-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-slitaz-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,21 +1,17 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xfce4-slitaz-config"
 VERSION="0.1"
 CATEGORY="misc"
 SHORT_DESC="Slitaz config files for XFCE"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://www.slitaz.org"
+WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
 
-DEPENDS="xfce4"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share $fs/etc
-	cp -a stuff/xdg $fs/etc
-	cp -a stuff/applications $fs/usr/share/applications
+	cp -a $stuff/xdg $fs/etc
+	cp -a $stuff/applications $fs/usr/share/applications
+	DEPENDS="xfce4"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-taskmanager/receipt
--- a/xfce4-taskmanager/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-taskmanager/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.1"
 CATEGORY="x-window"
 SHORT_DESC="Simple taskmanager for Xfce"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4-terminal/receipt
--- a/xfce4-terminal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4-terminal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6.3"
 CATEGORY="x-window"
 SHORT_DESC="Terminal emunaltor for Xfce Desktop Environment"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://goodies.xfce.org/projects/applications/terminal"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfce4/receipt
--- a/xfce4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfce4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,23 +4,16 @@
 VERSION="4.10.0"
 CATEGORY="meta"
 SHORT_DESC="Xfce Desktop Environment"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-SUGGESTED="xfce4-slitaz-config"
 WEB_SITE="https://www.xfce.org/"
 
-DEPENDS="libxfce4util xfconf libxfce4ui garcon exo \
-xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman \
+DEPENDS="libxfce4util xfconf libxfce4ui garcon exo xfce4-panel thunar \
+xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman \
 thunar-archive-plugin xfce-utils"
+SUGGESTED="xfce4-slitaz-config"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-}
-
-post_install()
-{
+post_install() {
 	# Adding xfce to SLIM available sessions.
 	if ! grep -q xfce "$1/etc/slim.conf"; then
 		sed -i s/,jwm/,jwm,xfce/ "$1/etc/slim.conf"
diff -r ad29ddfee1c9 -r d5aab818505e xfconf/receipt
--- a/xfconf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfconf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce configuration utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="intltool libxfce4util-dev dbus-dev dbus-glib-dev \
 perl-extutils-depends perl-extutils-pkgconfig perl-glib perl-dev"
-SPLIT="xfconf-dev xfconf-perl xfconf"
+SPLIT="$PACKAGE-dev $PACKAGE-perl $PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xfdesktop/receipt
--- a/xfdesktop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfdesktop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce desktop"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="intltool xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev \
 dbus-glib-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev exo-dev \
 thunar-dev garcon-dev libnotify-dev"
-SPLIT="xfdesktop-extras xfdesktop"
+SPLIT="$PACKAGE-extras $PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xfe/receipt
--- a/xfe/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfe/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,23 +4,18 @@
 VERSION="1.40"
 CATEGORY="system-tools"
 SHORT_DESC="FOX tools for X Window"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://roland65.free.fr/xfe/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS_arm="libpng16-dev libjpeg-turbo-dev tiff-dev xorg-libXft-dev \
-fox-dev automake"
 BUILD_DEPENDS="libpng16-dev libjpeg-turbo-dev tiff-dev xorg-libXft-dev fox-dev \
-automake intltool gettext xorg-libXrandr-dev xorg-libXi"
-SPLIT="xfe-extra-icons xfe xfi xfw xfp"
+automake intltool gettext-dev xorg-libXrandr-dev xorg-libXi"
+SPLIT="$PACKAGE-extra-icons $PACKAGE xfi xfw xfp"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib";;
-	esac
 	# Required by freetype-dev-2.4.11
 	sed -i 's|config/ftheader.h|freetype/config/ftheader.h|' configure.ac
 
diff -r ad29ddfee1c9 -r d5aab818505e xfig/receipt
--- a/xfig/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfig/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -23,7 +23,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR/xfig install || return 1
+	make DESTDIR=$install/xfig install || return 1
 
 	cd $src/fig2dev-$VERSION
 
@@ -31,7 +31,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR/transfig install
+	make DESTDIR=$install/transfig install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xflux/receipt
--- a/xflux/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xflux/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,16 @@
 PACKAGE="xflux"
 VERSION="1.1.8"
 CATEGORY="x-window"
-SHORT_DESC="f.lux for X."
+SHORT_DESC="f.lux for X"
 MAINTAINER="paul@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="http://stereopsis.com/flux/linux.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://stereopsis.com/flux/linux.html"
 WGET_URL="git|git://github.com/Kilian/f.lux-indicator-applet.git"
 
-DEPENDS=""
 BUILD_DEPENDS="git bzip2"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/$PACKAGE $fs/usr/bin
+genpkg_rules() {
+	copy @std
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e xfmedia/receipt
--- a/xfmedia/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfmedia/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.2"
 CATEGORY="multimedia"
 SHORT_DESC="Xfce Media Player"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://spuriousinterrupt.org/projects/xfmedia"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfmpc/receipt
--- a/xfmpc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfmpc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.2.3"
 CATEGORY="x-window"
 SHORT_DESC="MPD client for Xfce"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://goodies.xfce.org/projects/applications/xfmpc"
 
diff -r ad29ddfee1c9 -r d5aab818505e xfprint/receipt
--- a/xfprint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfprint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.6.1"
 CATEGORY="x-window"
 SHORT_DESC="Xfce Printer manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="libxfcegui4-dev libxfce4util-dev cups-dev intltool xfconf-dev \
 dbus-glib-dev startup-notification-dev util-linux-uuid-dev gtk2-dev \
 xorg-xcb-util-dev"
-SPLIT="xfprint-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS="$LDFLAGS -lX11"
@@ -24,7 +24,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xfsdump/receipt
--- a/xfsdump/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfsdump/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsdump/$TARBALL"
 
-BUILD_DEPENDS="libtool gettext util-linux-uuid-dev xfsprogs-dev \
+BUILD_DEPENDS="libtool gettext-dev util-linux-uuid-dev xfsprogs-dev \
 util-linux-uuid-dev attr-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xfsprogs/receipt
--- a/xfsprogs/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfsprogs/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,8 +3,8 @@
 PACKAGE="xfsprogs"
 VERSION="4.9.0"
 CATEGORY="system-tools"
-SHORT_DESC="Utilities for making, mounting, and manipulating XFS file-system"
-MAINTAINER="patel@math.uga.edu"
+SHORT_DESC="Making, mounting, and manipulating XFS filesystem"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="http://oss.sgi.com/projects/xfs/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/postlfs/xfsprogs.html"
@@ -12,8 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$TARBALL"
 
-BUILD_DEPENDS="gettext util-linux-uuid-dev readline-dev"
-SPLIT="xfsprogs-dev"
+BUILD_DEPENDS="gettext-dev util-linux-uuid-dev readline-dev \
+util-linux-blkid-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	rm /bin/rpm # busybox rpm useless here
diff -r ad29ddfee1c9 -r d5aab818505e xfwm4/receipt
--- a/xfwm4/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xfwm4/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="4.12.0" # Xfce release 4.12: http://archive.xfce.org/xfce/4.12/src/
 CATEGORY="x-window"
 SHORT_DESC="Xfce window manager"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.xfce.org/"
 
@@ -15,7 +15,7 @@
 xorg-libXext-dev gtk2-dev libxfce4util-dev libxfce4ui-dev libwnck2-dev \
 libdrm-dev xorg-libXrandr-dev xorg-libXcomposite-dev xorg-libXfixes-dev \
 xorg-libXdamage-dev"
-SPLIT="xfwm4-themes xfwm4"
+SPLIT="$PACKAGE-themes $PACKAGE"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xgalaga/receipt
--- a/xgalaga/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xgalaga/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,43 +3,40 @@
 PACKAGE="xgalaga"
 VERSION="2.1.1.0"
 CATEGORY="games"
-SHORT_DESC="A clone of the classic game Galaga for the X Window System."
+SHORT_DESC="A clone of the classic game Galaga for the X Window System"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="https://sourceforge.net/projects/xgalaga/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
 HOST_ARCH="i486"
 
-DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm xorg-libxcb \
-xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+
 BUILD_DEPENDS="xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/share/man/man6
+compile_rules() {
+	mkdir -p $install/usr/share/man/man6
 	sed -i	-e 's|\$(mandir)|$(DESTDIR)&|' \
 		-e 's|@prefix@|/usr/share/xgalaga|' \
 		-e 's|@exec_prefix@|/usr/bin|' \
 		-e 's|@CREDITSFILE@|/usr/share/xgalaga/CREDITS|' \
 			Makefile.in
 	./configure $CONFIGURE_ARGS
-	sed -i	-e 's|/usr/sounds/|/usr/share/xgalaga/sounds/|' \
+	sed \
+		-e 's|/usr/sounds/|/usr/share/xgalaga/sounds/|' \
 		-e 's|/usr/levels/|/usr/share/xgalaga/levels/|' \
 		-e 's|/usr/CREDITS|/usr/share/xgalaga/CREDITS|' \
 		-e 's|/usr/scores|/var/games/xgalaga/scores|' \
-			config.h
+		-i config.h
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/applications $fs/var/games/xgalaga/scores
 	cp -a $install/usr/share/xgalaga $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp $stuff/*.desktop $fs/usr/share/applications
+	DEPENDS="xorg-libX11 xorg-libXmu xorg-libXt xorg-libXext xorg-libXpm \
+	xorg-libxcb xorg-libXau xorg-libXdmcp xorg-libSM xorg-libICE util-linux-uuid"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e xget/receipt
--- a/xget/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xget/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -18,8 +18,8 @@
 		libxauth/Makefile statfs/Makefile
 	sed -i 's|<stdio.h>|&\n#include <sys/resource.h>|' xcpufs/xcpufs.c
 
-	make -j 1 &&
-	make INSTALLPREFIX=$DESTDIR/usr install || return 1
+	make -j1 &&
+	make INSTALLPREFIX=$install/usr install || return 1
 
 	cook_pick_docs doc/*.pdf
 }
diff -r ad29ddfee1c9 -r d5aab818505e xhtml2pdf/receipt
--- a/xhtml2pdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xhtml2pdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,24 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xhtml2pdf"
-SOURCE="pisa"
 VERSION="3.0.32"
 CATEGORY="utilities"
-SHORT_DESC="Converter for HTML/XHTML and CSS to PDF."
+SHORT_DESC="Converter for HTML/XHTML and CSS to PDF"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.xhtml2pdf.com/"
+
+SOURCE="pisa"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://www.xhtml2pdf.com"
 WGET_URL="https://files.pythonhosted.org/packages/source/p/$SOURCE/$TARBALL"
 
-DEPENDS="python python-reportlab python-html5lib python-pypdf"
-BUILD_DEPENDS="$DEPENDS python-dev"
+BUILD_DEPENDS="python-dev python-reportlab python-html5lib python-pypdf"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	python setup.py install --root=$DESTDIR
+compile_rules() {
+	python -B setup.py install --root=$install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="python python-reportlab python-html5lib python-pypdf"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xine-lib/receipt
--- a/xine-lib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xine-lib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.8"
 CATEGORY="multimedia"
 SHORT_DESC="Xine video library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xine-project.org/"
 
@@ -14,7 +14,7 @@
 BUILD_DEPENDS="xorg-libXvMC-dev xorg-libXv-dev xorg-xorgproto \
 alsa-lib-dev libogg-dev libvorbis-dev libtheora-dev freetype-dev perl \
 util-linux-uuid-dev xorg-libxcb-dev libcaca-dev ffmpeg-dev file \
-libmodplug-dev xorg-libXinerama-dev speex-dev gettext-tools"
+libmodplug-dev xorg-libXinerama-dev speex-dev gettext"
 SPLIT="xine-fonts $PACKAGE $PACKAGE-dev"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xine-plugin/receipt
--- a/xine-plugin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xine-plugin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.2"
 CATEGORY="multimedia"
 SHORT_DESC="Xine media player Firefox plugin"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xinehq.de/"
 
@@ -14,12 +14,12 @@
 BUILD_DEPENDS="shared-mime-info xine-lib xine-lib-dev xorg-dev gfortran"
 
 compile_rules() {
-	mkdir -p $DESTDIR/root/.mozilla/plugins
+	mkdir -p $install/root/.mozilla/plugins
 
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/usr/share/xine
 	# There's something different, don't know why
diff -r ad29ddfee1c9 -r d5aab818505e xine-ui/receipt
--- a/xine-ui/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xine-ui/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.99.7"
 CATEGORY="multimedia"
 SHORT_DESC="Xine media player user interface"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xine-project.org/"
 
@@ -22,7 +22,8 @@
 		--without-curl \
 		--disable-lirc \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xinput-calibrator/receipt
--- a/xinput-calibrator/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xinput-calibrator/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,9 +4,9 @@
 VERSION="0.7.5"
 CATEGORY="x-window"
 SHORT_DESC="A generic touchscreen calibration program for X.Org"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/xinput_calibrator/"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/xinput_calibrator/"
 
 TARBALL="xinput_calibrator-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/tias/xinput_calibrator/$TARBALL"
diff -r ad29ddfee1c9 -r d5aab818505e xl2tpd/receipt
--- a/xl2tpd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xl2tpd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xl2tpd"
 VERSION="1.2.4"
 CATEGORY="network"
-SHORT_DESC="Layer 2 Tunneling Protocol (L2TP) daemon."
+SHORT_DESC="Layer 2 Tunneling Protocol (L2TP) daemon"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.xelerance.com/software/xl2tpd"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.xelerance.com/software/xl2tpd"
 WGET_URL="$WEB_SITE/$TARBALL"
-TAGS="vpn tunnel"
 
-DEPENDS="libpcap"
 BUILD_DEPENDS="libpcap-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/-lpcap \$(LDLIBS) -o pfc pfc.o/$(LDLIBS) -o pfc pfc.o -lpcap/' Makefile
-	make PREFIX=/usr DESTDIR=$DESTDIR install
+
+	make PREFIX=/usr DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpcap"
+	TAGS="vpn tunnel"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e xlockmore/receipt
--- a/xlockmore/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xlockmore/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,42 +1,38 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xlockmore"
 VERSION="5.40"
 CATEGORY="utilities"
-SHORT_DESC="X Window System Lock Screen."
-MAINTAINER="rocky@slitaz.org"
+SHORT_DESC="X Window System Lock Screen"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://sillycycle.com/xlockmore.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://sillycycle.com/xlockmore.html"
 WGET_URL="https://www.tux.org/~bagleyd/xlock/$PACKAGE-$VERSION/$TARBALL" # FIXME
 
-DEPENDS="xorg-libX11 freetype freetype1"
 BUILD_DEPENDS="xorg-libXdmcp-dev xorg-libXpm-dev xorg-libX11-dev \
 xorg-libXt-dev xorg-libXext-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-    cd $src
-    ./configure --prefix=/usr \
-        --infodir=/usr/share/info \
-        --mandir=/usr/share/man \
-        $CONFIGURE_ARGS &&
-    make &&
-    mkdir -p $DESTDIR/usr/share/X11/app-defaults/ \
-        $DESTDIR/usr/bin
-    cp -f xlock/xlock $DESTDIR/usr/bin/
-    cp -f xlock/XLock.ad $DESTDIR/usr/share/X11/app-defaults/XLock
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
+	make || return 1
+
+	mkdir -p $install/usr/share/X11/app-defaults/ \
+		$install/usr/bin
+	cp -f xlock/xlock $install/usr/bin/
+	cp -f xlock/XLock.ad $install/usr/share/X11/app-defaults/XLock
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    mkdir -p $fs
-    cp -a $install/usr $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11 freetype freetype1"
 }
 
-post_install() 
-{
-    chmod u+s "$1/usr/bin/xlock"
+post_install() {
+	chmod u+s "$1/usr/bin/xlock"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xlogo/receipt
--- a/xlogo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xlogo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,25 +3,16 @@
 PACKAGE="xlogo"
 VERSION="0.9.959"
 CATEGORY="games"
-SHORT_DESC="A logo interpreter written in java."
+SHORT_DESC="A logo interpreter written in java"
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL"
-TARBALL="xlogo.jar"
-WEB_SITE="http://xlogo.tuxfamily.org"
+WEB_SITE="http://xlogo.tuxfamily.org/"
 
-DEPENDS="java-jre"
+TARBALL="xlogo.jar" # FIXME versioning
+WGET_URL="http://downloads.tuxfamily.org/xlogo/common/$TARBALL"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	wget_url="http://downloads.tuxfamily.org/xlogo/common/xlogo.jar"
-	[ -f $SRC/xlogo.jar ] ||
-	wget $wget_url -P $SRC
-}
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/lib/xlogo
 	cp $SRC/xlogo.jar $fs/usr/lib/xlogo
+	DEPENDS="java-jre"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xmgrace/receipt
--- a/xmgrace/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xmgrace/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,44 +1,49 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xmgrace"
 VERSION="5.1.25"
 CATEGORY="math"
-SHORT_DESC="Grace is a WYSIWYG 2D plotting tool."
+SHORT_DESC="Grace is a WYSIWYG 2D plotting tool"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL2"
-SOURCE="grace"
 WEB_SITE="http://plasma-gate.weizmann.ac.il/Grace/"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+
+TARBALL="grace-$VERSION.tar.gz"
 WGET_URL="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/$TARBALL"
 
-DEPENDS="libjpeg libpng16 fftw lesstif"
 BUILD_DEPENDS="jpeg-dev libpng16-dev fftw-dev lesstif-dev xorg-xorgproto bison \
 xorg-libXt-dev"
 
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|/man/|/share&|' doc/Makefile*
-	./configure $CONFIGURE_ARGS \
-		--prefix=/usr   --sharedstatedir=/var/lib --localstatedir=/var \
+
+	./configure \
+		--prefix=/usr \
+		--sharedstatedir=/var/lib \
+		--localstatedir=/var \
 		--enable-grace-home=/usr/share/grace \
 		--without-pdf-library \
-		--disable-netcdf --disable-editres \
-		--with-editor="editor" --with-helpviewer="browser %s" \
-		--disable-xmhtml &&
+		--disable-netcdf \
+		--disable-editres \
+		--with-editor="editor" \
+		--with-helpviewer="browser %s" \
+		--disable-xmhtml \
+		$CONFIGURE_ARGS &&
 	make &&
 	make install &&
-	make links
+	make links || return 1
+
 	mkdir -p $install/usr/share/applications
 	cp -a $stuff/xmgrace.desktop $install/usr/share/applications
 
 	fix symlinks
 }
 
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	rm -r $fs/usr/share/grace/auxiliary/magic.grace \
 		$fs/usr/share/grace/doc/*.pdf \
 		$fs/usr/share/grace/doc/*.1 \
 		$fs/usr/man
+	DEPENDS="libjpeg libpng16 fftw lesstif"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xmlrpc-c/receipt
--- a/xmlrpc-c/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xmlrpc-c/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="automake texinfo curl-dev libxml2-dev"
-SPLIT="xmlrpc-c-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# this file appeared later (with this content), but is absent when it required
@@ -25,8 +25,8 @@
 		--disable-wininet-client \
 		--enable-cplusplus \
 		$CONFIGURE_ARGS &&
-	make -j 1 &&
-	make DESTDIR=$DESTDIR install
+	make -j1 &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xmlstarlet/receipt
--- a/xmlstarlet/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xmlstarlet/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,8 @@
 	./configure \
 		--with-libxml-include-prefix=/usr/include/libxml2/ \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	mv $install/usr/bin/xml $install/usr/bin/xmlstarlet
 }
diff -r ad29ddfee1c9 -r d5aab818505e xmlto/receipt
--- a/xmlto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xmlto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
 	for file in $install/usr/share/xmlto/format/*/*; do
 		sed -i "s|http://docbook.sourceforge.net/release/xsl/current/|\
diff -r ad29ddfee1c9 -r d5aab818505e xombrero/receipt
--- a/xombrero/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xombrero/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 WGET_URL="https://github.com/conformal/xombrero/archive/$COMMIT.tar.gz"
 
 BUILD_DEPENDS="glib-dev gtk2-dev webkitgtk-dev libsoup-dev gnutls-dev \
-libbsd-dev perl mdocml" # groff absent yet, so we use mdocml and patch
+libbsd-dev perl mandoc" # groff absent yet, so we use mandoc and patch
 
 compile_rules() {
 	find -type f -print0 | xargs -0 sed -i 's|/usr/local|/usr|'
diff -r ad29ddfee1c9 -r d5aab818505e xorg-bitmap/receipt
--- a/xorg-bitmap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-bitmap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXmu-dev xorg-xorgproto \
 xorg-xbitmaps xorg-libXaw-dev"
-PKG_RULE="std+dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-cf-files/receipt
--- a/xorg-cf-files/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-cf-files/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,13 @@
 VERSION="1.0.6"
 CATEGORY="development"
 SHORT_DESC="Config files used by Xorg and Imake"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/util/$TARBALL"
 
-PKG_RULE="std"
-
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-evieext/receipt
--- a/xorg-evieext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-evieext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.1"
 CATEGORY="development"
 SHORT_DESC="XEvIE extension header files"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="evieext"
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/proto/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros"
-PKG_RULE="dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-font-util/receipt
--- a/xorg-font-util/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-font-util/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/font/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros"
-SPLIT="xorg-font-util-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-fstobdf/receipt
--- a/xorg-fstobdf/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-fstobdf/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-xorgproto xorg-libX11-dev xorg-libFS-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-gccmakedep/receipt
--- a/xorg-gccmakedep/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-gccmakedep/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/util/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-iceauth/receipt
--- a/xorg-iceauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-iceauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.8"
 CATEGORY="x-window"
 SHORT_DESC="ICE authority file utility"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-imake/receipt
--- a/xorg-imake/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-imake/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/util/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros perl xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libFS/receipt
--- a/xorg-libFS/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libFS/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-xorgproto xorg-xtrans"
-SPLIT="xorg-libFS-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libICE/receipt
--- a/xorg-libICE/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libICE/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.9"
 CATEGORY="x-window"
 SHORT_DESC="Inter-Client Exchange library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-xtrans"
-SPLIT="xorg-libICE-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	touch /root/missing /missing
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libSM/receipt
--- a/xorg-libSM/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libSM/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Session Management library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libICE-dev xorg-xtrans util-linux-uuid-dev"
-SPLIT="xorg-libSM-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libX11/receipt
--- a/xorg-libX11/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libX11/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.6"
 CATEGORY="x-window"
 SHORT_DESC="X11 Client library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="xorg-xtrans xorg-libxcb-dev \
 xorg-xorgproto xorg-libXau-dev xorg-libXdmcp-dev perl"
-SPLIT="xorg-libX11-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXScrnSaver/receipt
--- a/xorg-libXScrnSaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXScrnSaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libXScrnSaver-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXau/receipt
--- a/xorg-libXau/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXau/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.8"
 CATEGORY="x-window"
 SHORT_DESC="X Authorization routines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libXau.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto"
-SPLIT="xorg-libXau-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXaw/receipt
--- a/xorg-libXaw/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXaw/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.13"
 CATEGORY="x-window"
 SHORT_DESC="Athena Widgets toolkit"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXmu-dev xorg-libXpm-dev util-linux-uuid-dev"
-SPLIT="xorg-libXaw-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXaw3d/receipt
--- a/xorg-libXaw3d/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXaw3d/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev"
-SPLIT="xorg-libXaw3d-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXcomposite/receipt
--- a/xorg-libXcomposite/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXcomposite/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.4"
 CATEGORY="x-window"
 SHORT_DESC="Composite Extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libXfixes-dev"
-SPLIT="xorg-libXcomposite-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXcursor/receipt
--- a/xorg-libXcursor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXcursor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.15"
 CATEGORY="x-window"
 SHORT_DESC="Cursor extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXdamage/receipt
--- a/xorg-libXdamage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXdamage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.4"
 CATEGORY="x-window"
 SHORT_DESC="Damage extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libXfixes-dev"
-SPLIT="xorg-libXdamage-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXdmcp/receipt
--- a/xorg-libXdmcp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXdmcp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.2"
 CATEGORY="x-window"
 SHORT_DESC="X Display Manager Control Protocol routines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libXdmcp.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto"
-SPLIT="xorg-libXdmcp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXext/receipt
--- a/xorg-libXext/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXext/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.3"
 CATEGORY="x-window"
 SHORT_DESC="Common X Extensions library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
-SPLIT="xorg-libXext-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXfixes/receipt
--- a/xorg-libXfixes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXfixes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.0.3"
 CATEGORY="x-window"
 SHORT_DESC="X-Fixes extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libX11-dev"
-SPLIT="xorg-libXfixes-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXfont/receipt
--- a/xorg-libXfont/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXfont/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.4"
 CATEGORY="x-window"
 SHORT_DESC="X font handling library for server & utilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="libxfont"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="bzip2-dev freetype-dev zlib-dev xorg-xtrans xorg-xorgproto \
 xorg-libfontenc-dev"
-SPLIT="xorg-libXfont-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXfont2/receipt
--- a/xorg-libXfont2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXfont2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="xorg-util-macros freetype-dev xorg-xtrans \
 xorg-xorgproto xorg-libfontenc-dev"
-SPLIT="xorg-libXfont2-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXfontcache/receipt
--- a/xorg-libXfontcache/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXfontcache/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="gfortran xorg-libX11-dev xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libXfontcache-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXft/receipt
--- a/xorg-libXft/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXft/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.3.2"
 CATEGORY="x-window"
 SHORT_DESC="Client side font rendering library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXrender-dev freetype-dev fontconfig-dev libxml2-dev"
-SPLIT="xorg-libXft-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXi/receipt
--- a/xorg-libXi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.7.9"
 CATEGORY="x-window"
 SHORT_DESC="X Input Extension library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXext-dev xorg-libXfixes-dev xorg-xorgproto"
-SPLIT="xorg-libXi-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXinerama/receipt
--- a/xorg-libXinerama/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXinerama/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.4"
 CATEGORY="x-window"
 SHORT_DESC="Xinerama protocol library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libXinerama-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXmu/receipt
--- a/xorg-libXmu/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXmu/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.2"
 CATEGORY="x-window"
 SHORT_DESC="X miscellaneous utility routines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXext-dev xorg-libXt-dev util-linux-uuid-dev"
-SPLIT="xorg-libXmu-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXp/receipt
--- a/xorg-libXp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.3"
 CATEGORY="development"
 SHORT_DESC="Allow client applications to render to non-display devices"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="libxp"
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \
 xorg-libXau-dev xorg-xorgproto"
-SPLIT="xorg-libXp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXpm/receipt
--- a/xorg-libXpm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXpm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.5.12"
 CATEGORY="x-window"
 SHORT_DESC="XPM format pixmap library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,20 +14,10 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXt-dev xorg-libXext-dev xorg-libSM-dev \
-util-linux-uuid-dev gettext"
-SPLIT="xorg-libXpm-util xorg-libXpm-dev"
+util-linux-uuid-dev gettext-dev"
+SPLIT="$PACKAGE-util $PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) # ARM Hack
-			for la in libICE.la libSM.la libuuid.la; do
-				if grep -q "^libdir='/usr/lib'" /usr/lib/$la; then
-					sed -i s"#/usr/lib#/cross/$ARCH/sysroot/usr/lib#" \
-						/usr/lib/$la
-				fi
-			done ;;
-	esac
-
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXrandr/receipt
--- a/xorg-libXrandr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXrandr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.1"
 CATEGORY="x-window"
 SHORT_DESC="Xrandr extension library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/libraries/libxrandr/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libXext-dev xorg-libXrender-dev"
-SPLIT="xorg-libXrandr-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXrender/receipt
--- a/xorg-libXrender/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXrender/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.9.10"
 CATEGORY="x-window"
 SHORT_DESC="RENDER extension library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-xorgproto"
-SPLIT="xorg-libXrender-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXres/receipt
--- a/xorg-libXres/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXres/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \
 xorg-xorgproto"
-SPLIT="xorg-libXres-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXt/receipt
--- a/xorg-libXt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.5"
 CATEGORY="x-window"
 SHORT_DESC="X Toolkit Intrinsics library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,13 +14,9 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libSM-dev xorg-libX11-dev glib-dev util-linux-uuid-dev"
-SPLIT="xorg-libXt-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm) unset CFLAGS ;;
-	esac
-
 	./configure \
 		--with-appdefaultdir=/etc/X11/app-defaults \
 		$CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXtst/receipt
--- a/xorg-libXtst/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXtst/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.3"
 CATEGORY="x-window"
 SHORT_DESC="Xorg server module"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto xorg-libXext-dev xorg-libXi-dev"
-SPLIT="xorg-libXtst-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXv/receipt
--- a/xorg-libXv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.11"
 CATEGORY="x-window"
 SHORT_DESC="Xvideo extension library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libXv-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXvMC/receipt
--- a/xorg-libXvMC/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXvMC/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.10"
 CATEGORY="x-window"
 SHORT_DESC="Xorg server module"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXv-dev"
-SPLIT="xorg-libXvMC-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXxf86misc/receipt
--- a/xorg-libXxf86misc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXxf86misc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xorgproto \
 xorg-libXext-dev"
-SPLIT="xorg-libXxf86misc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libXxf86vm/receipt
--- a/xorg-libXxf86vm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libXxf86vm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.4"
 CATEGORY="x-window"
 SHORT_DESC="XFree86-VidMode extension library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libXxf86vm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libdmx/receipt
--- a/xorg-libdmx/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libdmx/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.4"
 CATEGORY="x-window"
 SHORT_DESC="Xorg DMX library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-xorgproto"
-SPLIT="xorg-libdmx-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libfontenc/receipt
--- a/xorg-libfontenc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libfontenc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.3"
 CATEGORY="x-window"
 SHORT_DESC="Font encoding library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="zlib-dev xorg-xorgproto xorg-font-util-dev"
-SPLIT="xorg-libfontenc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-liblbxutil/receipt
--- a/xorg-liblbxutil/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-liblbxutil/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="gfortran xorg-xorgproto zlib-dev"
-SPLIT="xorg-liblbxutil-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libpciaccess/receipt
--- a/xorg-libpciaccess/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libpciaccess/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.14"
 CATEGORY="x-window"
 SHORT_DESC="Xorg server module"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros"
-SPLIT="xorg-libpciaccess-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libxcb/receipt
--- a/xorg-libxcb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libxcb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.13"
 CATEGORY="x-window"
 SHORT_DESC="A C binding to the X11 protocol"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/libxcb.html"
@@ -13,22 +13,9 @@
 TARBALL="libxcb-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
-BUILD_DEPENDS="libxslt-dev xorg-xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \
-autoconf automake libtool"
-SPLIT="xorg-libxcb-dev"
-
-# Handle SliTaz arch
-case "$SLITAZ_ARCH" in
-	arm*) VERSION="1.9.1";;
-esac
-case "$ARCH" in
-	arm*) # We need host xorg-xcb-proto libxslt-dev file installed
-		VERSION="1.9.1"
-		TARBALL="libxcb-$VERSION.tar.bz2"
-		WGET_URL="https://xcb.freedesktop.org/dist/$TARBALL"
-		BUILD_DEPENDS="libxslt-dev xorg-xcb-proto xorg-libXau-dev xorg-libXdmcp-dev"
-		;;
-esac
+BUILD_DEPENDS="xorg-util-macros libxslt-dev xorg-xcb-proto xorg-libXau-dev \
+xorg-libXdmcp-dev autoconf automake libtool"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# Package "libpthread-stubs" no more needed:
@@ -43,7 +30,7 @@
 		$CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libxkbfile/receipt
--- a/xorg-libxkbfile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libxkbfile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.9"
 CATEGORY="x-window"
 SHORT_DESC="XKB file handling routines"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libxcb-dev xorg-libXau-dev xorg-libXdmcp-dev"
-SPLIT="xorg-libxkbfile-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-libxshmfence/receipt
--- a/xorg-libxshmfence/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-libxshmfence/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto"
-SPLIT="xorg-libxshmfence-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-makedepend/receipt
--- a/xorg-makedepend/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-makedepend/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.5"
 CATEGORY="development"
 SHORT_DESC="Create dependencies in makefiles"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="makedepend"
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/util/$TARBALL"
 
 BUILD_DEPENDS="xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-oclock/receipt
--- a/xorg-oclock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-oclock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXmu-dev \
 xorg-libXext-dev xorg-libXt-dev xorg-libxkbfile-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-pixman/receipt
--- a/xorg-pixman/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-pixman/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.34.0"
 CATEGORY="x-window"
 SHORT_DESC="Pixel-manipulation library for X and Cairo"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.cairographics.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/pixman.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
 
 BUILD_DEPENDS="libpng16-dev"
-SPLIT="xorg-pixman-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xorg-rgb/receipt
--- a/xorg-rgb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-rgb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="X colorname to RGB mapping database"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="rgb"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-server/receipt
--- a/xorg-server/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-server/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.20.1"
 CATEGORY="x-window"
 SHORT_DESC="X server"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xorg-server.html"
@@ -22,8 +22,8 @@
 xorg-xcb-util-renderutil-dev xorg-xcb-util-dev xorg-xcb-util-image-dev \
 xorg-xcb-util-wm-dev xorg-xcb-util-keysyms-dev expat-dev xorg-xtrans \
 xorg-xkbcomp-dev openssl-dev"
-SPLIT="xorg-server-Xdmx xorg-server-Xephyr xorg-server-Xnest xorg-server-Xvfb \
-xorg-server-module-glamor xorg-server-dev xorg-server xorg-server-light:light"
+SPLIT="$PACKAGE-Xdmx $PACKAGE-Xephyr $PACKAGE-Xnest $PACKAGE-Xvfb \
+$PACKAGE-module-glamor $PACKAGE-dev $PACKAGE $PACKAGE-light:light"
 COOKOPTS="skip-log-errors"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xorg-showfont/receipt
--- a/xorg-showfont/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-showfont/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-libFS-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-twm/receipt
--- a/xorg-twm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-twm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \
 xorg-libXt-dev xorg-libXmu-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	sed -i '/^rcdir =/s,^\(rcdir = \).*,\1/etc/X11/app-defaults,' src/Makefile.in
diff -r ad29ddfee1c9 -r d5aab818505e xorg-util-macros/receipt
--- a/xorg-util-macros/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-util-macros/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.19.2"
 CATEGORY="development"
 SHORT_DESC="Autoconf macros used in X modular configure.ac files"
-MAINTAINER="gokhlayeh@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/util-macros.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xauth/receipt
--- a/xorg-xauth/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xauth/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.10"
 CATEGORY="x-window"
 SHORT_DESC="X authority file utility"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xbacklight/receipt
--- a/xorg-xbacklight/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xbacklight/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Adjust backlight brightness using RandR extension"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xbitmaps/receipt
--- a/xorg-xbitmaps/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xbitmaps/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.2"
 CATEGORY="development"
 SHORT_DESC="Standard set of X bitmaps"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xbitmaps.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcalc/receipt
--- a/xorg-xcalc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcalc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev xorg-libXt-dev xorg-libX11-dev \
 xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-proto/receipt
--- a/xorg-xcb-proto/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-proto/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.13"
 CATEGORY="development"
 SHORT_DESC="X protocol descriptions for XCB"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-proto.html"
@@ -13,7 +13,6 @@
 TARBALL="xcb-proto-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="python-dev libxml2-tools"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util-cursor/receipt
--- a/xorg-xcb-util-cursor/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util-cursor/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-xcb-util-renderutil-dev \
 xorg-xcb-util-image-dev"
-SPLIT="xorg-xcb-util-cursor-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util-image/receipt
--- a/xorg-xcb-util-image/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util-image/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Utility libraries for XC Binding - Port of Xlib's XImage and \
 XShmImage functions"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-image.html"
@@ -15,7 +15,7 @@
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-xcb-util-dev xorg-util-macros"
-SPLIT="xorg-xcb-util-image-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util-keysyms/receipt
--- a/xorg-xcb-util-keysyms/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util-keysyms/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.0"
 CATEGORY="x-window"
 SHORT_DESC="Utility libraries for XC Binding"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-keysyms.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros"
-SPLIT="xorg-xcb-util-keysyms-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util-renderutil/receipt
--- a/xorg-xcb-util-renderutil/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util-renderutil/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros"
-SPLIT="xorg-xcb-util-renderutil-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util-wm/receipt
--- a/xorg-xcb-util-wm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util-wm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Utility libraries for XC Binding - client and window-manager \
 helpers for ICCCM"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util-wm.html"
@@ -15,7 +15,7 @@
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
 BUILD_DEPENDS="xorg-libxcb-dev xorg-util-macros"
-SPLIT="xorg-xcb-util-wm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcb-util/receipt
--- a/xorg-xcb-util/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcb-util/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.0"
 CATEGORY="x-window"
 SHORT_DESC="XCB Utilites"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://xcb.freedesktop.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xcb-util.html"
@@ -13,9 +13,8 @@
 TARBALL="xcb-util-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/xcb/$TARBALL"
 
-BUILD_DEPENDS_arm="xorg-libxcb-dev xorg-libXdmcp-dev"
 BUILD_DEPENDS="xorg-libxcb-dev gperf"
-SPLIT="xorg-xcb-util-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xclipboard/receipt
--- a/xorg-xclipboard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xclipboard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev xorg-libXmu-dev xorg-libXt-dev \
 xorg-libX11-dev xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xclock/receipt
--- a/xorg-xclock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xclock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.7"
 CATEGORY="x-window"
 SHORT_DESC="X clock"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xclock"
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev xorg-libXmu-dev \
 xorg-libX11-dev xorg-libXrender-dev xorg-libXft-dev xorg-libxkbfile-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcompmgr/receipt
--- a/xorg-xcompmgr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcompmgr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.7"
 CATEGORY="x-window"
 SHORT_DESC="X composite manager"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xcompmgr"
@@ -17,7 +17,6 @@
 xorg-libXdmcp-dev xorg-libxcb-dev"
 BUILD_DEPENDS="xorg-util-macros xorg-libXcomposite-dev xorg-libXfixes-dev \
 xorg-libXdamage-dev xorg-libXrender-dev xorg-libXext-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xcursorgen/receipt
--- a/xorg-xcursorgen/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xcursorgen/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="Create an X cursor file from PNG images"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xdpyinfo/receipt
--- a/xorg-xdpyinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xdpyinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.2"
 CATEGORY="x-window"
 SHORT_DESC="Display information utility for X"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xdriinfo/receipt
--- a/xorg-xdriinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xdriinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="Query configuration information of DRI drivers"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xedit/receipt
--- a/xorg-xedit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xedit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev xorg-libXmu-dev xorg-libXt-dev \
 xorg-libX11-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xev/receipt
--- a/xorg-xev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.2"
 CATEGORY="x-window"
 SHORT_DESC="Print contents of X events"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xeyes/receipt
--- a/xorg-xeyes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xeyes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros  xorg-libX11-dev xorg-libXt-dev \
 xorg-libXext-dev xorg-libXmu-dev xorg-libXrender-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-elographics/receipt
--- a/xorg-xf86-input-elographics/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-elographics/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg input driver for Elographics touchscreen devices"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:elographics"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-evdev/receipt
--- a/xorg-xf86-input-evdev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-evdev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.10.6"
 CATEGORY="x-window"
 SHORT_DESC="Generic Linux input driver"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#xorg-evdev-driver"
@@ -13,11 +13,9 @@
 TARBALL="xf86-input-evdev-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
-# ARM use build system xorg-server-dev or manually install it in sysroot
-BUILD_DEPENDS_arm="udev-dev"
 BUILD_DEPENDS="xorg-util-macros xorg-server-dev \
 xorg-xorgproto eudev-dev libevdev-dev mtdev-dev"
-SPLIT="xorg-xf86-input-evdev-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-joystick/receipt
--- a/xorg-xf86-input-joystick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-joystick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,8 +14,7 @@
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
 BUILD_DEPENDS="xorg-server-dev"
-SPLIT="xorg-xf86-input-joystick-dev"
-PKG_RULE="std-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-keyboard/receipt
--- a/xorg-xf86-input-keyboard/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-keyboard/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg input driver for keyboards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:keyboard"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-libinput/receipt
--- a/xorg-xf86-input-libinput/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-libinput/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
 BUILD_DEPENDS="xorg-server-dev libinput-dev mtdev-dev libevdev-dev"
-SPLIT="xorg-xf86-input-libinput-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-mouse/receipt
--- a/xorg-xf86-input-mouse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-mouse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.3"
 CATEGORY="x-window"
 SHORT_DESC="Xorg mouse input driver"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:mouse"
@@ -13,8 +13,7 @@
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
 BUILD_DEPENDS="xorg-server-dev"
-SPLIT="xorg-xf86-input-mouse-dev"
-PKG_RULE="std-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-mutouch/receipt
--- a/xorg-xf86-input-mutouch/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-mutouch/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg input driver for Microtouch devices"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:mutouch"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-synaptics/receipt
--- a/xorg-xf86-input-synaptics/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-synaptics/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.9.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg input driver for touchpads"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:synaptics"
@@ -14,8 +14,7 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-server-dev xorg-xorgproto \
 libevdev-dev xorg-libXi-dev xorg-libXtst-dev"
-SPLIT="xorg-xf86-input-synaptics-dev"
-PKG_RULE="std-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-void/receipt
--- a/xorg-xf86-input-void/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-void/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.1"
 CATEGORY="x-window"
 SHORT_DESC="Dummy/null Xorg input driver"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:void"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-input-wacom/receipt
--- a/xorg-xf86-input-wacom/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-input-wacom/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,8 +15,7 @@
 BUILD_DEPENDS="xorg-util-macros xorg-server-dev xorg-libXext-dev \
 xorg-xorgproto xorg-libXi-dev xorg-libXrandr-dev \
 xorg-libXinerama-dev eudev-dev"
-SPLIT="xorg-xf86-input-wacom-dev"
-PKG_RULE="std-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-ati/receipt
--- a/xorg-xf86-video-ati/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-ati/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="18.0.1"
 CATEGORY="x-window"
 SHORT_DESC="Xorg wrapper driver for ATI video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/ati/"
 REPOLOGY="xdrv:ati"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-fbdev/receipt
--- a/xorg-xf86-video-fbdev/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-fbdev/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.5.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg video driver for framebuffer device"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/fbdev/"
 REPOLOGY="xdrv:fbdev"
@@ -12,8 +12,6 @@
 TARBALL="xf86-video-fbdev-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/driver/$TARBALL"
 
-# ARM use build system xorg-server-dev or manually install it in sysroot
-BUILD_DEPENDS_arm=" "
 BUILD_DEPENDS="xorg-util-macros xorg-server-dev xorg-libXrandr-dev \
 xorg-libXrender-dev xorg-libXv-dev xorg-xorgproto"
 
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-fbturbo/receipt
--- a/xorg-xf86-video-fbturbo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-fbturbo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 COMMIT="f9a6ed7"
 CATEGORY="x-window"
 SHORT_DESC="Xorg DDX driver for ARM devices (Allwinner, RPi and others)"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://github.com/ssvb/xf86-video-fbturbo"
 REPOLOGY="xdrv:fbturbo"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-geode/receipt
--- a/xorg-xf86-video-geode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-geode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.11.19"
 CATEGORY="x-window"
 SHORT_DESC="Xorg video driver for AMD Geode GX and LX video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/GeodeDriver/"
 REPOLOGY="xdrv:geode"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-i740/receipt
--- a/xorg-xf86-video-i740/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-i740/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.6"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for Intel i740 video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/i740/"
 REPOLOGY="xdrv:i740"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-intel/receipt
--- a/xorg-xf86-video-intel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-intel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.99.917"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for Intel integrated graphics chipsets"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/intel/"
 REPOLOGY="xdrv:intel"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-neomagic/receipt
--- a/xorg-xf86-video-neomagic/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-neomagic/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -5,7 +5,7 @@
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for the Neomagic graphics chipsets found in many \
 laptop computers"
-MAINTAINER="domcox@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/neomagic/"
 REPOLOGY="xdrv:neomagic"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-nv/receipt
--- a/xorg-xf86-video-nv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-nv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.21"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for NVIDIA video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xdrv:nv"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-trident/receipt
--- a/xorg-xf86-video-trident/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-trident/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.8"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for Trident video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/trident/"
 REPOLOGY="xdrv:trident"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-vesa/receipt
--- a/xorg-xf86-video-vesa/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-vesa/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.4.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for generic VESA video cards"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/vesa/"
 REPOLOGY="xdrv:vesa"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xf86-video-vmware/receipt
--- a/xorg-xf86-video-vmware/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xf86-video-vmware/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="13.3.0"
 CATEGORY="x-window"
 SHORT_DESC="Xorg driver for VMware virtual video cards"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/vmware/"
 REPOLOGY="xdrv:vmware"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xfd/receipt
--- a/xorg-xfd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xfd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,8 +13,7 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev fontconfig-dev xorg-libXft-dev \
-xorg-libXrender-dev xorg-libXmu-dev xorg-xorgproto gettext"
-PKG_RULE="std"
+xorg-libXrender-dev xorg-libXmu-dev xorg-xorgproto gettext-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xfontsel/receipt
--- a/xorg-xfontsel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xfontsel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.6"
 CATEGORY="x-window"
 SHORT_DESC="Point and click selection of X11 font names"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xfontsel"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xfsinfo/receipt
--- a/xorg-xfsinfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xfsinfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-xorgproto xorg-libFS-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	touch /root/missing
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xinit/receipt
--- a/xorg-xinit/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xinit/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.0"
 CATEGORY="x-window"
 SHORT_DESC="X Window System initializer (includes startx)"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xinit"
@@ -15,14 +15,13 @@
 BUILD_DEPENDS="xorg-util-macros xorg-libXmu-dev"
 
 compile_rules() {
-	sed -e '/$serverargs $vtarg/ s/serverargs/: #&/' \
-		-i startx.cpp
+	sed -i '/$serverargs $vtarg/ s/serverargs/: #&/' startx.cpp
 
 	./configure \
 		--with-xinitdir=/etc/X11/xinit \
 		$CONFIGURE_ARGS &&
 	make &&
-	make install &&
+	make install || return 1
 
 	cp $stuff/xserverrc $install/etc/X11/xinit/xserverrc
 }
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xinput/receipt
--- a/xorg-xinput/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xinput/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.2"
 CATEGORY="x-window"
 SHORT_DESC="Utility to configure and test X input devices"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xkbcomp/receipt
--- a/xorg-xkbcomp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xkbcomp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.4.2"
 CATEGORY="x-window"
 SHORT_DESC="Compile XKB keyboard description"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
@@ -14,7 +14,7 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libxkbfile-dev xorg-xorgproto"
-SPLIT="xorg-xkbcomp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xkbprint/receipt
--- a/xorg-xkbprint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xkbprint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-libxkbfile-dev xorg-libX11-dev xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xkbutils/receipt
--- a/xorg-xkbutils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xkbutils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.4"
 CATEGORY="x-window"
 SHORT_DESC="Xorg keyboard utilities"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xkeyboard-config/receipt
--- a/xorg-xkeyboard-config/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xkeyboard-config/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.24"
 CATEGORY="x-window"
 SHORT_DESC="Keyboard configuration database for the X Window System"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/xkeyboard-config.html"
@@ -13,9 +13,8 @@
 TARBALL="xkeyboard-config-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/data/xkeyboard-config/$TARBALL"
 
-BUILD_DEPENDS_arm="xorg-xorgproto xorg-libX11-dev"
 BUILD_DEPENDS="libxslt xorg-xorgproto xorg-libX11-dev intltool"
-SPLIT="xorg-xkeyboard-config-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xkill/receipt
--- a/xorg-xkill/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xkill/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Kill a client by its X resource"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xload/receipt
--- a/xorg-xload/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xload/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.3"
 CATEGORY="x-window"
 SHORT_DESC="System load average display for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="xload"
@@ -12,7 +12,7 @@
 TARBALL="xload-$VERSION.tar.bz2"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
-BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev gettext"
+BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev gettext-dev"
 
 compile_rules() {
 	touch /root/missing /missing
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xlsfonts/receipt
--- a/xorg-xlsfonts/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xlsfonts/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xmag/receipt
--- a/xorg-xmag/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xmag/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXaw-dev xorg-libXmu-dev xorg-libXt-dev \
 xorg-libX11-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xmessage/receipt
--- a/xorg-xmessage/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xmessage/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.5"
 CATEGORY="x-window"
 SHORT_DESC="Display a message or query in a window"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xmodmap/receipt
--- a/xorg-xmodmap/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xmodmap/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.0.9"
 CATEGORY="x-window"
 SHORT_DESC="Utility for modifying keymaps and button mappings"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xprop/receipt
--- a/xorg-xprop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xprop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.3"
 CATEGORY="x-window"
 SHORT_DESC="Property displayer for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xrandr/receipt
--- a/xorg-xrandr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xrandr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.5.0"
 CATEGORY="x-window"
 SHORT_DESC="Primitive command line interface to RandR extension"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xrdb/receipt
--- a/xorg-xrdb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xrdb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.1"
 CATEGORY="x-window"
 SHORT_DESC="X server resource database utility"
-MAINTAINER="rocky@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xsetmode/receipt
--- a/xorg-xsetmode/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xsetmode/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXi-dev xorg-libX11-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xsetpointer/receipt
--- a/xorg-xsetpointer/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xsetpointer/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,6 @@
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
 
 BUILD_DEPENDS="xorg-libXi-dev xorg-libX11-dev xorg-xorgproto"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xsetroot/receipt
--- a/xorg-xsetroot/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xsetroot/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.2"
 CATEGORY="x-window"
 SHORT_DESC="Root window parameter setting utility for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xsm/receipt
--- a/xorg-xsm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xsm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,11 +14,11 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXt-dev xorg-libICE-dev \
 xorg-libSM-dev xorg-libXaw-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xtrans/receipt
--- a/xorg-xtrans/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xtrans/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.5"
 CATEGORY="development"
 SHORT_DESC="X Network Transport layer shared code"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7lib.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xvidtune/receipt
--- a/xorg-xvidtune/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xvidtune/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -14,7 +14,6 @@
 
 BUILD_DEPENDS="xorg-util-macros xorg-libXxf86vm-dev xorg-libXt-dev \
 xorg-libXaw-dev xorg-libXmu-dev xorg-libX11-dev"
-PKG_RULE="std"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xorg-xwininfo/receipt
--- a/xorg-xwininfo/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg-xwininfo/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.1.4"
 CATEGORY="x-window"
 SHORT_DESC="Window information utility for X"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/x/x7app.html"
diff -r ad29ddfee1c9 -r d5aab818505e xorg/receipt
--- a/xorg/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xorg/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,16 +4,14 @@
 VERSION="7.7"
 CATEGORY="x-window"
 SHORT_DESC="Xorg server"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://www.x.org/wiki/"
 REPOLOGY="-"
 
-SPLIT="xorg-dev xorg-dev-proto"
+SPLIT="$PACKAGE-dev $PACKAGE-dev-proto"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		xorg)
 			CAT="meta|meta-package to install all Xorg modules"
diff -r ad29ddfee1c9 -r d5aab818505e xosd/receipt
--- a/xosd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xosd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,12 +4,12 @@
 VERSION="2.2.14"
 CATEGORY="x-window"
 SHORT_DESC="Light on screen display tool"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://sourceforge.net/projects/libxosd/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/project/libxosd/libxosd/$PACKAGE-$VERSION/$TARBALL"
+WGET_URL="$SF_MIRROR/libxosd/$TARBALL"
 
 BUILD_DEPENDS="xorg-dev"
 
diff -r ad29ddfee1c9 -r d5aab818505e xournal/receipt
--- a/xournal/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xournal/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.4.7"
 CATEGORY="utilities"
 SHORT_DESC="Notetaking application"
-MAINTAINER="meshca@clarkson.edu"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://xournal.sourceforge.net/"
 
@@ -12,15 +12,15 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake gtk2-dev libgnomecanvas-dev poppler-dev \
-zlib-dev libart_lgpl-dev gettext"
+zlib-dev libart_lgpl-dev gettext-dev"
 
 compile_rules() {
 	CFLAGS="$CFLAGS $(pkg-config --cflags --libs gtk+-2.0 x11) -lm -lz"
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install &&
-	make DESTDIR=$DESTDIR desktop-install
+	make DESTDIR=$install install &&
+	make DESTDIR=$install desktop-install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xpad/receipt
--- a/xpad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,29 +4,29 @@
 VERSION="4.1"
 CATEGORY="utilities"
 SHORT_DESC="Sticky note application for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
 WEB_SITE="https://launchpad.net/xpad"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="https://launchpad.net/xpad/trunk/$VERSION/+download/$TARBALL"
-HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
 
-DEPENDS="gtk2 util-linux-uuid xorg-libICE xorg-libSM"
 BUILD_DEPENDS="gtk2-dev xorg-libSM-dev intltool"
 COOKOPTS="!pixmaps"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
+
+compile_rules() {
 	sed -i '/#include <glib\/glist.h>/d' src/xpad-undo.c
+
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/icons/hicolor/48x48/apps/
 	cp -a $install/usr/bin $fs/usr
 	cp -a $stuff/xpad.png $fs/usr/share/icons/hicolor/48x48/apps/
+	DEPENDS="gtk2 util-linux-uuid xorg-libICE xorg-libSM"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xpaint/receipt
--- a/xpaint/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpaint/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXft-dev freetype-dev libXaw3dXft-dev \
 libjpeg-turbo-dev tiff-dev libtool xorg-libXpm-dev"
-SPLIT="xpaint-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
diff -r ad29ddfee1c9 -r d5aab818505e xpat2/receipt
--- a/xpat2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpat2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,32 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="xpat2"
 VERSION="1.07"
 CATEGORY="games"
-SHORT_DESC="Soltaire games for X."
-MAINTAINER="b1+slitaz@nagel.org"
+SHORT_DESC="Soltaire games for X"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.ibiblio.org/pub/Linux/games/solitaires/!INDEX.html"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WGET_URL="http://www.ibiblio.org/pub/Linux/games/solitaires/$TARBALL"
 
-DEPENDS="xorg-libX11 xorg-libXt xorg-libXaw"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXt-dev xorg-libXaw-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	cd src
 	cp $stuff/Makefile .
+
 	make LDFLAGS="-lX11 -lXaw -lXmu -lXt -lXpm" &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/var/games/xpat2
 	cp -a $install/usr $fs
 	mkdir -p $fs/usr/share/X11/app-defaults/
 	cp -a $stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat
 	touch $fs/var/games/xpat2/xpat.log
 	chmod 666 $fs/var/games/xpat2/xpat.log
+	DEPENDS="xorg-libX11 xorg-libXt xorg-libXaw"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xpenguins/receipt
--- a/xpenguins/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpenguins/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xpenguins"
 VERSION="2.2"
@@ -6,27 +6,25 @@
 SHORT_DESC="Cute little penguins walking along the tops of your windows"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL"
-WEB_SITE="http://xpenguins.seul.org"
+WEB_SITE="http://xpenguins.seul.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="xorg-libXpm xorg-libX11 xorg-libXext"
 BUILD_DEPENDS="xorg-libXpm-dev xorg-libX11-dev xorg-libXext-dev xorg-libXt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS --prefix=/usr &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
-	mkdir -p $install/usr/share/applications
-	cp -a $stuff/xpenguins.desktop $install/usr/share/applications
-	cp -a $stuff/xpenguins.sh $install/usr/bin
+	make DESTDIR=$install install || return 1
+
+	install -Dm644 $stuff/xpenguins.desktop $install/usr/share/applications/xpenguins.desktop
+	install -Dm755 $stuff/xpenguins.sh      $install/usr/bin/xpenguins.sh
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
-	rm -r $fs/usr/share/man
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libXpm xorg-libX11 xorg-libXext"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xpenguins_themes/receipt
--- a/xpenguins_themes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpenguins_themes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,10 +6,10 @@
 SHORT_DESC="Additional themes for XPenguins"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="unclear"
-WEB_SITE="http://xpenguins.seul.org"
+WEB_SITE="http://xpenguins.seul.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$WEB_SITE/$TARBALL"
+WGET_URL="${WEB_SITE}$TARBALL"
 
 compile_rules() {
 	mkdir -p     $install/usr/share/xpenguins/themes/
diff -r ad29ddfee1c9 -r d5aab818505e xplc/receipt
--- a/xplc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xplc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,14 @@
 VERSION="0.3.13"
 CATEGORY="network"
 SHORT_DESC="Cross-Platform Lightweight Components"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="LGPL2.1"
-WEB_SITE="http://xplc.sourceforge.net"
+WEB_SITE="http://xplc.sourceforge.net/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/xplc/$TARBALL"
 
-SPLIT="xplc-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	export LDFLAGS='-ldl' # avoid '--as-needed' for old code
@@ -20,7 +20,7 @@
 		--without-libuuid \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xpra/receipt
--- a/xpra/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xpra/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,8 +21,8 @@
 compile_rules() {
 	echo 'NAME=SliTaz' > /etc/os-release # use both with the patch
 
-	python setup.py build &&
-	python setup.py install --root=$DESTDIR
+	python -B setup.py build &&
+	python -B setup.py install --root=$install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xrdp/receipt
--- a/xrdp/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xrdp/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,13 @@
 WGET_URL="https://github.com/neutrinolabs/xrdp/releases/download/v$VERSION/$TARBALL"
 
 BUILD_DEPENDS="autoconf automake libtool openssl-dev pam-dev xorg-dev nasm"
-SPLIT="xrdp-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	mkdir -p $install/etc/init.d/
 	mv $install/etc/xrdp/xrdp.sh $install/etc/init.d/xrdp
diff -r ad29ddfee1c9 -r d5aab818505e xrestop/receipt
--- a/xrestop/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xrestop/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xrestop"
 VERSION="0.4"
 CATEGORY="utilities"
-SHORT_DESC="X11 server resource usage monitor."
+SHORT_DESC="X11 server resource usage monitor"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.freedesktop.org/wiki/Software/xrestop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.freedesktop.org/wiki/Software/xrestop/"
 WGET_URL="http://downloads.yoctoproject.org/releases/xrestop/$TARBALL"
 
-DEPENDS="ncurses xorg-libXres"
 BUILD_DEPENDS="ncurses-dev xorg-libXres-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-	./configure --prefix=/usr
-	make
+
+	./configure --prefix=/usr &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr	
+	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses xorg-libXres"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xrick/receipt
--- a/xrick/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xrick/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="021212"
 CATEGORY="games"
 SHORT_DESC="Rick Dangerous"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL"
 WEB_SITE="http://www.bigorno.net/xrick/"
 
diff -r ad29ddfee1c9 -r d5aab818505e xruskb/receipt
--- a/xruskb/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xruskb/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,34 +1,28 @@
-# SliTaz package receipt
+# SliTaz package receipt v2.
 
 PACKAGE="xruskb"
 VERSION="1.15.4"
 CATEGORY="x-window"
-SHORT_DESC="Keyboard switcher for russian/czech"
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Keyboard switcher for Russian/Czech"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/lavv17/xruskb"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://github.com/lavv17/xruskb"
 WGET_URL="http://ftp.yars.free.net/pub/source/xruskb/$TARBALL"
 
-DEPENDS="lesstif freetype xorg-libXp xorg-libXmu"
 BUILD_DEPENDS="xorg-libXp-dev xorg-libXmu-dev lesstif-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{	
-	cd $src
+compile_rules() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/$PACKAGE $fs/usr/share	
+genpkg_rules() {
+	copy @std
+	DEPENDS="lesstif freetype xorg-libXp xorg-libXmu"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xsane/receipt
--- a/xsane/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xsane/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,14 +4,15 @@
 VERSION="0.998"
 CATEGORY="office"
 SHORT_DESC="XSane - graphical scanning frontend"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xsane.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.xsane.org/download/$TARBALL"
 
-BUILD_DEPENDS="gtk2-dev sane-backends-dev lcms-dev eudev"
+BUILD_DEPENDS="gtk2-dev sane-backends-dev lcms-dev eudev tiff-dev \
+libjpeg-turbo-dev"
 
 compile_rules() {
 	sed -i 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' src/xsane-save.c
@@ -22,7 +23,7 @@
 		--disable-gimp \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xscreensaver/receipt
--- a/xscreensaver/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xscreensaver/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -21,7 +21,7 @@
 
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make install_prefix=$DESTDIR install
+	make install_prefix=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xsnow/receipt
--- a/xsnow/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xsnow/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,30 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xsnow"
 VERSION="1.42"
 CATEGORY="misc"
-SHORT_DESC="X-windows application that will let it snow on the desktop."
+SHORT_DESC="X-windows application that will let it snow on the desktop"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="Freeware"
 WEB_SITE="http://janswaal.home.xs4all.nl/Xsnow/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/$TARBALL"
 
-DEPENDS="xorg-libXpm xorg-libXext"
 BUILD_DEPENDS="xorg-imake xorg-gccmakedep xorg-libX11-dev xorg-libXpm-dev \
 xorg-libXext-dev xorg-libXt-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	xmkmf && make depend && make && make install
-	mkdir -p $install/usr/share/applications
-	cp -a $stuff/xsnow.desktop $install/usr/share/applications
-	cp -a $stuff/xsnow.sh $install/usr/bin
+compile_rules() {
+	xmkmf &&
+	make depend &&
+	make &&
+	make install || return 1
+
+	install -Dm644 $stuff/xsnow.desktop $install/usr/share/applications/xsnow.desktop
+	install -Dm755 $stuff/xsnow.sh      $install/usr/bin/xsnow.sh
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libXpm xorg-libXext"
 }
diff -r ad29ddfee1c9 -r d5aab818505e xstroke/receipt
--- a/xstroke/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xstroke/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.6"
 CATEGORY="x-window"
 SHORT_DESC="Full-screen gesture recognition program for X"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://cworth.org/~cworth/papers/xstroke/"
 
@@ -14,19 +14,16 @@
 BUILD_DEPENDS="xorg-libX11-dev"
 
 compile_rules() {
-	case "$ARCH" in
-		arm*) sysroot="/cross/$ARCH/sysroot";;
-		*)    sysroot="";;
-	esac
-	sed -i \
-		-e s"#^CC.*#CC = $HOST_SYSTEM-gcc#" \
-		-e s"#^INCLUDE.*#INCLUDE = -I$sysroot/usr/include#" \
-		-e s"#^LDFLAGS.*#LDFLAGS = -L$sysroot/usr/lib#" Makefile
+	sed \
+		-e "s|^CC.*|CC = $HOST_SYSTEM-gcc|" \
+		-e "s|^INCLUDE.*|INCLUDE = -I/usr/include|" \
+		-e "s|^LDFLAGS.*|LDFLAGS = -L/usr/lib|" \
+		-i Makefile
 
 	make xstroke || return 1
 
-	install -Dm755 $src/xstroke $install/usr/bin/xstroke
-	cook_pick_docs $src/xstroke.man
+	install -Dm755 xstroke $install/usr/bin/xstroke
+	cook_pick_docs xstroke.man
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e xtel/receipt
--- a/xtel/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xtel/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,25 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xtel"
 VERSION="3.3.0"
 CATEGORY="network"
-SHORT_DESC="X emulator of the French Minitel."
+SHORT_DESC="X emulator of the French Minitel"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://pficheux.free.fr/xtel/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://pficheux.free.fr/xtel/"
 WGET_URL="${WEB_SITE}download/$TARBALL"
-CONFIG_FILES="/etc/xtel"
-TAGS="emulator minitel"
 
-DEPENDS="ncurses-extra jpeg xorg-libXp xorg"
 BUILD_DEPENDS="xorg-imake xorg-cf-files xorg-gccmakedep xorg-xbitmaps \
 xorg-libXp xorg-bdftopcf xorg-mkfontdir xorg-mkfontscale jpeg-dev \
 xorg-libXt-dev xorg-libXpm-dev xorg-libXaw-dev xorg-libXmu-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/sys_errlist.errno./strerror(errno)/' procedure.c teleinfo.c \
 		mdmdetect.c xteld.c Xsra/SelFile.c
 	sed -i 's/sys_errlist.code_erreur./strerror(code_erreur)/' xaw.c xm.c
@@ -27,15 +23,14 @@
 	sed -i 's/getwd.SFstartDir/getcwd(SFstartDir, MAXPATHLEN/' Xsra/SelFile.c
 	sed -i 's/, \(\$(...DIR)\)/,\1/;s/install_iminitel$/true/' \
 		Imakefile */Imakefile
+
 	xmkmf &&
-	make -j 1 Xtel &&
+	make -j1 Xtel &&
 	make all &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/fonts
 	cp -a $install/* $fs/
 	mv $fs/usr/lib/X11/xtel $fs/etc
@@ -43,25 +38,31 @@
 	sed -i 's/`host/`nslookup/;s|/bin/bash|/bin/sh|' $fs/etc/ppp/ip*.iminitel
 	sed -i 's|X11R6/||' $fs/usr/bin/make_xtel_lignes
 	mv $fs/fonts $fs/usr/share/fonts/X11
+	DEPENDS="ncurses-extra jpeg xorg-libXp xorg"
+	CONFIG_FILES="/etc/xtel"
+	TAGS="emulator minitel"
 }
 
-# Pre and post install commands for Tazpkg.
-post_install()
-{
-	grep -qs ^xtel "$1/etc/services" || cat >> "$1/etc/services" <<EOT
+post_install() {
+	grep -qs ^xtel "$1/etc/services" ||
+	cat >> "$1/etc/services" <<EOT
 xtel		1313/tcp				# French minitel
 EOT
-	grep -qs ^xtel "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
+
+	grep -qs ^xtel "$1/etc/inetd.conf" ||
+	cat >> "$1/etc/inetd.conf" <<EOT
 xtel	stream	tcp	nowait	root	/usr/bin/xteld	xteld
 EOT
+
 	chroot "$1/" /usr/bin/install_iminitel
 	if [ -z "$1" ]; then
 		/etc/init.d/inetd stop
 		/etc/init.d/inetd start
 	fi
-	cat <<EOT
-	
-You should launch /usr/bin/make_xtel_lignes now.
+	[ -n "$quiet" ] || cat <<EOT
 
+	.--------------------------------------------------.
+	| You should launch /usr/bin/make_xtel_lignes now. |
+	'--------------------------------------------------'
 EOT
 }
diff -r ad29ddfee1c9 -r d5aab818505e xterm/receipt
--- a/xterm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xterm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="330"
 CATEGORY="utilities"
 SHORT_DESC="X terminal emulator"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="http://invisible-island.net/xterm/"
 COOKOPTS="!pixmaps"
@@ -39,7 +39,7 @@
 		--disable-rectangles \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	cat >> $install/usr/share/X11/app-defaults/XTerm <<EOT
 !
diff -r ad29ddfee1c9 -r d5aab818505e xtrkcad/receipt
--- a/xtrkcad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xtrkcad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,19 +4,18 @@
 VERSION="4.0.3a1"
 CATEGORY="games"
 SHORT_DESC="A CAD program for designing model railroad layouts"
-MAINTAINER="rcx@zoominternet.net"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://www.xtrkcad.org/"
+WEB_SITE="http://www.xtrkcad.org/Wikka/HomePage"
 
 TARBALL="$PACKAGE-source-$VERSION.tar.gz"
 #WGET_URL="$SF_MIRROR/$PACKAGE-fork/$TARBALL"
 WGET_URL="http://users.zoominternet.net/~rcx/$TARBALL"
 
-BUILD_DEPENDS="cmake gettext zlib-dev \
-gtk2-dev libxml2-dev libgtkhtml-dev libgtkhtml doxygen \
-xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
+BUILD_DEPENDS="cmake gettext-dev zlib-dev gtk2-dev libxml2-dev libgtkhtml-dev \
+libgtkhtml doxygen xorg-libX11-dev xorg-xorgproto xorg-libXau-dev \
 xorg-libXdmcp-dev"
-SPLIT="xtrkcad-doc xtrkcad"
+SPLIT="$PACKAGE-doc $PACKAGE"
 
 compile_rules() {
 	# Binutils 2.22 break many packages build without LDFLAGS set correctly.
@@ -37,7 +36,7 @@
 		-D XTRKCAD_USE_GTK_CAIRO=ON \
 		. &&
 	make PREFIX=/usr &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/xtrkcad.png     $install/usr/share/pixmaps/xtrkcad.png
 	install -Dm644 $stuff/xtrkcad.desktop $install/usr/share/applications/xtrkcad.desktop
diff -r ad29ddfee1c9 -r d5aab818505e xv/receipt
--- a/xv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,10 +17,10 @@
 BUILD_DEPENDS="xorg-dev"
 
 compile_rules() {
-	for i in $PATCH1 $PATCH2 ; do
+	for i in $PATCH1 $PATCH2; do
 		[ -s $SRC/$(basename $i) ] || wget -P $SRC $i
 	done
-	cd .. ; tar xzf $SRC/$(basename $PATCH1) ; cd $src
+	cd ..; tar xzf $SRC/$(basename $PATCH1); cd $src
 	#patch -p0 < $SRC/$(basename $PATCH2)
 	sed -i 's/.*stdio.*/&\n#include <stdlib.h>/' xcmap.c bggen.c
 	sed -i 's/ gets *(\(.*\))/ fgets(\1,sizeof(\1)-1,stdin)/' vdcomp.c
diff -r ad29ddfee1c9 -r d5aab818505e xvidcore/receipt
--- a/xvidcore/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xvidcore/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,14 +6,14 @@
 SHORT_DESC="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://www.xvid.org/"
+WEB_SITE="https://www.xvid.com/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/multimedia/xvid.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://downloads.xvid.org/downloads/$TARBALL"
 
 BUILD_DEPENDS="yasm"
-SPLIT="xvidcore-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	cd build/generic
diff -r ad29ddfee1c9 -r d5aab818505e xvkbd/receipt
--- a/xvkbd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xvkbd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,20 +3,18 @@
 PACKAGE="xvkbd"
 VERSION="3.7"
 CATEGORY="x-window"
-SHORT_DESC="Virtual (graphical) keyboard program for X Window System."
+SHORT_DESC="Virtual (graphical) keyboard program for X Window System"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://t-sato.in.coocan.jp/xvkbd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://t-sato.in.coocan.jp/xvkbd/"
 WGET_URL="${WEB_SITE}$TARBALL"
 
-DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d"
 BUILD_DEPENDS="xorg-imake xorg-libXaw-dev xorg-libXp-dev xorg-libXtst-dev \
 xorg-libXaw3d-dev xorg-xorgproto"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# delete Xaw3d
 	# sed -i '/#define XAW3D/d' Imakefile
 	xmkmf &&
@@ -33,28 +31,26 @@
 	cp -f $stuff/etc/X11/app-defaults/XVkbd-russian $install/etc/X11/app-defaults
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="xorg-libXp xorg-libXtst xorg-libXaw3d"
 }
 
-post_install()
-{
+post_install() {
 	# .Xdefaults file
 	lang=$(echo $LANG | awk '{FS="_"} {print $1}')
 	find "$1/home" -maxdepth 2 -name ".Xdefaults" > /tmp/listeXdefaults
-	while read line
-	do
-	if ! grep -q "Xvkbd settings" $line; then
-	cat >> $line << EOT
+
+	while read line; do
+		if ! grep -q "Xvkbd settings" $line; then
+			cat >> $line << EOT
 
 ! Xvkbd settings
 !
 xvkbd*Font: -misc-fixed-medium-r-semicondensed--0-0-75-75-c-0-iso8859-1
 EOT
-echo "xvkbd.Layout : $lang" >> $line
-	fi
+			echo "xvkbd.Layout : $lang" >> $line
+		fi
 	done </tmp/listeXdefaults
 	rm -f /tmp/listeXdefaults
 }
diff -r ad29ddfee1c9 -r d5aab818505e xxhash/receipt
--- a/xxhash/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xxhash/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/Cyan4973/xxHash/archive/v$VERSION.tar.gz"
 
-SPLIT="xxhash-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make &&
diff -r ad29ddfee1c9 -r d5aab818505e xz/receipt
--- a/xz/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/xz/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,8 +12,8 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-BUILD_DEPENDS="gettext"
-SPLIT="xz-tools xz liblzma xz-dev"
+BUILD_DEPENDS="gettext-dev"
+SPLIT="$PACKAGE-tools $PACKAGE liblzma $PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e yad/receipt
--- a/yad/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yad/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,19 +12,18 @@
 WGET_URL="$SF_MIRROR/yad-dialog/$TARBALL"
 
 BUILD_DEPENDS="patch gtk2-dev gtk3-dev webkitgtk-dev intltool"
-SPLIT="yad-html:html yad-gtk3:gtk3"
+SPLIT="$PACKAGE-html:html $PACKAGE-gtk3:gtk3"
 
 compile_rules() {
 	case $SET in
-		'')   Gtk=gtk2; Html=disable;;
-		html) Gtk=gtk2; Html=enable ;;
-		gtk3) Gtk=gtk3; Html=disable;;
+		'')   SET_ARGS='--with-gtk=gtk2 --disable-html';;
+		html) SET_ARGS='--with-gtk=gtk2 --enable-html';;
+		gtk3) SET_ARGS='--with-gtk=gtk3 --disable-html';;
 	esac
 
 	./configure \
 		--enable-icon-browser \
-		--with-gtk=$Gtk \
-		--$Html-html \
+		$SET_ARGS \
 		$CONFIGURE_ARGS &&
 	make &&
 	make install
diff -r ad29ddfee1c9 -r d5aab818505e yaff/receipt
--- a/yaff/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yaff/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="306"
 CATEGORY="utilities"
 SHORT_DESC="Mozilla Firefox multi-launcher"
-MAINTAINER="postmaster@baba0rum.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://www.slitaz.org/"
 REPOLOGY="-"
@@ -12,16 +12,14 @@
 TARBALL="slitaz-dev-tools-$VERSION.tar.bz2"
 WGET_URL="http://hg.slitaz.org/slitaz-dev-tools/archive/$VERSION.tar.bz2"
 
-DEPENDS="gtkdialog"
 SIBLINGS="mirror-tools qemu-box slitaz-dev-tools slitaz-mercurial-style \
 tazchroot tazdev tazwikiss"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/bin
 	cp -a $src/baba-scripts/yaff $fs/usr/bin
 	cp -a $src/baba-scripts/mozicon24.png $src/baba-scripts/yaff.png \
 	      $fs/usr/share/pixmaps
 	chown -R root.root $fs
+	DEPENDS="gtkdialog"
 }
diff -r ad29ddfee1c9 -r d5aab818505e yaffs2utils/receipt
--- a/yaffs2utils/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yaffs2utils/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,28 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="yaffs2utils"
 VERSION="0.2.9"
 CATEGORY="base-system"
-SHORT_DESC="Make/extract a YAFFS2/YAFFS1 image for Linux."
+SHORT_DESC="Make/extract a YAFFS2/YAFFS1 image for Linux"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://code.google.com/archive/p/yaffs2utils/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://code.google.com/archive/p/yaffs2utils/"
 WGET_URL="http://yaffs2utils.googlecode.com/files/$VERSION.tar.gz"
 
-DEPENDS=""
-BUILD_DEPENDS=""
+compile_rules() {
+	mkdir -p $install/usr/sbin
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir -p $DESTDIR/usr/sbin
 	make &&
-	cp mkyaffs2 unyaffs2 unspare2 $DESTDIR/usr/sbin
+	cp mkyaffs2 unyaffs2 unspare2 $install/usr/sbin
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs/
 }
diff -r ad29ddfee1c9 -r d5aab818505e yajl/receipt
--- a/yajl/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yajl/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="2.1.0"
 CATEGORY="development"
 SHORT_DESC="Yet Another JSON Library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://lloyd.github.io/yajl/"
 
@@ -12,7 +12,7 @@
 WGET_URL="http://github.com/lloyd/yajl/tarball/$VERSION"
 
 BUILD_DEPENDS="cmake doxygen"
-SPLIT="yajl-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	mkdir build
diff -r ad29ddfee1c9 -r d5aab818505e yaml/receipt
--- a/yaml/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yaml/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="0.1.7"
 CATEGORY="system-tools"
 SHORT_DESC="YAML 1.1 parser and emitter written in C"
-MAINTAINER="erjo@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="CC-BY"
 WEB_SITE="https://pyyaml.org/wiki/LibYAML"
 REPOLOGY="libyaml"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://pyyaml.org/download/libyaml/$TARBALL"
 
-SPLIT="yaml-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
diff -r ad29ddfee1c9 -r d5aab818505e yandex-disk/receipt
--- a/yandex-disk/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yandex-disk/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,8 +16,7 @@
 
 COOKOPTS="!extradesktops"
 
-DEPENDS="gcc-lib-base glibc-base zlib"
-BUILD_DEPENDS="gettext"
+BUILD_DEPENDS="gettext-dev"
 
 compile_rules() {
 	# Extract filesystem from package
@@ -37,6 +36,7 @@
 	copy yandex-disk copyright *.mo \
 		publish unpublish test status *.desktop yandex-disk-helper \
 		@ico
+	DEPENDS="gcc-lib-base glibc-base zlib"
 }
 
 pre_remove() {
diff -r ad29ddfee1c9 -r d5aab818505e yarock/receipt
--- a/yarock/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yarock/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,41 +1,41 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="yarock"
 VERSION="0.9.67"
 CATEGORY="multimedia"
-SHORT_DESC="Yarock is a music player in c++/Qt"
+SHORT_DESC="Music player in c++/Qt"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://launchpad.net/yarock"
+
 TARBALL="Yarock_${VERSION}_source.tar.gz"
 WGET_URL="https://launchpad.net/yarock/trunk/$VERSION/+download/$TARBALL"
 
-# full list of depends to make available to listen to music and internet radio
-# (not only runtime (ldd) depends)
-# but something wrong with sub-depends - why Qt application needs GTK?!
-#
-# TODO: review libQtPlugins (huge depends, maybe split?) gst0-plugins-good (gtk?)
-#
-DEPENDS="libQtDBus qjson qt4-phonon taglib gst0-ffmpeg gst0-plugins-good \
-libshout libQtMultimedia libQtPlugins jack"
 BUILD_DEPENDS="cmake Qt4-dev qmake qt4-phonon taglib-dev qjson-dev \
 xorg-libX11 xorg-libXext xorg-libX11-dev wget"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/TAGLIB_VERSION STRLESS/TAGLIB_VERSION VERSION_LESS/' \
 		cmake/FindTaglib.cmake
 	cp -f $stuff/yarock_ru.ts $src/translation
 
-	mkdir build; cd build
-	cmake -DCMAKE_INSTALL_PREFIX=/usr ..
-	make
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		.. &&
+	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	# full list of depends to make available to listen to music and internet radio
+	# (not only runtime (ldd) depends)
+	# but something wrong with sub-depends - why Qt application needs GTK?!
+	#
+	# TODO: review libQtPlugins (huge depends, maybe split?) gst0-plugins-good (gtk?)
+	#
+	DEPENDS="libQtDBus qjson qt4-phonon taglib gst0-ffmpeg gst0-plugins-good \
+	libshout libQtMultimedia libQtPlugins jack"
 }
diff -r ad29ddfee1c9 -r d5aab818505e yasm/receipt
--- a/yasm/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yasm/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.3.0"
 CATEGORY="development"
 SHORT_DESC="The Yasm Modular Assembler"
-MAINTAINER="jozee@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="BSD GPL2 LGPL2"
 WEB_SITE="http://yasm.tortall.net/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/yasm.html"
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.tortall.net/projects/yasm/releases/$TARBALL"
 
-SPLIT="yasm-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	# prevent compiling vsyasm and ytasm that are only of use on MS Windows
diff -r ad29ddfee1c9 -r d5aab818505e yasr/receipt
--- a/yasr/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yasr/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -16,7 +16,7 @@
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e yaws/receipt
--- a/yaws/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yaws/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="http webserver written in erlang"
 MAINTAINER="allan316@gmail.com"
 LICENSE="BSD"
-WEB_SITE="http://yaws.hyber.org"
+WEB_SITE="http://yaws.hyber.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
@@ -17,7 +17,7 @@
 	cd $src/yaws
 	./configure $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ympd/receipt
--- a/ympd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ympd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,38 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ympd"
 VERSION="1.2.1"
 CATEGORY="multimedia"
-SHORT_DESC="Lightweight MPD (Music Player Daemon) web client."
-MAINTAINER="pankso@slitaz.org"
+SHORT_DESC="Lightweight MPD (Music Player Daemon) web client"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://www.ympd.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://www.ympd.org/"
 WGET_URL="https://github.com/notandy/ympd/archive/v$VERSION.tar.gz"
 
-DEPENDS="mpd libmpdclient"
 BUILD_DEPENDS="libmpdclient-dev cmake"
 
-# Handle cross compilation.
-case "$ARCH" in
-	arm*) 
-		BUILD_DEPENDS="libmpdclient-dev" 
-		ARCH_ARGS="-DLIBMPDCLIENT_LIBRARY=/cross/$ARCH/sysroot/usr/lib \
-		-DLIBMPDCLIENT_INCLUDE_DIR=/cross/$ARCH/sysroot/usr/include" ;;
-esac
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	mkdir build && cd build
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		${ARCH_ARGS} .. &&
-	make && make install
+compile_rules() {
+	mkdir build
+	cd    build
+	cmake \
+		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+		.. &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="mpd libmpdclient"
 }
diff -r ad29ddfee1c9 -r d5aab818505e yp-tools/receipt
--- a/yp-tools/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yp-tools/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -15,7 +15,7 @@
 	./configure $CONFIGURE_ARGS &&
 	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ypbind-mt/receipt
--- a/ypbind-mt/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ypbind-mt/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,9 @@
 WGET_URL="$WEB_SITE/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make DESTDIR=$install install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e ypserv/receipt
--- a/ypserv/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ypserv/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -17,7 +17,7 @@
 	./configure \
 		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install || return 1
+	make DESTDIR=$install install || return 1
 
 	# Copy config files
 	mkdir -p $install/etc/
diff -r ad29ddfee1c9 -r d5aab818505e ytnef/receipt
--- a/ytnef/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ytnef/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/Yeraze/ytnef/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="automake libtool"
-SPLIT="ytnef-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./autogen.sh &&
diff -r ad29ddfee1c9 -r d5aab818505e ytree/receipt
--- a/ytree/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ytree/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,29 @@
 PACKAGE="ytree"
 VERSION="1.97"
 CATEGORY="utilities"
-SHORT_DESC="file manager for file and archives"
+SHORT_DESC="File manager for file and archives"
 MAINTAINER="allan316@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://www.han.de/~werner/ytree.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.han.de/~werner/ytree.html"
 WGET_URL="http://www.han.de/~werner/$TARBALL"
-TAGS="file-manager"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# Dont use readline && utf-8 support via ncursesw && -0s to save ~10kb :-)
+compile_rules() {
+	# Don't use readline && utf-8 support via ncursesw && -Os to save ~10kb :-)
 	sed -i \
 		-e s"/CFLAGS.*/CFLAGS = -D_GNU_SOURCE -DWITH_UTF8 -Os -DCOLOR_SUPPORT/" \
 		-e s"/-lncurses -lreadline/-lncursesw/" \
-		Makefile &&
-	make
+		Makefile
+
+	make &&
+	install -Dm755 ytree $install/usr/bin/ytree
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin
-	cp -a $src/ytree $fs/usr/bin
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses"
+	TAGS="file-manager"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e yuyo-gtk-theme/receipt
--- a/yuyo-gtk-theme/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/yuyo-gtk-theme/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,22 +1,20 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="yuyo-gtk-theme"
 VERSION="1.0"
 CATEGORY="customization"
 LICENSE="GPL3"
-SHORT_DESC="Yuyo is a GTK theme belonging to the Ubuntu MATE project."
+SHORT_DESC="GTK theme belonging to the Ubuntu MATE project"
 MAINTAINER="yuripourre@gmail.com"
+WEB_SITE="https://web.archive.org/web/20150801205755/https://github.com/snwh/yuyo-gtk-theme"
+
 COMMIT_SHA="8f75db1db0f5f2f926c22384c4eb37fb2ed340b8"
 TARBALL="$COMMIT_SHA.zip"
-WEB_SITE="https://web.archive.org/web/20150801205755/https://github.com/snwh/yuyo-gtk-theme"
 WGET_URL="$WEB_SITE/archive/$TARBALL"
 
-DEPENDS="gdk-pixbuf gtk2-engine-murrine"
 BUILD_DEPENDS="wget"
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share/themes
 	rm -Rf $src/Yuyo/gtk-3.0
 	rm -Rf $src/Yuyo/unity
@@ -25,4 +23,5 @@
 
 	cp -a $src/Yuyo $fs/usr/share/themes
 	cp -a $src/Yuyo-Dark $fs/usr/share/themes
+	DEPENDS="gdk-pixbuf gtk2-engine-murrine"
 }
diff -r ad29ddfee1c9 -r d5aab818505e z3/receipt
--- a/z3/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/z3/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/Z3Prover/z3/releases/download/$PACKAGE-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="python"
-SPLIT="z3-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	python scripts/mk_make.py
diff -r ad29ddfee1c9 -r d5aab818505e zbar/receipt
--- a/zbar/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zbar/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="xmlto xorg-libX11-dev xorg-libXext-dev xorg-libXv-dev \
 libjpeg-turbo-dev imagemagick6-dev gtk2-dev"
-SPLIT="zbar-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	sed -i 's|MagickWand |MagickWand-6 |g' configure # search for MagickWand-6.pc instead
diff -r ad29ddfee1c9 -r d5aab818505e zenity+webkit2/receipt
--- a/zenity+webkit2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zenity+webkit2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,13 +12,15 @@
 TARBALL="zenity-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev webkit2gtk-dev gettext \
+BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev webkit2gtk-dev gettext-dev \
 itstool"
-SPLIT="zenity+webkit2-gnome zenity+webkit2"
+SPLIT="$PACKAGE-gnome $PACKAGE"
 SIBLINGS="zenity"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zenity-gtk2/receipt
--- a/zenity-gtk2/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zenity-gtk2/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="zenity-gtk2"
 VERSION="2.32.1" # GTK+2 was deprecated in newer versions of zenity
 CATEGORY="development"
-SHORT_DESC="gui dialogs"
+SHORT_DESC="GUI dialogs"
 MAINTAINER="allan316@gmail.com"
 LICENSE="LGPL2"
 WEB_SITE="https://wiki.gnome.org/Projects/Zenity"
@@ -18,7 +18,8 @@
 	./configure \
 		--disable-scrollkeeper \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zenity/receipt
--- a/zenity/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zenity/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -11,8 +11,8 @@
 TARBALL="zenity-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/zenity/${VERSION%.*}/$TARBALL"
 
-BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev gettext itstool"
-SPLIT="zenity-gnome zenity"
+BUILD_DEPENDS="gtk3-dev glib-dev libnotify-dev gettext-dev itstool"
+SPLIT="$PACKAGE-gnome $PACKAGE"
 SIBLINGS="zenity+webkit2"
 
 compile_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zerobin/receipt
--- a/zerobin/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zerobin/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 GITHASH="8cae64d6eab99fb0d31868df77846285c0958ed0" # 6 feb 2014
 VERSION="${GITHASH:0:7}"
 CATEGORY="network"
-SHORT_DESC="Online pastebin where the server has zero knowledge of pasted data."
+SHORT_DESC="Online pastebin where the server has zero knowledge of pasted data"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="http://sebsauvage.net/wiki/doku.php?id=php:zerobin"
diff -r ad29ddfee1c9 -r d5aab818505e zeromq/receipt
--- a/zeromq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zeromq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -13,7 +13,7 @@
 WGET_URL="https://github.com/RangeNetworks/dev/releases/download/v$OBVERSION/v$OBVERSION-source.zip"
 
 BUILD_DEPENDS="xmlto asciidoc"
-SPLIT="zeromq-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	tar xzf range-libzmq_$VERSION.tar.gz
@@ -21,9 +21,9 @@
 
 	./configure -prefix=/usr $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 
-	cp debian/zmq.hpp $DESTDIR/usr/include
+	cp debian/zmq.hpp $install/usr/include
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zfs-fuse/receipt
--- a/zfs-fuse/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zfs-fuse/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="ZFS file system from Sun"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CDDL"
-WEB_SITE="http://zfs-fuse.net"
+WEB_SITE="http://zfs-fuse.net/"
 REPOLOGY="fusefs:zfs"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
@@ -15,15 +15,15 @@
 BUILD_DEPENDS="fuse2-dev scons libaio-dev attr-dev zlib-dev acl-dev openssl-dev"
 
 compile_rules() {
-	mkdir -p $DESTDIR/usr
+	mkdir -p $install/usr
 	cd $src/src
 	# glibc 2.14 update
 	sed -i 's/\*__malloc_initialize_hook/* __volatile __malloc_initialize_hook/' \
 		lib/libumem/malloc.c
 	scons PREFIX=/usr &&
-	scons install_dir=$DESTDIR/usr/sbin \
-	      cfg_dir=$DESTDIR/etc \
-	      man_dir=$DESTDIR/usr/share/man/man8 install
+	scons install_dir=$install/usr/sbin \
+	      cfg_dir=$install/etc \
+	      man_dir=$install/usr/share/man/man8 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zile/receipt
--- a/zile/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zile/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,27 +3,25 @@
 PACKAGE="zile"
 VERSION="2.4.14"
 CATEGORY="development"
-SHORT_DESC="GNU Zile is a lightweight Emacs clone."
-MAINTAINER="domcox@slitaz.org"
+SHORT_DESC="Lightweight Emacs clone"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/zile/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.gnu.org/software/zile/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
-TAGS="text-editor"
 
-DEPENDS="ncurses"
 BUILD_DEPENDS="ncurses-dev gc-dev perl help2man"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
+	DEPENDS="ncurses"
+	TAGS="text-editor"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zim/receipt
--- a/zim/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zim/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="zim"
 VERSION="0.65"
 CATEGORY="utilities"
-SHORT_DESC="A desktop wiki."
-MAINTAINER="gokhlayeh@slitaz.org"
+SHORT_DESC="A desktop wiki"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://zim-wiki.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://zim-wiki.org/"
 WGET_URL="http://zim-wiki.org/downloads/$TARBALL"
-TAGS="wiki notebook"
 
-DEPENDS="python python-pygtk python-pygobject2 python-simplejson python-pyxdg \
-desktop-file-utils shared-mime-info xdg-utils"
-BUILD_DEPENDS="$DEPENDS python-pycairo-dev python-pygobject2-dev python-pygtk-dev python-dev"
+BUILD_DEPENDS="python-dev python-pygtk python-pygobject2 python-simplejson \
+python-pyxdg desktop-file-utils shared-mime-info xdg-utils python-pycairo-dev \
+python-pygobject2-dev python-pygtk-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./setup.py install --root=$DESTDIR install
+compile_rules() {
+	python -B setup.py install --root=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/share
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/lib $fs/usr
 	cp -a $install/usr/share/zim $fs/usr/share
+	DEPENDS="python python-pygtk python-pygobject2 python-simplejson \
+	python-pyxdg desktop-file-utils shared-mime-info xdg-utils"
+	TAGS="wiki notebook"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zip/receipt
--- a/zip/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zip/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="3.0"
 CATEGORY="utilities"
 SHORT_DESC="Compressor utilities compatible with the DOS PKZIP"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://www.info-zip.org/"
 LFS="http://www.linuxfromscratch.org/blfs/view/svn/general/zip.html"
diff -r ad29ddfee1c9 -r d5aab818505e ziproxy/receipt
--- a/ziproxy/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/ziproxy/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,36 +1,36 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ziproxy"
 VERSION="3.2.1"
 CATEGORY="network"
-SHORT_DESC="HTTP traffic compressor."
+SHORT_DESC="HTTP traffic compressor"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://ziproxy.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://ziproxy.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/ziproxy"
 
-DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng16"
 BUILD_DEPENDS="giflib-dev jasper-dev jpeg-dev cyrus-sasl-dev zlib-dev libpng16-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/DGifCloseFile(GifFile/&,NULL/;s/input))/input,NULL))/' src/image.c
-	./configure --prefix=/usr --mandir=/usr/share/man \
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--localstatedir=/var \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
-{
+genpkg_rules() {
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	cp -a $src/etc $fs
 	cp -a $src/var $fs
 	chown -R root.root $fs
-}
\ No newline at end of file
+	DEPENDS="giflib jasper jpeg libsasl cyrus-sasl zlib libpng16"
+	CONFIG_FILES="/etc/ziproxy"
+}
diff -r ad29ddfee1c9 -r d5aab818505e zlib/receipt
--- a/zlib/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zlib/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.2.11"
 CATEGORY="base-system"
 SHORT_DESC="Compression library"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="zlib/libpng"
 WEB_SITE="http://www.zlib.net/"
 LFS="http://www.linuxfromscratch.org/lfs/view/stable/chapter06/zlib.html"
@@ -12,12 +12,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="$WEB_SITE$TARBALL"
 
-SPLIT="zlib-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure \
 		--prefix=/usr &&
-	make && make install || return 1
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	mv -v $install/usr/lib/libz.so.* $install/lib
diff -r ad29ddfee1c9 -r d5aab818505e znc/receipt
--- a/znc/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/znc/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.6.6"
 CATEGORY="network"
 SHORT_DESC="An IRC bouncer with modules & scripts support"
-MAINTAINER="pankso@slitaz.org"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://wiki.znc.in/ZNC"
 
@@ -20,7 +20,8 @@
 		--disable-perl \
 		--disable-cyrus \
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e znotes/receipt
--- a/znotes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/znotes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,7 +3,7 @@
 PACKAGE="znotes"
 VERSION="0.4.5"
 CATEGORY="office"
-SHORT_DESC="zNotes is lightweigh crossplatform application for notes management"
+SHORT_DESC="Lightweigh crossplatform application for notes management"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="http://qt-apps.org/content/show.php/zNotes?content=113117"
@@ -12,12 +12,9 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/proton/zNotes/archive/$VERSION.tar.gz"
 
-DEPENDS="libQtGui libQtXml"
-BUILD_DEPENDS="Qt4-dev qmake wget"
+BUILD_DEPENDS="Qt4-dev qmake"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/qtlocalpeer.h.*/&\n#include <unistd.h>/' \
 		single_inst/qtlocalpeer.cpp
 	lrelease znotes.pro
@@ -26,8 +23,7 @@
 	make INSTALL_ROOT=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
+	DEPENDS="libQtGui libQtXml"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zonecheck/receipt
--- a/zonecheck/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zonecheck/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,32 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="zonecheck"
 VERSION="3.0.5"
 CATEGORY="network"
-SHORT_DESC="Check that a zone or domain name is correctly configured in the DNS."
+SHORT_DESC="Check that a zone or domain name is correctly configured in the DNS"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://www.zonecheck.fr"
+WEB_SITE="http://www.zonecheck.fr/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
 WGET_URL="$WEB_SITE/download/$TARBALL"
-CONFIG_FILES="/etc/zonecheck"
 
-DEPENDS="ruby"
 BUILD_DEPENDS="ruby-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	ruby ./installer.rb all -DPREFIX=$DESTDIR/usr -DETCDIR=$DESTDIR/etc \
-		-DMANDIR=$DESTDIR/usr/share/man
-	grep -rl $DESTDIR $DESTDIR/usr/libexec | xargs sed -i "s|$DESTDIR||"
+compile_rules() {
+	ruby \
+		./installer.rb all \
+		-DPREFIX=$install/usr \
+		-DETCDIR=$install/etc \
+		-DMANDIR=$install/usr/share/man
+	grep -rl $install $install/usr/libexec | xargs sed -i "s|$install||"
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/* $fs
 	tmp=$(readlink $fs/usr/bin/zonecheck)
 	rm -f $fs/usr/bin/zonecheck
 	ln -s ${tmp#$install} $fs/usr/bin/zonecheck
+	DEPENDS="ruby"
+	CONFIG_FILES="/etc/zonecheck"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zoneminder/receipt
--- a/zoneminder/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zoneminder/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,9 @@
 WGET_URL="http://www2.zoneminder.com/downloads/$TARBALL"
 
 BUILD_DEPENDS="mysql-dev jpeg-dev ffmpeg-dev gnutls-dev libav-dev \
-linux-api-headers $DEPENDS"
+linux-api-headers bzlib zlib x264 perl perl-dbi-dbd perl-dbd-mysql \
+perl-time-hires perl-getopt-long perl-date-manip perl-libwww-perl \
+perl-archive-zip"
 
 compile_rules() {
 	sed -i 's/.*fcntl.h.*/#include <limits.h>\n&/' src/zm_event.cpp \
@@ -29,7 +31,7 @@
 		--enable-mmap=no \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j 1 DESTDIR=$DESTDIR install || return 1
+	make -j1 DESTDIR=$install install || return 1
 
 	install -Dm644 $stuff/etc/logrotate.d/zoneminder $install/etc/logrotate.d/zoneminder
 	install -Dm644 $stuff/etc/mysql.d/zoneminder     $install/etc/mysql.d/zoneminder
diff -r ad29ddfee1c9 -r d5aab818505e zpaq/receipt
--- a/zpaq/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zpaq/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,26 +3,19 @@
 PACKAGE="zpaq"
 VERSION="7.02"
 CATEGORY="utilities"
-SHORT_DESC="incremental journaling backup utility and archiver"
-MAINTAINER="necrophcodr@necrophcodr.me"
+SHORT_DESC="Incremental journaling backup utility and archiver"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://mattmahoney.net/dc/zpaq.html"
+
 TARBALL="zpaq${VERSION/./}.zip"
-WEB_SITE="http://mattmahoney.net/dc/zpaq.html"
 WGET_URL="http://mattmahoney.net/dc/$TARBALL"
 
-DEPENDS=""
-BUILD_DEPENDS=""
-
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	make &&
-	mkdir -p $install/usr/bin &&
-	cp zpaq $install/usr/bin/zpaq
+	install -Dm755 zpaq $install/usr/bin/zpaq
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs/
+genpkg_rules() {
+	copy @std
 }
diff -r ad29ddfee1c9 -r d5aab818505e zsh/receipt
--- a/zsh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zsh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="5.0.7"
 CATEGORY="system-tools"
 SHORT_DESC="Zsh shell incorporates many features of bash, ksh, and tcsh"
-MAINTAINER="sandys@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="other"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://zsh.sourceforge.net/"
@@ -14,11 +14,11 @@
 DEPENDS="ncurses zlib"
 BUILD_DEPENDS="ncurses-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --bindir=/bin \
-		--disable-dynamic --enable-multibyte \
+compile_rules() {
+	./configure \
+		--bindir=/bin \
+		--disable-dynamic \
+		--enable-multibyte \
 		--enable-fndir=/usr/share/zsh/functions \
 		--enable-scriptdir=/usr/share/zsh/scripts \
 		--with-tcsetpgrp \
@@ -27,9 +27,7 @@
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/bin $fs
 
 	# Config files.
@@ -44,11 +42,7 @@
 	mkdir -p $fs/usr/share/zsh/scripts
 }
 
-# Post install commands for Tazpkg.
-# Check /bin/sh stat.
-#
-post_install()
-{
+post_install() {
 	sh=$(readlink "$1/bin/sh")
 	if [ "$sh" != '/bin/zsh' ]; then
 		echo ''
@@ -69,8 +63,7 @@
 }
 
 # Restore a valid sh link if needed.
-pre_remove()
-{
+pre_remove() {
 	sh=$(readlink "$1/bin/sh")
 	[ "$sh" != 'busybox' ] && ln -sf /bin/busybox "$1/bin/sh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zsnes/receipt
--- a/zsnes/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zsnes/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,7 +4,7 @@
 VERSION="1.51"
 CATEGORY="games"
 SHORT_DESC="Super Nintendo emulator"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.zsnes.com/"
 HOST_ARCH="i486"
@@ -31,7 +31,7 @@
 		force_arch=$ARCH \
 		$CONFIGURE_ARGS &&
 	make &&
-	make -j 1 install
+	make -j1 install
 }
 
 genpkg_rules() {
diff -r ad29ddfee1c9 -r d5aab818505e zssh/receipt
--- a/zssh/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zssh/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -3,32 +3,30 @@
 PACKAGE="zssh"
 VERSION="1.5c"
 CATEGORY="network"
-SHORT_DESC="Transfer files to a remote machine while using ssh"
+SHORT_DESC="Transfer files to a remote machine while using SSH"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://zssh.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tgz"
-WEB_SITE="http://zssh.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="ssh"
 
-DEPENDS="readline lrzsz"
 BUILD_DEPENDS="readline-dev ncurses-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
-	make
-	install -d -m 755 $DESTDIR/usr/share/man/man1 &&
-	install -d -m 755 $DESTDIR/usr/share/doc &&
-	install -m 644 $src/*.1 $DESTDIR/usr/share/man/man1 &&
-	install -m 644 $src/[A-Z][A-Z]* $DESTDIR/usr/share/doc
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		$CONFIGURE_ARGS &&
+	make || return 1
+
+	cook_pick_manpages *.1
+	cook_pick_docs     [A-Z][A-Z]*
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p $fs/usr/bin
 	cp -a $src/zssh $fs/usr/bin
 	ln $fs/usr/bin/zssh $fs/usr/bin/ztelnet
+	DEPENDS="readline lrzsz"
+	TAGS="ssh"
 }
diff -r ad29ddfee1c9 -r d5aab818505e zstd/receipt
--- a/zstd/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zstd/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -12,7 +12,7 @@
 WGET_URL="https://github.com/facebook/zstd/archive/v$VERSION.tar.gz"
 
 BUILD_DEPENDS="zlib-dev xz-dev lz4-dev"
-SPLIT="zstd-dev"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	make -C lib      PREFIX=/usr install &&
diff -r ad29ddfee1c9 -r d5aab818505e zsync/receipt
--- a/zsync/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zsync/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -1,31 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="zsync"
 VERSION="0.6.2"
 CATEGORY="network"
-SHORT_DESC="Incremental file transfert from a web server."
+SHORT_DESC="Incremental file transfert from a web server"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="Artistic"
+WEB_SITE="http://zsync.moria.org.uk/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://zsync.moria.org.uk/"
 WGET_URL="${WEB_SITE}download/$TARBALL"
-TAGS="sync"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man \
-	$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		$CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$install install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	TAGS="sync"
 }
-
diff -r ad29ddfee1c9 -r d5aab818505e zvbi/receipt
--- a/zvbi/receipt	Sun Oct 28 14:13:49 2018 +0000
+++ b/zvbi/receipt	Fri Nov 02 14:15:08 2018 +0200
@@ -4,15 +4,15 @@
 VERSION="0.2.35"
 CATEGORY="multimedia"
 SHORT_DESC="VBI capture and decoding library"
-MAINTAINER="slaxemulator@gmail.com"
+MAINTAINER="devel@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://zapping.sourceforge.net/ZVBI/index.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/zapping/$TARBALL"
 
-BUILD_DEPENDS="libpng16-dev xorg-libX11-dev gettext doxygen"
-SPLIT="zvbi-dev"
+BUILD_DEPENDS="libpng16-dev xorg-libX11-dev gettext-dev doxygen"
+SPLIT="$PACKAGE-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&