svn commit: r215669 - head

[Alexander Leidinger]

Author: netchild
Date: Mon Nov 22 09:37:52 2010
New Revision: 215669
URL: http://svn.freebsd.org/changeset/base/215669

Log:
  1) Add a hint to check for duplicates with optional files. The committed
     text is a little bit modified to what was submitted.
     The code example to automate a part of this was proposed by
     Dmitry Morozovsky.
  2) Remove trailing whitespace.
  
  Submitted by:	arundel

Modified:
  head/ObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Nov 22 09:34:38 2010	(r215668)
+++ head/ObsoleteFiles.inc	Mon Nov 22 09:37:52 2010	(r215669)
@@ -13,6 +13,15 @@
 #
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
+# Before you commit changes to this file please check if any entries in
+# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following
+# command tells which files are listed more than once regardless of some
+# architecture specific conditionals, so you can not blindly trust the
+# output:
+# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \
+# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \
+# sort | uniq -d
+#
 
 # 20101112: vgonel(9) has gone to private API a while ago
 OLD_FILES+=usr/share/man/man9/vgonel.9.gz
@@ -1634,7 +1643,7 @@ OLD_DIRS+=usr/include/c++/3.4
 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_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)