MFhead @ r291359

73 files changed, 106 insertions, 197 deletions

diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c
index b57dd03..9d3b5e6 100644
--- a/contrib/wpa/src/drivers/driver_bsd.c
+++ b/contrib/wpa/src/drivers/driver_bsd.c
@@ -1497,6 +1497,8 @@ get80211opmode(struct bsd_driver_data *drv)
 		}
 		if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP)
 			return IEEE80211_M_HOSTAP;
+		if (ifmr.ifm_current & IFM_IEEE80211_IBSS)
+			return IEEE80211_M_IBSS;
 		if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
 			return IEEE80211_M_MONITOR;
 #ifdef IEEE80211_M_MBSS
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 368517c..b306bfec2 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -9,7 +9,7 @@ MAN=
 
 PROG=	cc1
 SRCS=	main.c c-parser.c c-lang.c
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 5d5a64d..761dd69 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -15,7 +15,7 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
 	search.c semantics.c tree.c typeck.c typeck2.c optimize.c \
 	cp-objcp-common.c cp-gimplify.c tree-mudflap.c
 
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 .if ${MK_SHARED_TOOLCHAIN} == "no"
 NO_SHARED?=yes
 .endif
diff --git a/lib/Makefile b/lib/Makefile
index 38003b8..4277d4e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -48,7 +48,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdwarf \
 	libedit \
 	${_libelftc} \
-	${_libevent} \
+	libevent \
 	libexecinfo \
 	libexpat \
 	libfetch \
@@ -240,10 +240,6 @@ _libnetgraph=	libnetgraph
 _libypclnt=	libypclnt
 .endif
 
-.if ${MK_PF} != "no"
-_libevent=	libevent
-.endif
-
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _libsmb=	libsmb
 _libvgl=	libvgl
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 7c2ca9a..0acb0c4 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -17,7 +17,7 @@ MLINKS=	hosts_access.3 hosts_ctl.3 \
 .PATH:	${.CURDIR}/../../contrib/tcp_wrappers
 
 CFLAGS+=-DFACILITY=LOG_AUTH -DHOSTS_ACCESS -DNETGROUP -DDAEMON_UMASK=022 \
-	-DREAL_DAEMON_DIR=\"/usr/libexec\" -DPROCESS_OPTIONS \
+	-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" -DPROCESS_OPTIONS \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DSYS_ERRLIST_DEFINED -DALWAYS_HOSTNAME -DUSE_STRSEP -DPROCESS_OPTIONS
diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile
index 37abdf5..a841477 100644
--- a/libexec/hyperv/Makefile
+++ b/libexec/hyperv/Makefile
@@ -2,9 +2,8 @@
 
 .PATH:		${.CURDIR}/../../contrib/hyperv/tools/scripts
 
-BINDIR=		/usr/libexec/hyperv
+BINDIR=		${LIBEXECDIR}/hyperv
 
 SCRIPTS=	hv_set_ifconfig hv_get_dns_info hv_get_dhcp_info
-NO_OBJ=
 
 .include <bsd.prog.mk>
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 8758c8d..5667299 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -32,7 +32,7 @@ WARNS?=		2
 INSTALLFLAGS=	-C -b
 PRECIOUSPROG=
 BINDIR=		/libexec
-SYMLINKS=	${BINDIR}/${PROG} /usr/libexec/${PROG}
+SYMLINKS=	${BINDIR}/${PROG} ${LIBEXECDIR}/${PROG}
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile
index 03e8c52..45add0b 100644
--- a/libexec/tcpd/Makefile
+++ b/libexec/tcpd/Makefile
@@ -7,7 +7,7 @@
 PROG=	tcpd
 MAN=	tcpd.8
 CSTD?=	c89
-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\" \
 	-DFACILITY=LOG_DAEMON
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index 69ffe69..628eb190 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -4085,6 +4085,8 @@ get80211opmode(int s)
 		}
 		if (ifmr.ifm_current & IFM_IEEE80211_HOSTAP)
 			return IEEE80211_M_HOSTAP;
+		if (ifmr.ifm_current & IFM_IEEE80211_IBSS)
+			return IEEE80211_M_IBSS;
 		if (ifmr.ifm_current & IFM_IEEE80211_MONITOR)
 			return IEEE80211_M_MONITOR;
 		if (ifmr.ifm_current & IFM_IEEE80211_MBSS)
diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile
index c0c3f5e..a4bb4e6 100644
--- a/share/dtrace/Makefile
+++ b/share/dtrace/Makefile
@@ -26,6 +26,4 @@ SCRIPTS=	blocking \
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace
 
-NO_OBJ=
-
 .include <bsd.prog.mk>
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 63ad5b3..2484aff 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -187,8 +187,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 
 BINDIR= ${SHAREDIR}/examples
 
-NO_OBJ=
-
 .if ${MK_HAST} != "no"
 LDIRS+=		hast
 XFILES+=	hast/ucarp.sh \
diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile
index 3867b80..1bb1359 100644
--- a/share/examples/smbfs/Makefile
+++ b/share/examples/smbfs/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
 FILESDIR= ${SHAREDIR}/examples/smbfs
 FILES=	dot.nsmbrc
 
diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile
index 67f4823..129cffa 100644
--- a/share/examples/smbfs/print/Makefile
+++ b/share/examples/smbfs/print/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
 FILESDIR= ${SHAREDIR}/examples/smbfs/print
 FILES=	lj6l ljspool printcap.sample tolj
 
diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile
index bc8d13a..e55977c 100644
--- a/share/keys/pkg/trusted/Makefile
+++ b/share/keys/pkg/trusted/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILES=	pkg.freebsd.org.2013102301
 
 FILESDIR=	${SHAREDIR}/keys/pkg/trusted
diff --git a/share/mk/Makefile b/share/mk/Makefile
index a3560b9..b088b91 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -58,7 +58,6 @@ FILES=	\
 	sys.dependfile.mk \
 	version_gen.awk
 
-NO_OBJ=
 FILESDIR=	${BINDIR}/mk
 
 .if ${MK_TESTS} != "no"
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index f94181a..4333a82 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -55,10 +55,13 @@ CANONICALOBJDIR= ${.OBJDIR}
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
+OBJTOP?= ${MAKEOBJDIR}
 .else
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
+OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+
 #
 # Warn of unorthodox object directory.
 #
diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk
index 53c176e..762fae4 100644
--- a/share/mk/local.dirdeps.mk
+++ b/share/mk/local.dirdeps.mk
@@ -40,7 +40,7 @@ __<bsd.init.mk>__:
 # allowed to be built though since they are never installed.
 _need_host_libs=
 .for lib in ${_INTERNALLIBS}
