wok rev 21526

updated ncurses, ncurses-common, ncurses-dev, ncurses-extra, ncurses-man, ncursesw, ncursesw-dev, and ncursesw-extra (5.9 -> 6.1)
author Hans-G?nter Theisgen
date Sat May 04 11:23:56 2019 +0100 (2019-05-04)
parents 41d7f62d0d2c
children bd631cb15cd4
files ncurses-common/receipt ncurses-dev/receipt ncurses-extra/receipt ncurses-man/receipt ncurses/receipt ncursesw-dev/receipt ncursesw-extra/receipt ncursesw/receipt
line diff
     1.1 --- a/ncurses-common/receipt	Fri May 03 17:43:50 2019 +0100
     1.2 +++ b/ncurses-common/receipt	Sat May 04 11:23:56 2019 +0100
     1.3 @@ -1,47 +1,48 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="ncurses-common"
     1.7 -VERSION="5.9"
     1.8 +VERSION="6.1"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Common files for the ncurses and ncursesw library."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="MIT"
    1.13 -WANTED="ncurses"
    1.14 -WEB_SITE="https://invisible-island.net/ncurses/"
    1.15 -HOST_ARCH="i486 arm"
    1.16 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    1.17  
    1.18  DEPENDS="glibc-base"
    1.19 +WANTED="ncurses"
    1.20 +
    1.21 +HOST_ARCH="i486 arm"
    1.22  
    1.23  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.24  genpkg_rules()
    1.25  {
    1.26  	# Terminfo.
    1.27 -    mkdir -p $fs/usr/share/terminfo
    1.28 -    for dir in a l r v x
    1.29 -    do
    1.30 -        mkdir $fs/usr/share/terminfo/$dir
    1.31 -    done
    1.32 -    cp $install/usr/share/terminfo/a/ansi \
    1.33 -    $fs/usr/share/terminfo/a
    1.34 -    cp $install/usr/share/terminfo/l/linux \
    1.35 -    $fs/usr/share/terminfo/l
    1.36 -    cp $install/usr/share/terminfo/r/rxvt \
    1.37 -    $fs/usr/share/terminfo/r
    1.38 -    cp $install/usr/share/terminfo/x/xterm \
    1.39 -    $fs/usr/share/terminfo/x
    1.40 -    cp $install/usr/share/terminfo/x/xterm-256color \
    1.41 -    $fs/usr/share/terminfo/x
    1.42 -    cp $install/usr/share/terminfo/x/xterm-color \
    1.43 -    $fs/usr/share/terminfo/x
    1.44 -    cp $install/usr/share/terminfo/x/xterm-new \
    1.45 -    $fs/usr/share/terminfo/x
    1.46 -    cp $install/usr/share/terminfo/x/xterm-vt220 \
    1.47 -    $fs/usr/share/terminfo/x
    1.48 -    cp $install/usr/share/terminfo/v/vt100 \
    1.49 -    $fs/usr/share/terminfo/v
    1.50 -    cp $install/usr/share/terminfo/v/vt102* \
    1.51 -    $fs/usr/share/terminfo/v
    1.52 +	mkdir -p $fs/usr/share/terminfo
    1.53 +	for dir in a l r v x
    1.54 +	 do
    1.55 +		mkdir $fs/usr/share/terminfo/$dir
    1.56 +	 done
    1.57 +	cp $install/usr/share/terminfo/a/ansi \
    1.58 +		$fs/usr/share/terminfo/a
    1.59 +	cp $install/usr/share/terminfo/l/linux \
    1.60 +		$fs/usr/share/terminfo/l
    1.61 +	cp $install/usr/share/terminfo/r/rxvt \
    1.62 +		$fs/usr/share/terminfo/r
    1.63 +	cp $install/usr/share/terminfo/x/xterm \
    1.64 +		$fs/usr/share/terminfo/x
    1.65 +	cp $install/usr/share/terminfo/x/xterm-256color \
    1.66 +		$fs/usr/share/terminfo/x
    1.67 +	cp $install/usr/share/terminfo/x/xterm-color \
    1.68 +		$fs/usr/share/terminfo/x
    1.69 +	cp $install/usr/share/terminfo/x/xterm-new \
    1.70 +		$fs/usr/share/terminfo/x
    1.71 +	cp $install/usr/share/terminfo/x/xterm-vt220 \
    1.72 +		$fs/usr/share/terminfo/x
    1.73 +	cp $install/usr/share/terminfo/v/vt100 \
    1.74 +		$fs/usr/share/terminfo/v
    1.75 +	cp $install/usr/share/terminfo/v/vt102* \
    1.76 +		$fs/usr/share/terminfo/v
    1.77  
    1.78 -    # Tabset.
    1.79 -    cp -a $install/usr/share/tabset $fs/usr/share
    1.80 +	# Tabset.
    1.81 +	cp -a $install/usr/share/tabset $fs/usr/share
    1.82  }
     2.1 --- a/ncurses-dev/receipt	Fri May 03 17:43:50 2019 +0100
     2.2 +++ b/ncurses-dev/receipt	Sat May 04 11:23:56 2019 +0100
     2.3 @@ -1,24 +1,28 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="ncurses-dev"
     2.7 -VERSION="5.9"
     2.8 +VERSION="6.1"
     2.9  CATEGORY="development"
    2.10 -SHORT_DESC="Devel files for the ncurses library."
    2.11 +SHORT_DESC="Development files for the ncurses library."
    2.12  MAINTAINER="pankso@slitaz.org"
    2.13  LICENSE="MIT"
    2.14 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    2.15 +
    2.16 +DEPENDS="ncursesw-dev ncurses libtinfo" # pkg-config
    2.17  WANTED="ncurses"
    2.18 -WEB_SITE="https://invisible-island.net/ncurses/"
    2.19 +
    2.20  HOST_ARCH="i486 arm"
    2.21  
    2.22 -DEPENDS="ncursesw-dev ncurses libtinfo pkg-config"
    2.23 -
    2.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.25  genpkg_rules()
    2.26  {
    2.27 -	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
    2.28 -	cp -a $install/lib/*.a $fs/lib
    2.29 +	mkdir -p $fs/lib
    2.30 +	mkdir -p $fs/usr/bin
    2.31 +#	mkdir -p $fs/usr/lib
    2.32 +
    2.33 +	cp -a $install/lib/*.a			$fs/lib
    2.34  	# Use include file from ncursesw-dev
    2.35  	#cp -a $install/usr/include $fs/usr
    2.36 -	cp $install/usr/bin/ncurses5-config $fs/usr/bin
    2.37 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    2.38 +	cp $install/usr/bin/ncurses5-config	$fs/usr/bin
    2.39 +#	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    2.40  }
     3.1 --- a/ncurses-extra/receipt	Fri May 03 17:43:50 2019 +0100
     3.2 +++ b/ncurses-extra/receipt	Sat May 04 11:23:56 2019 +0100
     3.3 @@ -1,15 +1,15 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="ncurses-extra"
     3.7 -VERSION="5.9"
     3.8 +VERSION="6.1"
     3.9  CATEGORY="base-system"
    3.10  SHORT_DESC="Extra files for the ncurses library."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12  LICENSE="MIT"
    3.13 -WANTED="ncurses"
    3.14 -WEB_SITE="https://invisible-island.net/ncurses/"
    3.15 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    3.16  
    3.17  DEPENDS="ncurses"
    3.18 +WANTED="ncurses"
    3.19  
    3.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.21  genpkg_rules()
    3.22 @@ -18,8 +18,8 @@
    3.23  	# Binaries are provided by ncursesw-extra, we use UTF-8 by default.
    3.24  	#cp -a $install/usr/bin $fs/usr
    3.25  	#chmod 755 $fs/usr/bin/*
    3.26 -	cp -a $install/usr/share/terminfo $fs/usr/share
    3.27 -	# Remove already provided by other packages
    3.28 +	cp -a $install/usr/share/terminfo	$fs/usr/share
    3.29 +	# Remove files already provided by other packages
    3.30  	#rm -f $fs/usr/bin/ncurses5-config
    3.31  	[ -d $WOK/ncurses-common/taz ] || tazwok genpkg ncurses-common
    3.32  	for i in $(cd $fs ; find -type f); do
     4.1 --- a/ncurses-man/receipt	Fri May 03 17:43:50 2019 +0100
     4.2 +++ b/ncurses-man/receipt	Sat May 04 11:23:56 2019 +0100
     4.3 @@ -1,13 +1,14 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="ncurses-man"
     4.7 -VERSION="5.9"
     4.8 +VERSION="6.1"
     4.9  CATEGORY="development"
    4.10  SHORT_DESC="Manual pages for the ncurses library."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"
    4.12  LICENSE="MIT"
    4.13 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    4.14 +
    4.15  WANTED="ncurses"
    4.16 -WEB_SITE="https://invisible-island.net/ncurses/"
    4.17  
    4.18  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.19  genpkg_rules()
     5.1 --- a/ncurses/receipt	Fri May 03 17:43:50 2019 +0100
     5.2 +++ b/ncurses/receipt	Sat May 04 11:23:56 2019 +0100
     5.3 @@ -1,25 +1,27 @@
     5.4  # SliTaz package receipt.
     5.5  
     5.6  PACKAGE="ncurses"
     5.7 -VERSION="5.9"
     5.8 +VERSION="6.1"
     5.9  CATEGORY="base-system"
    5.10  SHORT_DESC="Library of functions to manage display on terminals."
    5.11  MAINTAINER="pankso@slitaz.org"
    5.12 +LICENSE="MIT"
    5.13 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    5.14 +
    5.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    5.16 -LICENSE="MIT"
    5.17 -WEB_SITE="https://invisible-island.net/ncurses/"
    5.18 -WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
    5.19 +WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
    5.20 +
    5.21 +DEPENDS="libtic libtinfo ncurses-common"
    5.22 +BUILD_DEPENDS=""
    5.23 +SPLIT="libform libmenu libpanel libtic libtinfo ncurses-common \
    5.24 +	ncurses-dev ncurses-extra ncurses-man"
    5.25 +
    5.26  HOST_ARCH="i486 arm"
    5.27  
    5.28 -DEPENDS="ncurses-common libtinfo libtic"
    5.29 -BUILD_DEPENDS=""
    5.30 -SPLIT="ncurses-common ncurses-extra ncurses-dev ncurses-man libform libmenu \
    5.31 -libpanel libtic libtinfo"
    5.32 -
    5.33  # Rules to configure and make the package.
    5.34  compile_rules()
    5.35  {
    5.36 -	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
    5.37 +	# Ncurses need an installed /usr/bin/tic which is in ncursesw-extra. And
    5.38  	# when cross compiling we can't use the freshly cooked binary. See cook log:
    5.39  	#
    5.40  	#** Building terminfo database, please wait...
    5.41 @@ -29,22 +31,26 @@
    5.42  		echo "Installing: ncursesw-extra"
    5.43  		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
    5.44  	fi
    5.45 -	cd $src
    5.46 +
    5.47  	mkdir -p $DESTDIR/usr/lib/terminfo
    5.48 -	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
    5.49 -		include/Makefile.in
    5.50 -	./configure \
    5.51 -		--libdir=/lib \
    5.52 -		--sysconfdir=/etc \
    5.53 -		--with-shared \
    5.54 -		--without-debug \
    5.55 -		--without-ada \
    5.56 -		--with-build-cc="gcc -D_GNU_SOURCE" \
    5.57 -		--with-termlib \
    5.58 -		--with-ticlib \
    5.59 -		--enable-pc-files \
    5.60 +
    5.61 +# search string not in file (6.1)
    5.62 +#	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
    5.63 +#		include/Makefile.in
    5.64 +
    5.65 +	./configure					\
    5.66 +		--libdir=/lib				\
    5.67 +		--sysconfdir=/etc			\
    5.68 +		--with-shared				\
    5.69 +		--without-debug				\
    5.70 +		--without-ada				\
    5.71 +		--with-build-cc="gcc -D_GNU_SOURCE"	\
    5.72 +		--with-termlib				\
    5.73 +		--with-ticlib				\
    5.74 +		--enable-pc-files			\
    5.75  		$CONFIGURE_ARGS &&
    5.76 -	make && make install
    5.77 +	make &&
    5.78 +	make install
    5.79  }
    5.80  
    5.81  # Rules to gen a SliTaz package suitable for Tazpkg.
     6.1 --- a/ncursesw-dev/receipt	Fri May 03 17:43:50 2019 +0100
     6.2 +++ b/ncursesw-dev/receipt	Sat May 04 11:23:56 2019 +0100
     6.3 @@ -1,25 +1,29 @@
     6.4  # SliTaz package receipt.
     6.5  
     6.6  PACKAGE="ncursesw-dev"
     6.7 -VERSION="5.9"
     6.8 +VERSION="6.1"
     6.9  CATEGORY="development"
    6.10 -SHORT_DESC="Devel files for the ncursesw library."
    6.11 +SHORT_DESC="Development files for the ncursesw library."
    6.12  MAINTAINER="pankso@slitaz.org"
    6.13  LICENSE="MIT"
    6.14 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    6.15 +
    6.16 +DEPENDS="ncursesw" # pkg-config
    6.17  WANTED="ncursesw"
    6.18 -WEB_SITE="https://invisible-island.net/ncurses/"
    6.19 +
    6.20  HOST_ARCH="i486 arm"
    6.21  
    6.22 -DEPENDS="ncursesw pkg-config"
    6.23 -
    6.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    6.25  genpkg_rules()
    6.26  {
    6.27 -	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
    6.28 -	cp -a $install/lib/*.a $fs/lib
    6.29 +	mkdir -p $fs/lib
    6.30 +	mkdir -p $fs/usr/bin
    6.31 +#	mkdir -p $fs/usr/lib
    6.32 +
    6.33 +	cp -a $install/lib/*.a			$fs/lib
    6.34  	# Include files are from the same source than ncuses-dev and work
    6.35  	# nicely for both.
    6.36 -	cp -a $install/usr/include $fs/usr
    6.37 -	cp $install/usr/bin/ncursesw5-config $fs/usr/bin
    6.38 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    6.39 +	cp -a $install/usr/include		$fs/usr
    6.40 +	cp $install/usr/bin/ncursesw6-config	$fs/usr/bin
    6.41 +#	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    6.42  }
     7.1 --- a/ncursesw-extra/receipt	Fri May 03 17:43:50 2019 +0100
     7.2 +++ b/ncursesw-extra/receipt	Sat May 04 11:23:56 2019 +0100
     7.3 @@ -1,14 +1,16 @@
     7.4  # SliTaz package receipt.
     7.5  
     7.6  PACKAGE="ncursesw-extra"
     7.7 -VERSION="5.9"
     7.8 +VERSION="6.1"
     7.9  CATEGORY="base-system"
    7.10  SHORT_DESC="Extra files for the ncursesw library."
    7.11  MAINTAINER="pascal.bellard@slitaz.org"
    7.12  LICENSE="MIT"
    7.13 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    7.14 +
    7.15 +DEPENDS="ncursesw ncurses-extra"
    7.16  WANTED="ncursesw"
    7.17 -DEPENDS="ncursesw ncurses-extra"
    7.18 -WEB_SITE="https://invisible-island.net/ncurses/"
    7.19 +
    7.20  HOST_ARCH="i486 arm"
    7.21  
    7.22  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.23 @@ -17,8 +19,9 @@
    7.24  	mkdir -p $fs/usr
    7.25  	cp -a $install/usr/bin $fs/usr
    7.26  	chmod 755 $fs/usr/bin/*
    7.27 +
    7.28  	# Remove tools already provided by other packages
    7.29 -	rm -f $fs/usr/bin/ncursesw5-config
    7.30 +	rm -f $fs/usr/bin/ncursesw6-config
    7.31  	rm -f $fs/usr/bin/clear
    7.32  	rm -f $fs/usr/bin/tset
    7.33  	rm -f $fs/usr/bin/reset
     8.1 --- a/ncursesw/receipt	Fri May 03 17:43:50 2019 +0100
     8.2 +++ b/ncursesw/receipt	Sat May 04 11:23:56 2019 +0100
     8.3 @@ -1,19 +1,21 @@
     8.4  # SliTaz package receipt.
     8.5  
     8.6  PACKAGE="ncursesw"
     8.7 -VERSION="5.9"
     8.8 -SOURCE="ncurses"
     8.9 +VERSION="6.1"
    8.10  CATEGORY="base-system"
    8.11  SHORT_DESC="Library of functions to manage display on terminals."
    8.12  MAINTAINER="pankso@slitaz.org"
    8.13  LICENSE="MIT"
    8.14 +WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
    8.15 +
    8.16 +SOURCE="ncurses"
    8.17  TARBALL="$SOURCE-$VERSION.tar.gz"
    8.18 -WEB_SITE="https://invisible-island.net/ncurses/"
    8.19 -WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
    8.20 -HOST_ARCH="i486 arm"
    8.21 +WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
    8.22  
    8.23  DEPENDS="ncurses-common"
    8.24 -BUILD_DEPENDS="gcc"
    8.25 +BUILD_DEPENDS=""
    8.26 +
    8.27 +HOST_ARCH="i486 arm"
    8.28  
    8.29  case "$ARCH" in
    8.30  	arm) BUILD_DEPENDS="" ;;
    8.31 @@ -22,7 +24,7 @@
    8.32  # Rules to configure and make the package.
    8.33  compile_rules()
    8.34  {
    8.35 -	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
    8.36 +	# Ncurses need an installed /usr/bin/tic which is in ncursesw-extra. And
    8.37  	# when cross compiling we can't use the freshly cooked binary. See cook log:
    8.38  	#
    8.39  	#** Building terminfo database, please wait...
    8.40 @@ -32,35 +34,40 @@
    8.41  		echo "Installing: ncursesw-extra"
    8.42  		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
    8.43  	fi
    8.44 -	cd $src
    8.45 +
    8.46  	mkdir -p $DESTDIR/usr/lib/terminfo
    8.47 -	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
    8.48 -		include/Makefile.in
    8.49 -	./configure \
    8.50 -		--libdir=/lib \
    8.51 -		--sysconfdir=/etc \
    8.52 -		--with-shared \
    8.53 -		--without-debug \
    8.54 -		--without-ada \
    8.55 -		--enable-widec \
    8.56 -		--with-build-cc="gcc -D_GNU_SOURCE" \
    8.57 -		--enable-pc-files \
    8.58 +
    8.59 +# search string not in file (6.1)
    8.60 +#	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
    8.61 +#		include/Makefile.in
    8.62 +
    8.63 +	./configure					\
    8.64 +		--libdir=/lib				\
    8.65 +		--sysconfdir=/etc			\
    8.66 +		--with-shared				\
    8.67 +		--without-debug				\
    8.68 +		--without-ada				\
    8.69 +		--enable-widec				\
    8.70 +		--with-build-cc="gcc -D_GNU_SOURCE"	\
    8.71 +		--enable-pc-files			\
    8.72  		$CONFIGURE_ARGS &&
    8.73 -	make && make install
    8.74 +	make &&
    8.75 +	make install
    8.76  }
    8.77  
    8.78  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.79  genpkg_rules()
    8.80  {
    8.81 -	mkdir -p $fs/lib $fs/usr/bin
    8.82 +	mkdir -p $fs/lib
    8.83 +	mkdir -p $fs/usr/bin
    8.84  
    8.85 -	# Libs.
    8.86 +	# Libraries
    8.87  	cp -a $install/lib/libncursesw.so* $fs/lib
    8.88  
    8.89 -	# Base progs.
    8.90 -	cp $install/usr/bin/clear $fs/usr/bin
    8.91 -	cp $install/usr/bin/tset $fs/usr/bin
    8.92 -	cp $install/usr/bin/reset $fs/usr/bin
    8.93 +	# Base programs
    8.94 +	cp $install/usr/bin/clear	$fs/usr/bin
    8.95 +	cp $install/usr/bin/tset	$fs/usr/bin
    8.96 +	cp $install/usr/bin/reset	$fs/usr/bin
    8.97  }
    8.98  
    8.99  # Overlap busybox