# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1523912801 -10800
# Node ID 556349764d5700c7d30de586e1c3b86d96bb2f00
# Parent  6e46ae5ac721cc0fa7c960a32d6984c7c977867e
More fix libtool

diff -r 6e46ae5ac721 -r 556349764d57 man-db/receipt
--- a/man-db/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/man-db/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -22,6 +22,7 @@
 		--with-vgrind=/usr/bin/vgrind \
 		--with-grap=/usr/bin/grap \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install || return 1
 
diff -r 6e46ae5ac721 -r 556349764d57 mate-menus/receipt
--- a/mate-menus/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mate-menus/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -18,6 +18,7 @@
 	./autogen.sh \
 		--enable-python \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 6e46ae5ac721 -r 556349764d57 mate-notification-daemon-gtk2/receipt
--- a/mate-notification-daemon-gtk2/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mate-notification-daemon-gtk2/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -20,14 +20,15 @@
 
 	mkdir macros; autoreconf -fi
 	intltoolize;  autoreconf
+
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
 
 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+ libcanberra libffi libharfbuzz libltdl liblzma libnotify libogg \
 	libpng16 libvorbis libwnck2 libxml2 pango pcre startup-notification \
diff -r 6e46ae5ac721 -r 556349764d57 mate-notification-daemon/receipt
--- a/mate-notification-daemon/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mate-notification-daemon/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -18,6 +18,7 @@
 compile_rules() {
 	./autogen.sh \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
@@ -25,14 +26,12 @@
 genpkg_rules() {
 	case $PACKAGE in
 		mate-notification-daemon)
-			copy @std
-			cook_copy_icons # only 16 and 48
-			DEPENDS=""
+			copy @std @ico # only 16 and 48 icons
 			PROVIDE="gtk+3:notification-daemon"
 			;;
 		*-dev)
 			copy @dev
-			DEPENDS=""
+			;;
 	esac
 	TAGS="MATE"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mathomatic/receipt
--- a/mathomatic/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mathomatic/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -14,19 +14,18 @@
 BUILD_DEPENDS="automake libtool readline-dev"
 SPLIT="mathomatic-optional mathomatic"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	autoreconf -fi &&
 
-	./configure $CONFIGURE_ARGS && make && make install || return 1
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
+	make &&
+	make install || return 1
 
 	install -m0755 primes/matho-mult primes/matho-sum primes/primorial \
 		$install/usr/bin
 
