wok-4.x rev 8531

Merge
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Feb 13 02:27:18 2011 +0000 (2011-02-13)
parents 5d6340961543 7fa7fb8b0f2a
children e3b85b1a6d75
files
line diff
     1.1 --- a/ecj/receipt	Sun Feb 13 01:40:21 2011 +0000
     1.2 +++ b/ecj/receipt	Sun Feb 13 02:27:18 2011 +0000
     1.3 @@ -20,10 +20,6 @@
     1.4  # Rules to configure and make the package.
     1.5  compile_rules()
     1.6  {
     1.7 -	# Please see the link below for a feature request addressing jar untar errors
     1.8 -	# http://labs.slitaz.org/issues/show/133
     1.9 -	echo " ** IGNORING ANY UNTAR ERRORS - UNTAR NOT NEEDED **"
    1.10 -
    1.11  	# Build the ecj shell script to use the current version
    1.12  	mkdir -p $src/_pkg/usr/bin && 
    1.13  	echo "#!/bin/sh" > $src/_pkg/usr/bin/ecj &&
    1.14 @@ -32,8 +28,7 @@
    1.15  	chmod +x $src/_pkg/usr/bin/ecj &&
    1.16  
    1.17  	mkdir -p $src/_pkg/usr/share/java &&
    1.18 -	cp -a $SOURCES_REPOSITORY/$TARBALL $src/_pkg/usr/share/java &&
    1.19 -	echo " ** BUILD SUCCEEDED **"
    1.20 +	cp -a $src/$TARBALL $src/_pkg/usr/share/java
    1.21  }
    1.22  
    1.23  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/icedtea6-jdk/receipt	Sun Feb 13 01:40:21 2011 +0000
     2.2 +++ b/icedtea6-jdk/receipt	Sun Feb 13 02:27:18 2011 +0000
     2.3 @@ -100,7 +100,7 @@
     2.4  		--with-rhino=/usr/share/java/js.jar \
     2.5  		--with-abs-install-dir=$JVM_PREFIX \
     2.6  		$CONFIGURE_ARGS &&
     2.7 -	make -j 1 ARCH_PREFIX=  || exit 1
     2.8 +	make -j 1 ARCH_PREFIX=  || return 1
     2.9  
    2.10  	# NOTE: don't build with -j 4. Only build with -j 1 or tank will crash
    2.11  	# NOTE: IcedTea6 does not define an "install" target
     3.1 --- a/libwrap-dev/receipt	Sun Feb 13 01:40:21 2011 +0000
     3.2 +++ b/libwrap-dev/receipt	Sun Feb 13 02:27:18 2011 +0000
     3.3 @@ -11,7 +11,6 @@
     3.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.5  genpkg_rules()
     3.6  {
     3.7 -	src=$WOK/$WANTED/tcp_wrappers_${VERSION}
     3.8  	mkdir -p $fs/usr/include $fs/usr/lib
     3.9  	cp -a $src/tcpd.h $fs/usr/include
    3.10  	cp -a $src/*.a $fs/usr/lib
     4.1 --- a/libwrap/receipt	Sun Feb 13 01:40:21 2011 +0000
     4.2 +++ b/libwrap/receipt	Sun Feb 13 02:27:18 2011 +0000
     4.3 @@ -13,7 +13,6 @@
     4.4  # Rules to configure and make the package.
     4.5  compile_rules()
     4.6  {
     4.7 -	src=$PWD/${SOURCE}_${VERSION}
     4.8  	cd $src
     4.9  	# Patch from Linux From Scratch
    4.10  	[ -f done.tcp_wrappers-7.6-shared_lib_plus_plus-1.patch ] ||
    4.11 @@ -27,7 +26,6 @@
    4.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.13  genpkg_rules()
    4.14  {
    4.15 -	src=$PWD/${SOURCE}_${VERSION}
    4.16  	mkdir -p $fs/usr/lib 
    4.17  	cp -a $src/shared/*.so* $fs/usr/lib
    4.18  }
     5.1 --- a/xalan-xerces-j/receipt	Sun Feb 13 01:40:21 2011 +0000
     5.2 +++ b/xalan-xerces-j/receipt	Sun Feb 13 02:27:18 2011 +0000
     5.3 @@ -8,7 +8,7 @@
     5.4  MAINTAINER="rcx@zoominternet.net"
     5.5  DEPENDS="jre"
     5.6  #DEPENDS="java-jre"
     5.7 -BUILD_DEPENDS=""
     5.8 +BUILD_DEPENDS="tar"
     5.9  SUGGESTED=""
    5.10  TARBALL="${SOURCE}_2_7_1-bin-2jars.tar.gz"
    5.11  WEB_SITE="http://xalan.apache.org/"