From aaf116f1f9fb5df3213fb080af3a41d7f90a4621 Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Thu, 9 Sep 2010 03:02:15 +0000 Subject: [PATCH] - Unbreak port PR: ports/146631 Submitted by: Martin Kraft --- net/pppload/Makefile | 6 +----- net/pppload/files/patch-ad | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/net/pppload/Makefile b/net/pppload/Makefile index 511ef1704f48..aa7ab3590268 100644 --- a/net/pppload/Makefile +++ b/net/pppload/Makefile @@ -7,7 +7,7 @@ PORTNAME= pppload PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net sysutils MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= system/network/serial/ppp @@ -28,8 +28,4 @@ do-install: .include -.if ${OSVERSION} >= 800064 -BROKEN= does not build -.endif - .include diff --git a/net/pppload/files/patch-ad b/net/pppload/files/patch-ad index a047c4fe397e..e16171157785 100644 --- a/net/pppload/files/patch-ad +++ b/net/pppload/files/patch-ad @@ -1,6 +1,6 @@ ---- PPPStats.C.orig Fri Jan 24 17:33:43 2003 -+++ PPPStats.C Fri Jan 24 17:33:27 2003 -@@ -19,16 +19,22 @@ +--- PPPStats.C.orig 1996-09-12 04:50:13.000000000 +0200 ++++ PPPStats.C 2010-05-16 12:45:39.000000000 +0200 +@@ -19,16 +19,24 @@ extern "C" { #include @@ -14,26 +14,30 @@ -#include +#include +#include -+#include ++// 2010-05-16 Kf Replaced patched net/if_ppp.h by net/ppp_defs.h. ++// (Is linux/ppp_defs.h in the distribution.); ++#include } #include "PPPStats.H" #include "Options.H" -+#include ++#include + +void get_command(char *); +char command[200]; typedef struct { -@@ -53,38 +59,44 @@ +@@ -53,38 +61,46 @@ system( (const char*)options->cmd() ); } - DclPPPInfo PPPInfo[1]; - struct ifreq ifreq; + DclPPPInfo PPPInfo[1]; -+ struct ifpppstatsreq ifreq; ++// 2010-05-16 Kf Replaced patched struct ifpppstatsreq by the original ++// struct ifreq. ++ struct ifreq ifreq; struct ppp_stats* PPPStat; - struct ppp_stats LastPPPStat[1]; - @@ -96,7 +100,7 @@ unsigned int rxDelta = PPPStat->p.ppp_ibytes - _rxTotal; unsigned int txDelta = PPPStat->p.ppp_obytes - _txTotal; _rxTotal = PPPStat->p.ppp_ibytes; -@@ -92,4 +104,17 @@ +@@ -92,4 +108,17 @@ if ( rxDelta == _rxTotal ) rxDelta = 0; if ( txDelta == _txTotal ) txDelta = 0; emit changeStats( rxDelta, txDelta, _rxTotal, _txTotal );