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.

6 files changed, 50 insertions, 53 deletions

diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 507ad84..fa1fc74 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/share/doc/papers/bufbio/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
-USE_PIC=1
-VOLUME= papers
-DOC=    bio
-SRCS=   bio.ms
-MACROS= -ms
+VOLUME=		papers
+DOC=		bio
+SRCS=		bio.ms
+MACROS=		-ms
+USE_PIC=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 71406dd..00177c2 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -1,8 +1,11 @@
 # $FreeBSD$
-VOLUME= papers
-DOC=    jail
-SRCS=   paper.ms
-EXTRA=	implementation.ms mgt.ms future.ms
-MACROS= -ms
+
+VOLUME=		papers
+DOC=		jail
+SRCS=		paper.ms
+EXTRA=		implementation.ms mgt.ms future.ms
+MACROS=		-ms
+USE_SOELIM=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index cda9219..ebb5cde 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,20 +1,18 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	papers
-DOC=	kernmalloc
-SRCS=	kernmalloc.ms appendix.ms
-SRCDIR=	${.OBJDIR}	# ack!
-MACROS=	-ms
-USE_TBL=	yes
-USE_PIC=	yes
-USE_EQN=	yes
-CLEANFILES+=	kernmalloc.ms appendix.ms
+VOLUME=		papers
+DOC=		kernmalloc
+SRCS=		kernmalloc.t appendix.ms
+EXTRA=		alloc.fig usage.tbl
+MACROS=		-ms
+USE_EQN=	YES
+USE_PIC=	YES
+USE_SOELIM=	YES
+USE_TBL=	YES
+CLEANFILES=	appendix.ms
 
-kernmalloc.ms:	kernmalloc.t alloc.fig usage.tbl
-	(cd ${.CURDIR}; ${SOELIM} kernmalloc.t) > ${.TARGET}
-
-appendix.ms:	appendix.t
-	vgrind -f < ${.CURDIR}/appendix.t > ${.TARGET}
+appendix.ms: appendix.t
+	${GRIND} < ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 3a6cac7..54a8e1c 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,20 +1,17 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	papers
-DOC=	px
-SRCS=	tmac.p pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n
-EXTRA=	fig1.1.n fig1.2.n fig1.3.n fig2.3.raw fig2.4.n fig3.2.n \
-	fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n
-OBJS=	fig2.3.n
-CLEANFILES+=fig2.3.n
-MACROS= -ms
-
-USE_SOELIM=	yes
-USE_SOELIMPP=	yes
-USE_TBL=	yes
+VOLUME=		papers
+DOC=		px
+SRCS=		tmac.p pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n
+EXTRA=		fig1.1.n fig1.2.n fig1.3.n fig2.3.n fig2.4.n fig3.2.n \
+		fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n
+MACROS=		-ms
+USE_SOELIM=	YES
+USE_TBL=	YES
+CLEANFILES=	fig2.3.n
 
 fig2.3.n: fig2.3.raw
-	sort ${.CURDIR}/fig2.3.raw >fig2.3.n
+	sort ${.ALLSRC} >${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index b22844b..5898b5a 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,12 +1,12 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	papers
-DOC=	releng
-SRCS=	0.t 1.t 2.t 3.t
-MACROS=	-ms
-EXTRA=	ref.bib
-
-USE_REFER=	yes
+VOLUME=		papers
+DOC=		releng
+SRCS=		0.t 1.t 2.t 3.t
+EXTRA=		ref.bib
+MACROS=		-ms
+USE_REFER=	YES
+CD_HACK=	${.CURDIR}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index 8494857..a6e89f5 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,16 +1,14 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	papers
-DOC=	sysperf
-MACROS= -ms
-SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
-EXTRA=	a1.t a2.t
-SRCS+=	appendix.tmp
+VOLUME=		papers
+DOC=		sysperf
+SRCS=		0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.tmp
+EXTRA=		a1.t a2.t
+MACROS=		-ms
+USE_EQN=	YES
+USE_TBL=	YES
 CLEANFILES=	appendix.tmp
-SRCDIR=	${.OBJDIR}
-USE_EQN=	yes
-USE_TBL=	yes
 
 appendix.tmp: a1.t a2.t
 	${GRIND} ${.CURDIR}/a1.t |  awk '/\.\(\)/{ cnt = 2 } \