Updated docsis to 0.9.0.

Changes since 0.7.5:

0.9.0			- fix range of MaxCPE (1-254)
			- add support for Win32 with Cygwin
			- fix ReAuthTimeout upper limit (30)
			- add script to generate HTML help from
			  the symbol table
			- add NSIS packaging script for Win32
			- added configure script, re-organized stuff
			- source code clean-up

0.8.8  02/07/03		- fix handling of label-hinted suffix to OIDs
evvolve			- check for string length overflow while parsing
			- added mibs to distribution
			- change SNMPv3* labels to SNMP*
			- add Docsis20Enable configuration setting
			- complete support for SnmpV3NotificationReceiver

Many thanks to Rudy Zijlstra for pointing out a few bugs.

0.8.7  20/6/03		- fix bug with encoding HexStrings with trailing zeros
Ronald Rosenfeld	- fix double declaration of symbol T_MAC
			- add support for negative integers
evvolve			- change -lcrypto to -lcrypt to make default
			  more "mainstream".
			- add support for ASN_GAUGE encodings
			- fix VendorSpecific decoding
			- print label as comment for enums

Many thanks to Ronald Rosenfeld for sending in three patches.

0.8.6  31/05/03		- add support for SNMPv3Kickstart and
evvolve		  	  partial support for SNMPv3 Notification Receiver
			- fix compilation warnings
			- add support for PHS Rule (untested)
			- cleanup indexes in docsis_symtable.h
			- add regression test script

0.8.4  10/05/03		- fixed SNMP handling ... hopefully for the last time :)
evvolve			- fixed Solaris support
ctrl			- added support for VendorSpecific TLVs


0.8.2  30/01/03		- Integrated fixes from Adrian Kwong and Cornel.
evvolve			- Updated OID format to accept "-" and "_" in labels
ctrl			- We can now encode decoded files directly !
akwong			  (thanks to help from Adrian Kwong)
			- MIB output format changed.
			- NET-SNMP 5.x support.
			- Dropped support for ucd-snmp.
			- Made SNMP decoding smarter - i.e. output OID
			  suffix only; but switch to full-OID output
			  if MIBs are not installed.
			- Hacked support for encoding MTA configuration files.
			- Added support for Vendor Specific info.
			- Worked around string formatting issues in NET-SNMP.
			- Added indent functionality.

Update provided by Simas Mockevicius (the new maintainer) in private
mail, with some changes by me.

5 files changed, 57 insertions, 76 deletions

diff --git a/net/docsis/Makefile b/net/docsis/Makefile
index 06e6eb3d4f2..4b78ceada3c 100644
--- a/net/docsis/Makefile
+++ b/net/docsis/Makefile
@@ -1,30 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2003/11/12 03:39:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/16 22:52:37 grant Exp $
 #
 
-DISTNAME=	docsis-0.7.5-RELEASE
-PKGNAME=	${DISTNAME:S/-RELEASE//}
-PKGREVISION=	1
-CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docsis/}
-EXTRACT_SUFX=	.tgz
+DISTNAME=		docsis-0.9.0
+CATEGORIES=		net
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=docsis/}
 
-MAINTAINER=	grant@NetBSD.org
-HOMEPAGE=	http://docsis.sourceforge.net/
-COMMENT=	Utility for manipulating DOCSIS-compliant cable modems
+MAINTAINER=		symka@NetBSD.vejas.lt
+HOMEPAGE=		http://docsis.sourceforge.net/
+COMMENT=		Utility for manipulating DOCSIS-compliant cable modems
 
-BUILD_DEPENDS+=	bison>=1.25:../../devel/bison
-USE_BUILDLINK2=	# defined
+BUILD_DEPENDS+=		bison>=1.25:../../devel/bison
 
