CVS commit: src/external/mit/xorg/lib/xkeyboard-config

2010-06-04 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Fri Jun  4 10:22:25 UTC 2010

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile

Log Message:
A suggestion from veego to fix it (taken from ../../include/fontsproto).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/xkeyboard-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5	Thu Jun  3 20:48:48 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Fri Jun  4 10:22:25 2010
@@ -1,8 +1,11 @@
-#	$NetBSD: Makefile,v 1.5 2010/06/03 20:48:48 ghen Exp $
+#	$NetBSD: Makefile,v 1.6 2010/06/04 10:22:25 ghen Exp $
 
 SUBDIR=		compat geometry keycodes keymap rules semantics symbols types
 
+NOOBJ=		# defined
+
 PKGCONFIG=	xkeyboard-config
 
 .include bsd.x11.mk
+.include bsd.prog.mk
 .include bsd.subdir.mk



CVS commit: src/external/mit/xorg/lib/xkeyboard-config

2010-06-03 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Thu Jun  3 10:38:34 UTC 2010

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile

Log Message:
.include bsd.lib.mk to handle the pkgconfig file correctly.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/xkeyboard-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.4
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.3	Fri May 28 13:01:23 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Thu Jun  3 10:38:34 2010
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2010/05/28 13:01:23 ghen Exp $
+#	$NetBSD: Makefile,v 1.4 2010/06/03 10:38:34 ghen Exp $
 
 SUBDIR=		compat geometry keycodes keymap rules semantics symbols types
 
 PKGCONFIG=	xkeyboard-config
 
 .include bsd.x11.mk
+.include bsd.lib.mk
 .include bsd.subdir.mk



CVS commit: src/external/mit/xorg/lib/xkeyboard-config

2010-06-03 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Thu Jun  3 20:48:48 UTC 2010

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile

Log Message:
Revert previous.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/xkeyboard-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.4 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.5
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.4	Thu Jun  3 10:38:34 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Thu Jun  3 20:48:48 2010
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2010/06/03 10:38:34 ghen Exp $
+#	$NetBSD: Makefile,v 1.5 2010/06/03 20:48:48 ghen Exp $
 
 SUBDIR=		compat geometry keycodes keymap rules semantics symbols types
 
 PKGCONFIG=	xkeyboard-config
 
 .include bsd.x11.mk
-.include bsd.lib.mk
 .include bsd.subdir.mk



CVS commit: src/external/mit/xorg/lib/xkeyboard-config

2010-06-03 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Thu Jun  3 20:48:48 UTC 2010

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config: Makefile

Log Message:
Revert previous.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/xkeyboard-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/xkeyboard-config/dist/rules

2010-05-29 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Sat May 29 07:58:35 UTC 2010

Removed Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base base.lst evdev
evdev.lst

Log Message:
Move compiled files from dist directory to reachover directory (suggested
by mrg).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base.lst \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/evdev

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules

2010-05-29 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Sat May 29 07:58:24 UTC 2010

Modified Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile
Added Files:
src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
evdev.lst

Log Message:
Move compiled files from dist directory to reachover directory (suggested
by mrg).  Add a note in the Makefile for future upgrades.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xkeyboard-config/rules/base \
src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \
src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 09:50:36 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir

Log Message:
Restore original (1.4 distfile) order to ease merges.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5
--- xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.4	Tue May 25 13:12:51 2010
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir	Fri May 28 09:50:36 2010
@@ -1,3 +1,5 @@
+-dp- a--- mn(basic)
+--p- a--- mn(olpc)
 --p- -m-- compose(ralt)
 --p- -m-- compose(lwin)
 --p- -m-- compose(rwin)
@@ -5,12 +7,6 @@
 --p- -m-- compose(rctrl)
 --p- -m-- compose(caps)
 --p- -m-- compose(102)
--dp- a--- mn(basic)
---p- a--- mn(olpc)
---p-  eurosign(e)
---p-  eurosign(2)
---p-  eurosign(4)
---p-  eurosign(5)
 -d--  de(basic)
 --p- a--- de(nodeadkeys)
 --p- a--- de(deadgraveacute)
