# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1524132941 -10800
# Node ID 10df65db91ade7b7b8b0d87f4dcd9e7685f4f520
# Parent  9cfaac585fef6fa3495ae413bd869fc1a84013ef
More fix libtool.

diff -r 9cfaac585fef -r 10df65db91ad amsn/receipt
--- a/amsn/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/amsn/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,7 +13,7 @@
 
 BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev libjpeg-turbo-dev xorg-libICE-dev \
 xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
-xorg-libXScrnSaver-dev zlib-dev libpng16-dev libv4l-dev autoconf automake"
+xorg-libXScrnSaver-dev zlib-dev libpng16-dev v4l-utils-dev autoconf automake"
 # for audio conversations: gst0-plugins-base-dev;
 # also need absent farstream-0.1 and farsight2-0.10 >= 0.0.9
 COOKOPTS="!pngz" # some png are really gif, and many problems with palette
@@ -34,7 +34,7 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libjpeg-turbo libpng16 python xorg-libX11   tk glib tls libv4l"
+	DEPENDS="libjpeg-turbo libpng16 python xorg-libX11   tk glib tls v4l-utils"
 	# /usr/share/amsn/plugins/amsnplus/snapshot depends on libImlib.so.11 - absent
 	TAGS="chat messenger im"
 }
diff -r 9cfaac585fef -r 10df65db91ad beaver/receipt
--- a/beaver/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/beaver/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -29,9 +29,8 @@
 genpkg_rules() {
 	case $PACKAGE in
 		beaver)
-			copy beaver resource/
+			copy beaver resource/ @ico
 			GENERIC_PIXMAPS="no"
-			cook_copy_icons
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+ \
 			libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
 			util-linux-blkid util-linux-mount util-linux-uuid xorg-libX11 \
diff -r 9cfaac585fef -r 10df65db91ad cookutils/receipt
--- a/cookutils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/cookutils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="cookutils"
-VERSION="1045"
+VERSION="1047"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages builder new generation"
 MAINTAINER="pankso@slitaz.org"
diff -r 9cfaac585fef -r 10df65db91ad dconf-editor/receipt
--- a/dconf-editor/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/dconf-editor/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -24,8 +24,7 @@
 }
 
 genpkg_rules() {
-	copy @std
-	rm -r $fs/usr/share/icons; cook_copy_icons # only 16 and 48
+	copy @std @ico # only 16 and 48 icons
 	rm -r $fs/usr/share/appdata
 	DEPENDS="atk cairo dconf gdk-pixbuf glib gtk+3 pango   dbus"
 }
diff -r 9cfaac585fef -r 10df65db91ad deadbeef/receipt
--- a/deadbeef/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/deadbeef/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -30,8 +30,7 @@
 			# only limited set of plugins
 			copy bin/ applications/ pixmaps/ \
 			alsa.so ddb_gui_GTK2.so hotkeys.so m3u.so mms.so mp3.so notify.so \
-			supereq.so vorbis.so
-			cook_copy_icons
+			supereq.so vorbis.so @ico
 			DEPENDS="alsa-lib atk cairo dbus fontconfig freetype gdk-pixbuf \
 			glib gtk+ jansson libmad libvorbis pango xorg-libX11"
 			SUGGESTED="deadbeef-plugins"
diff -r 9cfaac585fef -r 10df65db91ad dkms/receipt
--- a/dkms/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/dkms/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,27 +1,23 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="dkms"
 VERSION="2.1.1.2"
 CATEGORY="system-tools"
-SHORT_DESC="Dynamic Kernel Module Support."
+SHORT_DESC="Dynamic Kernel Module Support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://linux.dell.com/dkms"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://linux.dell.com/dkms"
 WGET_URL="$WEB_SITE/permalink/$TARBALL"
 
 BUILD_DEPENDS="gettext"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	make DESTDIR=$DESTDIR install
+compile_rules() {
+	make DESTDIR=$DESTDIR install &&
+	chown -R root:root $install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
 }
-
diff -r 9cfaac585fef -r 10df65db91ad gcr/receipt
--- a/gcr/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/gcr/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -34,8 +34,7 @@
 			CAT="security|base files"
 			;;
 		gcr)
-			copy @std @rm *.mo
-			cook_copy_icons
+			copy @std @rm *.mo @ico
 			DEPENDS="gcr-base atk bzlib cairo fontconfig freetype gdk-pixbuf \
 			gtk+3 libharfbuzz liblzma libpng16 libxml2 pango shared-mime-info \
 			xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender \
diff -r 9cfaac585fef -r 10df65db91ad gst0-plugins-good/receipt
--- a/gst0-plugins-good/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/gst0-plugins-good/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,7 +13,7 @@
 WGET_URL="$GNOME_MIRROR/gst-plugins-good/0.10/$TARBALL"
 
 BUILD_DEPENDS="gettext GConf-dev gtk-doc python glib-dev orc-dev \
-gstreamer0-dev gst0-plugins-base-dev gtk+-dev libgudev-dev libv4l-dev \
+gstreamer0-dev gst0-plugins-base-dev gtk+-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"
@@ -49,7 +49,7 @@
 			*wavpack.so
 			CAT="multimedia|extra plugins"
 			DEPENDS="glib gst0-plugins-base gstreamer0 jack2 libdv libgudev \
-			libshout libsoup libsoup-gnome libv4l libxml2 orc taglib wavpack \
+			libshout libsoup libsoup-gnome v4l-utils libxml2 orc taglib wavpack \
 			xorg-libICE xorg-libSM xorg-libX11 xorg-libXext xorg-libXv"
 			MAINTAINER="psychomaniak@xakep.ru"
 			;;
@@ -70,7 +70,7 @@
 			gst0-plugins-base-dev gstreamer0-dev harfbuzz-dev jack2-dev \
 			libjpeg-turbo-dev libavc1394-dev libcaca-dev libdv-dev libffi-dev \
 			libgudev-dev libiec61883-dev libogg-dev libpng16-dev \
-			libraw1394-dev libshout-dev libsoup-dev libtheora-dev libv4l-dev \
+			libraw1394-dev libshout-dev libsoup-dev libtheora-dev v4l-utils-dev \
 			libvorbis-dev libxml2-dev ncurses-dev openssl-dev orbit2-dev \
 			orc-dev pcre-dev speex-dev sqlite3-dev taglib-dev \
 			util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \
diff -r 9cfaac585fef -r 10df65db91ad guvcview/receipt
--- a/guvcview/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/guvcview/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -11,8 +11,8 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="gtk+3 portaudio ffmpeg libsdl libv4l libgudev"
-BUILD_DEPENDS="gtk+3-dev portaudio-dev ffmpeg-dev libsdl-dev libv4l-dev \
+DEPENDS="gtk+3 portaudio ffmpeg libsdl v4l-utils libgudev"
+BUILD_DEPENDS="gtk+3-dev portaudio-dev ffmpeg-dev libsdl-dev v4l-utils-dev \
 libgudev-dev intltool"
 
 # Rules to configure and make the package.
diff -r 9cfaac585fef -r 10df65db91ad hal/receipt
--- a/hal/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/hal/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://hal.freedesktop.org/releases/$TARBALL"
 
 BUILD_DEPENDS="dbus-dev dbus-glib dbus-glib-dev udev-dev pciutils \
-util-linux-blkid-dev expat-dev util-linux-uuid-dev glib-dev libv4l-dev"
+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"
diff -r 9cfaac585fef -r 10df65db91ad hplip/receipt
--- a/hplip/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/hplip/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -42,7 +42,7 @@
 	# remove xdg
 	rm -rf $fs/etc/xdg
 	DEPENDS="ghostscript python cups dbus-python libusb jpeg tiff \
-	sane-backends libgphoto2 libexif gcc-lib-base libltdl libv4l net-snmp \
+	sane-backends libgphoto2 libexif gcc-lib-base libltdl v4l-utils net-snmp \
 	PyQt-x11-gpl"
 	TAGS="printer driver printing"
 }
diff -r 9cfaac585fef -r 10df65db91ad kino/receipt
--- a/kino/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/kino/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,7 @@
 libdv-dev libraw1394-dev libavc1394-dev libsamplerate-dev xorg-libXv-dev \
 libiec61883-dev libxml2-dev bash libpng16-dev freetype-dev fontconfig-dev \
 libiec61883 ffmpeg-dev xorg-libXv libsamplerate util-linux-uuid-dev \
