wok-next rev 19605

Up/recook: cpio, libssh2, gpm, mc.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sat Jan 28 16:18:25 2017 +0200 (2017-01-28)
parents 15d7a244dec5
children 1b6882f2d8a2
files cpio/receipt gpm-dev/receipt gpm-extra/receipt gpm/receipt libssh2-dev/receipt libssh2/receipt mc/receipt mc/stuff/mc-root.desktop mc/stuff/mc.sh
line diff
     1.1 --- a/cpio/receipt	Sat Jan 28 13:29:32 2017 +0200
     1.2 +++ b/cpio/receipt	Sat Jan 28 16:18:25 2017 +0200
     1.3 @@ -1,47 +1,42 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cpio"
     1.7 -VERSION="2.11"
     1.8 +VERSION="2.12"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="GNU cpio archiver."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL3"
    1.13 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14 -WEB_SITE="http://www.gnu.org/software/cpio/"
    1.15 +WEB_SITE="https://www.gnu.org/software/cpio/"
    1.16 +
    1.17 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.18  WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    1.19  
    1.20  DEPENDS="glibc-base"
    1.21 -BUILD_DEPENDS="slitaz-toolchain"
    1.22 +BUILD_DEPENDS="tar gettext texinfo"
    1.23  
    1.24  # Rules to configure and make the package.
    1.25  compile_rules()
    1.26  {
    1.27 -	cd $src
    1.28 -	./configure --prefix=/usr \
    1.29 +	./configure \
    1.30  		--bindir=/bin \
    1.31 -		--libexecdir=/usr/bin \
    1.32 -		--mandir=/usr/share/man \
    1.33 -		--infodir=/usr/share/info \
    1.34 +		--enable-mt \
    1.35 +		--with-rmt=$install/usr/libexec/rmt \
    1.36  		$CONFIGURE_ARGS  &&
    1.37  	make &&
    1.38 -	make DESTDIR=$DESTDIR install
    1.39 +	makeinfo --html            -o doc/html      doc/cpio.texi &&
    1.40 +	makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &&
    1.41 +	makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi &&
    1.42 +	make install
    1.43 +
    1.44 +	docdir=$install/usr/share/doc/$PACKAGE-$VERSION
    1.45 +	install -v -m755 -d $docdir/html
    1.46 +	install -v -m644    doc/html/*    $docdir/html
    1.47 +	install -v -m644    doc/cpio.html $docdir
    1.48 +	install -v -m644    doc/cpio.txt  $docdir
    1.49  }
    1.50  
    1.51  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.52  genpkg_rules()
    1.53  {
    1.54 -	mkdir -p $fs/usr/share/locale
    1.55 -	cp -a $install/bin $fs
    1.56 -	cp -a $install/usr/bin $fs/usr
    1.57 +	cook_copy_folders bin
    1.58  }
    1.59 -
    1.60 -# Remove Busybox symlink before installing
    1.61 -pre_install()
    1.62 -{
    1.63 -	rm -f "$1/bin/cpio"
    1.64 -}
    1.65 -
    1.66 -post_remove()
    1.67 -{
    1.68 -	ln -s /bin/busybox "$1/bin/cpio"
    1.69 -}
     2.1 --- a/gpm-dev/receipt	Sat Jan 28 13:29:32 2017 +0200
     2.2 +++ b/gpm-dev/receipt	Sat Jan 28 16:18:25 2017 +0200
     2.3 @@ -7,9 +7,9 @@
     2.4  MAINTAINER="pascal.bellard@slitaz.org"
     2.5  LICENSE="GPL2"
     2.6  WEB_SITE="http://www.nico.schottelius.org/software/gpm/"
     2.7 -WANTED="gpm"
     2.8  HOST_ARCH="i486 arm"
     2.9  
    2.10 +WANTED="gpm"
    2.11  DEPENDS="gpm"
    2.12  
    2.13  # Rules to gen a SliTaz package suitable for Tazpkg.
     3.1 --- a/gpm-extra/receipt	Sat Jan 28 13:29:32 2017 +0200
     3.2 +++ b/gpm-extra/receipt	Sat Jan 28 16:18:25 2017 +0200
     3.3 @@ -7,9 +7,9 @@
     3.4  MAINTAINER="pascal.bellard@slitaz.org"
     3.5  LICENSE="GPL2"
     3.6  WEB_SITE="http://www.nico.schottelius.org/software/gpm/"
     3.7 -WANTED="gpm"
     3.8  HOST_ARCH="i486 arm"
     3.9  
    3.10 +WANTED="gpm"
    3.11  DEPENDS="gpm"
    3.12  
    3.13  # Just to be sure when cross-compiling.
     4.1 --- a/gpm/receipt	Sat Jan 28 13:29:32 2017 +0200
     4.2 +++ b/gpm/receipt	Sat Jan 28 16:18:25 2017 +0200
     4.3 @@ -6,13 +6,15 @@
     4.4  SHORT_DESC="Mouse server for console."
     4.5  MAINTAINER="pascal.bellard@slitaz.org"
     4.6  LICENSE="GPL2"
     4.7 +WEB_SITE="http://www.nico.schottelius.org/software/gpm/"
     4.8 +HOST_ARCH="i486 arm"
     4.9 +
    4.10  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.11 -WEB_SITE="http://www.nico.schottelius.org/software/gpm/"
    4.12 -WGET_URL="http://www.nico.schottelius.org/software/gpm/archives/$TARBALL"
    4.13 -HOST_ARCH="i486 arm"
    4.14 +WGET_URL="${WEB_SITE}archives/$TARBALL"
    4.15  
    4.16  DEPENDS="ncurses"
    4.17  BUILD_DEPENDS="gawk bison ncurses-dev automake autoconf libtool texinfo"
    4.18 +SPLIT="gpm-extra"
    4.19  
    4.20  # When cross compiling gawk and bison build system are used.
    4.21  case "$ARCH" in
    4.22 @@ -22,7 +24,6 @@
    4.23  # Rules to configure and make the package.
    4.24  compile_rules()
    4.25  {
    4.26 -	cd $src
    4.27  	./autogen.sh
    4.28  	ln -s headers/gpm.h src		# ???
    4.29  	./configure \
     5.1 --- a/libssh2-dev/receipt	Sat Jan 28 13:29:32 2017 +0200
     5.2 +++ b/libssh2-dev/receipt	Sat Jan 28 16:18:25 2017 +0200
     5.3 @@ -1,21 +1,18 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="libssh2-dev"
     5.7 -VERSION="1.7.0"
     5.8 +VERSION="1.8.0"
     5.9  CATEGORY="development"
    5.10  SHORT_DESC="A client-side C library implementing the SSH2 protocol, development files"
    5.11  MAINTAINER="pascal.bellard@slitaz.org"
    5.12  LICENSE="BSD"
    5.13  WEB_SITE="http://www.libssh2.org/"
    5.14 +
    5.15  WANTED="libssh2"
    5.16 -
    5.17 -DEPENDS="libssh2 pkg-config"
    5.18 +DEPENDS="libssh2 openssl-dev libcrypto-dev zlib-dev"
    5.19  
    5.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    5.21  genpkg_rules()
    5.22  {
    5.23 -	mkdir -p $fs/usr/lib
    5.24 -	cp -a $install/usr/include $fs/usr
    5.25 -	cp -a $install/usr/lib/*a $fs/usr/lib
    5.26 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    5.27 +	cook_copy_files *.h *.a *.la *.pc
    5.28  }
     6.1 --- a/libssh2/receipt	Sat Jan 28 13:29:32 2017 +0200
     6.2 +++ b/libssh2/receipt	Sat Jan 28 16:18:25 2017 +0200
     6.3 @@ -1,31 +1,27 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="libssh2"
     6.7 -VERSION="1.7.0"
     6.8 +VERSION="1.8.0"
     6.9  CATEGORY="network"
    6.10  SHORT_DESC="A client-side C library implementing the SSH2 protocol"
    6.11  MAINTAINER="pascal.bellard@slitaz.org"
    6.12  LICENSE="BSD"
    6.13 +WEB_SITE="https://www.libssh2.org/"
    6.14 +
    6.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    6.16 -WEB_SITE="http://www.libssh2.org/"
    6.17 -WGET_URL="$WEB_SITE/download/$TARBALL"
    6.18 +WGET_URL="${WEB_SITE}download/$TARBALL"
    6.19  
    6.20 -DEPENDS="libgcrypt zlib libgpg-error"
    6.21 -BUILD_DEPENDS="libgcrypt-dev zlib-dev"
    6.22 +DEPENDS="libssl libcrypto zlib"
    6.23 +BUILD_DEPENDS="openssl-dev zlib-dev"
    6.24  
    6.25  # Rules to configure and make the package.
    6.26  compile_rules()
    6.27  {
    6.28 -	./configure --prefix=/usr \
    6.29 -		--mandir=/usr/share/man \
    6.30 -		$CONFIGURE_ARGS &&
    6.31 -	make &&
    6.32 -	make DESTDIR=$DESTDIR install
    6.33 +	./configure $CONFIGURE_ARGS && make && make install
    6.34  }
    6.35  
    6.36  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.37  genpkg_rules()
    6.38  {
    6.39 -	mkdir -p $fs/usr/lib
    6.40 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    6.41 +	cook_copy_files *.so*
    6.42  }
     7.1 --- a/mc/receipt	Sat Jan 28 13:29:32 2017 +0200
     7.2 +++ b/mc/receipt	Sat Jan 28 16:18:25 2017 +0200
     7.3 @@ -1,22 +1,24 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="mc"
     7.7 -VERSION="4.8.15"
     7.8 +VERSION="4.8.18"
     7.9  CATEGORY="system-tools"
    7.10  SHORT_DESC="Midnight Commander - ncurses based file manager."
    7.11  MAINTAINER="erjo@slitaz.org"
    7.12  LICENSE="GPL3"
    7.13 -TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.14 -WEB_SITE="http://www.midnight-commander.org/"
    7.15 -WGET_URL="http://www.midnight-commander.org/downloads/$TARBALL"
    7.16 +WEB_SITE="http://midnight-commander.org/"
    7.17  TAGS="file-manager text-editor"
    7.18  HOST_ARCH="i486 arm"
    7.19  
    7.20 -SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file "
    7.21 -DEPENDS="ncursesw glib e2fsprogs util-linux-blkid"
    7.22 -BUILD_DEPENDS="gpm-dev glib-dev ncursesw-dev util-linux-mount-dev \
    7.23 - util-linux-blkid-dev util-linux-uuid-dev ncurses-extra"
    7.24 -GENERIC_MENUS="no"
    7.25 +TARBALL="$PACKAGE-$VERSION.tar.xz"
    7.26 +WGET_URL="http://ftp.midnight-commander.org/$TARBALL"
    7.27 +
    7.28 +SUGGESTED="gpm xz cdrkit-isoinfo lynx w3m wv poppler-apps file"
    7.29 +DEPENDS="ncurses glib e2fsprogs util-linux-blkid libssh2 libssl libcrypto zlib pcre"
    7.30 +BUILD_DEPENDS="gpm-dev glib-dev ncurses-dev util-linux-mount-dev \
    7.31 +util-linux-blkid-dev util-linux-uuid-dev check-dev gettext libssh2-dev"
    7.32 +
    7.33 +COOKOPTS="!menus"
    7.34  
    7.35  # Rules to configure and make the package.
    7.36  compile_rules()
    7.37 @@ -24,58 +26,29 @@
    7.38  	sed -i 's/lzma -cd/lzcat/' $src/src/editor/edit.c
    7.39  
    7.40  	./configure \
    7.41 -		--prefix=/usr \
    7.42 +		--enable-charset \
    7.43  		--with-gpm-mouse \
    7.44  		--with-screen=ncurses \
    7.45 -		--libexecdir=/usr/lib \
    7.46  		--sysconfdir=/etc \
    7.47  		$CONFIGURE_ARGS &&
    7.48  	make && make install
    7.49  
    7.50  	mkdir -p $install/usr/share/terminfo/s
    7.51  	cp -a /usr/share/terminfo/s/screen-256color $install/usr/share/terminfo/s
    7.52 +
    7.53 +	mkdir -p $install/usr/share/applications
    7.54 +	cp $stuff/*.desktop $install/usr/share/applications
    7.55 +
    7.56 +	install -m755 $stuff/mc.sh $install/usr/bin
    7.57 +
    7.58 +	chown -R root:root $install
    7.59  }
    7.60  
    7.61  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.62  genpkg_rules()
    7.63  {
    7.64 -	mkdir -p $fs/usr/share/applications
    7.65 -	cp -a $install/etc $fs/
    7.66 -	cp -a $install/usr/bin $fs/usr
    7.67 -	cp -a $install/usr/lib $fs/usr
    7.68 -	cp -a $install/usr/share/mc $fs/usr/share
    7.69 -	cp -a $install/usr/share/terminfo $fs/usr/share
    7.70 +	cook_copy_folders etc bin mc terminfo applications
    7.71  
    7.72 -	sed 's#&) ||#) ||#' -i $fs/usr/lib/mc/ext.d/*.sh
    7.73 -	sed 's#|profile|#&receipt|#' -i $fs/usr/share/mc/syntax/Syntax
    7.74 -	sed 's/lzma -dc/lzcat/g' -i	$fs/usr/lib/mc/ext.d/archive.sh
    7.75 -	cp -a $stuff/*.desktop $fs/usr/share/applications
    7.76 -
    7.77 -	cat > $fs/usr/bin/mc.sh <<EOF
    7.78 -case \$TERM in
    7.79 -	linux*)
    7.80 -		{
    7.81 -		cat <<EOT
    7.82 -shift   keycode  59 = F11
    7.83 -shift   keycode  60 = F12
    7.84 -shift   keycode  61 = F13
    7.85 -shift   keycode  62 = F14
    7.86 -shift   keycode  63 = F15
    7.87 -shift   keycode  64 = F16
    7.88 -shift   keycode  65 = F17
    7.89 -shift   keycode  66 = F18
    7.90 -shift   keycode  67 = F19
    7.91 -shift   keycode  68 = F20
    7.92 -EOT
    7.93 -		} | loadkeys -uv ; sleep 1 ;;
    7.94 -	xterm*)
    7.95 -		export TERM='xterm-color'
    7.96 -		[ -f '/usr/share/terminfo/s/screen-256color' ] && \\
    7.97 -			export TERM='screen-256color'	;;
    7.98 -esac
    7.99 -mc \$@
   7.100 -
   7.101 -EOF
   7.102 -	chmod 755 $fs/usr/bin/mc.sh
   7.103 -	chown -R root:root $fs
   7.104 +	sed -i 's#|profile|#&receipt|#' $fs/usr/share/mc/syntax/Syntax
   7.105 +	sed -i 's/lzma -dc/lzcat/g'     $fs/usr/libexec/mc/ext.d/archive.sh
   7.106  }
     8.1 --- a/mc/stuff/mc-root.desktop	Sat Jan 28 13:29:32 2017 +0200
     8.2 +++ b/mc/stuff/mc-root.desktop	Sat Jan 28 16:18:25 2017 +0200
     8.3 @@ -3,4 +3,4 @@
     8.4  Name=Midnight Commander (root)
     8.5  Exec=subox terminal -e mc.sh -S modarin256root -a
     8.6  Icon=utilities-terminal
     8.7 -Categories=FileTools;Development;
     8.8 +Categories=ConsoleOnly;Utility;FileTools;Development;
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/mc/stuff/mc.sh	Sat Jan 28 16:18:25 2017 +0200
     9.3 @@ -0,0 +1,27 @@
     9.4 +#!/bin/sh
     9.5 +
     9.6 +case $TERM in
     9.7 +	linux*)
     9.8 +		{
     9.9 +		cat <<EOT
    9.10 +shift   keycode  59 = F11
    9.11 +shift   keycode  60 = F12
    9.12 +shift   keycode  61 = F13
    9.13 +shift   keycode  62 = F14
    9.14 +shift   keycode  63 = F15
    9.15 +shift   keycode  64 = F16
    9.16 +shift   keycode  65 = F17
    9.17 +shift   keycode  66 = F18
    9.18 +shift   keycode  67 = F19
    9.19 +shift   keycode  68 = F20
    9.20 +EOT
    9.21 +		} | loadkeys -uv
    9.22 +		sleep 1
    9.23 +		;;
    9.24 +	xterm*)
    9.25 +		export TERM='xterm-color'
    9.26 +		[ -f '/usr/share/terminfo/s/screen-256color' ] &&
    9.27 +			export TERM='screen-256color'
    9.28 +		;;
    9.29 +esac
    9.30 +mc $@