# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1298184839 0
# Node ID be13f25e790b0e3e6bea6ae3268a2198c1af0c9b
# Parent  bd1f53513207d225bab817e6eecd154452f1cfd2
Removed all/most _pkg= lines in wok. The new tazwok-experimental can SOURCE paths and source are are all extracted to WOK/PACKAGE/PACKAGE-VERSION now with tazwok-experimental.

diff -r bd1f53513207 -r be13f25e790b airoscript-ng/receipt
--- a/airoscript-ng/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/airoscript-ng/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,23 +14,21 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/${SOURCE%-ng}
 	cd $src
-	patch -Np0 -i ../stuff/path.patch
-	patch -Np0 -i ../stuff/makefile.patch
-	make -j1 prefix=$PWD/_pkg/usr install
+	patch -Np0 -i $stuff/path.patch
+	patch -Np0 -i $stuff/makefile.patch
+	make -j1 prefix=$DESTDIR/usr install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/Airoscript/_pkg
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/share/airoscript-ng $fs/usr/share
 	cp -a $_pkg/usr/etc $fs/etc
 	mv $fs/etc/screenrc $fs/usr/share/airoscript-ng/
 	cd $fs/etc
-	patch -Np0 -i $WOK/$PACKAGE/stuff/config.patch
+	patch -Np0 -i $stuff/config.patch
 }
 
diff -r bd1f53513207 -r be13f25e790b apache-dev/receipt
--- a/apache-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/apache-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/apache $fs/usr/bin
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/bin/apxs $fs/usr/bin
 	cp -a $_pkg/usr/share/apache/build $fs/usr/share/apache
diff -r bd1f53513207 -r be13f25e790b apache-doc/receipt
--- a/apache-doc/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/apache-doc/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,8 +13,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/share/doc $fs/usr/share
-	
 }
 
diff -r bd1f53513207 -r be13f25e790b aspell-es/receipt
--- a/aspell-es/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/aspell-es/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,16 +15,14 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$SOURCE-$VERSION-2
 	cd $src
 	./configure && \
