wok-next rev 18663

Up tazpkg(880); change pre- post-functions, etc. in random packages
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Dec 04 02:45:17 2015 +0200 (2015-12-04)
parents 693f7325058f
children cbd7bac0a8a9
files coreutils-operations/receipt dbus/receipt eudev/receipt gdk-pixbuf/receipt gtk+/receipt gtk-doc/receipt gvfs/receipt jpeg/receipt libfm-gtk/receipt libtool/receipt pango-dev/receipt pango/receipt shared-mime-info/receipt startup-notification/receipt tazpkg/receipt tiff-dev/receipt tiff/receipt util-linux-blkid/receipt util-linux-mount/receipt xcb-util-dev/receipt xcb-util/receipt
line diff
     1.1 --- a/coreutils-operations/receipt	Thu Dec 03 15:56:36 2015 -0200
     1.2 +++ b/coreutils-operations/receipt	Fri Dec 04 02:45:17 2015 +0200
     1.3 @@ -15,7 +15,6 @@
     1.4  #
     1.5  # This is a special package for installed system or developer. We only take
     1.6  # a few things, as Busybox provides all the basic utilities, but not for compiling.
     1.7 -# But DO NOT erase a Busybox applet, remove it before with pre_install rules.
     1.8  #
     1.9  genpkg_rules()
    1.10  {
    1.11 @@ -31,32 +30,14 @@
    1.12  	cp -a $install/usr/bin/shred $fs/usr/bin
    1.13  }
    1.14  
    1.15 -# Pre and post install commands for Tazpkg.
    1.16 -# We must remove all Busybox symlink before installing.
    1.17 -#
    1.18 -pre_install()
    1.19 -{
    1.20 -	local root
    1.21 -	root=$1
    1.22 -	qaction "Removing all Busybox replaced utils... "
    1.23 -	rm -f $root/bin/dd $root/bin/mv $root/bin/ln
    1.24 -	rm -f $root/usr/bin/install $root/usr/bin/shred
    1.25 -	# Dont remove cp/rm or the installation will fail because tazpkg use
    1.26 -	# cp and rm during the process.
    1.27 -	#
    1.28 -	#rm -f $root/bin/cp $root/bin/rm
    1.29 -	qstatus
    1.30 -}
    1.31 -
    1.32  post_remove()
    1.33  {
    1.34  	# use busybox ln applet directly since /bin/ln
    1.35  	# in this package is remove already
    1.36 -	/bin/busybox ln -fs /bin/busybox $1/bin/cp
    1.37 +#	/bin/busybox ln -fs /bin/busybox $1/bin/cp
    1.38  	/bin/busybox ln -fs /bin/busybox $1/bin/dd
    1.39  	/bin/busybox ln -fs /bin/busybox $1/bin/mv
    1.40  	/bin/busybox ln -fs /bin/busybox $1/bin/ln
    1.41 -	/bin/busybox ln -fs /bin/busybox $1/bin/rm
    1.42 +#	/bin/busybox ln -fs /bin/busybox $1/bin/rm
    1.43  	/bin/busybox ln -fs /bin/busybox $1/usr/bin/install
    1.44 -	/bin/busybox ln -fs /bin/busybox $1/usr/bin/shred
    1.45  }
     2.1 --- a/dbus/receipt	Thu Dec 03 15:56:36 2015 -0200
     2.2 +++ b/dbus/receipt	Fri Dec 04 02:45:17 2015 +0200
     2.3 @@ -45,28 +45,26 @@
     2.4  
     2.5  pre_install()
     2.6  {
     2.7 -	local root
     2.8 -	root=$1
     2.9  	# Go for echoing on configuration files if any messagebus user
    2.10  	# was found.
    2.11 -	if ! grep -qs 'messagebus' $root/etc/passwd; then
    2.12 -		echo -n "Adding user: messagebus..."
    2.13 -		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> $root/etc/passwd
    2.14 -		echo 'messagebus:!:14013:0:99999:7:::' >> $root/etc/shadow
    2.15 -		echo 'messagebus:x:25:' >> $root/etc/group
    2.16 -		echo 'messagebus:!::' >> $root/etc/gshadow
    2.17 +	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    2.18 +		action 'Adding user: messagebus...'
    2.19 +		echo 'messagebus:x:25:25:DBUS Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd"
    2.20 +		echo 'messagebus:!:14013:0:99999:7:::' >> "$1/etc/shadow"
    2.21 +		echo 'messagebus:x:25:' >> "$1/etc/group"
    2.22 +		echo 'messagebus:!::' >> "$1/etc/gshadow"
    2.23  		status
    2.24  	fi
    2.25 -	if ! grep -qs ^DBUS_OPTIONS $root/etc/daemons.conf; then
    2.26 -		echo -n "Configuring $root/etc/daemons.conf..."
    2.27 -		cat >> $root/etc/daemons.conf << "EOT"
    2.28 +	if ! grep -qs ^DBUS_OPTIONS "$1/etc/daemons.conf"; then
    2.29 +		action 'Configuring %s/etc/daemons.conf...' "$1"
    2.30 +		cat >> "$1/etc/daemons.conf" << "EOT"
    2.31  # DBUS daemon options.
    2.32  DBUS_OPTIONS="--system"
    2.33  
    2.34  EOT
    2.35  		status
    2.36  	fi
    2.37 -	[ -d $root/var/run ] || mkdir -p $root/var/run
    2.38 +	[ -d "$1/var/run" ] || mkdir -p "$1/var/run"
    2.39  }
    2.40  
    2.41  pre_remove()
     3.1 --- a/eudev/receipt	Thu Dec 03 15:56:36 2015 -0200
     3.2 +++ b/eudev/receipt	Fri Dec 04 02:45:17 2015 +0200
     3.3 @@ -12,12 +12,12 @@
     3.4  PROVIDE="udev"
     3.5  
     3.6  DEPENDS="dbus util-linux-blkid pciids usbids acl kmod"
     3.7 -BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev dbus-dev gperf pkg-config acl-dev"
     3.8 +BUILD_DEPENDS="util-linux-blkid-dev util-linux-uuid-dev pcre-dev kmod-dev \
     3.9 +dbus-dev gperf pkg-config acl-dev"
    3.10  
    3.11  # Rules to configure and make the package.
    3.12  compile_rules()
    3.13  {
    3.14 -	cd $src
    3.15  	./configure \
    3.16  		--sysconfdir=/etc \
    3.17  		--exec-prefix="" \
    3.18 @@ -61,19 +61,22 @@
    3.19  
    3.20  list_udev_group()
    3.21  {
    3.22 -    object=$2
    3.23 -    [ -n "$object" ] || object=GROUP
    3.24 -    grep $object $1/etc/udev/rules.d/* | \
    3.25 -        sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq
    3.26 +	object=$2
    3.27 +	[ -n "$object" ] || object=GROUP
    3.28 +	grep $object $1/etc/udev/rules.d/* | \
    3.29 +		sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq
    3.30  }
    3.31  
    3.32  post_install()
    3.33  {
    3.34 -    # Sanity check for udev+ldap boot
    3.35 -    list_udev_group "$1" GROUP | while read x ; do
    3.36 -        grep -q ^$x: $1/etc/group || chroot $1/ addgroup -S $x
    3.37 -    done
    3.38 -    list_udev_group "$1" OWNER | while read x ; do
    3.39 -        grep -q ^$x: $1/etc/passwd || chroot $1/ adduser -S -D -H $x
    3.40 -    done
    3.41 +	# Sanity check for udev+ldap boot
    3.42 +	list_udev_group "$1" GROUP | \
    3.43 +	while read x ; do
    3.44 +		grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x
    3.45 +	done
    3.46 +
    3.47 +	list_udev_group "$1" OWNER | \
    3.48 +	while read x ; do
    3.49 +		grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x
    3.50 +	done
    3.51  }
     4.1 --- a/gdk-pixbuf/receipt	Thu Dec 03 15:56:36 2015 -0200
     4.2 +++ b/gdk-pixbuf/receipt	Fri Dec 04 02:45:17 2015 +0200
     4.3 @@ -51,7 +51,6 @@
     4.4  # Pre and post install commands for Tazpkg.
     4.5  post_install()
     4.6  {
     4.7 -	echo -n "Updating gdk pixbuf loaders cache file..."
     4.8 -	chroot $1/ /usr/bin/gdk-pixbuf-query-loaders --update-cache
     4.9 -	status
    4.10 +	# Updating gdk pixbuf loaders cache file...
    4.11 +	chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache
    4.12  }
     5.1 --- a/gtk+/receipt	Thu Dec 03 15:56:36 2015 -0200
     5.2 +++ b/gtk+/receipt	Fri Dec 04 02:45:17 2015 +0200
     5.3 @@ -10,7 +10,6 @@
     5.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     5.5  WEB_SITE="http://www.gtk.org/"
     5.6  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
     5.7 -CONFIG_FILES="/etc/gtk-2.0/gtk.immodules"
     5.8  HOST_ARCH="i486 arm"
     5.9  
    5.10  DEPENDS="glibc-base expat libxcb xcb-util zlib glib cairo pango atk libpng \
    5.11 @@ -72,7 +71,6 @@
    5.12  	cp -a $install/usr/bin/gtk-builder-convert $fs/usr/bin
    5.13  
    5.14  	mkdir -p $fs/etc/gtk-2.0
    5.15 -	touch $fs/etc/gtk-2.0/gtk.immodules
    5.16  	ln -s /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
    5.17  		$fs/etc/gtk-2.0/gdk-pixbuf.loaders
    5.18  }
    5.19 @@ -80,8 +78,6 @@
    5.20  # Pre and post install commands for Tazpkg.
    5.21  post_install()
    5.22  {
    5.23 -	local arg
    5.24 -	echo "Processing post-install commands..."
    5.25 -	mkdir -p $1/etc/gtk-2.0
    5.26 -	chroot $1/ /usr/bin/gtk-query-immodules-2.0 > $1/etc/gtk-2.0/gtk.immodules
    5.27 +	mkdir -p "$1/etc/gtk-2.0"
    5.28 +	chroot "$1/" /usr/bin/gtk-query-immodules-2.0 > "$1/etc/gtk-2.0/gtk.immodules"
    5.29  }
     6.1 --- a/gtk-doc/receipt	Thu Dec 03 15:56:36 2015 -0200
     6.2 +++ b/gtk-doc/receipt	Fri Dec 04 02:45:17 2015 +0200
     6.3 @@ -9,15 +9,12 @@
     6.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     6.5  WEB_SITE="http://www.gtk.org/gtk-doc/"
     6.6  WGET_URL="$GNOME_MIRROR/$PACKAGE/${VERSION:0:4}/$TARBALL"
     6.7 -#http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz
     6.8  
     6.9  BUILD_DEPENDS="docbook-xml docbook-xsl libxslt python perl"
    6.10  
    6.11  # Rules to configure and make the package.
    6.12  compile_rules()
    6.13  {
    6.14 -	cd $src
    6.15 -
    6.16  	./configure \
    6.17  		--prefix=/usr \
    6.18  		--sysconfdir=/etc \
    6.19 @@ -26,8 +23,8 @@
    6.20  	make DESTDIR=$DESTDIR install
    6.21  }
    6.22  
    6.23 -# Rules to gen a SliTaz package suitable for Tazpkg.   
    6.24 -genpkg_rules()                                      
    6.25 +# Rules to gen a SliTaz package suitable for Tazpkg.
    6.26 +genpkg_rules()
    6.27  {
    6.28  	cp -a $install/usr $fs
    6.29  	mkdir -p $fs/usr/share/gtk-doc/html
     7.1 --- a/gvfs/receipt	Thu Dec 03 15:56:36 2015 -0200
     7.2 +++ b/gvfs/receipt	Fri Dec 04 02:45:17 2015 +0200
     7.3 @@ -39,14 +39,7 @@
     7.4  	. $stuff/split
     7.5  }
     7.6  
     7.7 -post_install()
     7.8 -{
     7.9 -	echo "Processing post-install commands..."
    7.10 -	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
    7.11 -}
    7.12 -
    7.13  post_remove()
    7.14  {
    7.15 -	echo "Processing post-remove commands..."
    7.16 -	chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
    7.17 +	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
    7.18  }
     8.1 --- a/jpeg/receipt	Thu Dec 03 15:56:36 2015 -0200
     8.2 +++ b/jpeg/receipt	Fri Dec 04 02:45:17 2015 +0200
     8.3 @@ -17,12 +17,12 @@
     8.4  # Rules to configure and make the package.
     8.5  compile_rules()
     8.6  {
     8.7 -    ./configure \
     8.8 +	./configure \
     8.9  		--enable-shared \
    8.10  		--prefix=/usr \
    8.11  		--mandir=/usr/share/man \
    8.12  		$CONFIGURE_ARGS &&
    8.13 -    make &&
    8.14 +	make &&
    8.15  	make DESTDIR=$DESTDIR install
    8.16  }
    8.17  
     9.1 --- a/libfm-gtk/receipt	Thu Dec 03 15:56:36 2015 -0200
     9.2 +++ b/libfm-gtk/receipt	Fri Dec 04 02:45:17 2015 +0200
     9.3 @@ -9,14 +9,7 @@
     9.4  WEB_SITE="http://pcmanfm.sourceforge.net"
     9.5  
     9.6  WANTED="libfm"
     9.7 -#DEPENDS="util-linux-uuid libxcb xcb-util expat pixman shared-mime-info" ???
     9.8 -DEPENDS="atk bzlib cairo fontconfig freetype gdk-pixbuf glib glibc-base gtk+ \
     9.9 -libffi libfm libgio libxml2 menu-cache pango pcre zlib"
    9.10 -
    9.11 -# handle SliTaz arch and cross compilation ???
    9.12 -#case "$SLITAZ_ARCH" in
    9.13 -#	i?86) DEPENDS="$DEPENDS gamin"
    9.14 -#esac
    9.15 +DEPENDS="libfm gtk+"
    9.16  
    9.17  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.18  genpkg_rules()
    10.1 --- a/libtool/receipt	Thu Dec 03 15:56:36 2015 -0200
    10.2 +++ b/libtool/receipt	Fri Dec 04 02:45:17 2015 +0200
    10.3 @@ -22,7 +22,6 @@
    10.4  # Rules to configure and make the package.
    10.5  compile_rules()
    10.6  {
    10.7 -	cd $src
    10.8  	./configure \
    10.9  		--enable-shared \
   10.10  		$CONFIGURE_ARGS &&
    11.1 --- a/pango-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
    11.2 +++ b/pango-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
    11.3 @@ -16,13 +16,13 @@
    11.4  genpkg_rules()
    11.5  {
    11.6  	mkdir -p $fs/usr/lib $fs/usr/share
    11.7 -    cp -a $install/usr/lib/*.*a $fs/usr/lib
    11.8 -    cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    11.9 -    [ -d "$install/usr/lib/girepository-1.0" ] && \
   11.10 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
   11.11 +	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
   11.12 +	[ -d "$install/usr/lib/girepository-1.0" ] && \
   11.13  		cp -a $install/usr/lib/girepository-1.0 $fs/usr/lib
   11.14  	[ -d "$install/usr/share/gir-1.0" ] && \
   11.15  		cp -a $install/usr/share/gir-1.0 $fs/usr/share
   11.16 -    cp -a $install/usr/include $fs/usr
   11.17 -    cp -a $install/usr/lib/pango $fs/usr/lib
   11.18 -    rm -rf $fs/usr/lib/pango/1.8.0/modules/*.so
   11.19 +	cp -a $install/usr/include $fs/usr
   11.20 +	cp -a $install/usr/lib/pango $fs/usr/lib
   11.21 +	rm -rf $fs/usr/lib/pango/1.8.0/modules/*.so
   11.22  }
    12.1 --- a/pango/receipt	Thu Dec 03 15:56:36 2015 -0200
    12.2 +++ b/pango/receipt	Fri Dec 04 02:45:17 2015 +0200
    12.3 @@ -12,10 +12,8 @@
    12.4  CONFIG_FILES="/etc/pango/pango.modules"
    12.5  HOST_ARCH="i486 arm"
    12.6  
    12.7 -DEPENDS="cairo glib expat libxml2 xorg-libXft harfbuzz fontconfig freetype xcb-util \
    12.8 -bzlib slitaz-base-files gcc-lib-base xorg-libXft"
    12.9 -BUILD_DEPENDS="cairo-dev glib-dev expat-dev libxml2-dev xorg-libXft-dev \
   12.10 -libgio-dev harfbuzz-dev fontconfig-dev freetype-dev"
   12.11 +DEPENDS="cairo xorg-libXft slitaz-base-files gcc-lib-base"
   12.12 +BUILD_DEPENDS="cairo-dev libxml2-dev xorg-libXft-dev"
   12.13  
   12.14  # Handle cross compilation
   12.15  case "$ARCH" in
    13.1 --- a/shared-mime-info/receipt	Thu Dec 03 15:56:36 2015 -0200
    13.2 +++ b/shared-mime-info/receipt	Fri Dec 04 02:45:17 2015 +0200
    13.3 @@ -11,8 +11,8 @@
    13.4  WGET_URL="http://freedesktop.org/~hadess/$TARBALL"
    13.5  HOST_ARCH="i486 arm"
    13.6  
    13.7 -DEPENDS="glib libxml2 zlib"
    13.8 -BUILD_DEPENDS="perl-xml-parser glib-dev libxml2-dev intltool pkg-config"
    13.9 +DEPENDS="glib"
   13.10 +BUILD_DEPENDS="intltool"
   13.11  
   13.12  # Handle cross compilation. Host perl/intltool are used
   13.13  case "$ARCH" in
   13.14 @@ -22,9 +22,9 @@
   13.15  # Rules to configure and make the package.
   13.16  compile_rules()
   13.17  {
   13.18 -    #patch -Np1 -i $stuff/pbm.patch
   13.19 -    ./configure $CONFIGURE_ARGS &&
   13.20 -    make -j1 && make -j1 DESTDIR=$DESTDIR install
   13.21 +	#patch -Np1 -i $stuff/pbm.patch
   13.22 +	./configure $CONFIGURE_ARGS &&
   13.23 +	make -j1 && make -j1 DESTDIR=$DESTDIR install
   13.24  }
   13.25  
   13.26  # Rules to gen a SliTaz package suitable for Tazpkg.
   13.27 @@ -37,9 +37,3 @@
   13.28  	# Additional MIME-types supported by SliTaz
   13.29  	cp $stuff/*.xml $fs/usr/share/mime/packages
   13.30  }
   13.31 -
   13.32 -# Update mime database.
   13.33 -post_install()
   13.34 -{
   13.35 -	chroot "$1/" /usr/bin/update-mime-database /usr/share/mime
   13.36 -}
    14.1 --- a/startup-notification/receipt	Thu Dec 03 15:56:36 2015 -0200
    14.2 +++ b/startup-notification/receipt	Fri Dec 04 02:45:17 2015 +0200
    14.3 @@ -8,11 +8,10 @@
    14.4  LICENSE="LGPL2"
    14.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
    14.6  WEB_SITE="http://freedesktop.org/software/startup-notification/releases/"
    14.7 -WGET_URL="http://freedesktop.org/software/startup-notification/releases/$TARBALL"
    14.8 +WGET_URL="${WEB_SITE}$TARBALL"
    14.9  HOST_ARCH="i486 arm"
   14.10  
   14.11 -DEPENDS="util-linux-uuid libxcb xcb-util xorg-libICE xorg-libSM \
   14.12 -xorg-libX11 xorg-libXau xorg-libXdmcp"
   14.13 +DEPENDS="xcb-util xorg-libSM xorg-libX11"
   14.14  BUILD_DEPENDS="util-linux-uuid-dev libxcb-dev xcb-util-dev"
   14.15  
   14.16  # Rules to configure and make the package.
   14.17 @@ -31,4 +30,3 @@
   14.18  	mkdir -p $fs/usr/lib
   14.19  	cp -a $install/usr/lib/*.so* $fs/usr/lib
   14.20  }
   14.21 -
    15.1 --- a/tazpkg/receipt	Thu Dec 03 15:56:36 2015 -0200
    15.2 +++ b/tazpkg/receipt	Fri Dec 04 02:45:17 2015 +0200
    15.3 @@ -1,7 +1,7 @@
    15.4  # SliTaz package receipt.
    15.5  
    15.6  PACKAGE="tazpkg"
    15.7 -VERSION="878"
    15.8 +VERSION="880"
    15.9  CATEGORY="base-system"
   15.10  SHORT_DESC="SliTaz packages manager"
   15.11  MAINTAINER="pankso@slitaz.org"
    16.1 --- a/tiff-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
    16.2 +++ b/tiff-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
    16.3 @@ -3,7 +3,7 @@
    16.4  PACKAGE="tiff-dev"
    16.5  VERSION="4.0.3"
    16.6  CATEGORY="development"
    16.7 -SHORT_DESC="TIFF images libs devel files. (Check tiff-apps for utilities)."
    16.8 +SHORT_DESC="TIFF images libs devel files"
    16.9  MAINTAINER="pankso@slitaz.org"
   16.10  LICENSE="MIT"
   16.11  WANTED="tiff"
   16.12 @@ -15,7 +15,7 @@
   16.13  # Rules to gen a SliTaz package suitable for Tazpkg.
   16.14  genpkg_rules()
   16.15  {
   16.16 -    mkdir -p $fs/usr/lib
   16.17 -    cp -a $install/usr/lib/*.*a $fs/usr/lib
   16.18 -    cp -a $install/usr/include $fs/usr
   16.19 +	mkdir -p $fs/usr/lib
   16.20 +	cp -a $install/usr/lib/*.*a $fs/usr/lib
   16.21 +	cp -a $install/usr/include $fs/usr
   16.22  }
    17.1 --- a/tiff/receipt	Thu Dec 03 15:56:36 2015 -0200
    17.2 +++ b/tiff/receipt	Fri Dec 04 02:45:17 2015 +0200
    17.3 @@ -17,13 +17,13 @@
    17.4  # Rules to configure and make the package.
    17.5  compile_rules()
    17.6  {
    17.7 -    ./configure $CONFIGURE_ARGS &&
    17.8 -    make && make install
    17.9 +	./configure $CONFIGURE_ARGS &&
   17.10 +	make && make install
   17.11  }
   17.12  
   17.13  # Rules to gen a SliTaz package suitable for Tazpkg.
   17.14  genpkg_rules()
   17.15  {
   17.16 -    mkdir -p $fs/usr/lib
   17.17 -    cp -a $install/usr/lib/*.so* $fs/usr/lib
   17.18 +	mkdir -p $fs/usr/lib
   17.19 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
   17.20  }
    18.1 --- a/util-linux-blkid/receipt	Thu Dec 03 15:56:36 2015 -0200
    18.2 +++ b/util-linux-blkid/receipt	Fri Dec 04 02:45:17 2015 +0200
    18.3 @@ -26,19 +26,11 @@
    18.4  post_install()
    18.5  {
    18.6  	if [ -d "$INSTALLED/util-linux-ng-blkid" ]; then
    18.7 -		echo "Removing old: util-linux-ng-blkid"
    18.8  		rm -rf $INSTALLED/util-linux-ng-blkid
    18.9  	fi
   18.10  }
   18.11  
   18.12 -# Overlap busybox
   18.13 -pre_install()
   18.14 -{
   18.15 -	rm -f $root/sbin/blkid
   18.16 -}
   18.17 -
   18.18  post_remove()
   18.19  {
   18.20 -	cd $root/sbin
   18.21 -	ln -s ../bin/busybox blkid
   18.22 +	ln -s ../bin/busybox "$1/sbin/blkid"
   18.23  }
    19.1 --- a/util-linux-mount/receipt	Thu Dec 03 15:56:36 2015 -0200
    19.2 +++ b/util-linux-mount/receipt	Fri Dec 04 02:45:17 2015 +0200
    19.3 @@ -18,6 +18,5 @@
    19.4  	cp -a $install/bin/findmnt $fs/bin
    19.5  	cp -a $install/bin/*mount* $fs/bin
    19.6  	cp -a $install/lib/libmount.so* $fs/lib
    19.7 -	cd $fs/usr/lib &&
    19.8 -	ln -sf ../../lib/libmount.so.1.1.0 libmount.so
    19.9 +	ln -sf ../../lib/libmount.so.1.1.0 $fs/usr/lib/libmount.so
   19.10  }
    20.1 --- a/xcb-util-dev/receipt	Thu Dec 03 15:56:36 2015 -0200
    20.2 +++ b/xcb-util-dev/receipt	Fri Dec 04 02:45:17 2015 +0200
    20.3 @@ -7,7 +7,7 @@
    20.4  MAINTAINER="mallory@sweetpeople.org"
    20.5  LICENSE="MIT"
    20.6  WANTED="xcb-util"
    20.7 -WEB_SITE="http://xcb.freedesktop.org"
    20.8 +WEB_SITE="http://xcb.freedesktop.org/"
    20.9  HOST_ARCH="i486 arm"
   20.10  
   20.11  DEPENDS="xcb-util"
    21.1 --- a/xcb-util/receipt	Thu Dec 03 15:56:36 2015 -0200
    21.2 +++ b/xcb-util/receipt	Fri Dec 04 02:45:17 2015 +0200
    21.3 @@ -7,12 +7,12 @@
    21.4  MAINTAINER="mallory@sweetpeople.org"
    21.5  LICENSE="MIT"
    21.6  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    21.7 -WEB_SITE="http://xcb.freedesktop.org"
    21.8 -WGET_URL="$WEB_SITE/dist/$TARBALL"
    21.9 +WEB_SITE="http://xcb.freedesktop.org/"
   21.10 +WGET_URL="${WEB_SITE}dist/$TARBALL"
   21.11  HOST_ARCH="i486 arm"
   21.12  
   21.13 -DEPENDS="libxcb xorg-libXdmcp"
   21.14 -BUILD_DEPENDS="libxcb-dev xorg-libXdmcp-dev gperf"
   21.15 +DEPENDS="libxcb"
   21.16 +BUILD_DEPENDS="libxcb-dev gperf"
   21.17  
   21.18  # Handle cross compilation
   21.19  case "$ARCH" in
   21.20 @@ -22,7 +22,6 @@
   21.21  # Rules to configure and make the package.
   21.22  compile_rules()
   21.23  {
   21.24 -	cd $src
   21.25  	./configure \
   21.26  		--prefix=/usr \
   21.27  		--infodir=/usr/share/info \
   21.28 @@ -34,7 +33,6 @@
   21.29  # Rules to gen a SliTaz package suitable for Tazpkg.
   21.30  genpkg_rules()
   21.31  {
   21.32 -	mkdir -p $fs/usr/lib 
   21.33 +	mkdir -p $fs/usr/lib
   21.34  	cp -a $install/usr/lib/*.so* $fs/usr/lib
   21.35  }
   21.36 -