diff --git a/BUILDING b/BUILDING index f74acf787bbd..ef9ce0df75ee 100644 --- a/BUILDING +++ b/BUILDING @@ -247,11 +247,6 @@ CONFIGURATION Default: 2 - MKCATPAGES Can be set to "yes" or "no". Indicates whether preformatted - plaintext manual pages will be created during a build. - - Default: "no" - MKCROSSGDB Can be set to "yes" or "no". Create a cross-gdb as a host tool. @@ -385,9 +380,8 @@ CONFIGURATION MKSHARE Can be set to "yes" or "no". Indicates whether files destined to reside in DESTDIR/usr/share will be built and - installed during a build. If set to "no", then all of - MKCATPAGES, MKDOC, MKINFO, MKMAN, and MKNLS will be set to - "no" unconditionally. + installed during a build. If set to "no", then all of MKDOC, + MKINFO, MKMAN, and MKNLS will be set to "no" unconditionally. Default: "yes" diff --git a/distrib/sets/sets.subr b/distrib/sets/sets.subr index 2eb9444119bd..0629049cc27f 100644 --- a/distrib/sets/sets.subr +++ b/distrib/sets/sets.subr @@ -1,4 +1,4 @@ -# $NetBSD: sets.subr,v 1.193 2020/09/26 17:49:49 jmcneill Exp $ +# $NetBSD: sets.subr,v 1.194 2020/11/08 14:52:35 kamil Exp $ # # @@ -192,7 +192,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" # In each file, a record consists of a path and a System Package name, # separated by whitespace. E.g., # -# # $NetBSD: sets.subr,v 1.193 2020/09/26 17:49:49 jmcneill Exp $ +# # $NetBSD: sets.subr,v 1.194 2020/11/08 14:52:35 kamil Exp $ # . base-sys-root [keyword[,...]] # ./altroot base-sys-root # ./bin base-sys-root @@ -250,9 +250,6 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" # endian= = value of ${TARGET_ENDIANNESS} # # -# .cat if ${MKMANZ} != "no" && ${MKCATPAGES} != "no" -# automatically append ".gz" to the filename -# # .man if ${MKMANZ} != "no" && ${MKMAN} != "no" # automatically append ".gz" to the filename # @@ -354,8 +351,6 @@ list_set_files() if ("uefi" in wanted) { wanted["uefi=" "'"${HAVE_UEFI}"'"] = 1 } - if (("man" in wanted) && ("catpages" in wanted)) - wanted[".cat"] = 1 if (("man" in wanted) && ("manpages" in wanted)) wanted[".man"] = 1 if ("endian" in wanted) diff --git a/doc/BUILDING.mdoc b/doc/BUILDING.mdoc index 86dd783f7962..5ebfed19be7d 100644 --- a/doc/BUILDING.mdoc +++ b/doc/BUILDING.mdoc @@ -1,4 +1,4 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.131 2020/10/13 01:59:32 thorpej Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.132 2020/11/08 14:52:35 kamil Exp $ .\" .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -360,7 +360,7 @@ either the process environment or the configuration file specified by .Sy MAKECONF . . -.Bl -tag -width "MKCATPAGES" +.Bl -tag -width "MKXXXXXXXX" . .It Sy BUILDID Identifier for the build. @@ -500,12 +500,6 @@ flag. .DFLT 2 . -.It Sy MKCATPAGES -.YorN -Indicates whether preformatted plaintext manual pages will be created -during a build. -.DFLTn -. .It Sy MKCROSSGDB .YorN Create a cross-gdb as a host tool. @@ -698,7 +692,7 @@ will be built and installed during a build. If set to .Dq no , then all of -.Sy MKCATPAGES , MKDOC , MKINFO , MKMAN , +.Sy MKDOC , MKINFO , MKMAN , and .Sy MKNLS will be set to diff --git a/share/man/man5/mk.conf.5 b/share/man/man5/mk.conf.5 index afbb7c3aa734..b1c78326dab5 100644 --- a/share/man/man5/mk.conf.5 +++ b/share/man/man5/mk.conf.5 @@ -1,4 +1,4 @@ -.\" $NetBSD: mk.conf.5,v 1.81 2020/10/27 06:33:38 rin Exp $ +.\" $NetBSD: mk.conf.5,v 1.82 2020/11/08 14:52:35 kamil Exp $ .\" .\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -258,12 +258,6 @@ If based frontends are used. .DFLTy . -.It Sy MKCATPAGES -.YorN -Indicates whether preformatted plaintext manual pages will be created -and installed. -.DFLTn -. .It Sy MKCLEANSRC .YorN Indicates whether @@ -579,7 +573,7 @@ Indicates whether manual pages will be installed. If .Dq no , acts as -.Sy MKCATPAGES=no MKHTML=no . +.Sy MKHTML=no . . .It Sy MKMANZ .YorN @@ -745,7 +739,7 @@ will be built and installed. If .Dq no , acts as -.Sy MKCATPAGES=no MKDOC=no MKINFO=no MKHTML=no MKMAN=no MKNLS=no . +.Sy MKDOC=no MKINFO=no MKHTML=no MKMAN=no MKNLS=no . . .It Sy MKSKEY .YorN diff --git a/share/mk/bsd.README b/share/mk/bsd.README index faf7f07b8620..172b314dfc2b 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.412 2020/10/16 06:55:36 nia Exp $ +# $NetBSD: bsd.README,v 1.413 2020/11/08 14:52:35 kamil Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -130,9 +130,6 @@ MKBSDTAR If "yes", use the libarchive based cpio and tar instead of the pax frontends. Default: yes -MKCATPAGES If "no", don't build or install the catman pages. - Default: no - MKCOMPAT If "no", don't build or install the src/compat. Default: yes on amd64/mips64/sparc64, no elsewhere. @@ -348,8 +345,8 @@ MKLVM If "no", don't build or install the logical volume manager and device mapper tools and libraries Default: yes -MKMAN If "no", don't build or install the man or catman pages, - and also acts as "MKCATPAGES=no MKHTML=no". +MKMAN If "no", don't build or install the man pages, + and also acts as "MKHTML=no". Default: yes MKMANDOC If "yes", mandoc is built as tool and used to compile @@ -460,7 +457,7 @@ MKSANITIZER if "yes", use the selected sanitizer to compile userland depends on the compiler version and target CPU architecture. Default: no -MKSHARE If "no", act as "MKCATPAGES=no MKDOC=no MKHTML=no MKINFO=no +MKSHARE If "no", act as "MKDOC=no MKHTML=no MKINFO=no MKMAN=no MKNLS=no". I.e, don't build catman pages, documentation, Info documentation, man pages, NLS files, ... @@ -729,8 +726,8 @@ MANOWN Manual owner. [root] MANMODE Manual mode. [${NONBINMODE}] MANINSTALL Manual installation type. Space separated list: - catinstall, htmlinstall, maninstall - Default value derived from MKCATPAGES and MKHTML. + htmlinstall, maninstall + Default value derived from MKHTML. LDSTATIC Control program linking; if set blank, link everything dynamically. If set to "-static", link everything statically. @@ -1461,8 +1458,6 @@ links. It has a three targets: - catinstall: - Install the preformatted manual pages and their links. htmlinstall: Install the HTML manual pages and their links. maninstall: diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index cef0eb9ba379..dc00dc18bde9 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,10 +1,10 @@ -# $NetBSD: bsd.man.mk,v 1.120 2019/01/21 21:11:54 christos Exp $ +# $NetBSD: bsd.man.mk,v 1.121 2020/11/08 14:52:35 kamil Exp $ # @(#)bsd.man.mk 8.1 (Berkeley) 6/8/93 .include ##### Basic targets -.PHONY: catinstall maninstall catpages manpages catlinks manlinks +.PHONY: maninstall manpages manlinks .PHONY: htmlinstall htmlpages htmllinks .PHONY: lintmanpages realinstall: ${MANINSTALL} @@ -28,17 +28,6 @@ TMACDEPDIR?= /usr/share/tmac .endif HTMLDIR?= ${DESTDIR}${MANDIR} -.if ${MKMANDOC} == yes && !defined(NOMANDOC) -CATDEPS?= -.else -CATDEPS?= ${TMACDEPDIR}/andoc.tmac \ - ${TMACDEPDIR}/doc.tmac \ - ${TMACDEPDIR}/mdoc/doc-common \ - ${TMACDEPDIR}/mdoc/doc-ditroff \ - ${TMACDEPDIR}/mdoc/doc-nroff \ - ${TMACDEPDIR}/mdoc/doc-syms -.endif -MANTARGET?= cat MAN?= MLINKS?= @@ -131,74 +120,6 @@ manlinks:: ${_t} .endfor .endif # ${MKMAN} != "no" -##### Build and install rules (plaintext pages) - -.if (${MKCATPAGES} != "no") && (${MKMAN} != "no") -catinstall: catpages catlinks -catpages:: # ensure target exists -CATPAGES= ${MAN:C/\.(${_MSECTIONREGEX})\$/.cat\1${MANSUFFIX}/} - -realall: ${CATPAGES} -.NOPATH: ${CATPAGES} -.SUFFIXES: ${_MSECTIONS:@N@.cat$N${MANSUFFIX}@} -.MADE: ${CATDEPS} - -${_MSECTIONS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS} # build rule - ${_MKTARGET_FORMAT} -.if ${MKMANDOC} == yes && !defined(NOMANDOC) - if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \ - ${TOOL_MANDOC_ASCII} ${.IMPSRC} ${MANCOMPRESS} \ - > ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET}; \ - else \ - ${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \ - > ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET}; \ - fi -.elif defined(USETBL) - ${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \ - > ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET} -.else - ${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \ - > ${.TARGET}.tmp && ${MV} ${.TARGET}.tmp ${.TARGET} -.endif - -.for F in ${CATPAGES:S/${MANSUFFIX}$//:O:u} -_F:= ${DESTDIR}${MANDIR}/${F:T:E}${MANSUBDIR}/${F:R}.0${MANSUFFIX} - -.if ${MKUPDATE} == "no" -${_F}! ${F}${MANSUFFIX} __installpage # install rule -.if !defined(BUILD) && !make(all) && !make(${F}) -${_F}! .MADE # no build at install -.endif -.else -${_F}: ${F}${MANSUFFIX} __installpage # install rule -.if !defined(BUILD) && !make(all) && !make(${F}) -${_F}: .MADE # no build at install -.endif -.endif - -catpages:: ${_F} -.PRECIOUS: ${_F} # keep if install fails -.endfor - -catlinks:: # link install - -.for _src _dst in ${MLINKS} -_l:=${DESTDIR}${MANDIR}/cat${_src:T:E}${MANSUBDIR}/${_src:R}.0${MANSUFFIX} -_t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${MANSUBDIR}/${_dst:R}.0${MANSUFFIX} - -# Handle case conflicts carefully, when _dst occurs -# more than once after case flattening -.if ${MKUPDATE} == "no" || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} > 1 -${_t}! ${_l} __linkinstallpage -.else -${_t}: ${_l} __linkinstallpage -.endif - -catlinks:: ${_t} -.PRECIOUS: ${_t} -.endfor -.endif # (${MKCATPAGES} != "no") && (${MKMAN} != "no") - ##### Build and install rules (HTML pages) .if (${MKHTML} != "no") && (${MKMAN} != "no") # { @@ -276,17 +197,13 @@ htmllinks:: ${_t} .undef _F .if !empty(MAN) && (${MKMAN} != "no") -.if (${MKCATPAGES} != "no") -CLEANDIRFILES+= ${CATPAGES} -.endif .if !empty(MANSUFFIX) -CLEANDIRFILES+= ${MANPAGES} ${CATPAGES:S/${MANSUFFIX}$//} +CLEANDIRFILES+= ${MANPAGES} .endif .if ${MKHTML} != "no" CLEANDIRFILES+= ${HTMLPAGES} .endif .endif -# (XXX ${CATPAGES:S...} cleans up old .catN files where .catN.gz now used) .if !empty(MANPAGES) lintmanpages: ${MANPAGES} @@ -307,4 +224,4 @@ describe: .include .include -${TARGETS} catinstall maninstall htmlinstall: # ensure existence +${TARGETS} maninstall htmlinstall: # ensure existence diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 905f974ce37b..c2f465d67510 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1230 2020/11/05 13:03:31 rin Exp $ +# $NetBSD: bsd.own.mk,v 1.1231 2020/11/08 14:52:35 kamil Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1355,9 +1355,6 @@ MKHTML:= no .endif _MANINSTALL= maninstall -.if ${MKCATPAGES} != "no" -_MANINSTALL+= catinstall -.endif .if ${MKHTML} != "no" _MANINSTALL+= htmlinstall .endif