Remove original license disclaimer.

Add Caldera license.

Approved by:    David Taylor <davidt@caldera.com>

Make buildable under FreeBSD.  This one was relatively easy, though it
still contains obscenities.

2 files changed, 54 insertions, 7 deletions

diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile
index 6388cb1..0f99fff 100644
--- a/share/doc/psd/17.m4/Makefile
+++ b/share/doc/psd/17.m4/Makefile
@@ -4,8 +4,23 @@
 DIR=	psd/17.m4
 SRCS=	m4.ms
 MACROS=	-msU
+GROFF=	groff
+
+all: paper.ps paper.ascii
 
 paper.ps: ${SRCS}
-	${ROFF} ${SRCS} > ${.TARGET}
+	${GROFF} ${MACROS} ${SRCS} > ${.TARGET}
+
+paper.ascii: ${SRCS}
+	${ROFF} ${MACROS} ${SRCS} > ${.TARGET}
+
+paper.ascii.gz: paper.ascii
+paper.ps.gz: paper.ps
+
+paper.ascii.gz paper.ps.gz:
+	gzip -f ${.TARGET:.gz=}
+
+clean:
+	rm -f paper.* *.spell errs Errs make.out Make.log *~
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/17.m4/m4.ms b/share/doc/psd/17.m4/m4.ms
index 905dce4..6cd7b77 100644
--- a/share/doc/psd/17.m4/m4.ms
+++ b/share/doc/psd/17.m4/m4.ms
@@ -1,7 +1,39 @@
-.\" This module is believed to contain source code proprietary to AT&T.
-.\" Use and redistribution is subject to the Berkeley Software License
-.\" Agreement and your Software Agreement with AT&T (Western Electric).
-.\"
+.\" Copyright (C) Caldera International Inc. 2001-2002.  All rights reserved.
+.\" 
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions are
+.\" met:
+.\" 
+.\" Redistributions of source code and documentation must retain the above
+.\" copyright notice, this list of conditions and the following
+.\" disclaimer.
+.\" 
+.\" 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.
+.\" 
+.\" All advertising materials mentioning features or use of this software
+.\" must display the following acknowledgement:
+.\" 
+.\" This product includes software developed or owned by Caldera
+.\" International, Inc.  Neither the name of Caldera International, Inc.
+.\" nor the names of other contributors may be used to endorse or promote
+.\" products derived from this software without specific prior written
+.\" permission.
+.\" 
+.\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+.\" INTERNATIONAL, INC.  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 CALDERA INTERNATIONAL, INC. 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) RISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+.\" 
 .\"	@(#)m4.ms	6.3 (Berkeley) 6/5/93
 .\"
 .\" $FreeBSD$
@@ -52,8 +84,8 @@
 .		\"special chars in programs
 .	\" start of text
 .\".RP
-.....TR 59
-.....TM 77-1273-6 39199 39199-11
+.\" .....TR 59
+.\" .....TM 77-1273-6 39199 39199-11
 .ND "July 1, 1977"
 .TL
 The M4 Macro Processor