diff --git a/Makefile b/Makefile index a6ca71499..7e1cfe9f4 100644 --- a/Makefile +++ b/Makefile @@ -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 LOCALAPPD=/usr/local/lib/X11/app-defaults @@ -110,16 +110,12 @@ dist: distrib-dirs: - if [ ! -d ${DESTDIR}${X11BASE}/. ]; then \ - ${INSTALL} -d -o root -g wheel -m 755 ${DESTDIR}${X11BASE}/; \ - fi - mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist \ - -p ${DESTDIR}${X11BASE}/ -U - 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 +.if defined(DESTDIR) && ${DESTDIR} != "" + mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist -p ${DESTDIR} -U +.else + mtree -qdef ${.CURDIR}/etc/mtree/BSD.x11.dist -p / -U +.endif + .PHONY: all build beforeinstall install afterinstall release clean cleandir \ dist distrib-dirs fix-appd diff --git a/etc/mtree/BSD.etc-x11.dist b/etc/mtree/BSD.etc-x11.dist deleted file mode 100644 index f5b862ad1..000000000 --- a/etc/mtree/BSD.etc-x11.dist +++ /dev/null @@ -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 - .. -.. diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist index 5270638ea..4db82c66d 100644 --- a/etc/mtree/BSD.x11.dist +++ b/etc/mtree/BSD.x11.dist @@ -1,319 +1,451 @@ -# $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 . - bin - .. - include - GL - internal - .. - .. - X11 - ICE - .. - PM - .. - SM - .. - Xaw - .. - Xcursor - .. - Xft - .. - Xmu - .. - XprintAppUtil - .. - XprintUtil - .. - Xtrans - .. - bitmaps - .. - extensions - .. - fonts - .. - pixmaps - .. - .. - fontconfig - .. - freetype2 - freetype - config - .. - internal - services - .. - .. - .. - .. - xorg - .. - .. - lib + etc X11 app-defaults .. - config + fs .. - fonts - 100dpi - .. - 75dpi - .. - OTF - .. - Speedo - .. - TTF - .. - Type1 - .. - cyrillic - .. - encodings - large - .. - .. - misc - .. - util - .. - .. - fvwm + lbxproxy .. proxymngr .. - x11perfcomp - .. - xedit - lisp - progmodes + 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 .. .. - modules - drivers + fonts + conf.avail .. - extensions + conf.d .. - fonts - .. - input - .. - linux - .. - multimedia - .. - .. - pkgconfig - .. - xserver .. .. - man - cat1 + usr + X11R6 + bin + .. + include + GL + internal + .. + .. + X11 + ICE + .. + PM + .. + SM + .. + Xaw + .. + Xcursor + .. + Xft + .. + Xmu + .. + XprintAppUtil + .. + XprintUtil + .. + Xtrans + .. + bitmaps + .. + extensions + .. + fonts + .. + pixmaps + .. + .. + drm + .. + fontconfig + .. + freetype2 + freetype + config + .. + internal + services + .. + .. + .. + .. + pixman-1 + .. + xorg + .. + .. + lib + X11 + app-defaults + .. + config + .. + fonts + 100dpi + .. + 75dpi + .. + OTF + .. + Speedo + .. + TTF + .. + Type1 + .. + cyrillic + .. + encodings + large + .. + .. + misc + .. + util + .. + .. + fvwm + .. + proxymngr + .. + x11perfcomp + .. + xedit + lisp + progmodes + .. + .. + .. + .. + modules + drivers + .. + extensions + .. + fonts + .. + input + .. + linux + .. + multimedia + .. + .. + pkgconfig + .. + xserver + .. + .. + man + cat1 + .. + cat3 + .. + cat4 + .. + cat5 + .. + cat7 + .. + man1 + .. + man3 + .. + man4 + .. + man5 + .. + man7 + .. + .. + share + X11 + doc + .. + locale + C + .. + armscii-8 + .. + el_GR.UTF-8 + .. + en_US.UTF-8 + .. + georgian-academy + .. + georgian-ps + .. + ibm-cp1133 + .. + iscii-dev + .. + isiri-3342 + .. + iso8859-1 + .. + iso8859-10 + .. + iso8859-11 + .. + iso8859-13 + .. + iso8859-14 + .. + iso8859-15 + .. + iso8859-2 + .. + iso8859-3 + .. + iso8859-4 + .. + iso8859-5 + .. + iso8859-6 + .. + iso8859-7 + .. + iso8859-8 + .. + iso8859-9 + .. + iso8859-9e + .. + ja + .. + ja.JIS + .. + ja.S90 + .. + ja.SJIS + .. + ja.U90 + .. + ja_JP.UTF-8 + .. + ko + .. + ko_KR.UTF-8 + .. + koi8-c + .. + koi8-r + .. + koi8-u + .. + microsoft-cp1251 + .. + microsoft-cp1255 + .. + microsoft-cp1256 + .. + mulelao-1 + .. + nokhchi-1 + .. + pt_BR.UTF-8 + .. + tatar-cyr + .. + th_TH + .. + th_TH.UTF-8 + .. + tscii-0 + .. + vi_VN.tcvn + .. + vi_VN.viscii + .. + zh_CN + .. + zh_CN.UTF-8 + .. + zh_CN.gb18030 + .. + zh_CN.gbk + .. + zh_HK.UTF-8 + .. + zh_HK.big5 + .. + zh_HK.big5hkscs + .. + zh_TW + .. + zh_TW.UTF-8 + .. + zh_TW.big5 + .. + .. + xserver + C + print + attributes + .. + ddx-config + raster + .. + .. + models + CANONBJ10E-GS + .. + CANONC3200-PS + fonts + .. + .. + GSdefault + .. + HPDJ1600C + fonts + .. + .. + HPLJ4050-PS + fonts + .. + .. + HPLJ4family + fonts + .. + .. + PS2PDFspooldir-GS + .. + PSdefault + fonts + .. + .. + PSspooldir + .. + SPSPARC2 + fonts + .. + .. + .. + .. + .. + en_US + print + attributes + .. + .. + .. + .. + .. + aclocal + .. + doc + compositeproto + .. + damageproto + .. + fontconfig + fontconfig-devel + .. + .. + randrproto + .. + renderproto + .. + .. + mk + .. + .. .. - cat3 - .. - cat4 - .. - cat5 - .. - cat7 - .. - man1 - .. - man3 - .. - man4 - .. - man5 - .. - man7 + local + lib + X11 + .. + .. .. .. - share - X11 - doc - .. - locale - C - .. - armscii-8 - .. - el_GR.UTF-8 - .. - en_US.UTF-8 - .. - georgian-academy - .. - georgian-ps - .. - ibm-cp1133 - .. - iscii-dev - .. - isiri-3342 - .. - iso8859-1 - .. - iso8859-10 - .. - iso8859-11 - .. - iso8859-13 - .. - iso8859-14 - .. - iso8859-15 - .. - iso8859-2 - .. - iso8859-3 - .. - iso8859-4 - .. - iso8859-5 - .. - iso8859-6 - .. - iso8859-7 - .. - iso8859-8 - .. - iso8859-9 - .. - iso8859-9e - .. - ja - .. - ja.JIS - .. - ja.S90 - .. - ja.SJIS - .. - ja.U90 - .. - ja_JP.UTF-8 - .. - ko - .. - ko_KR.UTF-8 - .. - koi8-c - .. - koi8-r - .. - koi8-u - .. - microsoft-cp1251 - .. - microsoft-cp1255 - .. - microsoft-cp1256 - .. - mulelao-1 - .. - nokhchi-1 - .. - pt_BR.UTF-8 - .. - tatar-cyr - .. - th_TH - .. - th_TH.UTF-8 - .. - tscii-0 - .. - vi_VN.tcvn - .. - vi_VN.viscii - .. - zh_CN - .. - zh_CN.UTF-8 - .. - zh_CN.gb18030 - .. - zh_CN.gbk - .. - zh_HK.UTF-8 - .. - zh_HK.big5 - .. - zh_HK.big5hkscs - .. - zh_TW - .. - zh_TW.UTF-8 - .. - zh_TW.big5 - .. - .. - xserver - C - print - attributes - .. - ddx-config - raster - .. - .. - models - CANONBJ10E-GS - .. - CANONC3200-PS - fonts - .. - .. - GSdefault - .. - HPDJ1600C - fonts - .. - .. - HPLJ4050-PS - fonts - .. - .. - HPLJ4family - fonts - .. - .. - PS2PDFspooldir-GS - .. - PSdefault - fonts - .. - .. - PSspooldir - .. - SPSPARC2 - fonts - .. - .. - .. - .. - .. - en_US - print - attributes - .. - .. - .. + var + cache + fontconfig .. .. - aclocal + db + xkb + .. .. - mk + log .. .. ..