- Update to 0.9.5

PR:		ports/114158
Submitted by:	James E. Flemer <jflemer@alum.rpi.edu> (maintainer)

12 files changed, 138 insertions, 121 deletions

diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 1740584..8c37cc2 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	docsis
-PORTVERSION=	0.8.2
-PORTREVISION=	5
+PORTVERSION=	0.9.5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-RELEASE
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jflemer@alum.rpi.edu
 COMMENT=	DOCSIS(tm) binary configuration file encoder/decoder
 
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 
+GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_BISON=	yes
 
-ALL_TARGET=	docsis
+PLIST_SUB=	MIBS=share/snmp/mibs
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/docsis ${PREFIX}/bin
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+post-patch:
+	@${REINPLACE_CMD} -e 's|^htmldocdir =.*|htmldocdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's|^examplesdir =.*|examplesdir = ${EXAMPLESDIR}|' ${WRKSRC}/examples/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/docsis/distinfo b/net-mgmt/docsis/distinfo
index 22601ec..f69a3b0 100644
--- a/net-mgmt/docsis/distinfo
+++ b/net-mgmt/docsis/distinfo
@@ -1,3 +1,3 @@
-MD5 (docsis-0.8.2-RELEASE.tgz) = 595fbed678834bc9f60bc6d5bbe847d8
-SHA256 (docsis-0.8.2-RELEASE.tgz) = 4cfd9b22fc76db524ecb396556c28e7951065aa0962808e3402c92932099a807
-SIZE (docsis-0.8.2-RELEASE.tgz) = 49176
+MD5 (docsis-0.9.5.tar.gz) = 2b89cf254a5eb07b0ee8b6331238ea96
+SHA256 (docsis-0.9.5.tar.gz) = 4256fc4e60f8a336ddbeff6ff3fad0debf269239fbcc45fbf36ff5728125b11e
+SIZE (docsis-0.9.5.tar.gz) = 509674
diff --git a/net-mgmt/docsis/files/patch-Makefile b/net-mgmt/docsis/files/patch-Makefile
deleted file mode 100644
index 986b748..0000000
--- a/net-mgmt/docsis/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.orig	Tue Feb 11 15:36:39 2003
-+++ Makefile	Thu Feb 27 19:16:03 2003
-@@ -1,6 +1,6 @@
- # Makefile for "docsis" program. 
- #
--CC 	=  gcc 
-+#CC 	=  gcc 
- DEFS	= -DYY_NO_UNPUT  -DDEBUG
- #
- # We assume net-snmp is installed in /opt/net-snmp. If not, replace with 
-@@ -8,8 +8,8 @@
- # -lnetsnmp is NET-SNMP
- # -lcrypto is OpenSSL. 
- # 
--CFLAGS	= -g -Wall -I/opt/net-snmp/include
--LIBS  	= -L/opt/net-snmp/lib -lnetsnmp -lcrypto -lnsl -lfl -lm
-+CFLAGS	+= -I${PREFIX}/include -I${OPENSSLINC}
-+LIBS  	= -L${PREFIX}/lib -L${OPENSSLLIB} -lnetsnmp -lcrypto -lfl -lm
- 
- # If you installed NET-SNMP in /usr/local, uncomment the following two lines:
- # CFLAGS	= -g -Wall -I/usr/local/include
diff --git a/net-mgmt/docsis/files/patch-configure b/net-mgmt/docsis/files/patch-configure
new file mode 100644
index 0000000..e911629
--- /dev/null
+++ b/net-mgmt/docsis/files/patch-configure
@@ -0,0 +1,13 @@
+--- configure.orig	Wed Jul  6 01:53:59 2005
++++ configure	Wed Jul 11 00:09:11 2007
+@@ -19510,8 +19510,8 @@
+    { (exit 1); exit 1; }; }
+ else
+   ac_m4_vers=`$M4 --version 2>/dev/null | head -1` ;
+-  ac_is_gnu_m4=`echo $ac_m4_vers | cut -d' ' -f1`;
+-  if test "x$ac_is_gnu_m4" = "xGNU"; then
++  ac_is_gnu_m4=`echo $ac_m4_vers | grep GNU`;
++  if test "x$ac_is_gnu_m4" != "x"; then
+ 	echo "$as_me:$LINENO: result:    found $ac_m4_vers at $M4 " >&5
+ echo "${ECHO_T}   found $ac_m4_vers at $M4 " >&6
+   else
diff --git a/net-mgmt/docsis/files/patch-docsis.c b/net-mgmt/docsis/files/patch-docsis.c
new file mode 100644
index 0000000..bb5481d
--- /dev/null
+++ b/net-mgmt/docsis/files/patch-docsis.c
@@ -0,0 +1,31 @@
+# $FreeBSD$
+--- src/docsis.c.orig	Mon Aug 15 14:19:04 2005
++++ src/docsis.c	Sun Jun 10 18:14:07 2007
+@@ -20,10 +20,6 @@
+  *  DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com
+  */
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif /* HAVE_CONFIG_H  */
+-
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -35,6 +31,16 @@
+ #include <net-snmp/config_api.h>
+ #include <net-snmp/output_api.h>
+ #include <net-snmp/mib_api.h>
++
++#undef PACKAGE_BUGREPORT
++#undef PACKAGE_NAME
++#undef PACKAGE_STRING
++#undef PACKAGE_TARNAME
++#undef PACKAGE_VERSION
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H  */
+ 
+ #include "docsis.h"
+ #include "docsis_symtable.h"
diff --git a/net-mgmt/docsis/files/patch-docsis_decode.c b/net-mgmt/docsis/files/patch-docsis_decode.c
index ea2184c..95adee5 100644
--- a/net-mgmt/docsis/files/patch-docsis_decode.c
+++ b/net-mgmt/docsis/files/patch-docsis_decode.c
@@ -1,11 +1,11 @@
---- docsis_decode.c.orig	Fri Jul  5 14:54:11 2002
-+++ docsis_decode.c	Fri Jul  5 14:55:31 2002
-@@ -47,7 +47,7 @@
-   memset( &helper, 0,sizeof(unsigned int));
-   memcpy( &helper, tlvbuf+2, sizeof(unsigned int));
+# $FreeBSD$
+--- src/docsis_decode.c.orig	Mon Aug  1 07:30:42 2005
++++ src/docsis_decode.c	Sun Jun 10 18:24:22 2007
+@@ -22,6 +22,7 @@
  
