wok diff kbd/receipt @ rev 15580

directfb: update bdeps
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Nov 30 10:52:52 2013 +0000 (2013-11-30)
parents a4254bd509cd
children 159df010240c
line diff
     1.1 --- a/kbd/receipt	Sat Jun 29 17:32:45 2013 +0200
     1.2 +++ b/kbd/receipt	Sat Nov 30 10:52:52 2013 +0000
     1.3 @@ -1,26 +1,29 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd"
     1.7 -VERSION="1.15.3"
     1.8 +VERSION="1.15.5"
     1.9  CATEGORY="system-tools"
    1.10  SHORT_DESC="Keyboard maping definitions and tools."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.14  WEB_SITE="http://kbd-project.org/"
    1.15 -WGET_URL="http://kbd-project.org/download/$TARBALL"
    1.16 +#WGET_URL="http://kbd-project.org/download/$TARBALL"
    1.17 +WGET_URL="ftp://ftp.altlinux.org/pub/people/legion/kbd/$TARBALL"
    1.18  TAGS="keyboard"
    1.19  HOST_ARCH="i486 arm"
    1.20  
    1.21 -#BUILD_DEPENDS="flex"
    1.22 +DEPENDS="kbd-base"
    1.23 +BUILD_DEPENDS="flex pam-dev"
    1.24  
    1.25  # Rules to configure and make the package.
    1.26  compile_rules()
    1.27  {
    1.28 -	cd $src
    1.29 -	patch -Np1 -i $stuff/fix-es.po.patch
    1.30 +	# standard locale placement
    1.31 +	sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in
    1.32  	./configure \
    1.33  		--datadir=/usr/share/kbd \
    1.34 +		--localedir=/usr/share/locale \
    1.35  		$CONFIGURE_ARGS &&
    1.36  	make && make install
    1.37  }
    1.38 @@ -30,13 +33,19 @@
    1.39  {
    1.40  	mkdir -p $fs/usr/share
    1.41  
    1.42 -	# Copy all kbd files (should we split fonts ?) and remove the one
    1.43 -	# provided by: kbd-base.
    1.44 -	cp -a $_pkg/usr/share/kbd $fs/usr/share
    1.45 -	rm -rf $fs/usr/share/kbd/keymaps/i386
    1.46 +	# Copy all kbd files (should we split fonts?)
    1.47 +	cp -a $install/usr/share/kbd $fs/usr/share
    1.48  
    1.49  	# Tools
    1.50  	cp -a $install/usr/bin $fs/usr
    1.51 +
    1.52 +	# Remove files provided by kbd-base and kbd-vlock.
    1.53 +	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list); do
    1.54 +		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
    1.55 +	done
    1.56 +	rm -rf $fs/usr/share/kbd/keymaps/include
    1.57 +	rm -rf $fs/usr/share/kbd/keymaps/i386/include
    1.58 +	rm -f $fs/usr/bin/loadkeys $fs/usr/bin/vlock
    1.59  }
    1.60  
    1.61  # Overlap busybox