summaryrefslogtreecommitdiffstats
path: root/share/doc
diff options
context:
space:
mode:
Diffstat (limited to 'share/doc')
-rw-r--r--share/doc/papers/beyond4.3/Makefile2
-rw-r--r--share/doc/papers/devfs/Makefile10
-rw-r--r--share/doc/papers/diskperf/Makefile12
-rw-r--r--share/doc/papers/kerntune/Makefile18
-rw-r--r--share/doc/papers/malloc/Makefile7
-rw-r--r--share/doc/papers/nqnfs/Makefile12
-rw-r--r--share/doc/psd/05.sysman/Makefile11
-rw-r--r--share/doc/psd/06.Clang/Makefile7
-rw-r--r--share/doc/psd/13.rcs/rcs/Makefile6
-rw-r--r--share/doc/psd/13.rcs/rcs_func/Makefile2
-rw-r--r--share/doc/psd/16.lex/Makefile7
-rw-r--r--share/doc/psd/18.gprof/Makefile21
-rw-r--r--share/doc/psd/20.ipctut/Makefile19
-rw-r--r--share/doc/psd/21.ipc/Makefile9
-rw-r--r--share/doc/psd/28.cvs/Makefile12
-rw-r--r--share/doc/psd/contents/Makefile2
-rw-r--r--share/doc/psd/title/Makefile2
-rw-r--r--share/doc/smm/01.setup/Makefile9
-rw-r--r--share/doc/smm/02.config/Makefile11
-rw-r--r--share/doc/smm/05.fastfs/Makefile11
-rw-r--r--share/doc/smm/08.sendmailop/Makefile14
-rw-r--r--share/doc/smm/12.timed/Makefile14
-rw-r--r--share/doc/smm/contents/Makefile2
-rw-r--r--share/doc/smm/title/Makefile2
-rw-r--r--share/doc/usd/04.csh/Makefile10
-rw-r--r--share/doc/usd/07.mail/Makefile13
-rw-r--r--share/doc/usd/10.exref/summary/Makefile5
-rw-r--r--share/doc/usd/11.vitut/Makefile10
-rw-r--r--share/doc/usd/12.vi/Makefile2
-rw-r--r--share/doc/usd/12.vi/Makefile.inc1
-rw-r--r--share/doc/usd/12.vi/summary/Makefile6
-rw-r--r--share/doc/usd/12.vi/vi/Makefile5
-rw-r--r--share/doc/usd/12.vi/viapwh/Makefile3
-rw-r--r--share/doc/usd/contents/Makefile2
34 files changed, 129 insertions, 150 deletions
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 831c055..7d1fa49 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
VOLUME= papers
-SRCS= beyond43.ms
DOC= beyond43
+SRCS= beyond43.ms
MACROS= -ms
.include <bsd.doc.mk>
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 830fd0f..8683c94 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/share/doc/papers/devfs/Makefile
@@ -1,9 +1,9 @@
# $FreeBSD$
-VOLUME= papers
-DOC= devfs
-SRCS= paper.me
-MACROS= -me
-USE_PIC= yes
+VOLUME= papers
+DOC= devfs
+SRCS= paper.me
+MACROS= -me
+USE_PIC= YES
.include <bsd.doc.mk>
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 2dbe2a3..41acd7a 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,11 +1,11 @@
# From: @(#)Makefile 6.3 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= papers
-DOC= diskperf
-SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms results.ms \
- conclusions.ms appendix.ms
-MACROS= -ms
-USE_TBL= yes
+VOLUME= papers
+DOC= diskperf
+SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms \
+ results.ms conclusions.ms appendix.ms
+MACROS= -ms
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 1e1bcf3..53e5a49 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,14 +1,14 @@
# From: @(#)Makefile 1.5 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= papers
-DOC= kerntune
-SRCS= 0.t 1.t 2.t 3.t 4.t
-EXTRA= fig2.pic
-MACROS= -ms
-USE_SOELIM= yes
-USE_PIC= yes
-USE_TBL= yes
-USE_EQN= yes
+VOLUME= papers
+DOC= kerntune
+SRCS= 0.t 1.t 2.t 3.t 4.t
+EXTRA= fig2.pic
+MACROS= -ms
+USE_EQN= YES
+USE_PIC= YES
+USE_SOELIM= YES
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 5e2c318..00e1e3d 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -3,11 +3,8 @@
VOLUME= papers
DOC= malloc
-SRCS= abs.ms intro.ms kernel.ms malloc.ms problems.ms alternatives.ms
-SRCS+= performance.ms implementation.ms conclusion.ms
+SRCS= abs.ms intro.ms kernel.ms malloc.ms problems.ms alternatives.ms \
+ performance.ms implementation.ms conclusion.ms
MACROS= -ms
-edit:
- vi ${SRCS}
-
.include <bsd.doc.mk>
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index a937ed7..788873c 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,11 +1,11 @@
# From: @(#)Makefile 8.1 (Berkeley) 4/20/94
# $FreeBSD$
-VOLUME= papers
-DOC= nqnfs
-SRCS= nqnfs.me
-MACROS= -me
-USE_PIC= yes
-USE_TBL= yes
+VOLUME= papers
+DOC= nqnfs
+SRCS= nqnfs.me
+MACROS= -me
+USE_PIC= YES
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index fbba0b7..48b9414 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,11 +1,10 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= psd/05.sysman
-SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
- 2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t
-MACROS= -ms
-
-USE_TBL= yes
+VOLUME= psd/05.sysman
+SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
+ 2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t
+MACROS= -ms
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index 3e06914..cbd9af2 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -1,10 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= psd/06.Clang
-SRCS= Clang.ms
-MACROS= -ms
-
+VOLUME= psd/06.Clang
+SRCS= Clang.ms
+MACROS= -ms
USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile
index 4ef6e74..41a630e 100644
--- a/share/doc/psd/13.rcs/rcs/Makefile
+++ b/share/doc/psd/13.rcs/rcs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-SRCS= rcs.ms
-USE_PIC= yes
-USE_TBL= yes
+SRCS= rcs.ms
+USE_PIC= YES
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/13.rcs/rcs_func/Makefile b/share/doc/psd/13.rcs/rcs_func/Makefile
index 7c78765..09e5a9b 100644
--- a/share/doc/psd/13.rcs/rcs_func/Makefile
+++ b/share/doc/psd/13.rcs/rcs_func/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCS= rcs_func.ms
DOC= rcs_func
+SRCS= rcs_func.ms
.include <bsd.doc.mk>
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 15b82b2..4049bd6 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -1,10 +1,9 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= psd/16.lex
-SRCS= lex.ms
-MACROS= -ms
-
+VOLUME= psd/16.lex
+SRCS= lex.ms
+MACROS= -ms
USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 6ef8489..30ec4e0 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,16 +1,15 @@
# From: @(#)Makefile 8.1 (Berkeley) 8/14/93
# $FreeBSD$
-VOLUME= psd/18.gprof
-SRCS= header.me abstract.me intro.me profiling.me gathering.me \
- postp.me present.me refs.me
-EXTRA= postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic
-MACROS= -me
-SRCDIR= ${.CURDIR}/../../../../usr.bin/gprof/PSD.doc
-
-USE_SOELIM= yes
-USE_PIC= yes
-USE_TBL= yes
-USE_EQN= yes
+VOLUME= psd/18.gprof
+SRCS= header.me abstract.me intro.me profiling.me gathering.me \
+ postp.me present.me refs.me
+EXTRA= postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic
+MACROS= -me
+USE_SOELIM= YES
+USE_PIC= YES
+USE_TBL= YES
+USE_EQN= YES
+SRCDIR= ${.CURDIR}/../../../../usr.bin/gprof/PSD.doc
.include <bsd.doc.mk>
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index ce21508..aabef10 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,15 +1,14 @@
# From: @(#)Makefile 8.1 (Berkeley) 8/14/93
# $FreeBSD$
-VOLUME= psd/20.ipctut
-SRCS= tutor.me
-MACROS= -me
-EXTRA= dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \
- socketpair.c strchkread.c streamread.c streamwrite.c \
- udgramread.c udgramsend.c ustreamread.c ustreamwrite.c
-
-USE_SOELIM= yes
-USE_PIC= yes
-USE_TBL= yes
+VOLUME= psd/20.ipctut
+SRCS= tutor.me
+MACROS= -me
+EXTRA= dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \
+ socketpair.c strchkread.c streamread.c streamwrite.c \
+ udgramread.c udgramsend.c ustreamread.c ustreamwrite.c
+USE_SOELIM= YES
+USE_PIC= YES
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 08e5304..67ceab8 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,10 +1,9 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= psd/21.ipc
-SRCS= 0.t 1.t 2.t 3.t 4.t 5.t
-MACROS= -ms
-
-USE_TBL= yes
+VOLUME= psd/21.ipc
+SRCS= 0.t 1.t 2.t 3.t 4.t 5.t
+MACROS= -ms
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile
index d09702e..92f9339 100644
--- a/share/doc/psd/28.cvs/Makefile
+++ b/share/doc/psd/28.cvs/Makefile
@@ -1,10 +1,10 @@
# $FreeBSD$
-VOLUME= psd/28.cvs
-MACROS= -ms
-SRCDIR= ${.CURDIR}/../../../../contrib/cvs/doc
-SRCS= cvs-paper.ms
-USE_PIC= yes
-USE_TBL= yes
+VOLUME= psd/28.cvs
+SRCS= cvs-paper.ms
+MACROS= -ms
+USE_PIC= YES
+USE_TBL= YES
+SRCDIR= ${.CURDIR}/../../../../contrib/cvs/doc
.include <bsd.doc.mk>
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 5c4512e..38864e9 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
VOLUME= psd
-SRCS= contents.ms
DOC= contents
+SRCS= contents.ms
MACROS= -ms
.include <bsd.doc.mk>
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index fde1e98..c125c08 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
VOLUME= psd
-SRCS= Title
DOC= Title
+SRCS= Title
# unroff(1) requires a macro package as an argument
.if defined(PRINTERDEVICE) && ${PRINTERDEVICE} == "html"
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index b11596e..3572f4c 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,10 +1,9 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/27/93
# $FreeBSD$
-VOLUME= smm/01.setup
-SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
-MACROS= -ms
-
-USE_TBL= yes
+VOLUME= smm/01.setup
+SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
+MACROS= -ms
+USE_TBL= YES
.include <bsd.doc.mk>
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index 949a352..e801d6b 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,11 +1,10 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= smm/02.config
-SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
-MACROS= -ms
-SRCDIR= ${.CURDIR}/../../../../usr.sbin/config/SMM.doc
-
-USE_TBL= yes
+VOLUME= smm/02.config
+SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
+MACROS= -ms
+USE_TBL= YES
+SRCDIR= ${.CURDIR}/../../../../usr.sbin/config/SMM.doc
.include <bsd.doc.mk>
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index 7928d2d..4454d63 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,11 +1,10 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= smm/05.fastfs
-SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t
-MACROS= -ms
-
-USE_TBL= yes
-USE_EQN= yes
+VOLUME= smm/05.fastfs
+SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t
+MACROS= -ms
+USE_TBL= YES
+USE_EQN= YES
.include <bsd.doc.mk>
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 2ed8acb..5770c96 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -3,13 +3,11 @@
MAINTAINER= gshapiro@FreeBSD.org
-VOLUME= smm/08.sendmailop
-SRCS= op.me
-MACROS= -me
-
-SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/op
-
-USE_PIC= yes
-USE_EQN= yes
+VOLUME= smm/08.sendmailop
+SRCS= op.me
+MACROS= -me
+USE_PIC= YES
+USE_EQN= YES
+SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/op
.include <bsd.doc.mk>
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index 797a483..b926b87 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,12 +1,12 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-VOLUME= smm/12.timed
-SRCS= timed.ms
-EXTRA= date loop time unused
-MACROS= -ms
-SRCDIR= ${.CURDIR}/../../../../usr.sbin/timed/SMM.doc/timed
-USE_SOELIM= yes
-USE_TBL= yes
+VOLUME= smm/12.timed
+SRCS= timed.ms
+EXTRA= date loop time unused
+MACROS= -ms
+USE_SOELIM= YES
+USE_TBL= YES
+SRCDIR= ${.CURDIR}/../../../../usr.sbin/timed/SMM.doc/timed
.include <bsd.doc.mk>
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index 1c8d454..aa73faa 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
VOLUME= smm
-SRCS= contents.ms
DOC= contents
+SRCS= contents.ms
MACROS= -ms
.include <bsd.doc.mk>
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index b6718e5..b2bbe8f 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
VOLUME= smm
-SRCS= Title
DOC= Title
+SRCS= Title
# unroff(1) requires a macro package as an argument
.if defined(PRINTERDEVICE) && ${PRINTERDEVICE} == "html"
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>
OpenPOWER on IntegriCloud