# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1299060380 -3600
# Node ID 940b5937e496d052fd473afd54d8b75d522795a9
# Parent  b075b3e8a2760e7f49a8c8f5ad1218652ec2b9d6
[q-z]*: use  veriable

diff -r b075b3e8a276 -r 940b5937e496 qt4/receipt
--- a/qt4/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/qt4/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -29,8 +29,8 @@
 	cd $src
     
 	# Already fixed upstream
-	patch -Np1 -i ../stuff/fix-qtbug-15857.patch
-	patch -Np1 -i ../stuff/add-postgresql9.patch
+	patch -Np1 -i $stuff/fix-qtbug-15857.patch
+	patch -Np1 -i $stuff/add-postgresql9.patch
 	
 	./configure -v \
 		-prefix /usr \
diff -r b075b3e8a276 -r 940b5937e496 rarian/receipt
--- a/rarian/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/rarian/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,7 +15,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p0 -i ../stuff/user-segfault.patch
+	patch -p0 -i $stuff/user-segfault.patch
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r b075b3e8a276 -r 940b5937e496 rawstudio/receipt
--- a/rawstudio/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/rawstudio/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 {
 	cd $src
 	export PKG_CONFIG_PATH="/usr/lib/pkgconfig"
-	patch -p1 -i ../stuff/rawstudio-const.patch
+	patch -p1 -i $stuff/rawstudio-const.patch
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r b075b3e8a276 -r 940b5937e496 recorder/receipt
--- a/recorder/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/recorder/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,7 +15,7 @@
 compile_rules()
 {
 	cd $src
-	cp ../stuff/Makefile Makefile
+	cp $stuff/Makefile Makefile
 	make DESTDIR=$PWD/_pkg install
 }
 
diff -r b075b3e8a276 -r 940b5937e496 ruby/receipt
--- a/ruby/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/ruby/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	patch -Np1 < ../stuff/openssl-1.0.patch 
+	patch -Np1 < $stuff/openssl-1.0.patch 
 	./configure --prefix=/usr --enable-shared --infodir=/usr/share/info --mandir=/usr/share/man $CONFIGURE_ARGS && 		 
 	make -j 4 &&
 	make DESTDIR=$PWD/_pkg install
diff -r b075b3e8a276 -r 940b5937e496 sc/receipt
--- a/sc/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/sc/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,7 +15,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p1 < ../stuff/7.16.patch || return 1
+	patch -p1 < $stuff/7.16.patch || return 1
 	make
 }
 
diff -r b075b3e8a276 -r 940b5937e496 scim-pinyin/receipt
--- a/scim-pinyin/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/scim-pinyin/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
     while read file; do
         [ -f done.$file ] && continue
         echo "Apply $file..."
-        patch -p1 < ../stuff/$file || return 1
+        patch -p1 < $stuff/$file || return 1
         touch done.$file
     done <<EOT
 cstring-gcc43.patch
diff -r b075b3e8a276 -r 940b5937e496 scim/receipt
--- a/scim/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/scim/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
     while read file; do
         [ -f done.$file ] && continue
         echo "Apply $file..."
-        patch -p1 < ../stuff/$file || return 1
+        patch -p1 < $stuff/$file || return 1
         touch done.$file
     done <<EOT
 scim-glibc-2.10.patch
diff -r b075b3e8a276 -r 940b5937e496 seamonkey/receipt
--- a/seamonkey/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/seamonkey/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,9 +16,9 @@
 {
 	#mv mozilla $PACKAGE-$VERSION   2>/dev/null    || exit 1
 	mv comm-1.9.1 $PACKAGE-$VERSION   2>/dev/null 
-	cp -a stuff/seamonkey.mozconfig $src/.mozconfig
+	cp -a $stuff/seamonkey.mozconfig $src/.mozconfig
 	cd $src
-	#patch -p1 -i ../stuff/google-breakpad.u || exit 1
+	#patch -p1 -i $stuff/google-breakpad.u || exit 1
 	cat >> mozilla/layout/build/Makefile.in << "EOF"
 ifdef MOZ_ENABLE_CANVAS
 EXTRA_DSO_LDOPTS += $(XLDFLAGS) -lX11 -lXrender
@@ -39,10 +39,10 @@
 	cp -a $_pkg/usr/bin/seamonkey $fs/usr/bin
 	cp -a $_pkg/usr/lib/seamonkey-* $fs/usr/lib
 	# Home page, bookmarks file and branding.
-	cp -a stuff/bookmarks.html \
+	cp -a $stuff/bookmarks.html \
 		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile
 	# User preference.
-	cp -a stuff/userChrome.css \
+	cp -a $stuff/userChrome.css \
 		$fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome
 	# Move default config to /etc/seamonkey (/usr maybe read-only)
 	mv -f $fs/usr/lib/$PACKAGE-$VERSION/defaults $fs/etc/$PACKAGE
@@ -52,7 +52,7 @@
 	chown -R root.root $fs/etc
 
 	# Create default user preference file
-	cp stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js
+	cp $stuff/prefs.js $fs/etc/seamonkey/profile/prefs.js
 	
 }
 
