# HG changeset patch
# User Michael Dupont <milka@konstelacioj.info>
# Date 1217438171 -7200
# Node ID f1362553414e8430d761c76d454a7e2ba8725f10
# Parent  65a6365f055082e06ba3d723a60b927c33452e74
p7zip / p7zip-full simplified

diff -r 65a6365f0550 -r f1362553414e p7zip-full/receipt
--- a/p7zip-full/receipt	Wed Jul 30 12:12:44 2008 +0000
+++ b/p7zip-full/receipt	Wed Jul 30 19:16:11 2008 +0200
@@ -7,9 +7,9 @@
 SHORT_DESC="A file archiver with a high compression ratio (full version with restricted codecs)"
 MAINTAINER="milka@konstelacioj.info"
 #DEPENDS=""
-TARBALL="$SOURCE"_"$VERSION"_"src"_"all.tar.bz2"
+TARBALL="${SOURCE}_${VERSION}_src_all.tar.bz2"
 WEB_SITE="http://p7zip.sourceforge.net/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="$SF_MIRROR/$SOURCE/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
@@ -17,15 +17,13 @@
 	mv "$SOURCE"_"$VERSION" $src
 	cd $src
 	make all3
-	mkdir -p $PWD/_pkg/usr/
-	mv $PWD/bin $PWD/_pkg/usr/
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $src/bin $fs/usr
 	strip -s $fs/usr/bin/*
 }
 
diff -r 65a6365f0550 -r f1362553414e p7zip/receipt
--- a/p7zip/receipt	Wed Jul 30 12:12:44 2008 +0000
+++ b/p7zip/receipt	Wed Jul 30 19:16:11 2008 +0200
@@ -6,7 +6,7 @@
 SHORT_DESC="A file archiver with a high compression ratio (supports only 7z archives)"
 MAINTAINER="milka@konstelacioj.info"
 #DEPENDS=""
-TARBALL="$PACKAGE"_"$VERSION"_"src"_"all.tar.bz2"
+TARBALL="${PACKAGE}_${VERSION}_src_all.tar.bz2"
 WEB_SITE="http://p7zip.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
@@ -16,15 +16,13 @@
 	mv "$PACKAGE"_"$VERSION" $src
 	cd $src
 	make 7zr
-	mkdir -p $PWD/_pkg/usr
-	mv $PWD/bin $PWD/_pkg/usr/
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $src/bin $fs/usr
 	strip -s $fs/usr/bin/*
 }