Make all these format under the new scheme. I haven't had a chance to

test the -me stuff, so it's still disabled for now.

14 files changed, 97 insertions, 71 deletions

diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
new file mode 100644
index 0000000..2783d81
--- /dev/null
+++ b/share/doc/papers/Makefile
@@ -0,0 +1,8 @@
+#	$Id$
+
+# nqnfs requires -me
+
+SUBDIR=	beyond4.3 diskperf fsinterface kernmalloc kerntune memfs \
+	newvm px relengr sysperf
+
+.include <bsd.subdir.mk>
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index bb30a1a..7f9858e 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,10 +1,10 @@
-#	@(#)Makefile	5.2 (Berkeley) 6/8/93
+#	From: @(#)Makefile	5.2 (Berkeley) 6/8/93
+#	$Id$
 
+VOLUME=	papers
 SRCS=	beyond43.ms
 DOC=	beyond43
 MACROS=	-ms
-
-paper.ps: ${SRCS}
-	${TBL} ${.CURDIR}/${SRCS} | ${ROFF} > ${.TARGET}
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 4370f81..1b9ccd3 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,11 +1,11 @@
-#	@(#)Makefile	6.3 (Berkeley) 6/8/93
+#	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/diskperf
+VOLUME=	papers
+DOC=	diskperf
 SRCS=	abs.ms motivation.ms equip.ms methodology.ms tests.ms results.ms \
 	conclusions.ms appendix.ms
 MACROS=	-ms
-
-paper.ps: ${SRCS}
-	${TBL} ${SRCS} | ${ROFF} > ${.TARGET}
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index 1f63b6e..3eccadd 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,10 +1,10 @@
-#	@(#)Makefile	5.3 (Berkeley) 6/8/93
+#	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/fsinterface
+VOLUME=	papers
+DOC=	fsinterface
 SRCS=	fsinterface.ms
 MACROS=	-ms
-
-paper.ps: ${SRCS}
-	${TBL} ${SRCS} | ${ROFF} > ${.TARGET}
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index 8966f36..7c97c82 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,11 +1,20 @@
-#	@(#)Makefile	1.8 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/kernmalloc
-SRCS=	kernmalloc.t appendix.t
+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
 
-paper.ps: ${SRCS} alloc.fig usage.tbl
-	${SOELIM} ${SRCS} | ${TBL} | ${PIC} | ${EQN} | ${GRIND} | \
-	    ${ROFF} > ${.TARGET}
+kernmalloc.ms:	kernmalloc.t alloc.fig usage.tbl
+	(cd ${.CURDIR}; ${SOELIM} kernmalloc.t) > ${.TARGET}
+
+appendix.ms:	appendix.t
+	vgrind -f < ${.CURDIR}/appendix.t > ${.TARGET}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index f1d21cd..605d782 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,10 +1,13 @@
-#	@(#)Makefile	1.5 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.5 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/kerntune
+VOLUME=	papers
+DOC=	kerntune
 SRCS=	0.t 1.t 2.t 3.t 4.t
 MACROS=	-ms
-
-paper.ps: ${SRCS}
-	${SOELIM} ${SRCS} | ${PIC} | ${TBL} | ${EQN} | ${ROFF} > ${.TARGET}
+USE_SOELIM=	yes
+USE_PIC=	yes
+USE_TBL=	yes
+USE_EQN=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile
index 3e67998..bdc607d8 100644
--- a/share/doc/papers/memfs/Makefile
+++ b/share/doc/papers/memfs/Makefile
@@ -1,22 +1,22 @@
-#	@(#)Makefile	1.8 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/memfs
-SRCS=	0.t 1.t
+VOLUME=	papers
+DOC=	memfs
+SRCS=	tmac.srefs paper.t
 MACROS=	-ms
-REFER=	refer -n -e -l -s -p ref.bib
+REFER=	refer -n -e -l -s -p ${.CURDIR}/ref.bib
 EXTRA=	ref.bib A.t tmac.srefs
 CLEANFILES=ref.bib.i A.gt paper.t
+SRCDIR=	${.OBJDIR}	# ack!
 
-paper.ps: paper.t
-	${ROFF} tmac.srefs paper.t > ${.TARGET}
+paper.t: 0.t 1.t ${.OBJDIR}/ref.bib.i ${.OBJDIR}/A.gt
+	${REFER} ${.CURDIR}/0.t ${.CURDIR}/1.t A.gt > ${.TARGET}
 
-paper.t: ${SRCS} ref.bib.i A.gt
-	${REFER} ${SRCS} A.gt > ${.TARGET}
+${.OBJDIR}/ref.bib.i ref.bib.i: ${.CURDIR}/ref.bib
+	${INDXBIB} ${.CURDIR}/ref.bib
 
