kern/146439: [patch] remove share/man/man1aout

[Alex Kozlov]

The following reply was made to PR kern/146439; it has been noted by GNATS.

From: Alex Kozlov <spam at rm-rf.kiev.ua>
To: bug-followup at FreeBSD.org, spam at rm-rf.kiev.ua
Cc:  
Subject: Re: kern/146439: [patch] remove share/man/man1aout
Date: Sun, 9 May 2010 23:03:51 +0300

 --fUYQa+Pmc3FrFX/N
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Hi
 
 Updated patch.
 
 
 --fUYQa+Pmc3FrFX/N
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="patch.txt"
 
 Index: src/ObsoleteFiles.inc
 @@ -14,6 +14,11 @@
  # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
  #
  
 +# 2010XXXX: man1aout removal
 +OLD_DIRS+=usr/share/man/cat1aout
 +OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
 +OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 +OLD_DIRS+=usr/share/man/man1aout
  # 20100416: [mips] removed <machine/psl.h>
  .if ${TARGET_ARCH} == "mips"
  OLD_FILES+=usr/include/machine/psl.h
 @@ -14,6 +14,8 @@
  # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
  #
 Index: src/etc/mtree/BSD.usr.dist
 @@ -692,8 +692,6 @@
  /set uname=man
              cat1
              ..
 -            cat1aout
 -            ..
              cat2
              ..
              cat3
 @@ -731,8 +729,6 @@
              en.ISO8859-1    uname=root
                  cat1
                  ..
 -                cat1aout
 -                ..
                  cat2
                  ..
                  cat3
 @@ -771,8 +767,6 @@
              en.UTF-8        uname=root
                  cat1
                  ..
 -                cat1aout
 -                ..
                  cat2
                  ..
                  cat3
 @@ -849,8 +843,6 @@
              ..
              man1
              ..
 -            man1aout
 -            ..
              man2
              ..
              man3
 Index: src/share/mk/bsd.man.mk
 @@ -62,7 +62,7 @@
  MCOMPRESS_CMD?=	${COMPRESS_CMD}
  MCOMPRESS_EXT?=	${COMPRESS_EXT}
  
 -SECTIONS=	1 1aout 2 3 4 5 6 7 8 9
 +SECTIONS=	1 2 3 4 5 6 7 8 9
  .SUFFIXES:	${SECTIONS:S/^/./g}
  
  # Backwards compatibility.
 Index: src/share/mk/bsd.prog.mk
 @@ -98,8 +98,7 @@
  .if	${MK_MAN} != "no" && !defined(MAN) && \
  	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
  	!defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \
 -	!defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \
 -	!defined(MAN1aout)
 +	!defined(MAN7) && !defined(MAN8) && !defined(MAN9)
  MAN=	${PROG}.1
  MAN1=	${MAN}
  .endif
 
 --fUYQa+Pmc3FrFX/N--