Index: head/net-mgmt/docsis/Makefile =================================================================== --- head/net-mgmt/docsis/Makefile (revision 477222) +++ head/net-mgmt/docsis/Makefile (revision 477223) @@ -1,34 +1,37 @@ # Created by: James Flemer # $FreeBSD$ PORTNAME= docsis -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.8 CATEGORIES= net-mgmt -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Binary configuration file encoder/decoder LICENSE= GPLv2+ -BUILD_DEPENDS= gm4:devel/m4 -LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +BUILD_DEPENDS= gm4:devel/m4 \ + flex:textproc/flex +LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp \ + libpkg.so:ports-mgmt/pkg +USES= autoreconf bison libtool ssl +USE_GITHUB= yes GNU_CONFIGURE= yes -USES= bison ssl PLIST_SUB= MIBS=share/snmp/mibs -BROKEN_amd64= Produces corrupt files on amd64 - OPTIONS_DEFINE= DOCS EXAMPLES +GH_ACCOUNT= rlaager +GH_TAGNAME= upstream/${PORTVERSION} + post-patch: @${REINPLACE_CMD} -e \ '/^htmldocdir/s|share/docsis|share/doc/docsis|' \ - ${WRKSRC}/doc/Makefile.in + ${WRKSRC}/doc/Makefile.am @${REINPLACE_CMD} -e \ '/^examplesdir/s|docsis/examples|examples/docsis|' \ - ${WRKSRC}/examples/Makefile.in + ${WRKSRC}/examples/Makefile.am .include Index: head/net-mgmt/docsis/distinfo =================================================================== --- head/net-mgmt/docsis/distinfo (revision 477222) +++ head/net-mgmt/docsis/distinfo (revision 477223) @@ -1,2 +1,3 @@ -SHA256 (docsis-0.9.6.tar.gz) = 71633f58d29231b2084ebe993683a723bce813dbd893388563a21197aa3c0ca0 -SIZE (docsis-0.9.6.tar.gz) = 614310 +TIMESTAMP = 1534323098 +SHA256 (rlaager-docsis-0.9.8-upstream-0.9.8_GH0.tar.gz) = ef3ac656c0415580d018e657dec19093781962f657eae65026a7224109121d33 +SIZE (rlaager-docsis-0.9.8-upstream-0.9.8_GH0.tar.gz) = 2888501 Index: head/net-mgmt/docsis/files/patch-docsis_decode.c =================================================================== --- head/net-mgmt/docsis/files/patch-docsis_decode.c (revision 477222) +++ head/net-mgmt/docsis/files/patch-docsis_decode.c (nonexistent) @@ -1,10 +0,0 @@ ---- 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 @@ - - #include - #include -+#include - - /* #include "docsis.h" */ - #include "docsis_decode.h" Property changes on: head/net-mgmt/docsis/files/patch-docsis_decode.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-docsis_snmp.c =================================================================== --- head/net-mgmt/docsis/files/patch-docsis_snmp.c (revision 477222) +++ head/net-mgmt/docsis/files/patch-docsis_snmp.c (nonexistent) @@ -1,11 +0,0 @@ ---- 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 - */ - -+#include -+ - #include "docsis_snmp.h" - #include "docsis_decode.h" - Property changes on: head/net-mgmt/docsis/files/patch-docsis_snmp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-docsis_snmp.h =================================================================== --- head/net-mgmt/docsis/files/patch-docsis_snmp.h (revision 477222) +++ head/net-mgmt/docsis/files/patch-docsis_snmp.h (nonexistent) @@ -1,22 +0,0 @@ ---- 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 -+ - #include - #include - #include - #include - #include -+ -+#undef PACKAGE_BUGREPORT -+#undef PACKAGE_NAME -+#undef PACKAGE_STRING -+#undef PACKAGE_TARNAME -+#undef PACKAGE_VERSION - - #include "docsis.h" - Property changes on: head/net-mgmt/docsis/files/patch-docsis_snmp.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-docsis.c =================================================================== --- head/net-mgmt/docsis/files/patch-docsis.c (revision 477222) +++ head/net-mgmt/docsis/files/patch-docsis.c (nonexistent) @@ -1,30 +0,0 @@ ---- 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 - #include - #include -@@ -35,6 +31,16 @@ - #include - #include - #include -+ -+#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" Property changes on: head/net-mgmt/docsis/files/patch-docsis.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-src_docsis.c =================================================================== --- head/net-mgmt/docsis/files/patch-src_docsis.c (nonexistent) +++ head/net-mgmt/docsis/files/patch-src_docsis.c (revision 477223) @@ -0,0 +1,30 @@ +--- src/docsis.c.orig 2015-10-18 20:28:25 UTC ++++ src/docsis.c +@@ -21,10 +21,6 @@ + * DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com + */ + +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif /* HAVE_CONFIG_H */ +- + #include + #include + #include +@@ -37,6 +33,16 @@ + #include + #include + ++#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_globals.h" + #include "docsis_symtable.h" Property changes on: head/net-mgmt/docsis/files/patch-src_docsis.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-src_docsis__decode.c =================================================================== --- head/net-mgmt/docsis/files/patch-src_docsis__decode.c (nonexistent) +++ head/net-mgmt/docsis/files/patch-src_docsis__decode.c (revision 477223) @@ -0,0 +1,10 @@ +--- src/docsis_decode.c.orig 2015-10-18 20:28:25 UTC ++++ src/docsis_decode.c +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + /* #include "docsis.h" */ + #include "docsis_decode.h" Property changes on: head/net-mgmt/docsis/files/patch-src_docsis__decode.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-src_docsis__snmp.c =================================================================== --- head/net-mgmt/docsis/files/patch-src_docsis__snmp.c (nonexistent) +++ head/net-mgmt/docsis/files/patch-src_docsis__snmp.c (revision 477223) @@ -0,0 +1,11 @@ +--- src/docsis_snmp.c.orig 2015-10-18 20:28:25 UTC ++++ src/docsis_snmp.c +@@ -21,6 +21,8 @@ + * DOCSIS is a registered trademark of Cablelabs, http://www.cablelabs.com + */ + ++#include ++ + #include "docsis_snmp.h" + #include "docsis_decode.h" + Property changes on: head/net-mgmt/docsis/files/patch-src_docsis__snmp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/docsis/files/patch-src_docsis__snmp.h =================================================================== --- head/net-mgmt/docsis/files/patch-src_docsis__snmp.h (nonexistent) +++ head/net-mgmt/docsis/files/patch-src_docsis__snmp.h (revision 477223) @@ -0,0 +1,23 @@ +--- src/docsis_snmp.h.orig 2015-10-18 20:28:25 UTC ++++ src/docsis_snmp.h +@@ -25,12 +25,20 @@ + #ifndef _DOCSIS_SNMP_H + #define _DOCSIS_SNMP_H + ++#include ++ + #include + #include + #include + #include + #include + ++#undef PACKAGE_BUGREPORT ++#undef PACKAGE_NAME ++#undef PACKAGE_STRING ++#undef PACKAGE_TARNAME ++#undef PACKAGE_VERSION ++ + #include "docsis.h" + + unsigned int encode_vbind ( char *oid_string, char oid_asntype, union t_val *value, Property changes on: head/net-mgmt/docsis/files/patch-src_docsis__snmp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/docsis/pkg-descr =================================================================== --- head/net-mgmt/docsis/pkg-descr (revision 477222) +++ head/net-mgmt/docsis/pkg-descr (revision 477223) @@ -1,6 +1,6 @@ Docsis is a small program that can be used to generate binary configuration files for DOCSIS-compliant cable modems. DOCSIS stands for Data over Cable Service Interface Specification and is a standard developed by Cablelabs. -WWW: http://docsis.sourceforge.net/ +WWW: https://github.com/rlaager/docsis Index: head/net-mgmt/docsis/pkg-plist =================================================================== --- head/net-mgmt/docsis/pkg-plist (revision 477222) +++ head/net-mgmt/docsis/pkg-plist (revision 477223) @@ -1,65 +1,67 @@ bin/docsis %%PORTDOCS%%%%DOCSDIR%%/config-format.html %%PORTDOCS%%%%DOCSDIR%%/config-settings.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_2class_non-rfc2669.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_2class_non-rfc2669.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_2class_rfc2669.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_2class_rfc2669.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic_bpi.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic_bpi.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic_upgrade.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_basic_upgrade.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_example.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_example.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters2_oidnum.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters2_oidnum.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters2_oidtext.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters2_oidtext.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_NmAccess.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_NmAccess.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_oidnum.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_oidnum.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_oidtext.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.0_filters_oidtext.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_classifiers.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_classifiers.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_classifiers2.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_classifiers2.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_oss_v3coex.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_oss_v3coex.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_simple.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_simple.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_stress_test.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis1.1_stress_test.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20_no_snmp.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20_no_snmp.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20_stresstest.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis20_stresstest.txt +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis_ipv6.cfg +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docsis_ipv6.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/keyfile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/packetcable_mta.cfg %%PORTEXAMPLES%%%%EXAMPLESDIR%%/packetcable_mta.txt %%MIBS%%/CLAB-DEF-MIB %%MIBS%%/DIFFSERV-DSCP-TC %%MIBS%%/DIFFSERV-MIB %%MIBS%%/DOCS-BPI-MIB %%MIBS%%/DOCS-BPI2-MIB %%MIBS%%/DOCS-CABLE-DEVICE-MIB %%MIBS%%/DOCS-CABLE-DEVICE-TRAP-MIB %%MIBS%%/DOCS-IF-EXT-MIB %%MIBS%%/DOCS-IF-MIB %%MIBS%%/DOCS-QOS-MIB %%MIBS%%/DOCS-SUBMGT-MIB %%MIBS%%/IGMP-STD-MIB %%MIBS%%/INTEGRATED-SERVICES-MIB %%MIBS%%/PKTC-EVENT-MIB %%MIBS%%/PKTC-IETF-SIG-MIB %%MIBS%%/PKTC-MTA-MIB %%MIBS%%/PKTC-SIG-MIB %%MIBS%%/RMON2-MIB %%MIBS%%/TOKEN-RING-RMON-MIB