d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ``groff -man'' work again for both man(7) and mdoc(7) manpages.

Browse Source 
The new Groff release will support this feature.

Requested by:	peter
This commit is contained in:
ru 2001-02-23 09:35:33 +00:00
parent bb8c09c678
commit c6eb25402d
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,6 @@
..
.de TH
.rm TH
.do mso tmac.an
.do mso tmac.an-old
\\*(TH\\
..

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

@ -16,20 +16,22 @@ 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.an-old
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.an tmac.e tmac.doc
STRIPFILES= 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}
all: ${MDOCFILES} ${STRIPFILES} ${SPECIALFILES} tmac.an-old
.for f in ${MDOCFILES} ${STRIPFILES}
$f: ${DIST_DIR}/$f
@ -43,11 +45,14 @@ $f: ${DIST_DIR}/$f
${.ALLSRC} > ${.TARGET}
.endfor
tmac.an-old: 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} ${DESTDIR}${TMACDIR}
${STRIPFILES} ${SPECIALFILES} tmac.an-old ${DESTDIR}${TMACDIR}
cd ${DIST_DIR}; \
${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
${FILES} ${DESTDIR}${TMACDIR}

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

@ -7,9 +7,9 @@ libdir= /etc
bindir= ${BINDIR}
pager= more -s
manpath_config_file= /etc/manpath.config
troff= /usr/bin/groff -S -mandoc
troff= /usr/bin/groff -S -man
# -Tascii or localized encoding added automatically
nroff= /usr/bin/groff -S -Wall -mtty-char -mandoc
nroff= /usr/bin/groff -S -Wall -mtty-char -man
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 . " -mandoc | col";
local($nroff) = "nroff -T" . $dev_name . " -man | 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 -mandoc" to format russian manpages (if catman "-L"
# Use "nroff -Tkoi8-r -man" to format russian manpages (if catman "-L"
# option specified only).
if ($local_suffix =~ '\.KOI8-R$') {
$dev_name = "koi8-r";
}
# Use "nroff -Tlatin1 -mandoc" to format ISO 8859-1 manpages
# Use "nroff -Tlatin1 -man" 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 -mandoc -mtty-char
MROFF_CMD?= groff -Tascii -man
MCOMPRESS_CMD?= ${COMPRESS_CMD}
MCOMPRESS_EXT?= ${COMPRESS_EXT}