Remove USE_MTREE support. Keep one copy (the NetBSD version) for

the purpose of print-PLIST in plist/common-dirs.mtree.

Discussed with wiz@, no objections on tech-pkg@.

2 files changed, 1347 insertions, 2 deletions

diff --git a/mk/plist/common-dirs.mtree b/mk/plist/common-dirs.mtree
new file mode 100644
index 00000000000..a54af10820e
--- /dev/null
+++ b/mk/plist/common-dirs.mtree
@@ -0,0 +1,1343 @@
+#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp
+#	$NetBSD: common-dirs.mtree,v 1.1 2007/07/02 14:54:21 joerg Exp $
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    bin
+    ..
+    emul
+    ..
+    etc
+        rc.d
+	..
+    ..
+    include
+    ..
+    info
+    ..
+    lib
+        pkgconfig
+        ..
+    ..
+    libdata
+	    tcl
+	    ..
+    ..
+    libexec
+        cgi-bin
+        ..
+    ..
+    man
+        bg
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        cat1
+        ..
+        cat2
+        ..
+        cat3
+        ..
+        cat4
+        ..
+        cat5
+        ..
+        cat6
+        ..
+        cat7
+        ..
+        cat8
+        ..
+        cat9
+        ..
+        catl
+        ..
+        catn
+        ..
+        cs
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        de
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        es
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        fi
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+	..
+        fr
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        ja_JP.EUC
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        pl
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+        man1
+        ..
+        man2
+        ..
+        man3
+        ..
+        man4
+        ..
+        man5
+        ..
+        man6
+        ..
+        man7
+        ..
+        man8
+        ..
+        man9
+        ..
+        manl
+        ..
+        mann
+        ..
+        ru
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+            cat6
+            ..
+            cat7
+            ..
+            cat8
+            ..
+            cat9
+            ..
+            catl
+            ..
+            catn
+            ..
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+            manl
+            ..
+            mann
+            ..
+        ..
+    ..
+    sbin
+    ..
+    share
+	aclocal
+	..
+        dict
+        ..
+        doc
+	    html
+	    ..
+        ..
+        emacs
+	    site-lisp
+	    ..
+        ..
+        examples
+            rc.d
+            ..
+        ..
+	games
+        ..
+	gtk-doc
+		html
+		..
+	..
+	locale
+            aa
+                LC_MESSAGES
+                ..
+            ..
+            af
+                LC_MESSAGES
+                ..
+            ..
+            am
+                LC_MESSAGES
+                ..
+            ..
+            ang
+                LC_MESSAGES
+                ..
+            ..
+            ar
+                LC_MESSAGES
+                ..
+            ..
+            as
+                LC_MESSAGES
+                ..
+            ..
+            az
+                LC_MESSAGES
+                ..
+            ..
+            az_IR
+                LC_MESSAGES
+                ..
+            ..
+            be
+                LC_MESSAGES
+                ..
+            ..
+            bg
+                LC_MESSAGES
+                ..
+            ..
+            bn
+                LC_MESSAGES
+                ..
+            ..
+            bn_IN
+                LC_MESSAGES
+                ..
+            ..
+            br
+                LC_MESSAGES
+                ..
+            ..
+            bs
+                LC_MESSAGES
+                ..
+            ..
+            byn
+                LC_MESSAGES
+                ..
+            ..
+            ca
+                LC_MESSAGES
+                ..
+            ..
+            ca_ES@valencian
+                LC_MESSAGES
+                ..
+            ..
+            cs
+                LC_MESSAGES
+                ..
+            ..
+            cy
+                LC_MESSAGES
+                ..
+            ..
+            da
+                LC_MESSAGES
+                ..
+            ..
+            de
+                LC_MESSAGES
+                ..
+            ..
+            de_AT
+                LC_MESSAGES
+                ..
+            ..
+            de_DE
+                LC_MESSAGES
+                ..
+            ..
+            dk
+                LC_MESSAGES
+                ..
+            ..
+            dv
+                LC_MESSAGES
+                ..
+            ..
+            dz
+                LC_MESSAGES
+                ..
+            ..
+            ee
+                LC_MESSAGES
+                ..
+            ..
+            el
+                LC_MESSAGES
+                ..
+            ..
+            el_GR
+                LC_MESSAGES
+                ..
+            ..
+            en
+                LC_MESSAGES
+                ..
+            ..
+            en@boldquot
+                LC_MESSAGES
+                ..
+            ..
+            en@quot
+                LC_MESSAGES
+                ..
+            ..
+            en_AU
+                LC_MESSAGES
+                ..
+            ..
+            en_CA
+                LC_MESSAGES
+                ..
+            ..
+            en_GB
+                LC_MESSAGES
+                ..
+            ..
+            en_US
+                LC_MESSAGES
+                ..
+            ..
+            en@IPA
+                LC_MESSAGES
+                ..
+            ..
+            eo
+                LC_MESSAGES
+                ..
+            ..
+            es
+                LC_MESSAGES
+                ..
+            ..
+            es_AR
+                LC_MESSAGES
+                ..
+            ..
+            es_CL
+                LC_MESSAGES
+                ..
+            ..
+            es_CO
+                LC_MESSAGES
+                ..
+            ..
+            es_CR
+                LC_MESSAGES
+                ..
+            ..
+            es_DO
+                LC_MESSAGES
+                ..
+            ..
+            es_EC
+                LC_MESSAGES
+                ..
+            ..
+            es_ES
+                LC_MESSAGES
+                ..
+            ..
+            es_GT
+                LC_MESSAGES
+                ..
+            ..
+            es_HN
+                LC_MESSAGES
+                ..
+            ..
+            es_MX
+                LC_MESSAGES
+                ..
+            ..
+            es_NI
+                LC_MESSAGES
+                ..
+            ..
+            es_PA
+                LC_MESSAGES
+                ..
+            ..
+            es_PE
+                LC_MESSAGES
+                ..
+            ..
+            es_PR
+                LC_MESSAGES
+                ..
+            ..
+            es_SV
+                LC_MESSAGES
+                ..
+            ..
+            es_UY
+                LC_MESSAGES
+                ..
+            ..
+            es_VE
+                LC_MESSAGES
+                ..
+            ..
+            et
+                LC_MESSAGES
+                ..
+            ..
+            et_EE
+                LC_MESSAGES
+                ..
+            ..
+            eu
+                LC_MESSAGES
+                ..
+            ..
+            fa
+                LC_MESSAGES
+                ..
+            ..
+            fi
+                LC_MESSAGES
+                ..
+            ..
+            fo
+                LC_MESSAGES
+                ..
+            ..
+            fr
+                LC_MESSAGES
+                ..
+            ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
+            ga
+                LC_MESSAGES
+                ..
+            ..
+            gd
+                LC_MESSAGES
+                ..
+            ..
+            gez
+                LC_MESSAGES
+                ..
+            ..
+            gl
+                LC_MESSAGES
+                ..
+            ..
+            gn
+                LC_MESSAGES
+                ..
+            ..
+            gu
+                LC_MESSAGES
+                ..
+            ..
+            gv
+                LC_MESSAGES
+                ..
+            ..
+            haw
+                LC_MESSAGES
+                ..
+            ..
+            he
+                LC_MESSAGES
+                ..
+            ..
+            hi
+                LC_MESSAGES
+                ..
+            ..
+            hr
+                LC_MESSAGES
+                ..
+            ..
+            hsb
+                LC_MESSAGES
+                ..
+            ..
+            hu
+                LC_MESSAGES
+                ..
+            ..
+            hy
+                LC_MESSAGES
+                ..
+            ..
+            ia
+                LC_MESSAGES
+                ..
+            ..
+            id
+                LC_MESSAGES
+                ..
+            ..
+            is
+                LC_MESSAGES
+                ..
+            ..
+            it
+                LC_MESSAGES
+                ..
+            ..
+            it_NA
+                LC_MESSAGES
+                ..
+            ..
+            iu
+                LC_MESSAGES
+                ..
+            ..
+            ja
+                LC_MESSAGES
+                ..
+            ..
+            ka
+                LC_MESSAGES
+                ..
+            ..
+            kk
+                LC_MESSAGES
+                ..
+            ..
+            kl
+                LC_MESSAGES
+                ..
+            ..
+            km
+                LC_MESSAGES
+                ..
+            ..
+            kn
+                LC_MESSAGES
+                ..
+            ..
+            ko
+                LC_MESSAGES
+                ..
+            ..
+            kok
+                LC_MESSAGES
+                ..
+            ..
+            ku
+                LC_MESSAGES
+                ..
+            ..
+            kw
+                LC_MESSAGES
+                ..
+            ..
+            ky
+                LC_MESSAGES
+                ..
+            ..
+            li
+                LC_MESSAGES
+                ..
+            ..
+            lo
+                LC_MESSAGES
+                ..
+            ..
+            lt
+                LC_MESSAGES
+                ..
+            ..
+            lv
+                LC_MESSAGES
+                ..
+            ..
+            mg
+                LC_MESSAGES
+                ..
+            ..
+            mi
+                LC_MESSAGES
+                ..
+            ..
+            mk
+                LC_MESSAGES
+                ..
+            ..
+            ml
+                LC_MESSAGES
+                ..
+            ..
+            mn
+                LC_MESSAGES
+                ..
+            ..
+            mr
+                LC_MESSAGES
+                ..
+            ..
+            ms
+                LC_MESSAGES
+                ..
+            ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
+            my_MM
+                LC_MESSAGES
+                ..
+            ..
+            nb
+                LC_MESSAGES
+                ..
+            ..
+            nds
+                LC_MESSAGES
+                ..
+            ..
+            nds@NFE
+                LC_MESSAGES
+                ..
+            ..
+            ne
+                LC_MESSAGES
+                ..
+            ..
+            nl
+                LC_MESSAGES
+                ..
+            ..
+            nl_BE
+                LC_MESSAGES
+                ..
+            ..
+            nl_NL
+                LC_MESSAGES
+                ..
+            ..
+            nn
+                LC_MESSAGES
+                ..
+            ..
+            no
+                LC_MESSAGES
+                ..
+            ..
+            no@nynorsk
+                LC_MESSAGES
+                ..
+            ..
+            no_NO
+                LC_MESSAGES
+                ..
+            ..
+            no_NY
+                LC_MESSAGES
+                ..
+            ..
+            nso
+                LC_MESSAGES
+                ..
+            ..
+            oc
+                LC_MESSAGES
+                ..
+            ..
+            om
+                LC_MESSAGES
+                ..
+            ..
+            or
+                LC_MESSAGES
+                ..
+            ..
+            pa
+                LC_MESSAGES
+                ..
+            ..
+            pa_IN
+                LC_MESSAGES
+                ..
+            ..
+            pl
+                LC_MESSAGES
+                ..
+            ..
+            pl_PL
+                LC_MESSAGES
+                ..
+            ..
+            ps
+                LC_MESSAGES
+                ..
+            ..
+            pt
+                LC_MESSAGES
+                ..
+            ..
+            pt_BR
+                LC_MESSAGES
+                ..
+            ..
+            pt_PT
+                LC_MESSAGES
+                ..
+            ..
+            ro
+                LC_MESSAGES
+                ..
+            ..
+            ru
+                LC_MESSAGES
+                ..
+            ..
+            rw
+                LC_MESSAGES
+                ..
+            ..
+            sa
+                LC_MESSAGES
+                ..
+            ..
+            se
+                LC_MESSAGES
+                ..
+            ..
+            si
+                LC_MESSAGES
+                ..
+            ..
+            sid
+                LC_MESSAGES
+                ..
+            ..
+            sk
+                LC_MESSAGES
+                ..
+            ..
+            sl
+                LC_MESSAGES
+                ..
+            ..
+            so
+                LC_MESSAGES
+                ..
+            ..
+            sp
+                LC_MESSAGES
+                ..
+            ..
+            sq
+                LC_MESSAGES
+                ..
+            ..
+            sq_AL
+                LC_MESSAGES
+                ..
+            ..
+            sr
+                LC_MESSAGES
+                ..
+            ..
+            sr@Latn
+                LC_MESSAGES
+                ..
+            ..
+            sr@ije
+                LC_MESSAGES
+                ..
+            ..
+            ss
+                LC_MESSAGES
+                ..
+            ..
+            sv
+                LC_MESSAGES
+                ..
+            ..
+            sv_SE
+                LC_MESSAGES
+                ..
+            ..
+            sw
+                LC_MESSAGES
+                ..
+            ..
+            syr
+                LC_MESSAGES
+                ..
+            ..
+            ta
+                LC_MESSAGES
+                ..
+            ..
+            te
+                LC_MESSAGES
+                ..
+            ..
+            tg
+                LC_MESSAGES
+                ..
+            ..
+            th
+                LC_MESSAGES
+                ..
+            ..
+            ti
+                LC_MESSAGES
+                ..
+            ..
+            tig
+                LC_MESSAGES
+                ..
+            ..
+            tk
+                LC_MESSAGES
+                ..
+            ..
+            tl
+                LC_MESSAGES
+                ..
+            ..
+            tr
+                LC_MESSAGES
+                ..
+            ..
+            tt
+                LC_MESSAGES
+                ..
+            ..
+            ug
+                LC_MESSAGES
+                ..
+            ..
+            uk
+                LC_MESSAGES
+                ..
+            ..
+            ur
+                LC_MESSAGES
+                ..
+            ..
+            uz
+                LC_MESSAGES
+                ..
+            ..
+            uz@Latn
+                LC_MESSAGES
+                ..
+            ..
+            uz@Cyrl
+                LC_MESSAGES
+                ..
+            ..
+            ve
+                LC_MESSAGES
+                ..
+            ..
+            ven
+                LC_MESSAGES
+                ..
+            ..
+            vi
+                LC_MESSAGES
+                ..
+            ..
+            wa
+                LC_MESSAGES
+                ..
+            ..
+            wal
+                LC_MESSAGES
+                ..
+            ..
+            wo
+                LC_MESSAGES
+                ..
+            ..
+            xh
+                LC_MESSAGES
+                ..
+            ..
+            xx
+                LC_MESSAGES
+                ..
+            ..
+            yi
+                LC_MESSAGES
+                ..
+            ..
+            yo
+                LC_MESSAGES
+                ..
+            ..
+            zh
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN.GB2312
+                LC_MESSAGES
+                ..
+            ..
+            zh_HK
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW.Big5
+                LC_MESSAGES
+                ..
+            ..
+            zu
+                LC_MESSAGES
+                ..
+            ..
+        ..
+        misc
+        ..
+        mk
+        ..
+        nls
+	    C
+	    ..
+	    da_DK.ISO_8859-1
+            ..
+	    de_AT.ISO_8859-1
+            ..
+	    de_CH.ISO_8859-1
+            ..
+	    de_DE.ISO_8859-1
+            ..
+	    el_GR.ISO_8859-7
+            ..
+	    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
+            ..
+	    et_EE.ISO_8859-15
+	    ..
+	    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
+            ..
+	    is_IS.ISO_8859-1
+            ..
+	    it_CH.ISO_8859-1
+            ..
+	    it_IT.ISO_8859-1
+            ..
+            ja_JP.EUC
+            ..
+	    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_RU.KOI8-R
+	    ..
+	    ru_SU.CP866
+            ..
+            ru_SU.KOI8-R
+            ..
+	    sv_SE.ISO_8859-1
+            ..
+	    uk_UA.KOI8-U
+	    ..
+        ..
+        pkgconfig
+        ..
+    ..
+..
diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk
index 67830825f83..a3677fca7cf 100644
--- a/mk/plist/print-plist.mk
+++ b/mk/plist/print-plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.12 2007/03/02 09:08:33 wiz Exp $
+# $NetBSD: print-plist.mk,v 1.13 2007/07/02 14:54:21 joerg Exp $
 
 ###
 ### Automatic PLIST generation
@@ -57,6 +57,8 @@ _PRINT_PLIST_AWK_IGNORE+=	|| ($$0 ~ /^.*\/fonts\.cache-1/)
 # Common (system) directories not to generate @dirrm statements for
 # Reads _MTREE_FILE and generate awk statements that will
 # sort out which directories NOT to include into the PLIST @dirrm list
+_COMMON_MTREE_FILE=	${PKGSRCDIR}/mk/plist/common-dirs.mtree
+
 .if make(print-PLIST)
 _PRINT_PLIST_COMMON_DIRS!=	${AWK} 'BEGIN {				\
 			i=0;						\
@@ -80,7 +82,7 @@ _PRINT_PLIST_COMMON_DIRS!=	${AWK} 'BEGIN {				\
 			}						\
 		}							\
 		END { print "{ print $$$$0; }"; }			\
-	' <${_MTREE_FILE}
+	' <${_COMMON_MTREE_FILE}
 .endif
 
 # scan $PREFIX for any files/dirs modified since the package was extracted