# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1556965436 -3600
# Node ID 94ece03c2cb1bb6eedf0ba1b3821752723f904b7
# Parent  41d7f62d0d2c361a4c866925e4df55edc80a73dc
updated ncurses, ncurses-common, ncurses-dev, ncurses-extra, ncurses-man, ncursesw, ncursesw-dev, and ncursesw-extra (5.9 -> 6.1)

diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncurses-common/receipt
--- a/ncurses-common/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncurses-common/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,47 +1,48 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-common"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Common files for the ncurses and ncursesw library."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
-WANTED="ncurses"
-WEB_SITE="https://invisible-island.net/ncurses/"
-HOST_ARCH="i486 arm"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
 
 DEPENDS="glibc-base"
+WANTED="ncurses"
+
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	# Terminfo.
-    mkdir -p $fs/usr/share/terminfo
-    for dir in a l r v x
-    do
-        mkdir $fs/usr/share/terminfo/$dir
-    done
-    cp $install/usr/share/terminfo/a/ansi \
-    $fs/usr/share/terminfo/a
-    cp $install/usr/share/terminfo/l/linux \
-    $fs/usr/share/terminfo/l
-    cp $install/usr/share/terminfo/r/rxvt \
-    $fs/usr/share/terminfo/r
-    cp $install/usr/share/terminfo/x/xterm \
-    $fs/usr/share/terminfo/x
-    cp $install/usr/share/terminfo/x/xterm-256color \
-    $fs/usr/share/terminfo/x
-    cp $install/usr/share/terminfo/x/xterm-color \
-    $fs/usr/share/terminfo/x
-    cp $install/usr/share/terminfo/x/xterm-new \
-    $fs/usr/share/terminfo/x
-    cp $install/usr/share/terminfo/x/xterm-vt220 \
-    $fs/usr/share/terminfo/x
-    cp $install/usr/share/terminfo/v/vt100 \
-    $fs/usr/share/terminfo/v
-    cp $install/usr/share/terminfo/v/vt102* \
-    $fs/usr/share/terminfo/v
+	mkdir -p $fs/usr/share/terminfo
+	for dir in a l r v x
+	 do
+		mkdir $fs/usr/share/terminfo/$dir
+	 done
+	cp $install/usr/share/terminfo/a/ansi \
+		$fs/usr/share/terminfo/a
+	cp $install/usr/share/terminfo/l/linux \
+		$fs/usr/share/terminfo/l
+	cp $install/usr/share/terminfo/r/rxvt \
+		$fs/usr/share/terminfo/r
+	cp $install/usr/share/terminfo/x/xterm \
+		$fs/usr/share/terminfo/x
+	cp $install/usr/share/terminfo/x/xterm-256color \
+		$fs/usr/share/terminfo/x
+	cp $install/usr/share/terminfo/x/xterm-color \
+		$fs/usr/share/terminfo/x
+	cp $install/usr/share/terminfo/x/xterm-new \
+		$fs/usr/share/terminfo/x
+	cp $install/usr/share/terminfo/x/xterm-vt220 \
+		$fs/usr/share/terminfo/x
+	cp $install/usr/share/terminfo/v/vt100 \
+		$fs/usr/share/terminfo/v
+	cp $install/usr/share/terminfo/v/vt102* \
+		$fs/usr/share/terminfo/v
 
-    # Tabset.
-    cp -a $install/usr/share/tabset $fs/usr/share
+	# Tabset.
+	cp -a $install/usr/share/tabset $fs/usr/share
 }
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncurses-dev/receipt
--- a/ncurses-dev/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncurses-dev/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,24 +1,28 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-dev"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="development"
-SHORT_DESC="Devel files for the ncurses library."
+SHORT_DESC="Development files for the ncurses library."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
+DEPENDS="ncursesw-dev ncurses libtinfo" # pkg-config
 WANTED="ncurses"
