aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc14
-rw-r--r--bin/Makefile2
-rw-r--r--bin/Makefile.inc2
-rw-r--r--bin/csh/Makefile2
-rw-r--r--bin/date/Makefile2
-rw-r--r--bin/ed/Makefile2
-rw-r--r--bin/ls/Makefile2
-rw-r--r--bin/mv/Makefile2
-rw-r--r--bin/pax/Makefile2
-rw-r--r--bin/pkill/Makefile2
-rw-r--r--bin/sh/Makefile2
-rw-r--r--bin/test/Makefile2
-rw-r--r--cddl/Makefile2
-rw-r--r--cddl/lib/Makefile2
-rw-r--r--cddl/sbin/Makefile2
-rw-r--r--cddl/usr.bin/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile2
-rw-r--r--etc/Makefile2
-rw-r--r--etc/mtree/Makefile2
-rw-r--r--etc/periodic/daily/Makefile2
-rw-r--r--etc/periodic/monthly/Makefile2
-rw-r--r--etc/periodic/security/Makefile2
-rw-r--r--etc/periodic/weekly/Makefile2
-rw-r--r--etc/rc.d/Makefile2
-rw-r--r--games/Makefile2
-rw-r--r--games/factor/Makefile2
-rw-r--r--gnu/Makefile2
-rw-r--r--gnu/lib/Makefile2
-rw-r--r--gnu/lib/csu/Makefile2
-rw-r--r--gnu/lib/libgcc/Makefile2
-rw-r--r--gnu/lib/libgcov/Makefile2
-rw-r--r--gnu/lib/libstdc++/Makefile2
-rw-r--r--gnu/lib/libsupc++/Makefile2
-rw-r--r--gnu/usr.bin/Makefile2
-rw-r--r--gnu/usr.bin/binutils/as/Makefile2
-rw-r--r--gnu/usr.bin/binutils/ld/Makefile2
-rw-r--r--gnu/usr.bin/cc/Makefile2
-rw-r--r--gnu/usr.bin/cc/Makefile.inc1
-rw-r--r--gnu/usr.bin/cc/c++/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc_tools/Makefile2
-rw-r--r--gnu/usr.bin/cc/cpp/Makefile2
-rw-r--r--gnu/usr.bin/dialog/Makefile2
-rw-r--r--gnu/usr.bin/grep/Makefile2
-rw-r--r--include/Makefile2
-rw-r--r--include/arpa/Makefile2
-rw-r--r--kerberos5/Makefile.inc2
-rw-r--r--lib/Makefile2
-rw-r--r--lib/atf/Makefile2
-rw-r--r--lib/atf/libatf-c++/Makefile1
-rw-r--r--lib/atf/libatf-c/Makefile1
-rw-r--r--lib/clang/Makefile2
-rw-r--r--lib/clang/clang.build.mk2
-rw-r--r--lib/clang/libllvmanalysis/Makefile2
-rw-r--r--lib/clang/libllvmipa/Makefile2
-rw-r--r--lib/clang/libllvmipo/Makefile2
-rw-r--r--lib/clang/libllvmmc/Makefile2
-rw-r--r--lib/clang/libllvmscalaropts/Makefile2
-rw-r--r--lib/clang/libllvmsupport/Makefile2
-rw-r--r--lib/clang/libllvmtransformutils/Makefile2
-rw-r--r--lib/clang/libllvmx86disassembler/Makefile2
-rw-r--r--lib/libarchive/Makefile2
-rw-r--r--lib/libbsnmp/libbsnmp/Makefile2
-rw-r--r--lib/libc/Makefile2
-rw-r--r--lib/libc_nonshared/Makefile2
-rw-r--r--lib/libcompiler_rt/Makefile2
-rw-r--r--lib/libcrypt/Makefile2
-rw-r--r--lib/libfetch/Makefile2
-rw-r--r--lib/libipsec/Makefile2
-rw-r--r--lib/libkiconv/Makefile2
-rw-r--r--lib/libmilter/Makefile2
-rw-r--r--lib/libpam/modules/modules.inc2
-rw-r--r--lib/libpam/modules/pam_unix/Makefile1
-rw-r--r--lib/libpcap/Makefile2
-rw-r--r--lib/libproc/Makefile2
-rw-r--r--lib/libprocstat/Makefile2
-rw-r--r--lib/libradius/Makefile2
-rw-r--r--lib/librpcsvc/Makefile2
-rw-r--r--lib/libsm/Makefile2
-rw-r--r--lib/libsmb/Makefile2
-rw-r--r--lib/libstand/Makefile2
-rw-r--r--lib/libtelnet/Makefile2
-rw-r--r--lib/libthr/Makefile2
-rw-r--r--lib/libulog/Makefile2
-rw-r--r--lib/libutil/Makefile2
-rw-r--r--lib/libwrap/Makefile2
-rw-r--r--lib/ncurses/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile2
-rw-r--r--libexec/Makefile2
-rw-r--r--libexec/atf/atf-check/Makefile1
-rw-r--r--libexec/ftpd/Makefile2
-rw-r--r--libexec/rlogind/Makefile2
-rw-r--r--libexec/rtld-elf/Makefile2
-rw-r--r--libexec/tcpd/Makefile2
-rw-r--r--libexec/telnetd/Makefile2
-rw-r--r--release/picobsd/tinyware/login/Makefile2
-rw-r--r--rescue/librescue/Makefile2
-rw-r--r--rescue/rescue/Makefile2
-rw-r--r--sbin/Makefile2
-rw-r--r--sbin/Makefile.inc2
-rw-r--r--sbin/atm/atmconfig/Makefile2
-rw-r--r--sbin/dhclient/Makefile2
-rw-r--r--sbin/geom/class/Makefile2
-rw-r--r--sbin/ggate/Makefile2
-rw-r--r--sbin/growfs/Makefile2
-rw-r--r--sbin/hastctl/Makefile2
-rw-r--r--sbin/hastd/Makefile2
-rw-r--r--sbin/ifconfig/Makefile2
-rw-r--r--sbin/ipfw/Makefile2
-rw-r--r--sbin/mdconfig/Makefile2
-rw-r--r--sbin/pfctl/Makefile2
-rw-r--r--sbin/ping/Makefile2
-rw-r--r--sbin/route/Makefile2
-rw-r--r--sbin/setkey/Makefile2
-rw-r--r--secure/Makefile2
-rw-r--r--secure/Makefile.inc2
-rw-r--r--secure/lib/Makefile2
-rw-r--r--secure/lib/libssh/Makefile2
-rw-r--r--secure/libexec/Makefile2
-rw-r--r--secure/libexec/sftp-server/Makefile2
-rw-r--r--secure/libexec/ssh-keysign/Makefile2
-rw-r--r--secure/libexec/ssh-pkcs11-helper/Makefile2
-rw-r--r--secure/usr.bin/Makefile2
-rw-r--r--secure/usr.bin/scp/Makefile2
-rw-r--r--secure/usr.bin/sftp/Makefile2
-rw-r--r--secure/usr.bin/ssh-add/Makefile2
-rw-r--r--secure/usr.bin/ssh-agent/Makefile2
-rw-r--r--secure/usr.bin/ssh-keygen/Makefile2
-rw-r--r--secure/usr.bin/ssh-keyscan/Makefile2
-rw-r--r--secure/usr.bin/ssh/Makefile2
-rw-r--r--secure/usr.sbin/Makefile2
-rw-r--r--secure/usr.sbin/sshd/Makefile2
-rw-r--r--share/Makefile2
-rw-r--r--share/doc/Makefile2
-rw-r--r--share/doc/smm/Makefile2
-rw-r--r--share/dtrace/Makefile2
-rw-r--r--share/examples/Makefile2
-rw-r--r--share/man/Makefile2
-rw-r--r--share/man/man1/Makefile2
-rw-r--r--share/man/man3/Makefile2
-rw-r--r--share/man/man4/Makefile2
-rw-r--r--share/man/man5/Makefile2
-rw-r--r--share/mk/Makefile4
-rw-r--r--share/mk/bsd.opts.mk2
-rw-r--r--share/mk/bsd.own.mk5
-rw-r--r--share/mk/src.opts.mk5
-rw-r--r--sys/Makefile2
-rw-r--r--sys/boot/Makefile2
-rw-r--r--sys/boot/amd64/efi/Makefile2
-rw-r--r--sys/boot/arm/at91/bootspi/Makefile2
-rw-r--r--sys/boot/arm/at91/libat91/Makefile1
-rw-r--r--sys/boot/arm/ixp425/boot2/Makefile2
-rw-r--r--sys/boot/arm/uboot/Makefile2
-rw-r--r--sys/boot/i386/Makefile2
-rw-r--r--sys/boot/i386/loader/Makefile2
-rw-r--r--sys/boot/ia64/common/Makefile2
-rw-r--r--sys/boot/ia64/efi/Makefile2
-rw-r--r--sys/boot/ia64/ski/Makefile2
-rw-r--r--sys/boot/libstand32/Makefile2
-rw-r--r--sys/boot/mips/beri/loader/Makefile2
-rw-r--r--sys/boot/pc98/loader/Makefile2
-rw-r--r--sys/boot/powerpc/ofw/Makefile2
-rw-r--r--sys/boot/powerpc/ps3/Makefile2
-rw-r--r--sys/boot/powerpc/uboot/Makefile2
-rw-r--r--sys/boot/sparc64/loader/Makefile2
-rw-r--r--sys/boot/uboot/lib/Makefile2
-rw-r--r--sys/boot/userboot/userboot/Makefile2
-rw-r--r--sys/conf/kern.pre.mk2
-rw-r--r--sys/modules/Makefile2
-rw-r--r--sys/modules/aic7xxx/ahc/Makefile2
-rw-r--r--sys/modules/carp/Makefile2
-rw-r--r--sys/modules/cxgb/Makefile2
-rw-r--r--sys/modules/cxgb/cxgb/Makefile2
-rw-r--r--sys/modules/cxgb/iw_cxgb/Makefile2
-rw-r--r--sys/modules/cxgb/tom/Makefile2
-rw-r--r--sys/modules/cxgbe/Makefile2
-rw-r--r--sys/modules/cxgbe/if_cxgbe/Makefile2
-rw-r--r--sys/modules/cxgbe/iw_cxgbe/Makefile2
-rw-r--r--sys/modules/cxgbe/tom/Makefile2
-rw-r--r--sys/modules/dpt/Makefile2
-rw-r--r--sys/modules/drm/Makefile2
-rw-r--r--sys/modules/dummynet/Makefile2
-rw-r--r--sys/modules/em/Makefile2
-rw-r--r--sys/modules/ep/Makefile2
-rw-r--r--sys/modules/if_bridge/Makefile2
-rw-r--r--sys/modules/if_gif/Makefile2
-rw-r--r--sys/modules/if_lagg/Makefile2
-rw-r--r--sys/modules/igb/Makefile2
-rw-r--r--sys/modules/ipdivert/Makefile2
-rw-r--r--sys/modules/ipfilter/Makefile2
-rw-r--r--sys/modules/ipfw/Makefile2
-rw-r--r--sys/modules/ipoib/Makefile2
-rw-r--r--sys/modules/ixgbe/Makefile2
-rw-r--r--sys/modules/mlx4/Makefile2
-rw-r--r--sys/modules/mlx4ib/Makefile2
-rw-r--r--sys/modules/mlxen/Makefile2
-rw-r--r--sys/modules/mthca/Makefile2
-rw-r--r--sys/modules/netgraph/Makefile2
-rw-r--r--sys/modules/netgraph/ipfw/Makefile2
-rw-r--r--sys/modules/netgraph/netflow/Makefile2
-rw-r--r--sys/modules/pf/Makefile2
-rw-r--r--sys/modules/pflog/Makefile2
-rw-r--r--sys/modules/pfsync/Makefile2
-rw-r--r--sys/modules/sound/driver/Makefile2
-rw-r--r--sys/modules/usb/Makefile2
-rw-r--r--sys/modules/virtio/network/Makefile2
-rw-r--r--sys/modules/vmware/vmxnet3/Makefile2
-rw-r--r--sys/modules/vx/Makefile2
-rw-r--r--sys/ofed/drivers/infiniband/hw/mlx4/Makefile2
-rw-r--r--sys/ofed/drivers/net/mlx4/Makefile2
-rw-r--r--tools/regression/priv/Makefile2
-rw-r--r--tools/tools/net80211/wlanwatch/Makefile2
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.bin/apply/Makefile2
-rw-r--r--usr.bin/ar/Makefile2
-rw-r--r--usr.bin/atf/atf-sh/Makefile1
-rw-r--r--usr.bin/bmake/Makefile.inc4
-rw-r--r--usr.bin/calendar/Makefile2
-rw-r--r--usr.bin/chkey/Makefile2
-rw-r--r--usr.bin/chpass/Makefile2
-rw-r--r--usr.bin/clang/Makefile2
-rw-r--r--usr.bin/clang/clang/Makefile2
-rw-r--r--usr.bin/comm/Makefile2
-rw-r--r--usr.bin/cpio/Makefile2
-rw-r--r--usr.bin/fetch/Makefile2
-rw-r--r--usr.bin/file2c/Makefile2
-rw-r--r--usr.bin/ftp/Makefile2
-rw-r--r--usr.bin/grep/Makefile2
-rw-r--r--usr.bin/gzip/Makefile2
-rw-r--r--usr.bin/id/Makefile2
-rw-r--r--usr.bin/join/Makefile2
-rw-r--r--usr.bin/jot/Makefile2
-rw-r--r--usr.bin/kdump/Makefile2
-rw-r--r--usr.bin/lastcomm/Makefile2
-rw-r--r--usr.bin/lex/lib/Makefile2
-rw-r--r--usr.bin/logger/Makefile2
-rw-r--r--usr.bin/login/Makefile2
-rw-r--r--usr.bin/m4/Makefile2
-rw-r--r--usr.bin/make/Makefile2
-rw-r--r--usr.bin/ncal/Makefile2
-rw-r--r--usr.bin/netstat/Makefile2
-rw-r--r--usr.bin/newkey/Makefile2
-rw-r--r--usr.bin/passwd/Makefile2
-rw-r--r--usr.bin/printf/Makefile2
-rw-r--r--usr.bin/sed/Makefile2
-rw-r--r--usr.bin/sort/Makefile2
-rw-r--r--usr.bin/su/Makefile2
-rw-r--r--usr.bin/svn/Makefile.inc2
-rw-r--r--usr.bin/svn/lib/libapr_util/Makefile2
-rw-r--r--usr.bin/systat/Makefile2
-rw-r--r--usr.bin/tar/Makefile2
-rw-r--r--usr.bin/telnet/Makefile2
-rw-r--r--usr.bin/tr/Makefile2
-rw-r--r--usr.bin/uudecode/Makefile5
-rw-r--r--usr.bin/uuencode/Makefile2
-rw-r--r--usr.bin/vi/Makefile2
-rw-r--r--usr.bin/xargs/Makefile2
-rw-r--r--usr.bin/yacc/Makefile2
-rw-r--r--usr.sbin/Makefile2
-rw-r--r--usr.sbin/amd/Makefile.inc2
-rw-r--r--usr.sbin/amd/amd/Makefile2
-rw-r--r--usr.sbin/amd/include/Makefile2
-rw-r--r--usr.sbin/bootparamd/bootparamd/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile2
-rw-r--r--usr.sbin/bsdinstall/partedit/Makefile2
-rw-r--r--usr.sbin/bsnmpd/bsnmpd/Makefile2
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile2
-rw-r--r--usr.sbin/bsnmpd/modules/snmp_hast/Makefile2
-rw-r--r--usr.sbin/bsnmpd/tools/bsnmptools/Makefile2
-rw-r--r--usr.sbin/etcupdate/Makefile2
-rw-r--r--usr.sbin/flowctl/Makefile2
-rw-r--r--usr.sbin/gssd/Makefile2
-rw-r--r--usr.sbin/ifmcstat/Makefile2
-rw-r--r--usr.sbin/inetd/Makefile2
-rw-r--r--usr.sbin/jail/Makefile2
-rw-r--r--usr.sbin/jls/Makefile2
-rw-r--r--usr.sbin/lpr/Makefile.inc2
-rw-r--r--usr.sbin/mailwrapper/Makefile2
-rw-r--r--usr.sbin/mtest/Makefile2
-rw-r--r--usr.sbin/newsyslog/Makefile2
-rw-r--r--usr.sbin/ngctl/Makefile2
-rw-r--r--usr.sbin/ntp/Makefile.inc2
-rw-r--r--usr.sbin/ntp/doc/Makefile2
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile2
-rw-r--r--usr.sbin/ntp/ntpd/Makefile2
-rw-r--r--usr.sbin/ppp/Makefile2
-rw-r--r--usr.sbin/rpcbind/Makefile2
-rw-r--r--usr.sbin/sa/Makefile2
-rw-r--r--usr.sbin/sendmail/Makefile2
-rw-r--r--usr.sbin/syslogd/Makefile2
-rw-r--r--usr.sbin/tcpdchk/Makefile2
-rw-r--r--usr.sbin/tcpdmatch/Makefile2
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile2
-rw-r--r--usr.sbin/trpt/Makefile2
-rw-r--r--usr.sbin/tzsetup/Makefile2
-rw-r--r--usr.sbin/wpa/hostapd/Makefile1
-rw-r--r--usr.sbin/wpa/wpa_supplicant/Makefile2
300 files changed, 312 insertions, 295 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index ba7fe523774b..870ed7c309ce 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -45,7 +45,7 @@
.error "Both TARGET and TARGET_ARCH must be defined."
.endif
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
@@ -1808,7 +1808,7 @@ check-old: check-old-files check-old-libs check-old-dirs
# showconfig - show build configuration.
#
showconfig:
- @${MAKE} -n -f bsd.own.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
+ @${MAKE} -n -f src.opts.mk -V dummy -dg1 2>&1 | grep ^MK_ | sort
.if !empty(KRNLOBJDIR) && !empty(KERNCONF)
DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/
diff --git a/bin/Makefile b/bin/Makefile
index 63d96fedbdfe..ae509c41470e 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= cat \
chflags \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index ec24a486b9de..86141a1387f9 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,7 +1,7 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
BINDIR?= /bin
WARNS?= 6
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 1fa24a1f9d73..c8845f9523c9 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -6,7 +6,7 @@
#
# To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
-.include <bsd.own.mk>
+.include <src.opts.mk>
TCSHDIR= ${.CURDIR}/../../contrib/tcsh
.PATH: ${TCSHDIR}
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 6da5848e16ab..56ce33afb456 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= date
SRCS= date.c netdate.c vary.c
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 7c39e54bdf46..fb1c37da3d01 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 4d02a7ec94ac..7149d9146b0c 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/2/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ls
SRCS= cmp.c ls.c print.c util.c
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index ad8cc4f02d44..02a5a4805800 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/2/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= mv
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 95f18bba1c06..c00d52c70811 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# To install on versions prior to BSD 4.4 the following may have to be
# defined with CFLAGS +=
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
index bb4d865b7ae2..11bfbe329596 100644
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= pkill
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index e1ce5feb1851..6a982bc2b8b7 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sh
INSTALLFLAGS= -S
diff --git a/bin/test/Makefile b/bin/test/Makefile
index e9a0507f0cac..8e3121b3167f 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= test
LINKS= ${BINDIR}/test ${BINDIR}/[
diff --git a/cddl/Makefile b/cddl/Makefile
index 2a9b6f8089d5..44b778dbfc6b 100644
--- a/cddl/Makefile
+++ b/cddl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= lib sbin usr.bin usr.sbin
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index fef13839d9ae..634d70eea5fa 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_drti} \
libavl \
diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile
index 4fd96f6ee0e5..f40f2a45e759 100644
--- a/cddl/sbin/Makefile
+++ b/cddl/sbin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_tests} ${_zfs} ${_zpool}
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 3547ff7b6994..533697d1ed00 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= \
ctfconvert \
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 8551c28a1a0b..537b8e52792f 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_dtrace} \
${_dtruss} \
diff --git a/etc/Makefile b/etc/Makefile
index dd495e1739f2..861504695ef4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_SENDMAIL} != "no"
SUBDIR= sendmail
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index f24867b8ecf8..afed37044fa2 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= ${_BSD.debug.dist} \
BSD.include.dist \
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index aa28351ae2a1..61ede6ddacb3 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= 100.clean-disks \
110.clean-tmps \
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile
index d9e49691b6e9..ea2bd9f0b057 100644
--- a/etc/periodic/monthly/Makefile
+++ b/etc/periodic/monthly/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= 450.status-security \
999.local
diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
index c5af2f85b012..026948b9d854 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= 100.chksetuid \
110.neggrpperm \
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index b6f77c4f71d0..865ef5340def 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= 340.noid \
450.status-security \
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 6c6801b52581..7302d2934c17 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= DAEMON \
FILESYSTEMS \
diff --git a/games/Makefile b/games/Makefile
index 716a7861db5d..a3bb2965a25d 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= \
bcd \
diff --git a/games/factor/Makefile b/games/factor/Makefile
index da1737cdb28d..afc9510405f2 100644
--- a/games/factor/Makefile
+++ b/games/factor/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= factor
SRCS= factor.c pr_tbl.c
diff --git a/gnu/Makefile b/gnu/Makefile
index b460590387ae..25480c7b951a 100644
--- a/gnu/Makefile
+++ b/gnu/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 5.33.1.1 (Berkeley) 5/6/91
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= lib ${_tests} usr.bin
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 0a607d7afa86..2651eef5abdb 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= csu libgcc libgcov libdialog libgomp libregex libreadline
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 02f540bad165..6ab5e87a1de4 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
GCCDIR= ${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index d3befcbb89a8..11af4305edbb 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -6,7 +6,7 @@ GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
SHLIB_NAME= libgcc_s.so.1
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
#
# libgcc is linked in last and thus cannot depend on ssp symbols coming
# from earlier libraries. Disable stack protection for this library.
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index aab624105291..5292f9f8d53f 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -3,7 +3,7 @@
MK_PROFILE= no
MK_SSP= no
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt"
GCCDIR= ${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index b0d45d63b651..d19f9f3bb3ff 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index acf1b58ed3c1..5cc5f04adf67 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
GCCVER= 4.2
GCCDIR= ${.CURDIR}/../../../contrib/gcc
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 7e96a6f4829f..76330699dffa 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_binutils} \
${_cc} \
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index 4436394f5de4..c058727069e7 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -4,7 +4,7 @@
# BINDIR
.include "${.CURDIR}/../../Makefile.inc"
.include "${.CURDIR}/../Makefile.inc0"
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index dff112169eba..81a46d5d21b0 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
.include "../Makefile.inc0"
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${SRCDIR}/ld
diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index bf6d20c79ce4..313aaf2da84f 100644
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# The order of some of these are rather important. Some depend on previous
# subdirs.
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 39adc91308e7..dc9779973210 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -1,5 +1,6 @@
# $FreeBSD$
+.include <src.opts.mk>
.include "../Makefile.inc"
# Sometimes this is .include'd several times...
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 1e7f33959f36..39f372b2d888 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index ba53565c35f7..0fd82e092db4 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index e73b2c991194..368517c1be00 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 742d7c6d41f2..64a07255e011 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 8f75f43aadda..ae7f8b82d17d 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CFLAGS+= -I.
diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index a8e48af2d02c..a3ac04b909e3 100644
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile
index 7c98cfc062c8..a7e0a57ad594 100644
--- a/gnu/usr.bin/dialog/Makefile
+++ b/gnu/usr.bin/dialog/Makefile
@@ -10,7 +10,7 @@ CFLAGS+= -I${.CURDIR} -I${DIALOG}
WARNS?= 6
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
diff --git a/gnu/usr.bin/grep/Makefile b/gnu/usr.bin/grep/Makefile
index 7d3b60769b8d..d412dfdfd0ed 100644
--- a/gnu/usr.bin/grep/Makefile
+++ b/gnu/usr.bin/grep/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
GREP_LIBZ=YES
diff --git a/include/Makefile b/include/Makefile
index fd2940ee59a7..737575fb1aef 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -3,7 +3,7 @@
#
# Doing a "make install" builds /usr/include.
-.include <bsd.own.mk>
+.include <src.opts.mk>
CLEANFILES= osreldate.h version vers.c
SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
diff --git a/include/arpa/Makefile b/include/arpa/Makefile
index 8a7f63d5a26a..63ab7ea8e82c 100644
--- a/include/arpa/Makefile
+++ b/include/arpa/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
NO_OBJ=
INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 943f7445a1c2..f53eadd6f47f 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
NO_LINT=
diff --git a/lib/Makefile b/lib/Makefile
index fe99085104bf..de87cbaa8560 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index a191f0da4d47..0772065f0822 100644
--- a/lib/atf/Makefile
+++ b/lib/atf/Makefile
@@ -25,7 +25,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= libatf-c \
libatf-c++ \
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index d52e4965d0a1..84477f79927d 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c++
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 69c46114e8bb..5c607f7b42da 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= atf-c
diff --git a/lib/clang/Makefile b/lib/clang/Makefile
index d335d80fbee2..ae7ae4a0a44d 100644
--- a/lib/clang/Makefile
+++ b/lib/clang/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if !make(install)
.if !defined(EARLY_BUILD)
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index b58cd0cae6fa..057b8aa613b5 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
CLANG_SRCS= ${LLVM_SRCS}/tools/clang
CFLAGS+= -I${LLVM_SRCS}/include -I${CLANG_SRCS}/include \
diff --git a/lib/clang/libllvmanalysis/Makefile b/lib/clang/libllvmanalysis/Makefile
index 34725fc39cb2..ea2a7189c40f 100644
--- a/lib/clang/libllvmanalysis/Makefile
+++ b/lib/clang/libllvmanalysis/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmanalysis
diff --git a/lib/clang/libllvmipa/Makefile b/lib/clang/libllvmipa/Makefile
index 85b75afa1c37..c866ca0ddfe0 100644
--- a/lib/clang/libllvmipa/Makefile
+++ b/lib/clang/libllvmipa/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmipa
diff --git a/lib/clang/libllvmipo/Makefile b/lib/clang/libllvmipo/Makefile
index b1e90161786d..85af0360244a 100644
--- a/lib/clang/libllvmipo/Makefile
+++ b/lib/clang/libllvmipo/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmipo
diff --git a/lib/clang/libllvmmc/Makefile b/lib/clang/libllvmmc/Makefile
index 7fdc474eb7f1..84ba618902bb 100644
--- a/lib/clang/libllvmmc/Makefile
+++ b/lib/clang/libllvmmc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmmc
diff --git a/lib/clang/libllvmscalaropts/Makefile b/lib/clang/libllvmscalaropts/Makefile
index 1f4edffeede9..8da4bf06d0c9 100644
--- a/lib/clang/libllvmscalaropts/Makefile
+++ b/lib/clang/libllvmscalaropts/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmscalaropts
diff --git a/lib/clang/libllvmsupport/Makefile b/lib/clang/libllvmsupport/Makefile
index eb3f633286cb..b7cfe6aa2d86 100644
--- a/lib/clang/libllvmsupport/Makefile
+++ b/lib/clang/libllvmsupport/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmsupport
diff --git a/lib/clang/libllvmtransformutils/Makefile b/lib/clang/libllvmtransformutils/Makefile
index f74209220254..cfad040c638d 100644
--- a/lib/clang/libllvmtransformutils/Makefile
+++ b/lib/clang/libllvmtransformutils/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmtransformutils
diff --git a/lib/clang/libllvmx86disassembler/Makefile b/lib/clang/libllvmx86disassembler/Makefile
index 797f2bf49a89..e5489a0e6089 100644
--- a/lib/clang/libllvmx86disassembler/Makefile
+++ b/lib/clang/libllvmx86disassembler/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= llvmx86disassembler
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index eb3921949931..bbe03a0bf126 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile
index 20015b98a9d0..0b9087d6540c 100644
--- a/lib/libbsnmp/libbsnmp/Makefile
+++ b/lib/libbsnmp/libbsnmp/Makefile
@@ -2,7 +2,7 @@
#
# Author: Harti Brandt <harti@freebsd.org>
-.include <bsd.own.mk>
+.include <src.opts.mk>
CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
.PATH: ${CONTRIB}
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 34dac5255432..6b84f23c03b0 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -3,7 +3,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBC_SRCTOP?= ${.CURDIR}
diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile
index e65fca06f8b6..db4fb32c7922 100644
--- a/lib/libc_nonshared/Makefile
+++ b/lib/libc_nonshared/Makefile
@@ -5,7 +5,7 @@
# compile modes.
# bsd.lib.mk doesn't have an easy way to express that.
MK_PROFILE?=no
-.include <bsd.own.mk>
+.include <src.opts.mk>
NO_PIC=
# -fpic on some platforms, -fPIC on others.
CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile
index 5f8039bc166f..91ce965739c9 100644
--- a/lib/libcompiler_rt/Makefile
+++ b/lib/libcompiler_rt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= compiler_rt
NO_PIC=
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index aca24d8f8af3..85bf94804fca 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -4,7 +4,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
SHLIB_MAJOR= 5
LIB= crypt
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index 085aba2c6cb4..cef5f5a43c18 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= fetch
CFLAGS+= -I.
diff --git a/lib/libipsec/Makefile b/lib/libipsec/Makefile
index 840aefa54f27..7d3e94a7db5a 100644
--- a/lib/libipsec/Makefile
+++ b/lib/libipsec/Makefile
@@ -29,7 +29,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= ipsec
SHLIB_MAJOR= 4
diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile
index bda505eeaff1..c7b2179c1943 100644
--- a/lib/libkiconv/Makefile
+++ b/lib/libkiconv/Makefile
@@ -2,7 +2,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= kiconv
SRCS= kiconv_sysctl.c xlat16_iconv.c xlat16_sysctl.c
diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile
index 0e625d0812a4..ca9838d9bff1 100644
--- a/lib/libmilter/Makefile
+++ b/lib/libmilter/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c570cfd2f77c..66fc63c89dc9 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MODULES =
MODULES += pam_chroot
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 4d28cfd6a44b..ea9e639c3b5f 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -34,6 +34,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
LIB= pam_unix
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 1a3e63409bb8..8cae1f1bdc49 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -3,7 +3,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= pcap
SRCS= grammar.y tokdefs.h version.h pcap-bpf.c \
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index fea6569438ad..7375a9ac43ab 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= proc
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index af5a775d7d05..32c7daa0b19c 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= procstat
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index cb68eaa32b1a..2b769d9ee61d 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -24,7 +24,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= radius
SRCS= radlib.c
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 9c9e3ae04d53..ba972ac3e8eb 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.10 (Berkeley) 6/24/90
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../include/rpcsvc
diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile
index 07172c75ea27..b30ba42e3af2 100644
--- a/lib/libsm/Makefile
+++ b/lib/libsm/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsm
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index e464a8fd9875..ea7327b3e94c 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 5f645203597a..0e074d2a837e 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -9,7 +9,7 @@
MK_PROFILE= no
MK_SSP= no
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= stand
NO_PIC=
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1cf52a01e882..1d388799a08a 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.2 (Berkeley) 12/15/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/libtelnet
diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
index 1c70a5e71bd2..cfcc41efb997 100644
--- a/lib/libthr/Makefile
+++ b/lib/libthr/Makefile
@@ -10,7 +10,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
LIB=thr
diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile
index 074d9db9f87a..efbaece8fefb 100644
--- a/lib/libulog/Makefile
+++ b/lib/libulog/Makefile
@@ -2,7 +2,7 @@
SHLIBDIR?=/lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= ulog
SHLIB_MAJOR= 0
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 582cceffba4e..5e5139ff9fa0 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -3,7 +3,7 @@
SHLIBDIR?= /lib
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= util
SHLIB_MAJOR= 9
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 2ae6821d7757..7c2ca9a5535e 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= wrap
SHLIB_MAJOR= 6
diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile
index b363f6462204..822905f44dcc 100644
--- a/lib/ncurses/Makefile
+++ b/lib/ncurses/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ncurses form menu panel
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index 52cf0641510b..428ec80032e6 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -7,7 +7,7 @@ SHLIBDIR?= /lib
MK_MAN=no
.endif
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include "${.CURDIR}/../config.mk"
diff --git a/libexec/Makefile b/libexec/Makefile
index e087a8a8ffe7..8a32694d4050 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_atf} \
${_atrun} \
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index 0cfa8636491b..093de06ed534 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
ATF= ${.CURDIR:H:H:H}/contrib/atf
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index e415407fb9e6..0c7c9826a843 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/4/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ftpd
MAN= ftpd.8 ftpchroot.5
diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile
index 9807dc8e5ba3..de0fb20e2961 100644
--- a/libexec/rlogind/Makefile
+++ b/libexec/rlogind/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= rlogind
MAN= rlogind.8
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 2a0953c96dfa..21e2219d3727 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG?= ld-elf.so.1
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index e707a4e334e8..f3fbf29b5d5f 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile
index dcc339878e14..99f023f263f2 100644
--- a/libexec/telnetd/Makefile
+++ b/libexec/telnetd/Makefile
@@ -3,7 +3,7 @@
# Do not define -DKLUDGELINEMODE, as it does not interact well with many
# telnet implementations.
-.include <bsd.own.mk>
+.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/telnetd
diff --git a/release/picobsd/tinyware/login/Makefile b/release/picobsd/tinyware/login/Makefile
index a86fff46a933..0a39c756ad18 100644
--- a/release/picobsd/tinyware/login/Makefile
+++ b/release/picobsd/tinyware/login/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../../usr.bin/login
diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile
index 62f5da1ba292..ad4931e52c66 100644
--- a/rescue/librescue/Makefile
+++ b/rescue/librescue/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
# Certain library entries have hard-coded references to
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 4a4cd446fde9..fc778f0aa280 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -3,7 +3,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= rescue
diff --git a/sbin/Makefile b/sbin/Makefile
index 154815514349..3725270c4c3f 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.5 (Berkeley) 3/31/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# XXX MISSING: icheck ncheck
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index e506f9c56cee..896c64c82c13 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -1,7 +1,7 @@
# @(#)Makefile.inc 8.1 (Berkeley) 6/8/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
BINDIR?= /sbin
WARNS?= 6
diff --git a/sbin/atm/atmconfig/Makefile b/sbin/atm/atmconfig/Makefile
index 0d64fea0f4f7..34c2989d6762 100644
--- a/sbin/atm/atmconfig/Makefile
+++ b/sbin/atm/atmconfig/Makefile
@@ -5,7 +5,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= atmconfig
.ifndef RESCUE
diff --git a/sbin/dhclient/Makefile b/sbin/dhclient/Makefile
index 57c92118d131..09f19db0747e 100644
--- a/sbin/dhclient/Makefile
+++ b/sbin/dhclient/Makefile
@@ -31,7 +31,7 @@
# OF THE POSSIBILITY OF SUCH DAMAGE.
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile
index 912561fbc52f..a7ed1b9450e5 100644
--- a/sbin/geom/class/Makefile
+++ b/sbin/geom/class/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= cache
SUBDIR+=concat
diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile
index 8f889f1837eb..b46335991671 100644
--- a/sbin/ggate/Makefile
+++ b/sbin/ggate/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_ggatec} \
${_ggated} \
diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile
index 58ce41df6310..025771fa0370 100644
--- a/sbin/growfs/Makefile
+++ b/sbin/growfs/Makefile
@@ -6,7 +6,7 @@
#GFSDBG=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../mount
diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile
index 02531e6f5e8f..89b972e56705 100644
--- a/sbin/hastctl/Makefile
+++ b/sbin/hastctl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../hastd
diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile
index 7ff6ee830a06..306c83ac9e50 100644
--- a/sbin/hastd/Makefile
+++ b/sbin/hastd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= hastd
SRCS= activemap.c
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index d7c645226739..aae67249c2bf 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ifconfig
diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile
index 6aea26b7a3d4..de27e3ebdedc 100644
--- a/sbin/ipfw/Makefile
+++ b/sbin/ipfw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ipfw
SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 4b9b9405474d..69a688cdc389 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= mdconfig
MAN= mdconfig.8
diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile
index 5b3735c6e771..937f403569dd 100644
--- a/sbin/pfctl/Makefile
+++ b/sbin/pfctl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# pf_ruleset.c is shared between kernel and pfctl
.PATH: ${.CURDIR}/../../sys/netpfil/pf
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index c3dda698b519..a05efe371c57 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ping
MAN= ping.8
diff --git a/sbin/route/Makefile b/sbin/route/Makefile
index 569d21af07a0..25134e473b66 100644
--- a/sbin/route/Makefile
+++ b/sbin/route/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= route
MAN= route.8
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
index e2c93ccf489b..bd04f07c1eb4 100644
--- a/sbin/setkey/Makefile
+++ b/sbin/setkey/Makefile
@@ -27,7 +27,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= setkey
MAN= setkey.8
diff --git a/secure/Makefile b/secure/Makefile
index 4a111a25c548..4e2cc4f72523 100644
--- a/secure/Makefile
+++ b/secure/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= lib libexec ${_tests} usr.bin usr.sbin
diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index eb7c66ef1492..ca4cb857f2f7 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if exists(${.CURDIR}/../../lib/libcrypt/obj)
CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj
diff --git a/secure/lib/Makefile b/secure/lib/Makefile
index 118204f67f8a..4ca851766e62 100644
--- a/secure/lib/Makefile
+++ b/secure/lib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR=
.if ${MK_OPENSSL} != "no"
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index f4bfd06ea7fe..b63d6b9c6692 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIB= ssh
PRIVATELIB= true
diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile
index 9edc8e66c197..07aa3dd4bdc4 100644
--- a/secure/libexec/Makefile
+++ b/secure/libexec/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR=
.if ${MK_OPENSSH} != "no"
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
index ef56013ff3bc..eb788f6d0637 100644
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sftp-server
SRCS= sftp-server.c sftp-common.c sftp-server-main.c
diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile
index 7deda1976ba3..668ad9e1b4f8 100644
--- a/secure/libexec/ssh-keysign/Makefile
+++ b/secure/libexec/ssh-keysign/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-keysign
SRCS= ssh-keysign.c roaming_dummy.c readconf.c
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
index 4682929e2d93..f3cf9029f4cc 100644
--- a/secure/libexec/ssh-pkcs11-helper/Makefile
+++ b/secure/libexec/ssh-pkcs11-helper/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-pkcs11-helper
SRCS= ssh-pkcs11.c ssh-pkcs11-helper.c
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile
index e819ba74686c..e14ebe3000e9 100644
--- a/secure/usr.bin/Makefile
+++ b/secure/usr.bin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR=
.if ${MK_OPENSSL} != "no"
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index c33470ca9ef3..d58d855d8029 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= scp
SRCS= scp.c
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
index 924e1a702163..15dcaa52061d 100644
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sftp
SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c progressmeter.c
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index 316a6071280b..97191ba51fbf 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-add
SRCS+= ssh-add.c
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index 353abaced410..b5db53236c8b 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-agent
SRCS= ssh-agent.c
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 75934d9bff91..45e4d1691f98 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-keygen
SRCS= ssh-keygen.c
diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile
index 7dcb4d10826e..298f52a53c07 100644
--- a/secure/usr.bin/ssh-keyscan/Makefile
+++ b/secure/usr.bin/ssh-keyscan/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh-keyscan
SRCS= ssh-keyscan.c roaming_dummy.c
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 4a4642970195..89f9927c0aaa 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ssh
CFLAGS+=-I${SSHDIR} -include ssh_namespace.h
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile
index 33d945c0c683..e42f456b12d0 100644
--- a/secure/usr.sbin/Makefile
+++ b/secure/usr.sbin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR=
.if ${MK_OPENSSH} != "no"
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index e1c71a3eab94..d487fe3dd7cc 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sshd
SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
diff --git a/share/Makefile b/share/Makefile
index 8ac475044833..604e4169313a 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# Do not include `info' in the SUBDIR list, it is handled separately.
diff --git a/share/doc/Makefile b/share/doc/Makefile
index a4fe61d6c479..fda977f118e0 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_IPv6} \
${_atf} \
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index fd42bd4d53a6..1d99b052a351 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/10/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# The following modules do not describe FreeBSD:
# 14.uucpimpl, 15.uucpnet
diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile
index adbdc84971c4..ba52997a59ba 100644
--- a/share/dtrace/Makefile
+++ b/share/dtrace/Makefile
@@ -4,7 +4,7 @@
# the DTraceToolkit.
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= ${_toolkit}
diff --git a/share/examples/Makefile b/share/examples/Makefile
index a4270bf38ae8..dcc3256d2d29 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -2,7 +2,7 @@
#
# Doing a make install builds /usr/share/examples
-.include <bsd.own.mk>
+.include <src.opts.mk>
LDIRS= BSD_daemon \
FreeBSD_version \
diff --git a/share/man/Makefile b/share/man/Makefile
index 524235c2e9f0..c3bd5f22aca4 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/16/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# XXX MISSING: man3f
SUBDIR= man1 man3 man4 man5 man6 man7 man8 man9
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 97885a6a8b83..1b37c4b34e33 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MAN= builtin.1 intro.1
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile
index ccdc54985026..f0cbf0ecd9f3 100644
--- a/share/man/man3/Makefile
+++ b/share/man/man3/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 12/13/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MAN= assert.3 \
ATOMIC_VAR_INIT.3 \
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index f69c862282ad..5d2ee5f67a0e 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MAN= aac.4 \
aacraid.4 \
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index e0bd22247d40..541f21176f07 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
#MISSING: dump.5 plot.5
MAN= acct.5 \
diff --git a/share/mk/Makefile b/share/mk/Makefile
index cd1021565c6a..f6f6e98cba7b 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILES= \
bsd.README \
@@ -26,7 +26,7 @@ FILES= \
bsd.nls.mk \
bsd.obj.mk \
bsd.opts.mk \
- bsd.own.mk \
+ src.opts.mk \
bsd.port.mk \
bsd.port.options.mk \
bsd.port.post.mk \
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 50c3092dbf6a..09b607eb48f7 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -65,8 +65,6 @@ __DEFAULT_NO_OPTIONS = \
.include <bsd.mkopt.mk>
-# This should be elsewhere, but needs to be here first for now.
-.include <src.opts.mk>
.endif # !_WITHOUT_SRCCONF
.endif
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 3105cd63d0a2..952ca21a2852 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-# The include file <bsd.own.mk> set common variables for owner,
+# The include file <src.opts.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
#
#
@@ -234,4 +234,7 @@ COMPRESS_EXT?= .gz
# overriden by Makefiles, but the user may choose to set this in src.conf(5).
TESTSBASE?= /usr/tests
+# Compat for the moment
+.include <bsd.compiler.mk>
+
.endif # !target(__<bsd.own.mk>__)
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index e8a6e0081e80..2b0d41f1d78d 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -14,7 +14,7 @@
# Makefiles must include bsd.srcpot.mk before they test the value of any MK_FOO
# variable.
#
-# Makefiles may also assume that this file is included by bsd.own.mk should it
+# Makefiles may also assume that this file is included by src.opts.mk should it
# need variables defined there prior to the end of the Makefile where
# bsd.{subdir,lib.bin}.mk is traditionally included.
#
@@ -30,6 +30,9 @@
.if !target(__<src.opts.mk>__)
__<src.opts.mk>__:
+# Compat -- needed still?
+.include <bsd.own.mk>
+
# Allow user to configure things, but in the future this will move
# elsehwere...
diff --git a/sys/Makefile b/sys/Makefile
index 935f30d96147..47fd4629fb07 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# The boot loader
.if ${MK_BOOT} != "no"
diff --git a/sys/boot/Makefile b/sys/boot/Makefile
index 0d6441d77bd8..2984bd5c89cf 100644
--- a/sys/boot/Makefile
+++ b/sys/boot/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include <bsd.arch.inc.mk>
.if ${MK_FORTH} != "no"
diff --git a/sys/boot/amd64/efi/Makefile b/sys/boot/amd64/efi/Makefile
index f4138c937052..a9a213227d0e 100644
--- a/sys/boot/amd64/efi/Makefile
+++ b/sys/boot/amd64/efi/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
# In-tree GCC does not support __attribute__((ms_abi)).
.if ${COMPILER_TYPE} != "gcc"
diff --git a/sys/boot/arm/at91/bootspi/Makefile b/sys/boot/arm/at91/bootspi/Makefile
index 04c4fbb51592..a02d447b48a3 100644
--- a/sys/boot/arm/at91/bootspi/Makefile
+++ b/sys/boot/arm/at91/bootspi/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
.PATH: ${.CURDIR}/../libat91
P=bootspi
diff --git a/sys/boot/arm/at91/libat91/Makefile b/sys/boot/arm/at91/libat91/Makefile
index 7ab9a1f3bb47..b02281dc640d 100644
--- a/sys/boot/arm/at91/libat91/Makefile
+++ b/sys/boot/arm/at91/libat91/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.include <src.opts.mk>
.include "${.CURDIR}/../Makefile.inc"
SOC?=at91rm9200
diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile
index 14e87d1cea63..6fe515e0cfcb 100644
--- a/sys/boot/arm/ixp425/boot2/Makefile
+++ b/sys/boot/arm/ixp425/boot2/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# We get a lot of the std lib functions from here.
.PATH: ${.CURDIR}/../../at91/libat91
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
index 3402e02e2ed4..a24eeac45a2f 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ubldr
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
diff --git a/sys/boot/i386/Makefile b/sys/boot/i386/Makefile
index 3c05759fcf09..5ebd55764787 100644
--- a/sys/boot/i386/Makefile
+++ b/sys/boot/i386/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
libi386 libfirewire loader
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index b98a725ab1e8..b33101283b49 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
LOADER?= loader
diff --git a/sys/boot/ia64/common/Makefile b/sys/boot/ia64/common/Makefile
index 5740070594e6..ef2737f4cd2f 100644
--- a/sys/boot/ia64/common/Makefile
+++ b/sys/boot/ia64/common/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
LIB= ia64
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 6bb53b587123..fc11d6e8d657 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= loader.sym
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index 31af84e3450f..06201265f901 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= skiload
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile
index fd60d60f2f1b..56f7d153678e 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@@ -8,7 +8,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
S= ${.CURDIR}/../../../lib/libstand
diff --git a/sys/boot/mips/beri/loader/Makefile b/sys/boot/mips/beri/loader/Makefile
index 93360018cedb..fed224712ccd 100644
--- a/sys/boot/mips/beri/loader/Makefile
+++ b/sys/boot/mips/beri/loader/Makefile
@@ -29,7 +29,7 @@
#
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG?= loader
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 489eeac1542e..7ab13a189dd3 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
LOADER?= loader
diff --git a/sys/boot/powerpc/ofw/Makefile b/sys/boot/powerpc/ofw/Makefile
index ae4a443986ea..bf4ea8ab1651 100644
--- a/sys/boot/powerpc/ofw/Makefile
+++ b/sys/boot/powerpc/ofw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= loader
diff --git a/sys/boot/powerpc/ps3/Makefile b/sys/boot/powerpc/ps3/Makefile
index 87aa6ed565e7..5742a86bd500 100644
--- a/sys/boot/powerpc/ps3/Makefile
+++ b/sys/boot/powerpc/ps3/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG= loader.ps3
diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile
index c4180cbf2579..4239e47b4c3e 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/sys/boot/powerpc/uboot/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ubldr
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile
index 4624b6f7b448..d7266ad08781 100644
--- a/sys/boot/sparc64/loader/Makefile
+++ b/sys/boot/sparc64/loader/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
PROG?= loader
diff --git a/sys/boot/uboot/lib/Makefile b/sys/boot/uboot/lib/Makefile
index e5ed3ceea56d..4c9e5919a3e9 100644
--- a/sys/boot/uboot/lib/Makefile
+++ b/sys/boot/uboot/lib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../common
diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index cc528b35a738..5623e72c2eda 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
MK_SSP= no
SHLIB_NAME= userboot.so
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 3ff23c2db92d..1b7c49dbd6dc 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -3,7 +3,7 @@
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
-.include <bsd.own.mk>
+.include <src.opts.mk>
.include <bsd.compiler.mk>
# backwards compat option for older systems.
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 21e51415922d..00d3db6e8a0e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index f04c0352d7e7..cb59d9aa4c95 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../dev/aic7xxx
KMOD= ahc
diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile
index ca3d5da51320..6b1bde0c4345 100644
--- a/sys/modules/carp/Makefile
+++ b/sys/modules/carp/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../netinet
.PATH: ${.CURDIR}/../../crypto
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD= carp
SRCS= ip_carp.c sha1.c
diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile
index a84dbaf23359..b866287b2d8b 100644
--- a/sys/modules/cxgb/Makefile
+++ b/sys/modules/cxgb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= cxgb
SUBDIR+= cxgb_t3fw
diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile
index d24ff08da46e..3f0f68af2de4 100644
--- a/sys/modules/cxgb/cxgb/Makefile
+++ b/sys/modules/cxgb/cxgb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile
index f633bd5c663a..2ee4990b4646 100644
--- a/sys/modules/cxgb/iw_cxgb/Makefile
+++ b/sys/modules/cxgb/iw_cxgb/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB}/ulp/iw_cxgb
diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile
index 8b08fe273e1e..f4a277641fdb 100644
--- a/sys/modules/cxgb/tom/Makefile
+++ b/sys/modules/cxgb/tom/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB}/ulp/tom
diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile
index 86ce82e9e45d..b46bf224a1c3 100644
--- a/sys/modules/cxgbe/Makefile
+++ b/sys/modules/cxgbe/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR = if_cxgbe
SUBDIR+= t4_firmware
diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile
index f4ebcdd39dc3..665feb9ff9d9 100644
--- a/sys/modules/cxgbe/if_cxgbe/Makefile
+++ b/sys/modules/cxgbe/if_cxgbe/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGBE = ${.CURDIR}/../../../dev/cxgbe
.PATH: ${CXGBE} ${CXGBE}/common
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
index 7704650ed05f..fdf50639ab55 100644
--- a/sys/modules/cxgbe/iw_cxgbe/Makefile
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGBE = ${.CURDIR}/../../../dev/cxgbe
.PATH: ${CXGBE}/iw_cxgbe
diff --git a/sys/modules/cxgbe/tom/Makefile b/sys/modules/cxgbe/tom/Makefile
index d02afd4cc3f2..99c1f4e68596 100644
--- a/sys/modules/cxgbe/tom/Makefile
+++ b/sys/modules/cxgbe/tom/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
CXGBE = ${.CURDIR}/../../../dev/cxgbe
.PATH: ${CXGBE}/tom
diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile
index 85475933d5e9..c96bb4b016e5 100644
--- a/sys/modules/dpt/Makefile
+++ b/sys/modules/dpt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/dpt
KMOD= dpt
diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile
index 21328fcca951..f75eb3b815d4 100644
--- a/sys/modules/drm/Makefile
+++ b/sys/modules/drm/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index dfddbce89332..c1f8bb1cfad7 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netpfil/ipfw
KMOD= dummynet
diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile
index 545e37d809b9..5e71f2f00eaf 100644
--- a/sys/modules/em/Makefile
+++ b/sys/modules/em/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/e1000
KMOD = if_em
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 8db77d3beb13..99281a46421d 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/ep
diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile
index 1ddb4c87ef08..0cc231e3da1b 100644
--- a/sys/modules/if_bridge/Makefile
+++ b/sys/modules/if_bridge/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../net
KMOD= if_bridge
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index 1cde56cbcd0d..f2db9136f5fa 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile
index 4d84c92d1702..f2f1a6e48406 100644
--- a/sys/modules/if_lagg/Makefile
+++ b/sys/modules/if_lagg/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../net
KMOD= if_lagg
diff --git a/sys/modules/igb/Makefile b/sys/modules/igb/Makefile
index 1ff127467bca..5da3cf515240 100644
--- a/sys/modules/igb/Makefile
+++ b/sys/modules/igb/Makefile
@@ -1,6 +1,6 @@
#$FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/e1000
KMOD = if_igb
diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile
index 39500ceca19a..9e1e89d29d0a 100644
--- a/sys/modules/ipdivert/Makefile
+++ b/sys/modules/ipdivert/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netinet
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index c14469507e15..0bdfbf2dfcee 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 48f9ce163747..46cd70b98f3b 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netpfil/ipfw
diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile
index bcbafc83a8b5..6cf805dcde1b 100644
--- a/sys/modules/ipoib/Makefile
+++ b/sys/modules/ipoib/Makefile
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib
.PATH: ${.CURDIR}/../../ofed/include/linux
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = ipoib
SRCS = device_if.h bus_if.h opt_ofed.h vnode_if.h opt_inet.h opt_inet6.h
diff --git a/sys/modules/ixgbe/Makefile b/sys/modules/ixgbe/Makefile
index 68d887e3e93e..d7409d7e37e7 100644
--- a/sys/modules/ixgbe/Makefile
+++ b/sys/modules/ixgbe/Makefile
@@ -1,6 +1,6 @@
#$FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/ixgbe
diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile
index 02ee17687eb1..1af961ff81ca 100644
--- a/sys/modules/mlx4/Makefile
+++ b/sys/modules/mlx4/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../ofed/include/linux
KMOD = mlx4
diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile
index bdde60fb8708..68a8cd826096 100644
--- a/sys/modules/mlx4ib/Makefile
+++ b/sys/modules/mlx4ib/Makefile
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
.PATH: ${.CURDIR}/../../ofed/include/linux
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = mlx4ib
SRCS = device_if.h bus_if.h pci_if.h vnode_if.h
diff --git a/sys/modules/mlxen/Makefile b/sys/modules/mlxen/Makefile
index 73208d5cce7a..3611f25fa8e1 100644
--- a/sys/modules/mlxen/Makefile
+++ b/sys/modules/mlxen/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = mlxen
SRCS = device_if.h bus_if.h pci_if.h vnode_if.h
diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile
index a306289a3f6b..dd34d70114f3 100644
--- a/sys/modules/mthca/Makefile
+++ b/sys/modules/mthca/Makefile
@@ -2,7 +2,7 @@
.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = mthca
SRCS = device_if.h bus_if.h pci_if.h vnode_if.h
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index 0703c242f5ca..cccbd656c151 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -1,7 +1,7 @@
# $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= async \
atm \
diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile
index cc3f0f24e2a0..5805c09f8a49 100644
--- a/sys/modules/netgraph/ipfw/Makefile
+++ b/sys/modules/netgraph/ipfw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD= ng_ipfw
SRCS= ng_ipfw.c opt_inet.h opt_inet6.h
diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile
index fb38b241e5cc..2a8fd626cc02 100644
--- a/sys/modules/netgraph/netflow/Makefile
+++ b/sys/modules/netgraph/netflow/Makefile
@@ -3,7 +3,7 @@
# Author: Gleb Smirnoff <glebius@freebsd.org>
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../netgraph/netflow
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 9dc6c0dac72f..e327b5c5c3ea 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netpfil/pf
diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile
index 70a5234698a1..4da24b3a0dfa 100644
--- a/sys/modules/pflog/Makefile
+++ b/sys/modules/pflog/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netpfil/pf
diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile
index 92c6edb2fd53..9c085fceafdd 100644
--- a/sys/modules/pfsync/Makefile
+++ b/sys/modules/pfsync/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../netpfil/pf
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index 481aa8e91c77..2c51f45f8557 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# Modules that include binary-only blobs of microcode should be selectable by
# MK_SOURCELESS_UCODE option (see below).
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index eacd2ebcc1d0..6b3c9d4540e3 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -25,7 +25,7 @@
# SUCH DAMAGE.
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
#
# Check for common USB debug flags to pass when building the USB
diff --git a/sys/modules/virtio/network/Makefile b/sys/modules/virtio/network/Makefile
index f124d996342f..41a5101b8d72 100644
--- a/sys/modules/virtio/network/Makefile
+++ b/sys/modules/virtio/network/Makefile
@@ -23,7 +23,7 @@
# SUCH DAMAGE.
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../dev/virtio/network
diff --git a/sys/modules/vmware/vmxnet3/Makefile b/sys/modules/vmware/vmxnet3/Makefile
index 2a3ffbf7cad3..9d4299707ec9 100644
--- a/sys/modules/vmware/vmxnet3/Makefile
+++ b/sys/modules/vmware/vmxnet3/Makefile
@@ -23,7 +23,7 @@
# SUCH DAMAGE.
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3
diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile
index 2d7bc18a66cb..e700efe3780c 100644
--- a/sys/modules/vx/Makefile
+++ b/sys/modules/vx/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../dev/vx
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
index 6b03ea319128..7b81da0c060c 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/Makefile
@@ -2,7 +2,7 @@
#.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mlx4
#.PATH: ${.CURDIR}/../../../../include/linux
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = mlx4ib
SRCS = device_if.h bus_if.h pci_if.h vnode_if.h
diff --git a/sys/ofed/drivers/net/mlx4/Makefile b/sys/ofed/drivers/net/mlx4/Makefile
index 2e2ba35d7bb5..d6fe77534817 100644
--- a/sys/ofed/drivers/net/mlx4/Makefile
+++ b/sys/ofed/drivers/net/mlx4/Makefile
@@ -2,7 +2,7 @@
#.PATH: ${.CURDIR}/../../ofed/drivers/net/mlx4:${.CURDIR}/../../ofed/include/linux
.PATH: ${.CURDIR}/../../../../../include/linux
-.include <bsd.own.mk>
+.include <src.opts.mk>
KMOD = mlx4
diff --git a/tools/regression/priv/Makefile b/tools/regression/priv/Makefile
index 9ed28a7f6cb2..a1fbcc668f57 100644
--- a/tools/regression/priv/Makefile
+++ b/tools/regression/priv/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= priv
SRCS= main.c \
diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile
index 57f2332dd4e6..7cd0550071b4 100644
--- a/tools/tools/net80211/wlanwatch/Makefile
+++ b/tools/tools/net80211/wlanwatch/Makefile
@@ -4,7 +4,7 @@ PROG= wlanwatch
BINDIR= /usr/local/bin
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index ef9381b27107..694a8d00f3ee 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
# XXX MISSING: deroff diction graph learn plot
# spell spline struct xsend
diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile
index bf37b9cff8eb..3ecf038f9282 100644
--- a/usr.bin/apply/Makefile
+++ b/usr.bin/apply/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= apply
DPADD= ${LIBSBUF}
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 03d9814c1018..157d4113309c 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ar
SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
index de2e51e807f9..845521c80420 100644
--- a/usr.bin/atf/atf-sh/Makefile
+++ b/usr.bin/atf/atf-sh/Makefile
@@ -25,6 +25,7 @@
#
# $FreeBSD$
+.include <src.opts.mk>
.include <bsd.init.mk>
ATF= ${.CURDIR:H:H:H}/contrib/atf
diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc
index 75678878da8c..b8e27e0e1f3b 100644
--- a/usr.bin/bmake/Makefile.inc
+++ b/usr.bin/bmake/Makefile.inc
@@ -1,13 +1,13 @@
# $FreeBSD$
-.include "bsd.own.mk"
+.include "src.opts.mk"
.if defined(.PARSEDIR)
# make sure this is available to unit-tests/Makefile
.export SRCTOP
.endif
-# Sadly, we cannot assume bsd.own.mk did its job,
+# Sadly, we cannot assume src.opts.mk did its job,
# nor can we safely include the one we want
.if !defined(WITHOUT_BMAKE)
MK_BMAKE= yes
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index b347a52a0f3b..32a107a32247 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= calendar
SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index 847e5c960106..a9e00e8a3d91 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../newkey
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 566173e14d8d..cf3acc6bee15 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 4/2/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen
diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile
index f3e29578ca11..9655b06c4c65 100644
--- a/usr.bin/clang/Makefile
+++ b/usr.bin/clang/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= clang clang-tblgen tblgen
diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile
index ac6e685311e3..74ef867b441c 100644
--- a/usr.bin/clang/clang/Makefile
+++ b/usr.bin/clang/clang/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG_CXX=clang
diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile
index 59c97514e394..ca9134358188 100644
--- a/usr.bin/comm/Makefile
+++ b/usr.bin/comm/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= comm
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 635f4bce11ad..16446c4b4def 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive
diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile
index 687f3eac73d1..ed56f2f40c51 100644
--- a/usr.bin/fetch/Makefile
+++ b/usr.bin/fetch/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= fetch
CSTD?= c99
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 4a80e58a91fc..214d0336a015 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= file2c
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index 55a36beecaa8..abdd6b7cdf74 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -2,7 +2,7 @@
# $NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/3/94
-.include <bsd.own.mk>
+.include <src.opts.mk>
# Uncomment the following to provide defaults for gate-ftp operation
#
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index abc2f447073f..c0c24dc27c17 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_BSD_GREP} == "yes"
PROG= grep
diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile
index 6dcd62f8671a..73724358a560 100644
--- a/usr.bin/gzip/Makefile
+++ b/usr.bin/gzip/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.16 2011/06/21 13:25:45 joerg Exp $
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= gzip
MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 7d78b50c7440..d7e40493bfba 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= id
LINKS= ${BINDIR}/id ${BINDIR}/groups
diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile
index 61634ee2ec09..c3f40e4be6b8 100644
--- a/usr.bin/join/Makefile
+++ b/usr.bin/join/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= join
diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile
index ca646495316b..206c89312f45 100644
--- a/usr.bin/jot/Makefile
+++ b/usr.bin/jot/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= jot
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile
index f9d56cc2ec37..cba8e4102dab 100644
--- a/usr.bin/kdump/Makefile
+++ b/usr.bin/kdump/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if (${MACHINE_ARCH} == "amd64")
SFX= 32
diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile
index 88253757b7f1..54341caa6990 100644
--- a/usr.bin/lastcomm/Makefile
+++ b/usr.bin/lastcomm/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= lastcomm
SRCS= lastcomm.c readrec.c
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index d7e430f3e43f..4c28593aada9 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/flex
diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile
index 922192ce919f..cbdd0b433b2b 100644
--- a/usr.bin/logger/Makefile
+++ b/usr.bin/logger/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= logger
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index bd34ed9c6269..1ebc7602ad6d 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= login
SRCS= login.c login_fbtab.c
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index e6cf0b6b8c4c..13b99c8d0269 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -4,7 +4,7 @@
# -DEXTENDED
# if you want the paste & spaste macros.
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= m4
CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 9b8290c5b64a..27b295756b16 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -2,7 +2,7 @@
# $Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= make
CFLAGS+=-I${.CURDIR}
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 27aa5678ef30..b26605fbac21 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ncal
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index ff97074e553a..2d50a495428b 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/12/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= netstat
SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index b3b5b51d8c9f..bf4651352eed 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= newkey
SRCS= newkey.c generic.c update.c
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index d657c804a549..3e6dc9393950 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG = passwd
BINOWN = root
diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile
index 31047c53f931..759bcf75e982 100644
--- a/usr.bin/printf/Makefile
+++ b/usr.bin/printf/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= printf
diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile
index b635c89ad576..a741da3233e6 100644
--- a/usr.bin/sed/Makefile
+++ b/usr.bin/sed/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sed
SRCS= compile.c main.c misc.c process.c
diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile
index 3b257c2236a7..c6eef8561010 100644
--- a/usr.bin/sort/Makefile
+++ b/usr.bin/sort/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= sort
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 0002e869c471..d5eb805e3f6e 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= su
diff --git a/usr.bin/svn/Makefile.inc b/usr.bin/svn/Makefile.inc
index fb50b227567c..203b8175bd94 100644
--- a/usr.bin/svn/Makefile.inc
+++ b/usr.bin/svn/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_SVN} == "yes"
SVNLITE?=
diff --git a/usr.bin/svn/lib/libapr_util/Makefile b/usr.bin/svn/lib/libapr_util/Makefile
index 4f25e8f5bfac..df2d1f9a2104 100644
--- a/usr.bin/svn/lib/libapr_util/Makefile
+++ b/usr.bin/svn/lib/libapr_util/Makefile
@@ -28,7 +28,7 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${APR}/include/arch/unix \
-I${APR}/include
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_ICONV} == "yes"
CFLAGS+= -DHAVE_ICONV_H=1 -DAPU_HAVE_ICONV=1
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index 5773c36adf2d..8d024ffca9cc 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= systat
SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index d1f400bfa075..a289ea49a7ce 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index 0ef55c50e296..d47bb91c4eb7 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
.PATH: ${TELNETDIR}/telnet
diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile
index 7c65daeb8dba..393b446614fd 100644
--- a/usr.bin/tr/Makefile
+++ b/usr.bin/tr/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= tr
SRCS= cmap.c cset.c str.c tr.c
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 7f3dde00e196..7063d6f719a4 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,12 +1,11 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-MAN=
-
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= uudecode
LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode
+MAN=
.if ${MK_TESTS} != "no"
SUBDIR+= tests
diff --git a/usr.bin/uuencode/Makefile b/usr.bin/uuencode/Makefile
index 9c5e7291d367..eb2152f8bd8f 100644
--- a/usr.bin/uuencode/Makefile
+++ b/usr.bin/uuencode/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= uuencode
MAN= uuencode.1 uuencode.format.5
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 445d79fba2f7..16675c9f73d2 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
SRCDIR= ${.CURDIR}/../../contrib/nvi
SUBDIR+= catalog
diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile
index b627bf5e73b4..034a0a6de353 100644
--- a/usr.bin/xargs/Makefile
+++ b/usr.bin/xargs/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= xargs
SRCS= xargs.c strnsubst.c
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 03f0d01225e6..45e7929db00b 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 5.3 (Berkeley) 5/12/90
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
BYACC_SRC= ${.CURDIR}/../../contrib/byacc
.PATH: ${BYACC_SRC}
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b06dba709b35..fa0c9951440d 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SUBDIR= adduser \
arp \
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index cc616f1592f8..e4425f52a2c5 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -9,7 +9,7 @@
# Portions derived from amd/libamu/Makefile
# $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
-.include <bsd.own.mk>
+.include <src.opts.mk>
CFLAGS+= -I. -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../include
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index c7200037f628..1fc41bfe20d0 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/amd/amd
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile
index df770d1caf81..e594d71a4fb3 100644
--- a/usr.sbin/amd/include/Makefile
+++ b/usr.sbin/amd/include/Makefile
@@ -7,7 +7,7 @@
# Portions derived from amd/libamu/Makefile
# $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $
-.include <bsd.own.mk>
+.include <src.opts.mk>
SRCS= config_local.h
.if ${MK_NIS} == "no"
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
index a5163a3873ab..0596993ec67c 100644
--- a/usr.sbin/bootparamd/bootparamd/Makefile
+++ b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -1,7 +1,7 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= bootparamd
MAN= bootparams.5 bootparamd.8
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 1910b23d956c..e359bba590e5 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -8,7 +8,7 @@ LDADD= -larchive -ldialog -lm
WARNS?= 6
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 08eb91c07352..2ac9eb611b73 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -8,7 +8,7 @@ LDADD= -lfetch -ldialog -lm
WARNS?= 6
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index 3eb0d3f8946d..328259c1ec11 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -22,7 +22,7 @@ SRCS= diskeditor.c partedit.c gpart_ops.c partedit_${PARTEDIT_ARCH}.c \
WARNS?= 3
MAN= sade.8
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile
index 3e6df47fadac..b20ba31d604c 100644
--- a/usr.sbin/bsnmpd/bsnmpd/Makefile
+++ b/usr.sbin/bsnmpd/bsnmpd/Makefile
@@ -2,7 +2,7 @@
#
# Author: Harti Brandt <harti@freebsd.org>
-.include <bsd.own.mk>
+.include <src.opts.mk>
CONTRIB=${.CURDIR}/../../../contrib/bsnmp
.PATH: ${CONTRIB}/snmpd
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index 45558b7abcc0..24f9f0298c84 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/bsnmp/snmpd
diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
index 636991836137..e05ce31020ed 100644
--- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
+++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../../sbin/hastd
diff --git a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
index 94a1cea17242..3310420a4f38 100644
--- a/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
+++ b/usr.sbin/bsnmpd/tools/bsnmptools/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# Author: Shteryana Shopova <syrinx@FreeBSD.org>
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}
diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile
index 765533a331ad..155151de02f8 100644
--- a/usr.sbin/etcupdate/Makefile
+++ b/usr.sbin/etcupdate/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SCRIPTS=etcupdate.sh
MAN= etcupdate.8
diff --git a/usr.sbin/flowctl/Makefile b/usr.sbin/flowctl/Makefile
index a2dd37788c38..acee16ba8eff 100644
--- a/usr.sbin/flowctl/Makefile
+++ b/usr.sbin/flowctl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= flowctl
MAN= flowctl.8
diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile
index 3663bf9e8040..9573702b1b62 100644
--- a/usr.sbin/gssd/Makefile
+++ b/usr.sbin/gssd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= gssd
MAN= gssd.8
diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile
index fab7ea69e2e6..5b967c7b9eaf 100644
--- a/usr.sbin/ifmcstat/Makefile
+++ b/usr.sbin/ifmcstat/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ifmcstat
SRCS= ifmcstat.c printb.c
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile
index 29aacd1813d6..f31027af8765 100644
--- a/usr.sbin/inetd/Makefile
+++ b/usr.sbin/inetd/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= inetd
MAN= inetd.8
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index fb36defa8bf6..58324ac3c088 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= jail
MAN= jail.8 jail.conf.5
diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile
index b297cc46d653..431fd0c80c1d 100644
--- a/usr.sbin/jls/Makefile
+++ b/usr.sbin/jls/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= jls
MAN= jls.8
diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc
index ab667dd119a1..65535e6abac0 100644
--- a/usr.sbin/lpr/Makefile.inc
+++ b/usr.sbin/lpr/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile
index 8811f6f17587..8e49db7edd55 100644
--- a/usr.sbin/mailwrapper/Makefile
+++ b/usr.sbin/mailwrapper/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_MAILWRAPPER} != "no"
PROG= mailwrapper
diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile
index 9104c682002b..22c417c8141f 100644
--- a/usr.sbin/mtest/Makefile
+++ b/usr.sbin/mtest/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= mtest
MAN= mtest.8
diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile
index 4e3ae557034e..1c63e73e0a87 100644
--- a/usr.sbin/newsyslog/Makefile
+++ b/usr.sbin/newsyslog/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= newsyslog
MAN= newsyslog.8 newsyslog.conf.5
diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile
index 071f1c38ab95..a1d1e6b375c8 100644
--- a/usr.sbin/ngctl/Makefile
+++ b/usr.sbin/ngctl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
# $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ngctl
MAN= ngctl.8
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index 5095e89bbfbc..cadd4c7a941c 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H
NTPDEFS= -DSYS_FREEBSD
diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile
index 64e357155bea..9c42b0970174 100644
--- a/usr.sbin/ntp/doc/Makefile
+++ b/usr.sbin/ntp/doc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
FILESDIR= ${SHAREDIR}/doc/ntp
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 26716c2ff001..fea148cb076c 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/ntp/util \
${.CURDIR}/../../../contrib/ntp/ntpd
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 1ac4c7249f71..53f537f71343 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -2,7 +2,7 @@
MAN=
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 99436659344b..a61ebf57501e 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= ppp
MAN= ppp.8
diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile
index dd042f217a98..278000160fbb 100644
--- a/usr.sbin/rpcbind/Makefile
+++ b/usr.sbin/rpcbind/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= rpcbind
MAN= rpcbind.8
diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile
index 23f9bf274a85..c3c79b0b7350 100644
--- a/usr.sbin/sa/Makefile
+++ b/usr.sbin/sa/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../usr.bin/lastcomm
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index a9f7fbbafd69..f8a910bc1844 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.8 (Berkeley) 3/28/97
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 47640130bb14..069e093ccd21 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../usr.bin/wall
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index a49ffc60b748..e9799165c61f 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index caae746805d8..f8ccf8adc7da 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index ac7636acb164..498287320737 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
.PATH: ${TCPDUMP_DISTDIR}
diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile
index 5c62ce049a6a..e49fff1e9d33 100644
--- a/usr.sbin/trpt/Makefile
+++ b/usr.sbin/trpt/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.include <bsd.own.mk>
+.include <src.opts.mk>
PROG= trpt
MAN= trpt.8
diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile
index 5c80a480058b..5646b2acec04 100644
--- a/usr.sbin/tzsetup/Makefile
+++ b/usr.sbin/tzsetup/Makefile
@@ -10,7 +10,7 @@ WARNS?= 3
DPADD= ${LIBDIALOG} ${LIBM}
LDADD= -ldialog -lm
-.include <bsd.own.mk>
+.include <src.opts.mk>
.if ${MK_NCURSESW} == "no"
DPADD+= ${LIBNCURSES}
diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile
index 530cf020d2c5..7f0304c6af15 100644
--- a/usr.sbin/wpa/hostapd/Makefile
+++ b/usr.sbin/wpa/hostapd/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+.include <src.opts.mk>
.include "${.CURDIR}/../Makefile.inc"
.PATH.c:${HOSTAPD_DISTDIR} \
diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile
index 3424413f827b..11cccf3ee492 100644
--- a/usr.sbin/wpa/wpa_supplicant/Makefile
+++ b/usr.sbin/wpa/wpa_supplicant/Makefile
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <src.opts.mk>
+
.include "${.CURDIR}/../Makefile.inc"
.PATH.c:${WPA_SUPPLICANT_DISTDIR} \