--  printf ( "%s %u;\n", sym->sym_ident, ntohl(helper));
-+  printf ( "%s %u;\n", sym->sym_ident, (unsigned int)ntohl(helper));
- }
+ #include <math.h>
+ #include <ctype.h>
++#include <string.h>
  
- void decode_ushort (unsigned char *tlvbuf, symbol_type *sym)
+ /* #include "docsis.h" */
+ #include "docsis_decode.h"
diff --git a/net-mgmt/docsis/files/patch-docsis_main.c b/net-mgmt/docsis/files/patch-docsis_main.c
deleted file mode 100644
index 85ff4b3..0000000
--- a/net-mgmt/docsis/files/patch-docsis_main.c
+++ /dev/null
@@ -1,18 +0,0 @@
-

-$FreeBSD$

-

---- docsis_main.c.orig	Thu Feb 13 17:21:40 2003

-+++ docsis_main.c	Sat Apr  5 10:18:46 2003

-@@ -180,10 +180,10 @@

-    	if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID,  NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID)) {

-         	netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_PRINT_UCD_STYLE_OID);

-    	}   */

--

-+/*

-    	if (! netsnmp_ds_get_boolean (NETSNMP_DS_LIBRARY_ID,  NETSNMP_DS_LIB_DONT_PRINT_UNITS)) {

-         	netsnmp_ds_toggle_boolean(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_DONT_PRINT_UNITS);

--   	} 

-+   	} */

