svn commit: r248339 - in stable/9: . etc/mtree share/mk usr.bin/man

[Brooks Davis]

Author: brooks
Date: Fri Mar 15 19:50:21 2013
New Revision: 248339
URL: http://svnweb.freebsd.org/changeset/base/248339

Log:
  MFC r245513,245514,245515:
  
  The last section 1aout manpage was installed no later than July 2002.
  Remove all support for them.

Modified:
  stable/9/ObsoleteFiles.inc   (contents, props changed)
  stable/9/etc/mtree/BSD.usr.dist
  stable/9/share/mk/bsd.man.mk
  stable/9/share/mk/bsd.prog.mk
  stable/9/usr.bin/man/man.1
  stable/9/usr.bin/man/man.sh
Directory Properties:
  stable/9/etc/mtree/   (props changed)
  stable/9/share/mk/   (props changed)
  stable/9/usr.bin/man/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/ObsoleteFiles.inc	Fri Mar 15 19:50:21 2013	(r248339)
@@ -38,6 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130315: removed long unused directories for .1aout section manpages
+OLD_FILES+=usr/share/man/en.ISO8859-1/man1aout
+OLD_FILES+=usr/share/man/en.UTF-8/man1aout
+OLD_DIRS+=usr/share/man/man1aout
+OLD_DIRS+=usr/share/man/cat1aout
+OLD_DIRS+=usr/share/man/en.ISO8859-1/cat1aout
+OLD_DIRS+=usr/share/man/en.UTF-8/cat1aout
 # 20121230: remove wrongly created directories for auditdistd
 OLD_DIRS+=var/dist
 OLD_DIRS+=var/remote

Modified: stable/9/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/9/etc/mtree/BSD.usr.dist	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/etc/mtree/BSD.usr.dist	Fri Mar 15 19:50:21 2013	(r248339)
@@ -752,8 +752,6 @@
 /set uname=man
             cat1
             ..
-            cat1aout
-            ..
             cat2
             ..
             cat3
@@ -791,8 +789,6 @@
             en.ISO8859-1    uname=root
                 cat1
                 ..
-                cat1aout
-                ..
                 cat2
                 ..
                 cat3
@@ -831,8 +827,6 @@
             en.UTF-8        uname=root
                 cat1
                 ..
-                cat1aout
-                ..
                 cat2
                 ..
                 cat3
@@ -909,8 +903,6 @@
             ..
             man1
             ..
-            man1aout
-            ..
             man2
             ..
             man3

Modified: stable/9/share/mk/bsd.man.mk
==============================================================================
--- stable/9/share/mk/bsd.man.mk	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/share/mk/bsd.man.mk	Fri Mar 15 19:50:21 2013	(r248339)
@@ -62,7 +62,7 @@ MROFF_CMD?=	groff -Tascii -mtty-char -ma
 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.

Modified: stable/9/share/mk/bsd.prog.mk
==============================================================================
--- stable/9/share/mk/bsd.prog.mk	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/share/mk/bsd.prog.mk	Fri Mar 15 19:50:21 2013	(r248339)
@@ -95,8 +95,7 @@ ${PROG}: ${OBJS}
 .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

Modified: stable/9/usr.bin/man/man.1
==============================================================================
--- stable/9/usr.bin/man/man.1	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/usr.bin/man/man.1	Fri Mar 15 19:50:21 2013	(r248339)
@@ -84,7 +84,7 @@ environment variable.
 .It Fl S Ar mansect
 Restricts manual sections searched to the specified colon delimited list.
 Defaults to
-.Dq Li 1:1aout:8:2:3:n:4:5:6:7:9:l .
+.Dq Li 1:8:2:3:n:4:5:6:7:9:l .
 Overrides the
 .Ev MANSECT
 environment variable.

Modified: stable/9/usr.bin/man/man.sh
==============================================================================
--- stable/9/usr.bin/man/man.sh	Fri Mar 15 19:32:37 2013	(r248338)
+++ stable/9/usr.bin/man/man.sh	Fri Mar 15 19:50:21 2013	(r248339)
@@ -945,7 +945,7 @@ STTY=/bin/stty
 SYSCTL=/sbin/sysctl
 
 debug=0
-man_default_sections='1:1aout:8:2:3:n:4:5:6:7:9:l'
+man_default_sections='1:8:2:3:n:4:5:6:7:9:l'
 man_default_path='/usr/share/man:/usr/share/openssl/man:/usr/local/man'
 cattool='/usr/bin/zcat -f'