-alsa-lib xorg-libXext libv4l-dev"
+alsa-lib xorg-libXext v4l-utils-dev"
 
 compile_rules() {
 	sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
diff -r 9cfaac585fef -r 10df65db91ad linphone/receipt
--- a/linphone/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/linphone/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="http://download-mirror.savannah.gnu.org/releases/linphone/${VERSION%.*}.x/sources/$TARBALL"
 
 BUILD_DEPENDS="intltool libsdl-dev ffmpeg-dev osip-dev exosip-dev speex-dev \
-xorg-libXv-dev libv4l-dev libglade-dev gtk+-dev glib-dev speex-dev"
+xorg-libXv-dev v4l-utils-dev libglade-dev gtk+-dev glib-dev speex-dev"
 SPLIT="linphone-dev"
 
 compile_rules() {
@@ -49,7 +49,7 @@
 			cp -a $install/usr/share/linphone $fs/usr/share
 			cp -a $install/usr/bin $fs/usr
 			cp -a $install/usr/lib/*.so* $fs/usr/lib
-			DEPENDS="osip exosip speex ffmpeg xorg-libXv libv4l libglade gtk+ \
+			DEPENDS="osip exosip speex ffmpeg xorg-libXv v4l-utils libglade gtk+ \
 			glib"
 			TAGS="softphone telephony"
 			;;
diff -r 9cfaac585fef -r 10df65db91ad mate-desktop/receipt
--- a/mate-desktop/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/mate-desktop/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -27,8 +27,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		mate-desktop)
-			copy @std
-			cook_copy_icons # only 16 and 48
+			copy @std @ico # only 16 and 48 icons
 			DEPENDS="atk bzlib cairo dconf fontconfig freetype gdk-pixbuf glib \
 			gtk+3 libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
 			startup-notification util-linux-blkid util-linux-mount \
diff -r 9cfaac585fef -r 10df65db91ad mate-session-manager/receipt
--- a/mate-session-manager/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/mate-session-manager/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -22,8 +22,7 @@
 }
 
 genpkg_rules() {
-	copy @std
-	cook_copy_icons # only 16 and 48
+	copy @std @ico # only 16 and 48 icons
 	DEPENDS="atk bzlib cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
 	glib gtk+3 libffi libharfbuzz liblzma libpng16 libxml2 pango pcre \
 	util-linux-blkid util-linux-mount util-linux-uuid xorg-libICE xorg-libSM \
diff -r 9cfaac585fef -r 10df65db91ad mate-utils/receipt
--- a/mate-utils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/mate-utils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -25,8 +25,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		mate-utils)
-			copy @std
-			cook_copy_icons # only 16 and 48
+			copy @std @ico # only 16 and 48 icons
 			DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib gtk+3 \
 			libcanberra libcanberra-gtk3 libffi libgtop libharfbuzz libltdl \
 			liblzma libogg libpng16 libvorbis libxml2 mate-panel pango pcre \
diff -r 9cfaac585fef -r 10df65db91ad mate116/stuff/mate-notification-daemon-gtk2/receipt
--- a/mate116/stuff/mate-notification-daemon-gtk2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/mate116/stuff/mate-notification-daemon-gtk2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -31,8 +31,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	copy @std
-	rm -r $fs/usr/share/icons/; cook_copy_icons # only 16 and 48
+	copy @std @ico # only 16 and 48 icons
 	DEPENDS="atk bzlib cairo dbus dbus-glib fontconfig freetype gdk-pixbuf \
 	glib gtk+ libcanberra libffi libharfbuzz libltdl liblzma libnotify libogg \
 	libpng16 libvorbis libwnck2 libxml2 pango pcre startup-notification \
diff -r 9cfaac585fef -r 10df65db91ad motion/receipt
--- a/motion/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/motion/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-BUILD_DEPENDS="libpthread-stubs jpeg-dev libv4l-dev"
+BUILD_DEPENDS="libpthread-stubs jpeg-dev v4l-utils-dev"
 #ffmpeg --> breaks build
 
 compile_rules() {
@@ -27,5 +27,5 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="libpthread-stubs jpeg libv4l"
+	DEPENDS="libpthread-stubs jpeg v4l-utils"
 }
diff -r 9cfaac585fef -r 10df65db91ad mplayer-svn/receipt
--- a/mplayer-svn/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/mplayer-svn/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -12,7 +12,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk"
 BRANCH="$VERSION"
-SUGGESTED="libv4l"
+SUGGESTED="v4l-utils"
 
 DEPENDS="gtk+ cdparanoia-III libmad xorg-libXv libtheora lame giflib \
 xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass"
diff -r 9cfaac585fef -r 10df65db91ad notes/receipt
--- a/notes/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/notes/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -29,7 +29,6 @@
 }
 
 genpkg_rules() {
-	copy @std
-	cook_copy_icons # only 16 and 48; svg is too huge
+	copy @std @ico # only 16 and 48; svg is too huge
 	DEPENDS="libatomic mesa qt5-base xorg-libX11"
 }
diff -r 9cfaac585fef -r 10df65db91ad notification-daemon-gtk2/receipt
--- a/notification-daemon-gtk2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/notification-daemon-gtk2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -26,8 +26,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		notification-daemon-gtk2)
-			copy @std
-			rm -r $fs/usr/share/icons; cook_copy_icons # only 16 and 48
+			copy @std @ico # only 16 and 48 icons
 			DEPENDS="GConf atk bzlib cairo dbus dbus-glib fontconfig freetype \
 			gdk-pixbuf glib gtk+ libcanberra libffi libharfbuzz libltdl \
 			liblzma libnotify libogg libpng16 libvorbis libwnck2 libxml2 \
diff -r 9cfaac585fef -r 10df65db91ad opensc/receipt
--- a/opensc/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/opensc/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,7 +1,7 @@
 # SliTaz package receipt v2.
 
 PACKAGE="opensc"
-VERSION="0.13.0"
+VERSION="0.17.0"
 CATEGORY="security"
 SHORT_DESC="Tools and libraries for smart cards"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -9,9 +9,11 @@
 WEB_SITE="https://github.com/OpenSC/OpenSC/wiki"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+#WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="https://github.com/OpenSC/OpenSC/releases/download/$VERSION/$TARBALL"
 
-BUILD_DEPENDS="pcsc-lite-dev openssl-dev"
+BUILD_DEPENDS="libxslt docbook-xsl zlib-dev readline-dev openssl-dev \
+pcsc-lite-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
@@ -22,6 +24,6 @@
 
 genpkg_rules() {
 	copy @std
-	DEPENDS="openssl zlib"
+	DEPENDS="openssl readline zlib"
 	CONFIG_FILES="/etc/opensc.conf"
 }
diff -r 9cfaac585fef -r 10df65db91ad orbit2/receipt
--- a/orbit2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/orbit2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -7,7 +7,6 @@
 MAINTAINER="rcx@zoominternet.net"
 LICENSE="GPL2"
 WEB_SITE="https://projects.gnome.org/ORBit2/"
-CROSS="bug: Could not check for borked linking while cross-compiling"
 
 TARBALL="ORBit2-$VERSION.tar.bz2"
 WGET_URL="$GNOME_MIRROR/ORBit2/${VERSION%.*}/$TARBALL"
@@ -15,21 +14,18 @@
 BUILD_DEPENDS="glib-dev dbus-dev dbus-glib-dev libidl-dev"
 SPLIT="orbit2-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+CROSS="bug: Could not check for borked linking while cross-compiling"
+
+compile_rules() {
 	sed -i 's/-DG_DISABLE_DEPRECATED//' linc2/src/Makefile*
 
-	./configure \
-		--prefix=/usr \
-		--build=$HOST_SYSTEM \
-		--host=$HOST_SYSTEM &&
-	make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		orbit2)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad orc/receipt
--- a/orc/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/orc/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,15 +14,14 @@
 BUILD_DEPENDS="valgrind-dev"
 SPLIT="orc-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make $MAKEFLAGS && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make $MAKEFLAGS &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		orc)   copy @std;;
 		*-dev) copy @dev;;
diff -r 9cfaac585fef -r 10df65db91ad ortp/receipt
--- a/ortp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/ortp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad osip/receipt
--- a/osip/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/osip/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad osmo/receipt
--- a/osmo/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/osmo/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,8 +19,7 @@
 }
 
 genpkg_rules() {
-	copy @std *.mo
-	rm -r $fs/usr/share/icons; cook_copy_icons # only 16 and 48
+	copy @std *.mo @ico # only 16 and 48 icons
 	DEPENDS="atk cairo enchant gdk-pixbuf glib gtk+3 gtkspell3 libarchive \
 	libical liblzma libnotify-gtk3 libsoup libxml2 pango webkit2gtk zlib"
 	TAGS="office"
diff -r 9cfaac585fef -r 10df65db91ad ossp-uuid/receipt
--- a/ossp-uuid/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/ossp-uuid/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad owfs/receipt
--- a/owfs/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/owfs/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,9 +15,9 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--bindir=/usr/bin \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad pam/receipt
--- a/pam/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pam/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--disable-regenerate-docu \
 		--enable-securedir=/lib/security \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad pam_krb5/receipt
--- a/pam_krb5/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pam_krb5/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad pamtester/receipt
--- a/pamtester/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pamtester/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pamtester"
 VERSION="0.1.2"
@@ -6,27 +6,21 @@
 SHORT_DESC="Test the pluggable authentication modules (PAM) facility"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://pamtester.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="pam"
-BUILD_DEPENDS="pam pam-dev"
+BUILD_DEPENDS="pam-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 $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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="pam"
 }
diff -r 9cfaac585fef -r 10df65db91ad pangomm/receipt
--- a/pangomm/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pangomm/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,7 +18,10 @@
 compile_rules() {
 	sed -i "/^libdocdir =/ s|\$(book_name)|pangomm-$VERSION|" docs/Makefile.in
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pangox-compat/receipt
--- a/pangox-compat/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pangox-compat/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad pcmanfm-legacy/receipt
--- a/pcmanfm-legacy/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pcmanfm-legacy/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,41 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pcmanfm-legacy"
 VERSION="0.5.2"
 SOURCE="pcmanfm"
 CATEGORY="system-tools"
-SHORT_DESC="Light and easy to use file manager."
+SHORT_DESC="Light and easy to use file manager"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://pcmanfm.sourceforge.net/"
+
 TARBALL="$SOURCE-$VERSION.tar.bz2"
-WEB_SITE="http://pcmanfm.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
-TAGS="file-manager"
 
-DEPENDS="glibc-base glib util-linux-uuid xorg-libxcb xorg-xcb-util expat \
-zlib fontconfig freetype gtk+ atk cairo pango xorg-pixman libpng16 gamin \
-startup-notification dbus dbus-glib hal xorg-libICE xorg-libSM xorg-libX11 \
-xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
-xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender \
-hicolor-icon-theme shared-mime-info"
 BUILD_DEPENDS="gtk+-dev gamin-dev gamin shared-mime-info intltool hal-dev \
 dbus-glib-dev dbus-dev startup-notification-dev xorg-libxcb-dev xorg-xcb-util-dev \
 xorg-xcb-util xorg-libX11-dev xorg-libXt-dev"
 
-# 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 -lXt"
 
-	cd $src
-	for i in  $stuff/*.patch
-	do
-		if [ -f done.$(basename $i) ]; then
-			continue
-		else
-			patch -p0 < $i && touch done.$(basename $i) || return 1
-		fi
+	for i in  $stuff/*.patch; do
+		[ -f done.$(basename $i) ] && continue
+		patch -p0 < $i && touch done.$(basename $i) || return 1
 	done
 
 	cp $stuff/fr.po $src/po
@@ -43,26 +30,21 @@
 	./configure \
 		--enable-hal \
 		$CONFIGURE_ARGS &&
-	make && make -j 1 install
+	fix libtool &&
+	make &&
+	make -j1 install || return 1
+
+	# XDG autostart desktop file (lxsession will use it automaticaly)
+	install -Dm644 $stuff/autostart/pcmanfm.desktop $fs/etc/xdg/autostart/pcmanfm.desktop
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/applications $fs/etc/xdg
-
-	cp -a $install/usr/bin $fs/usr
-	#cp -a $install/usr/share/mime $fs/usr/share
-	cp -a $install/usr/share/pcmanfm $fs/usr/share
-	rm -rf $fs/usr/share/pcmanfm/icons
-
-	# XDG autostart desktop file (lxsession will use it automaticaly)
-	cp -a $stuff/autostart $fs/etc/xdg
+genpkg_rules() {
+	copy @std
+	DEPENDS="glibc-base glib util-linux-uuid xorg-libxcb xorg-xcb-util expat \
+	zlib fontconfig freetype gtk+ atk cairo pango xorg-pixman libpng16 gamin \
+	startup-notification dbus dbus-glib hal xorg-libICE xorg-libSM xorg-libX11 \
+	xorg-libXau xorg-libXcomposite xorg-libXcursor xorg-libXdamage xorg-libXdmcp \
+	xorg-libXext xorg-libXfixes xorg-libXinerama xorg-libXrender \
+	hicolor-icon-theme shared-mime-info"
+	TAGS="file-manager"
 }
-
-post_install()
-{
-	# update mime-cache
-	echo "Updating mime-types database"
-	chroot "$1/" /usr/bin/update-mime-database /usr/share/mime
-}
diff -r 9cfaac585fef -r 10df65db91ad pcre/receipt
--- a/pcre/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pcre/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,7 +17,6 @@
 
 compile_rules() {
 	./configure \
-		--docdir=/usr/share/doc/pcre-$VERSION \
 		--enable-unicode-properties \
 		--enable-pcre16 \
 		--enable-pcre32 \
@@ -28,7 +27,9 @@
 		--enable-jit \
 		--enable-valgrind \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	mv -v $install/usr/lib/libpcre.so.* $install/lib
diff -r 9cfaac585fef -r 10df65db91ad pcre2/receipt
--- a/pcre2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pcre2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,7 +17,6 @@
 
 compile_rules() {
 	./configure \
-		--docdir=/usr/share/doc/pcre2-$VERSION \
 		--enable-unicode \
 		--enable-pcre2-16 \
 		--enable-pcre2-32 \
@@ -28,7 +27,9 @@
 		--enable-jit \
 		--enable-valgrind \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pcsc-lite/receipt
--- a/pcsc-lite/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pcsc-lite/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--enable-ipcdir=/run/pcscd \
 		--enable-usbdropdir=/usr/lib/pcsc/drivers \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad perdition/receipt
--- a/perdition/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/perdition/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -34,6 +34,7 @@
 		--disable-gdbm \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad pidgin/receipt
--- a/pidgin/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pidgin/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -40,6 +40,7 @@
 		--disable-idn \
 		--disable-sm \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make -j 4 &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad pilot-link/receipt
--- a/pilot-link/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pilot-link/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,12 +16,12 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--enable-conduits \
 		--sharedstatedir=/var/lib \
-		--localstatedir=/var \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pkg-config/receipt
--- a/pkg-config/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pkg-config/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -30,7 +30,9 @@
 				$CONFIGURE_ARGS
 				;;
 	esac &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	cd $install/usr/bin
 	mv pkg-config ${TOOLPREFIX}pkg-config
diff -r 9cfaac585fef -r 10df65db91ad plymouth/receipt
--- a/plymouth/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/plymouth/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		--with-release-file=/etc/slitaz-release \
 		--disable-libdrm_nouveau \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad pmount/receipt
--- a/pmount/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pmount/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,35 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="pmount"
 VERSION="0.9.23"
 CATEGORY="system-tools"
-SHORT_DESC="Mount arbitrary hotpluggable devices as normal user."
+SHORT_DESC="Mount arbitrary hotpluggable devices as normal user"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://pmount.alioth.debian.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://pmount.alioth.debian.org/"
 WGET_URL="http://alioth.debian.org/frs/download.php/3310/$TARBALL"
-CONFIG_FILES="/etc/pmount.allow"
 
-DEPENDS="dbus hal sysfsutils"
 BUILD_DEPENDS="util-linux-blkid-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/ -D / /' src/Makefile*
-	./configure $CONFIGURE_ARGS && 
-	make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/locale
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
-	cp -a $install/usr/share/locale/de $fs/usr/share/locale
+genpkg_rules() {
+	copy @std
+	DEPENDS="dbus hal sysfsutils"
+	CONFIG_FILES="/etc/pmount.allow"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad polkit/receipt
--- a/polkit/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/polkit/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -8,7 +8,6 @@
 LICENSE="LGPL2"
 WEB_SITE="https://www.freedesktop.org/wiki/Software/polkit/"
 LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/polkit.html"
-CROSS="error: cannot check for file existence when cross compiling"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.freedesktop.org/software/polkit/releases/$TARBALL"
@@ -18,6 +17,8 @@
 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"
+
 compile_rules() {
 	if ! grep -q polkitd "/etc/passwd"; then
 		addgroup -g 27 polkitd
@@ -34,7 +35,9 @@
 		--enable-libsystemd-login=no \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	case "$SET" in
 		pam) install -Dm644 $stuff/polkit-1 $install/etc/pam.d/polkit-1;;
diff -r 9cfaac585fef -r 10df65db91ad poppler/receipt
--- a/poppler/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/poppler/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -23,6 +23,7 @@
 		--enable-xpdf-headers \
 		--with-testdatadir=$PWD/testfiles \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad popt/receipt
--- a/popt/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/popt/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,7 +18,9 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad portaudio/receipt
--- a/portaudio/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/portaudio/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,11 +15,8 @@
 SPLIT="portaudio-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad postgis/receipt
--- a/postgis/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/postgis/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 	./configure \
 		--with-gui \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make -j1 &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad potrace/receipt
--- a/potrace/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/potrace/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--enable-a4 \
 		--with-libpotrace \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad powertop/receipt
--- a/powertop/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/powertop/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="powertop"
 VERSION="2.0"
 CATEGORY="system-tools"
-SHORT_DESC="Utility designed to measure and explain a computer's electrical power consumption"
+SHORT_DESC="Utility designed to measure and explain a computer's electrical \
+power consumption"
 MAINTAINER="domcox@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.lesswatts.org/projects/powertop/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.lesswatts.org/projects/powertop/"
 WGET_URL="https://01.org/powertop/sites/default/files/downloads/$TARBALL"
-TAGS="power-management"
 
-DEPENDS="ncurses pciutils libnl zlib gcc-lib-base"
 BUILD_DEPENDS="acl gettext ncurses-dev autoconf automake libtool \
 pciutils-dev libnl-dev zlib-dev gettext diffutils"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/AC_PROG_LIBTOOL/AC_PROG_MKDIR_P\n&/' configure.ac
 	sed -i 's/(mkdir_p)/(MKDIR_P)/' po/Makefile.in.in
 	./autogen.sh
-	./configure &&  make && make install
+
+	./configure &&
+	fix libtool &&
+	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
+	DEPENDS="ncurses pciutils libnl zlib gcc-lib-base"
+	TAGS="power-management"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad prelink/receipt
--- a/prelink/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/prelink/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="prelink"
 VERSION="20130503"
@@ -7,21 +7,22 @@
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL"
 WEB_SITE="http://people.redhat.com/jakub/prelink/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://people.redhat.com/jakub/$PACKAGE/$TARBALL"
 
-DEPENDS="elfutils"
 BUILD_DEPENDS="elfutils-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/^LIBS.*/& -lpthread/' src/Makefile*
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="elfutils"
 }
diff -r 9cfaac585fef -r 10df65db91ad procps-ng/receipt
--- a/procps-ng/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/procps-ng/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,14 +16,15 @@
 SPLIT="procps-ng-dev"
 
 compile_rules() {
-#		--docdir=/usr/share/doc/procps-ng-$VERSION \
 	./configure \
 		--exec-prefix= \
 		--libdir=/usr/lib \
 		--disable-static \
 		--disable-kill \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/lib
 	mv $install/usr/lib/libprocps.so.* $install/lib
diff -r 9cfaac585fef -r 10df65db91ad proftpd/receipt
--- a/proftpd/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/proftpd/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 
diff -r 9cfaac585fef -r 10df65db91ad proj/receipt
--- a/proj/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/proj/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,18 +14,18 @@
 
 SPLIT="proj-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	mkdir -p $DESTDIR/usr/bin
-	./configure $CONFIGURE_ARGS && make && make install
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-		proj) copy @std;;
+		proj)  copy @std;;
 		*-dev) copy @dev;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad protobuf/receipt
