aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/Makefile1
-rw-r--r--share/Makefile.inc1
-rw-r--r--share/colldef/Makefile1
-rw-r--r--share/ctypedef/Makefile1
-rw-r--r--share/dict/Makefile1
-rw-r--r--share/doc/IPv6/Makefile1
-rw-r--r--share/doc/Makefile1
-rw-r--r--share/doc/legal/Makefile1
-rw-r--r--share/doc/legal/Makefile.armv71
-rw-r--r--share/doc/legal/imx/Makefile1
-rw-r--r--share/doc/legal/intel_ipw/Makefile1
-rw-r--r--share/doc/legal/intel_iwi/Makefile1
-rw-r--r--share/doc/legal/intel_iwlwififw/Makefile1
-rw-r--r--share/doc/legal/intel_iwn/Makefile1
-rw-r--r--share/doc/legal/intel_wpi/Makefile1
-rw-r--r--share/doc/legal/realtek/Makefile1
-rw-r--r--share/doc/llvm/Makefile1
-rw-r--r--share/doc/llvm/clang/Makefile1
-rw-r--r--share/doc/papers/Makefile1
-rw-r--r--share/doc/papers/beyond4.3/Makefile1
-rw-r--r--share/doc/papers/bufbio/Makefile1
-rw-r--r--share/doc/papers/contents/Makefile1
-rw-r--r--share/doc/papers/devfs/Makefile1
-rw-r--r--share/doc/papers/diskperf/Makefile1
-rw-r--r--share/doc/papers/fsinterface/Makefile1
-rw-r--r--share/doc/papers/jail/Makefile1
-rw-r--r--share/doc/papers/kernmalloc/Makefile1
-rw-r--r--share/doc/papers/kerntune/Makefile1
-rw-r--r--share/doc/papers/malloc/Makefile1
-rw-r--r--share/doc/papers/newvm/Makefile1
-rw-r--r--share/doc/papers/relengr/Makefile1
-rw-r--r--share/doc/papers/sysperf/Makefile1
-rw-r--r--share/doc/papers/timecounter/Makefile1
-rw-r--r--share/doc/pjdfstest/Makefile1
-rw-r--r--share/doc/psd/01.cacm/Makefile1
-rw-r--r--share/doc/psd/02.implement/Makefile1
-rw-r--r--share/doc/psd/03.iosys/Makefile1
-rw-r--r--share/doc/psd/04.uprog/Makefile1
-rw-r--r--share/doc/psd/05.sysman/Makefile1
-rw-r--r--share/doc/psd/06.Clang/Makefile1
-rw-r--r--share/doc/psd/12.make/Makefile1
-rw-r--r--share/doc/psd/15.yacc/Makefile1
-rw-r--r--share/doc/psd/16.lex/Makefile1
-rw-r--r--share/doc/psd/17.m4/Makefile1
-rw-r--r--share/doc/psd/18.gprof/Makefile1
-rw-r--r--share/doc/psd/20.ipctut/Makefile1
-rw-r--r--share/doc/psd/21.ipc/Makefile1
-rw-r--r--share/doc/psd/22.rpcgen/Makefile1
-rw-r--r--share/doc/psd/23.rpc/Makefile1
-rw-r--r--share/doc/psd/24.xdr/Makefile1
-rw-r--r--share/doc/psd/25.xdrrfc/Makefile1
-rw-r--r--share/doc/psd/26.rpcrfc/Makefile1
-rw-r--r--share/doc/psd/27.nfsrpc/Makefile1
-rw-r--r--share/doc/psd/Makefile1
-rw-r--r--share/doc/psd/contents/Makefile1
-rw-r--r--share/doc/psd/title/Makefile1
-rw-r--r--share/doc/smm/01.setup/Makefile1
-rw-r--r--share/doc/smm/02.config/Makefile1
-rw-r--r--share/doc/smm/03.fsck/Makefile1
-rw-r--r--share/doc/smm/04.quotas/Makefile1
-rw-r--r--share/doc/smm/05.fastfs/Makefile1
-rw-r--r--share/doc/smm/06.nfs/Makefile1
-rw-r--r--share/doc/smm/07.lpd/Makefile1
-rw-r--r--share/doc/smm/08.sendmailop/Makefile1
-rw-r--r--share/doc/smm/11.timedop/Makefile1
-rw-r--r--share/doc/smm/12.timed/Makefile1
-rw-r--r--share/doc/smm/18.net/Makefile1
-rw-r--r--share/doc/smm/Makefile1
-rw-r--r--share/doc/smm/contents/Makefile1
-rw-r--r--share/doc/smm/title/Makefile1
-rw-r--r--share/doc/usd/04.csh/Makefile1
-rw-r--r--share/doc/usd/05.dc/Makefile1
-rw-r--r--share/doc/usd/06.bc/Makefile1
-rw-r--r--share/doc/usd/07.mail/Makefile1
-rw-r--r--share/doc/usd/10.exref/Makefile1
-rw-r--r--share/doc/usd/10.exref/Makefile.inc1
-rw-r--r--share/doc/usd/10.exref/exref/Makefile1
-rw-r--r--share/doc/usd/10.exref/summary/Makefile1
-rw-r--r--share/doc/usd/11.vitut/Makefile1
-rw-r--r--share/doc/usd/12.vi/Makefile1
-rw-r--r--share/doc/usd/12.vi/Makefile.inc1
-rw-r--r--share/doc/usd/12.vi/summary/Makefile1
-rw-r--r--share/doc/usd/12.vi/vi/Makefile1
-rw-r--r--share/doc/usd/12.vi/viapwh/Makefile1
-rw-r--r--share/doc/usd/13.viref/Makefile1
-rw-r--r--share/doc/usd/18.msdiffs/Makefile1
-rw-r--r--share/doc/usd/19.memacros/Makefile1
-rw-r--r--share/doc/usd/20.meref/Makefile1
-rw-r--r--share/doc/usd/21.troff/Makefile1
-rw-r--r--share/doc/usd/Makefile1
-rw-r--r--share/doc/usd/contents/Makefile1
-rw-r--r--share/doc/usd/title/Makefile1
-rw-r--r--share/examples/FreeBSD_version/Makefile1
-rw-r--r--share/examples/find_interface/Makefile1
-rw-r--r--share/examples/hwpmc/Makefile1
-rw-r--r--share/examples/ipfilter/Makefile1
-rw-r--r--share/examples/kld/cdev/Makefile1
-rw-r--r--share/examples/kld/dyn_sysctl/Makefile1
-rw-r--r--share/examples/kld/firmware/Makefile1
-rw-r--r--share/examples/kld/firmware/fwconsumer/Makefile1
-rw-r--r--share/examples/kld/firmware/fwimage/Makefile1
-rw-r--r--share/examples/kld/khelp/Makefile1
-rw-r--r--share/examples/kld/random_adaptor/Makefile1
-rw-r--r--share/examples/kld/syscall/Makefile1
-rw-r--r--share/examples/libusb20/Makefile1
-rw-r--r--share/examples/libvgl/Makefile1
-rw-r--r--share/examples/perfmon/Makefile1
-rw-r--r--share/examples/pf/Makefile1
-rw-r--r--share/examples/scsi_target/Makefile1
-rw-r--r--share/examples/smbfs/Makefile1
-rw-r--r--share/examples/smbfs/print/Makefile1
-rw-r--r--share/examples/tests/Makefile1
-rw-r--r--share/examples/tests/tests/Makefile1
-rw-r--r--share/examples/tests/tests/atf/Makefile1
-rw-r--r--share/examples/tests/tests/plain/Makefile1
-rw-r--r--share/examples/tests/tests/tap/Makefile1
-rw-r--r--share/i18n/csmapper/Makefile.inc1
-rw-r--r--share/i18n/esdb/Makefile.inc1
-rw-r--r--share/keys/Makefile1
-rw-r--r--share/keys/pkg/Makefile1
-rw-r--r--share/keys/pkg/trusted/Makefile1
-rw-r--r--share/man/Makefile1
-rw-r--r--share/man/man1/Makefile1
-rw-r--r--share/man/man3/Makefile1
-rw-r--r--share/man/man3lua/Makefile1
-rw-r--r--share/man/man4/Makefile1
-rw-r--r--share/man/man4/man4.aarch64/Makefile1
-rw-r--r--share/man/man4/man4.arm/Makefile1
-rw-r--r--share/man/man4/man4.i386/Makefile1
-rw-r--r--share/man/man4/man4.powerpc/Makefile1
-rw-r--r--share/man/man5/Makefile1
-rw-r--r--share/man/man6/Makefile1
-rw-r--r--share/man/man7/Makefile1
-rw-r--r--share/man/man8/Makefile1
-rw-r--r--share/man/man9/Makefile1
-rw-r--r--share/misc/Makefile1
-rw-r--r--share/mk/Makefile1
-rw-r--r--share/numericdef/Makefile1
-rw-r--r--share/security/Makefile1
-rw-r--r--share/skel/Makefile1
-rw-r--r--share/snmp/Makefile1
-rw-r--r--share/snmp/mibs/Makefile1
-rw-r--r--share/syscons/Makefile1
-rw-r--r--share/syscons/Makefile.inc1
-rw-r--r--share/syscons/fonts/Makefile1
-rw-r--r--share/syscons/keymaps/Makefile1
-rw-r--r--share/syscons/scrnmaps/Makefile1
-rw-r--r--share/tabset/Makefile1
-rw-r--r--share/termcap/Makefile1
-rw-r--r--share/tests/Makefile1
-rw-r--r--share/timedef/Makefile1
-rw-r--r--share/vt/Makefile1
-rw-r--r--share/vt/fonts/Makefile1
-rw-r--r--share/vt/keymaps/Makefile1
-rw-r--r--share/zoneinfo/Makefile1
-rw-r--r--share/zoneinfo/tests/Makefile1
156 files changed, 0 insertions, 156 deletions
diff --git a/share/Makefile b/share/Makefile
index 5546f3e90c1b..a94fe6334709 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
# Do not include `info' in the SUBDIR list, it is handled separately.
diff --git a/share/Makefile.inc b/share/Makefile.inc
index 121787f4b10b..31d47bde05d9 100644
--- a/share/Makefile.inc
+++ b/share/Makefile.inc
@@ -1,4 +1,3 @@
-
BINDIR?= ${SHAREDIR}
BINOWN= ${SHAREOWN}
BINGRP= ${SHAREGRP}
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index dd310b699dd5..5d608056f733 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= locales
LOCALEDIR= ${SHAREDIR}/locale
FILESNAME= LC_COLLATE
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 62b3a719fe57..cf3335267446 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= locales
FILESGROUPS= FILES ALWAYS
ALWAYSPACKAGE= runtime
diff --git a/share/dict/Makefile b/share/dict/Makefile
index 7e8c830d1944..3fb23e269ae2 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,4 +1,3 @@
-
# XXX MISSING: connectives words
FILES= README propernames web2 web2a freebsd
FILESDIR= ${BINDIR}/dict
diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile
index 29a321f55c30..c2b04c972bf1 100644
--- a/share/doc/IPv6/Makefile
+++ b/share/doc/IPv6/Makefile
@@ -1,4 +1,3 @@
-
FILES= IMPLEMENTATION
FILESDIR= ${SHAREDIR}/doc/IPv6
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 75c12e2ba0e7..6324dd59ef75 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
SUBDIR= ${_IPv6} \
diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile
index 8e674019e9a2..9467a4ece9a7 100644
--- a/share/doc/legal/Makefile
+++ b/share/doc/legal/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= intel_ipw \
intel_iwi \
intel_iwlwififw \
diff --git a/share/doc/legal/Makefile.armv7 b/share/doc/legal/Makefile.armv7
index 245d40118ac0..3064611d04b2 100644
--- a/share/doc/legal/Makefile.armv7
+++ b/share/doc/legal/Makefile.armv7
@@ -1,2 +1 @@
-
SUBDIR += imx
diff --git a/share/doc/legal/imx/Makefile b/share/doc/legal/imx/Makefile
index bd0e97a04a8e..866af4017e4f 100644
--- a/share/doc/legal/imx/Makefile
+++ b/share/doc/legal/imx/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/imx/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= sdma-imx6q.LICENSE
diff --git a/share/doc/legal/intel_ipw/Makefile b/share/doc/legal/intel_ipw/Makefile
index fccf2bda0c0c..9f842cb8b247 100644
--- a/share/doc/legal/intel_ipw/Makefile
+++ b/share/doc/legal/intel_ipw/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/ipw/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_ipw.LICENSE
diff --git a/share/doc/legal/intel_iwi/Makefile b/share/doc/legal/intel_iwi/Makefile
index 93c0ddf05561..8c3a73fd88c1 100644
--- a/share/doc/legal/intel_iwi/Makefile
+++ b/share/doc/legal/intel_iwi/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/iwi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwi.LICENSE
diff --git a/share/doc/legal/intel_iwlwififw/Makefile b/share/doc/legal/intel_iwlwififw/Makefile
index 631d34654341..87956f8e7a30 100644
--- a/share/doc/legal/intel_iwlwififw/Makefile
+++ b/share/doc/legal/intel_iwlwififw/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwlwifi_firmware.LICENCE
diff --git a/share/doc/legal/intel_iwn/Makefile b/share/doc/legal/intel_iwn/Makefile
index d706f3a3b880..7542e0d6356d 100644
--- a/share/doc/legal/intel_iwn/Makefile
+++ b/share/doc/legal/intel_iwn/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/iwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_iwn.LICENSE
diff --git a/share/doc/legal/intel_wpi/Makefile b/share/doc/legal/intel_wpi/Makefile
index 29baf84d1d48..b23d3ab9260c 100644
--- a/share/doc/legal/intel_wpi/Makefile
+++ b/share/doc/legal/intel_wpi/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/wpi/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= intel_wpi.LICENSE
diff --git a/share/doc/legal/realtek/Makefile b/share/doc/legal/realtek/Makefile
index 2a6fd6ae6192..14aa123011c3 100644
--- a/share/doc/legal/realtek/Makefile
+++ b/share/doc/legal/realtek/Makefile
@@ -1,4 +1,3 @@
-
FILES= ${SRCTOP}/sys/contrib/dev/rtwn/LICENSE
FILESDIR= ${SHAREDIR}/doc/legal
FILESNAME= realtek.LICENSE
diff --git a/share/doc/llvm/Makefile b/share/doc/llvm/Makefile
index 829b77a117ab..8fde27acf117 100644
--- a/share/doc/llvm/Makefile
+++ b/share/doc/llvm/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= clang
SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm
diff --git a/share/doc/llvm/clang/Makefile b/share/doc/llvm/clang/Makefile
index 9cd2f210cd95..ba789f4afd98 100644
--- a/share/doc/llvm/clang/Makefile
+++ b/share/doc/llvm/clang/Makefile
@@ -1,4 +1,3 @@
-
SRCDIR= ${SRCTOP}/contrib/llvm-project/clang
.PATH: ${SRCDIR}
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index 271180abb827..3c702b2aeaaa 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= beyond4.3 \
bufbio \
contents \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index 9f25cb6db894..acc2048503f8 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= beyond43
SRCS= beyond43.ms
diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile
index 8cffb984f880..a486124fac51 100644
--- a/share/doc/papers/bufbio/Makefile
+++ b/share/doc/papers/bufbio/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= bio
SRCS= bio.ms-patched
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index c4075606b261..454fff5ee5a9 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= contents
SRCS= contents.ms
diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile
index 114134a59589..656e3cd89c2c 100644
--- a/share/doc/papers/devfs/Makefile
+++ b/share/doc/papers/devfs/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= devfs
SRCS= paper.me
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index dd6c009d47ea..0c909ea95845 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= diskperf
SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms \
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index 4226f134917a..3c45b04b08d6 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= fsinterface
SRCS= fsinterface.ms
diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile
index 3476ab194d5c..d25059929908 100644
--- a/share/doc/papers/jail/Makefile
+++ b/share/doc/papers/jail/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= jail
SRCS= paper.ms-patched
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index d91fd40baaa5..f353016251b5 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= kernmalloc
SRCS= kernmalloc.t appendix.ms
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index a4f9954d6aba..6dbc8c67ab2b 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= kerntune
SRCS= 0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 8925f01cb450..755264466aa3 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= malloc
SRCS= abs.ms intro.ms kernel.ms malloc.ms problems.ms alternatives.ms \
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 531de11faf3d..6a4d1342162d 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= newvm
SRCS= 0.t 1.t a.t
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index 902c3d1855e4..a2a2b355ef6e 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= releng
SRCS= stubs 0.t 1.t 2.t 3.t
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index 8eaf0ec10083..d38189a350dc 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= papers
DOC= sysperf
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.ms
diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile
index 02833db4692e..a2e7479bbd2a 100644
--- a/share/doc/papers/timecounter/Makefile
+++ b/share/doc/papers/timecounter/Makefile
@@ -1,4 +1,3 @@
-
# You really want:
# PRINTERDEVICE=ps
# or you will not get the illustration.
diff --git a/share/doc/pjdfstest/Makefile b/share/doc/pjdfstest/Makefile
index a4463fa65676..d7bfd45ae36e 100644
--- a/share/doc/pjdfstest/Makefile
+++ b/share/doc/pjdfstest/Makefile
@@ -1,4 +1,3 @@
-
FILESDIR= ${SHAREDIR}/doc/pjdfstest
FILES= README
diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile
index b7770a4c1fb2..1e5d3c677dbf 100644
--- a/share/doc/psd/01.cacm/Makefile
+++ b/share/doc/psd/01.cacm/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/01.cacm
SRCS= stubs p.mac p1 p2 p3 p4 p5 p6
EXTRA= ref.bib
diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile
index c6c881ab8f66..4aa334a84a9f 100644
--- a/share/doc/psd/02.implement/Makefile
+++ b/share/doc/psd/02.implement/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/02.implement
SRCS= stubs implement
EXTRA= ref.bib
diff --git a/share/doc/psd/03.iosys/Makefile b/share/doc/psd/03.iosys/Makefile
index 69b12e8d31ff..297c2e63a5e2 100644
--- a/share/doc/psd/03.iosys/Makefile
+++ b/share/doc/psd/03.iosys/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/03.iosys
SRCS= iosys
MACROS= -ms
diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile
index 9039377ea8f2..aeb736aedb04 100644
--- a/share/doc/psd/04.uprog/Makefile
+++ b/share/doc/psd/04.uprog/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/04.uprog
SRCS= p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9
MACROS= -ms
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index a9115a090289..eea45d304977 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,4 +1,3 @@
-
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
diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile
index 4a1f10394d7e..966bed693ba1 100644
--- a/share/doc/psd/06.Clang/Makefile
+++ b/share/doc/psd/06.Clang/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/06.Clang
SRCS= Clang.ms
MACROS= -ms
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index d72bde8b35f4..ea4ba64282fe 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/12.make
SRCS= stubs tutorial.ms
MACROS= -ms
diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile
index 462b31785878..781cbb0c6ced 100644
--- a/share/doc/psd/15.yacc/Makefile
+++ b/share/doc/psd/15.yacc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/15.yacc
SRCS= stubs ss_ ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \
ss10 ss11 ssa ssb ssc ssd
diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile
index 23698f35b656..ff7f26e13747 100644
--- a/share/doc/psd/16.lex/Makefile
+++ b/share/doc/psd/16.lex/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/16.lex
SRCS= lex.ms
MACROS= -ms
diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile
index 1f248858c057..d47473ba0a3d 100644
--- a/share/doc/psd/17.m4/Makefile
+++ b/share/doc/psd/17.m4/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/17.m4
SRCS= m4.ms
MACROS= -ms
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 05d283217bdc..066a930a2ea3 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/18.gprof
SRCS= header.me abstract.me intro.me profiling.me gathering.me \
postp.me present.me refs.me
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index f26c47c6d6df..c752d8279c98 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/20.ipctut
SRCS= tutor.me
MACROS= -me
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index 4ba3bf5d44b7..baf34752ea10 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/21.ipc
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t
MACROS= -ms
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index 653a382ebbab..067b258a1a9f 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/22.rpcgen
SRCS= stubs rpcgen.ms
MACROS= -ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index f1a004c4a574..5a893108c02d 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/23.rpc
SRCS= stubs rpc.prog.ms
MACROS= -ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index 49a9239dbef6..b4525b58c7b4 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/24.xdr
SRCS= stubs xdr.nts.ms
MACROS= -ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index e2deaa0edd49..5edb44e847c9 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/25.xdrrfc
SRCS= stubs xdr.rfc.ms
MACROS= -ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 6334e077f2f0..cdfbe9d4a4d5 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/26.rpcrfc
SRCS= stubs rpc.rfc.ms
MACROS= -ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index aa06a588d2cb..c1c1720b74e5 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd/27.nfsrfc
SRCS= stubs nfs.rfc.ms
MACROS= -ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 93fa759ed346..15ff1bb02221 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,4 +1,3 @@
-
# The following modules do not build/install:
# 10.gdb
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index 778650d1f4c2..b1ca61764f90 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd
DOC= contents
SRCS= contents.ms
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index 06f1a0607137..c13d72618522 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= psd
DOC= Title
SRCS= Title
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index be4ea12d9431..60351b562bb3 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/01.setup
SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t
MACROS= -ms
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index da2ec7424c86..7c8eb7f50779 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,4 +1,3 @@
-
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
diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile
index a946ad81be7d..59cf82cd2cf4 100644
--- a/share/doc/smm/03.fsck/Makefile
+++ b/share/doc/smm/03.fsck/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/03.fsck
SRCS= 0.t 1.t 2.t 3.t 4.t
MACROS= -ms
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index ade471b8d654..e9f7ac58710b 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/04.quotas
SRCS= quotas.ms
MACROS= -ms
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index 18b13a175c94..fa7cf0f830df 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/05.fastfs
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t
MACROS= -ms
diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile
index d5375598b989..a15d81d5b868 100644
--- a/share/doc/smm/06.nfs/Makefile
+++ b/share/doc/smm/06.nfs/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/06.nfs
SRCS= 0.t 1.t 2.t ref.t
MACROS= -me
diff --git a/share/doc/smm/07.lpd/Makefile b/share/doc/smm/07.lpd/Makefile
index 1d2ffa321343..a92ce0bd3bbb 100644
--- a/share/doc/smm/07.lpd/Makefile
+++ b/share/doc/smm/07.lpd/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/07.lpd
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
MACROS= -ms
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 53eedc4058c7..ba0eb96de955 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/08.sendmailop
SRCS= op.me
MACROS= -me
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index 1f7ff654b501..a78b1204ca47 100644
--- a/share/doc/smm/11.timedop/Makefile
+++ b/share/doc/smm/11.timedop/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/11.timedop
SRCS= timed.ms
MACROS= -ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index eee720bac9a2..e8498e8ccc90 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/12.timed
SRCS= timed.ms
EXTRA= date loop time unused
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index 05972254c5d9..beb0b147771a 100644
--- a/share/doc/smm/18.net/Makefile
+++ b/share/doc/smm/18.net/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm/18.net
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
MACROS= -ms
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 60c4f72ee923..14a57395090e 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
# The following modules do not describe FreeBSD:
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index 800331f7eb13..c529682d6f33 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm
DOC= contents
SRCS= contents.ms
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index bd8c1e1e3431..294e37666112 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= smm
DOC= Title
SRCS= Title
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index f9845389a6c4..95aafe8851fa 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/04.csh
SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
MACROS= -ms
diff --git a/share/doc/usd/05.dc/Makefile b/share/doc/usd/05.dc/Makefile
index 73ac03c794ec..4a850d9f21aa 100644
--- a/share/doc/usd/05.dc/Makefile
+++ b/share/doc/usd/05.dc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/05.dc
SRCS= dc
MACROS= -ms
diff --git a/share/doc/usd/06.bc/Makefile b/share/doc/usd/06.bc/Makefile
index ddb52f6f701d..15e6aaca9539 100644
--- a/share/doc/usd/06.bc/Makefile
+++ b/share/doc/usd/06.bc/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/06.bc
SRCS= bc
MACROS= -ms
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index 5009150bc849..a8592b1e77e6 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,4 +1,3 @@
-
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
diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index f41e46a8b60a..b5732c655131 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= exref summary
.include <bsd.subdir.mk>
diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc
index 5a64f267bb45..c5dd0a9aac67 100644
--- a/share/doc/usd/10.exref/Makefile.inc
+++ b/share/doc/usd/10.exref/Makefile.inc
@@ -1,3 +1,2 @@
-
VOLUME= usd/10.exref
MACROS= -ms
diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile
index 8e5d815dbe3e..23d10e553164 100644
--- a/share/doc/usd/10.exref/exref/Makefile
+++ b/share/doc/usd/10.exref/exref/Makefile
@@ -1,4 +1,3 @@
-
SRCS= ex.rm
.include <bsd.doc.mk>
diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile
index 1d05d7c0f8c8..fe2d338a961e 100644
--- a/share/doc/usd/10.exref/summary/Makefile
+++ b/share/doc/usd/10.exref/summary/Makefile
@@ -1,4 +1,3 @@
-
DOC= summary
SRCS= ex.summary
USE_TBL=
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index 9a18829d24c2..e6aa1e72e546 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/11.edit
SRCS= edittut.ms
MACROS= -ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index ba422c8442e9..9896d75fb419 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,4 +1,3 @@
-
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 1c1b09d2add7..0fa6960311d4 100644
--- a/share/doc/usd/12.vi/Makefile.inc
+++ b/share/doc/usd/12.vi/Makefile.inc
@@ -1,3 +1,2 @@
-
VOLUME= usd/12.vi
MACROS= -ms
diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile
index e2a12e50fed6..16482e203b72 100644
--- a/share/doc/usd/12.vi/summary/Makefile
+++ b/share/doc/usd/12.vi/summary/Makefile
@@ -1,4 +1,3 @@
-
DOC= summary
SRCS= vi.summary
USE_TBL=
diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile
index 72be559f2100..b7281ebcdc86 100644
--- a/share/doc/usd/12.vi/vi/Makefile
+++ b/share/doc/usd/12.vi/vi/Makefile
@@ -1,4 +1,3 @@
-
SRCS= vi.in vi.chars
USE_TBL=
diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile
index 3746784bbdb5..a8de9a151e0a 100644
--- a/share/doc/usd/12.vi/viapwh/Makefile
+++ b/share/doc/usd/12.vi/viapwh/Makefile
@@ -1,4 +1,3 @@
-
DOC= viapwh
SRCS= vi.apwh.ms
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index 5bea230c3ce0..c7a03af2c7aa 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/13.viref
EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff
MACROS= -me
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index a50b225f66b7..1945542dc282 100644
--- a/share/doc/usd/18.msdiffs/Makefile
+++ b/share/doc/usd/18.msdiffs/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/18.msdiffs
SRCS= ms.diffs
MACROS= -ms
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index e3a00289cd6c..547eb25bd817 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/19.memacros
SRCS= meintro.me-sed
MACROS= -me
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index 0481c80e38f7..a0d7fe6cb2e4 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/20.meref
SRCS= meref.me-sed
MACROS= -me
diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile
index 5360967a7004..d2b140dc44bc 100644
--- a/share/doc/usd/21.troff/Makefile
+++ b/share/doc/usd/21.troff/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd/21.troff
SRCS= m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2
USE_TBL=
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 7f298c60a655..16d98b85506f 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,4 +1,3 @@
-
# The following modules are not provided:
# 14.jove
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index d2052ccce944..860f1199707d 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd
DOC= contents
SRCS= contents.ms
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index 8d1adca5b9f3..3a0b41aee339 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,3 @@
-
VOLUME= usd
DOC= Title
SRCS= Title
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index 13d60978e868..9c74916dd6b4 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/${PROG}
PROG= FreeBSD_version
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index 91ce0eb88072..23d02a2002de 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/${PROG}
PROG= find_interface
diff --git a/share/examples/hwpmc/Makefile b/share/examples/hwpmc/Makefile
index fcbb6160bb00..c7d1c54b1d19 100644
--- a/share/examples/hwpmc/Makefile
+++ b/share/examples/hwpmc/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/hwpmc
PROG= overhead
diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile
index b1b8b57449f1..ec4d4be3dd2f 100644
--- a/share/examples/ipfilter/Makefile
+++ b/share/examples/ipfilter/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=ipf
FILES= README
diff --git a/share/examples/kld/cdev/Makefile b/share/examples/kld/cdev/Makefile
index 706cb2dcbae9..8c7662243b3c 100644
--- a/share/examples/kld/cdev/Makefile
+++ b/share/examples/kld/cdev/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/cdev
SUBDIR= module test
diff --git a/share/examples/kld/dyn_sysctl/Makefile b/share/examples/kld/dyn_sysctl/Makefile
index 0dffd9c8e7b0..e47eb3f339b3 100644
--- a/share/examples/kld/dyn_sysctl/Makefile
+++ b/share/examples/kld/dyn_sysctl/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/${KMOD}
SRCS = dyn_sysctl.c
diff --git a/share/examples/kld/firmware/Makefile b/share/examples/kld/firmware/Makefile
index b4b144a7669d..5e31deaa17eb 100644
--- a/share/examples/kld/firmware/Makefile
+++ b/share/examples/kld/firmware/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/firmware
SUBDIR= fwimage fwconsumer
diff --git a/share/examples/kld/firmware/fwconsumer/Makefile b/share/examples/kld/firmware/fwconsumer/Makefile
index b29684999124..ce4f77d41d89 100644
--- a/share/examples/kld/firmware/fwconsumer/Makefile
+++ b/share/examples/kld/firmware/fwconsumer/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/fwconsumer
KMOD= fw_consumer
diff --git a/share/examples/kld/firmware/fwimage/Makefile b/share/examples/kld/firmware/fwimage/Makefile
index 1e0e3ff3ca93..b57d2bf326b4 100644
--- a/share/examples/kld/firmware/fwimage/Makefile
+++ b/share/examples/kld/firmware/fwimage/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/fwimage
KMOD= beastie
diff --git a/share/examples/kld/khelp/Makefile b/share/examples/kld/khelp/Makefile
index 7cbaa79ceda6..dfdf602a4689 100644
--- a/share/examples/kld/khelp/Makefile
+++ b/share/examples/kld/khelp/Makefile
@@ -1,4 +1,3 @@
-
.include <bsd.own.mk>
# Change if the src tree you are compiling for is not in /usr/src
diff --git a/share/examples/kld/random_adaptor/Makefile b/share/examples/kld/random_adaptor/Makefile
index c391da795e89..c9011bb2dba3 100644
--- a/share/examples/kld/random_adaptor/Makefile
+++ b/share/examples/kld/random_adaptor/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/${KMOD}
KMOD= random_adaptor_example
diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile
index efae887771e2..4270f388bd1b 100644
--- a/share/examples/kld/syscall/Makefile
+++ b/share/examples/kld/syscall/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/kld/syscall
SUBDIR= module test
diff --git a/share/examples/libusb20/Makefile b/share/examples/libusb20/Makefile
index 262f1ac3825a..9c0524c00b2c 100644
--- a/share/examples/libusb20/Makefile
+++ b/share/examples/libusb20/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/libusb20
TARGETS= bulk control
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index ebfa7eaa47ea..8bb99eb795b9 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/libvgl
PROG= demo
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index a687980e7808..96712dee88e3 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/${PROG}
PROG= perfmon
diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile
index 4ea4f9c79bb8..3107fa346c65 100644
--- a/share/examples/pf/Makefile
+++ b/share/examples/pf/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILES= faq-example1 faq-example2 faq-example3 \
ackpri queue1 queue2 queue3 queue4 \
diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile
index 1e2c076591bf..42dd2ca58513 100644
--- a/share/examples/scsi_target/Makefile
+++ b/share/examples/scsi_target/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=examples
FILESDIR=${SHAREDIR}/examples/${PROG}
PROG= scsi_target
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index e38305148005..cd235434db79 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=utilities
FILESDIR= ${SHAREDIR}/examples/smbfs
FILES= dot.nsmbrc
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index 0a0fd500724f..a8a6e12e7013 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE=utilities
FILESDIR= ${SHAREDIR}/examples/smbfs/print
FILES= lj6l ljspool printcap.sample tolj
diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile
index 8f257929d60f..6aea074e2544 100644
--- a/share/examples/tests/Makefile
+++ b/share/examples/tests/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= tests
.PATH: ${SRCTOP}/tests
diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile
index ecaa1b5b9037..4530e341aa37 100644
--- a/share/examples/tests/tests/Makefile
+++ b/share/examples/tests/tests/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
# Directory into which the Kyuafile provided by this directory will be
diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile
index 7614767b6e0a..72c2e546d3f9 100644
--- a/share/examples/tests/tests/atf/Makefile
+++ b/share/examples/tests/tests/atf/Makefile
@@ -1,4 +1,3 @@
-
# The release package to use for the tests contained within the directory
#
# This applies to components which rely on ^/projects/release-pkg support
diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile
index 462324309f6a..40f4e7041b1a 100644
--- a/share/examples/tests/tests/plain/Makefile
+++ b/share/examples/tests/tests/plain/Makefile
@@ -1,4 +1,3 @@
-
# The release package to use for the tests contained within the directory
#
# This applies to components which rely on ^/projects/release-pkg support
diff --git a/share/examples/tests/tests/tap/Makefile b/share/examples/tests/tests/tap/Makefile
index 86d3f6805045..af906b309358 100644
--- a/share/examples/tests/tests/tap/Makefile
+++ b/share/examples/tests/tests/tap/Makefile
@@ -1,4 +1,3 @@
-
# The release package to use for the tests contained within the directory
#
# This applies to components which rely on ^/projects/release-pkg support
diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc
index 798a0ab4f505..9bbbbed5020b 100644
--- a/share/i18n/csmapper/Makefile.inc
+++ b/share/i18n/csmapper/Makefile.inc
@@ -1,4 +1,3 @@
-
.include <bsd.own.mk>
CSMAPPERDIR?= /usr/share/i18n/csmapper
diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc
index 8db77ae0711b..e072ef592aa0 100644
--- a/share/i18n/esdb/Makefile.inc
+++ b/share/i18n/esdb/Makefile.inc
@@ -1,4 +1,3 @@
-
.include <bsd.own.mk>
.PATH: ${.CURDIR}
diff --git a/share/keys/Makefile b/share/keys/Makefile
index b51ccc176268..f4bab152d8cb 100644
--- a/share/keys/Makefile
+++ b/share/keys/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= pkg
.include <bsd.subdir.mk>
diff --git a/share/keys/pkg/Makefile b/share/keys/pkg/Makefile
index 2fd000191078..665bcf389da1 100644
--- a/share/keys/pkg/Makefile
+++ b/share/keys/pkg/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= trusted
.include <bsd.subdir.mk>
diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile
index 15044f1c9a4d..cb550d1d71ff 100644
--- a/share/keys/pkg/trusted/Makefile
+++ b/share/keys/pkg/trusted/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= pkg-bootstrap
FILES= pkg.freebsd.org.2013102301
diff --git a/share/man/Makefile b/share/man/Makefile
index cf91101a27f0..51e560e199a5 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
# XXX MISSING: man3f
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 04f05920c9a4..e5ab6597ead2 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= builtin.1 intro.1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index 5c8dced71743..1d8586e48f9f 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= arb.3 \
diff --git a/share/man/man3lua/Makefile b/share/man/man3lua/Makefile
index 35555988b6a2..6f95a27ac303 100644
--- a/share/man/man3lua/Makefile
+++ b/share/man/man3lua/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= intro.3lua
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 69424a4be271..36d945d64a60 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= aac.4 \
diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile
index a0161f8f4900..aca11eeb583f 100644
--- a/share/man/man4/man4.aarch64/Makefile
+++ b/share/man/man4/man4.aarch64/Makefile
@@ -1,4 +1,3 @@
-
.PATH: ${.CURDIR}/../man4.arm # Some manpages are common to arm and aarch64
MAN= \
diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile
index e2a41559410b..b5d49d0dffb9 100644
--- a/share/man/man4/man4.arm/Makefile
+++ b/share/man/man4/man4.arm/Makefile
@@ -1,4 +1,3 @@
-
MAN= \
aw_gpio.4 \
aw_mmc.4 \
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index f84f0797a62c..ad9b3a01828c 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,4 +1,3 @@
-
MAN= apm.4 \
CPU_ELAN.4 \
glxiic.4 \
diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile
index dbc133cc985b..1762bf17b50d 100644
--- a/share/man/man4/man4.powerpc/Makefile
+++ b/share/man/man4/man4.powerpc/Makefile
@@ -1,4 +1,3 @@
-
MAN= adb.4 \
akbd.4 \
abtn.4 \
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 465cc85a3feb..553bedddeea1 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
#MISSING: dump.5 plot.5
diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile
index b97fae54a03d..9c94781169f8 100644
--- a/share/man/man6/Makefile
+++ b/share/man/man6/Makefile
@@ -1,4 +1,3 @@
-
MAN= intro.6
.include <bsd.prog.mk>
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index b83399b2917d..67cca438a46d 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
#MISSING: eqnchar.7 ms.7 term.7
diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index 1e2c22e97d8e..bd6bdfe4ba05 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= \
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 35eec7b2c6ce..9880b7b2f5e4 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
MAN= accept_filter.9 \
diff --git a/share/misc/Makefile b/share/misc/Makefile
index bd560db25c7d..d92a359ec367 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../sys/dev/usb
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 096dc2ede002..85b39a9c72ea 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,3 @@
-
# Only parse this if executing make in this directory, not in other places
# in src that lack a Makefile, such as sys/dev/*. Otherwise the MAKESYSPATH
# will read this Makefile since it auto includes it into -I.
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index 4835486036ab..95469fd68ddf 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= locales
LOCALEDIR= ${SHAREDIR}/locale
FILESNAME= LC_NUMERIC
diff --git a/share/security/Makefile b/share/security/Makefile
index 31de6284f913..44d116aa4724 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,4 +1,3 @@
-
FILES= lomac-policy.contexts
FILESDIR= ${BINDIR}/security
diff --git a/share/skel/Makefile b/share/skel/Makefile
index fa0c97066dda..0cd718b6ad2e 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -1,4 +1,3 @@
-
FILES= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \
dot.shrc dot.mail_aliases
FILESDIR= ${SHAREDIR}/skel
diff --git a/share/snmp/Makefile b/share/snmp/Makefile
index 6e1e93019cad..95efeec23a76 100644
--- a/share/snmp/Makefile
+++ b/share/snmp/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= mibs
.include <bsd.subdir.mk>
diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile
index 023cbf26e01c..29be45a8dafd 100644
--- a/share/snmp/mibs/Makefile
+++ b/share/snmp/mibs/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= bsnmp
FILES= FREEBSD-MIB.txt
diff --git a/share/syscons/Makefile b/share/syscons/Makefile
index 2bff5fcb6398..aa1920937826 100644
--- a/share/syscons/Makefile
+++ b/share/syscons/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= fonts keymaps scrnmaps
SUBDIR_PARALLEL=
diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc
index 0b22547cec2f..07cde30e3d52 100644
--- a/share/syscons/Makefile.inc
+++ b/share/syscons/Makefile.inc
@@ -1,2 +1 @@
-
FILESPACKAGE= syscons
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 8dfd012c9103..e1b6614b5684 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= syscons-data
FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index a8aaa08c47d3..139834abcd2b 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= syscons-data
FILES= INDEX.keymaps \
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index b7e94fd16293..8da31ed32be4 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= syscons-data
SCRMAPS = armscii8-2haik8.scm \
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index a23390052126..fe7519084716 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,4 +1,3 @@
-
FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
xerox1730-lm zenith29
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 3bddf790b801..34ad41fd520a 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,4 +1,3 @@
-
# reorder gives an editor command for most common terminals
# (in reverse order from n'th to 1'st most commonly used)
# to move them to the front of termcap
diff --git a/share/tests/Makefile b/share/tests/Makefile
index b8996030aafc..29b1b564beca 100644
--- a/share/tests/Makefile
+++ b/share/tests/Makefile
@@ -1,4 +1,3 @@
-
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index f8cb183c0323..d09a7d33db34 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= locales
LOCALEDIR= ${SHAREDIR}/locale
FILESNAME= LC_TIME
diff --git a/share/vt/Makefile b/share/vt/Makefile
index 91465c657766..51c237e7ac8f 100644
--- a/share/vt/Makefile
+++ b/share/vt/Makefile
@@ -1,4 +1,3 @@
-
SUBDIR= fonts keymaps
.include <bsd.subdir.mk>
diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile
index a5a1ef981a97..01f56a235e5e 100644
--- a/share/vt/fonts/Makefile
+++ b/share/vt/fonts/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= vt-data
.PATH: ${SRCTOP}/contrib/spleen
diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile
index bcfd6abaa4e1..52b7c616c8b7 100644
--- a/share/vt/keymaps/Makefile
+++ b/share/vt/keymaps/Makefile
@@ -1,4 +1,3 @@
-
PACKAGE= vt-data
FILES= INDEX.keymaps \
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index d4b37ce991aa..824dda827e44 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,4 +1,3 @@
-
#
# HOW TO UPDATE THE ZONEINFO DATA
#
diff --git a/share/zoneinfo/tests/Makefile b/share/zoneinfo/tests/Makefile
index 97d47d3a150f..7e8c05a3bc76 100644
--- a/share/zoneinfo/tests/Makefile
+++ b/share/zoneinfo/tests/Makefile
@@ -1,4 +1,3 @@
-
.include <src.opts.mk>
.PATH: ${SRCTOP}/contrib/tzdata