-WEB_SITE="https://invisible-island.net/ncurses/"
+
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncursesw-dev ncurses libtinfo pkg-config"
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
-	cp -a $install/lib/*.a $fs/lib
+	mkdir -p $fs/lib
+	mkdir -p $fs/usr/bin
+#	mkdir -p $fs/usr/lib
+
+	cp -a $install/lib/*.a			$fs/lib
 	# Use include file from ncursesw-dev
 	#cp -a $install/usr/include $fs/usr
-	cp $install/usr/bin/ncurses5-config $fs/usr/bin
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp $install/usr/bin/ncurses5-config	$fs/usr/bin
+#	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
 }
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncurses-extra/receipt
--- a/ncurses-extra/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncurses-extra/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,15 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-extra"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Extra files for the ncurses library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
-WANTED="ncurses"
-WEB_SITE="https://invisible-island.net/ncurses/"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
 
 DEPENDS="ncurses"
+WANTED="ncurses"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -18,8 +18,8 @@
 	# Binaries are provided by ncursesw-extra, we use UTF-8 by default.
 	#cp -a $install/usr/bin $fs/usr
 	#chmod 755 $fs/usr/bin/*
-	cp -a $install/usr/share/terminfo $fs/usr/share
-	# Remove already provided by other packages
+	cp -a $install/usr/share/terminfo	$fs/usr/share
+	# Remove files already provided by other packages
 	#rm -f $fs/usr/bin/ncurses5-config
 	[ -d $WOK/ncurses-common/taz ] || tazwok genpkg ncurses-common
 	for i in $(cd $fs ; find -type f); do
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncurses-man/receipt
--- a/ncurses-man/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncurses-man/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses-man"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="development"
 SHORT_DESC="Manual pages for the ncurses library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
 WANTED="ncurses"
-WEB_SITE="https://invisible-island.net/ncurses/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncurses/receipt
--- a/ncurses/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncurses/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,25 +1,27 @@
 # SliTaz package receipt.
 
 PACKAGE="ncurses"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Library of functions to manage display on terminals."
 MAINTAINER="pankso@slitaz.org"
+LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-LICENSE="MIT"
-WEB_SITE="https://invisible-island.net/ncurses/"
-WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
+WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+
+DEPENDS="libtic libtinfo ncurses-common"
+BUILD_DEPENDS=""
+SPLIT="libform libmenu libpanel libtic libtinfo ncurses-common \
+	ncurses-dev ncurses-extra ncurses-man"
+
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncurses-common libtinfo libtic"
-BUILD_DEPENDS=""
-SPLIT="ncurses-common ncurses-extra ncurses-dev ncurses-man libform libmenu \
-libpanel libtic libtinfo"
-
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
+	# Ncurses need an installed /usr/bin/tic which is in ncursesw-extra. And
 	# when cross compiling we can't use the freshly cooked binary. See cook log:
 	#
 	#** Building terminfo database, please wait...
@@ -29,22 +31,26 @@
 		echo "Installing: ncursesw-extra"
 		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
 	fi
-	cd $src
+
 	mkdir -p $DESTDIR/usr/lib/terminfo
-	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
-		include/Makefile.in
-	./configure \
-		--libdir=/lib \
-		--sysconfdir=/etc \
-		--with-shared \
-		--without-debug \
-		--without-ada \
-		--with-build-cc="gcc -D_GNU_SOURCE" \
-		--with-termlib \
-		--with-ticlib \
-		--enable-pc-files \
+
+# search string not in file (6.1)
+#	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
+#		include/Makefile.in
+
+	./configure					\
+		--libdir=/lib				\
+		--sysconfdir=/etc			\
+		--with-shared				\
+		--without-debug				\
+		--without-ada				\
+		--with-build-cc="gcc -D_GNU_SOURCE"	\
+		--with-termlib				\
+		--with-ticlib				\
+		--enable-pc-files			\
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncursesw-dev/receipt
--- a/ncursesw-dev/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncursesw-dev/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,25 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="ncursesw-dev"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="development"
-SHORT_DESC="Devel files for the ncursesw library."
+SHORT_DESC="Development files for the ncursesw library."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
+DEPENDS="ncursesw" # pkg-config
 WANTED="ncursesw"
-WEB_SITE="https://invisible-island.net/ncurses/"
+
 HOST_ARCH="i486 arm"
 
-DEPENDS="ncursesw pkg-config"
-
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/bin $fs/usr/lib
-	cp -a $install/lib/*.a $fs/lib
+	mkdir -p $fs/lib
+	mkdir -p $fs/usr/bin
+#	mkdir -p $fs/usr/lib
+
+	cp -a $install/lib/*.a			$fs/lib
 	# Include files are from the same source than ncuses-dev and work
 	# nicely for both.
-	cp -a $install/usr/include $fs/usr
-	cp $install/usr/bin/ncursesw5-config $fs/usr/bin
-	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
+	cp -a $install/usr/include		$fs/usr
+	cp $install/usr/bin/ncursesw6-config	$fs/usr/bin
+#	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
 }
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncursesw-extra/receipt
--- a/ncursesw-extra/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncursesw-extra/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,14 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="ncursesw-extra"
-VERSION="5.9"
+VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Extra files for the ncursesw library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
+DEPENDS="ncursesw ncurses-extra"
 WANTED="ncursesw"
-DEPENDS="ncursesw ncurses-extra"
-WEB_SITE="https://invisible-island.net/ncurses/"
+
 HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -17,8 +19,9 @@
 	mkdir -p $fs/usr
 	cp -a $install/usr/bin $fs/usr
 	chmod 755 $fs/usr/bin/*
+
 	# Remove tools already provided by other packages
-	rm -f $fs/usr/bin/ncursesw5-config
+	rm -f $fs/usr/bin/ncursesw6-config
 	rm -f $fs/usr/bin/clear
 	rm -f $fs/usr/bin/tset
 	rm -f $fs/usr/bin/reset
diff -r 41d7f62d0d2c -r 94ece03c2cb1 ncursesw/receipt
--- a/ncursesw/receipt	Fri May 03 17:43:50 2019 +0100
+++ b/ncursesw/receipt	Sat May 04 11:23:56 2019 +0100
@@ -1,19 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="ncursesw"
-VERSION="5.9"
-SOURCE="ncurses"
+VERSION="6.1"
 CATEGORY="base-system"
 SHORT_DESC="Library of functions to manage display on terminals."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
+WEB_SITE="https://www.gnu.org/software/ncurses/ncurses.html"
+
+SOURCE="ncurses"
 TARBALL="$SOURCE-$VERSION.tar.gz"
-WEB_SITE="https://invisible-island.net/ncurses/"
-WGET_URL="ftp://invisible-island.net/ncurses/$TARBALL"
-HOST_ARCH="i486 arm"
+WGET_URL="$GNU_MIRROR/$SOURCE/$TARBALL"
 
 DEPENDS="ncurses-common"
-BUILD_DEPENDS="gcc"
+BUILD_DEPENDS=""
+
+HOST_ARCH="i486 arm"
 
 case "$ARCH" in
 	arm) BUILD_DEPENDS="" ;;
@@ -22,7 +24,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	# Ncurses need an installed /usr/bin/tic witch is in ncursesw-extra. And
+	# Ncurses need an installed /usr/bin/tic which is in ncursesw-extra. And
 	# when cross compiling we can't use the freshly cooked binary. See cook log:
 	#
 	#** Building terminfo database, please wait...
@@ -32,35 +34,40 @@
 		echo "Installing: ncursesw-extra"
 		tazpkg get-install ncursesw-extra 2>/dev/null 1>/dev/null
 	fi
-	cd $src
+
 	mkdir -p $DESTDIR/usr/lib/terminfo
-	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
-		include/Makefile.in
-	./configure \
-		--libdir=/lib \
-		--sysconfdir=/etc \
-		--with-shared \
-		--without-debug \
-		--without-ada \
-		--enable-widec \
-		--with-build-cc="gcc -D_GNU_SOURCE" \
-		--enable-pc-files \
+
+# search string not in file (6.1)
+#	sed -i 's|\tsh $(srcdir)/MKhashsize.sh|\tash $(srcdir)/MKhashsize.sh|' \
+#		include/Makefile.in
+
+	./configure					\
+		--libdir=/lib				\
+		--sysconfdir=/etc			\
+		--with-shared				\
+		--without-debug				\
+		--without-ada				\
+		--enable-widec				\
+		--with-build-cc="gcc -D_GNU_SOURCE"	\
+		--enable-pc-files			\
 		$CONFIGURE_ARGS &&
-	make && make install
+	make &&
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/lib $fs/usr/bin
+	mkdir -p $fs/lib
+	mkdir -p $fs/usr/bin
 
-	# Libs.
+	# Libraries
 	cp -a $install/lib/libncursesw.so* $fs/lib
 
-	# Base progs.
-	cp $install/usr/bin/clear $fs/usr/bin
-	cp $install/usr/bin/tset $fs/usr/bin
-	cp $install/usr/bin/reset $fs/usr/bin
+	# Base programs
+	cp $install/usr/bin/clear	$fs/usr/bin
+	cp $install/usr/bin/tset	$fs/usr/bin
+	cp $install/usr/bin/reset	$fs/usr/bin
 }
 
 # Overlap busybox