# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1320660291 0
# Node ID 6ee191c3fa9e042101b87b3f13debc811490631c
# Parent  0547a154c252968569da3038357f86a72b1ed7b7
upx: Fixed ucl and upx to be more compatable with my wok-tank cooking branch and still be compatible with official cookutils.

diff -r 0547a154c252 -r 6ee191c3fa9e ucl/receipt
--- a/ucl/receipt	Mon Nov 07 06:42:39 2011 +0000
+++ b/ucl/receipt	Mon Nov 07 10:04:51 2011 +0000
@@ -3,25 +3,23 @@
 PACKAGE="ucl"
 VERSION="1.03"
 CATEGORY="system-tools"
-SHORT_DESC="the UCL Compression Library"
+SHORT_DESC="Portable lossless data compression library written in ANSI C"
 MAINTAINER="devl547@gmail.com"
+WEB_SITE="http://www.oberhumer.com/opensource/ucl/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.oberhumer.com/opensource/ucl/"
 WGET_URL="$WEB_SITE/download/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	./configure \
-	--enable-shared \
-	$CONFIGURE_ARGS &&
-	make $MAKEFLAGS && make install
+	./configure --enable-shared $CONFIGURE_ARGS && 
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib 
+	mkdir -p $fs/usr/lib
 	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
 }
diff -r 0547a154c252 -r 6ee191c3fa9e upx/receipt
--- a/upx/receipt	Mon Nov 07 06:42:39 2011 +0000
+++ b/upx/receipt	Mon Nov 07 10:04:51 2011 +0000
@@ -1,36 +1,32 @@
 # SliTaz package receipt.
-#
 
 PACKAGE="upx"
 VERSION="3.07"
 CATEGORY="system-tools"
 SHORT_DESC="Ultimate Packer for eXecutables (free version using UCL compression)"
 MAINTAINER="devl547@gmail.com"
+WEB_SITE="http://upx.sourceforge.net/"
+TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
+WGET_URL="http://upx.sourceforge.net/download/$TARBALL"
+PATCH="http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2"
+
 DEPENDS="ucl zlib"
 BUILD_DEPENDS="ucl-dev zlib-dev"
-TARBALL="$PACKAGE-$VERSION-src.tar.bz2"
-WEB_SITE="http://upx.sourceforge.net"
-WGET_URL="$WEB_SITE/download/$TARBALL"
-LZMA_TARBALL="lzma465.tar.bz2"
-LZMA_SOURCE="http://downloads.sourceforge.net/sevenzip/$LZMA_TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
+	[ -s $SOURCES_REPOSITORY/$(basename $PATCH) ] ||
+		wget -P $SOURCES_REPOSITORY $PATCH
+	tar -xjpf $SOURCES_REPOSITORY/$(basename $PATCH)
+	CXXFLAGS="$CXXFLAGS -DWITH_ZLIB=1"
 	cd $src
-	wget $LZMA_SOURCE
-	tar -xjpf $LZMA_TARBALL
-	#./configure $CONFIGURE_ARGS &&
-	CXXFLAGS="$CXXFLAGS -DWITH_ZLIB=1"
-	UPX_LZMADIR=$src make all $MAKEFLAGS
-	cd src
-	mv upx.out upx
+	UPX_LZMADIR=$src make all
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $src/src/upx $fs/usr/bin/
+	cp -a $src/src/upx.out $fs/usr/bin/upx
 }
-