Fixed mdocs Makefile, repaired nroff include paths, added OpenBSD rcs tags,

and included strip.sed for future use by new dir struct.

8 files changed, 101 insertions, 16 deletions

diff --git a/share/tmac/mdoc/Makefile b/share/tmac/mdoc/Makefile
index 40614074535..72d39acef0d 100644
--- a/share/tmac/mdoc/Makefile
+++ b/share/tmac/mdoc/Makefile
@@ -1,24 +1,19 @@
+#	$OpenBSD: Makefile,v 1.2 1996/08/24 07:47:06 etheisen Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
-FILES=	tmac.r tmac.andoc tmac.s tmac.e
 MSRCS=  doc doc-ditroff doc-common doc-nroff doc-syms
+BINDIR=	/usr/share/tmac/mdoc
 
-LINKS=	${BINDIR}/tmac/tmac.andoc ${BINDIR}/tmac/tmac.an
+STRIP_SED = ${.CURDIR}/../strip.sed
 NOOBJ=	noobj
 
-# old macros not currently installed...
-# OFILES=	tmac.a tmac.cp
-
 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; \
+		sed -f ${STRIP_SED} < $$i > ${DESTDIR}${BINDIR}/$$i; \
+		chown ${BINOWN}.${BINGRP} ${DESTDIR}${BINDIR}/$$i; \
+		chmod 444 ${DESTDIR}${BINDIR}/$$i; \
 	done
-	install -c -o ${BINOWN} -g ${BINOWN} -m 444 ${FILES} \
-		${DESTDIR}${BINDIR}/tmac
-
 
 .include <bsd.prog.mk>
diff --git a/share/tmac/mdoc/README b/share/tmac/mdoc/README
index a15dcaf5a8f..04807c5b2b7 100644
--- a/share/tmac/mdoc/README
+++ b/share/tmac/mdoc/README
@@ -1,4 +1,38 @@
-# @(#)README	8.1 (Berkeley) 6/8/93
+.\"	$OpenBSD: README,v 1.2 1996/08/24 07:47:06 etheisen Exp $
+.\"
+.\" Copyright (c) 1991, 1993
+.\"	 The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	@(#)README	8.1 (Berkeley) 6/8/93
+.\"
 
 -mdoc stuff
 	doc-* files are unstripped tmac.doc-* files
diff --git a/share/tmac/mdoc/doc b/share/tmac/mdoc/doc
index 609b9c1bcea..b988c27d743 100644
--- a/share/tmac/mdoc/doc
+++ b/share/tmac/mdoc/doc
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: doc,v 1.2 1996/08/24 07:47:07 etheisen Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -38,13 +40,13 @@
 .ftr C CR
 .\}
 .if t \{\
-.       so /usr/share/tmac/tmac.doc-ditroff
+.       so /usr/share/tmac/mdoc/doc-ditroff
 .\}
 .if n \{\
-.       so /usr/share/tmac/tmac.doc-nroff
+.       so /usr/share/tmac/mdoc/doc-nroff
 .\}
-.so /usr/share/tmac/tmac.doc-common
-.so /usr/share/tmac/tmac.doc-syms
+.so /usr/share/tmac/mdoc/doc-common
+.so /usr/share/tmac/mdoc/doc-syms
 .\" NS Db macro - start/stop DEBUG MODE
 .\" NS Db register DEBUG MODE
 .\" NS iN register DEBUG MODE (inline if 1, to stderr if 0 (default))
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index a8aef9ed644..c667022778a 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: doc-common,v 1.2 1996/08/24 07:47:07 etheisen Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/share/tmac/mdoc/doc-ditroff b/share/tmac/mdoc/doc-ditroff
index 08b413eed38..294e2841b95 100644
--- a/share/tmac/mdoc/doc-ditroff
+++ b/share/tmac/mdoc/doc-ditroff
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: doc-ditroff,v 1.2 1996/08/24 07:47:08 etheisen Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/share/tmac/mdoc/doc-nroff b/share/tmac/mdoc/doc-nroff
index 2bb953137ea..1b3d06cd6e7 100644
--- a/share/tmac/mdoc/doc-nroff
+++ b/share/tmac/mdoc/doc-nroff
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: doc-nroff,v 1.2 1996/08/24 07:47:08 etheisen Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms
index edc886f828a..ea1094fc9ef 100644
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: doc-syms,v 1.2 1996/08/24 07:47:09 etheisen Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
diff --git a/share/tmac/strip.sed b/share/tmac/strip.sed
new file mode 100644
index 00000000000..e296eb3e00f
--- /dev/null
+++ b/share/tmac/strip.sed
@@ -0,0 +1,46 @@
+#! /bin/sed -f
+#
+#	$OpenBSD: strip.sed,v 1.1 1996/08/24 07:47:05 etheisen Exp $
+#
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)strip.sed	8.1 (Berkeley) 6/8/93
+#
+
+/%beginstrip%/{
+	h
+	s/.*/.\\" This version has had comments stripped; an unstripped version is available./p
+	g
+}
+/%beginstrip%/,$s/[. 	][ 	]*\\".*//
+/^$/d
+/\\n@/d