[src/netbsd-3]: src/x11 Pull up revision 1.4 (requested by jmc in ticket #114):

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7c3e84094c0f
branches:  netbsd-3
changeset: 575226:7c3e84094c0f
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 06 21:37:57 2005 +0000

description:
Pull up revision 1.4 (requested by jmc in ticket #114):
The last of the changes for missing files in i386 vs xsrc.
+ build libafb for i386 (like xsrc does)
+ hook getconfig into the build
+ add new input driver acecad
+ add new xkb symbols
+ add new font encodings
It should be safe to update the set lists for i386 now.

diffstat:

 x11/Xserver/hw/xfree86/input/Makefile    |   4 ++--
 x11/bin/xkbcomp/symbols/pc/Makefile      |  14 +++++++-------
 x11/share/fonts/encodings/Makefile       |   6 +++---
 x11/share/fonts/encodings/large/Makefile |   5 +++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diffs (85 lines):

diff -r b52b7de47f01 -r 7c3e84094c0f x11/Xserver/hw/xfree86/input/Makefile
--- a/x11/Xserver/hw/xfree86/input/Makefile     Wed Apr 06 21:37:52 2005 +0000
+++ b/x11/Xserver/hw/xfree86/input/Makefile     Wed Apr 06 21:37:57 2005 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: Makefile,v 1.3 2004/07/13 09:29:45 sekiya Exp $
+#      $NetBSD: Makefile,v 1.3.4.1 2005/04/06 21:37:57 tron Exp $
 
-SUBDIR=        mouse calcomp citron digitaledge dmc dynapro elographics fpit \
+SUBDIR=        acecad mouse calcomp citron digitaledge dmc dynapro elographics fpit \
        hyperpen js_x kbd magellan microtouch mutouch palmax penmount \
        spaceorb summa tek4957 void wacom
 
diff -r b52b7de47f01 -r 7c3e84094c0f x11/bin/xkbcomp/symbols/pc/Makefile
--- a/x11/bin/xkbcomp/symbols/pc/Makefile       Wed Apr 06 21:37:52 2005 +0000
+++ b/x11/bin/xkbcomp/symbols/pc/Makefile       Wed Apr 06 21:37:57 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/04/28 14:17:56 lukem Exp $
+#      $NetBSD: Makefile,v 1.3.4.1 2005/04/06 21:37:57 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -8,20 +8,20 @@
                cz cz_qwerty \
                de dev dk dvorak dz \
                ee el en_US es \
-               fi fr fr-latin9 \
+               fi fo fr fr-latin9 \
                gb ge_la ge_ru guj gur \
-               hr \
+               hr hsb hu \
                ie il il_phonetic ir is it iu \
-               kan \
-               la latin lo lt lv \
+               kan ky \
+               la lat latin lo lt lv \
                mk ml mm mt mt_us \
                nl no \
                ogham ori \
                pc pl pl2 pt \
                ro ru \
-               sapmi se se_FI se_NO se_SE si sk sk_qwerty sr syr syr_phonetic \
+               sapmi se se_FI se_NO se_SE si sin sk sk_qwerty sr syr syr_phonetic \
                tel th th_tis th_pat tj tml tr \
-               ua us us_intl uz \
+               ua us ur_PK us_intl uz \
                yu 
 
 .PATH:         ${X11SRCDIR.xc}/programs/xkbcomp/symbols/pc
diff -r b52b7de47f01 -r 7c3e84094c0f x11/share/fonts/encodings/Makefile
--- a/x11/share/fonts/encodings/Makefile        Wed Apr 06 21:37:52 2005 +0000
+++ b/x11/share/fonts/encodings/Makefile        Wed Apr 06 21:37:57 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2004/04/28 14:17:57 lukem Exp $
+#      $NetBSD: Makefile,v 1.3.4.1 2005/04/06 21:37:58 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -12,8 +12,8 @@
        microsoft-cp1252.enc microsoft-cp1253.enc microsoft-cp1254.enc \
        microsoft-cp1255.enc microsoft-cp1256.enc microsoft-cp1257.enc \
        microsoft-cp1258.enc microsoft-win3.1.enc mulearabic-0.enc \
-       mulearabic-1.enc mulearabic-2.enc mulelao-1.enc tcvn-0.enc \
-       tis620-2.enc
+       mulearabic-1.enc mulearabic-2.enc mulelao-1.enc sun_eu_greek.enc \
+       tcvn-0.enc tis620-2.enc
 
 GZFILES=adobe-dingbats.enc.gz adobe-standard.enc.gz adobe-symbol.enc.gz \
        viscii1.1-1.enc.gz
diff -r b52b7de47f01 -r 7c3e84094c0f x11/share/fonts/encodings/large/Makefile
--- a/x11/share/fonts/encodings/large/Makefile  Wed Apr 06 21:37:52 2005 +0000
+++ b/x11/share/fonts/encodings/large/Makefile  Wed Apr 06 21:37:57 2005 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2004/03/06 03:13:06 rtr Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2005/04/06 21:37:58 tron Exp $
 
 .include <bsd.own.mk>
 
 ENCDIR=        encodings/large
 
-GZFILES=big5.eten-0.enc.gz big5hkscs-0.enc.gz gb2312.1980-0.enc.gz \
+GZFILES=big5.eten-0.enc.gz big5hkscs-0.enc.gz cns11643-1.enc.gz \
+       gb2312.1980-0.enc.gz \
        gbk-0.enc.gz gb18030.2000-0.enc.gz gb18030.2000-1.enc.gz \
        jisx0201.1976-0.enc.gz jisx0208.1990-0.enc.gz \
        jisx0212.1990-0.enc.gz ksc5601.1987-0.enc.gz ksc5601.1992-3.enc.gz \