--- a/protobuf/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/protobuf/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,19 +14,18 @@
 BUILD_DEPENDS="curl automake libtool zlib-dev python-dev"
 SPLIT="protobuf-python protobuf-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh &&
-	./configure $CONFIGURE_ARGS && make && make install || exit 1
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || exit 1
 
 	cd $src/python
 	python setup.py install --prefix=/usr --root $DESTDIR
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		protobuf)
 			copy bin/ *.so*
diff -r 9cfaac585fef -r 10df65db91ad pth/receipt
--- a/pth/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pth/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,8 +15,9 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make -j 1 &&
-	make -j 1 DESTDIR=$DESTDIR install
+	fix libtool &&
+	make -j1 &&
+	make -j1 DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pulseaudio/receipt
--- a/pulseaudio/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pulseaudio/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -28,6 +28,7 @@
 		--disable-oss-output \
 		--disable-oss-wrapper \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad pygobject/receipt
--- a/pygobject/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pygobject/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,7 +19,9 @@
 	./configure \
 		--disable-introspection \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pygobject3/receipt
--- a/pygobject3/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pygobject3/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,7 +19,8 @@
 	NOCONFIGURE=1 ./autogen.sh &&
 	./configure $CONFIGURE_ARGS > /dev/null 2>&1 # create ./libtool
 	./configure $CONFIGURE_ARGS &&
-	sed -i 's| -shared | -Wl,-O1,--as-needed\0|g' libtool &&
+	fix libtool &&
+#	sed -i 's| -shared | -Wl,-O1,--as-needed\0|g' libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad pygoocanvas/receipt
--- a/pygoocanvas/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pygoocanvas/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 	./configure \
 		--disable-docs \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad pyorbit/receipt
--- a/pyorbit/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pyorbit/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad python-pygame/receipt
--- a/python-pygame/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/python-pygame/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -12,7 +12,7 @@
 WGET_URL="$WEB_SITE/ftp/$TARBALL"
 
 BUILD_DEPENDS="python-dev libsmpeg-dev libsdl-dev libsdl-image-dev \
-libsdl-mixer-dev libsdl-ttf-dev libv4l-dev"
+libsdl-mixer-dev libsdl-ttf-dev v4l-utils-dev"
 SPLIT="python-pygame-dev"
 
 compile_rules() {
diff -r 9cfaac585fef -r 10df65db91ad pywebkitgtk/receipt
--- a/pywebkitgtk/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/pywebkitgtk/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="pywebkitgtk-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad qpdf/receipt
--- a/qpdf/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/qpdf/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad qrencode/receipt
--- a/qrencode/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/qrencode/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,15 +14,14 @@
 BUILD_DEPENDS="libpng16-dev"
 SPLIT="qrencode-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		qrencode)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad quesoglc/receipt
--- a/quesoglc/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/quesoglc/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,7 +20,9 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad radeontool/receipt
--- a/radeontool/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/radeontool/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,29 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="radeontool"
 VERSION="1.6.3"
 CATEGORY="system-tools"
-SHORT_DESC="Utility to control ATI Radeon backlight functions on laptops."
+SHORT_DESC="Utility to control ATI Radeon backlight functions on laptops"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="zlib/libpng"
+WEB_SITE="http://anonscm.debian.org/cgit/collab-maint/radeontool.git"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://anonscm.debian.org/cgit/collab-maint/radeontool.git"
 WGET_URL="http://people.freedesktop.org/~airlied/$PACKAGE/$TARBALL"
 
-DEPENDS="xorg-libpciaccess"
 BUILD_DEPENDS="xorg-libpciaccess-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
-		$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs/
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libpciaccess"
 }
diff -r 9cfaac585fef -r 10df65db91ad radiusclient-ng/receipt
--- a/radiusclient-ng/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/radiusclient-ng/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make -j 1 DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad raptor/receipt
--- a/raptor/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/raptor/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -3,28 +3,30 @@
 PACKAGE="raptor"
 VERSION="2.0.8"
 CATEGORY="multimedia"
+SHORT_DESC="A C library that parses RDF/XML/N-Triples into RDF triples"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
-SHORT_DESC="A C library that parses RDF/XML/N-Triples into RDF triples"
 WEB_SITE="http://librdf.org/raptor"
-SOURCE="raptor2"
-TARBALL="$SOURCE-$VERSION.tar.gz"
+
+TARBALL="raptor2-$VERSION.tar.gz"
 WGET_URL="http://librdf.org/dist/source/$TARBALL"
 
 BUILD_DEPENDS="libxml2-dev curl-dev zlib-dev openssl-dev libxslt-dev libidn-dev"
 SPLIT="raptor-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --disable-static --with-yajl=no $CONFIGURE_ARGS &&
-	make && make prefix=/usr install 
+compile_rules() {
+	./configure \
+		--disable-static \
+		--with-yajl=no \
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make prefix=/usr install || return 1
+
+	ln -s raptor2/raptor2.h $install/usr/include/raptor.h
 }
-	
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{	
+
+genpkg_rules() {
 	case $PACKAGE in
 		raptor)
 			copy @std
@@ -32,7 +34,6 @@
 			;;
 		raptor-dev)
 			copy @dev
-			ln -s raptor2/raptor2.h $fs/usr/include/raptor.h
 			DEPENDS="raptor curl-dev libxslt-dev"
 			;;
 	esac
diff -r 9cfaac585fef -r 10df65db91ad rarian/receipt
--- a/rarian/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rarian/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad rdpdesk/receipt
--- a/rdpdesk/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rdpdesk/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,34 +1,33 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rdpdesk"
 VERSION="3.2"
 CATEGORY="network"
-SHORT_DESC="RDP, VNC & ICA client."
+SHORT_DESC="RDP, VNC & ICA client"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://rdpdesk.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://rdpdesk.com/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="wxWidgets28 xorg-libXp xorg-libXaw openssl"
 BUILD_DEPENDS="wxWidgets28-dev xorg-imake jpeg-dev zlib-dev gettext-tools \
 openssl-dev xorg-libXp autoconf xorg-libXt-dev xorg-libXp-dev xorg-libXaw-dev"
-SUGGESTED="wfica rdesktop"
 
-# 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"
 
 	sed -i 's|glib/.*h|glib.h|' src/proto/*Connection_nix.hpp
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	cp -a $install/usr $fs
+	DEPENDS="wxWidgets28 xorg-libXp xorg-libXaw openssl"
+	SUGGESTED="wfica rdesktop"
 }
diff -r 9cfaac585fef -r 10df65db91ad re-alpine/receipt
--- a/re-alpine/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/re-alpine/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,36 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="re-alpine"
 VERSION="2.03"
 CATEGORY="network"
-SHORT_DESC="Re-alpine is the continuation of Alpine (a text-based email client)."
+SHORT_DESC="Re-alpine is the continuation of Alpine (a text-based email client)"
 MAINTAINER="paul@slitaz.org"
 LICENSE="Apache"
+WEB_SITE="http://sourceforge.net/projects/re-alpine/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://sourceforge.net/projects/re-alpine/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-TAGS="mail client"
 
-DEPENDS="openssl pam libldap libsasl ncurses libkrb5 libcomerr3"
 BUILD_DEPENDS="openssl-dev pam-dev openldap-dev cyrus-sasl-dev libldap krb5-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	touch libtoolT	# configure wan't to remove it...
+
 	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
 		--with-ssl-dir=/usr \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	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="openssl pam libldap libsasl ncurses libkrb5 libcomerr3"
+	TAGS="mail client"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad reiserfsprogs/receipt
--- a/reiserfsprogs/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/reiserfsprogs/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.sfr-fresh.com/linux/misc/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/postlfs/reiserfs.html"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v$VERSION/$TARBALL"
@@ -14,21 +15,16 @@
 BUILD_DEPENDS="util-linux-uuid-dev libcomerr-dev acl-dev"
 SPLIT="reiserfsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/reiserfs.html
-
+compile_rules(){
 	./configure \
 		--sbindir=/sbin \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		reiserfsprogs)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad rhythmcat2/receipt
--- a/rhythmcat2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rhythmcat2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rhythmcat2"
 VERSION="1.9.5"
@@ -8,16 +8,14 @@
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL3"
 WEB_SITE="https://github.com/supercatexpert/RhythmCat2"
+
 TARBALL="$PACKAGE-$COMMIT.tar.gz"
 WGET_URL="$WEB_SITE/archive/$COMMIT.tar.gz"
 
-DEPENDS="gst0-plugins-base gtk+3 xorg-libXdamage"
 BUILD_DEPENDS="gstreamer0-dev gst0-plugins-base-dev gtk+3-dev curl-dev \
 intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	patch -p1 -i $stuff/rhythmcat2.patch
 	cp $stuff/ru.po $src/po
 
@@ -26,11 +24,12 @@
 		--disable-introspection \
 		--with-native-plugins \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy RhythmCat2 *.so* *.PNG *.desktop *.mo
+	DEPENDS="gst0-plugins-base gtk+3 xorg-libXdamage"
 }
diff -r 9cfaac585fef -r 10df65db91ad rlog/receipt
--- a/rlog/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rlog/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,9 +14,8 @@
 SPLIT="rlog-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad rpcbind/receipt
--- a/rpcbind/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rpcbind/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,34 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rpcbind"
 VERSION="0.2.0"
 CATEGORY="network"
-SHORT_DESC="RPC program numbers to universal addresses converter."
+SHORT_DESC="RPC program numbers to universal addresses converter"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://rpcbind.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://rpcbind.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
-DEPENDS="libtirpc"
 BUILD_DEPENDS="libtirpc-dev"
 
-# Handle cross compilation.
-case "$ARCH" in
-	arm*) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include/tirpc" ;;
-esac
+compile_rules() {
+	case "$ARCH" in
+		arm*) export CPPFLAGS="$CPPFLAGS -I/cross/$ARCH/sysroot/usr/include/tirpc" ;;
+	esac
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	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="libtirpc"
 }
diff -r 9cfaac585fef -r 10df65db91ad rrdtool-lite/receipt
--- a/rrdtool-lite/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rrdtool-lite/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,23 +1,19 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="rrdtool-lite"
-SOURCE="rrdtool"
 VERSION="1.4.6"
 CATEGORY="misc"
-SHORT_DESC="Data logging system for time series data."
+SHORT_DESC="Data logging system for time series data"
 MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="http://oss.oetiker.ch/$SOURCE"
+WEB_SITE="http://oss.oetiker.ch/rrdtool"
+
+TARBALL="rrdtool-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/pub/$TARBALL"
 
-DEPENDS="zlib glib libxml2"
 BUILD_DEPENDS="libxml2-dev glib-dev groff"
-TAGS="logs"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr --infodir=/usr/share/info \
+compile_rules() {
+	./configure \
 		--disable-rrdcgi \
 		--disable-rrd_graph \
 		--disable-nls \
@@ -28,15 +24,14 @@
 		--disable-lua \
 		--disable-tcl \
 		--disable-python \
-		--mandir=/usr/share/man $CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib glib libxml2"
+	TAGS="logs"
 }
diff -r 9cfaac585fef -r 10df65db91ad rrdtool/receipt
--- a/rrdtool/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/rrdtool/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -32,6 +32,7 @@
 	./configure \
 		--enable-perl-site-install \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad sane-backends/receipt
--- a/sane-backends/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sane-backends/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -11,7 +11,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp2.sane-project.org/pub/sane/$PACKAGE-$VERSION/$TARBALL"
 
-BUILD_DEPENDS="libusb-compat-dev libjpeg-turbo-dev tiff-dev zlib-dev libv4l-dev \
+BUILD_DEPENDS="libusb-compat-dev libjpeg-turbo-dev tiff-dev zlib-dev v4l-utils-dev \
 libgphoto2-dev libtool eudev-dev"
 SPLIT="sane-backends-dev"
 
@@ -22,6 +22,7 @@
 	patch -Np1 -i $stuff/xerox_mfp_fix_usb_devices.patch
 
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make -j1 DESTDIR=$install install || return 1
 
@@ -53,7 +54,7 @@
 	case $PACKAGE in
 		sane-backends)
 			copy @std
-			DEPENDS="libusb-compat libjpeg-turbo tiff zlib libgphoto2 libv4l libltdl"
+			DEPENDS="libusb-compat libjpeg-turbo tiff zlib libgphoto2 v4l-utils libltdl"
 			SUGGESTED="imagemagick gocr tesseract-ocr"
 			;;
 		*-dev)
diff -r 9cfaac585fef -r 10df65db91ad sawman/receipt
--- a/sawman/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sawman/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sawman"
 VERSION="1.4.3"
@@ -6,33 +6,25 @@
 SHORT_DESC="DirectFB Window manager"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-SOURCE="SaWMan"
-TARBALL="${SOURCE}-${VERSION}.tar.gz"
 WEB_SITE="http://directfb.org/index.php?path=Platform/SaWMan"
+
+TARBALL="SaWMan-$VERSION.tar.gz"
 WGET_URL="http://directfb.org/downloads/Extras/$TARBALL"
 
-DEPENDS="directfb"
 BUILD_DEPENDS="directfb-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	 ./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/lib/directfb-* $fs/usr/lib
-	find $fs/usr/lib -name "*.*a" -exec rm '{}' \;
+genpkg_rules() {
+	copy @std
+	DEPENDS="directfb"
 }
 
-testsuite()
-{
+testsuite() {
 	readelf -h $install/usr/bin/testman
 }
diff -r 9cfaac585fef -r 10df65db91ad schroedinger/receipt
--- a/schroedinger/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/schroedinger/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,18 +14,16 @@
 BUILD_DEPENDS="orc-dev"
 SPLIT="schroedinger-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--disable-static \
-		$CONFIGURE_ARGS && \
-	make && make install
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		schroedinger)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad scilab/receipt
--- a/scilab/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/scilab/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,35 +1,35 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="scilab"
 VERSION="5.5.2"
 CATEGORY="office"
-SHORT_DESC="Open source software for numerical computation."
+SHORT_DESC="Open source software for numerical computation"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="CECILL"
+WEB_SITE="http://www.scilab.org/"
+
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
-WEB_SITE="http://www.scilab.org/"
 WGET_URL="${WEB_SITE}download/$VERSION/$TARBALL"
 
-DEPENDS="libgfortran tk curl blas lapack hdf5 pcre fftw libxml2 gcc-lib-math \
-arpack-ng matio"
 BUILD_DEPENDS="gfortran hdf5-dev ocaml fftw-dev libxml2-dev \
 gettext blas lapack curl-dev tcl-dev tk-dev xorg-dev ncurses-dev \
 arpack-ng-dev matio-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	fix math
-	./configure --prefix=/usr \
-		--without-javasci --without-gui --disable-build-help \
+	./configure \
+		--without-javasci \
+		--without-gui \
+		--disable-build-help \
 		--without-umfpack \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make all &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs/
+genpkg_rules() {
+	copy @std
+	DEPENDS="libgfortran tk curl blas lapack hdf5 pcre fftw libxml2 \
+	gcc-lib-math arpack-ng matio"
 }
diff -r 9cfaac585fef -r 10df65db91ad screentest/receipt
--- a/screentest/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/screentest/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,31 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="screentest"
 VERSION="2.0"
 CATEGORY="misc"
-SHORT_DESC="A CRT and LCD screen testing utility."
+SHORT_DESC="A CRT and LCD screen testing utility"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://tobix.github.io/screentest/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://tobix.github.io/screentest/"
 WGET_URL="https://github.com/TobiX/screentest/archive/$VERSION.tar.gz"
-TAGS="test diagnostic screen"
 
-DEPENDS="gtk+ libglade"
 BUILD_DEPENDS="gtk+-dev libglade-dev automake autoconf libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/prune , -name/prune -or -name/' autogen.sh
 	./autogen.sh
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/* $fs/
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk+ libglade"
+	TAGS="test diagnostic screen"
 }
diff -r 9cfaac585fef -r 10df65db91ad seed/receipt
--- a/seed/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/seed/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,7 +20,9 @@
 	./configure \
 		--with-webkit=1.0 \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad sg3_utils/receipt
--- a/sg3_utils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sg3_utils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad shadow/receipt
--- a/shadow/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/shadow/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -28,6 +28,7 @@
 
 	./configure \
 		--with-group-name-max-length=32 &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad shellinabox/receipt
--- a/shellinabox/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/shellinabox/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,53 +1,48 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="shellinabox"
 VERSION="2.14"
 CATEGORY="network"
-SHORT_DESC="Ajax web based terminal emulator."
+SHORT_DESC="Web based AJAX terminal emulator"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://code.google.com/archive/p/shellinabox/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.googlecode.com/"
-WGET_URL="${WEB_SITE}files/$TARBALL"
-TAGS="web application"
+WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/shellinabox/$TARBALL"
 
-DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev"
-SUGGESTED="ssh knock"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install || return 1
+
+	mkdir -p \
+		$install/usr/share/shellinabox/ \
+		$install/etc/init.d/
+	cp $install/usr/share/doc/shellinabox/*black*.css $install/usr/share/shellinabox/
+	cp $stuff/*.css       $install/usr/share/shellinabox/
+	cp $stuff/shellinabox $install/etc/init.d/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/share/shellinabox $fs/etc/init.d
-	cp -a $install/usr/bin $fs/usr
-	cp $install/usr/share/doc/shellinabox/*black*.css $fs/usr/share/shellinabox
-	cp $stuff/*.css $fs/usr/share/shellinabox
-	cp $stuff/shellinabox $fs/etc/init.d/
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib"
+	SUGGESTED="ssh knock"
+	TAGS="web application"
 }
 
-# Pre and post install commands for Tazpkg.
 # We stop the server by default in case of upgarde.
-pre_install()
-{
-	[ -z "$1" ] && [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
+pre_install() {
+	[ -z "$1" ] && [ -f /etc/init.d/shellinabox ] && /etc/init.d/shellinabox stop
 }
 
-post_install()
-{
-	[ "$1" ] || /etc/init.d/$PACKAGE start
+post_install() {
+	[ "$1" ] || /etc/init.d/shellinabox start
 }
 
-pre_remove()
-{
-	[ "$1" ] || /etc/init.d/$PACKAGE stop
+pre_remove() {
+	[ "$1" ] || /etc/init.d/shellinabox stop
 }
diff -r 9cfaac585fef -r 10df65db91ad silc-server/receipt
--- a/silc-server/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/silc-server/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 	./configure \
 		--with-logsdir=/var/log/silc \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad siproxd/receipt
--- a/siproxd/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/siproxd/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,6 +19,7 @@
 	./configure \
 		--sysconfdir=/etc/siproxd \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad sleuthkit/receipt
--- a/sleuthkit/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sleuthkit/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--without-libewf \
 		--without-afflib \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make LDFLAGS+="-lpthread -ldl" &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad smx/receipt
--- a/smx/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/smx/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -23,7 +23,10 @@
 	#        Any other examples of using?
 	#        Or it is only inconsistence in the docs/doc2man script?
 
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad snort-mysql/receipt
--- a/snort-mysql/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/snort-mysql/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,36 +1,34 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="snort-mysql"
 VERSION="2.9.4"
 CATEGORY="network"
-SHORT_DESC="Network intrusion prevention and detection system (IDS/IPS) with MySQL support."
+SHORT_DESC="Network intrusion prevention and detection system (IDS/IPS) with \
+MySQL support"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.snort.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.snort.org/"
 WGET_URL="http://www.snort.org/downloads/1207"
-DEPENDS="pcre libdnet libdaq libmysqlclient"
+
 BUILD_DEPENDS="pcre-dev libpcap-dev libdaq-dev libdnet-dev zlib-dev \
 mysql-dev flex"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--with-mysql \
 		--enable-dynamicplugin \
 		--enable-perfprofiling \
 		--enable-zlib \
 		--enable-reload \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	mkdir -p \
 		$fs/usr/lib \
 		$fs/etc/snort/rules \
@@ -41,16 +39,15 @@
 	cp -a $install/usr/lib/snort_dynamic* $fs/usr/lib
 
 	cp -a $src/etc/*.conf* $fs/etc/snort
-	cp -a $src/etc/*.map $fs/etc/snort
+	cp -a $src/etc/*.map   $fs/etc/snort
 	cp -a $src/schemas/create_mysql  $fs/usr/share/snort/schemas
 
 	# Remove unwanted files
 	rm -f $fs/usr/lib/*/*.*a