@@ -32,10 +28,10 @@
 --p- a--- ro(std)
 --p- a--- ro(std_cedilla)
 --p- a--- ro(winkeys)
---p- --kf srvr_ctrl(xfree86)
---p- --k- srvr_ctrl(stdkeypad)
---p- ---f srvr_ctrl(fkey2vt)
---p- --kf srvr_ctrl(no_srvr_keys)
+--p-  eurosign(e)
+--p-  eurosign(2)
+--p-  eurosign(4)
+--p-  eurosign(5)
 -dp- a--- me(basic)
 --p- a--- me(cyrillic)
 --p- a--- me(cyrillicyz)
@@ -71,7 +67,10 @@
 --p- a--- be(Sundeadkeys)
 --p- a--- be(nodeadkeys)
 --p- a--- be(wang)
-  sony_vndr/us(nwp5461)
+--p- --kf srvr_ctrl(xfree86)
+--p- --k- srvr_ctrl(stdkeypad)
+--p- ---f srvr_ctrl(fkey2vt)
+--p- --kf srvr_ctrl(no_srvr_keys)
 -dp- a--- ba(basic)
 --p- a--- ba(us)
 --p- a--- ba(alternatequotes)
@@ -101,9 +100,35 @@
 --p- a---g--- gr(extended)
 --p- a---g--- gr(polytonic)
 --p- a---g--- gr(nodeadkeys)
--dp-  sun_vndr/solaris(defaults)
---p-  sun_vndr/solaris(keynames)
---p-  sun_vndr/solaris(xf86keynames)
+  sony_vndr/us(nwp5461)
+-dp-  hu(basic)
+--p-  hu(standard)
+--p-  hu(nodeadkeys)
+--p-  hu(qwerty)
+--p-  hu(101_qwertz_comma_dead)
+--p-  hu(101_qwertz_comma_nodead)
+--p-  hu(101_qwertz_dot_dead)
+--p-  hu(101_qwertz_dot_nodead)
+--p-  hu(101_qwerty_comma_dead)
+--p-  hu(101_qwerty_comma_nodead)
+--p-  hu(101_qwerty_dot_dead)
+--p-  hu(101_qwerty_dot_nodead)
+--p-  hu(102_qwertz_comma_dead)
+--p-  hu(102_qwertz_comma_nodead)
+--p-  hu(102_qwertz_dot_dead)
+--p-  hu(102_qwertz_dot_nodead)
+--p-  hu(102_qwerty_comma_dead)
+--p-  hu(102_qwerty_comma_nodead)
+--p-  hu(102_qwerty_dot_dead)
+--p-  hu(102_qwerty_dot_nodead)
+h-p- a--- hu(def_102)
+h-p- a--- hu(def_101)
+h-p- a--- hu(def_qwertz)
+h-p- a--- hu(def_qwerty)
+h-p- --k- hu(def_dot)
+h-p- a--- hu(def_dead)
+h-p- a--- hu(def_nodead)
+h-p- a--- hu(def_common)
   sun_vndr/de(type4)
   sun_vndr/fi(basic)
   sun_vndr/ko(type4)
@@ -117,6 +142,9 @@
   sun_vndr/gr(type5)
 -dp- a--- sun_vndr/hu(type5)
   sun_vndr/cz(type5)
+-dp-  sun_vndr/solaris(defaults)
+--p-  sun_vndr/solaris(keynames)
+--p-  sun_vndr/solaris(xf86keynames)
 -dp- a--- sun_vndr/lt(type5)
   sun_vndr/jp(basic)
   sun_vndr/jp(type4)
@@ -180,35 +208,6 @@
   sun_vndr/usb(sun_usb)
   sun_vndr/ru(basic)
 --p-  sun_vndr/ru(type6)
