wok diff kbd/receipt @ rev 23869

linld: typos in vga= support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jun 21 19:06:48 2020 +0000 (2020-06-21)
parents b0cfa2140c91
children a3b6dd3aac6f
line diff
     1.1 --- a/kbd/receipt	Sat Mar 16 09:42:26 2019 +0100
     1.2 +++ b/kbd/receipt	Sun Jun 21 19:06:48 2020 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="kbd"
     1.7 -VERSION="2.0.4"
     1.8 +VERSION="2.2.0"
     1.9  CATEGORY="system-tools"
    1.10  TAGS="keyboard"
    1.11  SHORT_DESC="Keyboard mapping definitions and tools."
    1.12 @@ -14,6 +14,7 @@
    1.13  
    1.14  DEPENDS="kbd-base"
    1.15  BUILD_DEPENDS="advancecomp check-dev flex pam-dev"
    1.16 +
    1.17  HOST_ARCH="i486 arm"
    1.18  
    1.19  # Handle cross compilation.
    1.20 @@ -25,7 +26,8 @@
    1.21  compile_rules()
    1.22  {
    1.23  	# standard locale placement
    1.24 -	sed 's|localedir = .*|localedir = @localedir@|' -i $src/po/Makefile.in.in
    1.25 +	sed -i 's|localedir = .*|localedir = @localedir@|' \
    1.26 +		po/Makefile.in.in
    1.27  
    1.28  	# Handle cross compilation.
    1.29  	case "$ARCH" in
    1.30 @@ -42,7 +44,6 @@
    1.31  				--localedir=/usr/share/locale	\
    1.32  				$CONFIGURE_ARGS ;;
    1.33  	esac &&
    1.34 -
    1.35  	make -j 1 &&
    1.36  	make install &&
    1.37  
    1.38 @@ -56,20 +57,21 @@
    1.39  	mkdir -p $fs/usr/share
    1.40  
    1.41  	# Copy all kbd files (should we split fonts?)
    1.42 -	cp -a $install/usr/share/kbd $fs/usr/share
    1.43 +	cp -a $install/usr/share/kbd	$fs/usr/share
    1.44  
    1.45  	# Tools
    1.46 -	cp -a $install/usr/bin $fs/usr
    1.47 +	cp -a $install/usr/bin		$fs/usr
    1.48  
    1.49  	# Remove files provided by kbd-base and kbd-vlock.
    1.50 -	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list); do
    1.51 +	for keymap in $(cat $WOK/kbd-base/stuff/keymaps-path.list)
    1.52 +	  do
    1.53  		rm -f $fs/usr/share/kbd/keymaps/i386/$keymap
    1.54 -	done
    1.55 -	rm -rf $fs/usr/share/kbd/keymaps/include
    1.56 -	rm -rf $fs/usr/share/kbd/keymaps/i386/include
    1.57 -	rm -f $fs/usr/bin/loadkeys
    1.58 -	rm -f $fs/usr/bin/setfont
    1.59 -	rm -f $fs/usr/bin/vlock
    1.60 +	  done
    1.61 +	rm -rf				$fs/usr/share/kbd/keymaps/include
    1.62 +	rm -rf				$fs/usr/share/kbd/keymaps/i386/include
    1.63 +	rm -f				$fs/usr/bin/loadkeys
    1.64 +	rm -f				$fs/usr/bin/setfont
    1.65 +	rm -f				$fs/usr/bin/vlock
    1.66  }
    1.67  
    1.68  # Overlap busybox