# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1304847648 0
# Node ID 7b13b3b4b8365b7a084de2d56d8536b7ee6519ae
# Parent  d1768332cee05e1eee07df628d77a431c51b63ab
Fixed up the errors from last commit.

diff -r d1768332cee0 -r 7b13b3b4b836 dhcp6/receipt
--- a/dhcp6/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/dhcp6/receipt	Sun May 08 09:40:48 2011 +0000
@@ -34,6 +34,6 @@
 	mkdir -p $fs/usr/sbin $fs/etc/init.d
 	cp $_pkg/etc/dhcpd.conf $fs/etc
 	cp $_pkg/usr/sbin/dhcpd $fs/usr/sbin
-	cp $WOK/dhcp6/stuff/dhcpd $fs/etc/init.d
+	cp $WOK/dhcp/stuff/dhcpd $fs/etc/init.d
 }
 
diff -r d1768332cee0 -r 7b13b3b4b836 linux/receipt
--- a/linux/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/linux/receipt	Sun May 08 09:40:48 2011 +0000
@@ -106,7 +106,7 @@
     local path
     cp -a $_pkg/boot $fs
     # Compress all modules.
-    $stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz
+    #$stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz
     path=$fs/lib/modules/$VERSION-slitaz/kernel
     mkdir -p $path
     cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* \
@@ -115,7 +115,7 @@
     export src
     export _pkg
     mkdir $WOK/$PACKAGE/tmp
-    $WOK/$PACKA$stuff/list_modules.sh \
+    $stuff/list_modules.sh \
 	$(cat stuff/modules-$VERSION.list) > $WOK/$PACKAGE/tmp/modules.list
     while read module; do
     	dir=$(dirname $module)
