Page MenuHomeFreeBSD
Files F150703646

D1409.diff
No OneTemporary
Actions

D1409.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -260,7 +260,7 @@
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 @@
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 @@
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 @@
@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 @@
#
# 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 @@
_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 @@
${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 @@
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?=${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} \
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -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
Index: gnu/usr.bin/Makefile
===================================================================
--- gnu/usr.bin/Makefile
+++ gnu/usr.bin/Makefile
@@ -14,8 +14,7 @@
${_groff} \
${_rcs} \
sdiff \
- ${_tests} \
- ${_texinfo}
+ ${_tests}
.if ${MK_CXX} != "no"
.if ${MK_GCC} != "no"
@@ -30,10 +29,6 @@
_dtc= dtc
.endif
-.if ${MK_INFO} != "no"
-_texinfo= texinfo
-.endif
-
.if ${MK_RCS} != "no"
_rcs= rcs
.endif
Index: gnu/usr.bin/texinfo/Makefile
===================================================================
--- gnu/usr.bin/texinfo/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# $FreeBSD$
-#
-
-SUBDIR= libtxi makeinfo info infokey install-info texindex doc
-
-.include <bsd.subdir.mk>
Index: gnu/usr.bin/texinfo/Makefile.inc
===================================================================
--- gnu/usr.bin/texinfo/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-TXIDIR= ${.CURDIR}/../../../../contrib/texinfo
-LIBTXI= ${.OBJDIR}/../libtxi/libtxi.a
-
-CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \
- -I${TXIDIR} -I${TXIDIR}/lib
-
-.include "../Makefile.inc"
Index: gnu/usr.bin/texinfo/doc/Makefile
===================================================================
--- gnu/usr.bin/texinfo/doc/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-INFO= info info-stnd texinfo
-SRCDIR= ${TXIDIR}/doc
-
-CLEANFILES= texinfo.texi
-
-texinfo.texi: texinfo.txi
- ln -fs ${.ALLSRC} ${.TARGET}
-
-.include <bsd.info.mk>
Index: gnu/usr.bin/texinfo/info/Makefile
===================================================================
--- gnu/usr.bin/texinfo/info/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PROG= info
-MAN= info.1 info.5 texinfo.5
-
-SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \
- footnotes.c gc.c indices.c info-utils.c info.c infodoc.c \
- infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
- signals.c terminal.c tilde.c variables.c window.c
-
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
-
-DPADD= ${LIBTERMCAPW} ${LIBTXI}
-LDADD= -ltermcapw ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TXIDIR}/info ${TXIDIR}/doc
Index: gnu/usr.bin/texinfo/infokey/Makefile
===================================================================
--- gnu/usr.bin/texinfo/infokey/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PROG= infokey
-SRCS= infokey.c key.c
-
-DPADD= ${LIBTXI}
-LDADD= ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TXIDIR}/info ${TXIDIR}/doc
Index: gnu/usr.bin/texinfo/install-info/Makefile
===================================================================
--- gnu/usr.bin/texinfo/install-info/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG= install-info
-
-DPADD= ${LIBTXI}
-LDADD= ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TXIDIR}/util ${TXIDIR}/doc
Index: gnu/usr.bin/texinfo/libtxi/Makefile
===================================================================
--- gnu/usr.bin/texinfo/libtxi/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-LIB= txi
-INTERNALLIB=
-
-SRCS= substring.c xexit.c xmalloc.c xstrdup.c
-
-.include <bsd.lib.mk>
-
-.PATH: ${TXIDIR}/lib
Index: gnu/usr.bin/texinfo/makeinfo/Makefile
===================================================================
--- gnu/usr.bin/texinfo/makeinfo/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG= makeinfo
-SRCS= cmds.c defun.c files.c float.c footnote.c html.c \
- index.c insertion.c lang.c macro.c makeinfo.c multi.c \
- node.c sectioning.c toc.c xml.c xref.c
-
-DPADD= ${LIBTXI}
-LDADD= ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH: $(TXIDIR)/makeinfo $(TXIDIR)/doc
Index: gnu/usr.bin/texinfo/texindex/Makefile
===================================================================
--- gnu/usr.bin/texinfo/texindex/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-PROG= texindex
-
-DPADD= ${LIBTXI}
-LDADD= ${LIBTXI}
-
-.include <bsd.prog.mk>
-
-.PATH: ${TXIDIR}/util ${TXIDIR}/doc
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc
+++ tools/build/mk/OptionalObsoleteFiles.inc
@@ -1967,40 +1967,6 @@
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
Index: tools/build/options/WITH_INFO
===================================================================
--- tools/build/options/WITH_INFO
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to make or install
-.Xr info 5
-files.

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 4, 11:59 AM (13 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30817227
Default Alt Text
D1409.diff (10 KB)

Event Timeline