diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index d602d3ae4a84..c166b8f91b87 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -1,64 +1,64 @@ -# $Id: BSD.include.dist,v 1.16 1998/03/04 10:22:51 dufault Exp $ +# $Id: BSD.include.dist,v 1.17 1998/05/28 06:59:50 peter Exp $ # -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 . arpa .. g++ std .. .. isofs cd9660 .. .. machine .. msdosfs .. net .. netatalk .. netinet .. netipx .. netkey .. netns .. nfs .. objc .. pccard .. posix4 .. protocols .. readline .. rpc .. rpcsvc .. ss .. sys .. tcl .. ufs ffs .. mfs .. ufs .. .. vm .. .. diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 32da1a4e59da..8146eb2dd633 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -1,56 +1,56 @@ -# $Id: BSD.root.dist,v 1.27 1997/10/01 13:06:30 ache Exp $ +# $Id: BSD.root.dist,v 1.28 1997/10/20 00:35:38 jmb Exp $ # /set type=dir uname=root gname=wheel mode=0755 . - bin uname=bin gname=bin + bin uname=root gname=wheel .. -/set type=dir uname=bin gname=bin mode=0555 +/set type=dir uname=root gname=wheel mode=0555 dev uname=root gname=wheel mode=0755 fd .. .. /set type=dir uname=root gname=wheel mode=0755 etc periodic daily .. weekly .. monthly .. .. gnats .. kerberosIV .. mail .. mtree .. namedb .. ppp .. skel .. uucp uname=uucp gname=uucp mode=0770 .. .. - lkm uname=bin gname=bin + lkm uname=root gname=wheel .. mnt .. proc mode=0555 .. root .. - sbin uname=bin gname=bin + sbin uname=root gname=wheel .. - tmp uname=bin gname=bin mode=01777 + tmp uname=root gname=wheel mode=01777 .. usr .. var .. .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3dd44a2761f6..dd2e316fbd0f 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1,729 +1,729 @@ -# $Id: BSD.usr.dist,v 1.122 1998/09/10 15:46:41 bde Exp $ +# $Id: BSD.usr.dist,v 1.123 1998/09/12 21:16:16 jkh Exp $ # -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 . uname=root gname=wheel bin .. -/set type=dir uname=games gname=bin mode=0700 - games uname=bin mode=0755 +/set type=dir uname=games gname=games mode=0700 + games uname=root mode=0755 hide gname=games uname=root mode=0550 .. .. -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 include .. lib aout .. compat .. .. libdata doscmd .. gcc .. ldscripts .. lint .. msdosfs .. stallion .. perl 5.00502 B .. CGI .. CPAN .. Class .. Data .. Devel .. ExtUtils .. File Spec .. .. Getopt .. I18N .. IPC .. Math .. Net .. Pod .. Search .. Sys .. Term .. Test .. Text .. Tie .. Time .. User .. auto Getopt Long .. .. .. mach B .. CORE .. IO .. auto B .. DB_File .. Data Dumper .. .. DynaLoader .. Fcntl .. IO .. IPC SysV .. .. NDBM_File .. Opcode .. POSIX .. SDBM_File .. Socket .. attrs .. re .. sdbm .. .. .. .. .. .. libexec aout .. elf .. lpr ru .. .. sm.bin .. uucp .. .. local uname=root gname=wheel .. mdec .. obj nochange .. sbin .. share calendar de_DE.ISO_8859-1 .. hr_HR.ISO_8859-2 .. ru_SU.KOI8-R .. .. dict .. doc FAQ .. handbook .. ja FAQ .. handbook .. .. papers .. psd 05.sysman .. 12.make .. 13.rcs .. 18.gprof .. 19.curses .. 20.ipctut .. 21.ipc .. 22.rpcgen .. 23.rpc .. 24.xdr .. 25.xdrrfc .. 26.rpcrfc .. 27.nfsrfc .. 28.cvs .. .. smm 01.setup .. 02.config .. 03.fsck .. 04.quotas .. 05.fastfs .. 06.nfs .. 07.lpd .. 08.sendmailop .. 09.sendmail .. 10.named .. 11.timedop .. 12.timed .. 18.net .. .. tutorials ddwg .. mh .. devel .. diskformat .. disklessx .. fonts .. ppp .. multios .. newuser .. upgrade .. .. usd 04.csh .. 07.mail .. 10.exref .. 11.edit .. 12.vi .. 13.viref .. 18.msdiffs .. 19.memacros .. 20.meref .. 30.rogue .. 31.trek .. .. .. examples FreeBSD_version .. atapi .. cvs contrib .. examples .. pcl-cvs .. .. cvsup .. drivers .. etc .. find_interface .. ibcs2 .. libvgl .. lkm misc module .. test .. .. syscall module .. test .. .. .. meteor .. mdoc .. perfmon .. ppi .. printing .. slattach .. sliplogin .. startslip .. sunrpc dir .. msg .. sort .. .. worm .. .. -/set type=dir uname=games gname=bin mode=0755 - games uname=bin +/set type=dir uname=games gname=games mode=0755 + games uname=root atc .. fortune .. larn .. quiz.db .. .. -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 groff_font devX100 .. devX100-12 .. devX75 .. devX75-12 .. devascii .. devdvi .. devkoi8-r .. devlatin1 .. devlj4 .. devps .. .. info .. isdn .. libg++ .. locale da_DK.ISO_8859-1 .. de_AT.ISO_8859-1 .. de_CH.ISO_8859-1 .. de_DE.ISO_8859-1 .. en_AU.ISO_8859-1 .. en_CA.ISO_8859-1 .. en_GB.ISO_8859-1 .. en_US.ISO_8859-1 .. es_ES.ISO_8859-1 .. fi_FI.ISO_8859-1 .. fr_BE.ISO_8859-1 .. fr_CA.ISO_8859-1 .. fr_CH.ISO_8859-1 .. fr_FR.ISO_8859-1 .. hr_HR.ISO_8859-2 .. hu_HU.ISO_8859-2 .. is_IS.ISO_8859-1 .. it_CH.ISO_8859-1 .. it_IT.ISO_8859-1 .. ja_JP.EUC .. ja_JP.SJIS .. ko_KR.EUC .. lt_LN.ASCII .. lt_LN.ISO_8859-1 .. lt_LN.ISO_8859-2 .. nl_BE.ISO_8859-1 .. nl_NL.ISO_8859-1 .. no_NO.ISO_8859-1 .. pl_PL.ISO_8859-2 .. pt_PT.ISO_8859-1 .. ru_SU.CP866 .. ru_SU.KOI8-R .. sl_SI.ISO_8859-2 .. sv_SE.ISO_8859-1 .. zh_CN.EUC .. zh_TW.BIG5 .. .. -/set type=dir uname=man gname=bin mode=0755 - man uname=bin +/set type=dir uname=man gname=root mode=0755 + man uname=wheel cat1 .. cat1aout .. cat2 .. cat3 .. cat4 i386 .. .. cat5 .. cat6 .. cat7 .. cat8 i386 .. .. cat9 i386 .. .. catn .. - ja uname=bin + ja uname=root cat1 .. cat2 .. cat3 .. cat4 .. cat5 .. cat6 .. cat7 .. cat8 .. cat9 .. catn .. - man1 uname=bin + man1 uname=root .. - man2 uname=bin + man2 uname=root .. - man3 uname=bin + man3 uname=root .. - man4 uname=bin + man4 uname=root .. - man5 uname=bin + man5 uname=root .. - man6 uname=bin + man6 uname=root .. - man7 uname=bin + man7 uname=root .. - man8 uname=bin + man8 uname=root .. - man9 uname=bin + man9 uname=root .. - mann uname=bin + mann uname=root .. .. - man1 uname=bin + man1 uname=root .. - man1aout uname=bin + man1aout uname=root .. - man2 uname=bin + man2 uname=root .. - man3 uname=bin + man3 uname=root .. -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 man4 i386 .. .. man5 .. man6 .. man7 .. man8 i386 .. .. man9 i386 .. .. mann .. .. me .. misc fonts .. pcvtfonts .. pkg_manage .. .. mk .. nls C .. da_DK.ISO_8859-1 .. de_AT.ISO_8859-1 .. de_CH.ISO_8859-1 .. de_DE.ISO_8859-1 .. en_AU.ISO_8859-1 .. en_CA.ISO_8859-1 .. en_GB.ISO_8859-1 .. en_US.ISO_8859-1 .. es_ES.ISO_8859-1 .. fi_FI.ISO_8859-1 .. fr_BE.ISO_8859-1 .. fr_CA.ISO_8859-1 .. fr_CH.ISO_8859-1 .. fr_FR.ISO_8859-1 .. hr_HR.ISO_8859-2 .. hu_HU.ISO_8859-2 .. is_IS.ISO_8859-1 .. it_CH.ISO_8859-1 .. it_IT.ISO_8859-1 .. ja_JP.EUC .. ja_JP.SJIS .. ko_KR.EUC .. lt_LN.ASCII .. lt_LN.ISO_8859-1 .. lt_LN.ISO_8859-2 .. nl_BE.ISO_8859-1 .. nl_NL.ISO_8859-1 .. no_NO.ISO_8859-1 .. pl_PL.ISO_8859-2 .. pt_PT.ISO_8859-1 .. ru_SU.CP866 .. ru_SU.KOI8-R .. sl_SI.ISO_8859-2 .. sv_SE.ISO_8859-1 .. zh_CN.EUC .. .. pcvt Doc .. Etc .. .. perl -/set type=dir uname=man gname=bin mode=0755 - man uname=bin +/set type=dir uname=root gname=wheel mode=0755 + man uname=root cat3 .. - man3 uname=bin + man3 uname=root .. .. .. -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 skel .. syscons fonts .. keymaps .. scrnmaps .. .. tabset .. tmac mdoc .. mm .. .. vi catalog .. perl .. tcl .. .. -/set type=dir uname=bin gname=bin mode=0555 +/set type=dir uname=root gname=wheel mode=0555 zoneinfo mode=0755 Africa .. America Indiana .. .. Antarctica .. Arctic .. Asia .. Atlantic .. Australia .. Etc .. Europe .. Indian .. Pacific .. SystemV .. .. .. src mode=0755 nochange .. .. diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index 53bfd73787f2..62889744c75f 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -1,86 +1,86 @@ -# $Id: BSD.var.dist,v 1.34 1997/09/24 17:40:11 ache Exp $ +# $Id: BSD.var.dist,v 1.35 1997/10/01 13:06:31 ache Exp $ # -/set type=dir uname=bin gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 . uname=root gname=wheel account .. /set type=dir uname=daemon gname=wheel mode=0755 at uname=root jobs .. spool .. .. backups uname=root mode=0750 .. crash uname=root mode=0750 .. /set type=dir uname=root gname=wheel mode=0700 cron mode=0750 tabs .. .. - db uname=bin gname=bin mode=0755 + db uname=root gname=wheel mode=0755 .. -/set type=dir uname=root gname=bin mode=0755 +/set type=dir uname=root gname=wheel mode=0755 games gname=games mode=0775 hackdir gname=games mode=0770 save gname=games mode=0770 .. .. larn gname=games mode=0775 .. phantasia gname=games mode=0775 .. .. - log uname=bin + log uname=root .. - mail uname=bin gname=mail mode=0775 + mail uname=root gname=mail mode=0775 .. msgs uname=daemon .. - preserve uname=bin + preserve uname=root .. run uname=root .. - rwho uname=bin gname=daemon mode=0775 + rwho uname=root gname=daemon mode=0775 .. /set type=dir uname=uucp gname=daemon mode=0755 - spool uname=bin gname=bin + spool uname=root gname=wheel lock gname=dialer mode=0775 .. - lpd uname=bin + lpd uname=root .. mqueue uname=root .. opielocks uname=root mode=0700 .. - output uname=bin + output uname=root lpd uname=root gname=daemon .. .. /set type=dir uname=uucp gname=uucp mode=0775 uucp .Preserve .. .Sequence .. .Status .. .Temp .. .Xqtdir .. .. uucppublic mode=0777 .. .. -/set type=dir uname=bin gname=bin mode=01777 +/set type=dir uname=root gname=wheel mode=01777 tmp vi.recover .. .. yp mode=0755 .. .. diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 345fbe3210a6..fece2848e2e5 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,200 +1,200 @@ -# $Id: bsd.own.mk,v 1.17 1998/08/30 20:35:24 jb Exp $ +# $Id: bsd.own.mk,v 1.18 1998/08/31 23:34:37 jb Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. # # # +++ variables +++ # # DESTDIR Change the tree where the file gets installed. [not set] # # DISTDIR Change the tree where the file for a distribution # gets installed (see /usr/src/release/Makefile). [not set] # # # COPY The flag passed to the install program to cause the binary # to be copied rather than moved. This is to be used when # building our own install script so that the entire system # can either be installed with copies, or with moves using # a single knob. [-c] # # COMPRESS_CMD Program to compress documents. # Output is to stdout. [gzip -cn] # # COMPRESS_EXT File name extension of ${COMPRESS_CMD} command. [.gz] # # STRIP The flag passed to the install program to cause the binary # to be stripped. This is to be used when building your # own install script so that the entire system can be made # stripped/not-stripped using a single knob. [-s] # # OBJFORMAT Default object format that selects which set of tools to run. # [elf on alpha, aout otherwise] # -# BINOWN Binary owner. [bin] +# BINOWN Binary owner. [root] # -# BINGRP Binary group. [bin] +# BINGRP Binary group. [wheel] # # BINMODE Binary mode. [555] # # NOBINMODE Mode for non-executable files. [444] # # # LIBDIR Base path for libraries. [/usr/lib] # # LIBCOMPATDIR Base path for compat libraries. [/usr/lib/compat] # # LIBDATADIR Base path for misc. utility data files. [/usr/libdata] # # LINTLIBDIR Base path for lint libraries. [/usr/libdata/lint] # # SHLIBDIR Base path for shared libraries. [${LIBDIR}] # # LIBOWN Library mode. [${BINOWN}] # # LIBGRP Library group. [${BINGRP}] # # LIBMODE Library mode. [${NOBINMODE}] # # # KMODDIR Base path for loadable kernel modules # (see lkm(4)). [/lkm] # # KMODOWN LKM owner. [${BINOWN}] # # KMODGRP LKM group. [${BINGRP}] # # KMODMODE LKM mode. [${BINMODE}] # # # SHAREDIR Base path for architecture-independent ascii # text files. [/usr/share] # -# SHAREOWN ASCII text file owner. [bin] +# SHAREOWN ASCII text file owner. [root] # -# SHAREGRP ASCII text file group. [bin] +# SHAREGRP ASCII text file group. [wheel] # # SHAREMODE ASCII text file mode. [${NOBINMODE}] # # # DOCDIR Base path for system documentation (e.g. PSD, USD, # handbook, FAQ etc.). [${SHAREDIR}/doc] # # DOCOWN Documentation owner. [${SHAREOWN}] # # DOCGRP Documentation group. [${SHAREGRP}] # # DOCMODE Documentation mode. [${NOBINMODE}] # # # INFODIR Base path for GNU's hypertext system # called Info (see info(1)). [${SHAREDIR}/info] # # INFOOWN Info owner. [${SHAREOWN}] # # INFOGRP Info group. [${SHAREGRP}] # # INFOMODE Info mode. [${NOBINMODE}] # # # MANDIR Base path for manual installation. [${SHAREDIR}/man/man] # # MANOWN Manual owner. [${SHAREOWN}] # # MANGRP Manual group. [${SHAREGRP}] # # MANMODE Manual mode. [${NOBINMODE}] # # # NLSDIR Base path for National Language Support files # installation (see mklocale(1)). [${SHAREDIR}/nls] # # NLSGRP National Language Support files group. [${SHAREOWN}] # # NLSOWN National Language Support files owner. [${SHAREGRP}] # # NLSMODE National Language Support files mode. [${NONBINMODE}] # # INCLUDEDIR Base path for standard C include files [/usr/include] # This is only here for bootstrapping and is not officially exported # from here. It has normally already been defined in sys.mk. MACHINE_ARCH?= i386 # # The build tools are indirected by /usr/bin/objformat which determines the # object format from the OBJFORMAT environment variable and if this is not # defined, it reads /etc/objectformat. # .if exists(/etc/objformat) && !defined(OBJFORMAT) .include "/etc/objformat" .endif # Default executable format .if ${MACHINE_ARCH} == "alpha" OBJFORMAT?= elf .else OBJFORMAT?= aout .endif # Binaries -BINOWN?= bin -BINGRP?= bin +BINOWN?= root +BINGRP?= wheel BINMODE?= 555 NOBINMODE?= 444 .if ${OBJFORMAT} == aout LIBDIR?= /usr/lib/aout .else LIBDIR?= /usr/lib .endif LIBCOMPATDIR?= /usr/lib/compat LIBDATADIR?= /usr/libdata LINTLIBDIR?= /usr/libdata/lint SHLIBDIR?= ${LIBDIR} LIBOWN?= ${BINOWN} LIBGRP?= ${BINGRP} LIBMODE?= ${NOBINMODE} KMODDIR?= /lkm KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} KMODMODE?= ${BINMODE} # Share files SHAREDIR?= /usr/share -SHAREOWN?= bin -SHAREGRP?= bin +SHAREOWN?= root +SHAREGRP?= wheel SHAREMODE?= ${NOBINMODE} MANDIR?= ${SHAREDIR}/man/man MANOWN?= ${SHAREOWN} MANGRP?= ${SHAREGRP} MANMODE?= ${NOBINMODE} DOCDIR?= ${SHAREDIR}/doc DOCOWN?= ${SHAREOWN} DOCGRP?= ${SHAREGRP} DOCMODE?= ${NOBINMODE} INFODIR?= ${SHAREDIR}/info INFOOWN?= ${SHAREOWN} INFOGRP?= ${SHAREGRP} INFOMODE?= ${NOBINMODE} NLSDIR?= ${SHAREDIR}/nls NLSGRP?= ${SHAREOWN} NLSOWN?= ${SHAREGRP} NLSMODE?= ${NONBINMODE} INCLUDEDIR?= /usr/include # Common variables .if !defined(DEBUG_FLAGS) STRIP?= -s .endif COPY?= -c COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz