From 85f282d1bc9fc72fce8d2fad51da392f5085001c Mon Sep 17 00:00:00 2001 From: lukem Date: Sun, 16 May 2004 10:25:13 +0000 Subject: [PATCH] Radically overhaul X11 configuration: * End user modifiable configuration has moved from /usr/X11R6/lib/X11/ to /etc/X11/ 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. --- 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 | 13 ++++-- 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, 188 insertions(+), 148 deletions(-) diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index c8e7ea1cf2b0c..68a97c2f4f884 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -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 --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index 2b24fd4f706d6..d46d9f654a0ab 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -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 --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi index 6e1b4af106d4f..b21b5305c1353 100644 --- a/distrib/sets/lists/xetc/mi +++ b/distrib/sets/lists/xetc/mi @@ -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 --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist index fb0c9a1db816d..111331c35b8c4 100644 --- a/etc/mtree/NetBSD.dist +++ b/etc/mtree/NetBSD.dist @@ -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 --git a/x11/Makefile b/x11/Makefile index 4844cd1a92035..fb8dadef1dd9f 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -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 @@ -53,6 +53,17 @@ afterinstall: .PHONY .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 --git a/x11/TODO b/x11/TODO index c71c1a3ab9034..183efc095813a 100644 --- a/x11/TODO +++ b/x11/TODO @@ -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 --git a/x11/Xserver/Xext/Makefile.ext b/x11/Xserver/Xext/Makefile.ext index e8423752570a2..543b21d534030 100644 --- a/x11/Xserver/Xext/Makefile.ext +++ b/x11/Xserver/Xext/Makefile.ext @@ -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+= ${X11FLAGS.EXTENSION} CPPFLAGS+= -UXF86VIDMODE .endif -CPPFLAGS.security.c= -DDEFAULTPOLICYFILE=\"${X11LIBDIR}/xserver/SecurityPolicy\" +CPPFLAGS.security.c= -DDEFAULTPOLICYFILE=\"${X11ETCDIR}/xserver/SecurityPolicy\" CPPFLAGS.xf86bigfont.c= -DHAS_SHM .include diff --git a/x11/Xserver/Xext/ext/Makefile b/x11/Xserver/Xext/ext/Makefile index 4cd90f1d4a1ef..6dead539a70c1 100644 --- a/x11/Xserver/Xext/ext/Makefile +++ b/x11/Xserver/Xext/ext/Makefile @@ -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= EVI.c appgroup.c bigreq.c cup.c dpms.c fontcache.c mitmisc.c \ SRCS+= xf86vmode.c xf86misc.c xf86dga.c xf86dga2.c .endif -FILESDIR= ${X11LIBDIR}/xserver -FILES= SecurityPolicy +CONFIGFILES= SecurityPolicy +FILESDIR= ${X11ETCDIR}/xserver .include "../../Makefile.serverlib" .include "../Makefile.ext" diff --git a/x11/Xserver/printer/Makefile b/x11/Xserver/printer/Makefile index 2b479abedb205..139ab146fbc93 100644 --- a/x11/Xserver/printer/Makefile +++ b/x11/Xserver/printer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/10 16:28:29 rtr Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/16 10:25:14 lukem Exp $ .include "../Makefile.serverlib" @@ -26,7 +26,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${DESTDIR}${X11INCDIR}/X11/extensions \ -I${X11SRCDIR.xc}/lib/X11 -CPPFLAGS+= -DXPRINTDIR=\"${X11LIBDIR}/xserver\" \ +CPPFLAGS+= -DXPRINTDIR=\"${X11ETCDIR}/xserver\" \ -DXPRASTERDDX -DXPPCLDDX -DXPPSDDX -DHAS_MKSTEMP \ -UXFree86LOADER -D_XP_PRINT_SERVER_ diff --git a/x11/bin/lbxproxy/Makefile b/x11/bin/lbxproxy/Makefile index e114eb2b5d79b..0af4e8a010187 100644 --- a/x11/bin/lbxproxy/Makefile +++ b/x11/bin/lbxproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/04/05 12:03:25 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/16 10:25:14 lukem Exp $ .include @@ -16,8 +16,10 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \ -I${X11SRCDIR.xc}/programs/${PROG}/include \ ${X11FLAGS.SERVER} +LBXPROXYDIR= ${X11ETCDIR}/lbxproxy + CPPFLAGS.dispatch.c= ${X11FLAGS.EXTENSION} -CPPFLAGS.utils.c= -DDEF_ATOMS_FILE=\"${X11LIBDIR}/lbxproxy/AtomControl\" \ +CPPFLAGS.utils.c= -DDEF_ATOMS_FILE=\"${LBXPROXYDIR}/AtomControl\" \ -DRGB_DB=\"${X11LIBDIR}/rgb\" @@ -36,8 +38,8 @@ CPPFLAGS.transport.c+= -DLBXPROXY_t -DTRANS_SERVER -DBSD44SOCKETS \ -I${X11SRCDIR.xc}/lib/xtrans .PATH: ${X11SRCDIR.xc}/programs/${PROG}/config -FILES= AtomControl -FILESDIR= ${X11LIBDIR}/lbxproxy +CONFIGFILES= AtomControl +FILESDIR= ${LBXPROXYDIR} LDADD+= -llbxutil -lICE -lXext -lX11 -lz DPADD+= ${LIBLBXUTIL} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBZ} diff --git a/x11/bin/proxymngr/Makefile b/x11/bin/proxymngr/Makefile index 25db9116d78de..3509d2346312e 100644 --- a/x11/bin/proxymngr/Makefile +++ b/x11/bin/proxymngr/Makefile @@ -1,16 +1,20 @@ -# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:08 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/16 10:25:14 lukem Exp $ .include PROG= proxymngr SRCS= main.c pmdb.c config.c -CPPFLAGS.main.c=-DCONFIG_FILE=\"${X11LIBDIR}/proxymngr/pmconfig\" +PROXYMANAGERDIR= ${X11ETCDIR}/proxymngr + +CPPFLAGS.main.c= -DCONFIG_FILE=\"${PROXYMANAGERDIR}/pmconfig\" + +X11EXTRAMANDEFS+= -DPROXYMANAGERDIR=${PROXYMANAGERDIR} CPPSCRIPTS= pmconfig CPPSCRIPTFLAGS= -DLBXPROXY=${X11BINDIR}/lbxproxy -FILES= pmconfig -FILESDIR= ${X11LIBDIR}/proxymngr +CONFIGFILES= pmconfig +FILESDIR= ${PROXYMANAGERDIR} INCS= PM.h PMproto.h INCSDIR=${X11INCDIR}/X11/PM diff --git a/x11/bin/rstart/Makefile b/x11/bin/rstart/Makefile index 6cd8e747213a5..be7905f417bbf 100644 --- a/x11/bin/rstart/Makefile +++ b/x11/bin/rstart/Makefile @@ -1,31 +1,35 @@ -# $NetBSD: Makefile,v 1.5 2004/01/02 16:38:14 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/16 10:25:14 lukem Exp $ .include PROG= rstartd.real SRCS= auth.c server.c RSTARTDBINDIR= ${X11ROOTDIR}/libexec +RSTARTCONFIGDIR= ${X11ETCDIR}/rstart CPPFLAGS.server.c= -DSERVERNAME=\"rstartd\" \ - -DDEFAULT_CONFIG=\"${X11LIBDIR}/rstart/config\" + -DDEFAULT_CONFIG=\"${RSTARTCONFIGDIR}/config\" MAN= rstart.1 rstartd.1 +X11EXTRAMANDEFS+= -DRSTARTCONFIGDIR=${RSTARTCONFIGDIR} + BUILDSYMLINKS= client.cpp rstart.cpp \ server.cpp rstartd.cpp CPPSCRIPTS= config rstart rstartd -CPPSCRIPTFLAGS_config= -DBINDIR=${X11BINDIR} -DLIBDIR=${X11LIBDIR}/rstart \ +CPPSCRIPTFLAGS_config= -DBINDIR=${X11BINDIR} -DLIBDIR=${RSTARTCONFIGDIR} \ -DPACKAGEname=rstart -DENVPREFIX=RSTART CPPSCRIPTFLAGS_rstart= -DRSHCMD=rsh -DSERVERNAME=rstartd -CPPSCRIPTFLAGS_rstartd= -DLIBDIR=${X11LIBDIR}/rstart -DSERVERNAME=rstartd \ +CPPSCRIPTFLAGS_rstartd= -DLIBDIR=${RSTARTCONFIGDIR} -DSERVERNAME=rstartd \ -DBINDIR=${RSTARTDBINDIR} SCRIPTS= rstart rstartd SCRIPTSDIR= ${X11BINDIR} -FILES= config -FILESDIR= ${X11LIBDIR}/rstart +CONFIGFILES= config +FILESDIR= ${RSTARTCONFIGDIR} SUBDIR= commands contexts +TARGETS+= configinstall .PATH: ${X11SRCDIR.xc}/programs/rstart diff --git a/x11/bin/rstart/Makefile.rstart b/x11/bin/rstart/Makefile.rstart index d3bc2d1db69f4..63f2080e0880b 100644 --- a/x11/bin/rstart/Makefile.rstart +++ b/x11/bin/rstart/Makefile.rstart @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.rstart,v 1.2 2003/11/08 13:57:29 lukem Exp $ +# $NetBSD: Makefile.rstart,v 1.3 2004/05/16 10:25:14 lukem Exp $ .include .PATH: ${X11SRCDIR.xc}/programs/rstart/${CFDIR} -FILESDIR= ${X11LIBDIR}/rstart/${CFDIR} +FILESDIR= ${X11ETCDIR}/rstart/${CFDIR} .for _F in ${CFFILES} ${_F}.sed: ${_F} @@ -11,9 +11,11 @@ ${_F}.sed: ${_F} rm -f ${.TARGET} sed ${CFSED} < ${.ALLSRC} > ${.TARGET} -FILES+= ${_F}.sed +CONFIGFILES+= ${_F}.sed CLEANFILES+= ${_F}.sed FILESNAME_${_F}.sed= ${_F} .endfor -realall: ${FILES} +TARGETS+= configinstall + +realall: ${CONFIGFILES} diff --git a/x11/bin/rstart/commands/Makefile b/x11/bin/rstart/commands/Makefile index dac21e257b2c0..4c00741f0e420 100644 --- a/x11/bin/rstart/commands/Makefile +++ b/x11/bin/rstart/commands/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:09 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/16 10:25:14 lukem Exp $ .include @@ -6,7 +6,7 @@ CFDIR= commands CFFILES= @List ListContexts ListGenericCommands CFSED= -e 's,ENVPREFIX,RSTART,g' -SYMLINKS= x11r6 ${FILESDIR}/x \ +CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \ x11r6 ${FILESDIR}/x11 \ SUBDIR= x11r6 diff --git a/x11/bin/rstart/contexts/Makefile b/x11/bin/rstart/contexts/Makefile index 4b952f64a6eee..03c18461f7fbf 100644 --- a/x11/bin/rstart/contexts/Makefile +++ b/x11/bin/rstart/contexts/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:10 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/16 10:25:14 lukem Exp $ CFDIR= contexts CFFILES= @List default x11r6 CFSED= -e 's,_PATH,/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR},g' \ -e 's,_MANPATH,${X11MANDIR}:/usr/man,g' -SYMLINKS= x11r6 ${FILESDIR}/x \ +CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \ x11r6 ${FILESDIR}/x11 \ .include "../Makefile.rstart" diff --git a/x11/bin/twm/Makefile b/x11/bin/twm/Makefile index 2411d30319544..57716b65568ff 100644 --- a/x11/bin/twm/Makefile +++ b/x11/bin/twm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/11/08 13:57:29 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $ .include @@ -8,11 +8,16 @@ SRCS= gram.y lex.l deftwmrc.c add_window.c gc.c list.c twm.c \ cursor.c icons.c session.c YHEADER=1 + +TWMCONFIGDIR= ${X11ETCDIR}/twm + +X11EXTRAMANDEFS+= -DTWMDIR=${TWMCONFIGDIR} + CPPFLAGS+= -I. -I${X11SRCDIR.xc}/programs/${PROG} -DHAS_MKSTEMP -CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${X11LIBDIR}/twm/system.twmrc\" +CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${TWMCONFIGDIR}/system.twmrc\" -FILES= system.twmrc -FILESDIR=${X11LIBDIR}/twm +CONFIGFILES= system.twmrc +FILESDIR= ${TWMCONFIGDIR} DPSRCS+= deftwmrc.c CLEANFILES+= deftwmrc.c diff --git a/x11/bin/xdm/Makefile b/x11/bin/xdm/Makefile index 3ce30f515dbb4..521f82f754010 100644 --- a/x11/bin/xdm/Makefile +++ b/x11/bin/xdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/05/12 03:58:48 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2004/05/16 10:25:14 lukem Exp $ .include @@ -21,9 +21,9 @@ CPPFLAGS.resource.c= \ -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_SHELL=\"/bin/sh\" \ -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \ - -DDEF_XDM_CONFIG=\"${X11LIBDIR}/xdm/xdm-config\" \ + -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \ -DDEF_AUTH_DIR=\"${XDMVARDIR}\" \ - -DDEF_GREETER_LIB=\"${X11LIBDIR}/xdm/libXdmGreet.so\" + -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt @@ -32,14 +32,21 @@ DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBCRYPT} SUBDIR= chooser config sessreg # SUBDIR+= xdmshell # XXX +TARGETS+= configinstall .PATH: ${X11SRCDIR.xc}/programs/${PROG}/greeter .include "Makefile.xdm" -CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${CHOOSERPATH}\" -X11EXTRAMANDEFS+= -DCHOOSERPATH=${CHOOSERPATH} -SYMLINKS+= ${CHOOSERPATH} ${X11LIBDIR}/xdm/chooser +CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\" + +X11EXTRAMANDEFS+= -DARC4_RANDOM \ + -DCHOOSERPATH=${XDMCHOOSERPATH} \ + -DGREETERLIBPATH=${XDMGREETERLIB} \ + -DXDMDIR=${XDMDIR} \ + -DXDMAUTHDIR=${XDMVARDIR} \ + -DXDMLOGDIR=${XDMLOGDIR} \ + -DXDMPIDDIR=${XDMPIDDIR} .include .include diff --git a/x11/bin/xdm/Makefile.xdm b/x11/bin/xdm/Makefile.xdm index 1fea4aba49c56..8225993518154 100644 --- a/x11/bin/xdm/Makefile.xdm +++ b/x11/bin/xdm/Makefile.xdm @@ -1,8 +1,13 @@ -# $NetBSD: Makefile.xdm,v 1.6 2004/05/12 03:58:48 lukem Exp $ +# $NetBSD: Makefile.xdm,v 1.7 2004/05/16 10:25:14 lukem Exp $ -XDMVARDIR?= /var/db/xdm +XDMVARDIR= /var/db/xdm +XDMDIR= ${X11ETCDIR}/xdm +XDMCHOOSERPATH= ${X11ROOTDIR}/libexec/chooser +XDMGREETERLIB= ${X11ROOTDIR}/libexec/libXdmGreet.so +XDMLOGDIR= /var/log +XDMPIDDIR= /var/run -CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \ +CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \ -DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \ -DFRAGILE_DEV_MEM -DARC4_RANDOM \ -DXPM -DUSE_XINERAMA -DHAS_SETPROCTITLE \ @@ -10,8 +15,4 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${X11LIBDIR}/xdm\" \ -I${X11SRCDIR.xc}/programs/xdm \ ${X11FLAGS.VERSION} -X11EXTRAMANDEFS+=-DARC4_RANDOM -DXDMAUTHDIR=${XDMVARDIR} - -CHOOSERPATH= ${X11ROOTDIR}/libexec/chooser - .PATH: ${X11SRCDIR.xc}/programs/xdm diff --git a/x11/bin/xdm/chooser/Makefile b/x11/bin/xdm/chooser/Makefile index ee69a3e5c1f60..9e8a1840012e8 100644 --- a/x11/bin/xdm/chooser/Makefile +++ b/x11/bin/xdm/chooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/01/02 17:19:51 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2004/05/16 10:25:14 lukem Exp $ NOMAN= 1 @@ -17,5 +17,5 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ .include "../Makefile.xdm" .include -BINDIR= ${CHOOSERPATH:H} +BINDIR= ${XDMCHOOSERPATH:H} .include diff --git a/x11/bin/xdm/config/Makefile b/x11/bin/xdm/config/Makefile index 9259910d3714a..f78762602907e 100644 --- a/x11/bin/xdm/config/Makefile +++ b/x11/bin/xdm/config/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.7 2004/05/12 03:58:48 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2004/05/16 10:25:14 lukem Exp $ .include CPPSCRIPTS= Xresources Xservers.ws xdm-config -CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11LIBDIR}/xdm/pixmaps \ +CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \ -DXDM_PIXMAP=XFree86.xpm \ -DXDM_BWPIXMAP=XFree86bw.xpm @@ -16,20 +16,21 @@ DEFAULTVT= # defined empty .endif CPPSCRIPTFLAGS_Xservers.ws= -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT} -CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${X11LIBDIR}/xdm \ - -DXDMLOGDIR=/var/log \ +CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${XDMDIR} \ -DXDMAUTHDIR=${XDMVARDIR} \ - -DXDMPIDDIR=/var/run \ + -DXDMLOGDIR=${XDMLOGDIR} \ + -DXDMPIDDIR=${XDMPIDDIR} \ -DSU="su -m" -FILES= GiveConsole TakeConsole XFree86.xpm XFree86bw.xpm \ +CONFIGFILES= GiveConsole TakeConsole \ Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \ ${CPPSCRIPTS} -FILESDIR= ${X11LIBDIR}/xdm -FILESDIR_XFree86.xpm= ${X11LIBDIR}/xdm/pixmaps -FILESDIR_XFree86bw.xpm= ${X11LIBDIR}/xdm/pixmaps +FILES= XFree86.xpm XFree86bw.xpm +FILESDIR= ${XDMDIR} +FILESDIR_XFree86.xpm= ${X11INCDIR}/X11/pixmaps +FILESDIR_XFree86bw.xpm= ${X11INCDIR}/X11/pixmaps -SYMLINKS= Xservers.ws ${X11LIBDIR}/xdm/Xservers +CONFIGSYMLINKS= Xservers.ws ${XDMDIR}/Xservers BUILDSYMLINKS= Xres.cpp Xresources.cpp \ Xserv.ws.cpp Xservers.ws.cpp \ @@ -39,7 +40,7 @@ BUILDSYMLINKS= Xres.cpp Xresources.cpp \ .include "../Makefile.xdm" -CPPSCRIPTFLAGS_xdm-config+= -DCHOOSERPATH=${CHOOSERPATH} +CPPSCRIPTFLAGS_xdm-config+= -DCHOOSERPATH=${XDMCHOOSERPATH} .include .include diff --git a/x11/bin/xfs/Makefile b/x11/bin/xfs/Makefile index 8ef799bee628e..4f7410eea27da 100644 --- a/x11/bin/xfs/Makefile +++ b/x11/bin/xfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/03/06 03:09:36 rtr Exp $ +# $NetBSD: Makefile,v 1.7 2004/05/16 10:25:14 lukem Exp $ .include @@ -21,7 +21,9 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/xfs/include \ CONN_DEFINES= ${X11FLAGS.CONNECTION} -DFONT_t -DTRANS_SERVER \ -DTRANS_REOPEN -CPPFLAGS.main.c= -DDEFAULT_CONFIG_FILE=\"${X11LIBDIR}/fs/config\" +XFSCONFIGDIR= ${X11ETCDIR}/fs + +CPPFLAGS.main.c= -DDEFAULT_CONFIG_FILE=\"${XFSCONFIGDIR}/config\" CPPFLAGS.initfonts.c= -DFONT_PCF -DFONT_FS -DFONT_SPEEDO -DFONTCACHE CPPFLAGS.connection.c= ${CONN_DEFINES} -DBSD44SOCKETS \ ${X11FLAGS.OS_DEFINES} @@ -33,14 +35,17 @@ CPPFLAGS.osglue.c= ${CONN_DEFINES} \ ${X11FLAGS.OS_DEFINES} CPPFLAGS.config.c= ${CONN_DEFINES} -DFONTCACHE +X11EXTRAMANDEFS+= -DDEFAULT_CONFIG_FILE=${XFSCONFIGDIR}/config + BUILDSYMLINKS= config.cpp fsconfig.cpp CPPSCRIPTS= fsconfig CPPSCRIPTFLAGS= -DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Speedo/,${X11FONTDIR}/Type1/,${X11FONTDIR}/CID/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \ -DFSERRORS=/var/log/xfs.log -FILES= fsconfig + +CONFIGFILES= fsconfig FILESNAME= config -FILESDIR= ${X11LIBDIR}/fs +FILESDIR= ${XFSCONFIGDIR} LDADD+= -lXfont -lfntstubs -lXfontcache -lXext -lX11 -lfreetype -lm -lz diff --git a/x11/bin/xinit/Makefile b/x11/bin/xinit/Makefile index 065628ec1b82f..1c3cfde230da3 100644 --- a/x11/bin/xinit/Makefile +++ b/x11/bin/xinit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2004/04/24 03:42:07 mrg Exp $ +# $NetBSD: Makefile,v 1.5 2004/05/16 10:25:14 lukem Exp $ .include @@ -7,6 +7,8 @@ PROG= xinit MAN= xinit.1 startx.1 +XINITDIR= ${X11ETCDIR}/xinit + CPPFLAGS+= -DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \ .if ${XSERVER_XFREE86} != "no" @@ -14,19 +16,19 @@ CPPFLAGS+= -DXFREE86 .endif CPPSCRIPTS= startx xinitrc -CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${X11LIBDIR}/xinit -DBINDIR=${X11BINDIR} -CPPSCRIPTFLAGS_startx= -DXINITDIR=${X11LIBDIR}/xinit -DBINDIR=${X11BINDIR} \ +CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} +CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \ -DHAS_COOKIE_MAKER \ -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"' SCRIPTS= startx -FILES= xinitrc -FILESDIR= ${X11LIBDIR}/xinit +CONFIGFILES= xinitrc +FILESDIR= ${XINITDIR} LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} -X11EXTRAMANDEFS=-D__xinitdir__=${X11LIBDIR}/xinit +X11EXTRAMANDEFS=-D__xinitdir__=${XINITDIR} .PATH: ${X11SRCDIR.xc}/programs/${PROG} diff --git a/x11/bin/xsm/Makefile b/x11/bin/xsm/Makefile index 63a3ec6b253ca..cd18ead5138c8 100644 --- a/x11/bin/xsm/Makefile +++ b/x11/bin/xsm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/09/13 20:18:36 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/16 10:25:14 lukem Exp $ .include @@ -7,12 +7,14 @@ SRCS= auth.c choose.c info.c list.c lock.c log.c \ mainwin.c misc.c popup.c printhex.c prop.c remote.c \ restart.c save.c saveutil.c signals.c xsm.c xtwatch.c +XSMDIR= ${X11ETCDIR}/xsm + CPPFLAGS+=-DHAS_MKSTEMP CPPFLAGS.remote.c= -DRSHCMD=\"rsh\" -CPPFLAGS.restart.c= -DSYSTEM_INIT_FILE=\"${X11LIBDIR}/xsm/system.xsm\" +CPPFLAGS.restart.c= -DSYSTEM_INIT_FILE=\"${XSMDIR}/system.xsm\" -FILES= system.xsm -FILESDIR=${X11LIBDIR}/xsm +CONFIGFILES= system.xsm +FILESDIR= ${XSMDIR} APPDEFS=XSm.ad diff --git a/x11/lib/fontconfig/etc/Makefile b/x11/lib/fontconfig/etc/Makefile index fb83c524dd642..9001068ba3771 100644 --- a/x11/lib/fontconfig/etc/Makefile +++ b/x11/lib/fontconfig/etc/Makefile @@ -1,13 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2004/03/06 03:05:40 rtr Exp $ - -XTODO= only install on make distribution?? +# $NetBSD: Makefile,v 1.4 2004/05/16 10:25:14 lukem Exp $ .include .PATH: ${X11SRCDIR.xc}/extras/fontconfig -FILESDIR=/etc/fonts -FILES= fonts.conf fonts.dtd +CONFIGFILES= fonts.conf fonts.dtd +FILESDIR= /etc/fonts .include .include