summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2017-01-04 00:42:20 +0000
committerngie <ngie@FreeBSD.org>2017-01-04 00:42:20 +0000
commit9aa8f34c06da4eb8b849179d51f33660440d0d79 (patch)
treebdb152f80c2be36ddd8081a030f6e6d5bb85ef04
parentf33dd63955a7cdea3d8a3464d803b6162db4ac4b (diff)
downloadFreeBSD-src-9aa8f34c06da4eb8b849179d51f33660440d0d79.zip
FreeBSD-src-9aa8f34c06da4eb8b849179d51f33660440d0d79.tar.gz
MFstable/11 r311212:
MFC r310665: Only build/install usr.sbin/bsnmpd/modules/snmp_hast if MK_HAST != no
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc6
-rw-r--r--usr.sbin/bsnmpd/modules/Makefile5
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 5d3917e..165d8e9 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2418,6 +2418,12 @@ OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
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
diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile
index 6b07be2..09598b3 100644
--- a/usr.sbin/bsnmpd/modules/Makefile
+++ b/usr.sbin/bsnmpd/modules/Makefile
@@ -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
OpenPOWER on IntegriCloud