# HG changeset patch # User Aleksej Bobylev # Date 1482121613 -7200 # Node ID 708211fae5b67e83018bbad2802aee1c8f6a18a2 # Parent 74fceceeec2331a4033a96db119611ddef76f5c5 Up gettext, pcre, grep, gzip. diff -r 74fceceeec23 -r 708211fae5b6 gettext/receipt --- a/gettext/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/gettext/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -12,11 +12,11 @@ TARBALL="$PACKAGE-$VERSION.tar.xz" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" -# Why deps on glib-dev ??? And glib build depends on gettext anyway... -DEPENDS="gettext-base libgomp acl-dev gcc-lib-base glib-dev libxml2-dev m4 \ -ncurses gettext-tools libcroco" -#BUILD_DEPENDS="acl attr-dev glib-dev libxml2-dev ncurses-dev" +# Runtime depends, then dev-depends +DEPENDS="gettext-base gettext-tools libcroco \ +acl-dev attr-dev libcroco-dev libxml2-dev glib-dev pcre-dev m4" BUILD_DEPENDS="libcroco-dev libxml2-dev glib-dev acl-dev" +SPLIT="gettext-base gettext-tools" # Handle cross compilation. Glibc-locale are installed in cross chroot. case "$ARCH" in diff -r 74fceceeec23 -r 708211fae5b6 grep/receipt --- a/grep/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/grep/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -6,28 +6,25 @@ SHORT_DESC="GNU Global Regular Expression Print." MAINTAINER="paul@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/grep/" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/grep/" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" DEPENDS="pcre" -BUILD_DEPENDS="pcre-dev" +BUILD_DEPENDS="pcre-dev perl gettext" # Rules to configure and make the package. compile_rules() { ./configure $CONFIGURE_ARGS && make && make install - - find $install/usr/share/man -type f -exec gzip -9 \{\} \; } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share - cp -a $install/usr/bin $fs - cp -a $install/usr/share/man $fs/usr/share + cook_copy_folders bin } post_remove() diff -r 74fceceeec23 -r 708211fae5b6 gzip-full/receipt --- a/gzip-full/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/gzip-full/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -1,38 +1,32 @@ # SliTaz package receipt. PACKAGE="gzip-full" -VERSION="1.6" +VERSION="1.8" CATEGORY="system-tools" SHORT_DESC="GNU compression utilities" MAINTAINER="erjo@slitaz.org" LICENSE="GPL3" WEB_SITE="http://www.gnu.org/software/gzip/" + WANTED="gzip" - DEPENDS="gzip" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - - cp -a $install/usr/bin $fs/usr - rm -f $fs/usr/bin/gzip $fs/usr/bin/gunzip + cook_copy_folders bin + cook_split_rm gzip } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. pre_install() { - echo -n "Removing Busybox uncompress and zcat utilities... " + # Removing Busybox uncompress and zcat applets + # as we have /usr/bin/uncompress and /usr/bin/zcat in this package rm -f "$1/bin/uncompress" "$1/bin/zcat" - status } post_remove() { - echo -n "Restoring Busybox uncompress and zcat utilities... " ln -s busybox "$1/bin/uncompress" ln -s busybox "$1/bin/zcat" - status } diff -r 74fceceeec23 -r 708211fae5b6 gzip/receipt --- a/gzip/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/gzip/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -1,51 +1,41 @@ # SliTaz package receipt. PACKAGE="gzip" -VERSION="1.6" +VERSION="1.8" CATEGORY="system-tools" SHORT_DESC="GNU compression utilities (gzip and gunzip)" MAINTAINER="erjo@slitaz.org" LICENSE="GPL3" +WEB_SITE="https://www.gnu.org/software/gzip/" + TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://www.gnu.org/software/gzip/" -WGET_URL="http://ftp.gnu.org/gnu/gzip/$TARBALL" +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" DEPENDS="glibc-base" BUILD_DEPENDS="glibc-dev" +SPLIT="gzip-full" # Rules to configure and make the package. compile_rules() { - ./configure \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && - make && make DESTDIR=$DESTDIR install + ./configure $CONFIGURE_ARGS && make && make install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin - cp -a $install/usr/bin/zgrep $fs/usr/bin - cp -a $install/usr/bin/gzip $fs/usr/bin - cp -a $install/usr/bin/gunzip $fs/usr/bin + cook_copy_files gzip gunzip zgrep } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. pre_install() { - echo -n "Removing Busybox gzip and gunzip utilities... " + # Removing Busybox gzip and gunzip applets + # as we have /usr/bin/gzip and /usr/bin/gunzip in this package rm -f "$1/bin/gzip" "$1/bin/gunzip" - status } post_remove() { - echo -n "Restoring Busybox gzip and gunzip utilities... " ln -s busybox "$1/bin/gzip" ln -s busybox "$1/bin/gunzip" - status } diff -r 74fceceeec23 -r 708211fae5b6 pcre-dev/receipt --- a/pcre-dev/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/pcre-dev/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -10,12 +10,11 @@ HOST_ARCH="i486 arm" WANTED="pcre" -DEPENDS="pcre pkg-config" +DEPENDS="pcre glib pkg-config" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cp -a $install/* $fs - rm $fs/usr/lib/*.so* - rm -r $fs/usr/share + cook_copy_folders bin include lib + cook_split_rm pcre } diff -r 74fceceeec23 -r 708211fae5b6 pcre/receipt --- a/pcre/receipt Mon Dec 19 05:43:33 2016 +0200 +++ b/pcre/receipt Mon Dec 19 06:26:53 2016 +0200 @@ -6,10 +6,11 @@ SHORT_DESC="Perl 5 Compatible Regular Expression, library" MAINTAINER="pankso@slitaz.org" LICENSE="BSD" +WEB_SITE="http://www.pcre.org/" +HOST_ARCH="i486 arm" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.pcre.org/" WGET_URL="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$TARBALL" -HOST_ARCH="i486 arm" # Rules to configure and make the package. compile_rules() @@ -22,17 +23,10 @@ --enable-unicode-properties \ $CONFIGURE_ARGS && make && make install - - find $install/usr/share/man -type f -exec gzip -9 \{\} \; - for i in $(find $install/usr/share/man -type l); do - dest=$(readlink $i) - rm $i; ln -s $dest.gz $i.gz - done } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib + cook_copy_files *.so* }