Use /etc/mtree/BSD.x11-4.dist as mtree file and remove all corresponding

'@dirrm ...' in plists.

4 files changed, 1 insertions, 497 deletions

diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 70886f951377..11d5a00a00f9 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -24,6 +24,7 @@ INSTALL_TARGET=	install install.man
 DIST_SUBDIR=	xc
 PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
 SCRIPTS_ENV=	OSVERSION=${OSVERSION}
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 .ifdef DISTRIB
 DESTDIR=	${WRKDIR}/distrib
 MAKE_ENV+=	DESTDIR=${DESTDIR}
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index fa505b8bbc54..420a7fac15b9 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -4445,172 +4445,6 @@ man/man7/XConsortium.7.gz
 man/man7/XProjectTeam.7.gz
 man/man7/XStandards.7.gz
 man/man7/Xsecurity.7.gz
-@dirrm bin
-@dirrm etc/rc.d
-@dirrm etc
-@dirrm include/DPS
-@dirrm include/GL
-@dirrm include/X11/ICE
-@dirrm include/X11/PEX5
-@dirrm include/X11/PM
-@dirrm include/X11/SM
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xmu
-@dirrm include/X11/bitmaps
-@dirrm include/X11/extensions
-@dirrm include/X11/fonts/codeconv
-@dirrm include/X11/fonts
-@dirrm include/X11/pixmaps
-@dirrm include/X11
-@dirrm include/bitmaps
-@dirrm include
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup
-@dirrm lib/X11/config
-@dirrm lib/X11/doc/html
-@dirrm lib/X11/doc
-@dirrm lib/X11/etc
-@dirrm lib/X11/fonts/100dpi
-@dirrm lib/X11/fonts/75dpi
-@dirrm lib/X11/fonts/CID
-@dirrm lib/X11/fonts/PEX
-@dirrm lib/X11/fonts/Speedo
-@dirrm lib/X11/fonts/Type1
-@dirrm lib/X11/fonts/cyrillic
-@dirrm lib/X11/fonts/encodings/large
-@dirrm lib/X11/fonts/encodings
-@dirrm lib/X11/fonts/latin2/100dpi
-@dirrm lib/X11/fonts/latin2/75dpi
-@dirrm lib/X11/fonts/latin2
-@dirrm lib/X11/fonts/local
-@dirrm lib/X11/fonts/misc
-@dirrm lib/X11/fonts
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/en_US.utf
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/tbl_data
-@dirrm lib/X11/locale/th_TH.TACTIS
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.Big5
-@dirrm lib/X11/locale
-@dirrm lib/X11/x11perfcomp
-@dirrm lib/X11/xkb/compat
-@dirrm lib/X11/xkb/compiled
-@dirrm lib/X11/xkb/geometry/digital
-@dirrm lib/X11/xkb/geometry/sgi
-@dirrm lib/X11/xkb/geometry
-@dirrm lib/X11/xkb/keycodes/digital
-@dirrm lib/X11/xkb/keycodes/sgi
-@dirrm lib/X11/xkb/keycodes
-@dirrm lib/X11/xkb/keymap/digital
-@dirrm lib/X11/xkb/keymap/sgi
-@dirrm lib/X11/xkb/keymap/sun
-@dirrm lib/X11/xkb/keymap
-@dirrm lib/X11/xkb/rules
-@dirrm lib/X11/xkb/semantics
-@dirrm lib/X11/xkb/symbols/digital
-@dirrm lib/X11/xkb/symbols/fujitsu
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/nec
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/sony
-@dirrm lib/X11/xkb/symbols/sun
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb
-@dirrm lib/X11
-@dirrm lib/aout
-@dirrm lib/modules/codeconv
-@dirrm lib/modules/dri
-@dirrm lib/modules/drivers
-@dirrm lib/modules/extensions
-@dirrm lib/modules/fonts
-@dirrm lib/modules/input
-@dirrm lib/modules/freebsd
-@dirrm lib/modules
-@dirrm lib
-@dirrm libexec
-@dirrm man/cat1
-@dirrm man/cat2
-@dirrm man/cat3
-@dirrm man/cat4
-@dirrm man/cat5
-@dirrm man/cat6
-@dirrm man/cat7
-@dirrm man/cat8
-@dirrm man/cat9
-@dirrm man/catl
-@dirrm man/catn
-@dirrm man/ja/cat1
-@dirrm man/ja/cat2
-@dirrm man/ja/cat3
-@dirrm man/ja/cat4
-@dirrm man/ja/cat5
-@dirrm man/ja/cat6
-@dirrm man/ja/cat7
-@dirrm man/ja/cat8
-@dirrm man/ja/cat9
-@dirrm man/ja/catl
-@dirrm man/ja/catn
-@dirrm man/ja/man1
-@dirrm man/ja/man2
-@dirrm man/ja/man3
-@dirrm man/ja/man4
-@dirrm man/ja/man5
-@dirrm man/ja/man6
-@dirrm man/ja/man7
-@dirrm man/ja/man8
-@dirrm man/ja/man9
-@dirrm man/ja/manl
-@dirrm man/ja/mann
-@dirrm man/ja
-@dirrm man/man1
-@dirrm man/man2
-@dirrm man/man3
-@dirrm man/man4
-@dirrm man/man5
-@dirrm man/man6
-@dirrm man/man7
-@dirrm man/man8
-@dirrm man/man9
-@dirrm man/manl
-@dirrm man/mann
-@dirrm man
-@dirrm share/aclocal
-@dirrm share/doc/ja
-@dirrm share/doc
-@dirrm share/examples
-@dirrm share
 @cwd /etc
 X11/app-defaults/Beforelight
 X11/app-defaults/Bitmap
