jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-01 23:43:35 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Install the stock (as supplied by groff(1) distribution) tmac.an

Browse Source 
and tmac.andoc files.  The man(1), catman(1) and bsd.man.mk have
been modified to call groff(1) with -mandoc argument.
This commit is contained in:
Ruslan Ermilov 2000-12-06 17:02:33 +00:00
parent 081b301be3
commit 4c5804ea54
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=69679
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/groff/tmac/tmac.andoc
View File

@ -1,3 +1,4 @@
.\" $FreeBSD$
.\" Load either tmac.an or tmac.doc.
.if !\n(.g .ab These macros require groff.
.de Dd
@ -7,6 +8,6 @@
..
.de TH
.rm TH
.do mso tmac.groff_an
.do mso tmac.an
\\*(TH\\
..

11
gnu/usr.bin/groff/tmac/Makefile
View File

@ -16,22 +16,20 @@ MLINKS+= groff_ms.7 ms.7
MLINKS+= groff_me.7 me.7
MLINKS+= groff_msafer.7 msafer.7
MLINKS+= groff_markup.7 markup.7
LINKS= ${TMACDIR}/tmac.andoc ${TMACDIR}/tmac.an
CLEANFILES= ${MAN5} ${MAN7} ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
CLEANFILES+= tmac.groff_an
FILES= tmac.mandoc tmac.andoc tmac.pic tmac.ps tmac.psnew tmac.psold \
tmac.pspic tmac.psatk tmac.dvi tmac.tty tmac.tty-char \
tmac.X tmac.Xps tmac.latin1 tmac.lj4 eqnrc troffrc troffrc-end \
tmac.safer tmac.html tmac.markup tmac.arkup tmac.a4 \
tmac.trace tmac.me tmac.mdoc tmac.s tmac.lbp
STRIPFILES= tmac.e tmac.doc
STRIPFILES= tmac.an tmac.e tmac.doc
SPECIALFILES= tmac.man tmac.ms
MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms
LOCALEFILES= locale-list koi8-r
all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES} tmac.groff_an
all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES}
.for f in ${MDOCFILES} ${STRIPFILES}
$f: ${DIST_DIR}/$f
@ -45,14 +43,11 @@ $f: ${DIST_DIR}/$f
${.ALLSRC} > ${.TARGET}
.endfor
tmac.groff_an: tmac.an
sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
beforeinstall:
${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${MDOCFILES} ${DESTDIR}${MDOCDIR}
${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${STRIPFILES} ${SPECIALFILES} tmac.groff_an ${DESTDIR}${TMACDIR}
${STRIPFILES} ${SPECIALFILES} ${DESTDIR}${TMACDIR}
cd ${DIST_DIR}; \
${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${FILES} ${DESTDIR}${TMACDIR}

5
gnu/usr.bin/man/Makefile.inc
View File

@ -1,3 +1,4 @@
# $FreeBSD$
#
# Set a bunch of things to hardcoded paths so that we don't accidently
# pick up a user's own version of some utility and hose ourselves.
@ -6,9 +7,9 @@ libdir= /etc
bindir= ${BINDIR}
pager= more -s
manpath_config_file= /etc/manpath.config
troff= /usr/bin/groff -S -man
troff= /usr/bin/groff -S -mandoc
# -Tascii or localized encoding added automatically
nroff= /usr/bin/groff -S -Wall -mtty-char -man
nroff= /usr/bin/groff -S -Wall -mtty-char -mandoc
apropos= /usr/bin/apropos
whatis= /usr/bin/whatis
eqn= /usr/bin/eqn

6
gnu/usr.bin/man/catman/catman.perl
View File

@ -337,7 +337,7 @@ sub garbage {
sub nroff {
local($man,$cat) = @_;
local($nroff) = "nroff -T" . $dev_name . " -man | col";
local($nroff) = "nroff -T" . $dev_name . " -mandoc | col";
local($dev, $ino) = (stat($man))[01];
# It's a link
@ -386,12 +386,12 @@ sub nroff_device {
$dev_name = "ascii";
if ($locale) {
# Use "nroff -Tkoi8-r -man" to format russian manpages (if catman "-L"
# Use "nroff -Tkoi8-r -mandoc" to format russian manpages (if catman "-L"
# option specified only).
if ($local_suffix =~ '\.KOI8-R$') {
$dev_name = "koi8-r";
}
# Use "nroff -Tlatin1 -man" to format ISO 8859-1 manpages
# Use "nroff -Tlatin1 -mandoc" to format ISO 8859-1 manpages
elsif ($local_suffix =~ '\.ISO_8859-1$') {
$dev_name = "latin1";
}

2
share/mk/bsd.man.mk
View File

@ -57,7 +57,7 @@ MINSTALL= ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
CATDIR= ${MANDIR:H:S/$/\/cat/}
CATEXT= .cat
MROFF_CMD?= groff -Tascii -man
MROFF_CMD?= groff -Tascii -mandoc -mtty-char
MCOMPRESS_CMD?= ${COMPRESS_CMD}
MCOMPRESS_EXT?= ${COMPRESS_EXT}