wok-4.x rev 8751

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.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Feb 20 06:53:59 2011 +0000 (2011-02-20)
parents bd1f53513207
children a1c1d35d9f92
files airoscript-ng/receipt apache-dev/receipt apache-doc/receipt aspell-es/receipt atm-tools-dev/receipt atm-tools/receipt boxbackup-client/receipt codeblocks/receipt cups-pdf/receipt exo-tools/receipt exosip-dev/receipt fceux/receipt fox14-dev/receipt freeradius-pam/receipt freetype1-dev/receipt geoip-dev/receipt glpi/receipt gvim/receipt h8300-gdb-dev/receipt hal-cups-utils/receipt icedtea6-jre/receipt imagemagick-dev/receipt java-jdk/receipt java-jre/receipt jclic/receipt keepassx/receipt libgtkimageview-dev/receipt libhx-dev/receipt libsdl-dev/receipt libsdl-gfx-dev/receipt libsdl-image-dev/receipt libsdl-mixer-dev/receipt libsdl-net-dev/receipt libsdl-pango-dev/receipt libsdl-perl/receipt libsdl-ttf-dev/receipt libv4l-dev/receipt libv4l/receipt libvncserver-dev/receipt lives/receipt mencoder/receipt mupen64plus/receipt nathive/receipt ncursesw-dev/receipt ncursesw-extra/receipt ocsinventory-agent/receipt ocsinventory-server/receipt ocsinventory/receipt openal-dev/receipt opensp-dev/receipt osip-dev/receipt poptop-man/receipt portaudio-dev/receipt portaudio/receipt portmap/receipt portmidi/receipt pptpclient-extra/receipt pptpclient-man/receipt python-couchdbkit/receipt python-dev/receipt python-docutils/receipt python-restclient/receipt rapidsvn/receipt ssmtp/receipt thunar-dev/receipt tk-dev/receipt tk/receipt vim-tiny/receipt vim/receipt wireless_tools-dev/receipt wireless_tools/receipt wxpython-dev/receipt x264-dev/receipt xorg-libICE-dev/receipt xorg-libSM-dev/receipt xorg-libX11-dev/receipt xorg-libXau-dev/receipt xorg-libXaw-dev/receipt xorg-libXcomposite-dev/receipt xorg-libXcursor-dev/receipt xorg-libXdamage-dev/receipt xorg-libXdmcp-dev/receipt xorg-libXext-dev/receipt xorg-libXfixes-dev/receipt xorg-libXfont-dev/receipt xorg-libXft-dev/receipt xorg-libXinerama-dev/receipt xorg-libXmu-dev/receipt xorg-libXp-dev/receipt xorg-libXpm-dev/receipt xorg-libXrandr-dev/receipt xorg-libXrender-dev/receipt xorg-libXss-dev/receipt xorg-libXt-dev/receipt xorg-libXtst-dev/receipt xorg-libXv-dev/receipt xorg-libXvMC-dev/receipt xorg-libXxf86vm-dev/receipt xorg-libfontenc-dev/receipt xorg-libpciaccess-dev/receipt xorg-libxkbfile-dev/receipt
line diff
     1.1 --- a/airoscript-ng/receipt	Sun Feb 20 05:51:18 2011 +0000
     1.2 +++ b/airoscript-ng/receipt	Sun Feb 20 06:53:59 2011 +0000
     1.3 @@ -14,23 +14,21 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	src=$WOK/$PACKAGE/${SOURCE%-ng}
     1.8  	cd $src
     1.9 -	patch -Np0 -i ../stuff/path.patch
    1.10 -	patch -Np0 -i ../stuff/makefile.patch
    1.11 -	make -j1 prefix=$PWD/_pkg/usr install
    1.12 +	patch -Np0 -i $stuff/path.patch
    1.13 +	patch -Np0 -i $stuff/makefile.patch
    1.14 +	make -j1 prefix=$DESTDIR/usr install
    1.15  }
    1.16  
    1.17  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.18  genpkg_rules()
    1.19  {
    1.20 -	_pkg=$WOK/$PACKAGE/Airoscript/_pkg
    1.21  	mkdir -p $fs/usr/share
    1.22  	cp -a $_pkg/usr/sbin $fs/usr
    1.23  	cp -a $_pkg/usr/share/airoscript-ng $fs/usr/share
    1.24  	cp -a $_pkg/usr/etc $fs/etc
    1.25  	mv $fs/etc/screenrc $fs/usr/share/airoscript-ng/
    1.26  	cd $fs/etc
    1.27 -	patch -Np0 -i $WOK/$PACKAGE/stuff/config.patch
    1.28 +	patch -Np0 -i $stuff/config.patch
    1.29  }
    1.30  
     2.1 --- a/apache-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
     2.2 +++ b/apache-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
     2.3 @@ -13,7 +13,6 @@
     2.4  genpkg_rules()
     2.5  {
     2.6  	mkdir -p $fs/usr/share/apache $fs/usr/bin
     2.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
     2.8  	cp -a $_pkg/usr/include $fs/usr
     2.9  	cp -a $_pkg/usr/bin/apxs $fs/usr/bin
    2.10  	cp -a $_pkg/usr/share/apache/build $fs/usr/share/apache
     3.1 --- a/apache-doc/receipt	Sun Feb 20 05:51:18 2011 +0000
     3.2 +++ b/apache-doc/receipt	Sun Feb 20 06:53:59 2011 +0000
     3.3 @@ -13,8 +13,6 @@
     3.4  genpkg_rules()
     3.5  {
     3.6  	mkdir -p $fs/usr/share
     3.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
     3.8  	cp -a $_pkg/usr/share/doc $fs/usr/share
     3.9 -	
    3.10  }
    3.11  
     4.1 --- a/aspell-es/receipt	Sun Feb 20 05:51:18 2011 +0000
     4.2 +++ b/aspell-es/receipt	Sun Feb 20 06:53:59 2011 +0000
     4.3 @@ -15,16 +15,14 @@
     4.4  # Rules to configure and make the package.
     4.5  compile_rules()
     4.6  {
     4.7 -	src=$WOK/$PACKAGE/$SOURCE-$VERSION-2
     4.8  	cd $src
     4.9  	./configure && \
    4.10 -	make && make DESTDIR=$PWD/_pkg install
    4.11 +	make && make DESTDIR=$DESTDIR install
    4.12  }
    4.13  
    4.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.15  genpkg_rules()
    4.16  {
    4.17 -	_pkg=$WOK/$PACKAGE/$SOURCE-$VERSION-2/_pkg
    4.18  	mkdir -p $fs/usr/lib
    4.19  	cp -a $_pkg/usr/lib/* $fs/usr/lib
    4.20  }
     5.1 --- a/atm-tools-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
     5.2 +++ b/atm-tools-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
     5.3 @@ -12,7 +12,6 @@
     5.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     5.5  genpkg_rules()
     5.6  {
     5.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
     5.8  	mkdir -p $fs/usr/lib
     5.9  	cp -a $_pkg/usr/include $fs/usr
    5.10  	cp -a $_pkg/usr/lib/*a $fs/usr/lib
     6.1 --- a/atm-tools/receipt	Sun Feb 20 05:51:18 2011 +0000
     6.2 +++ b/atm-tools/receipt	Sun Feb 20 06:53:59 2011 +0000
     6.3 @@ -11,16 +11,15 @@
     6.4  WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
     6.5  CONFIG_FILES="/etc/atmsigd.conf"
     6.6  
     6.7 -
     6.8  # Rules to configure and make the package.
     6.9  compile_rules()
    6.10  {
    6.11  	cd $src
    6.12 -	busybox patch -p0 < ../stuff/MAX_PATH.u
    6.13 +	busybox patch -p0 < $stuff/MAX_PATH.u
    6.14  	./configure --prefix=/usr --infodir=/usr/share/info \
    6.15  	--sysconfdir=/etc --mandir=/usr/share/man $CONFIGURE_ARGS &&
    6.16  	make &&
    6.17 -	make DESTDIR=$PWD/_pkg install
    6.18 +	make DESTDIR=$DESTDIR install
    6.19  }
    6.20  
    6.21  # Rules to gen a SliTaz package suitable for Tazpkg.
     7.1 --- a/boxbackup-client/receipt	Sun Feb 20 05:51:18 2011 +0000
     7.2 +++ b/boxbackup-client/receipt	Sun Feb 20 06:53:59 2011 +0000
     7.3 @@ -19,7 +19,7 @@
     7.4  # Rules to gen a SliTaz package suitable for Tazpkg
     7.5  genpkg_rules()
     7.6  {
     7.7 - 	_pkg=$WOK/$WANTED/${SOURCE}-$VERSION/parcels/boxbackup-${VERSION}-backup-client-linux-gnu
     7.8 +	_pkg=$WOK/$WANTED/${SOURCE}-$VERSION/parcels/boxbackup-${VERSION}-backup-client-linux-gnu
     7.9  	mkdir -p $fs/usr/bin
    7.10  	cp -a $_pkg/bb* $fs/usr/bin
    7.11  	mkdir -p $fs/etc/init.d
    7.12 @@ -40,15 +40,17 @@
    7.13  post_install()
    7.14  {
    7.15  	# Creating conf dir
    7.16 -	if [ ! -e $CONF_DIR ]; then
    7.17 -	    mkdir -p $CONF_DIR && chmod 755 $CONF_DIR
    7.18 +	if [ ! -e $1/$CONF_DIR ]; then
    7.19 +	    mkdir -p $1/$CONF_DIR && chmod 755 $1/$CONF_DIR
    7.20  	fi
    7.21 -	if [ ! -e $DATA_DIR ]; then
    7.22 -	    mkdir -p $DATA_DIR && chmod 700 $DATA_DIR
    7.23 +	if [ ! -e $1/$DATA_DIR ]; then
    7.24 +	    mkdir -p $1/$DATA_DIR && chmod 700 $1/$DATA_DIR
    7.25  	fi
    7.26 -	# Start daemon (if stopped by install)
    7.27 -	if [ $RUN_DMON -eq 1 ]; then
    7.28 -		/etc/init.d/bbackupd start
    7.29 +	if [ -z $1 ]; then
    7.30 +		# Start daemon (if stopped by install)
    7.31 +		if [ $RUN_DMON -eq 1 ]; then
    7.32 +			/etc/init.d/bbackupd start
    7.33 +		fi
    7.34  	fi
    7.35  }
    7.36  
    7.37 @@ -57,25 +59,27 @@
    7.38  pre_remove()
    7.39  {
    7.40      # Stop daemon
    7.41 -	if [ -e /var/run/bbackupd.pid ]; then
    7.42 -		/etc/init.d/bbackupd stop
    7.43 +	if [ -z $1 ]; then
    7.44 +		if [ -e /var/run/bbackupd.pid ]; then
    7.45 +			/etc/init.d/bbackupd stop
    7.46 +		fi
    7.47  	fi
    7.48  }
    7.49  
    7.50  post_remove()
    7.51  {
    7.52  	# Delete DATA directory
    7.53 -	rm -rf $DATA_DIR
    7.54 +	rm -rf $1/$DATA_DIR
    7.55  
    7.56  	# Delete Client config files
    7.57 -	rm -rf $CONF_DIR/bbackupd*
    7.58 +	rm -rf $1/$CONF_DIR/bbackupd*
    7.59  
    7.60  	# Delete CONF dir (if empty)
    7.61  	if [ `ls -lA $CONF_DIR | wc -l` -eq 0 ]; then
    7.62  		echo -n "Removing $CONF_DIR..."
    7.63 -		rm -rf $CONF_DIR
    7.64 +		rm -rf $1/$CONF_DIR
    7.65  		status
    7.66  	fi
    7.67  	# Delete PID, sock files
    7.68 -	rm -f /var/run/bbackupd.*
    7.69 +	rm -f $1/var/run/bbackupd.*
    7.70  }
     8.1 --- a/codeblocks/receipt	Sun Feb 20 05:51:18 2011 +0000
     8.2 +++ b/codeblocks/receipt	Sun Feb 20 06:53:59 2011 +0000
     8.3 @@ -15,21 +15,19 @@
     8.4  # Rules to configure and make the package.
     8.5  compile_rules()
     8.6  {
     8.7 -	src=$WOK/$PACKAGE/$PACKAGE-$VERSION-release
     8.8  	cd $src
     8.9 -	busybox patch -p1 -i ../stuff/glib.u
    8.10 +	busybox patch -p1 -i $stuff/glib.u
    8.11  	./configure \
    8.12  		--with-contrib-plugins="all, -help" \
    8.13  		--prefix=/usr \
    8.14  		$CONFIGURE_ARGS &&
    8.15  	make -j 4 &&
    8.16 -	make DESTDIR=$PWD/_pkg install
    8.17 +	make DESTDIR=$DESTDIR install
    8.18  }
    8.19  
    8.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.21  genpkg_rules()
    8.22  {
    8.23 -	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION-release/_pkg
    8.24  	mkdir -p $fs/usr/lib $fs/usr/share
    8.25  	cp -a $_pkg/usr/include $fs/usr
    8.26  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
     9.1 --- a/cups-pdf/receipt	Sun Feb 20 05:51:18 2011 +0000
     9.2 +++ b/cups-pdf/receipt	Sun Feb 20 06:53:59 2011 +0000
     9.3 @@ -23,10 +23,9 @@
     9.4  genpkg_rules()
     9.5  {
     9.6  	mkdir -p $fs/etc/cups $fs/usr/lib/cups/backend $fs/usr/share/cups/model
     9.7 -	_pkg=$src
     9.8 -	cp -a $_pkg/src/cups-pdf $fs/usr/lib/cups/backend 
     9.9 -	cp -a $_pkg/extra/CUPS-PDF.ppd $fs/usr/share/cups/model
    9.10 -	cp -a $_pkg/extra/cups-pdf.conf   $fs/etc/cups
    9.11 +	cp -a $src/src/cups-pdf $fs/usr/lib/cups/backend 
    9.12 +	cp -a $src/extra/CUPS-PDF.ppd $fs/usr/share/cups/model
    9.13 +	cp -a $src/extra/cups-pdf.conf   $fs/etc/cups
    9.14  	
    9.15  }
    9.16  
    10.1 --- a/exo-tools/receipt	Sun Feb 20 05:51:18 2011 +0000
    10.2 +++ b/exo-tools/receipt	Sun Feb 20 06:53:59 2011 +0000
    10.3 @@ -14,9 +14,6 @@
    10.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    10.5  genpkg_rules()
    10.6  {
    10.7 -	src=$WOK/$WANTED/$WANTED-$VERSION
    10.8 -	_pkg=$WOK/$WANTED/$WANTED-$VERSION/_pkg
    10.9 -	
   10.10  	mkdir -p $fs/usr/share/locale \
   10.11  		$fs/usr/share/xfce4 \
   10.12  		$fs/etc/xdg/xfce4
    11.1 --- a/exosip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    11.2 +++ b/exosip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    11.3 @@ -11,7 +11,6 @@
    11.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    11.5  genpkg_rules()
    11.6  {
    11.7 -	_pkg=$WOK/$WANTED/libeXosip2-$VERSION/_pkg
    11.8  	mkdir -p $fs/usr
    11.9  	cp -a $_pkg/usr/include $fs/usr
   11.10  	cp -a $_pkg/usr/lib $fs/usr
    12.1 --- a/fceux/receipt	Sun Feb 20 05:51:18 2011 +0000
    12.2 +++ b/fceux/receipt	Sun Feb 20 06:53:59 2011 +0000
    12.3 @@ -14,7 +14,6 @@
    12.4  # Rules to configure and make the package.
    12.5  compile_rules()
    12.6  {
    12.7 -	src=$WOK/$PACKAGE/fceu${VERSION}
    12.8  	cd $src
    12.9  	scons
   12.10  
   12.11 @@ -25,7 +24,6 @@
   12.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   12.13  genpkg_rules()
   12.14  {
   12.15 -	_pkg=$WOK/$PACKAGE/fceu${VERSION}/_pkg
   12.16  	mkdir -p $fs/usr
   12.17  	cp -a $_pkg/usr/bin $fs/usr
   12.18  }
    13.1 --- a/fox14-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    13.2 +++ b/fox14-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    13.3 @@ -16,7 +16,6 @@
    13.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    13.5  genpkg_rules()
    13.6  {
    13.7 -	_pkg=$WOK/$WANTED/fox-$VERSION/_pkg
    13.8  	mkdir -p $fs/usr/lib
    13.9  	cp -a $_pkg/usr/include $fs/usr
   13.10  	cp -a $_pkg/usr/lib/*.a* $fs/usr/lib
    14.1 --- a/freeradius-pam/receipt	Sun Feb 20 05:51:18 2011 +0000
    14.2 +++ b/freeradius-pam/receipt	Sun Feb 20 06:53:59 2011 +0000
    14.3 @@ -15,7 +15,6 @@
    14.4  genpkg_rules()
    14.5  {
    14.6  	mkdir -p $fs/usr/lib $fs/etc/raddb/modules
    14.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    14.8  	cp -a $_pkg/usr/lib/rlm_pam*.so* $fs/usr/lib
    14.9  	cp -a $_pkg/etc/raddb/modules/pam $fs/etc/raddb/modules
   14.10  }
    15.1 --- a/freetype1-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    15.2 +++ b/freetype1-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    15.3 @@ -12,9 +12,6 @@
    15.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    15.5  genpkg_rules()
    15.6  {
    15.7 -	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
    15.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    15.9 -
   15.10  	mkdir -p $fs/usr/lib
   15.11  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   15.12  	cp -a $_pkg/usr/include $fs/usr
    16.1 --- a/geoip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    16.2 +++ b/geoip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    16.3 @@ -13,7 +13,6 @@
    16.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    16.5  genpkg_rules()
    16.6  {
    16.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    16.8  	mkdir -p $fs/usr/lib
    16.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   16.10  	cp -a $_pkg/usr/include $fs/usr
    17.1 --- a/glpi/receipt	Sun Feb 20 05:51:18 2011 +0000
    17.2 +++ b/glpi/receipt	Sun Feb 20 06:53:59 2011 +0000
    17.3 @@ -14,16 +14,12 @@
    17.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    17.5  genpkg_rules()
    17.6  {
    17.7 -	test -d $PACKAGE && mv $PACKAGE $PACKAGE-$VERSION
    17.8 -	
    17.9 -	_pkg=$src
   17.10 -	
   17.11  	mkdir -p $fs/usr/share/$PACKAGE \
   17.12  		$fs/etc/$PACKAGE \
   17.13  		$fs/var/log/$PACKAGE \
   17.14  		$fs/var/lib/$PACKAGE
   17.15  		 
   17.16 -	cp -a $_pkg/* $fs/usr/share/$PACKAGE
   17.17 +	cp -a $src/* $fs/usr/share/$PACKAGE
   17.18  	[ -d $fs/usr/share/$PACKAGE/files ] &&  mv $fs/usr/share/$PACKAGE/files $fs/var/lib/$PACKAGE
   17.19  
   17.20  	# Copy config db as temporary file.
    18.1 --- a/gvim/receipt	Sun Feb 20 05:51:18 2011 +0000
    18.2 +++ b/gvim/receipt	Sun Feb 20 06:53:59 2011 +0000
    18.3 @@ -13,7 +13,6 @@
    18.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    18.5  genpkg_rules()
    18.6  {
    18.7 -	_pkg="$WOK/$WANTED/vim72/_pkg"
    18.8  	mkdir -p $fs/usr/bin \
    18.9  		-p $fs/usr/share/pixmaps \
   18.10  		-p $fs/usr/share/applications
   18.11 @@ -23,7 +22,7 @@
   18.12  		cp -a $_pkg/usr/bin/$i $fs/usr/bin
   18.13  	done
   18.14  	
   18.15 -	cp -a $WOK/$WANTED/vim72/runtime/vim16x16.png $fs/usr/share/pixmaps/gvim.png
   18.16 +	cp -a $src/runtime/vim16x16.png $fs/usr/share/pixmaps/gvim.png
   18.17  		
   18.18  	cp -a stuff/gvim.desktop $fs/usr/share/applications
   18.19  }
    19.1 --- a/h8300-gdb-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    19.2 +++ b/h8300-gdb-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    19.3 @@ -12,9 +12,6 @@
    19.4  
    19.5  genpkg_rules()
    19.6  {
    19.7 -	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
    19.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    19.9 -
   19.10  	mkdir -p $fs/usr
   19.11  	
   19.12  	# Copying include dir if exists
    20.1 --- a/hal-cups-utils/receipt	Sun Feb 20 05:51:18 2011 +0000
    20.2 +++ b/hal-cups-utils/receipt	Sun Feb 20 06:53:59 2011 +0000
    20.3 @@ -15,7 +15,6 @@
    20.4  # Rules to configure and make the package.
    20.5  
    20.6  compile_rules() {
    20.7 -  cd $WOK/$PACKAGE/$PACKAGE
    20.8    ./configure --prefix=/usr --libexecdir=/usr/lib/hal/scripts/ &&
    20.9    make  &&
   20.10    make DESTDIR=$PWD/_pkg install
   20.11 @@ -25,7 +24,6 @@
   20.12  genpkg_rules()
   20.13  {
   20.14  	mkdir -p $fs/usr
   20.15 -	_pkg="$WOK/$PACKAGE/$PACKAGE/_pkg"
   20.16  	cp -a $_pkg/usr/lib $fs/usr
   20.17  	cp -a $_pkg/usr/share $fs/usr
   20.18  	
    21.1 --- a/icedtea6-jre/receipt	Sun Feb 20 05:51:18 2011 +0000
    21.2 +++ b/icedtea6-jre/receipt	Sun Feb 20 06:53:59 2011 +0000
    21.3 @@ -17,7 +17,7 @@
    21.4  genpkg_rules()
    21.5  {
    21.6  	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
    21.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    21.8 +	
    21.9  
   21.10  	mkdir -p $fs/usr/lib/jvm/java-icedtea
   21.11  	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre $fs/usr/lib/jvm/java-icedtea
    22.1 --- a/imagemagick-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    22.2 +++ b/imagemagick-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    22.3 @@ -14,7 +14,6 @@
    22.4  genpkg_rules()
    22.5  {
    22.6  	mkdir -p $fs/usr/lib
    22.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    22.8  	cp -a $_pkg/usr/include $fs/usr
    22.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   22.10  }
    23.1 --- a/java-jdk/receipt	Sun Feb 20 05:51:18 2011 +0000
    23.2 +++ b/java-jdk/receipt	Sun Feb 20 06:53:59 2011 +0000
    23.3 @@ -15,9 +15,6 @@
    23.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    23.5  genpkg_rules()
    23.6  {
    23.7 -	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
    23.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    23.9 -
   23.10  	mkdir -p $fs/usr/bin
   23.11  	cp -a $_pkg/usr/jdk-bin/* $fs/usr/bin
   23.12  }
    24.1 --- a/java-jre/receipt	Sun Feb 20 05:51:18 2011 +0000
    24.2 +++ b/java-jre/receipt	Sun Feb 20 06:53:59 2011 +0000
    24.3 @@ -14,9 +14,6 @@
    24.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    24.5  genpkg_rules()
    24.6  {
    24.7 -	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
    24.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    24.9 -
   24.10  	mkdir -p $fs/usr/bin
   24.11  	cp -a $_pkg/usr/jre-bin/* $fs/usr/bin
   24.12  }
    25.1 --- a/jclic/receipt	Sun Feb 20 05:51:18 2011 +0000
    25.2 +++ b/jclic/receipt	Sun Feb 20 06:53:59 2011 +0000
    25.3 @@ -21,13 +21,11 @@
    25.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    25.5  genpkg_rules()
    25.6  {
    25.7 -	_pkg="$WOK/$PACKAGE/$PACKAGE-$VERSION"
    25.8 -	STUFF="$WOK/$PACKAGE/stuff"
    25.9  	mkdir -p $fs/usr/lib/jclic $fs/usr/share/pixmaps $fs/usr/share/applications
   25.10 -	cp -a $_pkg/* $fs/usr/lib/jclic
   25.11 -	cp $STUFF/jclicauthor.desktop $fs/usr/share/applications
   25.12 -	cp $STUFF/jclicreports.desktop $fs/usr/share/applications
   25.13 -	cp $STUFF/author.png $fs/usr/share/pixmaps
   25.14 -	cp $STUFF/reports.png $fs/usr/share/pixmaps
   25.15 +	cp -a $src/* $fs/usr/lib/jclic
   25.16 +	cp $stuff/jclicauthor.desktop $fs/usr/share/applications
   25.17 +	cp $stuff/jclicreports.desktop $fs/usr/share/applications
   25.18 +	cp $stuff/author.png $fs/usr/share/pixmaps
   25.19 +	cp $stuff/reports.png $fs/usr/share/pixmaps
   25.20  }
   25.21  
    26.1 --- a/keepassx/receipt	Sun Feb 20 05:51:18 2011 +0000
    26.2 +++ b/keepassx/receipt	Sun Feb 20 06:53:59 2011 +0000
    26.3 @@ -27,7 +27,6 @@
    26.4  genpkg_rules()
    26.5  {
    26.6     	mkdir -p $fs/usr/share/pixmaps
    26.7 -	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION/_pkg
    26.8  	cp -a $_pkg/usr/bin $fs/usr
    26.9  	#cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share	
   26.10  	cp -a $_pkg/usr/share $fs/usr	
    27.1 --- a/libgtkimageview-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    27.2 +++ b/libgtkimageview-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    27.3 @@ -12,7 +12,6 @@
    27.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    27.5  genpkg_rules()
    27.6  {
    27.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    27.8  	mkdir -p $fs/usr
    27.9  	cp -a $_pkg/usr/include $fs/usr
   27.10  	cp -a $_pkg/usr/lib $fs/usr
    28.1 --- a/libhx-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    28.2 +++ b/libhx-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    28.3 @@ -13,7 +13,6 @@
    28.4  genpkg_rules()
    28.5  {
    28.6  	mkdir -p $fs/usr/lib
    28.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    28.8  	cp -a $_pkg/usr/lib/*a $fs/usr/lib
    28.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   28.10  	cp -a $_pkg/usr/include $fs/usr
    29.1 --- a/libsdl-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    29.2 +++ b/libsdl-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    29.3 @@ -14,7 +14,6 @@
    29.4  genpkg_rules()
    29.5  {
    29.6  	mkdir -p $fs/usr/lib $fs/usr/share
    29.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    29.8  	cp -a $_pkg/usr/bin $fs/usr
    29.9  	cp -a $_pkg/usr/include $fs/usr
   29.10  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    30.1 --- a/libsdl-gfx-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    30.2 +++ b/libsdl-gfx-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    30.3 @@ -14,7 +14,6 @@
    30.4  genpkg_rules()
    30.5  {
    30.6  	mkdir -p $fs/usr/lib
    30.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    30.8  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    30.9  	cp -a $_pkg/usr/include $fs/usr
   30.10  }
    31.1 --- a/libsdl-image-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    31.2 +++ b/libsdl-image-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    31.3 @@ -17,7 +17,6 @@
    31.4  {
    31.5  	mkdir -p $fs/usr/lib
    31.6  
    31.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    31.8  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    31.9  	cp -a $_pkg/usr/include $fs/usr
   31.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    32.1 --- a/libsdl-mixer-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    32.2 +++ b/libsdl-mixer-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    32.3 @@ -5,9 +5,7 @@
    32.4  CATEGORY="development"
    32.5  SHORT_DESC="Development files of a multichannel sample and music mixer."
    32.6  MAINTAINER="chadi.elahmad@gmail.com"
    32.7 -
    32.8  WEB_SITE="http://www.libsdl.org/projects/SDL_mixer/"
    32.9 -
   32.10  DEPENDS="libsdl-mixer libsdl-dev libmad-dev libvorbis-dev libogg-dev "
   32.11  WANTED="libsdl-mixer"
   32.12  SOURCE="SDL_mixer"
   32.13 @@ -16,8 +14,6 @@
   32.14  genpkg_rules()
   32.15  {
   32.16  	mkdir -p $fs/usr/lib
   32.17 -
   32.18 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
   32.19  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   32.20  	cp -a $_pkg/usr/include $fs/usr
   32.21  }
    33.1 --- a/libsdl-net-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    33.2 +++ b/libsdl-net-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    33.3 @@ -14,8 +14,6 @@
    33.4  genpkg_rules()
    33.5  {
    33.6  	mkdir -p $fs/usr/lib
    33.7 -	
    33.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    33.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   33.10  	cp -a $_pkg/usr/include $fs/usr
   33.11  }
    34.1 --- a/libsdl-pango-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    34.2 +++ b/libsdl-pango-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    34.3 @@ -13,7 +13,6 @@
    34.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    34.5  genpkg_rules()
    34.6  {
    34.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    34.8  	mkdir -p $fs/usr/lib
    34.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   34.10  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    35.1 --- a/libsdl-perl/receipt	Sun Feb 20 05:51:18 2011 +0000
    35.2 +++ b/libsdl-perl/receipt	Sun Feb 20 06:53:59 2011 +0000
    35.3 @@ -15,7 +15,6 @@
    35.4  # Rules to configure and make the package.
    35.5  compile_rules()
    35.6  {
    35.7 -	src=$WOK/$PACKAGE/$SOURCE-v${VERSION}
    35.8  	cd $src
    35.9  	perl Build.PL destdir="$PWD/_pkg" &&
   35.10  	perl Build &&
   35.11 @@ -25,7 +24,6 @@
   35.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   35.13  genpkg_rules()
   35.14  {
   35.15 -	_pkg=$WOK/$PACKAGE/$SOURCE-v${VERSION}/_pkg
   35.16  	mkdir -p $fs/usr
   35.17  	cp -a $_pkg/usr/lib $fs/usr
   35.18  }
    36.1 --- a/libsdl-ttf-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    36.2 +++ b/libsdl-ttf-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    36.3 @@ -14,8 +14,6 @@
    36.4  genpkg_rules()
    36.5  {
    36.6  	mkdir -p $fs/usr/lib
    36.7 -	
    36.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    36.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   36.10  	cp -a $_pkg/usr/include $fs/usr
   36.11  }
    37.1 --- a/libv4l-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    37.2 +++ b/libv4l-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    37.3 @@ -12,7 +12,6 @@
    37.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    37.5  genpkg_rules()
    37.6  {
    37.7 -	_pkg=$WOK/${PACKAGE/-dev}/$SOURCE-$VERSION/_pkg
    37.8  	mkdir -p $fs/usr/lib 
    37.9  	cp -a $_pkg/usr/include $fs/usr
   37.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib	
    38.1 --- a/libv4l/receipt	Sun Feb 20 05:51:18 2011 +0000
    38.2 +++ b/libv4l/receipt	Sun Feb 20 06:53:59 2011 +0000
    38.3 @@ -15,7 +15,6 @@
    38.4  # Rules to configure and make the package.
    38.5  
    38.6  compile_rules() {
    38.7 -  src=$WOK/$PACKAGE/$SOURCE-$VERSION
    38.8    cd $src
    38.9    make &&
   38.10    make install PREFIX="/usr" DESTDIR="${PWD}/_pkg" 
   38.11 @@ -24,7 +23,6 @@
   38.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   38.13  genpkg_rules()
   38.14  {
   38.15 -	_pkg=$WOK/$PACKAGE/$SOURCE-$VERSION/_pkg
   38.16  	mkdir -p $fs/usr/lib
   38.17  	cp -a $_pkg/usr/lib/*so* $fs/usr/lib/
   38.18  	cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib
    39.1 --- a/libvncserver-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    39.2 +++ b/libvncserver-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    39.3 @@ -13,7 +13,6 @@
    39.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    39.5  genpkg_rules()
    39.6  {
    39.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    39.8  	mkdir -p $fs/usr/lib
    39.9  	cp -a $_pkg/usr/include $fs/usr
   39.10  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    40.1 --- a/lives/receipt	Sun Feb 20 05:51:18 2011 +0000
    40.2 +++ b/lives/receipt	Sun Feb 20 06:53:59 2011 +0000
    40.3 @@ -28,7 +28,6 @@
    40.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    40.5  genpkg_rules()
    40.6  {
    40.7 -	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION/_pkg
    40.8  	mkdir -p $fs/usr/lib $fs/usr/share
    40.9  	cp -a $_pkg/usr/bin $fs/usr
   40.10  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    41.1 --- a/mencoder/receipt	Sun Feb 20 05:51:18 2011 +0000
    41.2 +++ b/mencoder/receipt	Sun Feb 20 06:53:59 2011 +0000
    41.3 @@ -13,7 +13,6 @@
    41.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    41.5  genpkg_rules()
    41.6  {
    41.7 -	_pkg=$WOK/$WANTED/MPlayer-$VERSION/_pkg
    41.8  	mkdir -p $fs/usr/bin
    41.9  	cp -a $_pkg/usr/bin/mencoder $fs/usr/bin
   41.10  }
    42.1 --- a/mupen64plus/receipt	Sun Feb 20 05:51:18 2011 +0000
    42.2 +++ b/mupen64plus/receipt	Sun Feb 20 06:53:59 2011 +0000
    42.3 @@ -15,14 +15,13 @@
    42.4  # Rules to configure and make the package.
    42.5  compile_rules()
    42.6  {
    42.7 -	src=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src
    42.8  	cd $src
    42.9  
   42.10  	# patching (provided by Yggdrasil) Thanks! Will remove when new version of mupen64plus comes out.
   42.11 -	patch -Np1 -i ../stuff/const.patch
   42.12 -	patch -Np1 -i ../stuff/blight-input-linking.patch
   42.13 +	patch -Np1 -i $stuff/const.patch
   42.14 +	patch -Np1 -i $stuff/blight-input-linking.patch
   42.15  	# thanks to debian for having a patch :) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577329
   42.16 -	patch -Np1 -i ../stuff/ftbfs-gvariant-type-conflicts.patch
   42.17 +	patch -Np1 -i $stuff/ftbfs-gvariant-type-conflicts.patch
   42.18  
   42.19  	make PREFIX=/usr all
   42.20  	mkdir -p $PWD/_pkg/usr/bin
   42.21 @@ -32,7 +31,6 @@
   42.22  # Rules to gen a SliTaz package suitable for Tazpkg.
   42.23  genpkg_rules()
   42.24  {
   42.25 -	_pkg=$WOK/$PACKAGE/$SOURCE-${VERSION//./-}-src/_pkg
   42.26  	mkdir -p $fs/usr/share
   42.27  	cp -a $_pkg/usr/bin $fs/usr
   42.28  	cp -a $_pkg/usr/share/mupen64plus $fs/usr/share
    43.1 --- a/nathive/receipt	Sun Feb 20 05:51:18 2011 +0000
    43.2 +++ b/nathive/receipt	Sun Feb 20 06:53:59 2011 +0000
    43.3 @@ -12,11 +12,9 @@
    43.4  WGET_URL="$WEB_SITE/get/$TARBALL"
    43.5  TAGS="image photo editor"
    43.6  
    43.7 -
    43.8  # Rules to configure and make the package.
    43.9  compile_rules()
   43.10  {
   43.11 -    src="$WOK/$PACKAGE/${PACKAGE}_${VERSION}_source"
   43.12  	cd $src
   43.13  	sed 's|"./"|"/usr/share/nathive/"|g' -i main.c
   43.14  	make	
   43.15 @@ -25,20 +23,19 @@
   43.16  # Rules to gen a SliTaz package suitable for Tazpkg.
   43.17  genpkg_rules()
   43.18  {
   43.19 -    mkdir -p $fs/usr/bin
   43.20 -    mkdir -p $fs/usr/share/nathive  
   43.21 +	mkdir -p $fs/usr/bin
   43.22 +	mkdir -p $fs/usr/share/nathive  
   43.23  	mkdir -p $fs/usr/share/applications 
   43.24 -	_pkg="$WOK/$PACKAGE/${PACKAGE}_${VERSION}_source"
   43.25  
   43.26 -	cp -a $_pkg/nathive $fs/usr/bin
   43.27 +	cp -a $src/nathive $fs/usr/bin
   43.28  	
   43.29 -	cp -a $_pkg/cfg/ $_pkg/img/ $_pkg/palettes/ $_pkg/text/ $fs/usr/share/nathive/
   43.30 +	cp -a $src/cfg/ $src/img/ $src/palettes/ $src/text/ $fs/usr/share/nathive/
   43.31  	#copy locale : it only adds 4k
   43.32 -	cp -a $_pkg/lang/ $fs/usr/share/nathive/
   43.33 +	cp -a $src/lang/ $fs/usr/share/nathive/
   43.34  	# change owner and permissions
   43.35  	chown -R root.root $fs/usr/share/nathive
   43.36  	chmod -R 0755 $fs/usr/share/nathive
   43.37  	
   43.38 -	cp -a stuff/nathive.desktop $fs/usr/share/applications 
   43.39 +	cp -a $stuff/nathive.desktop $fs/usr/share/applications 
   43.40  
   43.41  }
    44.1 --- a/ncursesw-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    44.2 +++ b/ncursesw-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    44.3 @@ -11,7 +11,6 @@
    44.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    44.5  genpkg_rules()
    44.6  {
    44.7 -	_pkg=$WOK/$WANTED/ncurses-$VERSION/_pkg
    44.8  	mkdir -p $fs/lib $fs/usr/bin
    44.9  	cp -a $_pkg/lib/*.a $fs/lib
   44.10  	# Include files have the same name as ncuses-dev but seems 
    45.1 --- a/ncursesw-extra/receipt	Sun Feb 20 05:51:18 2011 +0000
    45.2 +++ b/ncursesw-extra/receipt	Sun Feb 20 06:53:59 2011 +0000
    45.3 @@ -12,7 +12,6 @@
    45.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    45.5  genpkg_rules()
    45.6  {
    45.7 -	_pkg=$WOK/$WANTED/ncurses-$VERSION/_pkg
    45.8  	mkdir -p $fs/usr
    45.9  	cp -a $_pkg/usr/bin $fs/usr
   45.10  	chmod 755 $fs/usr/bin/*
    46.1 --- a/ocsinventory-agent/receipt	Sun Feb 20 05:51:18 2011 +0000
    46.2 +++ b/ocsinventory-agent/receipt	Sun Feb 20 06:53:59 2011 +0000
    46.3 @@ -16,16 +16,14 @@
    46.4  # Rules to configure and make the package.
    46.5  compile_rules()
    46.6  {
    46.7 -	src=$WOK/$PACKAGE/Ocsinventory-Agent-${VERSION}
    46.8 -
    46.9 -	cp stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
   46.10 -	cp stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
   46.11 +	cp $stuff/Slitaz.pm $src/lib/Ocsinventory/Agent/Backend/OS/Linux/Distro/NonLSB
   46.12 +	cp $stuff/Tazpkg.pm $src/lib/Ocsinventory/Agent/Backend/OS/Generic/Packaging
   46.13  	
   46.14  	cd $src
   46.15  	
   46.16  	# don't run postinstall script
   46.17  	rm -f run-postinst
   46.18 -	for p in ../stuff/ocsinventory-agent-1.1.2.1.u
   46.19 +	for p in $stuff/ocsinventory-agent-1.1.2.1.u
   46.20  	do
   46.21  		[ -f done.$(basename $p) ] && continue
   46.22  		patch -p1 -i $p || return 1
   46.23 @@ -39,8 +37,6 @@
   46.24  # Rules to gen a SliTaz package suitable for Tazpkg.
   46.25  genpkg_rules()
   46.26  {
   46.27 -	_pkg=$WOK/$PACKAGE/Ocsinventory-Agent-${VERSION}/_pkg
   46.28 -		
   46.29  	mkdir -p $fs/usr \
   46.30  		$fs/etc/ocsinventory-agent \
   46.31  		$fs/var/lib/ocsinventory-agent
   46.32 @@ -61,10 +57,5 @@
   46.33  		install -o root -g root -m 0755 -d $1/var/lib/dpkg
   46.34  		touch $1/var/lib/dpkg/status
   46.35  	fi
   46.36 -}	
   46.37 -
   46.38 -clean_wok()
   46.39 -{
   46.40 -	[ -d Ocsinventory-Agent-${VERSION} ] && rm -rf Ocsinventory-Agent-${VERSION}
   46.41  }
   46.42  
    47.1 --- a/ocsinventory-server/receipt	Sun Feb 20 05:51:18 2011 +0000
    47.2 +++ b/ocsinventory-server/receipt	Sun Feb 20 06:53:59 2011 +0000
    47.3 @@ -16,9 +16,6 @@
    47.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    47.5  genpkg_rules()
    47.6  {
    47.7 -	src=$WOK/$WANTED/$SOURCE-$VERSION
    47.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    47.9 -	
   47.10  	mkdir -p $fs/usr
   47.11  	cp -a $_pkg/usr/lib $fs/usr
   47.12  	
    48.1 --- a/ocsinventory/receipt	Sun Feb 20 05:51:18 2011 +0000
    48.2 +++ b/ocsinventory/receipt	Sun Feb 20 06:53:59 2011 +0000
    48.3 @@ -18,7 +18,6 @@
    48.4  # Rules to configure and make the package.
    48.5  compile_rules()
    48.6  {
    48.7 -	mv ${SOURCE}_${VERSION} $src 2> /dev/null
    48.8  	cd $src/Apache
    48.9  	perl Makefile.PL &&
   48.10  	make &&
   48.11 @@ -27,12 +26,6 @@
   48.12  
   48.13  genpkg_rules() {
   48.14  	mkdir $fs/usr
   48.15 -	
   48.16 -#	cd $WOK 
   48.17 -	for i in $DEPENDS
   48.18 -	do
   48.19 -		 tazwok cook $i
   48.20 -	done
   48.21  }
   48.22  
   48.23  
    49.1 --- a/openal-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    49.2 +++ b/openal-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    49.3 @@ -14,7 +14,6 @@
    49.4  genpkg_rules()
    49.5  {
    49.6  	mkdir -p $fs/usr/lib
    49.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    49.8  	cp -a $_pkg/usr/include $fs/usr
    49.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   49.10  }
    50.1 --- a/opensp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    50.2 +++ b/opensp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    50.3 @@ -15,8 +15,6 @@
    50.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    50.5  genpkg_rules()
    50.6  {
    50.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    50.8 -	
    50.9  	mkdir -p $fs/usr/lib $fs/usr/share
   50.10  	
   50.11  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    51.1 --- a/osip-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    51.2 +++ b/osip-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    51.3 @@ -12,7 +12,6 @@
    51.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    51.5  genpkg_rules()
    51.6  {
    51.7 -	_pkg=$WOK/$WANTED/libosip2-$VERSION/_pkg
    51.8  	mkdir -p $fs/usr
    51.9  	cp -a $_pkg/usr/include $fs/usr
   51.10  	cp -a $_pkg/usr/lib $fs/usr
    52.1 --- a/poptop-man/receipt	Sun Feb 20 05:51:18 2011 +0000
    52.2 +++ b/poptop-man/receipt	Sun Feb 20 06:53:59 2011 +0000
    52.3 @@ -13,7 +13,6 @@
    52.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    52.5  genpkg_rules()
    52.6  {
    52.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    52.8  	mkdir -p $fs/usr/
    52.9  	cp -a $_pkg/usr/share $fs/usr/
   52.10  }
    53.1 --- a/portaudio-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    53.2 +++ b/portaudio-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    53.3 @@ -13,8 +13,6 @@
    53.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    53.5  genpkg_rules()
    53.6  {
    53.7 -	_pkg=$WOK/$WANTED/$WANTED/_pkg
    53.8 -
    53.9  	mkdir -p $fs/usr/lib
   53.10  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   53.11  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    54.1 --- a/portaudio/receipt	Sun Feb 20 05:51:18 2011 +0000
    54.2 +++ b/portaudio/receipt	Sun Feb 20 06:53:59 2011 +0000
    54.3 @@ -15,7 +15,6 @@
    54.4  # Rules to configure and make the package.
    54.5  compile_rules()
    54.6  {
    54.7 -	src=$PACKAGE
    54.8  	cd  $src
    54.9  	./configure --prefix=/usr \
   54.10  		--infodir=/usr/share/info \
   54.11 @@ -27,8 +26,6 @@
   54.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   54.13  genpkg_rules()
   54.14  {
   54.15 -	_pkg=$WOK/$PACKAGE/$PACKAGE/_pkg
   54.16 -
   54.17  	mkdir -p $fs/usr/lib
   54.18  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
   54.19  }
    55.1 --- a/portmap/receipt	Sun Feb 20 05:51:18 2011 +0000
    55.2 +++ b/portmap/receipt	Sun Feb 20 06:53:59 2011 +0000
    55.3 @@ -15,9 +15,6 @@
    55.4  # rules to configure and make the package.
    55.5  compile_rules()
    55.6  {
    55.7 -	# Ovewriting default $src definition
    55.8 -	
    55.9 -	src=${PACKAGE}_${VERSION}	
   55.10  	cd $src
   55.11  	
   55.12  	# Build 
   55.13 @@ -28,10 +25,6 @@
   55.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   55.15  genpkg_rules()
   55.16  {
   55.17 -	src=${PACKAGE}_${VERSION}	
   55.18 -	_pkg=${PACKAGE}_${VERSION}/_pkg	
   55.19 -	
   55.20 -
   55.21  	mkdir -p $fs/usr/sbin
   55.22  	cp -a $src/pmap_dump $fs/usr/sbin
   55.23  	cp -a $src/pmap_set $fs/usr/sbin
    56.1 --- a/portmidi/receipt	Sun Feb 20 05:51:18 2011 +0000
    56.2 +++ b/portmidi/receipt	Sun Feb 20 06:53:59 2011 +0000
    56.3 @@ -14,9 +14,8 @@
    56.4  # Rules to configure and make the package.
    56.5  compile_rules()
    56.6  {
    56.7 -	src=$WOK/$PACKAGE/$PACKAGE
    56.8  	cd $src
    56.9 -	patch -Np1 -i ../stuff/portmidi-217-Makefile.patch
   56.10 +	patch -Np1 -i $stuff/portmidi-217-Makefile.patch
   56.11  
   56.12  	 # Prefix Fix
   56.13  	sed -i "s_\(/usr\)/local_\1_" \
   56.14 @@ -39,7 +38,6 @@
   56.15  # Rules to gen a SliTaz package suitable for Tazpkg.
   56.16  genpkg_rules()
   56.17  {
   56.18 -	_pkg=$WOK/$PACKAGE/$PACKAGE/_pkg
   56.19  	mkdir -p $fs/usr
   56.20  	cp -a $_pkg/usr/* $fs/usr
   56.21  }
    57.1 --- a/pptpclient-extra/receipt	Sun Feb 20 05:51:18 2011 +0000
    57.2 +++ b/pptpclient-extra/receipt	Sun Feb 20 06:53:59 2011 +0000
    57.3 @@ -13,7 +13,6 @@
    57.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    57.5  genpkg_rules()
    57.6  {
    57.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    57.8  	mkdir -p $fs/usr/sbin
    57.9  	cp -a $_pkg/usr/sbin/pptpsetup $fs/usr/sbin
   57.10  	sed -i 's/die ".* MPPE .* in kernel/echo "$0: no MPPE kernel module/' \
    58.1 --- a/pptpclient-man/receipt	Sun Feb 20 05:51:18 2011 +0000
    58.2 +++ b/pptpclient-man/receipt	Sun Feb 20 06:53:59 2011 +0000
    58.3 @@ -12,7 +12,6 @@
    58.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    58.5  genpkg_rules()
    58.6  {
    58.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    58.8  	mkdir -p $fs/usr/
    58.9  	cp -a $_pkg/usr/share $fs/usr/
   58.10  }
    59.1 --- a/python-couchdbkit/receipt	Sun Feb 20 05:51:18 2011 +0000
    59.2 +++ b/python-couchdbkit/receipt	Sun Feb 20 06:53:59 2011 +0000
    59.3 @@ -15,7 +15,6 @@
    59.4  # Rules to configure and make the package.
    59.5  compile_rules()
    59.6  {
    59.7 -	src="$SOURCE"
    59.8  	cd $src
    59.9  	python setup.py install --root=$PWD/_pkg
   59.10  }
   59.11 @@ -24,10 +23,6 @@
   59.12  genpkg_rules()
   59.13  {
   59.14  	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
   59.15 -	_pkg="$SOURCE/_pkg"
   59.16 -	for file in `find $_pkg | grep 'pyc$'`; do
   59.17 -		rm $file
   59.18 -	done
   59.19  	mkdir -p $fs/usr
   59.20  	rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/*
   59.21  	rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests
    60.1 --- a/python-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    60.2 +++ b/python-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    60.3 @@ -14,7 +14,6 @@
    60.4  genpkg_rules()
    60.5  {
    60.6  	mkdir -p $fs/usr/bin
    60.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    60.8  	cp -a $_pkg/usr/include $fs/usr
    60.9  	cp -a $_pkg/usr/bin/*-config $fs/usr/bin
   60.10  	chmod 755 $fs/usr/bin/*-config
    61.1 --- a/python-docutils/receipt	Sun Feb 20 05:51:18 2011 +0000
    61.2 +++ b/python-docutils/receipt	Sun Feb 20 06:53:59 2011 +0000
    61.3 @@ -16,7 +16,6 @@
    61.4  # Rules to configure and make the package.
    61.5  compile_rules()
    61.6  {
    61.7 -	src="$SOURCE"
    61.8  	cd $src
    61.9  	python setup.py install --root=$PWD/_pkg
   61.10  }
   61.11 @@ -24,10 +23,6 @@
   61.12  # Rules to gen a SliTaz package suitable for Tazpkg.
   61.13  genpkg_rules()
   61.14  {
   61.15 -	_pkg="$SOURCE/_pkg"
   61.16 -	for file in `find $_pkg | grep 'pyc$'`; do
   61.17 -		rm $file
   61.18 -	done
   61.19  	mkdir -p $fs/usr
   61.20  	cp -a $_pkg/usr $fs
   61.21  }
    62.1 --- a/python-restclient/receipt	Sun Feb 20 05:51:18 2011 +0000
    62.2 +++ b/python-restclient/receipt	Sun Feb 20 06:53:59 2011 +0000
    62.3 @@ -15,7 +15,6 @@
    62.4  # Rules to configure and make the package.
    62.5  compile_rules()
    62.6  {
    62.7 -	src="$SOURCE"
    62.8  	cd $src
    62.9  	python setup.py install --root=$PWD/_pkg
   62.10  }
   62.11 @@ -24,10 +23,6 @@
   62.12  genpkg_rules()
   62.13  {
   62.14  	PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/')
   62.15 -	_pkg="$SOURCE/_pkg"
   62.16 -	for file in `find $_pkg | grep 'pyc$'`; do
   62.17 -		rm $file
   62.18 -	done
   62.19  	mkdir -p $fs/usr
   62.20  	rm -f $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests/*
   62.21  	rmdir $_pkg/usr/lib/$PYTHON_LIB/site-packages/tests
    63.1 --- a/rapidsvn/receipt	Sun Feb 20 05:51:18 2011 +0000
    63.2 +++ b/rapidsvn/receipt	Sun Feb 20 06:53:59 2011 +0000
    63.3 @@ -13,11 +13,9 @@
    63.4  WGET_URL="http://www.rapidsvn.org/download/release/0.12/$TARBALL"
    63.5  TAGS="subversion svn version-control versioning"
    63.6  
    63.7 -
    63.8  # Rules to configure and make the package.
    63.9  compile_rules()
   63.10  {
   63.11 -	src=$WOK/$PACKAGE/$PACKAGE-$VERSION-1
   63.12  	cd $src
   63.13  	./configure --prefix=/usr \
   63.14  		--with-apr-config=apr-1-config \
   63.15 @@ -34,7 +32,6 @@
   63.16  # Rules to gen a SliTaz package suitable for Tazpkg.
   63.17  genpkg_rules()
   63.18  {
   63.19 -	_pkg=$WOK/$PACKAGE/$PACKAGE-$VERSION-1/_pkg
   63.20  	mkdir -p $fs/usr/lib \
   63.21  		 $fs/usr/share \
   63.22  		 $fs/usr/share/applications \
    64.1 --- a/ssmtp/receipt	Sun Feb 20 05:51:18 2011 +0000
    64.2 +++ b/ssmtp/receipt	Sun Feb 20 06:53:59 2011 +0000
    64.3 @@ -14,7 +14,7 @@
    64.4  # Rules to configure and make the package.
    64.5  compile_rules()
    64.6  {
    64.7 -    cd ssmtp
    64.8 +    cd $src
    64.9      ./configure --prefix=/usr \
   64.10          --sysconfdir=/etc \
   64.11          --mandir=/usr/share/man \
   64.12 @@ -32,7 +32,6 @@
   64.13  # Rules to gen a SliTaz package suitable for Tazpkg.
   64.14  genpkg_rules()
   64.15  {
   64.16 -    _pkg=$PWD/ssmtp/_pkg
   64.17      mkdir -p $fs/usr
   64.18      cp -a $_pkg/usr/sbin/ $fs/usr/
   64.19      cp -a $_pkg/etc/ $fs/
   64.20 @@ -51,12 +50,7 @@
   64.21  post_remove() 
   64.22  {
   64.23      echo "Processing post-remove commands..."
   64.24 -    rm -f /usr/sbin/sendmail
   64.25 -    rm -f /usr/sbin/newaliases
   64.26 -    rm -f /usr/sbin/mailq
   64.27 +    rm -f $1/usr/sbin/sendmail
   64.28 +    rm -f $1/usr/sbin/newaliases
   64.29 +    rm -f $1/usr/sbin/mailq
   64.30  }
   64.31 -
   64.32 -clean_wok()
   64.33 -{
   64.34 -    rm -rf ssmtp
   64.35 -}
    65.1 --- a/thunar-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    65.2 +++ b/thunar-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    65.3 @@ -13,9 +13,6 @@
    65.4  
    65.5  genpkg_rules()
    65.6  {
    65.7 -	
    65.8 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    65.9 -	
   65.10  	mkdir -p $fs/usr/lib/thunarx-2
   65.11  	
   65.12  	cp -a $_pkg/usr/include $fs/usr
    66.1 --- a/tk-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    66.2 +++ b/tk-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    66.3 @@ -11,19 +11,11 @@
    66.4  WEB_SITE="http://tcl.sourceforge.net/"
    66.5  WANTED="tk"
    66.6  
    66.7 -
    66.8 -
    66.9  # Rules to gen a SliTaz package suitable for Tazpkg.
   66.10  genpkg_rules()
   66.11  {
   66.12 -	_pkg=$WOK/$WANTED/${SOURCE}${VERSION}/unix/_pkg
   66.13 -	
   66.14  	mkdir -p $fs/usr/lib
   66.15  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   66.16  	cp -a $_pkg/usr/lib/tkConfig.sh $fs/usr/lib
   66.17  	cp -a $_pkg/usr/include $fs/usr/
   66.18  }
   66.19 -
   66.20 -clean_wok(){
   66.21 -	test -d tk* && rm -rf tk*
   66.22 -}
    67.1 --- a/tk/receipt	Sun Feb 20 05:51:18 2011 +0000
    67.2 +++ b/tk/receipt	Sun Feb 20 06:53:59 2011 +0000
    67.3 @@ -17,22 +17,17 @@
    67.4  # Rules to configure and make the package.
    67.5  compile_rules()
    67.6  {
    67.7 -	# Redefine TK source path
    67.8 -	src=${SOURCE}${VERSION}/unix
    67.9 -
   67.10 -	cd $src
   67.11 +	cd $src/unix
   67.12  	./configure --prefix=/usr \
   67.13  	 --enable-threads \
   67.14  	 --enable-shared  $CONFIGURE_ARGS &&
   67.15  	make &&
   67.16 -	make DESTDIR=$PWD/_pkg install
   67.17 +	make DESTDIR=$DESTDIR install
   67.18  }
   67.19  
   67.20  # Rules to gen a SliTaz package suitable for Tazpkg.
   67.21  genpkg_rules()
   67.22  {
   67.23 -	_pkg=${SOURCE}${VERSION}/unix/_pkg
   67.24 -	
   67.25  	mkdir -p $fs/usr/lib
   67.26  	cp -a $_pkg/usr/bin $fs/usr
   67.27  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
   67.28 @@ -41,8 +36,3 @@
   67.29  	cd $fs/usr/bin
   67.30  	ln -s wish${VERSION%%.[0-9]} wish
   67.31  }
   67.32 -
   67.33 -clean_wok()
   67.34 -{
   67.35 -	test -d tk* && rm -rf tk*
   67.36 -}
    68.1 --- a/vim-tiny/receipt	Sun Feb 20 05:51:18 2011 +0000
    68.2 +++ b/vim-tiny/receipt	Sun Feb 20 06:53:59 2011 +0000
    68.3 @@ -16,8 +16,6 @@
    68.4  # Rules to configure and make the package.
    68.5  compile_rules()
    68.6  {
    68.7 -	src=vim72
    68.8 -	#test -d $PACKAGE-$VERSION || mv vim72 $PACKAGE-$VERSION
    68.9  	cd $src
   68.10  	
   68.11  	./configure --prefix=/usr \
   68.12 @@ -33,30 +31,21 @@
   68.13  	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
   68.14  	 
   68.15  	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/$src MAKE="make -e" &&
   68.16 -	make DESTDIR=$PWD/_pkg install
   68.17 +	make DESTDIR=$DESTDIR install
   68.18 +	mkdir -p $DESTDIR/etc/vim
   68.19 +	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
   68.20  }
   68.21  
   68.22  # Rules to gen a SliTaz package suitable for Tazpkg.
   68.23  genpkg_rules()
   68.24  {
   68.25 -	_pkg="$PWD/vim72/_pkg"
   68.26 -	
   68.27 -	mkdir -p $fs/usr $fs/usr/share $fs/etc/vim
   68.28 +	mkdir -p $fs/usr $fs/usr/share
   68.29  	
   68.30  	cp -a $_pkg/usr/bin $fs/usr
   68.31  	cp -a $_pkg/usr/share/vim $fs/usr/share
   68.32 -	cp -a $WOK/$PACKAGE/vim72/runtime/vimrc_example.vim $fs/etc/vim/vimrc
   68.33  	rm -f $fs/usr/bin/*tutor
   68.34  }
   68.35  
   68.36 -
   68.37 -
   68.38 -# Rules to clean extras dirs or files
   68.39 -clean_wok()
   68.40 -{
   68.41 -	rm -rf $PWD/vim72 2>/dev/null
   68.42 -}
   68.43 -
   68.44  post_install()
   68.45  {
   68.46      local root
   68.47 @@ -84,5 +73,5 @@
   68.48  {
   68.49  	# restore previous symlink
   68.50  	echo "Processing post-remove commands..."
   68.51 -	ln -sf /bin/busybox /bin/vi
   68.52 +	ln -sf /bin/busybox $1/bin/vi
   68.53  }
    69.1 --- a/vim/receipt	Sun Feb 20 05:51:18 2011 +0000
    69.2 +++ b/vim/receipt	Sun Feb 20 06:53:59 2011 +0000
    69.3 @@ -15,7 +15,6 @@
    69.4  # Rules to configure and make the package.
    69.5  compile_rules()
    69.6  {
    69.7 -	src="vim72"
    69.8  	cd $src
    69.9  	
   69.10  	./configure --prefix=/usr \
   69.11 @@ -29,30 +28,21 @@
   69.12  	 --mandir=/usr/share/man $CONFIGURE_ARGS && 
   69.13  	 
   69.14  	make VIMRCLOC=/etc/vim VIMRUNTIMEDIR=/usr/share/vim/$src MAKE="make -e" &&
   69.15 -	make DESTDIR=$PWD/_pkg install
   69.16 +	make DESTDIR=$DESTDIR install
   69.17 +	mkdir -p $DESTDIR/etc/vim
   69.18 +	cp -a $src/runtime/vimrc_example.vim $DESTDIR/etc/vim/vimrc
   69.19  }
   69.20  
   69.21  # Rules to gen a SliTaz package suitable for Tazpkg.
   69.22  genpkg_rules()
   69.23  {
   69.24 -	_pkg="$PWD/vim72/_pkg"
   69.25 -	
   69.26 -	mkdir -p $fs/usr $fs/usr/share $fs/etc/vim
   69.27 +	mkdir -p $fs/usr $fs/usr/share
   69.28  	
   69.29  	cp -a $_pkg/usr/bin $fs/usr
   69.30  	cp -a $_pkg/usr/share/vim $fs/usr/share
   69.31 -	cp -a $WOK/$PACKAGE/vim72/runtime/vimrc_example.vim $fs/etc/vim/vimrc
   69.32  	rm -f $fs/usr/bin/*vimtutor
   69.33  }
   69.34  
   69.35 -
   69.36 -
   69.37 -# Rules to clean extras dirs or files
   69.38 -clean_wok()
   69.39 -{
   69.40 -	rm -rf $PWD/vim72 2>/dev/null
   69.41 -}
   69.42 -
   69.43  post_install()
   69.44  {
   69.45      local root
   69.46 @@ -80,5 +70,5 @@
   69.47  {
   69.48  	# restore previous symlink
   69.49  	echo "Processing post-remove commands..."
   69.50 -	ln -sf /bin/busybox /bin/vi
   69.51 +	ln -sf /bin/busybox $1/bin/vi
   69.52  }
    70.1 --- a/wireless_tools-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    70.2 +++ b/wireless_tools-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    70.3 @@ -11,7 +11,6 @@
    70.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    70.5  genpkg_rules()
    70.6  {
    70.7 -	_pkg=$WOK/$WANTED/${WANTED}.${VERSION}/_pkg
    70.8  	mkdir -p $fs/usr
    70.9  	cp -a $_pkg/usr/include $fs/usr
   70.10  }
    71.1 --- a/wireless_tools/receipt	Sun Feb 20 05:51:18 2011 +0000
    71.2 +++ b/wireless_tools/receipt	Sun Feb 20 06:53:59 2011 +0000
    71.3 @@ -15,9 +15,6 @@
    71.4  # Rules to configure and make the package.
    71.5  compile_rules()
    71.6  {
    71.7 -	src=${PACKAGE}.${VERSION}
    71.8 -	# fix perms
    71.9 -	chown -R root.root $src
   71.10  	cd $src
   71.11  	make PREFIX=$PWD/_pkg/usr
   71.12  	make PREFIX=$PWD/_pkg/usr install
   71.13 @@ -26,8 +23,6 @@
   71.14  # Rules to gen a SliTaz package suitable for Tazpkg.
   71.15  genpkg_rules()
   71.16  {
   71.17 -	_pkg=$WOK/$PACKAGE/${PACKAGE}.${VERSION}/_pkg
   71.18 -	
   71.19  	mkdir -p $fs/usr/lib $fs/usr/bin $fs/usr/share/applications
   71.20  	cp -a $_pkg/usr/sbin $fs/usr
   71.21  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    72.1 --- a/wxpython-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    72.2 +++ b/wxpython-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    72.3 @@ -13,7 +13,6 @@
    72.4  # Rules to gen a SliTaz package suitable for Tazpkg.
    72.5  genpkg_rules()
    72.6  {
    72.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    72.8  	mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share
    72.9  	cp -a $_pkg/usr/bin/wx-config $fs/usr/bin
   72.10  	cp -a $_pkg/usr/lib/wx $fs/usr/lib
    73.1 --- a/x264-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    73.2 +++ b/x264-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    73.3 @@ -14,7 +14,6 @@
    73.4  genpkg_rules()
    73.5  {
    73.6  	mkdir -p $fs/usr/lib
    73.7 -	_pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg"
    73.8  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
    73.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   73.10  	cp -a $_pkg/usr/include $fs/usr
    74.1 --- a/xorg-libICE-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    74.2 +++ b/xorg-libICE-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    74.3 @@ -12,7 +12,6 @@
    74.4  genpkg_rules()
    74.5  {
    74.6  	mkdir -p $fs/usr/lib
    74.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    74.8  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
    74.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   74.10  	cp -a $_pkg/usr/include $fs/usr
    75.1 --- a/xorg-libSM-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    75.2 +++ b/xorg-libSM-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    75.3 @@ -14,7 +14,6 @@
    75.4  genpkg_rules()
    75.5  {
    75.6  	mkdir -p $fs/usr/lib
    75.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    75.8  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
    75.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   75.10  	cp -a $_pkg/usr/include $fs/usr
    76.1 --- a/xorg-libX11-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    76.2 +++ b/xorg-libX11-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    76.3 @@ -15,7 +15,6 @@
    76.4  genpkg_rules()
    76.5  {
    76.6  	mkdir -p $fs/usr/lib
    76.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    76.8  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
    76.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   76.10  	cp -a $_pkg/usr/include $fs/usr
    77.1 --- a/xorg-libXau-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    77.2 +++ b/xorg-libXau-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    77.3 @@ -14,7 +14,6 @@
    77.4  genpkg_rules()
    77.5  {
    77.6  	mkdir -p $fs/usr/lib
    77.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    77.8  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
    77.9  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   77.10  	cp -a $_pkg/usr/include $fs/usr
    78.1 --- a/xorg-libXaw-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    78.2 +++ b/xorg-libXaw-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    78.3 @@ -12,7 +12,7 @@
    78.4  genpkg_rules()
    78.5  {
    78.6  	mkdir -p $fs/usr/lib
    78.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    78.8 +	
    78.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   78.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   78.11  	cp -a $_pkg/usr/include $fs/usr
    79.1 --- a/xorg-libXcomposite-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    79.2 +++ b/xorg-libXcomposite-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    79.3 @@ -13,7 +13,7 @@
    79.4  genpkg_rules()
    79.5  {
    79.6  	mkdir -p $fs/usr/lib
    79.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    79.8 +	
    79.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   79.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   79.11  	cp -a $_pkg/usr/include $fs/usr
    80.1 --- a/xorg-libXcursor-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    80.2 +++ b/xorg-libXcursor-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    80.3 @@ -12,7 +12,7 @@
    80.4  genpkg_rules()
    80.5  {
    80.6  	mkdir -p $fs/usr/lib
    80.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    80.8 +	
    80.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   80.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   80.11  	cp -a $_pkg/usr/include $fs/usr
    81.1 --- a/xorg-libXdamage-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    81.2 +++ b/xorg-libXdamage-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    81.3 @@ -14,7 +14,7 @@
    81.4  genpkg_rules()
    81.5  {
    81.6  	mkdir -p $fs/usr/lib
    81.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    81.8 +	
    81.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   81.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   81.11  	cp -a $_pkg/usr/include $fs/usr
    82.1 --- a/xorg-libXdmcp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    82.2 +++ b/xorg-libXdmcp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    82.3 @@ -12,7 +12,7 @@
    82.4  genpkg_rules()
    82.5  {
    82.6  	mkdir -p $fs/usr/lib
    82.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    82.8 +	
    82.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   82.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   82.11  	cp -a $_pkg/usr/include $fs/usr
    83.1 --- a/xorg-libXext-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    83.2 +++ b/xorg-libXext-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    83.3 @@ -14,7 +14,7 @@
    83.4  genpkg_rules()
    83.5  {
    83.6  	mkdir -p $fs/usr/lib
    83.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    83.8 +	
    83.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   83.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   83.11  	cp -a $_pkg/usr/include $fs/usr
    84.1 --- a/xorg-libXfixes-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    84.2 +++ b/xorg-libXfixes-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    84.3 @@ -12,7 +12,7 @@
    84.4  genpkg_rules()
    84.5  {
    84.6  	mkdir -p $fs/usr/lib
    84.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    84.8 +	
    84.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   84.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   84.11  	cp -a $_pkg/usr/include $fs/usr
    85.1 --- a/xorg-libXfont-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    85.2 +++ b/xorg-libXfont-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    85.3 @@ -15,7 +15,7 @@
    85.4  genpkg_rules()
    85.5  {
    85.6  	mkdir -p $fs/usr/lib
    85.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    85.8 +	
    85.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   85.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   85.11  	cp -a $_pkg/usr/include $fs/usr
    86.1 --- a/xorg-libXft-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    86.2 +++ b/xorg-libXft-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    86.3 @@ -14,7 +14,7 @@
    86.4  genpkg_rules()
    86.5  {
    86.6  	mkdir -p $fs/usr/lib $fs/usr/bin
    86.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    86.8 +	
    86.9  	install -o root -g root -m 0755 $_pkg/usr/bin/xft-config $fs/usr/bin
   86.10  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   86.11  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    87.1 --- a/xorg-libXinerama-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    87.2 +++ b/xorg-libXinerama-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    87.3 @@ -14,7 +14,7 @@
    87.4  genpkg_rules()
    87.5  {
    87.6  	mkdir -p $fs/usr/lib
    87.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    87.8 +	
    87.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   87.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   87.11  	cp -a $_pkg/usr/include $fs/usr
    88.1 --- a/xorg-libXmu-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    88.2 +++ b/xorg-libXmu-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    88.3 @@ -14,7 +14,7 @@
    88.4  genpkg_rules()
    88.5  {
    88.6  	mkdir -p $fs/usr/lib
    88.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    88.8 +	
    88.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   88.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   88.11  	cp -a $_pkg/usr/include $fs/usr
    89.1 --- a/xorg-libXp-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    89.2 +++ b/xorg-libXp-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    89.3 @@ -14,7 +14,7 @@
    89.4  genpkg_rules()
    89.5  {
    89.6  	# _pkg is not set correctly when both SOURCE and WANTED are defined
    89.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    89.8 +	
    89.9  
   89.10  	mkdir -p $fs/usr/lib
   89.11  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
    90.1 --- a/xorg-libXpm-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    90.2 +++ b/xorg-libXpm-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    90.3 @@ -12,7 +12,7 @@
    90.4  genpkg_rules()
    90.5  {
    90.6  	mkdir -p $fs/usr/lib
    90.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    90.8 +	
    90.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   90.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   90.11  	cp -a $_pkg/usr/include $fs/usr
    91.1 --- a/xorg-libXrandr-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    91.2 +++ b/xorg-libXrandr-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    91.3 @@ -15,7 +15,7 @@
    91.4  genpkg_rules()
    91.5  {
    91.6  	mkdir -p $fs/usr/lib
    91.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    91.8 +	
    91.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   91.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   91.11  	cp -a $_pkg/usr/include $fs/usr
    92.1 --- a/xorg-libXrender-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    92.2 +++ b/xorg-libXrender-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    92.3 @@ -12,7 +12,7 @@
    92.4  genpkg_rules()
    92.5  {
    92.6  	mkdir -p $fs/usr/lib
    92.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    92.8 +	
    92.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   92.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   92.11  	cp -a $_pkg/usr/include $fs/usr
    93.1 --- a/xorg-libXss-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    93.2 +++ b/xorg-libXss-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    93.3 @@ -14,7 +14,7 @@
    93.4  genpkg_rules()
    93.5  {
    93.6  	mkdir -p $fs/usr/lib
    93.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    93.8 +	
    93.9  	cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
   93.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   93.11  	cp -a $_pkg/usr/include $fs/usr
    94.1 --- a/xorg-libXt-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    94.2 +++ b/xorg-libXt-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    94.3 @@ -14,7 +14,7 @@
    94.4  genpkg_rules()
    94.5  {
    94.6  	mkdir -p $fs/usr/lib
    94.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    94.8 +	
    94.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   94.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   94.11  	cp -a $_pkg/usr/include $fs/usr
    95.1 --- a/xorg-libXtst-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    95.2 +++ b/xorg-libXtst-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    95.3 @@ -14,7 +14,7 @@
    95.4  genpkg_rules()
    95.5  {
    95.6  	mkdir -p $fs/usr/lib $fs/usr/include/X11
    95.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    95.8 +	
    95.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   95.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   95.11  	cp -a $_pkg/usr/include/X11/extensions $fs/usr/include/X11/
    96.1 --- a/xorg-libXv-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    96.2 +++ b/xorg-libXv-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    96.3 @@ -14,7 +14,7 @@
    96.4  genpkg_rules()
    96.5  {
    96.6  	mkdir -p $fs/usr/lib
    96.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    96.8 +	
    96.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   96.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   96.11  	cp -a $_pkg/usr/include $fs/usr
    97.1 --- a/xorg-libXvMC-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    97.2 +++ b/xorg-libXvMC-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    97.3 @@ -14,7 +14,7 @@
    97.4  genpkg_rules()
    97.5  {
    97.6  	mkdir -p $fs/usr/lib
    97.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    97.8 +	
    97.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   97.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   97.11  	cp -a $_pkg/usr/include $fs/usr
    98.1 --- a/xorg-libXxf86vm-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    98.2 +++ b/xorg-libXxf86vm-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    98.3 @@ -14,7 +14,7 @@
    98.4  genpkg_rules()
    98.5  {
    98.6  	mkdir -p $fs/usr/lib
    98.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    98.8 +	
    98.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   98.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   98.11  	cp -a $_pkg/usr/include $fs/usr
    99.1 --- a/xorg-libfontenc-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
    99.2 +++ b/xorg-libfontenc-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
    99.3 @@ -12,7 +12,7 @@
    99.4  genpkg_rules()
    99.5  {
    99.6  	mkdir -p $fs/usr/lib
    99.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
    99.8 +	
    99.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
   99.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
   99.11  	cp -a $_pkg/usr/include $fs/usr
   100.1 --- a/xorg-libpciaccess-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
   100.2 +++ b/xorg-libpciaccess-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
   100.3 @@ -14,7 +14,7 @@
   100.4  genpkg_rules()
   100.5  {
   100.6  	mkdir -p $fs/usr/lib
   100.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
   100.8 +	
   100.9  	cp -a $_pkg/usr/lib/*.*a* $fs/usr/lib
  100.10  	cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
  100.11  	cp -a $_pkg/usr/include $fs/usr
   101.1 --- a/xorg-libxkbfile-dev/receipt	Sun Feb 20 05:51:18 2011 +0000
   101.2 +++ b/xorg-libxkbfile-dev/receipt	Sun Feb 20 06:53:59 2011 +0000
   101.3 @@ -14,7 +14,7 @@
   101.4  genpkg_rules()
   101.5  {
   101.6  	mkdir -p $fs/usr/lib
   101.7 -	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
   101.8 +	
   101.9      cp -a $_pkg/usr/lib/*.*a $fs/usr/lib
  101.10      cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib
  101.11      cp -a $_pkg/usr/include $fs/usr