merge into /usr/old

SCCS-vsn: old/tmac/tmac.an 6.11
SCCS-vsn: old/tmac/tmac.an.v6compat 6.2
SCCS-vsn: old/tmac/tmac.an6n 6.2
SCCS-vsn: old/tmac/tmac.an6t 6.2
SCCS-vsn: old/tmac/Makefile 1.2

diff --git a/usr/src/old/tmac/Makefile b/usr/src/old/tmac/Makefile
index d0f3835..2247883 100644 (file)
--- a/usr/src/old/tmac/Makefile
+++ b/usr/src/old/tmac/Makefile
@@ -1,27 +1,16 @@
-#      @(#)Makefile    1.1 (Berkeley) %G%
+#      @(#)Makefile    1.2 (Berkeley) %G%

 
 

-# eliminating tmac.an.old to test tmac.an from /usr/src/.../groff/mancros/grot
-# FILES=       tmac.an.old tmac.r tmac.andoc
+FILES= tmac.an.v6compat tmac.an6n tmac.an6t tmac.an

 
 

-FILES= tmac.r tmac.andoc tmac.s
-MSRCS=  doc doc-ditroff doc-common doc-nroff doc-syms
-
-LINKS= ${BINDIR}/tmac/tmac.andoc ${BINDIR}/tmac/tmac.an

 NOOBJ= noobj
 NOOBJ= noobj

-
-# old macros not currently installed...
-# OFILES=      tmac.an.v6compat tmac.an6n tmac.an6t tmac.a tmac.cp
+BINDIR= /usr/old/lib

 
 all clean cleandir depend lint tags:
 
 beforeinstall:
 
 all clean cleandir depend lint tags:
 
 beforeinstall:

-       for i in ${MSRCS}; do \
-               sed -f strip.sed < $$i > ${DESTDIR}${BINDIR}/tmac/tmac.$$i; \
-               chown ${BINOWN}.${BINGRP} ${DESTDIR}${BINDIR}/tmac/tmac.$$i; \
-               chmod 444 ${DESTDIR}${BINDIR}/tmac/tmac.$$i; \
-       done

        install -c -o ${BINOWN} -g ${BINOWN} -m 444 ${FILES} \
                ${DESTDIR}${BINDIR}/tmac
 
        install -c -o ${BINOWN} -g ${BINOWN} -m 444 ${FILES} \
                ${DESTDIR}${BINDIR}/tmac
 

+BINDIR= /usr/old/lib

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/usr/src/old/tmac/tmac.an b/usr/src/old/tmac/tmac.an
index b833e94..e47a2e3 100644 (file)
--- a/usr/src/old/tmac/tmac.an
+++ b/usr/src/old/tmac/tmac.an
@@ -3,7 +3,7 @@
 .\"
 .\" %sccs.include.proprietary.roff%
 .\"
 .\"
 .\" %sccs.include.proprietary.roff%
 .\"

-.\"    @(#)tmac.an     6.10 (Berkeley) %G%
+.\"    @(#)tmac.an     6.11 (Berkeley) %G%

 .\"
 
 '      DT, PD, SM, and B macros invoked internally.
 .\"
 
 '      DT, PD, SM, and B macros invoked internally.

diff --git a/usr/src/old/tmac/tmac.an.v6compat b/usr/src/old/tmac/tmac.an.v6compat
index 1078879..3fe9953 100644 (file)
--- a/usr/src/old/tmac/tmac.an.v6compat
+++ b/usr/src/old/tmac/tmac.an.v6compat
@@ -2,16 +2,16 @@
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"

-.\"    @(#)tmac.an.v6compat    6.1 (Berkeley) %G%
+.\"    @(#)tmac.an.v6compat    6.2 (Berkeley) %G%

 .\"
 .de th
 .\"
 .de th

-.if t .so /usr/lib/tmac/tmac.an6t
-.if n .so /usr/lib/tmac/tmac.an6n
+.if t .so /usr/old/lib/tmac/tmac.an6t
+.if n .so /usr/old/lib/tmac/tmac.an6n

 .t1 "\\$1" "\\$2" "\\$3"
 ..
 .de TH
 .rn TH xx
 .t1 "\\$1" "\\$2" "\\$3"
 ..
 .de TH
 .rn TH xx

-.so /usr/lib/tmac/tmac.an.new
+.so /usr/old/lib/tmac/tmac.an.new

 .TH "\\$1" "\\$2" "\\$3" "\\$4" "\\$5"
 .rm xx
 ..
 .TH "\\$1" "\\$2" "\\$3" "\\$4" "\\$5"
 .rm xx
 ..

diff --git a/usr/src/old/tmac/tmac.an6n b/usr/src/old/tmac/tmac.an6n
index beadd0f..bb8f960 100644 (file)
--- a/usr/src/old/tmac/tmac.an6n
+++ b/usr/src/old/tmac/tmac.an6n
@@ -2,7 +2,7 @@
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"

-.\"    @(#)tmac.an6n   6.1 (Berkeley) %G%
+.\"    @(#)tmac.an6n   6.2 (Berkeley) %G%

 .\"
 .nr in 5
 .de i0
 .\"
 .nr in 5
 .de i0

diff --git a/usr/src/old/tmac/tmac.an6t b/usr/src/old/tmac/tmac.an6t
index 0acf109..5d048f1 100644 (file)
--- a/usr/src/old/tmac/tmac.an6t
+++ b/usr/src/old/tmac/tmac.an6t
@@ -2,7 +2,7 @@
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"
 .\" All rights reserved.  The Berkeley software License Agreement
 .\" specifies the terms and conditions for redistribution.
 .\"

-.\"    @(#)tmac.an6t   6.1 (Berkeley) %G%
+.\"    @(#)tmac.an6t   6.2 (Berkeley) %G%

 .\"
 .nr in .5i
 .de CM
 .\"
 .nr in .5i
 .de CM