Use a single style for share/doc/ makefiles.

10 files changed, 25 insertions, 32 deletions

diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index c455e3f..e917c82 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,10 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
 # $FreeBSD$
 
-VOLUME=	usd/04.csh
-SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
-MACROS= -ms
-SRCDIR=	${.CURDIR}/../../../../bin/csh/USD.doc
-USE_SOELIM=	yes
+VOLUME=		usd/04.csh
+SRCS=		tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
+MACROS=		-ms
+USE_SOELIM=	YES
+SRCDIR=		${.CURDIR}/../../../../bin/csh/USD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index b4eb7d6..f858309 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,12 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	usd/07.mail
-SRCS=	mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
-	mail7.nr mail8.nr mail9.nr maila.nr
-MACROS=	-me
-SRCDIR=	${.CURDIR}/../../../../usr.bin/mail/USD.doc
-
-USE_TBL=	yes
+VOLUME=		usd/07.mail
+SRCS=		mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
+		mail7.nr mail8.nr mail9.nr maila.nr
+MACROS=		-me
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../usr.bin/mail/USD.doc
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 9b6015c..17fbbec 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-SRCS=	ex.summary
-DOC=	summary
-
+DOC=		summary
+SRCS=		ex.summary
 USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index ea96ddf..ab44651 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,11 +1,11 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 # $FreeBSD$
 
-VOLUME=	usd/11.edit
-SRCS=	edittut.ms
-MACROS=	-ms
-SRCDIR=	${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/edit
-USE_TBL=	yes
+VOLUME=		usd/11.edit
+SRCS=		edittut.ms
+MACROS=		-ms
+USE_TBL=	YES
+SRCDIR=		${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/edit
 
 # index for versatec is different from the one in edit.tut
 # because the fonts are different and entries reference page
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index 0f885a0..7b2c080 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	vi viapwh summary 
+SUBDIR=	vi viapwh summary
 
 .include <bsd.subdir.mk>
 
diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc
index d96b811..42d417f 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -2,3 +2,4 @@
 
 VOLUME=		usd/12.vi
 MACROS=		-ms
+SRCDIR=		${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index f931661..ab55a90 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
-SRCS=	vi.summary
-DOC=	summary
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
-
+DOC=		summary
+SRCS=		vi.summary
 USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index f740dc2..3809036 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,9 +1,6 @@
 # $FreeBSD$
 
-SRCS=	vi.in vi.chars
-#DOC=	tutorial
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
-
+SRCS=		vi.in vi.chars
 USE_TBL=	YES
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index baad1ce..f20582d 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
-SRCS=	vi.apwh.ms
 DOC=	viapwh
-SRCDIR=	${.CURDIR}/../../../../../contrib/nvi/docs/USD.doc/vitut
+SRCS=	vi.apwh.ms
 
 .include <bsd.doc.mk>
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index 283b69d..ec0c508 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 VOLUME=	usd
-SRCS=	contents.ms
 DOC=	contents
+SRCS=	contents.ms
 MACROS=	-ms
 
 .include <bsd.doc.mk>