Author: ngie
Date: Wed Jan 4 00:40:06 2017
New Revision: 311211
URL: https://svnweb.freebsd.org/changeset/base/311211
Log:
MFstable/11 r311209:
MFC r310664:
Only build/install usr.sbin/bsnmpd/modules/snmp_wlan if MK_WIRELESS != no
Modified:
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
stable/10/usr.sbin/bsnmpd/modules/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jan 4 00:39:06
2017 (r311210)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Jan 4 00:40:06
2017 (r311211)
@@ -5695,6 +5695,12 @@ OLD_FILES+=usr/share/man/man8/wlandebug.
OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz
OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz
+OLD_FILES+=usr/lib/snmp_wlan.so
+OLD_LIBS+=usr/lib/snmp_wlan.so.6
+# bsnmp module
+OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz
+OLD_FILES+=usr/share/snmp/defs/wlan_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt
.endif
.if ${MK_SVNLITE} == no || ${MK_SVN} == yes
Modified: stable/10/usr.sbin/bsnmpd/modules/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/Makefile Wed Jan 4 00:39:06 2017
(r311210)
+++ stable/10/usr.sbin/bsnmpd/modules/Makefile Wed Jan 4 00:40:06 2017
(r311211)
@@ -16,7 +16,6 @@ SUBDIR= ${_snmp_atm} \
snmp_target \
snmp_usm \
snmp_vacm \
- snmp_wlan
.if ${MK_PF} != "no"
SUBDIR+=snmp_pf
@@ -26,6 +25,10 @@ SUBDIR+=snmp_pf
SUBDIR+=snmp_netgraph
.endif
+.if ${MK_WIRELESS} != "no"
+SUBDIR+=snmp_wlan
+.endif
+
INCS= snmpmod.h
INCSDIR= ${INCLUDEDIR}/bsnmp
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
