# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1393107015 -3600
# Node ID 159df010240c5d274f83c1a2a6fdb90e89cd4185
# Parent  2ba6fbff0a52afcd44cb937b9b5f023296f433bd
arm arch: fix pkgs build for kbd and e2fsprogs plus add flex and check

diff -r 2ba6fbff0a52 -r 159df010240c check-dev/receipt
--- a/check-dev/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/check-dev/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="LGPL2.1"
 WEB_SITE="http://check.sourceforge.net/"
 WANTED="check"
+HOST_ARCH="i486 arm"
 
 DEPENDS="check pkg-config"
 BUILD_DEPENDS=""
diff -r 2ba6fbff0a52 -r 159df010240c check/receipt
--- a/check/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/check/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -9,6 +9,7 @@
 WEB_SITE="http://check.sourceforge.net/"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="$SF_MIRROR/$PACKAGE/$VERSION/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS=""
 BUILD_DEPENDS=""
diff -r 2ba6fbff0a52 -r 159df010240c e2fsprogs/receipt
--- a/e2fsprogs/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/e2fsprogs/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -14,6 +14,11 @@
 DEPENDS="libcomerr util-linux-blkid util-linux-uuid"
 BUILD_DEPENDS="texinfo"
 
+# Handle cross compilation.
+case "$ARCH" in
+	arm) BUILD_DEPENDS="" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 2ba6fbff0a52 -r 159df010240c flex/receipt
--- a/flex/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/flex/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://flex.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="bison"
 BUILD_DEPENDS="bison"
diff -r 2ba6fbff0a52 -r 159df010240c kbd-base/receipt
--- a/kbd-base/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/kbd-base/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-base"
-VERSION="1.15.5"
+VERSION="2.0.1"
 CATEGORY="base-system"
 SHORT_DESC="Keyboard maping definitions and loadkeys utility."
 MAINTAINER="pankso@slitaz.org"
diff -r 2ba6fbff0a52 -r 159df010240c kbd-vlock/receipt
--- a/kbd-vlock/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/kbd-vlock/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd-vlock"
-VERSION="1.15.5"
+VERSION="2.0.1"
 CATEGORY="system-tools"
 SHORT_DESC="vlock - Virtual Console lock program"
 MAINTAINER="al.bobylev@gmail.com"
diff -r 2ba6fbff0a52 -r 159df010240c kbd/receipt
--- a/kbd/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/kbd/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -1,30 +1,45 @@
 # SliTaz package receipt.
 
 PACKAGE="kbd"
-VERSION="1.15.5"
+VERSION="2.0.1"
 CATEGORY="system-tools"
 SHORT_DESC="Keyboard maping definitions and tools."
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://kbd-project.org/"
-#WGET_URL="http://kbd-project.org/download/$TARBALL"
-WGET_URL="ftp://ftp.altlinux.org/pub/people/legion/kbd/$TARBALL"
+WGET_URL="ftp://ftp.kernel.org/pub/linux/utils/kbd/$TARBALL"
 TAGS="keyboard"
 HOST_ARCH="i486 arm"
 
 DEPENDS="kbd-base"
-BUILD_DEPENDS="flex pam-dev"
+BUILD_DEPENDS="flex pam-dev check-dev"
+
+# Handle cross compilation.
+case "$ARCH" in
+	arm) BUILD_DEPENDS="flex check-dev" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	# standard locale placement
 	sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in
-	./configure \
-		--datadir=/usr/share/kbd \
-		--localedir=/usr/share/locale \
-		$CONFIGURE_ARGS &&
+	# Handle cross compilation.
+	case "$ARCH" in
+		arm)
+			# No PAM support for ARM
+			./configure \
+				--datadir=/usr/share/kbd \
+				--localedir=/usr/share/locale \
+				--disable-vlock \
+				$CONFIGURE_ARGS ;;
+		i468)
+			./configure \
+				--datadir=/usr/share/kbd \
+				--localedir=/usr/share/locale \
+				$CONFIGURE_ARGS ;;
+	esac &&
 	make && make install
 }
 
diff -r 2ba6fbff0a52 -r 159df010240c texinfo/receipt
--- a/texinfo/receipt	Sat Feb 22 19:56:00 2014 +0100
+++ b/texinfo/receipt	Sat Feb 22 23:10:15 2014 +0100
@@ -12,7 +12,7 @@
 TAGS="documentation"
 
 DEPENDS="ncurses"
-BUILD_DEPENDS="ncurses"
+BUILD_DEPENDS="ncurses-dev"
 
 # Rules to compile & install the temporary toolchain by Tazwok.
 cook_tmp_toolchain()