--dp-  hu(basic)
---p-  hu(standard)
---p-  hu(nodeadkeys)
---p-  hu(qwerty)
---p-  hu(101_qwertz_comma_dead)
---p-  hu(101_qwertz_comma_nodead)
---p-  hu(101_qwertz_dot_dead)
---p-  hu(101_qwertz_dot_nodead)
---p-  hu(101_qwerty_comma_dead)
---p-  hu(101_qwerty_comma_nodead)
---p-  hu(101_qwerty_dot_dead)
---p-  hu(101_qwerty_dot_nodead)
---p-  hu(102_qwertz_comma_dead)
---p-  hu(102_qwertz_comma_nodead)
---p- 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 09:55:02 UTC 2010

Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10477

Log Message:
Initial import of xkeyboard-config-1.9

Status:

Vendor Tag: xorg
Release Tags:   xkeyboard-config-1-9

U xsrc/external/mit/xkeyboard-config/dist/install-sh
U xsrc/external/mit/xkeyboard-config/dist/configure.in
U xsrc/external/mit/xkeyboard-config/dist/xkbrules.am
U xsrc/external/mit/xkeyboard-config/dist/missing
U xsrc/external/mit/xkeyboard-config/dist/README
U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4
U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in
U xsrc/external/mit/xkeyboard-config/dist/configure
U xsrc/external/mit/xkeyboard-config/dist/autogen.sh
U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS
U xsrc/external/mit/xkeyboard-config/dist/COPYING
N xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in
U xsrc/external/mit/xkeyboard-config/dist/config.rpath
U xsrc/external/mit/xkeyboard-config/dist/CREDITS
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec.in
U xsrc/external/mit/xkeyboard-config/dist/TODO
U xsrc/external/mit/xkeyboard-config/dist/NEWS
U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in
U xsrc/external/mit/xkeyboard-config/dist/Makefile.am
U xsrc/external/mit/xkeyboard-config/dist/Makefile.in
U xsrc/external/mit/xkeyboard-config/dist/AUTHORS
U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in
U xsrc/external/mit/xkeyboard-config/dist/ChangeLog
U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.spec
U xsrc/external/mit/xkeyboard-config/dist/symbols/compose
U xsrc/external/mit/xkeyboard-config/dist/symbols/mn
U xsrc/external/mit/xkeyboard-config/dist/symbols/de
U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign
U xsrc/external/mit/xkeyboard-config/dist/symbols/il
U xsrc/external/mit/xkeyboard-config/dist/symbols/ro
U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/me
U xsrc/external/mit/xkeyboard-config/dist/symbols/mm
U xsrc/external/mit/xkeyboard-config/dist/symbols/ma
U xsrc/external/mit/xkeyboard-config/dist/symbols/fi
N xsrc/external/mit/xkeyboard-config/dist/symbols/tz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bt
U xsrc/external/mit/xkeyboard-config/dist/symbols/ie
U xsrc/external/mit/xkeyboard-config/dist/symbols/be
U xsrc/external/mit/xkeyboard-config/dist/symbols/ba
U xsrc/external/mit/xkeyboard-config/dist/symbols/ng
U xsrc/external/mit/xkeyboard-config/dist/symbols/af
U xsrc/external/mit/xkeyboard-config/dist/symbols/dk
U xsrc/external/mit/xkeyboard-config/dist/symbols/fo
U xsrc/external/mit/xkeyboard-config/dist/symbols/gr
U xsrc/external/mit/xkeyboard-config/dist/symbols/hu
U xsrc/external/mit/xkeyboard-config/dist/symbols/kh
U xsrc/external/mit/xkeyboard-config/dist/symbols/az
U xsrc/external/mit/xkeyboard-config/dist/symbols/ge
U xsrc/external/mit/xkeyboard-config/dist/symbols/altwin
U xsrc/external/mit/xkeyboard-config/dist/symbols/et
U xsrc/external/mit/xkeyboard-config/dist/symbols/br
N xsrc/external/mit/xkeyboard-config/dist/symbols/typo
U xsrc/external/mit/xkeyboard-config/dist/symbols/kz
U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl
N xsrc/external/mit/xkeyboard-config/dist/symbols/bw
U xsrc/external/mit/xkeyboard-config/dist/symbols/cn
N xsrc/external/mit/xkeyboard-config/dist/symbols/terminate
U xsrc/external/mit/xkeyboard-config/dist/symbols/ctrl
U xsrc/external/mit/xkeyboard-config/dist/symbols/lk
U xsrc/external/mit/xkeyboard-config/dist/symbols/cz
U xsrc/external/mit/xkeyboard-config/dist/symbols/bg
U xsrc/external/mit/xkeyboard-config/dist/symbols/sk
U xsrc/external/mit/xkeyboard-config/dist/symbols/lt
N xsrc/external/mit/xkeyboard-config/dist/symbols/sn
U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad
U xsrc/external/mit/xkeyboard-config/dist/symbols/gn
U xsrc/external/mit/xkeyboard-config/dist/symbols/rs
U xsrc/external/mit/xkeyboard-config/dist/symbols/jp
U xsrc/external/mit/xkeyboard-config/dist/symbols/latam
U xsrc/external/mit/xkeyboard-config/dist/symbols/hr
N xsrc/external/mit/xkeyboard-config/dist/symbols/brai
C xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
U xsrc/external/mit/xkeyboard-config/dist/symbols/sy
U xsrc/external/mit/xkeyboard-config/dist/symbols/level5
U xsrc/external/mit/xkeyboard-config/dist/symbols/am
U xsrc/external/mit/xkeyboard-config/dist/symbols/latin
U xsrc/external/mit/xkeyboard-config/dist/symbols/kr
U xsrc/external/mit/xkeyboard-config/dist/symbols/no
U xsrc/external/mit/xkeyboard-config/dist/symbols/mv
U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc
U xsrc/external/mit/xkeyboard-config/dist/symbols/ua
U xsrc/external/mit/xkeyboard-config/dist/symbols/al
U xsrc/external/mit/xkeyboard-config/dist/symbols/iq
U xsrc/external/mit/xkeyboard-config/dist/symbols/pc
U xsrc/external/mit/xkeyboard-config/dist/symbols/lv
U 

