Update to version 0.4.5

package changes:
- Add test target support
- Needs gmake to build

Many changes since last packaged version (0.1.6): many bug fixes
and new features.  Please see the file ChangeLog enclosed in the
source distribution or the on-line version at
http://www.ibr.cs.tu-bs.de/projects/libsmi/ChangeLog.html

7 files changed, 385 insertions, 21 deletions

diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index 436cb926e0b..dd97e970e24 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2006/09/03 00:56:29 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/10/16 23:39:50 seb Exp $
 #
 
-DISTNAME=	libsmi-0.1.6
-PKGREVISION=	1
+DISTNAME=	libsmi-0.4.5
 CATEGORIES=	devel net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/
 
@@ -11,18 +10,32 @@ HOMEPAGE=	http://www.ibr.cs.tu-bs.de/projects/libsmi/
 COMMENT=	Library to access SMI MIB information
 
 MIBDIR=		${PREFIX}/share/libsmi/mibs
+PIBDIR=		${PREFIX}/share/libsmi/pibs
+
+DEPENDS+=	wget-[0-9]*:../../net/wget
 
 USE_LIBTOOL=	YES
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mibdir=${MIBDIR:Q}
+CONFIGURE_ARGS+=--with-pibdir=${PIBDIR:Q}
 # this might make it easier to use scotty's and ucd-snmp's mibs,
 # and local ones too
 CONFIGURE_ARGS+=--with-smipath="${MIBDIR}:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs"
 
