# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1297564038 0
# Node ID 0043777ad43d4be11573535d9be72460e0b28411
# Parent  5d6340961543a3eef1e19a83283cfb1f33ff43d2# Parent  7fa7fb8b0f2a335167dd7fbac6cce802a5eba96b
Merge

diff -r 5d6340961543 -r 0043777ad43d ecj/receipt
--- a/ecj/receipt	Sun Feb 13 01:40:21 2011 +0000
+++ b/ecj/receipt	Sun Feb 13 02:27:18 2011 +0000
@@ -20,10 +20,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Please see the link below for a feature request addressing jar untar errors
-	# http://labs.slitaz.org/issues/show/133
-	echo " ** IGNORING ANY UNTAR ERRORS - UNTAR NOT NEEDED **"
-
 	# Build the ecj shell script to use the current version
 	mkdir -p $src/_pkg/usr/bin && 
 	echo "#!/bin/sh" > $src/_pkg/usr/bin/ecj &&
@@ -32,8 +28,7 @@
 	chmod +x $src/_pkg/usr/bin/ecj &&
 
 	mkdir -p $src/_pkg/usr/share/java &&
-	cp -a $SOURCES_REPOSITORY/$TARBALL $src/_pkg/usr/share/java &&
-	echo " ** BUILD SUCCEEDED **"
+	cp -a $src/$TARBALL $src/_pkg/usr/share/java
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 5d6340961543 -r 0043777ad43d icedtea6-jdk/receipt
--- a/icedtea6-jdk/receipt	Sun Feb 13 01:40:21 2011 +0000
+++ b/icedtea6-jdk/receipt	Sun Feb 13 02:27:18 2011 +0000
@@ -100,7 +100,7 @@
 		--with-rhino=/usr/share/java/js.jar \
 		--with-abs-install-dir=$JVM_PREFIX \
 		$CONFIGURE_ARGS &&
-	make -j 1 ARCH_PREFIX=  || exit 1
+	make -j 1 ARCH_PREFIX=  || return 1
 
 	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
 	# NOTE: IcedTea6 does not define an "install" target
diff -r 5d6340961543 -r 0043777ad43d libwrap-dev/receipt
--- a/libwrap-dev/receipt	Sun Feb 13 01:40:21 2011 +0000
+++ b/libwrap-dev/receipt	Sun Feb 13 02:27:18 2011 +0000
@@ -11,7 +11,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	src=$WOK/$WANTED/tcp_wrappers_${VERSION}
 	mkdir -p $fs/usr/include $fs/usr/lib
 	cp -a $src/tcpd.h $fs/usr/include
 	cp -a $src/*.a $fs/usr/lib
diff -r 5d6340961543 -r 0043777ad43d libwrap/receipt
--- a/libwrap/receipt	Sun Feb 13 01:40:21 2011 +0000
+++ b/libwrap/receipt	Sun Feb 13 02:27:18 2011 +0000
@@ -13,7 +13,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	src=$PWD/${SOURCE}_${VERSION}
 	cd $src
 	# Patch from Linux From Scratch
 	[ -f done.tcp_wrappers-7.6-shared_lib_plus_plus-1.patch ] ||
@@ -27,7 +26,6 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	src=$PWD/${SOURCE}_${VERSION}
 	mkdir -p $fs/usr/lib 
 	cp -a $src/shared/*.so* $fs/usr/lib
 }
diff -r 5d6340961543 -r 0043777ad43d xalan-xerces-j/receipt
--- a/xalan-xerces-j/receipt	Sun Feb 13 01:40:21 2011 +0000
+++ b/xalan-xerces-j/receipt	Sun Feb 13 02:27:18 2011 +0000
@@ -8,7 +8,7 @@
 MAINTAINER="rcx@zoominternet.net"
 DEPENDS="jre"
 #DEPENDS="java-jre"
-BUILD_DEPENDS=""
+BUILD_DEPENDS="tar"
 SUGGESTED=""
 TARBALL="${SOURCE}_2_7_1-bin-2jars.tar.gz"
 WEB_SITE="http://xalan.apache.org/"