svn commit: r477223 - in head/net-mgmt/docsis: . files

Emanuel Haupt ehaupt at FreeBSD.org
Wed Aug 15 12:49:40 UTC 2018 

Author: ehaupt
Date: Wed Aug 15 12:49:38 2018
New Revision: 477223
URL: https://svnweb.freebsd.org/changeset/ports/477223

Log:
  - Update to 0.9.8
  - Move from SF to GitHub
  - Update WWW
  - Pacify portlint
  - Unbreak on amd64, "Philippe Maechler" <pmaechler-ml at glattnet.ch> notified us
    via ports@ that the produced config files work fine

Added:
  head/net-mgmt/docsis/files/patch-src_docsis.c   (contents, props changed)
  head/net-mgmt/docsis/files/patch-src_docsis__decode.c   (contents, props changed)
  head/net-mgmt/docsis/files/patch-src_docsis__snmp.c   (contents, props changed)
  head/net-mgmt/docsis/files/patch-src_docsis__snmp.h   (contents, props changed)
Deleted:
  head/net-mgmt/docsis/files/patch-docsis.c
  head/net-mgmt/docsis/files/patch-docsis_decode.c
  head/net-mgmt/docsis/files/patch-docsis_snmp.c
  head/net-mgmt/docsis/files/patch-docsis_snmp.h
Modified:
  head/net-mgmt/docsis/Makefile
  head/net-mgmt/docsis/distinfo
  head/net-mgmt/docsis/pkg-descr
  head/net-mgmt/docsis/pkg-plist

Modified: head/net-mgmt/docsis/Makefile
==============================================================================
--- head/net-mgmt/docsis/Makefile	Wed Aug 15 12:39:19 2018	(r477222)
+++ head/net-mgmt/docsis/Makefile	Wed Aug 15 12:49:38 2018	(r477223)
@@ -2,33 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	docsis
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.8
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports at 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 <bsd.port.mk>

Modified: head/net-mgmt/docsis/distinfo
==============================================================================
--- head/net-mgmt/docsis/distinfo	Wed Aug 15 12:39:19 2018	(r477222)
+++ head/net-mgmt/docsis/distinfo	Wed Aug 15 12:49:38 2018	(r477223)
@@ -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

Added: head/net-mgmt/docsis/files/patch-src_docsis.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/docsis/files/patch-src_docsis.c	Wed Aug 15 12:49:38 2018	(r477223)
@@ -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 <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
+@@ -37,6 +33,16 @@
+ #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_globals.h"
+ #include "docsis_symtable.h"

Added: head/net-mgmt/docsis/files/patch-src_docsis__decode.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/docsis/files/patch-src_docsis__decode.c	Wed Aug 15 12:49:38 2018	(r477223)
@@ -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 <math.h>
+ #include <ctype.h>
++#include <string.h>
+ 
+ /* #include "docsis.h" */
+ #include "docsis_decode.h"

Added: head/net-mgmt/docsis/files/patch-src_docsis__snmp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/docsis/files/patch-src_docsis__snmp.c	Wed Aug 15 12:49:38 2018	(r477223)
@@ -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 <string.h>
++
+ #include "docsis_snmp.h"
+ #include "docsis_decode.h"
+ 

Added: head/net-mgmt/docsis/files/patch-src_docsis__snmp.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/docsis/files/patch-src_docsis__snmp.h	Wed Aug 15 12:49:38 2018	(r477223)
@@ -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 <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"
+ 
+ unsigned int encode_vbind ( char *oid_string, char oid_asntype, union t_val *value,

Modified: head/net-mgmt/docsis/pkg-descr
==============================================================================
--- head/net-mgmt/docsis/pkg-descr	Wed Aug 15 12:39:19 2018	(r477222)
+++ head/net-mgmt/docsis/pkg-descr	Wed Aug 15 12:49:38 2018	(r477223)
@@ -3,4 +3,4 @@ configuration files for DOCSIS-compliant cable modems.
 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

Modified: head/net-mgmt/docsis/pkg-plist
==============================================================================
--- head/net-mgmt/docsis/pkg-plist	Wed Aug 15 12:39:19 2018	(r477222)
+++ head/net-mgmt/docsis/pkg-plist	Wed Aug 15 12:49:38 2018	(r477223)
@@ -41,6 +41,8 @@ bin/docsis
 %%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

More information about the svn-ports-all mailing list