wok-current rev 4353

Update: java-* - remove files that are already in dependent packages
author Matthew Sheets <rcx@zoominternet.net>
date Sat Oct 03 22:00:35 2009 +0000 (2009-10-03)
parents 55ebdca75e49
children a8aaec062c69
files java-jdk/receipt java-jre/receipt
line diff
     1.1 --- a/java-jdk/receipt	Sat Oct 03 20:24:26 2009 +0200
     1.2 +++ b/java-jdk/receipt	Sat Oct 03 22:00:35 2009 +0000
     1.3 @@ -17,16 +17,6 @@
     1.4  	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
     1.5  	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
     1.6  
     1.7 -	mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
     1.8 -	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \
     1.9 -		$fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
    1.10 +	mkdir -p $fs/usr/bin
    1.11  	cp -a $_pkg/usr/jdk-bin/* $fs/usr/bin
    1.12 -	for i in $_pkg/usr/jdk-bin/* ; do
    1.13 -		while [ -L $i ]; do
    1.14 -			target=$(readlink $i)
    1.15 -			mkdir -p $fs$(dirname $target)
    1.16 -			cp -a $_pkg$target $fs$target
    1.17 -			i=$_pkg$target
    1.18 -		done
    1.19 -	done
    1.20  }
     2.1 --- a/java-jre/receipt	Sat Oct 03 20:24:26 2009 +0200
     2.2 +++ b/java-jre/receipt	Sat Oct 03 22:00:35 2009 +0000
     2.3 @@ -17,16 +17,6 @@
     2.4  	# tazwok does not define _pkg correctly when both WANTED and SOURCE are set
     2.5  	_pkg=$WOK/$WANTED/$SOURCE-$VERSION/_pkg
     2.6  
     2.7 -	mkdir -p $fs/usr/bin $fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
     2.8 -	cp -a $_pkg/usr/lib/jvm/java-icedtea/jre/lib/i386/jli/libjli.so \
     2.9 -		$fs/usr/lib/jvm/java-icedtea/jre/lib/i386/jli
    2.10 +	mkdir -p $fs/usr/bin
    2.11  	cp -a $_pkg/usr/jre-bin/* $fs/usr/bin
    2.12 -	for i in $_pkg/usr/jre-bin/* ; do
    2.13 -		while [ -L $i ]; do
    2.14 -			target=$(readlink $i)
    2.15 -			mkdir -p $fs$(dirname $target)
    2.16 -			cp -a $_pkg$target $fs$target
    2.17 -			i=$_pkg$target
    2.18 -		done
    2.19 -	done
    2.20  }