From d206480695dfe52db583494b1cbf203eca621890 Mon Sep 17 00:00:00 2001
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Tue, 4 Jun 2013 21:22:13 +0000
Subject: Update to 2.9

Obtained from:	xorg development repo
---
 x11/xkeyboard-config/Makefile  | 7 +++----
 x11/xkeyboard-config/distinfo  | 4 ++--
 x11/xkeyboard-config/pkg-plist | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 8758fa187795..89a8256074bd 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	2.8
+PORTVERSION=	2.9
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -10,13 +10,12 @@ MASTER_SITE_SUBDIR=	individual/${XORG_CAT}/${PORTNAME}
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 XORG_CAT=	data
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	intlhack
+USE_GNOME=	intlhack libxslt:build
 USES=		pathfix
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 683ece1fdce3..e147c55fd1b4 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/data/xkeyboard-config-2.8.tar.bz2) = 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae
-SIZE (xorg/data/xkeyboard-config-2.8.tar.bz2) = 862678
+SHA256 (xorg/data/xkeyboard-config-2.9.tar.bz2) = 5e89bc182a10d53c3e83efc6c3546de0fe5504d91c3dbc80d55cc64ddab5643a
+SIZE (xorg/data/xkeyboard-config-2.9.tar.bz2) = 912379
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index 6529344aea0f..bf29a8ae8293 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -59,6 +59,7 @@ share/X11/xkb/keycodes/fujitsu
 share/X11/xkb/keycodes/hp
 share/X11/xkb/keycodes/ibm
 share/X11/xkb/keycodes/macintosh
+share/X11/xkb/keycodes/olpc
 share/X11/xkb/keycodes/sgi_vndr/indigo
 share/X11/xkb/keycodes/sgi_vndr/indy
 share/X11/xkb/keycodes/sgi_vndr/iris
@@ -302,6 +303,7 @@ share/X11/xkb/types/pc
 %%NLS%%share/locale/nb/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xkeyboard-config.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
 %%NLS%%share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0