wok-next rev 18734

Remove redundant messages in {pre|post}_{install|remove}() in random packages
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Dec 21 02:53:09 2015 +0200 (2015-12-21)
parents b685a2174a02
children 139df21c10dd
files clamav/receipt coreutils-conditions/receipt coreutils-context-user/receipt coreutils-file-format/receipt coreutils-file-output-full/receipt coreutils-file-output-part/receipt coreutils-line/receipt coreutils-path/receipt coreutils-redirection/receipt coreutils/receipt couchdb/receipt docbook-xsl-ns/receipt eom/receipt evince/receipt fpc/receipt gcc+gcj/receipt gcc/receipt gecko-mediaplayer/receipt gnu-netcat/receipt gnucash/receipt hd2u/receipt less/receipt lighttpd-ssl/receipt linux/receipt lzma/receipt mate-control-center/receipt mate-desktop/receipt mate-session-manager/receipt mate-terminal/receipt mplayerplug-in/receipt nginx/receipt nvidia-173xx/receipt open-iscsi/receipt ovz-web-panel/receipt ssmtp/receipt sudo/receipt usbutils/receipt xfce4/receipt
line diff
     1.1 --- a/clamav/receipt	Mon Dec 21 01:46:18 2015 +0200
     1.2 +++ b/clamav/receipt	Mon Dec 21 02:53:09 2015 +0200
     1.3 @@ -21,7 +21,6 @@
     1.4  	# Have to create clamav user/group to be able to compile
     1.5  	adduser -s /bin/false -H -D -u 64 clamav
     1.6  
     1.7 -	cd $src
     1.8  	./configure \
     1.9  		--prefix=/usr \
    1.10  		--sysconfdir=/etc/clamav \
    1.11 @@ -47,7 +46,7 @@
    1.12  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.13  	# Copy daemon from /$stuff
    1.14  	cp $stuff/daemon-clamd $fs/etc/init.d/clamd
    1.15 -	
    1.16 +
    1.17  	# Customize config
    1.18  	sed -i -e "s/^Example/#Example/" \
    1.19  		-e "s|^#LogFile /tmp/clamd.log|LogFile /var/log/clamav/clamav.log|" \
    1.20 @@ -59,24 +58,18 @@
    1.21  
    1.22  post_install()
    1.23  {
    1.24 -	
    1.25 -	local user
    1.26 -	local group
    1.27 -	
    1.28 -	user=clamav
    1.29 -	group=clamav
    1.30 -	
    1.31 -	echo "Processing post-install commands..."
    1.32 -	
    1.33 +	local user=clamav
    1.34 +	local group=clamav
    1.35 +
    1.36  	# Enable freshclam update
    1.37 -	echo -n "Enabling freshclam update..."
    1.38 +	echo; action 'Enabling freshclam update...'
    1.39  	cd "$1/etc/clamav"
    1.40 -	sed -i 's/^Example/#Example/' freshclam.conf 
    1.41 +	sed -i 's/^Example/#Example/' freshclam.conf
    1.42  	status
    1.43  
    1.44  	# adduser clamav if needed
    1.45  	if ! grep -q "${user}:" "$1/etc/passwd"; then
    1.46 -		echo -n "Adding user/group $user..."
    1.47 +		action 'Adding user/group $user...'
    1.48  		chroot "$1/" addgroup -S $group
    1.49  		chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user
    1.50  		status
    1.51 @@ -84,15 +77,14 @@
    1.52  
    1.53  	# Enable daily.cvd updates (sometimes needed for new version)
    1.54  	#chown -R ${user}:${group} "$1/var/lib/clamav"
    1.55 -	
    1.56 +
    1.57  	# Fix perms
    1.58  	chroot "$1/" chown -R ${user}.${group} /var/log/clamav \
    1.59  		/run/clamav /var/lib/clamav
    1.60 -
    1.61  }
    1.62  
    1.63  # Del user clamav when pkg is removed.
    1.64  post_remove()
    1.65  {
    1.66 -	chroot "$1/" deluser clamav	
    1.67 +	chroot "$1/" deluser clamav
    1.68  }
     2.1 --- a/coreutils-conditions/receipt	Mon Dec 21 01:46:18 2015 +0200
     2.2 +++ b/coreutils-conditions/receipt	Mon Dec 21 02:53:09 2015 +0200
     2.3 @@ -29,18 +29,6 @@
     2.4  	cp -a $install/usr/bin/expr $fs/usr/bin
     2.5  }
     2.6  
     2.7 -# Pre and post install commands for Tazpkg.
     2.8 -# We must remove all Busybox symlink before installing.
     2.9 -#
    2.10 -pre_install()
    2.11 -{
    2.12 -	echo "Processing pre-install commands..."
    2.13 -	echo -n "Removing all Busybox replaced utils... "
    2.14 -	rm -f "$1/bin/false" "$1/bin/true"
    2.15 -	rm -f "$1/usr/bin/test" "$1/usr/bin/[" "$1/usr/bin/expr"
    2.16 -	status
    2.17 -}
    2.18 -
    2.19  post_remove()
    2.20  {
    2.21  	ln -s /bin/busybox "$1/bin/false"
     3.1 --- a/coreutils-context-user/receipt	Mon Dec 21 01:46:18 2015 +0200
     3.2 +++ b/coreutils-context-user/receipt	Mon Dec 21 02:53:09 2015 +0200
     3.3 @@ -31,18 +31,6 @@
     3.4  	cp -a $install/usr/bin/who $fs/usr/bin
     3.5  }
     3.6  
     3.7 -# Pre and post install commands for Tazpkg.
     3.8 -# We must remove all Busybox symlink before installing.
     3.9 -#
    3.10 -pre_install()
    3.11 -{
    3.12 -	echo "Processing pre-install commands..."
    3.13 -	echo -n "Removing all Busybox replaced utils... "
    3.14 -	rm -f "$1/bin/id"
    3.15 -	rm -f "$1/usr/bin/logname" "$1/usr/bin/whoami" "$1/usr/bin/who"
    3.16 -	status
    3.17 -}
    3.18 -
    3.19  post_remove()
    3.20  {
    3.21  	ln -s /bin/busybox "$1/bin/id"
     4.1 --- a/coreutils-file-format/receipt	Mon Dec 21 01:46:18 2015 +0200
     4.2 +++ b/coreutils-file-format/receipt	Mon Dec 21 02:53:09 2015 +0200
     4.3 @@ -25,17 +25,6 @@
     4.4  	cp -a $install/usr/bin/fold $fs/usr/bin
     4.5  }
     4.6  
     4.7 -# Pre and post install commands for Tazpkg.
     4.8 -# We must remove all Busybox symlink before installing.
     4.9 -#
    4.10 -pre_install()
    4.11 -{
    4.12 -	echo "Processing pre-install commands..."
    4.13 -	echo -n "Removing all Busybox replaced utils... "
    4.14 -	rm -f "$root/usr/bin/fold"
    4.15 -	status
    4.16 -}
    4.17 -
    4.18  post_remove()
    4.19  {
    4.20  	ln -s /bin/busybox "$1/usr/bin/fold"
     5.1 --- a/coreutils-file-output-full/receipt	Mon Dec 21 01:46:18 2015 +0200
     5.2 +++ b/coreutils-file-output-full/receipt	Mon Dec 21 02:53:09 2015 +0200
     5.3 @@ -29,17 +29,6 @@
     5.4  	cp -a $install/usr/bin/base64 $fs/usr/bin
     5.5  }
     5.6  
     5.7 -# Pre and post install commands for Tazpkg.
     5.8 -# We must remove all Busybox symlink before installing.
     5.9 -#
    5.10 -pre_install()
    5.11 -{
    5.12 -	echo "Processing pre-install commands..."
    5.13 -	echo -n "Removing all Busybox replaced utils... "
    5.14 -	rm -f "$1/bin/cat" "$1/usr/bin/od" "$1/usr/bin/tac"
    5.15 -	status
    5.16 -}
    5.17 -
    5.18  post_remove()
    5.19  {
    5.20  	ln -s /bin/busybox "$1/bin/cat"
     6.1 --- a/coreutils-file-output-part/receipt	Mon Dec 21 01:46:18 2015 +0200
     6.2 +++ b/coreutils-file-output-part/receipt	Mon Dec 21 02:53:09 2015 +0200
     6.3 @@ -26,17 +26,6 @@
     6.4  	cp -a $install/usr/bin/csplit $fs/usr/bin
     6.5  }
     6.6  
     6.7 -# Pre and post install commands for Tazpkg.
     6.8 -# We must remove all Busybox symlink before installing.
     6.9 -#
    6.10 -pre_install()
    6.11 -{
    6.12 -	echo "Processing pre-install commands..."
    6.13 -	echo -n "Removing all Busybox replaced utils... "
    6.14 -	rm -f "$1/usr/bin/head" "$1/usr/bin/tail" "$1/usr/bin/split"
    6.15 -	status
    6.16 -}
    6.17 -
    6.18  post_remove()
    6.19  {
    6.20  	ln -s /bin/busybox "$1/usr/bin/head"
     7.1 --- a/coreutils-line/receipt	Mon Dec 21 01:46:18 2015 +0200
     7.2 +++ b/coreutils-line/receipt	Mon Dec 21 02:53:09 2015 +0200
     7.3 @@ -25,17 +25,6 @@
     7.4  	cp -a $install/usr/bin/join $fs/usr/bin
     7.5  }
     7.6  
     7.7 -# Pre and post install commands for Tazpkg.
     7.8 -# We must remove all Busybox symlink before installing.
     7.9 -#
    7.10 -pre_install()
    7.11 -{
    7.12 -	echo "Processing pre-install commands..."
    7.13 -	echo -n "Removing all Busybox replaced utils... "
    7.14 -	rm -f "$1/usr/bin/cut"
    7.15 -	status
    7.16 -}
    7.17 -
    7.18  post_remove()
    7.19  {
    7.20  	ln -s /bin/busybox "$1/usr/bin/cut"
     8.1 --- a/coreutils-path/receipt	Mon Dec 21 01:46:18 2015 +0200
     8.2 +++ b/coreutils-path/receipt	Mon Dec 21 02:53:09 2015 +0200
     8.3 @@ -25,17 +25,6 @@
     8.4  	cp -a $install/usr/bin/pathchk $fs/usr/bin
     8.5  }
     8.6  
     8.7 -# Pre and post install commands for Tazpkg.
     8.8 -# We must remove all Busybox symlink before installing.
     8.9 -#
    8.10 -pre_install()
    8.11 -{
    8.12 -	echo "Processing pre-install commands..."
    8.13 -	echo -n "Removing all Busybox replaced utils... "
    8.14 -	rm -f "$1/usr/bin/basename" "$1/usr/bin/dirname"
    8.15 -	status
    8.16 -}
    8.17 -
    8.18  post_remove()
    8.19  {
    8.20  	ln -s /bin/busybox "$1/usr/bin/basename"
     9.1 --- a/coreutils-redirection/receipt	Mon Dec 21 01:46:18 2015 +0200
     9.2 +++ b/coreutils-redirection/receipt	Mon Dec 21 02:53:09 2015 +0200
     9.3 @@ -23,17 +23,6 @@
     9.4  	cp -a $install/usr/bin/tee $fs/usr/bin
     9.5  }
     9.6  
     9.7 -# Pre and post install commands for Tazpkg.
     9.8 -# We must remove all Busybox symlink before installing.
     9.9 -#
    9.10 -pre_install()
    9.11 -{
    9.12 -	echo "Processing pre-install commands..."
    9.13 -	echo -n "Removing all Busybox replaced utils... "
    9.14 -	rm -f "$1/usr/bin/tee"
    9.15 -	status
    9.16 -}
    9.17 -
    9.18  post_remove()
    9.19  {
    9.20  	ln -s /bin/busybox "$1/usr/bin/tee"
    10.1 --- a/coreutils/receipt	Mon Dec 21 01:46:18 2015 +0200
    10.2 +++ b/coreutils/receipt	Mon Dec 21 02:53:09 2015 +0200
    10.3 @@ -16,8 +16,6 @@
    10.4  # Rules to configure and make the package.
    10.5  compile_rules()
    10.6  {
    10.7 -	cd $src
    10.8 -
    10.9  	# NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3
   10.10  
   10.11  	# Hack to fix ls: expected specifier-qualifier-list before '__u64'
   10.12 @@ -38,7 +36,7 @@
   10.13  	sed -i 's/1.10a/1.10.2/' configure.ac || return 1
   10.14  	sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1
   10.15  
   10.16 -	./configure $CONFIGURE_ARGS && 
   10.17 +	./configure $CONFIGURE_ARGS &&
   10.18  	make && make install
   10.19  
   10.20  	# Restore original sigcontext.h
   10.21 @@ -71,24 +69,10 @@
   10.22  	cp -a $install/usr/bin/cp $fs/usr/bin
   10.23  }
   10.24  
   10.25 -# Pre and post install commands for Tazpkg.
   10.26 -# We must remove all Busybox symlink but cp before installing.
   10.27 -#
   10.28 -pre_install()
   10.29 -{
   10.30 -	echo "Processing pre-install commands..."
   10.31 -	# we keed busybox cp for installing the pkg
   10.32 -	echo -n "Removing Busybox replaced utils... "
   10.33 -	rm -f "$1/usr/bin/od" "$1/usr/bin/split"
   10.34 -	status
   10.35 -}
   10.36 -
   10.37  post_install()
   10.38  {
   10.39 -	echo -n "Installing cp..."
   10.40  	rm "$1/bin/cp" &&
   10.41  	mv "$1/usr/bin/cp" "$1/bin"
   10.42 -	status
   10.43  }
   10.44  
   10.45  post_remove()
    11.1 --- a/couchdb/receipt	Mon Dec 21 01:46:18 2015 +0200
    11.2 +++ b/couchdb/receipt	Mon Dec 21 02:53:09 2015 +0200
    11.3 @@ -18,7 +18,6 @@
    11.4  # Rules to configure and make the package.
    11.5  compile_rules()
    11.6  {
    11.7 -	cd $src
    11.8  	./configure \
    11.9  		--prefix=/usr \
   11.10  		--sysconfdir=/etc \
   11.11 @@ -52,9 +51,7 @@
   11.12  pre_install()
   11.13  {
   11.14  	INIT_FILE="/etc/init.d/$PACKAGE"
   11.15 -	echo "Processing pre-install commands..."
   11.16  	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
   11.17 -	echo "Done..."
   11.18  }
   11.19  
   11.20  # Post install commands for tazpkg
   11.21 @@ -66,8 +63,6 @@
   11.22  	LOGDIR="/var/log/$PACKAGE"
   11.23  	RUNDIR="/var/run/$PACKAGE"
   11.24  
   11.25 -	echo "Processing post-install commands..."
   11.26 -
   11.27  	grep -q "$PACKAGE" "$1/etc/group" || chroot "$1/" addgroup -S $PACKAGE
   11.28  
   11.29  	grep -q "$PACKAGE" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \
   11.30 @@ -77,17 +72,13 @@
   11.31  		chroot "$1/" chown -R $PACKAGE:$PACKAGE $DIR &&
   11.32  		chroot "$1/" chmod -R 0770 $DIR
   11.33  	done
   11.34 -
   11.35 -	echo "Done..."
   11.36  }
   11.37  
   11.38  # Pre and post remove commands for Tazpkg.
   11.39  pre_remove()
   11.40  {
   11.41  	INIT_FILE="/etc/init.d/$PACKAGE"
   11.42 -	echo "Processing pre-remove commands..."
   11.43  	[ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop
   11.44 -	echo "Done..."
   11.45  }
   11.46  
   11.47  post_remove()
   11.48 @@ -97,13 +88,9 @@
   11.49  	LOGDIR="/var/log/$PACKAGE"
   11.50  	RUNDIR="/var/run/$PACKAGE"
   11.51  
   11.52 -	echo "Processing post-remove commands..."
   11.53 -
   11.54  	chroot "$1/" deluser $PACKAGE
   11.55  
   11.56  	for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do
   11.57  		rm -rf "$1$DIR"
   11.58  	done
   11.59 -
   11.60 -	echo "Done..."
   11.61  }
    12.1 --- a/docbook-xsl-ns/receipt	Mon Dec 21 01:46:18 2015 +0200
    12.2 +++ b/docbook-xsl-ns/receipt	Mon Dec 21 02:53:09 2015 +0200
    12.3 @@ -15,15 +15,14 @@
    12.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    12.5  genpkg_rules()
    12.6  {
    12.7 -	cd $src
    12.8  	pkgroot=$fs/usr/share/xml/docbook/stylesheet/$PACKAGE
    12.9  	install -dm755 $pkgroot/common
   12.10  	install -dm755 $pkgroot/params
   12.11 -	
   12.12 +
   12.13  	for fn in xml xsl dtd ent; do
   12.14  		install -m644 common/*.${fn} $pkgroot/common/
   12.15  	done
   12.16 -	
   12.17 +
   12.18  	for fn in fo highlighting html roundtrip; do
   12.19  		install -dm755 ${pkgroot}/${fn}
   12.20  		install -m644 ${fn}/*.xml ${pkgroot}/${fn}/
   12.21 @@ -39,16 +38,15 @@
   12.22  # Pre and post install commands for Tazpkg.
   12.23  post_install()
   12.24  {
   12.25 -	echo -n "Processing post-install commands..."
   12.26  	if [ "$1" ]; then
   12.27 -		mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null
   12.28 +		mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2>/dev/null
   12.29  		cp /etc/resolv.conf "$1/etc/resolv.conf"
   12.30  	fi
   12.31  
   12.32  	# Create a /etc/xml/catalog file
   12.33  	if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi &&
   12.34  	if [ ! -f "$1/etc/xml/catalog" ]; then
   12.35 -    		chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
   12.36 +		chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog
   12.37  	fi &&
   12.38  
   12.39  	chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \
   12.40 @@ -70,9 +68,8 @@
   12.41  		"http://docbook.sourceforge.net/release/xsl-ns/current" \
   12.42  		"/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \
   12.43  	/etc/xml/catalog
   12.44 -	status
   12.45 +
   12.46  	if [ "$1" ]; then
   12.47 -		mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null
   12.48 +		mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2>/dev/null
   12.49  	fi
   12.50  }
   12.51 -
    13.1 --- a/eom/receipt	Mon Dec 21 01:46:18 2015 +0200
    13.2 +++ b/eom/receipt	Mon Dec 21 02:53:09 2015 +0200
    13.3 @@ -38,15 +38,3 @@
    13.4  	cp -a $install/usr/share/glib-2.0 $fs/usr/share
    13.5  	cp -a $install/usr/share/MateConf $fs/usr/share
    13.6  }
    13.7 -
    13.8 -post_install()
    13.9 -{
   13.10 -	echo "Processing post-install commands..."
   13.11 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   13.12 -}
   13.13 -
   13.14 -post_remove()
   13.15 -{
   13.16 -	echo "Processing post-remove commands..."
   13.17 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   13.18 -}
    14.1 --- a/evince/receipt	Mon Dec 21 01:46:18 2015 +0200
    14.2 +++ b/evince/receipt	Mon Dec 21 02:53:09 2015 +0200
    14.3 @@ -41,26 +41,13 @@
    14.4  	cp -a $install/usr/bin $fs/usr
    14.5  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    14.6  	cp -a $install/usr/lib/evince $fs/usr/lib
    14.7 -	
    14.8 +
    14.9  	cp -a $install/usr/share/dbus-1 $fs/usr/share
   14.10  	cp -a $install/usr/share/icons $fs/usr/share
   14.11  	cp -a $install/usr/share/evince $fs/usr/share
   14.12  	cp -a $install/usr/share/glib-2.0/schemas $fs/usr/share/glib-2.0
   14.13  	cp -a $stuff/evince.desktop $fs/usr/share/applications
   14.14 -	
   14.15 +
   14.16  	# Removing unwanted files
   14.17  	find $fs/usr/lib -name "*.*a" -exec rm -rf {} \;
   14.18  }
   14.19 -
   14.20 -# Post install/remove commands for Tazpkg.
   14.21 -post_install()
   14.22 -{
   14.23 -	echo "Processing post-install commands..."
   14.24 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   14.25 -}
   14.26 -
   14.27 -post_remove()
   14.28 -{
   14.29 -	echo "Processing post-remove commands..."
   14.30 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   14.31 -}
    15.1 --- a/fpc/receipt	Mon Dec 21 01:46:18 2015 +0200
    15.2 +++ b/fpc/receipt	Mon Dec 21 02:53:09 2015 +0200
    15.3 @@ -41,7 +41,7 @@
    15.4  			BINUTILSPREFIX=arm-slitaz-gnueabi- \ 
    15.5  			INSTALL_PREFIX=$DESTDIR/usr ;;
    15.6  	esac &&
    15.7 -	
    15.8 +
    15.9  	# install package license
   15.10  	install -m 755 -d $DESTDIR/usr/share/licenses/fpc &&
   15.11  	install -m 644 $src/fpcsrc/rtl/COPYING.FPC \
   15.12 @@ -54,10 +54,10 @@
   15.13  	mkdir -p $fs/usr $fs/etc
   15.14  	cp -a $install/usr/bin $fs/usr
   15.15  	cp -a $install/usr/lib $fs/usr
   15.16 -	
   15.17 +
   15.18  	# create symlink for compiler
   15.19  	ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin
   15.20 -	
   15.21 +
   15.22  	# config file
   15.23  	#mkdir -p $fs/etc
   15.24  	#cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg
   15.25 @@ -65,14 +65,12 @@
   15.26  
   15.27  post_install()
   15.28  {
   15.29 -	echo"Processing postinstall commands..."
   15.30  	if [ ! -f "$1/etc/fpc.cfg" ]; then
   15.31  		chroot "$1/" fpcmkcfg > /etc/fpc.cfg 
   15.32  	fi
   15.33 -	
   15.34 +
   15.35  	# Fix units search path
   15.36  	sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \
   15.37  	-e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/*!' \
   15.38  	-e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' "$1/etc/fpc.cfg"
   15.39 -
   15.40  }
    16.1 --- a/gcc+gcj/receipt	Mon Dec 21 01:46:18 2015 +0200
    16.2 +++ b/gcc+gcj/receipt	Mon Dec 21 02:53:09 2015 +0200
    16.3 @@ -26,7 +26,6 @@
    16.4  # Rules to configure and make the package.
    16.5  compile_rules()
    16.6  {
    16.7 -	cd $src
    16.8  	sed -i 's/@mkdir_p@/mkdir -p/' libjava/classpath/lib/copy-vmresources.sh.in
    16.9  	# Set HOST_SYSTEM if not defined in tazwok.conf as it should be
   16.10  	if [ -z "$HOST_SYSTEM" ] ; then
   16.11 @@ -52,10 +51,10 @@
   16.12  	# Use libiberty.a from binutils.
   16.13  	sed -i 's/install_to_$(INSTALL_DEST) //' \
   16.14  		$src/libiberty/Makefile.in || return 1
   16.15 -    mkdir -p ../build && cd ../build
   16.16 +	mkdir -p ../build && cd ../build
   16.17  
   16.18 -    PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
   16.19 -    ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
   16.20 +	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
   16.21 +	../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \
   16.22  		--infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \
   16.23  		--enable-languages=c,c++,objc,java --enable-shared \
   16.24  		--with-system-zlib \
   16.25 @@ -69,10 +68,10 @@
   16.26  		--enable-gtk-cairo \
   16.27  		--enable-lto \
   16.28  		$CONFIGURE_ARGS $GCC_TARGET  &&
   16.29 -    make bootstrap &&
   16.30 -    # Make install in the source tree to help creating derived pkgs
   16.31 -    # and keep $_pkg variable set for genpkg.
   16.32 -    make install
   16.33 +	make bootstrap &&
   16.34 +	# Make install in the source tree to help creating derived pkgs
   16.35 +	# and keep $_pkg variable set for genpkg.
   16.36 +	make install
   16.37  }
   16.38  
   16.39  # Rules to gen a SliTaz package suitable for Tazpkg.
   16.40 @@ -80,23 +79,22 @@
   16.41  {
   16.42  	mkdir -p  $fs/usr/share
   16.43  	cp -a $install/usr/share/java $fs/usr/share
   16.44 -    cp -a $install/usr/bin $fs/usr
   16.45 -    # Copy all libs. Remove libgcc_s.so and libstdc++.so
   16.46 -    # they goes in gcc-lib-base-$VERSION package.
   16.47 -    cp -a $install/usr/lib $fs/usr
   16.48 -    rm $fs/usr/lib/libgcc_s.so*
   16.49 -    rm $fs/usr/lib/libstdc++.so*
   16.50 -    rm $fs/usr/lib/libgomp.so*
   16.51 -    #rm $fs/usr/lib/gcj-$VERSION-11/*.la
   16.52 -    rm $fs/usr/lib/*.la
   16.53 -    # Include files.
   16.54 -    cp -a $install/usr/include $fs/usr
   16.55 +	cp -a $install/usr/bin $fs/usr
   16.56 +	# Copy all libs. Remove libgcc_s.so and libstdc++.so
   16.57 +	# they goes in gcc-lib-base-$VERSION package.
   16.58 +	cp -a $install/usr/lib $fs/usr
   16.59 +	rm $fs/usr/lib/libgcc_s.so*
   16.60 +	rm $fs/usr/lib/libstdc++.so*
   16.61 +	rm $fs/usr/lib/libgomp.so*
   16.62 +	#rm $fs/usr/lib/gcj-$VERSION-11/*.la
   16.63 +	rm $fs/usr/lib/*.la
   16.64 +	# Include files.
   16.65 +	cp -a $install/usr/include $fs/usr
   16.66  }
   16.67  
   16.68  # Post install commands for Tazpkg.
   16.69  post_install()
   16.70  {
   16.71 -	echo "Processing post-install commands..."
   16.72  	if [ ! -f "$1/lib/cpp" ] ; then
   16.73  		ln -s ../usr/bin/cpp "$1/lib"
   16.74  	fi
    17.1 --- a/gcc/receipt	Mon Dec 21 01:46:18 2015 +0200
    17.2 +++ b/gcc/receipt	Mon Dec 21 02:53:09 2015 +0200
    17.3 @@ -118,7 +118,6 @@
    17.4  # Post install commands for Tazpkg.
    17.5  post_install()
    17.6  {
    17.7 -	echo "Processing post-install commands..."
    17.8  	[ -f "$1/lib/cpp" ] ||
    17.9  		ln -s ../usr/bin/cpp "$1/lib"
   17.10  	[ -f "$1/usr/bin/cc" ] ||
    18.1 --- a/gecko-mediaplayer/receipt	Mon Dec 21 01:46:18 2015 +0200
    18.2 +++ b/gecko-mediaplayer/receipt	Mon Dec 21 02:53:09 2015 +0200
    18.3 @@ -7,17 +7,16 @@
    18.4  MAINTAINER="jozee@slitaz.org"
    18.5  LICENSE="GPL2"
    18.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
    18.7 -WEB_SITE="http://code.google.com/p/gecko-mediaplayer/" 
    18.8 +WEB_SITE="http://code.google.com/p/gecko-mediaplayer/"
    18.9  WGET_URL="http://gecko-mediaplayer.googlecode.com/files/$TARBALL"
   18.10  TAGS="player audio video browser"
   18.11  
   18.12  DEPENDS="gnome-mplayer dbus-glib gcc-lib-base"
   18.13  BUILD_DEPENDS="firefox-dev dbus-dev dbus-glib-dev nspr-dev"
   18.14 - 
   18.15 +
   18.16  # Rules to configure and make the package.
   18.17  compile_rules()
   18.18  {
   18.19 -	cd $src	
   18.20  	sed -i 's/utf8characters/UTF8Characters/g' src/*.cpp
   18.21  	sed -i 's|NPP_Initialize|//&|' src/np_entry.cpp
   18.22  	sed -i 's|char[\*\) ]*NP*_GetMIMEDescription(|const &|' src/npupp.h \
   18.23 @@ -30,7 +29,6 @@
   18.24  		$CONFIGURE_ARGS &&
   18.25  	make  &&
   18.26  	make DESTDIR=$DESTDIR install
   18.27 -	
   18.28  }
   18.29  
   18.30  # Rules to gen a SliTaz package suitable for Tazpkg.
   18.31 @@ -38,21 +36,16 @@
   18.32  {
   18.33  	mkdir -p $fs/usr/lib
   18.34  	cp -a $install/usr/lib/mozilla $fs/usr/lib
   18.35 -
   18.36  }
   18.37  
   18.38  post_install()
   18.39  {
   18.40 -	echo -n "Processing post install commands..."
   18.41  	for i in "$1"/usr/lib/mozilla/plugins/$PACKAGE*.so ; do
   18.42  		ln -s "$i" "$1"/usr/lib/firefox*/plugins
   18.43 -	done 
   18.44 -	status
   18.45 +	done
   18.46  }
   18.47  
   18.48  post_remove()
   18.49  {
   18.50 -	echo -n "Processing post remove commands..."
   18.51  	rm -f /usr/lib/firefox*/plugins/$PACKAGE*.so
   18.52 -	status
   18.53  }
    19.1 --- a/gnu-netcat/receipt	Mon Dec 21 01:46:18 2015 +0200
    19.2 +++ b/gnu-netcat/receipt	Mon Dec 21 02:53:09 2015 +0200
    19.3 @@ -16,7 +16,6 @@
    19.4  # Rules to configure and make the package.
    19.5  compile_rules()
    19.6  {
    19.7 -	cd $src
    19.8  	./configure --mandir=/usr/share/man \
    19.9  		--infodir=/usr/share/info \
   19.10  		$CONFIGURE_ARGS &&
   19.11 @@ -30,18 +29,7 @@
   19.12  	cp -a $install/usr/bin $fs/usr
   19.13  }
   19.14  
   19.15 -# Pre and post install commands for Tazpkg.
   19.16 -# We must remove all Busybox symlink before installing.
   19.17 -#
   19.18 -pre_install()
   19.19 -{
   19.20 -	echo "Processing pre-install commands..."
   19.21 -	echo -n "Removing all Busybox replaced utils... "
   19.22 -	rm -f "$1/usr/bin/nc"
   19.23 -	status
   19.24 -}
   19.25 -
   19.26  post_remove()
   19.27  {
   19.28  	ln -s /bin/busybox "$1/usr/bin/nc"
   19.29 -}
   19.30 \ No newline at end of file
   19.31 +}
    20.1 --- a/gnucash/receipt	Mon Dec 21 01:46:18 2015 +0200
    20.2 +++ b/gnucash/receipt	Mon Dec 21 02:53:09 2015 +0200
    20.3 @@ -64,16 +64,3 @@
    20.4  		cp -a $install/usr/share/locale/$locale $fs/usr/share/locale
    20.5  	done
    20.6  }
    20.7 -
    20.8 -# Post install/remove commands for Tazpkg.
    20.9 -post_install()
   20.10 -{
   20.11 -  echo "Processing post-install commands..."
   20.12 -  chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   20.13 -}
   20.14 -
   20.15 -post_remove()
   20.16 -{ 
   20.17 -  echo "Processing post-remove commands..."
   20.18 -  chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   20.19 -}  
    21.1 --- a/hd2u/receipt	Mon Dec 21 01:46:18 2015 +0200
    21.2 +++ b/hd2u/receipt	Mon Dec 21 02:53:09 2015 +0200
    21.3 @@ -16,7 +16,6 @@
    21.4  # Rules to configure and make the package.
    21.5  compile_rules()
    21.6  {
    21.7 -	cd $src
    21.8  	./configure \
    21.9  		--prefix=/usr \
   21.10  		--infodir=/usr/share/info \
   21.11 @@ -32,18 +31,7 @@
   21.12  	cp -a $install/usr/bin $fs/usr
   21.13  }
   21.14  
   21.15 -# Pre and post install commands for Tazpkg.
   21.16 -# We must remove all Busybox symlink before installing.
   21.17 -#
   21.18 -pre_install()
   21.19 -{
   21.20 -	echo "Processing pre-install commands..."
   21.21 -	echo -n "Removing all Busybox replaced utils... "
   21.22 -	rm -f "$1/usr/bin/dos2unix"
   21.23 -	status
   21.24 -}
   21.25 -
   21.26  post_remove()
   21.27  {
   21.28  	ln -s /bin/busybox "$1/usr/bin/dos2unix"
   21.29 -}
   21.30 \ No newline at end of file
   21.31 +}
    22.1 --- a/less/receipt	Mon Dec 21 01:46:18 2015 +0200
    22.2 +++ b/less/receipt	Mon Dec 21 02:53:09 2015 +0200
    22.3 @@ -16,7 +16,6 @@
    22.4  # Rules to configure and make the package.
    22.5  compile_rules()
    22.6  {
    22.7 -	cd $src
    22.8  	./configure \
    22.9  		--prefix=/usr \
   22.10  		--sysconfdir=/etc \
   22.11 @@ -33,17 +32,6 @@
   22.12  	cp -a $install/usr/bin $fs/usr
   22.13  }
   22.14  
   22.15 -# Pre and post install commands for Tazpkg.
   22.16 -# We must remove all Busybox symlink before installing.
   22.17 -#
   22.18 -pre_install()
   22.19 -{
   22.20 -	echo "Processing pre-install commands..."
   22.21 -	echo -n "Removing all Busybox replaced utils... "
   22.22 -	rm -f "$1/usr/bin/less"
   22.23 -	status
   22.24 -}
   22.25 -
   22.26  post_remove()
   22.27  {
   22.28  	ln -s /bin/busybox "$1/usr/bin/less"
    23.1 --- a/lighttpd-ssl/receipt	Mon Dec 21 01:46:18 2015 +0200
    23.2 +++ b/lighttpd-ssl/receipt	Mon Dec 21 02:53:09 2015 +0200
    23.3 @@ -39,9 +39,9 @@
    23.4  		--disable-ipv6 \
    23.5  		--with-openssl \
    23.6  		--prefix=/usr \
    23.7 -    	--libdir=/usr/lib/lighttpd \
    23.8 -    	--mandir=/usr/share/man \
    23.9 -    	$CONFIGURE_ARGS &&
   23.10 +		--libdir=/usr/lib/lighttpd \
   23.11 +		--mandir=/usr/share/man \
   23.12 +		$CONFIGURE_ARGS &&
   23.13  	make &&
   23.14  	make DESTDIR=$DESTDIR install
   23.15  }
   23.16 @@ -56,10 +56,10 @@
   23.17  
   23.18  	# Modules.
   23.19  	mkdir -p $fs/usr/lib/lighttpd
   23.20 -	for module in $BASE_MODULES
   23.21 -	do
   23.22 +	for module in $BASE_MODULES; do
   23.23 +		action 'Copying : mod_${module}.so'
   23.24  		cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd
   23.25 -		echo -n "Copying : mod_${module}.so" && status
   23.26 +		status
   23.27  	done
   23.28  
   23.29  	# Server root and config file.
   23.30 @@ -95,13 +95,11 @@
   23.31  # We stop the server by default in case of upgarde.
   23.32  pre_install()
   23.33  {
   23.34 -	echo "Processing pre-install commands..."
   23.35  	[ -f /etc/init.d/lighttpd ] && /etc/init.d/lighttpd stop
   23.36  }
   23.37  
   23.38  post_install()
   23.39  {
   23.40 -	echo "Processing post-install commands..."
   23.41  	if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then
   23.42  		openssl req -new -x509 \
   23.43  			-keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \
    24.1 --- a/linux/receipt	Mon Dec 21 01:46:18 2015 +0200
    24.2 +++ b/linux/receipt	Mon Dec 21 02:53:09 2015 +0200
    24.3 @@ -348,43 +348,42 @@
    24.4  			return 0 ;;
    24.5  	esac
    24.6  
    24.7 -    export PACKAGE VERSION
    24.8 -    local path
    24.9 -    cp -a $install/boot $fs
   24.10 -    
   24.11 -    # Compress all modules.
   24.12 -    path=$fs/lib/modules/$VERSION-slitaz/kernel
   24.13 -    mkdir -p $path
   24.14 -	
   24.15 -    # Get the base modules
   24.16 -    export src install
   24.17 -    mkdir -p $WOK/$PACKAGE/source/tmp
   24.18 -    # Warning stuff/list_modules.sh must find the generated modules.list
   24.19 -    $stuff/list_modules.sh \
   24.20 +	export PACKAGE VERSION
   24.21 +	local path
   24.22 +	cp -a $install/boot $fs
   24.23 +
   24.24 +	# Compress all modules.
   24.25 +	path=$fs/lib/modules/$VERSION-slitaz/kernel
   24.26 +	mkdir -p $path
   24.27 +
   24.28 +	# Get the base modules
   24.29 +	export src install
   24.30 +	mkdir -p $WOK/$PACKAGE/source/tmp
   24.31 +	# Warning stuff/list_modules.sh must find the generated modules.list
   24.32 +	$stuff/list_modules.sh \
   24.33  		$(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list
   24.34 -    while read module; do
   24.35 -    	dir=$(dirname $module)
   24.36 -    	[ -d $path/$dir ] || mkdir -p $path/$dir
   24.37 -        cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
   24.38 -    done < $WOK/$PACKAGE/source/tmp/modules.list
   24.39 -    
   24.40 -    # Remove unresolved links
   24.41 -    rm -f $fs/lib/modules/$VERSION-slitaz/build
   24.42 -    rm -f $fs/lib/modules/$VERSION-slitaz/source
   24.43 -    
   24.44 -    # We only need module.{order,builtin} because other map files are 
   24.45 -    # generated by depmod in post_install
   24.46 -    cp -a $install/lib/modules/$VERSION-slitaz/modules.order \
   24.47 +	while read module; do
   24.48 +		dir=$(dirname $module)
   24.49 +		[ -d $path/$dir ] || mkdir -p $path/$dir
   24.50 +		cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir
   24.51 +	done < $WOK/$PACKAGE/source/tmp/modules.list
   24.52 +
   24.53 +	# Remove unresolved links
   24.54 +	rm -f $fs/lib/modules/$VERSION-slitaz/build
   24.55 +	rm -f $fs/lib/modules/$VERSION-slitaz/source
   24.56 +
   24.57 +	# We only need module.{order,builtin} because other map files are
   24.58 +	# generated by depmod in post_install
   24.59 +	cp -a $install/lib/modules/$VERSION-slitaz/modules.order \
   24.60  		$install/lib/modules/$VERSION-slitaz/modules.builtin \
   24.61  		$fs/lib/modules/$VERSION-slitaz
   24.62 -    
   24.63 -    # Pack all packages with a kernel module
   24.64 -    for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt)
   24.65 -    do
   24.66 +
   24.67 +	# Pack all packages with a kernel module
   24.68 +	for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt); do
   24.69  		[ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1
   24.70  		cook ${i%/receipt}
   24.71 -    done
   24.72 -	
   24.73 +	done
   24.74 +
   24.75  	# Check any module in kernel .config that's not added to a linux-* pkgs
   24.76  	# and remove aufs patches: we dont need them in HG wok.
   24.77  	$stuff/check_modules.sh
   24.78 @@ -394,17 +393,16 @@
   24.79  # Pre and post install commands for Tazpkg.
   24.80  post_install()
   24.81  {
   24.82 -    echo "Processing post-install commands..."
   24.83 -    chroot "$root/" depmod -a $VERSION-slitaz
   24.84 -    
   24.85 -    # Handle multiarch installation
   24.86 -    case "$SLITAZ_ARCH" in
   24.87 +	chroot "$root/" depmod -a $VERSION-slitaz
   24.88 +
   24.89 +	# Handle multiarch installation
   24.90 +	case "$SLITAZ_ARCH" in
   24.91  		arm)
   24.92  			echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH"
   24.93  			echo "Modules: /lib/modules/$VERSION-slitaz"
   24.94  			return 0 ;;
   24.95  	esac
   24.96 -	
   24.97 +
   24.98  	# GRUB stuff.
   24.99  	if [ -f "$1/boot/grub/menu.lst" ]; then
  24.100  		# Current root device
  24.101 @@ -413,10 +411,10 @@
  24.102  		# Use device.map to find grub device number
  24.103  		grub_dev="$(grep $(echo $root_dev | grep -o  '^/dev/.d.' ) \
  24.104  			"$1/boot/grub/device.map" | cut -f1 | sed "s/)$/.$grub_part)/g")" 
  24.105 -    	
  24.106 +
  24.107  		# Add and clean kernel entries in case of upgrade for installed system.
  24.108  		if ! grep -q vmlinuz-$VERSION-slitaz "$1/boot/grub/menu.lst"; then
  24.109 -		
  24.110 +
  24.111  			# Clean the old entry
  24.112  			# TODO: old vmlinuz file is removed but the entry is still there.
  24.113  			# So grub error:15 when selected: http://bugs.slitaz.org/?id=74
  24.114 @@ -432,9 +430,10 @@
  24.115  			last_entry=$(( $(grep -c '^title' "$1/boot/grub/menu.lst")-1 ))
  24.116  			sed -e "s/^default.*/default $last_entry/g" -i "$1/boot/grub/menu.lst"
  24.117  		fi
  24.118 -		
  24.119 +
  24.120  		# Display information message.
  24.121  		cat <<EOT
  24.122 +
  24.123  ----
  24.124  GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
  24.125  
    25.1 --- a/lzma/receipt	Mon Dec 21 01:46:18 2015 +0200
    25.2 +++ b/lzma/receipt	Mon Dec 21 02:53:09 2015 +0200
    25.3 @@ -50,18 +50,6 @@
    25.4  	ln -s lzma $fs/usr/bin/lzcat
    25.5  }
    25.6  
    25.7 -# Pre and post install commands for Tazpkg.
    25.8 -# We must remove all Busybox symlink before installing.
    25.9 -#
   25.10 -pre_install()
   25.11 -{
   25.12 -	echo "Processing pre-install commands..."
   25.13 -	echo -n "Removing all Busybox replaced utils... "
   25.14 -	rm -f "$1/usr/bin/unlzma"
   25.15 -	rm -f "$1/usr/bin/lzcat"
   25.16 -	status
   25.17 -}
   25.18 -
   25.19  post_remove()
   25.20  {
   25.21  	ln -s /bin/busybox "$1/usr/bin/unlzma"
    26.1 --- a/mate-control-center/receipt	Mon Dec 21 01:46:18 2015 +0200
    26.2 +++ b/mate-control-center/receipt	Mon Dec 21 02:53:09 2015 +0200
    26.3 @@ -22,7 +22,7 @@
    26.4  # Rules to configure and make the package.
    26.5  compile_rules()
    26.6  {
    26.7 -	./autogen.sh                   \
    26.8 +	./autogen.sh               \
    26.9  		--prefix=/usr          \
   26.10  		--sysconfdir=/etc      \
   26.11  		--localstatedir=/var   \
   26.12 @@ -42,21 +42,3 @@
   26.13  	cp -a $install/usr/lib/*.so* $fs/usr/lib
   26.14  	cp -a $install/usr/lib/window-manager-settings/*.so* $fs/usr/lib/window-manager-settings
   26.15  }
   26.16 -
   26.17 -# Post installation custom.
   26.18 -post_install()
   26.19 -{
   26.20 -	echo "Processing post-install commands..."
   26.21 -	[ -x "$1/usr/bin/gtk-update-icon-cache" ] &&
   26.22 -	  chroot "$1/" gtk-update-icon-cache -f -t /usr/share/icons/hicolor
   26.23 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   26.24 -	chroot "$1/" /usr/bin/update-mime-database /usr/share/mime
   26.25 -}
   26.26 -
   26.27 -post_remove()
   26.28 -{
   26.29 -	echo "Processing post-remove commands..."
   26.30 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   26.31 -	chroot "$1/" /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
   26.32 -	chroot "$1/" /usr/bin/update-mime-database /usr/share/mime
   26.33 -}
    27.1 --- a/mate-desktop/receipt	Mon Dec 21 01:46:18 2015 +0200
    27.2 +++ b/mate-desktop/receipt	Mon Dec 21 02:53:09 2015 +0200
    27.3 @@ -17,7 +17,7 @@
    27.4  # Rules to configure and make the package.
    27.5  compile_rules()
    27.6  {
    27.7 -	./autogen.sh                   \
    27.8 +	./autogen.sh               \
    27.9  		--prefix=/usr          \
   27.10  		$CONFIGURE_ARGS &&
   27.11  	make &&
   27.12 @@ -32,16 +32,3 @@
   27.13  	cp -a $install/usr/share $fs/usr
   27.14  	cp -a $install/usr/lib/*.so* $fs/usr/lib
   27.15  }
   27.16 -
   27.17 -# Post install/remove commands for Tazpkg.
   27.18 -post_install()
   27.19 -{
   27.20 -	echo "Processing post-install commands..."
   27.21 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   27.22 -}
   27.23 -
   27.24 -post_remove()
   27.25 -{ 
   27.26 -	echo "Processing post-remove commands..."
   27.27 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   27.28 -}
    28.1 --- a/mate-session-manager/receipt	Mon Dec 21 01:46:18 2015 +0200
    28.2 +++ b/mate-session-manager/receipt	Mon Dec 21 02:53:09 2015 +0200
    28.3 @@ -21,7 +21,7 @@
    28.4  # Rules to configure and make the package.
    28.5  compile_rules()
    28.6  {
    28.7 -	./autogen.sh                   \
    28.8 +	./autogen.sh               \
    28.9  		--prefix=/usr          \
   28.10  		--sysconfdir=/etc      \
   28.11  		--disable-static       \
   28.12 @@ -40,15 +40,3 @@
   28.13  	cp -a $install/usr/bin $fs/usr
   28.14  	cp -a $install/usr/share $fs/usr
   28.15  }
   28.16 -
   28.17 -post_install()
   28.18 -{
   28.19 -	echo "Processing post-install commands..."
   28.20 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   28.21 -}
   28.22 -
   28.23 -post_remove()
   28.24 -{
   28.25 -	echo "Processing post-remove commands..."
   28.26 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   28.27 -}
    29.1 --- a/mate-terminal/receipt	Mon Dec 21 01:46:18 2015 +0200
    29.2 +++ b/mate-terminal/receipt	Mon Dec 21 02:53:09 2015 +0200
    29.3 @@ -18,7 +18,7 @@
    29.4  # Rules to configure and make the package.
    29.5  compile_rules()
    29.6  {
    29.7 -	./autogen.sh                   \
    29.8 +	./autogen.sh               \
    29.9  		--prefix=/usr          \
   29.10  		--sysconfdir=/etc      \
   29.11  		--localstatedir=/var   \
   29.12 @@ -40,16 +40,3 @@
   29.13  	mkdir -p $fs/usr
   29.14  	cp -a $install/usr $fs
   29.15  }
   29.16 -
   29.17 -# Post install/remove commands for Tazpkg.
   29.18 -post_install()
   29.19 -{
   29.20 -	echo "Processing post-install commands..."
   29.21 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   29.22 -}
   29.23 -
   29.24 -post_remove()
   29.25 -{ 
   29.26 -	echo "Processing post-remove commands..."
   29.27 -	chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
   29.28 -}
    30.1 --- a/mplayerplug-in/receipt	Mon Dec 21 01:46:18 2015 +0200
    30.2 +++ b/mplayerplug-in/receipt	Mon Dec 21 02:53:09 2015 +0200
    30.3 @@ -7,7 +7,7 @@
    30.4  MAINTAINER="jozee@slitaz.org"
    30.5  LICENSE="GPL"
    30.6  TARBALL="$PACKAGE-$VERSION.tar.gz"
    30.7 -WEB_SITE="http://mplayerplug-in.sourceforge.net/" 
    30.8 +WEB_SITE="http://mplayerplug-in.sourceforge.net/"
    30.9  WGET_URL="http://downloads.sourceforge.net/mplayerplug-in/$TARBALL"
   30.10  TAGS="player audio video browser"
   30.11  
   30.12 @@ -18,13 +18,12 @@
   30.13  get_firefox_version()
   30.14  {
   30.15  	FIREFOX_VER=$(cat "$1/var/lib/tazpkg/installed/firefox/receipt" | \
   30.16 -			grep VERSION= | cut -d \" -f 2)
   30.17 +		grep VERSION= | cut -d \" -f 2)
   30.18  }
   30.19  
   30.20  # Rules to configure and make the package.
   30.21  compile_rules()
   30.22  {
   30.23 -	cd $src
   30.24  	sed -i 's/npupp\.h/npfunctions.h/' */np*
   30.25  	sed -i 's|char [\* ]*NP*_GetMIMEDescription(|const &|' \
   30.26  		plugingate/np_entry.cpp Source/plugin.cpp
   30.27 @@ -65,23 +64,18 @@
   30.28  	cp -a $install/usr/lib/mozilla $fs/usr/lib		
   30.29  	# change the default video output to xv,x11
   30.30  	sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf
   30.31 -	      
   30.32  }
   30.33  
   30.34  post_install()
   30.35  {
   30.36 -	echo -n "Processing post install commands..."
   30.37  	get_firefox_version "$1"
   30.38  	cd "$1/"
   30.39  	for i in usr/lib/mozilla/plugins/$PACKAGE*.so ; do
   30.40  		ln -s "/$i" "$1/usr/lib/firefox-$FIREFOX_VER/plugins"
   30.41 -	done 
   30.42 -	status
   30.43 +	done
   30.44  }
   30.45  
   30.46  post_remove()
   30.47  {
   30.48 -	echo -n "Processing post remove commands..."
   30.49  	rm -f /usr/lib/firefox*/plugins/$PACKAGE*.so
   30.50 -	status
   30.51  }
    31.1 --- a/nginx/receipt	Mon Dec 21 01:46:18 2015 +0200
    31.2 +++ b/nginx/receipt	Mon Dec 21 02:53:09 2015 +0200
    31.3 @@ -19,8 +19,6 @@
    31.4  # Rules to configure and make the package.
    31.5  compile_rules()
    31.6  {
    31.7 -	cd $src
    31.8 -
    31.9  #  --with-rtsig_module                enable rtsig module
   31.10  #  --with-select_module               enable select module
   31.11  #  --with-poll_module                 enable poll module
   31.12 @@ -59,39 +57,38 @@
   31.13  # On SliTaz Lighttpd runs as user/group : www/www or 80/80.
   31.14  genpkg_rules()
   31.15  {
   31.16 -        cp -a $install/* $fs/
   31.17 -        rm -rf $fs/usr/html
   31.18 -        cp -a stuff/* $fs
   31.19 -        sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
   31.20 +	cp -a $install/* $fs/
   31.21 +	rm -rf $fs/usr/html
   31.22 +	cp -a stuff/* $fs
   31.23 +	sed -i 's/#user  nobody;/user  www;/' $fs/etc/nginx/nginx.conf
   31.24  }
   31.25  
   31.26  # Pre and post install commands for Tazpkg.
   31.27  # We stop the server by default in case of upgarde.
   31.28  pre_install()
   31.29  {
   31.30 -        echo "Processing pre-install commands..."
   31.31 -        [ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
   31.32 -        # Backup config file.
   31.33 -        if [ -d "$1/$CONFIG_FILES" ]; then
   31.34 +	[ -f /etc/init.d/$PACKAGE ] && /etc/init.d/$PACKAGE stop
   31.35 +	# Backup config file.
   31.36 +	if [ -d "$1/$CONFIG_FILES" ]; then
   31.37  		cp -a "$1/$CONFIG_FILES" "$1/$CONFIG_FILES.bak"
   31.38 -        fi
   31.39 +	fi
   31.40  }
   31.41 +
   31.42  post_install()
   31.43  {
   31.44 -        echo "Processing post-install commands..."
   31.45 -        mkdir -p /var/spool/nginx
   31.46 -        # Restore original config.
   31.47 -        if [ -d "$1/$CONFIG_FILES.bak" ]; then
   31.48 +	mkdir -p /var/spool/nginx
   31.49 +	# Restore original config.
   31.50 +	if [ -d "$1/$CONFIG_FILES.bak" ]; then
   31.51  		rm -rf "$1/$CONFIG_FILES"
   31.52  		mv "$1/$CONFIG_FILES.bak" "$1/$CONFIG_FILES"
   31.53 -        fi
   31.54 -        # Just in case.
   31.55 -        chown www.www "$1/var/log/$PACKAGE"
   31.56 -        if [ -z "$1" ]; then
   31.57 +	fi
   31.58 +	# Just in case.
   31.59 +	chown www.www "$1/var/log/$PACKAGE"
   31.60 +	if [ -z "$1" ]; then
   31.61  		for i in apache lighttpd ; do
   31.62  			[ -f /etc/init.d/$i ] && /etc/init.d/$i stop
   31.63  		done
   31.64  		/etc/init.d/$PACKAGE start
   31.65 -        fi
   31.66 -        true
   31.67 +	fi
   31.68 +	true
   31.69  }
    32.1 --- a/nvidia-173xx/receipt	Mon Dec 21 01:46:18 2015 +0200
    32.2 +++ b/nvidia-173xx/receipt	Mon Dec 21 02:53:09 2015 +0200
    32.3 @@ -27,34 +27,37 @@
    32.4  	make SYSSRC="/usr/src/linux" module 2>&1 | sed s'/ERROR:/error:/'
    32.5  	xz nvidia.ko
    32.6  }
    32.7 -	
    32.8 +
    32.9  # Rules to gen a SliTaz package suitable for Tazpkg.
   32.10  genpkg_rules()
   32.11 -{	
   32.12 +{
   32.13  	EXTRAVERSION=_${kvers}
   32.14 -	
   32.15 -	mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \
   32.16 -				 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \
   32.17 -				 $fs/usr/share/doc/$PACKAGE 
   32.18 -	
   32.19 +
   32.20 +	mkdir -p \
   32.21 +		$fs/usr/share \
   32.22 +		$fs/usr/lib/X11 \
   32.23 +		$fs/usr/share/licenses/$PACKAGE \
   32.24 +		$fs/lib/modules/$kvers-slitaz/kernel/drivers/video \
   32.25 +		$fs/usr/share/doc/$PACKAGE
   32.26 +
   32.27  	cp $src/usr/src/nv/nvidia.ko.xz \
   32.28 -			$fs/lib/modules/$kvers-slitaz/kernel/drivers/video/
   32.29 +		$fs/lib/modules/$kvers-slitaz/kernel/drivers/video/
   32.30  	chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz
   32.31 -	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz	
   32.32 -	
   32.33 +	chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz
   32.34 +
   32.35  	cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE
   32.36  	cp -a $src/usr/bin $fs/usr
   32.37  	cp -a $src/nvidia-installer $fs/usr/bin
   32.38  	cp -a $src/usr/lib/*.so* $fs/usr/lib/
   32.39  	cp -a $src/usr/lib/tls $fs/usr/lib/
   32.40 -        cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib
   32.41 -        cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/
   32.42 -        cp -a $src/usr/share/applications $fs/usr/share
   32.43 +	cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib
   32.44 +	cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/
   32.45 +	cp -a $src/usr/share/applications $fs/usr/share
   32.46  	cp -a $src/usr/share/pixmaps $fs/usr/share
   32.47  	cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/
   32.48  	cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11
   32.49  
   32.50 -        ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so
   32.51 +	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so
   32.52  	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1
   32.53  	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so
   32.54  	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1
   32.55 @@ -69,51 +72,37 @@
   32.56  	ln -s libXvMCNVIDIA.so.$VERSION $fs/usr/lib/libXvMCNVIDIA_dynamic.so
   32.57  	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so
   32.58  	ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1
   32.59 -	ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so	
   32.60 +	ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so
   32.61  }
   32.62  
   32.63  pre_install()
   32.64  {
   32.65 -	echo ""
   32.66 -	echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2"
   32.67 -	echo "================================================================================"
   32.68 +	title "PROPRIETARY LICENSE"
   32.69  	echo "You are installing a package with proprietary license."
   32.70  	echo "You must accept the license."
   32.71 -    echo "================================================================================"
   32.72 -    echo ""
   32.73 -	
   32.74 +	footer
   32.75  }
   32.76  
   32.77  post_install()
   32.78  {
   32.79 -	echo "Processing post-install commands..."
   32.80 -	chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz
   32.81 -	
   32.82 +	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
   32.83 +
   32.84  	# correct .desktop file file
   32.85  	sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop"
   32.86  	sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop"
   32.87 -	
   32.88 -	echo ""
   32.89 -	echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2"
   32.90 -	echo "================================================================================"
   32.91 +
   32.92 +	title "NVIDIA LICENSE INFORMATION"
   32.93  	echo "For installing this package, you have to accept the $PACKAGE license."
   32.94 -    echo "The license is stored in /usr/share/licenses/$PACKAGE "    
   32.95 -    echo -n "Would you like to read the license (y/N) : "; read anser
   32.96 -    if [ "$anser" = "y" ]; then
   32.97 -		cat /usr/share/licenses/"$PACKAGE"/LICENSE | more	
   32.98 -		echo "" 		
   32.99 +	echo "The license is stored in /usr/share/licenses/$PACKAGE "
  32.100 +	echo -n "Would you like to read the license (y/N) : "; read anser
  32.101 +	if [ "$anser" == 'y' ]; then
  32.102 +		more "$1/usr/share/licenses/$PACKAGE/LICENSE"
  32.103 +		newline
  32.104  	fi
  32.105 -	echo "================================================================================"
  32.106 -	 echo -n "Do you accept the license (y/N) : "; read anser
  32.107 -    if [ "$anser" = "N" ]; then
  32.108 -		echo "You did not accept the license, Removing the pkg."	
  32.109 -		tazpkg remove "$PACKAGE"		
  32.110 +	separator
  32.111 +	echo -n 'Do you accept the license (y/N) : '; read anser
  32.112 +	if [ "$anser" == 'N' ]; then
  32.113 +		echo 'You did not accept the license, Removing the pkg.'
  32.114 +		tazpkg remove "$PACKAGE"
  32.115  	fi
  32.116 -
  32.117  }
  32.118 -
  32.119 -post_remove()
  32.120 -{
  32.121 -	echo "Processing post-remove commands..."
  32.122 -	depmod -a
  32.123 -}
    33.1 --- a/open-iscsi/receipt	Mon Dec 21 01:46:18 2015 +0200
    33.2 +++ b/open-iscsi/receipt	Mon Dec 21 02:53:09 2015 +0200
    33.3 @@ -15,7 +15,6 @@
    33.4  # Rules to configure and make the package.
    33.5  compile_rules()
    33.6  {
    33.7 -	cd $src
    33.8  	sed -i 's/ install_kernel / /' Makefile
    33.9  	sed -i 's|dirent.h>|&\n#include <sys/types.h>\n#include <sys/stat.h>|' \
   33.10  		usr/iscsi_sysfs.c
   33.11 @@ -33,8 +32,7 @@
   33.12  
   33.13  post_install()
   33.14  {
   33.15 -	echo "Processing post-install commands..."
   33.16  	if  [ ! -f "$1/etc/iscsi/initiatorname.iscsi" ]; then
   33.17 -			echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi"
   33.18 +		echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi"
   33.19  	fi
   33.20  }
    34.1 --- a/ovz-web-panel/receipt	Mon Dec 21 01:46:18 2015 +0200
    34.2 +++ b/ovz-web-panel/receipt	Mon Dec 21 02:53:09 2015 +0200
    34.3 @@ -15,7 +15,6 @@
    34.4  # Rules to configure and make the package.
    34.5  compile_rules()
    34.6  {
    34.7 -	cd $src
    34.8  	# Apply patches
    34.9  	while read patch_file; do
   34.10  		if [ -f done.$patch_file ]; then
   34.11 @@ -36,29 +35,28 @@
   34.12  genpkg_rules()
   34.13  {
   34.14  	mkdir -p $fs/usr/share \
   34.15 -		$fs/etc 
   34.16 -				
   34.17 +		$fs/etc
   34.18 +
   34.19  	cp -a $install $fs/usr/share/$PACKAGE
   34.20  	cp -a $fs/usr/share/$PACKAGE/config/owp.conf.sample $fs/etc/owp.conf
   34.21  	cp -a $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini.sample $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini
   34.22 -	
   34.23 +
   34.24  	# Set secret key
   34.25  	sed -i 's/secret/2918b7aafc1f5f753ee232a7e7f78175/' \
   34.26  		$fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini
   34.27 -	
   34.28 +
   34.29  	# Set program homedir
   34.30  	sed -i 's!/opt!/usr/share!' $fs/etc/owp.conf
   34.31 -	
   34.32 +
   34.33  	# Fix perms
   34.34  	chmod 755 $fs/usr/share/$PACKAGE/script/owp
   34.35 -	
   34.36 +
   34.37  	# Cleaning.
   34.38  	rm -f $fs/usr/share/$PACKAGE/done.*.u
   34.39  }
   34.40  
   34.41  post_install()
   34.42  {
   34.43 -	echo "Processing post-install commands..."	
   34.44  	chroot "$1/" ln -s /usr/share/$PACKAGE/script/owp /etc/init.d/owp
   34.45  }
   34.46  
    35.1 --- a/ssmtp/receipt	Mon Dec 21 01:46:18 2015 +0200
    35.2 +++ b/ssmtp/receipt	Mon Dec 21 02:53:09 2015 +0200
    35.3 @@ -17,42 +17,39 @@
    35.4  # Rules to configure and make the package.
    35.5  compile_rules()
    35.6  {
    35.7 -    cd $src
    35.8 -    sed -i 's|@LIBS@|& -lcrypto|' Makefile.in
    35.9 -    ./configure --prefix=/usr \
   35.10 -        --sysconfdir=/etc \
   35.11 -        --mandir=/usr/share/man \
   35.12 -        --enable-md5auth \
   35.13 -        --enable-ssl \
   35.14 -        $CONFIGURE_ARGS &&
   35.15 -    make &&
   35.16 +	sed -i 's|@LIBS@|& -lcrypto|' Makefile.in
   35.17 +	./configure --prefix=/usr \
   35.18 +		--sysconfdir=/etc \
   35.19 +		--mandir=/usr/share/man \
   35.20 +		--enable-md5auth \
   35.21 +		--enable-ssl \
   35.22 +		$CONFIGURE_ARGS &&
   35.23 +	make
   35.24  
   35.25 -    # Install
   35.26 -    mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp
   35.27 -    cp ssmtp $DESTDIR/usr/sbin
   35.28 -    cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp
   35.29 +	# Install
   35.30 +	mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp
   35.31 +	cp ssmtp $DESTDIR/usr/sbin
   35.32 +	cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp
   35.33  }
   35.34  
   35.35  # Rules to gen a SliTaz package suitable for Tazpkg.
   35.36  genpkg_rules()
   35.37  {
   35.38 -    mkdir -p $fs/usr
   35.39 -    cp -a $install/usr/sbin/ $fs/usr/
   35.40 -    cp -a $install/etc/ $fs/
   35.41 +	mkdir -p $fs/usr
   35.42 +	cp -a $install/usr/sbin/ $fs/usr/
   35.43 +	cp -a $install/etc/ $fs/
   35.44  }
   35.45  
   35.46 -post_install() 
   35.47 +post_install()
   35.48  {
   35.49 -    echo "Processing post-install commands..."
   35.50 -    ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail"
   35.51 -    ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases"
   35.52 -    ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq"
   35.53 +	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail"
   35.54 +	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases"
   35.55 +	ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq"
   35.56  }
   35.57  
   35.58 -post_remove() 
   35.59 +post_remove()
   35.60  {
   35.61 -    echo "Processing post-remove commands..."
   35.62 -    rm -f "$1/usr/sbin/sendmail"
   35.63 -    rm -f "$1/usr/sbin/newaliases"
   35.64 -    rm -f "$1/usr/sbin/mailq"
   35.65 +	rm -f "$1/usr/sbin/sendmail"
   35.66 +	rm -f "$1/usr/sbin/newaliases"
   35.67 +	rm -f "$1/usr/sbin/mailq"
   35.68  }
    36.1 --- a/sudo/receipt	Mon Dec 21 01:46:18 2015 +0200
    36.2 +++ b/sudo/receipt	Mon Dec 21 02:53:09 2015 +0200
    36.3 @@ -14,7 +14,6 @@
    36.4  # Rules to configure and make the package.
    36.5  compile_rules()
    36.6  {
    36.7 -	cd $src
    36.8  	./configure --sysconfdir=/etc \
    36.9  	--without-pam \
   36.10  	--with-editor=/bin/vi \
   36.11 @@ -38,7 +37,6 @@
   36.12  
   36.13  pre_install()
   36.14  {
   36.15 -	echo "Processing pre-install commands..."
   36.16  	if [ -f "$1/etc/sudoers.bak" ]; then
   36.17  		cp "$1/etc/sudoers" "$1/etc/sudoers.bak"
   36.18  	fi
   36.19 @@ -46,7 +44,6 @@
   36.20  
   36.21  post_install()
   36.22  {
   36.23 -	echo "Processing post-install commands..."
   36.24  	if [ -f "$1/etc/sudoers.bak" ]; then
   36.25  		mv "$1/etc/sudoers" "$1/etc/sudoers-dist"
   36.26  		mv "$1/etc/sudoers.bak" "$1/etc/sudoers"
   36.27 @@ -54,4 +51,4 @@
   36.28  		chown root.root "$1/etc/sudoers"
   36.29  		chmod 0440 "$1/etc/sudoers"
   36.30  	fi
   36.31 -}                        
   36.32 +}
    37.1 --- a/usbutils/receipt	Mon Dec 21 01:46:18 2015 +0200
    37.2 +++ b/usbutils/receipt	Mon Dec 21 02:53:09 2015 +0200
    37.3 @@ -37,18 +37,6 @@
    37.4  	rm -f $fs/usr/bin/lsusb.py
    37.5  }
    37.6  
    37.7 -# Pre and post install commands for Tazpkg.
    37.8 -# Busybox lsusb does not display human-readable usb.ids hardware info.
    37.9 -# We must remove busybox lsusb symlink before installing.
   37.10 -#
   37.11 -pre_install()
   37.12 -{
   37.13 -	echo "Processing pre-install commands..."
   37.14 -	echo -n "Removing Busybox lsusb... "
   37.15 -	rm -f "$1/usr/bin/lsusb"
   37.16 -	status
   37.17 -}
   37.18 -
   37.19  post_remove()
   37.20  {
   37.21  	ln -s /bin/busybox "$1/usr/bin/lsusb"
    38.1 --- a/xfce4/receipt	Mon Dec 21 01:46:18 2015 +0200
    38.2 +++ b/xfce4/receipt	Mon Dec 21 02:53:09 2015 +0200
    38.3 @@ -9,9 +9,9 @@
    38.4  SUGGESTED="xfce4-slitaz-config"
    38.5  WEB_SITE="http://www.xfce.org"
    38.6  
    38.7 -DEPENDS="libxfce4util xfconf libxfce4ui garcon libexo 
    38.8 - xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman
    38.9 - thunar-archive-plugin xfce-utils"
   38.10 +DEPENDS="libxfce4util xfconf libxfce4ui garcon libexo \
   38.11 +xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman \
   38.12 +thunar-archive-plugin xfce-utils"
   38.13  
   38.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   38.15  genpkg_rules()
   38.16 @@ -21,13 +21,10 @@
   38.17  
   38.18  post_install()
   38.19  {
   38.20 -	echo "Processing postinstall commands..."
   38.21 -	
   38.22  	# Adding xfce to SLIM available sessions.
   38.23  	if ! grep -q xfce "$1/etc/slim.conf"; then
   38.24  		sed -i s/,jwm/,jwm,xfce/ "$1/etc/slim.conf"
   38.25  	fi
   38.26 -	
   38.27 +
   38.28  	# Adding xfce support to tazx
   38.29 -	
   38.30  }