svn commit: r279529 - in head: . etc/mtree gnu/usr.bin/binutils/doc tools/build/mk

[Baptiste Daroussin]

Author: bapt
Date: Mon Mar  2 17:24:04 2015
New Revision: 279529
URL: https://svnweb.freebsd.org/changeset/base/279529

Log:
  Install manpage version of texinfo documentation for binutils

Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/gnu/usr.bin/binutils/doc/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Mar  2 17:20:34 2015	(r279528)
+++ head/ObsoleteFiles.inc	Mon Mar  2 17:24:04 2015	(r279529)
@@ -38,6 +38,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150302: binutils documentation distributed as a manpage
+OLD_FILES+=usr/share/doc/binutils/as.txt
+OLD_FILES+=usr/share/doc/binutils/ld.txt
+OLD_DIRS+=usr/share/doc/binutils
 # 20150222: Removed bcd(6) and ppt(6)
 OLD_FILES+=usr/bin/bcd
 OLD_FILES+=usr/bin/ppt

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Mon Mar  2 17:20:34 2015	(r279528)
+++ head/etc/mtree/BSD.usr.dist	Mon Mar  2 17:24:04 2015	(r279529)
@@ -181,8 +181,6 @@
             ..
             atm
             ..
-            binutils
-            ..
             legal
                 intel_ipw
                 ..

Modified: head/gnu/usr.bin/binutils/doc/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/doc/Makefile	Mon Mar  2 17:20:34 2015	(r279528)
+++ head/gnu/usr.bin/binutils/doc/Makefile	Mon Mar  2 17:24:04 2015	(r279529)
@@ -2,11 +2,10 @@
 
 .include "../Makefile.inc0"
 
-.PATH: ${SRCDIR}/gas/doc ${SRCDIR}/ld
+.PATH: ${SRCDIR}/gas/doc \
+	${SRCDIR}/ld \
+	${SRCDIR}/binutils/doc
 
-FILESGROUPS=	TOP
-
-TOPDIR=	${SHAREDIR}/doc/binutils
-TOP=	as.txt ld.txt
+MAN=	ld.7 ldint.7 as.7 binutils.7
 
 .include <bsd.prog.mk>

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Mar  2 17:20:34 2015	(r279528)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Mar  2 17:24:04 2015	(r279529)
@@ -200,13 +200,15 @@ OLD_FILES+=usr/libdata/ldscripts/elf_x86
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
 OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
-OLD_FILES+=usr/share/doc/binutils/as.txt
-OLD_FILES+=usr/share/doc/binutils/ld.txt
 OLD_FILES+=usr/share/man/man1/as.1.gz
 OLD_FILES+=usr/share/man/man1/ld.1.gz
 OLD_FILES+=usr/share/man/man1/objcopy.1.gz
 OLD_FILES+=usr/share/man/man1/objdump.1.gz
 OLD_FILES+=usr/share/man/man1/readelf.1.gz
+OLD_FILES+=usr/share/man/man7/as.7.gz
+OLD_FILES+=usr/share/man/man7/ld.7.gz
+OLD_FILES+=usr/share/man/man7/ldint.7.gz
+OLD_FILES+=usr/share/man/man7/binutils.7.gz
 .endif
 
 .if ${MK_BLUETOOTH} == no