xkeyboard-config: => 2.4.1

7 files changed, 23 insertions, 7 deletions

diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD
index d60d8c828c..d5deb61d8b 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -1,6 +1,5 @@
-OPTS="$OPTS --enable-xkbcomp-symlink"               &&
-OPTS="$OPTS --enable-compat-rules"                  &&
-OPTS="$OPTS --with-xkb-base=/usr/share/X11/xkb"     &&
-OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86"  &&
+OPTS="$OPTS --enable-compat-rules" &&
+OPTS="$OPTS --with-xkb-base=$INSTALL_ROOT/usr/share/X11/xkb" &&
+OPTS="$OPTS --with-xkb-rules-symlink=xorg,xfree86" &&
 
 default_build
diff --git a/xorg-data/xkeyboard-config/DEPENDS b/xorg-data/xkeyboard-config/DEPENDS
index c08c9e09d2..b2d2d0b82a 100755
--- a/xorg-data/xkeyboard-config/DEPENDS
+++ b/xorg-data/xkeyboard-config/DEPENDS
@@ -2,4 +2,14 @@ depends intltool &&
 depends util-macros &&
 depends xkbcomp &&
 depends xml-parser-expat &&
-depends glib2
+depends glib2 &&
+
+optional_depends libxslt \
+                 "--with-xsltproc" \
+                 "--without-xsltproc" \
+                 "for the transformation of XML documents" &&
+
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "to use Native Language Support"
diff --git a/xorg-data/xkeyboard-config/DETAILS b/xorg-data/xkeyboard-config/DETAILS
index ad459a342e..d4ca95f2f5 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,9 +1,9 @@
            SPELL=xkeyboard-config
-         VERSION=2.2.1
+         VERSION=2.4.1
 #     SOURCE_HASH=sha512:fd52753e81e7e41585d0fdd190bd05f0aad9b055d74119913fa72a1fdc1da2bef60f62a82a08558afc23a7f589297ffd84a1d0c1db4a452d4755d88548df51ff
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/data/$SPELL/$SOURCE
+   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/data/$SOURCE
    SOURCE_URL[1]=http://people.freedesktop.org/~svu/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://xorg.freedesktop.org/
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index 3f71d2a4df..683bce84a2 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,3 +1,9 @@
+2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.4.1; fixed SOURCE_URL[0]
+	* DEPENDS: added missing optional dependencies
+	* BUILD: removed outdated option
+	* INSTALL: end with make_normal
+
 2011-04-25 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 2.2.1
 	  2.2.x requires libx11 1.4.3+
diff --git a/xorg-data/xkeyboard-config/INSTALL b/xorg-data/xkeyboard-config/INSTALL
index bce9146159..675e74a818 100755
--- a/xorg-data/xkeyboard-config/INSTALL
+++ b/xorg-data/xkeyboard-config/INSTALL
@@ -1,4 +1,5 @@
 make_single &&
 default_install &&
+make_normal &&
 
 install -vm 755 -d "$INSTALL_ROOT/var/lib/xkb"
diff --git a/xorg-data/xkeyboard-config/xkeyboard-config-2.2.1.tar.bz2.sig b/xorg-data/xkeyboard-config/xkeyboard-config-2.2.1.tar.bz2.sig
deleted file mode 100644
index 3205eec09c..0000000000
--- a/xorg-data/xkeyboard-config/xkeyboard-config-2.2.1.tar.bz2.sig
+++ /dev/null
diff --git a/xorg-data/xkeyboard-config/xkeyboard-config-2.4.1.tar.bz2.sig b/xorg-data/xkeyboard-config/xkeyboard-config-2.4.1.tar.bz2.sig
new file mode 100644
index 0000000000..1a3e466b02
--- /dev/null
+++ b/xorg-data/xkeyboard-config/xkeyboard-config-2.4.1.tar.bz2.sig