svn commit: r311214 - in stable/10: tools/build/mk usr.sbin/bsnmpd/modules

[Ngie Cooper]

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