+	DEPENDS="pcre libdnet libdaq libmysqlclient"
 }
 
-# Post install commands
-post_install()
-{
+post_install() {
 	local db_name=snort
 	local db_pass=snort
 	local db_schema=/usr/share/snort/create_mysql
@@ -59,22 +56,18 @@
 
 	# addgroup snort if needed
 	if ! grep -q snort "$1/etc/group"; then
-		action 'Adding group snort...'
 		chroot "$1/" /bin/addgroup snort
-		status
 	fi
 	# adduser snort if needed
 	if ! grep -q 'snort:' "$1/etc/passwd"; then
-		action 'Adding user snort...'
 		chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \
 			-g "Snort Daemon user" -H -D -S -G snort snort
-		status
 	fi
 	chroot "$1/" chown snort.snort /var/log/snort 
 
 	# Create database
 	if [ -z "$1" ]; then
-		if ( ! mysqladmin -s ping > /dev/null ); then
+		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
diff -r 9cfaac585fef -r 10df65db91ad snort/receipt
--- a/snort/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/snort/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad soundtouch/receipt
--- a/soundtouch/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/soundtouch/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -22,6 +22,7 @@
 	./configure \
 		--enable-shared \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad sox/receipt
--- a/sox/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sox/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -23,6 +23,7 @@
 	./configure \
 		--with-distro="SliTaz" \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad spacefm-gtk2/receipt
--- a/spacefm-gtk2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/spacefm-gtk2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,22 +13,19 @@
 
 BUILD_DEPENDS="intltool gtk+-dev eudev-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--disable-video-thumbnails \
 		--with-preferable-sudo=/usr/bin/subox \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make MKDIRPROG='mkdir -p' install || return 1
 
 	rm -rf $install/usr/share/mime/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="cairo eudev gdk-pixbuf glib gtk+ pango xorg-libX11   bash"
 }
diff -r 9cfaac585fef -r 10df65db91ad spacefm/receipt
--- a/spacefm/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/spacefm/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,25 +1,21 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="spacefm"
 VERSION="0.9.4"
 CATEGORY="system-tools"
-SHORT_DESC="Light, fast and easy to use file manager."
+SHORT_DESC="Light, fast and easy to use file manager"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://ignorantguru.github.io/spacefm/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://ignorantguru.github.io/spacefm/"
 WGET_URL="$SF_MIRROR/$PACKAGE/files/$TARBALL"
-TAGS="file-manager"
 
-DEPENDS="glibc-base glib util-linux-uuid xorg-libxcb xorg-xcb-util expat \
-gtk+ startup-notification dbus dbus-glib gdk-pixbuf udev bash udevil"
 BUILD_DEPENDS="gtk+-dev dbus-glib-dev dbus-dev startup-notification-dev \
 xorg-libxcb-dev xorg-xcb-util-dev expat-dev gdk-pixbuf-dev intltool udev-dev \
 coreutils-file-special"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	patch -Np1 -i $stuff/prefdlg.ui.diff
 	patch -Np1 -i $stuff/settings.h.diff
 	patch -Np1 -i $stuff/vfs-file-task.c.diff
@@ -28,22 +24,21 @@
 		--with-preferable-sudo="/usr/bin/subox" \
 		--disable-pixmaps \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install || return 1
+
+	install -Dm644 $stuff/spacefm.conf                  $install/etc/spacefm/spacefm.conf
+	install -Dm644 $stuff/xdg/autostart/spacefm.desktop $install/etc/autostart/spacefm.desktop
+	install -Dm644 $stuff/xdg/spacefm/session           $install/etc/xdg/spacefm/session
+
+	# /bin/bash --> /bin/sh
+	sed -i 's|/bin/bash|/bin/sh|g' $install/usr/bin/spacefm-auth
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share $fs/etc/spacefm
-	cp -a $install/usr/bin $fs/usr
-	for d in applications icons spacefm; do
-		cp -a $install/usr/share/$d $fs/usr/share
-	done
-	cp $stuff/spacefm.conf $fs/etc/spacefm
-	cp -a $stuff/xdg $fs/etc
-	# Faenza --> SliTaz
-	mv $fs/usr/share/icons/Faenza $fs/usr/share/icons/SliTaz
-	rm -rf $fs/usr/share/icons/hicolor/128x128
-	# /bin/bash --> /bin/sh
-	sed -i s'|/bin/bash|/bin/sh|'g $fs/usr/bin/spacefm-auth
+genpkg_rules() {
+	copy @std @ico
+	DEPENDS="glibc-base glib util-linux-uuid xorg-libxcb xorg-xcb-util expat \
+	gtk+ startup-notification dbus dbus-glib gdk-pixbuf udev bash udevil"
+	TAGS="file-manager"
 }
diff -r 9cfaac585fef -r 10df65db91ad spandsp/receipt
--- a/spandsp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/spandsp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make -j1 install
 }
diff -r 9cfaac585fef -r 10df65db91ad speech-dispatcher/receipt
--- a/speech-dispatcher/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/speech-dispatcher/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -30,6 +30,7 @@
 	./configure \
 		--with-espeak \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad speex/receipt
--- a/speex/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/speex/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		\
 		--enable-binaries \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make -j1 install
 }
diff -r 9cfaac585fef -r 10df65db91ad speexdsp/receipt
--- a/speexdsp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/speexdsp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad spl/receipt
--- a/spl/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/spl/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -8,36 +8,30 @@
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://zfsonlinux.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="https://github.com/zfsonlinux/zfs/releases/download/zfs-$VERSION/$TARBALL"
 
 BUILD_DEPENDS="linux-module-headers xz"
-SPLIT="spl-src"
+SPLIT="spl-src spl"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
+compile_rules() {
+	./configure \
 		--with-linux=/usr/src/linux \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	spl)
-		mkdir -p $fs/usr
-		cp -a $install/usr/sbin $fs/usr
-		cp -a $install/lib $fs
-		;;
-	spl-src)
-		CAT="system-tools|development files"
-		mkdir -p $fs/usr
-		cp -a $install/usr/src $fs/usr
-		;;
+		spl-src)
+			copy /usr/src/
+			CAT="system-tools|development files"
+			;;
+		spl)
+			copy @std @rm
+			;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad sqlite3/receipt
--- a/sqlite3/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sqlite3/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,9 +17,7 @@
 BUILD_DEPENDS="tcl-dev"
 SPLIT="libsqlite3 libsqlite3-tcl lemon sqlite3-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	case "$ARCH" in
 		arm*) ARCH_ARGS="--with-tcl=/cross/arm/sysroot/usr/lib" ;;
 	esac
@@ -39,6 +37,7 @@
 		LDFLAGS="$LDFLAGS -ldl" \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool &&
 	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool &&
 	make &&
@@ -60,9 +59,7 @@
 	chmod +x $install/usr/bin/mysql2sqlite.sh
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		sqlite3)
 			copy sqlite3 mysql2sqlite.sh
