bsd.doc.mk changes:

Don't gratuitously pipe thru a cat(1) if NODOCCOMPRESS.

Only create _stamp.extra when necessary.

Get rid of SOELIMPP and OBJS.

Use Groff version of soelim(1); we need its -I option
for the following to work.

Don't needlessly chdir to SRCDIR.  Only a few documents
need CD_HACK, and those that need it either use refer(1)
or .PSPIC macro which internally uses the .psbb call.

10 files changed, 53 insertions, 59 deletions

diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index 8471899..8dd5e41 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -1,12 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	psd/01.cacm
-SRCS=	p.mac p1 p2 p3 p4 p5 p6
-EXTRA=	ref.bib
-MACROS=	-ms
-
-USE_REFER=	yes
-USE_TBL=	yes
+VOLUME=		psd/01.cacm
+SRCS=		p.mac p1 p2 p3 p4 p5 p6
+EXTRA=		ref.bib
+MACROS=		-ms
+USE_REFER=	YES
+USE_TBL=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index e9baddf..67e415f 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -1,13 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	psd/02.implement
-SRCS=	implement
-EXTRA=	ref.bib
-MACROS=	-ms
-
-USE_PIC=	yes
-USE_REFER=	yes
-USE_SOELIM=	yes
+VOLUME=		psd/02.implement
+SRCS=		implement
+EXTRA=		ref.bib
+MACROS=		-ms
+USE_PIC=	YES
+USE_REFER=	YES
+USE_SOELIM=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index b266f9b..fdc38a7 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 VOLUME=	psd/12.make
-SRCS=	tutorial.ms
+SRCS=	stubs tutorial.ms
 MACROS=	-ms
 SRCDIR=	${.CURDIR}/../../../../usr.bin/make/PSD.doc
 
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 293ead5..9dc4a1d 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -1,11 +1,11 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 # $FreeBSD$
 
-VOLUME=	psd/15.yacc
-SRCS=	ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
-EXTRA=	ref.bib
-MACROS=	-ms
-
-USE_REFER=	yes
+VOLUME=		psd/15.yacc
+SRCS=		ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 ssA ssB ssa ssb ssc ssd
+EXTRA=		ref.bib
+MACROS=		-ms
+USE_REFER=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index d383228..4d14019 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-VOLUME=	psd/22.rpcgen
-SRCS=	rpcgen.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_TBL=	yes
+VOLUME=		psd/22.rpcgen
+SRCS=		stubs rpcgen.ms
+MACROS=		-ms
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 16247c8..00e15d8 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
-VOLUME=	psd/23.rpc
-SRCS=	rpc.prog.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_TBL=	yes
-USE_PIC=	yes
+VOLUME=		psd/23.rpc
+SRCS=		stubs rpc.prog.ms
+MACROS=		-ms
+USE_TBL=	YES
+USE_PIC=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 8e4f218..2338152 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-VOLUME=	psd/24.xdr
-SRCS=	xdr.nts.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_EQN=	yes
+VOLUME=		psd/24.xdr
+SRCS=		stubs xdr.nts.ms
+MACROS=		-ms
+USE_EQN=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index b2281b2..07e5ec1 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-VOLUME=	psd/25.xdrrfc
-SRCS=	xdr.rfc.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_TBL=	yes
+VOLUME=		psd/25.xdrrfc
+SRCS=		stubs xdr.rfc.ms
+MACROS=		-ms
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index b61fb9f..233aa99 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-VOLUME=	psd/26.rpcrfc
-SRCS=	rpc.rfc.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_TBL=	yes
+VOLUME=		psd/26.rpcrfc
+SRCS=		stubs rpc.rfc.ms
+MACROS=		-ms
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index e01f6af..3eaa6e8 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
-VOLUME=	psd/27.nfsrfc
-SRCS=	nfs.rfc.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
-
-USE_TBL=	yes
+VOLUME=		psd/27.nfsrfc
+SRCS=		stubs nfs.rfc.ms
+MACROS=		-ms
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../lib/libc/rpc/PSD.doc
 
 .include <bsd.doc.mk>