wok rev 22292

updated xorg-xkeyboard-config and xorg-xkeyboard-config-dev (2.2.1 -> 2.5.1)
author Hans-G?nter Theisgen
date Wed Nov 13 16:21:48 2019 +0100 (2019-11-13)
parents fb9d5030d826
children 86bd5f0c0347
files xorg-xkeyboard-config-dev/receipt xorg-xkeyboard-config/receipt
line diff
     1.1 --- a/xorg-xkeyboard-config-dev/receipt	Wed Nov 13 16:11:02 2019 +0100
     1.2 +++ b/xorg-xkeyboard-config-dev/receipt	Wed Nov 13 16:21:48 2019 +0100
     1.3 @@ -1,20 +1,21 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="xorg-xkeyboard-config-dev"
     1.7 -VERSION="2.2.1"
     1.8 +VERSION="2.5.1"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="Xorg server keyboard devel files."
    1.11 +SHORT_DESC="Xorg server keyboard - development files."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="MIT"
    1.14 -WEB_SITE="https://www.x.org/"
    1.15 +WEB_SITE="https://www.x.org/wiki/"
    1.16 +
    1.17 +DEPENDS="pkg-config xorg-xkeyboard-config"
    1.18  WANTED="xorg-xkeyboard-config"
    1.19 +
    1.20  HOST_ARCH="i486 arm"
    1.21  
    1.22 -DEPENDS="xorg-xkeyboard-config pkg-config"
    1.23 -
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26  {
    1.27  	mkdir -p $fs/usr/share
    1.28 -	cp -a $install/usr/share/pkgconfig $fs/usr/share
    1.29 +	cp -a $install/usr/share/pkgconfig	$fs/usr/share
    1.30  }
     2.1 --- a/xorg-xkeyboard-config/receipt	Wed Nov 13 16:11:02 2019 +0100
     2.2 +++ b/xorg-xkeyboard-config/receipt	Wed Nov 13 16:21:48 2019 +0100
     2.3 @@ -1,19 +1,21 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="xorg-xkeyboard-config"
     2.7 -VERSION="2.2.1"
     2.8 +VERSION="2.5.1"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="Xorg server keyboard definition files."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="MIT"
    2.13 +WEB_SITE="https://www.x.org/wiki/"
    2.14 +
    2.15  SOURCE="xkeyboard-config"
    2.16  TARBALL="$SOURCE-$VERSION.tar.bz2"
    2.17 -WEB_SITE="https://www.x.org/"
    2.18 -WGET_URL="http://xorg.freedesktop.org/releases/individual/data/$SOURCE/$TARBALL"
    2.19 -HOST_ARCH="i486 arm"
    2.20 +WGET_URL="$XORG_MIRROR/data/$TARBALL"
    2.21  
    2.22  DEPENDS="xorg-xkbcomp"
    2.23 -BUILD_DEPENDS="perl-xml-parser xorg-xkbcomp xorg-xproto xorg-libX11-dev intltool"
    2.24 +BUILD_DEPENDS="intltool perl-xml-parser xorg-libX11-dev xorg-xkbcomp xorg-xproto"
    2.25 +
    2.26 +HOST_ARCH="i486 arm"
    2.27  
    2.28  # Handle cross compilation. Use build host: xorg-xkbcomp perl-xml-parser
    2.29  case "$ARCH" in
    2.30 @@ -23,19 +25,19 @@
    2.31  # Rules to configure and make the package.
    2.32  compile_rules()
    2.33  {
    2.34 -	./configure \
    2.35 -		--sysconfdir=/etc \
    2.36 -		--localstatedir=/var \
    2.37 -		--with-xkb-base=/usr/share/X11/xkb \
    2.38 -		--with-xkb-rules-symlink=xorg \
    2.39 +	./configure					\
    2.40 +		--sysconfdir=/etc			\
    2.41 +		--localstatedir=/var			\
    2.42 +		--with-xkb-base=/usr/share/X11/xkb	\
    2.43 +		--with-xkb-rules-symlink=xorg		\
    2.44  		$CONFIGURE_ARGS &&
    2.45 -	make && make install
    2.46 +	make &&
    2.47 +	make install
    2.48  }
    2.49  
    2.50  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.51  genpkg_rules()
    2.52  {
    2.53  	mkdir -p $fs/usr/share
    2.54 -	cp -a $install/usr/share/X11 $fs/usr/share
    2.55 +	cp -a $install/usr/share/X11	$fs/usr/share
    2.56  }
    2.57 -