mtree: Remove BSD.local.dist.
authorSascha Wildner <saw@online.de>
Tue, 13 Mar 2018 10:30:01 +0000 (11:30 +0100)
committerSascha Wildner <saw@online.de>
Tue, 13 Mar 2018 10:30:01 +0000 (11:30 +0100)
The (d)ports framework uses its own Templates/BSD.local.dist.

Discussed-with: zrj

Makefile_upgrade.inc
etc/Makefile
etc/mtree/BSD.local.dist [deleted file]
nrelease/Makefile

index af639c3..fa0fb0b 100644 (file)
@@ -3377,6 +3377,7 @@ TO_REMOVE+=/etc/periodic/monthly/300.statistics
 TO_REMOVE+=/etc/periodic/weekly/120.clean-kvmdb
 TO_REMOVE+=/etc/periodic/daily/470.status-named
 TO_REMOVE+=/etc/periodic/daily/430.status-rwho
+TO_REMOVE+=/etc/mtree/BSD.local.dist
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 916b3d2..96e78b8 100644 (file)
@@ -48,8 +48,7 @@ BIN2= pccard_ether rc.firewall rc.suspend rc.resume
 DEFAULTS= compilers.conf devfs.conf make.conf mkinitrd.conf periodic.conf \
          pfi.conf rc.conf uuids
 
-MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
-       BSD.var.dist
+MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 
 PPPCNF=        ppp.conf
 
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
deleted file mode 100644 (file)
index 3057ab8..0000000
+++ /dev/null
@@ -1,572 +0,0 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.55.2.20 2003/04/10 18:10:28 ru Exp $
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-    ..
-    info
-    ..
-    lib
-        perl5
-            site_perl
-            ..
-        ..
-    ..
-    libdata
-        ldconfig
-        ..
-    ..
-    libexec
-    ..
-    man
-/set uname=man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        de.ISO8859-1    uname=root
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catl
-            ..
-            catn
-            ..
-/set uname=root
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-            manl
-            ..
-            mann
-            ..
-        ..
-        en.ISO8859-1
-/set uname=man
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catn
-            ..
-        ..
-        ja              uname=root
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catl
-            ..
-            catn
-            ..
-/set uname=root
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-            manl
-            ..
-            mann
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-        ru.KOI8-R
-/set uname=man
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-            cat6
-            ..
-            cat7
-            ..
-            cat8
-            ..
-            cat9
-            ..
-            catl
-            ..
-            catn
-            ..
-/set uname=root
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-            manl
-            ..
-            mann
-            ..
-        ..
-    ..
-    sbin
-    ..
-    share
-        aclocal
-        ..
-        dict
-        ..
-        doc
-            ja
-            ..
-        ..
-        emacs
-            site-lisp
-            ..
-        ..
-        examples
-        ..
-        java
-            classes
-            ..
-        ..
-        misc
-        ..
-        nls
-            C
-            ..
-            af_ZA.ISO8859-1
-            ..
-            af_ZA.UTF-8
-            ..
-            ar_AE.UTF-8
-            ..
-            ar_EG.UTF-8
-            ..
-            ar_JO.UTF-8
-            ..
-            ar_MA.UTF-8
-            ..
-            ar_QA.UTF-8
-            ..
-            ar_SA.UTF-8
-            ..
-            am_ET.UTF-8
-            ..
-            be_BY.CP1131
-            ..
-            be_BY.CP1251
-            ..
-            be_BY.ISO8859-5
-            ..
-            be_BY.UTF-8
-            ..
-            bg_BG.CP1251
-            ..
-            bg_BG.UTF-8
-            ..
-            ca_ES.ISO8859-15
-            ..
-            ca_ES.UTF-8
-            ..
-            cs_CZ.ISO8859-2
-            ..
-            cs_CZ.UTF-8
-            ..
-            da_DK.ISO8859-15
-            ..
-            da_DK.UTF-8
-            ..
-            de_AT.ISO8859-15
-            ..
-            de_AT.UTF-8
-            ..
-            de_CH.ISO8859-15
-            ..
-            de_CH.UTF-8
-            ..
-            de_DE.ISO8859-15
-            ..
-            de_DE.UTF-8
-            ..
-            el_GR.ISO8859-7
-            ..
-            el_GR.UTF-8
-            ..
-            en_AU.ISO8859-1
-            ..
-            en_AU.US-ASCII
-            ..
-            en_AU.UTF-8
-            ..
-            en_CA.ISO8859-1
-            ..
-            en_CA.US-ASCII
-            ..
-            en_CA.UTF-8
-            ..
-            en_GB.ISO8859-15
-            ..
-            en_GB.US-ASCII
-            ..
-            en_GB.UTF-8
-            ..
-            en_HK.ISO8859-1
-            ..
-            en_HK.UTF-8
-            ..
-            en_IE.ISO8859-15
-            ..
-            en_IE.UTF-8
-            ..
-            en_NZ.ISO8859-1
-            ..
-            en_NZ.US-ASCII
-            ..
-            en_NZ.UTF-8
-            ..
-            en_PH.UTF-8
-            ..
-            en_SG.ISO8859-1
-            ..
-            en_SG.UTF-8
-            ..
-            en_US.ISO8859-1
-            ..
-            en_US.US-ASCII
-            ..
-            en_US.UTF-8
-            ..
-            en_ZA.ISO8859-1
-            ..
-            en_ZA.US-ASCII
-            ..
-            en_ZA.UTF-8
-            ..
-            es_AR.ISO8859-1
-            ..
-            es_AR.UTF-8
-            ..
-            es_CR.UTF-8
-            ..
-            es_ES.ISO8859-15
-            ..
-            es_ES.UTF-8
-            ..
-            es_MX.ISO8859-1
-            ..
-            es_MX.UTF-8
-            ..
-            et_EE.ISO8859-15
-            ..
-            et_EE.UTF-8
-            ..
-            eu_ES.ISO8859-15
-            ..
-            eu_ES.UTF-8
-            ..
-            fi_FI.ISO8859-15
-            ..
-            fi_FI.UTF-8
-            ..
-            fr_BE.ISO8859-15
-            ..
-            fr_BE.UTF-8
-            ..
-            fr_CA.ISO8859-1
-            ..
-            fr_CA.UTF-8
-            ..
-            fr_CH.ISO8859-15
-            ..
-            fr_CH.UTF-8
-            ..
-            fr_FR.ISO8859-15
-            ..
-            fr_FR.UTF-8
-            ..
-            he_IL.UTF-8
-            ..
-            hi_IN.ISCII-DEV
-            ..
-            hi_IN.UTF-8
-            ..
-            hr_HR.ISO8859-2
-            ..
-            hr_HR.UTF-8
-            ..
-            hu_HU.ISO8859-2
-            ..
-            hu_HU.UTF-8
-            ..
-            hy_AM.ARMSCII-8
-            ..
-            hy_AM.UTF-8
-            ..
-            is_IS.ISO8859-15
-            ..
-            is_IS.UTF-8
-            ..
-            it_CH.ISO8859-15
-            ..
-            it_CH.UTF-8
-            ..
-            it_IT.ISO8859-15
-            ..
-            it_IT.UTF-8
-            ..
-            ja_JP.SJIS
-            ..
-            ja_JP.UTF-8
-            ..
-            ja_JP.eucJP
-            ..
-            kk_Cyrl_KZ.UTF-8
-            ..
-            ko_KR.CP949
-            ..
-            ko_KR.UTF-8
-            ..
-            ko_KR.eucKR
-            ..
-            lt_LT.ISO8859-13
-            ..
-            lt_LT.UTF-8
-            ..
-            nb_NO.ISO8859-15
-            ..
-            nb_NO.UTF-8
-            ..
-            nl_BE.ISO8859-15
-            ..
-            nl_BE.UTF-8
-            ..
-            nl_NL.ISO8859-15
-            ..
-            nl_NL.UTF-8
-            ..
-            nn_NO.ISO8859-15
-            ..
-            nn_NO.UTF-8
-            ..
-            pl_PL.ISO8859-2
-            ..
-            pl_PL.UTF-8
-            ..
-            pt_BR.ISO8859-1
-            ..
-            pt_BR.UTF-8
-            ..
-            pt_PT.ISO8859-15
-            ..
-            pt_PT.UTF-8
-            ..
-            ro_RO.ISO8859-2
-            ..
-            ro_RO.UTF-8
-            ..
-            ru_RU.CP1251
-            ..
-            ru_RU.CP866
-            ..
-            ru_RU.ISO8859-5
-            ..
-            ru_RU.KOI8-R
-            ..
-            ru_RU.UTF-8
-            ..
-            se_FI.UTF-8
-            ..
-            se_NO.UTF-8
-            ..
-            sk_SK.ISO8859-2
-            ..
-            sk_SK.UTF-8
-            ..
-            sl_SI.ISO8859-2
-            ..
-            sl_SI.UTF-8
-            ..
-            sr_Cyrl_RS.ISO8859-5
-            ..
-            sr_Cyrl_RS.UTF-8
-            ..
-            sr_Latn_RS.ISO8859-2
-            ..
-            sr_Latn_RS.UTF-8
-            ..
-            sv_FI.ISO8859-15
-            ..
-            sv_FI.UTF-8
-            ..
-            sv_SE.ISO8859-15
-            ..
-            sv_SE.UTF-8
-            ..
-            tr_TR.ISO8859-9
-            ..
-            tr_TR.UTF-8
-            ..
-            uk_UA.ISO8859-5
-            ..
-            uk_UA.KOI8-U
-            ..
-            uk_UA.UTF-8
-            ..
-            zh_Hans_CN.GB18030
-            ..
-            zh_Hans_CN.GB2312
-            ..
-            zh_Hans_CN.GBK
-            ..
-            zh_Hans_CN.UTF-8
-            ..
-            zh_Hans_CN.eucCN
-            ..
-            zh_Hant_HK.Big5HKSCS
-            ..
-            zh_Hant_HK.UTF-8
-            ..
-            zh_Hant_TW.Big5
-            ..
-            zh_Hant_TW.UTF-8
-            ..
-        ..
-        sgml
-        ..
-        skel
-        ..
-        xml
-        ..
-    ..
-..
index 167cbd3..fa92f9c 100644 (file)
@@ -210,7 +210,6 @@ buildiso:
        # do so from inside of it.
        #
        ${ISOROOT}/sbin/mkinitrd -c ${ISOROOT}/usr/share/initrd -b ${ISOROOT}/boot
-       mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/
        mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var
        dev_mkdb -f ${ISOROOT}/var/run/dev.db ${ISOROOT}/dev