diff -r d1768332cee0 -r 7b13b3b4b836 locale-cs/receipt
--- a/locale-cs/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-cs/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-de/receipt
--- a/locale-de/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-de/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-es/receipt
--- a/locale-es/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-es/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-fr/receipt
--- a/locale-fr/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-fr/receipt	Sun May 08 09:40:48 2011 +0000
@@ -28,7 +28,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
 	CORE_PKGS=""
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
diff -r d1768332cee0 -r 7b13b3b4b836 locale-hu/receipt
--- a/locale-hu/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-hu/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-id/receipt
--- a/locale-id/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-id/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {	
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-it/receipt
--- a/locale-it/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-it/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-pt/receipt
--- a/locale-pt/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-pt/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-ru/receipt
--- a/locale-ru/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-ru/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-sl/receipt
--- a/locale-sl/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-sl/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -27,8 +27,8 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 locale-zh_TW/receipt
--- a/locale-zh_TW/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/locale-zh_TW/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	# Ensure packages are built.
 	for pkg in $CORE_PKGS
 	do
@@ -28,8 +28,8 @@
 # Genereted locale files are in /usr/lib/locale.
 genpkg_rules()
 {
-	. $WOK/slitaz-i1$stuff/locale-pack.functions
-	. $WOK/slitaz-i1$stuff/locale-pack.conf
+	. $WOK/slitaz-i18n/stuff/locale-pack.functions
+	. $WOK/slitaz-i18n/stuff/locale-pack.conf
 	PKG_NAME="$PACKAGE"
 	PKG_VERS="$VERSION"
 	mk_locale_dir
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-binutils/receipt
--- a/mingw32-binutils/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-binutils/receipt	Sun May 08 09:40:48 2011 +0000
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-gcc-c/receipt
--- a/mingw32-gcc-c/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-gcc-c/receipt	Sun May 08 09:40:48 2011 +0000
@@ -15,8 +15,8 @@
 MINGW32_ID="i586-pc-mingw32"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-gcc/receipt
--- a/mingw32-gcc/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-gcc/receipt	Sun May 08 09:40:48 2011 +0000
@@ -19,8 +19,8 @@
 MINGW32_ID="i586-pc-mingw32"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-runtime-headers/receipt
--- a/mingw32-runtime-headers/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-runtime-headers/receipt	Sun May 08 09:40:48 2011 +0000
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-runtime/receipt
--- a/mingw32-runtime/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-runtime/receipt	Sun May 08 09:40:48 2011 +0000
@@ -14,8 +14,8 @@
 MINGW32_ID="i586-pc-mingw32"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-w32api-headers/receipt
--- a/mingw32-w32api-headers/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-w32api-headers/receipt	Sun May 08 09:40:48 2011 +0000
@@ -13,8 +13,8 @@
 WGET_URL="$SF_MIRROR/mingw/$TARBALL"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mingw32-w32api/receipt
--- a/mingw32-w32api/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mingw32-w32api/receipt	Sun May 08 09:40:48 2011 +0000
@@ -14,8 +14,8 @@
 MINGW32_ID="i586-pc-mingw32"
 
 # Configuration only needs included if we're in the build/wok environment
-if [ -e $WOK/mingw32-toolcha$stuff/mingw32.conf ] ; then
-	. $WOK/mingw32-toolcha$stuff/mingw32.conf
+if [ -e $WOK/mingw32-toolchain/stuff/mingw32.conf ] ; then
+	. $WOK/mingw32-toolchain/stuff/mingw32.conf
 fi
 
 # Rules to configure and make the package.
diff -r d1768332cee0 -r 7b13b3b4b836 mysql/receipt
--- a/mysql/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/mysql/receipt	Sun May 08 09:40:48 2011 +0000
@@ -59,7 +59,7 @@
 	# Permissions
 	chmod 600 $fs/etc/mysql/my.cnf
 
-	cat $WOK/$PACKA$stuff/*.files-list | while read file; do
+	cat $stuff/*.files-list | while read file; do
 		[ -f $fs$file ] && rm -f $fs$file
 	done
 
diff -r d1768332cee0 -r 7b13b3b4b836 ndiswrapper-driver/receipt
--- a/ndiswrapper-driver/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/ndiswrapper-driver/receipt	Sun May 08 09:40:48 2011 +0000
@@ -36,7 +36,7 @@
 	install -o root -m 755 $src/utils/loadndisdriver $fs/sbin/
 
 	# Compress and install module
-	$stuff/gztazmod.sh $fs/lib/modules/$VERSION-slitaz
+	# $stuff/gztazmod.sh $fs/lib/modules/$VERSION-slitaz
 	lzma e $src/driver/ndiswrapper.ko \
 		$fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.gz
 	chown root $fs/lib/modules/$KERNEL_VERSION-slitaz/kernel/misc/ndiswrapper.ko.gz
diff -r d1768332cee0 -r 7b13b3b4b836 openssh-pam/receipt
--- a/openssh-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/openssh-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -32,7 +32,7 @@
 	cp -a $_pkg/usr/sbin $_pkg/usr/bin $fs/usr
 	rm -f $fs/usr/sbin/sftp-server
 	cp -a $_pkg/etc $fs
-	cp ../$SOUR$stuff/openssh $fs/etc/init.d
+	cp ../$SOURCE/stuff/openssh $fs/etc/init.d
 	sed -i 's/.*UsePAM.*/UsePAM yes/' $fs/etc/ssh/sshd_config
 }
 
diff -r d1768332cee0 -r 7b13b3b4b836 partimage-pam/receipt
--- a/partimage-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/partimage-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -31,8 +31,8 @@
 	mkdir -p $fs/usr $fs/etc/init.d
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/etc $fs/
-	install -g root -o root -m 0600 ../$SOUR$stuff/etc/partimaged/partimaged.* $fs/etc/partimaged
-	install -g root -o root -m 0755 ../$SOUR$stuff/etc/init.d/partimaged $fs/etc/init.d
+	install -g root -o root -m 0600 ../$SOURCE/stuff/etc/partimaged/partimaged.* $fs/etc/partimaged
+	install -g root -o root -m 0755 ../$SOURCE/stuff/etc/init.d/partimaged $fs/etc/init.d
 }
 
 post_install()
diff -r d1768332cee0 -r 7b13b3b4b836 perdition-pam/receipt
--- a/perdition-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/perdition-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -35,7 +35,7 @@
 	mkdir -p $fs/usr/lib $fs/etc/openldap/schema
 	cp -a $_pkg/etc $fs
 	rm -f $fs/etc/perdition/perdition.conf
-	cp -a ../$SOUR$stuff/etc $fs
+	cp -a ../$SOURCE/stuff/etc $fs
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 	for i in pop3 pop3s imap4 imap4s imaps; do
diff -r d1768332cee0 -r 7b13b3b4b836 postgresql/receipt
--- a/postgresql/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/postgresql/receipt	Sun May 08 09:40:48 2011 +0000
@@ -39,10 +39,10 @@
 	cp -a $_pkg/usr/lib/postgresql $fs/usr/lib
 	rm -f $fs/usr/lib/postgresql/*a
 	cp -a $_pkg/usr/share/postgresql $fs/usr/share
-	cp -a stuff/etc $fs
+	cp -a $stuff/etc $fs
 	ln -s /var/lib/pgsql/postgresql.conf $fs/etc
 	chmod 700 $fs/var/lib/pgsql
-	cat $WOK/$PACKA$stuff/*.files-list | while read file; do
+	cat $stuff/*.files-list | while read file; do
 		[ -f $fs$file ] && rm -f $fs$file
 	done
 
diff -r d1768332cee0 -r 7b13b3b4b836 ppp-pam/receipt
--- a/ppp-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/ppp-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -33,7 +33,7 @@
 	cp -a $_pkg/usr/lib $fs/usr
 	# Config files.
 	mkdir -p $fs/etc/ppp/scripts
-	cp ../$SOUR$stuff/README.scripts $fs/etc/ppp
+	cp ../$SOURCE/stuff/README.scripts $fs/etc/ppp
 	cp -a $src/etc.ppp/* $fs/etc/ppp
 	# PPP scripts.
 	cp -a $src/scripts/ppp-on $fs/etc/ppp/scripts
diff -r d1768332cee0 -r 7b13b3b4b836 privoxy/receipt
--- a/privoxy/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/privoxy/receipt	Sun May 08 09:40:48 2011 +0000
@@ -42,8 +42,8 @@
 	cp -a $_pkg/var $fs
 	cp -a $_pkg/etc $fs
 
-	# Copy daemon fro$stuff
-	cp stuff/daemon-privoxy $fs/etc/init.d/privoxy
+	# Copy daemon from stuff
+	cp $stuff/daemon-privoxy $fs/etc/init.d/privoxy
 }
 
 post_install()
diff -r d1768332cee0 -r 7b13b3b4b836 pure-ftpd-pam/receipt
--- a/pure-ftpd-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/pure-ftpd-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -28,7 +28,7 @@
 	mkdir -p $fs/usr $fs/etc/init.d
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/sbin $fs/usr
-	install -g root -o root -m 0755 ../$SOUR$stuff/pure-ftpd $fs/etc/init.d
+	install -g root -o root -m 0755 ../$SOURCE/stuff/pure-ftpd $fs/etc/init.d
 }
 
 post_install()
diff -r d1768332cee0 -r 7b13b3b4b836 python-bpython/receipt
--- a/python-bpython/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/python-bpython/receipt	Sun May 08 09:40:48 2011 +0000
@@ -29,6 +29,6 @@
 	mkdir -p $fs/usr $fs/usr/share/applications
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
-	cp -a $WOK/$PACKA$stuff/* $fs/usr/share/applications
+	cp -a $stuff/* $fs/usr/share/applications
 }
 
diff -r d1768332cee0 -r 7b13b3b4b836 samba-pam/receipt
--- a/samba-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/samba-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -32,7 +32,7 @@
 	make DESTDIR=$PWD/../_pkg install || return 1
 	rm -f ../_pkg/usr/*bin/*.old
 	#ln -s libwbclient.so $PWD/../_pkg/usr/lib/libwbclient.so.0
-	cp ../../../$SOUR$stuff/*.files-list ..
+	cp ../../../$SOURCE/stuff/*.files-list ..
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r d1768332cee0 -r 7b13b3b4b836 slim-pam/receipt
--- a/slim-pam/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/slim-pam/receipt	Sun May 08 09:40:48 2011 +0000
@@ -30,11 +30,11 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a ../$SOUR$stuff/themes $fs/usr/share/slim
+	cp -a ../$SOURCE/stuff/themes $fs/usr/share/slim
 	cp -a $_pkg/usr/bin $fs/usr
 	
 	# Config file and rc script.
-	cp -a ../$SOUR$stuff/etc $fs
+	cp -a ../$SOURCE/stuff/etc $fs
 	chown -R root.root $fs
 }
 
diff -r d1768332cee0 -r 7b13b3b4b836 urxvt-full/receipt
--- a/urxvt-full/receipt	Sun May 08 09:01:58 2011 +0000
+++ b/urxvt-full/receipt	Sun May 08 09:40:48 2011 +0000
@@ -16,7 +16,7 @@
 compile_rules()
 {
 	cd $src
-	busybox patch -p0 -i $WOK/urx$stuff/gcc.u
+	busybox patch -p0 -i $WOK/urxvt/stuff/gcc.u
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--enable-everything \
 	--mandir=/usr/share/man $CONFIGURE_ARGS && \