Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Radically overhaul X11 configuration:
details: https://anonhg.NetBSD.org/src/rev/82a6b4a59f0f
branches: trunk
changeset: 566654:82a6b4a59f0f
user: lukem <lukem%NetBSD.org@localhost>
date: Sun May 16 10:25:13 2004 +0000
description:
Radically overhaul X11 configuration:
* End user modifiable configuration has moved from
/usr/X11R6/lib/X11/<someprog>
to
/etc/X11/<someprog>
This is consistent with our own policies as well as other projects.
The files & directories that were moved have _NOT_ been marked
`obsolete', as they contain user configuration and therefore we
don't want the automatic "obsolete file removal" mechanism to
remove them.
* The /etc/font/* and /etc/X11/* configuration files are installed
with 'configinstall' (not 'install'), using CONFIGFILES and
CONFIGSYMLINKS.
This is so that a normal 'make build' in src/x11 will not
trash your configuration.
* A 'distribution' target has been added to src/x11 to perform
'make configinstall' in the appropriate subdirectories.
(Should we consider making 'configinstall' a first-class target?)
* The xdm pixmaps have have been moved to /usr/X11R6/include/X11/pixmaps
where the other pixmaps are.
(I don't consider these pictures end-user configuration).
IMPORTANT NOTE:
* These changes require an up to date xsrc, and 'make cleandir' should
be performed in src/x11 before a build for the changes to fully take
effect.
diffstat:
distrib/sets/lists/base/mi | 27 +++++++-------
distrib/sets/lists/xbase/mi | 4 +-
distrib/sets/lists/xetc/mi | 71 +++++++++++++++++++--------------------
etc/mtree/NetBSD.dist | 27 +++++++-------
x11/Makefile | 13 ++++++-
x11/TODO | 5 +-
x11/Xserver/Xext/Makefile.ext | 4 +-
x11/Xserver/Xext/ext/Makefile | 6 +-
x11/Xserver/printer/Makefile | 4 +-
x11/bin/lbxproxy/Makefile | 10 +++--
x11/bin/proxymngr/Makefile | 12 ++++--
x11/bin/rstart/Makefile | 16 +++++---
x11/bin/rstart/Makefile.rstart | 10 +++--
x11/bin/rstart/commands/Makefile | 4 +-
x11/bin/rstart/contexts/Makefile | 4 +-
x11/bin/twm/Makefile | 15 +++++--
x11/bin/xdm/Makefile | 19 +++++++---
x11/bin/xdm/Makefile.xdm | 15 ++++---
x11/bin/xdm/chooser/Makefile | 4 +-
x11/bin/xdm/config/Makefile | 23 ++++++------
x11/bin/xfs/Makefile | 13 +++++--
x11/bin/xinit/Makefile | 14 ++++---
x11/bin/xsm/Makefile | 10 +++--
x11/lib/fontconfig/etc/Makefile | 8 +--
24 files changed, 189 insertions(+), 149 deletions(-)
diffs (truncated from 801 to 300 lines):
diff -r 01684dde6abf -r 82a6b4a59f0f distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Sun May 16 09:53:09 2004 +0000
+++ b/distrib/sets/lists/base/mi Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.476 2004/05/12 03:58:47 lukem Exp $
+# $NetBSD: mi,v 1.477 2004/05/16 10:25:13 lukem Exp $
. base-sys-root
./altroot base-sys-root
./bin base-sys-root
@@ -54,6 +54,18 @@
./dev/log base-sys-root
./etc base-sys-root
./etc/X11 base-x11-root
+./etc/X11/fs base-x11-root
+./etc/X11/lbxproxy base-x11-root
+./etc/X11/proxymngr base-x11-root
+./etc/X11/rstart base-x11-root
+./etc/X11/rstart/commands base-x11-root
+./etc/X11/rstart/commands/x11r6 base-x11-root
+./etc/X11/rstart/contexts base-x11-root
+./etc/X11/twm base-x11-root
+./etc/X11/xdm base-x11-root
+./etc/X11/xinit base-x11-root
+./etc/X11/xserver base-x11-root
+./etc/X11/xsm base-x11-root
./etc/cgd base-sys-root
./etc/defaults base-sys-root
./etc/disklabels base-obsolete obsolete
@@ -233,8 +245,6 @@
./usr/X11R6/lib/X11/fonts/local base-x11-root
./usr/X11R6/lib/X11/fonts/misc base-x11-root
./usr/X11R6/lib/X11/fonts/util base-x11-root
-./usr/X11R6/lib/X11/fs base-x11-root
-./usr/X11R6/lib/X11/lbxproxy base-x11-root
./usr/X11R6/lib/X11/locale base-x11-root
./usr/X11R6/lib/X11/locale/C base-x11-root
./usr/X11R6/lib/X11/locale/armscii-8 base-x11-root
@@ -290,19 +300,10 @@
./usr/X11R6/lib/X11/locale/zh_TW base-x11-root
./usr/X11R6/lib/X11/locale/zh_TW.UTF-8 base-x11-root
./usr/X11R6/lib/X11/locale/zh_TW.big5 base-x11-root
-./usr/X11R6/lib/X11/proxymngr base-x11-root
-./usr/X11R6/lib/X11/rstart base-x11-root
-./usr/X11R6/lib/X11/rstart/commands base-x11-root
-./usr/X11R6/lib/X11/rstart/commands/x11r6 base-x11-root
-./usr/X11R6/lib/X11/rstart/contexts base-x11-root
-./usr/X11R6/lib/X11/twm base-x11-root
./usr/X11R6/lib/X11/x11perfcomp base-x11-root
-./usr/X11R6/lib/X11/xdm base-x11-root
-./usr/X11R6/lib/X11/xdm/pixmaps base-x11-root
./usr/X11R6/lib/X11/xedit base-x11-root
./usr/X11R6/lib/X11/xedit/lisp base-x11-root
./usr/X11R6/lib/X11/xedit/lisp/progmodes base-x11-root
-./usr/X11R6/lib/X11/xinit base-x11-root
./usr/X11R6/lib/X11/xkb base-x11-root
./usr/X11R6/lib/X11/xkb/compat base-x11-root
./usr/X11R6/lib/X11/xkb/compiled base-x11-root
@@ -332,8 +333,6 @@
./usr/X11R6/lib/X11/xkb/symbols/sun base-x11-root
./usr/X11R6/lib/X11/xkb/symbols/xfree68 base-x11-root
./usr/X11R6/lib/X11/xkb/types base-x11-root
-./usr/X11R6/lib/X11/xserver base-x11-root
-./usr/X11R6/lib/X11/xsm base-x11-root
./usr/X11R6/lib/modules base-x11-root
./usr/X11R6/lib/modules/codeconv base-x11-root
./usr/X11R6/lib/modules/drivers base-x11-root
diff -r 01684dde6abf -r 82a6b4a59f0f distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Sun May 16 09:53:09 2004 +0000
+++ b/distrib/sets/lists/xbase/mi Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.41 2004/04/28 14:17:55 lukem Exp $
+# $NetBSD: mi,v 1.42 2004/05/16 10:25:13 lukem Exp $
./etc/mtree/set.xbase xbase-sys-root
./usr/X11R6/bin/Xmark
./usr/X11R6/bin/appres
@@ -207,6 +207,8 @@
./usr/X11R6/include/X11/bitmaps/xlogo32
./usr/X11R6/include/X11/bitmaps/xlogo64
./usr/X11R6/include/X11/bitmaps/xsnow
+./usr/X11R6/include/X11/pixmaps/XFree86.xpm
+./usr/X11R6/include/X11/pixmaps/XFree86bw.xpm
./usr/X11R6/include/X11/pixmaps/deny-always.xpm
./usr/X11R6/include/X11/pixmaps/deny.xpm
./usr/X11R6/include/X11/pixmaps/logo.xpm
diff -r 01684dde6abf -r 82a6b4a59f0f distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Sun May 16 09:53:09 2004 +0000
+++ b/distrib/sets/lists/xetc/mi Sun May 16 10:25:13 2004 +0000
@@ -1,40 +1,37 @@
-# $NetBSD: mi,v 1.2 2004/01/30 08:44:11 lukem Exp $
+# $NetBSD: mi,v 1.3 2004/05/16 10:25:13 lukem Exp $
+./etc/X11/fs/config
+./etc/X11/lbxproxy/AtomControl
+./etc/X11/proxymngr/pmconfig
+./etc/X11/rstart/commands/@List
+./etc/X11/rstart/commands/ListContexts
+./etc/X11/rstart/commands/ListGenericCommands
+./etc/X11/rstart/commands/x
+./etc/X11/rstart/commands/x11
+./etc/X11/rstart/commands/x11r6/@List
+./etc/X11/rstart/commands/x11r6/LoadMonitor
+./etc/X11/rstart/commands/x11r6/Terminal
+./etc/X11/rstart/config
+./etc/X11/rstart/contexts/@List
+./etc/X11/rstart/contexts/default
+./etc/X11/rstart/contexts/x
+./etc/X11/rstart/contexts/x11
+./etc/X11/rstart/contexts/x11r6
+./etc/X11/twm/system.twmrc
+./etc/X11/xdm/GiveConsole
+./etc/X11/xdm/TakeConsole
+./etc/X11/xdm/Xaccess
+./etc/X11/xdm/Xresources
+./etc/X11/xdm/Xservers
+./etc/X11/xdm/Xservers.fs
+./etc/X11/xdm/Xservers.ws
+./etc/X11/xdm/Xsession
+./etc/X11/xdm/Xsetup_0
+./etc/X11/xdm/Xwilling
+./etc/X11/xdm/xdm-config
+./etc/X11/xinit/xinitrc
+./etc/X11/xserver/SecurityPolicy
+./etc/X11/xsm/system.xsm
./etc/fonts/fonts.conf
./etc/fonts/fonts.dtd
-./etc/mtree/set.xetc xetc-sys-root
-./usr/X11R6/lib/X11/fs/config
-./usr/X11R6/lib/X11/lbxproxy/AtomControl
-./usr/X11R6/lib/X11/proxymngr/pmconfig
+./etc/mtree/set.xetc xetc-sys-root
./usr/X11R6/lib/X11/rgb.txt
-./usr/X11R6/lib/X11/rstart/commands/@List
-./usr/X11R6/lib/X11/rstart/commands/ListContexts
-./usr/X11R6/lib/X11/rstart/commands/ListGenericCommands
-./usr/X11R6/lib/X11/rstart/commands/x
-./usr/X11R6/lib/X11/rstart/commands/x11
-./usr/X11R6/lib/X11/rstart/commands/x11r6/@List
-./usr/X11R6/lib/X11/rstart/commands/x11r6/LoadMonitor
-./usr/X11R6/lib/X11/rstart/commands/x11r6/Terminal
-./usr/X11R6/lib/X11/rstart/config
-./usr/X11R6/lib/X11/rstart/contexts/@List
-./usr/X11R6/lib/X11/rstart/contexts/default
-./usr/X11R6/lib/X11/rstart/contexts/x
-./usr/X11R6/lib/X11/rstart/contexts/x11
-./usr/X11R6/lib/X11/rstart/contexts/x11r6
-./usr/X11R6/lib/X11/twm/system.twmrc
-./usr/X11R6/lib/X11/xdm/GiveConsole
-./usr/X11R6/lib/X11/xdm/TakeConsole
-./usr/X11R6/lib/X11/xdm/Xaccess
-./usr/X11R6/lib/X11/xdm/Xresources
-./usr/X11R6/lib/X11/xdm/Xservers
-./usr/X11R6/lib/X11/xdm/Xservers.fs
-./usr/X11R6/lib/X11/xdm/Xservers.ws
-./usr/X11R6/lib/X11/xdm/Xsession
-./usr/X11R6/lib/X11/xdm/Xsetup_0
-./usr/X11R6/lib/X11/xdm/Xwilling
-./usr/X11R6/lib/X11/xdm/chooser
-./usr/X11R6/lib/X11/xdm/pixmaps/XFree86.xpm
-./usr/X11R6/lib/X11/xdm/pixmaps/XFree86bw.xpm
-./usr/X11R6/lib/X11/xdm/xdm-config
-./usr/X11R6/lib/X11/xinit/xinitrc
-./usr/X11R6/lib/X11/xserver/SecurityPolicy
-./usr/X11R6/lib/X11/xsm/system.xsm
diff -r 01684dde6abf -r 82a6b4a59f0f etc/mtree/NetBSD.dist
--- a/etc/mtree/NetBSD.dist Sun May 16 09:53:09 2004 +0000
+++ b/etc/mtree/NetBSD.dist Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.262 2004/05/12 03:58:47 lukem Exp $
+# $NetBSD: NetBSD.dist,v 1.263 2004/05/16 10:25:14 lukem Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
/set type=dir uname=root gname=wheel mode=0755
@@ -11,6 +11,18 @@
./dev/fd
./etc
./etc/X11
+./etc/X11/fs
+./etc/X11/lbxproxy
+./etc/X11/proxymngr
+./etc/X11/rstart
+./etc/X11/rstart/commands
+./etc/X11/rstart/commands/x11r6
+./etc/X11/rstart/contexts
+./etc/X11/twm
+./etc/X11/xdm
+./etc/X11/xinit
+./etc/X11/xserver
+./etc/X11/xsm
./etc/cgd mode=0700
./etc/defaults
./etc/fonts
@@ -86,8 +98,6 @@
./usr/X11R6/lib/X11/fonts/local
./usr/X11R6/lib/X11/fonts/misc
./usr/X11R6/lib/X11/fonts/util
-./usr/X11R6/lib/X11/fs
-./usr/X11R6/lib/X11/lbxproxy
./usr/X11R6/lib/X11/locale
./usr/X11R6/lib/X11/locale/C
./usr/X11R6/lib/X11/locale/armscii-8
@@ -143,19 +153,10 @@
./usr/X11R6/lib/X11/locale/zh_TW
./usr/X11R6/lib/X11/locale/zh_TW.UTF-8
./usr/X11R6/lib/X11/locale/zh_TW.big5
-./usr/X11R6/lib/X11/proxymngr
-./usr/X11R6/lib/X11/rstart
-./usr/X11R6/lib/X11/rstart/commands
-./usr/X11R6/lib/X11/rstart/commands/x11r6
-./usr/X11R6/lib/X11/rstart/contexts
-./usr/X11R6/lib/X11/twm
./usr/X11R6/lib/X11/x11perfcomp
-./usr/X11R6/lib/X11/xdm
-./usr/X11R6/lib/X11/xdm/pixmaps
./usr/X11R6/lib/X11/xedit
./usr/X11R6/lib/X11/xedit/lisp
./usr/X11R6/lib/X11/xedit/lisp/progmodes
-./usr/X11R6/lib/X11/xinit
./usr/X11R6/lib/X11/xkb
./usr/X11R6/lib/X11/xkb/compat
./usr/X11R6/lib/X11/xkb/compiled
@@ -185,8 +186,6 @@
./usr/X11R6/lib/X11/xkb/symbols/sun
./usr/X11R6/lib/X11/xkb/symbols/xfree68
./usr/X11R6/lib/X11/xkb/types
-./usr/X11R6/lib/X11/xserver
-./usr/X11R6/lib/X11/xsm
./usr/X11R6/lib/modules
./usr/X11R6/lib/modules/codeconv
./usr/X11R6/lib/modules/extensions
diff -r 01684dde6abf -r 82a6b4a59f0f x11/Makefile
--- a/x11/Makefile Sun May 16 09:53:09 2004 +0000
+++ b/x11/Makefile Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/13 12:50:34 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/16 10:25:14 lukem Exp $
.include <bsd.own.mk>
@@ -53,6 +53,17 @@
.endif
+DISTRIBTARGETS= Xserver/Xext/ext \
+ bin/lbxproxy bin/proxymngr bin/rstart bin/twm \
+ bin/xdm/config bin/xfs bin/xinit bin/xsm \
+ lib/fontconfig/etc
+
+distribution: check_X11SRCDIR
+.for tgt in ${DISTRIBTARGETS}
+ ${MAKEDIRTARGET} ${tgt} configinstall
+.endfor
+
+
check_X11SRCDIR: .PHONY .NOTMAIN
.if !defined(X11SRCDIR)
@echo
diff -r 01684dde6abf -r 82a6b4a59f0f x11/TODO
--- a/x11/TODO Sun May 16 09:53:09 2004 +0000
+++ b/x11/TODO Sun May 16 10:25:13 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: TODO,v 1.12 2004/05/13 09:31:11 lukem Exp $
+$NetBSD: TODO,v 1.13 2004/05/16 10:25:14 lukem Exp $
clean up XTODO issues
-consider symlinking various dirs in lib/X11 -> /etc/X11, and only
-install the files on "distribution" ?
+consider symlinking various CONFIGFILES dirs in lib/X11 to /etc/X11
check all Imakefile & config diffs between -rv4-3-0 -rv4-4-0 , including:
programs/Xserver
diff -r 01684dde6abf -r 82a6b4a59f0f x11/Xserver/Xext/Makefile.ext
--- a/x11/Xserver/Xext/Makefile.ext Sun May 16 09:53:09 2004 +0000
+++ b/x11/Xserver/Xext/Makefile.ext Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ext,v 1.8 2004/03/06 03:31:05 rtr Exp $
+# $NetBSD: Makefile.ext,v 1.9 2004/05/16 10:25:14 lukem Exp $
.PATH: ${X11SRCDIR.xc}/programs/Xserver/Xext
@@ -19,7 +19,7 @@
CPPFLAGS+= -UXF86VIDMODE
.endif
-CPPFLAGS.security.c= -DDEFAULTPOLICYFILE=\"${X11LIBDIR}/xserver/SecurityPolicy\"
+CPPFLAGS.security.c= -DDEFAULTPOLICYFILE=\"${X11ETCDIR}/xserver/SecurityPolicy\"
CPPFLAGS.xf86bigfont.c= -DHAS_SHM
.include <bsd.x11.mk>
diff -r 01684dde6abf -r 82a6b4a59f0f x11/Xserver/Xext/ext/Makefile
--- a/x11/Xserver/Xext/ext/Makefile Sun May 16 09:53:09 2004 +0000
+++ b/x11/Xserver/Xext/ext/Makefile Sun May 16 10:25:13 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/23 04:07:15 rtr Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/16 10:25:14 lukem Exp $
LIB= ext
SRCS= EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \
@@ -11,8 +11,8 @@
SRCS+= xf86vmode.c xf86misc.c xf86dga.c xf86dga2.c
.endif
Home |
Main Index |
Thread Index |
Old Index