11 files changed, 22 insertions, 22 deletions
diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 524ee04ea347..9bdd4874fb20 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/share/doc/papers/bufbio/Makefile
@@ -5,7 +5,7 @@ DOC=		bio
 SRCS=		bio.ms-patched
 EXTRA=		bufsize.eps
 MACROS=		-ms
-USE_PIC=	YES
+USE_PIC=
 CLEANFILES=	bio.ms-patched
 
 bio.ms-patched: bio.ms
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 8683c94c20aa..53a79fccab9a 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/share/doc/papers/devfs/Makefile
@@ -4,6 +4,6 @@ VOLUME=		papers
 DOC=		devfs
 SRCS=		paper.me
 MACROS=		-me
-USE_PIC=	YES
+USE_PIC=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index 41acd7a8b0fa..7f7670c45533 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -6,6 +6,6 @@ DOC=		diskperf
 SRCS=		abs.ms motivation.ms equip.ms methodology.ms tests.ms \
 		results.ms conclusions.ms appendix.ms
 MACROS=		-ms
-USE_TBL=	YES
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 8e9fd287d791..5d493542ea98 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -5,7 +5,7 @@ DOC=		jail
 SRCS=		paper.ms-patched
 EXTRA=		implementation.ms mgt.ms future.ms jail01.eps
 MACROS=		-ms
-USE_SOELIM=	YES
+USE_SOELIM=
 CLEANFILES=	paper.ms-patched
 
 paper.ms-patched: paper.ms
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index ebb5cdefcf91..e706f0a38962 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -6,10 +6,10 @@ 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
+USE_EQN=
+USE_PIC=
+USE_SOELIM=
+USE_TBL=
 CLEANFILES=	appendix.ms
 
 appendix.ms: appendix.t
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index 53e5a4987030..33416d6e3c1b 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -6,9 +6,9 @@ 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
+USE_EQN=
+USE_PIC=
+USE_SOELIM=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 788873c921fc..f968068f4878 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -5,7 +5,7 @@ VOLUME=		papers
 DOC=		nqnfs
 SRCS=		nqnfs.me
 MACROS=		-me
-USE_PIC=	YES
-USE_TBL=	YES
+USE_PIC=
+USE_TBL=
 
 .include <bsd.doc.mk>
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 54a8e1c39cb2..aa314495a7c5 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -7,8 +7,8 @@ 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
+USE_SOELIM=
+USE_TBL=
 CLEANFILES=	fig2.3.n
 
 fig2.3.n: fig2.3.raw
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index ad7e38ed4e9d..88ab5afcc287 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -6,7 +6,7 @@ DOC=		releng
 SRCS=		stubs 0.t 1.t 2.t 3.t
 EXTRA=		ref.bib
 MACROS=		-ms
-USE_REFER=	YES
+USE_REFER=
 CLEANFILES=	stubs
 
 stubs:
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index a6e89f538fbb..9ddbc9df5474 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -6,8 +6,8 @@ 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
+USE_EQN=
+USE_TBL=
 CLEANFILES=	appendix.tmp
 
 appendix.tmp: a1.t a2.t
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index 252dba347761..f6d158ba4034 100644
--- a/share/doc/papers/timecounter/Makefile
+++ b/share/doc/papers/timecounter/Makefile
@@ -9,9 +9,9 @@ SRCS=	tmac.usenix timecounter.ms-patched
 EXTRA=	fig1.eps fig2.eps fig3.eps fig4.eps fig5.eps gps.ps intr.ps
 MACROS=	-ms
 CLEANFILES=	timecounter.ms-patched
-USE_PIC=1
-USE_EQN=1
-USE_TBL=1
+USE_PIC=
+USE_EQN=
+USE_TBL=
 
 timecounter.ms-patched: timecounter.ms
 	sed -E -e 's;(gps|intr).ps;${.CURDIR}/&;' -e 's;fig[0-9].eps;${.CURDIR}/&;' \