svn commit: r365305 - in head: . tools/build/mk

[Dimitry Andric]

Author: dim
Date: Thu Sep  3 18:21:58 2020
New Revision: 365305
URL: https://svnweb.freebsd.org/changeset/base/365305

Log:
  Ensure zpool-features(5) doesn't get removed by make delete-old.
  
  Apparently, somewhere in 2012 ZFS-on-FreeBSD moved it from section 5 to
  7, but ZFS-on-Linux never did.

Modified:
  head/ObsoleteFiles.inc
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Thu Sep  3 17:07:58 2020	(r365304)
+++ head/ObsoleteFiles.inc	Thu Sep  3 18:21:58 2020	(r365305)
@@ -7605,8 +7605,6 @@ OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote
-# 20121114: zpool-features manual page moved from section 5 to 7
-OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 # 20121022: remove harp, hfa and idt man page
 OLD_FILES+=usr/share/man/man4/harp.4.gz
 OLD_FILES+=usr/share/man/man4/hfa.4.gz

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Sep  3 17:07:58 2020	(r365304)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Thu Sep  3 18:21:58 2020	(r365305)
@@ -1173,7 +1173,7 @@ OLD_FILES+=usr/sbin/zfsd
 OLD_FILES+=usr/sbin/zhack
 OLD_FILES+=usr/sbin/zdb
 OLD_FILES+=usr/share/man/man3/libbe.3.gz
-OLD_FILES+=usr/share/man/man7/zpool-features.7.gz
+OLD_FILES+=usr/share/man/man5/zpool-features.5.gz
 OLD_FILES+=usr/share/man/man8/bectl.8.gz
 OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz
 OLD_FILES+=usr/share/man/man8/zdb.8.gz