# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1449189917 -7200
# Node ID 124c3a7da04fddba29d868566fffa0cf3551ee4d
# Parent  693f7325058f0df6128f9bc874b60b4f827db08b
Up tazpkg(880); change pre- post-functions, etc. in random packages

diff -r 693f7325058f -r 124c3a7da04f coreutils-operations/receipt
--- a/coreutils-operations/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/coreutils-operations/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -15,7 +15,6 @@
 #
 # This is a special package for installed system or developer. We only take
 # a few things, as Busybox provides all the basic utilities, but not for compiling.
-# But DO NOT erase a Busybox applet, remove it before with pre_install rules.
 #
 genpkg_rules()
 {
@@ -31,32 +30,14 @@
 	cp -a $install/usr/bin/shred $fs/usr/bin
 }
 
-# Pre and post install commands for Tazpkg.
-# We must remove all Busybox symlink before installing.
-#
-pre_install()
-{
-	local root
-	root=$1
-	qaction "Removing all Busybox replaced utils... "
-	rm -f $root/bin/dd $root/bin/mv $root/bin/ln
-	rm -f $root/usr/bin/install $root/usr/bin/shred
-	# Dont remove cp/rm or the installation will fail because tazpkg use
-	# cp and rm during the process.
-	#
-	#rm -f $root/bin/cp $root/bin/rm
-	qstatus
-}
-
 post_remove()
 {
 	# use busybox ln applet directly since /bin/ln
 	# in this package is remove already
-	/bin/busybox ln -fs /bin/busybox $1/bin/cp
+#	/bin/busybox ln -fs /bin/busybox $1/bin/cp
 	/bin/busybox ln -fs /bin/busybox $1/bin/dd
 	/bin/busybox ln -fs /bin/busybox $1/bin/mv
 	/bin/busybox ln -fs /bin/busybox $1/bin/ln
-	/bin/busybox ln -fs /bin/busybox $1/bin/rm
+#	/bin/busybox ln -fs /bin/busybox $1/bin/rm
 	/bin/busybox ln -fs /bin/busybox $1/usr/bin/install
-	/bin/busybox ln -fs /bin/busybox $1/usr/bin/shred
 }
diff -r 693f7325058f -r 124c3a7da04f dbus/receipt
--- a/dbus/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/dbus/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -45,28 +45,26 @@
 
 pre_install()
 {
-	local root
-	root=$1
 	# Go for echoing on configuration files if any messagebus user
 	# was found.
-	if ! grep -qs 'messagebus' $root/etc/passwd; then
-		echo -n "Adding user: messagebus..."
-		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> $root/etc/passwd
-		echo 'messagebus:!:14013:0:99999:7:::' >> $root/etc/shadow
-		echo 'messagebus:x:25:' >> $root/etc/group
-		echo 'messagebus:!::' >> $root/etc/gshadow
+	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
+		action 'Adding user: messagebus...'
+		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
+		echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow"
+		echo 'messagebus:x:25:' >> "$1/etc/group"
+		echo 'messagebus:!::' >> "$1/etc/gshadow"
 		status
 	fi
-	if ! grep -qs ^DBUS_OPTIONS $root/etc/daemons.conf; then
-		echo -n "Configuring $root/etc/daemons.conf..."
-		cat >> $root/etc/daemons.conf << "EOT"
+	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
+		action 'Configuring %s/etc/daemons.conf...' "$1"
+		cat >> "$1/etc/daemons.conf" << "EOT"
 # DBUS daemon options.
 DBUS_OPTIONS="--system"
 
 EOT
 		status
 	fi
-	[ -d $root/var/run ] || mkdir -p $root/var/run
+	[ -d "$1/var/run" ] || mkdir -p "$1/var/run"
 }
 
 pre_remove()
diff -r 693f7325058f -r 124c3a7da04f eudev/receipt
--- a/eudev/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/eudev/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -12,12 +12,12 @@
 PROVIDE="udev"
 
 DEPENDS="dbus util-linux-blkid pciids usbids acl kmod"
-BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev dbus-dev gperf pkg-config acl-dev"
+BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev \
+dbus-dev gperf pkg-config acl-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--sysconfdir=/etc \
 		--exec-prefix="" \
