From owner-svn-src-stable@freebsd.org  Wed Jan  4 00:42:21 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 93515C9C8B2;
 Wed,  4 Jan 2017 00:42:21 +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 62448128B;
 Wed,  4 Jan 2017 00:42:21 +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 v040gKfJ088279;
 Wed, 4 Jan 2017 00:42:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v040gKc8088277;
 Wed, 4 Jan 2017 00:42:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701040042.v040gKc8088277@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, 4 Jan 2017 00:42:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r311214 - in stable/10: tools/build/mk
 usr.sbin/bsnmpd/modules
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2017 00:42:21 -0000

Author: ngie
Date: Wed Jan  4 00:42:20 2017
New Revision: 311214
URL: https://svnweb.freebsd.org/changeset/base/311214

Log:
  MFstable/11 r311212:
  
  MFC r310665:
  
  Only build/install usr.sbin/bsnmpd/modules/snmp_hast if MK_HAST != 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:41:33 2017	(r311213)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Jan  4 00:42:20 2017	(r311214)
@@ -2418,6 +2418,12 @@ OLD_FILES+=usr/share/man/man5/hast.conf.
 OLD_FILES+=usr/share/man/man8/hastctl.8.gz
 OLD_FILES+=usr/share/man/man8/hastd.8.gz
 OLD_DIRS+=usr/share/examples/hast
+# bsnmp
+OLD_FILES+=usr/lib/snmp_hast.so
+OLD_LIBS+=usr/lib/snmp_hast.so.6
+OLD_FILES+=usr/share/man/man3/snmp_hast.3.gz
+OLD_FILES+=usr/share/snmp/defs/hast_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-HAST-MIB.txt
 .endif
 
 .if ${MK_HESIOD} == no

Modified: stable/10/usr.sbin/bsnmpd/modules/Makefile
==============================================================================
--- stable/10/usr.sbin/bsnmpd/modules/Makefile	Wed Jan  4 00:41:33 2017	(r311213)
+++ stable/10/usr.sbin/bsnmpd/modules/Makefile	Wed Jan  4 00:42:20 2017	(r311214)
@@ -10,13 +10,16 @@ _snmp_atm= snmp_atm
 
 SUBDIR=	${_snmp_atm} \
 	snmp_bridge \
-	snmp_hast \
 	snmp_hostres \
 	snmp_mibII \
 	snmp_target \
 	snmp_usm \
 	snmp_vacm \
 
+.if ${MK_HAST} != "no"
+SUBDIR+=snmp_hast
+.endif
+
 .if ${MK_PF} != "no"
 SUBDIR+=snmp_pf
 .endif