+REPLACE_SH+=	tools/smicache.in
+REPLACE_SH+=	tools/smistrip.in
+REPLACE_SH+=	test/*.test.in
+
+TEST_TARGET=	check
+
 # Only for systems that don't have these:
 .include "../../mk/bsd.prefs.mk"
 .if ${OS_VERSION:M1.4} || ${OS_VERSION:M1.3} || ${OS_VERSION:M1.2}
 CPPFLAGS+=	-Dstrtoll=strtoq -Dstrtoull=strtouq
 .endif
 
+post-extract:
+	${RM} -f ${WRKSRC}/test/smilint-smiv2.test
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsmi/PLIST b/devel/libsmi/PLIST
index 8ee19a64ce0..161a4887cb9 100644
--- a/devel/libsmi/PLIST
+++ b/devel/libsmi/PLIST
@@ -1,30 +1,334 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:28 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/16 23:39:50 seb Exp $
+bin/smicache
+bin/smidiff
 bin/smidump
 bin/smilint
 bin/smiquery
+bin/smistrip
 include/smi.h
 lib/libsmi.la
+lib/pkgconfig/libsmi.pc
+man/man1/smicache.1
+man/man1/smidiff.1
 man/man1/smidump.1
 man/man1/smilint.1
 man/man1/smiquery.1
+man/man1/smistrip.1
 man/man3/libsmi.3
 man/man3/smi_config.3
 man/man3/smi_macro.3
 man/man3/smi_module.3
 man/man3/smi_node.3
+man/man3/smi_render.3
 man/man3/smi_type.3
-share/libsmi/mibs/IRTF-NMRG-SMING-EXTENSIONS.sming
-share/libsmi/mibs/IRTF-NMRG-SMING-TYPES.sming
-share/libsmi/mibs/IRTF-NMRG-SMING.sming
-share/libsmi/mibs/RFC-1212
-share/libsmi/mibs/RFC-1213
-share/libsmi/mibs/RFC-1215
-share/libsmi/mibs/RFC1155-SMI
-share/libsmi/mibs/RFC1158-MIB
-share/libsmi/mibs/RFC1213-MIB
-share/libsmi/mibs/RFC1271-MIB
-share/libsmi/mibs/SNMPv2-CONF
-share/libsmi/mibs/SNMPv2-SMI
-share/libsmi/mibs/SNMPv2-TC
+share/aclocal/libsmi.m4
+share/libsmi/mibs/iana/IANA-ADDRESS-FAMILY-NUMBERS-MIB
+share/libsmi/mibs/iana/IANA-CHARSET-MIB
+share/libsmi/mibs/iana/IANA-FINISHER-MIB
+share/libsmi/mibs/iana/IANA-LANGUAGE-MIB
+share/libsmi/mibs/iana/IANA-MALLOC-MIB
+share/libsmi/mibs/iana/IANA-PRINTER-MIB
+share/libsmi/mibs/iana/IANA-RTPROTO-MIB
+share/libsmi/mibs/iana/IANATn3270eTC-MIB
+share/libsmi/mibs/iana/IANAifType-MIB
+share/libsmi/mibs/ietf/ACCOUNTING-CONTROL-MIB
+share/libsmi/mibs/ietf/ADSL-LINE-EXT-MIB
+share/libsmi/mibs/ietf/ADSL-LINE-MIB
+share/libsmi/mibs/ietf/ADSL-TC-MIB
+share/libsmi/mibs/ietf/AGENTX-MIB
+share/libsmi/mibs/ietf/AGGREGATE-MIB
+share/libsmi/mibs/ietf/ALARM-MIB
+share/libsmi/mibs/ietf/APM-MIB
+share/libsmi/mibs/ietf/APPC-MIB
+share/libsmi/mibs/ietf/APPLETALK-MIB
+share/libsmi/mibs/ietf/APPLICATION-MIB
+share/libsmi/mibs/ietf/APPN-DLUR-MIB
+share/libsmi/mibs/ietf/APPN-MIB
+share/libsmi/mibs/ietf/APPN-TRAP-MIB
+share/libsmi/mibs/ietf/APS-MIB
+share/libsmi/mibs/ietf/ARC-MIB
+share/libsmi/mibs/ietf/ATM-ACCOUNTING-INFORMATION-MIB
+share/libsmi/mibs/ietf/ATM-MIB
+share/libsmi/mibs/ietf/ATM-TC-MIB
+share/libsmi/mibs/ietf/ATM2-MIB
+share/libsmi/mibs/ietf/BGP4-MIB
+share/libsmi/mibs/ietf/BLDG-HVAC-MIB
+share/libsmi/mibs/ietf/BRIDGE-MIB
+share/libsmi/mibs/ietf/CHARACTER-MIB
+share/libsmi/mibs/ietf/CIRCUIT-IF-MIB
+share/libsmi/mibs/ietf/CLNS-MIB
+share/libsmi/mibs/ietf/COFFEE-POT-MIB
+share/libsmi/mibs/ietf/COPS-CLIENT-MIB
+share/libsmi/mibs/ietf/DECNET-PHIV-MIB
+share/libsmi/mibs/ietf/DIAL-CONTROL-MIB
+share/libsmi/mibs/ietf/DIFFSERV-CONFIG-MIB
+share/libsmi/mibs/ietf/DIFFSERV-DSCP-TC
+share/libsmi/mibs/ietf/DIFFSERV-MIB
+share/libsmi/mibs/ietf/DIRECTORY-SERVER-MIB
+share/libsmi/mibs/ietf/DISMAN-EVENT-MIB
+share/libsmi/mibs/ietf/DISMAN-EXPRESSION-MIB
+share/libsmi/mibs/ietf/DISMAN-NSLOOKUP-MIB
+share/libsmi/mibs/ietf/DISMAN-PING-MIB
+share/libsmi/mibs/ietf/DISMAN-SCHEDULE-MIB
+share/libsmi/mibs/ietf/DISMAN-SCRIPT-MIB
+share/libsmi/mibs/ietf/DISMAN-TRACEROUTE-MIB
+share/libsmi/mibs/ietf/DLSW-MIB
+share/libsmi/mibs/ietf/DNS-RESOLVER-MIB
+share/libsmi/mibs/ietf/DNS-SERVER-MIB
+share/libsmi/mibs/ietf/DOCS-BPI-MIB
+share/libsmi/mibs/ietf/DOCS-CABLE-DEVICE-MIB
+share/libsmi/mibs/ietf/DOCS-IETF-BPI2-MIB
+share/libsmi/mibs/ietf/DOCS-IETF-QOS-MIB
+share/libsmi/mibs/ietf/DOCS-IETF-SUBMGT-MIB
+share/libsmi/mibs/ietf/DOCS-IF-MIB
+share/libsmi/mibs/ietf/DOT12-IF-MIB
+share/libsmi/mibs/ietf/DOT12-RPTR-MIB
+share/libsmi/mibs/ietf/DS0-MIB
+share/libsmi/mibs/ietf/DS0BUNDLE-MIB
+share/libsmi/mibs/ietf/DS1-MIB
+share/libsmi/mibs/ietf/DS3-MIB
+share/libsmi/mibs/ietf/DSA-MIB
+share/libsmi/mibs/ietf/DSMON-MIB
+share/libsmi/mibs/ietf/EBN-MIB
+share/libsmi/mibs/ietf/ENTITY-MIB
+share/libsmi/mibs/ietf/ENTITY-SENSOR-MIB
+share/libsmi/mibs/ietf/ENTITY-STATE-MIB
+share/libsmi/mibs/ietf/ENTITY-STATE-TC-MIB
+share/libsmi/mibs/ietf/ETHER-CHIPSET-MIB
+share/libsmi/mibs/ietf/ETHER-WIS
+share/libsmi/mibs/ietf/EtherLike-MIB
+share/libsmi/mibs/ietf/FC-MGMT-MIB
+share/libsmi/mibs/ietf/FCIP-MGMT-MIB
+share/libsmi/mibs/ietf/FDDI-SMT73-MIB
+share/libsmi/mibs/ietf/FIBRE-CHANNEL-FE-MIB
+share/libsmi/mibs/ietf/FLOW-METER-MIB
+share/libsmi/mibs/ietf/FR-ATM-PVC-SERVICE-IWF-MIB
+share/libsmi/mibs/ietf/FR-MFR-MIB
+share/libsmi/mibs/ietf/FRAME-RELAY-DTE-MIB
+share/libsmi/mibs/ietf/FRNETSERV-MIB
+share/libsmi/mibs/ietf/FRSLD-MIB
+share/libsmi/mibs/ietf/Finisher-MIB
+share/libsmi/mibs/ietf/GSMP-MIB
+share/libsmi/mibs/ietf/HC-ALARM-MIB
+share/libsmi/mibs/ietf/HC-PerfHist-TC-MIB
+share/libsmi/mibs/ietf/HC-RMON-MIB
+share/libsmi/mibs/ietf/HCNUM-TC
+share/libsmi/mibs/ietf/HDSL2-SHDSL-LINE-MIB
+share/libsmi/mibs/ietf/HOST-RESOURCES-MIB
+share/libsmi/mibs/ietf/HOST-RESOURCES-TYPES
+share/libsmi/mibs/ietf/HPR-IP-MIB
+share/libsmi/mibs/ietf/HPR-MIB
+share/libsmi/mibs/ietf/IANA-ITU-ALARM-TC-MIB
+share/libsmi/mibs/ietf/IF-INVERTED-STACK-MIB
+share/libsmi/mibs/ietf/IF-MIB
+share/libsmi/mibs/ietf/IFCP-MGMT-MIB
+share/libsmi/mibs/ietf/IGMP-STD-MIB
+share/libsmi/mibs/ietf/INET-ADDRESS-MIB
+share/libsmi/mibs/ietf/INTEGRATED-SERVICES-GUARANTEED-MIB
+share/libsmi/mibs/ietf/INTEGRATED-SERVICES-MIB
+share/libsmi/mibs/ietf/INTERFACETOPN-MIB
+share/libsmi/mibs/ietf/IP-FORWARD-MIB
+share/libsmi/mibs/ietf/IP-MIB
+share/libsmi/mibs/ietf/IPATM-IPMC-MIB
+share/libsmi/mibs/ietf/IPMROUTE-STD-MIB
+share/libsmi/mibs/ietf/IPOA-MIB
+share/libsmi/mibs/ietf/IPV6-FLOW-LABEL-MIB
+share/libsmi/mibs/ietf/IPV6-ICMP-MIB
+share/libsmi/mibs/ietf/IPV6-MIB
+share/libsmi/mibs/ietf/IPV6-MLD-MIB
+share/libsmi/mibs/ietf/IPV6-TC
+share/libsmi/mibs/ietf/IPV6-TCP-MIB
+share/libsmi/mibs/ietf/IPV6-UDP-MIB
+share/libsmi/mibs/ietf/ISDN-MIB
+share/libsmi/mibs/ietf/ISIS-MIB
+share/libsmi/mibs/ietf/ITU-ALARM-MIB
+share/libsmi/mibs/ietf/ITU-ALARM-TC-MIB
+share/libsmi/mibs/ietf/Job-Monitoring-MIB
+share/libsmi/mibs/ietf/L2TP-MIB
+share/libsmi/mibs/ietf/LMP-MIB
+share/libsmi/mibs/ietf/MALLOC-MIB
+share/libsmi/mibs/ietf/MAU-MIB
+share/libsmi/mibs/ietf/MIOX25-MIB
+share/libsmi/mibs/ietf/MIP-MIB
+share/libsmi/mibs/ietf/MOBILEIPV6-MIB
+share/libsmi/mibs/ietf/MPLS-FTN-STD-MIB
+share/libsmi/mibs/ietf/MPLS-L3VPN-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LC-ATM-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LC-FR-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LDP-ATM-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LDP-FRAME-RELAY-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LDP-GENERIC-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LDP-STD-MIB
+share/libsmi/mibs/ietf/MPLS-LSR-STD-MIB
+share/libsmi/mibs/ietf/MPLS-TC-STD-MIB
+share/libsmi/mibs/ietf/MPLS-TE-STD-MIB
+share/libsmi/mibs/ietf/MTA-MIB
+share/libsmi/mibs/ietf/Modem-MIB
+share/libsmi/mibs/ietf/NAT-MIB
+share/libsmi/mibs/ietf/NETWORK-SERVICES-MIB
+share/libsmi/mibs/ietf/NHRP-MIB
+share/libsmi/mibs/ietf/NOTIFICATION-LOG-MIB
+share/libsmi/mibs/ietf/OPT-IF-MIB
+share/libsmi/mibs/ietf/OSPF-MIB
+share/libsmi/mibs/ietf/OSPF-TRAP-MIB
+share/libsmi/mibs/ietf/P-BRIDGE-MIB
+share/libsmi/mibs/ietf/PARALLEL-MIB
+share/libsmi/mibs/ietf/PIM-MIB
+share/libsmi/mibs/ietf/PINT-MIB
+share/libsmi/mibs/ietf/POLICY-BASED-MANAGEMENT-MIB
+share/libsmi/mibs/ietf/POWER-ETHERNET-MIB
+share/libsmi/mibs/ietf/PPP-BRIDGE-NCP-MIB
+share/libsmi/mibs/ietf/PPP-IP-NCP-MIB
+share/libsmi/mibs/ietf/PPP-LCP-MIB
+share/libsmi/mibs/ietf/PPP-SEC-MIB
+share/libsmi/mibs/ietf/PTOPO-MIB
+share/libsmi/mibs/ietf/PerfHist-TC-MIB
+share/libsmi/mibs/ietf/Printer-MIB
+share/libsmi/mibs/ietf/Q-BRIDGE-MIB
+share/libsmi/mibs/ietf/RADIUS-ACC-CLIENT-MIB
+share/libsmi/mibs/ietf/RADIUS-ACC-SERVER-MIB
+share/libsmi/mibs/ietf/RADIUS-AUTH-CLIENT-MIB
+share/libsmi/mibs/ietf/RADIUS-AUTH-SERVER-MIB
+share/libsmi/mibs/ietf/RDBMS-MIB
+share/libsmi/mibs/ietf/RFC-1212
+share/libsmi/mibs/ietf/RFC-1215
+share/libsmi/mibs/ietf/RFC1065-SMI
+share/libsmi/mibs/ietf/RFC1155-SMI
+share/libsmi/mibs/ietf/RFC1158-MIB
+share/libsmi/mibs/ietf/RFC1213-MIB
+share/libsmi/mibs/ietf/RFC1269-MIB
+share/libsmi/mibs/ietf/RFC1271-MIB
+share/libsmi/mibs/ietf/RFC1285-MIB
+share/libsmi/mibs/ietf/RFC1316-MIB
+share/libsmi/mibs/ietf/RFC1381-MIB
+share/libsmi/mibs/ietf/RFC1382-MIB
+share/libsmi/mibs/ietf/RFC1414-MIB
+share/libsmi/mibs/ietf/RIPv2-MIB
+share/libsmi/mibs/ietf/RMON-MIB
+share/libsmi/mibs/ietf/RMON2-MIB
+share/libsmi/mibs/ietf/ROHC-MIB
+share/libsmi/mibs/ietf/ROHC-RTP-MIB
+share/libsmi/mibs/ietf/ROHC-UNCOMPRESSED-MIB
+share/libsmi/mibs/ietf/RS-232-MIB
+share/libsmi/mibs/ietf/RSTP-MIB
+share/libsmi/mibs/ietf/RSVP-MIB
+share/libsmi/mibs/ietf/RTP-MIB
+share/libsmi/mibs/ietf/SCSI-MIB
+share/libsmi/mibs/ietf/SCTP-MIB
+share/libsmi/mibs/ietf/SFLOW-MIB
+share/libsmi/mibs/ietf/SIP-MIB
+share/libsmi/mibs/ietf/SLAPM-MIB
+share/libsmi/mibs/ietf/SMON-MIB
+share/libsmi/mibs/ietf/SNA-NAU-MIB
+share/libsmi/mibs/ietf/SNA-SDLC-MIB
+share/libsmi/mibs/ietf/SNMP-COMMUNITY-MIB
+share/libsmi/mibs/ietf/SNMP-FRAMEWORK-MIB
+share/libsmi/mibs/ietf/SNMP-MPD-MIB
+share/libsmi/mibs/ietf/SNMP-NOTIFICATION-MIB
+share/libsmi/mibs/ietf/SNMP-PROXY-MIB
+share/libsmi/mibs/ietf/SNMP-REPEATER-MIB
+share/libsmi/mibs/ietf/SNMP-TARGET-MIB
+share/libsmi/mibs/ietf/SNMP-USER-BASED-SM-MIB
+share/libsmi/mibs/ietf/SNMP-USM-DH-OBJECTS-MIB
+share/libsmi/mibs/ietf/SNMP-VIEW-BASED-ACM-MIB
+share/libsmi/mibs/ietf/SNMPv2-CONF
+share/libsmi/mibs/ietf/SNMPv2-MIB
+share/libsmi/mibs/ietf/SNMPv2-SMI
+share/libsmi/mibs/ietf/SNMPv2-TC
+share/libsmi/mibs/ietf/SNMPv2-TM
+share/libsmi/mibs/ietf/SNMPv2-USEC-MIB
+share/libsmi/mibs/ietf/SONET-MIB
+share/libsmi/mibs/ietf/SOURCE-ROUTING-MIB
+share/libsmi/mibs/ietf/SSPM-MIB
+share/libsmi/mibs/ietf/SYSAPPL-MIB
+share/libsmi/mibs/ietf/T11-FC-FABRIC-ADDR-MGR-MIB
+share/libsmi/mibs/ietf/T11-FC-NAME-SERVER-MIB
+share/libsmi/mibs/ietf/T11-TC-MIB
+share/libsmi/mibs/ietf/TCP-MIB
+share/libsmi/mibs/ietf/TCPIPX-MIB
+share/libsmi/mibs/ietf/TE-LINK-STD-MIB
+share/libsmi/mibs/ietf/TE-MIB
+share/libsmi/mibs/ietf/TIME-AGGREGATE-MIB
+share/libsmi/mibs/ietf/TN3270E-MIB
+share/libsmi/mibs/ietf/TN3270E-RT-MIB
+share/libsmi/mibs/ietf/TOKEN-RING-RMON-MIB
+share/libsmi/mibs/ietf/TOKENRING-MIB
+share/libsmi/mibs/ietf/TOKENRING-STATION-SR-MIB
+share/libsmi/mibs/ietf/TRANSPORT-ADDRESS-MIB
+share/libsmi/mibs/ietf/TRIP-MIB
+share/libsmi/mibs/ietf/TRIP-TC-MIB
+share/libsmi/mibs/ietf/TUNNEL-MIB
+share/libsmi/mibs/ietf/UDP-MIB
+share/libsmi/mibs/ietf/UPS-MIB
+share/libsmi/mibs/ietf/VDSL-LINE-EXT-MCM-MIB
+share/libsmi/mibs/ietf/VDSL-LINE-EXT-SCM-MIB
+share/libsmi/mibs/ietf/VDSL-LINE-MIB
+share/libsmi/mibs/ietf/VPN-TC-STD-MIB
+share/libsmi/mibs/ietf/VRRP-MIB
+share/libsmi/mibs/ietf/WWW-MIB
+share/libsmi/mibs/irtf/IRTF-NMRG-SMING
+share/libsmi/mibs/irtf/IRTF-NMRG-SMING-EXTENSIONS
+share/libsmi/mibs/irtf/IRTF-NMRG-SMING-TYPES
+share/libsmi/mibs/tubs/POLICY-DEVICE-AUX-MIB
+share/libsmi/mibs/tubs/POLICY-DEVICE-AUX-MIB-orig
+share/libsmi/mibs/tubs/TUBS-IBR-AGENT-CAPABILITIES
+share/libsmi/mibs/tubs/TUBS-IBR-LINUX-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-LINUX-NETFILTER-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-NFS-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-PING-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-PROC-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-TEST-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-TNM-MIB
+share/libsmi/mibs/tubs/TUBS-IBR-XEN-MIB
+share/libsmi/mibs/tubs/TUBS-SMI
+share/libsmi/pibs/ietf/COPS-PR-SPPI
+share/libsmi/pibs/ietf/COPS-PR-SPPI-TC
+share/libsmi/pibs/ietf/DIFFSERV-PIB
+share/libsmi/pibs/ietf/FRAMEWORK-FEEDBACK-PIB
+share/libsmi/pibs/ietf/FRAMEWORK-PIB
+share/libsmi/pibs/ietf/FRAMEWORK-TC-PIB
+share/libsmi/pibs/tubs/ACCESSBIND-PIB
+share/libsmi/pibs/tubs/ACCESSBIND-PIB-orig
+share/libsmi/pibs/tubs/ACCOUNTING-FRAMEWORK-PIB
+share/libsmi/pibs/tubs/ACCOUNTING-FRAMEWORK-PIB-orig
+share/libsmi/pibs/tubs/FEEDBACK-FRAMEWORK-PIB
+share/libsmi/pibs/tubs/FEEDBACK-FRAMEWORK-PIB-orig
+share/libsmi/pibs/tubs/IP-TE-PIB
+share/libsmi/pibs/tubs/IP-TE-PIB-orig
+share/libsmi/pibs/tubs/IPSEC-POLICY-PIB
+share/libsmi/pibs/tubs/IPSEC-POLICY-PIB-orig
+share/libsmi/pibs/tubs/LOAD-BALANCING-PIB
+share/libsmi/pibs/tubs/LOAD-BALANCING-PIB-orig
+share/libsmi/pibs/tubs/META-POLICY-PIB
+share/libsmi/pibs/tubs/META-POLICY-PIB-orig
+share/libsmi/pibs/tubs/MPLS-SETUP-PIB
+share/libsmi/pibs/tubs/MPLS-SETUP-PIB-orig
+share/libsmi/pibs/tubs/PARTITION-PIB
+share/libsmi/pibs/tubs/PARTITION-PIB-orig
+share/libsmi/pibs/tubs/POLICY-FRAMEWORK-PIB
+share/libsmi/pibs/tubs/POLICY-FRAMEWORK-PIB-orig
+share/libsmi/pibs/tubs/PPVPN-PIB
+share/libsmi/pibs/tubs/PPVPN-PIB-orig
+share/libsmi/pibs/tubs/QOS-POLICY-802-PIB
+share/libsmi/pibs/tubs/QOS-POLICY-802-PIB-orig
+share/libsmi/pibs/tubs/QOS-POLICY-IP-PIB
+share/libsmi/pibs/tubs/QOS-POLICY-IP-PIB-orig
+share/libsmi/pibs/tubs/RSVP-PCC-PIB
+share/libsmi/pibs/tubs/RSVP-PCC-PIB-orig
+share/libsmi/pibs/tubs/SLS-NEGOTIATION-PIB
+share/libsmi/pibs/tubs/SLS-NEGOTIATION-PIB-orig
+share/libsmi/pibs/tubs/UMTS-PIB
+share/libsmi/pibs/tubs/UMTS-PIB-orig
+@dirrm share/libsmi/pibs/tubs
+@exec ${MKDIR} %D/share/libsmi/pibs/site
+@dirrm share/libsmi/pibs/site
+@dirrm share/libsmi/pibs/ietf
+@dirrm share/libsmi/pibs
+@dirrm share/libsmi/mibs/tubs
+@exec ${MKDIR} %D/share/libsmi/mibs/site
+@dirrm share/libsmi/mibs/site
+@dirrm share/libsmi/mibs/irtf
+@dirrm share/libsmi/mibs/ietf
+@dirrm share/libsmi/mibs/iana
 @dirrm share/libsmi/mibs
 @dirrm share/libsmi
diff --git a/devel/libsmi/distinfo b/devel/libsmi/distinfo
index 0b6680b161b..457609ce67c 100644
--- a/devel/libsmi/distinfo
+++ b/devel/libsmi/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:19 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/10/16 23:39:50 seb Exp $
 
-SHA1 (libsmi-0.1.6.tar.gz) = 3be4a0b6be42145b9f51d1a0ad0b6cc6cedcdccd
-RMD160 (libsmi-0.1.6.tar.gz) = 827f0444999b7e78d5a97bdf050a2a56baf25d4b
-Size (libsmi-0.1.6.tar.gz) = 443504 bytes
+SHA1 (libsmi-0.4.5.tar.gz) = e52da95ff8d5f5497f9bdd5e7205dc9c2d1f33aa
+RMD160 (libsmi-0.4.5.tar.gz) = 4ba83e0a2196a555cb54d7b651ce1d26f3c247dc
+Size (libsmi-0.4.5.tar.gz) = 3439904 bytes
+SHA1 (patch-aa) = 0daa795492391e52cce09db2334872838ea654f3
+SHA1 (patch-ab) = 2ebd512bfa4e284eaf892a5437f0bf12ad3ff36c
+SHA1 (patch-ac) = e10b25773c6df404b74a2cd28bac06cbd6183983
+SHA1 (patch-ad) = ca9376deac37b3c894f8d34e4b73473af49c7790
diff --git a/devel/libsmi/patches/patch-aa b/devel/libsmi/patches/patch-aa
new file mode 100644
index 00000000000..7e174ab6149
--- /dev/null
+++ b/devel/libsmi/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/10/16 23:39:50 seb Exp $
+
+--- test/smilint-smiv2.test.in.orig	2005-11-25 09:13:23.000000000 +0000
++++ test/smilint-smiv2.test.in
+@@ -48,7 +48,7 @@ cat > sync-dumps <<EOF
+ #
+ 
+ CMDPREFIX=echo
+-if [ "\$1" == "-f" ] ; then CMDPREFIX="" ; fi
++if [ "\$1" = "-f" ] ; then CMDPREFIX="" ; fi
+ 
+ EOF
+ chmod a+x sync-dumps
diff --git a/devel/libsmi/patches/patch-ab b/devel/libsmi/patches/patch-ab
new file mode 100644
index 00000000000..819638617d9
--- /dev/null
+++ b/devel/libsmi/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1 2006/10/16 23:39:50 seb Exp $
+
+--- test/parser.test.in.orig	2005-11-25 09:13:23.000000000 +0000
++++ test/parser.test.in
+@@ -1,4 +1,4 @@
+-#!@BASH@
++#!/bin/sh
+ 
+ rm -rf parser.out
+ mkdir parser.out
diff --git a/devel/libsmi/patches/patch-ac b/devel/libsmi/patches/patch-ac
new file mode 100644
index 00000000000..7cadca097b7
--- /dev/null
+++ b/devel/libsmi/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2006/10/16 23:39:50 seb Exp $
+
+--- tools/smicache.in.orig	2005-11-25 09:13:59.000000000 +0000
++++ tools/smicache.in
+@@ -1,4 +1,4 @@
+-#!@SH@
++#!/bin/sh
+ #
+ # smicache --
+ #
diff --git a/devel/libsmi/patches/patch-ad b/devel/libsmi/patches/patch-ad
new file mode 100644
index 00000000000..0aa4633f4c4
--- /dev/null
+++ b/devel/libsmi/patches/patch-ad
@@ -0,0 +1,10 @@
+$NetBSD: patch-ad,v 1.1 2006/10/16 23:39:50 seb Exp $
+
+--- tools/smistrip.in.orig	2006-04-07 07:03:01.000000000 +0000
++++ tools/smistrip.in
+@@ -1,4 +1,4 @@
+-#!@SH@
++#!/bin/sh
+ #
+ # smistrip --
+ #