-	docdir="$install/usr/share/doc/mathomatic-16.0.5"
-	mkdir -p $docdir
-	cp doc/* $docdir
+	cook_pick_docs doc/*
 
 	appdir="$install/usr/share/applications"
 	mkdir -p $appdir
@@ -41,9 +40,7 @@
 	cook_pick_manpages mathomatic.1 lib/*.3 primes/*.1
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
+genpkg_rules() {
 	case $PACKAGE in
 		mathomatic-optional)
 			copy bin/matho-* primorial
diff -r 6e46ae5ac721 -r 556349764d57 matio/receipt
--- a/matio/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/matio/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 mcrypt/receipt
--- a/mcrypt/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mcrypt/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,30 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mcrypt"
 VERSION="2.6.8"
 CATEGORY="security"
-SHORT_DESC="Encryption"
+SHORT_DESC="Simple crypting program"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="http://mcrypt.sourceforge.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://mcrypt.sourceforge.net/"
 WGET_URL="http://downloads.sourceforge.net/project/mcrypt/MCrypt/$VERSION/$TARBALL"
 
-DEPENDS="zlib mhash libmcrypt"
-BUILD_DEPENDS="libmcrypt-dev libmcrypt-dev mhash-dev zlib-dev"
+BUILD_DEPENDS="libmcrypt-dev mhash-dev zlib-dev"
+COOKOPTS="skip-log-errors"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr $CONFIGURE_ARGS 2>&1 | grep -v libtoolT &&
+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="zlib mhash libmcrypt"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mdbtools/receipt
--- a/mdbtools/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mdbtools/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -20,6 +20,7 @@
 		--enable-sql \
 		--with-unixodbc=/usr \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 megatools/receipt
--- a/megatools/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/megatools/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,29 +1,29 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="megatools"
 VERSION="1.9.96"
 CATEGORY="network"
-SHORT_DESC="A collection of CLI programs for accessing Mega service."
+SHORT_DESC="A collection of CLI programs for accessing Mega service"
 MAINTAINER="Lucas Levrel <llev@slitaz.org>"
 LICENSE="GPL2"
 WEB_SITE="https://megatools.megous.com"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/builds/$TARBALL"
 
-DEPENDS="glib libcurl openssl gmp"
 BUILD_DEPENDS="glib-dev curl-dev openssl-dev gmp-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure $CONFIGURE_ARGS --disable-static \
-	&& make && make install
+compile_rules() {
+	./configure \
+		--disable-static \
+		$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
 	# upstream info: lib is deprecated; remove .h .pc .la
-	rm -r $fs/usr/share $fs/usr/lib/pkgconfig $fs/usr/lib/*a $fs/usr/include
+	DEPENDS="glib libcurl openssl gmp"
 }
diff -r 6e46ae5ac721 -r 556349764d57 menu-cache/receipt
--- a/menu-cache/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/menu-cache/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -20,7 +20,9 @@
 		--disable-static \
 		--enable-gtk-doc \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 6e46ae5ac721 -r 556349764d57 mesa-demos/receipt
--- a/mesa-demos/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mesa-demos/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -19,6 +19,7 @@
 	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11"
 
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 metacity/receipt
--- a/metacity/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/metacity/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,4 +1,4 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="metacity"
 VERSION="2.30.3"
@@ -6,33 +6,30 @@
 SHORT_DESC="Window manager"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
+WEB_SITE="http://blogs.gnome.org/metacity/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-HI_VERSION=$(echo $VERSION | sed 's|\([0-9\.]*\)\.[0-9]*|\1|')
-WEB_SITE="http://blogs.gnome.org/metacity/"
-WGET_URL="http://ftp.acc.umu.se/pub/gnome/sources/metacity/$HI_VERSION/$TARBALL"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-DEPENDS="gsettings-desktop-schemas glib gtk+ xorg-libXcomposite \
-xorg-libXdamage zenity-gtk2 xorg-libXinerama xorg-libXrandr xorg-libXcursor \
-libcanberra libltdl libvorbis libogg GConf"
 BUILD_DEPENDS="gsettings-desktop-schemas glib-dev gtk+-dev \
 xorg-libXcomposite-dev xorg-libXdamage-dev zenity-gtk2 xorg-libXinerama-dev \
 xorg-libXrandr-dev xorg-libXcursor-dev libcanberra-dev libltdl libvorbis-dev \
 libogg-dev libtool gnome-doc-utils GConf-dev util-linux-uuid-dev intltool"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr \
-		--disable-verbose-mode --disable-sm --disable-scrollkeeper
+compile_rules() {
+	./configure \
+		--disable-verbose-mode \
+		--disable-sm \
+		--disable-scrollkeeper \
+		&&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	cp -a $install/usr $fs
-	rm -rf $fs/usr/include $fs/usr/lib/pkgconfig $fs/usr/share/gnome \
-	$fs/usr/share/gnome-control-center $fs/usr/share/man $fs/usr/share/locale
-	rm $fs/usr/lib/libmetacity-private.a $fs/usr/lib/libmetacity-private.la
+genpkg_rules() {
+	copy @std
+	DEPENDS="gsettings-desktop-schemas glib gtk+ xorg-libXcomposite \
+	xorg-libXdamage zenity-gtk2 xorg-libXinerama xorg-libXrandr xorg-libXcursor \
+	libcanberra libltdl libvorbis libogg GConf"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mhash/receipt
--- a/mhash/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mhash/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -15,6 +15,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 mjpegtools/receipt
--- a/mjpegtools/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mjpegtools/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -20,15 +20,14 @@
 BUILD_DEPENDS="libjpeg-turbo-dev libpng16-dev libdv-dev xorg-libX11-dev \
 xorg-libICE-dev xorg-libXxf86dga-dev gtk+-dev libsdl-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
 		mjpegtools)
 			copy @std
diff -r 6e46ae5ac721 -r 556349764d57 moc/receipt
--- a/moc/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/moc/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,47 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="moc"
 VERSION="2.5.0"
 CATEGORY="multimedia"
-SHORT_DESC="Music on console."
+SHORT_DESC="Music on console"
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://moc.daper.net/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://moc.daper.net/"
 WGET_URL="http://ftp.daper.net/pub/soft/moc/stable/$TARBALL"
 
-DEPENDS="alsa-lib libvorbis libogg libmad libid3tag flac curl \
-libsamplerate libsndfile libltdl ffmpeg ncurses db"
+BUILD_DEPENDS_arm="alsa-lib-dev libid3tag-dev libogg-dev libvorbis-dev"
 BUILD_DEPENDS="libvorbis-dev libogg-dev libmad-dev libid3tag-dev flac-dev db-dev \
 curl-dev libsamplerate-dev alsa-lib-dev ncurses-dev libsndfile-dev libsamplerate \
 libtool libmagic-dev"
 
-# Handle cross compilation
-case "$ARCH" in
-	arm) BUILD_DEPENDS="alsa-lib-dev libid3tag-dev libogg-dev libvorbis-dev" ;;
-esac
+compile_rules() {
+	export LIBTOOL=${HOST_SYSTEM}-libtool
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	export LIBTOOL=${HOST_SYSTEM}-libtool
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	./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/moc $fs/usr/share/doc $fs/usr/share/moc
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/lib/moc/* $fs/usr/lib/moc
-	cp -a $install/usr/share/doc/* $fs/usr/share/doc
-	cp -a $install/usr/share/moc/* $fs/usr/share/moc
-
-	# strip unneeded libraries
-	rm $fs/usr/lib/moc/decoder_plugins/*.*a
+genpkg_rules() {
+	copy @std
+	DEPENDS="alsa-lib libvorbis libogg libmad libid3tag flac curl \
+	libsamplerate libsndfile libltdl ffmpeg ncurses db"
 }
diff -r 6e46ae5ac721 -r 556349764d57 modsecurity-apache/receipt
--- a/modsecurity-apache/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/modsecurity-apache/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,28 +1,27 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="modsecurity-apache"
 VERSION="2.7.7"
 CATEGORY="network"
-SHORT_DESC="Web application firewall engine."
+SHORT_DESC="Web application firewall engine"
 MAINTAINER="pascal.bellard@slitaz.org"
-TARBALL="${PACKAGE}_$VERSION.tar.gz"
 LICENSE="Apache"
 WEB_SITE="https://www.modsecurity.org/"
+
+TARBALL="${PACKAGE}_$VERSION.tar.gz"
 WGET_URL="$WEB_SITE/tarball/$VERSION/$TARBALL"
 
-DEPENDS="apache apr apr-util pcre util-linux-uuid curl zlib openssl"
 BUILD_DEPENDS="apache-dev apr-dev apr-util-dev pcre-dev libxml2-dev \
 util-linux-uuid-dev curl-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure --prefix=/usr $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()
-{
-	cp -a $install/* $fs
+genpkg_rules() {
+	copy @std
+	DEPENDS="apache apr apr-util pcre util-linux-uuid curl zlib openssl"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mondo/receipt
--- a/mondo/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mondo/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,28 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mondo"
 VERSION="3.0.2"
 CATEGORY="system-tools"
-SHORT_DESC="GPL disaster recovery solution."
+SHORT_DESC="GPL disaster recovery solution"
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.mondorescue.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="ftp://ftp.mondorescue.org/src/$TARBALL"
 
-DEPENDS="newt mindi coreutils-disk afio gawk"
 BUILD_DEPENDS="newt-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/share
-	cp -a $install/usr/sbin $fs/usr
-	cp -a $install/usr/share/mondo $fs/usr/share
+genpkg_rules() {
+	copy @std
+	DEPENDS="newt mindi coreutils-disk afio gawk"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mono/receipt
--- a/mono/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mono/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -22,6 +22,7 @@
 	./configure \
 		--with-libgdiplus=installed \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make -j1 &&
 	make install
 
diff -r 6e46ae5ac721 -r 556349764d57 moserial/receipt
--- a/moserial/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/moserial/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,44 +1,32 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="moserial"
 VERSION="2.32.1"
 CATEGORY="utilities"
-SHORT_DESC="A gtk-based serial console."
+SHORT_DESC="A GTK-based serial console"
 MAINTAINER="domcox@slitaz.org"
 LICENSE="GPL3"
+WEB_SITE="https://live.gnome.org/moserial"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="https://live.gnome.org/moserial"
-WGET_URL="http://ftp.gnome.org/pub/GNOME/sources/$PACKAGE/${VERSION%.*}/$TARBALL"
-LOCALES="da de es fr pt_BR zh_CN"
-TAGS="serial console"
+WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION%.*}/$TARBALL"
 
-DEPENDS="GConf gtk+"
 BUILD_DEPENDS="GConf-dev gnome-doc-utils intltool vala gtk+-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	# removing help
 	patch -Np3 -i $stuff/glade.patch
-	# build
-	./configure $CONFIGURE_ARGS \
+
+	./configure \
 		--disable-scrollkeeper \
-		--prefix="/usr" &&
+		$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/pixmaps $fs/usr/share/locale
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/moserial $fs/usr/share
-	cp -a $install/usr/share/icons/hicolor/48x48/apps/moserial.png \
-		$fs/usr/share/pixmaps
-	for locale in $LOCALES; do
-		cp -a $install/usr/share/locale/$locale $fs/usr/share/locale
-	done
-	chown -R root.root $fs
+genpkg_rules() {
+	copy @std *.mo
+	DEPENDS="GConf gtk+"
+	TAGS="serial console"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mpc-library/receipt
--- a/mpc-library/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mpc-library/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -19,7 +19,11 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make html && make install && make install-html
+	fix libtool &&
+	make &&
+	make html &&
+	make install &&
+	make install-html
 }
 
 genpkg_rules() {
diff -r 6e46ae5ac721 -r 556349764d57 mpfr/receipt
--- a/mpfr/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mpfr/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -23,7 +23,11 @@
 		--disable-static \
 		--enable-thread-safe \
 		$CONFIGURE_ARGS &&
-	make && make html && make install && make install-html
+	fix libtool &&
+	make &&
+	make html &&
+	make install &&
+	make install-html
 }
 
 testsuite() {
diff -r 6e46ae5ac721 -r 556349764d57 mpg123/receipt
--- a/mpg123/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mpg123/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -24,6 +24,7 @@
 		--with-default-audio=alsa \
 		$ARCH_ARGS \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }
diff -r 6e46ae5ac721 -r 556349764d57 mtd-utils/receipt
--- a/mtd-utils/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mtd-utils/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -1,30 +1,26 @@
-# SliTaz package receipt.
+# SliTaz package receipt v2.
 
 PACKAGE="mtd-utils"
 VERSION="2.0.1"
 CATEGORY="base-system"
-SHORT_DESC="Memory Technology Device Tools (including jff2)."
+SHORT_DESC="Memory Technology Device Tools (including jff2)"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.linux-mtd.infradead.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.linux-mtd.infradead.org/"
 WGET_URL="ftp://ftp.infradead.org/pub/mtd-utils/$TARBALL"
 
-DEPENDS="lzo zlib util-linux-uuid"
 BUILD_DEPENDS="acl-dev lzo-dev zlib-dev util-linux-uuid-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
-	./configure \
-		--prefix=/usr \
-		$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()
-{
-	mkdir -p $fs/usr
-	cp -a $install/usr/sbin $fs/usr
+genpkg_rules() {
+	copy @std
+	DEPENDS="lzo zlib util-linux-uuid"
 }
diff -r 6e46ae5ac721 -r 556349764d57 mtdev/receipt
--- a/mtdev/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/mtdev/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -18,7 +18,9 @@
 	./configure \
 		--disable-static \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install
 }
 
 genpkg_rules() {
diff -r 6e46ae5ac721 -r 556349764d57 n2nc/receipt
--- a/n2nc/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/n2nc/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -3,7 +3,7 @@
 PACKAGE="n2nc"
 VERSION="r_133"
 CATEGORY="network"
-SHORT_DESC="Nat 2 Nat COnnector"
+SHORT_DESC="Nat 2 Nat Connector"
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://n2nc.sourceforge.net/"
@@ -21,11 +21,9 @@
 	autoheader
 	automake --force-missing --add-missing
 	autoconf
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		$CONFIGURE_ARGS &&
+
+	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 nagios-plugins/receipt
--- a/nagios-plugins/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/nagios-plugins/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -17,15 +17,15 @@
 
 compile_rules() {
 	sed -i '/gets is a security hole/d' gl/stdio*.h
+
 	./configure \
-		--prefix=/usr \
 		--libexecdir=/usr/lib/nagios/plugins \
 		--with-nagios-user=nobody \
 		--with-nagios-group=nogroup \
 		--with-ping-command="/bin/ping -w %d -c %d %s" \
 		--with-fping-command="/usr/sbin/fping" \
-		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install &&
 	make DESTDIR=$DESTDIR install-root
diff -r 6e46ae5ac721 -r 556349764d57 naim/receipt
--- a/naim/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/naim/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -18,6 +18,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make -j1 &&
 	make -j1 DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 navit/receipt
--- a/navit/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/navit/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -18,6 +18,7 @@
 
 compile_rules() {
 	./configure $CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 6e46ae5ac721 -r 556349764d57 ncmpcpp/receipt
--- a/ncmpcpp/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/ncmpcpp/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -13,29 +13,25 @@
 
 BUILD_DEPENDS="ncurses-dev taglib taglib-dev curl-dev libmpdclient-dev"
 
-# Rules to configure and make the package.
-compile_rules()
-{
+compile_rules() {
 	./configure \
-		--prefix=/usr \
 		--enable-clock \
 		--with-taglib \
 		--with-curl \
-		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make install
+	fix libtool &&
+	make &&
+	make install || return 1
+
+	mkdir -p $install/etc/skel/.ncmpcpp/
+	cp $install/usr/share/doc/ncmpcpp/config \
+	   $install/usr/share/doc/ncmpcpp/keys     $install/etc/skel/.ncmpcpp/
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-	mkdir -p $fs/usr/share $fs/etc/skel/.ncmpcpp
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/doc $fs/usr/share
-	ln $fs/usr/share/doc/ncmpcpp/config $fs/etc/skel/.ncmpcpp
-	ln $fs/usr/share/doc/ncmpcpp/keys $fs/etc/skel/.ncmpcpp
-DEPENDS="ncurses taglib mpd curl libmpdclient"
-TAGS="music audio player"
+genpkg_rules() {
+	copy @std
+	DEPENDS="ncurses taglib mpd curl libmpdclient"
+	TAGS="music audio player"
 }
 
 post_install() {
diff -r 6e46ae5ac721 -r 556349764d57 neon/receipt
--- a/neon/receipt	Mon Apr 16 22:50:58 2018 +0300
+++ b/neon/receipt	Tue Apr 17 00:06:41 2018 +0300
@@ -24,6 +24,7 @@
 		--enable-shared \
 		--disable-static \
 		$CONFIGURE_ARGS &&
+	fix libtool &&
 	make &&
 	make install
 }