From owner-svn-src-head@freebsd.org  Wed Dec 28 05:16:42 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C753FC91CE6;
 Wed, 28 Dec 2016 05:16:42 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8930E1049;
 Wed, 28 Dec 2016 05:16:42 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBS5Gfnx006672;
 Wed, 28 Dec 2016 05:16:41 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBS5Gfxl006670;
 Wed, 28 Dec 2016 05:16:41 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201612280516.uBS5Gfxl006670@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Wed, 28 Dec 2016 05:16:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r310664 - in head: tools/build/mk usr.sbin/bsnmpd/modules
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Dec 2016 05:16:42 -0000

Author: ngie
Date: Wed Dec 28 05:16:41 2016
New Revision: 310664
URL: https://svnweb.freebsd.org/changeset/base/310664

Log:
  Only build/install usr.sbin/bsnmpd/modules/snmp_wlan if MK_WIRELESS != no
  
  MFC after:	1 week

Modified:
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.sbin/bsnmpd/modules/Makefile

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Dec 28 05:05:08 2016	(r310663)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Wed Dec 28 05:16:41 2016	(r310664)
@@ -9021,6 +9021,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: head/usr.sbin/bsnmpd/modules/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/modules/Makefile	Wed Dec 28 05:05:08 2016	(r310663)
+++ head/usr.sbin/bsnmpd/modules/Makefile	Wed Dec 28 05:16:41 2016	(r310664)
@@ -17,7 +17,6 @@ SUBDIR=	${_snmp_atm} \
 	snmp_target \
 	snmp_usm \
 	snmp_vacm \
-	snmp_wlan
 
 .if ${MK_PF} != "no"
 SUBDIR+=snmp_pf
@@ -27,6 +26,10 @@ SUBDIR+=snmp_pf
 SUBDIR+=snmp_netgraph
 .endif
 
+.if ${MK_WIRELESS} != "no"
+SUBDIR+=snmp_wlan
+.endif
+
 INCS=	snmpmod.h
 INCSDIR= ${INCLUDEDIR}/bsnmp