Author: bapt
Date: Fri Jan  2 18:45:03 2015
New Revision: 276551
URL: https://svnweb.freebsd.org/changeset/base/276551

Log:
  Remove GNU texinfo from base along with all info pages.
  
  To be able to info pages consider installing texinfo from ports print/texinfo 
or
  via pkg: pkg install texinfo
  
  Differential Revision:        https://reviews.freebsd.org/D1409
  Reviewed by:  emaste, imp (previous version)
  Relnotes:     yes

Deleted:
  head/contrib/texinfo/
  head/gnu/usr.bin/binutils/doc/
  head/gnu/usr.bin/cc/doc/
  head/gnu/usr.bin/gdb/doc/
  head/gnu/usr.bin/grep/doc/
  head/gnu/usr.bin/groff/doc/
  head/gnu/usr.bin/texinfo/
  head/kerberos5/doc/
  head/lib/libcom_err/doc/
  head/tools/build/options/WITH_INFO
  head/usr.sbin/amd/doc/
Modified:
  head/Makefile.inc1
  head/ObsoleteFiles.inc
  head/UPDATING
  head/gnu/usr.bin/Makefile
  head/gnu/usr.bin/binutils/Makefile
  head/gnu/usr.bin/cc/Makefile
  head/gnu/usr.bin/gdb/Makefile
  head/gnu/usr.bin/grep/Makefile
  head/gnu/usr.bin/groff/Makefile
  head/kerberos5/Makefile
  head/lib/libcom_err/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/amd/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Fri Jan  2 18:36:08 2015        (r276550)
+++ head/Makefile.inc1  Fri Jan  2 18:45:03 2015        (r276551)
@@ -260,7 +260,7 @@ BMAKE=              MAKEOBJDIRPREFIX=${WORLDTMP} \
                DESTDIR= \
                BOOTSTRAPPING=${OSRELDATE} \
                SSP_CFLAGS= \
-               MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+               MK_HTML=no NO_LINT=yes MK_MAN=no \
                -DNO_PIC MK_PROFILE=no -DNO_SHARED \
                -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
                MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
@@ -293,7 +293,7 @@ KTMAKE=             TOOLS_PREFIX=${WORLDTMP} MAKEOB
                DESTDIR= \
                BOOTSTRAPPING=${OSRELDATE} \
                SSP_CFLAGS= \
-               MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+               MK_HTML=no -DNO_LINT MK_MAN=no \
                -DNO_PIC MK_PROFILE=no -DNO_SHARED \
                -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no
 
@@ -438,7 +438,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAG
                MK_TESTS=no
 
 LIB32WMAKE=    ${LIB32WMAKEENV} ${MAKE} ${LIB32WMAKEFLAGS} \
