summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/groff/tmac/tmac.andoc2
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile11
-rw-r--r--gnu/usr.bin/man/Makefile.inc4
-rw-r--r--gnu/usr.bin/man/catman/catman.perl6
-rw-r--r--share/mk/bsd.man.mk2
5 files changed, 15 insertions, 10 deletions
diff --git a/contrib/groff/tmac/tmac.andoc b/contrib/groff/tmac/tmac.andoc
index ae1fbfe..7a9e92f 100644
--- a/contrib/groff/tmac/tmac.andoc
+++ b/contrib/groff/tmac/tmac.andoc
@@ -8,6 +8,6 @@
..
.de TH
.rm TH
-.do mso tmac.an
+.do mso tmac.an-old
\\*(TH\\
..
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 29db21d..121b077 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -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}
diff --git a/gnu/usr.bin/man/Makefile.inc b/gnu/usr.bin/man/Makefile.inc
index fa1ad78..7da63dc 100644
--- a/gnu/usr.bin/man/Makefile.inc
+++ b/gnu/usr.bin/man/Makefile.inc
@@ -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
diff --git a/gnu/usr.bin/man/catman/catman.perl b/gnu/usr.bin/man/catman/catman.perl
index 5b51d2f..3eeafed 100644
--- a/gnu/usr.bin/man/catman/catman.perl
+++ b/gnu/usr.bin/man/catman/catman.perl
@@ -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";
}
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index d836eec..e5ba33e 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -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}
OpenPOWER on IntegriCloud