wok rev 22575

updated bzip2 and bzip2-dev (1.0.6 -> 1.0.8)
author Hans-G?nter Theisgen
date Mon Jan 06 16:31:02 2020 +0100 (2020-01-06)
parents 1d9e2a91579d
children 59a032355c05
files bzip2-dev/receipt bzip2/receipt
line diff
     1.1 --- a/bzip2-dev/receipt	Mon Jan 06 15:51:49 2020 +0100
     1.2 +++ b/bzip2-dev/receipt	Mon Jan 06 16:31:02 2020 +0100
     1.3 @@ -1,22 +1,24 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="bzip2-dev"
     1.7 -VERSION="1.0.6"
     1.8 +VERSION="1.0.8"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="High-quality data compressor dev files."
    1.11 +SHORT_DESC="High-quality data compressor - development files."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="BSD"
    1.14 -WEB_SITE="http://www.bzip.org/"
    1.15 -HOST_ARCH="i486 arm"
    1.16 +WEB_SITE="https://sourceware.org/bzip2/"
    1.17 +
    1.18 +DEPENDS="bzip2"
    1.19  WANTED="bzip2"
    1.20  
    1.21 -DEPENDS="bzip2"
    1.22 +HOST_ARCH="i486 arm"
    1.23  
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26  {
    1.27 -	mkdir -p $fs/usr/include $fs/usr/lib
    1.28 -	cp $src/*.h $fs/usr/include
    1.29 -	cp -a $src/*.*a $fs/usr/lib
    1.30 +	mkdir -p $fs/usr/include
    1.31 +	mkdir -p $fs/usr/lib
    1.32 +
    1.33 +	cp $src/*.h	$fs/usr/include
    1.34 +	cp -a $src/*.*a	$fs/usr/lib
    1.35  }
    1.36 -
     2.1 --- a/bzip2/receipt	Mon Jan 06 15:51:49 2020 +0100
     2.2 +++ b/bzip2/receipt	Mon Jan 06 16:31:02 2020 +0100
     2.3 @@ -1,35 +1,39 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="bzip2"
     2.7 -VERSION="1.0.6"
     2.8 +VERSION="1.0.8"
     2.9  CATEGORY="utilities"
    2.10 +TAGS="compression archive"
    2.11  SHORT_DESC="High-quality data compressor."
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13  LICENSE="BSD"
    2.14 +WEB_SITE="https://sourceware.org/bzip2/"
    2.15 +
    2.16  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.17 -WEB_SITE="https://sourceware.org/bzip2/"
    2.18 -WGET_URL="http://www.bzip.org/$VERSION/$TARBALL"
    2.19 -TAGS="compression archive"
    2.20 -HOST_ARCH="i486 arm"
    2.21 +WGET_URL="https://sourceware.org/pub/$PACKAGE/$TARBALL"
    2.22  
    2.23  DEPENDS="bzlib"
    2.24  BUILD_DEPENDS=""
    2.25  
    2.26 +HOST_ARCH="i486 arm"
    2.27 +
    2.28  # Rules to configure and make the package.
    2.29  compile_rules()
    2.30  {
    2.31  	# Disable the tests since they won't work on a multi-architecture build
    2.32  	cp Makefile Makefile.orig
    2.33  	sed -e "/^all:/s/ test//" Makefile.orig > Makefile
    2.34 -	
    2.35 +
    2.36  	# No configure script, we must used CC, AR and RANLIB set by cook.
    2.37  	case "$ARCH" in
    2.38  		arm*)
    2.39  			make -f Makefile-libbz2_so CC=${CC} AR=${AR} RANLIB=${RANLIB} &&
    2.40 -			make clean && make CC=${CC} AR=${AR} RANLIB=${RANLIB} ;;
    2.41 +			make clean &&
    2.42 +			make CC=${CC} AR=${AR} RANLIB=${RANLIB} ;;
    2.43  		*)
    2.44  			make -f Makefile-libbz2_so &&
    2.45 -			make clean && make ;;
    2.46 +			make clean &&
    2.47 +			make ;;
    2.48  	esac
    2.49  
    2.50  	cook_pick_manpages bzdiff.1 bzgrep.1 bzip2.1 bzmore.1
    2.51 @@ -45,7 +49,8 @@
    2.52  genpkg_rules()
    2.53  {
    2.54  	mkdir -p $fs/usr/bin
    2.55 -	cp -a $src/bzip2-shared $fs/usr/bin/bzip2
    2.56 +	cp -a $src/bzip2-shared	$fs/usr/bin/bzip2
    2.57 +
    2.58  	# Da bunzip2, bzcat and lib symlink.
    2.59  	cd $fs/usr/bin
    2.60  	ln -s bzip2 bunzip2
    2.61 @@ -55,7 +60,7 @@
    2.62  # Restore Busybox symlinks upon removal
    2.63  post_remove()
    2.64  {
    2.65 -	ln -s /bin/busybox /usr/bin/bunzip2
    2.66 -	ln -s /bin/busybox /usr/bin/bzcat
    2.67 -	#ln -s /bin/busybox /usr/bin/bzip2
    2.68 +	ln -s /bin/busybox	/usr/bin/bunzip2
    2.69 +	ln -s /bin/busybox	/usr/bin/bzcat
    2.70 +	#ln -s /bin/busybox	/usr/bin/bzip2
    2.71  }