-_need_host_libs+= ${LIB${lib:tu}DIR:S,^${ROOTOBJDIR}/,,}
+_need_host_libs+= ${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
 .endfor
 
 N_host_libs:= ${cd ${SRCTOP} && echo lib/lib*:L:sh:${_need_host_libs:${M_ListToSkip}}:${M_ListToSkip}}
diff --git a/share/mk/netbsd-tests.test.mk b/share/mk/netbsd-tests.test.mk
index 92a401b..5357b08 100644
--- a/share/mk/netbsd-tests.test.mk
+++ b/share/mk/netbsd-tests.test.mk
@@ -3,8 +3,6 @@
 .if !target(__netbsd_tests.test.mk__)
 __netbsd_tests.test.mk__:
 
-OBJTOP?=	${.OBJDIR:S/${RELDIR}//}
-
 TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/${RELDIR:H}
 
 .if !exists(${TESTSRC}/)
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index bb57578..79da325 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -12,12 +12,6 @@ __<src.libnames.mk>__:
 
 .include <src.opts.mk>
 
-.if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR}
-ROOTOBJDIR=	${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
-.elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != ""
-ROOTOBJDIR=	${OBJTOP}
-.endif
-
 _PRIVATELIBS=	\
 		atf_c \
 		atf_cxx \
@@ -311,127 +305,127 @@ LDADD+=		${LDADD_${_l}}
 .error Missing ${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/DPADD_/} variable add "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//}" to _LIBRARIES, _INTERNALLIBS, or _PRIVATELIBS and define "${DPADD:Mmissing-dpadd_*:S/missing-dpadd_//:S/^/LIB/:tu}".
 .endif
 
-LIBELFTCDIR=	${ROOTOBJDIR}/lib/libelftc
+LIBELFTCDIR=	${OBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 
-LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
+LIBREADLINEDIR=	${OBJTOP}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 
-LIBOPENBSDDIR=	${ROOTOBJDIR}/lib/libopenbsd
+LIBOPENBSDDIR=	${OBJTOP}/lib/libopenbsd
 LIBOPENBSD?=	${LIBOPENBSDDIR}/libopenbsd.a
 
-LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
+LIBSMDIR=	${OBJTOP}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm.a
 
-LIBSMDBDIR=	${ROOTOBJDIR}/lib/libsmdb
+LIBSMDBDIR=	${OBJTOP}/lib/libsmdb
 LIBSMDB?=	${LIBSMDBDIR}/libsmdb.a
 
-LIBSMUTILDIR=	${ROOTOBJDIR}/lib/libsmutil
+LIBSMUTILDIR=	${OBJTOP}/lib/libsmutil
 LIBSMUTIL?=	${LIBSMDBDIR}/libsmutil.a
 
-LIBNETBSDDIR?=	${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSDDIR?=	${OBJTOP}/lib/libnetbsd
 LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd.a
 
-LIBVERSDIR?=	${ROOTOBJDIR}/kerberos5/lib/libvers
+LIBVERSDIR?=	${OBJTOP}/kerberos5/lib/libvers
 LIBVERS?=	${LIBVERSDIR}/libvers.a
 
-LIBSLDIR=	${ROOTOBJDIR}/kerberos5/lib/libsl
+LIBSLDIR=	${OBJTOP}/kerberos5/lib/libsl
 LIBSL?=		${LIBSLDIR}/libsl.a
 
-LIBIPFDIR=	${ROOTOBJDIR}/sbin/ipf/libipf
+LIBIPFDIR=	${OBJTOP}/sbin/ipf/libipf
 LIBIPF?=	${LIBIPFDIR}/libipf.a
 
-LIBTELNETDIR=	${ROOTOBJDIR}/lib/libtelnet
+LIBTELNETDIR=	${OBJTOP}/lib/libtelnet
 LIBTELNET?=	${LIBTELNETDIR}/libtelnet.a
 
-LIBCRONDIR=	${ROOTOBJDIR}/usr.sbin/cron/lib
+LIBCRONDIR=	${OBJTOP}/usr.sbin/cron/lib
 LIBCRON?=	${LIBCRONDIR}/libcron.a
 
-LIBNTPDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libntp
+LIBNTPDIR=	${OBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=	${LIBNTPDIR}/libntp.a
 
-LIBNTPEVENTDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libntpevent
+LIBNTPEVENTDIR=	${OBJTOP}/usr.sbin/ntp/libntpevent
 LIBNTPEVENT?=	${LIBNTPEVENTDIR}/libntpevent.a
 
-LIBOPTSDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libopts
+LIBOPTSDIR=	${OBJTOP}/usr.sbin/ntp/libopts
 LIBOTPS?=	${LIBOPTSDIR}/libopts.a
 
-LIBPARSEDIR=	${ROOTOBJDIR}/usr.sbin/ntp/libparse
+LIBPARSEDIR=	${OBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=	${LIBPARSEDIR}/libparse.a
 
-LIBLPRDIR=	${ROOTOBJDIR}/usr.sbin/lpr/common_source
+LIBLPRDIR=	${OBJTOP}/usr.sbin/lpr/common_source
 LIBLPR?=	${LIBOPTSDIR}/liblpr.a
 
-LIBFIFOLOGDIR=	${ROOTOBJDIR}/usr.sbin/fifolog/lib
+LIBFIFOLOGDIR=	${OBJTOP}/usr.sbin/fifolog/lib
 LIBFIFOLOG?=	${LIBOPTSDIR}/libfifolog.a
 
-LIBBSNMPTOOLSDIR=	${ROOTOBJDIR}/usr.sbin/bsnmpd/tools/libbsnmptools
+LIBBSNMPTOOLSDIR=	${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools.a
 
-LIBAMUDIR=	${ROOTOBJDIR}/usr.sbin/amd/libamu
+LIBAMUDIR=	${OBJTOP}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu/libamu.a
 
 # Define a directory for each library.  This is useful for adding -L in when
 # not using a --sysroot or for meta mode bootstrapping when there is no
 # Makefile.depend.  These are sorted by directory.
-LIBAVLDIR=	${ROOTOBJDIR}/cddl/lib/libavl
-LIBCTFDIR=	${ROOTOBJDIR}/cddl/lib/libctf
-LIBDTRACEDIR=	${ROOTOBJDIR}/cddl/lib/libdtrace
-LIBNVPAIRDIR=	${ROOTOBJDIR}/cddl/lib/libnvpair
-LIBUMEMDIR=	${ROOTOBJDIR}/cddl/lib/libumem
-LIBUUTILDIR=	${ROOTOBJDIR}/cddl/lib/libuutil
-LIBZFSDIR=	${ROOTOBJDIR}/cddl/lib/libzfs
-LIBZFS_COREDIR=	${ROOTOBJDIR}/cddl/lib/libzfs_core
-LIBZPOOLDIR=	${ROOTOBJDIR}/cddl/lib/libzpool
-LIBDIALOGDIR=	${ROOTOBJDIR}/gnu/lib/libdialog
-LIBGCOVDIR=	${ROOTOBJDIR}/gnu/lib/libgcov
-LIBGOMPDIR=	${ROOTOBJDIR}/gnu/lib/libgomp
-LIBGNUREGEXDIR=	${ROOTOBJDIR}/gnu/lib/libregex
-LIBSSPDIR=	${ROOTOBJDIR}/gnu/lib/libssp
-LIBSSP_NONSHAREDDIR=	${ROOTOBJDIR}/gnu/lib/libssp/libssp_nonshared
-LIBSUPCPLUSPLUSDIR=	${ROOTOBJDIR}/gnu/lib/libsupc++
-LIBASN1DIR=	${ROOTOBJDIR}/kerberos5/lib/libasn1
-LIBGSSAPI_KRB5DIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_krb5
-LIBGSSAPI_NTLMDIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_ntlm
-LIBGSSAPI_SPNEGODIR=	${ROOTOBJDIR}/kerberos5/lib/libgssapi_spnego
-LIBHDBDIR=	${ROOTOBJDIR}/kerberos5/lib/libhdb
-LIBHEIMBASEDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimbase
-LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
-LIBHEIMIPCSDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcs
-LIBHEIMNTLMDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimntlm
-LIBHX509DIR=	${ROOTOBJDIR}/kerberos5/lib/libhx509
-LIBKADM5CLNTDIR=	${ROOTOBJDIR}/kerberos5/lib/libkadm5clnt
-LIBKADM5SRVDIR=	${ROOTOBJDIR}/kerberos5/lib/libkadm5srv
-LIBKAFS5DIR=	${ROOTOBJDIR}/kerberos5/lib/libkafs5
-LIBKDCDIR=	${ROOTOBJDIR}/kerberos5/lib/libkdc
-LIBKRB5DIR=	${ROOTOBJDIR}/kerberos5/lib/libkrb5
-LIBROKENDIR=	${ROOTOBJDIR}/kerberos5/lib/libroken
-LIBWINDDIR=	${ROOTOBJDIR}/kerberos5/lib/libwind
-LIBALIASDIR=	${ROOTOBJDIR}/lib/libalias/libalias
-LIBBLOCKSRUNTIMEDIR=	${ROOTOBJDIR}/lib/libblocksruntime
-LIBBSNMPDIR=	${ROOTOBJDIR}/lib/libbsnmp/libbsnmp
-LIBBSDXMLDIR=	${ROOTOBJDIR}/lib/libexpat
-LIBKVMDIR=	${ROOTOBJDIR}/lib/libkvm
-LIBPTHREADDIR=	${ROOTOBJDIR}/lib/libthr
-LIBMDIR=	${ROOTOBJDIR}/lib/msun
-LIBFORMDIR=	${ROOTOBJDIR}/lib/ncurses/form
-LIBFORMLIBWDIR=	${ROOTOBJDIR}/lib/ncurses/formw
-LIBMENUDIR=	${ROOTOBJDIR}/lib/ncurses/menu
-LIBMENULIBWDIR=	${ROOTOBJDIR}/lib/ncurses/menuw
-LIBTERMCAPDIR=	${ROOTOBJDIR}/lib/ncurses/ncurses
-LIBTERMCAPWDIR=	${ROOTOBJDIR}/lib/ncurses/ncursesw
-LIBPANELDIR=	${ROOTOBJDIR}/lib/ncurses/panel
-LIBPANELWDIR=	${ROOTOBJDIR}/lib/ncurses/panelw
-LIBCRYPTODIR=	${ROOTOBJDIR}/secure/lib/libcrypto
-LIBSSHDIR=	${ROOTOBJDIR}/secure/lib/libssh
-LIBSSLDIR=	${ROOTOBJDIR}/secure/lib/libssl
-LIBTEKENDIR=	${ROOTOBJDIR}/sys/teken/libteken
-LIBEGACYDIR=	${ROOTOBJDIR}/tools/build
-LIBLNDIR=	${ROOTOBJDIR}/usr.bin/lex/lib
+LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
+LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
+LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
+LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair
+LIBUMEMDIR=	${OBJTOP}/cddl/lib/libumem
+LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
+LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
+LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
+LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
+LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
+LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
+LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp
+LIBGNUREGEXDIR=	${OBJTOP}/gnu/lib/libregex
+LIBSSPDIR=	${OBJTOP}/gnu/lib/libssp
+LIBSSP_NONSHAREDDIR=	${OBJTOP}/gnu/lib/libssp/libssp_nonshared
+LIBSUPCPLUSPLUSDIR=	${OBJTOP}/gnu/lib/libsupc++
+LIBASN1DIR=	${OBJTOP}/kerberos5/lib/libasn1
+LIBGSSAPI_KRB5DIR=	${OBJTOP}/kerberos5/lib/libgssapi_krb5
+LIBGSSAPI_NTLMDIR=	${OBJTOP}/kerberos5/lib/libgssapi_ntlm
+LIBGSSAPI_SPNEGODIR=	${OBJTOP}/kerberos5/lib/libgssapi_spnego
+LIBHDBDIR=	${OBJTOP}/kerberos5/lib/libhdb
+LIBHEIMBASEDIR=	${OBJTOP}/kerberos5/lib/libheimbase
+LIBHEIMIPCCDIR=	${OBJTOP}/kerberos5/lib/libheimipcc
+LIBHEIMIPCSDIR=	${OBJTOP}/kerberos5/lib/libheimipcs
+LIBHEIMNTLMDIR=	${OBJTOP}/kerberos5/lib/libheimntlm
+LIBHX509DIR=	${OBJTOP}/kerberos5/lib/libhx509
+LIBKADM5CLNTDIR=	${OBJTOP}/kerberos5/lib/libkadm5clnt
+LIBKADM5SRVDIR=	${OBJTOP}/kerberos5/lib/libkadm5srv
+LIBKAFS5DIR=	${OBJTOP}/kerberos5/lib/libkafs5
+LIBKDCDIR=	${OBJTOP}/kerberos5/lib/libkdc
+LIBKRB5DIR=	${OBJTOP}/kerberos5/lib/libkrb5
+LIBROKENDIR=	${OBJTOP}/kerberos5/lib/libroken
+LIBWINDDIR=	${OBJTOP}/kerberos5/lib/libwind
+LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
+LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
+LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
+LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
+LIBKVMDIR=	${OBJTOP}/lib/libkvm
+LIBPTHREADDIR=	${OBJTOP}/lib/libthr
+LIBMDIR=	${OBJTOP}/lib/msun
+LIBFORMDIR=	${OBJTOP}/lib/ncurses/form
+LIBFORMLIBWDIR=	${OBJTOP}/lib/ncurses/formw
+LIBMENUDIR=	${OBJTOP}/lib/ncurses/menu
+LIBMENULIBWDIR=	${OBJTOP}/lib/ncurses/menuw
+LIBTERMCAPDIR=	${OBJTOP}/lib/ncurses/ncurses
+LIBTERMCAPWDIR=	${OBJTOP}/lib/ncurses/ncursesw
+LIBPANELDIR=	${OBJTOP}/lib/ncurses/panel
+LIBPANELWDIR=	${OBJTOP}/lib/ncurses/panelw
+LIBCRYPTODIR=	${OBJTOP}/secure/lib/libcrypto
+LIBSSHDIR=	${OBJTOP}/secure/lib/libssh
+LIBSSLDIR=	${OBJTOP}/secure/lib/libssl
+LIBTEKENDIR=	${OBJTOP}/sys/teken/libteken
+LIBEGACYDIR=	${OBJTOP}/tools/build
+LIBLNDIR=	${OBJTOP}/usr.bin/lex/lib
 
 # Default other library directories to lib/libNAME.
 .for lib in ${_LIBRARIES}
-LIB${lib:tu}DIR?=	${ROOTOBJDIR}/lib/lib${lib}
+LIB${lib:tu}DIR?=	${OBJTOP}/lib/lib${lib}
 .endfor
 
 .endif	# !target(__<src.libnames.mk>__)
diff --git a/share/security/Makefile b/share/security/Makefile
index c25a52d..682a02b 100644
--- a/share/security/Makefile
+++ b/share/security/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 FILES=	lomac-policy.contexts
-NO_OBJ=
 FILESDIR=	${BINDIR}/security
 
 .include "${.CURDIR}/../Makefile.inc"
diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile
index 762cb17..283c348 100644
--- a/share/vt/keymaps/Makefile
+++ b/share/vt/keymaps/Makefile
@@ -88,6 +88,4 @@ FILES=	INDEX.keymaps \
 
 FILESDIR= ${SHAREDIR}/vt/keymaps
 
-NO_OBJ=
-
 .include <bsd.prog.mk>
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 6388dac..1ca3d45 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee80211vap *vap, u_long cmd, struct ieee80211r
 		/* XXX verify ciphers available */
 		flags = vap->iv_flags & ~IEEE80211_F_WPA;
 		switch (ireq->i_val) {
+		case 0:
+			/* wpa_supplicant calls this to clear the WPA config */
+			break;
 		case 1:
 			if (!(vap->iv_caps & IEEE80211_C_WPA1))
 				return EOPNOTSUPP;
diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile
index ba0e1ee..1010949 100644
--- a/usr.bin/makewhatis/Makefile
+++ b/usr.bin/makewhatis/Makefile
@@ -4,7 +4,7 @@ PROG=		makewhatis
 LIBADD=		z
 SCRIPTS=	makewhatis.local.sh
 MAN=		makewhatis.1 makewhatis.local.8
-SCRIPTSDIR=	/usr/libexec
+SCRIPTSDIR=	${LIBEXECDIR}
 LINKS=		${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
 MLINKS=		makewhatis.local.8 catman.local.8
 
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 06d9052..a7dc9a1 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -13,7 +13,7 @@ MAN=	vgrind.1 vgrindefs.5
 
 WARNS?=	3
 
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 SCRIPTSDIR=/usr/bin
 
 CLEANFILES= vgrindefs.src.db
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 2d6539e..6792ba0 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -11,7 +11,7 @@ LIBADD=	l m
 CFLAGS+= -I. -I${.CURDIR}
 LINTFLAGS=-aehpz
 
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 
 .PATH: ${.CURDIR}/../common
 
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index 8f4a4ad..ad14d2a 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -9,6 +9,6 @@ MAN=
 CFLAGS+=-I${.CURDIR}/../lint1
 LINTFLAGS=-abehrz
 
-BINDIR=	/usr/libexec
+BINDIR=	${LIBEXECDIR}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdconfig/console/Makefile b/usr.sbin/bsdconfig/console/Makefile
index c765a33..bcb2ebd 100644
--- a/usr.sbin/bsdconfig/console/Makefile
+++ b/usr.sbin/bsdconfig/console/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/080.console
diff --git a/usr.sbin/bsdconfig/console/include/Makefile b/usr.sbin/bsdconfig/console/include/Makefile
index d2a17a0..52cb0be 100644
--- a/usr.sbin/bsdconfig/console/include/Makefile
+++ b/usr.sbin/bsdconfig/console/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/080.console/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/diskmgmt/Makefile b/usr.sbin/bsdconfig/diskmgmt/Makefile
index fc659f8..16a8900 100644
--- a/usr.sbin/bsdconfig/diskmgmt/Makefile
+++ b/usr.sbin/bsdconfig/diskmgmt/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/050.diskmgmt
diff --git a/usr.sbin/bsdconfig/diskmgmt/include/Makefile b/usr.sbin/bsdconfig/diskmgmt/include/Makefile
index 33b93e0..c927153 100644
--- a/usr.sbin/bsdconfig/diskmgmt/include/Makefile
+++ b/usr.sbin/bsdconfig/diskmgmt/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/050.diskmgmt/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/docsinstall/Makefile b/usr.sbin/bsdconfig/docsinstall/Makefile
index 4b67834..2ab3a68 100644
--- a/usr.sbin/bsdconfig/docsinstall/Makefile
+++ b/usr.sbin/bsdconfig/docsinstall/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/020.docsinstall
diff --git a/usr.sbin/bsdconfig/docsinstall/include/Makefile b/usr.sbin/bsdconfig/docsinstall/include/Makefile
index b86091a..a3ca529 100644
--- a/usr.sbin/bsdconfig/docsinstall/include/Makefile
+++ b/usr.sbin/bsdconfig/docsinstall/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/020.docsinstall/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/dot/Makefile b/usr.sbin/bsdconfig/dot/Makefile
index 0f11518..ccd10b4 100644
--- a/usr.sbin/bsdconfig/dot/Makefile
+++ b/usr.sbin/bsdconfig/dot/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/dot
diff --git a/usr.sbin/bsdconfig/dot/include/Makefile b/usr.sbin/bsdconfig/dot/include/Makefile
index 891279f..b687b88 100644
--- a/usr.sbin/bsdconfig/dot/include/Makefile
+++ b/usr.sbin/bsdconfig/dot/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/dot/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/examples/Makefile b/usr.sbin/bsdconfig/examples/Makefile
index 33899d8..f66c2b1 100644
--- a/usr.sbin/bsdconfig/examples/Makefile
+++ b/usr.sbin/bsdconfig/examples/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/examples/bsdconfig
 FILES=		add_some_packages.sh browse_packages_http.sh bsdconfigrc
 
diff --git a/usr.sbin/bsdconfig/include/Makefile b/usr.sbin/bsdconfig/include/Makefile
index 50bef4c..913481c 100644
--- a/usr.sbin/bsdconfig/include/Makefile
+++ b/usr.sbin/bsdconfig/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/include
 FILES=		bsdconfig.hlp media.hlp messages.subr network_device.hlp \
 		options.hlp tcp.hlp usage.hlp
diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile
index c0bd689..367776c 100644
--- a/usr.sbin/bsdconfig/includes/Makefile
+++ b/usr.sbin/bsdconfig/includes/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/includes
diff --git a/usr.sbin/bsdconfig/includes/include/Makefile b/usr.sbin/bsdconfig/includes/include/Makefile
index 21d55a1..3b8b3ec 100644
--- a/usr.sbin/bsdconfig/includes/include/Makefile
+++ b/usr.sbin/bsdconfig/includes/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/includes/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/mouse/Makefile b/usr.sbin/bsdconfig/mouse/Makefile
index b054c8b..97fa52b 100644
--- a/usr.sbin/bsdconfig/mouse/Makefile
+++ b/usr.sbin/bsdconfig/mouse/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/110.mouse
diff --git a/usr.sbin/bsdconfig/mouse/include/Makefile b/usr.sbin/bsdconfig/mouse/include/Makefile
index 5071db8..2cc852f 100644
--- a/usr.sbin/bsdconfig/mouse/include/Makefile
+++ b/usr.sbin/bsdconfig/mouse/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/110.mouse/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/networking/Makefile b/usr.sbin/bsdconfig/networking/Makefile
index fcd8421..8a88067 100644
--- a/usr.sbin/bsdconfig/networking/Makefile
+++ b/usr.sbin/bsdconfig/networking/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/120.networking
diff --git a/usr.sbin/bsdconfig/networking/include/Makefile b/usr.sbin/bsdconfig/networking/include/Makefile
index b76349a..54f66e1 100644
--- a/usr.sbin/bsdconfig/networking/include/Makefile
+++ b/usr.sbin/bsdconfig/networking/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/120.networking/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/networking/share/Makefile b/usr.sbin/bsdconfig/networking/share/Makefile
index 3cb2d4e..6d77f25 100644
--- a/usr.sbin/bsdconfig/networking/share/Makefile
+++ b/usr.sbin/bsdconfig/networking/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/networking
 FILES=		common.subr device.subr hostname.subr ipaddr.subr media.subr \
 		netmask.subr resolv.subr routing.subr services.subr
diff --git a/usr.sbin/bsdconfig/packages/Makefile b/usr.sbin/bsdconfig/packages/Makefile
index 6450e06..fa5bd30 100644
--- a/usr.sbin/bsdconfig/packages/Makefile
+++ b/usr.sbin/bsdconfig/packages/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/030.packages
diff --git a/usr.sbin/bsdconfig/packages/include/Makefile b/usr.sbin/bsdconfig/packages/include/Makefile
index 0c72bd4..3d30fd2 100644
--- a/usr.sbin/bsdconfig/packages/include/Makefile
+++ b/usr.sbin/bsdconfig/packages/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/030.packages/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/password/Makefile b/usr.sbin/bsdconfig/password/Makefile
index 0c4851f..d660e45 100644
--- a/usr.sbin/bsdconfig/password/Makefile
+++ b/usr.sbin/bsdconfig/password/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/040.password
diff --git a/usr.sbin/bsdconfig/password/include/Makefile b/usr.sbin/bsdconfig/password/include/Makefile
index dba8f19..a146eb2 100644
--- a/usr.sbin/bsdconfig/password/include/Makefile
+++ b/usr.sbin/bsdconfig/password/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/040.password/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/password/share/Makefile b/usr.sbin/bsdconfig/password/share/Makefile
index af707b3..65f9e8c 100644
--- a/usr.sbin/bsdconfig/password/share/Makefile
+++ b/usr.sbin/bsdconfig/password/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/password
 FILES=		password.subr
 
diff --git a/usr.sbin/bsdconfig/security/Makefile b/usr.sbin/bsdconfig/security/Makefile
index 4caa6ae..af83cee 100644
--- a/usr.sbin/bsdconfig/security/Makefile
+++ b/usr.sbin/bsdconfig/security/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/130.security
diff --git a/usr.sbin/bsdconfig/security/include/Makefile b/usr.sbin/bsdconfig/security/include/Makefile
index 8b49a81..2efcc0f 100644
--- a/usr.sbin/bsdconfig/security/include/Makefile
+++ b/usr.sbin/bsdconfig/security/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/130.security/include
 FILES=		messages.subr securelevel.hlp
 
diff --git a/usr.sbin/bsdconfig/share/Makefile b/usr.sbin/bsdconfig/share/Makefile
index 400cc11..a09697a 100644
--- a/usr.sbin/bsdconfig/share/Makefile
+++ b/usr.sbin/bsdconfig/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR=	media packages
 
 FILESDIR=	${SHAREDIR}/bsdconfig
diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile
index 7be059b..135515b 100644
--- a/usr.sbin/bsdconfig/share/media/Makefile
+++ b/usr.sbin/bsdconfig/share/media/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/media
 FILES=		any.subr cdrom.subr common.subr directory.subr dos.subr \
 		floppy.subr ftp.subr http.subr httpproxy.subr network.subr \
diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile
index 8146346..bc0e59a 100644
--- a/usr.sbin/bsdconfig/share/packages/Makefile
+++ b/usr.sbin/bsdconfig/share/packages/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/packages
 FILES=		categories.subr index.subr musthavepkg.subr packages.subr
 
diff --git a/usr.sbin/bsdconfig/startup/Makefile b/usr.sbin/bsdconfig/startup/Makefile
index afab7b1..62a9e71 100644
--- a/usr.sbin/bsdconfig/startup/Makefile
+++ b/usr.sbin/bsdconfig/startup/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/140.startup
diff --git a/usr.sbin/bsdconfig/startup/include/Makefile b/usr.sbin/bsdconfig/startup/include/Makefile
index 40a6539..aab9842 100644
--- a/usr.sbin/bsdconfig/startup/include/Makefile
+++ b/usr.sbin/bsdconfig/startup/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/140.startup/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/startup/share/Makefile b/usr.sbin/bsdconfig/startup/share/Makefile
index 221c38b..134914c 100644
--- a/usr.sbin/bsdconfig/startup/share/Makefile
+++ b/usr.sbin/bsdconfig/startup/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/startup
 FILES=		rcconf.subr rcedit.subr rcvar.subr
 
diff --git a/usr.sbin/bsdconfig/timezone/Makefile b/usr.sbin/bsdconfig/timezone/Makefile
index ea6a6a6..1569e7e 100644
--- a/usr.sbin/bsdconfig/timezone/Makefile
+++ b/usr.sbin/bsdconfig/timezone/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/090.timezone
diff --git a/usr.sbin/bsdconfig/timezone/include/Makefile b/usr.sbin/bsdconfig/timezone/include/Makefile
index 82787e1..8fc6dfc 100644
--- a/usr.sbin/bsdconfig/timezone/include/Makefile
+++ b/usr.sbin/bsdconfig/timezone/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/090.timezone/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/timezone/share/Makefile b/usr.sbin/bsdconfig/timezone/share/Makefile
index bd67741..166fb10 100644
--- a/usr.sbin/bsdconfig/timezone/share/Makefile
+++ b/usr.sbin/bsdconfig/timezone/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/timezone
 FILES=		continents.subr countries.subr iso3166.subr menus.subr \
 		zones.subr
diff --git a/usr.sbin/bsdconfig/ttys/Makefile b/usr.sbin/bsdconfig/ttys/Makefile
index d53314c..044fdcf 100644
--- a/usr.sbin/bsdconfig/ttys/Makefile
+++ b/usr.sbin/bsdconfig/ttys/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/150.ttys
diff --git a/usr.sbin/bsdconfig/ttys/include/Makefile b/usr.sbin/bsdconfig/ttys/include/Makefile
index 2f32175..45c72ad 100644
--- a/usr.sbin/bsdconfig/ttys/include/Makefile
+++ b/usr.sbin/bsdconfig/ttys/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/150.ttys/include
 FILES=		messages.subr
 
diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile b/usr.sbin/bsdconfig/usermgmt/Makefile
index d82f6d6..127c874 100644
--- a/usr.sbin/bsdconfig/usermgmt/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 SUBDIR= include share
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig/070.usermgmt
diff --git a/usr.sbin/bsdconfig/usermgmt/include/Makefile b/usr.sbin/bsdconfig/usermgmt/include/Makefile
index a63b1fe..4839654 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/include/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${LIBEXECDIR}/bsdconfig/070.usermgmt/include
 FILES=		messages.subr usermgmt.hlp
 
diff --git a/usr.sbin/bsdconfig/usermgmt/share/Makefile b/usr.sbin/bsdconfig/usermgmt/share/Makefile
index a13c200..eba7c1c 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/Makefile
+++ b/usr.sbin/bsdconfig/usermgmt/share/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-NO_OBJ=
-
 FILESDIR=	${SHAREDIR}/bsdconfig/usermgmt
 FILES=		group.subr group_input.subr user.subr user_input.subr
 
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 313ec00..d3008f6 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distextract
 LIBADD=	archive dpv figpar ncursesw dialog m
 
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 5c0f6e8..1620c9b 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	distfetch
 LIBADD=	fetch ncursesw dialog m
 
diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile
index d48f777..21d842e 100644
--- a/usr.sbin/bsdinstall/partedit/Makefile
+++ b/usr.sbin/bsdinstall/partedit/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 PROG=	partedit
 LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
        ${BINDIR}/partedit ${BINDIR}/scriptedpart
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index efe9700..c0d6ac2 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -3,7 +3,7 @@
 SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
 	 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
 	 rootpass script services time umount wlanconfig zfsboot
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
 
 MAN=
 
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index f1bc586..7976752 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
-BINDIR=	/usr/libexec/lpr
+BINDIR=	${LIBEXECDIR}/lpr
 
 PROG=	lpf
 MAN=
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 5f5fb77..9b2fb39 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -7,7 +7,7 @@ RPCDIR=	${DESTDIR}/usr/include/rpcsvc
 
 PROG=	rpc.yppasswdd
 SCRIPTS=yppwupdate
-SCRIPTSDIR= /usr/libexec
+SCRIPTSDIR= ${LIBEXECDIR}
 MAN=	rpc.yppasswdd.8
 SRCS=	util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
 	yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS}
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index 80ce13b..f9641c1 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
 .PATH: ${SMDIR}
 
-BINDIR=	/usr/libexec/sendmail
+BINDIR=	${LIBEXECDIR}/sendmail
 
 PROG=	sendmail
 MAN=	mailq.1 newaliases.1 aliases.5 sendmail.8 
diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile
index 5faea18..c7d4155 100644
--- a/usr.sbin/tcpdchk/Makefile
+++ b/usr.sbin/tcpdchk/Makefile
@@ -8,7 +8,7 @@ PROG=	tcpdchk
 MAN=	tcpdchk.8
 SRCS=	tcpdchk.c fakelog.c inetcf.c scaffold.c
 
-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10 -DPROCESS_OPTIONS \
 	-DHOSTS_DENY=\"/etc/hosts.deny\" -DHOSTS_ALLOW=\"/etc/hosts.allow\"
 .if ${MK_INET6_SUPPORT} != "no"
diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile
index bbe29a4..2f92427 100644
--- a/usr.sbin/tcpdmatch/Makefile
+++ b/usr.sbin/tcpdmatch/Makefile
@@ -8,7 +8,7 @@ PROG=	tcpdmatch
 MAN=	tcpdmatch.8
 SRCS=	tcpdmatch.c fakelog.c inetcf.c scaffold.c
 
-CFLAGS+=-DREAL_DAEMON_DIR=\"/usr/libexec\" \
+CFLAGS+=-DREAL_DAEMON_DIR=\"${LIBEXECDIR}\" \
 	-DSEVERITY=LOG_INFO -DRFC931_TIMEOUT=10
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6