@@ -61,19 +61,22 @@
 
 list_udev_group()
 {
-    object=$2
-    [ -n "$object" ] || object=GROUP
-    grep $object $1/etc/udev/rules.d/* | \
-        sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq
+	object=$2
+	[ -n "$object" ] || object=GROUP
+	grep $object $1/etc/udev/rules.d/* | \
+		sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq
 }
 
 post_install()
 {
-    # Sanity check for udev+ldap boot
-    list_udev_group "$1" GROUP | while read x ; do
-        grep -q ^$x: $1/etc/group || chroot $1/ addgroup -S $x
-    done
-    list_udev_group "$1" OWNER | while read x ; do
-        grep -q ^$x: $1/etc/passwd || chroot $1/ adduser -S -D -H $x
-    done
+	# Sanity check for udev+ldap boot
+	list_udev_group "$1" GROUP | \
+	while read x ; do
+		grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x
+	done
+
+	list_udev_group "$1" OWNER | \
+	while read x ; do
+		grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x
+	done
 }
diff -r 693f7325058f -r 124c3a7da04f gdk-pixbuf/receipt
--- a/gdk-pixbuf/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/gdk-pixbuf/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -51,7 +51,6 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	echo -n "Updating gdk pixbuf loaders cache file..."
-	chroot $1/ /usr/bin/gdk-pixbuf-query-loaders --update-cache
-	status
+	# Updating gdk pixbuf loaders cache file...
+	chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache
 }
diff -r 693f7325058f -r 124c3a7da04f gtk+/receipt
--- a/gtk+/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/gtk+/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -10,7 +10,6 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.gtk.org/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
-CONFIG_FILES="/etc/gtk-2.0/gtk.immodules"
 HOST_ARCH="i486 arm"
 
 DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
@@ -72,7 +71,6 @@
 	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
 
 	mkdir -p $fs/etc/gtk-2.0
-	touch $fs/etc/gtk-2.0/gtk.immodules
 	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
 		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
 }
@@ -80,8 +78,6 @@
 # Pre and post install commands for Tazpkg.
 post_install()
 {
-	local arg
-	echo "Processing post-install commands..."
-	mkdir -p $1/etc/gtk-2.0
-	chroot $1/ /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
+	mkdir -p "$1/etc/gtk-2.0"
+	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > "$1/etc/gtk-2.0/gtk.immodules"
 }
diff -r 693f7325058f -r 124c3a7da04f gtk-doc/receipt
--- a/gtk-doc/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/gtk-doc/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -9,15 +9,12 @@
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WEB_SITE="http://www.gtk.org/gtk-doc/"
 WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
-#http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz
 
 BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -26,8 +23,8 @@
 	make DESTDIR=$DESTDIR install
 }
 
-# Rules to gen a SliTaz package suitable for Tazpkg.   
-genpkg_rules()                                      
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
 {
 	cp -a $install/usr $fs
 	mkdir -p $fs/usr/share/gtk-doc/html
diff -r 693f7325058f -r 124c3a7da04f gvfs/receipt
--- a/gvfs/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/gvfs/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -39,14 +39,7 @@
 	. $stuff/split
 }
 
-post_install()
-{
-	echo "Processing post-install commands..."
-	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
 post_remove()
 {
-	echo "Processing post-remove commands..."
-	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
+	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 }
diff -r 693f7325058f -r 124c3a7da04f jpeg/receipt
--- a/jpeg/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/jpeg/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -17,12 +17,12 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    ./configure \
+	./configure \
 		--enable-shared \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-    make &&
+	make &&
 	make DESTDIR=$DESTDIR install
 }
 
diff -r 693f7325058f -r 124c3a7da04f libfm-gtk/receipt
--- a/libfm-gtk/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/libfm-gtk/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -9,14 +9,7 @@
 WEB_SITE="http://pcmanfm.sourceforge.net"
 
 WANTED="libfm"
-#DEPENDS="util-linux-uuid libxcb xcb-util expat pixman shared-mime-info" ???
-DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib glibc-base gtk+ \
-libffi libfm libgio libxml2 menu-cache pango pcre zlib"
-
-# handle SliTaz arch and cross compilation ???
-#case "$SLITAZ_ARCH" in
-#	i?86) DEPENDS="$DEPENDS gamin"
-#esac
+DEPENDS="libfm gtk+"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 693f7325058f -r 124c3a7da04f libtool/receipt
--- a/libtool/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/libtool/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -22,7 +22,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--enable-shared \
 		$CONFIGURE_ARGS &&
diff -r 693f7325058f -r 124c3a7da04f pango-dev/receipt
--- a/pango-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/pango-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -16,13 +16,13 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-    cp -a $install/usr/lib/*.*a $fs/usr/lib
-    cp -a $install/usr/lib/pkgconfig $fs/usr/lib
-    [ -d "$install/usr/lib/girepository-1.0" ] && \
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	[ -d "$install/usr/lib/girepository-1.0" ] && \
 		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
 	[ -d "$install/usr/share/gir-1.0" ] && \
 		cp -a $install/usr/share/gir-1.0 $fs/usr/share
-    cp -a $install/usr/include $fs/usr
-    cp -a $install/usr/lib/pango $fs/usr/lib
-    rm -rf $fs/usr/lib/pango/1.8.0/modules/*.so
+	cp -a $install/usr/include $fs/usr
+	cp -a $install/usr/lib/pango $fs/usr/lib
+	rm -rf $fs/usr/lib/pango/1.8.0/modules/*.so
 }
diff -r 693f7325058f -r 124c3a7da04f pango/receipt
--- a/pango/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/pango/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -12,10 +12,8 @@
 CONFIG_FILES="/etc/pango/pango.modules"
 HOST_ARCH="i486 arm"
 
-DEPENDS="cairo glib expat libxml2 xorg-libXft harfbuzz fontconfig freetype xcb-util \
-bzlib slitaz-base-files gcc-lib-base xorg-libXft"
-BUILD_DEPENDS="cairo-dev glib-dev expat-dev libxml2-dev xorg-libXft-dev \
-libgio-dev harfbuzz-dev fontconfig-dev freetype-dev"
+DEPENDS="cairo xorg-libXft slitaz-base-files gcc-lib-base"
+BUILD_DEPENDS="cairo-dev libxml2-dev xorg-libXft-dev"
 
 # Handle cross compilation
 case "$ARCH" in
diff -r 693f7325058f -r 124c3a7da04f shared-mime-info/receipt
--- a/shared-mime-info/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/shared-mime-info/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -11,8 +11,8 @@
 WGET_URL="http://freedesktop.org/~hadess/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS="glib libxml2 zlib"
-BUILD_DEPENDS="perl-xml-parser glib-dev libxml2-dev intltool pkg-config"
+DEPENDS="glib"
+BUILD_DEPENDS="intltool"
 
 # Handle cross compilation. Host perl/intltool are used
 case "$ARCH" in
@@ -22,9 +22,9 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    #patch -Np1 -i $stuff/pbm.patch
-    ./configure $CONFIGURE_ARGS &&
-    make -j1 && make -j1 DESTDIR=$DESTDIR install
+	#patch -Np1 -i $stuff/pbm.patch
+	./configure $CONFIGURE_ARGS &&
+	make -j1 && make -j1 DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -37,9 +37,3 @@
 	# Additional MIME-types supported by SliTaz
 	cp $stuff/*.xml $fs/usr/share/mime/packages
 }
-
-# Update mime database.
-post_install()
-{
-	chroot "$1/" /usr/bin/update-mime-database /usr/share/mime
-}
diff -r 693f7325058f -r 124c3a7da04f startup-notification/receipt
--- a/startup-notification/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/startup-notification/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -8,11 +8,10 @@
 LICENSE="LGPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://freedesktop.org/software/startup-notification/releases/"
-WGET_URL="http://freedesktop.org/software/startup-notification/releases/$TARBALL"
+WGET_URL="${WEB_SITE}$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS="util-linux-uuid libxcb xcb-util xorg-libICE xorg-libSM \
-xorg-libX11 xorg-libXau xorg-libXdmcp"
+DEPENDS="xcb-util xorg-libSM xorg-libX11"
 BUILD_DEPENDS="util-linux-uuid-dev libxcb-dev xcb-util-dev"
 
 # Rules to configure and make the package.
@@ -31,4 +30,3 @@
 	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 }
-
diff -r 693f7325058f -r 124c3a7da04f tazpkg/receipt
--- a/tazpkg/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/tazpkg/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpkg"
-VERSION="878"
+VERSION="880"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz packages manager"
 MAINTAINER="pankso@slitaz.org"
diff -r 693f7325058f -r 124c3a7da04f tiff-dev/receipt
--- a/tiff-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/tiff-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -3,7 +3,7 @@
 PACKAGE="tiff-dev"
 VERSION="4.0.3"
 CATEGORY="development"
-SHORT_DESC="TIFF images libs devel files. (Check tiff-apps for utilities)."
+SHORT_DESC="TIFF images libs devel files"
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WANTED="tiff"
@@ -15,7 +15,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/lib
-    cp -a $install/usr/lib/*.*a $fs/usr/lib
-    cp -a $install/usr/include $fs/usr
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/*.*a $fs/usr/lib
+	cp -a $install/usr/include $fs/usr
 }
diff -r 693f7325058f -r 124c3a7da04f tiff/receipt
--- a/tiff/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/tiff/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -17,13 +17,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    ./configure $CONFIGURE_ARGS &&
-    make && make install
+	./configure $CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/lib
-    cp -a $install/usr/lib/*.so* $fs/usr/lib
+	mkdir -p $fs/usr/lib
+	cp -a $install/usr/lib/*.so* $fs/usr/lib
 }
diff -r 693f7325058f -r 124c3a7da04f util-linux-blkid/receipt
--- a/util-linux-blkid/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/util-linux-blkid/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -26,19 +26,11 @@
 post_install()
 {
 	if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then
-		echo "Removing old: util-linux-ng-blkid"
 		rm -rf $INSTALLED/util-linux-ng-blkid
 	fi
 }
 
-# Overlap busybox
-pre_install()
-{
-	rm -f $root/sbin/blkid
-}
-
 post_remove()
 {
-	cd $root/sbin
-	ln -s ../bin/busybox blkid
+	ln -s ../bin/busybox "$1/sbin/blkid"
 }
diff -r 693f7325058f -r 124c3a7da04f util-linux-mount/receipt
--- a/util-linux-mount/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/util-linux-mount/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -18,6 +18,5 @@
 	cp -a $install/bin/findmnt $fs/bin
 	cp -a $install/bin/*mount* $fs/bin
 	cp -a $install/lib/libmount.so* $fs/lib
-	cd $fs/usr/lib &&
-	ln -sf ../../lib/libmount.so.1.1.0 libmount.so
+	ln -sf ../../lib/libmount.so.1.1.0 $fs/usr/lib/libmount.so
 }
diff -r 693f7325058f -r 124c3a7da04f xcb-util-dev/receipt
--- a/xcb-util-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/xcb-util-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -7,7 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="MIT"
 WANTED="xcb-util"
-WEB_SITE="http://xcb.freedesktop.org"
+WEB_SITE="http://xcb.freedesktop.org/"
 HOST_ARCH="i486 arm"
 
 DEPENDS="xcb-util"
diff -r 693f7325058f -r 124c3a7da04f xcb-util/receipt
--- a/xcb-util/receipt	Thu Dec 03 15:56:36 2015 -0200
+++ b/xcb-util/receipt	Fri Dec 04 02:45:17 2015 +0200
@@ -7,12 +7,12 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://xcb.freedesktop.org"
-WGET_URL="$WEB_SITE/dist/$TARBALL"
+WEB_SITE="http://xcb.freedesktop.org/"
+WGET_URL="${WEB_SITE}dist/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS="libxcb xorg-libXdmcp"
-BUILD_DEPENDS="libxcb-dev xorg-libXdmcp-dev gperf"
+DEPENDS="libxcb"
+BUILD_DEPENDS="libxcb-dev gperf"
 
 # Handle cross compilation
 case "$ARCH" in
@@ -22,7 +22,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -34,7 +33,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib 
+	mkdir -p $fs/usr/lib
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 }
-