From 9fcf053b76f7aef007a9f9898df433c8bc880b32 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 25 Apr 2010 01:43:22 +0200 Subject: [PATCH] Remove /usr/include/kadm5 and sort etc/mtree/BSD.include.dist. --- Makefile_upgrade.inc | 1 + etc/mtree/BSD.include.dist | 180 ++++++++++++++++++------------------- 2 files changed, 90 insertions(+), 91 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index d32c7d8f8a..379317f5d3 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1212,6 +1212,7 @@ TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_onoe.4.gz TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_onoe.4.gz TO_REMOVE+=/usr/share/man/cat4/wlan_ratectl_sample.4.gz TO_REMOVE+=/usr/share/man/man4/wlan_ratectl_sample.4.gz +TO_REMOVE+=/usr/include/kadm5 # XXX Remove when adjusted to the new 802.11 framework TO_REMOVE+=/boot/modules/if_acx.ko diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 20654363ec..1380d757cb 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -24,6 +24,36 @@ isa .. .. + c++ + 4.1 + backward + .. + bits + .. + debug + .. + ext + .. + tr1 + .. + .. + 4.4 + backward + .. + bits + .. + debug + .. + ext + .. + tr1 + .. + tr1_impl + .. + .. + .. + cpu + .. crypto .. dev @@ -56,97 +86,13 @@ .. .. .. - netproto - 802_11 - .. - atalk - .. - atm - ipatm - .. - sigpvc - .. - spans - .. - uni - .. - .. - ipsec - .. - ipx - .. - key - .. - mpls - .. - natm - .. - ncp - .. - ns - .. - smb - .. - .. emulation posix4 .. linux .. .. - vfs - hammer - .. - msdosfs - .. - nfs - .. - ntfs - .. - nwfs - .. - udf - .. - ufs - .. - mfs - .. - smbfs - .. - isofs - cd9660 - .. - .. - .. - c++ - 4.1 - backward - .. - bits - .. - debug - .. - ext - .. - tr1 - .. - .. - 4.4 - backward - .. - bits - .. - debug - .. - ext - .. - tr1 - .. - tr1_impl - .. - .. - .. - cpu + i4b_machine .. isc .. @@ -156,8 +102,6 @@ pc .. .. - i4b_machine - .. net altq .. @@ -192,6 +136,8 @@ .. .. .. + netbt + .. netgraph UI .. @@ -246,14 +192,42 @@ vjc .. .. - kadm5 - .. - netbt - .. netinet .. netinet6 .. + netproto + 802_11 + .. + atalk + .. + atm + ipatm + .. + sigpvc + .. + spans + .. + uni + .. + .. + ipsec + .. + ipx + .. + key + .. + mpls + .. + natm + .. + ncp + .. + ns + .. + smb + .. + .. objc .. openssl @@ -272,6 +246,30 @@ .. sys .. + vfs + hammer + .. + msdosfs + .. + nfs + .. + ntfs + .. + nwfs + .. + udf + .. + ufs + .. + mfs + .. + smbfs + .. + isofs + cd9660 + .. + .. + .. vm .. .. -- 2.41.0