CVS commit: xsrc/external/mit/xkeyboard-config/dist

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 10:01:08 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
symbols.dir
Added Files:
xsrc/external/mit/xkeyboard-config/dist/rules: base.lo_s.part
base.o_k.part
Removed Files:
xsrc/external/mit/xkeyboard-config/dist/po: s...@latn.po
xsrc/external/mit/xkeyboard-config/dist/rules: base base.l2_s.part
base.l3_s.part base.l4_s.part base.lst evdev evdev.lst
xsrc/external/mit/xkeyboard-config/dist/rules/compat: layoutRename.lst
ln_s.sh lnv_s.sh ml1_s.sh ml1v1_s.sh ml1v_s.sh ml_s.sh mlv_s.sh
variantRename.lst
xsrc/external/mit/xkeyboard-config/dist/symbols: braille
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr: es
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr: cs hu ko sw
usb

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/po/s...@latn.po
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/xkeyboard-config/dist/rules/base
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l2_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l3_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.l4_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev \
xsrc/external/mit/xkeyboard-config/dist/rules/evdev.lst
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part \
xsrc/external/mit/xkeyboard-config/dist/rules/base.o_k.part
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/base.lst
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/layoutRename.lst
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ln_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/lnv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v1_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml1v_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/ml_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/mlv_s.sh \
xsrc/external/mit/xkeyboard-config/dist/rules/compat/variantRename.lst
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/braille
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/macintosh_vndr/es
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/cs \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/hu \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/ko \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/sw \
xsrc/external/mit/xkeyboard-config/dist/symbols/sun_vndr/usb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.3
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.2	Sun Dec 13 04:54:51 2009
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Fri May 28 10:01:08 2010
@@ -1,12 +1,12 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr extras
 
 symbolsdir = $(xkb_base)/symbols
 dist_symbols_DATA = \
 ad af al \
 am ara az \
-be bd \
-bg br ba \
-bt by braille \
+ba bd be \
+bg br brai \
+bt bw by \
 ca cd \
 ch cn cz \
 de dk \
