summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2011-03-11 20:01:55 +0100
committertnut <thierryn1 at hispeed dot ch>2011-03-11 20:01:55 +0100
commit9db0400010cebce40ec0853cecef39d73bde4522 (patch)
tree8c941425f251585d2937bcea5af0023e1148625f
parent86e0a0e0699cbd657aa51807ed91705aa6e6dbc6 (diff)
downloadnutyx-extra-9db0400010cebce40ec0853cecef39d73bde4522.tar.gz
nutyx-extra-9db0400010cebce40ec0853cecef39d73bde4522.tar.bz2
nutyx-extra-9db0400010cebce40ec0853cecef39d73bde4522.tar.xz
nutyx-extra-9db0400010cebce40ec0853cecef39d73bde4522.zip
xkeyboard-config, port adapté
-rw-r--r--xorg/xkeyboard-config/.footprint.i6865
-rw-r--r--xorg/xkeyboard-config/.footprint.x86_645
-rwxr-xr-xxorg/xkeyboard-config/Pkgfile12
3 files changed, 10 insertions, 12 deletions
diff --git a/xorg/xkeyboard-config/.footprint.i686 b/xorg/xkeyboard-config/.footprint.i686
index ccf825f4a..9837eb6e5 100644
--- a/xorg/xkeyboard-config/.footprint.i686
+++ b/xorg/xkeyboard-config/.footprint.i686
@@ -25,7 +25,6 @@ drwxr-xr-x root/root usr/share/X11/xkb/compat/
-rw-r--r-- root/root usr/share/X11/xkb/compat/pc98
-rw-r--r-- root/root usr/share/X11/xkb/compat/xfree86
-rw-r--r-- root/root usr/share/X11/xkb/compat/xtest
-lrwxrwxrwx root/root usr/share/X11/xkb/compiled -> /var/lib/xkb
-rw-r--r-- root/root usr/share/X11/xkb/geometry.dir
drwxr-xr-x root/root usr/share/X11/xkb/geometry/
-rw-r--r-- root/root usr/share/X11/xkb/geometry/README
@@ -355,5 +354,9 @@ drwxr-xr-x root/root usr/share/X11/xkb/types/
-rw-r--r-- root/root usr/share/X11/xkb/types/nokia
-rw-r--r-- root/root usr/share/X11/xkb/types/numpad
-rw-r--r-- root/root usr/share/X11/xkb/types/pc
+drwxr-xr-x root/root usr/share/locale/
+drwxr-xr-x root/root usr/share/locale/fr/
+drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
drwxr-xr-x root/root usr/share/pkgconfig/
-rw-r--r-- root/root usr/share/pkgconfig/xkeyboard-config.pc
diff --git a/xorg/xkeyboard-config/.footprint.x86_64 b/xorg/xkeyboard-config/.footprint.x86_64
index ccf825f4a..9837eb6e5 100644
--- a/xorg/xkeyboard-config/.footprint.x86_64
+++ b/xorg/xkeyboard-config/.footprint.x86_64
@@ -25,7 +25,6 @@ drwxr-xr-x root/root usr/share/X11/xkb/compat/
-rw-r--r-- root/root usr/share/X11/xkb/compat/pc98
-rw-r--r-- root/root usr/share/X11/xkb/compat/xfree86
-rw-r--r-- root/root usr/share/X11/xkb/compat/xtest
-lrwxrwxrwx root/root usr/share/X11/xkb/compiled -> /var/lib/xkb
-rw-r--r-- root/root usr/share/X11/xkb/geometry.dir
drwxr-xr-x root/root usr/share/X11/xkb/geometry/
-rw-r--r-- root/root usr/share/X11/xkb/geometry/README
@@ -355,5 +354,9 @@ drwxr-xr-x root/root usr/share/X11/xkb/types/
-rw-r--r-- root/root usr/share/X11/xkb/types/nokia
-rw-r--r-- root/root usr/share/X11/xkb/types/numpad
-rw-r--r-- root/root usr/share/X11/xkb/types/pc
+drwxr-xr-x root/root usr/share/locale/
+drwxr-xr-x root/root usr/share/locale/fr/
+drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
drwxr-xr-x root/root usr/share/pkgconfig/
-rw-r--r-- root/root usr/share/pkgconfig/xkeyboard-config.pc
diff --git a/xorg/xkeyboard-config/Pkgfile b/xorg/xkeyboard-config/Pkgfile
index 6ece84157..b9fdc5a9b 100755
--- a/xorg/xkeyboard-config/Pkgfile
+++ b/xorg/xkeyboard-config/Pkgfile
@@ -1,6 +1,6 @@
# Description: X keyboard configuration database
# URL: http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig
-# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
# Depends on: xorg-xkbcomp, intltool
# Run on: xorg-xkbcomp,intltool
@@ -12,15 +12,7 @@ source=(http://xlibs.freedesktop.org/xkbdesc/$name-$version.tar.bz2)
build() {
cd xkeyboard-config-$version
-
- ./configure --prefix=/usr \
- --with-xkb-base=/usr/share/X11/xkb \
- --with-xkb-rules-symlink=xorg
-
+ ./configure $XORG_CONFIG --with-xkb-rules-symlink=xorg
make
make DESTDIR=$PKG install
-
- rm -rf $PKG/usr/share/locale
-
- ln -s /var/lib/xkb $PKG/usr/share/X11/xkb/compiled
}