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-ab,v 1.4 2010/09/01 12:55:50 wiz Exp $

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

--- symbols/ir.orig	2010-02-01 23:00:18.000000000 +0000
+++ symbols/ir
@@@@ -18,11 +18,11 @@@@ partial default alphanumeric_keys
 xkb_symbols "pes" {
     name[Group1]= "Iran";
 
-    include "ir(pes_part_basic)";
-    include "ir(pes_part_ext)";
+    include "ir(pes_part_basic)"
+    include "ir(pes_part_ext)"
 
-    include "nbsp(zwnj2nb3nnb4)";
-    include "level3(ralt_switch)";
+    include "nbsp(zwnj2nb3nnb4)"
+    include "level3(ralt_switch)"
 };
 
 
@@@@ -30,11 +30,11 @@@@ partial alphanumeric_keys
 xkb_symbols "pes_keypad" {
     name[Group1]= "Iran - Persian, with Persian Keypad";
 
-    include "ir(pes_part_basic)";
-    include "ir(pes_part_keypad)";
+    include "ir(pes_part_basic)"
+    include "ir(pes_part_keypad)"
 
-    include "nbsp(zwnj2nb3nnb4)";
-    include "level3(ralt_switch)";
+    include "nbsp(zwnj2nb3nnb4)"
+    include "level3(ralt_switch)"
 };
 
 partial hidden alphanumeric_keys
@


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-ab,v 1.2 2007/12/19 04:10:44 bjs Exp $
d3 37
a39 11
--- configure.in.orig	2007-10-02 17:51:04.000000000 -0400
+++ configure.in
@@@@ -91,7 +91,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"
@


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 28
--- rules/base.xml.in.orig	2007-09-26 07:56:42.000000000 -0400
+++ rules/base.xml.in
@@@@ -213,6 +213,12 @@@@
     </model>
     <model>
       <configItem>
+        <name>btc9116u</name>
+	<_description>BTC 9116U Mini Wireless Internet and Gaming</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>cherryblue</name>
         <_description>Cherry Blue Line CyBo@@rd</_description>
       </configItem>
@@@@ -3606,6 +3612,12 @@@@
       </option>
       <option>
         <configItem>
+          <name>keypad:comma</name>
+          <_description>Force standard comma keypad</_description>
+       </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>keypad:oss</name>
           <_description>Keypad with unicode additions (arrows and math operators)</_description>
        </configItem>
@


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
@@