-	make && make DESTDIR=$PWD/_pkg install
+	make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$SOURCE-$VERSION-2/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/* $fs/usr/lib
 }
diff -r bd1f53513207 -r be13f25e790b atm-tools-dev/receipt
--- a/atm-tools-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/atm-tools-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*a $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b atm-tools/receipt
--- a/atm-tools/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/atm-tools/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -11,16 +11,15 @@
 WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
 CONFIG_FILES="/etc/atmsigd.conf"
 
-
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	busybox patch -p0 < ../stuff/MAX_PATH.u
+	busybox patch -p0 < $stuff/MAX_PATH.u
 	./configure --prefix=/usr --infodir=/usr/share/info \
 	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r bd1f53513207 -r be13f25e790b boxbackup-client/receipt
--- a/boxbackup-client/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/boxbackup-client/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -19,7 +19,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg
 genpkg_rules()
 {
- 	_pkg=$WOK/$WANTED/${SOURCE}-$VERSION/parcels/boxbackup-${VERSION}-backup-client-linux-gnu
+	_pkg=$WOK/$WANTED/${SOURCE}-$VERSION/parcels/boxbackup-${VERSION}-backup-client-linux-gnu
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/bb* $fs/usr/bin
 	mkdir -p $fs/etc/init.d
@@ -40,15 +40,17 @@
 post_install()
 {
 	# Creating conf dir
-	if [ ! -e $CONF_DIR ]; then
-	    mkdir -p $CONF_DIR && chmod 755 $CONF_DIR
+	if [ ! -e $1/$CONF_DIR ]; then
+	    mkdir -p $1/$CONF_DIR && chmod 755 $1/$CONF_DIR
 	fi
-	if [ ! -e $DATA_DIR ]; then
-	    mkdir -p $DATA_DIR && chmod 700 $DATA_DIR
+	if [ ! -e $1/$DATA_DIR ]; then
+	    mkdir -p $1/$DATA_DIR && chmod 700 $1/$DATA_DIR
 	fi
-	# Start daemon (if stopped by install)
-	if [ $RUN_DMON -eq 1 ]; then
-		/etc/init.d/bbackupd start
+	if [ -z $1 ]; then
+		# Start daemon (if stopped by install)
+		if [ $RUN_DMON -eq 1 ]; then
+			/etc/init.d/bbackupd start
+		fi
 	fi
 }
 
@@ -57,25 +59,27 @@
 pre_remove()
 {
     # Stop daemon
-	if [ -e /var/run/bbackupd.pid ]; then
-		/etc/init.d/bbackupd stop
+	if [ -z $1 ]; then
+		if [ -e /var/run/bbackupd.pid ]; then
+			/etc/init.d/bbackupd stop
+		fi
 	fi
 }
 
 post_remove()
 {
 	# Delete DATA directory
-	rm -rf $DATA_DIR
+	rm -rf $1/$DATA_DIR
 
 	# Delete Client config files
-	rm -rf $CONF_DIR/bbackupd*
+	rm -rf $1/$CONF_DIR/bbackupd*
 
 	# Delete CONF dir (if empty)
 	if [ `ls -lA $CONF_DIR | wc -l` -eq 0 ]; then
 		echo -n "Removing $CONF_DIR..."
-		rm -rf $CONF_DIR
+		rm -rf $1/$CONF_DIR
 		status
 	fi
 	# Delete PID, sock files
-	rm -f /var/run/bbackupd.*
+	rm -f $1/var/run/bbackupd.*
 }
diff -r bd1f53513207 -r be13f25e790b codeblocks/receipt
--- a/codeblocks/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/codeblocks/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,21 +15,19 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$PACKAGE-$VERSION-release
 	cd $src
-	busybox patch -p1 -i ../stuff/glib.u
+	busybox patch -p1 -i $stuff/glib.u
 	./configure \
 		--with-contrib-plugins="all, -help" \
 		--prefix=/usr \
 		$CONFIGURE_ARGS &&
 	make -j 4 &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION-release/_pkg
 	mkdir -p $fs/usr/lib $fs/usr/share
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b cups-pdf/receipt
--- a/cups-pdf/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/cups-pdf/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -23,10 +23,9 @@
 genpkg_rules()
 {
 	mkdir -p $fs/etc/cups $fs/usr/lib/cups/backend $fs/usr/share/cups/model
-	_pkg=$src
-	cp -a $_pkg/src/cups-pdf $fs/usr/lib/cups/backend 
-	cp -a $_pkg/extra/CUPS-PDF.ppd $fs/usr/share/cups/model
-	cp -a $_pkg/extra/cups-pdf.conf   $fs/etc/cups
+	cp -a $src/src/cups-pdf $fs/usr/lib/cups/backend 
+	cp -a $src/extra/CUPS-PDF.ppd $fs/usr/share/cups/model
+	cp -a $src/extra/cups-pdf.conf   $fs/etc/cups
 	
 }
 
diff -r bd1f53513207 -r be13f25e790b exo-tools/receipt
--- a/exo-tools/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/exo-tools/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,9 +14,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	src=$WOK/$WANTED/$WANTED-$VERSION
-	_pkg=$WOK/$WANTED/$WANTED-$VERSION/_pkg
-	
 	mkdir -p $fs/usr/share/locale \
 		$fs/usr/share/xfce4 \
 		$fs/etc/xdg/xfce4
diff -r bd1f53513207 -r be13f25e790b exosip-dev/receipt
--- a/exosip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/exosip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -11,7 +11,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/libeXosip2-$VERSION/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
diff -r bd1f53513207 -r be13f25e790b fceux/receipt
--- a/fceux/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/fceux/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/fceu${VERSION}
 	cd $src
 	scons
 
@@ -25,7 +24,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/fceu${VERSION}/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b fox14-dev/receipt
--- a/fox14-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/fox14-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -16,7 +16,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/fox-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*.a* $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b freeradius-pam/receipt
--- a/freeradius-pam/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/freeradius-pam/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/etc/raddb/modules
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/rlm_pam*.so* $fs/usr/lib
 	cp -a $_pkg/etc/raddb/modules/pam $fs/etc/raddb/modules
 }
diff -r bd1f53513207 -r be13f25e790b freetype1-dev/receipt
--- a/freetype1-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/freetype1-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,9 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b geoip-dev/receipt
--- a/geoip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/geoip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b glpi/receipt
--- a/glpi/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/glpi/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,16 +14,12 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	test -d $PACKAGE && mv $PACKAGE $PACKAGE-$VERSION
-	
-	_pkg=$src
-	
 	mkdir -p $fs/usr/share/$PACKAGE \
 		$fs/etc/$PACKAGE \
 		$fs/var/log/$PACKAGE \
 		$fs/var/lib/$PACKAGE
 		 
-	cp -a $_pkg/* $fs/usr/share/$PACKAGE
+	cp -a $src/* $fs/usr/share/$PACKAGE
 	[ -d $fs/usr/share/$PACKAGE/files ] &&  mv $fs/usr/share/$PACKAGE/files $fs/var/lib/$PACKAGE
 
 	# Copy config db as temporary file.
diff -r bd1f53513207 -r be13f25e790b gvim/receipt
--- a/gvim/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/gvim/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg="$WOK/$WANTED/vim72/_pkg"
 	mkdir -p $fs/usr/bin \
 		-p $fs/usr/share/pixmaps \
 		-p $fs/usr/share/applications
@@ -23,7 +22,7 @@
 		cp -a $_pkg/usr/bin/$i $fs/usr/bin
 	done
 	
-	cp -a $WOK/$WANTED/vim72/runtime/vim16x16.png $fs/usr/share/pixmaps/gvim.png
+	cp -a $src/runtime/vim16x16.png $fs/usr/share/pixmaps/gvim.png
 		
 	cp -a stuff/gvim.desktop $fs/usr/share/applications
 }
diff -r bd1f53513207 -r be13f25e790b h8300-gdb-dev/receipt
--- a/h8300-gdb-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/h8300-gdb-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,9 +12,6 @@
 
 genpkg_rules()
 {
-	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-
 	mkdir -p $fs/usr
 	
 	# Copying include dir if exists
diff -r bd1f53513207 -r be13f25e790b hal-cups-utils/receipt
--- a/hal-cups-utils/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/hal-cups-utils/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 
 compile_rules() {
-  cd $WOK/$PACKAGE/$PACKAGE
   ./configure --prefix=/usr --libexecdir=/usr/lib/hal/scripts/ &&
   make  &&
   make DESTDIR=$PWD/_pkg install
@@ -25,7 +24,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	_pkg="$WOK/$PACKAGE/$PACKAGE/_pkg"
 	cp -a $_pkg/usr/lib $fs/usr
 	cp -a $_pkg/usr/share $fs/usr
 	
diff -r bd1f53513207 -r be13f25e790b icedtea6-jre/receipt
--- a/icedtea6-jre/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/icedtea6-jre/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -17,7 +17,7 @@
 genpkg_rules()
 {
 	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 
 	mkdir -p $fs/usr/lib/jvm/java-icedtea
 	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
diff -r bd1f53513207 -r be13f25e790b imagemagick-dev/receipt
--- a/imagemagick-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/imagemagick-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 }
diff -r bd1f53513207 -r be13f25e790b java-jdk/receipt
--- a/java-jdk/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/java-jdk/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,9 +15,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/jdk-bin/* $fs/usr/bin
 }
diff -r bd1f53513207 -r be13f25e790b java-jre/receipt
--- a/java-jre/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/java-jre/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,9 +14,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/jre-bin/* $fs/usr/bin
 }
diff -r bd1f53513207 -r be13f25e790b jclic/receipt
--- a/jclic/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/jclic/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -21,13 +21,11 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg="$WOK/$PACKAGE/$PACKAGE-$VERSION"
-	STUFF="$WOK/$PACKAGE/stuff"
 	mkdir -p $fs/usr/lib/jclic $fs/usr/share/pixmaps $fs/usr/share/applications
-	cp -a $_pkg/* $fs/usr/lib/jclic
-	cp $STUFF/jclicauthor.desktop $fs/usr/share/applications
-	cp $STUFF/jclicreports.desktop $fs/usr/share/applications
-	cp $STUFF/author.png $fs/usr/share/pixmaps
-	cp $STUFF/reports.png $fs/usr/share/pixmaps
+	cp -a $src/* $fs/usr/lib/jclic
+	cp $stuff/jclicauthor.desktop $fs/usr/share/applications
+	cp $stuff/jclicreports.desktop $fs/usr/share/applications
+	cp $stuff/author.png $fs/usr/share/pixmaps
+	cp $stuff/reports.png $fs/usr/share/pixmaps
 }
 
diff -r bd1f53513207 -r be13f25e790b keepassx/receipt
--- a/keepassx/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/keepassx/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -27,7 +27,6 @@
 genpkg_rules()
 {
    	mkdir -p $fs/usr/share/pixmaps
-	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION/_pkg
 	cp -a $_pkg/usr/bin $fs/usr
 	#cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share	
 	cp -a $_pkg/usr/share $fs/usr	
diff -r bd1f53513207 -r be13f25e790b libgtkimageview-dev/receipt
--- a/libgtkimageview-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libgtkimageview-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
diff -r bd1f53513207 -r be13f25e790b libhx-dev/receipt
--- a/libhx-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libhx-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b libsdl-dev/receipt
--- a/libsdl-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/share
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b libsdl-gfx-dev/receipt
--- a/libsdl-gfx-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-gfx-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b libsdl-image-dev/receipt
--- a/libsdl-image-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-image-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -17,7 +17,6 @@
 {
 	mkdir -p $fs/usr/lib
 
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b libsdl-mixer-dev/receipt
--- a/libsdl-mixer-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-mixer-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -5,9 +5,7 @@
 CATEGORY="development"
 SHORT_DESC="Development files of a multichannel sample and music mixer."
 MAINTAINER="chadi.elahmad@gmail.com"
-
 WEB_SITE="http://www.libsdl.org/projects/SDL_mixer/"
-
 DEPENDS="libsdl-mixer libsdl-dev libmad-dev libvorbis-dev libogg-dev "
 WANTED="libsdl-mixer"
 SOURCE="SDL_mixer"
@@ -16,8 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b libsdl-net-dev/receipt
--- a/libsdl-net-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-net-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,8 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b libsdl-pango-dev/receipt
--- a/libsdl-pango-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-pango-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b libsdl-perl/receipt
--- a/libsdl-perl/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-perl/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$SOURCE-v${VERSION}
 	cd $src
 	perl Build.PL destdir="$PWD/_pkg" &&
 	perl Build &&
@@ -25,7 +24,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$SOURCE-v${VERSION}/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b libsdl-ttf-dev/receipt
--- a/libsdl-ttf-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libsdl-ttf-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,8 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b libv4l-dev/receipt
--- a/libv4l-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libv4l-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/${PACKAGE/-dev}/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib 
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib	
diff -r bd1f53513207 -r be13f25e790b libv4l/receipt
--- a/libv4l/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libv4l/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 
 compile_rules() {
-  src=$WOK/$PACKAGE/$SOURCE-$VERSION
   cd $src
   make &&
   make install PREFIX="/usr" DESTDIR="${PWD}/_pkg" 
@@ -24,7 +23,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*so* $fs/usr/lib/
 	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b libvncserver-dev/receipt
--- a/libvncserver-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/libvncserver-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b lives/receipt
--- a/lives/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/lives/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -28,7 +28,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION/_pkg
 	mkdir -p $fs/usr/lib $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b mencoder/receipt
--- a/mencoder/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/mencoder/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/MPlayer-$VERSION/_pkg
 	mkdir -p $fs/usr/bin
 	cp -a $_pkg/usr/bin/mencoder $fs/usr/bin
 }
diff -r bd1f53513207 -r be13f25e790b mupen64plus/receipt
--- a/mupen64plus/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/mupen64plus/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,14 +15,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src
 	cd $src
 
 	# patching (provided by Yggdrasil) Thanks! Will remove when new version of mupen64plus comes out.
-	patch -Np1 -i ../stuff/const.patch
-	patch -Np1 -i ../stuff/blight-input-linking.patch
+	patch -Np1 -i $stuff/const.patch
+	patch -Np1 -i $stuff/blight-input-linking.patch
 	# thanks to debian for having a patch :) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329
-	patch -Np1 -i ../stuff/ftbfs-gvariant-type-conflicts.patch
+	patch -Np1 -i $stuff/ftbfs-gvariant-type-conflicts.patch
 
 	make PREFIX=/usr all
 	mkdir -p $PWD/_pkg/usr/bin
@@ -32,7 +31,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src/_pkg
 	mkdir -p $fs/usr/share
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/mupen64plus $fs/usr/share
diff -r bd1f53513207 -r be13f25e790b nathive/receipt
--- a/nathive/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/nathive/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,11 +12,9 @@
 WGET_URL="$WEB_SITE/get/$TARBALL"
 TAGS="image photo editor"
 
-
 # Rules to configure and make the package.
 compile_rules()
 {
-    src="$WOK/$PACKAGE/${PACKAGE}_${VERSION}_source"
 	cd $src
 	sed 's|"./"|"/usr/share/nathive/"|g' -i main.c
 	make	
@@ -25,20 +23,19 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    mkdir -p $fs/usr/bin
-    mkdir -p $fs/usr/share/nathive  
+	mkdir -p $fs/usr/bin
+	mkdir -p $fs/usr/share/nathive  
 	mkdir -p $fs/usr/share/applications 
-	_pkg="$WOK/$PACKAGE/${PACKAGE}_${VERSION}_source"
 
-	cp -a $_pkg/nathive $fs/usr/bin
+	cp -a $src/nathive $fs/usr/bin
 	
-	cp -a $_pkg/cfg/ $_pkg/img/ $_pkg/palettes/ $_pkg/text/ $fs/usr/share/nathive/
+	cp -a $src/cfg/ $src/img/ $src/palettes/ $src/text/ $fs/usr/share/nathive/
 	#copy locale : it only adds 4k
-	cp -a $_pkg/lang/ $fs/usr/share/nathive/
+	cp -a $src/lang/ $fs/usr/share/nathive/
 	# change owner and permissions
 	chown -R root.root $fs/usr/share/nathive
 	chmod -R 0755 $fs/usr/share/nathive
 	
-	cp -a stuff/nathive.desktop $fs/usr/share/applications 
+	cp -a $stuff/nathive.desktop $fs/usr/share/applications 
 
 }
diff -r bd1f53513207 -r be13f25e790b ncursesw-dev/receipt
--- a/ncursesw-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ncursesw-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -11,7 +11,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/ncurses-$VERSION/_pkg
 	mkdir -p $fs/lib $fs/usr/bin
 	cp -a $_pkg/lib/*.a $fs/lib
 	# Include files have the same name as ncuses-dev but seems 
diff -r bd1f53513207 -r be13f25e790b ncursesw-extra/receipt
--- a/ncursesw-extra/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ncursesw-extra/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/ncurses-$VERSION/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/bin $fs/usr
 	chmod 755 $fs/usr/bin/*
diff -r bd1f53513207 -r be13f25e790b ocsinventory-agent/receipt
--- a/ocsinventory-agent/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ocsinventory-agent/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -16,16 +16,14 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/Ocsinventory-Agent-${VERSION}
-
-	cp stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
-	cp stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
+	cp $stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
+	cp $stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
 	
 	cd $src
 	
 	# don't run postinstall script
 	rm -f run-postinst
-	for p in ../stuff/ocsinventory-agent-1.1.2.1.u
+	for p in $stuff/ocsinventory-agent-1.1.2.1.u
 	do
 		[ -f done.$(basename $p) ] && continue
 		patch -p1 -i $p || return 1
@@ -39,8 +37,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/Ocsinventory-Agent-${VERSION}/_pkg
-		
 	mkdir -p $fs/usr \
 		$fs/etc/ocsinventory-agent \
 		$fs/var/lib/ocsinventory-agent
@@ -61,10 +57,5 @@
 		install -o root -g root -m 0755 -d $1/var/lib/dpkg
 		touch $1/var/lib/dpkg/status
 	fi
-}	
-
-clean_wok()
-{
-	[ -d Ocsinventory-Agent-${VERSION} ] && rm -rf Ocsinventory-Agent-${VERSION}
 }
 
diff -r bd1f53513207 -r be13f25e790b ocsinventory-server/receipt
--- a/ocsinventory-server/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ocsinventory-server/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -16,9 +16,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	src=$WOK/$WANTED/$SOURCE-$VERSION
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-	
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
 	
diff -r bd1f53513207 -r be13f25e790b ocsinventory/receipt
--- a/ocsinventory/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ocsinventory/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -18,7 +18,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	mv ${SOURCE}_${VERSION} $src 2> /dev/null
 	cd $src/Apache
 	perl Makefile.PL &&
 	make &&
@@ -27,12 +26,6 @@
 
 genpkg_rules() {
 	mkdir $fs/usr
-	
-#	cd $WOK 
-	for i in $DEPENDS
-	do
-		 tazwok cook $i
-	done
 }
 
 
diff -r bd1f53513207 -r be13f25e790b openal-dev/receipt
--- a/openal-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/openal-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 }
diff -r bd1f53513207 -r be13f25e790b opensp-dev/receipt
--- a/opensp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/opensp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,8 +15,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-	
 	mkdir -p $fs/usr/lib $fs/usr/share
 	
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b osip-dev/receipt
--- a/osip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/osip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/libosip2-$VERSION/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/lib $fs/usr
diff -r bd1f53513207 -r be13f25e790b poptop-man/receipt
--- a/poptop-man/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/poptop-man/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/
 	cp -a $_pkg/usr/share $fs/usr/
 }
diff -r bd1f53513207 -r be13f25e790b portaudio-dev/receipt
--- a/portaudio-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/portaudio-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,8 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$WANTED/_pkg
-
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b portaudio/receipt
--- a/portaudio/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/portaudio/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$PACKAGE
 	cd  $src
 	./configure --prefix=/usr \
 		--infodir=/usr/share/info \
@@ -27,8 +26,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$PACKAGE/_pkg
-
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 }
diff -r bd1f53513207 -r be13f25e790b portmap/receipt
--- a/portmap/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/portmap/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,9 +15,6 @@
 # rules to configure and make the package.
 compile_rules()
 {
-	# Ovewriting default $src definition
-	
-	src=${PACKAGE}_${VERSION}	
 	cd $src
 	
 	# Build 
@@ -28,10 +25,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	src=${PACKAGE}_${VERSION}	
-	_pkg=${PACKAGE}_${VERSION}/_pkg	
-	
-
 	mkdir -p $fs/usr/sbin
 	cp -a $src/pmap_dump $fs/usr/sbin
 	cp -a $src/pmap_set $fs/usr/sbin
diff -r bd1f53513207 -r be13f25e790b portmidi/receipt
--- a/portmidi/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/portmidi/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,9 +14,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$PACKAGE
 	cd $src
-	patch -Np1 -i ../stuff/portmidi-217-Makefile.patch
+	patch -Np1 -i $stuff/portmidi-217-Makefile.patch
 
 	 # Prefix Fix
 	sed -i "s_\(/usr\)/local_\1_" \
@@ -39,7 +38,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$PACKAGE/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/* $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b pptpclient-extra/receipt
--- a/pptpclient-extra/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/pptpclient-extra/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/sbin
 	cp -a $_pkg/usr/sbin/pptpsetup $fs/usr/sbin
 	sed -i 's/die ".* MPPE .* in kernel/echo "$0: no MPPE kernel module/' \
diff -r bd1f53513207 -r be13f25e790b pptpclient-man/receipt
--- a/pptpclient-man/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/pptpclient-man/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/
 	cp -a $_pkg/usr/share $fs/usr/
 }
diff -r bd1f53513207 -r be13f25e790b python-couchdbkit/receipt
--- a/python-couchdbkit/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/python-couchdbkit/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src="$SOURCE"
 	cd $src
 	python setup.py install --root=$PWD/_pkg
 }
@@ -24,10 +23,6 @@
 genpkg_rules()
 {
 	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
-	_pkg="$SOURCE/_pkg"
-	for file in `find $_pkg | grep 'pyc$'`; do
-		rm $file
-	done
 	mkdir -p $fs/usr
 	rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/*
 	rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests
diff -r bd1f53513207 -r be13f25e790b python-dev/receipt
--- a/python-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/python-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/include $fs/usr
 	cp -a $_pkg/usr/bin/*-config $fs/usr/bin
 	chmod 755 $fs/usr/bin/*-config
diff -r bd1f53513207 -r be13f25e790b python-docutils/receipt
--- a/python-docutils/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/python-docutils/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -16,7 +16,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src="$SOURCE"
 	cd $src
 	python setup.py install --root=$PWD/_pkg
 }
@@ -24,10 +23,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg="$SOURCE/_pkg"
-	for file in `find $_pkg | grep 'pyc$'`; do
-		rm $file
-	done
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr $fs
 }
diff -r bd1f53513207 -r be13f25e790b python-restclient/receipt
--- a/python-restclient/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/python-restclient/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src="$SOURCE"
 	cd $src
 	python setup.py install --root=$PWD/_pkg
 }
@@ -24,10 +23,6 @@
 genpkg_rules()
 {
 	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
-	_pkg="$SOURCE/_pkg"
-	for file in `find $_pkg | grep 'pyc$'`; do
-		rm $file
-	done
 	mkdir -p $fs/usr
 	rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/*
 	rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests
diff -r bd1f53513207 -r be13f25e790b rapidsvn/receipt
--- a/rapidsvn/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/rapidsvn/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,11 +13,9 @@
 WGET_URL="http://www.rapidsvn.org/download/release/0.12/$TARBALL"
 TAGS="subversion svn version-control versioning"
 
-
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$WOK/$PACKAGE/$PACKAGE-$VERSION-1
 	cd $src
 	./configure --prefix=/usr \
 		--with-apr-config=apr-1-config \
@@ -34,7 +32,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION-1/_pkg
 	mkdir -p $fs/usr/lib \
 		 $fs/usr/share \
 		 $fs/usr/share/applications \
diff -r bd1f53513207 -r be13f25e790b ssmtp/receipt
--- a/ssmtp/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/ssmtp/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd ssmtp
+    cd $src
     ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --mandir=/usr/share/man \
@@ -32,7 +32,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-    _pkg=$PWD/ssmtp/_pkg
     mkdir -p $fs/usr
     cp -a $_pkg/usr/sbin/ $fs/usr/
     cp -a $_pkg/etc/ $fs/
@@ -51,12 +50,7 @@
 post_remove() 
 {
     echo "Processing post-remove commands..."
-    rm -f /usr/sbin/sendmail
-    rm -f /usr/sbin/newaliases
-    rm -f /usr/sbin/mailq
+    rm -f $1/usr/sbin/sendmail
+    rm -f $1/usr/sbin/newaliases
+    rm -f $1/usr/sbin/mailq
 }
-
-clean_wok()
-{
-    rm -rf ssmtp
-}
diff -r bd1f53513207 -r be13f25e790b thunar-dev/receipt
--- a/thunar-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/thunar-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,9 +13,6 @@
 
 genpkg_rules()
 {
-	
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
-	
 	mkdir -p $fs/usr/lib/thunarx-2
 	
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b tk-dev/receipt
--- a/tk-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/tk-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -11,19 +11,11 @@
 WEB_SITE="http://tcl.sourceforge.net/"
 WANTED="tk"
 
-
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/${SOURCE}${VERSION}/unix/_pkg
-	
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/tkConfig.sh $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr/
 }
-
-clean_wok(){
-	test -d tk* && rm -rf tk*
-}
diff -r bd1f53513207 -r be13f25e790b tk/receipt
--- a/tk/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/tk/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -17,22 +17,17 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Redefine TK source path
-	src=${SOURCE}${VERSION}/unix
-
-	cd $src
+	cd $src/unix
 	./configure --prefix=/usr \
 	 --enable-threads \
 	 --enable-shared  $CONFIGURE_ARGS &&
 	make &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=${SOURCE}${VERSION}/unix/_pkg
-	
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
@@ -41,8 +36,3 @@
 	cd $fs/usr/bin
 	ln -s wish${VERSION%%.[0-9]} wish
 }
-
-clean_wok()
-{
-	test -d tk* && rm -rf tk*
-}
diff -r bd1f53513207 -r be13f25e790b vim-tiny/receipt
--- a/vim-tiny/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/vim-tiny/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -16,8 +16,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=vim72
-	#test -d $PACKAGE-$VERSION || mv vim72 $PACKAGE-$VERSION
 	cd $src
 	
 	./configure --prefix=/usr \
@@ -33,30 +31,21 @@
 	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
 	 
 	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/$src MAKE="make -e" &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
+	mkdir -p $DESTDIR/etc/vim
+	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg="$PWD/vim72/_pkg"
-	
-	mkdir -p $fs/usr $fs/usr/share $fs/etc/vim
+	mkdir -p $fs/usr $fs/usr/share
 	
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/vim $fs/usr/share
-	cp -a $WOK/$PACKAGE/vim72/runtime/vimrc_example.vim $fs/etc/vim/vimrc
 	rm -f $fs/usr/bin/*tutor
 }
 
-
-
-# Rules to clean extras dirs or files
-clean_wok()
-{
-	rm -rf $PWD/vim72 2>/dev/null
-}
-
 post_install()
 {
     local root
@@ -84,5 +73,5 @@
 {
 	# restore previous symlink
 	echo "Processing post-remove commands..."
-	ln -sf /bin/busybox /bin/vi
+	ln -sf /bin/busybox $1/bin/vi
 }
diff -r bd1f53513207 -r be13f25e790b vim/receipt
--- a/vim/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/vim/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src="vim72"
 	cd $src
 	
 	./configure --prefix=/usr \
@@ -29,30 +28,21 @@
 	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
 	 
 	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/$src MAKE="make -e" &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
+	mkdir -p $DESTDIR/etc/vim
+	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg="$PWD/vim72/_pkg"
-	
-	mkdir -p $fs/usr $fs/usr/share $fs/etc/vim
+	mkdir -p $fs/usr $fs/usr/share
 	
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/vim $fs/usr/share
-	cp -a $WOK/$PACKAGE/vim72/runtime/vimrc_example.vim $fs/etc/vim/vimrc
 	rm -f $fs/usr/bin/*vimtutor
 }
 
-
-
-# Rules to clean extras dirs or files
-clean_wok()
-{
-	rm -rf $PWD/vim72 2>/dev/null
-}
-
 post_install()
 {
     local root
@@ -80,5 +70,5 @@
 {
 	# restore previous symlink
 	echo "Processing post-remove commands..."
-	ln -sf /bin/busybox /bin/vi
+	ln -sf /bin/busybox $1/bin/vi
 }
diff -r bd1f53513207 -r be13f25e790b wireless_tools-dev/receipt
--- a/wireless_tools-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/wireless_tools-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -11,7 +11,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/${WANTED}.${VERSION}/_pkg
 	mkdir -p $fs/usr
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r bd1f53513207 -r be13f25e790b wireless_tools/receipt
--- a/wireless_tools/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/wireless_tools/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,9 +15,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=${PACKAGE}.${VERSION}
-	# fix perms
-	chown -R root.root $src
 	cd $src
 	make PREFIX=$PWD/_pkg/usr
 	make PREFIX=$PWD/_pkg/usr install
@@ -26,8 +23,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$PACKAGE/${PACKAGE}.${VERSION}/_pkg
-	
 	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share/applications
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b wxpython-dev/receipt
--- a/wxpython-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/wxpython-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share
 	cp -a $_pkg/usr/bin/wx-config $fs/usr/bin
 	cp -a $_pkg/usr/lib/wx $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b x264-dev/receipt
--- a/x264-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/x264-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg"
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libICE-dev/receipt
--- a/xorg-libICE-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libICE-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libSM-dev/receipt
--- a/xorg-libSM-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libSM-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libX11-dev/receipt
--- a/xorg-libX11-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libX11-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXau-dev/receipt
--- a/xorg-libXau-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXau-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,6 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXaw-dev/receipt
--- a/xorg-libXaw-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXaw-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXcomposite-dev/receipt
--- a/xorg-libXcomposite-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXcomposite-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -13,7 +13,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXcursor-dev/receipt
--- a/xorg-libXcursor-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXcursor-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXdamage-dev/receipt
--- a/xorg-libXdamage-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXdamage-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXdmcp-dev/receipt
--- a/xorg-libXdmcp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXdmcp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXext-dev/receipt
--- a/xorg-libXext-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXext-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXfixes-dev/receipt
--- a/xorg-libXfixes-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXfixes-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXfont-dev/receipt
--- a/xorg-libXfont-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXfont-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXft-dev/receipt
--- a/xorg-libXft-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXft-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/bin
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	install -o root -g root -m 0755 $_pkg/usr/bin/xft-config $fs/usr/bin
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b xorg-libXinerama-dev/receipt
--- a/xorg-libXinerama-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXinerama-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXmu-dev/receipt
--- a/xorg-libXmu-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXmu-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXp-dev/receipt
--- a/xorg-libXp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	# _pkg is not set correctly when both SOURCE and WANTED are defined
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 
 	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
diff -r bd1f53513207 -r be13f25e790b xorg-libXpm-dev/receipt
--- a/xorg-libXpm-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXpm-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXrandr-dev/receipt
--- a/xorg-libXrandr-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXrandr-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -15,7 +15,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXrender-dev/receipt
--- a/xorg-libXrender-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXrender-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXss-dev/receipt
--- a/xorg-libXss-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXss-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXt-dev/receipt
--- a/xorg-libXt-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXt-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXtst-dev/receipt
--- a/xorg-libXtst-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXtst-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib $fs/usr/include/X11
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include/X11/extensions $fs/usr/include/X11/
diff -r bd1f53513207 -r be13f25e790b xorg-libXv-dev/receipt
--- a/xorg-libXv-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXv-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXvMC-dev/receipt
--- a/xorg-libXvMC-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXvMC-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libXxf86vm-dev/receipt
--- a/xorg-libXxf86vm-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libXxf86vm-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libfontenc-dev/receipt
--- a/xorg-libfontenc-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libfontenc-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -12,7 +12,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libpciaccess-dev/receipt
--- a/xorg-libpciaccess-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libpciaccess-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
 	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
 	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
 	cp -a $_pkg/usr/include $fs/usr
diff -r bd1f53513207 -r be13f25e790b xorg-libxkbfile-dev/receipt
--- a/xorg-libxkbfile-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
+++ b/xorg-libxkbfile-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
@@ -14,7 +14,7 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/lib
-	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
+	
     cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
     cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
     cp -a $_pkg/usr/include $fs/usr