diff options
author | syrinx <syrinx@FreeBSD.org> | 2010-12-20 22:56:50 +0000 |
---|---|---|
committer | syrinx <syrinx@FreeBSD.org> | 2010-12-20 22:56:50 +0000 |
commit | 3830b0c9c78eedec2084a8ebcbcb06fb7a9b2a5c (patch) | |
tree | ef97e25fb8862244948a9946c10c4ff89348468b | |
parent | be5201b0d1c733f2bfb8fa4bef0225259f9acb2c (diff) | |
download | FreeBSD-src-3830b0c9c78eedec2084a8ebcbcb06fb7a9b2a5c.zip FreeBSD-src-3830b0c9c78eedec2084a8ebcbcb06fb7a9b2a5c.tar.gz |
Unbreak the build by temprorarily not using include directives in
bsnmpd(1)' def files, until bsd.snmpmod.mk & Makefiles are fixed to
pass proper include path flags to gensnmptree.
-rwxr-xr-x | contrib/bsnmp/snmp_target/target_tree.def | 11 | ||||
-rwxr-xr-x | contrib/bsnmp/snmp_usm/usm_tree.def | 11 | ||||
-rwxr-xr-x | contrib/bsnmp/snmp_vacm/vacm_tree.def | 11 | ||||
-rw-r--r-- | contrib/bsnmp/snmpd/tree.def | 11 | ||||
-rw-r--r-- | lib/libbsnmp/libbsnmp/Makefile | 4 | ||||
-rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def | 11 | ||||
-rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def | 11 |
7 files changed, 60 insertions, 10 deletions
diff --git a/contrib/bsnmp/snmp_target/target_tree.def b/contrib/bsnmp/snmp_target/target_tree.def index 6c77b3f..990bfac 100755 --- a/contrib/bsnmp/snmp_target/target_tree.def +++ b/contrib/bsnmp/snmp_target/target_tree.def @@ -29,7 +29,16 @@ # $FreeBSD$ # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) typedef StorageType ENUM ( 1 other diff --git a/contrib/bsnmp/snmp_usm/usm_tree.def b/contrib/bsnmp/snmp_usm/usm_tree.def index 41eb557..72c446e 100755 --- a/contrib/bsnmp/snmp_usm/usm_tree.def +++ b/contrib/bsnmp/snmp_usm/usm_tree.def @@ -29,7 +29,16 @@ # $FreeBSD$ # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) typedef StorageType ENUM ( 1 other diff --git a/contrib/bsnmp/snmp_vacm/vacm_tree.def b/contrib/bsnmp/snmp_vacm/vacm_tree.def index bd7f70a..45b3c33 100755 --- a/contrib/bsnmp/snmp_vacm/vacm_tree.def +++ b/contrib/bsnmp/snmp_vacm/vacm_tree.def @@ -29,7 +29,16 @@ # $FreeBSD$ # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) typedef StorageType ENUM ( 1 other diff --git a/contrib/bsnmp/snmpd/tree.def b/contrib/bsnmp/snmpd/tree.def index f4d8579..b45817f 100644 --- a/contrib/bsnmp/snmpd/tree.def +++ b/contrib/bsnmp/snmpd/tree.def @@ -31,7 +31,16 @@ # System group and private Begemot SNMPd MIB. # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) (1 internet (2 mgmt diff --git a/lib/libbsnmp/libbsnmp/Makefile b/lib/libbsnmp/libbsnmp/Makefile index 7057816..d33808d 100644 --- a/lib/libbsnmp/libbsnmp/Makefile +++ b/lib/libbsnmp/libbsnmp/Makefile @@ -10,10 +10,6 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib LIB= bsnmp SHLIBDIR?= /lib -FILESGROUPS+= DEFS -DEFSDIR?= ${SHAREDIR}/snmp/defs -DEFS= tc.def - CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def index a8f30c8..2e88e5e 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def @@ -26,7 +26,16 @@ # $FreeBSD$ # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) typedef TruthValue ENUM ( 1 true diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def index bc89d56..7c695c4 100644 --- a/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def @@ -29,7 +29,16 @@ # $FreeBSD$ # -include "tc.def" +#include "tc.def" + +typedef RowStatus ENUM ( + 1 active + 2 notInService + 3 notReady + 4 createAndGo + 5 createAndWait + 6 destroy +) typedef TruthValue ENUM ( 1 true |