diff -r 9cfaac585fef -r 10df65db91ad squid/receipt
--- a/squid/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/squid/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -43,49 +43,50 @@
 		--enable-icap-client \
 		--with-pthreads ac_cv_header_linux_netfilter_ipv4_h="yes" \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make $MAKEFLAGS &&
 	make install
 }
 
 genpkg_rules() {
 	case $PACKAGE in
-	squid)
-		CONFIG_FILES="/etc/squid"
-		DEPENDS="libsasl libldap openssl libltdl"
-		SUGGESTED="iptables"
-		mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid \
-			$fs/var/log/squid $fs/usr/lib/squid $fs/etc/squid/conf.d
-	
-		touch $fs/var/log/squid/cache.log
-	
-		cp -a $install/etc $fs
-		rm -rf $fs/etc/squid/*.default
-		cp -a $stuff/etc $fs
-	
-		cp -a $install/var $fs
-		cp -a $install/usr/bin $fs/usr
-		cp -a $install/usr/sbin $fs/usr
-		cp -a $install/usr/lib/squid/* $fs/usr/lib/squid
-	
-		# Remove auth libs
-		rm -f $fs/usr/lib/squid/*_auth*
-	
-		cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid
-		cp -a $install/usr/share/squid/icons $fs/usr/share/squid
-		cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors
-		cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors
-		cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
-	
-		sed -i \
-			-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
-			-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
-			-e 's|^#pid_filename /var/logs|pid_filename /var/run/squid.pid|' \
-			-e "s|^coredump_dir.*|coredump_dir /var/cache/squid|" \
-			-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
-			-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
-				$fs/etc/squid/squid.conf
-		
-		cat <<EOF>>$fs/etc/squid/squid.conf
+		squid)
+			CONFIG_FILES="/etc/squid"
+			DEPENDS="libsasl libldap openssl libltdl"
+			SUGGESTED="iptables"
+			mkdir -p $fs/usr/share/squid/errors $fs/var/cache/squid \
+				$fs/var/log/squid $fs/usr/lib/squid $fs/etc/squid/conf.d
+
+			touch $fs/var/log/squid/cache.log
+
+			cp -a $install/etc $fs
+			rm -rf $fs/etc/squid/*.default
+			cp -a $stuff/etc $fs
+
+			cp -a $install/var $fs
+			cp -a $install/usr/bin $fs/usr
+			cp -a $install/usr/sbin $fs/usr
+			cp -a $install/usr/lib/squid/* $fs/usr/lib/squid
+
+			# Remove auth libs
+			rm -f $fs/usr/lib/squid/*_auth*
+
+			cp -a $install/usr/share/squid/mib.txt $fs/usr/share/squid
+			cp -a $install/usr/share/squid/icons $fs/usr/share/squid
+			cp -a $install/usr/share/squid/errors/templates $fs/usr/share/squid/errors
+			cp -a $install/usr/share/squid/errors/en* $fs/usr/share/squid/errors
+			cp -a $install/usr/share/squid/errors/fr* $fs/usr/share/squid/errors
+
+			sed \
+				-e 's/TAG: visible_hostname/TAG: visible_hostname\nvisible_hostname slitaz/' \
+				-e 's|^#cache_dir ufs /var/cache 100|cache_dir ufs /var/cache/squid 256|' \
+				-e 's|^#pid_filename /var/logs|pid_filename /var/run/squid.pid|' \
+				-e "s|^coredump_dir.*|coredump_dir /var/cache/squid|" \
+				-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
+				-e 's|^# error_directory|error_directory /usr/share/squid/errors/French|' \
+				-i $fs/etc/squid/squid.conf
+
+			cat <<EOF>>$fs/etc/squid/squid.conf
 	
 cache_effective_user squid
 cache_effective_group squid
@@ -96,21 +97,21 @@
 
 include /etc/squid/conf.d/*.conf
 EOF
-		;;
-	squid-auth-helpers)
-		CAT="network|Web/ftp proxy."
-		DEPENDS="squid libldap libsasl openssl libkrb5 libcomerr3"
-		mkdir -p $fs/usr/lib/squid
-		cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid
-		;;
-	squid-langpack)
-		CAT="network|Web/ftp proxy language pack."
-		DEPENDS="squid"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/share/squid/errors $fs/usr/share
-		rm -rf $fs/usr/share/squid/errors/en*
-		rm -rf $fs/usr/share/squid/errors/fr*
-		;;
+			;;
+		squid-auth-helpers)
+			CAT="network|auth helpers"
+			DEPENDS="squid libldap libsasl openssl libkrb5 libcomerr3"
+			mkdir -p $fs/usr/lib/squid
+			cp -a $install/usr/lib/squid/*_auth* $fs/usr/lib/squid
+			;;
+		squid-langpack)
+			CAT="network|language pack"
+			DEPENDS="squid"
+			mkdir -p $fs/usr/share
+			cp -a $install/usr/share/squid/errors $fs/usr/share
+			rm -rf $fs/usr/share/squid/errors/en*
+			rm -rf $fs/usr/share/squid/errors/fr*
+			;;
 	esac
 }
 
diff -r 9cfaac585fef -r 10df65db91ad squidclamav/receipt
--- a/squidclamav/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/squidclamav/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,6 +19,7 @@
 		--libdir=/usr/lib \
 		--libexecdir=/var/www/cgi-bin \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad stardict/receipt
--- a/stardict/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/stardict/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -30,6 +30,7 @@
 		--disable-advertisement \
 		--disable-updateinfo \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad subversion/receipt
--- a/subversion/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/subversion/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		--disable-static \
 		--with-apache-libexecdir \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad sudo/receipt
--- a/sudo/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sudo/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -29,6 +29,7 @@
 		--with-passprompt="[sudo] password for %p" \
 		$SET_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad suricata/receipt
--- a/suricata/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/suricata/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="suricata"
 VERSION="1.1.1"
 CATEGORY="security"
-SHORT_DESC="Next Generation Intrusion Detection and Prevention Engine."
+SHORT_DESC="Next Generation Intrusion Detection and Prevention Engine"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.openinfosecfoundation.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://www.openinfosecfoundation.org/download/$TARBALL"
 
-DEPENDS="libhtp libcap-ng libpcap libnfnetlink libnetfilter_queue yaml pcre"
 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"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	rm -f config.h
-	./configure $CONFIGURE_ARGS \
+	./configure \
 		--enable-non-bundled-htp \
 		--enable-nfqueue \
 		--enable-af-packet \
-	&& make && make install
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	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="libhtp libcap-ng libpcap libnfnetlink libnetfilter_queue yaml pcre"
 }
diff -r 9cfaac585fef -r 10df65db91ad swfdec/receipt
--- a/swfdec/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/swfdec/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,12 +17,10 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		--enable-gtk \
 		--with-audio="alsa" \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad sylfilter/receipt
--- a/sylfilter/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sylfilter/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sylfilter"
 VERSION="0.8"
 CATEGORY="network"
-SHORT_DESC="SylFilter is a light message filter library and command-line tools."
+SHORT_DESC="SylFilter is a light message filter library and command-line tools"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://sylpheed.sraoss.jp/sylfilter/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://sylpheed.sraoss.jp/sylfilter/"
 WGET_URL="http://sylpheed.sraoss.jp/sylfilter/src/$TARBALL"
-TAGS="mail email filter spam"
 
-DEPENDS="sqlite3"
 BUILD_DEPENDS="sqlite3-dev gfortran glib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	sed -i 's|config.rpath.*|& 2>/dev/null|' configure	# hide trigger
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
-	make && make install
+COOKOPTS="skip-log-errors"
+
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+genpkg_rules() {
+	copy @std
+	DEPENDS="sqlite3"
+	TAGS="mail email filter spam"
 }
diff -r 9cfaac585fef -r 10df65db91ad sylpheed-full/receipt
--- a/sylpheed-full/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sylpheed-full/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sylpheed-full"
 VERSION="3.5.1"
@@ -6,31 +6,27 @@
 SHORT_DESC="Simple and full featured e-mail client (GPG, spell, ldap support)"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-SOURCE="sylpheed"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://sylpheed.sraoss.jp/en/"
+
+TARBALL="sylpheed-$VERSION.tar.bz2"
 WGET_URL="http://sylpheed.sraoss.jp/sylpheed/v${VERSION%.*}/$TARBALL"
-TAGS="mail internet"
-PROVIDE="sylpheed"
 
-DEPENDS="gtk+ openssl gnupg gpgme libgpg-error gtkspell enchant libldap"
 BUILD_DEPENDS="gtk+-dev openssl-dev libgpg-error-dev gtkspell-dev \
 enchant-dev openldap-dev gpgme-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--enable-ldap \
 		--disable-updatecheck \
-		$CONFIGURE_ARGS && 
-	make && make install
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk+ openssl gnupg gpgme libgpg-error gtkspell enchant libldap"
+	PROVIDE="sylpheed"
+	TAGS="mail internet"
 }
diff -r 9cfaac585fef -r 10df65db91ad sylpheed/receipt
--- a/sylpheed/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sylpheed/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,6 +19,7 @@
 		--disable-gtkspell \
 		--disable-updatecheck \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad sysbench/receipt
--- a/sysbench/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sysbench/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="sysbench"
 VERSION="20150930"
 CATEGORY="misc"
-SHORT_DESC="A modular, cross-platform and multi-threaded benchmark tool."
+SHORT_DESC="A modular, cross-platform and multi-threaded benchmark tool"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://github.com/akopytov/sysbench"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://github.com/akopytov/sysbench"
 WGET_URL="git|git://github.com/akopytov/sysbench.git"
 
-DEPENDS="libmysqlclient openssl zlib"
 BUILD_DEPENDS="git automake autoconf libtool mysql-dev openssl-dev zlib-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./autogen.sh
-	./configure --prefix=/usr $CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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="libmysqlclient openssl zlib"
 }
diff -r 9cfaac585fef -r 10df65db91ad sysfsutils/receipt
--- a/sysfsutils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/sysfsutils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="sysfsutils-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad system-tools-backends/receipt
--- a/system-tools-backends/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/system-tools-backends/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad systemd/receipt
--- a/systemd/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/systemd/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -35,6 +35,7 @@
 		--disable-ima \
 		--with-distro=other \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad szip/receipt
--- a/szip/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/szip/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,15 +13,14 @@
 
 SPLIT="szip-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		szip)  copy @std;;
 		*-dev) copy @dev;;
diff -r 9cfaac585fef -r 10df65db91ad tcpcrypt/receipt
--- a/tcpcrypt/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tcpcrypt/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,7 +17,10 @@
 
 compile_rules() {
 	./bootstrap.sh &&
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/var/run/tcpcryptd
 }
diff -r 9cfaac585fef -r 10df65db91ad telepathy-glib/receipt
--- a/telepathy-glib/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/telepathy-glib/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad tesseract-ocr/receipt
--- a/tesseract-ocr/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tesseract-ocr/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 compile_rules() {
 	./autogen.sh
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad thunar-archive-plugin/receipt
--- a/thunar-archive-plugin/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/thunar-archive-plugin/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="thunar-archive-plugin"
 VERSION="0.3.0"
@@ -6,38 +6,24 @@
 SHORT_DESC="Thunar Archive Manager plugin"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
 WGET_URL="http://archive.xfce.org/src/thunar-plugins/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-DEPENDS="thunar"
 BUILD_DEPENDS="intltool thunar-dev exo-dev libxfce4ui-dev \
- xfconf-dev startup-notification-dev"
+xfconf-dev startup-notification-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure --libexecdir=/usr/lib \
-		$CONFIGURE_ARGS && \
-	make && make install
+compile_rules() {
+	./configure \
+		--libexecdir=/usr/lib \
+		$CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/locale \
-		$fs/usr/lib/thunarx-2
-	
-	cp -a $install/usr/lib/thunarx-2/*.so* $fs/usr/lib/thunarx-2
-	cp -a $install/usr/share/icons $fs/usr/share
-	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
-	cp -a $install/usr/lib/$PACKAGE $fs/usr/lib
-	
-	# Fix perms
-	chmod 755 $fs/usr/lib/thunar-archive-plugin/*
-	
-	# Cleanup
-	rm -f $fs/usr/lib/thunarx-2/*.*a
+genpkg_rules() {
+	copy @std
+	DEPENDS="thunar"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad tidy/receipt
--- a/tidy/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tidy/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--enable-access \
 		--enable-utf16 \
 		--enable-asian &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad tiff/receipt
--- a/tiff/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tiff/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,18 +14,16 @@
 BUILD_DEPENDS="libjpeg-turbo-dev zlib-dev"
 SPLIT="tiff-apps tiff-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		tiff)
 			copy *.so*
diff -r 9cfaac585fef -r 10df65db91ad transmission-remote-gtk/receipt
--- a/transmission-remote-gtk/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/transmission-remote-gtk/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="transmission-remote-gtk"
 VERSION="1.1.1"
@@ -6,29 +6,24 @@
 SHORT_DESC="GTK remote control for the Transmission BitTorrent client"
 MAINTAINER="devl547@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://code.google.com/p/transmission-remote-gtk/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://code.google.com/p/transmission-remote-gtk/"
 WGET_URL="http://transmission-remote-gtk.googlecode.com/files/$TARBALL"
 
-DEPENDS="gtk+ json-glib curl libnotify libunique"
 BUILD_DEPENDS="gtk+-dev json-glib-dev curl-dev libnotify-dev \
 libunique-dev intltool gettext-tools"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--enable-gtk2 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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/icons $fs/usr/share
-	cp -a $install/usr/share/applications $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk+ json-glib curl libnotify libunique"
 }
diff -r 9cfaac585fef -r 10df65db91ad transmission/receipt
--- a/transmission/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/transmission/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -3,84 +3,76 @@
 PACKAGE="transmission"
 VERSION="2.92"
 CATEGORY="network"
-SHORT_DESC="Light and easy to use BitTorrent client."
+SHORT_DESC="Light and easy to use BitTorrent client"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.transmissionbt.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.xz"
-WEB_SITE="http://www.transmissionbt.com/"
 WGET_URL="https://transmission.cachefly.net/$TARBALL"
 
 BUILD_DEPENDS="gtk+3-dev openssl-dev curl-dev curl intltool \
 expat-dev gettext dbus-dev dbus-glib-dev libevent-dev wget tar"
 SPLIT="transmission-cli transmission-daemon transmission-web"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	touch third-party/miniupnp/VERSION
-	CFLAGS="$CFLAGS -fdata-sections -ffunction-sections \
-	-Wl,--gc-sections"
+	CFLAGS="$CFLAGS -fdata-sections -ffunction-sections -Wl,--gc-sections"
+
 	./configure \
-		--prefix=/usr \
 		--enable-cli \
 		--enable-lightweight \
 		$CONFIGURE_ARGS &&
-	make && make install &&
+	fix libtool &&
+	make && make install || return 1
+
 	rm -rf $install/usr/share/applications $src/macosx
 	#For gcc v4.7+
 	#cd $src/qt && qmake qtr.pro
 	#make && make INSTALL_ROOT=$install install
+
+	install -Dm644 $stuff/settings.json       $install/var/transmission-daemon/settings.json
+	install -Dm755 $stuff/transmission-daemon $install/etc/init.d/transmission-daemon
+
+	mv $install/usr/bin/transmission-gtk $install/usr/bin/transmission
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-	transmission)
-		DEPENDS="gtk+3 openssl libcurl glib dbus dbus-glib \
+		transmission)
+			copy transmission
+			DEPENDS="gtk+3 openssl libcurl glib dbus dbus-glib \
 			xorg-libXdamage libnotify libevent"
-		TAGS="torrent"
-		SUGGESTED="transmission-web transmission-cli transmission-daemon"
-		mkdir -p $fs/usr/bin $fs/usr/share/applications
-		cp -a $install/usr/bin/${PACKAGE}-gtk $fs/usr/bin/${PACKAGE}
-		;;
-	transmission-cli)
-		CAT="network|Transmission command line interface."
-		DEPENDS="transmission libcurl openssl"
-		mkdir -p $fs/usr/bin
-		cp -a $install/usr/bin/transmission-cli $fs/usr/bin
-		;;
-	transmission-daemon)
-		CAT="network|Transmission daemon and remote tool."
-		SUGGESTED="transmission-web transmission-cli"
-		DEPENDS="openssl libcurl libevent"
-		mkdir -p $fs/usr/bin \
-			$fs/etc/init.d \
-			$fs/var/transmission-daemon
-		cp -a $install/usr/bin/transmission-daemon $fs/usr/bin
-		cp -a $install/usr/bin/transmission-remote $fs/usr/bin
-		cp $stuff/settings.json $fs/var/transmission-daemon
-		cp $stuff/transmission-daemon $fs/etc/init.d
-		;;
-	transmission-web)
-		CAT="network|Transmission web interface."
-		SUGGESTED="transmission-daemon"
-		mkdir -p $fs/usr/share
-		cp -a $install/usr/share/transmission $fs/usr/share
-		rm $fs/usr/share/transmission/web/LICENSE
-		;;
+			TAGS="torrent"
+			SUGGESTED="transmission-web transmission-cli transmission-daemon"
+			;;
+		transmission-cli)
+			copy transmission-cli
+			CAT="network|command line interface"
+			DEPENDS="transmission libcurl openssl"
+			;;
+		transmission-daemon)
+			copy transmission-daemon transmission-remote settings.json
+			CAT="network|daemon and remote tool"
+			SUGGESTED="transmission-web transmission-cli"
+			DEPENDS="openssl libcurl libevent"
+			;;
+		transmission-web)
+			copy share/transmission/
+			rm $fs/usr/share/transmission/web/LICENSE
+			CAT="network|web interface"
+			SUGGESTED="transmission-daemon"
+			;;
 	esac
 }
 
 # Remove old packages name
-post_install_transmission()
-{
+post_install_transmission() {
 	rm -f "$1/usr/bin/transmission-gtk"
-	rm -f "$1/usr/share/applications/${PACKAGE}-gtk.desktop"
+	rm -f "$1/usr/share/applications/transmission-gtk.desktop"
 }
 
-post_install_transmission_web()
-{
+post_install_transmission_web() {
 	# Info message
 	echo "
 You must activate the web interface throught Transmission and then
diff -r 9cfaac585fef -r 10df65db91ad trickle/receipt
--- a/trickle/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/trickle/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,34 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="trickle"
-HASH=66551ad94ad3d8af83e1e4422804676ac8762f47	# 13/1/2015
+HASH="66551ad94ad3d8af83e1e4422804676ac8762f47"	# 13/1/2015
 VERSION="${HASH:0:7}"
 CATEGORY="network"
 SHORT_DESC="A portable lightweight userspace bandwidth shaper"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="https://github.com/mariusae/trickle"
+
 TARBALL="$PACKAGE-$VERSION.zip"
-WEB_SITE="https://github.com/mariusae/trickle"
 WGET_URL="https://github.com/mariusae/trickle/archive/$HASH.zip"
 
-DEPENDS="libevent"
 BUILD_DEPENDS="libevent-dev wget automake autoconf libtool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	touch libtrickle.so
 	autoreconf -if
-	./configure --prefix=/usr \
-		$CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/trickle $fs/usr/lib
+genpkg_rules() {
+	copy @std
+	DEPENDS="libevent"
 }
diff -r 9cfaac585fef -r 10df65db91ad tslib/receipt
--- a/tslib/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tslib/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 
 	./autogen.sh &&
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad tumbler/receipt
--- a/tumbler/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/tumbler/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -27,6 +27,7 @@
 		--disable-debug \
 		--enable-gtk-doc \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad ucarp/receipt
--- a/ucarp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/ucarp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,34 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="ucarp"
 VERSION="1.5.2"
 CATEGORY="network"
-SHORT_DESC="Portable implementation of the CARP protocol."
+SHORT_DESC="Portable implementation of the CARP protocol"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
+WEB_SITE="http://www.ucarp.org/project/ucarp"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.ucarp.org/project/ucarp"
 WGET_URL="http://download.pureftpd.org/pub/$PACKAGE/$TARBALL"
-TAGS="High availability HA"
 
 BUILD_DEPENDS="libpcap-dev gfortran gettext"
-DEPENDS="libpcap"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
+compile_rules() {
 	sed -i 's/\$(SHELL) @install_sh@/@install_sh@/' po/Makefile.in*
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		--localstatedir=/var \
-	$CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	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
+genpkg_rules() {
+	copy @std
+	DEPENDS="libpcap"
+	TAGS="High availability HA"
 }
diff -r 9cfaac585fef -r 10df65db91ad ucl/receipt
--- a/ucl/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/ucl/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,24 +14,19 @@
 BUILD_DEPENDS="gfortran"
 SPLIT="ucl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--enable-shared \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make && make install || return 1
 
-	docdir=$install/usr/share/doc/ucl-$VERSION
-	mkdir -p $docdir
-	cp AUTHORS NEWS README THANKS TODO $docdir
+	cook_pick_docs AUTHORS NEWS README THANKS TODO $docdir
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
-		ucl) copy @std;;
+		ucl)   copy @std;;
 		*-dev) copy @dev;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad udev/receipt
--- a/udev/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udev/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -7,7 +7,6 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.freedesktop.org/software/systemd/man/udev.html"
-BUILD_WARNING="Install new udev package and rebuild hal"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kernel/hotplug/$TARBALL"
@@ -18,6 +17,8 @@
 libgudev-dev pcre-dev xz-dev util-linux-uuid-dev"
 SPLIT="udev-dev"
 
+BUILD_WARNING="Install new udev package and rebuild hal"
+
 compile_rules() {
 	case "$ARCH" in
 		arm*) # ARM Hack
@@ -45,6 +46,7 @@
 		--with-usb-ids-path=/usr/share/misc/usb.ids.gz \
 		--with-systemdsystemunitdir=no \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
@@ -79,11 +81,7 @@
 			DEPENDS="util-linux-blkid pciids usbids acl kmod"
 			;;
 		*-dev)
-			mkdir -p $fs/lib $fs/usr/lib/pkgconfig $fs/usr/include
-			cp -a $install/lib/libudev*a $fs/lib
-			cp -a $install/lib/pkgconfig/libudev.pc $fs/usr/lib/pkgconfig
-			cp -a $install/usr/share/pkgconfig/* $fs/usr/lib/pkgconfig
-			cp -a $install/usr/include/libudev.h $fs/usr/include
+			copy @dev
 			;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad udevil/receipt
--- a/udevil/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udevil/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,21 +13,18 @@
 
 BUILD_DEPENDS="intltool eudev-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
 		--disable-systemd \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make && make install || return 1
 
 	# Must be suid root
 	chmod +s $install/usr/bin/udevil
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="eudev glib   acl"
 	SUGGESTED="util-linux-mount util-linux-misc"
diff -r 9cfaac585fef -r 10df65db91ad udftools/receipt
--- a/udftools/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udftools/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 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/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://linux-udf.sourceforge.net/"
 WGET_URL="$SF_MIRROR/linux-udf/$TARBALL"
 
-DEPENDS="ncurses readline"
 BUILD_DEPENDS="ncurses-dev readline-dev bash"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's|^inline|extern &|' include/libudffs.h
 	sed -i 's/(char\*)spm += /spm = (char*)spm + /' wrudf/wrudf.c
 	sed -i 's/<stdio.h>/&\n#include <limits.h>/' \
 		cdrwtool/cdrwtool.c pktsetup/pktsetup.c
-	./configure --prefix=/usr &&
+
+	./configure &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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 readline"
 }
diff -r 9cfaac585fef -r 10df65db91ad udisks/receipt
--- a/udisks/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udisks/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -23,6 +23,7 @@
 		--disable-remote-access \
 		--disable-gtk-doc-html \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
@@ -49,8 +50,7 @@
 			util-linux-mount lsof"
 			;;
 		*-dev)
-			mkdir -p $fs/usr/share
-			cp -a $install/usr/share/pkgconfig $fs/usr/share
+			copy @dev
 			;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad udisks2-kitless/receipt
--- a/udisks2-kitless/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udisks2-kitless/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,6 +20,7 @@
 		--with-udevdir=/etc/udev \
 		--with-systemdsystemunitdir=no \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad udisks2/receipt
--- a/udisks2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/udisks2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		--disable-static \
 		--enable-fhs-media \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad unbound/receipt
--- a/unbound/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/unbound/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -28,6 +28,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad unixODBC/receipt
--- a/unixODBC/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/unixODBC/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 	./configure \
 		--disable-gui \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad unshield/receipt
--- a/unshield/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/unshield/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,34 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="unshield"
 VERSION="0.5"
 CATEGORY="utilities"
-SHORT_DESC="Extract files from InstallShield CAB archive."
+SHORT_DESC="Extract files from InstallShield CAB archive"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://sourceforge.net/projects/synce/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://kent.dl.sourceforge.net/sourceforge/synce/"
-WGET_URL="http://kent.dl.sourceforge.net/sourceforge/synce/$TARBALL"
-TAGS="windows exe cab"
+WGET_URL="$SF_MIRROR/synce/$TARBALL"
 
-DEPENDS="zlib"
 BUILD_DEPENDS="zlib-dev mysql-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i 's/_BSD_SOURCE/_DEFAULT_SOURCE/' */*.c
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
+genpkg_rules() {
+	copy @std
+	DEPENDS="zlib"
+	TAGS="windows exe cab"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad upower/receipt
--- a/upower/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/upower/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		--enable-deprecated \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad usbredir/receipt
--- a/usbredir/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/usbredir/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,9 +15,8 @@
 SPLIT="usbredir-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad util-linux/receipt
--- a/util-linux/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/util-linux/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -35,6 +35,7 @@
 		--disable-static \
 		--without-systemd \
 		--without-systemdsystemunitdir &&
+	fix libtool &&
 	make && make install || exit 1
 
 	install -Dm644 $stuff/cfdisk.desktop \
diff -r 9cfaac585fef -r 10df65db91ad v4l-utils/receipt
--- a/v4l-utils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/v4l-utils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make -j1 install
 }
