Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/x11 The last of the changes for missing files in i386 vs xsrc.
details: https://anonhg.NetBSD.org/src/rev/c9a743be6863
branches: trunk
changeset: 579726:c9a743be6863
user: rtr <rtr%NetBSD.org@localhost>
date: Wed Mar 23 01:00:32 2005 +0000
description:
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/Makefile.common | 6 +++++-
x11/Xserver/hw/xfree86/bin/Makefile | 4 ++--
x11/Xserver/hw/xfree86/input/Makefile | 4 ++--
x11/Xserver/hw/xfree86/input/acecad/Makefile | 25 +++++++++++++++++++++++++
x11/bin/xkbcomp/symbols/Makefile | 8 ++++----
x11/bin/xkbcomp/symbols/pc/Makefile | 14 +++++++-------
x11/share/fonts/encodings/Makefile | 6 +++---
x11/share/fonts/encodings/large/Makefile | 5 +++--
8 files changed, 51 insertions(+), 21 deletions(-)
diffs (172 lines):
diff -r e3ac9fb0ddb9 -r c9a743be6863 x11/Xserver/Makefile.common
--- a/x11/Xserver/Makefile.common Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/Xserver/Makefile.common Wed Mar 23 01:00:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/03/22 19:47:59 rtr Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/03/23 01:00:32 rtr Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -47,6 +47,10 @@
XSERVER_NEEDS_XFONT= yes
XSERVER_NEEDS_MIEXT= yes
XSERVER_XFREE86= yes
+# XXX xfree 4.5 installs libafb for i386 and others?
+.if ${MACHINE} == "i386"
+XSERVER_HAS_AFB= yes
+.endif
.endif
.if ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcsh"
diff -r e3ac9fb0ddb9 -r c9a743be6863 x11/Xserver/hw/xfree86/bin/Makefile
--- a/x11/Xserver/hw/xfree86/bin/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/Xserver/hw/xfree86/bin/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2004/01/23 08:45:02 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/23 01:00:32 rtr Exp $
-SUBDIR= xf86config xf86cfg kbd_mode scanpci pcitweak mmapr mmapw gtf
+SUBDIR= getconfig xf86config xf86cfg kbd_mode scanpci pcitweak mmapr mmapw gtf
.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "x86_64"
SUBDIR+=ioport
diff -r e3ac9fb0ddb9 -r c9a743be6863 x11/Xserver/hw/xfree86/input/Makefile
--- a/x11/Xserver/hw/xfree86/input/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/Xserver/hw/xfree86/input/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2004/07/13 09:29:45 sekiya Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 01:00:32 rtr 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 e3ac9fb0ddb9 -r c9a743be6863 x11/Xserver/hw/xfree86/input/acecad/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/Xserver/hw/xfree86/input/acecad/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2005/03/23 01:00:33 rtr Exp $
+
+XMODULEDIR= ${X11USRLIBDIR}/modules/input
+
+.include "../../../../Makefile.serverlib"
+
+MODULE= acecad_drv
+MAN= acecad.4
+.PATH: ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/acecad
+
+SRCS= acecad.c
+
+CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/input/acecad \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/common \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/loader \
+ -I${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/os-support \
+ -I${X11SRCDIR.xc}/programs/Xserver/include \
+ -I${X11SRCDIR.xc}/programs/Xserver/mi \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${XSERVERINCDIR}
+
+.include <bsd.x11.mk>
+LIBDIR= ${XMODULEDIR}
+.include "../../Makefile.drivermod"
diff -r e3ac9fb0ddb9 -r c9a743be6863 x11/bin/xkbcomp/symbols/Makefile
--- a/x11/bin/xkbcomp/symbols/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/bin/xkbcomp/symbols/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/06 03:09:36 rtr Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/23 01:00:33 rtr Exp $
.include <bsd.own.mk>
@@ -11,13 +11,13 @@
czsk cz cz_qwerty \
de de_CH dev dk dvorak \
ee el en_US es \
- fi fr fr_CH \
+ fi fo fr fr_CH \
gb ge_la ge_ru group guj gur \
hr hr_US hu hu_US hu_qwerty \
ie il il_phonetic iso9995-3 inet ir is it iu \
jp \
- kan keypad \
- la level3 lo lock lt lt_std lv \
+ kan keypad ky \
+ la lat level3 lo lock lt lt_std lv \
ml mk mm mt mt_us \
nl no \
ogham ori \
diff -r e3ac9fb0ddb9 -r c9a743be6863 x11/bin/xkbcomp/symbols/pc/Makefile
--- a/x11/bin/xkbcomp/symbols/pc/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/bin/xkbcomp/symbols/pc/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/28 14:17:56 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 01:00:33 rtr 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 e3ac9fb0ddb9 -r c9a743be6863 x11/share/fonts/encodings/Makefile
--- a/x11/share/fonts/encodings/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/share/fonts/encodings/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/28 14:17:57 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 01:00:33 rtr 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 e3ac9fb0ddb9 -r c9a743be6863 x11/share/fonts/encodings/large/Makefile
--- a/x11/share/fonts/encodings/large/Makefile Wed Mar 23 00:38:10 2005 +0000
+++ b/x11/share/fonts/encodings/large/Makefile Wed Mar 23 01:00:32 2005 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/03/06 03:13:06 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/23 01:00:33 rtr 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 \
Home |
Main Index |
Thread Index |
Old Index