- 

-         netsnmp_ds_set_int(NETSNMP_DS_LIBRARY_ID, NETSNMP_DS_LIB_OID_OUTPUT_FORMAT,

-                                                       NETSNMP_OID_OUTPUT_SUFFIX); 

diff --git a/net-mgmt/docsis/files/patch-docsis_snmp.c b/net-mgmt/docsis/files/patch-docsis_snmp.c
index bbf8b1e..e8e0126 100644
--- a/net-mgmt/docsis/files/patch-docsis_snmp.c
+++ b/net-mgmt/docsis/files/patch-docsis_snmp.c
@@ -1,13 +1,12 @@
-
-$FreeBSD$
-
---- docsis_snmp.c.orig	Tue Feb 11 16:36:30 2003
-+++ docsis_snmp.c	Thu Feb 27 19:17:23 2003
-@@ -206,6 +206,7 @@
-   static char outbuf[1024];
-   char *cp;
+# $FreeBSD$
+--- src/docsis_snmp.c.orig	Wed Oct 12 07:30:20 2005
++++ src/docsis_snmp.c	Sun Jun 10 18:25:36 2007
+@@ -20,6 +20,8 @@
+  *  DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com
+  */
  
-+    badtype = 0;
-   memset (outbuf, 0, 1024);
++#include <string.h>
++
+ #include "docsis_snmp.h"
+ #include "docsis_decode.h"
  
-   vp = (struct variable_list *) malloc (sizeof (struct variable_list));
diff --git a/net-mgmt/docsis/files/patch-docsis_snmp.h b/net-mgmt/docsis/files/patch-docsis_snmp.h
new file mode 100644
index 0000000..7117790
--- /dev/null
+++ b/net-mgmt/docsis/files/patch-docsis_snmp.h
@@ -0,0 +1,23 @@
+# $FreeBSD$
+--- src/docsis_snmp.h.orig	Wed Mar 17 08:01:37 2004
++++ src/docsis_snmp.h	Sun Jun 10 18:27:16 2007
+@@ -24,11 +24,19 @@
+ #ifndef _DOCSIS_SNMP_H
+ #define _DOCSIS_SNMP_H
+ 
++#include <stdlib.h>
++
+ #include <net-snmp/net-snmp-config.h>
+ #include <net-snmp/utilities.h>
+ #include <net-snmp/config_api.h>
+ #include <net-snmp/output_api.h>
+ #include <net-snmp/mib_api.h>
++
++#undef PACKAGE_BUGREPORT
++#undef PACKAGE_NAME
++#undef PACKAGE_STRING
++#undef PACKAGE_TARNAME
++#undef PACKAGE_VERSION
+ 
+ #include "docsis.h"
+ 
diff --git a/net-mgmt/docsis/files/patch-docsis_yy.y b/net-mgmt/docsis/files/patch-docsis_yy.y
deleted file mode 100644
index b3e1614..0000000
--- a/net-mgmt/docsis/files/patch-docsis_yy.y
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- docsis_yy.y.orig	Sun Feb  9 15:35:00 2003
-+++ docsis_yy.y	Thu Feb 27 19:14:53 2003
-@@ -50,7 +50,6 @@
- %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
diff --git a/net-mgmt/docsis/files/patch-ethermac.h b/net-mgmt/docsis/files/patch-ethermac.h
deleted file mode 100644
index 2219065..0000000
--- a/net-mgmt/docsis/files/patch-ethermac.h
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- ethermac.h.orig	Wed Feb 13 14:09:52 2002
-+++ ethermac.h	Thu Feb 27 19:14:53 2003
-@@ -22,6 +22,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- int ether_aton ( const char *macstr, unsigned char *outbuf ) ;
- char * ether_ntoa ( const unsigned char *mac);
diff --git a/net-mgmt/docsis/pkg-plist b/net-mgmt/docsis/pkg-plist
index 7f8b260..3f8b144 100644
--- a/net-mgmt/docsis/pkg-plist
+++ b/net-mgmt/docsis/pkg-plist
@@ -1,22 +1,43 @@
 bin/docsis
-share/examples/docsis/docsis1.0_2class_non-rfc2669.cfg
-share/examples/docsis/docsis1.0_2class_rfc2669.cfg
-share/examples/docsis/docsis1.0_basic.cfg
-share/examples/docsis/docsis1.0_basic_bpi.cfg
-share/examples/docsis/docsis1.0_basic_upgrade.cfg
-share/examples/docsis/docsis1.0_example.cfg
-share/examples/docsis/docsis1.0_filters2_oidnum.cfg
-share/examples/docsis/docsis1.0_filters2_oidtext.cfg
-share/examples/docsis/docsis1.0_filters_NmAccess.cfg
-share/examples/docsis/docsis1.0_filters_oidnum.cfg
-share/examples/docsis/docsis1.0_filters_oidtext.cfg
-share/examples/docsis/docsis1.1_classifiers.cfg
-share/examples/docsis/docsis1.1_classifiers2.cfg
-share/examples/docsis/docsis1.1_simple.cfg
-share/examples/docsis/docsis1.1_stress_test.cfg
-share/examples/docsis/docsis20.cfg
-share/examples/docsis/docsis20_no_snmp.cfg
-share/examples/docsis/keyfile
-share/examples/docsis/packetcable_mta.cfg
-share/examples/docsis/testkey.key
-@dirrm share/examples/docsis
+%%DOCSDIR%%/config-format.html
+%%DOCSDIR%%/config-settings.html
+%%DOCSDIR%%/index.html
+%%EXAMPLESDIR%%/docsis1.0_2class_non-rfc2669.cfg
+%%EXAMPLESDIR%%/docsis1.0_2class_rfc2669.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic_bpi.cfg
+%%EXAMPLESDIR%%/docsis1.0_basic_upgrade.cfg
+%%EXAMPLESDIR%%/docsis1.0_example.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters2_oidnum.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters2_oidtext.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_NmAccess.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_oidnum.cfg
+%%EXAMPLESDIR%%/docsis1.0_filters_oidtext.cfg
+%%EXAMPLESDIR%%/docsis1.1_classifiers.cfg
+%%EXAMPLESDIR%%/docsis1.1_classifiers2.cfg
+%%EXAMPLESDIR%%/docsis1.1_oss_v3coex.cfg
+%%EXAMPLESDIR%%/docsis1.1_simple.cfg
+%%EXAMPLESDIR%%/docsis1.1_stress_test.cfg
+%%EXAMPLESDIR%%/docsis20.cfg
+%%EXAMPLESDIR%%/docsis20_no_snmp.cfg
+%%EXAMPLESDIR%%/docsis20_stresstest.cfg
+%%EXAMPLESDIR%%/keyfile
+%%EXAMPLESDIR%%/packetcable_mta.cfg
+%%EXAMPLESDIR%%/readme.txt
+%%EXAMPLESDIR%%/testkey.key
+%%MIBS%%/CLAB-DEF-MIB.txt
+%%MIBS%%/DOCS-BPI-MIB.mib
+%%MIBS%%/DOCS-BPI2-MIB.mib
+%%MIBS%%/DOCS-CABLE-DEVICE-MIB.mib
+%%MIBS%%/DOCS-CABLE-DEVICE-TRAP-MIB.mib
+%%MIBS%%/DOCS-IF-EXT-MIB.mib
+%%MIBS%%/DOCS-IF-MIB.mib
+%%MIBS%%/DOCS-QOS-MIB.mib
+%%MIBS%%/DOCS-SUBMGT-MIB.mib
+%%MIBS%%/IGMP-STD-MIB.mib
+%%MIBS%%/PKTC-EVENT-MIB.mib
+%%MIBS%%/PKTC-MTA-MIB.mib
+%%MIBS%%/PKTC-SIG-MIB.mib
+@dirrmtry %%MIBS%%
+@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%