svn commit: r291360 - in user/ngie/more-tests2: contrib/wpa/src/drivers gnu/usr.bin/cc/cc1 gnu/usr.bin/cc/cc1plus lib lib/libwrap libexec/hyperv libexec/rtld-elf libexec/tcpd sbin/ifconfig share/dt...
Garrett Cooper
ngie at FreeBSD.org
Thu Nov 26 07:06:30 UTC 2015
Author: ngie
Date: Thu Nov 26 07:06:20 2015
New Revision: 291360
URL: https://svnweb.freebsd.org/changeset/base/291360
Log:
MFhead @ r291359
Modified:
user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c
user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile
user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile
user/ngie/more-tests2/lib/Makefile
user/ngie/more-tests2/lib/libwrap/Makefile
user/ngie/more-tests2/libexec/hyperv/Makefile
user/ngie/more-tests2/libexec/rtld-elf/Makefile
user/ngie/more-tests2/libexec/tcpd/Makefile
user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c
user/ngie/more-tests2/share/dtrace/Makefile
user/ngie/more-tests2/share/examples/Makefile
user/ngie/more-tests2/share/examples/smbfs/Makefile
user/ngie/more-tests2/share/examples/smbfs/print/Makefile
user/ngie/more-tests2/share/keys/pkg/trusted/Makefile
user/ngie/more-tests2/share/mk/Makefile
user/ngie/more-tests2/share/mk/bsd.obj.mk
user/ngie/more-tests2/share/mk/local.dirdeps.mk
user/ngie/more-tests2/share/mk/netbsd-tests.test.mk
user/ngie/more-tests2/share/mk/src.libnames.mk
user/ngie/more-tests2/share/security/Makefile
user/ngie/more-tests2/share/vt/keymaps/Makefile
user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c
user/ngie/more-tests2/usr.bin/makewhatis/Makefile
user/ngie/more-tests2/usr.bin/vgrind/Makefile
user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile
user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile
user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile
user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile
user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile
user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile
user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile
user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile
user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile
user/ngie/more-tests2/usr.sbin/sendmail/Makefile
user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile
user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile
Directory Properties:
user/ngie/more-tests2/ (props changed)
user/ngie/more-tests2/contrib/wpa/ (props changed)
user/ngie/more-tests2/sbin/ (props changed)
user/ngie/more-tests2/share/ (props changed)
user/ngie/more-tests2/sys/ (props changed)
Modified: user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c
==============================================================================
--- user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/contrib/wpa/src/drivers/driver_bsd.c Thu Nov 26 07:06:20 2015 (r291360)
@@ -1497,6 +1497,8 @@ get80211opmode(struct bsd_driver_data *d
}
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
Modified: user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile
==============================================================================
--- user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/gnu/usr.bin/cc/cc1/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile
==============================================================================
--- user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/gnu/usr.bin/cc/cc1plus/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -15,7 +15,7 @@ SRCS+= main.c cp-lang.c c-opts.c call.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
Modified: user/ngie/more-tests2/lib/Makefile
==============================================================================
--- user/ngie/more-tests2/lib/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/lib/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/lib/libwrap/Makefile
==============================================================================
--- user/ngie/more-tests2/lib/libwrap/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/lib/libwrap/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/libexec/hyperv/Makefile
==============================================================================
--- user/ngie/more-tests2/libexec/hyperv/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/libexec/hyperv/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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>
Modified: user/ngie/more-tests2/libexec/rtld-elf/Makefile
==============================================================================
--- user/ngie/more-tests2/libexec/rtld-elf/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/libexec/rtld-elf/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/libexec/tcpd/Makefile
==============================================================================
--- user/ngie/more-tests2/libexec/tcpd/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/libexec/tcpd/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c
==============================================================================
--- user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/sbin/ifconfig/ifieee80211.c Thu Nov 26 07:06:20 2015 (r291360)
@@ -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)
Modified: user/ngie/more-tests2/share/dtrace/Makefile
==============================================================================
--- user/ngie/more-tests2/share/dtrace/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/dtrace/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -26,6 +26,4 @@ SCRIPTS= blocking \
SCRIPTSDIR= ${SHAREDIR}/dtrace
-NO_OBJ=
-
.include <bsd.prog.mk>
Modified: user/ngie/more-tests2/share/examples/Makefile
==============================================================================
--- user/ngie/more-tests2/share/examples/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/examples/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -187,8 +187,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
BINDIR= ${SHAREDIR}/examples
-NO_OBJ=
-
.if ${MK_HAST} != "no"
LDIRS+= hast
XFILES+= hast/ucarp.sh \
Modified: user/ngie/more-tests2/share/examples/smbfs/Makefile
==============================================================================
--- user/ngie/more-tests2/share/examples/smbfs/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/examples/smbfs/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,6 +1,5 @@
# $FreeBSD$
-NO_OBJ=
FILESDIR= ${SHAREDIR}/examples/smbfs
FILES= dot.nsmbrc
Modified: user/ngie/more-tests2/share/examples/smbfs/print/Makefile
==============================================================================
--- user/ngie/more-tests2/share/examples/smbfs/print/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/examples/smbfs/print/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,6 +1,5 @@
# $FreeBSD$
-NO_OBJ=
FILESDIR= ${SHAREDIR}/examples/smbfs/print
FILES= lj6l ljspool printcap.sample tolj
Modified: user/ngie/more-tests2/share/keys/pkg/trusted/Makefile
==============================================================================
--- user/ngie/more-tests2/share/keys/pkg/trusted/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/keys/pkg/trusted/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILES= pkg.freebsd.org.2013102301
FILESDIR= ${SHAREDIR}/keys/pkg/trusted
Modified: user/ngie/more-tests2/share/mk/Makefile
==============================================================================
--- user/ngie/more-tests2/share/mk/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/mk/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -58,7 +58,6 @@ FILES= \
sys.dependfile.mk \
version_gen.awk
-NO_OBJ=
FILESDIR= ${BINDIR}/mk
.if ${MK_TESTS} != "no"
Modified: user/ngie/more-tests2/share/mk/bsd.obj.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/bsd.obj.mk Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/mk/bsd.obj.mk Thu Nov 26 07:06:20 2015 (r291360)
@@ -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.
#
Modified: user/ngie/more-tests2/share/mk/local.dirdeps.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/local.dirdeps.mk Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/mk/local.dirdeps.mk Thu Nov 26 07:06:20 2015 (r291360)
@@ -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}}
Modified: user/ngie/more-tests2/share/mk/netbsd-tests.test.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/netbsd-tests.test.mk Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/mk/netbsd-tests.test.mk Thu Nov 26 07:06:20 2015 (r291360)
@@ -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}/)
Modified: user/ngie/more-tests2/share/mk/src.libnames.mk
==============================================================================
--- user/ngie/more-tests2/share/mk/src.libnames.mk Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/mk/src.libnames.mk Thu Nov 26 07:06:20 2015 (r291360)
@@ -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>__)
Modified: user/ngie/more-tests2/share/security/Makefile
==============================================================================
--- user/ngie/more-tests2/share/security/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/security/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,6 @@
# $FreeBSD$
FILES= lomac-policy.contexts
-NO_OBJ=
FILESDIR= ${BINDIR}/security
.include "${.CURDIR}/../Makefile.inc"
Modified: user/ngie/more-tests2/share/vt/keymaps/Makefile
==============================================================================
--- user/ngie/more-tests2/share/vt/keymaps/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/share/vt/keymaps/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -88,6 +88,4 @@ FILES= INDEX.keymaps \
FILESDIR= ${SHAREDIR}/vt/keymaps
-NO_OBJ=
-
.include <bsd.prog.mk>
Modified: user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/sys/net80211/ieee80211_ioctl.c Thu Nov 26 07:06:20 2015 (r291360)
@@ -2807,6 +2807,9 @@ ieee80211_ioctl_set80211(struct ieee8021
/* 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;
Modified: user/ngie/more-tests2/usr.bin/makewhatis/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.bin/makewhatis/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.bin/makewhatis/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/usr.bin/vgrind/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.bin/vgrind/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.bin/vgrind/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -13,7 +13,7 @@ MAN= vgrind.1 vgrindefs.5
WARNS?= 3
-BINDIR= /usr/libexec
+BINDIR= ${LIBEXECDIR}
SCRIPTSDIR=/usr/bin
CLEANFILES= vgrindefs.src.db
Modified: user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.bin/xlint/lint1/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -11,7 +11,7 @@ LIBADD= l m
CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz
-BINDIR= /usr/libexec
+BINDIR= ${LIBEXECDIR}
.PATH: ${.CURDIR}/../common
Modified: user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.bin/xlint/lint2/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -9,6 +9,6 @@ MAN=
CFLAGS+=-I${.CURDIR}/../lint1
LINTFLAGS=-abehrz
-BINDIR= /usr/libexec
+BINDIR= ${LIBEXECDIR}
.include <bsd.prog.mk>
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/console/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/console/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/diskmgmt/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/docsinstall/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/dot/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/dot
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/dot/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/dot/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/examples/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/examples/bsdconfig
FILES= add_some_packages.sh browse_packages_http.sh bsdconfigrc
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/includes/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/includes
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/includes/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/includes/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/mouse/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include share
FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/networking/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/packages/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/packages/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include share
FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/password/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/bsdconfig/password
FILES= password.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/security/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/security/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security/include
FILES= messages.subr securelevel.hlp
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= media packages
FILESDIR= ${SHAREDIR}/bsdconfig
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/media/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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 \
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/share/packages/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/bsdconfig/packages
FILES= categories.subr index.subr musthavepkg.subr packages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include share
FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/startup/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/bsdconfig/startup
FILES= rcconf.subr rcedit.subr rcvar.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include share
FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/timezone/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/bsdconfig/timezone
FILES= continents.subr countries.subr iso3166.subr menus.subr \
zones.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include
FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/ttys/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys/include
FILES= messages.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
SUBDIR= include share
FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/include/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include
FILES= messages.subr usermgmt.hlp
Modified: user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdconfig/usermgmt/share/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,5 @@
# $FreeBSD$
-NO_OBJ=
-
FILESDIR= ${SHAREDIR}/bsdconfig/usermgmt
FILES= group.subr group_input.subr user.subr user_input.subr
Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdinstall/distextract/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,6 +1,6 @@
# $FreeBSD$
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distextract
LIBADD= archive dpv figpar ncursesw dialog m
Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdinstall/distfetch/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,6 +1,6 @@
# $FreeBSD$
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= distfetch
LIBADD= fetch ncursesw dialog m
Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdinstall/partedit/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,6 +1,6 @@
# $FreeBSD$
-BINDIR= /usr/libexec/bsdinstall
+BINDIR= ${LIBEXECDIR}/bsdinstall
PROG= partedit
LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
${BINDIR}/partedit ${BINDIR}/scriptedpart
Modified: user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/bsdinstall/scripts/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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=
Modified: user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/lpr/filters/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-BINDIR= /usr/libexec/lpr
+BINDIR= ${LIBEXECDIR}/lpr
PROG= lpf
MAN=
Modified: user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/rpc.yppasswdd/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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}
Modified: user/ngie/more-tests2/usr.sbin/sendmail/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/sendmail/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/sendmail/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -7,7 +7,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/se
SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR}
-BINDIR= /usr/libexec/sendmail
+BINDIR= ${LIBEXECDIR}/sendmail
PROG= sendmail
MAN= mailq.1 newaliases.1 aliases.5 sendmail.8
Modified: user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/tcpdchk/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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"
Modified: user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile
==============================================================================
--- user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile Thu Nov 26 07:03:59 2015 (r291359)
+++ user/ngie/more-tests2/usr.sbin/tcpdmatch/Makefile Thu Nov 26 07:06:20 2015 (r291360)
@@ -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
More information about the svn-src-user
mailing list