5 files changed, 58 insertions, 20 deletions

diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index f644e39af29c..843c15b4487f 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xkeyboard-config
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	x11
 MASTER_SITES=	http://xlibs.freedesktop.org/xkbdesc/
 DISTNAME=	xkeyboard-config-${PORTVERSION}
@@ -15,8 +14,7 @@ DISTNAME=	xkeyboard-config-${PORTVERSION}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Keyboard Configuration Database
 
-BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp \
-		${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
 # XXX - sigh
 PREFIX=		${X11BASE}
@@ -24,11 +22,14 @@ PREFIX=		${X11BASE}
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
+USE_GNOME=	intlhack
 USE_GETTEXT=	yes
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-xkb-base=${PREFIX}/share/X11/xkb \
+CONFIGURE_ARGS=	--with-xkb-base=${PREFIX}/share/X11/xkb \
 			--with-xkb-rules-symlink=xorg
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-install:
 	${MKDIR} /var/lib/xkb
diff --git a/x11/xkeyboard-config/distinfo b/x11/xkeyboard-config/distinfo
index 2ad7f7527dd8..725911b0f6da 100644
--- a/x11/xkeyboard-config/distinfo
+++ b/x11/xkeyboard-config/distinfo
@@ -1,3 +1,3 @@
-MD5 (xkeyboard-config-1.0.tar.bz2) = bcf08a6bf76bd5661f730d36a1d66517
-SHA256 (xkeyboard-config-1.0.tar.bz2) = 44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb
-SIZE (xkeyboard-config-1.0.tar.bz2) = 534180
+MD5 (xkeyboard-config-1.2.tar.bz2) = 667c582a54d5715d24110c20e8c4be38
+SHA256 (xkeyboard-config-1.2.tar.bz2) = 64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7
+SIZE (xkeyboard-config-1.2.tar.bz2) = 586629
diff --git a/x11/xkeyboard-config/files/patch-configure b/x11/xkeyboard-config/files/patch-configure
new file mode 100644
index 000000000000..c7d7ce26efb3
--- /dev/null
+++ b/x11/xkeyboard-config/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-02-08 23:52:05.000000000 -0500
++++ configure	2008-02-08 23:52:12.000000000 -0500
+@@ -7456,7 +7456,7 @@ else
+   echo "    Symbolic link(s) to legacy rules: $xkb_rules_symlink"
+ fi
+ 
+-if test "$enable_compat_rules" == "yes" ; then
++if test "$enable_compat_rules" = "yes" ; then
+   echo "    Compatibility rules are included"
+ else
+   echo "    Compatibility rules are not included"
diff --git a/x11/xkeyboard-config/files/patch-intltool-merge.in b/x11/xkeyboard-config/files/patch-intltool-merge.in
deleted file mode 100644
index 32de637e9f5a..000000000000
--- a/x11/xkeyboard-config/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	2007-12-03 07:58:17.000000000 +0900
-+++ intltool-merge.in	2007-12-03 08:00:47.000000000 +0900
-@@ -91,7 +91,7 @@
- 
- my %po_files_by_lang = ();
- my %translations = ();
--my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "/usr/bin/iconv";
-+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
- 
- # Use this instead of \w for XML files to handle more possible characters.
- my $w = "[-A-Za-z0-9._:]";
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index e86940e9f01d..9799efb0a4ec 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -13,6 +13,7 @@ share/X11/xkb/compat/level5
 share/X11/xkb/compat/misc
 share/X11/xkb/compat/mousekeys
 share/X11/xkb/compat/norepeat
+share/X11/xkb/compat/olpc
 share/X11/xkb/compat/pc
 share/X11/xkb/compat/pc98
 share/X11/xkb/compat/xfree86
@@ -133,6 +134,7 @@ share/X11/xkb/symbols/digital_vndr/vt
 share/X11/xkb/symbols/fujitsu_vndr/jp
 share/X11/xkb/symbols/fujitsu_vndr/us
 share/X11/xkb/symbols/hp_vndr/us
+share/X11/xkb/symbols/kpdl
 share/X11/xkb/symbols/macintosh_vndr/apple
 share/X11/xkb/symbols/macintosh_vndr/ch
 share/X11/xkb/symbols/macintosh_vndr/de
@@ -150,7 +152,9 @@ share/X11/xkb/symbols/macintosh_vndr/pt
 share/X11/xkb/symbols/macintosh_vndr/se
 share/X11/xkb/symbols/macintosh_vndr/us
 share/X11/xkb/symbols/nec_vndr/jp
+share/X11/xkb/symbols/olpc
 share/X11/xkb/symbols/sgi_vndr/jp
+share/X11/xkb/symbols/shift
 share/X11/xkb/symbols/sony_vndr/us
 share/X11/xkb/symbols/sun_vndr/cs
 share/X11/xkb/symbols/sun_vndr/cz
@@ -198,7 +202,7 @@ share/X11/xkb/symbols/by
 share/X11/xkb/symbols/ca
 share/X11/xkb/symbols/cd
 share/X11/xkb/symbols/ch
-share/X11/xkb/symbols/cs
+share/X11/xkb/symbols/cn
 share/X11/xkb/symbols/cz
 share/X11/xkb/symbols/de
 share/X11/xkb/symbols/dk
@@ -212,6 +216,7 @@ share/X11/xkb/symbols/fr
 share/X11/xkb/symbols/gb
 share/X11/xkb/symbols/ge
 share/X11/xkb/symbols/gh
+share/X11/xkb/symbols/gn
 share/X11/xkb/symbols/gr
 share/X11/xkb/symbols/hr
 share/X11/xkb/symbols/hu
@@ -235,6 +240,7 @@ share/X11/xkb/symbols/lt
 share/X11/xkb/symbols/lv
 share/X11/xkb/symbols/ma
 share/X11/xkb/symbols/mao
+share/X11/xkb/symbols/me
 share/X11/xkb/symbols/mk
 share/X11/xkb/symbols/mm
 share/X11/xkb/symbols/mn
@@ -250,6 +256,7 @@ share/X11/xkb/symbols/pk
 share/X11/xkb/symbols/pl
 share/X11/xkb/symbols/pt
 share/X11/xkb/symbols/ro
+share/X11/xkb/symbols/rs
 share/X11/xkb/symbols/ru
 share/X11/xkb/symbols/se
 share/X11/xkb/symbols/si
@@ -289,6 +296,34 @@ share/X11/xkb/types/numpad
 share/X11/xkb/types/pc
 share/X11/xkb/types/README
 share/X11/xkb/xkbcomp
+share/locale/af/LC_MESSAGES/xkeyboard-config.mo
+share/locale/az/LC_MESSAGES/xkeyboard-config.mo
+share/locale/bg/LC_MESSAGES/xkeyboard-config.mo
+share/locale/cs/LC_MESSAGES/xkeyboard-config.mo
+share/locale/da/LC_MESSAGES/xkeyboard-config.mo
+share/locale/el/LC_MESSAGES/xkeyboard-config.mo
+share/locale/en_GB/LC_MESSAGES/xkeyboard-config.mo
+share/locale/es/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/fr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/hu/LC_MESSAGES/xkeyboard-config.mo
+share/locale/it/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ka/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ko/LC_MESSAGES/xkeyboard-config.mo
+share/locale/nl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/ru/LC_MESSAGES/xkeyboard-config.mo
+share/locale/rw/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sl/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sq/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sr@Latn/LC_MESSAGES/xkeyboard-config.mo
+share/locale/sv/LC_MESSAGES/xkeyboard-config.mo
+share/locale/tr/LC_MESSAGES/xkeyboard-config.mo
+share/locale/uk/LC_MESSAGES/xkeyboard-config.mo
+share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
+share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
 @exec mkdir -p /var/lib/xkb
 @dirrm share/X11/xkb/compat
 @dirrm share/X11/xkb/geometry/digital_vndr
@@ -317,3 +352,5 @@ share/X11/xkb/xkbcomp
 @dirrm share/X11/xkb
 @dirrmtry share/X11
 @dirrmtry /var/lib/xkb
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw