# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1647189934 -3600
# Node ID da39e47234a25d112ea8aebc2e411c9ed241a277
# Parent  ce6b8763dcf8375aec218fcd098323c9609bff92
updated kbd, kbd-base, kbd-busybox and kbd-vlock (2.2.0 -> 2.4.0)

diff -r ce6b8763dcf8 -r da39e47234a2 kbd-base/receipt
--- a/kbd-base/receipt	Sun Mar 13 17:05:22 2022 +0100
+++ b/kbd-base/receipt	Sun Mar 13 17:45:34 2022 +0100
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-base"
-VERSION="2.2.0"
+VERSION="2.4.0"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://kbd-project.org/"
+WEB_SITE="https://kbd-project.org/"
 
 WANTED="kbd"
 
diff -r ce6b8763dcf8 -r da39e47234a2 kbd-busybox/receipt
--- a/kbd-busybox/receipt	Sun Mar 13 17:05:22 2022 +0100
+++ b/kbd-busybox/receipt	Sun Mar 13 17:45:34 2022 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-busybox"
-VERSION="2.2.0"
+VERSION="2.4.0"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard mapping definitions for busybox."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -31,5 +31,5 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	cp -a $install/usr $fs
+	cp -a $install/usr	$fs
 }
diff -r ce6b8763dcf8 -r da39e47234a2 kbd-lang/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kbd-lang/receipt	Sun Mar 13 17:45:34 2022 +0100
@@ -0,0 +1,17 @@
+# SliTaz package receipt.
+
+PACKAGE="kbd-lang"
+VERSION="2.4.0"
+CATEGORY="localization"
+SHORT_DESC="Keyboard mapping definitions, loadkeys and setfont utilities - localised messages."
+MAINTAINER="maintainer@slitaz.org"
+LICENSE="GPL2"
+WEB_SITE="https://kbd-project.org/"
+
+WANTED="kbd"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	cook_copy_folders	locale
+}
diff -r ce6b8763dcf8 -r da39e47234a2 kbd-vlock/receipt
--- a/kbd-vlock/receipt	Sun Mar 13 17:05:22 2022 +0100
+++ b/kbd-vlock/receipt	Sun Mar 13 17:45:34 2022 +0100
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-vlock"
-VERSION="2.2.0"
+VERSION="2.4.0"
 CATEGORY="system-tools"
 TAGS="console"
 SHORT_DESC="Vlock - Virtual Console lock program."
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="GPL2"
-WEB_SITE="http://kbd-project.org/"
+WEB_SITE="https://kbd-project.org/"
 
 DEPENDS="pam"
 WANTED="kbd"
diff -r ce6b8763dcf8 -r da39e47234a2 kbd/receipt
--- a/kbd/receipt	Sun Mar 13 17:05:22 2022 +0100
+++ b/kbd/receipt	Sun Mar 13 17:45:34 2022 +0100
@@ -1,19 +1,20 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd"
-VERSION="2.2.0"
+VERSION="2.4.0"
 CATEGORY="system-tools"
 TAGS="keyboard"
 SHORT_DESC="Keyboard mapping definitions and tools."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://kbd-project.org/"
+WEB_SITE="https://kbd-project.org/"
 
 TARBALL="$PACKAGE-$VERSION.tar.xz"
 WGET_URL="https://www.kernel.org/pub/linux/utils/kbd/$TARBALL"
 
-DEPENDS="kbd-base"
-BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
+SUGGESTED="kbd-lang"
+DEPENDS="gcc83-lib-base kbd-base"
+BUILD_DEPENDS="advancecomp automake check-dev flex gcc83 pam-dev"
 
 HOST_ARCH="i486 arm"
 
@@ -22,6 +23,8 @@
 	arm) BUILD_DEPENDS="check-dev flex" ;;
 esac
 
+# @maintainer: Please update also: kbd-base, kbd-busybox, kbd-lang and kbd-vlock
+
 current_version()
 {
 	wget -O - https://github.com/legionus/kbd/releases 2>/dev/null | \
@@ -32,25 +35,31 @@
 compile_rules()
 {
 	# standard locale placement
-	sed -i 's|localedir = .*|localedir = @localedir@|' \
-		po/Makefile.in.in
+	# 2.4.0 no longer required
+#	sed -i 's|localedir = .*|localedir = @localedir@|' \
+#		po/Makefile.in.in
 
 	# Handle cross compilation.
 	case "$ARCH" in
-		arm)
+		(arm)
 			# No PAM support for ARM
 			./configure				\
 				--datadir=/usr/share/kbd	\
 				--localedir=/usr/share/locale	\
 				--disable-vlock			\
-				$CONFIGURE_ARGS ;;
-		i486)
+				$CONFIGURE_ARGS
+			;;
+		(i486)
 			./configure				\
+				CC=gcc-83			\
+				CXX=g++-83			\
 				--datadir=/usr/share/kbd	\
 				--localedir=/usr/share/locale	\
-				$CONFIGURE_ARGS ;;
+				$CONFIGURE_ARGS
+			;;
 	esac &&
-	make -j 1 &&
+
+	make &&
 	make install &&
 
 	find $DESTDIR/usr/share/kbd -name '*gz' -exec advdef -z4 {} \;
@@ -71,7 +80,7 @@
 	# Remove files provided by kbd-base and kbd-vlock.
 	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list)
 	  do
-		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
+		rm -f			$fs/usr/share/kbd/keymaps/i386/$keymap
 	  done
 	rm -rf				$fs/usr/share/kbd/keymaps/include
 	rm -rf				$fs/usr/share/kbd/keymaps/i386/include