@@ -16,21 +16,24 @@
 gr hr hu \
 ie il in iq \
 ir is it jp \
-kg kh kr kz \
+ke kg kh \
+kr kz \
 la latam latin \
 lk lt lv \
-ma mao me mk \
-mm mn mt mv \
+ma mao me \
+mk ml mm \
+mn mt mv \
 ng nl no np \
 pc pk pl pt \
 ro rs ru \
-se si sk \
+se si sk sn \
 sy th \
-tj tr \
+terminate \
+tj tm tr tz \
 ua us uz vn \
 za \
-altwin capslock compose ctrl eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
+altwin capslock compose ctrl empty eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
 dir_data = $(dist_symbols_DATA)
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir:1.6
--- 

CVS commit: src

2010-05-28 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Fri May 28 12:38:35 UTC 2010

Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/xkeyboard-config: Makefile
src/external/mit/xorg/lib/xkeyboard-config/compat: Makefile
src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile
src/external/mit/xorg/lib/xkeyboard-config/keycodes: Makefile
src/external/mit/xorg/lib/xkeyboard-config/rules: Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr:
Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr: Makefile
src/external/mit/xorg/lib/xkeyboard-config/types: Makefile
Added Files:
src/external/mit/xorg/lib/xkeyboard-config/symbols/extras: Makefile
src/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr: Makefile

Log Message:
Update to xkeyboard-config 1.4.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/compat/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/keycodes/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/extras/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/macintosh_vndr/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/nokia_vndr/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/symbols/sun_vndr/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/lib/xkeyboard-config/types/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.92 src/distrib/sets/lists/xbase/mi:1.93
--- src/distrib/sets/lists/xbase/mi:1.92	Tue May 25 13:13:55 2010
+++ src/distrib/sets/lists/xbase/mi	Fri May 28 12:38:34 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.92 2010/05/25 13:13:55 nonaka Exp $
+# $NetBSD: mi,v 1.93 2010/05/28 12:38:34 ghen Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -1845,6 +1845,7 @@
 ./usr/X11R7/lib/X11/xkb/compat/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/accessx			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/basic			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/compat/caps			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/complete			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/default			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/compat/iso9995			-unknown-	xorg
@@ -1889,6 +1890,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/macintosh		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/microsoft		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/nec			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/geometry/nokia			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/northgate		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/pc			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi			-obsolete-	obsolete
@@ -1902,6 +1904,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/sony			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sun			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/thinkpad		-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/geometry/typematrix		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/winbook		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes			base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes.dir			-unknown-	xorg
@@ -1915,6 +1918,7 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr		base-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/lk	-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/pc	-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/keycodes/empty			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/evdev			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/fujitsu		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/hp			-unknown-	xorg
@@ -2025,9 +2029,11 @@
 ./usr/X11R7/lib/X11/xkb/rulesbase-x11-root	xorg
 ./usr/X11R7/lib/X11/xkb/rules/README			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/base			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/rules/base.extras.xml		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/base.lst			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/base.xml			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/evdev			-unknown-	xorg
+./usr/X11R7/lib/X11/xkb/rules/evdev.extras.xml		-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/evdev.lst			-unknown-	xorg
 ./usr/X11R7/lib/X11/xkb/rules/evdev.xml			

CVS commit: src

2010-05-28 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Fri May 28 13:01:23 UTC 2010

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/xkeyboard-config: Makefile

Log Message:
Install pkgconfig file for xkeyboard-config.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.109 src/distrib/sets/lists/xcomp/mi:1.110
--- src/distrib/sets/lists/xcomp/mi:1.109	Sun May 23 21:32:50 2010
+++ src/distrib/sets/lists/xcomp/mi	Fri May 28 13:01:23 2010
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.109 2010/05/23 21:32:50 mrg Exp $
+#	 $NetBSD: mi,v 1.110 2010/05/28 13:01:23 ghen Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -6320,6 +6320,7 @@
 ./usr/X11R7/lib/pkgconfig/xineramaproto.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xkbfile.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xkbui.pc			-unknown-	xorg
