Index: head/net-mgmt/docsis/Makefile =================================================================== --- head/net-mgmt/docsis/Makefile (revision 363492) +++ head/net-mgmt/docsis/Makefile (revision 363493) @@ -1,33 +1,35 @@ # Created by: James Flemer # $FreeBSD$ PORTNAME= docsis -PORTVERSION= 0.9.5 -PORTREVISION= 5 +PORTVERSION= 0.9.6 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= DOCSIS(tm) binary configuration file encoder/decoder +COMMENT= Binary configuration file encoder/decoder +LICENSE= GPLv2 # (or later) + BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp GNU_CONFIGURE= yes USE_OPENSSL= yes USES= bison PLIST_SUB= MIBS=share/snmp/mibs -NO_STAGE= yes -.include +BROKEN_amd64= Produces corrupt files on amd64 -.if ${ARCH} == "amd64" -BROKEN= Produces corrupt files on amd64 -.endif +OPTIONS_DEFINE= DOCS EXAMPLES post-patch: - @${REINPLACE_CMD} -e 's|^htmldocdir =.*|htmldocdir = ${DOCSDIR}|' ${WRKSRC}/doc/Makefile.in - @${REINPLACE_CMD} -e 's|^examplesdir =.*|examplesdir = ${EXAMPLESDIR}|' ${WRKSRC}/examples/Makefile.in + @${REINPLACE_CMD} -e \ + '/^htmldocdir/s|share/docsis|share/doc/docsis|' \ + ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} -e \ + '/^examplesdir/s|docsis/examples|examples/docsis|' \ + ${WRKSRC}/examples/Makefile.in -.include +.include Index: head/net-mgmt/docsis/distinfo =================================================================== --- head/net-mgmt/docsis/distinfo (revision 363492) +++ head/net-mgmt/docsis/distinfo (revision 363493) @@ -1,2 +1,2 @@ -SHA256 (docsis-0.9.5.tar.gz) = 4256fc4e60f8a336ddbeff6ff3fad0debf269239fbcc45fbf36ff5728125b11e -SIZE (docsis-0.9.5.tar.gz) = 509674 +SHA256 (docsis-0.9.6.tar.gz) = 71633f58d29231b2084ebe993683a723bce813dbd893388563a21197aa3c0ca0 +SIZE (docsis-0.9.6.tar.gz) = 614310 Index: head/net-mgmt/docsis/files/patch-configure =================================================================== --- head/net-mgmt/docsis/files/patch-configure (revision 363492) +++ head/net-mgmt/docsis/files/patch-configure (nonexistent) @@ -1,13 +0,0 @@ ---- 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 Property changes on: head/net-mgmt/docsis/files/patch-configure ___________________________________________________________________ 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-md5.h =================================================================== --- head/net-mgmt/docsis/files/patch-md5.h (revision 363492) +++ head/net-mgmt/docsis/files/patch-md5.h (nonexistent) @@ -1,22 +0,0 @@ -# $FreeBSD$ ---- src/md5.h.orig 2004-03-17 07:09:31.000000000 -0800 -+++ src/md5.h 2009-05-07 19:41:20.000000000 -0700 -@@ -22,14 +22,16 @@ - documentation and/or software. - */ - -+#include -+ - /* POINTER defines a generic pointer type */ - typedef unsigned char *POINTER; - - /* UINT2 defines a two byte word */ --typedef unsigned short int UINT2; -+typedef uint16_t UINT2; - - /* UINT4 defines a four byte word */ --typedef unsigned long int UINT4; -+typedef uint32_t UINT4; - - /* MD5 context. */ - typedef struct { Property changes on: head/net-mgmt/docsis/files/patch-md5.h ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ 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/pkg-plist =================================================================== --- head/net-mgmt/docsis/pkg-plist (revision 363492) +++ head/net-mgmt/docsis/pkg-plist (revision 363493) @@ -1,43 +1,67 @@ bin/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%% +%%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%%/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 +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%