diff options
| author | ru <ru@FreeBSD.org> | 2002-10-24 11:05:58 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-10-24 11:05:58 +0000 |
| commit | 20d1f108df04f8386a09abaf5543faf416d1eb5f (patch) | |
| tree | 690a44352fbbb2bf856784595acad4f7be45c98a | |
| parent | 4e82bade9fae829dcf0202c4c000c6032c5254e6 (diff) | |
| download | FreeBSD-src-20d1f108df04f8386a09abaf5543faf416d1eb5f.zip FreeBSD-src-20d1f108df04f8386a09abaf5543faf416d1eb5f.tar.gz | |
A version of SGR disabling stuff that is believed to be safe.
Submitted by: Werner LEMBERG <wl@gnu.org>
| -rw-r--r-- | contrib/groff/tmac/troffrc | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/groff/tmac/Makefile | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/contrib/groff/tmac/troffrc b/contrib/groff/tmac/troffrc index 755bc39..a1e5a36 100644 --- a/contrib/groff/tmac/troffrc +++ b/contrib/groff/tmac/troffrc @@ -45,4 +45,12 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html . .\} . +.\" Disable SGR support in grotty(1). +.if n \{\ +. do nop \X'tty: sgr 0' +. sp -1 +. nr nl 0-1 +. nr % -1 +.\} +. .\" Don't let blank lines creep in here. diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index a9a9873..d32f620 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -14,7 +14,6 @@ MLINKS+= groff_me.7 me.7 MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -33,7 +32,7 @@ NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc \ + troffrc troffrc-end \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -41,7 +40,6 @@ MDOCFILES= doc-common doc-ditroff doc-nroff doc-syms \ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -55,9 +53,6 @@ $f-s: $f ${.ALLSRC} > ${.TARGET} .endfor -troffrc-end.patched: troffrc-end - (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} - beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -66,8 +61,6 @@ beforeinstall: ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} - ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f |
