wok-next rev 19567

Up gettext, pcre, grep, gzip.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Dec 19 06:26:53 2016 +0200 (2016-12-19)
parents 74fceceeec23
children 96871f3890f0
files gettext/receipt grep/receipt gzip-full/receipt gzip/receipt pcre-dev/receipt pcre/receipt
line diff
     1.1 --- a/gettext/receipt	Mon Dec 19 05:43:33 2016 +0200
     1.2 +++ b/gettext/receipt	Mon Dec 19 06:26:53 2016 +0200
     1.3 @@ -12,11 +12,11 @@
     1.4  TARBALL="$PACKAGE-$VERSION.tar.xz"
     1.5  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
     1.6  
     1.7 -# Why deps on glib-dev ??? And glib build depends on gettext anyway...
     1.8 -DEPENDS="gettext-base libgomp acl-dev gcc-lib-base glib-dev libxml2-dev m4 \
     1.9 -ncurses gettext-tools libcroco"
    1.10 -#BUILD_DEPENDS="acl attr-dev glib-dev libxml2-dev ncurses-dev"
    1.11 +# Runtime depends, then dev-depends
    1.12 +DEPENDS="gettext-base gettext-tools libcroco \
    1.13 +acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4"
    1.14  BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev"
    1.15 +SPLIT="gettext-base gettext-tools"
    1.16  
    1.17  # Handle cross compilation. Glibc-locale are installed in cross chroot.
    1.18  case "$ARCH" in
     2.1 --- a/grep/receipt	Mon Dec 19 05:43:33 2016 +0200
     2.2 +++ b/grep/receipt	Mon Dec 19 06:26:53 2016 +0200
     2.3 @@ -6,28 +6,25 @@
     2.4  SHORT_DESC="GNU Global Regular Expression Print."
     2.5  MAINTAINER="paul@slitaz.org"
     2.6  LICENSE="GPL3"
     2.7 +WEB_SITE="https://www.gnu.org/software/grep/"
     2.8 +
     2.9  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.10 -WEB_SITE="http://www.gnu.org/software/grep/"
    2.11  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    2.12  
    2.13  DEPENDS="pcre"
    2.14 -BUILD_DEPENDS="pcre-dev"
    2.15 +BUILD_DEPENDS="pcre-dev perl gettext"
    2.16  
    2.17  # Rules to configure and make the package.
    2.18  compile_rules()
    2.19  {
    2.20  	./configure $CONFIGURE_ARGS &&
    2.21  	make && make install
    2.22 -
    2.23 -	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
    2.24  }
    2.25  
    2.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.27  genpkg_rules()
    2.28  {
    2.29 -	mkdir -p $fs/usr/share
    2.30 -	cp -a $install/usr/bin $fs
    2.31 -	cp -a $install/usr/share/man $fs/usr/share
    2.32 +	cook_copy_folders bin
    2.33  }
    2.34  
    2.35  post_remove()
     3.1 --- a/gzip-full/receipt	Mon Dec 19 05:43:33 2016 +0200
     3.2 +++ b/gzip-full/receipt	Mon Dec 19 06:26:53 2016 +0200
     3.3 @@ -1,38 +1,32 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="gzip-full"
     3.7 -VERSION="1.6"
     3.8 +VERSION="1.8"
     3.9  CATEGORY="system-tools"
    3.10  SHORT_DESC="GNU compression utilities"
    3.11  MAINTAINER="erjo@slitaz.org"
    3.12  LICENSE="GPL3"
    3.13  WEB_SITE="http://www.gnu.org/software/gzip/"
    3.14 +
    3.15  WANTED="gzip"
    3.16 -
    3.17  DEPENDS="gzip"
    3.18  
    3.19  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.20  genpkg_rules()
    3.21  {
    3.22 -	mkdir -p $fs/usr
    3.23 -
    3.24 -	cp -a $install/usr/bin $fs/usr
    3.25 -	rm -f $fs/usr/bin/gzip $fs/usr/bin/gunzip
    3.26 +	cook_copy_folders bin
    3.27 +	cook_split_rm gzip
    3.28  }
    3.29  
    3.30 -# Pre and post install commands for Tazpkg.
    3.31 -# We must remove all Busybox symlink before installing.
    3.32  pre_install()
    3.33  {
    3.34 -	echo -n "Removing Busybox uncompress and zcat utilities... "
    3.35 +	# Removing Busybox uncompress and zcat applets
    3.36 +	# as we have /usr/bin/uncompress and /usr/bin/zcat in this package
    3.37  	rm -f "$1/bin/uncompress" "$1/bin/zcat"
    3.38 -	status
    3.39  }
    3.40  
    3.41  post_remove()
    3.42  {
    3.43 -	echo -n "Restoring Busybox uncompress and zcat utilities... "
    3.44  	ln -s busybox "$1/bin/uncompress"
    3.45  	ln -s busybox "$1/bin/zcat"
    3.46 -	status
    3.47  }
     4.1 --- a/gzip/receipt	Mon Dec 19 05:43:33 2016 +0200
     4.2 +++ b/gzip/receipt	Mon Dec 19 06:26:53 2016 +0200
     4.3 @@ -1,51 +1,41 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="gzip"
     4.7 -VERSION="1.6"
     4.8 +VERSION="1.8"
     4.9  CATEGORY="system-tools"
    4.10  SHORT_DESC="GNU compression utilities (gzip and gunzip)"
    4.11  MAINTAINER="erjo@slitaz.org"
    4.12  LICENSE="GPL3"
    4.13 +WEB_SITE="https://www.gnu.org/software/gzip/"
    4.14 +
    4.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
    4.16 -WEB_SITE="http://www.gnu.org/software/gzip/"
    4.17 -WGET_URL="http://ftp.gnu.org/gnu/gzip/$TARBALL"
    4.18 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    4.19  
    4.20  DEPENDS="glibc-base"
    4.21  BUILD_DEPENDS="glibc-dev"
    4.22 +SPLIT="gzip-full"
    4.23  
    4.24  # Rules to configure and make the package.
    4.25  compile_rules()
    4.26  {
    4.27 -	./configure \
    4.28 -		--prefix=/usr \
    4.29 -		--infodir=/usr/share/info \
    4.30 -		--mandir=/usr/share/man \
    4.31 -		$CONFIGURE_ARGS &&
    4.32 -	make && make DESTDIR=$DESTDIR install
    4.33 +	./configure $CONFIGURE_ARGS && make && make install
    4.34  }
    4.35  
    4.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.37  genpkg_rules()
    4.38  {
    4.39 -	mkdir -p $fs/usr/bin
    4.40 -	cp -a $install/usr/bin/zgrep $fs/usr/bin
    4.41 -	cp -a $install/usr/bin/gzip $fs/usr/bin
    4.42 -	cp -a $install/usr/bin/gunzip $fs/usr/bin
    4.43 +	cook_copy_files gzip gunzip zgrep
    4.44  }
    4.45  
    4.46 -# Pre and post install commands for Tazpkg.
    4.47 -# We must remove all Busybox symlink before installing.
    4.48  pre_install()
    4.49  {
    4.50 -	echo -n "Removing Busybox gzip and gunzip utilities... "
    4.51 +	# Removing Busybox gzip and gunzip applets
    4.52 +	# as we have /usr/bin/gzip and /usr/bin/gunzip in this package
    4.53  	rm -f "$1/bin/gzip" "$1/bin/gunzip"
    4.54 -	status
    4.55  }
    4.56  
    4.57  post_remove()
    4.58  {
    4.59 -	echo -n "Restoring Busybox gzip and gunzip utilities... "
    4.60  	ln -s busybox "$1/bin/gzip"
    4.61  	ln -s busybox "$1/bin/gunzip"
    4.62 -	status
    4.63  }
     5.1 --- a/pcre-dev/receipt	Mon Dec 19 05:43:33 2016 +0200
     5.2 +++ b/pcre-dev/receipt	Mon Dec 19 06:26:53 2016 +0200
     5.3 @@ -10,12 +10,11 @@
     5.4  HOST_ARCH="i486 arm"
     5.5  
     5.6  WANTED="pcre"
     5.7 -DEPENDS="pcre pkg-config"
     5.8 +DEPENDS="pcre glib pkg-config"
     5.9  
    5.10  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.11  genpkg_rules()
    5.12  {
    5.13 -	cp -a $install/* $fs
    5.14 -	rm $fs/usr/lib/*.so*
    5.15 -	rm -r $fs/usr/share
    5.16 +	cook_copy_folders bin include lib
    5.17 +	cook_split_rm pcre
    5.18  }
     6.1 --- a/pcre/receipt	Mon Dec 19 05:43:33 2016 +0200
     6.2 +++ b/pcre/receipt	Mon Dec 19 06:26:53 2016 +0200
     6.3 @@ -6,10 +6,11 @@
     6.4  SHORT_DESC="Perl 5 Compatible Regular Expression, library"
     6.5  MAINTAINER="pankso@slitaz.org"
     6.6  LICENSE="BSD"
     6.7 +WEB_SITE="http://www.pcre.org/"
     6.8 +HOST_ARCH="i486 arm"
     6.9 +
    6.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    6.11 -WEB_SITE="http://www.pcre.org/"
    6.12  WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL"
    6.13 -HOST_ARCH="i486 arm"
    6.14  
    6.15  # Rules to configure and make the package.
    6.16  compile_rules()
    6.17 @@ -22,17 +23,10 @@
    6.18  		--enable-unicode-properties \
    6.19  		$CONFIGURE_ARGS &&
    6.20  	make && make install
    6.21 -
    6.22 -	find $install/usr/share/man -type f -exec gzip -9 \{\} \;
    6.23 -	for i in $(find $install/usr/share/man -type l); do
    6.24 -		dest=$(readlink $i)
    6.25 -		rm $i; ln -s $dest.gz $i.gz
    6.26 -	done
    6.27  }
    6.28  
    6.29  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.30  genpkg_rules()
    6.31  {
    6.32 -	mkdir -p $fs/usr/lib
    6.33 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.34 +	cook_copy_files *.so*
    6.35  }