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.

5 files changed, 27 insertions, 38 deletions

diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index e71a444..001bb47 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,27 +1,25 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
 # $FreeBSD$
 
-VOLUME=	usd/13.viref
-SRCS=	vi.ref
-EXTRA=	ex.cmd.roff ref.so set.opt.roff vi.cmd.roff
-OBJS=	index.so
-MACROS=	-me -U
-CLEANFILES+=index index.so
-USE_SOELIM=	yes
-USE_SOELIMPP=	yes
-USE_TBL=	yes
-SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
+VOLUME=		usd/13.viref
+SRCS=		vi.ref
+EXTRA=		ex.cmd.roff ref.so set.opt.roff vi.cmd.roff index.so
+MACROS=		-me
+CLEANFILES=	index index.so
+TRFLAGS=	-U		# this is to hide warnings only
+USE_SOELIM=	YES
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref
 
 # Build index.so as a side-effect of building the paper.
-index.so: ${SRCS} ${EXTRA}
-	(cd ${SRCDIR}; ${SOELIMPP} -e 's:^\.so index.so$$::' ${SRCS}) | \
-	${ROFF} > /dev/null
+index.so: ${SRCS} ${EXTRA:Nindex.so}
+	(cd ${SRCDIR}; sed -e 's:^\.so index.so$$::' ${SRCS}) | ${ROFF} -U -z
 	sed -e 's/MINUSSIGN/-/' \
 	    -e 's/DOUBLEQUOTE/""/' \
 	    -e "s/SQUOTE/'/" \
 	    -e 's/ /__SPACE/g' < index | \
 	sort -u '-t	' -k 1,1 -k 2n | awk -f ${SRCDIR}/merge.awk | \
 	sed -e 's/__SPACE/ /g' \
-	    -e "s/^\\(['\\.]\\)/\\\\\&\\1/" > index.so 
+	    -e "s/^\\(['\\.]\\)/\\\\\&\\1/" > index.so
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index 7378d09..4966e36 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,14 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	usd/19.memacros
-SRCS=	meintro.me-sed
-MACROS=	-me
-SRCDIR=	${.OBJDIR}
-
-GROFFDIR=${.CURDIR}/../../../../contrib/groff
-
-.PATH:	${GROFFDIR}/doc
+VOLUME=		usd/19.memacros
+SRCS=		meintro.me-sed
+MACROS=		-me
+GROFFDIR=	${.CURDIR}/../../../../contrib/groff
+SRCDIR=		${GROFFDIR}/doc
 
 version=`cat ${GROFFDIR}/VERSION`
 revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
@@ -16,6 +13,6 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
 meintro.me-sed: meintro.me
 	sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET}
 
-CLEANFILES+=${SRCS}
+CLEANFILES=	${SRCS}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index f4bf738..af30e9b 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,14 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	usd/20.meref
-SRCS=	meref.me-sed
-MACROS=	-me
-SRCDIR=	${.OBJDIR}
-
-GROFFDIR=${.CURDIR}/../../../../contrib/groff
-
-.PATH:	${GROFFDIR}/doc
+VOLUME=		usd/20.meref
+SRCS=		meref.me-sed
+MACROS=		-me
+GROFFDIR=	${.CURDIR}/../../../../contrib/groff
+SRCDIR=		${GROFFDIR}/doc
 
 version=`cat ${GROFFDIR}/VERSION`
 revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
@@ -16,6 +13,6 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' ${GROFFDIR}/REVISION`
 meref.me-sed: meref.me
 	sed -e "s;@VERSION@;$(version)$(revision);" ${.ALLSRC} > ${.TARGET}
 
-CLEANFILES+=${SRCS}
+CLEANFILES=	${SRCS}
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile
index e4fbf35..0f9bfa2 100644
--- a/share/doc/usd/21.troff/Makefile
+++ b/share/doc/usd/21.troff/Makefile
@@ -1,10 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 # $FreeBSD$
 
-VOLUME=	usd/21.troff
-SRCS=	m0 m0a m1 m2 m3 m4 m5
-SRCS+=	table1 table2
-MACROS= m.mac
-USE_TBL=YES
+VOLUME=		usd/21.troff
+SRCS=		m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
+USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/22.trofftut/Makefile b/share/doc/usd/22.trofftut/Makefile
index 8ccc0bd..a3f32fd 100644
--- a/share/doc/usd/22.trofftut/Makefile
+++ b/share/doc/usd/22.trofftut/Makefile
@@ -41,6 +41,5 @@ VOLUME=	usd/22.trofftut
 SRCS=	tt.mac tt00 tt01 tt02 tt03 tt04 tt05 tt06 tt07 tt08 tt09 tt10 \
 	tt11 tt12 tt13 tt14 ttack ttcharset ttindex
 MACROS=	-ms
-SRCDIR=	${.OBJDIR}
 
 .include <bsd.doc.mk>