net-mgmt/netdisco 1.0 update

Sevan / Venture37 venture37 at gmail.com
Mon Jul 19 23:03:15 UTC 2010 

On 19 July 2010 01:06, Sevan / Venture37 <venture37 at gmail.com> wrote:
> ammended patch for netdisco.crontab, use this patch instead of the one
> included in the previous diff.

updated patch which fixes a couple of things that were missed.


Sevan / Venture37
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	28 Mar 2010 06:41:55 -0000	1.11
+++ Makefile	19 Jul 2010 22:59:10 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	netdisco
-PORTVERSION=	0.95
-PORTREVISION=	4
+PORTVERSION=	1.0
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}_with_mibs
@@ -25,12 +24,15 @@
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5		\
 		${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg			\
 		${SITE_PERL}/${PERL_ARCH}/Apache/Test.pm:${PORTSDIR}/www/p5-Apache-Test			\
-		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib	\
+		${SITE_PERL}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib			\
 		${SITE_PERL}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser		\
 		${SITE_PERL}/MasonX/Request/WithApacheSession.pm:${PORTSDIR}/www/p5-MasonX-Request-WithApacheSession
 
 OPTIONS=	GRAPHVIZ "Install GraphViz for network map support"	on
 
+USERS=		netdisco
+GROUPS=		netdisco
+
 USE_PERL5=	yes
 USE_PGSQL=	yes
 USE_APACHE=	1.3+
@@ -41,9 +43,8 @@
 
 RUNDIR?=	/var/run
 DBDIR?=		/var/db
-APACHE_CFG=	${APACHE_CFGDIR}/httpd.conf
 
-SUB_FILES=	pkg-message pkg-install
+SUB_FILES=	pkg-message
 SUB_LIST=	DBDIR=${DBDIR}
 PLIST_SUB=	DBDIR=${DBDIR}
 
@@ -60,12 +61,9 @@
 .if ${APACHE_VERSION} >= 20
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2	\
 		${SITE_PERL}/${PERL_ARCH}/APR/Request/Apache2.pm:${PORTSDIR}/www/p5-libapreq2
-APACHE_CFGDIR=	${LOCALBASE}/etc/apache${APACHE_VERSION:S/20/2/}
 .else
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl		\
 		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq
-APACHE_CFGDIR=	${LOCALBASE}/etc/apache
-APACHE2_RE=	\#
 .endif
 
 .if defined(WITH_GRAPHVIZ)
@@ -79,13 +77,13 @@
 .	endfor
 
 	cd ${WRKSRC} && \
-	   ${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g'	\
-	                    -e 's#%%PREFIX%%#${PREFIX}#g'		\
-	                    -e 's#%%DATADIR%%#${DATADIR}#g'		\
-	                    -e 's#%%RUNDIR%%#${RUNDIR}#g'		\
-	                    -e 's#%%DBDIR%%#${DBDIR}#g'			\
-	                    -e 's/%%APACHE2%%/${APACHE2_RE}/g'		\
-	                    ${ALTER_FILES}
+	${REINPLACE_CMD} -e 's#%%WWWDIR%%#${WWWDIR}#g'		\
+			-e 's#%%PREFIX%%#${PREFIX}#g'		\
+			-e 's#%%DATADIR%%#${DATADIR}#g'		\
+			-e 's#%%RUNDIR%%#${RUNDIR}#g'		\
+			-e 's#%%DBDIR%%#${DBDIR}#g'		\
+			-e 's#%%ETCDIR%%#${ETCDIR}#g'		\
+			${ALTER_FILES}
 
 do-install:
 .	for i in netdisco bin/parse_mac bin/port_control bin/parse_kismet_ap
@@ -104,13 +102,13 @@
 
 	${INSTALL_DATA} ${WRKSRC}/netdisco.pm ${SITE_PERL}
 
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${MKDIR} ${ETCDIR}
 
 .	for i in ${CONFIG_FILES}
-		cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${PREFIX}/etc/${PORTNAME}/${i}.sample
-		@(if [ ! -f ${PREFIX}/etc/${PORTNAME}/${i} ]; then	\
-			${CP} ${PREFIX}/etc/${PORTNAME}/${i}.sample	\
-			      ${PREFIX}/etc/${PORTNAME}/${i};		\
+		cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${ETCDIR}/${i}.sample
+		@(if [ ! -f ${ETCDIR}/${i} ]; then	\
+			${CP} ${ETCDIR}/${i}.sample	\
+			      ${ETCDIR}/${i};		\
 		fi)
 .	endfor
 
@@ -126,17 +124,20 @@
 
 	${MKDIR} ${DBDIR}/${PORTNAME}
 
+	${CHOWN} -R ${USERS}:${GROUPS} ${ETCDIR}
+	${CHMOD} -R 660 ${ETCDIR}/*
+	${CHOWN} -R ${USERS}:${GROUPS} ${DBDIR}/netdisco
+
 .	if !defined(PACKAGE_BUILDING)
-		@(if [ -f ${APACHE_CFG} ] ; then \
-			${ECHO_MSG} "===> Updating ${APACHE_CFG}...";							\
-			${ECHO_CMD} "# Netdisco include files" >> ${APACHE_CFG};					\
-			${ECHO_CMD} "Include ${PREFIX}/etc/${PORTNAME}/netdisco_apache.conf" >> ${APACHE_CFG};		\
-			${ECHO_CMD} "Include ${PREFIX}/etc/${PORTNAME}/netdisco_apache_dir.conf" >> ${APACHE_CFG};	\
+		@(if [ -f ${APACHEETCDIR}/httpd.conf ] ; then \
+			${ECHO_MSG} "===> Updating ${APACHEETCDIR}/httpd.conf...";					\
+			${ECHO_CMD} "# Netdisco include files" >> ${APACHEETCDIR}/httpd.conf};				\
+			${ECHO_CMD} "Include ${ETCDIR}/netdisco_apache.conf" >> ${APACHEETCDIR}/httpd.conf;		\
+			${ECHO_CMD} "Include ${ETCDIR}/netdisco_apache_dir.conf" >> ${APACHEETCDIR}/httpd.conf;		\
 		fi)
 .	endif
 
 post-install:
-	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	5 Jan 2008 14:35:25 -0000	1.2
+++ distinfo	19 Jul 2010 22:59:10 -0000
@@ -1,3 +1,3 @@
-MD5 (netdisco-0.95_with_mibs.tar.gz) = 7cca1eb52203a0fa7b9bb65727b86d00
-SHA256 (netdisco-0.95_with_mibs.tar.gz) = d7a48dba471d683b0be470c1f82d2b5fa9f396deb914b7171774d0a3137e0745
-SIZE (netdisco-0.95_with_mibs.tar.gz) = 8318725
+MD5 (netdisco-1.0_with_mibs.tar.gz) = c1d9c3f51569235e90a6eb7dc0e73c74
+SHA256 (netdisco-1.0_with_mibs.tar.gz) = ff20ff42f71e9a8390aa4a436e7a8426bea6a43bd96884e65a1d6e71c3a047b0
+SIZE (netdisco-1.0_with_mibs.tar.gz) = 12701473
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	7 Jan 2008 14:08:44 -0000	1.3
+++ pkg-plist	19 Jul 2010 22:59:10 -0000
@@ -7,11 +7,181 @@
 %%DATADIR%%/mibs/UPGRADE
 %%DATADIR%%/mibs/allied/ati-mib.mib
 %%DATADIR%%/mibs/allied/atswtch2.mib
+%%DATADIR%%/mibs/arista/ARISTA-PRODUCTS-MIB.txt
+%%DATADIR%%/mibs/arista/ARISTA-SMI-MIB.txt
+%%DATADIR%%/mibs/aruba/a80sb_mb_private.mib
 %%DATADIR%%/mibs/aruba/aruba-ap.my
+%%DATADIR%%/mibs/aruba/aruba-auth.my
+%%DATADIR%%/mibs/aruba/aruba-cts.my
+%%DATADIR%%/mibs/aruba/aruba-esi.my
+%%DATADIR%%/mibs/aruba/aruba-ifext.my
+%%DATADIR%%/mibs/aruba/aruba-mesh.my
+%%DATADIR%%/mibs/aruba/aruba-mgmt.my
+%%DATADIR%%/mibs/aruba/aruba-mobility.my
+%%DATADIR%%/mibs/aruba/aruba-mon.my
+%%DATADIR%%/mibs/aruba/aruba-snr.my
 %%DATADIR%%/mibs/aruba/aruba-switch.my
+%%DATADIR%%/mibs/aruba/aruba-systemext.my
+%%DATADIR%%/mibs/aruba/aruba-tc.my
+%%DATADIR%%/mibs/aruba/aruba-trap.my
+%%DATADIR%%/mibs/aruba/aruba-user.my
+%%DATADIR%%/mibs/aruba/aruba-voice.my
+%%DATADIR%%/mibs/aruba/aruba-wlan.my
 %%DATADIR%%/mibs/aruba/aruba.my
 %%DATADIR%%/mibs/asante/ASANTE-AH1012-MIB.txt
 %%DATADIR%%/mibs/asante/AsanteSwitchMIB.txt
+%%DATADIR%%/mibs/cabletron/cabletron-traps-irm.txt
+%%DATADIR%%/mibs/cabletron/cabletron-traps.txt
+%%DATADIR%%/mibs/cabletron/chassis-mib.txt
+%%DATADIR%%/mibs/cabletron/community-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-broadcast-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-cmmphys-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-container-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-els10-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-fastpath-dhcpserver-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-fastpath-protected-port-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-flash-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-fps-services-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-hsimphys-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-pic-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-priority-classify-mib.txt
+%%DATADIR%%/mibs/cabletron/ct-priority-queuing-mib.txt
+%%DATADIR%%/mibs/cabletron/ctatm-config-mib.txt
+%%DATADIR%%/mibs/cabletron/ctels100-ng-mib.txt
+%%DATADIR%%/mibs/cabletron/ctfps-mib.txt
+%%DATADIR%%/mibs/cabletron/ctframer-config-mib.txt
+%%DATADIR%%/mibs/cabletron/ctif-ext-mib.txt
+%%DATADIR%%/mibs/cabletron/ctinb-mib.txt
+%%DATADIR%%/mibs/cabletron/ctinb2-mib.txt
+%%DATADIR%%/mibs/cabletron/ctrmonxt-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-alias-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ap3000-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-appletalk-router-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-appn-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-bdg-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-bridge-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-bus-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-cdp.mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-chassis-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-common-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-csmacd-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-dcm-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-deciv-router-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-device-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-dhcp-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-dlsw-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-download-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-elan-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-entity-state-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-entity-state-tc-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-environment-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ethernet-parameters.txt
+%%DATADIR%%/mibs/cabletron/ctron-etwmim-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-fddi-fnb-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-fddi-stat-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-fnbtr-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-frontpanel-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-if-remap-2-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-if-remap-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-igmp-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ip-router-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ipx-router-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-mib-names.txt
+%%DATADIR%%/mibs/cabletron/ctron-nat-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-oids.mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-orp-hsim-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-portmap-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-power-supply-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ppc-bad-packets.txt
+%%DATADIR%%/mibs/cabletron/ctron-priority-classify-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-priority-extensions-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-q-bridge-mib-ext.txt
+%%DATADIR%%/mibs/cabletron/ctron-rate-policing-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-remote-access-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-routers-internal-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-routers-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfcs-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-base-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-bindery-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-call-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-chassis-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-common-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-conn-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-connection-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-diagstats-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-directory-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-esys-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-eventlog-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-flood-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-include-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-l4ss-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-mcast-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-path-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-pktmgr-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-policy-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-port-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-resolve-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-sflsp-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-size-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-softlink-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-tap-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-topology-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-vlan-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-sfps-vstp-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-smarttrunk-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-capacity-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-config-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-hardware-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-l2-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-l3-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-policy-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-service-status-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-smi-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ssr-trap-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-timed-reset-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-translation-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-tx-queue-arbitration-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-ups-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-vlan-classify-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-vlan-extensions-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-wan-imux-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-wan-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-wan-multi-imux-mib.txt
+%%DATADIR%%/mibs/cabletron/ctron-webview-mib.txt
+%%DATADIR%%/mibs/cabletron/ctsmtmib-mib.txt
+%%DATADIR%%/mibs/cabletron/cttraplog-mib.txt
+%%DATADIR%%/mibs/cabletron/dlm-mib.txt
+%%DATADIR%%/mibs/cabletron/dot5-log-mib.txt
+%%DATADIR%%/mibs/cabletron/dot5-phys-mib.txt
+%%DATADIR%%/mibs/cabletron/elh100-mib.txt
+%%DATADIR%%/mibs/cabletron/els100-s24tx2m-mib.txt
+%%DATADIR%%/mibs/cabletron/event-actions-mib.txt
+%%DATADIR%%/mibs/cabletron/fast-ethernet-mib.txt
+%%DATADIR%%/mibs/cabletron/garp-mib.txt
+%%DATADIR%%/mibs/cabletron/irm-oids.txt
+%%DATADIR%%/mibs/cabletron/irm3-mib.txt
+%%DATADIR%%/mibs/cabletron/netlink-specific-mib.txt
+%%DATADIR%%/mibs/cabletron/network-diags-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-ap-status-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-ap-tc.txt
+%%DATADIR%%/mibs/cabletron/rbtws-basic-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-client-session-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-client-session-tc.txt
+%%DATADIR%%/mibs/cabletron/rbtws-external-server-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-info-rf-detect-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-port-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-registration-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-root-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-system-mib.txt
+%%DATADIR%%/mibs/cabletron/rbtws-trap-mib.txt
+%%DATADIR%%/mibs/cabletron/repeater-mib-2.txt
+%%DATADIR%%/mibs/cabletron/repeater-rev4-mib.txt
+%%DATADIR%%/mibs/cabletron/router-oids.txt
+%%DATADIR%%/mibs/cabletron/system-resource-mib.txt
+%%DATADIR%%/mibs/cabletron/trap-mib.txt
+%%DATADIR%%/mibs/cabletron/ups2-mib.txt
+%%DATADIR%%/mibs/cabletron/v2h124-24-mib.txt
+%%DATADIR%%/mibs/cabletron/ziplock-mib.txt
 %%DATADIR%%/mibs/chk_dups
 %%DATADIR%%/mibs/chk_mibs
 %%DATADIR%%/mibs/chk_mibs_all
@@ -20,6 +190,7 @@
 %%DATADIR%%/mibs/cisco/ADMIN-AUTH-STATS-MIB.my
 %%DATADIR%%/mibs/cisco/ADSL-DMT-LINE-MIB.my
 %%DATADIR%%/mibs/cisco/AIRESPACE-REF-MIB.my
+%%DATADIR%%/mibs/cisco/AIRESPACE-SWITCHING-MIB.my
 %%DATADIR%%/mibs/cisco/AIRESPACE-WIRELESS-MIB.my
 %%DATADIR%%/mibs/cisco/ALTIGA-ADDRESS-STATS-MIB.my
 %%DATADIR%%/mibs/cisco/ALTIGA-BMGT-STATS-MIB.my
@@ -70,6 +241,7 @@
 %%DATADIR%%/mibs/cisco/CAT2600-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-5800-HEALTH-MON-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-6400-CHASSIS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-802-TAP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-90-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-AAA-CLIENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-AAA-SERVER-EXT-MIB.my
@@ -83,7 +255,9 @@
 %%DATADIR%%/mibs/cisco/CISCO-ADSL-DMT-LINE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ALPS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ANNOUNCEMENT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-AON-STATUS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-APPLIANCE-REDUNDANCY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-APPLICATION-ACCELERATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-APS-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-APS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ASPP-MIB.my
@@ -96,6 +270,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-ATM-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-IF-PHYS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ATM-NETWORK-CLOCK-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-PVC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-PVCTRAP-EXTN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-QOS-MIB.my
@@ -111,6 +286,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-ATM-TRUNK-STAT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM-VIRTUAL-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ATM2-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-AUTH-FRAMEWORK-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-AUTHORIZATION-STATS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BBSM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BCP-MIB.my
@@ -118,6 +294,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-BGP-POLICY-ACCOUNTING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BGP4-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BITS-CLOCK-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-BRIDGE-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BSC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BSTUN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-BULK-FILE-MIB.my
@@ -132,6 +309,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-CABLE-METERING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CABLE-QOS-MONITOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CABLE-SPECTRUM-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CABLE-WIDEBAND-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CAC-SYSTEM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CALL-APPLICATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CALL-HISTORY-MIB.my
@@ -147,10 +325,13 @@
 %%DATADIR%%/mibs/cisco/CISCO-CASA-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CAT6K-CROSSBAR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CATOS-ACL-QOS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CBP-TARGET-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CBP-TARGET-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CCM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CCME-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CDL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CDMA-AHDLC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CDMA-PDSN-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CDMA-PDSN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CDP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CEF-MIB.my
@@ -174,6 +355,8 @@
 %%DATADIR%%/mibs/cisco/CISCO-CONFIG-MAN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CONTENT-ENGINE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CONTENT-NETWORK-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CONTENT-SERVICES-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-CONTEXT-MAPPING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-COPS-CLIENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CRYPTO-ACCELERATOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-CSG-MIB.my
@@ -183,6 +366,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-DHCP-SNOOPING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DIAL-CONTROL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DIFFSERV-EXT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-DIGITAL-MEDIA-SYSTEMS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DIST-DIRECTOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DLCSW-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DLSW-EXT-MIB.my
@@ -195,12 +379,16 @@
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-ASSOCIATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-CLIENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-CONTEXT-SERVICES-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-DOT11-HT-MAC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-DOT11-HT-PHY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-LBS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-QOS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-DOT11-RADAR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-RADIO-DIAGNOSTIC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-SSID-SECURITY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DOT11-WIDS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-DOT3-OAM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DS0-CROSS-CONNECT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DS0BUNDLE-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-DS0BUNDLE-MIB.my
@@ -213,6 +401,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-DYNAMIC-PORT-VSAN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-EIGRP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-EMBEDDED-EVENT-MGR-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ENERGYWISE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENHANCED-IMAGE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENHANCED-IPSEC-FLOW-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENHANCED-MEMPOOL-MIB.my
@@ -220,17 +409,24 @@
 %%DATADIR%%/mibs/cisco/CISCO-ENHANCED-WRED-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-ALARM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-ASSET-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ENTITY-DIAG-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ENTITY-DIAG-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-DISPLAY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-FRU-CONTROL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-PFE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-PROVISIONING-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ENTITY-REDUNDANCY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ENTITY-REDUNDANCY-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-SENSOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENTITY-VENDORTYPE-OID-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ENVMON-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-EPM-NOTIFICATION-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ERM-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-ERR-DISABLE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ETHER-CFM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ETHERNET-ACCESS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-EVC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-EXT-SCSI-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FABRIC-C12K-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FABRIC-HFR-MIB.my
@@ -241,6 +437,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-FC-FE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FC-MULTICAST-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FC-ROUTE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-FC-SDV-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FC-SPAN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FCC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FCIP-MGMT-EXT-MIB.my
@@ -262,22 +459,30 @@
 %%DATADIR%%/mibs/cisco/CISCO-FSPF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-FTP-CLIENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GATEKEEPER-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-GGSN-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GGSN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GGSN-QOS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GGSN-SERVICE-AWARE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GPRS-ACC-PT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GPRS-CHARGING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GPRS-GTP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-GSLB-DNS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-GSLB-HEALTH-MON-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-GSLB-SYSTEM-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-GSLB-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GTP-DIRECTOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-GTP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-H323-TC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-H324-DIAL-CONTROL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-HC-ALARM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-HEALTH-MONITOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-HSRP-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-HSRP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ICSUDSU-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IDSL-LINE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IEEE8021-CFM-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-ATM2-PVCTRAP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IETF-BFD-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-DHCP-SERVER-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-DHCP-SERVER-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-DOT11-QOS-EXT-MIB.my
@@ -289,6 +494,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-IETF-ISIS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-ISNS-MGMT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-MEGACO-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IETF-MSDP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-NAT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-PIM-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-PIM-MIB.my
@@ -300,6 +506,9 @@
 %%DATADIR%%/mibs/cisco/CISCO-IETF-SCTP-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-SCTP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-VDSL-LINE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IETF-VPLS-BGP-EXT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IETF-VPLS-GENERIC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IETF-VPLS-LDP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IETF-VRRP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IF-CALL-SERVICE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IF-EXTENSION-MIB.my
@@ -316,13 +525,17 @@
 %%DATADIR%%/mibs/cisco/CISCO-IMAGE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IMAGE-TC.my
 %%DATADIR%%/mibs/cisco/CISCO-IMAGE-UPGRADE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-INTERFACETOPN-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-ENCRYPTION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-LOCAL-POOL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-NW-DISCOVERY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-PROTOCOL-FILTER-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IP-RAN-BACKHAUL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-STAT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IP-TAP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IP-UPLINK-REDIRECT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-IP-URPF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IPMCAST-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IPMROUTE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IPSEC-FLOW-MONITOR-MIB.my
@@ -331,6 +544,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-IPSEC-PROVISIONING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IPSEC-SIGNALING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-IPSEC-TC.my
+%%DATADIR%%/mibs/cisco/CISCO-IPSLA-ETHERNET-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ISCSI-GW-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ISCSI-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-ISDN-MIB.my
@@ -358,6 +572,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-L2-DEV-MONITORING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-L2-TUNNEL-CONFIG-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-L2L3-INTERFACE-CONFIG-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-L4L7MODULE-REDUNDANCY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-L4L7MODULE-RESOURCE-LIMIT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LAG-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LATITUDE-MIB.my
@@ -365,28 +580,46 @@
 %%DATADIR%%/mibs/cisco/CISCO-LEC-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LECS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LES-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LICENSE-MGMT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LICENSE-MGR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LICENSE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LINK-ERROR-MONITOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LOCAL-DIRECTOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LRE-CPE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-AAA-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-ACL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-AP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-CCX-RM-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-CDP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-CLIENT-ROAMING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CALIB-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-CCX-TC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-DOT11-CLIENT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-DOT11-LDAP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-DOT11-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-IDS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-LINKTEST-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-LOCAL-AUTH-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-MESH-BATTERY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-MESH-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-MESH-STATS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-MFP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-MOBILITY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-QOS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-REAP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-ROGUE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-RRM-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-LWAPP-SYS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-TSM-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-WEBAUTH-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-WLAN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-LWAPP-WLAN-SECURITY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-MAC-AUTH-BYPASS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MAC-NOTIFICATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MAU-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MEDIA-GATEWAY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-MEGACO-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MEMORY-POOL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-METRO-PHY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MGC-MIB.my
@@ -404,15 +637,19 @@
 %%DATADIR%%/mibs/cisco/CISCO-MGX82XX-VIRTUAL-PORT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MGX8800-IF-MAPPING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MMAIL-DIAL-CONTROL-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-MMODAL-CONTACT-APPS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MOBILE-IP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MODEM-MGMT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MODULE-AUTO-SHUTDOWN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MODULE-VIRTUALIZATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-MVPN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NAC-NAD-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-NAC-TC-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-NAT-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NBAR-PROTOCOL-DISCOVERY-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NDE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NETFLOW-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-NETINT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NETWORK-REGISTRAR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NMS-APPL-HEALTH-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-NS-MIB.my
@@ -426,7 +663,10 @@
 %%DATADIR%%/mibs/cisco/CISCO-OSCP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-OSPF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-OSPF-TRAP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-OTN-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-OUTAGE-MONITOR-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-P2P-IF-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-PACKET-CAPTURE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PAE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PAGP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PIM-MIB.my
@@ -434,6 +674,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-PKI-PARTICIPATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PNNI-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-POE-PD-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-POLICY-GROUP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-POP-MGMT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PORT-CHANNEL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PORT-QOS-MIB.my
@@ -442,6 +683,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-PORT-TRACK-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-POWER-ETHERNET-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PPPOE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-PREFERRED-PATH-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PRIVATE-VLAN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PROCESS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-PRODUCTS-MIB.my
@@ -455,10 +697,12 @@
 %%DATADIR%%/mibs/cisco/CISCO-QLLC01-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-QOS-PIB-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-QOS-POLICY-CONFIG-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-QOS-TC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-QUEUE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RADIUS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-REMOTE-ACCESS-MONITOR-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-REPEATER-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-RESILIENT-ETHERNET-PROTOCOL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RF-SUPPLEMENTAL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RHINO-MIB.my
@@ -467,6 +711,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-RSCN-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RSRB-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RTTMON-ICMP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-RTTMON-IP-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RTTMON-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RTTMON-RTP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-RTTMON-TC-MIB.my
@@ -478,6 +723,14 @@
 %%DATADIR%%/mibs/cisco/CISCO-SDLLC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SDSL-LINE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SECURE-SHELL-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROL-ATTACK-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROL-LINK-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROL-RDR-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROL-SUBSCRIBERS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROL-TP-STATS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SERVICE-CONTROLLER-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SESS-BORDER-CTRLR-CALL-STATS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SESS-BORDER-CTRLR-EVENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SIBU-FLASH-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SIBU-MANAGERS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SIBU-STACKABLE-DUAL-SPEED-HUB-MIB.my
@@ -486,11 +739,13 @@
 %%DATADIR%%/mibs/cisco/CISCO-SLB-HEALTH-MON-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SLB-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SM-FILE-DOWNLOAD-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SME-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SMI.my
 %%DATADIR%%/mibs/cisco/CISCO-SNA-LLC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SNAPSHOT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SNMP-NOTIFICATION-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SNMP-TARGET-EXT-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SNMP-USM-OIDS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SNMP-VACM-EXT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SONET-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SP-MIB.my
@@ -509,6 +764,9 @@
 %%DATADIR%%/mibs/cisco/CISCO-SVI-AUTOSTATE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SWITCH-CGMP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SWITCH-ENGINE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SWITCH-HARDWARE-CAPACITY-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SWITCH-MULTICAST-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-SWITCH-QOS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SWITCH-USAGE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SYS-INFO-LOG-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-SYSLOG-EVENT-EXT-MIB.my
@@ -523,6 +781,9 @@
 %%DATADIR%%/mibs/cisco/CISCO-TC.my
 %%DATADIR%%/mibs/cisco/CISCO-TCP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-TCPOFFLOAD-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-TELEPRESENCE-CALL-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-TELEPRESENCE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-TELNET-SERVER-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-TN3270SERVER-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-TPC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-TRANSACTION-CONNECTION-MIB.my
@@ -530,8 +791,10 @@
 %%DATADIR%%/mibs/cisco/CISCO-UDLDP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-UNIFIED-FIREWALL-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-UNITY-EXPRESS-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-USER-CONNECTION-TAP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VINES-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VIRTUAL-NW-IF-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-VIRTUAL-SWITCH-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VISM-ATM-TRUNK-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VISM-CAC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VISM-CAS-MIB.my
@@ -548,12 +811,13 @@
 %%DATADIR%%/mibs/cisco/CISCO-VISM-SVC-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VISM-TRAPS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VISM-XGCP-EXT.my
-%%DATADIR%%/mibs/cisco/CISCO-VLAN-BRIDGE-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-VLAN-BRIDGING-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VLAN-IFTABLE-RELATIONSHIP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VLAN-MEMBERSHIP-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VLAN-TRANSLATION-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VMPS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VOA-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-VOICE-AALX-PROFILE-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VOICE-ANALOG-IF-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VOICE-APPLICATIONS-OID-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VOICE-APPS-MIB.my
@@ -574,6 +838,7 @@
 %%DATADIR%%/mibs/cisco/CISCO-VSI-CONTROLLER-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VSIMASTER-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-VTP-MIB.my
+%%DATADIR%%/mibs/cisco/CISCO-WAN-3G-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-WAN-AAL2-PROFILES-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-WAN-ANNOUNCEMENT-MIB.my
 %%DATADIR%%/mibs/cisco/CISCO-WAN-ATM-CONN-MIB.my
@@ -639,22 +904,36 @@
 %%DATADIR%%/mibs/cisco/CISCO-ZS-MIB.my
 %%DATADIR%%/mibs/cisco/CISCOWAN-SMI.my
 %%DATADIR%%/mibs/cisco/CISCOWORKS-MIB.my
+%%DATADIR%%/mibs/cisco/CLAB-DEF-MIB.my
+%%DATADIR%%/mibs/cisco/CLAB-TOPO-MIB.my
 %%DATADIR%%/mibs/cisco/COMPAT-MIB.my
 %%DATADIR%%/mibs/cisco/DOCS-BPI-PLUS-MIB.my
 %%DATADIR%%/mibs/cisco/DOCS-CABLE-DEVICE-TRAP-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-DIAG-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-DRF-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-DSG-IF-MIB.my
 %%DATADIR%%/mibs/cisco/DOCS-IF-EXT-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-IF3-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-IFEXT2-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-L2VPN-MIB.my
 %%DATADIR%%/mibs/cisco/DOCS-QOS-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-QOS3-MIB.my
 %%DATADIR%%/mibs/cisco/DOCS-SUBMGT-MIB.my
+%%DATADIR%%/mibs/cisco/DOCS-TEST-MIB.my
 %%DATADIR%%/mibs/cisco/ERR-STATUS-MIB.my
 %%DATADIR%%/mibs/cisco/ESMODULE-MIB.my
 %%DATADIR%%/mibs/cisco/ESSWITCH-MIB.my
 %%DATADIR%%/mibs/cisco/ETHERLIKE-MIB.my
 %%DATADIR%%/mibs/cisco/EXPRESSION-MIB.my
 %%DATADIR%%/mibs/cisco/GENERICOBJECT-MIB.my
-%%DATADIR%%/mibs/cisco/IBM-6611-APPN-MIB.my
+%%DATADIR%%/mibs/cisco/IEEE-802DOT17-RPR-MIB.my
+%%DATADIR%%/mibs/cisco/IEEE8021-CFM-MIB.my
+%%DATADIR%%/mibs/cisco/IEEE8021-CFM-V2-MIB.my
+%%DATADIR%%/mibs/cisco/IEEE8021-TC-MIB.my
 %%DATADIR%%/mibs/cisco/IGMP-MIB.my
 %%DATADIR%%/mibs/cisco/IMA-MIB.my
 %%DATADIR%%/mibs/cisco/IPMROUTE-MIB.my
+%%DATADIR%%/mibs/cisco/ISIS-CAPABILTY-MIB.my
 %%DATADIR%%/mibs/cisco/LAN-EMULATION-CLIENT-MIB.my
 %%DATADIR%%/mibs/cisco/LANOPTICS-ALERTS-MIB.my
 %%DATADIR%%/mibs/cisco/LANOPTICS-BRIDGE-OPTION-MIB.my
@@ -667,7 +946,6 @@
 %%DATADIR%%/mibs/cisco/MADGEBOX-MIB.my
 %%DATADIR%%/mibs/cisco/MADGERSW-MIB.my
 %%DATADIR%%/mibs/cisco/METRO1500-MIB.my
-%%DATADIR%%/mibs/cisco/MPLS-L3VPN-STD-MIB.my
 %%DATADIR%%/mibs/cisco/MPLS-LDP-MIB.my
 %%DATADIR%%/mibs/cisco/MPLS-LSR-MIB.my
 %%DATADIR%%/mibs/cisco/MPLS-TE-MIB.my
@@ -707,6 +985,14 @@
 %%DATADIR%%/mibs/cisco/v2-readme
 %%DATADIR%%/mibs/cisco1.diff
 %%DATADIR%%/mibs/cisco2.diff
+%%DATADIR%%/mibs/cisco_remove
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-ADM-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-CONF-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-INFO-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-PM-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-ACS-SYS-MIB.mib
+%%DATADIR%%/mibs/cyclades/CYCLADES-MIB.mib
 %%DATADIR%%/mibs/dell/apollo.mib
 %%DATADIR%%/mibs/dell/dell_ita.mib
 %%DATADIR%%/mibs/dell/env_mib.mib
@@ -742,10 +1028,70 @@
 %%DATADIR%%/mibs/dell/rlvlan.mib
 %%DATADIR%%/mibs/dell/trunk.mib
 %%DATADIR%%/mibs/diff_dir
+%%DATADIR%%/mibs/enterasys/enterasys-8021x-extensions-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-8021x-rekeying-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-802dot11ext.txt
+%%DATADIR%%/mibs/enterasys/enterasys-R2Management.txt
+%%DATADIR%%/mibs/enterasys/enterasys-aaa-policy-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-activation-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-class-of-service-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-configuration-change-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-configuration-management-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-convergence-end-point-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-diagnostic-message-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-encr-8021x-config-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-encr-8021x-rekeying-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-eswitch-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-firewall-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-flow-limiting-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-ieee8023-lag-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-ietf-bridge-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-ietf-p-bridge-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-if-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-image-validation-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-jumbo-ethernet-frame-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-license-key-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-license-key-oids-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-link-flap-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mac-authentication-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mac-locking-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mau-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mgmt-auth-notification-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mib-names.mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mib-org.mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-mstp-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-multi-auth-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-multi-user-8021x-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-netflow-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-oids-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-policy-profile-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-power-ethernet-mib-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-pwa-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-radius-acct-client-ext-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-radius-auth-client-encrypt-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-radius-auth-client-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-resource-utilization-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-secure-shell-server-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-service-level-reporting-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-snmp-persistence-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-sntp-client-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-spanning-tree-diagnostic-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-ssh-server-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-syslog-client-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-threat-notification-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-tls-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-upn-tc-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-vlan-authorization-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-vlan-interface-mib.txt
+%%DATADIR%%/mibs/enterasys/enterasys-wifi-protected-access-mib.txt
 %%DATADIR%%/mibs/extreme/extreme-base.mib
+%%DATADIR%%/mibs/extreme/extreme-cable.mib
 %%DATADIR%%/mibs/extreme/extreme-dlcs.mib
+%%DATADIR%%/mibs/extreme/extreme-dos.mib
 %%DATADIR%%/mibs/extreme/extreme-eaps.mib
 %%DATADIR%%/mibs/extreme/extreme-edp.mib
+%%DATADIR%%/mibs/extreme/extreme-enh-dos.mib
+%%DATADIR%%/mibs/extreme/extreme-entity.mib
 %%DATADIR%%/mibs/extreme/extreme-esrp.mib
 %%DATADIR%%/mibs/extreme/extreme-fdb.mib
 %%DATADIR%%/mibs/extreme/extreme-filetransfer.mib
@@ -761,6 +1107,7 @@
 %%DATADIR%%/mibs/extreme/extreme-services.mib
 %%DATADIR%%/mibs/extreme/extreme-slb.mib
 %%DATADIR%%/mibs/extreme/extreme-snmpv3.mib
+%%DATADIR%%/mibs/extreme/extreme-stacking.mib
 %%DATADIR%%/mibs/extreme/extreme-stp-extensions.mib
 %%DATADIR%%/mibs/extreme/extreme-system.mib
 %%DATADIR%%/mibs/extreme/extreme-trap.mib
@@ -768,6 +1115,9 @@
 %%DATADIR%%/mibs/extreme/extreme-v2trap.mib
 %%DATADIR%%/mibs/extreme/extreme-vc.mib
 %%DATADIR%%/mibs/extreme/extreme-vlan.mib
+%%DATADIR%%/mibs/extreme/extreme-wireless.mib
+%%DATADIR%%/mibs/extreme/extremedot11ap.mib
+%%DATADIR%%/mibs/extreme/extremedot11f.mib
 %%DATADIR%%/mibs/foundry/FOUNDRY-CAR-MIB.mib
 %%DATADIR%%/mibs/foundry/FOUNDRY-SN-AGENT-MIB.mib
 %%DATADIR%%/mibs/foundry/FOUNDRY-SN-APPLETALK-MIB.mib
@@ -787,6 +1137,9 @@
 %%DATADIR%%/mibs/foundry/FOUNDRY-SN-VSRP-MIB.mib
 %%DATADIR%%/mibs/foundry/FOUNDRY-SN-WIRELESS-GROUP-MIB.mib
 %%DATADIR%%/mibs/foundry/FOUNDRY-VLAN-CAR-MIB.mib
+%%DATADIR%%/mibs/foundry/foundry-sn-mac-authentication.mib
+%%DATADIR%%/mibs/foundry/foundry-sn-mac-vlan.mib
+%%DATADIR%%/mibs/foundry/foundry-sn-mrp.mib
 %%DATADIR%%/mibs/hp/h2r07604c.mib
 %%DATADIR%%/mibs/hp/hp-sn-agent.mib
 %%DATADIR%%/mibs/hp/hp-sn-appletalk.mib
@@ -806,6 +1159,9 @@
 %%DATADIR%%/mibs/hp/hpentmib.mib
 %%DATADIR%%/mibs/hp/hphttpmg.mib
 %%DATADIR%%/mibs/hp/hpicf8023rptr.mib
+%%DATADIR%%/mibs/hp/hpicfarpprotect.mib
+%%DATADIR%%/mibs/hp/hpicfautorun.mib
+%%DATADIR%%/mibs/hp/hpicfautz.mib
 %%DATADIR%%/mibs/hp/hpicfbasic.mib
 %%DATADIR%%/mibs/hp/hpicfbridge.mib
 %%DATADIR%%/mibs/hp/hpicfchain.mib
@@ -816,21 +1172,30 @@
 %%DATADIR%%/mibs/hp/hpicfetwist.mib
 %%DATADIR%%/mibs/hp/hpicfff.mib
 %%DATADIR%%/mibs/hp/hpicfgenrptr.mib
+%%DATADIR%%/mibs/hp/hpicfgppc.mib
+%%DATADIR%%/mibs/hp/hpicfhighavailability.mib
+%%DATADIR%%/mibs/hp/hpicfinstmon.mib
 %%DATADIR%%/mibs/hp/hpicfipaddress.mib
 %%DATADIR%%/mibs/hp/hpicfiproute.mib
 %%DATADIR%%/mibs/hp/hpicfjumbo.mib
+%%DATADIR%%/mibs/hp/hpicfl3macconfig.mib
 %%DATADIR%%/mibs/hp/hpicflinktest.mib
+%%DATADIR%%/mibs/hp/hpicfmld.mib
 %%DATADIR%%/mibs/hp/hpicfoid.mib
 %%DATADIR%%/mibs/hp/hpicfospf.mib
 %%DATADIR%%/mibs/hp/hpicfpim.mib
+%%DATADIR%%/mibs/hp/hpicfproviderbridge.mib
 %%DATADIR%%/mibs/hp/hpicfratelimit.mib
 %%DATADIR%%/mibs/hp/hpicfrip.mib
 %%DATADIR%%/mibs/hp/hpicfsecurity.mib
+%%DATADIR%%/mibs/hp/hpicfsnmp.mib
 %%DATADIR%%/mibs/hp/hpicfsntp.mib
 %%DATADIR%%/mibs/hp/hpicfstack.mib
 %%DATADIR%%/mibs/hp/hpicftc.mib
+%%DATADIR%%/mibs/hp/hpicfudld.mib
 %%DATADIR%%/mibs/hp/hpicfudpforward.mib
 %%DATADIR%%/mibs/hp/hpicfusrauth.mib
+%%DATADIR%%/mibs/hp/hpicfusrprof.mib
 %%DATADIR%%/mibs/hp/hpicfvg.mib
 %%DATADIR%%/mibs/hp/hpicfvgrptr.mib
 %%DATADIR%%/mibs/hp/hpicfvrrp.mib
@@ -845,8 +1210,8 @@
 %%DATADIR%%/mibs/hp/hpvlan.mib
 %%DATADIR%%/mibs/hp/ipx.mib
 %%DATADIR%%/mibs/hp/orinoco.mib
-%%DATADIR%%/mibs/hp/sflow.mib
 %%DATADIR%%/mibs/hp1.diff
+%%DATADIR%%/mibs/ianalist
 %%DATADIR%%/mibs/juniper/mib-jnx-atm-cos.txt
 %%DATADIR%%/mibs/juniper/mib-jnx-atm.txt
 %%DATADIR%%/mibs/juniper/mib-jnx-bgpmib2.txt
@@ -887,8 +1252,10 @@
 %%DATADIR%%/mibs/net-snmp/NET-SNMP-EXTEND-MIB.txt
 %%DATADIR%%/mibs/net-snmp/NET-SNMP-MIB.txt
 %%DATADIR%%/mibs/net-snmp/NET-SNMP-MONITOR-MIB.txt
+%%DATADIR%%/mibs/net-snmp/NET-SNMP-PASS-MIB.txt
 %%DATADIR%%/mibs/net-snmp/NET-SNMP-SYSTEM-MIB.txt
 %%DATADIR%%/mibs/net-snmp/NET-SNMP-TC.txt
+%%DATADIR%%/mibs/net-snmp/NET-SNMP-VACM-MIB.txt
 %%DATADIR%%/mibs/net-snmp/RFC-1215.txt
 %%DATADIR%%/mibs/net-snmp/UCD-DEMO-MIB.txt
 %%DATADIR%%/mibs/net-snmp/UCD-DISKIO-MIB.txt
@@ -904,23 +1271,40 @@
 %%DATADIR%%/mibs/netscreen/NETSCREEN-RESOURCE-MIB.mib
 %%DATADIR%%/mibs/netscreen/NETSCREEN-SET-GEN-MIB.mib
 %%DATADIR%%/mibs/netscreen/NETSCREEN-SMI.mib
+%%DATADIR%%/mibs/nortel.diff
 %%DATADIR%%/mibs/nortel/AAC.mib
 %%DATADIR%%/mibs/nortel/CSMACD.MIB
 %%DATADIR%%/mibs/nortel/Commgmt.mib
 %%DATADIR%%/mibs/nortel/HARDWARE.MIB
 %%DATADIR%%/mibs/nortel/L2mgmt.mib
 %%DATADIR%%/mibs/nortel/L3mgmt.mib
+%%DATADIR%%/mibs/nortel/MODULE.MIB
 %%DATADIR%%/mibs/nortel/OSPF.MIB
 %%DATADIR%%/mibs/nortel/PriL3mgmt.mib
 %%DATADIR%%/mibs/nortel/SSH.mib
 %%DATADIR%%/mibs/nortel/TAG1Q.MIB
 %%DATADIR%%/mibs/nortel/WFCOMMON.MIB
-%%DATADIR%%/mibs/nortel/WSS2270-SW20-switching.mib
 %%DATADIR%%/mibs/nortel/altroot.mib
+%%DATADIR%%/mibs/nortel/aosbwm.mib
+%%DATADIR%%/mibs/nortel/aoslayer4.mib
+%%DATADIR%%/mibs/nortel/aoslayer7.mib
+%%DATADIR%%/mibs/nortel/aosnetwork.mib
+%%DATADIR%%/mibs/nortel/aosphysical.mib
+%%DATADIR%%/mibs/nortel/aosswitch.mib
+%%DATADIR%%/mibs/nortel/baystack.mib
 %%DATADIR%%/mibs/nortel/baystackadac.mib
+%%DATADIR%%/mibs/nortel/baystackarpinspection.mib
+%%DATADIR%%/mibs/nortel/baystackdhcpsnooping.mib
+%%DATADIR%%/mibs/nortel/baystackecmp.mib
+%%DATADIR%%/mibs/nortel/baystackerrormessage.mib
 %%DATADIR%%/mibs/nortel/baystacklacpext.mib
 %%DATADIR%%/mibs/nortel/baystackmulticastflooding.mib
+%%DATADIR%%/mibs/nortel/baystackospfext.mib
 %%DATADIR%%/mibs/nortel/baystackpethext.mib
+%%DATADIR%%/mibs/nortel/baystackradius.mib
+%%DATADIR%%/mibs/nortel/baystacksourceguard.mib
+%%DATADIR%%/mibs/nortel/baystackstats.mib
+%%DATADIR%%/mibs/nortel/baystackvrrpext.mib
 %%DATADIR%%/mibs/nortel/bayxlr.mib
 %%DATADIR%%/mibs/nortel/bnlog.mib
 %%DATADIR%%/mibs/nortel/bsee.mib
@@ -932,8 +1316,10 @@
 %%DATADIR%%/mibs/nortel/mcast201.mib
 %%DATADIR%%/mibs/nortel/nnmst.mib
 %%DATADIR%%/mibs/nortel/nnrst.mib
+%%DATADIR%%/mibs/nortel/nortelsecurenetworkaccess.mib
 %%DATADIR%%/mibs/nortel/ntwlanap006.mib
 %%DATADIR%%/mibs/nortel/rapid_city.mib
+%%DATADIR%%/mibs/nortel/rcmlt.mib
 %%DATADIR%%/mibs/nortel/s3com.mib
 %%DATADIR%%/mibs/nortel/s3eth.mib
 %%DATADIR%%/mibs/nortel/s5age.mib
@@ -958,7 +1344,10 @@
 %%DATADIR%%/mibs/rfc/ADSL-LINE-EXT-MIB.txt
 %%DATADIR%%/mibs/rfc/ADSL-LINE-MIB.txt
 %%DATADIR%%/mibs/rfc/ADSL-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/ADSL2-LINE-MIB.txt
+%%DATADIR%%/mibs/rfc/ADSL2-LINE-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/AGENTX-MIB.txt
+%%DATADIR%%/mibs/rfc/AGGREGATE-MIB.txt
 %%DATADIR%%/mibs/rfc/ALARM-MIB.txt
 %%DATADIR%%/mibs/rfc/APM-MIB.txt
 %%DATADIR%%/mibs/rfc/APPC-MIB.txt
@@ -998,16 +1387,23 @@
 %%DATADIR%%/mibs/rfc/DOCS-BPI-MIB.txt
 %%DATADIR%%/mibs/rfc/DOCS-CABLE-DEVICE-MIB.txt
 %%DATADIR%%/mibs/rfc/DOCS-IETF-BPI2-MIB.txt
+%%DATADIR%%/mibs/rfc/DOCS-IETF-CABLE-DEVICE-NOTIFICATION-MIB.txt
+%%DATADIR%%/mibs/rfc/DOCS-IETF-QOS-MIB.txt
 %%DATADIR%%/mibs/rfc/DOCS-IETF-SUBMGT-MIB.txt
 %%DATADIR%%/mibs/rfc/DOCS-IF-MIB.txt
 %%DATADIR%%/mibs/rfc/DOT12-IF-MIB.txt
 %%DATADIR%%/mibs/rfc/DOT12-RPTR-MIB.txt
+%%DATADIR%%/mibs/rfc/DOT3-EPON-MIB.txt
+%%DATADIR%%/mibs/rfc/DOT3-OAM-MIB.txt
+%%DATADIR%%/mibs/rfc/DPI20-MIB.txt
 %%DATADIR%%/mibs/rfc/DS0-MIB.txt
 %%DATADIR%%/mibs/rfc/DS0BUNDLE-MIB.txt
 %%DATADIR%%/mibs/rfc/DS1-MIB.txt
 %%DATADIR%%/mibs/rfc/DS3-MIB.txt
 %%DATADIR%%/mibs/rfc/DSA-MIB.txt
+%%DATADIR%%/mibs/rfc/DSMON-MIB.txt
 %%DATADIR%%/mibs/rfc/EBN-MIB.txt
+%%DATADIR%%/mibs/rfc/EFM-CU-MIB.txt
 %%DATADIR%%/mibs/rfc/ENTITY-MIB.txt
 %%DATADIR%%/mibs/rfc/ENTITY-SENSOR-MIB.txt
 %%DATADIR%%/mibs/rfc/ENTITY-STATE-MIB.txt
@@ -1016,6 +1412,7 @@
 %%DATADIR%%/mibs/rfc/ETHER-WIS.txt
 %%DATADIR%%/mibs/rfc/EtherLike-MIB.txt
 %%DATADIR%%/mibs/rfc/FC-MGMT-MIB.txt
+%%DATADIR%%/mibs/rfc/FCIP-MGMT-MIB.txt
 %%DATADIR%%/mibs/rfc/FDDI-SMT73-MIB.txt
 %%DATADIR%%/mibs/rfc/FIBRE-CHANNEL-FE-MIB.txt
 %%DATADIR%%/mibs/rfc/FLOW-METER-MIB.txt
@@ -1025,6 +1422,10 @@
 %%DATADIR%%/mibs/rfc/FRNETSERV-MIB.txt
 %%DATADIR%%/mibs/rfc/FRSLD-MIB.txt
 %%DATADIR%%/mibs/rfc/Finisher-MIB.txt
+%%DATADIR%%/mibs/rfc/GMPLS-LABEL-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/GMPLS-LSR-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/GMPLS-TC-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/GMPLS-TE-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/GSMP-MIB.txt
 %%DATADIR%%/mibs/rfc/HC-ALARM-MIB.txt
 %%DATADIR%%/mibs/rfc/HC-PerfHist-TC-MIB.txt
@@ -1038,18 +1439,23 @@
 %%DATADIR%%/mibs/rfc/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-CHARSET-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-FINISHER-MIB.txt
+%%DATADIR%%/mibs/rfc/IANA-GMPLS-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-ITU-ALARM-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-LANGUAGE-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-MALLOC-MIB.txt
+%%DATADIR%%/mibs/rfc/IANA-MAU-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-PRINTER-MIB.txt
 %%DATADIR%%/mibs/rfc/IANA-RTPROTO-MIB.txt
 %%DATADIR%%/mibs/rfc/IANATn3270eTC-MIB.txt
 %%DATADIR%%/mibs/rfc/IANAifType-MIB.txt
+%%DATADIR%%/mibs/rfc/IBM-6611-APPN-MIB.txt
 %%DATADIR%%/mibs/rfc/IEEE8021-PAE-MIB.my
 %%DATADIR%%/mibs/rfc/IEEE8023-LAG-MIB.my
 %%DATADIR%%/mibs/rfc/IEEE802dot11-MIB.my
+%%DATADIR%%/mibs/rfc/IF-CAP-STACK-MIB.txt
 %%DATADIR%%/mibs/rfc/IF-INVERTED-STACK-MIB.txt
 %%DATADIR%%/mibs/rfc/IF-MIB.txt
+%%DATADIR%%/mibs/rfc/IFCP-MGMT-MIB.txt
 %%DATADIR%%/mibs/rfc/IGMP-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/INET-ADDRESS-MIB.txt
 %%DATADIR%%/mibs/rfc/INT-SERV-GUARANTEED-MIB.my
@@ -1060,8 +1466,11 @@
 %%DATADIR%%/mibs/rfc/IP-FORWARD-MIB.txt
 %%DATADIR%%/mibs/rfc/IP-MIB.txt
 %%DATADIR%%/mibs/rfc/IPATM-IPMC-MIB.txt
+%%DATADIR%%/mibs/rfc/IPMCAST-MIB.txt
 %%DATADIR%%/mibs/rfc/IPMROUTE-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/IPOA-MIB.txt
+%%DATADIR%%/mibs/rfc/IPS-AUTH-MIB.txt
+%%DATADIR%%/mibs/rfc/IPSEC-SPD-MIB.txt
 %%DATADIR%%/mibs/rfc/IPV6-FLOW-LABEL-MIB.txt
 %%DATADIR%%/mibs/rfc/IPV6-ICMP-MIB.txt
 %%DATADIR%%/mibs/rfc/IPV6-MIB.txt
@@ -1069,16 +1478,27 @@
 %%DATADIR%%/mibs/rfc/IPV6-TC.txt
 %%DATADIR%%/mibs/rfc/IPV6-TCP-MIB.txt
 %%DATADIR%%/mibs/rfc/IPV6-UDP-MIB.txt
+%%DATADIR%%/mibs/rfc/ISCSI-MIB.txt
 %%DATADIR%%/mibs/rfc/ISDN-MIB.txt
+%%DATADIR%%/mibs/rfc/ISIS-MIB.txt
+%%DATADIR%%/mibs/rfc/ISNS-MIB.txt
 %%DATADIR%%/mibs/rfc/ITU-ALARM-MIB.txt
 %%DATADIR%%/mibs/rfc/ITU-ALARM-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/Job-Monitoring-MIB.txt
 %%DATADIR%%/mibs/rfc/L2TP-MIB.txt
+%%DATADIR%%/mibs/rfc/LANGTAG-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/LMP-MIB.txt
 %%DATADIR%%/mibs/rfc/MALLOC-MIB.txt
 %%DATADIR%%/mibs/rfc/MAU-MIB.txt
+%%DATADIR%%/mibs/rfc/MGMD-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/MIDCOM-MIB.txt
 %%DATADIR%%/mibs/rfc/MIOX25-MIB.txt
 %%DATADIR%%/mibs/rfc/MIP-MIB.txt
+%%DATADIR%%/mibs/rfc/MOBILEIPV6-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-FTN-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/MPLS-L3VPN-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/MPLS-LC-ATM-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/MPLS-LC-FR-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-LDP-ATM-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-LDP-FRAME-RELAY-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-LDP-GENERIC-STD-MIB.txt
@@ -1086,9 +1506,11 @@
 %%DATADIR%%/mibs/rfc/MPLS-LSR-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-TC-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/MPLS-TE-STD-MIB.txt
+%%DATADIR%%/mibs/rfc/MSDP-MIB.txt
 %%DATADIR%%/mibs/rfc/MTA-MIB.txt
 %%DATADIR%%/mibs/rfc/Modem-MIB.txt
 %%DATADIR%%/mibs/rfc/NAT-MIB.txt
+%%DATADIR%%/mibs/rfc/NEMO-MIB.txt
 %%DATADIR%%/mibs/rfc/NETWORK-SERVICES-MIB.txt
 %%DATADIR%%/mibs/rfc/NHRP-MIB.txt
 %%DATADIR%%/mibs/rfc/NOTIFICATION-LOG-MIB.txt
@@ -1097,8 +1519,13 @@
 %%DATADIR%%/mibs/rfc/OSPF-TRAP-MIB.txt
 %%DATADIR%%/mibs/rfc/P-BRIDGE-MIB.txt
 %%DATADIR%%/mibs/rfc/PARALLEL-MIB.txt
+%%DATADIR%%/mibs/rfc/PIM-BSR-MIB.txt
 %%DATADIR%%/mibs/rfc/PIM-MIB.txt
+%%DATADIR%%/mibs/rfc/PIM-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/PINT-MIB.txt
+%%DATADIR%%/mibs/rfc/PKTC-IETF-EVENT-MIB.txt
+%%DATADIR%%/mibs/rfc/PKTC-IETF-MTA-MIB.txt
+%%DATADIR%%/mibs/rfc/PKTC-IETF-SIG-MIB.txt
 %%DATADIR%%/mibs/rfc/POLICY-BASED-MANAGEMENT-MIB.txt
 %%DATADIR%%/mibs/rfc/POWER-ETHERNET-MIB.txt
 %%DATADIR%%/mibs/rfc/PPP-BRIDGE-NCP-MIB.txt
@@ -1113,6 +1540,10 @@
 %%DATADIR%%/mibs/rfc/RADIUS-ACC-SERVER-MIB.txt
 %%DATADIR%%/mibs/rfc/RADIUS-AUTH-CLIENT-MIB.txt
 %%DATADIR%%/mibs/rfc/RADIUS-AUTH-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/RADIUS-DYNAUTH-CLIENT-MIB.txt
+%%DATADIR%%/mibs/rfc/RADIUS-DYNAUTH-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/RAQMON-MIB.txt
+%%DATADIR%%/mibs/rfc/RAQMON-RDS-MIB.txt
 %%DATADIR%%/mibs/rfc/RDBMS-MIB.txt
 %%DATADIR%%/mibs/rfc/RFC1155-SMI.txt
 %%DATADIR%%/mibs/rfc/RFC1213-MIB.txt
@@ -1134,10 +1565,18 @@
 %%DATADIR%%/mibs/rfc/ROHC-RTP-MIB.txt
 %%DATADIR%%/mibs/rfc/ROHC-UNCOMPRESSED-MIB.txt
 %%DATADIR%%/mibs/rfc/RS-232-MIB.txt
+%%DATADIR%%/mibs/rfc/RSERPOOL-MIB.txt
+%%DATADIR%%/mibs/rfc/RSTP-MIB.txt
 %%DATADIR%%/mibs/rfc/RSVP-MIB.txt
 %%DATADIR%%/mibs/rfc/RTP-MIB.txt
+%%DATADIR%%/mibs/rfc/SCSI-MIB.txt
 %%DATADIR%%/mibs/rfc/SCTP-MIB.txt
+%%DATADIR%%/mibs/rfc/SFLOW-MIB.txt
+%%DATADIR%%/mibs/rfc/SIP-COMMON-MIB.txt
 %%DATADIR%%/mibs/rfc/SIP-MIB.txt
+%%DATADIR%%/mibs/rfc/SIP-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/SIP-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/SIP-UA-MIB.txt
 %%DATADIR%%/mibs/rfc/SLAPM-MIB.txt
 %%DATADIR%%/mibs/rfc/SMON-MIB.txt
 %%DATADIR%%/mibs/rfc/SMUX-MIB.txt
@@ -1145,6 +1584,7 @@
 %%DATADIR%%/mibs/rfc/SNA-SDLC-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-COMMUNITY-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-FRAMEWORK-MIB.txt
+%%DATADIR%%/mibs/rfc/SNMP-IEEE802-TM-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-MPD-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-NOTIFICATION-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-PROXY-MIB.txt
@@ -1155,27 +1595,53 @@
 %%DATADIR%%/mibs/rfc/SNMP-USM-DH-OBJECTS-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMP-VIEW-BASED-ACM-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMPv2-CONF.txt
+%%DATADIR%%/mibs/rfc/SNMPv2-M2M-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMPv2-MIB.txt
+%%DATADIR%%/mibs/rfc/SNMPv2-PARTY-MIB.txt
 %%DATADIR%%/mibs/rfc/SNMPv2-SMI.txt
 %%DATADIR%%/mibs/rfc/SNMPv2-TC.txt
 %%DATADIR%%/mibs/rfc/SNMPv2-TM.txt
+%%DATADIR%%/mibs/rfc/SNMPv2-USEC-MIB.txt
 %%DATADIR%%/mibs/rfc/SONET-MIB.txt
 %%DATADIR%%/mibs/rfc/SOURCE-ROUTING-MIB.txt
 %%DATADIR%%/mibs/rfc/SSPM-MIB.txt
 %%DATADIR%%/mibs/rfc/SYSAPPL-MIB.txt
+%%DATADIR%%/mibs/rfc/SYSLOG-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-FABRIC-ADDR-MGR-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-FABRIC-CONFIG-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-FABRIC-LOCK-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-FSPF-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-NAME-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-ROUTE-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-RSCN-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-SP-AUTHENTICATION-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-SP-POLICY-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-SP-SA-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-SP-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-SP-ZONING-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-VIRTUAL-FABRIC-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-FC-ZONE-SERVER-MIB.txt
+%%DATADIR%%/mibs/rfc/T11-TC-MIB.txt
+%%DATADIR%%/mibs/rfc/TCP-ESTATS-MIB.txt
 %%DATADIR%%/mibs/rfc/TCP-MIB.txt
 %%DATADIR%%/mibs/rfc/TCPIPX-MIB.txt
 %%DATADIR%%/mibs/rfc/TE-LINK-STD-MIB.txt
 %%DATADIR%%/mibs/rfc/TE-MIB.txt
+%%DATADIR%%/mibs/rfc/TIME-AGGREGATE-MIB.txt
 %%DATADIR%%/mibs/rfc/TN3270E-MIB.txt
 %%DATADIR%%/mibs/rfc/TN3270E-RT-MIB.txt
 %%DATADIR%%/mibs/rfc/TOKEN-RING-RMON-MIB.txt
 %%DATADIR%%/mibs/rfc/TOKENRING-MIB.txt
 %%DATADIR%%/mibs/rfc/TOKENRING-STATION-SR-MIB.txt
+%%DATADIR%%/mibs/rfc/TPM-MIB.txt
 %%DATADIR%%/mibs/rfc/TRANSPORT-ADDRESS-MIB.txt
+%%DATADIR%%/mibs/rfc/TRIP-MIB.txt
+%%DATADIR%%/mibs/rfc/TRIP-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/TUNNEL-MIB.txt
 %%DATADIR%%/mibs/rfc/UDP-MIB.txt
+%%DATADIR%%/mibs/rfc/UDPLITE-MIB.txt
 %%DATADIR%%/mibs/rfc/UPS-MIB.txt
+%%DATADIR%%/mibs/rfc/URI-TC-MIB.txt
 %%DATADIR%%/mibs/rfc/VDSL-LINE-EXT-MCM-MIB.txt
 %%DATADIR%%/mibs/rfc/VDSL-LINE-EXT-SCM-MIB.txt
 %%DATADIR%%/mibs/rfc/VDSL-LINE-MIB.txt
@@ -1186,28 +1652,40 @@
 %%DATADIR%%/mibs/rfc/lldp_dot1.mib
 %%DATADIR%%/mibs/rfc/lldp_dot3.mib
 %%DATADIR%%/mibs/rfc1.diff
+%%DATADIR%%/mibs/rfclist
 %%DATADIR%%/mibs/rm_cisco_dups
 %%DATADIR%%/mibs/snmp.conf
 %%DATADIR%%/mibs/snmpwalkmib
+%%DATADIR%%/mibs/split-extreme
 %%DATADIR%%/mibs/to_locase
 %%DATADIR%%/mibs/walk_all
 %%DATADIR%%/sql/admin.sql
 %%DATADIR%%/sql/device.sql
 %%DATADIR%%/sql/device_ip.sql
+%%DATADIR%%/sql/device_module.sql
 %%DATADIR%%/sql/device_port.sql
 %%DATADIR%%/sql/device_port_log.sql
+%%DATADIR%%/sql/device_port_power.sql
 %%DATADIR%%/sql/device_port_ssid.sql
+%%DATADIR%%/sql/device_port_vlan.sql
+%%DATADIR%%/sql/device_port_wireless.sql
+%%DATADIR%%/sql/device_power.sql
+%%DATADIR%%/sql/device_vlan.sql
 %%DATADIR%%/sql/log.sql
 %%DATADIR%%/sql/node.sql
 %%DATADIR%%/sql/node_ip.sql
+%%DATADIR%%/sql/node_monitor.sql
 %%DATADIR%%/sql/node_nbt.sql
+%%DATADIR%%/sql/node_wireless.sql
 %%DATADIR%%/sql/oui.sql
 %%DATADIR%%/sql/pg
+%%DATADIR%%/sql/process.sql
 %%DATADIR%%/sql/sessions.sql
 %%DATADIR%%/sql/subnets.sql
 %%DATADIR%%/sql/upgrade-0.92-to-0.93.sql
 %%DATADIR%%/sql/upgrade-0.93-to-0.94.sql
 %%DATADIR%%/sql/upgrade-0.94-to-0.95.sql
+%%DATADIR%%/sql/upgrade-0.95-to-1.0.sql
 %%DATADIR%%/sql/user_log.sql
 %%DATADIR%%/sql/users.sql
 %%WWWDIR%%/admin.html
@@ -1218,6 +1696,7 @@
 %%WWWDIR%%/admin_user.html
 %%WWWDIR%%/apache_login.html
 %%WWWDIR%%/autohandler
+%%WWWDIR%%/bullet.gif
 %%WWWDIR%%/change_pw.html
 %%WWWDIR%%/corner-bl.png
 %%WWWDIR%%/corner-br.png
@@ -1225,7 +1704,10 @@
 %%WWWDIR%%/corner-tr.png
 %%WWWDIR%%/device.html
 %%WWWDIR%%/device_inv.html
+%%WWWDIR%%/device_module.html
+%%WWWDIR%%/device_module_search.html
 %%WWWDIR%%/device_search.html
+%%WWWDIR%%/discoball2.gif
 %%WWWDIR%%/doc/ChangeLog.txt
 %%WWWDIR%%/doc/INSTALL.html
 %%WWWDIR%%/doc/README.html
@@ -1234,6 +1716,7 @@
 %%WWWDIR%%/doc/netdisco-api-backend.html
 %%WWWDIR%%/doc/netdisco-api-shared.html
 %%WWWDIR%%/duplex.html
+%%WWWDIR%%/frontpanel.html
 %%WWWDIR%%/icon_down.gif
 %%WWWDIR%%/icon_info.gif
 %%WWWDIR%%/icon_lock.gif
@@ -1246,33 +1729,42 @@
 %%WWWDIR%%/log.html
 %%WWWDIR%%/login.html
 %%WWWDIR%%/logout.html
+%%WWWDIR%%/minus.gif
+%%WWWDIR%%/mktree.css
+%%WWWDIR%%/mktree.js
+%%WWWDIR%%/netdisco.css
+%%WWWDIR%%/netdisco.ico
 %%WWWDIR%%/netdiscoball.gif
 %%WWWDIR%%/netmap.html
 %%WWWDIR%%/node.html
+%%WWWDIR%%/plus.gif
 %%WWWDIR%%/port_info.html
 %%WWWDIR%%/port_report.html
 %%WWWDIR%%/portcontrol.html
 %%WWWDIR%%/powered_by_mason.jpg
+%%WWWDIR%%/public_debugging.html
+%%WWWDIR%%/reports.html
+%%WWWDIR%%/search.html
 %%WWWDIR%%/sidebar.html
 %%WWWDIR%%/stats.html
 %%WWWDIR%%/traceroute.html
 %%WWWDIR%%/valid-html401.png
 %%WWWDIR%%/vcss.gif
- at unexec d="%D/etc/netdisco"; f="netdisco.conf";            if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
-etc/netdisco/netdisco.conf.sample
- at exec if [ ! -f %D/etc/netdisco/netdisco.conf ] ; then cp -p %D/etc/netdisco/netdisco.conf.sample %D/etc/netdisco/netdisco.conf; fi
- at unexec d="%D/etc/netdisco"; f="netdisco-topology.txt";    if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
-etc/netdisco/netdisco-topology.txt.sample
- at exec if [ ! -f %D/etc/netdisco/netdisco-topology.txt ] ; then cp -p %D/etc/netdisco/netdisco-topology.txt.sample %D/etc/netdisco/netdisco-topology.txt; fi
- at unexec d="%D/etc/netdisco"; f="netdisco.crontab";         if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
-etc/netdisco/netdisco.crontab.sample
- at exec if [ ! -f %D/etc/netdisco/netdisco.crontab ] ; then cp -p %D/etc/netdisco/netdisco.crontab.sample %D/etc/netdisco/netdisco.crontab; fi
- at unexec d="%D/etc/netdisco"; f="netdisco_apache.conf";     if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
-etc/netdisco/netdisco_apache.conf.sample
- at exec if [ ! -f %D/etc/netdisco/netdisco_apache.conf ] ; then cp -p %D/etc/netdisco/netdisco_apache.conf.sample %D/etc/netdisco/netdisco_apache.conf; fi
- at unexec d="%D/etc/netdisco"; f="netdisco_apache_dir.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
-etc/netdisco/netdisco_apache_dir.conf.sample
- at exec if [ ! -f %D/etc/netdisco/netdisco_apache_dir.conf ] ; then cp -p %D/etc/netdisco/netdisco_apache_dir.conf.sample %D/etc/netdisco/netdisco_apache_dir.conf; fi
+ at unexec d="%D/%%ETCDIR%%"; f="netdisco.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
+%%ETCDIR%%/netdisco.conf.sample
+ at exec if [ ! -f %%ETCDIR%%/netdisco.conf ] ; then cp -p %%ETCDIR%%/netdisco.conf.sample %%ETCDIR%%/netdisco.conf; fi
+ at unexec d="%D/%%ETCDIR%%"; f="netdisco-topology.txt"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
+%%ETCDIR%%/netdisco-topology.txt.sample
+ at exec if [ ! -f %%ETCDIR%%/netdisco-topology.txt ] ; then cp -p %%ETCDIR%%/netdisco-topology.txt.sample %%ETCDIR%%/netdisco-topology.txt; fi
+ at unexec d="%D/%%ETCDIR%%"; f="netdisco.crontab"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
+%%ETCDIR%%/netdisco.crontab.sample
+ at exec if [ ! -f %%ETCDIR%%/netdisco.crontab ] ; then cp -p %%ETCDIR%%/netdisco.crontab.sample %%ETCDIR%%/netdisco.crontab; fi
+ at unexec d="%D/%%ETCDIR%%"; f="netdisco_apache.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
+%%ETCDIR%%/netdisco_apache.conf.sample
+ at exec if [ ! -f %%ETCDIR%%/netdisco_apache.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache.conf.sample %%ETCDIR%%/netdisco_apache.conf; fi
+ at unexec d="%D/%%ETCDIR%%"; f="netdisco_apache_dir.conf"; if cmp -s ${d}/${f}.sample ${d}/${f}; then rm -f ${d}/${f}; fi;
+%%ETCDIR%%/netdisco_apache_dir.conf.sample
+ at exec if [ ! -f %%ETCDIR%%/netdisco_apache_dir.conf ] ; then cp -p %%ETCDIR%%/netdisco_apache_dir.conf.sample %%ETCDIR%%/netdisco_apache_dir.conf; fi
 @dirrm %%WWWDIR%%/doc
 @exec mkdir -p %D/%%WWWDIR%%/mason
 @dirrm %%WWWDIR%%/mason
@@ -1286,11 +1778,15 @@
 @dirrm %%DATADIR%%/mibs/hp
 @dirrm %%DATADIR%%/mibs/foundry
 @dirrm %%DATADIR%%/mibs/extreme
+ at dirrm %%DATADIR%%/mibs/enterasys
 @dirrm %%DATADIR%%/mibs/dell
+ at dirrm %%DATADIR%%/mibs/cyclades
 @dirrm %%DATADIR%%/mibs/cisco
+ at dirrm %%DATADIR%%/mibs/cabletron
 @dirrm %%DATADIR%%/mibs/asante
 @dirrm %%DATADIR%%/mibs/aruba
+ at dirrm %%DATADIR%%/mibs/arista
 @dirrm %%DATADIR%%/mibs/allied
 @dirrm %%DATADIR%%/mibs
 @dirrm %%DATADIR%%
- at dirrmtry etc/netdisco
+ at dirrmtry %%ETCDIR%%
Index: files/patch-netdisco
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/patch-netdisco,v
retrieving revision 1.2
diff -u -r1.2 patch-netdisco
--- files/patch-netdisco	5 Jan 2008 14:35:25 -0000	1.2
+++ files/patch-netdisco	19 Jul 2010 22:59:10 -0000
@@ -1,15 +1,15 @@
---- netdisco.orig	Wed Mar  7 10:09:23 2007
-+++ netdisco	Wed Mar  7 10:18:23 2007
+--- netdisco.orig	2010-07-04 01:51:44.000000000 +0100
++++ netdisco	2010-07-04 01:55:59.000000000 +0100
 @@ -113,7 +113,7 @@
  &header if (grep(/^([aABdeEFgIikKmMOprRTu]|expire-nodes-subnet)$/,keys %args) and !$BatchMode);
  
  # Parse Config File - Check for -C, then in current dir, then in default dir.
 -foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'/usr/local/netdisco/netdisco.conf') {
-+foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'%%PREFIX%%/etc/netdisco/netdisco.conf') {
++foreach my $c ($args{C},"$FindBin::Bin/netdisco.conf",'%%ETCDIR%%/netdisco.conf') {
      if (defined $c and -r $c){
          $configfile = $c;
          print "Using Config File : $configfile\n" if $DEBUG;
-@@ -629,7 +629,7 @@
+@@ -683,7 +683,7 @@
  
      my ($file_name,$want_time,$no_header) = @_;
  
@@ -18,12 +18,12 @@
  
      my $extension = defined $CONFIG{logextension} ? $CONFIG{logextension} : 'log';
      
-@@ -3597,7 +3597,7 @@
+@@ -4471,7 +4471,7 @@
  
  sub admin_daemon_pid {
      my $pid = shift;
 -    my $pid_file = homepath('daemon_pid', 'netdisco_daemon.pid');
-+    my $pid_file = homepath('daemon_pid','%%RUNDIR%%/netdisco_daemon.pid');
++    my $pid_file = homepath('daemon_pid', '%%RUNDIR%%/netdisco_daemon.pid');
  
      if (defined $pid) {
          print "Writing pid:$pid to $pid_file\n" if $DEBUG;
Index: files/patch-netdisco.conf
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/patch-netdisco.conf,v
retrieving revision 1.2
diff -u -r1.2 patch-netdisco.conf
--- files/patch-netdisco.conf	5 Jan 2008 14:35:25 -0000	1.2
+++ files/patch-netdisco.conf	19 Jul 2010 22:59:10 -0000
@@ -1,35 +1,36 @@
---- netdisco.conf.orig	Wed Mar  7 10:26:11 2007
-+++ netdisco.conf	Wed Mar  7 10:50:53 2007
-@@ -13,8 +13,8 @@
+--- netdisco.conf.orig	2010-07-04 01:57:30.000000000 +0100
++++ netdisco.conf	2010-07-04 02:03:16.000000000 +0100
+@@ -13,10 +13,10 @@
  
  # ---- General Settings ----
  domain          = .mycompany.com
 -home            = /usr/local/netdisco
--topofile        = netdisco-topology.txt
 +home            = %%DATADIR%%
-+topofile        = %%PREFIX%%/etc/netdisco-topology.txt
- timeout         = 90  
- macsuck_timeout = 90   
+ #customer        = mycompany
+ #customericon    = mycompany.gif,88,31
+-topofile        = netdisco-topology.txt
++topofile        = %%ETCDIR%%/netdisco-topology.txt
+ timeout         = 180
+ macsuck_timeout = 240
  #macsuck_all_vlans = true
-@@ -25,6 +25,8 @@
+@@ -28,6 +28,7 @@
  #discover_only  =
  #arpnip_no      = 192.168.5.5,192.168.0.0/24,192.168.2.1,192.168.5.0/26
  #arpnip_only    =
-+mibshome        = %%DATADIR%%/mibs
-+
++mibshome	= %%DATADIR%%/mibs
  
- # -- Database Maintenance and Data Removal --
- expire_devices       = 60
-@@ -33,7 +35,7 @@
+ # interfaces with names matching these items will skipped in discovery
+ ignore_interfaces = EOBC,unrouted VLAN,StackPort,Control Plane Interface,SPAN (S|R)P Interface,StackSub
+@@ -61,7 +62,7 @@
  
  # ---- Admin Panel Daemon Settings ----
  daemon_bg       = true
 -daemon_pid      = netdisco_daemon.pid
-+daemon_pid      = %%RUNDIR%%/netdisco.pid
++daemon_pid      = %%RUNDIR%%/netdisco_daemon.pid
  daemon_poll     = 2
  
  # ---- Port Control Settings ---
-@@ -49,7 +51,7 @@
+@@ -76,7 +77,7 @@
  # Data Archiving and Logging
  compresslogs    = true
  compress        = /usr/bin/gzip -f
@@ -38,45 +39,61 @@
  logextension    = txt
  #nmis_dump       = netdisco_nmis
  
-@@ -83,11 +85,12 @@
+@@ -128,23 +129,23 @@
  snmptimeout     = 1000000 
  snmpretries     = 3
- snmpver         = 2
--mibdirs         = $home/mibs/allied,  $home/mibs/asante, $home/mibs/cisco, \
--                  $home/mibs/foundry, $home/mibs/hp,     $home/mibs/nortel, \
--                  $home/mibs/extreme, \
-+mibdirs         = $mibshome/mibs/allied,  $mibshome/mibs/asante, $mibshome/mibs/cisco, \
-+                  $mibshome/mibs/foundry, $mibshome/mibs/hp,     $mibshome/mibs/nortel, \
-+                  $mibshome/mibs/extreme, \
-                   # Do not remove rfc or net-snmp. \
--                  $home/mibs/rfc,     $home/mibs/net-snmp
-+                  $mibshome/mibs/rfc,     $mibshome/mibs/net-snmp
-+
+ mibdirs         = \
+-    $home/mibs/allied, \
+-    $home/mibs/arista, \
+-    $home/mibs/aruba, \
+-    $home/mibs/asante, \
+-    $home/mibs/cabletron, \
+-    $home/mibs/cisco, \
+-    $home/mibs/cyclades, \
+-    $home/mibs/dell, \
+-    $home/mibs/enterasys, \
+-    $home/mibs/extreme, \
+-    $home/mibs/foundry, \
+-    $home/mibs/hp, \
+-    $home/mibs/juniper, \
+-    $home/mibs/netscreen, \
+-    $home/mibs/nortel, \
++    $mibshome/mibs/allied, \
++    $mibshome/mibs/arista, \
++    $mibshome/mibs/aruba, \
++    $mibshome/mibs/asante, \
++    $mibshome/mibs/cabletron, \
++    $mibshome/mibs/cisco, \
++    $mibshome/mibs/cyclades, \
++    $mibshome/mibs/dell, \
++    $mibshome/mibs/enterasys, \
++    $mibshome/mibs/extreme, \
++    $mibshome/mibs/foundry, \
++    $mibshome/mibs/hp, \
++    $mibshome/mibs/juniper, \
++    $mibshome/mibs/netscreen, \
++    $mibshome/mibs/nortel, \
+     # Do not remove rfc or net-snmp. \
+-    $home/mibs/rfc,     $home/mibs/net-snmp
++    $mibshome/mibs/rfc,     $home/mibs/net-snmp
  
  #bulkwalk_no    = vendor:foundry,model:blah,127.0.0.1/32,myswitch
  #bulkwalk_off   = true
-@@ -96,7 +99,7 @@
+@@ -167,7 +168,7 @@
  # ---- Graph Settings ----
  edge_color      = wheat
  
 -graph           = html/netmap.gif
 +graph           = netmap.gif
- # If you'd rather use PNG, comment out the above and
- # uncomment this.
  #graph_png       = html/netmap.png
-@@ -106,13 +109,13 @@
- #graph_dir       = net_dir.gif
- graph_epsilon   = 6
- graph_layout    = twopi  # try neato or fdp too
--graph_map       = html/netmap.map
-+graph_map       = netmap.map
- graph_overlap   = scale
- graph_nodesep   = 2
+ graph_bg        = black
+ graph_clusters  = false  # try fdp layout
+@@ -182,7 +183,7 @@
  graph_ranksep   = .3
- #graph_raw       = graph_raw.dot
+ #graph_raw      = graph_raw.dot
  graph_splines   = false
--#graph_svg      = html/netmap.svg
-+graph_svg       =  netmap.svg
+-graph_svg       = html/netmap.svg
++graph_svg       = netmap.svg
  graph_timeout   = 90
  graph_x         = 30
  graph_y         = 30
Index: files/patch-netdisco.crontab
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/patch-netdisco.crontab,v
retrieving revision 1.1
diff -u -r1.1 patch-netdisco.crontab
--- files/patch-netdisco.crontab	13 Jul 2006 00:11:12 -0000	1.1
+++ files/patch-netdisco.crontab	19 Jul 2010 22:59:10 -0000
@@ -1,7 +1,7 @@
---- netdisco.crontab.orig	Sun Dec  5 02:14:26 2004
-+++ netdisco.crontab	Sat Apr  8 23:11:20 2006
+--- netdisco.crontab.orig	2010-07-04 02:08:01.000000000 +0100
++++ netdisco.crontab	2010-07-04 02:07:28.000000000 +0100
 @@ -4,34 +4,34 @@
- # $Id: netdisco.crontab,v 1.7 2004/12/05 02:14:26 maxbaker Exp $
+ # $Id: netdisco.crontab,v 1.8 2009/06/10 18:39:03 maxbaker Exp $
  
  #MAILTO=max
 -PATH=/bin:/usr/bin:/usr/local/bin
@@ -20,8 +20,8 @@
 +0 1 * * *       %%PREFIX%%/bin/netdisco -b -B 
  
  # Restart admin panel daemon nightly
--0 2 * * *       /usr/local/netdisco/netdisco -p restart
-+0 2 * * *       %%PREFIX%%/bin/netdisco -p restart
+-0 2 * * *       /usr/local/netdisco/netdisco -b -p restart
++0 2 * * *       %%PREFIX%%/bin/netdisco -b -p restart
  
  # Refresh Graph every day
 -0 3 * * *       /usr/local/netdisco/netdisco -b -g 2>&1 
Index: files/patch-netdisco_apache.conf
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/patch-netdisco_apache.conf,v
retrieving revision 1.3
diff -u -r1.3 patch-netdisco_apache.conf
--- files/patch-netdisco_apache.conf	5 Jan 2008 14:35:25 -0000	1.3
+++ files/patch-netdisco_apache.conf	19 Jul 2010 22:59:10 -0000
@@ -1,23 +1,10 @@
---- netdisco_apache.conf.orig	Sun Mar  7 19:13:49 2004
-+++ netdisco_apache.conf	Sun Apr  9 17:44:59 2006
-@@ -2,25 +2,35 @@
- #   This file applied to the global server space.
- # $Id: netdisco_apache.conf,v 1.12 2004/03/07 19:13:49 maxbaker Exp $
- 
-+#Apache 2.x ---
-+%%APACHE2%%LoadModule apreq_module    /usr/local/libexec/apache2/mod_apreq2.so
-+#--------------
-+
+--- netdisco_apache.conf.orig	2010-07-04 14:12:22.000000000 +0100
++++ netdisco_apache.conf	2010-07-04 15:17:46.000000000 +0100
+@@ -13,18 +13,22 @@
  # Pool Database Connections
  PerlModule Apache::DBI
  
 -<Directory /usr/local/netdisco/html>
-+#Apache 2.x ---
-+%%APACHE2%%PerlModule CGI
-+%%APACHE2%%PerlModule Apache2::Request
-+%%APACHE2%%PerlModule Apache2::compat
-+#--------------
-+
 +<Directory %%WWWDIR%%>
  	order allow,deny
  	allow from all
@@ -35,11 +22,18 @@
 -    use lib '/usr/local/netdisco';
      use netdisco qw/:all/;
 -    &netdisco::config('/usr/local/netdisco/netdisco.conf');
--
--    # Uncomment next two lines to setup switch reverse proxy.
--    #use lib '/usr/local/netdisco/switch';
--    #use Apache::ProxyRewriteMax;
-+    &netdisco::config('%%PREFIX%%/etc/netdisco/netdisco.conf');
++    &netdisco::config('%%ETCDIR%%/netdisco.conf');
  }
  
  # Setup Mason and Session Handler
+@@ -35,8 +39,8 @@
+ 
+     my $ah = new HTML::Mason::ApacheHandler(
+         args_method            => 'mod_perl',
+-        comp_root              => '/usr/local/netdisco/html',
+-        data_dir               => '/usr/local/netdisco/mason',
++        comp_root              => '%%WWWDIR%%',
++        data_dir               => '%%WWWDIR%%/mason',
+         request_class          => 'MasonX::Request::WithApacheSession',
+         session_class          => 'Apache::Session::Postgres',
+         session_commit         => 1,
Index: files/patch-netdisco_apache_dir.conf
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/patch-netdisco_apache_dir.conf,v
retrieving revision 1.2
diff -u -r1.2 patch-netdisco_apache_dir.conf
--- files/patch-netdisco_apache_dir.conf	24 Mar 2007 14:04:34 -0000	1.2
+++ files/patch-netdisco_apache_dir.conf	19 Jul 2010 22:59:10 -0000
@@ -1,5 +1,5 @@
---- netdisco_apache_dir.conf.orig	Wed May  7 02:07:35 2003
-+++ netdisco_apache_dir.conf	Sat Apr  8 23:44:17 2006
+--- netdisco_apache_dir.conf.orig	2010-07-04 15:19:09.000000000 +0100
++++ netdisco_apache_dir.conf	2010-07-04 15:30:02.000000000 +0100
 @@ -1,8 +1,8 @@
  # Apache Configuration for Netdisco
  # This is applied to each virtual server
Index: files/pkg-install.in
===================================================================
RCS file: files/pkg-install.in
diff -N files/pkg-install.in
--- files/pkg-install.in	13 Jul 2006 00:11:12 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-if [ x"$2" != x"POST-INSTALL" ]; then
-    exit 0
-fi
-
-USER=netdisco
-GROUP=${USER}
-UID=840
-GID=${UID}
-USERS_HOME="/nonexistent"
-
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/bin/sh" -d ${USERS_HOME} -c "netdisco user"; \
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-chown -R ${USER}:${GROUP} ${PKG_PREFIX}/etc/netdisco
-chmod 660 ${PKG_PREFIX}/etc/netdisco/*
-
-chown ${USER}:${GROUP} %%DBDIR%%/netdisco
-
-exit 0
Index: files/pkg-message.in
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/netdisco/files/pkg-message.in,v
retrieving revision 1.2
diff -u -r1.2 pkg-message.in
--- files/pkg-message.in	5 Jan 2008 14:35:25 -0000	1.2
+++ files/pkg-message.in	19 Jul 2010 22:59:10 -0000
@@ -12,18 +12,18 @@
 	sh %%DATADIR%%/sql/pg_run
 	sh %%DATADIR%%/sql/pg_all
 
-    3) Examine all the configuration files in %%PREFIX%%/etc/netdisco,
+    3) Examine all the configuration files in %%ETCDIR%%,
        and modify them to suit your needs.
 
     4) Add an initial admin user by running 'netdisco -u'
 
     5) Import the OUI database: netdisco -o
 
-    6) Edit %%PREFIX%%/etc/netdisco/netdisco.crontab and change
+    6) Edit %%ETCDIR%%/netdisco.crontab and change
        center_network_device to one of your core routers/switches. Then
        install the crontab:
 
-         crontab -u netdisco %%PREFIX%%/etc/netdisco/netdisco.crontab
+         crontab -u netdisco %%ETCDIR%%/netdisco.crontab
 
     7) Add netdisco_enable="YES" to /etc/rc.conf, and then run
        %%PREFIX%%/etc/rc.d/netdisco to start the admin daemon.

More information about the freebsd-ports mailing list