svn commit: r289946 - in stable/9: . etc/mtree

[Garrett Cooper]

Author: ngie
Date: Sun Oct 25 22:05:26 2015
New Revision: 289946
URL: https://svnweb.freebsd.org/changeset/base/289946

Log:
  MFstable/10 r286637 (made some minor adjustments due to other commits not MFCed):
  
  r286637 (by garga):
  
  MFC r257077:
  
  Cleanup empty directories
  
  PR:		167133
  Approved by:	loos
  Sponsored by:	Netgate

Modified:
  stable/9/ObsoleteFiles.inc
  stable/9/etc/mtree/BSD.usr.dist
Directory Properties:
  stable/9/   (props changed)
  stable/9/etc/   (props changed)
  stable/9/etc/mtree/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Sun Oct 25 22:00:56 2015	(r289945)
+++ stable/9/ObsoleteFiles.inc	Sun Oct 25 22:05:26 2015	(r289946)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131023: remove never used iscsi directory
+OLD_DIRS+=usr/share/examples/iscsi
 # 20151023: unused sgsmsg utility is removed
 OLD_FILES+=usr/bin/sgsmsg
 # 20140922: sleepq_calc_signal_retval.9 and sleepq_catch_signals.9 removed
@@ -2011,6 +2013,7 @@ OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
+OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)

Modified: stable/9/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/9/etc/mtree/BSD.usr.dist	Sun Oct 25 22:00:56 2015	(r289945)
+++ stable/9/etc/mtree/BSD.usr.dist	Sun Oct 25 22:05:26 2015	(r289946)
@@ -333,8 +333,6 @@
             ..
             ipfw
             ..
-            iscsi
-            ..
             jails
             ..
             kld
@@ -366,8 +364,6 @@
             mdoc
             ..
             netgraph
-                bluetooth
-                ..
             ..
             nwclient
             ..