Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/sets First step of supporting XFree86 4.x binary sets:
details: https://anonhg.NetBSD.org/src/rev/3aa90d6b83b3
branches: trunk
changeset: 522106:3aa90d6b83b3
user: tron <tron%NetBSD.org@localhost>
date: Mon Feb 11 16:23:17 2002 +0000
description:
First step of supporting XFree86 4.x binary sets:
- Recognize version dependent X11 lists files.
- Move all files which only belong to XFree86 3.3.6 in lists for version 3.
diffstat:
distrib/sets/Makefile | 9 +++-
distrib/sets/lists/xbase/md.arm32 | 8 +---
distrib/sets/lists/xbase/md.atari | 5 +-
distrib/sets/lists/xbase/md.i386 | 8 +---
distrib/sets/lists/xbase/md.vax | 7 +--
distrib/sets/lists/xbase/mi | 43 +-------------------
distrib/sets/lists/xbase/shl.elf | 4 +-
distrib/sets/lists/xbase/shl.mi | 7 +--
distrib/sets/lists/xbase3/md.arm32 | 7 +++
distrib/sets/lists/xbase3/md.atari | 4 +
distrib/sets/lists/xbase3/md.i386 | 7 +++
distrib/sets/lists/xbase3/md.vax | 6 ++
distrib/sets/lists/xbase3/mi | 42 +++++++++++++++++++
distrib/sets/lists/xbase3/shl.elf | 3 +
distrib/sets/lists/xbase3/shl.mi | 6 ++
distrib/sets/lists/xcomp/md.arm32 | 23 +----------
distrib/sets/lists/xcomp/md.i386 | 23 +----------
distrib/sets/lists/xcomp/mi | 14 +-----
distrib/sets/lists/xcomp/shl.elf | 4 +-
distrib/sets/lists/xcomp3/md.arm32 | 22 ++++++++++
distrib/sets/lists/xcomp3/md.i386 | 22 ++++++++++
distrib/sets/lists/xcomp3/mi | 13 +++++
distrib/sets/lists/xcomp3/shl.elf | 3 +
distrib/sets/lists/xfont/md.arm32 | 4 +-
distrib/sets/lists/xfont/md.i386 | 4 +-
distrib/sets/lists/xfont/mi | 7 +--
distrib/sets/lists/xfont3/md.arm32 | 3 +
distrib/sets/lists/xfont3/md.i386 | 3 +
distrib/sets/lists/xfont3/mi | 6 ++
distrib/sets/lists/xserver/md.amiga | 3 +-
distrib/sets/lists/xserver/md.arm32 | 60 +---------------------------
distrib/sets/lists/xserver/md.atari | 58 +--------------------------
distrib/sets/lists/xserver/md.hpcmips | 3 +-
distrib/sets/lists/xserver/md.i386 | 74 +---------------------------------
distrib/sets/lists/xserver/md.x68k | 3 +-
distrib/sets/lists/xserver3/md.amiga | 2 +
distrib/sets/lists/xserver3/md.arm32 | 59 +++++++++++++++++++++++++++
distrib/sets/lists/xserver3/md.atari | 57 ++++++++++++++++++++++++++
distrib/sets/lists/xserver3/md.hpcmips | 2 +
distrib/sets/lists/xserver3/md.i386 | 73 +++++++++++++++++++++++++++++++++
distrib/sets/lists/xserver3/md.x68k | 2 +
distrib/sets/lists/xserver3/mi | 1 +
distrib/sets/makeflist | 18 +++++++-
43 files changed, 387 insertions(+), 345 deletions(-)
diffs (truncated from 1319 to 300 lines):
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/Makefile
--- a/distrib/sets/Makefile Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/Makefile Mon Feb 11 16:23:17 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/01 07:59:32 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2002/02/11 16:23:17 tron Exp $
# The `all' target must appear before bsd.own.mk is pulled in.
all:
@@ -46,6 +46,13 @@
print_use_new_toolchain: .PHONY
@echo "${USE_NEW_TOOLCHAIN:Dyes}"
+print_x11_version: .PHONY
+.if defined(USE_XF86_4) && (${USE_XF86_4} != no)
+ @echo 4
+.else
+ @echo 3
+.endif
+
# This target has debugging value only, really.
makeflist: .PHONY check_destdir
DESTDIR=${DESTDIR} MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/md.arm32
--- a/distrib/sets/lists/xbase/md.arm32 Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/md.arm32 Mon Feb 11 16:23:17 2002 +0000
@@ -1,29 +1,23 @@
-# $NetBSD: md.arm32,v 1.8 2000/08/06 22:39:04 wiz Exp $
+# $NetBSD: md.arm32,v 1.9 2002/02/11 16:23:18 tron Exp $
./usr/X11R6/bin/beforelight
./usr/X11R6/bin/dga
./usr/X11R6/bin/kbd_mode
-./usr/X11R6/bin/reconfig
./usr/X11R6/bin/xf86config
./usr/X11R6/bin/xvidtune
./usr/X11R6/lib/X11/Cards
./usr/X11R6/lib/X11/app-defaults/Beforelight
./usr/X11R6/lib/X11/app-defaults/Xvidtune
./usr/X11R6/lib/X11/doc
-./usr/X11R6/lib/X11/doc/COPYRIGHT
./usr/X11R6/lib/X11/etc
-./usr/X11R6/lib/X11/etc/postinst.sh
-./usr/X11R6/lib/X11/etc/preinst.sh
./usr/X11R6/lib/X11/etc/sun.termcap
./usr/X11R6/lib/X11/etc/sun.terminfo
./usr/X11R6/lib/X11/etc/xmodmap.std
./usr/X11R6/lib/X11/etc/xterm.termcap
./usr/X11R6/lib/X11/etc/xterm.terminfo
-./usr/X11R6/lib/X11/fonts/PEX
./usr/X11R6/man/cat1/XFree86.0
./usr/X11R6/man/cat1/beforelight.0
./usr/X11R6/man/cat1/dga.0
./usr/X11R6/man/cat1/kbd_mode.0
-./usr/X11R6/man/cat1/reconfig.0
./usr/X11R6/man/cat1/xf86config.0
./usr/X11R6/man/cat1/xvidtune.0
./usr/X11R6/man/cat5
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/md.atari
--- a/distrib/sets/lists/xbase/md.atari Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/md.atari Mon Feb 11 16:23:17 2002 +0000
@@ -1,13 +1,10 @@
-# $NetBSD: md.atari,v 1.7 2000/08/06 22:39:04 wiz Exp $
+# $NetBSD: md.atari,v 1.8 2002/02/11 16:23:18 tron Exp $
./usr/X11R6/bin/beforelight
./usr/X11R6/bin/dga
./usr/X11R6/bin/kbd_mode
./usr/X11R6/bin/xvidtune
./usr/X11R6/lib/X11/app-defaults/Beforelight
./usr/X11R6/lib/X11/app-defaults/Xvidtune
-./usr/X11R6/lib/X11/doc/COPYRIGHT
-./usr/X11R6/lib/X11/etc/postinst.sh
-./usr/X11R6/lib/X11/etc/preinst.sh
./usr/X11R6/lib/X11/etc/sun.termcap
./usr/X11R6/lib/X11/etc/sun.terminfo
./usr/X11R6/lib/X11/etc/xmodmap.std
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/md.i386
--- a/distrib/sets/lists/xbase/md.i386 Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/md.i386 Mon Feb 11 16:23:17 2002 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: md.i386,v 1.9 1999/04/19 03:11:36 simonb Exp $
+# $NetBSD: md.i386,v 1.10 2002/02/11 16:23:18 tron Exp $
./usr/X11R6/bin/beforelight
./usr/X11R6/bin/dga
./usr/X11R6/bin/kbd_mode
-./usr/X11R6/bin/reconfig
./usr/X11R6/bin/scanpci
./usr/X11R6/bin/xf86config
./usr/X11R6/bin/xvidtune
@@ -10,21 +9,16 @@
./usr/X11R6/lib/X11/app-defaults/Beforelight
./usr/X11R6/lib/X11/app-defaults/Xvidtune
./usr/X11R6/lib/X11/doc
-./usr/X11R6/lib/X11/doc/COPYRIGHT
./usr/X11R6/lib/X11/etc
-./usr/X11R6/lib/X11/etc/postinst.sh
-./usr/X11R6/lib/X11/etc/preinst.sh
./usr/X11R6/lib/X11/etc/sun.termcap
./usr/X11R6/lib/X11/etc/sun.terminfo
./usr/X11R6/lib/X11/etc/xmodmap.std
./usr/X11R6/lib/X11/etc/xterm.termcap
./usr/X11R6/lib/X11/etc/xterm.terminfo
-./usr/X11R6/lib/X11/fonts/PEX
./usr/X11R6/man/cat1/XFree86.0
./usr/X11R6/man/cat1/beforelight.0
./usr/X11R6/man/cat1/dga.0
./usr/X11R6/man/cat1/kbd_mode.0
-./usr/X11R6/man/cat1/reconfig.0
./usr/X11R6/man/cat1/xf86config.0
./usr/X11R6/man/cat1/xvidtune.0
./usr/X11R6/man/cat5
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/md.vax
--- a/distrib/sets/lists/xbase/md.vax Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/md.vax Mon Feb 11 16:23:17 2002 +0000
@@ -1,13 +1,8 @@
-# $NetBSD: md.vax,v 1.6 2000/10/05 02:27:02 tv Exp $
+# $NetBSD: md.vax,v 1.7 2002/02/11 16:23:18 tron Exp $
./usr/X11R6/lib/libICE.so.6.3
-./usr/X11R6/lib/libPEX5.so.6.0
./usr/X11R6/lib/libSM.so.6.0
-./usr/X11R6/lib/libX11.so.6.1
-./usr/X11R6/lib/libXIE.so.6.0
./usr/X11R6/lib/libXaw.so.6.1
-./usr/X11R6/lib/libXext.so.6.3
./usr/X11R6/lib/libXi.so.6.0
-./usr/X11R6/lib/libXmu.so.6.0
./usr/X11R6/lib/libXp.so.6.2
./usr/X11R6/lib/libXt.so.6.0
./usr/X11R6/lib/libXtst.so.6.1
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/mi Mon Feb 11 16:23:17 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.20 2001/04/29 11:05:59 wiz Exp $
+# $NetBSD: mi,v 1.21 2002/02/11 16:23:18 tron Exp $
./usr/X11R6
./usr/X11R6/bin
./usr/X11R6/bin/Xmark
@@ -8,7 +8,6 @@
./usr/X11R6/bin/bitmap
./usr/X11R6/bin/bmtoa
./usr/X11R6/bin/editres
-./usr/X11R6/bin/fsinfo
./usr/X11R6/bin/fslsfonts
./usr/X11R6/bin/fstobdf
./usr/X11R6/bin/iceauth
@@ -40,7 +39,6 @@
./usr/X11R6/bin/xfs
./usr/X11R6/bin/xfwp
./usr/X11R6/bin/xhost
-./usr/X11R6/bin/xieperf
./usr/X11R6/bin/xinit
./usr/X11R6/bin/xkbbell
./usr/X11R6/bin/xkbcomp
@@ -60,7 +58,6 @@
./usr/X11R6/bin/xprop
./usr/X11R6/bin/xrdb
./usr/X11R6/bin/xrefresh
-./usr/X11R6/bin/xrx
./usr/X11R6/bin/xset
./usr/X11R6/bin/xsetmode
./usr/X11R6/bin/xsetpointer
@@ -74,7 +71,6 @@
./usr/X11R6/include
./usr/X11R6/include/X11
./usr/X11R6/include/X11/ICE
-./usr/X11R6/include/X11/PEX5
./usr/X11R6/include/X11/PM
./usr/X11R6/include/X11/SM
./usr/X11R6/include/X11/Xaw
@@ -203,8 +199,6 @@
./usr/X11R6/lib/X11/locale/C
./usr/X11R6/lib/X11/locale/C/XLC_LOCALE
./usr/X11R6/lib/X11/locale/compose.dir
-./usr/X11R6/lib/X11/locale/en_US.utf
-./usr/X11R6/lib/X11/locale/en_US.utf/XLC_LOCALE
./usr/X11R6/lib/X11/locale/iso8859-1
./usr/X11R6/lib/X11/locale/iso8859-1/Compose
./usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE
@@ -243,30 +237,7 @@
./usr/X11R6/lib/X11/locale/koi8-r/XLC_LOCALE
./usr/X11R6/lib/X11/locale/locale.alias
./usr/X11R6/lib/X11/locale/locale.dir
-./usr/X11R6/lib/X11/locale/tbl_data
-./usr/X11R6/lib/X11/locale/tbl_data/gb2312
-./usr/X11R6/lib/X11/locale/tbl_data/jis0201
-./usr/X11R6/lib/X11/locale/tbl_data/jis0208
-./usr/X11R6/lib/X11/locale/tbl_data/ksc5601
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_1
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_10
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_15
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_2
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_3
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_4
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_5
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_6
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_7
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_8
-./usr/X11R6/lib/X11/locale/tbl_data/tab8859_9
-./usr/X11R6/lib/X11/locale/tbl_data/tabkoi8_r
-./usr/X11R6/lib/X11/locale/th_TH.TACTIS
-./usr/X11R6/lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
-./usr/X11R6/lib/X11/locale/zh
-./usr/X11R6/lib/X11/locale/zh/XLC_LOCALE
./usr/X11R6/lib/X11/locale/zh_TW
-./usr/X11R6/lib/X11/locale/zh_TW.Big5
-./usr/X11R6/lib/X11/locale/zh_TW.Big5/XLC_LOCALE
./usr/X11R6/lib/X11/locale/zh_TW/XLC_LOCALE
./usr/X11R6/lib/X11/proxymngr
./usr/X11R6/lib/X11/proxymngr/pmconfig
@@ -349,7 +320,6 @@
./usr/X11R6/lib/X11/xkb/geometry/sgi/O2
./usr/X11R6/lib/X11/xkb/geometry/sgi/indigo
./usr/X11R6/lib/X11/xkb/geometry/sgi/indy
-./usr/X11R6/lib/X11/xkb/geometry/sharp
./usr/X11R6/lib/X11/xkb/geometry/sony
./usr/X11R6/lib/X11/xkb/geometry/sun
./usr/X11R6/lib/X11/xkb/geometry/winbook
@@ -370,7 +340,6 @@
./usr/X11R6/lib/X11/xkb/keycodes/sgi/iris
./usr/X11R6/lib/X11/xkb/keycodes/sony
./usr/X11R6/lib/X11/xkb/keycodes/sun
-./usr/X11R6/lib/X11/xkb/keycodes/x68k
./usr/X11R6/lib/X11/xkb/keycodes/xfree86
./usr/X11R6/lib/X11/xkb/keycodes/xfree98
./usr/X11R6/lib/X11/xkb/keymap
@@ -384,7 +353,6 @@
./usr/X11R6/lib/X11/xkb/keymap/sgi/be
./usr/X11R6/lib/X11/xkb/keymap/sgi/bg
./usr/X11R6/lib/X11/xkb/keymap/sgi/ca
-./usr/X11R6/lib/X11/xkb/keymap/sgi/cs
./usr/X11R6/lib/X11/xkb/keymap/sgi/de
./usr/X11R6/lib/X11/xkb/keymap/sgi/de_CH
./usr/X11R6/lib/X11/xkb/keymap/sgi/dk
@@ -410,7 +378,6 @@
./usr/X11R6/lib/X11/xkb/keymap/sun/de
./usr/X11R6/lib/X11/xkb/keymap/sun/se
./usr/X11R6/lib/X11/xkb/keymap/sun/us
-./usr/X11R6/lib/X11/xkb/keymap/x68k
./usr/X11R6/lib/X11/xkb/keymap/xfree86
./usr/X11R6/lib/X11/xkb/keymap/xfree98
./usr/X11R6/lib/X11/xkb/rules
@@ -426,14 +393,11 @@
./usr/X11R6/lib/X11/xkb/semantics/xtest
./usr/X11R6/lib/X11/xkb/symbols
./usr/X11R6/lib/X11/xkb/symbols.dir
-./usr/X11R6/lib/X11/xkb/symbols/amiga
-./usr/X11R6/lib/X11/xkb/symbols/ataritt
./usr/X11R6/lib/X11/xkb/symbols/be
./usr/X11R6/lib/X11/xkb/symbols/bg
./usr/X11R6/lib/X11/xkb/symbols/br
./usr/X11R6/lib/X11/xkb/symbols/ca
./usr/X11R6/lib/X11/xkb/symbols/ca_enhanced
-./usr/X11R6/lib/X11/xkb/symbols/cs
./usr/X11R6/lib/X11/xkb/symbols/ctrl
./usr/X11R6/lib/X11/xkb/symbols/czsk
./usr/X11R6/lib/X11/xkb/symbols/de
@@ -476,8 +440,6 @@
./usr/X11R6/lib/X11/xkb/symbols/se
./usr/X11R6/lib/X11/xkb/symbols/sgi
./usr/X11R6/lib/X11/xkb/symbols/sgi/jp
-./usr/X11R6/lib/X11/xkb/symbols/sharp
-./usr/X11R6/lib/X11/xkb/symbols/sharp/jp
./usr/X11R6/lib/X11/xkb/symbols/si
./usr/X11R6/lib/X11/xkb/symbols/sony
./usr/X11R6/lib/X11/xkb/symbols/sony/us
@@ -508,7 +470,6 @@
./usr/X11R6/man/cat1/bitmap.0
./usr/X11R6/man/cat1/bmtoa.0
./usr/X11R6/man/cat1/editres.0
-./usr/X11R6/man/cat1/fsinfo.0
./usr/X11R6/man/cat1/fslsfonts.0
./usr/X11R6/man/cat1/fstobdf.0
./usr/X11R6/man/cat1/iceauth.0
@@ -540,7 +501,6 @@
./usr/X11R6/man/cat1/xfs.0
./usr/X11R6/man/cat1/xfwp.0
./usr/X11R6/man/cat1/xhost.0
-./usr/X11R6/man/cat1/xieperf.0
./usr/X11R6/man/cat1/xinit.0
./usr/X11R6/man/cat1/xkbcomp.0
./usr/X11R6/man/cat1/xkbevd.0
@@ -557,7 +517,6 @@
./usr/X11R6/man/cat1/xprop.0
./usr/X11R6/man/cat1/xrdb.0
./usr/X11R6/man/cat1/xrefresh.0
-./usr/X11R6/man/cat1/xrx.0
./usr/X11R6/man/cat1/xset.0
./usr/X11R6/man/cat1/xsetmode.0
./usr/X11R6/man/cat1/xsetpointer.0
diff -r 1b95878ae08c -r 3aa90d6b83b3 distrib/sets/lists/xbase/shl.elf
--- a/distrib/sets/lists/xbase/shl.elf Mon Feb 11 16:21:55 2002 +0000
+++ b/distrib/sets/lists/xbase/shl.elf Mon Feb 11 16:23:17 2002 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: shl.elf,v 1.3 1999/09/07 15:45:09 perry Exp $
+# $NetBSD: shl.elf,v 1.4 2002/02/11 16:23:18 tron Exp $
./usr/X11R6/lib/libICE.so.6
-./usr/X11R6/lib/libPEX5.so.6
./usr/X11R6/lib/libSM.so.6
./usr/X11R6/lib/libX11.so.6
-./usr/X11R6/lib/libXIE.so.6
Home |
Main Index |
Thread Index |
Old Index