diff --git a/x11/XFree86-4/pkg-plist.alpha b/x11/XFree86-4/pkg-plist.alpha
index 5fe27e2d13cb..7afe820ae6bd 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -4439,171 +4439,6 @@ man/man7/XConsortium.7.gz
 man/man7/XProjectTeam.7.gz
 man/man7/XStandards.7.gz
 man/man7/Xsecurity.7.gz
-@dirrm bin
-@dirrm etc/rc.d
-@dirrm etc
-@dirrm include/DPS
-@dirrm include/GL
-@dirrm include/X11/ICE
-@dirrm include/X11/PEX5
-@dirrm include/X11/PM
-@dirrm include/X11/SM
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xmu
-@dirrm include/X11/bitmaps
-@dirrm include/X11/extensions
-@dirrm include/X11/fonts/codeconv
-@dirrm include/X11/fonts
-@dirrm include/X11/pixmaps
-@dirrm include/X11
-@dirrm include/bitmaps
-@dirrm include
-@dirrm info
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup
-@dirrm lib/X11/config
-@dirrm lib/X11/doc/html
-@dirrm lib/X11/doc
-@dirrm lib/X11/etc
-@dirrm lib/X11/fonts/100dpi
-@dirrm lib/X11/fonts/75dpi
-@dirrm lib/X11/fonts/CID
-@dirrm lib/X11/fonts/PEX
-@dirrm lib/X11/fonts/Speedo
-@dirrm lib/X11/fonts/Type1
-@dirrm lib/X11/fonts/cyrillic
-@dirrm lib/X11/fonts/encodings/large
-@dirrm lib/X11/fonts/encodings
-@dirrm lib/X11/fonts/latin2/100dpi
-@dirrm lib/X11/fonts/latin2/75dpi
-@dirrm lib/X11/fonts/latin2
-@dirrm lib/X11/fonts/local
-@dirrm lib/X11/fonts/misc
-@dirrm lib/X11/fonts
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/en_US.utf
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/tbl_data
-@dirrm lib/X11/locale/th_TH.TACTIS
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.Big5
-@dirrm lib/X11/locale
-@dirrm lib/X11/x11perfcomp
-@dirrm lib/X11/xkb/compat
-@dirrm lib/X11/xkb/geometry/digital
-@dirrm lib/X11/xkb/geometry/sgi
-@dirrm lib/X11/xkb/geometry
-@dirrm lib/X11/xkb/keycodes/digital
-@dirrm lib/X11/xkb/keycodes/sgi
-@dirrm lib/X11/xkb/keycodes
-@dirrm lib/X11/xkb/keymap/digital
-@dirrm lib/X11/xkb/keymap/sgi
-@dirrm lib/X11/xkb/keymap/sun
-@dirrm lib/X11/xkb/keymap
-@dirrm lib/X11/xkb/rules
-@dirrm lib/X11/xkb/semantics
-@dirrm lib/X11/xkb/symbols/digital
-@dirrm lib/X11/xkb/symbols/fujitsu
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/nec
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/sony
-@dirrm lib/X11/xkb/symbols/sun
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb
-@dirrm lib/X11
-@dirrm lib/aout
-@dirrm lib/modules/codeconv
-@dirrm lib/modules/dri
-@dirrm lib/modules/drivers
-@dirrm lib/modules/extensions
-@dirrm lib/modules/fonts
-@dirrm lib/modules/input
-@dirrm lib/modules/freebsd
-@dirrm lib/modules
-@dirrm lib
-@dirrm libexec
-@dirrm man/cat1
-@dirrm man/cat2
-@dirrm man/cat3
-@dirrm man/cat4
-@dirrm man/cat5
-@dirrm man/cat6
-@dirrm man/cat7
-@dirrm man/cat8
-@dirrm man/cat9
-@dirrm man/catl
-@dirrm man/catn
-@dirrm man/ja/cat1
-@dirrm man/ja/cat2
-@dirrm man/ja/cat3
-@dirrm man/ja/cat4
-@dirrm man/ja/cat5
-@dirrm man/ja/cat6
-@dirrm man/ja/cat7
-@dirrm man/ja/cat8
-@dirrm man/ja/cat9
-@dirrm man/ja/catl
-@dirrm man/ja/catn
-@dirrm man/ja/man1
-@dirrm man/ja/man2
-@dirrm man/ja/man3
-@dirrm man/ja/man4
-@dirrm man/ja/man5
-@dirrm man/ja/man6
-@dirrm man/ja/man7
-@dirrm man/ja/man8
-@dirrm man/ja/man9
-@dirrm man/ja/manl
-@dirrm man/ja/mann
-@dirrm man/ja
-@dirrm man/man1
-@dirrm man/man2
-@dirrm man/man3
-@dirrm man/man4
-@dirrm man/man5
-@dirrm man/man6
-@dirrm man/man7
-@dirrm man/man8
-@dirrm man/man9
-@dirrm man/manl
-@dirrm man/mann
-@dirrm man
-@dirrm share/aclocal
-@dirrm share/doc
-@dirrm share/examples
-@dirrm share
 @cwd /etc
 X11/app-defaults/Beforelight
 X11/app-defaults/Bitmap
