head	1.5;
access;
symbols
	pkgsrc-2013Q2:1.5.0.8
	pkgsrc-2013Q2-base:1.5
	pkgsrc-2012Q4:1.5.0.6
	pkgsrc-2012Q4-base:1.5
	pkgsrc-2011Q4:1.5.0.4
	pkgsrc-2011Q4-base:1.5
	pkgsrc-2011Q2:1.5.0.2
	pkgsrc-2011Q2-base:1.5
	pkgsrc-2010Q3:1.4.0.2
	pkgsrc-2010Q3-base:1.4
	pkgsrc-2010Q1:1.2.0.24
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.22
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.20
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.18
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.16
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.14
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.12
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.10
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.8
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.6
	pkgsrc-2008Q1:1.2.0.4
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.2
	pkgsrc-2007Q4-base:1.2
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2010.10.16.13.13.18;	author ghen;	state dead;
branches;
next	1.4;

1.4
date	2010.09.01.12.55.50;	author wiz;	state Exp;
branches;
next	1.3;

1.3
date	2010.06.01.13.14.25;	author ghen;	state dead;
branches;
next	1.2;

1.2
date	2007.12.19.04.10.44;	author bjs;	state Exp;
branches;
next	1.1;

1.1
date	2007.12.18.00.28.14;	author bjs;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2007.12.18.00.28.14;	author bjs;	state Exp;
branches;
next	;


desc
@@


1.5
log
@Update to xkeyboard-config 2.0.

Changes: Bugfixes (17), updated/new translations, some new layouts and models.

pkgsrc: 4 patches included upstream.
@
text
@$NetBSD: patch-aa,v 1.4 2010/09/01 12:55:50 wiz Exp $

Fix syntax error.
https://bugs.freedesktop.org/show_bug.cgi?id=29887

--- symbols/in.orig	2010-03-08 23:08:20.000000000 +0000
+++ symbols/in
@@@@ -85,7 +85,7 @@@@ xkb_symbols "deva" {
 	key <AB10> { [ U092f, U095f, slash, question ] };
 
 	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
-	include "nbsp(zwnj3zwj4)";
+	include "nbsp(zwnj3zwj4)"
 };
 
 //Name		:	Bolnagri (Combined)
@@@@ -1263,7 +1263,7 @@@@ xkb_symbols "olpc" {
   key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
 
   // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
-  include "nbsp(zwnj3zwj4)";
+  include "nbsp(zwnj3zwj4)"
 
   include "group(olpc)"
 };
@


1.4
log
@Fix syntax error in some layout files. From Pouya D. Tafti on pkgsrc-users.
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.3
log
@Update xkeyboard-config to 1.9 (two years worth of updates/fixes/...).

Pkgsrc patches (bashisms) have been included upstream.
@
text
@d1 1
a1 1
$NetBSD: patch-aa,v 1.2 2007/12/19 04:10:44 bjs Exp $
d3 20
a22 4
--- rules/merge.sh.orig	2007-12-18 18:04:26.000000000 -0500
+++ rules/merge.sh
@@@@ -11,7 +11,7 @@@@ basename=`basename $0`
 echo "// DO NOT EDIT THIS FILE - IT WAS AUTOGENERATED BY $basename FROM rules/*.part" >$DEST
d24 2
a25 6
 for i in $*; do
-  if [ "$i" == "$HDR" ] || [ "$i" == "HDR" ]; then
+  if [ "$i" = "$HDR" ] || [ "$i" = "HDR" ]; then
     echo >> $DEST;
     read hdr
     echo "$hdr" >> $DEST
@


1.2
log
@
Fix this so that it works with the snapshot I provided.  Bump rev.
Tested by me with xorg-server-1.4.0.90.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Initial revision
@
text
@d3 11
a13 10
--- rules/base.o_s.part.orig	2007-07-16 04:24:28.000000000 -0400
+++ rules/base.o_s.part
@@@@ -64,6 +64,7 @@@@
   keypad:legacy_wang         =	+keypad(legacy_wang)
   keypad:oss_wang         =	+keypad(oss_wang)
   keypad:future_wang         =	+keypad(future_wang)
+  keypad:comma          =       +keypad(comma)
   nbsp:none             =	+nbsp(none)
   nbsp:level2           =	+nbsp(level2)
   nbsp:level3           =	+nbsp(level3)
@


1.1.1.1
log
@

Import xkeyboard-config-20071217 (snapshot is better than maintaining
a thousand patches).  This is required for the upcoming 
modular-xorg-server-1.4.0.90 package.
@
text
@@