diff -r b075b3e8a276 -r 940b5937e496 setserial/receipt
--- a/setserial/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/setserial/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 	
 	# http://bugs.gentoo.org/309883
 	#  & remove warnings 
-	patch -p1 < ../stuff/setserial-2.17.u || return 1
+	patch -p1 < $stuff/setserial-2.17.u || return 1
 	
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--mandir=/usr/share/man $CONFIGURE_ARGS &&
diff -r b075b3e8a276 -r 940b5937e496 sheerdns/receipt
--- a/sheerdns/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/sheerdns/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,9 +15,9 @@
 {
 	mv $PACKAGE $src 2> /dev/null
 	cd $src
-	for i in $( cd ../stuff ; ls *.u); do
+	for i in $( cd $stuff ; ls *.u); do
 		[ -f done.$i ] && continue
-		patch -p0 < ../stuff/$i
+		patch -p0 < $stuff/$i
 		touch done.$i
 	done
 	make
diff -r b075b3e8a276 -r 940b5937e496 slim/receipt
--- a/slim/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/slim/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p1 < ../stuff/NoPwdForCmd.patch || return 1
+	patch -p1 < $stuff/NoPwdForCmd.patch || return 1
 	make &&
 	make DESTDIR=$src/_pkg install
 }
@@ -28,11 +28,11 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a stuff/themes $fs/usr/share/slim
+	cp -a $stuff/themes $fs/usr/share/slim
 	cp -a $_pkg/usr/bin $fs/usr
 
 	# Config file and rc script.
-	cp -a stuff/etc $fs
+	cp -a $stuff/etc $fs
 	chown -R root.root $fs
 }
 
diff -r b075b3e8a276 -r 940b5937e496 speedtouch/receipt
--- a/speedtouch/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/speedtouch/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -18,7 +18,7 @@
   while read file; do
     	[ -f done.$file ] && continue
     	echo "Apply $file..."
-    	patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1
+    	patch -p1 < $stuff/$PACKAGE-$VERSION-$file || return 1
 	touch done.$file
     done <<EOT
 	gcc4.u
diff -r b075b3e8a276 -r 940b5937e496 squashfs/receipt
--- a/squashfs/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/squashfs/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 {
 	mv ${PACKAGE}${VERSION} $src 2> /dev/null
 	cd $src
-	patch -Np1 -i ../stuff/xz.patch
+	patch -Np1 -i $stuff/xz.patch
 	cd $src/squashfs-tools
 	#sed -i 's|#XZ_SUPPORT = 1|XZ_SUPPORT = 1|g' Makefile
 	mkdir -p ../_pkg/usr/sbin ../_pkg/sbin
diff -r b075b3e8a276 -r 940b5937e496 squidguard/receipt
--- a/squidguard/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/squidguard/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -20,7 +20,7 @@
 	# Security patches 
 	while read patch_file; do
 		echo "Apply $patch_file"
-		tar xvzf  ../stuff/$patch_file || return 1
+		tar xvzf  $stuff/$patch_file || return 1
 		cp -a $(basename $patch_file .tar.gz)/* src
 	done <<EOT
 squidGuard-1.4-patch-20091015.tar.gz
diff -r b075b3e8a276 -r 940b5937e496 stardict/receipt
--- a/stardict/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/stardict/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,8 +15,8 @@
 compile_rules()
 {
  cd $src
- patch -p1 < ../stuff/sigc++.patch || return 1
- patch -p1 < ../stuff/stardict_gcc43.patch || return 1
+ patch -p1 < $stuff/sigc++.patch || return 1
+ patch -p1 < $stuff/stardict_gcc43.patch || return 1
 
  ./configure \
  --prefix=/usr \
diff -r b075b3e8a276 -r 940b5937e496 stellarium/receipt
--- a/stellarium/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/stellarium/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -26,7 +26,7 @@
 	mkdir -p $fs/usr/share/pixmaps $fs/usr/share/applications
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/stellarium $fs/usr/share
-	cp -a $WOK/$PACKAGE/stuff/stellarium.png $fs/usr/share/pixmaps
-	cp -a $WOK/$PACKAGE/stuff/stellarium.desktop $fs/usr/share/applications
+	cp -a $stuff/stellarium.png $fs/usr/share/pixmaps
+	cp -a $stuff/stellarium.desktop $fs/usr/share/applications
 }
 
diff -r b075b3e8a276 -r 940b5937e496 supertux/receipt
--- a/supertux/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/supertux/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	cp ../stuff/menu.h src
+	cp $stuff/menu.h src
 	cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
 	make && make DESTDIR=$PWD/_pkg install
 }
diff -r b075b3e8a276 -r 940b5937e496 syasokoban/receipt
--- a/syasokoban/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/syasokoban/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 {
 	cd $src
 	if [ ! -f gcc44.u.done ]; then
-		patch -p0 < ../stuff/gcc44.u
+		patch -p0 < $stuff/gcc44.u
 		touch gcc44.u.done
 	fi
 	make
@@ -27,7 +27,7 @@
 {
 	mkdir -p $fs/usr/bin $fs/usr/share/syasokoban $fs/usr/share/applications
 	cp -a $src/syasokoban $src/data $fs/usr/share/syasokoban
-	cp -a stuff/sokoban.desktop $fs/usr/share/applications
-	cp -a stuff/syasokoban $fs/usr/bin/syasokoban
+	cp -a $stuff/sokoban.desktop $fs/usr/share/applications
+	cp -a $stuff/syasokoban $fs/usr/bin/syasokoban
 }
 
diff -r b075b3e8a276 -r 940b5937e496 syslinux/receipt
--- a/syslinux/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/syslinux/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,10 +17,10 @@
 {
     cd $src
     # Do not try to build the Windows or DOS installers
-    patch -p1 -i ../stuff/syslinux-dont-build-dos-windows-targets.patch
-    cp ../stuff/tools/isohybrid.sh .
-    cp ../stuff/tools/keytab-lilo.pl .
-    cp ../stuff/extra/ifmem.c com32/modules
+    patch -p1 -i $stuff/syslinux-dont-build-dos-windows-targets.patch
+    cp $stuff/tools/isohybrid.sh .
+    cp $stuff/tools/keytab-lilo.pl .
+    cp $stuff/extra/ifmem.c com32/modules
     grep -q ifmem.c32 com32/modules/Makefile ||
 	sed -i 's/ifcpu64.c32/ifcpu64.c32 ifmem.c32/' com32/modules/Makefile
     make -C com32
@@ -41,7 +41,7 @@
     cp -a $src/com32/modules/reboot.c32 $fs/boot/isolinux
     cp -a $src/com32/modules/ifmem.c32 $fs/boot/isolinux
     cp -a $src/modules/poweroff.com $fs/boot/isolinux
-    cp stuff/*.cfg stuff/*.txt stuff/*.msg stuff/*.lss $fs/boot/isolinux
+    cp $stuff/*.cfg $stuff/*.txt $stuff/*.msg $stuff/*.lss $fs/boot/isolinux
     while read cfg kbd loc ; do
         sed -e "s/^display/kbdmap $cfg.kbd\ndisplay/" \
             -e "s/^label/say Now using $kbd keyboard and $loc locale.\nlabel/" \
diff -r b075b3e8a276 -r 940b5937e496 syslinux/stuff/tools/isohybrid.sh
--- a/syslinux/stuff/tools/isohybrid.sh	Wed Mar 02 10:41:40 2011 +0100
+++ b/syslinux/stuff/tools/isohybrid.sh	Wed Mar 02 11:06:20 2011 +0100
@@ -19,21 +19,23 @@
 offset=0
 partok=0
 hd0=0
+always=0
 
 while [ -n "$1" ]; do
-	case "$1" in
-	-ct*)		hd0=2;;
-	-e*|--e*)	entry=$2; shift;;
-	-f*)		hd0=1;;
-	-h)		heads=$2; shift;;
-	-i|--i*)	id=$(($2)); shift;;
-	-noh*)		hd0=0;;
-	-nop*)		partok=0;;
-	-o*|--o*)	offset=$(($2)); shift;;
-	-p*)		partok=1;;
-	-s)		sectors=$2; shift;;
-	-t*|--t*)	partype=$(($2 & 255)); shift;;
-	*)		iso=$1;;
+	case "${1/--/-}" in
+	-a*)	always=1;;
+	-ct*)	hd0=2;;
+	-e*)	entry=$2; shift;;
+	-f*)	hd0=1;;
+	-h)	heads=$2; shift;;
+	-i*)	id=$(($2)); shift;;
+	-noh*)	hd0=0;;
+	-nop*)	partok=0;;
+	-o*)	offset=$(($2)); shift;;
+	-p*)	partok=1;;
+	-s)	sectors=$2; shift;;
+	-t*)	partype=$(($2 & 255)); shift;;
+	*)	iso=$1;;
 	esac
 	shift
 done
@@ -51,6 +53,7 @@
 	--forcehd0	Assume we are loaded as disk ID 0
 	--ctrlhd0	Assume disk ID 0 if the Ctrl key is pressed
 	--partok	Allow booting from within a partition
+	--always	Do not abort on errors
 EOT
 	exit 1
 fi
@@ -74,9 +77,9 @@
 # write a 32 bits data
 store32()
 {
-	n=$2; i=4; while [ $i -ne 0 ]; do
+	n=$2; for i in 1 2 3 4; do
 		printf '\\\\x%02X' $(($n & 255))
-		i=$(($i-1)); n=$(($n >> 8))
+		n=$(($n >> 8))
 	done | xargs echo -en | ddq bs=1 conv=notrunc of=$iso seek=$(($1))
 }
 
@@ -99,7 +102,7 @@
 abort()
 {
 	echo "$iso: $1"
-	exit 1
+	[ $always -eq 0 ] && exit 1
 }
 
 [ "$(readiso 17 7 23)" == "EL TORITO SPECIFICATION" ] ||
diff -r b075b3e8a276 -r 940b5937e496 tcc/receipt
--- a/tcc/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/tcc/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 {
 	cd $src
 	if [ ! -f done.Makefile.u ]; then
-		patch < ../stuff/Makefile.u || return 1
+		patch < $stuff/Makefile.u || return 1
 		touch done.Makefile.u
 	fi
 	sed -i 's/cp -u/cp/' tests/Makefile
diff -r b075b3e8a276 -r 940b5937e496 tiff/receipt
--- a/tiff/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/tiff/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -20,7 +20,7 @@
     # allows context-dependent attackers to cause a denial of service 
     # (crash) via a crafted TIFF imag.
 
-    patch -p1 -i ../stuff/libtiff-CVE-2009-2285.patch
+    patch -p1 -i $stuff/libtiff-CVE-2009-2285.patch
     ./configure --prefix=/usr --infodir=/usr/share/info \
     --mandir=/usr/share/man $CONFIGURE_ARGS &&
     make &&
diff -r b075b3e8a276 -r 940b5937e496 tinyproxy/receipt
--- a/tinyproxy/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/tinyproxy/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -14,7 +14,7 @@
 compile_rules()
 {
 	cd $src
-	patch -Np1 -i ../stuff/no-docs-and-tests.diff
+	patch -Np1 -i $stuff/no-docs-and-tests.diff
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -35,6 +35,6 @@
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/share/tinyproxy $fs/usr/share
 	cp -a $_pkg/etc/tinyproxy $fs/etc
-	cp -a stuff/tinyproxy $fs/etc/init.d
+	cp -a $stuff/tinyproxy $fs/etc/init.d
 }
 
diff -r b075b3e8a276 -r 940b5937e496 tuxmath/receipt
--- a/tuxmath/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/tuxmath/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p1 -i ../stuff/SDL_extras.c.patch	
+	patch -p1 -i $stuff/SDL_extras.c.patch	
 	./configure \
 		--prefix=/usr \
 		--without-sdlpango \
diff -r b075b3e8a276 -r 940b5937e496 urxvt/receipt
--- a/urxvt/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/urxvt/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	busybox patch -p0 -i ../stuff/gcc.u
+	busybox patch -p0 -i $stuff/gcc.u
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--disable-perl --with-codesets='eu' \
 	--mandir=/usr/share/man $CONFIGURE_ARGS && \
diff -r b075b3e8a276 -r 940b5937e496 util-linux-ng/receipt
--- a/util-linux-ng/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/util-linux-ng/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,9 +19,9 @@
 {
 	cd $src
 	# fix findmnt
-	patch -p1 -i ../stuff/fix-findmnt.patch
+	patch -p1 -i $stuff/fix-findmnt.patch
 	# fix cfdisk partition changing, included in next upstream release
-	patch -p1 -i ../stuff/util-linux-ng-cfdisk.patch
+	patch -p1 -i $stuff/util-linux-ng-cfdisk.patch
 
 	if ! grep 'tty:x:4:' /etc/group; then
 		addgroup -g 4 tty
diff -r b075b3e8a276 -r 940b5937e496 visualboyadvance/receipt
--- a/visualboyadvance/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/visualboyadvance/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 compile_rules()
 {
 	cd $src
-	for i in ../stuff/$VERSION-*.patch; do
+	for i in $stuff/$VERSION-*.patch; do
 		patch -Np0 < $i
 	done
 	./configure \
diff -r b075b3e8a276 -r 940b5937e496 vym/receipt
--- a/vym/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/vym/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -20,7 +20,7 @@
 	make &&
 	make INSTALL_ROOT=$PWD/_pkg install
 	mkdir -p $PWD/_pkg/usr/share/applications
-	cp -f ../stuff/vym.desktop $PWD/_pkg/usr/share/applications
+	cp -f $stuff/vym.desktop $PWD/_pkg/usr/share/applications
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r b075b3e8a276 -r 940b5937e496 vzctl/receipt
--- a/vzctl/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/vzctl/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -23,7 +23,7 @@
 			continue
 		fi
 		echo "Apply $patch_file"
-		patch -p1 < ../stuff/$patch_file || return 1
+		patch -p1 < $stuff/$patch_file || return 1
 		touch done.$patch_file
 	done <<EOT
 vzctl-${VERSION}-Makefile.u
diff -r b075b3e8a276 -r 940b5937e496 vzquota/receipt
--- a/vzquota/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/vzquota/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -21,7 +21,7 @@
 			continue
 		fi
 		echo "Apply $patch_file"
-		patch -p1 < ../stuff/$patch_file || return 1
+		patch -p1 < $stuff/$patch_file || return 1
 		touch done.$patch_file
 	done <<EOT
 vzquota-${VERSION}.u
diff -r b075b3e8a276 -r 940b5937e496 wbar/receipt
--- a/wbar/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/wbar/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p0 < ../stuff/gcc43_fixes.diff || return 1
+	patch -p0 < $stuff/gcc43_fixes.diff || return 1
 	make &&
 	mkdir -p _pkg/usr/share/wbar/iconpack _pkg/usr/bin &&
 	cp wbar _pkg/usr/bin &&
diff -r b075b3e8a276 -r 940b5937e496 weechat/receipt
--- a/weechat/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/weechat/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
 	while read file; do
 		[ -f done.$file ] && continue
 		echo "Apply $file..."
-		patch -p1 < ../stuff/$file || return 1
+		patch -p1 < $stuff/$file || return 1
 		touch done.$file
 	done <<EOT
 weechat-implicit-function-declaration.patch
diff -r b075b3e8a276 -r 940b5937e496 wine/receipt
--- a/wine/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/wine/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
 {
 	cd $src
 
-	patch -p1 < ../stuff/wine-1.2-cdrom.c.u || return 1
+	patch -p1 < $stuff/wine-1.2-cdrom.c.u || return 1
 
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--mandir=/usr/share/man $CONFIGURE_ARGS &&
diff -r b075b3e8a276 -r 940b5937e496 xarchive/receipt
--- a/xarchive/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xarchive/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -19,7 +19,7 @@
 	cd $src
 	# patch tar-wrap for busybox tar option
 	[ -f done.slitaz-xarchive-wrappers-0.2.8-6.patch ] || \
-	patch -p1 -i ../stuff/slitaz-xarchive-wrappers-0.2.8-6.patch
+	patch -p1 -i $stuff/slitaz-xarchive-wrappers-0.2.8-6.patch
 	touch done.slitaz-xarchive-wrappers-0.2.8-6.patch
 
 	./configure --prefix=/usr --infodir=/usr/share/info \
@@ -35,7 +35,7 @@
 	mkdir -p $fs/usr/lib/xarchive/wrappers
 	cp -a $_pkg/usr/bin $fs/usr
 	sed -i 's|#!\s*/bin/bash|#!/bin/sh|' $_pkg/usr/lib/xarchive/wrappers/*
-	cp stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers
+	cp $stuff/slitaz-wrap.sh $fs/usr/lib/xarchive/wrappers
 	strip -s $fs/usr/bin/*
 }
 
diff -r b075b3e8a276 -r 940b5937e496 xdg-utils/receipt
--- a/xdg-utils/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xdg-utils/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
     while read file; do
         [ -f done.$file ] && continue
         echo "Apply $file..."
-        patch -p1 < ../stuff/$file || return 1
+        patch -p1 < $stuff/$file || return 1
         touch done.$file
     done <<EOT
 xdg-open-chrome.patch
diff -r b075b3e8a276 -r 940b5937e496 xfe/receipt
--- a/xfe/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xfe/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	patch -p 0 < ../stuff/gcc-4.patch || return 1
+	patch -p 0 < $stuff/gcc-4.patch || return 1
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
diff -r b075b3e8a276 -r 940b5937e496 xine-lib/receipt
--- a/xine-lib/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xine-lib/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -29,7 +29,7 @@
 	grep -qs 'define u8' src/input/vcd/libcdio/_cdio_linux.c ||
 	sed -i 's|#include <scsi/scsi.h>|#define u8 __u8\n&|' \
 		src/input/vcd/libcdio/_cdio_linux.c
-	patch -p0 < ../stuff/xine-lib-1.1.19-xvmc.patch
+	patch -p0 < $stuff/xine-lib-1.1.19-xvmc.patch
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
diff -r b075b3e8a276 -r 940b5937e496 xorg-xf86-input-evdev/receipt
--- a/xorg-xf86-input-evdev/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xf86-input-evdev/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -34,6 +34,6 @@
     cp -a $_pkg/usr/lib/X11/modules/input/*.so \
     	$fs/usr/lib/X11/modules/input/
 	mkdir -p $fs/etc/X11/xorg.conf.d
-	cp -a stuff/*evdev.conf $fs/etc/X11/xorg.conf.d
+	cp -a $stuff/*evdev.conf $fs/etc/X11/xorg.conf.d
 }
 
diff -r b075b3e8a276 -r 940b5937e496 xorg-xf86-input-evtouch/receipt
--- a/xorg-xf86-input-evtouch/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xf86-input-evtouch/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
     cd $src
-    grep -qs dummy evtouch.c && patch -p1 < ../stuff/evtouch.u
+    grep -qs dummy evtouch.c && patch -p1 < $stuff/evtouch.u
     ./configure \
     	--prefix=/usr \
     	--sysconfdir=/etc \
diff -r b075b3e8a276 -r 940b5937e496 xorg-xf86-input-microtouch/receipt
--- a/xorg-xf86-input-microtouch/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xf86-input-microtouch/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
     cd $src
-    grep -qs axis_labels src/microtouch.c || patch -p0 < ../stuff/microtouch.u
+    grep -qs axis_labels src/microtouch.c || patch -p0 < $stuff/microtouch.u
     ./configure \
     	--prefix=/usr \
     	--sysconfdir=/etc \
diff -r b075b3e8a276 -r 940b5937e496 xorg-xf86-input-mutouch/receipt
--- a/xorg-xf86-input-mutouch/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xf86-input-mutouch/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 compile_rules()
 {
     cd $src
-    patch -p1 -i ../stuff/mutouch-1.2.1-abi.patch
+    patch -p1 -i $stuff/mutouch-1.2.1-abi.patch
     ./configure \
     	--prefix=/usr \
     	--sysconfdir=/etc \
diff -r b075b3e8a276 -r 940b5937e496 xorg-xf86-input-synaptics/receipt
--- a/xorg-xf86-input-synaptics/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xf86-input-synaptics/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -35,6 +35,6 @@
     cp -a $_pkg/usr/lib/X11/modules/input/*.so \
     	$fs/usr/lib/X11/modules/input/
 	mkdir -p $fs/etc/X11/xorg.conf.d
-	cp -a stuff/*.conf $fs/etc/X11/xorg.conf.d
+	cp -a $stuff/*.conf $fs/etc/X11/xorg.conf.d
 }
 
diff -r b075b3e8a276 -r 940b5937e496 xorg-xinit/receipt
--- a/xorg-xinit/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xorg-xinit/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -17,7 +17,7 @@
 compile_rules()
 {
 	cd $src
-	patch -Np1 -i ../stuff/06_move_serverauthfile_into_tmp.diff
+	patch -Np1 -i $stuff/06_move_serverauthfile_into_tmp.diff
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
@@ -31,7 +31,7 @@
 {
 	mkdir -p $fs/usr $fs/etc/X11/xinit
 	cp -a $_pkg/usr/bin $fs/usr
-	cp -a stuff/xserverrc $fs/etc/X11/xinit/xserverrc
+	cp -a $stuff/xserverrc $fs/etc/X11/xinit/xserverrc
 }
 
 pre_install()
diff -r b075b3e8a276 -r 940b5937e496 xpat2/receipt
--- a/xpat2/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xpat2/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,11 +16,11 @@
 	cd $src
 	for i in xpat2.patch layout.patch ; do
 		[ -f done.$i ] && continue
-		patch -p1 < ../stuff/$i
+		patch -p1 < $stuff/$i
 		touch done.$i
 	done
 	cd src
-	cp ../../stuff/Makefile .
+	cp $stuff/Makefile .
 	make &&
 	make DESTDIR=../_pkg install
 }
@@ -31,7 +31,7 @@
 	mkdir -p $fs/var/games/xpat2
 	cp -a $_pkg/usr $fs
 	mkdir -p $fs/usr/share/X11/app-defaults/
-	cp -a $src/../stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat
+	cp -a $stuff/XPat.ad $fs/usr/share/X11/app-defaults/XPat
 	touch $fs/var/games/xpat2/xpat.log
 	chmod 666 $fs/var/games/xpat2/xpat.log
 }
diff -r b075b3e8a276 -r 940b5937e496 xtrkcad/receipt
--- a/xtrkcad/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/xtrkcad/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -22,7 +22,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	XTRKCAD_STUFF=$PWD/stuff
+	XTRKCAD_STUFF=$stuff
 	
 	[ -d $PACKAGE-source-$VERSION ] && mv $PACKAGE-source-$VERSION $PACKAGE-$VERSION
 	cd $src
diff -r b075b3e8a276 -r 940b5937e496 yasr/receipt
--- a/yasr/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/yasr/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -14,7 +14,7 @@
 compile_rules()
 {
 	cd $src/yasr
-	patch -p0 < ../../stuff/yasr.patch || return 1
+	patch -p0 < $stuff/yasr.patch || return 1
 	cd ../
 	./configure \
 		--prefix=/usr 
diff -r b075b3e8a276 -r 940b5937e496 zsnes/receipt
--- a/zsnes/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/zsnes/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -16,7 +16,7 @@
 
 compile_rules() {
   cd $src
-  patch -p1 -i ../stuff/zsnes.patch 
+  patch -p1 -i $stuff/zsnes.patch 
   cd $src/src
   ./configure --prefix=/usr \
     --x-libraries=/usr/lib \
diff -r b075b3e8a276 -r 940b5937e496 zvbi/receipt
--- a/zvbi/receipt	Wed Mar 02 10:41:40 2011 +0100
+++ b/zvbi/receipt	Wed Mar 02 11:06:20 2011 +0100
@@ -15,7 +15,7 @@
 compile_rules()
 {
 	cd $src
-	patch -Np1 -i ../stuff/fix-includes.patch
+	patch -Np1 -i $stuff/fix-includes.patch
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \