# HG changeset patch # User Aleksej Bobylev # Date 1485613105 -7200 # Node ID 1b1490b81f6b736646251170cf7547f098631533 # Parent 15d7a244dec52ea4bcea38d772b74cdb37b408d5 Up/recook: cpio, libssh2, gpm, mc. diff -r 15d7a244dec5 -r 1b1490b81f6b cpio/receipt --- a/cpio/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/cpio/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -1,47 +1,42 @@ # SliTaz package receipt. PACKAGE="cpio" -VERSION="2.11" +VERSION="2.12" CATEGORY="base-system" SHORT_DESC="GNU cpio archiver." MAINTAINER="pankso@slitaz.org" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.gnu.org/software/cpio/" +WEB_SITE="https://www.gnu.org/software/cpio/" + +TARBALL="$PACKAGE-$VERSION.tar.bz2" WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL" DEPENDS="glibc-base" -BUILD_DEPENDS="slitaz-toolchain" +BUILD_DEPENDS="tar gettext texinfo" # Rules to configure and make the package. compile_rules() { - cd $src - ./configure --prefix=/usr \ + ./configure \ --bindir=/bin \ - --libexecdir=/usr/bin \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ + --enable-mt \ + --with-rmt=$install/usr/libexec/rmt \ $CONFIGURE_ARGS && make && - make DESTDIR=$DESTDIR install + makeinfo --html -o doc/html doc/cpio.texi && + makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi && + makeinfo --plaintext -o doc/cpio.txt doc/cpio.texi && + make install + + docdir=$install/usr/share/doc/$PACKAGE-$VERSION + install -v -m755 -d $docdir/html + install -v -m644 doc/html/* $docdir/html + install -v -m644 doc/cpio.html $docdir + install -v -m644 doc/cpio.txt $docdir } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/locale - cp -a $install/bin $fs - cp -a $install/usr/bin $fs/usr + cook_copy_folders bin } - -# Remove Busybox symlink before installing -pre_install() -{ - rm -f "$1/bin/cpio" -} - -post_remove() -{ - ln -s /bin/busybox "$1/bin/cpio" -} diff -r 15d7a244dec5 -r 1b1490b81f6b gpm-dev/receipt --- a/gpm-dev/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/gpm-dev/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -7,9 +7,9 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.nico.schottelius.org/software/gpm/" -WANTED="gpm" HOST_ARCH="i486 arm" +WANTED="gpm" DEPENDS="gpm" # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 15d7a244dec5 -r 1b1490b81f6b gpm-extra/receipt --- a/gpm-extra/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/gpm-extra/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -7,9 +7,9 @@ MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" WEB_SITE="http://www.nico.schottelius.org/software/gpm/" -WANTED="gpm" HOST_ARCH="i486 arm" +WANTED="gpm" DEPENDS="gpm" # Just to be sure when cross-compiling. diff -r 15d7a244dec5 -r 1b1490b81f6b gpm/receipt --- a/gpm/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/gpm/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -6,13 +6,15 @@ SHORT_DESC="Mouse server for console." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="GPL2" +WEB_SITE="http://www.nico.schottelius.org/software/gpm/" +HOST_ARCH="i486 arm" + TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.nico.schottelius.org/software/gpm/" -WGET_URL="http://www.nico.schottelius.org/software/gpm/archives/$TARBALL" -HOST_ARCH="i486 arm" +WGET_URL="${WEB_SITE}archives/$TARBALL" DEPENDS="ncurses" BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo" +SPLIT="gpm-extra" # When cross compiling gawk and bison build system are used. case "$ARCH" in @@ -22,7 +24,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./autogen.sh ln -s headers/gpm.h src # ??? ./configure \ diff -r 15d7a244dec5 -r 1b1490b81f6b libssh2-dev/receipt --- a/libssh2-dev/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/libssh2-dev/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -1,21 +1,18 @@ # SliTaz package receipt. PACKAGE="libssh2-dev" -VERSION="1.7.0" +VERSION="1.8.0" CATEGORY="development" SHORT_DESC="A client-side C library implementing the SSH2 protocol, development files" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" WEB_SITE="http://www.libssh2.org/" + WANTED="libssh2" - -DEPENDS="libssh2 pkg-config" +DEPENDS="libssh2 openssl-dev libcrypto-dev zlib-dev" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/lib - cp -a $install/usr/include $fs/usr - cp -a $install/usr/lib/*a $fs/usr/lib - cp -a $install/usr/lib/pkgconfig $fs/usr/lib + cook_copy_files *.h *.a *.la *.pc } diff -r 15d7a244dec5 -r 1b1490b81f6b libssh2/receipt --- a/libssh2/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/libssh2/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -1,31 +1,27 @@ # SliTaz package receipt. PACKAGE="libssh2" -VERSION="1.7.0" +VERSION="1.8.0" CATEGORY="network" SHORT_DESC="A client-side C library implementing the SSH2 protocol" MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" +WEB_SITE="https://www.libssh2.org/" + TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://www.libssh2.org/" -WGET_URL="$WEB_SITE/download/$TARBALL" +WGET_URL="${WEB_SITE}download/$TARBALL" -DEPENDS="libgcrypt zlib libgpg-error" -BUILD_DEPENDS="libgcrypt-dev zlib-dev" +DEPENDS="libssl libcrypto zlib" +BUILD_DEPENDS="openssl-dev zlib-dev" # Rules to configure and make the package. compile_rules() { - ./configure --prefix=/usr \ - --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/lib - cp -a $install/usr/lib/*.so* $fs/usr/lib + cook_copy_files *.so* } diff -r 15d7a244dec5 -r 1b1490b81f6b mc/receipt --- a/mc/receipt Sat Jan 28 13:29:32 2017 +0200 +++ b/mc/receipt Sat Jan 28 16:18:25 2017 +0200 @@ -1,22 +1,24 @@ # SliTaz package receipt. PACKAGE="mc" -VERSION="4.8.15" +VERSION="4.8.18" CATEGORY="system-tools" SHORT_DESC="Midnight Commander - ncurses based file manager." MAINTAINER="erjo@slitaz.org" LICENSE="GPL3" -TARBALL="$PACKAGE-$VERSION.tar.xz" -WEB_SITE="http://www.midnight-commander.org/" -WGET_URL="http://www.midnight-commander.org/downloads/$TARBALL" +WEB_SITE="http://midnight-commander.org/" TAGS="file-manager text-editor" HOST_ARCH="i486 arm" -SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file " -DEPENDS="ncursesw glib e2fsprogs util-linux-blkid" -BUILD_DEPENDS="gpm-dev glib-dev ncursesw-dev util-linux-mount-dev \ - util-linux-blkid-dev util-linux-uuid-dev ncurses-extra" -GENERIC_MENUS="no" +TARBALL="$PACKAGE-$VERSION.tar.xz" +WGET_URL="http://ftp.midnight-commander.org/$TARBALL" + +SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file" +DEPENDS="ncurses glib e2fsprogs util-linux-blkid libssh2 libssl libcrypto zlib pcre" +BUILD_DEPENDS="gpm-dev glib-dev ncurses-dev util-linux-mount-dev \ +util-linux-blkid-dev util-linux-uuid-dev check-dev gettext libssh2-dev" + +COOKOPTS="!menus" # Rules to configure and make the package. compile_rules() @@ -24,58 +26,29 @@ sed -i 's/lzma -cd/lzcat/' $src/src/editor/edit.c ./configure \ - --prefix=/usr \ + --enable-charset \ --with-gpm-mouse \ --with-screen=ncurses \ - --libexecdir=/usr/lib \ --sysconfdir=/etc \ $CONFIGURE_ARGS && make && make install mkdir -p $install/usr/share/terminfo/s cp -a /usr/share/terminfo/s/screen-256color $install/usr/share/terminfo/s + + mkdir -p $install/usr/share/applications + cp $stuff/*.desktop $install/usr/share/applications + + install -m755 $stuff/mc.sh $install/usr/bin + + chown -R root:root $install } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/share/applications - cp -a $install/etc $fs/ - cp -a $install/usr/bin $fs/usr - cp -a $install/usr/lib $fs/usr - cp -a $install/usr/share/mc $fs/usr/share - cp -a $install/usr/share/terminfo $fs/usr/share + cook_copy_folders etc bin mc terminfo applications - sed 's#&) ||#) ||#' -i $fs/usr/lib/mc/ext.d/*.sh - sed 's#|profile|#&receipt|#' -i $fs/usr/share/mc/syntax/Syntax - sed 's/lzma -dc/lzcat/g' -i $fs/usr/lib/mc/ext.d/archive.sh - cp -a $stuff/*.desktop $fs/usr/share/applications - - cat > $fs/usr/bin/mc.sh <