-ref.bib.i: ref.bib
-	${INDXBIB} ref.bib
-
-A.gt: A.t
-	${GRIND} < A.t > A.gt
+${.OBJDIR}/A.gt A.gt: ${.CURDIR}/A.t
+	${GRIND} < ${.CURDIR}/A.t > A.gt
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 8def3b2..2bddf9d 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,10 +1,10 @@
-#	@(#)Makefile	1.4 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.4 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/newvm
+VOLUME=	papers
+DOC=	newvm
 SRCS=	0.t 1.t a.t
 MACROS=	-ms
-
-paper.ps: ${SRCS}
-	${TBL} ${SRCS} | ${ROFF} > ${.TARGET}
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 37530fa..316cdd7 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,10 +1,11 @@
-#	@(#)Makefile	8.1 (Berkeley) 4/20/94
+#	From: @(#)Makefile	8.1 (Berkeley) 4/20/94
+#	$Id$
 
-DIR=	papers/nqnfs
+VOLUME=	papers
+DOC=	nqnfs
 SRCS=	nqnfs.me
 MACROS=	-me
-
-paper.ps: ${SRCS}
-	${PIC} ${SRCS} | ${TBL} | ${ROFF} > ${.TARGET}
+USE_PIC=	yes
+USE_TBL=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 33bb3f1..f7282e5 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,15 +1,18 @@
-#	@(#)Makefile	5.3 (Berkeley) 6/8/93
+#	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/px
+VOLUME=	papers
+DOC=	px
 SRCS=	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 tmac.p
 CLEANFILES+=fig2.3.n
+DPADD+=	fig2.3.n
 
-paper.ps: ${SRCS} fig2.3.n
-	${SOELIM} ${SRCS} | ${TBL} | ${ROFF} > ${.TARGET}
+USE_SOELIM=	yes
+USE_TBL=	yes
 
 fig2.3.n: fig2.3.raw
-	sort fig2.3.raw >fig2.3.n
+	sort ${.CURDIR}/fig2.3.raw >fig2.3.n
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/table2.3.n b/share/doc/papers/px/table2.3.n
index 51796ae..974dd7e 100644
--- a/share/doc/papers/px/table2.3.n
+++ b/share/doc/papers/px/table2.3.n
@@ -41,5 +41,5 @@ _
 Mnemonic	Reference	Description
 =
 .TH
-.so fig2.3.n
+.so obj/fig2.3.n
 .TE
diff --git a/share/doc/papers/px/tmac.p b/share/doc/papers/px/tmac.p
index b6f381a..8836d41 100644
--- a/share/doc/papers/px/tmac.p
+++ b/share/doc/papers/px/tmac.p
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)tmac.p	5.2 (Berkeley) 4/17/91
 .\"
-'if \n(FM=0 'so /usr/lib/tmac/tmac.s
+'if \n(FM=0 'so /usr/share/tmac/tmac.s
 .if n .nr FM 1.2i
 .if t .tr *\(**=\(eq/\(sl+\(pl
 .bd S B 3
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index ba57b0d..da1b8bf 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,11 +1,12 @@
-#	@(#)Makefile	1.6 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/relengr
+VOLUME=	papers
+DOC=	releng
 SRCS=	0.t 1.t 2.t 3.t
 MACROS=	-ms
 EXTRA=	ref.bib tmac.srefs
 
-paper.ps: ${SRCS}
-	${REFER} ${SRCS} | ${ROFF} > ${.TARGET}
+USE_REFER=	yes
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index b65852bf..ae567bc 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,22 +1,23 @@
-#	@(#)Makefile	1.6 (Berkeley) 6/8/93
+#	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
+#	$Id$
 
-DIR=	papers/sysperf
+VOLUME=	papers
+DOC=	sysperf
 MACROS= -ms
-SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
+LSRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
 EXTRA=	a1.t a2.t
-OBJS=	paper.tmp appendix.tmp
-CLEANFILES+=${OBJS}
+SRCS=	paper.tmp appendix.tmp
+CLEANFILES+=${SRCS}
+SRCDIR=	${.OBJDIR}
+USE_EQN=	yes
 
-paper.ps: ${OBJS}
-	${ROFF} ${OBJS} > ${.TARGET}
-
-paper.tmp: ${SRCS}
-	${TBL} ${SRCS} | ${EQN} > paper.tmp
+paper.tmp: ${LSRCS}
+	(cd ${.CURDIR}; ${TBL} ${LSRCS}) > paper.tmp
 
 appendix.tmp: a1.t a2.t
-	${GRIND} -f a1.t |  awk '/\.\(\)/{ cnt = 2 } \
+	${GRIND} -f ${.CURDIR}/a1.t |  awk '/\.\(\)/{ cnt = 2 } \
 	   { if (cnt) cnt -= 1; else print $$0; } ' > appendix.tmp
-	${GRIND} -f -lcsh a2.t |  awk '/\.\(\)/{ cnt = 2 } \
+	${GRIND} -f -lcsh ${.CURDIR}/a2.t |  awk '/\.\(\)/{ cnt = 2 } \
 	   { if (cnt) cnt -= 1; else print $$0; } ' >> appendix.tmp
 
 .include <bsd.doc.mk>