diff options
author | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-05-07 01:40:46 +0000 |
---|---|---|
committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-05-07 01:40:46 +0000 |
commit | 936a825fc484d4dd8d1bedca02185608b1bd75ee (patch) | |
tree | 88391858ac57b625887d8f7fa1cdca74e6fc726c /net/docsis | |
parent | Remove .bak file after reinplace. (diff) |
add patch files which are omitted in previous commit and unbreak this port.
Pointy hat to: leeym
Noticed by: "James E. Flemer" <jflemer@uvm.edu>, kris
Notes
Notes:
svn path=/head/; revision=80318
Diffstat (limited to 'net/docsis')
-rw-r--r-- | net/docsis/Makefile | 2 | ||||
-rw-r--r-- | net/docsis/files/patch-docsis_decode.c | 11 | ||||
-rw-r--r-- | net/docsis/files/patch-docsis_main.c | 18 | ||||
-rw-r--r-- | net/docsis/files/patch-docsis_yy.y | 13 | ||||
-rw-r--r-- | net/docsis/files/patch-ethermac.h | 13 |
5 files changed, 55 insertions, 2 deletions
diff --git a/net/docsis/Makefile b/net/docsis/Makefile index eda8f1321e1e..eb805b18831f 100644 --- a/net/docsis/Makefile +++ b/net/docsis/Makefile @@ -16,8 +16,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= jflemer@alum.rpi.edu COMMENT= DOCSIS(tm) binary configuration file encoder/decoder -BROKEN= "Does not build" - LIB_DEPENDS= netsnmp:${PORTSDIR}/net/net-snmp USE_OPENSSL= yes diff --git a/net/docsis/files/patch-docsis_decode.c b/net/docsis/files/patch-docsis_decode.c new file mode 100644 index 000000000000..ea2184c0fa84 --- /dev/null +++ b/net/docsis/files/patch-docsis_decode.c @@ -0,0 +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)); + +- printf ( "%s %u;\n", sym->sym_ident, ntohl(helper)); ++ printf ( "%s %u;\n", sym->sym_ident, (unsigned int)ntohl(helper)); + } + + void decode_ushort (unsigned char *tlvbuf, symbol_type *sym) diff --git a/net/docsis/files/patch-docsis_main.c b/net/docsis/files/patch-docsis_main.c new file mode 100644 index 000000000000..85ff4b3f217a --- /dev/null +++ b/net/docsis/files/patch-docsis_main.c @@ -0,0 +1,18 @@ +
+$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/docsis/files/patch-docsis_yy.y b/net/docsis/files/patch-docsis_yy.y new file mode 100644 index 000000000000..b3e1614f0025 --- /dev/null +++ b/net/docsis/files/patch-docsis_yy.y @@ -0,0 +1,13 @@ + +$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/docsis/files/patch-ethermac.h b/net/docsis/files/patch-ethermac.h new file mode 100644 index 000000000000..2219065fbf36 --- /dev/null +++ b/net/docsis/files/patch-ethermac.h @@ -0,0 +1,13 @@ + +$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); |