@@ -25,13 +26,11 @@
 		v4l-utils)
 			copy @std
 			DEPENDS="eudev libjpeg-turbo"
-			PROVIDE="libv4l"
 			TAGS="webcam video"
 			;;
 		*-dev)
 			copy @dev
 			DEPENDS="v4l-utils eudev-dev libjpeg-turbo-dev"
-			PROVIDE="libv4l-dev"
 			;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad v4l4j/receipt
--- a/v4l4j/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/v4l4j/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -11,8 +11,8 @@
 WGET_URL="https://github.com/yuripourre/v4l4j/releases/download/v0.9.1/$TARBALL"
 TAGS="java"
 
-DEPENDS="libv4l jpeg icedtea6-jre"
-BUILD_DEPENDS="libv4l-dev jpeg-dev apache-ant icedtea6-jdk"
+DEPENDS="v4l-utils jpeg icedtea6-jre"
+BUILD_DEPENDS="v4l-utils-dev jpeg-dev apache-ant icedtea6-jdk"
 
 compile_rules()
 {
diff -r 9cfaac585fef -r 10df65db91ad vala/receipt
--- a/vala/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vala/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,10 @@
 BUILD_DEPENDS="glib-dev libxslt-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad vanessa_adt/receipt
--- a/vanessa_adt/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vanessa_adt/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,11 +15,8 @@
 SPLIT="vanessa_adt-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad vanessa_logger/receipt
--- a/vanessa_logger/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vanessa_logger/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,9 @@
 
 compile_rules() {
 	./configure &&
-	make && make DESTDIR=$DESTDIR install
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad vanessa_socket/receipt
--- a/vanessa_socket/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vanessa_socket/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,11 +15,8 @@
 SPLIT="vanessa_socket-dev"
 
 compile_rules() {
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad vcdimager/receipt
--- a/vcdimager/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vcdimager/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -6,8 +6,9 @@
 SHORT_DESC="vcd tools"
 MAINTAINER="jozee@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.vcdimager.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.vcdimager.org/" 
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 
 BUILD_DEPENDS="libcdio libcdio-dev libxml2-dev popt-dev gfortran"
@@ -15,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad vde2/receipt
--- a/vde2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vde2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 	./configure \
 		--libexecdir=/usr/lib/$PACKAGE \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad verbiste/receipt
--- a/verbiste/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/verbiste/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,30 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="verbiste"
 VERSION="0.1.33"
 CATEGORY="office"
-SHORT_DESC="Verbiste is a French conjugation system."
+SHORT_DESC="Verbiste is a French conjugation system"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://perso.b2b2c.ca/sarrazip/dev/verbiste.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://perso.b2b2c.ca/sarrazip/dev/verbiste.html"
 WGET_URL="http://perso.b2b2c.ca/sarrazip/dev/$TARBALL"
 
-DEPENDS="gtk+ libxml2"
 BUILD_DEPENDS="gtk+-dev libxml2-dev perl-xml-parser"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure $CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install || return 1
+
+	mkdir -p $install/usr/share/pixmaps/
+	cp $src/src/gtk/verbiste.png $install/usr/share/pixmaps/
 }
 
-# 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/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/share/verbiste-* $fs/usr/share
+genpkg_rules() {
+	copy @std
 	rm $fs/usr/share/verbiste-*/COPYING
-	cp $src/src/gtk/verbiste.png $fs/usr/share/pixmaps
+	DEPENDS="gtk+ libxml2"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad viewnior/receipt
--- a/viewnior/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/viewnior/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -19,12 +19,13 @@
 	mkdir -p $src/m4
 
 	autoreconf -fi
-	./configure $CONFIGURE_ARGS && make $MAKEFLAGS install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make $MAKEFLAGS install
 }
 
 genpkg_rules() {
-	copy viewnior *.ui
-	cook_copy_icons
+	copy viewnior *.ui @ico
 	DEPENDS="atk bzlib cairo exiv2 fontconfig freetype gcc-lib-base gdk-pixbuf \
 	glib glibc-base gtk+ harfbuzz libffi libpng16 xorg-libxcb libxml2 pango \
 	pcre xorg-pixman xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \
diff -r 9cfaac585fef -r 10df65db91ad volume_key/receipt
--- a/volume_key/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/volume_key/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 	autoreconf -fiv &&
 
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad vorbis-tools/receipt
--- a/vorbis-tools/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vorbis-tools/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,30 +1,28 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vorbis-tools"
 VERSION="1.4.0"
 CATEGORY="multimedia"
-SHORT_DESC="Vorbis encoder, decoder and tiny tools."
+SHORT_DESC="Vorbis encoder, decoder and tiny tools"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.vorbis.com/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.vorbis.com/"
 WGET_URL="http://downloads.xiph.org/releases/vorbis/$TARBALL"
-TAGS="multimedia ogg"
 
-DEPENDS="libogg libvorbis flac libao libcurl speex openssl"
 BUILD_DEPENDS="libogg-dev libvorbis-dev flac-dev libao-dev curl-dev speex-dev \
 openssl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	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="libogg libvorbis flac libao libcurl speex openssl"
+	TAGS="multimedia ogg"
 }
diff -r 9cfaac585fef -r 10df65db91ad vte-gtk2/receipt
--- a/vte-gtk2/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vte-gtk2/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -7,6 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="https://www.gnome.org/"
+LFS="http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html" # (for gtk+3 version)
 
 TARBALL="vte-$VERSION.tar.xz"
 WGET_URL="$GNOME_MIRROR/vte/0.28/$TARBALL"
@@ -16,8 +17,6 @@
 SPLIT="vte-gtk2-terminal vte-gtk2-python vte-gtk2 vte-gtk2-dev"
 
 compile_rules() {
-	# http://www.linuxfromscratch.org/blfs/view/stable/gnome/vte.html (for gtk+3 version)
-
 	case "$ARCH" in
 		arm*) ARCH_ARGS="--enable-introspection=no";;
 		*)    ARCH_ARGS="--enable-introspection=yes";;
@@ -27,6 +26,7 @@
 		--disable-static \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make -j1 &&
 	make install
 
diff -r 9cfaac585fef -r 10df65db91ad vzctl/receipt
--- a/vzctl/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/vzctl/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="vzctl"
 VERSION="3.0.25.1"
@@ -6,18 +6,14 @@
 SHORT_DESC="OpenVZ containers control utility"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://wiki.openvz.org/Main_Page"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://wiki.openvz.org/Main_Page"
 WGET_URL="http://download.openvz.org/utils/${PACKAGE}/${VERSION}/src/${TARBALL}"
 
-DEPENDS="udev bash procmail bridge-utils logrotate tar gzip"
 BUILD_DEPENDS="sed"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	
+compile_rules() {
 	# Apply patches
 	while read patch_file; do
 		if [ -f done.$patch_file ]; then
@@ -30,35 +26,36 @@
 	done <<EOT
 vzctl-${VERSION}-Makefile.u
 EOT
+
 	./configure \
-		--prefix=/usr \
-		--localstatedir=/var \
 		--enable-bashcomp \
 		--enable-logrotate \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install && make DESTDIR=$DESTDIR install-slitaz
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install &&
+	make DESTDIR=$DESTDIR install-slitaz
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib \
+genpkg_rules() {
+	mkdir -p \
+		$fs/usr/lib \
 		$fs/usr/share
-		
+
 	cp -a $install/usr/sbin $fs/usr
 	cp -a $install/usr/lib/vzctl $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/etc $fs/
 	cp -a $install/var/ $fs/
 	cp -a $install/vz/ $fs/
-	
+
 	# fix permissions
 	chmod 0755 $fs/usr/lib/vzctl/scripts/v*
 	chmod 0755 $fs/usr/sbin/*
 	chmod 0755 $fs/etc/init.d/vz
-	
+
 	# Copy slitaz script and config
-	cp -a stuff/slitaz.conf $fs/etc/vz/dists
-	cp -a stuff/slitaz-*.sh $fs/etc/vz/dists/scripts
+	cp -a $stuff/slitaz.conf $fs/etc/vz/dists
+	cp -a $stuff/slitaz-*.sh $fs/etc/vz/dists/scripts
+	DEPENDS="udev bash procmail bridge-utils logrotate tar gzip"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad waterline-plugin-multiload/receipt
--- a/waterline-plugin-multiload/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/waterline-plugin-multiload/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -30,6 +30,7 @@
 		--with-lxpanel \
 		--without-xfce4 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad waterline/receipt
--- a/waterline/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/waterline/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,8 @@
 # libsde-utils-dev libsde-utils-x11-dev libsde-utils-jansson-dev libsde-utils-gtk-dev
 SPLIT="waterline-dev"
 
+COOKOPTS="!menus"
+
 compile_rules() {
 	rm -rf $src/.git
 	sed 's/lxsession-logout/tazbox logout/' -i src/defaultapplications.c
@@ -27,21 +29,17 @@
 		--disable-maintainer-mode \
 		--enable-silent-rules \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
-	make install
+	make install || return 1
+
+	install -Dm644 $stuff/waterline.desktop $install/etc/xdg/autostart/waterline.desktop
 }
 
 genpkg_rules() {
 	case $PACKAGE in
 		waterline)
 			copy @std
-			mkdir -p $fs/etc/xdg/autostart
-			cat > $fs/etc/xdg/autostart/waterline.desktop <<EOT
-[Desktop Entry]
-Type=Application
-Name=Waterline Desktop panel
-Exec=waterline
-EOT
 			DEPENDS="libsde-utils-jansson libsde-utils-x11"
 			TAGS="desktop panel taskbar"
 			;;
diff -r 9cfaac585fef -r 10df65db91ad waterline/stuff/waterline.desktop
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/waterline/stuff/waterline.desktop	Thu Apr 19 13:15:41 2018 +0300
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Application
+Name=Waterline Desktop panel
+Exec=waterline
diff -r 9cfaac585fef -r 10df65db91ad wavpack/receipt
--- a/wavpack/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wavpack/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,17 +13,16 @@
 
 SPLIT="wavpack-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		wavpack) copy @std;;
-		*-dev) copy @dev;;
+		*-dev)   copy @dev;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad wayland/receipt
--- a/wayland/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wayland/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,10 +17,11 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--disable-documentation \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad webkit-r/receipt
--- a/webkit-r/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/webkit-r/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -8,7 +8,7 @@
 LICENSE="BSD LGPL"
 WEB_SITE="http://webkit.org/"
 
-TARBALL="WebKit-r${VERSION}.tar.bz2"
+TARBALL="WebKit-r$VERSION.tar.bz2"
 WGET_URL="http://nightly.webkit.org/files/trunk/src/$TARBALL"
 
 BUILD_DEPENDS="icu icu-dev gperf libxslt-dev glib-dev autoconf automake \
@@ -22,11 +22,11 @@
 	cd $src
 	patch -p0 < $stuff/bison26.u
 	patch -p1 < $stuff/CSSParser.cpp.u
+
 	./autogen.sh \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
 		--with-gtk=2.0 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
 }
@@ -34,8 +34,7 @@
 genpkg_rules() {
 	case $PACKAGE in
 		webkit-r)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/*.so* $fs/usr/lib
+			copy @std
 			DEPENDS="libxslt expat gtk+ icu jpeg libcurl libxml2 openssl \
 			sqlite3 xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
 			xorg-libXcomposite xorg-libXcursor xorg-libXdmcp xorg-libXext \
@@ -43,10 +42,7 @@
 			xorg-libXt xorg-libXdamage gcc-lib-base"
 			;;
 		*-dev)
-			mkdir -p $fs/usr/lib
-			cp -a $install/usr/lib/*.*a $fs/usr/lib
-			cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-			cp -a $install/usr/include $fs/usr
+			copy @dev
 			;;
 	esac
 }
diff -r 9cfaac585fef -r 10df65db91ad wifidog/receipt
--- a/wifidog/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wifidog/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,33 +1,31 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="wifidog"
 VERSION="1.1.5"
 CATEGORY="network"
-SHORT_DESC="Captive portal solution for hotspot, gateway side."
+SHORT_DESC="Captive portal solution for hotspot, gateway side"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://dev.wifidog.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
-CONFIG_FILES="/etc/wifidog.conf"
 
-# 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 &&
+	fix libtool &&
 	make &&
-	make DESTDIR=$DESTDIR install
+	make DESTDIR=$DESTDIR install || return 1
+
+	install -Dm644 $src/wifidog.conf           $install/etc/wifidog.conf
+	install -Dm755 $src/scripts/init.d/wifidog $install/etc/init.d/wifidog
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/lib $fs/etc/init.d
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp $src/wifidog.conf $fs/etc
-	cp $src/scripts/init.d/wifidog $fs/etc/init.d
+genpkg_rules() {
+	copy @std
+	CONFIG_FILES="/etc/wifidog.conf"
 }
-
diff -r 9cfaac585fef -r 10df65db91ad wimlib/receipt
--- a/wimlib/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wimlib/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,10 @@
 SPLIT="wimlib-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad wine/receipt
--- a/wine/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wine/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,7 +13,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 libv4l-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
+jpeg-dev libpng16-dev v4l-utils-dev gnutls-dev libgphoto2-dev xorg-dev zlib-dev"
 SPLIT="wine-dev"
 
 compile_rules() {
diff -r 9cfaac585fef -r 10df65db91ad wireshark/receipt
--- a/wireshark/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wireshark/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,13 +16,12 @@
 
 compile_rules() {
 	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
 		--enable-setuid-install \
 		--with-qt=no \
 		--with-gtk2=yes \
 		--with-gtk3=no \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	sed -i 's/mozilla/browser/' config.h &&
 	make $MAKEFLAGS &&
 	make install
diff -r 9cfaac585fef -r 10df65db91ad wv/receipt
--- a/wv/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wv/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,11 +16,10 @@
 
 compile_rules() {
 	sed -i 's|.ac_install_sh -d|mkdir -p|' configure
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make 
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
 	make DESTDIR=$DESTDIR install
 }
 
diff -r 9cfaac585fef -r 10df65db91ad wxdfast/receipt
--- a/wxdfast/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/wxdfast/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,37 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="wxdfast"
 VERSION="0.6.0"
 CATEGORY="network"
-SHORT_DESC="Download Manager."
+SHORT_DESC="Download Manager"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://dfast.sourceforge.net/index.html"
+
 TARBALL="${PACKAGE}_${VERSION}.tar.gz"
-WEB_SITE="http://dfast.sourceforge.net/index.html"
 WGET_URL="http://heanet.dl.sourceforge.net/sourceforge/dfast/$TARBALL"
 
-DEPENDS="wxWidgets28 xorg-libXdamage xorg-libXxf86vm"
 BUILD_DEPENDS="wxWidgets28-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 &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr \
-		$fs/usr/share \
-		$fs/usr/share/locale
-
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/wxdfast $fs/usr/share
-	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
-	cp -a $install/usr/share/pixmaps $fs/usr/share
-	cp -a $install/usr/share/applications $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="wxWidgets28 xorg-libXdamage xorg-libXxf86vm"
 }
diff -r 9cfaac585fef -r 10df65db91ad xapian/receipt
--- a/xapian/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xapian/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,15 +14,14 @@
 BUILD_DEPENDS="perl zlib-dev util-linux-uuid-dev"
 SPLIT="xapian-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		xapian)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad xarchiver/receipt
--- a/xarchiver/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xarchiver/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,7 +14,10 @@
 BUILD_DEPENDS="gtk+-dev intltool"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 
 	mkdir -p $install/var/www/cgi-bin $install/usr/share/doc/xarchiver/html
 	cp $stuff/xarchiver.cgi $install/var/www/cgi-bin
@@ -25,8 +28,7 @@
 }
 
 genpkg_rules() {
-	copy @std
-	rm -r $fs/usr/share/icons; cook_copy_icons
+	copy @std @ico
 	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango"
 	# binutils for ar; busybox also contains gzip & cpio; rar is get-rar;
 	# gtar is absent
diff -r 9cfaac585fef -r 10df65db91ad xchat-plugin/receipt
--- a/xchat-plugin/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xchat-plugin/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xchat-plugin"
 VERSION="2.8.8"
@@ -7,18 +7,14 @@
 MAINTAINER="lenios@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xchat.org/"
-SOURCE="xchat"
-TARBALL="$SOURCE-$VERSION.tar.bz2"
+
+TARBALL="xchat-$VERSION.tar.bz2"
 WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
-PROVIDE="xchat"
 
-DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
 BUILD_DEPENDS="gtk+-dev dbus-dev openssl shared-mime-info \
 gettext-tools perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
 		-e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
 		-e 's|glib/gutils.h|glib.h|' src/common/xchat.h
@@ -26,21 +22,17 @@
 	sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
 
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		--disable-tcl \
 		--enable-spell=static \
 		--enable-ipv6 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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/dbus-1 $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
+	PROVIDE="xchat"
 }
diff -r 9cfaac585fef -r 10df65db91ad xchat/receipt
--- a/xchat/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xchat/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xchat"
 VERSION="2.8.8"
@@ -7,16 +7,14 @@
 MAINTAINER="lenios@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.xchat.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="http://www.xchat.org/files/source/${VERSION%.*}/$TARBALL"
 
-DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
 BUILD_DEPENDS="gtk+-dev dbus-dev openssl-dev shared-mime-info \
 gettext-tools perl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	sed -i -e 's|glib/gslist.h|glib.h|' -e 's|glib/giochannel.h|glib.h|' \
 		-e 's|glib/glist.h|glib.h|' -e 's|glib/gstrfuncs.h|glib.h|' \
 		-e 's|glib/gutils.h|glib.h|' src/common/xchat.h
@@ -24,22 +22,17 @@
 	sed -i 's|glib/gmarkup.h|glib.h|' src/common/util.c
 
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		--disable-plugin \
 		--disable-tcl \
 		--enable-spell=static \
 		--enable-ipv6 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR 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/dbus-1 $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="gtk+ dbus openssl gettext-base dbus-glib xorg-libXdamage"
 }
diff -r 9cfaac585fef -r 10df65db91ad xerces-c/receipt
--- a/xerces-c/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xerces-c/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make $MAKEFLAGS &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xfce-utils/receipt
--- a/xfce-utils/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xfce-utils/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 		--with-browser=browser \
 		--with-terminal=xterm \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 9cfaac585fef -r 10df65db91ad xfce4-appfinder/receipt
--- a/xfce4-appfinder/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xfce4-appfinder/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 	./configure \
 		--disable-debug \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xfce4-dev-tools/receipt
--- a/xfce4-dev-tools/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xfce4-dev-tools/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xfsdump/receipt
--- a/xfsdump/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xfsdump/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,14 +13,13 @@
 
 BUILD_DEPENDS="libtool gettext util-linux-uuid-dev xfsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	rm /bin/rpm # busybox rpm is useless here
 
 	./configure \
 		CFLAGS=-D_FILE_OFFSET_BITS=64 \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make && make install
 
 	# change absolute symlinks to relative ones
@@ -28,9 +27,7 @@
 	ln -sf ../../sbin/xfsrestore $install/usr/sbin/xfsrestore
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	copy @std
 	DEPENDS="attr ncurses util-linux-uuid xfsprogs"
 }
diff -r 9cfaac585fef -r 10df65db91ad xfsprogs/receipt
--- a/xfsprogs/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xfsprogs/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,31 +14,29 @@
 BUILD_DEPENDS="gettext util-linux-uuid-dev readline-dev"
 SPLIT="xfsprogs-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/xfsprogs.html
 	rm /bin/rpm # busybox rpm useless here
+
+	fix libtool &&
 	make \
 		DEBUG=-DNDEBUG \
 		INSTALL_USER=root \
 		INSTALL_GROUP=root \
 		LOCAL_CONFIGURE_OPTIONS="--enable-readline" &&
 	make PKG_DOC_DIR=/usr/share/doc/xfsprogs-$VERSION install &&
-	make PKG_DOC_DIR=/usr/share/doc/xfsprogs-$VERSION install-dev &&
+	make PKG_DOC_DIR=/usr/share/doc/xfsprogs-$VERSION install-dev || return 1
 
 	rm -fv \
 		$install/usr/lib/libhandle.a \
 		$install/lib/libhandle.a \
 		$install/lib/libhandle.la \
-		$install/lib/libhandle.so &&
-	ln -sfv ../../lib/libhandle.so.1 $install/usr/lib/libhandle.so &&
+		$install/lib/libhandle.so
+	ln -sfv ../../lib/libhandle.so.1 $install/usr/lib/libhandle.so
 	sed -i "s@libdir='/lib@libdir='/usr/lib@" $install/usr/lib/libhandle.la
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		xfsprogs)
 			copy @std
diff -r 9cfaac585fef -r 10df65db91ad xine-lib/receipt
--- a/xine-lib/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xine-lib/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -28,9 +28,6 @@
 	sed -i 's/grep -x/grep/' configure
 	CPPFLAGS="$CPPFLAGS -DHAVE_NANO_SLEEP" \
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		--with-freetype \
 		--with-xcb \
 		--without-jack \
@@ -45,6 +42,7 @@
 		--disable-vcd \
 		--disable-musepack \
 		$CONFIGURE_ARGS $ARCH_ARGS &&
+	fix libtool &&
 	make && make install
 }
 
diff -r 9cfaac585fef -r 10df65db91ad xine-plugin/receipt
--- a/xine-plugin/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xine-plugin/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,7 +15,9 @@
 
 compile_rules() {
 	mkdir -p $DESTDIR/root/.mozilla/plugins
+
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad xinput-calibrator/receipt
--- a/xinput-calibrator/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xinput-calibrator/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xinput-calibrator"
 VERSION="0.7.5"
@@ -6,27 +6,21 @@
 SHORT_DESC="A generic touchscreen calibration program for X.Org"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-SOURCE="xinput_calibrator"
-TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.freedesktop.org/wiki/Software/xinput_calibrator/"
+
+TARBALL="xinput_calibrator-$VERSION.tar.gz"
 WGET_URL="http://cloud.github.com/downloads/tias/xinput_calibrator/$TARBALL"
 
-DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXext-dev xorg-libXi-dev xorg-inputproto"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		$CONFIGURE_ARGS &&
-	make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share/pixmaps
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/pixmaps/*.xpm \
-		$fs/usr/share/pixmaps
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11"
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-libFS/receipt
--- a/xorg-libFS/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-libFS/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-libXfont/receipt
--- a/xorg-libXfont/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-libXfont/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,10 +14,10 @@
 BUILD_DEPENDS="bzip2-dev freetype-dev zlib-dev xorg-xtrans xorg-fontsproto \
 xorg-libfontenc-dev"
 SPLIT="xorg-libXfont-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-libXp/receipt
--- a/xorg-libXp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-libXp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,10 +14,10 @@
 BUILD_DEPENDS="xorg-util-macros xorg-libX11-dev xorg-libXext-dev \
 xorg-xextproto xorg-libXau-dev xorg-printproto"
 SPLIT="xorg-libXp-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-liblbxutil/receipt
--- a/xorg-liblbxutil/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-liblbxutil/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,10 +13,10 @@
 
 BUILD_DEPENDS="gfortran xorg-xextproto xorg-xproto zlib-dev"
 SPLIT="xorg-liblbxutil-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-libpciaccess/receipt
--- a/xorg-libpciaccess/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-libpciaccess/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-libxshmfence/receipt
--- a/xorg-libxshmfence/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-libxshmfence/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-pixman/receipt
--- a/xorg-pixman/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-pixman/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,10 +13,10 @@
 
 BUILD_DEPENDS="libpng16-dev"
 SPLIT="xorg-pixman-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-server-light/receipt
--- a/xorg-server-light/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-server-light/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -67,6 +67,7 @@
 		--with-serverconfig-path=/etc/X11 \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xcb-util/receipt
--- a/xorg-xcb-util/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xcb-util/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-acecad/receipt
--- a/xorg-xf86-input-acecad/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-acecad/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-elographics/receipt
--- a/xorg-xf86-input-elographics/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-elographics/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-fpit/receipt
--- a/xorg-xf86-input-fpit/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-fpit/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-hyperpen/receipt
--- a/xorg-xf86-input-hyperpen/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-hyperpen/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-joystick/receipt
--- a/xorg-xf86-input-joystick/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-joystick/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -18,6 +18,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-keyboard/receipt
--- a/xorg-xf86-input-keyboard/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-keyboard/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-libinput/receipt
--- a/xorg-xf86-input-libinput/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-libinput/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,10 +13,10 @@
 
 BUILD_DEPENDS="xorg-server-dev libinput-dev mtdev-dev libevdev-dev"
 SPLIT="xorg-xf86-input-libinput-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-mouse/receipt
--- a/xorg-xf86-input-mouse/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-mouse/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-mutouch/receipt
--- a/xorg-xf86-input-mutouch/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-mutouch/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-penmount/receipt
--- a/xorg-xf86-input-penmount/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-penmount/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-vmmouse/receipt
--- a/xorg-xf86-input-vmmouse/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-vmmouse/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-input-void/receipt
--- a/xorg-xf86-input-void/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-input-void/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-amdgpu/receipt
--- a/xorg-xf86-video-amdgpu/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-amdgpu/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-ast/receipt
--- a/xorg-xf86-video-ast/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-ast/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-ati/receipt
--- a/xorg-xf86-video-ati/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-ati/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-chips/receipt
--- a/xorg-xf86-video-chips/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-chips/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-cirrus/receipt
--- a/xorg-xf86-video-cirrus/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-cirrus/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-fbturbo/receipt
--- a/xorg-xf86-video-fbturbo/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-fbturbo/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -22,6 +22,7 @@
 compile_rules() {
 	autoreconf -vi
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-geode/receipt
--- a/xorg-xf86-video-geode/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-geode/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -13,10 +13,10 @@
 
 BUILD_DEPENDS="xorg-server-dev"
 SPLIT="xorg-xf86-video-geode-dev"
-PKG_RULE="std-dev"
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-glint/receipt
--- a/xorg-xf86-video-glint/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-glint/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-i740/receipt
--- a/xorg-xf86-video-i740/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-i740/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-intel/receipt
--- a/xorg-xf86-video-intel/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-intel/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -23,6 +23,7 @@
 		--enable-kms-only \
 		--enable-uxa \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-mach64/receipt
--- a/xorg-xf86-video-mach64/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-mach64/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-neomagic/receipt
--- a/xorg-xf86-video-neomagic/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-neomagic/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-nouveau/receipt
--- a/xorg-xf86-video-nouveau/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-nouveau/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-nv/receipt
--- a/xorg-xf86-video-nv/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-nv/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-omap/receipt
--- a/xorg-xf86-video-omap/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-omap/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-openchrome/receipt
--- a/xorg-xf86-video-openchrome/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-openchrome/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-qxl/receipt
--- a/xorg-xf86-video-qxl/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-qxl/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-r128/receipt
--- a/xorg-xf86-video-r128/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-r128/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-rendition/receipt
--- a/xorg-xf86-video-rendition/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-rendition/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-s3virge/receipt
--- a/xorg-xf86-video-s3virge/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-s3virge/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-savage/receipt
--- a/xorg-xf86-video-savage/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-savage/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-siliconmotion/receipt
--- a/xorg-xf86-video-siliconmotion/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-siliconmotion/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-sis/receipt
--- a/xorg-xf86-video-sis/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-sis/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-sisusb/receipt
--- a/xorg-xf86-video-sisusb/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-sisusb/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-suncg14/receipt
--- a/xorg-xf86-video-suncg14/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-suncg14/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-suncg3/receipt
--- a/xorg-xf86-video-suncg3/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-suncg3/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-suncg6/receipt
--- a/xorg-xf86-video-suncg6/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-suncg6/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-sunffb/receipt
--- a/xorg-xf86-video-sunffb/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-sunffb/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-sunleo/receipt
--- a/xorg-xf86-video-sunleo/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-sunleo/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-suntcx/receipt
--- a/xorg-xf86-video-suntcx/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-suntcx/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-tdfx/receipt
--- a/xorg-xf86-video-tdfx/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-tdfx/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-trident/receipt
--- a/xorg-xf86-video-trident/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-trident/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xorg-xf86-video-vmware/receipt
--- a/xorg-xf86-video-vmware/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xorg-xf86-video-vmware/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -17,6 +17,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad xosd/receipt
--- a/xosd/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xosd/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -1,31 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="xosd"
 VERSION="2.2.14"
 CATEGORY="x-window"
-SHORT_DESC="Light on screen display tool."
+SHORT_DESC="Light on screen display tool"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://sourceforge.net/projects/libxosd/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://sourceforge.net/projects/libxosd/"
 WGET_URL="$SF_MIRROR/project/libxosd/libxosd/$PACKAGE-$VERSION/$TARBALL"
 
-DEPENDS="xorg-libX11"
 BUILD_DEPENDS="xorg-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-	./configure $CONFIGURE_ARGS \
-		make && make install
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share
-	cp -a $install/usr/bin/osd_cat $fs/usr/bin
-	cp -a $install/usr/lib/*.so* $fs/usr/lib
-	cp -a $install/usr/share/xosd $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="xorg-libX11"
 }
diff -r 9cfaac585fef -r 10df65db91ad xrdp/receipt
--- a/xrdp/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xrdp/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -16,6 +16,7 @@
 compile_rules() {
 	./bootstrap &&
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install || return 1
 
diff -r 9cfaac585fef -r 10df65db91ad xsane/receipt
--- a/xsane/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xsane/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -10,7 +10,7 @@
 WEB_SITE="http://www.xsane.org/"
 WGET_URL="http://www.xsane.org/download/$TARBALL"
 
-DEPENDS="sane-backends gtk+ tiff xorg-libXdamage lcms libv4l libltdl"
+DEPENDS="sane-backends gtk+ tiff xorg-libXdamage lcms v4l-utils libltdl"
 BUILD_DEPENDS="gtk+-dev sane-backends-dev lcms-dev udev"
 
 # Rules to configure and make the package.
diff -r 9cfaac585fef -r 10df65db91ad xz/receipt
--- a/xz/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/xz/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -20,7 +20,9 @@
 		--disable-static \
 		--enable-small \
 		$CONFIGURE_ARGS &&
-	make && make install || return 1
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	mkdir -p $install/bin $install/lib
 	for i in lzma unlzma lzcat xz unxz xzcat; do
diff -r 9cfaac585fef -r 10df65db91ad yaml/receipt
--- a/yaml/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/yaml/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,7 +14,10 @@
 SPLIT="yaml-dev"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad yandex-disk/receipt
--- a/yandex-disk/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/yandex-disk/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -50,8 +50,8 @@
 genpkg_rules()
 {
 	copy yandex-disk copyright *.mo \
-		publish unpublish test status *.desktop yandex-disk-helper
-	cook_copy_icons
+		publish unpublish test status *.desktop yandex-disk-helper \
+		@ico
 }
 
 pre_remove()
diff -r 9cfaac585fef -r 10df65db91ad yp-tools/receipt
--- a/yp-tools/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/yp-tools/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -12,7 +12,10 @@
 WGET_URL="$WEB_SITE/$TARBALL"
 
 compile_rules() {
-	./configure $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make DESTDIR=$DESTDIR install
 }
 
 genpkg_rules() {
diff -r 9cfaac585fef -r 10df65db91ad ytnef/receipt
--- a/ytnef/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/ytnef/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -21,6 +21,7 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 9cfaac585fef -r 10df65db91ad zvbi/receipt
--- a/zvbi/receipt	Tue Apr 17 10:03:53 2018 +0200
+++ b/zvbi/receipt	Thu Apr 19 13:15:41 2018 +0300
@@ -14,19 +14,16 @@
 BUILD_DEPENDS="libpng16-dev xorg-libX11-dev gettext doxygen"
 SPLIT="zvbi-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS && make && make install &&
+compile_rules() {
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
-	docdir="$install/usr/share/doc/zvbi-$VERSION" &&
-	mkdir -p $docdir &&
-	cp -r doc/html $docdir
+	cook_pick_docs doc/html
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		zvbi)
 			copy @std