Author: syrinx
Date: Mon Dec 20 22:56:50 2010
New Revision: 216605
URL: http://svn.freebsd.org/changeset/base/216605
Log:
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.
Modified:
head/contrib/bsnmp/snmp_target/target_tree.def
head/contrib/bsnmp/snmp_usm/usm_tree.def
head/contrib/bsnmp/snmp_vacm/vacm_tree.def
head/contrib/bsnmp/snmpd/tree.def
head/lib/libbsnmp/libbsnmp/Makefile
head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
Modified: head/contrib/bsnmp/snmp_target/target_tree.def
==============================================================================
--- head/contrib/bsnmp/snmp_target/target_tree.def Mon Dec 20 22:49:31
2010 (r216604)
+++ head/contrib/bsnmp/snmp_target/target_tree.def Mon Dec 20 22:56:50
2010 (r216605)
@@ -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
Modified: head/contrib/bsnmp/snmp_usm/usm_tree.def
==============================================================================
--- head/contrib/bsnmp/snmp_usm/usm_tree.def Mon Dec 20 22:49:31 2010
(r216604)
+++ head/contrib/bsnmp/snmp_usm/usm_tree.def Mon Dec 20 22:56:50 2010
(r216605)
@@ -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
Modified: head/contrib/bsnmp/snmp_vacm/vacm_tree.def
==============================================================================
--- head/contrib/bsnmp/snmp_vacm/vacm_tree.def Mon Dec 20 22:49:31 2010
(r216604)
+++ head/contrib/bsnmp/snmp_vacm/vacm_tree.def Mon Dec 20 22:56:50 2010
(r216605)
@@ -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
Modified: head/contrib/bsnmp/snmpd/tree.def
==============================================================================
--- head/contrib/bsnmp/snmpd/tree.def Mon Dec 20 22:49:31 2010
(r216604)
+++ head/contrib/bsnmp/snmpd/tree.def Mon Dec 20 22:56:50 2010
(r216605)
@@ -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
Modified: head/lib/libbsnmp/libbsnmp/Makefile
==============================================================================
--- head/lib/libbsnmp/libbsnmp/Makefile Mon Dec 20 22:49:31 2010
(r216604)
+++ head/lib/libbsnmp/libbsnmp/Makefile Mon Dec 20 22:56:50 2010
(r216605)
@@ -10,10 +10,6 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsn
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"'
Modified: head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def
==============================================================================
--- head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def Mon Dec 20
22:49:31 2010 (r216604)
+++ head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_tree.def Mon Dec 20
22:56:50 2010 (r216605)
@@ -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
Modified: head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
==============================================================================
--- head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def Mon Dec 20
22:49:31 2010 (r216604)
+++ head/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def Mon Dec 20
22:56:50 2010 (r216605)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