-ALL_TARGET=	docsis
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_GNU_TOOLS+=		m4
 
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/docsis ${PREFIX}/bin
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/docsis
-		${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/docsis
-		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/docsis
-		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/docsis
-		cd ${WRKSRC}/examples && ${PAX} -rw . ${PREFIX}/share/examples/docsis
-
-.include "../../security/openssl/buildlink2.mk"
-.include "../../net/ucd-snmp/buildlink2.mk"
+.include "../../net/net-snmp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/docsis/PLIST b/net/docsis/PLIST
index 97fa91082f3..57320c3e960 100644
--- a/net/docsis/PLIST
+++ b/net/docsis/PLIST
@@ -1,22 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/25 04:12:52 grant Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/16 22:52:37 grant Exp $
 bin/docsis
-share/doc/docsis/CHANGES
-share/doc/docsis/README
-share/examples/docsis/docsis20.cfg
-share/examples/docsis/docsis20_no_snmp.cfg
-share/examples/docsis/example-non-rfc2669.cfg
-share/examples/docsis/example.cfg
-share/examples/docsis/hoof-lab.cfg
-share/examples/docsis/hoof-lab1.cfg
-share/examples/docsis/keyfile
-share/examples/docsis/modem-b.cfg
-share/examples/docsis/modem-oid.cfg
-share/examples/docsis/modem-text.cfg
-share/examples/docsis/modem.cfg
-share/examples/docsis/modem1.cfg
-share/examples/docsis/rolab-oid.cfg
-share/examples/docsis/rolab-text.cfg
-share/examples/docsis/snmp20.cfg
-share/examples/docsis/testkey.key
-@dirrm share/examples/docsis
-@dirrm share/doc/docsis
+share/docsis/config-format.html
+share/docsis/config-settings.html
+share/docsis/examples/docsis1.0_2class_non-rfc2669.cfg
+share/docsis/examples/docsis1.0_2class_rfc2669.cfg
+share/docsis/examples/docsis1.0_basic.cfg
+share/docsis/examples/docsis1.0_basic_bpi.cfg
+share/docsis/examples/docsis1.0_basic_upgrade.cfg
+share/docsis/examples/docsis1.0_example.cfg
+share/docsis/examples/docsis1.0_filters2_oidnum.cfg
+share/docsis/examples/docsis1.0_filters2_oidtext.cfg
+share/docsis/examples/docsis1.0_filters_NmAccess.cfg
+share/docsis/examples/docsis1.0_filters_oidnum.cfg
+share/docsis/examples/docsis1.0_filters_oidtext.cfg
+share/docsis/examples/docsis1.1_classifiers.cfg
+share/docsis/examples/docsis1.1_classifiers2.cfg
+share/docsis/examples/docsis1.1_oss_v3coex.cfg
+share/docsis/examples/docsis1.1_simple.cfg
+share/docsis/examples/docsis1.1_stress_test.cfg
+share/docsis/examples/docsis20.cfg
+share/docsis/examples/docsis20_no_snmp.cfg
+share/docsis/examples/docsis20_stresstest.cfg
+share/docsis/examples/keyfile
+share/docsis/examples/packetcable_mta.cfg
+share/docsis/examples/readme.txt
+share/docsis/examples/testkey.key
+share/docsis/index.html
+share/snmp/mibs/CLAB-DEF-MIB.txt
+share/snmp/mibs/DOCS-BPI-MIB.mib
+share/snmp/mibs/DOCS-BPI2-MIB.mib
+share/snmp/mibs/DOCS-CABLE-DEVICE-MIB.mib
+share/snmp/mibs/DOCS-CABLE-DEVICE-TRAP-MIB.mib
+share/snmp/mibs/DOCS-IF-EXT-MIB.mib
+share/snmp/mibs/DOCS-IF-MIB.mib
+share/snmp/mibs/DOCS-QOS-MIB.mib
+share/snmp/mibs/DOCS-SUBMGT-MIB.mib
+share/snmp/mibs/IGMP-STD-MIB.mib
+share/snmp/mibs/PKTC-EVENT-MIB.mib
+share/snmp/mibs/PKTC-MTA-MIB.mib
+share/snmp/mibs/PKTC-SIG-MIB.mib
+@dirrm share/docsis/examples
+@dirrm share/docsis
diff --git a/net/docsis/distinfo b/net/docsis/distinfo
index 4dfd5e85554..22b5e7688ed 100644
--- a/net/docsis/distinfo
+++ b/net/docsis/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/01/13 12:49:33 grant Exp $
+$NetBSD: distinfo,v 1.3 2003/12/16 22:52:37 grant Exp $
 
-SHA1 (docsis-0.7.5-RELEASE.tgz) = 2bf8ffd0af0dd6dcebaf2f657cad2196c05b3ac6
-Size (docsis-0.7.5-RELEASE.tgz) = 42517 bytes
-SHA1 (patch-aa) = 5e0fec5f4d12e467d57b1dd2fff0a1a690ad4753
-SHA1 (patch-ab) = e8bd55d1318cf591ce70ec955cb3a740e24c59ae
+SHA1 (docsis-0.9.0.tar.gz) = 618c9b0867fae6231e946b304a9c8e1561a09718
+Size (docsis-0.9.0.tar.gz) = 410896 bytes
diff --git a/net/docsis/patches/patch-aa b/net/docsis/patches/patch-aa
deleted file mode 100644
index 56cd3d3ab12..00000000000
--- a/net/docsis/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/25 04:12:53 grant Exp $
-
---- Makefile.orig	Tue Jun 25 23:29:11 2002
-+++ Makefile	Tue Jun 25 23:31:55 2002
-@@ -7,8 +7,8 @@
- # -lcrypto is OpenSSL. 
- # 
- # CFLAGS	= -g -Wall -I/usr/local/include
--CFLAGS	= -g -Wall -I/opt/ucd-snmp-4.2/include
--LIBS  	= -L/opt/ucd-snmp-4.2/lib -lsnmp -lcrypto -lnsl -lfl -lm
-+CFLAGS	= -g -Wall ${CPPFLAGS}
-+LIBS  	= ${LDFLAGS} -lsnmp -lcrypto -lfl -lm
- 
- docsis: Makefile docsis_decode.o docsis_yy.o docsis_main.o md5.o hmac_md5.o docsis_snmp.o ethermac.h ethermac.o version.h docsis_encode.o 
- 	$(CC) $(CFLAGS) $(DEFS) -g -o docsis docsis_main.o docsis_encode.o docsis_decode.o docsis_yy.o md5.o hmac_md5.o docsis_snmp.o ethermac.o $(LIBS)
diff --git a/net/docsis/patches/patch-ab b/net/docsis/patches/patch-ab
deleted file mode 100644
index a846a6070f7..00000000000
--- a/net/docsis/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/13 12:49:35 grant Exp $
-
---- docsis_yy.y.orig	Thu Feb 14 06:09:52 2002
-+++ docsis_yy.y
-@@ -51,7 +51,6 @@ extern symbol_type *global_symtable;
- %token <strval>  T_ETHERMASK
- %token <strval>  T_LABEL_OID
- %token <strval>  T_IP
--%token <strval>  T_MAC
- %token <strval>  T_MAIN
- %token <strval>  T_STRING
- %token <strval>  T_HEX_STRING