EOL the tv-derecurse branch; it has become too outdated. The last livetv-derecurse

revision can be fetched at the tv-derecurse-eol tag.

207 files changed, 0 insertions, 57828 deletions

diff --git a/mk/AIX.pkg.dist b/mk/AIX.pkg.dist
deleted file mode 100644
index dafd3414416..00000000000
--- a/mk/AIX.pkg.dist
+++ /dev/null
@@ -1,1005 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: AIX.pkg.dist,v 1.25.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=system 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
-            ..
-        ..
-        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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/BSDOS.pkg.dist b/mk/BSDOS.pkg.dist
deleted file mode 100644
index 5734049c881..00000000000
--- a/mk/BSDOS.pkg.dist
+++ /dev/null
@@ -1,1005 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: BSDOS.pkg.dist,v 1.25.2.5 2005/05/17 18:29:44 tv 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
-            ..
-        ..
-        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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/CHANGES b/mk/CHANGES
deleted file mode 100644
index f480152b670..00000000000
--- a/mk/CHANGES
+++ /dev/null
@@ -1,56 +0,0 @@
-This revision of the pkgsrc/mk infrastructure does a lot of cleanup to 
-remove unnecessary ${MAKE} recursion, as well as reorganization to make it 
-easier to read and maintain.  For the most part, the changes should be 
-backwards compatible, and no externally visible variables have changed 
-(except where noted below).
-
-Notable changes:
-
-* Reorganization:  bsd.pkg.mk has a new, cleaner structure that is 
-  explicitly delineated into sections.  It's not perfect, but this provides 
-  a tentative structure for further future cleanups.
-
-* Use of more variable modifiers:  The make(1) modifiers :D and :U are now 
-  used quite a bit more to reduce the visual complexity of chains of .if 
-  blocks.  ::!= and :sh are used for deferred shell evaluation.
-
-* Phase based build:  bsd.prefs.mk defines the new variable PKG_PHASES, 
-  which contains a list of what phases *could* be run in the given make(1) 
-  instance.  This allows for conditional parsing of .mk fragments based on 
-  whether or not the data in question is needed.  (For instance, a recursive 
-  "make fetch" need not include compilation tool definitions.)
-
-* USE_*:  Some parts of bsd.pkg.mk for automatic handling of common 
-  dependencies (USE_PERL5, INFO_FILES, ...) have been factored out into the 
-  new file bsd.pkg.use.mk.
-
-* ALL_ENV:  This new variable is included into all of CONFIGURE_ENV,
-  MAKE_ENV, and SCRIPTS_ENV, to help reduce multiple settings of these
-  individual variables.
-
-* BUILD_DEFS_FIXED:  Like BUILD_DEFS, but the values are assumed to be fixed 
-  (not directly user configurable in mk.conf) and thus will not be printed 
-  in the pre-extract notice about configurable variables.
-
-* BUILD_ENV:  Because there is no longer build recursion within a package's 
-  Makefile, this is only used to propagate environment values to tools via 
-  the wrapper scripts in bsd.wrapper.mk.  These values will not be seen by 
-  non-wrappered programs anymore.
-
-* "depends":  This is a new phase of the build which executes between 
-  "checksum" and "extract".  It factors out the dependency handling into its 
-  own stage, to separate the logic and make it easier to follow in 
-  bsd.pkg.mk.  There is no longer a "pre-install-depends"; things which once 
-  attached tasks to that now use "pre-extract".
-
-* "test":  This is now a true phase of the build which executes between 
-  "build" and "install".  It is skipped automatically if PKGSRC_RUN_TEST is 
-  not set to YES (as before).  Having it as a real phase means that it works 
-  more amicably with the phase-based build framework.
-
-* "show-var-noeval", "show-vars-noeval":  In order to preserve 
-  compatibility, calling "make show-var" will set PKG_PHASES (see above) to 
-  all possible values.  "show-var[s]-noeval" does the same thing, except 
-  that PKG_PHASES is left empty (to exclude unnecessary .mk code).
-
-[More TBD]
diff --git a/mk/Darwin.pkg.dist b/mk/Darwin.pkg.dist
deleted file mode 100644
index 602ebabf44c..00000000000
--- a/mk/Darwin.pkg.dist
+++ /dev/null
@@ -1,1055 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Darwin.pkg.dist,v 1.60.2.5 2005/05/17 18:29:44 tv 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/Darwin.x11.dist b/mk/Darwin.x11.dist
deleted file mode 100644
index d21300774b0..00000000000
--- a/mk/Darwin.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: Darwin.x11.dist,v 1.33.4.1 2005/01/10 16:15:24 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/DragonFly.pkg.dist b/mk/DragonFly.pkg.dist
deleted file mode 100644
index e53c26f2735..00000000000
--- a/mk/DragonFly.pkg.dist
+++ /dev/null
@@ -1,1054 +0,0 @@
-#	$NetBSD: DragonFly.pkg.dist,v 1.1.2.5 2005/05/17 18:29:44 tv 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/DragonFly.x11.dist b/mk/DragonFly.x11.dist
deleted file mode 100644
index 8295150c10d..00000000000
--- a/mk/DragonFly.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: DragonFly.x11.dist,v 1.1.2.1 2005/01/10 16:15:24 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/FreeBSD.pkg.dist b/mk/FreeBSD.pkg.dist
deleted file mode 100644
index 64a39ef2e51..00000000000
--- a/mk/FreeBSD.pkg.dist
+++ /dev/null
@@ -1,1054 +0,0 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.51.2.5 2005/05/17 18:29:44 tv 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/FreeBSD.x11.dist b/mk/FreeBSD.x11.dist
deleted file mode 100644
index 2a16f3a6c86..00000000000
--- a/mk/FreeBSD.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: FreeBSD.x11.dist,v 1.9.4.1 2005/01/10 16:15:24 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/IRIX.pkg.dist b/mk/IRIX.pkg.dist
deleted file mode 100644
index 6cbaf25deef..00000000000
--- a/mk/IRIX.pkg.dist
+++ /dev/null
@@ -1,1054 +0,0 @@
-# $NetBSD: IRIX.pkg.dist,v 1.50.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=sys 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/IRIX.x11.dist b/mk/IRIX.x11.dist
deleted file mode 100644
index b67de9710cd..00000000000
--- a/mk/IRIX.x11.dist
+++ /dev/null
@@ -1,639 +0,0 @@
-#     $NetBSD: IRIX.x11.dist,v 1.13.4.1 2005/01/10 16:15:24 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=sys mode=0755
-.
-    bin
-    ..
-    catman
-        u_man
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-        ..
-        p_man
-            cat1
-            ..
-            cat2
-            ..
-            cat3
-            ..
-            cat4
-            ..
-            cat5
-            ..
-        ..
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        u_man
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-        ..
-        p_man
-            man1
-            ..
-            man2
-            ..
-            man3
-            ..
-            man4
-            ..
-            man5
-            ..
-            man6
-            ..
-            man7
-            ..
-            man8
-            ..
-            man9
-            ..
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/Interix.pkg.dist b/mk/Interix.pkg.dist
deleted file mode 100644
index 66149a6eedc..00000000000
--- a/mk/Interix.pkg.dist
+++ /dev/null
@@ -1,1051 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Interix.pkg.dist,v 1.15.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uid=197108 gid=131616 mode=0775
-.
-    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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/Interix.x11.dist b/mk/Interix.x11.dist
deleted file mode 100644
index 82d624725f1..00000000000
--- a/mk/Interix.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: Interix.x11.dist,v 1.4.4.1 2005/01/10 16:15:25 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uid=197108 gid=131616 mode=0775
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/Linux.pkg.dist b/mk/Linux.pkg.dist
deleted file mode 100644
index 165542ef3e8..00000000000
--- a/mk/Linux.pkg.dist
+++ /dev/null
@@ -1,1055 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Linux.pkg.dist,v 1.67.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=sys 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/Linux.x11.dist b/mk/Linux.x11.dist
deleted file mode 100644
index 138ac76dcda..00000000000
--- a/mk/Linux.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: Linux.x11.dist,v 1.39.4.1 2005/01/10 16:15:25 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=sys mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/NetBSD.pkg.dist b/mk/NetBSD.pkg.dist
deleted file mode 100644
index 3888253a77b..00000000000
--- a/mk/NetBSD.pkg.dist
+++ /dev/null
@@ -1,1051 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: NetBSD.pkg.dist,v 1.78.2.5 2005/05/17 18:29:44 tv 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/NetBSD.x11.dist b/mk/NetBSD.x11.dist
deleted file mode 100644
index 9f25f8cdc50..00000000000
--- a/mk/NetBSD.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: NetBSD.x11.dist,v 1.40.4.1 2005/01/10 16:15:25 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/OSF1.pkg.dist b/mk/OSF1.pkg.dist
deleted file mode 100644
index fbf689fe5a9..00000000000
--- a/mk/OSF1.pkg.dist
+++ /dev/null
@@ -1,1054 +0,0 @@
-# $NetBSD: OSF1.pkg.dist,v 1.1.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=system 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/OpenBSD.pkg.dist b/mk/OpenBSD.pkg.dist
deleted file mode 100644
index 13e95886dd8..00000000000
--- a/mk/OpenBSD.pkg.dist
+++ /dev/null
@@ -1,1054 +0,0 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.50.2.5 2005/05/17 18:29:44 tv 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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/OpenBSD.x11.dist b/mk/OpenBSD.x11.dist
deleted file mode 100644
index 332f6570e64..00000000000
--- a/mk/OpenBSD.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: OpenBSD.x11.dist,v 1.27.4.1 2005/01/10 16:15:25 tv Exp $
-#  	OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp 
-#	FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-
-/set type=dir uname=root gname=wheel mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-    ..
-..
diff --git a/mk/SunOS.pkg.dist b/mk/SunOS.pkg.dist
deleted file mode 100644
index e57345e49c7..00000000000
--- a/mk/SunOS.pkg.dist
+++ /dev/null
@@ -1,1059 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: SunOS.pkg.dist,v 1.72.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=sys mode=0755
-.
-    bin
-    ..
-    emul
-    ..
-    etc
-        rc.d
-	..
-    ..
-    include
-    ..
-    info
-    ..
-    lib
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-        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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-        lib
-	    terminfo
-            ..
-        ..
-        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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/SunOS.x11.dist b/mk/SunOS.x11.dist
deleted file mode 100644
index 5a3699b2eff..00000000000
--- a/mk/SunOS.x11.dist
+++ /dev/null
@@ -1,667 +0,0 @@
-#     $NetBSD: SunOS.x11.dist,v 1.40.4.1 2005/01/10 16:15:25 tv Exp $
-#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
-#
-
-/set type=dir uname=root gname=sys mode=0755
-.
-    bin
-    ..
-    etc
-        rc.d
-        ..
-    ..
-    include
-        X11
-            ICE
-            ..
-            PEX5
-            ..
-            PM
-            ..
-            SM
-            ..
-            Xaw
-            ..
-            Xmu
-            ..
-            bitmaps
-            ..
-            extensions
-            ..
-            fonts
-            ..
-            pixmaps
-            ..
-        ..
-    ..
-    info
-    ..
-    lib
-        X11
-            XF86Setup
-                pics
-                ..
-                scripts
-                ..
-                tcllib
-                ..
-            ..
-            app-defaults
-            ..
-            config
-            ..
-            doc
-            ..
-            etc
-            ..
-            fonts
-                100dpi
-                ..
-                75dpi
-                ..
-                PEX
-                ..
-                Speedo
-                ..
-                Type1
-                ..
-                cyrillic
-                ..
-                local
-                ..
-                misc
-                ..
-            ..
-            fs
-            ..
-            lbxproxy
-            ..
-            locale
-                C
-                ..
-                en_US.utf
-                ..
-                iso8859-1
-                ..
-                iso8859-2
-                ..
-                iso8859-3
-                ..
-                iso8859-4
-                ..
-                iso8859-5
-                ..
-                iso8859-6
-                ..
-                iso8859-7
-                ..
-                iso8859-8
-                ..
-                iso8859-9
-                ..
-                ja
-                ..
-                ja.JIS
-                ..
-                ja.SJIS
-                ..
-                ko
-                ..
-                koi8-r
-                ..
-                tbl_data
-                ..
-                th_TH.TACTIS
-                ..
-                zh
-                ..
-                zh_TW
-                ..
-            ..
-            proxymngr
-            ..
-            rstart
-                commands
-                    x11r6
-                    ..
-                ..
-                contexts
-                ..
-            ..
-            twm
-            ..
-            x11perfcomp
-            ..
-            xdm
-            ..
-            xinit
-            ..
-            xkb
-                compat
-                ..
-                compiled
-                ..
-                geometry
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keycodes
-                    digital
-                    ..
-                    sgi
-                    ..
-                ..
-                keymap
-                    digital
-                    ..
-                    sgi
-                    ..
-                    sun
-                    ..
-                ..
-                rules
-                ..
-                semantics
-                ..
-                symbols
-                    digital
-                    ..
-                    fujitsu
-                    ..
-                    nec
-                    ..
-                    sony
-                    ..
-                    sun
-                    ..
-                ..
-            ..
-            xserver
-            ..
-            xsm
-            ..
-        ..
-	locale
-            af
-                LC_MESSAGES
-                ..
-            ..
-            am
-                LC_MESSAGES
-                ..
-            ..
-            ar
-                LC_MESSAGES
-                ..
-            ..
-            az
-                LC_MESSAGES
-                ..
-            ..
-            be
-                LC_MESSAGES
-                ..
-            ..
-            bg
-                LC_MESSAGES
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                LC_MESSAGES
-                ..
-            ..
-            cs
-                LC_MESSAGES
-                ..
-            ..
-            da
-                LC_MESSAGES
-                ..
-            ..
-            de
-                LC_MESSAGES
-                ..
-            ..
-            de_DE
-                LC_MESSAGES
-                ..
-            ..
-            dk
-                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_GB
-                LC_MESSAGES
-                ..
-            ..
-            en_US
-                LC_MESSAGES
-                ..
-            ..
-            eo
-                LC_MESSAGES
-                ..
-            ..
-            es
-                LC_MESSAGES
-                ..
-            ..
-            es_AR
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                LC_MESSAGES
-                ..
-            ..
-            et
-                LC_MESSAGES
-                ..
-            ..
-            eu
-                LC_MESSAGES
-                ..
-            ..
-            fi
-                LC_MESSAGES
-                ..
-            ..
-            fo
-                LC_MESSAGES
-                ..
-            ..
-            fr
-                LC_MESSAGES
-                ..
-            ..
-            ga
-                LC_MESSAGES
-                ..
-            ..
-            gd
-                LC_MESSAGES
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                LC_MESSAGES
-                ..
-            ..
-            ml
-                LC_MESSAGES
-                ..
-            ..
-            mr
-                LC_MESSAGES
-                ..
-            ..
-            ms
-                LC_MESSAGES
-                ..
-            ..
-            my_MM
-                LC_MESSAGES
-                ..
-            ..
-            nb
-                LC_MESSAGES
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                LC_MESSAGES
-                ..
-            ..
-            nl_NL
-                LC_MESSAGES
-                ..
-            ..
-            nn
-                LC_MESSAGES
-                ..
-            ..
-            no
-                LC_MESSAGES
-                ..
-            ..
-            no@nynorsk
-                LC_MESSAGES
-                ..
-            ..
-            nso
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                LC_MESSAGES
-                ..
-            ..
-            xh
-                LC_MESSAGES
-                ..
-            ..
-            xx
-                LC_MESSAGES
-                ..
-            ..
-            yi
-                LC_MESSAGES
-                ..
-            ..
-            zh
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN
-                LC_MESSAGES
-                ..
-            ..
-            zh_CN.GB2312
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-        modules
-        ..
-    ..
-    libexec
-    ..
-    man
-        cat1
-        ..
-        cat2
-        ..
-        cat3
-        ..
-        cat4
-        ..
-        cat5
-        ..
-        cat6
-        ..
-        cat7
-        ..
-        cat8
-        ..
-        cat9
-        ..
-        catl
-        ..
-        catn
-        ..
-        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
-            ..
-        ..
-        man1
-        ..
-        man2
-        ..
-        man3
-        ..
-        man4
-        ..
-        man5
-        ..
-        man6
-        ..
-        man7
-        ..
-        man8
-        ..
-        man9
-        ..
-        manl
-        ..
-        mann
-        ..
-    ..
-    share
-        doc
-            html
-            ..
-        ..
-        examples
-        ..
-	fonts
-	..
-    ..
-..
diff --git a/mk/UnixWare.pkg.dist b/mk/UnixWare.pkg.dist
deleted file mode 100644
index a480fe1e78f..00000000000
--- a/mk/UnixWare.pkg.dist
+++ /dev/null
@@ -1,1060 +0,0 @@
-#     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#	$NetBSD: UnixWare.pkg.dist,v 1.9.2.5 2005/05/17 18:29:44 tv Exp $
-#
-
-/set type=dir uname=root gname=sys mode=0755
-.
-    bin
-    ..
-    emul
-    ..
-    etc
-        rc.d
-	..
-    ..
-    include
-    ..
-    info
-    ..
-    lib
-	locale
-            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
-                ..
-            ..
-            br
-                LC_MESSAGES
-                ..
-            ..
-            bs
-                LC_MESSAGES
-                ..
-            ..
-            ca
-                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
-                ..
-            ..
-            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_ES
-                LC_MESSAGES
-                ..
-            ..
-            es_MX
-                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
-                ..
-            ..
-            gl
-                LC_MESSAGES
-                ..
-            ..
-            gu
-                LC_MESSAGES
-                ..
-            ..
-            he
-                LC_MESSAGES
-                ..
-            ..
-            hi
-                LC_MESSAGES
-                ..
-            ..
-            hr
-                LC_MESSAGES
-                ..
-            ..
-            hsb
-                LC_MESSAGES
-                ..
-            ..
-            hu
-                LC_MESSAGES
-                ..
-            ..
-            ia
-                LC_MESSAGES
-                ..
-            ..
-            id
-                LC_MESSAGES
-                ..
-            ..
-            is
-                LC_MESSAGES
-                ..
-            ..
-            it
-                LC_MESSAGES
-                ..
-            ..
-            it_NA
-                LC_MESSAGES
-                ..
-            ..
-            ja
-                LC_MESSAGES
-                ..
-            ..
-            ja_JP
-                LC_MESSAGES
-                ..
-            ..
-            ka
-                LC_MESSAGES
-                ..
-            ..
-            kn
-                LC_MESSAGES
-                ..
-            ..
-            ko
-                LC_MESSAGES
-                ..
-            ..
-            li
-                LC_MESSAGES
-                ..
-            ..
-            lt
-                LC_MESSAGES
-                ..
-            ..
-            lv
-                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
-                ..
-            ..
-            ne
-                LC_MESSAGES
-                ..
-            ..
-            nl
-                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
-                ..
-            ..
-            or
-                LC_MESSAGES
-                ..
-            ..
-            pa
-                LC_MESSAGES
-                ..
-            ..
-            pl
-                LC_MESSAGES
-                ..
-            ..
-            pl_PL
-                LC_MESSAGES
-                ..
-            ..
-            pt
-                LC_MESSAGES
-                ..
-            ..
-            pt_BR
-                LC_MESSAGES
-                ..
-            ..
-            pt_PT
-                LC_MESSAGES
-                ..
-            ..
-            ro
-                LC_MESSAGES
-                ..
-            ..
-            ru
-                LC_MESSAGES
-                ..
-            ..
-            rw
-                LC_MESSAGES
-                ..
-            ..
-            se
-                LC_MESSAGES
-                ..
-            ..
-            sk
-                LC_MESSAGES
-                ..
-            ..
-            sl
-                LC_MESSAGES
-                ..
-            ..
-            sp
-                LC_MESSAGES
-                ..
-            ..
-            sq
-                LC_MESSAGES
-                ..
-            ..
-            sq_AL
-                LC_MESSAGES
-                ..
-            ..
-            sr
-                LC_MESSAGES
-                ..
-            ..
-            sr@Latn
-                LC_MESSAGES
-                ..
-            ..
-            sr@ije
-                LC_MESSAGES
-                ..
-            ..
-            sv
-                LC_MESSAGES
-                ..
-            ..
-            ta
-                LC_MESSAGES
-                ..
-            ..
-            tg
-                LC_MESSAGES
-                ..
-            ..
-            th
-                LC_MESSAGES
-                ..
-            ..
-            tk
-                LC_MESSAGES
-                ..
-            ..
-            tl
-                LC_MESSAGES
-                ..
-            ..
-            tr
-                LC_MESSAGES
-                ..
-            ..
-            uk
-                LC_MESSAGES
-                ..
-            ..
-            uz
-                LC_MESSAGES
-                ..
-            ..
-            uz@Latn
-                LC_MESSAGES
-                ..
-            ..
-            uz@Cyrl
-                LC_MESSAGES
-                ..
-            ..
-            ven
-                LC_MESSAGES
-                ..
-            ..
-            vi
-                LC_MESSAGES
-                ..
-            ..
-            wa
-                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_TW
-                LC_MESSAGES
-                ..
-            ..
-            zh_TW.Big5
-                LC_MESSAGES
-                ..
-            ..
-            zu
-                LC_MESSAGES
-                ..
-            ..
-        ..
-        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
-        ..
-    ..
-    sbin
-    ..
-    share
-	aclocal
-	..
-        dict
-        ..
-        doc
-	    html
-	    ..
-        ..
-        examples
-        ..
-	games
-        ..
-        lib
-	    terminfo
-            ..
-        ..
-        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
-	    ..
-        ..
-        skel
-        ..
-    ..
-..
diff --git a/mk/alternatives.mk b/mk/alternatives.mk
deleted file mode 100644
index 331322a20ef..00000000000
--- a/mk/alternatives.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: alternatives.mk,v 1.4.2.2 2005/02/11 15:27:57 tv Exp $
-#
-# This Makefile fragment handles the alternatives system, registering a
-# package in the database.
-#
-# The ALTERNATIVES_SRC variable contains the path to a file listing the
-# alternatives provided by the package.  It defaults to the ALTERNATIVES
-# file in the current directory if found.  If this variable is empty, no
-# actions are taken by this file.
-#
-
-.if !defined(ALTERNATIVES_MK)
-ALTERNATIVES_MK=	# defined
-
-.if !defined(ALTERNATIVES_SRC)
-.  if exists(${.CURDIR}/ALTERNATIVES)
-ALTERNATIVES_SRC?=	${.CURDIR}/ALTERNATIVES
-.  else
-ALTERNATIVES_SRC?=
-.  endif
-.endif
-
-.if !empty(ALTERNATIVES_SRC)
-
-${WRKDIR}/.altinstall: ${ALTERNATIVES_SRC}
-	@{ ${ECHO} 'if ${TEST} $${STAGE} = "POST-INSTALL"; then'; \
-	${ECHO} '${CAT} >./+ALTERNATIVES <<EOF'; \
-	${SED} ${FILES_SUBST_SED} <${ALTERNATIVES_SRC}; \
-	${ECHO} 'EOF'; \
-	${ECHO} 'if ${TEST} -x ${PKG_ALTERNATIVES}; then'; \
-	${ECHO} '${PKG_ALTERNATIVES} -gs register ./+ALTERNATIVES'; \
-	${ECHO} 'fi'; \
-	${ECHO} 'fi'; \
-	} >${WRKDIR}/.altinstall
-
-${WRKDIR}/.altdeinstall: ${ALTERNATIVES_SRC}
-	@{ ${ECHO} 'if ${TEST} $${STAGE} = "DEINSTALL"; then'; \
-	${ECHO} 'if ${TEST} -x ${PKG_ALTERNATIVES}; then'; \
-	${ECHO} '${PKG_ALTERNATIVES} -gs unregister ./+ALTERNATIVES'; \
-	${ECHO} 'fi'; \
-	${ECHO} '${RM} -f ./+ALTERNATIVES'; \
-	${ECHO} 'fi'; \
-	} >${WRKDIR}/.altdeinstall
-
-PRINT_PLIST_AWK+=	/^libdata\/alternatives\// { next; }
-PRINT_PLIST_AWK+=	/^@dirrm libdata\/alternatives/ { next; }
-
-EVAL_PREFIX+=			PREFIX.pkg_alternatives=pkg_alternatives
-PREFIX.alternatives_DEFAULT=	${LOCALBASE}
-PKG_ALTERNATIVES=		${PREFIX.pkg_alternatives}/sbin/pkg_alternatives
-
-INSTALL_EXTRA_TMPL+=	${WRKDIR}/.altinstall
-DEINSTALL_EXTRA_TMPL+=	${WRKDIR}/.altdeinstall
-USE_PKGINSTALL=		YES
-
-.endif
-
-.endif	# ALTERNATIVES_MK
diff --git a/mk/apache.mk b/mk/apache.mk
deleted file mode 100644
index e44c4040517..00000000000
--- a/mk/apache.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# $NetBSD: apache.mk,v 1.6.4.2 2005/05/17 18:29:44 tv Exp $
-#
-# This Makefile fragment handles Apache dependencies and make variables,
-# and is meant to be included by packages that require Apache either at
-# build-time or at run-time.  apache.mk will:
-#
-#	* set PKG_APACHE to the name of the apache web server used
-#
-#	* add a full dependency on the apache server
-#
-#	* optionally add a full dependency on apr
-#
-# The available user variables are:
-#
-# PKG_APACHE_DEFAULT is a user-settable variable whose value is the default
-#	apache server to use.  Possible values are apache13 and apache2.
-#   If there is already a version of apache installed this will have no
-#   effect.
-#
-# The available makefile variables are:
-#
-# PKG_APACHE_ACCEPTED is a package-settable list of servers that may be used as
-#	possible dependencies for the package.  Possible values are the same as
-#   for PKG_APACHE_DEFAULT.
-#
-# USE_APR is used to note that the package requires the Apache Portable
-#   runtime to build and execute.  This is only takes effect if apache2
-#   is chosen (by this file) as the web server to use.  This adds a full
-#   dependency on apr.
-#
-
-.if !defined(APACHE_MK)
-APACHE_MK=	# defined
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_APACHE_DEFAULT?=	# empty
-
-_PKG_APACHES?=	apache13 apache2
-
-.if defined(PKG_APACHE_ACCEPTED)
-.  for _ap_ in ${PKG_APACHE_ACCEPTED}
-.    if !empty(_PKG_APACHES:M${_ap_})
-_PKG_APACHE_ACCEPTED+=	${PKG_APACHE_ACCEPTED:M${_ap_}}
-.    endif
-.  endfor
-.endif
-
-_PKG_APACHE_ACCEPTED?=	${_PKG_APACHES}
-
-# Set the default apache for this platform.
-#
-.if !empty(PKG_APACHE_DEFAULT)
-_PKG_APACHE_DEFAULT=	${PKG_APACHE_DEFAULT}
-.endif
-.if !defined(_PKG_APACHE_DEFAULT)
-_PKG_APACHE_DEFAULT?=	apache13
-.endif
-
-_APACHE_PKGBASE.apache13=	apache-1\*
-_APACHE_PKGBASE.apache2=	apache-2\*
-
-# Mark the acceptable apaches and check which apache packages are installed.
-.for _ap_ in ${_PKG_APACHE_ACCEPTED}
-_PKG_APACHE_OK.${_ap_}=	yes
-_PKG_APACHE_INSTALLED.${_ap_}!= \
-	if ${PKG_INFO} -qe ${_APACHE_PKGBASE.${_ap_}}; then		\
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-.endfor
-
-# Use one of the installed apaches,...
-#
-.if !defined(_PKG_APACHE)
-.  for _ap_ in ${_PKG_APACHE_ACCEPTED}
-.    if !empty(_PKG_APACHE_INSTALLED.${_ap_}:M[yY][eE][sS])
-_PKG_APACHE?=			${_ap_}
-.    else
-_PKG_APACHE_FIRSTACCEPTED?=	${_ap_}
-.    endif
-.  endfor
-.endif
-#
-# ...otherwise, prefer the default one if it's accepted,...
-#
-.if !defined(_PKG_APACHE)
-.  if defined(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}) && \
-      !empty(_PKG_APACHE_OK.${_PKG_APACHE_DEFAULT}:M[yY][eE][sS])
-_PKG_APACHE=	${_PKG_APACHE_DEFAULT}
-.  endif
-.endif
-#
-# ...otherwise, just use the first accepted apache.
-#
-.if !defined(_PKG_APACHE)
-.  if defined(_PKG_APACHE_FIRSTACCEPTED)
-_PKG_APACHE=	${_PKG_APACHE_FIRSTACCEPTED}
-.  endif
-.endif
-#
-# If there are no acceptable apaches, then generate an error.
-#
-.if !defined(_PKG_APACHE)
-# force an error
-PKG_FAIL_REASON=	"no acceptable apache found"
-_PKG_APACHE=		"none"
-.endif
-
-BUILDLINK_DEPENDS.apache13?=	apache-1.3*
-BUILDLINK_DEPENDS.apache2?=	apache-2*
-
-.if ${_PKG_APACHE} == "apache13"
-_APACHE_PKGSRCDIR=	../../www/apache
-.elif ${_PKG_APACHE} == "apache2"
-_APACHE_PKGSRCDIR=	../../www/apache2
-_APACHE_BL_SRCDIR=	${_APACHE_PKGSRCDIR}
-.endif
-
-_APACHE_BL_SRCDIR?=	../../www/apache
-
-# Add a runtime dependency on the apache server.
-# This may or may not create an actual dependency depending on
-# what the apache buildlink[23].mk file does.
-#
-.if defined(_APACHE_PKGSRCDIR)
-.  include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
-.endif
-
-# If we are building apache modules, then we might need a build-time
-# dependency on apr, and the apache sources?
-#
-.if ${_PKG_APACHE} == "apache2"
-.  if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS])
-.    include "../../devel/apr/buildlink3.mk"
-.  endif
-.endif
-
-# PKG_APACHE is a publicly readable variable containing the name of the server
-#	we will be using.
-#
-PKG_APACHE:=		${_PKG_APACHE}
-BUILD_DEFS+=		PKG_APACHE
-
-.endif	# APACHE_MK
diff --git a/mk/autoconf.mk b/mk/autoconf.mk
deleted file mode 100644
index 3f09cd6a498..00000000000
--- a/mk/autoconf.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-# $NetBSD: autoconf.mk,v 1.6.2.1 2005/05/17 18:29:44 tv Exp $
-#
-# makefile fragment for packages that use autoconf
-# AUTOCONF_REQD can be set to the minimum version required.
-# It adds a build dependency on the appropriate autoconf package
-# and sets the following variables:
-#	AUTOCONF:	autoconf binary to use
-#	AUTORECONF:	autoreconf binary to use
-#	AUTOHEADER:	autoheader binary to use
-#
-
-.if !defined(AUTOCONF_MK)
-AUTOCONF_MK=	# defined
-
-# minimal required version
-AUTOCONF_REQD?= 2.50
-
-.include "../../mk/bsd.prefs.mk"
-
-.if empty(AUTOCONF_REQD:M2.1[0-9]*)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_TOOLS+=		autoconf
-.  else
-BUILD_DEPENDS+=		autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
-AUTOCONF=		${LOCALBASE}/bin/autoconf
-AUTORECONF=		${LOCALBASE}/bin/autoreconf
-AUTOHEADER=		${LOCALBASE}/bin/autoheader
-.  endif
-.else
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_TOOLS+=		autoconf213
-.  else
-BUILD_DEPENDS+=		autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
-AUTOCONF=		${LOCALBASE}/bin/autoconf-2.13
-AUTORECONF=		${LOCALBASE}/bin/autoreconf-2.13
-AUTOHEADER=		${LOCALBASE}/bin/autoheader-2.13
-.    if defined(USE_LIBTOOL)
-pre-configure: do-libtool-m4-override
-.    endif
-.  endif
-.endif
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
-# will be created.  The libtool.m4 is only created if a GNU configure
-# script exists at that location.
-#
-LIBTOOL_M4_OVERRIDE?=	libtool.m4 */libtool.m4 */*/libtool.m4
-
-# Symlink the libtool-1.4.m4 file into any directory in which there's a
-# configure script under ${WRKSRC}.  The  symlink is called "libtool.m4",
-# which is the name expected by the autoconf tools.  The symlinking is
-# only done if ${AUTOCONF_REQD} == 2.13 and USE_LIBTOOL is defined.  This
-# allows autoconf-2.13, autoreconf-2.13 and aclocal-2.13 to use the older
-# libtool.m4 file when regenerating files.  This is okay, because we later
-# override the generated libtool file anyway.
-#
-.PHONY: do-libtool-m4-override
-do-libtool-m4-override:
-.for _pattern_ in ${LIBTOOL_M4_OVERRIDE}
-	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};			\
-	for cfile in ${_pattern_:S/libtool.m4$/configure/}; do		\
-		if [ -f "$$cfile" ]; then				\
-			libtool_m4=`${DIRNAME} $$cfile`/libtool.m4;	\
-			${LN} -sf ${PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
-				$$libtool_m4;				\
-		fi;							\
-	done
-.endfor
-.endif
-
-.endif # AUTOCONF_MK
diff --git a/mk/automake.mk b/mk/automake.mk
deleted file mode 100644
index a73ca1ddedd..00000000000
--- a/mk/automake.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: automake.mk,v 1.8.4.1 2005/05/17 18:29:44 tv Exp $
-#
-# makefile fragment for packages that use automake
-# AUTOMAKE_REQD can be set to the minimum version required.
-# It adds a build dependency on the appropriate automake and autoconf
-# packages and sets the following variables:
-#	AUTOMAKE:	automake binary to use
-#	ACLOCAL:	aclocal binary to use
-# autoconf required version will default to 2.13 if automake 1.4* is used,
-# and to 2.58 otherwise.
-#
-
-.if !defined(AUTOMAKE_MK)
-AUTOMAKE_MK=	# defined
-
-# minimal required version
-AUTOMAKE_REQD?= 1.9
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(AUTOMAKE_REQD:M1.4*)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_TOOLS+=		automake14
-.  else
-BUILD_DEPENDS+=		automake14>=${AUTOMAKE_REQD}:../../devel/automake14
-_AUTOMAKE_API_VERSION=	1.4
-AUTOCONF_REQD?=		2.13
-.  endif
-.else
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-USE_TOOLS+=		automake
-.  else
-BUILD_DEPENDS+=		automake>=${AUTOMAKE_REQD}:../../devel/automake
-_AUTOMAKE_API_VERSION=	1.9
-AUTOCONF_REQD?=		2.58
-.  endif
-.endif
-
-.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-AUTOMAKE=		${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
-ACLOCAL=		${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
-
-.if defined(BUILD_USES_GETTEXT_M4)
-BUILD_DEPENDS+=		{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
-.endif
-
-.include "../mk/autoconf.mk"
-.endif
-.endif # AUTOMAKE_MK
diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
deleted file mode 100644
index 6cdecaacf7e..00000000000
--- a/mk/bdb.buildlink3.mk
+++ /dev/null
@@ -1,108 +0,0 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.12.2.1 2005/01/10 16:15:25 tv Exp $
-#
-# This Makefile fragment is meant to be included by packages that
-# require a Berkeley DB implementation.  bdb.buildlink3.mk will:
-#
-#       * set BDBBASE to the base directory of the Berkeley DB files;
-#	* set BDB_LIBS to the library option needed to link against
-#	  the Berkeley DB library;
-#       * set BDB_TYPE to the Berkeley DB implementation used.
-#
-# There are two variables that can be used to tweak the selection of
-# the Berkeley DB implementation:
-#
-# BDB_DEFAULT is a user-settable variable whose value represents the
-#	package we use when either a db-1.85 interface isn't required,
-#	or a db-1.85 interface is required, but it's not built-in.
-#
-# BDB185_DEFAULT is a user-settable variable whose value represents the
-#	package we use when a db-1.85 interface is required.  It defaults
-#	to "db1" if it's built-in, or to ${BDB_DEFAULT} otherwise.
-#
-# BDB_ACCEPTED is a package-settable list of Berkeley DB implementations
-#       that may be used by the package.
-#
-# Note for when databases/db1 is imported:
-#   (1) Remove the section that conditionally sets the default
-#	value for BDB185_DEFAULT and always set it to be "db1".
-#   (2) Remove the special case for ${BDB_TYPE} == "db1" at the end.
-#   (3) Move mk/db1.builtin.mk to databases/db1/builtin.mk.
-
-BDB_BUILDLINK3_MK:=	${BDB_BUILDLINK3_MK}+
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(BDB_BUILDLINK3_MK:M+)
-
-# If we've specified a list of acceptable Berkeley DB packages and it
-# doesn't include db1, then don't set USE_DB185 to yes.  The package's
-# configure process should know how to probe for the libraries and
-# headers on its own.
-#
-.  if defined(BDB_ACCEPTED) && empty(BDB_ACCEPTED:Mdb1)
-USE_DB185?=	no
-.  else
-USE_DB185?=	yes
-.  endif
-
-# _BDB_PKGS is an exhaustive list of all of the Berkeley DB
-# implementations that may be used with bdb.buildlink3.mk.
-#
-_BDB_PKGS?=	db1 db2 db3 db4
-
-BDB_DEFAULT?=	db4
-BDB_ACCEPTED?=	${_BDB_PKGS}
-
-CHECK_BUILTIN.db1:=	yes
-.  include "../../mk/db1.builtin.mk"
-CHECK_BUILTIN.db1:=	no
-.  if defined(IS_BUILTIN.db1) && !empty(IS_BUILTIN.db1:M[yY][eE][sS])
-BDB185_DEFAULT?=	db1
-.  else
-BDB185_DEFAULT?=	${BDB_DEFAULT}
-.  endif
-
-_BDB_PKGBASE.db2=		db
-_BDB_PKGSRCDIR.db2=		../../databases/db
-.  for _bdb_ in ${_BDB_PKGS}
-_BDB_PKGBASE.${_bdb_}?=		${_bdb_}
-_BDB_PKGSRCDIR.${_bdb_}?=	../../databases/${_bdb_}
-.  endfor
-
-_BDB_DEFAULT=		${BDB_DEFAULT}
-_BDB185_DEFAULT=	${BDB185_DEFAULT}
-_BDB_ACCEPTED=		${BDB_ACCEPTED}
-
-.  if !defined(_BDB_TYPE)
-.    if !empty(USE_DB185:M[yY][eE][sS])
-_BDB_TYPE=	${_BDB185_DEFAULT}
-.    else
-_BDB_TYPE=	${_BDB_DEFAULT}
-.    endif
-.  endif
-
-.  if !empty(_BDB_ACCEPTED:M${_BDB_TYPE})
-BDB_TYPE=	${_BDB_TYPE}
-.  else
-BDB_TYPE=	none
-.  endif
-
-# Define some public variables to refer to package-specific variables.
-BDBBASE=	${BUILDLINK_PREFIX.${_BDB_PKGBASE.${BDB_TYPE}}}
-BDB_LIBS=	${BUILDLINK_LDADD.${_BDB_PKGBASE.${BDB_TYPE}}}
-
-BUILD_DEFS+=	BDB_TYPE
-BUILD_DEFS+=	BDBBASE
-
-.endif	# BDB_BUILDLINK3_MK
-
-.if ${BDB_TYPE} == "none"
-PKG_FAIL_REASON=	\
-	"${_BDB_TYPE} is not an acceptable Berkeley DB type for ${PKGNAME}."
-.elif ${BDB_TYPE} == "db1"
-BUILDLINK_PACKAGES:=		${BUILDLINK_PACKAGES:Ndb1}
-BUILDLINK_PACKAGES+=		db1
-BUILDLINK_BUILTIN_MK.db1=	../../mk/db1.builtin.mk
-.else
-.  include "${_BDB_PKGSRCDIR.${BDB_TYPE}}/buildlink3.mk"
-.endif
diff --git a/mk/bsd.hacks.mk b/mk/bsd.hacks.mk
deleted file mode 100644
index ad6e7a86aae..00000000000
--- a/mk/bsd.hacks.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: bsd.hacks.mk,v 1.1.2.1 2004/11/22 22:48:04 tv Exp $
-#
-# Copyright (c) 2004 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Johnny C. Lam.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#        This product includes software developed by the NetBSD
-#        Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# This Makefile fragment automatically includes the necessary hacks to
-# make the package build correctly by including the package's hacks.mk
-# file if it exists.
-#
-# An example package hacks.mk:
-#
-# -------------8<-------------8<-------------8<-------------8<-------------
-# .if !defined(FOO_HACKS_MK)
-# FOO_HACKS_MK=	defined
-#
-# ### [Sun Nov 14 02:08:31 EST 2004 : jlam]
-# ### arm GCC 2.95.x optimisation bug tickled when compiling
-# ### lib/funkyfile.c.  Require a more recent version of GCC as a
-# ### workaround and patch lib/funkyfile.c (patch-ae).
-# ###
-# .if !empty(MACHINE_ARCH:Marm*)
-# PKG_HACKS+=	optimisation
-# GCC_REQD+=	3.0
-# .endif
-#
-# .endif  # FOO_HACKS_MK
-# -------------8<-------------8<-------------8<-------------8<-------------
-
-PKG_HACKS?=	# empty
-
-.if exists(${PKGDIR}/hacks.mk)
-.  include "${PKGDIR}/hacks.mk"
-.endif
-
-# Record any package hacks that we use in the installed package.
-.if !empty(PKG_HACKS)
-BUILD_DEFS+=	PKG_HACKS
-.endif
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
deleted file mode 100644
index 830c1667c25..00000000000
--- a/mk/bsd.options.mk
+++ /dev/null
@@ -1,192 +0,0 @@
-# $NetBSD: bsd.options.mk,v 1.9.4.5 2005/05/17 18:29:44 tv Exp $
-#
-# This Makefile fragment provides boilerplate code for standard naming
-# conventions for handling per-package build options.
-#
-# Before including this file, the following variables can be defined:
-#
-#	PKG_SUPPORTED_OPTIONS (must be defined)
-#		This is a list of build options supported by the package.
-#		This variable should be set in a package Makefile.  E.g.,
-#
-#			PKG_SUPPORTED_OPTIONS=	kerberos ldap ssl
-#
-#	PKG_OPTION_VAR (must be defined)
-#               The variable the user can set to enable or disable
-#		options specifically for this package.
-#
-#	PKG_SUGGESTED_OPTIONS (defaults to empty)
-#		This is a list of build options which are enabled by default.
-#
-#	PKG_OPTION_LEGACY_VARS
-#               This is a list of USE_VARIABLE:option pairs that
-#		map legacy /etc/mk.conf variables to their option
-#		counterparts.
-#		
-#
-# Optionally, the user may define the following variables in /etc/mk.conf:
-#
-#	PKG_DEFAULT_OPTIONS
-#               This variable can be used to override default
-#		options for every package.  Options listed in this
-#		variable will be enabled in every package that
-#		supports them.  If you prefix an option with `-',
-#		it will be disabled in every package.
-#
-#	${PKG_OPTIONS_VAR}
-#		This variable can be used to override default
-#		options and options listed in PKG_DEFAULT_OPTIONS.
-#		The syntax is the same as PKG_DEFAULT_OPTIONS.
-#
-# After including this file, the following variables are defined:
-#
-#	PKG_OPTIONS
-#		This is the list of the selected build options, properly
-#		filtered to remove unsupported and duplicate options.
-#
-# Example usage:
-#
-# -------------8<-------------8<-------------8<-------------8<-------------
-# PKG_SUPPORTED_OPTIONS=	foo ldap sasl
-# PKG_SUGGESTED_OPTIONS=		foo
-# PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_OPENLDAP:ldap
-# PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_SASL2:sasl
-#
-# .include "../../mk/bsd.options.mk"
-#
-# # Package-specific option-handling
-#
-# ###
-# ### FOO support
-# ###
-# .if !empty(PKG_OPTIONS:Mfoo)
-# CONFIGURE_ARGS+=	--enable-foo
-# .endif
-
-# ###
-# ### LDAP support
-# ###
-# .if !empty(PKG_OPTIONS:Mldap)
-# .  include "../../databases/openldap/buildlink3.mk"
-# CONFIGURE_ARGS+=	--enable-ldap=${BUILDLINK_PREFIX.openldap}
-# .endif
-#
-# ###
-# ### SASL authentication
-# ###
-# .if !empty(PKG_OPTIONS:Msasl)
-# .  include "../../security/cyrus-sasl2/buildlink3.mk"
-# CONFIGURE_ARGS+=	--enable-sasl=${BUILDLINK_PREFIX.sasl}
-# .endif
-# -------------8<-------------8<-------------8<-------------8<-------------
-
-.include "../../mk/bsd.prefs.mk"
-
-# Define PKG_OPTIONS, no matter if we have an error or not, to suppress
-# further make(1) warnings.
-PKG_OPTIONS=		# empty
-
-# Check for variable definitions required before including this file.
-.if !defined(PKG_SUPPORTED_OPTIONS)
-PKG_FAIL_REASON+=	"bsd.options.mk: PKG_SUPPORTED_OPTIONS is not defined."
-.elif !defined(PKG_OPTIONS_VAR)
-PKG_FAIL_REASON+=	"bsd.options.mk: PKG_OPTIONS_VAR is not defined."
-.else # process the rest of the file
-
-# include deprecated variable to options mapping
-.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
-
-.for _m_ in ${PKG_OPTIONS_LEGACY_VARS}
-.if !empty(PKG_SUPPORTED_OPTIONS:M${_m_:C/.*://}) && defined(${_m_:C/:.*//}) && !empty(${_m_:C/:.*//}:M[yY][eE][sS])
-_PKG_LEGACY_OPTIONS+=${_m_:C/.*://}
-_DEPRECATED_WARNING+="Deprecated variable "${_m_:C/:.*//:Q}" used, use PKG_DEFAULT_OPTIONS+="${_m_:C/.*://:Q}" instead."
-.endif
-.endfor
-
-#
-# process options from generic to specific
-#
-PKG_OPTIONS:=	# empty
-.for _o_ in ${PKG_SUGGESTED_OPTIONS} ${_PKG_LEGACY_OPTIONS} \
-	${PKG_DEFAULT_OPTIONS} ${${PKG_OPTIONS_VAR}}
-_opt_:=		${_o_}
-#  ,--- this variable is a work around for a bug documented in the
-#  |    regress/make-quoting package, testcase bug1.
-_popt_:=	${_o_:C/^-//}	# popt == plain option
-.  if !empty(_opt_:M-*)
-PKG_OPTIONS:=	${PKG_OPTIONS:N${_popt_}}
-.  elif !empty(PKG_SUPPORTED_OPTIONS:M${_popt_})
-PKG_OPTIONS:=	${PKG_OPTIONS} ${_popt_}
-.  endif
-.endfor
-PKG_OPTIONS:=	${PKG_OPTIONS:O:u}
-
-_PKG_OPTIONS_WORDWRAP_FILTER=						\
-	${AWK} '							\
-		BEGIN { printwidth = 40; line = "" }			\
-		{							\
-			if (length(line) > 0)				\
-				line = line" "$$0;			\
-			else						\
-				line = $$0;				\
-			if (length(line) > 40) {			\
-				print "	"line;				\
-				line = "";				\
-			}						\
-		}							\
-		END { if (length(line) > 0) print "	"line }		\
-	'
-
-.PHONY: describe-options
-describe-options:
-	@${ECHO} The following options are supported by this package:
-.for _opt_ in ${PKG_SUPPORTED_OPTIONS:O}
-	@${ECHO} "	"${_opt_:Q}"	"`${SED} -n "s/^"${_opt_:Q}"	//p" ../../mk/defaults/options.description`
-.endfor
-	@${ECHO}
-	@${ECHO} "These options are enabled by default: "${PKG_SUGGESTED_OPTIONS:O:Q}
-	@${ECHO} "These options are currently enabled: "${PKG_OPTIONS:O:Q}
-
-.PHONY: show-options
-show-options:
-	@${ECHO} "available: "${PKG_SUPPORTED_OPTIONS:O:Q}
-	@${ECHO} "default: "${PKG_SUGGESTED_OPTIONS:O:Q}
-	@${ECHO} "enabled: "${PKG_OPTIONS:O:Q}
-
-.if defined(PKG_SUPPORTED_OPTIONS)
-.PHONY: supported-options-message
-pre-extract: supported-options-message
-supported-options-message:
-.  if !empty(PKG_SUPPORTED_OPTIONS)
-	@${ECHO} "=========================================================================="
-	@${ECHO} "The supported build options for this package are:"
-	@${ECHO} ""
-	@${ECHO} ${PKG_SUPPORTED_OPTIONS:O:Q} | ${XARGS} -n 1 | ${_PKG_OPTIONS_WORDWRAP_FILTER}
-.    if !empty(PKG_OPTIONS)
-	@${ECHO} ""
-	@${ECHO} "The currently selected options are:"
-	@${ECHO} ""
-	@${ECHO} ${PKG_OPTIONS:O:Q} | ${XARGS} -n 1 | ${_PKG_OPTIONS_WORDWRAP_FILTER}
-.    endif
-	@${ECHO} ""
-	@${ECHO} "You can select which build options to use by setting PKG_DEFAULT_OPTIONS"
-	@${ECHO} "or the following variable.  Its current value is shown:"
-	@${ECHO} ""
-.    if !defined(${PKG_OPTIONS_VAR})
-	@${ECHO} "	${PKG_OPTIONS_VAR} (not defined)"
-.    else
-	@${ECHO} "	${PKG_OPTIONS_VAR} = ${${PKG_OPTIONS_VAR}}"
-.    endif
-.    if defined(_DEPRECATED_WARNING)
-	@${ECHO}
-	@for l in ${_DEPRECATED_WARNING}; \
-	do \
-		${ECHO} "$$l"; \
-	done
-.    endif
-	@${ECHO} ""
-	@${ECHO} "=========================================================================="
-.  endif
-.endif
-
-.endif # defined(PKG_OPTIONS_VAR) && defined(PKG_SUPPORTED_OPTIONS)
diff --git a/mk/bsd.pkg.data.mk b/mk/bsd.pkg.data.mk
deleted file mode 100644
index e26df3e8a5f..00000000000
--- a/mk/bsd.pkg.data.mk
+++ /dev/null
@@ -1,534 +0,0 @@
-#	$NetBSD: bsd.pkg.data.mk,v 1.1.2.3 2004/12/31 20:25:30 tv Exp $
-#
-# bsd.pkg.mk fragments for exporting data in human-readable or machine
-# parseable formats.
-#
-# These targets are not called internally by pkgsrc when building packages
-# via the "normal" build mechanisms, but some are used by the bulk build
-# system (BATCH/bsd.bulk-pkg.mk) or other external processes (README
-# and README.html generation).
-#
-# Targets:
-#
-## README.html (internal only)
-## binpkg-list
-## cdrom-readme
-## check
-## describe
-## fetch-list
-## fetch-list-recursive (internal only)
-## fetch-list-one-pkg (internal only)
-## info
-## lint
-## list
-## make-readme-html-help (internal only)
-## print-build-depends-list
-## print-run-depends-list
-## print-summary-data
-## readme [readmes]
-## show-all-depends-dirs
-## show-depends-dirs
-## show-distfiles
-## show-downlevel
-## show-installed-depends
-## show-license [show-licence]
-## show-needs-update
-## show-pkgsrc-dir
-## show-pkgtools-version
-## show-root-dirs
-## show-vulnerabilities-html (internal only)
-#
-
-# show both build and run depends directories (non-recursively)
-.PHONY: show-depends-dirs
-show-depends-dirs:
-	@dlist="";							\
-	thisdir=`${PWD_CMD}`;						\
-	for reldir in "" ${DEPENDS:C/^[^:]*://:C/:.*$//} ${BUILD_DEPENDS:C/^[^:]*://:C/:.*$//} ;\
-	do								\
-		if [ "X$$reldir" = "X" ]; then continue; fi;		\
-		cd $$thisdir/$$reldir;					\
-		WD=`${PWD_CMD}`;					\
-		d=`dirname $$WD`;					\
-		absdir=`basename $$d`/`basename $$WD`;			\
-		dlist="$$dlist $$absdir";				\
-	done;								\
-	cd $$thisdir;							\
-	${ECHO} "$$dlist"
-
-# Show all build and run depends, reverse-breadth first, with options.
-
-# "awk" macro to recurse over the dependencies efficiently, never running in
-# the same same directory twice. You may set the following options via "-v":
-#
-#	NonSelf = 1	to not print own directory;
-#	RootsOnly = 1	to print only root directories (i.e. directories
-#			of packages with no dependencies), including possibly
-#			own directory
-#
-_RECURSE_DEPENDS_DIRS=							\
-	function append_dirs(dir) {					\
-		command = "cd ../../" dir " && ${MAKE} show-depends-dirs"; \
-		command | getline tmp_dirs;				\
-		close(command);						\
-		if (tmp_dirs ~ /^$$/)					\
-			root_dirs[p++] = dir;				\
-		for (i = 1; i <= split(tmp_dirs, tmp_r); i++)		\
-			if (!(tmp_r[i] in hash_all_dirs)) {		\
-				all_dirs[n++] = tmp_r[i];		\
-				hash_all_dirs[tmp_r[i]] = 1		\
-			}						\
-	}								\
-	BEGIN {								\
-		command = "${PWD_CMD}";					\
-		command | getline start_dir;				\
-		close(command);						\
-		i = split(start_dir, tmp_r, /\//);			\
-		all_dirs[n++] = tmp_r[i-1] "/" tmp_r[i];		\
-		for (; m < n; )						\
-			append_dirs(all_dirs[m++]);			\
-		if (RootsOnly) {					\
-			printf("%s", root_dirs[--p]);			\
-			for (; p > 0; )					\
-				printf(" %s", root_dirs[--p])		\
-		}							\
-		else {							\
-			if (m > NonSelf)				\
-				printf("%s", all_dirs[--m]);		\
-			for (; m > NonSelf; )				\
-				printf(" %s", all_dirs[--m])		\
-		}							\
-		print							\
-	}
-
-_SHOW_ALL_DEPENDS_DIRS_EXCL=	${AWK} -v NonSelf=1 '${_RECURSE_DEPENDS_DIRS}'
-
-.PHONY: show-all-depends-dirs
-show-all-depends-dirs:
-	@${AWK} '${_RECURSE_DEPENDS_DIRS}'
-
-.PHONY: show-root-dirs
-show-root-dirs:
-	${_PKG_SILENT}${_PKG_DEBUG}${AWK} -v RootsOnly=1 '${_RECURSE_DEPENDS_DIRS}'
-
-.PHONY: show-distfiles
-show-distfiles:
-.if !defined(PKG_FAIL_REASON)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	for file in "" ${_CKSUMFILES}; do				\
-		if [ "X$$file" = "X" ]; then continue; fi;		\
-		${ECHO} $$file;						\
-	done
-.endif
-
-.PHONY: show-downlevel
-show-downlevel:
-.if !defined(PKG_FAIL_REASON)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	found="`${PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`";	\
-	if [ "X$$found" != "X" -a "X$$found" != "X${PKGNAME}" ]; then	\
-		${ECHO} "${PKGBASE} package: $$found installed, pkgsrc version ${PKGNAME}"; \
-		if [ "X$$STOP_DOWNLEVEL_AFTER_FIRST" != "X" ]; then	\
-			${ECHO} "stopping after first downlevel pkg found"; \
-			exit 1;						\
-		fi;							\
-	fi
-.endif
-
-.PHONY: show-installed-depends
-show-installed-depends:
-.if !empty(DEPENDS)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	for i in ${DEPENDS:C/:.*$//:Q:S/\ / /g} ; do			\
-		echo "$$i =>" `${PKG_BEST_EXISTS} "$$i"` ;		\
-	done
-.endif
-
-.PHONY: show-needs-update
-show-needs-update:
-.if !empty(DEPENDS)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	for i in `${MAKE} show-all-depends-dirs`; do			\
-		cd ${PKGSRCDIR}/$$i;					\
-		want=`${MAKE} show-var-noeval VARNAME=PKGNAME`;		\
-		wild=`${MAKE} show-var-noeval VARNAME=PKGWILDCARD`;	\
-		have=`${PKG_BEST_EXISTS} "$$wild" || ${TRUE}`;		\
-		if [ -z "$$have" ]; then				\
-			${ECHO} "$$i => (none) => needs install of $$want"; \
-		elif [ "$$have" != "$$want" ]; then			\
-			${ECHO} "$$i => $$have => needs update to $$want"; \
-		fi;							\
-	done
-.endif
-
-.PHONY: show-pkgsrc-dir
-show-pkgsrc-dir:
-.if !defined(PKG_FAIL_REASON)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	found="`${PKG_BEST_EXISTS} \"${PKGWILDCARD}\" || ${TRUE}`";	\
-	if [ "X$$found" != "X" ]; then					\
-		${ECHO} ${PKGPATH};					\
-	fi
-.endif
-
-# The 'info' target can be used to display information about a package.
-.PHONY: info
-info:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} "${PKGWILDCARD}"
-
-# The 'check' target can be used to check an installed package.
-.PHONY: check
-check:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} check "${PKGWILDCARD}"
-
-# The 'list' target can be used to list the files installed by a package.
-.PHONY: list
-list:
-	${_PKG_SILENT}${_PKG_DEBUG}${PKG_INFO} -L "${PKGWILDCARD}"
-
-# Run pkglint:
-.PHONY: lint
-lint:
-	${_PKG_SILENT}${_PKG_DEBUG}${LOCALBASE}/bin/pkglint | ${GREP} -v ^OK
-
-# Prints out a script to fetch all needed files (no checksumming).
-.PHONY: fetch-list
-fetch-list:
-	@${ECHO} '#!/bin/sh'
-	@${ECHO} '#'
-	@${ECHO} '# This is an auto-generated script, the result of running'
-	@${ECHO} '# `${MAKE} fetch-list'"'"' in directory "'"`${PWD_CMD}`"'"'
-	@${ECHO} '# on host "'"`${UNAME} -n`"'" on "'"`date`"'".'
-	@${ECHO} '#'
-	@${MAKE} ${MAKEFLAGS} fetch-list-recursive
-
-.PHONY: fetch-list-recursive
-fetch-list-recursive:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	for dir in `${MAKE} ${MAKEFLAGS} show-all-depends-dirs`; do	\
-		(cd ../../$$dir &&					\
-		${MAKE} ${MAKEFLAGS} fetch-list-one-pkg			\
-		| ${AWK} '						\
-		/^[^#]/ { FoundSomething = 1 }				\
-		/^unsorted/ { gsub(/[[:space:]]+/, " \\\n\t") }		\
-		/^echo/ { gsub(/;[[:space:]]+/, "\n") }			\
-		{ block[line_c++] = $$0 }				\
-		END { if (FoundSomething)				\
-			for (line = 0; line < line_c; line++)		\
-				print block[line] }			\
-		')							\
-	done
-
-.PHONY: fetch-list-one-pkg
-fetch-list-one-pkg:
-.if !empty(_ALLFILES)
-	@${ECHO}
-	@${ECHO} '#'
-	@location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \
-		${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...'
-	@${ECHO} '#'
-	@${MKDIR} ${_DISTDIR}
-.  for fetchfile in ${_ALLFILES}
-.    if defined(_FETCH_MESSAGE)
-	@(cd ${_DISTDIR};						\
-	if [ ! -f ${fetchfile:T} ]; then				\
-		${ECHO};						\
-		filesize=`${AWK} '					\
-			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
-			' ${DISTINFO_FILE}` || true;			\
-		${ECHO} '# Prompt user to get ${fetchfile} ('$${filesize-???}' bytes) manually:'; \
-		${ECHO} '#';						\
-		${ECHO} ${_FETCH_MESSAGE:Q};				\
-	fi)
-.    elif defined(DYNAMIC_MASTER_SITES)
-	@(cd ${_DISTDIR};						\
-	if [ ! -f ${fetchfile:T} ]; then				\
-		${ECHO};						\
-		filesize=`${AWK} '					\
-			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
-			' ${DISTINFO_FILE}` || true;			\
-		${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \
-		${ECHO} '#';						\
-		${ECHO} '${SH} -s ${fetchfile:T} <<"EOF" |(';		\
-		${CAT} ${FILESDIR}/getsite.sh;				\
-		${ECHO} EOF;						\
-		${ECHO} read unsorted_sites;				\
-		${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \
-		${ECHO} sites='"'${ORDERED_SITES:Q}'"';			\
-		${ECHO} "${MKDIR} ${_DISTDIR}";				\
-		${ECHO} 'cd ${_DISTDIR} && [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
-		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
-		${ECHO} '	${ECHO} ${fetchfile} not fetched';	\
-		${ECHO}	done;						\
-		${ECHO} ')';						\
-	fi)
-.    else
-	@(cd ${_DISTDIR};						\
-	if [ ! -f ${fetchfile:T} ]; then				\
-		${ECHO};						\
-		filesize=`${AWK} '					\
-			/^Size/ && $$2 == "(${fetchfile})" { print $$4 } \
-			' ${DISTINFO_FILE}` || true;			\
-		${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \
-		${ECHO} '#';						\
-		${ECHO} 'unsorted_sites="${SITES_${fetchfile:T:S/=/--/}} ${_MASTER_SITE_BACKUP}"'; \
-		${ECHO} sites='"'${ORDERED_SITES:Q}'"';			\
-		${ECHO} "${MKDIR} ${_DISTDIR}";				\
-		${ECHO} 'cd ${_DISTDIR} && [ -f ${fetchfile} -o -f ${fetchfile:T} ] ||'; \
-		${ECHO}	'for site in $$sites; do';			\
-		${ECHO} '	${FETCH_CMD} ${FETCH_BEFORE_ARGS} "$${site}${fetchfile:T}" ${FETCH_AFTER_ARGS} && break ||'; \
-		${ECHO} '	${ECHO} ${fetchfile} not fetched';	\
-		${ECHO}	done;						\
-	fi)
-.    endif # defined(_FETCH_MESSAGE) || defined(DYNAMIC_MASTER_SITES)
-.  endfor
-.endif # !empty(_ALLFILES)
-
-.PHONY: make-readme-html-help
-make-readme-html-help:
-	@${ECHO} '${PKGNAME:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g}</a>: <TD>'${COMMENT:S/&/\&amp;/g:S/>/\&gt;/g:S/</\&lt;/g:Q}
-
-# If PACKAGES is set to the default (../../pkgsrc/packages), the current
-# ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
-# structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
-# The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
-# the target used to generate the README.html file.
-.PHONY: binpkg-list
-binpkg-list:
-	@if ${TEST} -d ${PACKAGES}; then				\
-		cd ${PACKAGES};						\
-		case ${.CURDIR} in					\
-		*/pkgsrc/packages)					\
-			for pkg in ${PKGREPOSITORYSUBDIR}/${PKGWILDCARD}${PKG_SUFX} ; \
-			do 						\
-				if [ -f "$$pkg" ] ; then		\
-					pkgname=`${ECHO} $$pkg | ${SED} 's@.*/@@'`; \
-					${ECHO} "<TR><TD>${MACHINE_ARCH}:<TD><a href=\"${PKG_URL}/$$pkg\">$$pkgname</a><TD>(${OPSYS} ${OS_VERSION})"; \
-				fi ;					\
-			done ; 						\
-			;;						\
-		*)							\
-			cd ${PACKAGES}/../..;				\
-			for i in [1-9].*/*; do  			\
-				if cd ${PACKAGES}/../../$$i/${PKGREPOSITORYSUBDIR} 2>/dev/null; then \
-					for j in ${PKGWILDCARD}${PKG_SUFX}; \
-					do 				\
-						if [ -f "$$j" ]; then	\
-							${ECHO} $$i/$$j;\
-						fi;			\
-					done; 				\
-				fi; 					\
-			done | ${AWK} -F/ '				\
-				{					\
-					release = $$1;			\
-					arch = $$2; 			\
-					pkg = $$3;			\
-					gsub("\\.tgz","", pkg);		\
-					if (arch != "m68k" && arch != "mipsel") { \
-						if (arch in urls)	\
-							urls[arch "/" pkg "/" release] = "<a href=\"${PKG_URL}/" release "/" arch "/${PKGREPOSITORYSUBDIR}/" pkg "${PKG_SUFX}\">" pkg "</a>, " urls[arch]; \
-						else			\
-							urls[arch "/" pkg "/" release] = "<a href=\"${PKG_URL}/" release "/" arch "/${PKGREPOSITORYSUBDIR}/" pkg "${PKG_SUFX}\">" pkg "</a> "; \
-					}				\
-				} 					\
-				END { 					\
-					for (av in urls) {		\
-						split(av, ava, "/");	\
-						arch=ava[1];		\
-						pkg=ava[2];		\
-						release=ava[3];		\
-						print "<TR><TD>" arch ":<TD>" urls[av] "<TD>(${OPSYS} " release ")"; \
-					}				\
-				}' | ${SORT}				\
-			;;						\
-		esac;							\
-	fi
-
-# This target generates an index entry suitable for aggregation into
-# a large index.  Format is:
-#
-# distribution-name|package-path|installation-prefix|comment| \
-#  description-file|maintainer|categories|build deps|run deps|for arch| \
-#  not for opsys
-#
-.PHONY: describe
-describe:
-	@${ECHO_N} "${PKGNAME}|${.CURDIR}|";				\
-	${ECHO_N} "${PREFIX}|";						\
-	${ECHO_N} ${COMMENT:Q};						\
-	if [ -f ${DESCR_SRC} ]; then					\
-		${ECHO_N} "|${DESCR_SRC}";				\
-	else								\
-		${ECHO_N} "|/dev/null";					\
-	fi;								\
-	${ECHO_N} "|${MAINTAINER}|${CATEGORIES}|";			\
-	case "A${BUILD_DEPENDS}B${DEPENDS}C" in	\
-		ABC) ;;							\
-		*) cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`;; \
-	esac;								\
-	${ECHO_N} "|";							\
-	if [ "${DEPENDS}" != "" ]; then					\
-		cd ${.CURDIR} && ${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`; \
-	fi;								\
-	${ECHO_N} "|";							\
-	if [ "${ONLY_FOR_ARCHS}" = "" ]; then				\
-		${ECHO_N} "any";					\
-	else								\
-		${ECHO_N} "${ONLY_FOR_ARCHS}";				\
-	fi;								\
-	${ECHO_N} "|";							\
-	if [ "${NOT_FOR_OPSYS}" = "" ]; then				\
-		${ECHO_N} "any";					\
-	else								\
-		${ECHO_N} "not ${NOT_FOR_OPSYS}";			\
-	fi;								\
-	${ECHO} ""
-
-# This target is used to generate README.html files
-FTP_PKG_URL_HOST?=	ftp://ftp.NetBSD.org
-FTP_PKG_URL_DIR?=	/pub/NetBSD/packages
-
-.PHONY: readme readmes
-readme readmes:
-	@cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} README.html PKG_URL=${FTP_PKG_URL_HOST}${FTP_PKG_URL_DIR}
-
-# This target is used to generate README.html files, very like "readme"
-# However, a different target was used for ease of use.
-CDROM_PKG_URL_HOST?=	file://localhost
-CDROM_PKG_URL_DIR?=	/usr/pkgsrc/packages
-
-.PHONY: cdrom-readme
-cdrom-readme:
-	@cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} README.html PKG_URL=${CDROM_PKG_URL_HOST}${CDROM_PKG_URL_DIR}
-
-README_NAME=	${TEMPLATES}/README.pkg
-
-# set up the correct license information as a sed expression
-.ifdef LICENSE
-SED_LICENSE_EXPR=       -e 's|%%LICENSE%%|<p>Please note that this package has a ${LICENSE} license.</p>|'
-.else
-SED_LICENSE_EXPR=       -e 's|%%LICENSE%%||'
-.endif
-
-# set up the "more info URL" information as a sed expression
-.ifdef HOMEPAGE
-SED_HOMEPAGE_EXPR=       -e 's|%%HOMEPAGE%%|<p>This package has a home page at <a HREF="${HOMEPAGE}">${HOMEPAGE}</a>.</p>|'
-.else
-SED_HOMEPAGE_EXPR=       -e 's|%%HOMEPAGE%%||'
-.endif
-
-.PHONY: show-vulnerabilities-html
-show-vulnerabilities-html:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then			\
-		${AWK} '/^${PKGBASE}[-<>=]+[0-9]/ { gsub("\<", "\\&lt;", $$1);	\
-			 gsub("\>", "\\&gt;", $$1);			\
-			 printf("<LI><STRONG>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", $$1, $$2, $$3, $$3) }' \
-			${PKGVULNDIR}/pkg-vulnerabilities;			\
-	fi
-
-# If PACKAGES is set to the default (../../packages), the current
-# ${MACHINE_ARCH} and "release" (uname -r) will be used. Otherwise a directory
-# structure of ...pkgsrc/packages/`uname -r`/${MACHINE_ARCH} is assumed.
-# The PKG_URL is set from FTP_PKG_URL_* or CDROM_PKG_URL_*, depending on
-# the target used to generate the README.html file.
-.PHONY: README.html
-README.html: .PRECIOUS
-	@${SETENV} AWK=${AWK} BMAKE=${MAKE} ../../mk/scripts/mkdatabase -f $@.tmp1
-	@if ${TEST} -d ${PACKAGES}; then					\
-		cd ${PACKAGES};						\
-		case `${PWD_CMD}` in					\
-			${PKGSRCDIR}/packages)				\
-				MULTIARCH=no;				\
-				;;					\
-			*)						\
-				MULTIARCH=yes;				\
-				;;					\
-		esac;							\
-		cd ${.CURDIR} ;						\
-	fi;								\
-	${AWK} -f ../../mk/scripts/genreadme.awk \
-		builddependsfile=/dev/null \
-		dependsfile=/dev/null \
-		DISTDIR=${DISTDIR} \
-		MACHINE_ARCH=${MACHINE_ARCH} \
-		MULTIARCH=$$MULTIARCH \
-		OPSYS=${OPSYS} \
-		OS_VERSION=${OS_VERSION} \
-		PACKAGES=${PACKAGES} \
-		PKG_SUFX=${PKG_SUFX} \
-		PKG_URL=${PKG_URL} \
-		PKGREPOSITORYSUBDIR=${PKGREPOSITORYSUBDIR} \
-		PKGSRCDIR=${.CURDIR:C|/[^/]*/[^/]*$||} \
-		TMPDIR=${TMPDIR:U/tmp} \
-		SINGLEPKG=${PKGPATH} \
-		$@.tmp1
-	@${RM} $@.tmp1
-
-.PHONY: show-pkgtools-version
-show-pkgtools-version:
-	@${ECHO} ${PKGTOOLS_VERSION}
-
-.PHONY: print-build-depends-list
-print-build-depends-list:
-.if !empty(BUILD_DEPENDS) || !empty(DEPENDS)
-	@${ECHO_N} 'This package requires package(s) "'
-	@${ECHO_N} `${MAKE} ${MAKEFLAGS} build-depends-list | ${SORT} -u`
-	@${ECHO} '" to build.'
-.endif
-
-.PHONY: print-run-depends-list
-print-run-depends-list:
-.if !empty(DEPENDS)
-	@${ECHO_N} 'This package requires package(s) "'
-	@${ECHO_N} `${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`
-	@${ECHO} '" to run.'
-.endif
-
-# This target is used by the mk/scripts/mkreadme script to generate
-# README.html files
-.PHONY: print-summary-data
-print-summary-data:
-	@${ECHO} "depends ${PKGPATH} ${DEPENDS}"
-	@${ECHO} "build_depends ${PKGPATH} ${BUILD_DEPENDS}"
-	@${ECHO} "conflicts ${PKGPATH} ${CONFLICTS}"
-	@${ECHO} "index ${PKGPATH} ${PKGNAME}"
-	@${ECHO} htmlname ${PKGPATH} ${HTML_PKGNAME:Q}
-	@${ECHO} homepage ${PKGPATH} ${HOMEPAGE:Q}
-	@${ECHO} wildcard ${PKGPATH} ${PKGWILDCARD:Q}
-	@${ECHO} comment ${PKGPATH} ${COMMENT:Q}
-	@${ECHO} license ${PKGPATH} ${LICENSE:Q}
-	@if [ "${ONLY_FOR_ARCHS}" = "" ]; then				\
-		${ECHO} "onlyfor ${PKGPATH} any";			\
-	else								\
-		${ECHO} "onlyfor ${PKGPATH} ${ONLY_FOR_ARCHS}";		\
-	fi;
-	@if [ "${NOT_FOR_OPSYS}" = "" ]; then				\
-		${ECHO} "notfor ${PKGPATH} any";			\
-	else								\
-		${ECHO} "notfor ${PKGPATH} not ${NOT_FOR_OPSYS}";	\
-	fi;
-	@${ECHO} "maintainer ${PKGPATH} ${MAINTAINER}"
-	@${ECHO} "categories ${PKGPATH} ${CATEGORIES}"
-	@if [ -f ${DESCR_SRC} ]; then					\
-		${ECHO}  "descr ${PKGPATH} ${DESCR_SRC:S;${PKGSRCDIR}/;;g}"; \
-	else								\
-		${ECHO}  "descr ${PKGPATH} /dev/null";			\
-	fi
-	@${ECHO} "prefix ${PKGPATH} ${PREFIX}"
-
-.PHONY: show-license show-licence
-show-license show-licence:
-	@if [ "${LICENSE}" != "" ]; then				\
-		if ${TEST} -f ${PKGSRCDIR}/licenses/${LICENSE}; then	\
-			if [ "${PAGER}" != "" ]; then			\
-				${PAGER} ${PKGSRCDIR}/licenses/${LICENSE};\
-			else						\
-				${CAT} ${PKGSRCDIR}/licenses/${LICENSE};\
-			fi						\
-		else							\
-			${ECHO} "Generic ${LICENSE} information not available"; \
-			${ECHO} "See the package description (pkg_info -d ${PKGNAME}) for more information."; \
-		fi							\
-	fi
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk
deleted file mode 100644
index e095db1cba4..00000000000
--- a/mk/bsd.pkg.extract.mk
+++ /dev/null
@@ -1,209 +0,0 @@
-# $NetBSD: bsd.pkg.extract.mk,v 1.6.2.2 2005/05/17 18:29:44 tv Exp $
-#
-# This Makefile fragment is included to bsd.pkg.mk and defines the
-# relevant variables and targets for the "extract" phase.
-#
-# The following variables may be set by the package Makefile and
-# specify how extraction happens:
-#
-#    EXTRACT_ONLY is a list of distfiles relative to ${_DISTDIR} to
-#	extract and defaults to ${DISTFILES}.
-#
-#    EXTRACT_SUFX is the suffix for the default distfile to be
-#	extracted.  The default suffix is ".tar.gz".
-#
-#    EXTRACT_CMD is a shell command list that extracts the contents of
-#	an archive named by the shell variable "extract_file" based on
-#	the extension of the archive.  The extensions understood by
-#	EXTRACT_CMD are listed in _EXTRACT_SUFFIXES.
-#
-#    EXTRACT_CMD.<sufx> is a shell command list that extracts the
-#	contents of an archive named by the shell variable "extract_file"
-#	that ends in <sufx>.
-#
-#    EXTRACT_USING specifies the tool used to extract tar/ustar-format
-#	archives.  The possible values are "gtar", "nbtar", and "pax".
-#	By default, we use the "nbtar" tool (NetBSD's pax-as-tar).
-#
-#    EXTRACT_ELEMENTS is a list of files within the distfile to extract.
-#	This variable only takes effect for distfiles that are tarballs.
-#	By default, this is empty, which causes all files within the
-#	tarball to be extracted.
-#
-# The following targets are defined by bsd.pkg.extract.mk:
-#
-#    do-extract is the target that causes the actual extraction of
-#	the distfiles to occur during the "extract" phase.
-#
-
-EXTRACT_ONLY?=		${DISTFILES}
-EXTRACT_SUFX?=		.tar.gz
-EXTRACT_USING?=		nbtar
-
-_EXTRACT_SUFFIXES=	.tar.gz .tgz .tar.bz2 .tbz .tar.Z .tar _tar.gz
-_EXTRACT_SUFFIXES+=	.shar.gz .shar.bz2 .shar.Z .shar
-_EXTRACT_SUFFIXES+=	.zip
-_EXTRACT_SUFFIXES+=	.lha .lzh
-_EXTRACT_SUFFIXES+=	.Z .bz2 .gz
-_EXTRACT_SUFFIXES+=	.zoo
-_EXTRACT_SUFFIXES+=	.bin
-_EXTRACT_SUFFIXES+=	.rar
-
-.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_ONLY:M*.tar.*) || \
-    !empty(EXTRACT_SUFX:M*.tar) || !empty(EXTRACT_SUFX:M*.tar.*) || \
-    !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_ONLY:M*.tgz) || \
-    !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz)
-.  if !empty(EXTRACT_USING:Mgtar)
-PKGSRC_USE_TOOLS+=	gtar
-.  elif !empty(EXTRACT_USING:Mnbtar)
-PKGSRC_USE_TOOLS+=	tar
-.  else
-PKGSRC_USE_TOOLS+=	pax
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
-    !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	bzcat
-.  elif exists(/usr/bin/bzcat)
-BZCAT=			/usr/bin/bzcat <
-.  else
-BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
-BZCAT=			${LOCALBASE}/bin/bzcat
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	unzip
-.  else
-BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
-UNZIP=			${LOCALBASE}/bin/unzip
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \
-    !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	lha
-.  else
-BUILD_DEPENDS+=		lha>=114.9:../../archivers/lha
-LHA=			${LOCALBASE}/bin/lha
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \
-    !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \
-    !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	gzcat
-.  elif !defined(GZCAT)
-BUILD_DEPENDS+=         gzip-base>=1.2.4b:../../archivers/gzip-base
-GZCAT=                  ${LOCALBASE}/bin/zcat
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	unzoo
-.  else
-BUILD_DEPENDS+=		unzoo-[0-9]*:../../archivers/unzoo
-UNZOO=			${LOCALBASE}/bin/unzoo
-.  endif
-.endif
-.if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar)
-.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
-PKGSRC_USE_TOOLS+=	unrar
-.  else
-BUILD_DEPENDS+=		unrar>=3.3.4:../../archivers/unrar
-UNRAR=			${LOCALBASE}/bin/unrar
-.  endif
-.endif
-
-DECOMPRESS_CMD.tar.gz?=		${GZCAT}
-DECOMPRESS_CMD.tgz?=		${DECOMPRESS_CMD.tar.gz}
-DECOMPRESS_CMD.tar.bz2?=	${BZCAT}
-DECOMPRESS_CMD.tbz?=		${DECOMPRESS_CMD.tar.bz2}
-DECOMPRESS_CMD.tar.Z?=		${GZCAT}
-DECOMPRESS_CMD.tar?=		${CAT}
-
-DECOMPRESS_CMD.shar.gz?=	${GZCAT}
-DECOMPRESS_CMD.shar.bz2?=	${BZCAT}
-DECOMPRESS_CMD.shar.Z?=		${GZCAT}
-DECOMPRESS_CMD.shar?=		${CAT}
-
-DECOMPRESS_CMD.Z?=		${GZCAT}
-DECOMPRESS_CMD.bz2?=		${BZCAT}
-DECOMPRESS_CMD.gz?=		${GZCAT}
-
-DECOMPRESS_CMD?=		${GZCAT}
-.for __suffix__ in ${_EXTRACT_SUFFIXES}
-.  if !defined(DECOMPRESS_CMD${__suffix__})
-DECOMPRESS_CMD${__suffix__}?=	${DECOMPRESS_CMD}
-.  endif
-.endfor
-
-# If this is empty, then everything gets extracted.
-EXTRACT_ELEMENTS?=	# empty
-
-DOWNLOADED_DISTFILE=	$${extract_file}
-
-EXTRACT_CMD.zip?=	${UNZIP} ${EXTRACT_CMD_OPTS.zip} $${extract_file}
-EXTRACT_CMD_OPTS.zip?=	-Laqo
-EXTRACT_CMD.lha?=	${LHA} ${EXTRACT_CMD_OPTS.lha} $${extract_file}
-EXTRACT_CMD_OPTS.lha?=	xq
-EXTRACT_CMD.lzh?=	${EXTRACT_CMD.lha}
-EXTRACT_CMD_OPTS.lzh?=	${EXTRACT_CMD_OPTS.lha}
-EXTRACT_CMD.zoo?=	${UNZOO} ${EXTRACT_CMD_OPTS.zoo} $${extract_file}
-EXTRACT_CMD_OPTS.zoo?=	-x
-EXTRACT_CMD.rar?=	${UNRAR} ${EXTRACT_CMD_OPTS.rar} $${extract_file}
-EXTRACT_CMD_OPTS.rar?=	x -inul
-EXTRACT_ENV.bin?=	# empty
-EXTRACT_CMD.bin?=	${ECHO} yes | ${SETENV} ${EXTRACT_ENV.bin} $${extract_file} ${EXTRACT_CMD_OPTS.bin} >/dev/null
-
-.for __suffix__ in .gz .bz2 .Z
-EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} > `${BASENAME} $${extract_file} ${__suffix__}`
-.endfor
-
-.for __suffix__ in .shar.gz .shar.bz2 .shar.Z .shar
-EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${SH}
-.endfor
-
-.if !empty(EXTRACT_USING:Mgtar)
-_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
-.elif !empty(EXTRACT_USING:Mnbtar)
-_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${TAR} -xf - ${EXTRACT_ELEMENTS}
-.else
-_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
-.endif
-
-.for __suffix__ in ${_EXTRACT_SUFFIXES}
-.  if !defined(EXTRACT_CMD${__suffix__})
-.    if !empty(EXTRACT_USING:Mgtar)
-EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
-.    elif !empty(EXTRACT_USING:Mnbtar)
-EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${TAR} -xf - ${EXTRACT_ELEMENTS}
-.    else
-EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
-.    endif
-.  endif
-.endfor
-
-# _SHELL_EXTRACT is a "subroutine" for extracting an archive.  It extracts
-# the contents of archive named by the shell variable "extract_file" based
-# on the file extension of the archive.
-#
-_SHELL_EXTRACT=		case $${extract_file} in
-.for __suffix__ in ${_EXTRACT_SUFFIXES}
-_SHELL_EXTRACT+=	*${__suffix__})	${EXTRACT_CMD${__suffix__}} ;;
-.endfor
-_SHELL_EXTRACT+=	*)		${_DFLT_EXTRACT_CMD} ;;
-_SHELL_EXTRACT+=	esac
-
-EXTRACT_CMD?=		${_SHELL_EXTRACT}
-
-.PHONY: do-extract
-.if !target(do-extract)
-do-extract: ${WRKDIR}
-.  for __file__ in ${EXTRACT_ONLY}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	extract_file="${_DISTDIR}/${__file__}";	export extract_file;	\
-	cd ${WRKDIR}; ${EXTRACT_CMD}
-.  endfor
-.endif
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
deleted file mode 100644
index 38b0a82c207..00000000000
--- a/mk/bsd.pkg.mk
+++ /dev/null
@@ -1,3712 +0,0 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1540.2.26 2005/03/21 15:43:00 tv Exp $
-#
-# This file is in the public domain.
-#
-# This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard.
-#
-# Please see the pkgsrc/doc/guide manual for details on the
-# variables used in this make file template.
-#
-# XXX tv: rev 1.1554 is not merged yet (phase "error handlers")
-#
-
-############################################################################
-# Include any preferences, if not already included, and common definitions
-############################################################################
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/bsd.hacks.mk"
-
-# _PKG_PHASES_WRKDIR is an ordered list of phases which require ${WRKDIR}
-# to exist.  _PKG_PHASES_ALL also includes the phases from before ${WRKDIR}
-# is created.  These macros are used below mainly in .for loops.
-
-_PKG_PHASES_ALL=	fetch checksum ${_PKG_PHASES_WRKDIR}
-_PKG_PHASES_WRKDIR=	depends extract patch tools wrapper \
-			configure build test install package
-
-############################################################################
-# Transform package Makefile variables and set defaults
-############################################################################
-
-CHECK_FILES?=		NO	# run check-files after install
-CHECK_FILES_STRICT?=	NO	# make check-files very strict on errors
-CHECK_SHLIBS?=		YES	# run check-shlibs after install
-CLEANDEPENDS?=		NO
-DEINSTALLDEPENDS?=	NO	# add -R to pkg_delete
-MKCRYPTO?=		YES	# build crypto packages by default
-NOCLEAN?=		NO	# don't clean up after update
-REINSTALL?=		NO	# reinstall upon update
-SHLIB_HANDLING?=	YES	# do automatic shared lib handling
-
-##### Variant spellings
-
-.if defined(LICENCE) && !defined(LICENSE)
-LICENSE=		${LICENCE}
-.endif
-.if defined(ACCEPTABLE_LICENCES) && !defined(ACCEPTABLE_LICENSES)
-ACCEPTABLE_LICENSES=	${ACCEPTABLE_LICENCES}
-.endif
-
-##### PKGBASE, PKGNAME[_NOREV], PKGVERSION
-
-PKGBASE?=		${PKGNAME:C/-[^-]*$//}
-PKGVERSION?=		${PKGNAME:C/^.*-//}
-.if defined(PKGREVISION) && !empty(PKGREVISION) && (${PKGREVISION} != "0")
-.  if defined(PKGNAME)
-PKGNAME_NOREV:=		${PKGNAME}
-PKGNAME:=		${PKGNAME}nb${PKGREVISION}
-.  else
-PKGNAME?=		${DISTNAME}nb${PKGREVISION}
-PKGNAME_NOREV=		${DISTNAME}
-.  endif
-.else
-PKGNAME?=		${DISTNAME}
-PKGNAME_NOREV=		${PKGNAME}
-.endif
-
-##### PLIST
-
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-PLIST_TYPE?=		dynamic
-.endif
-PLIST_TYPE?=		static
-
-.if !defined(PLIST_SRC)
-.  if exists(${PKGDIR}/PLIST.common)
-PLIST_SRC+=		${PKGDIR}/PLIST.common
-.  endif
-.  if exists(${PKGDIR}/PLIST.${OPSYS})
-PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}
-.  endif
-.  if exists(${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g})
-PLIST_SRC+=		${PKGDIR}/PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
-.  endif
-.  if exists(${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
-PLIST_SRC+=		${PKGDIR}/PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
-.  endif
-.  if exists(${PKGDIR}/PLIST)
-PLIST_SRC+=		${PKGDIR}/PLIST
-.  endif
-.  if exists(${PKGDIR}/PLIST.common_end)
-PLIST_SRC+=		${PKGDIR}/PLIST.common_end
-.  endif
-.endif # !PLIST_SRC
-
-##### Others
-
-_DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
-BUILD_DEFS?=		# empty
-BUILD_DEPENDS?=		# empty
-BUILD_TARGET?=		all
-COMMENT?=		(no description)
-CONFIGURE_DIRS?=	${WRKSRC}
-CONFIGURE_SCRIPT?=	./configure
-DEPENDS?=		# empty
-DESCR_SRC?=		${PKGDIR}/DESCR
-DIGEST_ALGORITHMS?=	SHA1 RMD160
-DISTFILES?=		${DISTNAME}${EXTRACT_SUFX}
-DISTINFO_FILE?=		${PKGDIR}/distinfo
-EXTRACT_ONLY?=		${DISTFILES}
-EXTRACT_SUFX?=		.tar.gz
-INSTALL_DIRS?=		${BUILD_DIRS}
-INSTALL_MAKE_FLAGS?=	${MAKE_FLAGS}
-INSTALL_TARGET?=	install
-INTERACTIVE_STAGE?=	none
-MAINTAINER?=		tech-pkg@NetBSD.org
-MAKE_FLAGS?=		# empty
-MAKEFILE?=		Makefile
-PATCH_DIGEST_ALGORITHM?=SHA1
-PKG_SUFX?=		.tgz
-PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
-PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
-PKGREPOSITORYSUBDIR?=	All
-PKGWILDCARD?=		${PKGBASE}-[0-9]*
-SVR4_PKGNAME?=		${PKGNAME}
-USE_DIGEST?=		YES
-USE_GNU_TOOLS?=		# empty
-WRKSRC?=		${WRKDIR}/${DISTNAME}
-
-BUILD_DEFS_FIXED+=	PKGPATH
-BUILD_DEFS_FIXED+=	OPSYS OS_VERSION MACHINE_ARCH MACHINE_GNU_ARCH
-BUILD_DEFS_FIXED+=	CPPFLAGS CFLAGS FFLAGS LDFLAGS
-BUILD_DEFS_FIXED+=	CONFIGURE_ENV CONFIGURE_ARGS
-BUILD_DEFS_FIXED+=	OBJECT_FMT LICENSE RESTRICTED
-BUILD_DEFS_FIXED+=	NO_SRC_ON_FTP NO_SRC_ON_CDROM
-BUILD_DEFS_FIXED+=	NO_BIN_ON_FTP NO_BIN_ON_CDROM
-BUILD_DEFS_FIXED+=	${OSVERSION_SPECIFIC:DOSVERSION_SPECIFIC}
-
-.if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS)
-_INSTALL_UNSTRIPPED=	# set (flag used by platform/*.mk)
-.endif
-
-##### Non-overridable constants
-
-# Latest versions of tools required for correct pkgsrc operation.
-DIGEST_REQD=		20010302
-PKGTOOLS_REQD=		${_OPSYS_PKGTOOLS_REQD:U20050204}
-
-PKG_DB_TMPDIR=		${WRKDIR}/.pkgdb
-DDIR=			${WRKDIR}/.DDIR
-DESCR=			${PKG_DB_TMPDIR}/+DESC
-DLIST=			${WRKDIR}/.DLIST
-PLIST=			${WRKDIR}/.PLIST
-
-# Files to create for versioning and build information
-BUILD_VERSION_FILE=	${PKG_DB_TMPDIR}/+BUILD_VERSION
-BUILD_INFO_FILE=	${PKG_DB_TMPDIR}/+BUILD_INFO
-
-# Files containing size of pkg w/o and w/ all required pkgs
-SIZE_PKG_FILE=		${PKG_DB_TMPDIR}/+SIZE_PKG
-SIZE_ALL_FILE=		${PKG_DB_TMPDIR}/+SIZE_ALL
-
-# File to denote "no deletion of a package"
-PRESERVE_FILE=		${PKG_DB_TMPDIR}/+PRESERVE
-
-.for targ in ${_PKG_PHASES_WRKDIR}
-${targ}_COOKIE=		${WRKDIR}/.${targ}_done
-.endfor
-
-##### Transform USE_* into dependencies
-
-.include "../../mk/bsd.pkg.use.mk"
-
-############################################################################
-# Sanity checks
-############################################################################
-
-# Fail-safe in the case of circular dependencies
-.if defined(_PKGSRC_DEPS) && defined(PKGNAME) && !empty(_PKGSRC_DEPS:M${PKGNAME})
-PKG_FAIL_REASON+=	"Circular dependency detected"
-.endif
-
-# PKG_INSTALLATION_TYPE can only be one of two values: "pkgviews" or
-# "overwrite".
-.if (${PKG_INSTALLATION_TYPE} != "pkgviews") && \
-    (${PKG_INSTALLATION_TYPE} != "overwrite")
-PKG_FAIL_REASON+=	"PKG_INSTALLATION_TYPE must be \`\`pkgviews'' or \`\`overwrite''."
-.endif
-
-.if empty(PKG_INSTALLATION_TYPES:M${PKG_INSTALLATION_TYPE})
-PKG_FAIL_REASON+=	"This package doesn't support PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE}."
-.endif
-
-.if (${PLIST_TYPE} != "dynamic") && (${PLIST_TYPE} != "static")
-PKG_FAIL_REASON+=	"PLIST_TYPE must be \`\`dynamic'' or \`\`static''."
-.endif
-
-.if (${PKG_INSTALLATION_TYPE} == "overwrite") && (${PLIST_TYPE} != "static")
-PKG_FAIL_REASON+=	"PLIST_TYPE must be \`\`static'' for \`\`overwrite'' packages."
-.endif
-
-# Check that we are using up-to-date pkg_* tools with this file.
-.if !defined(NO_PKGTOOLS_REQD_CHECK)
-.  if ${PKGTOOLS_VERSION} < ${PKGTOOLS_REQD}
-PKG_FAIL_REASON+='Error: The package tools installed on this system are out of date.'
-PKG_FAIL_REASON+='The installed package tools are dated ${PKGTOOLS_VERSION:C|(....)(..)(..)|\1/\2/\3|} and you must update'
-PKG_FAIL_REASON+='them to at least ${PKGTOOLS_REQD:C|(....)(..)(..)|\1/\2/\3|} using the following command:'
-PKG_FAIL_REASON+=''
-PKG_FAIL_REASON+='	cd ${PKGSRCDIR}/pkgtools/pkg_install && ${MAKE} clean && ${MAKE} install'
-.  endif
-.endif # !NO_PKGTOOLS_REQD_CHECK
-
-.if defined(ALL_TARGET)
-PKG_FAIL_REASON+='ALL_TARGET is deprecated and must be replaced with BUILD_TARGET.'
-.endif
-
-.if defined(NO_WRKSUBDIR)
-PKG_FAIL_REASON+='NO_WRKSUBDIR has been deprecated - please replace it with an explicit'
-PKG_FAIL_REASON+='assignment of WRKSRC= $${WRKDIR}'
-.endif # NO_WRKSUBDIR
-
-# We need to make sure the buildlink-x11 package is not installed since it
-# breaks builds that use imake.
-.if defined(USE_IMAKE)
-.  if exists(${LOCALBASE}/lib/X11/config/buildlinkX11.def) || \
-      exists(${X11BASE}/lib/X11/config/buildlinkX11.def)
-PKG_FAIL_REASON+= "${PKGNAME} uses imake, but the buildlink-x11 package was found." \
-	 "    Please deinstall it (pkg_delete buildlink-x11)."
-.  endif
-.endif	# USE_IMAKE
-
-.if !defined(CATEGORIES) || !defined(DISTNAME)
-PKG_FAIL_REASON+='CATEGORIES and DISTNAME are mandatory.'
-.endif
-
-.if defined(LIB_DEPENDS)
-PKG_FAIL_REASON+='LIB_DEPENDS is deprecated and must be replaced with DEPENDS.'
-.endif
-
-.if defined(PKG_PATH)
-PKG_FAIL_REASON+='Please unset PKG_PATH before doing pkgsrc work!'
-.endif
-
-.if defined(MASTER_SITE_SUBDIR)
-PKG_FAIL_REASON+='MASTER_SITE_SUBDIR is deprecated and must be replaced with MASTER_SITES.'
-.endif
-
-.if defined(PATCH_SITE_SUBDIR)
-PKG_FAIL_REASON+='PATCH_SITE_SUBDIR is deprecated and must be replaced with PATCH_SITES.'
-.endif
-
-.if defined(ONLY_FOR_ARCHS) || defined(NOT_FOR_ARCHS) \
-	|| defined(ONLY_FOR_OPSYS) || defined(NOT_FOR_OPSYS)
-PKG_FAIL_REASON+='ONLY/NOT_FOR_ARCHS/OPSYS are deprecated and must be replaced with ONLY/NOT_FOR_PLATFORM.'
-.endif
-
-.if (${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once")
-.  if !defined(OBJHOSTNAME)
-PKG_FAIL_REASON+='PKGSRC_LOCKTYPE needs OBJHOSTNAME defined.'
-.  elif !exists(${SHLOCK})
-PKG_FAIL_REASON+='The ${SHLOCK} utility does not exist, and is necessary for locking.'
-PKG_FAIL_REASON+='Please "${MAKE} install" in ../../pkgtools/shlock.'
-.  endif
-.endif
-
-#
-# Many ways to disable a package.
-#
-# Ignore packages that can't be resold if building for a CDROM.
-#
-# Don't build a package if it's restricted and we don't want to
-# get into that.
-#
-# Don't build any package that utilizes strong cryptography, for
-# when the law of the land forbids it.
-#
-# Don't attempt to build packages against X if we don't have X.
-#
-# Don't build a package if it's broken.
-#
-
-.if (defined(NO_BIN_ON_CDROM) && defined(FOR_CDROM))
-PKG_FAIL_REASON+= "${PKGNAME} may not be placed in binary form on a CDROM:" \
-         "    "${NO_BIN_ON_CDROM:Q}
-.endif
-.if (defined(NO_SRC_ON_CDROM) && defined(FOR_CDROM))
-PKG_FAIL_REASON+= "${PKGNAME} may not be placed in source form on a CDROM:" \
-         "    "${NO_SRC_ON_CDROM:Q}
-.endif
-.if (defined(RESTRICTED) && defined(NO_RESTRICTED))
-PKG_FAIL_REASON+= "${PKGNAME} is restricted:" \
-	 "    "${RESTRICTED:Q}
-.endif
-.if !(${MKCRYPTO} == "YES" || ${MKCRYPTO} == yes)
-.  if defined(CRYPTO)
-PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong cryptography"
-.  endif
-.endif
-.if defined(USE_X11) && !exists(${X11BASE})
-PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
-.endif
-.if defined(BROKEN)
-PKG_FAIL_REASON+= "${PKGNAME} is marked as broken:" ${BROKEN:Q}
-.endif
-
-.if defined(LICENSE)
-.  ifdef ACCEPTABLE_LICENSES
-.    for _lic in ${ACCEPTABLE_LICENSES}
-.      if ${LICENSE} == "${_lic}"
-_ACCEPTABLE=	yes
-.      endif	# LICENSE == _lic
-.    endfor	# _lic
-.  endif	# ACCEPTABLE_LICENSES
-.  ifndef _ACCEPTABLE
-PKG_FAIL_REASON+= "${PKGNAME} has an unacceptable license: ${LICENSE}." \
-	 "    To view the license, enter \"${MAKE} show-license\"." \
-	 "    To indicate acceptance, add this line to your /etc/mk.conf:" \
-	 "    ACCEPTABLE_LICENSES+=${LICENSE}"
-.  endif	# _ACCEPTABLE
-.endif		# LICENSE
-
-# Define __PLATFORM_OK only if the OS matches the pkg's allowed list.
-.if defined(ONLY_FOR_PLATFORM) && !empty(ONLY_FOR_PLATFORM)
-.  for __tmp__ in ${ONLY_FOR_PLATFORM}
-.    if ${MACHINE_PLATFORM:M${__tmp__}} != ""
-__PLATFORM_OK?=	yes
-.    endif	# MACHINE_PLATFORM
-.  endfor	# __tmp__
-.else		# !ONLY_FOR_PLATFORM
-__PLATFORM_OK?=	yes
-.endif		# ONLY_FOR_PLATFORM
-.for __tmp__ in ${NOT_FOR_PLATFORM}
-.  if ${MACHINE_PLATFORM:M${__tmp__}} != ""
-.    undef __PLATFORM_OK
-.  endif	# MACHINE_PLATFORM
-.endfor		# __tmp__
-.if !defined(__PLATFORM_OK)
-PKG_SKIP_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}"
-.endif		# !__PLATFORM_OK
-
-.if !defined(NO_SKIP)
-.  if defined(PKG_FAIL_REASON) || defined(PKG_SKIP_REASON)
-_PKG_SKIPPED=	# defined
-.  endif
-.endif
-
-############################################################################
-# Set up build environment
-############################################################################
-
-.if !defined(_PKG_SKIPPED)
-
-# Allow variables to be set on a per-OS basis
-OPSYSVARS+=	CFLAGS CPPFLAGS CXXFLAGS FFLAGS LDFLAGS LIBS
-.  for var in ${OPSYSVARS:O}
-.    if defined(${var}.${OPSYS})
-${var}+=	${${var}.${OPSYS}}
-.    elif defined(${var}.*)
-${var}+=	${${var}.*}
-.    endif
-.  endfor
-
-CPPFLAGS+=	${CPP_PRECOMP_FLAGS}
-
-.  if !empty(USE_BUILDLINK3:M[nN][oO])
-LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
-LDFLAGS+=	-L${LOCALBASE}/lib
-.  endif
-
-ALL_ENV+=	CC=${CC:Q}
-ALL_ENV+=	CFLAGS=${CFLAGS:Q}
-ALL_ENV+=	CPPFLAGS=${CPPFLAGS:Q}
-ALL_ENV+=	CXX=${CXX:Q}
-ALL_ENV+=	CXXFLAGS=${CXXFLAGS:Q}
-ALL_ENV+=	COMPILER_RPATH_FLAG=${COMPILER_RPATH_FLAG:Q}
-ALL_ENV+=	F77=${FC:Q}
-ALL_ENV+=	FC=${FC:Q}
-ALL_ENV+=	FFLAGS=${FFLAGS:Q}
-ALL_ENV+=	LANG=C
-ALL_ENV+=	LC_COLLATE=C
-ALL_ENV+=	LC_CTYPE=C
-ALL_ENV+=	LC_MESSAGES=C
-ALL_ENV+=	LC_MONETARY=C
-ALL_ENV+=	LC_NUMERIC=C
-ALL_ENV+=	LC_TIME=C
-ALL_ENV+=	LDFLAGS=${LDFLAGS:Q}
-ALL_ENV+=	LINKER_RPATH_FLAG=${LINKER_RPATH_FLAG:Q}
-ALL_ENV+=	PATH=${PATH:Q}:${LOCALBASE}/bin:${X11BASE}/bin
-ALL_ENV+=	PREFIX=${PREFIX}
-
-MAKE_ENV+=	${ALL_ENV}
-MAKE_ENV+=	${NO_EXPORT_CPP:D:UCPP=${CPP:Q}}
-MAKE_ENV+=	LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
-MAKE_ENV+=	LOCALBASE=${LOCALBASE}
-MAKE_ENV+=	NO_WHOLE_ARCHIVE_FLAG=${NO_WHOLE_ARCHIVE_FLAG:Q}
-MAKE_ENV+=	WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q}
-MAKE_ENV+=	X11BASE=${X11BASE}
-MAKE_ENV+=	X11PREFIX=${X11PREFIX}
-
-# Constants to provide a consistent environment for packages using
-# BSD-style Makefiles.
-MAKE_ENV+=	MAKECONF=${PKGMAKECONF:U/dev/null}
-MAKE_ENV+=	OBJECT_FMT=${OBJECT_FMT:Q}
-MAKE_ENV+=	${USETOOLS:DUSETOOLS=${USETOOLS:Q}}
-
-SCRIPTS_ENV+=	${ALL_ENV}
-SCRIPTS_ENV+=	_PKGSRCDIR=${_PKGSRCDIR}
-SCRIPTS_ENV+=	${BATCH:DBATCH=yes}
-SCRIPTS_ENV+=	CURDIR=${.CURDIR}
-SCRIPTS_ENV+=	DEPENDS=${DEPENDS:Q}
-SCRIPTS_ENV+=	DISTDIR=${DISTDIR}
-SCRIPTS_ENV+=	FILESDIR=${FILESDIR}
-SCRIPTS_ENV+=	LOCALBASE=${LOCALBASE}
-SCRIPTS_ENV+=	PATCHDIR=${PATCHDIR}
-SCRIPTS_ENV+=	PKGSRCDIR=${PKGSRCDIR}
-SCRIPTS_ENV+=	SCRIPTDIR=${SCRIPTDIR}
-SCRIPTS_ENV+=	VIEWBASE=${VIEWBASE}
-SCRIPTS_ENV+=	WRKDIR=${WRKDIR}
-SCRIPTS_ENV+=	WRKSRC=${WRKSRC}
-SCRIPTS_ENV+=	X11BASE=${X11BASE}
-
-# Set PLIST_SUBST to substitute "${variable}" to "value" in PLIST
-PLIST_SUBST+=	CHGRP=${CHGRP:Q}
-PLIST_SUBST+=	CHMOD=${CHMOD:Q}
-PLIST_SUBST+=	CHOWN=${CHOWN:Q}
-PLIST_SUBST+=	LN=${LN:Q}
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
-PLIST_SUBST+=	LOWER_VENDOR=${LOWER_VENDOR}
-PLIST_SUBST+=	LOWER_OPSYS=${LOWER_OPSYS}
-PLIST_SUBST+=	LOWER_OS_VERSION=${LOWER_OS_VERSION}
-PLIST_SUBST+=	MACHINE_ARCH=${MACHINE_ARCH}
-PLIST_SUBST+=	MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH}
-PLIST_SUBST+=	MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM}
-PLIST_SUBST+=	MKDIR=${MKDIR:Q}
-PLIST_SUBST+=	OPSYS=${OPSYS}
-PLIST_SUBST+=	OS_VERSION=${OS_VERSION}
-PLIST_SUBST+=	PKGBASE=${PKGBASE}
-PLIST_SUBST+=	PKGNAME=${PKGNAME_NOREV}
-PLIST_SUBST+=	PKGLOCALEDIR=${PKGLOCALEDIR}
-PLIST_SUBST+=	PKGVERSION=${PKGVERSION:C/nb[0-9]*$//}
-PLIST_SUBST+=	QMAILDIR=${QMAILDIR} # XXXTV is this used?
-PLIST_SUBST+=	RM=${RM:Q}
-PLIST_SUBST+=	RMDIR=${RMDIR:Q}
-PLIST_SUBST+=	SVR4_PKGNAME=${SVR4_PKGNAME}
-PLIST_SUBST+=	TRUE=${TRUE:Q}
-PLIST_SUBST+=	VIEWBASE=${VIEWBASE}
-PLIST_SUBST+=	X11BASE=${X11BASE}
-PLIST_SUBST+=	X11PREFIX=${X11PREFIX}
-
-# Automatically increase process limit where necessary for building.
-.  if defined(UNLIMIT_RESOURCES)
-.    for res in ${UNLIMIT_RESOURCES}
-_ULIMIT_CMD+=	${ULIMIT_CMD_${res}:D${ULIMIT_CMD_${res}} ; }
-.    endfor
-.  endif
-
-# if automatic manual page compression is done by the package according
-# to MANZ's value, set MANCOMPRESSED if MANZ is set
-.  if defined(MANCOMPRESSED_IF_MANZ) && defined(MANZ)
-MANCOMPRESSED=	yes
-MAKE_ENV+=	MANZ=${MANZ}
-.  endif
-
-# CONF_DEPENDS notes a dependency where the config directory for the
-# package matches the dependency's config directory.  CONF_DEPENDS is
-# only meaningful if ${PKG_INSTALLATION_TYPE} == "pkgviews".
-#
-CONF_DEPENDS?=		# empty
-.  if !empty(CONF_DEPENDS)
-USE_PKGINSTALL=		YES
-.  endif
-
-.endif	# !_PKG_SKIPPED
-
-############################################################################
-# Debug support
-############################################################################
-
-# Debugging levels for this file, dependent on PKG_DEBUG_LEVEL definition
-# 0 == normal, default, quiet operation
-# 1 == all shell commands echoed before invocation
-# 2 == shell "set -x" operation
-PKG_DEBUG_LEVEL?=	0
-_PKG_SILENT=		@
-_PKG_DEBUG=		# empty
-_PKG_DEBUG_SCRIPT=	# empty
-
-.if ${PKG_DEBUG_LEVEL} > 0
-_PKG_SILENT=		# empty
-.endif
-
-.if ${PKG_DEBUG_LEVEL} > 1
-_PKG_DEBUG=		set -x;
-_PKG_DEBUG_SCRIPT=	${SH} -x
-.endif
-
-############################################################################
-# External tools
-############################################################################
-
-# top part not skipped by _PKG_SKIPPED
-
-# Used to print all the '===>' style prompts - override this to turn them off.
-ECHO_MSG?=		${ECHO}
-
-# Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree
-# of dependencies for building, and the current target.
-.ifdef SMART_MESSAGES
-_PKGSRC_IN?=		===> ${.TARGET} [${PKGNAME}${_PKGSRC_DEPS}] ===
-.endif
-_PKGSRC_IN?=		===
-
-DO_NADA?=		${TRUE} # deprecated; for compatibility only
-SHCOMMENT?=		${ECHO_MSG} >/dev/null '***'
-TOUCH_FLAGS?=		-f
-
-FETCH_BEFORE_ARGS+=	${PASSIVE_FETCH:D-p}
-
-.if !defined(_PKG_SKIPPED)
-
-INSTALL_DATA?= 		${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
-INSTALL_DATA_DIR?= 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m ${PKGDIRMODE}
-INSTALL_GAME?=		${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEMODE}
-INSTALL_GAME_DATA?= 	${INSTALL} ${COPY} -o ${GAMEOWN} -g ${GAMEGRP} -m ${GAMEDATAMODE}
-INSTALL_LIB?= 		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-INSTALL_LIB_DIR?= 	${INSTALL_PROGRAM_DIR}
-INSTALL_MAN?= 		${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
-INSTALL_MAN_DIR?= 	${INSTALL} -d -o ${MANOWN} -g ${MANGRP} -m ${PKGDIRMODE}
-INSTALL_PROGRAM?= 	${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-INSTALL_PROGRAM_DIR?= 	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${PKGDIRMODE}
-INSTALL_SCRIPT?= 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
-INSTALL_SCRIPT_DIR?= 	${INSTALL_PROGRAM_DIR}
-
-_INSTALL_MACROS=	BSD_INSTALL=${INSTALL:Q}
-.  for mac in DATA GAME LIB MAN PROGRAM SCRIPT
-_INSTALL_MACROS+=	BSD_INSTALL_${mac}=${INSTALL_${mac}:Q}
-_INSTALL_MACROS+=	BSD_INSTALL_${mac}_DIR=${INSTALL_${mac}_DIR:Q}
-CONFIGURE_ENV+=		INSTALL_${mac}=${INSTALL_${mac}:Q}
-CONFIGURE_ENV+=		INSTALL_${mac}_DIR=${INSTALL_${mac}_DIR:Q}
-.  endfor
-MAKE_ENV+=		${_INSTALL_MACROS}
-SCRIPTS_ENV+=		${_INSTALL_MACROS}
-
-.  if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS:Mmake)
-MAKE_PROGRAM=		${GMAKE}
-.  elif defined(USE_IMAKE)
-.    if ${_IMAKE_MAKE} == ${GMAKE}
-USE_GNU_TOOLS+=		make
-.    endif
-MAKE_PROGRAM=		${_IMAKE_MAKE}
-.  endif
-MAKE_PROGRAM?=		${MAKE}
-
-MTREE_ARGS?=		-U -f ${MTREE_FILE} -d -e -p
-MTREE_FILE?=		${PKGSRCDIR}/mk/${OPSYS}.pkg.dist
-
-PKG_ARGS_COMMON=	-v -c -${COMMENT:Q}" " -d ${DESCR} -f ${PLIST}
-PKG_ARGS_COMMON+=	-l -b ${BUILD_VERSION_FILE} -B ${BUILD_INFO_FILE}
-PKG_ARGS_COMMON+=	-s ${SIZE_PKG_FILE} -S ${SIZE_ALL_FILE}
-PKG_ARGS_COMMON+=	-P "`${MAKE} ${MAKEFLAGS} run-depends-list | ${SORT} -u`"
-PKG_ARGS_COMMON+=	${INSTALL_FILE:D-i ${INSTALL_FILE}}
-PKG_ARGS_COMMON+=	${DEINSTALL_FILE:D-k ${DEINSTALL_FILE}}
-PKG_ARGS_COMMON+=	${MESSAGE:D-D ${MESSAGE}}
-PKG_ARGS_COMMON+=	${NO_MTREE:D:U-m ${MTREE_FILE}}
-PKG_ARGS_COMMON+=	${PKG_PRESERVE:D-n ${PRESERVE_FILE}}
-.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
-PKG_ARGS_COMMON+=	${CONFLICTS:D-C "${CONFLICTS}"}
-.  endif
-
-PKG_ARGS_INSTALL=	-p ${PREFIX} ${PKG_ARGS_COMMON}
-PKG_ARGS_BINPKG=	-p ${PREFIX:S/^${DESTDIR}//} -L ${PREFIX} ${PKG_ARGS_COMMON}
-
-.endif	# !_PKG_SKIPPED
-
-############################################################################
-# External bsd.pkg.mk fragments needing to perform overrides
-############################################################################
-
-.if !defined(_PKG_SKIPPED)
-
-USE_PKGINSTALL?=	NO
-.  if !empty(USE_PKGINSTALL:M[yY][eE][sS])
-.    include "../../mk/bsd.pkg.install.mk"
-.  endif
-
-.endif	# !_PKG_SKIPPED
-
-############################################################################
-# Transform package Makefile variables (overridable by external fragments)
-############################################################################
-
-.if !defined(_PKG_SKIPPED)
-
-# Set INSTALL_FILE to be the name of any INSTALL file
-.  if !defined(INSTALL_FILE) && exists(${PKGDIR}/INSTALL)
-INSTALL_FILE=		${PKGDIR}/INSTALL
-.  endif
-
-# Set DEINSTALL_FILE to be the name of any DEINSTALL file
-.  if !defined(DEINSTALL_FILE) && exists(${PKGDIR}/DEINSTALL)
-DEINSTALL_FILE=		${PKGDIR}/DEINSTALL
-.  endif
-
-# If MESSAGE hasn't been defined, then set MESSAGE_SRC to be a space-separated
-# list of files to be concatenated together to generate the MESSAGE file.
-#
-.  if !defined(MESSAGE_SRC) && !defined(MESSAGE)
-.    if exists(${PKGDIR}/MESSAGE)
-MESSAGE_SRC=		${PKGDIR}/MESSAGE
-.    else
-.      if exists(${PKGDIR}/MESSAGE.common)
-MESSAGE_SRC=		${PKGDIR}/MESSAGE.common
-.      endif
-.      if exists(${PKGDIR}/MESSAGE.${OPSYS})
-MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
-.      endif
-.      if exists(${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g})
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.${MACHINE_ARCH:C/i[3-6]86/i386/g}
-.      endif
-.      if exists(${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g})
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
-.      endif
-.    endif
-.  endif
-
-.  if defined(MESSAGE_SRC)
-MESSAGE=		${PKG_DB_TMPDIR}/+DISPLAY
-
-# Set MESSAGE_SUBST to substitute "${variable}" to "value" in MESSAGE
-MESSAGE_SUBST+=	LOCALBASE=${LOCALBASE}
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-MESSAGE_SUBST+=	PKGNAME=${PKGNAME}
-MESSAGE_SUBST+=	PREFIX=${PREFIX}
-MESSAGE_SUBST+=	QMAILDIR=${QMAILDIR} # XXXTV is this used?
-MESSAGE_SUBST+=	ROOT_GROUP=${ROOT_GROUP}
-MESSAGE_SUBST+=	ROOT_USER=${ROOT_USER}
-MESSAGE_SUBST+=	VIEWBASE=${VIEWBASE}
-MESSAGE_SUBST+=	X11BASE=${X11BASE}
-MESSAGE_SUBST+=	X11PREFIX=${X11PREFIX}
-
-MESSAGE_SUBST_SED=	${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}
-.  endif
-
-##### Config file related settings - see doc/guide
-
-PKG_SYSCONFVAR?=	${PKGBASE}
-PKG_SYSCONFSUBDIR?=	# empty
-.  if ${PKG_INSTALLATION_TYPE} == "overwrite"
-PKG_SYSCONFDEPOTBASE=	# empty
-PKG_SYSCONFBASEDIR=	${PKG_SYSCONFBASE}
-.  else
-.    if !empty(PKG_SYSCONFBASE:M${PREFIX}) || \
-        !empty(PKG_SYSCONFBASE:M${PREFIX}/*)
-PKG_SYSCONFDEPOTBASE=	# empty
-PKG_SYSCONFBASEDIR=	${PKG_SYSCONFBASE}
-.      if !empty(CONF_DEPENDS)
-_PLIST_IGNORE_FILES+=	${PKG_SYSCONFDIR:S,^${PREFIX}/,,}
-.      endif
-.    else
-PKG_SYSCONFDEPOTBASE=	${PKG_SYSCONFBASE}/${DEPOT_SUBDIR}
-PKG_SYSCONFBASEDIR=	${PKG_SYSCONFDEPOTBASE}/${PKGNAME}
-.    endif
-.  endif
-.  if empty(PKG_SYSCONFSUBDIR)
-DFLT_PKG_SYSCONFDIR:=	${PKG_SYSCONFBASEDIR}
-.  else
-DFLT_PKG_SYSCONFDIR:=	${PKG_SYSCONFBASEDIR}/${PKG_SYSCONFSUBDIR}
-.  endif
-PKG_SYSCONFDIR=		${DFLT_PKG_SYSCONFDIR}
-.  if defined(PKG_SYSCONFDIR.${PKG_SYSCONFVAR})
-PKG_SYSCONFDIR=		${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
-PKG_SYSCONFBASEDIR=	${PKG_SYSCONFDIR.${PKG_SYSCONFVAR}}
-PKG_SYSCONFDEPOTBASE=	# empty
-.  endif
-
-ALL_ENV+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-BUILD_DEFS_FIXED+=	PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
-
-.endif	# !_PKG_SKIPPED
-
-##### Checksum and other file handling support
-# not skipped by _PKG_SKIPPED
-
-ALLFILES?=	${DISTFILES} ${PATCHFILES}
-CKSUMFILES?=	${ALLFILES}
-.for __tmp__ in ${IGNOREFILES}
-CKSUMFILES:=	${CKSUMFILES:N${__tmp__}}
-.endfor
-
-# List of all files, with ${DIST_SUBDIR} in front.  Used for fetch and checksum.
-.if defined(DIST_SUBDIR)
-.  if ${CKSUMFILES} != ""
-_CKSUMFILES?=	${CKSUMFILES:S/^/${DIST_SUBDIR}\//}
-.  endif
-.  if !empty(DISTFILES)
-_DISTFILES?=	${DISTFILES:S/^/${DIST_SUBDIR}\//}
-.  else
-_DISTFILES?=	# empty
-.  endif
-.  if defined(IGNOREFILES) && !empty(IGNOREFILES)
-_IGNOREFILES?=	${IGNOREFILES:S/^/${DIST_SUBDIR}\//}
-.  endif
-.  if defined(PATCHFILES) && !empty(PATCHFILES)
-_PATCHFILES?=	${PATCHFILES:S/^/${DIST_SUBDIR}\//}
-.  else
-_PATCHFILES?=	# empty
-.  endif
-.else
-_CKSUMFILES?=	${CKSUMFILES}
-_DISTFILES?=	${DISTFILES}
-_IGNOREFILES?=	${IGNOREFILES}
-_PATCHFILES?=	${PATCHFILES}
-.endif
-_ALLFILES?=	${_DISTFILES} ${_PATCHFILES}
-
-############################################################################
-# Phase `fetch'
-############################################################################
-
-.if !empty(PKG_PHASES:Mfetch) && !defined(_PKG_SKIPPED)
-
-##### Master site selection
-
-.  include "../../mk/bsd.sites.mk"
-
-.  if defined(DIST_SUBDIR)
-_MASTER_SITE_BACKUP:=	${MASTER_SITE_BACKUP:=${DIST_SUBDIR}/}
-.    if defined(MASTER_SITE_OVERRIDE)
-_MASTER_SITE_OVERRIDE:=	${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}/}
-.    endif # MASTER_SITE_OVERRIDE
-.  else  # !DIST_SUBDIR
-_MASTER_SITE_BACKUP:=	${MASTER_SITE_BACKUP}
-.    if defined(MASTER_SITE_OVERRIDE)
-_MASTER_SITE_OVERRIDE:= ${MASTER_SITE_OVERRIDE}
-.    endif # MASTER_SITE_OVERRIDE
-.  endif # DIST_SUBDIR
-
-# Where to put distfiles that don't have any other master site
-MASTER_SITE_LOCAL?=	${MASTER_SITE_BACKUP:=LOCAL_PORTS/}
-
-##### Make subtargets for "fetch".
-
-#===> check-vulnerable:  Check for any vulnerabilities in the package
-_CHECK_VULNERABLE=							\
-	${SETENV} PKGNAME="${PKGNAME}"					\
-		  PKGBASE="${PKGBASE}"					\
-		${AWK} '/^$$/ { next }					\
-			/^\#.*/ { next }				\
-			$$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { next } \
-			{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ECHO} \"*** WARNING - %s vulnerability in %s - see %s for more information ***\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); system(s); } \
-		' < ${PKGVULNDIR}/pkg-vulnerabilities || ${ECHO} 'could not check pkg-vulnerabilities file'
-
-_REAL_TARGETS.fetch+=		check-vulnerable
-.PHONY: check-vulnerable
-check-vulnerable:
-.  if !defined(ALLOW_VULNERABLE_PACKAGES) && !exists(${extract_COOKIE})
-.    if exists(${PKGVULNDIR}/pkg-vulnerabilities)
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO_MSG} "${_PKGSRC_IN}> Checking for vulnerabilities in ${PKGNAME}"; \
-	vul=`${_CHECK_VULNERABLE}`;					\
-	case "$$vul" in							\
-	"")	;;							\
-	*)	${ECHO} "$$vul";					\
-		${ECHO} "or define ALLOW_VULNERABLE_PACKAGES if this package is absolutely essential"; \
-		${FALSE} ;;						\
-	esac
-.    else
-	@${ECHO_MSG} "${_PKGSRC_IN}> *** No ${PKGVULNDIR}/pkg-vulnerabilities file found,"
-	@${ECHO_MSG} "${_PKGSRC_IN}> *** skipping vulnerability checks. To fix, install"
-	@${ECHO_MSG} "${_PKGSRC_IN}> *** the pkgsrc/security/audit-packages package and run"
-	@${ECHO_MSG} "${_PKGSRC_IN}> *** '${LOCALBASE}/sbin/download-vulnerability-list'."
-.    endif
-.  endif
-
-#===> "pre-fetch"
-
-_REAL_TARGETS.fetch+=		pre-fetch
-.PHONY: pre-fetch
-pre-fetch: .OPTIONAL
-
-#===> "do-fetch"
-
-_REAL_TARGETS.fetch+=		do-fetch
-.PHONY: do-fetch
-#do-fetch:
-
-#===> "post-fetch"
-
-_REAL_TARGETS.fetch+=		post-fetch
-.PHONY: post-fetch
-post-fetch: .OPTIONAL
-
-.endif	# !empty(PKG_PHASES:Mfetch) && !defined(_PKG_SKIPPED)
-
-############################################################################
-# Phase `checksum'
-############################################################################
-
-# not skipped by _PKG_SKIPPED
-
-#===> uptodate-digest:  Install "digest" if needed.
-# this is also used by `patch' and `make*sum'
-.PHONY: uptodate-digest
-uptodate-digest:
-.if !empty(USE_DIGEST:M[yY][eE][sS])
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ -f ${DISTINFO_FILE} -a \( ! -f ${DIGEST} -o ${DIGEST_VERSION} -lt ${DIGEST_REQD} \) ]; then \
-		{ cd ${PKGSRCDIR}/pkgtools/digest;			\
-		${MAKE} clean;						\
-		if [ -f ${DIGEST} ]; then				\
-			${MAKE} ${MAKEFLAGS} deinstall;			\
-		fi;							\
-		${MAKE} ${MAKEFLAGS} test;				\
-		if [ -f ${DIGEST} ]; then				\
-			${MAKE} ${MAKEFLAGS} deinstall;			\
-		fi;							\
-		${MAKE} ${MAKEFLAGS} ${DEPENDS_TARGET};			\
-		${MAKE} ${MAKEFLAGS} clean; } 				\
-	fi
-.endif
-
-.if !empty(PKG_PHASES:Mchecksum) && !defined(_PKG_SKIPPED)
-
-#===> do-checksum
-
-_REAL_TARGETS.checksum+=	do-checksum
-.PHONY: do-checksum
-do-checksum: .OPTIONAL
-.  if !defined(NO_CHECKSUM) && !exists(${extract_COOKIE})
-do-checksum: uptodate-digest
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ ! -f ${DISTINFO_FILE} ]; then				\
-		${ECHO_MSG} "=> No checksum file.";			\
-	else								\
-		(cd ${DISTDIR}; OK="true"; missing=""; 			\
-		  for file in "" ${_CKSUMFILES}; do			\
-		  	if [ "X$$file" = X"" ]; then continue; fi; 	\
-			filesummed=false;				\
-			for a in ${DIGEST_ALGORITHMS}; do		\
-				CKSUM2=`${AWK} 'NF == 4 && $$1 == "'$$a'" && $$2 == "('$$file')" && $$3 == "=" {print $$4;}' ${DISTINFO_FILE}`; \
-				case "$${CKSUM2}" in			\
-				"")	${ECHO_MSG} "=> No $$a checksum re