-               MK_MAN=no MK_INFO=no MK_HTML=no
+               MK_MAN=no MK_HTML=no
 LIB32IMAKE=    ${LIB32WMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
                MK_TOOLCHAIN=no ${IMAKE_INSTALL}
 .endif
@@ -590,7 +590,7 @@ _libraries:
        @echo ">>> stage 4.2: building libraries"
        @echo "--------------------------------------------------------------"
        ${_+_}cd ${.CURDIR}; \
-           ${WMAKE} -DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
+           ${WMAKE} -DNO_FSCHG MK_HTML=no -DNO_LINT MK_MAN=no \
            MK_PROFILE=no MK_TESTS=no MK_TESTS_SUPPORT=${MK_TESTS} libraries
 _depend:
        @echo
@@ -784,9 +784,6 @@ __installcheck_UGID:
 #
 # Required install tools to be saved in a scratch dir for safety.
 #
-.if ${MK_INFO} != "no"
-_install-info= install-info
-.endif
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=     zic tzsetup
 .endif
@@ -1367,11 +1364,6 @@ _share=  share/syscons/scrnmaps
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
-.if ${MK_INFO} != "no"
-_texinfo=      gnu/usr.bin/texinfo/libtxi \
-               gnu/usr.bin/texinfo/makeinfo
-.endif
-
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
@@ -1403,16 +1395,6 @@ build-tools: .MAKE
                ${MAKE} DIRPRFX=${_tool}/ depend && \
                ${MAKE} DIRPRFX=${_tool}/ all
 .endfor
-.for _tool in \
-    ${_texinfo}
-       ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-               cd ${.CURDIR}/${_tool} && \
-               ${MAKE} DIRPRFX=${_tool}/ obj && \
-               ${MAKE} DIRPRFX=${_tool}/ depend && \
-               ${MAKE} DIRPRFX=${_tool}/ all && \
-               ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
-.endfor
-
 
 #
 # kernel-tools: Build kernel-building tools
@@ -1495,7 +1477,7 @@ NXBMAKE=  ${NXBENV} ${MAKE} \
                MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
                MK_GDB=no MK_TESTS=no \
                SSP_CFLAGS= \
-               MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
+               MK_HTML=no NO_LINT=yes MK_MAN=no \
                -DNO_PIC MK_PROFILE=no -DNO_SHARED \
                -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
                MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
@@ -2024,7 +2006,7 @@ XDEV_CPUTYPE?=${CPUTYPE}
 XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
-NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
+NOFUN=-DNO_FSCHG MK_HTML=no -DNO_LINT \
        MK_MAN=no MK_NLS=no MK_PROFILE=no \
        MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
        TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc      Fri Jan  2 18:36:08 2015        (r276550)
+++ head/ObsoleteFiles.inc      Fri Jan  2 18:45:03 2015        (r276551)
@@ -38,6 +38,38 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150103: removal of texinfo
+OLD_FILES+=usr/bin/info
+OLD_FILES+=usr/bin/infokey
+OLD_FILES+=usr/bin/install-info
+OLD_FILES+=usr/bin/makeinfo
+OLD_FILES+=usr/bin/texindex
+OLD_FILES+=usr/share/info/am-utils.info.gz
+OLD_FILES+=usr/share/info/as-utils.info.gz
+OLD_FILES+=usr/share/info/binutils.info.gz
+OLD_FILES+=usr/share/info/com_err.info.gz
+OLD_FILES+=usr/share/info/diff.info.gz
+OLD_FILES+=usr/share/info/gdb.info.gz
+OLD_FILES+=usr/share/info/gdbint.info.gz
+OLD_FILES+=usr/share/info/gperf.info.gz
+OLD_FILES+=usr/share/info/grep.info.gz
+OLD_FILES+=usr/share/info/groff.info.gz
+OLD_FILES+=usr/share/info/heimdal.info.gz
+OLD_FILES+=usr/share/info/history.info.gz
+OLD_FILES+=usr/share/info/info-stnd.info.gz
+OLD_FILES+=usr/share/info/info.info.gz
+OLD_FILES+=usr/share/info/ld.info.gz
+OLD_FILES+=usr/share/info/regex.info.gz
+OLD_FILES+=usr/share/info/rluserman.info.gz
+OLD_FILES+=usr/share/info/stabs.info.gz
+OLD_FILES+=usr/share/info/texinfo.info.gz
+OLD_FILES+=usr/share/man/man1/info.1.gz
+OLD_FILES+=usr/share/man/man1/infokey.1.gz
+OLD_FILES+=usr/share/man/man1/install-info.1.gz
+OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
+OLD_FILES+=usr/share/man/man1/texindex.1.gz
+OLD_FILES+=usr/share/man/man5/info.5.gz
+OLD_FILES+=usr/share/man/man5/texinfo.5.gz
 # 20141231: new clang import which bumps version from 3.4.1 to 3.5.0.
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.4.1/__wmmintrin_pclmul.h

Modified: head/UPDATING
==============================================================================
--- head/UPDATING       Fri Jan  2 18:36:08 2015        (r276550)
+++ head/UPDATING       Fri Jan  2 18:45:03 2015        (r276551)
@@ -31,6 +31,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
        disable the most expensive debugging functionality run
        "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150102:
+       The GNU texinfo and GNU info pages have been removed.
+       To be able to view GNU info pages please install texinfo from ports.
+
 20141231:
        Clang, llvm and lldb have been upgraded to 3.5.0 release.
 
@@ -176,6 +180,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
        The GNU texinfo and GNU info pages are not built and installed
        anymore, WITH_INFO knob has been added to allow to built and install
        them again.
+       UPDATE: see 20150102 entry on texinfo's removal
 
 20140708:
        The GNU readline library is now an INTERNALLIB - that is, it is

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile   Fri Jan  2 18:36:08 2015        (r276550)
+++ head/gnu/usr.bin/Makefile   Fri Jan  2 18:45:03 2015        (r276551)
@@ -14,8 +14,7 @@ SUBDIR= ${_binutils} \
        ${_groff} \
        ${_rcs} \
        sdiff \
-       ${_tests} \
-       ${_texinfo}
+       ${_tests}
 
 .if ${MK_CXX} != "no"
 .if ${MK_GCC} != "no"
@@ -30,10 +29,6 @@ _groff=              groff
 _dtc=          dtc
 .endif
 
-.if ${MK_INFO} != "no"
-_texinfo=      texinfo
-.endif
-
 .if ${MK_RCS} != "no"
 _rcs=          rcs
 .endif

Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile  Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/gnu/usr.bin/binutils/Makefile  Fri Jan  2 18:45:03 2015        
(r276551)
@@ -15,9 +15,8 @@ SUBDIR=       libiberty \
        readelf \
        ${_size} \
        ${_strings} \
-       ${_strip} \
-       doc
-       
+       ${_strip}
+
 .if ${MK_ELFTOOLCHAIN_TOOLS} == "no"
 _addr2line=    addr2line
 _nm=           nm

Modified: head/gnu/usr.bin/cc/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/Makefile        Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/gnu/usr.bin/cc/Makefile        Fri Jan  2 18:45:03 2015        
(r276551)
@@ -5,7 +5,7 @@
 # The order of some of these are rather important.  Some depend on previous
 # subdirs.
 
-SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include doc
+SUBDIR= cc_tools libiberty libcpp libdecnumber cc_int cc cc1 include
 
 .if ${MK_CPP} != "no"
 SUBDIR+= cpp

Modified: head/gnu/usr.bin/gdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/Makefile       Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/gnu/usr.bin/gdb/Makefile       Fri Jan  2 18:45:03 2015        
(r276551)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=        doc libgdb gdb gdbtui kgdb
+SUBDIR=        libgdb gdb gdbtui kgdb
 
 .if exists(${.CURDIR}/gdbserver/reg-${MACHINE_CPUARCH}.c)
 SUBDIR+=gdbserver

Modified: head/gnu/usr.bin/grep/Makefile
==============================================================================
--- head/gnu/usr.bin/grep/Makefile      Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/gnu/usr.bin/grep/Makefile      Fri Jan  2 18:45:03 2015        
(r276551)
@@ -45,8 +45,6 @@ MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 g
 gnugrep.1: grep.1
        cp ${.ALLSRC} ${.TARGET}
 
-SUBDIR+=doc
-
 check: all
        @failed=0; total=0; \
        for tst in ${TESTS}; do \

Modified: head/gnu/usr.bin/groff/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/Makefile     Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/gnu/usr.bin/groff/Makefile     Fri Jan  2 18:45:03 2015        
(r276551)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=                contrib doc font man src tmac
+SUBDIR=                contrib font man src tmac
 
 .for subdir in ${SUBDIR:Nsrc}
 SUBDIR_DEPEND_${subdir}=       src

Modified: head/kerberos5/Makefile
==============================================================================
--- head/kerberos5/Makefile     Fri Jan  2 18:36:08 2015        (r276550)
+++ head/kerberos5/Makefile     Fri Jan  2 18:45:03 2015        (r276551)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=        doc lib libexec tools usr.bin usr.sbin
+SUBDIR=        lib libexec tools usr.bin usr.sbin
 
 # These are the programs which depend on Kerberos.
 KPROGS=        lib/libpam \

Modified: head/lib/libcom_err/Makefile
==============================================================================
--- head/lib/libcom_err/Makefile        Fri Jan  2 18:36:08 2015        
(r276550)
+++ head/lib/libcom_err/Makefile        Fri Jan  2 18:45:03 2015        
(r276551)
@@ -10,8 +10,6 @@ CFLAGS+=      -I${COM_ERRDIR}
 LDFLAGS=       -Wl,--no-undefined
 VERSION_MAP=   ${COM_ERRDIR}/version-script.map
 
-SUBDIR=        doc
-
 .include <bsd.lib.mk>
 
 .PATH: ${COM_ERRDIR}

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc       Fri Jan  2 18:36:08 
2015        (r276550)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc       Fri Jan  2 18:45:03 
2015        (r276551)
@@ -1967,40 +1967,6 @@ OLD_FILES+=usr/share/man/man8/traceroute
 OLD_FILES+=rescue/ping6
 .endif
 
-.if ${MK_INFO} == no
-OLD_FILES+=usr/bin/info
-OLD_FILES+=usr/bin/infokey
-OLD_FILES+=usr/bin/install-info
-OLD_FILES+=usr/bin/makeinfo
-OLD_FILES+=usr/bin/texindex
-OLD_FILES+=usr/share/info/am-utils.info.gz
-OLD_FILES+=usr/share/info/as-utils.info.gz
-OLD_FILES+=usr/share/info/binutils.info.gz
-OLD_FILES+=usr/share/info/com_err.info.gz
-OLD_FILES+=usr/share/info/diff.info.gz
-OLD_FILES+=usr/share/info/gdb.info.gz
-OLD_FILES+=usr/share/info/gdbint.info.gz
-OLD_FILES+=usr/share/info/gperf.info.gz
-OLD_FILES+=usr/share/info/grep.info.gz
-OLD_FILES+=usr/share/info/groff.info.gz
-OLD_FILES+=usr/share/info/heimdal.info.gz
-OLD_FILES+=usr/share/info/history.info.gz
-OLD_FILES+=usr/share/info/info-stnd.info.gz
-OLD_FILES+=usr/share/info/info.info.gz
-OLD_FILES+=usr/share/info/ld.info.gz
-OLD_FILES+=usr/share/info/regex.info.gz
-OLD_FILES+=usr/share/info/rluserman.info.gz
-OLD_FILES+=usr/share/info/stabs.info.gz
-OLD_FILES+=usr/share/info/texinfo.info.gz
-OLD_FILES+=usr/share/man/man1/info.1.gz
-OLD_FILES+=usr/share/man/man1/infokey.1.gz
-OLD_FILES+=usr/share/man/man1/install-info.1.gz
-OLD_FILES+=usr/share/man/man1/makeinfo.1.gz
-OLD_FILES+=usr/share/man/man1/texindex.1.gz
-OLD_FILES+=usr/share/man/man5/info.5.gz
-OLD_FILES+=usr/share/man/man5/texinfo.5.gz
-.endif
-
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
 OLD_FILES+=etc/periodic/security/610.ipf6denied

Modified: head/usr.sbin/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/Makefile  Fri Jan  2 18:36:08 2015        (r276550)
+++ head/usr.sbin/amd/Makefile  Fri Jan  2 18:45:03 2015        (r276551)
@@ -5,7 +5,7 @@
 #
 # $FreeBSD$
 
-SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \
+SUBDIR= include libamu amd amq fixmount fsinfo hlfsd mk-amd-map pawd \
        scripts wire-test
 
 .include <bsd.subdir.mk>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to