+./usr/X11R7/lib/pkgconfig/xkeyboard-config.pc		-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xmu.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xmuu.pc			-unknown-	xorg
 ./usr/X11R7/lib/pkgconfig/xorg-server.pc		-unknown-	xorg

Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.2 src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.3
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile:1.2	Fri May 28 12:38:34 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile	Fri May 28 13:01:23 2010
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2010/05/28 12:38:34 ghen Exp $
+#	$NetBSD: Makefile,v 1.3 2010/05/28 13:01:23 ghen Exp $
 
 SUBDIR=		compat geometry keycodes keymap rules semantics symbols types
 
 PKGCONFIG=	xkeyboard-config
 
+.include bsd.x11.mk
 .include bsd.subdir.mk



CVS commit: src/etc/mtree

2010-05-28 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Fri May 28 17:17:12 UTC 2010

Modified Files:
src/etc/mtree: NetBSD.dist.Xorg

Log Message:
Update to xkeyboard-config 1.9.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.Xorg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.7 src/etc/mtree/NetBSD.dist.Xorg:1.8
--- src/etc/mtree/NetBSD.dist.Xorg:1.7	Sat May 22 23:19:45 2010
+++ src/etc/mtree/NetBSD.dist.Xorg	Fri May 28 17:17:12 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.Xorg,v 1.7 2010/05/22 23:19:45 mrg Exp $
+#	$NetBSD: NetBSD.dist.Xorg,v 1.8 2010/05/28 17:17:12 ghen Exp $
 
 ./usr/X11R7
 ./usr/X11R7/bin
@@ -131,10 +131,12 @@
 ./usr/X11R7/lib/X11/xkb/semantics
 ./usr/X11R7/lib/X11/xkb/symbols
 ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr
+./usr/X11R7/lib/X11/xkb/symbols/extras
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/hp_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr
+./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr
 ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr



CVS commit: xsrc/external/mit/xkeyboard-config/dist/symbols

2010-05-28 Thread Geert Hendrickx
Module Name:xsrc
Committed By:   ghen
Date:   Fri May 28 09:50:36 UTC 2010

Modified Files:
xsrc/external/mit/xkeyboard-config/dist/symbols: symbols.dir

Log Message:
Restore original (1.4 distfile) order to ease merges.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xkeyboard-config/dist/symbols/symbols.dir

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/etc/mtree

2010-05-28 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Fri May 28 17:17:12 UTC 2010

Modified Files:
src/etc/mtree: NetBSD.dist.Xorg

Log Message:
Update to xkeyboard-config 1.9.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/mtree/NetBSD.dist.Xorg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: [netbsd-5-0] src/doc

2010-01-18 Thread Geert Hendrickx
On Sat, Jan 16, 2010 at 05:54:33PM +, Manuel Bouyer wrote:
 Module Name:  src
 Committed By: bouyer
 Date: Sat Jan 16 17:54:33 UTC 2010
 
 Modified Files:
   src/doc [netbsd-5-0]: CHANGES-5.0.1
 
 Log Message:
 tickets 1238, 1240,1241
 


This should have been added to CHANGES-5.0.2 instead?


Geert



-- 
Geert Hendrickx  -=-  g...@telenet.be  -=-  PGP: 0xC4BB9E9F
This e-mail was composed using 100% recycled spam messages!


CVS commit: src/external/bsd/iscsi/dist/src/initiator

2009-11-08 Thread Geert Hendrickx
Module Name:src
Committed By:   ghen
Date:   Sun Nov  8 15:33:21 UTC 2009

Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c

Log Message:
Add missing newline.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.4
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3	Thu Jul 23 04:32:13 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c	Sun Nov  8 15:33:21 2009
@@ -619,7 +619,7 @@
 		}
 	}
 	if (iscsi_initiator_getvar(ini, user) == NULL) {
-		iscsi_err(__FILE__, __LINE__, user must be specified with -u);
+		iscsi_err(__FILE__, __LINE__, user must be specified with -u\n);
 		exit(EXIT_FAILURE);
 	}