qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge the two xenocara mtree specs into a unique one, rooted at /

Browse Source 
ok todd@
This commit is contained in:
matthieu 2008-01-31 22:34:40 +00:00
parent e6e77f8eea
commit 78c2f7ac8a
3 changed files with 431 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2008/01/05 20:22:38 espie Exp $ # $OpenBSD: Makefile,v 1.25 2008/01/31 22:34:40 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
LOCALAPPD=/usr/local/lib/X11/app-defaults LOCALAPPD=/usr/local/lib/X11/app-defaults
@ -110,16 +110,12 @@ dist:
distrib-dirs: distrib-dirs:
if [ ! -d ${DESTDIR}${X11BASE}/. ]; then \ .if defined(DESTDIR) && ${DESTDIR} != ""
${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}${X11BASE}/; \ mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist -p ${DESTDIR} -U
fi .else
mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist \ mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist -p / -U
-p ${DESTDIR}${X11BASE}/ -U .endif
if [ ! -d ${DESTDIR}${X11ETC}/. ]; then \
${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}${X11ETC}/; \
fi
mtree -qdef ${.CURDIR}/etc/mtree/BSD.etc-x11.dist \
-p ${DESTDIR}${X11ETC}/ -U
.PHONY: all build beforeinstall install afterinstall release clean cleandir \ .PHONY: all build beforeinstall install afterinstall release clean cleandir \
dist distrib-dirs fix-appd dist distrib-dirs fix-appd

69
etc/mtree/BSD.etc-x11.dist
View File

@ -1,69 +0,0 @@
# $OpenBSD: BSD.etc-x11.dist,v 1.5 2006/12/31 10:17:17 matthieu Exp $
/set type=dir uname=root gname=wheel mode=0755
.
app-defaults
..
fs
..
lbxproxy
..
proxymngr
..
rstart
commands
x11r6
..
..
contexts
..
..
twm
..
xdm
..
xinit
..
xkb
compat
..
geometry
digital
..
sgi
..
..
keycodes
digital
..
sgi
..
..
keymap
digital
..
sgi
..
sun
..
..
rules
..
semantics
..
symbols
digital
..
fujitsu
..
nec
..
sony
..
sun
..
..
..
xsm
..
..

134
etc/mtree/BSD.x11.dist
View File

@ -1,7 +1,101 @@
# $OpenBSD: BSD.x11.dist,v 1.7 2006/12/31 16:02:32 matthieu Exp $ # $OpenBSD: BSD.x11.dist,v 1.8 2008/01/31 22:34:40 matthieu Exp $
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
. .
etc
X11
app-defaults
..
fs
..
lbxproxy
..
proxymngr
..
rstart
commands
x11r6
..
..
contexts
..
..
twm
..
xdm
pixmaps
..
..
xinit
..
xkb
compat
..
geometry
digital
..
ibm
..
sgi
..
..
keycodes
digital
..
sgi
..
..
keymap
digital
..
sgi
..
sun
..
..
rules
..
semantics
..
symbols
digital
..
fujitsu
..
hp
..
macintosh
..
nec
..
pc
..
sgi
..
sony
..
sun
..
xfree68
..
..
torture
..
types
..
..
xsm
..
..
fonts
conf.avail
..
conf.d
..
..
..
usr
X11R6
bin bin
.. ..
include include
@ -39,6 +133,8 @@
pixmaps pixmaps
.. ..
.. ..
drm
..
fontconfig fontconfig
.. ..
freetype2 freetype2
@ -51,6 +147,8 @@
.. ..
.. ..
.. ..
pixman-1
..
xorg xorg
.. ..
.. ..
@ -313,7 +411,41 @@
.. ..
aclocal aclocal
.. ..
doc
compositeproto
..
damageproto
..
fontconfig
fontconfig-devel
..
..
randrproto
..
renderproto
..
..
mk mk
.. ..
.. ..
..
local
lib
X11
..
..
..
..
var
cache
fontconfig
..
..
db
xkb
..
..
log
..
..
.. ..