9 files changed, 58 insertions, 11 deletions
diff --git a/xorg-data/xcursor-themes/DETAILS b/xorg-data/xcursor-themes/DETAILS
index 241e6806b1..6e9ca7258f 100755
--- a/xorg-data/xcursor-themes/DETAILS
+++ b/xorg-data/xcursor-themes/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xcursor-themes
-         VERSION=1.0.2
+         VERSION=1.0.3
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/data/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
diff --git a/xorg-data/xcursor-themes/HISTORY b/xorg-data/xcursor-themes/HISTORY
index 031d34d9e9..465611e755 100644
--- a/xorg-data/xcursor-themes/HISTORY
+++ b/xorg-data/xcursor-themes/HISTORY
@@ -1,3 +1,6 @@
+2011-01-30 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.0.3
+
 2009-10-01 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.0.2
 	  SOURCE matches upstream posted MD5
diff --git a/xorg-data/xcursor-themes/xcursor-themes-1.0.2.tar.bz2.sig b/xorg-data/xcursor-themes/xcursor-themes-1.0.2.tar.bz2.sig
deleted file mode 100644
index 434809b986..0000000000
--- a/xorg-data/xcursor-themes/xcursor-themes-1.0.2.tar.bz2.sig
+++ /dev/null
diff --git a/xorg-data/xcursor-themes/xcursor-themes-1.0.3.tar.bz2.sig b/xorg-data/xcursor-themes/xcursor-themes-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000000..65b8c16ff1
--- /dev/null
+++ b/xorg-data/xcursor-themes/xcursor-themes-1.0.3.tar.bz2.sig
diff --git a/xorg-data/xkeyboard-config/BUILD b/xorg-data/xkeyboard-config/BUILD
index ef901bdb5a..d5deb61d8b 100755
--- a/xorg-data/xkeyboard-config/BUILD
+++ b/xorg-data/xkeyboard-config/BUILD
@@ -1,7 +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" &&
 
-./autogen.sh &&
 default_build
diff --git a/xorg-data/xkeyboard-config/DEPENDS b/xorg-data/xkeyboard-config/DEPENDS
index 10df2c3b25..b2d2d0b82a 100755
--- a/xorg-data/xkeyboard-config/DEPENDS
+++ b/xorg-data/xkeyboard-config/DEPENDS
@@ -2,5 +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 5d583821ae..7c04ccc870 100755
--- a/xorg-data/xkeyboard-config/DETAILS
+++ b/xorg-data/xkeyboard-config/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xkeyboard-config
-         VERSION=2.10.1
-     SOURCE_HASH=sha512:e21927e365f4742d710bf414c312a9bcaf46d881ee274f1baa0a288339477fa8aa24c338473f96ec658133205f21db43d1737d6c59c77999344244c43cff1be2
+         VERSION=2.12
+     SOURCE_HASH=sha512:d271b635407ef82f19f34cdabe6279a0ccab4c5347f56e1b28963d99e53f4db18c1cca349fe841a392d9045a47712817259ba6ba36355f3839d8ef46cae0e2ff
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.x.org/releases/individual/data/$SPELL/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY
index d7f0a3de2d..c38e52e523 100644
--- a/xorg-data/xkeyboard-config/HISTORY
+++ b/xorg-data/xkeyboard-config/HISTORY
@@ -1,11 +1,47 @@
+2014-05-28 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.12
+
+2014-01-30 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.11
+
 2013-11-23 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS: Fixed SOURCE_URL[0]
-	  updated spell to 2.3
-	  updated spell to 2.10.1
+
+2013-10-28 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.10.1
 
 2011-08-19 Bor Kraljič <pyrobor@ver.si>
 	* BUILD: commented unrecognized option (issue #30)
 
+2013-05-29 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.9
+
+2012-09-26 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.7
+
+2012-05-30 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.6
+
+2012-02-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.5.1
+
+2012-01-20 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 2.5
+
+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+
+
+2011-01-30 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 2.1; added 1st source url
+	* BUILD: removed autogen.sh, deprecated flags; use INSTALL_ROOT
+
 2010-11-01 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 2.0
 
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"