diff --git a/x11/XFree86-4/pkg-plist.pc98 b/x11/XFree86-4/pkg-plist.pc98
index fa505b8bbc54..420a7fac15b9 100644
--- a/x11/XFree86-4/pkg-plist.pc98
+++ b/x11/XFree86-4/pkg-plist.pc98
@@ -4445,172 +4445,6 @@ man/man7/XConsortium.7.gz
 man/man7/XProjectTeam.7.gz
 man/man7/XStandards.7.gz
 man/man7/Xsecurity.7.gz
-@dirrm bin
-@dirrm etc/rc.d
-@dirrm etc
-@dirrm include/DPS
-@dirrm include/GL
-@dirrm include/X11/ICE
-@dirrm include/X11/PEX5
-@dirrm include/X11/PM
-@dirrm include/X11/SM
-@dirrm include/X11/Xaw
-@dirrm include/X11/Xmu
-@dirrm include/X11/bitmaps
-@dirrm include/X11/extensions
-@dirrm include/X11/fonts/codeconv
-@dirrm include/X11/fonts
-@dirrm include/X11/pixmaps
-@dirrm include/X11
-@dirrm include/bitmaps
-@dirrm include
-@dirrm lib/X11/XF86Setup/pics
-@dirrm lib/X11/XF86Setup/scripts
-@dirrm lib/X11/XF86Setup/tcllib
-@dirrm lib/X11/XF86Setup
-@dirrm lib/X11/config
-@dirrm lib/X11/doc/html
-@dirrm lib/X11/doc
-@dirrm lib/X11/etc
-@dirrm lib/X11/fonts/100dpi
-@dirrm lib/X11/fonts/75dpi
-@dirrm lib/X11/fonts/CID
-@dirrm lib/X11/fonts/PEX
-@dirrm lib/X11/fonts/Speedo
-@dirrm lib/X11/fonts/Type1
-@dirrm lib/X11/fonts/cyrillic
-@dirrm lib/X11/fonts/encodings/large
-@dirrm lib/X11/fonts/encodings
-@dirrm lib/X11/fonts/latin2/100dpi
-@dirrm lib/X11/fonts/latin2/75dpi
-@dirrm lib/X11/fonts/latin2
-@dirrm lib/X11/fonts/local
-@dirrm lib/X11/fonts/misc
-@dirrm lib/X11/fonts
-@dirrm lib/X11/locale/C
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/en_US.utf
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iso8859-1
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/iso8859-2
-@dirrm lib/X11/locale/iso8859-3
-@dirrm lib/X11/locale/iso8859-4
-@dirrm lib/X11/locale/iso8859-5
-@dirrm lib/X11/locale/iso8859-6
-@dirrm lib/X11/locale/iso8859-7
-@dirrm lib/X11/locale/iso8859-8
-@dirrm lib/X11/locale/iso8859-9
-@dirrm lib/X11/locale/ja
-@dirrm lib/X11/locale/ja.JIS
-@dirrm lib/X11/locale/ja.SJIS
-@dirrm lib/X11/locale/ko
-@dirrm lib/X11/locale/koi8-r
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/tbl_data
-@dirrm lib/X11/locale/th_TH.TACTIS
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/X11/locale/zh
-@dirrm lib/X11/locale/zh_TW
-@dirrm lib/X11/locale/zh_TW.Big5
-@dirrm lib/X11/locale
-@dirrm lib/X11/x11perfcomp
-@dirrm lib/X11/xkb/compat
-@dirrm lib/X11/xkb/compiled
-@dirrm lib/X11/xkb/geometry/digital
-@dirrm lib/X11/xkb/geometry/sgi
-@dirrm lib/X11/xkb/geometry
-@dirrm lib/X11/xkb/keycodes/digital
-@dirrm lib/X11/xkb/keycodes/sgi
-@dirrm lib/X11/xkb/keycodes
-@dirrm lib/X11/xkb/keymap/digital
-@dirrm lib/X11/xkb/keymap/sgi
-@dirrm lib/X11/xkb/keymap/sun
-@dirrm lib/X11/xkb/keymap
-@dirrm lib/X11/xkb/rules
-@dirrm lib/X11/xkb/semantics
-@dirrm lib/X11/xkb/symbols/digital
-@dirrm lib/X11/xkb/symbols/fujitsu
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/nec
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/sony
-@dirrm lib/X11/xkb/symbols/sun
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb
-@dirrm lib/X11
-@dirrm lib/aout
-@dirrm lib/modules/codeconv
-@dirrm lib/modules/dri
-@dirrm lib/modules/drivers
-@dirrm lib/modules/extensions
-@dirrm lib/modules/fonts
-@dirrm lib/modules/input
-@dirrm lib/modules/freebsd
-@dirrm lib/modules
-@dirrm lib
-@dirrm libexec
-@dirrm man/cat1
-@dirrm man/cat2
-@dirrm man/cat3
-@dirrm man/cat4
-@dirrm man/cat5
-@dirrm man/cat6
-@dirrm man/cat7
-@dirrm man/cat8
-@dirrm man/cat9
-@dirrm man/catl
-@dirrm man/catn
-@dirrm man/ja/cat1
-@dirrm man/ja/cat2
-@dirrm man/ja/cat3
-@dirrm man/ja/cat4
-@dirrm man/ja/cat5
-@dirrm man/ja/cat6
-@dirrm man/ja/cat7
-@dirrm man/ja/cat8
-@dirrm man/ja/cat9
-@dirrm man/ja/catl
-@dirrm man/ja/catn
-@dirrm man/ja/man1
-@dirrm man/ja/man2
-@dirrm man/ja/man3
-@dirrm man/ja/man4
-@dirrm man/ja/man5
-@dirrm man/ja/man6
-@dirrm man/ja/man7
-@dirrm man/ja/man8
-@dirrm man/ja/man9
-@dirrm man/ja/manl
-@dirrm man/ja/mann
-@dirrm man/ja
-@dirrm man/man1
-@dirrm man/man2
-@dirrm man/man3
-@dirrm man/man4
-@dirrm man/man5
-@dirrm man/man6
-@dirrm man/man7
-@dirrm man/man8
-@dirrm man/man9
-@dirrm man/manl
-@dirrm man/mann
-@dirrm man
-@dirrm share/aclocal
-@dirrm share/doc/ja
-@dirrm share/doc
-@dirrm share/examples
-@dirrm share
 @cwd /etc
 X11/app-defaults/Beforelight
 X11/app-defaults/Bitmap